diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /maps/Route29.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'maps/Route29.asm')
| -rw-r--r-- | maps/Route29.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/Route29.asm b/maps/Route29.asm index cd91a1f3e..6c7239d92 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE29_TUSCANY const ROUTE29_POKE_BALL -Route29_MapScriptHeader: +Route29_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -16,7 +16,7 @@ Route29_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_OBJECTS, .Tuscany + callback MAPCALLBACK_OBJECTS, .Tuscany .DummyScene0: end @@ -59,7 +59,7 @@ Route29Tutorial1: writetext CatchingTutorialDebriefText waitbutton closetext - setscene $0 + setscene 0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -84,7 +84,7 @@ Route29Tutorial2: writetext CatchingTutorialDebriefText waitbutton closetext - setscene $0 + setscene 0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end @@ -93,7 +93,7 @@ Script_RefusedTutorial1: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b - setscene $0 + setscene 0 end Script_RefusedTutorial2: @@ -101,14 +101,14 @@ Script_RefusedTutorial2: waitbutton closetext applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b - setscene $0 + setscene 0 end CatchingTutorialDudeScript: faceplayer opentext checkcode VAR_BOXSPACE - if_equal $0, .BoxFull + if_equal 0, .BoxFull checkevent EVENT_LEARNED_TO_CATCH_POKEMON iftrue .BoxFull checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM @@ -324,7 +324,7 @@ Route29FisherText: line "progress." done -; possibly unused +; unused Text_WaitingForDay: text "I'm waiting for" line "#MON that" @@ -415,13 +415,13 @@ Route29Sign2Text: line "NEW BARK TOWN" done -Route29_MapEventHeader: +Route29_MapEvents: ; filler db 0, 0 .Warps: db 1 - warp_def 27, 1, 3, ROUTE_29_46_GATE + warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE .CoordEvents: db 2 |