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/TeamRocketBaseB3F.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/TeamRocketBaseB3F.asm')
| -rw-r--r-- | maps/TeamRocketBaseB3F.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 176319e87..1ba793c5c 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -16,10 +16,10 @@ TeamRocketBaseB3F_MapScripts: db 4 ; scene scripts - scene_script .LanceGetsPassword ; SCENE_TEAMROCKETBASEB3F_0 - scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_1 - scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_2 - scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_3 + scene_script .LanceGetsPassword ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER + scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS + scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_NOTHING db 1 ; callbacks callback MAPCALLBACK_TILES, .CheckGiovanniDoor @@ -58,7 +58,7 @@ LanceGetPasswordScript: closetext applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c disappear TEAMROCKETBASEB3F_LANCE - setscene SCENE_TEAMROCKETBASEB3F_1 + setscene SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER end RocketBaseRival: @@ -77,7 +77,7 @@ RocketBaseRival: applymovement PLAYER, RocketBaseRivalShovesPlayerMovement applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement disappear TEAMROCKETBASEB3F_SILVER - setscene SCENE_TEAMROCKETBASEB3F_2 + setscene SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS special RestartMapMusic end @@ -114,7 +114,7 @@ UnknownScript_0x6e056: playsound SFX_TACKLE applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 disappear TEAMROCKETBASEB3F_ROCKET1 - setscene SCENE_TEAMROCKETBASEB3F_3 + setscene SCENE_TEAMROCKETBASEB3F_NOTHING end RocketBaseMurkrow: @@ -573,9 +573,9 @@ TeamRocketBaseB3F_MapEvents: warp_event 27, 14, 5, TEAM_ROCKET_BASE_B2F db 3 ; coord events - coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_2, UnknownScript_0x6e04b - coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_2, UnknownScript_0x6e052 - coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_1, RocketBaseRival + coord_event 10, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e04b + coord_event 11, 8, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS, UnknownScript_0x6e052 + coord_event 8, 10, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER, RocketBaseRival db 10 ; bg events bg_event 10, 9, BGEVENT_IFNOTSET, TeamRocketBaseB3FLockedDoor |