hidemoneybox buries dummy args now
This commit is contained in:
@@ -1014,8 +1014,10 @@
|
|||||||
.endm
|
.endm
|
||||||
|
|
||||||
@ Hides the secondary box spawned by showmoney.
|
@ Hides the secondary box spawned by showmoney.
|
||||||
.macro hidemoneybox
|
.macro hidemoneybox @, x, y
|
||||||
.byte 0x94
|
.byte 0x94
|
||||||
|
.byte 0 @ x
|
||||||
|
.byte 0 @ y
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
@ Updates the secondary box spawned by showmoney. Consumes but does not use arguments.
|
@ Updates the secondary box spawned by showmoney. Consumes but does not use arguments.
|
||||||
|
|||||||
@@ -7923,23 +7923,17 @@ EventScript_1B2907:: @ 81B2907
|
|||||||
special Special_UpdateTrainerCardPhotoIcons
|
special Special_UpdateTrainerCardPhotoIcons
|
||||||
msgbox gUnknown_81B1E7D
|
msgbox gUnknown_81B1E7D
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
nop
|
|
||||||
nop
|
|
||||||
releaseall
|
releaseall
|
||||||
end
|
end
|
||||||
|
|
||||||
EventScript_1B2926:: @ 81B2926
|
EventScript_1B2926:: @ 81B2926
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
nop
|
|
||||||
nop
|
|
||||||
releaseall
|
releaseall
|
||||||
end
|
end
|
||||||
|
|
||||||
EventScript_1B292B:: @ 81B292B
|
EventScript_1B292B:: @ 81B292B
|
||||||
msgbox gUnknown_81B1E07
|
msgbox gUnknown_81B1E07
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
nop
|
|
||||||
nop
|
|
||||||
releaseall
|
releaseall
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -11488,8 +11482,6 @@ EventScript_1BF3DD:: @ 81BF3DD
|
|||||||
msgbox Text_19DDBE
|
msgbox Text_19DDBE
|
||||||
fadescreen 1
|
fadescreen 1
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
nop
|
|
||||||
nop
|
|
||||||
special ChooseSendDaycareMon
|
special ChooseSendDaycareMon
|
||||||
waitstate
|
waitstate
|
||||||
showmoneybox 0, 0, 0
|
showmoneybox 0, 0, 0
|
||||||
@@ -11584,8 +11576,6 @@ EventScript_1BF533:: @ 81BF533
|
|||||||
|
|
||||||
EventScript_1BF541:: @ 81BF541
|
EventScript_1BF541:: @ 81BF541
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
nop
|
|
||||||
nop
|
|
||||||
release
|
release
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -298,7 +298,5 @@ EventScript_16C13F:: @ 816C13F
|
|||||||
|
|
||||||
EventScript_16C14D:: @ 816C14D
|
EventScript_16C14D:: @ 816C14D
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
releaseall
|
releaseall
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -81,8 +81,6 @@ EventScript_16C762:: @ 816C762
|
|||||||
|
|
||||||
EventScript_16C77A:: @ 816C77A
|
EventScript_16C77A:: @ 816C77A
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
hidecoinsbox 0, 5
|
hidecoinsbox 0, 5
|
||||||
release
|
release
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -26,8 +26,6 @@ EventScript_16AC07:: @ 816AC07
|
|||||||
EventScript_16AC15:: @ 816AC15
|
EventScript_16AC15:: @ 816AC15
|
||||||
msgbox gUnknown_819280E
|
msgbox gUnknown_819280E
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
release
|
release
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -124,8 +124,6 @@ EventScript_16D3CA:: @ 816D3CA
|
|||||||
msgbox gUnknown_8197D80
|
msgbox gUnknown_8197D80
|
||||||
closemessage
|
closemessage
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
compare_var_to_value VAR_0x4002, 0
|
compare_var_to_value VAR_0x4002, 0
|
||||||
call_if eq, EventScript_16D44C
|
call_if eq, EventScript_16D44C
|
||||||
compare_var_to_value VAR_0x4002, 1
|
compare_var_to_value VAR_0x4002, 1
|
||||||
@@ -172,8 +170,6 @@ EventScript_16D48C:: @ 816D48C
|
|||||||
EventScript_16D49A:: @ 816D49A
|
EventScript_16D49A:: @ 816D49A
|
||||||
closemessage
|
closemessage
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
applymovement 255, Movement_16D4AA
|
applymovement 255, Movement_16D4AA
|
||||||
waitmovement 0
|
waitmovement 0
|
||||||
releaseall
|
releaseall
|
||||||
|
|||||||
@@ -69,8 +69,6 @@ EventScript_16A3D1:: @ 816A3D1
|
|||||||
msgbox gUnknown_81904F9
|
msgbox gUnknown_81904F9
|
||||||
closemessage
|
closemessage
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
applymovement 255, Movement_16A48E
|
applymovement 255, Movement_16A48E
|
||||||
waitmovement 0
|
waitmovement 0
|
||||||
releaseall
|
releaseall
|
||||||
@@ -94,8 +92,6 @@ EventScript_16A402:: @ 816A402
|
|||||||
msgbox gUnknown_8190505
|
msgbox gUnknown_8190505
|
||||||
setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 1
|
setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 1
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
releaseall
|
releaseall
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -118,8 +114,6 @@ EventScript_16A476:: @ 816A476
|
|||||||
msgbox gUnknown_819051C
|
msgbox gUnknown_819051C
|
||||||
closemessage
|
closemessage
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
applymovement 255, Movement_16A48E
|
applymovement 255, Movement_16A48E
|
||||||
waitmovement 0
|
waitmovement 0
|
||||||
releaseall
|
releaseall
|
||||||
|
|||||||
@@ -66,8 +66,6 @@ EventScript_16F7F6:: @ 816F7F6
|
|||||||
call EventScript_1A8C27
|
call EventScript_1A8C27
|
||||||
fadescreen 1
|
fadescreen 1
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
special ChangePokemonNickname
|
special ChangePokemonNickname
|
||||||
waitstate
|
waitstate
|
||||||
goto EventScript_16F86A
|
goto EventScript_16F86A
|
||||||
@@ -80,8 +78,6 @@ EventScript_16F822:: @ 816F822
|
|||||||
goto_if eq, EventScript_16F84B
|
goto_if eq, EventScript_16F84B
|
||||||
fadescreen 1
|
fadescreen 1
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
special ChangeBoxPokemonNickname
|
special ChangeBoxPokemonNickname
|
||||||
waitstate
|
waitstate
|
||||||
lock
|
lock
|
||||||
@@ -101,8 +97,6 @@ EventScript_16F856:: @ 816F856
|
|||||||
|
|
||||||
EventScript_16F861:: @ 816F861
|
EventScript_16F861:: @ 816F861
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
goto EventScript_16F86A
|
goto EventScript_16F86A
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -124,16 +118,12 @@ EventScript_16F86F:: @ 816F86F
|
|||||||
EventScript_16F888:: @ 816F888
|
EventScript_16F888:: @ 816F888
|
||||||
msgbox gUnknown_819DC07
|
msgbox gUnknown_819DC07
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
release
|
release
|
||||||
end
|
end
|
||||||
|
|
||||||
EventScript_16F895:: @ 816F895
|
EventScript_16F895:: @ 816F895
|
||||||
msgbox gUnknown_819DC78
|
msgbox gUnknown_819DC78
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
release
|
release
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -146,8 +136,6 @@ EventScript_16F8AC:: @ 816F8AC
|
|||||||
textcolor 0
|
textcolor 0
|
||||||
msgbox gUnknown_819DC3E
|
msgbox gUnknown_819DC3E
|
||||||
hidemoneybox
|
hidemoneybox
|
||||||
.byte 0
|
|
||||||
.byte 0
|
|
||||||
release
|
release
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user