diff options
Diffstat (limited to 'maps/Route40.asm')
| -rw-r--r-- | maps/Route40.asm | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/maps/Route40.asm b/maps/Route40.asm index 77f433c81..53ce2f959 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -13,11 +13,9 @@ const_value set 2 const ROUTE40_STANDING_YOUNGSTER Route40_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .MonicaCallback .MonicaCallback: @@ -32,7 +30,7 @@ Route40_MapScripts: return TrainerSwimmerfElaine: - trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script + trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script .Script: end_if_just_battled @@ -43,7 +41,7 @@ TrainerSwimmerfElaine: end TrainerSwimmerfPaula: - trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script + trainer SWIMMERF, PAULA, EVENT_BEAT_SWIMMERF_PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script .Script: end_if_just_battled @@ -54,7 +52,7 @@ TrainerSwimmerfPaula: end TrainerSwimmermSimon: - trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script + trainer SWIMMERM, SIMON, EVENT_BEAT_SWIMMERM_SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script .Script: end_if_just_battled @@ -65,7 +63,7 @@ TrainerSwimmermSimon: end TrainerSwimmermRandall: - trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script + trainer SWIMMERM, RANDALL, EVENT_BEAT_SWIMMERM_RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script .Script: end_if_just_battled @@ -79,7 +77,7 @@ Route40Lass1Script: jumptextfaceplayer Route40Lass1Text PokefanMScript_0x1a61c7: - special Special_Mobile_DummyReturnFalse + special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x1a646a @@ -135,7 +133,7 @@ Route40Rock: jumpstd smashrock Route40HiddenHyperPotion: - hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_ROUTE_40_HIDDEN_HYPER_POTION MovementData_0x1a621c: step RIGHT @@ -338,23 +336,18 @@ Route40SignText: done Route40_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE + db 1 ; warp events + warp_event 9, 5, 1, ROUTE_40_BATTLE_TOWER_GATE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 + db 2 ; bg events bg_event 14, 10, BGEVENT_READ, Route40Sign bg_event 7, 8, BGEVENT_ITEM, Route40HiddenHyperPotion -.ObjectEvents: - db 12 + db 12 ; object events object_event 14, 15, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerSwimmermSimon, -1 object_event 18, 30, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerSwimmermRandall, -1 object_event 3, 19, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerSwimmerfElaine, -1 |