diff options
Diffstat (limited to 'maps/FuchsiaCity.asm')
| -rw-r--r-- | maps/FuchsiaCity.asm | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 34a636aaf..0d44b0e8f 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const FUCHSIACITY_YOUNGSTER const FUCHSIACITY_POKEFAN_M const FUCHSIACITY_TEACHER const FUCHSIACITY_FRUIT_TREE FuchsiaCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -125,40 +123,35 @@ NoLitteringSignText: done FuchsiaCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 11 - warp_def 5, 13, 2, FUCHSIA_MART - warp_def 22, 13, 1, SAFARI_ZONE_MAIN_OFFICE - warp_def 8, 27, 1, FUCHSIA_GYM - warp_def 11, 27, 1, FUCHSIA_BILL_SPEECH_HOUSE - warp_def 19, 27, 1, FUCHSIA_POKECENTER_1F - warp_def 27, 27, 1, SAFARI_ZONE_WARDENS_HOME - warp_def 18, 3, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA - warp_def 37, 22, 1, ROUTE_15_FUCHSIA_GATE - warp_def 37, 23, 2, ROUTE_15_FUCHSIA_GATE - warp_def 7, 35, 1, ROUTE_19_FUCHSIA_GATE - warp_def 8, 35, 2, ROUTE_19_FUCHSIA_GATE - -.CoordEvents: - db 0 - -.BGEvents: - db 8 + db 0, 0 ; filler + + db 11 ; warp events + warp_event 5, 13, FUCHSIA_MART, 2 + warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1 + warp_event 8, 27, FUCHSIA_GYM, 1 + warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1 + warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1 + warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1 + warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; inaccessible + warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1 + warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2 + warp_event 7, 35, ROUTE_19_FUCHSIA_GATE, 1 + warp_event 8, 35, ROUTE_19_FUCHSIA_GATE, 2 + + db 0 ; coord events + + db 8 ; bg events bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign - bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign + bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign bg_event 27, 29, BGEVENT_READ, WardensHomeSign - bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign + bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign bg_event 13, 15, BGEVENT_READ, NoLitteringSign bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign - bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign + bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign -.ObjectEvents: - db 4 + db 4 ; object events object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 - object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 + object_event 13, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 object_event 16, 14, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 - object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 + object_event 8, 1, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 |