diff options
Diffstat (limited to 'maps/Route32Pokecenter1F.asm')
| -rw-r--r-- | maps/Route32Pokecenter1F.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 5bedc7853..7d4571668 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -1,14 +1,12 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE32POKECENTER1F_NURSE const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F Route32Pokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks NurseScript_0x69b52: jumpstd pokecenternurse @@ -95,23 +93,18 @@ Route32Pokecenter1FCooltrainerFText: done Route32Pokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 1, ROUTE_32 - warp_def 4, 7, 1, ROUTE_32 - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 3 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 - object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 - object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, ROUTE_32, 1 + warp_event 4, 7, ROUTE_32, 1 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 3 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x69b52, -1 + object_event 1, 4, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x69b55, -1 + object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32Pokecenter1FCooltrainerFScript, -1 |