diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-31 23:16:51 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-31 23:16:51 -0500 |
| commit | a17623d96b25d6733846f5774fd10bb317862b43 (patch) | |
| tree | fe13b09b13f1eb102c31dd31ce0cc8d0c2d6ae02 /maps/Route29.asm | |
| parent | 7d6e82ef1c8c3eccdc630e85af1d687eaa612ad6 (diff) | |
Add scene ID constants (TODO: meaningful names)
Diffstat (limited to 'maps/Route29.asm')
| -rw-r--r-- | maps/Route29.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route29.asm b/maps/Route29.asm index 39fc0c960..995e4735d 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -10,8 +10,8 @@ Route29_MapScripts: db 2 ; scene scripts - scene_script .DummyScene0 - scene_script .DummyScene1 + scene_script .DummyScene0 ; SCENE_ROUTE29_0 + scene_script .DummyScene1 ; SCENE_ROUTE29_1 db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .Tuscany @@ -57,7 +57,7 @@ Route29Tutorial1: writetext CatchingTutorialDebriefText waitbutton closetext - setscene 0 + setscene SCENE_ROUTE29_0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -82,7 +82,7 @@ Route29Tutorial2: writetext CatchingTutorialDebriefText waitbutton closetext - setscene 0 + setscene SCENE_ROUTE29_0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -91,7 +91,7 @@ Script_RefusedTutorial1: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b - setscene 0 + setscene SCENE_ROUTE29_0 end Script_RefusedTutorial2: @@ -99,7 +99,7 @@ Script_RefusedTutorial2: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b - setscene 0 + setscene SCENE_ROUTE29_0 end CatchingTutorialDudeScript: @@ -420,8 +420,8 @@ Route29_MapEvents: warp_event 27, 1, 3, ROUTE_29_ROUTE_46_GATE db 2 ; coord events - coord_event 53, 8, 1, Route29Tutorial1 - coord_event 53, 9, 1, Route29Tutorial2 + coord_event 53, 8, SCENE_ROUTE29_1, Route29Tutorial1 + coord_event 53, 9, SCENE_ROUTE29_1, Route29Tutorial2 db 2 ; bg events bg_event 51, 7, BGEVENT_READ, Route29Sign1 |