Merge pull request #145 from PikalaxALT/hidemoneybox

hidemoneybox buries dummy args now

8 files changed, 24 insertions, 58 deletions

diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 21e3e65c0..19293e527 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1014,8 +1014,12 @@
 	.endm
 
 	@ Hides the secondary box spawned by showmoney.
-	.macro hidemoneybox
+	@ The two arguments are unused.
+	@ They are retained here for backwards compatibility with Ruby/Sapphire.
+	.macro hidemoneybox x, y
 	.byte 0x94
+	.byte \x
+	.byte \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..f75442912 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -7922,24 +7922,18 @@ EventScript_1B2907:: @ 81B2907
 	delay 60
 	special Special_UpdateTrainerCardPhotoIcons
 	msgbox gUnknown_81B1E7D
-	hidemoneybox
-	nop
-	nop
+	hidemoneybox 0, 0
 	releaseall
 	end
 
 EventScript_1B2926:: @ 81B2926
-	hidemoneybox
-	nop
-	nop
+	hidemoneybox 0, 0
 	releaseall
 	end
 
 EventScript_1B292B:: @ 81B292B
 	msgbox gUnknown_81B1E07
-	hidemoneybox
-	nop
-	nop
+	hidemoneybox 0, 0
 	releaseall
 	end
 
@@ -11487,9 +11481,7 @@ EventScript_1BF3DD:: @ 81BF3DD
 	goto_if eq, EventScript_1BF452
 	msgbox Text_19DDBE
 	fadescreen 1
-	hidemoneybox
-	nop
-	nop
+	hidemoneybox 0, 0
 	special ChooseSendDaycareMon
 	waitstate
 	showmoneybox 0, 0, 0
@@ -11583,9 +11575,7 @@ EventScript_1BF533:: @ 81BF533
 	end
 
 EventScript_1BF541:: @ 81BF541
-	hidemoneybox
-	nop
-	nop
+	hidemoneybox 0, 0
 	release
 	end
 
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
index 6e5c8a284..da6ec9c0b 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
@@ -297,8 +297,6 @@ EventScript_16C13F:: @ 816C13F
 	end
 
 EventScript_16C14D:: @ 816C14D
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	releaseall
 	end
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
index 487d9fa64..65aa9a529 100644
--- a/data/maps/CeladonCity_GameCorner/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -80,9 +80,7 @@ EventScript_16C762:: @ 816C762
 	end
 
 EventScript_16C77A:: @ 816C77A
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	hidecoinsbox 0, 5
 	release
 	end
diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc
index 40302e25f..75ebd4b6b 100644
--- a/data/maps/CeruleanCity_BikeShop/scripts.inc
+++ b/data/maps/CeruleanCity_BikeShop/scripts.inc
@@ -25,9 +25,7 @@ EventScript_16AC07:: @ 816AC07
 
 EventScript_16AC15:: @ 816AC15
 	msgbox gUnknown_819280E
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	release
 	end
 
diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
index 16b796efe..777e88a96 100644
--- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
@@ -123,9 +123,7 @@ EventScript_16D3CA:: @ 816D3CA
 	call EventScript_1A6675
 	msgbox gUnknown_8197D80
 	closemessage
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	compare_var_to_value VAR_0x4002, 0
 	call_if eq, EventScript_16D44C
 	compare_var_to_value VAR_0x4002, 1
@@ -171,9 +169,7 @@ EventScript_16D48C:: @ 816D48C
 
 EventScript_16D49A:: @ 816D49A
 	closemessage
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 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..7e4973a15 100644
--- a/data/maps/PewterCity_Museum_1F/scripts.inc
+++ b/data/maps/PewterCity_Museum_1F/scripts.inc
@@ -68,9 +68,7 @@ EventScript_16A3D1:: @ 816A3D1
 	goto_if eq, EventScript_16A402
 	msgbox gUnknown_81904F9
 	closemessage
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	applymovement 255, Movement_16A48E
 	waitmovement 0
 	releaseall
@@ -93,9 +91,7 @@ EventScript_16A402:: @ 816A402
 	waitse
 	msgbox gUnknown_8190505
 	setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 1
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	releaseall
 	end
 
@@ -117,9 +113,7 @@ EventScript_16A46B:: @ 816A46B
 EventScript_16A476:: @ 816A476
 	msgbox gUnknown_819051C
 	closemessage
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 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..4b485bbbd 100644
--- a/data/maps/Route4_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc
@@ -65,9 +65,7 @@ EventScript_16F7F6:: @ 816F7F6
 	goto_if eq, EventScript_16F861
 	call EventScript_1A8C27
 	fadescreen 1
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	special ChangePokemonNickname
 	waitstate
 	goto EventScript_16F86A
@@ -79,9 +77,7 @@ EventScript_16F822:: @ 816F822
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_16F84B
 	fadescreen 1
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	special ChangeBoxPokemonNickname
 	waitstate
 	lock
@@ -100,9 +96,7 @@ EventScript_16F856:: @ 816F856
 	end
 
 EventScript_16F861:: @ 816F861
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	goto EventScript_16F86A
 	end
 
@@ -123,17 +117,13 @@ EventScript_16F86F:: @ 816F86F
 
 EventScript_16F888:: @ 816F888
 	msgbox gUnknown_819DC07
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	release
 	end
 
 EventScript_16F895:: @ 816F895
 	msgbox gUnknown_819DC78
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	release
 	end
 
@@ -145,9 +135,7 @@ EventScript_16F8A2:: @ 816F8A2
 EventScript_16F8AC:: @ 816F8AC
 	textcolor 0
 	msgbox gUnknown_819DC3E
-	hidemoneybox
-	.byte 0
-	.byte 0
+	hidemoneybox 0, 0
 	release
 	end