summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-22 16:30:13 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-22 16:30:13 -0400
commit61847b3596807fd5789c800139af624bcac32e7a (patch)
tree084f9a798e73322f6c50ac3bea91b3d2c5594123 /maps
parente0d07fba3fbc5e5923d3f523afe386ad3fab1393 (diff)
Identify some more labels
Diffstat (limited to 'maps')
-rw-r--r--maps/Route27.asm8
-rw-r--r--maps/RuinsOfAlphOutside.asm8
2 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route27.asm b/maps/Route27.asm
index f6298137d..4bc974290 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -25,13 +25,13 @@ Route27_MapScripts:
FirstStepIntoKantoLeftScene:
turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
- applymovement ROUTE27_FISHER, MovementData_0x1a0a66
+ applymovement ROUTE27_FISHER, Route27FisherStepLeftTwiceMovement
sjump FirstStepIntoKantoScene_Continue
FirstStepIntoKantoRightScene:
turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
- applymovement ROUTE27_FISHER, MovementData_0x1a0a69
+ applymovement ROUTE27_FISHER, Route27FisherStepLeftOnceMovement
FirstStepIntoKantoScene_Continue:
turnobject PLAYER, RIGHT
opentext
@@ -305,12 +305,12 @@ Route27TMSolarbeam:
Route27RareCandy:
itemball RARE_CANDY
-MovementData_0x1a0a66:
+Route27FisherStepLeftTwiceMovement:
step LEFT
step LEFT
step_end
-MovementData_0x1a0a69:
+Route27FisherStepLeftOnceMovement:
step LEFT
step_end
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index d67d0424a..684d8d1e0 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -60,10 +60,10 @@ RuinsOfAlphOutsideScientistSceneContinue:
closetext
playmusic MUSIC_SHOW_ME_AROUND
follow RUINSOFALPHOUTSIDE_SCIENTIST, PLAYER
- applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x580ba
+ applymovement RUINSOFALPHOUTSIDE_SCIENTIST, RuinsOfAlphOutsideScientistWalkToLabMovement
disappear RUINSOFALPHOUTSIDE_SCIENTIST
stopfollow
- applymovement PLAYER, MovementData_0x580c5
+ applymovement PLAYER, RuinsOfAlphOutsidePlayerEnterLabMovement
setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
warpcheck
end
@@ -130,7 +130,7 @@ RuinsOfAlphSign:
RuinsOfAlphResearchCenterSign:
jumptext RuinsOfAlphResearchCenterSignText
-MovementData_0x580ba:
+RuinsOfAlphOutsideScientistWalkToLabMovement:
step RIGHT
step RIGHT
step RIGHT
@@ -143,7 +143,7 @@ MovementData_0x580ba:
step UP
step_end
-MovementData_0x580c5:
+RuinsOfAlphOutsidePlayerEnterLabMovement:
step UP
step_end