summaryrefslogtreecommitdiff
path: root/data/maps/PokemonMansion_B1F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/PokemonMansion_B1F/scripts.inc')
-rw-r--r--data/maps/PokemonMansion_B1F/scripts.inc17
1 files changed, 8 insertions, 9 deletions
diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc
index 3baba4c34..d1641f28a 100644
--- a/data/maps/PokemonMansion_B1F/scripts.inc
+++ b/data/maps/PokemonMansion_B1F/scripts.inc
@@ -1,10 +1,9 @@
PokemonMansion_B1F_MapScripts:: @ 81622FC
- map_script 1, PokemonMansion_B1F_MapScript1_162302
+ map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_B1F_OnLoad
.byte 0
-PokemonMansion_B1F_MapScript1_162302:: @ 8162302
- checkflag FLAG_POKEMON_MANSION_SWITCH_STATE
- call_if TRUE, EventScript_1A7F4C
+PokemonMansion_B1F_OnLoad:: @ 8162302
+ call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, EventScript_1A7F4C
end
PokemonMansion_B1F_EventScript_16230C:: @ 816230C
@@ -18,15 +17,15 @@ PokemonMansion_B1F_EventScript_16230C:: @ 816230C
end
PokemonMansion_B1F_EventScript_162320:: @ 8162320
- msgbox gUnknown_8177798, 3
+ msgbox gUnknown_8177798, MSGBOX_SIGN
end
PokemonMansion_B1F_EventScript_162329:: @ 8162329
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_BURGLAR_LEWIS, 0, Text_1776C0, Text_1776D7
- msgbox gUnknown_81776DE, 6
+ trainerbattle_single TRAINER_BURGLAR_LEWIS, Text_1776C0, Text_1776D7
+ msgbox gUnknown_81776DE, MSGBOX_AUTOCLOSE
end
PokemonMansion_B1F_EventScript_162340:: @ 8162340
- trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_IVAN, 0, Text_177720, Text_177757
- msgbox gUnknown_817776A, 6
+ trainerbattle_single TRAINER_SCIENTIST_IVAN, Text_177720, Text_177757
+ msgbox gUnknown_817776A, MSGBOX_AUTOCLOSE
end