diff options
Diffstat (limited to 'maps/FuchsiaCity.asm')
-rw-r--r-- | maps/FuchsiaCity.asm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 13af9ee23..f13245e68 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -10,8 +10,6 @@ FuchsiaCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -45,7 +43,7 @@ SafariZoneClosedSign: NoLitteringSign: jumptext NoLitteringSignText -FuchsiaCityPokeCenterSign: +FuchsiaCityPokecenterSign: jumpstd pokecentersign FuchsiaCityMartSign: @@ -155,12 +153,12 @@ FuchsiaCity_MapEventHeader: signpost 29, 27, SIGNPOST_READ, WardensHomeSign signpost 5, 17, SIGNPOST_READ, SafariZoneClosedSign signpost 15, 13, SIGNPOST_READ, NoLitteringSign - signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokeCenterSign + signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokecenterSign signpost 13, 6, SIGNPOST_READ, FuchsiaCityMartSign .PersonEvents: db 4 - person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 - person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 - person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 + person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1 + person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, FuchsiaCityPokefanM, -1 + person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FuchsiaCityTeacher, -1 person_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1 |