Merge remote-tracking branch 'origin/main' into options-menu

# Conflicts:
#	UnleashedRecomp/framework.h
#	UnleashedRecompLib/config/SWA.toml
This commit is contained in:
Skyth 2024-12-06 18:40:01 +03:00
commit fb57655aa2
2 changed files with 8 additions and 0 deletions

View file

@ -45,6 +45,8 @@ void WerehogBattleMusicMidAsmHook(PPCRegister& r11)
r11.u8 = 3; r11.u8 = 3;
} }
void StorageDevicePromptMidAsmHook() {}
/* Hook function that gets the game region /* Hook function that gets the game region
and force result to zero for Japanese and force result to zero for Japanese
to display the correct logos. */ to display the correct logos. */

View file

@ -449,6 +449,12 @@ name = "GetDatabaseDataMidAsmHook"
address = 0x827D6018 # Particle Material XML address = 0x827D6018 # Particle Material XML
registers = ["r1", "r30"] registers = ["r1", "r30"]
# Removes the storage device prompt on new game
[[midasm_hook]]
name = "StorageDevicePromptMidAsmHook"
address = 0x822C53CC
jump_address = 0x822C53F8
# World Map Pause Menu # World Map Pause Menu
[[midasm_hook]] [[midasm_hook]]
name = "CHudPauseAddOptionsItemMidAsmHook" name = "CHudPauseAddOptionsItemMidAsmHook"