diff options
| -rw-r--r-- | asm/macros/event.inc | 4 | ||||
| -rw-r--r-- | data/event_scripts.s | 10 | ||||
| -rw-r--r-- | data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/CeladonCity_GameCorner/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/CeruleanCity_BikeShop/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/PewterCity_Museum_1F/scripts.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route4_PokemonCenter_1F/scripts.inc | 12 |
8 files changed, 3 insertions, 39 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 21e3e65c0..71e0eaef1 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1014,8 +1014,10 @@ .endm @ Hides the secondary box spawned by showmoney. - .macro hidemoneybox + .macro hidemoneybox @, x, y .byte 0x94 + .byte 0 @ x + .byte 0 @ y .endm @ Updates the secondary box spawned by showmoney. Consumes but does not use arguments. diff --git a/data/event_scripts.s b/data/event_scripts.s index af9eff3e6..865bc7114 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -7923,23 +7923,17 @@ EventScript_1B2907:: @ 81B2907 special Special_UpdateTrainerCardPhotoIcons msgbox gUnknown_81B1E7D hidemoneybox - nop - nop releaseall end EventScript_1B2926:: @ 81B2926 hidemoneybox - nop - nop releaseall end EventScript_1B292B:: @ 81B292B msgbox gUnknown_81B1E07 hidemoneybox - nop - nop releaseall end @@ -11488,8 +11482,6 @@ EventScript_1BF3DD:: @ 81BF3DD msgbox Text_19DDBE fadescreen 1 hidemoneybox - nop - nop special ChooseSendDaycareMon waitstate showmoneybox 0, 0, 0 @@ -11584,8 +11576,6 @@ EventScript_1BF533:: @ 81BF533 EventScript_1BF541:: @ 81BF541 hidemoneybox - nop - nop release end diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 6e5c8a284..8829af100 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -298,7 +298,5 @@ EventScript_16C13F:: @ 816C13F EventScript_16C14D:: @ 816C14D hidemoneybox - .byte 0 - .byte 0 releaseall end diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 487d9fa64..c3496a771 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -81,8 +81,6 @@ EventScript_16C762:: @ 816C762 EventScript_16C77A:: @ 816C77A hidemoneybox - .byte 0 - .byte 0 hidecoinsbox 0, 5 release end diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 40302e25f..8aaf02cb7 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -26,8 +26,6 @@ EventScript_16AC07:: @ 816AC07 EventScript_16AC15:: @ 816AC15 msgbox gUnknown_819280E hidemoneybox - .byte 0 - .byte 0 release end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 16b796efe..0a887b70e 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -124,8 +124,6 @@ EventScript_16D3CA:: @ 816D3CA msgbox gUnknown_8197D80 closemessage hidemoneybox - .byte 0 - .byte 0 compare_var_to_value VAR_0x4002, 0 call_if eq, EventScript_16D44C compare_var_to_value VAR_0x4002, 1 @@ -172,8 +170,6 @@ EventScript_16D48C:: @ 816D48C EventScript_16D49A:: @ 816D49A closemessage hidemoneybox - .byte 0 - .byte 0 applymovement 255, Movement_16D4AA waitmovement 0 releaseall diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 8d4f9dc6d..f62940880 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -69,8 +69,6 @@ EventScript_16A3D1:: @ 816A3D1 msgbox gUnknown_81904F9 closemessage hidemoneybox - .byte 0 - .byte 0 applymovement 255, Movement_16A48E waitmovement 0 releaseall @@ -94,8 +92,6 @@ EventScript_16A402:: @ 816A402 msgbox gUnknown_8190505 setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 1 hidemoneybox - .byte 0 - .byte 0 releaseall end @@ -118,8 +114,6 @@ EventScript_16A476:: @ 816A476 msgbox gUnknown_819051C closemessage hidemoneybox - .byte 0 - .byte 0 applymovement 255, Movement_16A48E waitmovement 0 releaseall diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index e1a823cb5..7437c98b1 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -66,8 +66,6 @@ EventScript_16F7F6:: @ 816F7F6 call EventScript_1A8C27 fadescreen 1 hidemoneybox - .byte 0 - .byte 0 special ChangePokemonNickname waitstate goto EventScript_16F86A @@ -80,8 +78,6 @@ EventScript_16F822:: @ 816F822 goto_if eq, EventScript_16F84B fadescreen 1 hidemoneybox - .byte 0 - .byte 0 special ChangeBoxPokemonNickname waitstate lock @@ -101,8 +97,6 @@ EventScript_16F856:: @ 816F856 EventScript_16F861:: @ 816F861 hidemoneybox - .byte 0 - .byte 0 goto EventScript_16F86A end @@ -124,16 +118,12 @@ EventScript_16F86F:: @ 816F86F EventScript_16F888:: @ 816F888 msgbox gUnknown_819DC07 hidemoneybox - .byte 0 - .byte 0 release end EventScript_16F895:: @ 816F895 msgbox gUnknown_819DC78 hidemoneybox - .byte 0 - .byte 0 release end @@ -146,8 +136,6 @@ EventScript_16F8AC:: @ 816F8AC textcolor 0 msgbox gUnknown_819DC3E hidemoneybox - .byte 0 - .byte 0 release end |