diff options
Diffstat (limited to 'maps/Route10Pokecenter1F.asm')
| -rw-r--r-- | maps/Route10Pokecenter1F.asm | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 4a75da2ec..ecd56522d 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE10POKECENTER1F_NURSE const ROUTE10POKECENTER1F_GENTLEMAN const ROUTE10POKECENTER1F_GYM_GUY const ROUTE10POKECENTER1F_COOLTRAINER_F Route10Pokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x188bd4: jumpstd pokecenternurse @@ -81,24 +79,19 @@ Route10Pokecenter1FCooltrainerFText: done Route10Pokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_10_NORTH - warp_def 4, 7, 1, ROUTE_10_NORTH - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 - object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 - object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 - object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, ROUTE_10_NORTH, 1 + warp_event 4, 7, ROUTE_10_NORTH, 1 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x188bd4, -1 + object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1 + object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x188bda, -1 + object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1 |