diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-01 12:40:58 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-01 13:03:21 -0500 |
| commit | fcfe77bc3db73afd2001c21ec9cc1cfb1beca20e (patch) | |
| tree | 2fe20a614851089b0e22cc2dc0164ee40447ebb6 /maps/AzaleaTown.asm | |
| parent | 936a170e0da19cb5bb2ccc325a43a28690230098 (diff) | |
Meaningful scene constant names
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
Diffstat (limited to 'maps/AzaleaTown.asm')
| -rw-r--r-- | maps/AzaleaTown.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index ef9a68221..834a4fd1d 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -14,9 +14,9 @@ AzaleaTown_MapScripts: db 3 ; scene scripts - scene_script .DummyScene0 ; SCENE_AZALEATOWN_0 - scene_script .DummyScene1 ; SCENE_AZALEATOWN_1 - scene_script .DummyScene2 ; SCENE_AZALEATOWN_2 + scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING + scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE + scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .Flypoint @@ -100,7 +100,7 @@ AzaleaTownRivalBattleScript: applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement playsound SFX_EXIT_BUILDING disappear AZALEATOWN_SILVER - setscene SCENE_AZALEATOWN_0 + setscene SCENE_AZALEATOWN_NOTHING waitsfx playmapmusic end @@ -168,7 +168,7 @@ AzaleaTownCelebiScene: setflag ENGINE_FOREST_IS_RESTLESS clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - setscene SCENE_AZALEATOWN_0 + setscene SCENE_AZALEATOWN_NOTHING closetext end @@ -467,9 +467,9 @@ AzaleaTown_MapEvents: warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE db 3 ; coord events - coord_event 5, 10, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene1 - coord_event 5, 11, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene2 - coord_event 9, 6, SCENE_AZALEATOWN_2, AzaleaTownCelebiScene + coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 + coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2 + coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene db 9 ; bg events bg_event 19, 9, BGEVENT_READ, AzaleaTownSign |