propagate msgbox macro

1 files changed, 50 insertions, 100 deletions

diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index e52bdad8d..d34f6c7c4 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -64,8 +64,7 @@ EventScript_170CB1:: @ 8170CB1
 	applymovement 255, Movement_170E7D
 	applymovement 2, Movement_170E86
 	waitmovement 0
-	loadword 0, gUnknown_81A0CDE
-	callstd 4
+	msgbox gUnknown_81A0CDE
 	applymovement 255, Movement_1A75EB
 	waitmovement 0
 	playse SE_PIN
@@ -75,15 +74,12 @@ EventScript_170CB1:: @ 8170CB1
 	waitmovement 0
 	applymovement 3, Movement_1A75DD
 	waitmovement 0
-	loadword 0, gUnknown_81A0CF7
-	callstd 4
-	loadword 0, gUnknown_81A0D27
-	callstd 4
+	msgbox gUnknown_81A0CF7
+	msgbox gUnknown_81A0D27
 	applymovement 2, Movement_1A75ED
 	applymovement 255, Movement_1A75E9
 	waitmovement 0
-	loadword 0, gUnknown_81A0D72
-	callstd 4
+	msgbox gUnknown_81A0D72
 	applymovement 2, Movement_1A75EB
 	waitmovement 0
 	applymovement 255, Movement_1A75EB
@@ -94,42 +90,34 @@ EventScript_170CB1:: @ 8170CB1
 	call_if 0, EventScript_170E3D
 	applymovement 3, Movement_1A75ED
 	waitmovement 0
-	loadword 0, gUnknown_81A0E17
-	callstd 4
-	loadword 0, gUnknown_81A0E90
-	callstd 4
+	msgbox gUnknown_81A0E17
+	msgbox gUnknown_81A0E90
 	applymovement 3, Movement_1A75E7
 	waitmovement 0
-	loadword 0, gUnknown_81A0ECC
-	callstd 4
+	msgbox gUnknown_81A0ECC
 	closemessage
 	applymovement 2, Movement_1A75E9
 	waitmovement 0
-	loadword 0, gUnknown_81A0F40
-	callstd 4
+	msgbox gUnknown_81A0F40
 	applymovement 2, Movement_1A75ED
 	waitmovement 0
 	applymovement 255, Movement_1A75E9
 	waitmovement 0
-	loadword 0, gUnknown_81A0FB1
-	callstd 4
+	msgbox gUnknown_81A0FB1
 	giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, BGM_FRLG_ME_KEYITEM
 	additem ITEM_METEORITE, 1
 	applymovement 3, Movement_1A75ED
 	waitmovement 0
-	loadword 0, gUnknown_81A1113
-	callstd 4
+	msgbox gUnknown_81A1113
 	additem ITEM_TRI_PASS, 1
 	giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, BGM_FRLG_ME_KEYITEM
-	loadword 0, gUnknown_81A1150
-	callstd 4
+	msgbox gUnknown_81A1150
 	compare_var_to_value VAR_0x4058, 2
 	call_if 4, EventScript_170E46
 	compare_var_to_value VAR_0x4058, 2
 	call_if 0, EventScript_170E58
 	setflag FLAG_0x845
-	loadword 0, gUnknown_81A1230
-	callstd 4
+	msgbox gUnknown_81A1230
 	closemessage
 	applymovement 2, Movement_1A75E9
 	waitmovement 0
@@ -141,13 +129,11 @@ EventScript_170CB1:: @ 8170CB1
 	end
 
 EventScript_170E34:: @ 8170E34
-	loadword 0, gUnknown_81A0DE8
-	callstd 4
+	msgbox gUnknown_81A0DE8
 	return
 
 EventScript_170E3D:: @ 8170E3D
-	loadword 0, gUnknown_81A0DAC
-	callstd 4
+	msgbox gUnknown_81A0DAC
 	return
 
 EventScript_170E46:: @ 8170E46
@@ -208,16 +194,14 @@ OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D
 	lock
 	checkflag FLAG_0x2A1
 	goto_if 1, EventScript_170EB1
-	loadword 0, gUnknown_81A1266
-	callstd 4
+	msgbox gUnknown_81A1266
 	release
 	end
 
 EventScript_170EB1:: @ 8170EB1
 	applymovement 2, Movement_1A75E1
 	waitmovement 0
-	loadword 0, gUnknown_81A128C
-	callstd 4
+	msgbox gUnknown_81A128C
 	release
 	end
 
@@ -241,8 +225,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
 	goto_if 1, EventScript_1710FC
 	compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
 	goto_if 1, EventScript_171134
-	loadword 0, gUnknown_81A1321
-	callstd 4
+	msgbox gUnknown_81A1321
 	closemessage
 	applymovement 3, Movement_1A75E5
 	waitmovement 0
@@ -250,8 +233,7 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
 	end
 
 EventScript_170F35:: @ 8170F35
-	loadword 0, gUnknown_81A1EBD
-	callstd 4
+	msgbox gUnknown_81A1EBD
 	random 3
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_170F6D
@@ -260,8 +242,7 @@ EventScript_170F35:: @ 8170F35
 	setvar VAR_0x8004, 13
 	setvar VAR_0x8005, 5
 	special SetFlavorTextFlagFromSpecialVars
-	loadword 0, gUnknown_81A2076
-	callstd 4
+	msgbox gUnknown_81A2076
 	release
 	end
 
@@ -269,8 +250,7 @@ EventScript_170F6D:: @ 8170F6D
 	setvar VAR_0x8004, 13
 	setvar VAR_0x8005, 3
 	special SetFlavorTextFlagFromSpecialVars
-	loadword 0, gUnknown_81A1EF3
-	callstd 4
+	msgbox gUnknown_81A1EF3
 	release
 	end
 
@@ -278,14 +258,12 @@ EventScript_170F84:: @ 8170F84
 	setvar VAR_0x8004, 13
 	setvar VAR_0x8005, 4
 	special SetFlavorTextFlagFromSpecialVars
-	loadword 0, gUnknown_81A1F7C
-	callstd 4
+	msgbox gUnknown_81A1F7C
 	release
 	end
 
 EventScript_170F9B:: @ 8170F9B
-	loadword 0, gUnknown_81A1E39
-	callstd 4
+	msgbox gUnknown_81A1E39
 	release
 	end
 
@@ -297,16 +275,14 @@ EventScript_170FA5:: @ 8170FA5
 	waitfanfare
 	call EventScript_1A6675
 	removeitem ITEM_SAPPHIRE, 1
-	loadword 0, gUnknown_81A1C4E
-	callstd 4
+	msgbox gUnknown_81A1C4E
 	closemessage
 	applymovement 3, Movement_171142
 	waitmovement 0
 	playse SE_N
 	call EventScript_170C2C
 	special DrawWholeMapView
-	loadword 0, gUnknown_81A1D45
-	callstd 4
+	msgbox gUnknown_81A1D45
 	closemessage
 	delay 60
 	applymovement 3, Movement_17113E
@@ -318,12 +294,10 @@ EventScript_170FA5:: @ 8170FA5
 	playse SE_PC_ON
 	call EventScript_170C36
 	special DrawWholeMapView
-	loadword 0, gUnknown_81A1D59
-	callstd 4
+	msgbox gUnknown_81A1D59
 	applymovement 3, Movement_1A75E1
 	waitmovement 0
-	loadword 0, gUnknown_81A1D7D
-	callstd 4
+	msgbox gUnknown_81A1D7D
 	special sub_810B82C
 	setflag FLAG_0x844
 	setflag FLAG_0x05C
@@ -334,14 +308,12 @@ EventScript_170FA5:: @ 8170FA5
 	end
 
 EventScript_17103A:: @ 817103A
-	loadword 0, gUnknown_81A1BB7
-	callstd 4
+	msgbox gUnknown_81A1BB7
 	release
 	end
 
 EventScript_171044:: @ 8171044
-	loadword 0, gUnknown_81A197E
-	callstd 4
+	msgbox gUnknown_81A197E
 	textcolor 3
 	playfanfare MUS_ME_WAZA
 	message Text_1A198D
@@ -357,24 +329,21 @@ EventScript_171044:: @ 8171044
 	delay 30
 	applymovement 3, Movement_1A75E1
 	waitmovement 0
-	loadword 0, gUnknown_81A19AA
-	callstd 5
+	msgbox gUnknown_81A19AA, 5
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_171099
 	goto EventScript_1710B2
 	end
 
 EventScript_171099:: @ 8171099
-	loadword 0, gUnknown_81A1A08
-	callstd 5
+	msgbox gUnknown_81A1A08, 5
 	compare_var_to_value VAR_RESULT, 0
 	goto_if 1, EventScript_171099
 	goto EventScript_1710B2
 	end
 
 EventScript_1710B2:: @ 81710B2
-	loadword 0, gUnknown_81A1A3F
-	callstd 4
+	msgbox gUnknown_81A1A3F
 	removeitem ITEM_RUBY, 1
 	removeitem ITEM_TRI_PASS, 1
 	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
@@ -394,30 +363,25 @@ EventScript_1710B2:: @ 81710B2
 	end
 
 EventScript_1710F2:: @ 81710F2
-	loadword 0, gUnknown_81A1896
-	callstd 4
+	msgbox gUnknown_81A1896
 	release
 	end
 
 EventScript_1710FC:: @ 81710FC
-	loadword 0, gUnknown_81A169B
-	callstd 4
+	msgbox gUnknown_81A169B
 	applymovement 3, Movement_1A75E9
 	waitmovement 0
-	loadword 0, gUnknown_81A1723
-	callstd 4
+	msgbox gUnknown_81A1723
 	applymovement 3, Movement_1A75E1
 	waitmovement 0
-	loadword 0, gUnknown_81A17DF
-	callstd 4
+	msgbox gUnknown_81A17DF
 	setvar VAR_0x407F, 1
 	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
 	release
 	end
 
 EventScript_171134:: @ 8171134
-	loadword 0, gUnknown_81A15EC
-	callstd 4
+	msgbox gUnknown_81A15EC
 	release
 	end
 
@@ -436,13 +400,11 @@ Movement_171142:: @ 8171142
 	step_end
 
 OneIsland_PokemonCenter_1F_EventScript_171148:: @ 8171148
-	loadword 0, gUnknown_81A20D5
-	callstd 2
+	msgbox gUnknown_81A20D5, 2
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151
-	loadword 0, gUnknown_81A212D
-	callstd 2
+	msgbox gUnknown_81A212D, 2
 	end
 
 OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A
@@ -450,14 +412,12 @@ OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A
 	faceplayer
 	checkflag FLAG_0x844
 	goto_if 1, EventScript_17116F
-	loadword 0, gUnknown_81A218D
-	callstd 4
+	msgbox gUnknown_81A218D
 	release
 	end
 
 EventScript_17116F:: @ 817116F
-	loadword 0, gUnknown_81A21D0
-	callstd 4
+	msgbox gUnknown_81A21D0
 	release
 	end
 
@@ -467,20 +427,17 @@ OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179
 	goto_if 1, EventScript_1711A0
 	checkflag FLAG_0x2A1
 	goto_if 1, EventScript_171196
-	loadword 0, gUnknown_81A223F
-	callstd 4
+	msgbox gUnknown_81A223F
 	releaseall
 	end
 
 EventScript_171196:: @ 8171196
-	loadword 0, gUnknown_81A2286
-	callstd 4
+	msgbox gUnknown_81A2286
 	releaseall
 	end
 
 EventScript_1711A0:: @ 81711A0
-	loadword 0, gUnknown_81A22CB
-	callstd 4
+	msgbox gUnknown_81A22CB
 	releaseall
 	end
 
@@ -513,8 +470,7 @@ EventScript_1711DA:: @ 81711DA
 	playse SE_PIN
 	applymovement 2, Movement_1A75DB
 	waitmovement 0
-	loadword 0, gUnknown_81A13B8
-	callstd 4
+	msgbox gUnknown_81A13B8
 	closemessage
 	compare_var_to_value VAR_0x4001, 1
 	call_if 1, EventScript_1712E4
@@ -525,20 +481,16 @@ EventScript_1711DA:: @ 81711DA
 	compare_var_to_value VAR_0x4001, 4
 	call_if 1, EventScript_171305
 	delay 10
-	loadword 0, gUnknown_81A13CB
-	callstd 4
+	msgbox gUnknown_81A13CB
 	applymovement 255, Movement_1A75ED
 	waitmovement 0
-	loadword 0, gUnknown_81A1431
-	callstd 4
+	msgbox gUnknown_81A1431
 	applymovement 2, Movement_1A75ED
 	waitmovement 0
 	applymovement 3, Movement_1A75E9
 	waitmovement 0
-	loadword 0, gUnknown_81A1470
-	callstd 4
-	loadword 0, gUnknown_81A14E1
-	callstd 4
+	msgbox gUnknown_81A1470
+	msgbox gUnknown_81A14E1
 	closemessage
 	applymovement 2, Movement_1A75E7
 	waitmovement 0
@@ -546,8 +498,7 @@ EventScript_1711DA:: @ 81711DA
 	applymovement 255, Movement_1A75EB
 	waitmovement 0
 	delay 15
-	loadword 0, gUnknown_81A14FB
-	callstd 4
+	msgbox gUnknown_81A14FB
 	closemessage
 	applymovement 2, Movement_1A75ED
 	waitmovement 0
@@ -556,8 +507,7 @@ EventScript_1711DA:: @ 81711DA
 	waitmovement 0
 	applymovement 255, Movement_1A75ED
 	waitmovement 0
-	loadword 0, gUnknown_81A1574
-	callstd 4
+	msgbox gUnknown_81A1574
 	closemessage
 	delay 25
 	applymovement 255, Movement_171326