diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-04 18:15:38 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-04 18:15:38 -0400 |
| commit | 169470378aa890ecbb6a177183f080fcd54fec61 (patch) | |
| tree | 5038ff87369962e88fba92000103d3518986efe8 /maps/TeamRocketBaseB3F.asm | |
| parent | 836da09f4e4fc23ee863171845caef6280dcd7fe (diff) | |
Identify movement labels in map scripts
Diffstat (limited to 'maps/TeamRocketBaseB3F.asm')
| -rw-r--r-- | maps/TeamRocketBaseB3F.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 34c996feb..35061b6f5 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -51,12 +51,12 @@ LanceGetPasswordScript: pause 5 turnobject TEAMROCKETBASEB3F_MOLTRES, RIGHT pause 20 - applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a + applymovement TEAMROCKETBASEB3F_LANCE, RocketBaseLanceApproachesPlayerMovement opentext writetext LanceGetPasswordText waitbutton closetext - applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c + applymovement TEAMROCKETBASEB3F_LANCE, RocketBaseLanceLeavesMovement disappear TEAMROCKETBASEB3F_LANCE setscene SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER end @@ -75,7 +75,7 @@ RocketBaseRival: closetext playsound SFX_TACKLE applymovement PLAYER, RocketBaseRivalShovesPlayerMovement - applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeaveMovement + applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeavesMovement disappear TEAMROCKETBASEB3F_SILVER setscene SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS special RestartMapMusic @@ -85,11 +85,11 @@ TeamRocketBaseB3FRocketScript: jumptextfaceplayer TeamRocketBaseB3FRocketText RocketBaseBossLeft: - applymovement PLAYER, MovementData_0x6e133 + applymovement PLAYER, RocketBasePlayerApproachesBossLeftMovement sjump RocketBaseBoss RocketBaseBossRight: - applymovement PLAYER, MovementData_0x6e13a + applymovement PLAYER, RocketBasePlayerApproachesBossRightMovement RocketBaseBoss: pause 30 showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15 @@ -99,7 +99,7 @@ RocketBaseBoss: writetext ExecutiveM4BeforeText waitbutton closetext - applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142 + applymovement TEAMROCKETBASEB3F_ROCKET1, RocketBaseBossApproachesPlayerMovement winlosstext ExecutiveM4BeatenText, 0 setlasttalked TEAMROCKETBASEB3F_ROCKET1 loadtrainer EXECUTIVEM, EXECUTIVEM_4 @@ -110,9 +110,9 @@ RocketBaseBoss: writetext ExecutiveM4AfterText waitbutton closetext - applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144 + applymovement TEAMROCKETBASEB3F_ROCKET1, RocketBaseBossHitsTableMovement playsound SFX_TACKLE - applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 + applymovement TEAMROCKETBASEB3F_ROCKET1, RocketBaseBossLeavesMovement disappear TEAMROCKETBASEB3F_ROCKET1 setscene SCENE_TEAMROCKETBASEB3F_NOTHING end @@ -217,11 +217,11 @@ TeamRocketBaseB3FIceHeal: TeamRocketBaseB3FUltraBall: itemball ULTRA_BALL -MovementData_0x6e12a: +RocketBaseLanceApproachesPlayerMovement: step RIGHT step_end -MovementData_0x6e12c: +RocketBaseLanceLeavesMovement: step DOWN step LEFT step LEFT @@ -230,7 +230,7 @@ MovementData_0x6e12c: step LEFT step_end -MovementData_0x6e133: +RocketBasePlayerApproachesBossLeftMovement: step UP step UP step UP @@ -239,7 +239,7 @@ MovementData_0x6e133: turn_head UP step_end -MovementData_0x6e13a: +RocketBasePlayerApproachesBossRightMovement: step UP step UP step LEFT @@ -249,16 +249,16 @@ MovementData_0x6e13a: turn_head UP step_end -MovementData_0x6e142: +RocketBaseBossApproachesPlayerMovement: step DOWN step_end -MovementData_0x6e144: +RocketBaseBossHitsTableMovement: big_step RIGHT big_step RIGHT step_end -MovementData_0x6e147: +RocketBaseBossLeavesMovement: fix_facing fast_jump_step LEFT remove_fixed_facing @@ -300,7 +300,7 @@ RocketBaseRivalEnterMovement: step RIGHT step_end -RocketBaseRivalLeaveMovement: +RocketBaseRivalLeavesMovement: step LEFT step LEFT step UP |