diff options
Diffstat (limited to 'data/maps/PokemonLeague_BrunosRoom/scripts.inc')
| -rw-r--r-- | data/maps/PokemonLeague_BrunosRoom/scripts.inc | 72 |
1 files changed, 33 insertions, 39 deletions
diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 6cc4a23a4..66c688505 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -11,10 +11,10 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A end PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 - checkflag FLAG_0x4B9 - call_if 1, EventScript_1626C0 - compare_var_to_value VAR_0x4068, 2 - call_if 1, EventScript_1626BA + checkflag FLAG_DEFEATED_BRUNO + call_if TRUE, EventScript_1626C0 + compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2 + call_if eq, EventScript_1626BA end EventScript_1626BA:: @ 81626BA @@ -34,41 +34,35 @@ EventScript_1626D0:: @ 81626D0 end PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5 - map_script_2 VAR_0x4068, 1, EventScript_1626DF + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, EventScript_1626DF .2byte 0 EventScript_1626DF:: @ 81626DF lockall call EventScript_1A751F - setvar VAR_0x4068, 2 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 2 releaseall end PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC lock faceplayer - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x4B9 - goto_if_eq EventScript_162779 - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag FLAG_0x82C - call_if 0, EventScript_162751 - checkflag FLAG_0x82C - call_if 1, EventScript_16275A - setflag FLAG_0x003 - setflag FLAG_0x005 - checkflag FLAG_0x844 - call_if 0, EventScript_162763 - checkflag FLAG_0x844 - call_if 1, EventScript_16276E - clearflag FLAG_0x005 + famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + checkflag FLAG_DEFEATED_BRUNO + goto_if TRUE, EventScript_162779 + famechecker FAMECHECKER_BRUNO, 0 + famechecker FAMECHECKER_BRUNO, 1 + checkflag FLAG_SYS_GAME_CLEAR + call_if FALSE, EventScript_162751 + checkflag FLAG_SYS_GAME_CLEAR + call_if TRUE, EventScript_16275A + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if FALSE, EventScript_162763 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if TRUE, EventScript_16276E + clearflag FLAG_TEMP_5 goto EventScript_1627B0 EventScript_162750:: @ 8162750 @@ -83,40 +77,40 @@ EventScript_16275A:: @ 816275A return EventScript_162763:: @ 8162763 - trainerbattle 3, 411, 0, Text_178409 + trainerbattle 3, TRAINER_ELITE_FOUR_BRUNO, 0, Text_178409 return EventScript_16276E:: @ 816276E - trainerbattle 3, 736, 0, Text_178409 + trainerbattle 3, TRAINER_ELITE_FOUR_BRUNO_2, 0, Text_178409 return EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA + call_if eq, EventScript_1627FA compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF + call_if eq, EventScript_1627EF compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 release end EventScript_1627B0:: @ 81627B0 - setflag FLAG_0x4B9 + setflag FLAG_DEFEATED_BRUNO call EventScript_1A7506 msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA + call_if eq, EventScript_1627FA compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF + call_if eq, EventScript_1627EF compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 release end |