diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 62215bd3d..13af9ee23 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -18,14 +18,14 @@ FuchsiaCity_MapScriptHeader: setflag ENGINE_FLYPOINT_FUCHSIA return -YoungsterScript_0x194b22: - jumptextfaceplayer UnknownText_0x194b45 +FuchsiaCityYoungster: + jumptextfaceplayer FuchsiaCityYoungsterText -PokefanMScript_0x194b25: - jumptextfaceplayer UnknownText_0x194b83 +FuchsiaCityPokefanM: + jumptextfaceplayer FuchsiaCityPokefanMText -TeacherScript_0x194b28: - jumptextfaceplayer UnknownText_0x194bd3 +FuchsiaCityTeacher: + jumptextfaceplayer FuchsiaCityTeacherText FuchsiaCitySign: jumptext FuchsiaCitySignText @@ -51,10 +51,10 @@ FuchsiaCityPokeCenterSign: FuchsiaCityMartSign: jumpstd martsign -FruitTreeScript_0x194b43: +FuchsiaCityFruitTree: fruittree FRUITTREE_FUCHSIA_CITY -UnknownText_0x194b45: +FuchsiaCityYoungsterText: text "One of the ELITE" line "FOUR used to be" @@ -62,7 +62,7 @@ UnknownText_0x194b45: line "FUCHSIA's GYM." done -UnknownText_0x194b83: +FuchsiaCityPokefanMText: text "KOGA's daughter" line "succeeded him as" @@ -71,7 +71,7 @@ UnknownText_0x194b83: cont "the ELITE FOUR." done -UnknownText_0x194bd3: +FuchsiaCityTeacherText: text "The SAFARI ZONE is" line "closed… It's sad," @@ -160,7 +160,7 @@ FuchsiaCity_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_YOUNGSTER, 18, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x194b22, -1 - person_event SPRITE_POKEFAN_M, 8, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x194b25, -1 - person_event SPRITE_TEACHER, 14, 16, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, TeacherScript_0x194b28, -1 - person_event SPRITE_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x194b43, -1 + 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_FRUIT_TREE, 1, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FuchsiaCityFruitTree, -1