Folded nops into hidemoneybox and updatemoneybox
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:
1 parent
9bcd39d86c
commit
f4d4424618
7 files changed
+10
-54
No files matched your search
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user