dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Folded nops into hidemoneybox and updatemoneybox

Browse Source 
The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.
This commit is contained in:
Tustin2121
2019-08-17 13:25:36 -04:00
parent 9bcd39d86c
commit f4d4424618
7 changed files with 10 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/maps/MtChimney/scripts.inc
View File

@@ -115,38 +115,29 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3
compare VAR_RESULT, 0
goto_if_eq MtChimney_EventScript_22EF51
hidemoneybox
nop
nop
release
end
MtChimney_EventScript_22EF51:: @ 822EF51
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
MtChimney_EventScript_22EF5E:: @ 822EF5E
takemoney 0xc8, 0
updatemoneybox 0, 0
nop
updatemoneybox 0,0
return
MtChimney_EventScript_22EF69:: @ 822EF69
msgbox MtChimney_Text_22FE9B, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
MtChimney_EventScript_22EF76:: @ 822EF76
msgbox MtChimney_Text_22FE5E, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end