diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 19:16:45 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 19:16:57 -0500 |
| commit | 2e5bf6c9ef4f4406b1dd725e91a88cbdd10ad5c2 (patch) | |
| tree | efaa59d9de2fa1df7621d859b6c0f2ebc91ebd8b /data/maps/PokemonLeague_ChampionsRoom/scripts.inc | |
| parent | 31d31d326034fde26dedaf2dadb1c608e00fb92f (diff) | |
Use map_script constants, name unique map_script labels
Diffstat (limited to 'data/maps/PokemonLeague_ChampionsRoom/scripts.inc')
| -rw-r--r-- | data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 449f0f741..4dfdf4e94 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -1,10 +1,10 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 - map_script 4, PokemonLeague_ChampionsRoom_MapScript1_162B5D - map_script 5, PokemonLeague_ChampionsRoom_MapScript2_162AF2 - map_script 2, PokemonLeague_ChampionsRoom_MapScript3_162B6C + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_ChampionsRoom_OnFrame .byte 0 -PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 +PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 compare VAR_STARTER_MON, 2 @@ -40,7 +40,7 @@ EventScript_162B57:: @ 8162B57 setvar VAR_0x4001, 1 return -PokemonLeague_ChampionsRoom_MapScript1_162B5D:: @ 8162B5D +PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D map_script_2 VAR_0x4001, 0, EventScript_162B67 .2byte 0 @@ -48,7 +48,7 @@ EventScript_162B67:: @ 8162B67 turnobject 255, 2 end -PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C +PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C map_script_2 VAR_0x4001, 0, EventScript_162B76 .2byte 0 |