From 0680bf99d30f8d290549ad5961985293f530acd9 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 28 Feb 2018 17:47:31 -0500 Subject: [PATCH] Label more map scripts --- maps/BillsFamilysHouse.asm | 30 +++++------ maps/CeladonGym.asm | 6 +-- maps/CeladonMansion3F.asm | 12 ++--- maps/CeladonMansionRoofHouse.asm | 12 ++--- maps/EcruteakCity.asm | 40 +++++++------- maps/FastShipB1F.asm | 30 +++++------ maps/FastShipCabins_NNW_NNE_NE.asm | 16 +++--- maps/FastShipCabins_SW_SSW_NW.asm | 14 ++--- maps/GoldenrodBikeShop.asm | 12 ++--- maps/GoldenrodCity.asm | 24 ++++----- maps/GoldenrodDeptStore4F.asm | 8 +-- maps/GoldenrodGym.asm | 12 ++--- maps/GoldenrodUndergroundWarehouse.asm | 4 +- maps/LancesRoom.asm | 6 +-- maps/LavRadioTower1F.asm | 24 ++++----- maps/MahoganyMart1F.asm | 32 +++++------ maps/MahoganyRedGyaradosSpeechHouse.asm | 22 ++++---- maps/MountMortarB1F.asm | 16 +++--- maps/OlivineCafe.asm | 16 +++--- maps/OlivineCity.asm | 24 ++++----- maps/OlivineHouseBeta.asm | 8 +-- maps/OlivineLighthouse6F.asm | 3 +- maps/PewterCity.asm | 16 +++--- maps/RadioTower1F.asm | 4 +- maps/RadioTower2F.asm | 14 ++--- maps/RadioTower3F.asm | 24 ++++----- maps/RadioTower4F.asm | 32 +++++------ maps/Route12SuperRodHouse.asm | 12 ++--- maps/Route16Gate.asm | 18 +++---- maps/Route17Route18Gate.asm | 18 +++---- maps/Route19.asm | 50 ++++++++--------- maps/Route24.asm | 4 +- maps/Route26HealHouse.asm | 4 +- maps/Route27.asm | 12 ++--- maps/Route29.asm | 12 ++--- maps/Route2NuggetHouse.asm | 20 +++---- maps/Route34IlexForestGate.asm | 28 +++++----- maps/Route36.asm | 12 ++--- maps/Route39Barn.asm | 8 +-- maps/Route40.asm | 12 ++--- maps/RuinsOfAlphKabutoChamber.asm | 6 +-- maps/RuinsOfAlphOutside.asm | 72 ++++++++++++------------- maps/SaffronMagnetTrainStation.asm | 16 +++--- maps/SilphCo1F.asm | 24 ++++----- maps/SlowpokeWellB2F.asm | 12 ++--- maps/SproutTower3F.asm | 8 +-- maps/UnionCave1F.asm | 7 +-- maps/VermilionCity.asm | 4 +- maps/VermilionPort.asm | 8 +-- maps/VioletNicknameSpeechHouse.asm | 8 +-- maps/WiseTriosRoom.asm | 8 +-- 51 files changed, 424 insertions(+), 420 deletions(-) diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index baf09246d..1c95dc68d 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -12,15 +12,15 @@ BillScript: faceplayer opentext checkevent EVENT_GOT_EEVEE - iftrue UnknownScript_0x54c1f + iftrue .GotEevee writetext UnknownText_0x54c74 yesorno - iffalse UnknownScript_0x54c19 + iffalse .Refused writetext UnknownText_0x54d3f buttonsound waitsfx checkcode VAR_PARTYCOUNT - ifequal PARTY_LENGTH, UnknownScript_0x54c13 + ifequal PARTY_LENGTH, .NoRoom writetext UnknownText_0x54dae playsound SFX_CAUGHT_MON waitsfx @@ -31,19 +31,19 @@ BillScript: closetext end -UnknownScript_0x54c13: +.NoRoom: writetext UnknownText_0x54e02 waitbutton closetext end -UnknownScript_0x54c19: +.Refused: writetext UnknownText_0x54e2d waitbutton closetext end -UnknownScript_0x54c1f: +.GotEevee: writetext UnknownText_0x54e42 waitbutton closetext @@ -53,13 +53,13 @@ BillsMomScript: faceplayer opentext checkevent EVENT_MET_BILL - iffalse UnknownScript_0x54c33 + iffalse .HaventMetBill writetext UnknownText_0x54ea8 waitbutton closetext end -UnknownScript_0x54c33: +.HaventMetBill: writetext UnknownText_0x54f4e waitbutton closetext @@ -69,33 +69,33 @@ BillsSisterScript: faceplayer opentext checkcellnum PHONE_BILL - iftrue UnknownScript_0x54c58 + iftrue .GotBillsNumber writetext UnknownText_0x54f9e askforphonenumber PHONE_BILL - ifequal PHONE_CONTACTS_FULL, UnknownScript_0x54c64 - ifequal PHONE_CONTACT_REFUSED, UnknownScript_0x54c5e + ifequal PHONE_CONTACTS_FULL, .NoRoom + ifequal PHONE_CONTACT_REFUSED, .Refused waitsfx addcellnum PHONE_BILL writetext UnknownText_0x54fd9 playsound SFX_REGISTER_PHONE_NUMBER waitsfx buttonsound -UnknownScript_0x54c58: ;0x54c58 +.GotBillsNumber: writetext UnknownText_0x55069 waitbutton closetext end -UnknownScript_0x54c5e: +.Refused: writetext UnknownText_0x54ff3 waitbutton closetext end -UnknownScript_0x54c64: +.NoRoom: writetext UnknownText_0x55046 buttonsound - jump UnknownScript_0x54c5e + jump .Refused BillsHouseBookshelf1: jumpstd picturebookshelf diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index ae4b397a8..4e33cb3f3 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -35,13 +35,13 @@ CeladonGymErikaScript: setflag ENGINE_RAINBOWBADGE .FightDone: checkevent EVENT_GOT_TM19_GIGA_DRAIN - iftrue UnknownScript_0x72aae + iftrue .GotGigaDrain writetext UnknownText_0x72cb0 buttonsound verbosegiveitem TM_GIGA_DRAIN - iffalse UnknownScript_0x72aae + iffalse .GotGigaDrain setevent EVENT_GOT_TM19_GIGA_DRAIN -UnknownScript_0x72aae: +.GotGigaDrain: writetext UnknownText_0x72d8f waitbutton closetext diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 8c4fc2371..85572da9a 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -14,12 +14,12 @@ CooltrainerMScript_0x71670: opentext writetext UnknownText_0x716ce checkcode VAR_DEXCAUGHT - ifgreater NUM_POKEMON - 2 - 1, UnknownScript_0x7167e ; ignore Mew and Celebi + ifgreater NUM_POKEMON - 2 - 1, .CompletedPokedex ; ignore Mew and Celebi waitbutton closetext end -UnknownScript_0x7167e: +.CompletedPokedex: buttonsound writetext UnknownText_0x71725 playsound SFX_DEX_FANFARE_230_PLUS @@ -37,21 +37,21 @@ GymGuyScript_0x71696: faceplayer opentext checkevent EVENT_ENABLE_DIPLOMA_PRINTING - iftrue UnknownScript_0x716a4 + iftrue .CanPrintDiploma writetext UnknownText_0x717b4 waitbutton closetext end -UnknownScript_0x716a4: +.CanPrintDiploma: writetext UnknownText_0x717d8 yesorno - iffalse UnknownScript_0x716b0 + iffalse .Refused special PrintDiploma closetext end -UnknownScript_0x716b0: +.Refused: writetext UnknownText_0x71830 waitbutton closetext diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 61157e619..c14ddc1fc 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -10,26 +10,26 @@ PharmacistScript_0x71afd: faceplayer opentext checkevent EVENT_GOT_TM03_CURSE - iftrue UnknownScript_0x71b21 + iftrue .GotCurse writetext UnknownText_0x71b27 buttonsound checktime NITE - iftrue UnknownScript_0x71b14 + iftrue .Night writetext UnknownText_0x71b4a waitbutton closetext end -UnknownScript_0x71b14: +.Night: writetext UnknownText_0x71ba3 buttonsound verbosegiveitem TM_CURSE - iffalse UnknownScript_0x71b25 + iffalse .NoRoom setevent EVENT_GOT_TM03_CURSE -UnknownScript_0x71b21: +.GotCurse: writetext UnknownText_0x71db3 waitbutton -UnknownScript_0x71b25: +.NoRoom: closetext end diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index a1c7d7474..fdc2bba86 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -26,37 +26,37 @@ EcruteakCityGramps2Script: EcruteakCityGramps3Script: jumptextfaceplayer EcruteakCityGramps3Text -EcruteakCityLassScript: - jumptextfaceplayer EcruteakCityLassText +EcruteakCityLass1Script: + jumptextfaceplayer EcruteakCityLass1Text -LassScript_0x1a4015: +EcruteakCityLass2Script: faceplayer opentext checkevent EVENT_RELEASED_THE_BEASTS - iftrue UnknownScript_0x1a4023 - writetext UnknownText_0x1a421a + iftrue .ReleasedBeasts + writetext EcruteakCityLass2Text waitbutton closetext end -UnknownScript_0x1a4023: - writetext UnknownText_0x1a4269 +.ReleasedBeasts: + writetext EcruteakCityLass2Text_ReleasedBeasts waitbutton closetext end -FisherScript_0x1a4029: +EcruteakCityFisherScript: faceplayer opentext checkevent EVENT_JASMINE_RETURNED_TO_GYM - iftrue UnknownScript_0x1a4037 - writetext UnknownText_0x1a42ac + iftrue .JasmineReturned + writetext EcruteakCityFisherText waitbutton closetext end -UnknownScript_0x1a4037: - writetext UnknownText_0x1a4325 +.JasmineReturned: + writetext EcruteakCityFisherText_JasmineReturned waitbutton closetext end @@ -132,7 +132,7 @@ EcruteakCityGramps2Text: cont "nice, I hear." done -EcruteakCityLassText: +EcruteakCityLass1Text: text "I'm going to prac-" line "tice at the DANCE" @@ -140,7 +140,7 @@ EcruteakCityLassText: line "join me?" done -UnknownText_0x1a421a: +EcruteakCityLass2Text: text "The tower that" line "used to be here…" @@ -149,14 +149,14 @@ UnknownText_0x1a421a: cont "taller." done -UnknownText_0x1a4269: +EcruteakCityLass2Text_ReleasedBeasts: text "Three big #MON" line "ran off in differ-" cont "ent directions." cont "What were they?" done -UnknownText_0x1a42ac: +EcruteakCityFisherText: text "I heard a rumor" line "about OLIVINE" cont "LIGHTHOUSE." @@ -169,7 +169,7 @@ UnknownText_0x1a42ac: cont "are in trouble." done -UnknownText_0x1a4325: +EcruteakCityFisherText_JasmineReturned: text "The #MON at" line "OLIVINE LIGHTHOUSE" cont "has been cured." @@ -292,8 +292,8 @@ EcruteakCity_MapEvents: db 7 ; object events object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 - object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 - object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 - object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 + object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLass1Script, -1 + object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityLass2Script, -1 + object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityFisherScript, -1 object_event 10, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 3984274cc..51c1742dc 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -25,9 +25,9 @@ FastShipB1F_MapScripts: .DummyScene1: end -UnknownScript_0x7673c: +FastShipB1FSailorBlocksLeft: checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT - iftrue UnknownScript_0x76766 + iftrue FastShipB1FAlreadyBlocked applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876 moveobject FASTSHIPB1F_SAILOR1, 30, 6 appear FASTSHIPB1F_SAILOR1 @@ -35,9 +35,9 @@ UnknownScript_0x7673c: disappear FASTSHIPB1F_SAILOR2 end -UnknownScript_0x76751: +FastShipB1FSailorBlocksRight: checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT - iftrue UnknownScript_0x76766 + iftrue FastShipB1FAlreadyBlocked applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871 moveobject FASTSHIPB1F_SAILOR2, 31, 6 appear FASTSHIPB1F_SAILOR2 @@ -45,18 +45,18 @@ UnknownScript_0x76751: disappear FASTSHIPB1F_SAILOR1 end -UnknownScript_0x76766: +FastShipB1FAlreadyBlocked: end SailorScript_0x76767: faceplayer opentext checkevent EVENT_FAST_SHIP_FIRST_TIME - iftrue UnknownScript_0x767a0 + iftrue .FirstTime checkevent EVENT_FAST_SHIP_LAZY_SAILOR - iftrue UnknownScript_0x7678d + iftrue .LazySailor checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR - iftrue UnknownScript_0x76787 + iftrue .AlreadyInformed writetext UnknownText_0x7687b waitbutton closetext @@ -64,28 +64,28 @@ SailorScript_0x76767: clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR end -UnknownScript_0x76787: +.AlreadyInformed: writetext UnknownText_0x76907 waitbutton closetext end -UnknownScript_0x7678d: +.LazySailor: writetext UnknownText_0x7692e checkevent EVENT_FAST_SHIP_FOUND_GIRL - iffalse UnknownScript_0x76799 + iffalse .NotFoundGirl waitbutton closetext end -UnknownScript_0x76799: +.NotFoundGirl: buttonsound writetext UnknownText_0x7696d waitbutton closetext end -UnknownScript_0x767a0: +.FirstTime: writetext UnknownText_0x7699d waitbutton closetext @@ -454,8 +454,8 @@ FastShipB1F_MapEvents: warp_event 31, 13, FAST_SHIP_1F, 12 db 2 ; coord events - coord_event 30, 7, SCENE_DEFAULT, UnknownScript_0x7673c - coord_event 31, 7, SCENE_DEFAULT, UnknownScript_0x76751 + coord_event 30, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksLeft + coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight db 1 ; bg events bg_event 27, 9, BGEVENT_READ, FashShipB1FTrashcan diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 8bc91d408..c2af9728b 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -78,7 +78,7 @@ TrainerBurglarCorey: closetext end -SailorScript_0x755f1: +FastShipLazySailorScript: playmusic MUSIC_HIKER_ENCOUNTER faceplayer opentext @@ -98,15 +98,15 @@ SailorScript_0x755f1: setevent EVENT_FAST_SHIP_LAZY_SAILOR setmapscene FAST_SHIP_B1F, SCENE_FINISHED checkcode VAR_FACING - ifequal RIGHT, UnknownScript_0x75629 - applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 + ifequal RIGHT, .Movement2 + applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement1 playsound SFX_EXIT_BUILDING disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR waitsfx end -UnknownScript_0x75629: - applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x7563c +.Movement2: + applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement2 playsound SFX_EXIT_BUILDING disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR waitsfx @@ -115,14 +115,14 @@ UnknownScript_0x75629: FastShipCabins_NNW_NNE_NETrashcan: jumpstd trashcan -MovementData_0x75637: +FastShipLazySailorLeavesMovement1: step LEFT step LEFT step UP step UP step_end -MovementData_0x7563c: +FastShipLazySailorLeavesMovement2: step DOWN step LEFT step LEFT @@ -284,6 +284,6 @@ FastShipCabins_NNW_NNE_NE_MapEvents: object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipLazySailorScript, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index e9146447b..ab1a27b13 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -80,19 +80,19 @@ FastShipBed: waitbutton closetext checkevent EVENT_FAST_SHIP_HAS_ARRIVED - iftrue UnknownScript_0x75ae1 + iftrue .AlreadyArrived checkevent EVENT_FAST_SHIP_FOUND_GIRL - iftrue UnknownScript_0x75ae2 + iftrue .CanArrive checkevent EVENT_FAST_SHIP_FIRST_TIME - iftrue UnknownScript_0x75ae2 -UnknownScript_0x75ae1: + iftrue .CanArrive +.AlreadyArrived: end -UnknownScript_0x75ae2: +.CanArrive: playsound SFX_ELEVATOR_END pause 30 checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE - iftrue UnknownScript_0x75af7 + iftrue .ArrivedOlivine opentext writetext FastShipArrivedVermilionText waitbutton @@ -100,7 +100,7 @@ UnknownScript_0x75ae2: setevent EVENT_FAST_SHIP_HAS_ARRIVED end -UnknownScript_0x75af7: +.ArrivedOlivine: opentext writetext FastShipArrivedOlivineText waitbutton diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index e76f082d8..62a1902e9 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -9,14 +9,14 @@ GoldenrodBikeShop_MapScripts: .UnreferencedDummyScene: end -ClerkScript_0x54750: +GoldenrodBikeShopClerkScript: faceplayer opentext checkevent EVENT_GOT_BICYCLE - iftrue UnknownScript_0x54775 + iftrue .GotBicycle writetext UnknownText_0x54787 yesorno - iffalse UnknownScript_0x5477b + iffalse .Refused writetext UnknownText_0x547f8 buttonsound waitsfx @@ -27,13 +27,13 @@ ClerkScript_0x54750: itemnotify setflag ENGINE_BIKE_SHOP_CALL_ENABLED setevent EVENT_GOT_BICYCLE -UnknownScript_0x54775: +.GotBicycle: writetext UnknownText_0x5485f waitbutton closetext end -UnknownScript_0x5477b: +.Refused: writetext UnknownText_0x54898 waitbutton closetext @@ -121,4 +121,4 @@ GoldenrodBikeShop_MapEvents: bg_event 7, 6, BGEVENT_READ, GoldenrodBikeShopBicycle db 1 ; object events - object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x54750, -1 + object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodBikeShopClerkScript, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index f9f076ea0..51041345f 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -161,34 +161,34 @@ GoldenrodCityPokefanMScript: GoldenrodCityYoungster1Script: jumptextfaceplayer GoldenrodCityYoungster1Text -CooltrainerFScript_0x1989e9: +GoldenrodCityCooltrainerF1Script: faceplayer opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue .ClearedRadioTower - writetext UnknownText_0x198ae6 + writetext GoldenrodCityCooltrainerF1Text waitbutton closetext end .ClearedRadioTower: - writetext UnknownText_0x198b2d + writetext GoldenrodCityCooltrainerF1Text_ClearedRadioTower waitbutton closetext end -CooltrainerFScript_0x1989fd: +GoldenrodCityCooltrainerF2Script: faceplayer opentext checkflag ENGINE_RADIO_CARD iftrue .GotRadioCard - writetext UnknownText_0x198b73 + writetext GoldenrodCityCooltrainerF2Text waitbutton closetext end .GotRadioCard: - writetext UnknownText_0x198c14 + writetext GoldenrodCityCooltrainerF2Text_GotRadioCard waitbutton closetext end @@ -297,7 +297,7 @@ GoldenrodCityYoungster1Text: line "anywhere." done -UnknownText_0x198ae6: +GoldenrodCityCooltrainerF1Text: text "Is that man in" line "black dressed up" @@ -305,7 +305,7 @@ UnknownText_0x198ae6: line "member? How silly!" done -UnknownText_0x198b2d: +GoldenrodCityCooltrainerF1Text_ClearedRadioTower: text "Was that man in" line "black really part" @@ -313,7 +313,7 @@ UnknownText_0x198b2d: line "can't believe it!" done -UnknownText_0x198b73: +GoldenrodCityCooltrainerF2Text: text "The RADIO TOWER in" line "GOLDENROD CITY is" cont "a landmark." @@ -329,7 +329,7 @@ UnknownText_0x198b73: line "serve as a radio." done -UnknownText_0x198c14: +GoldenrodCityCooltrainerF2Text_GotRadioCard: text "Oh, your #GEAR" line "works as a radio!" done @@ -588,8 +588,8 @@ GoldenrodCity_MapEvents: db 15 ; object events object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityCooltrainerF1Script, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityCooltrainerF2Script, EVENT_GOLDENROD_CITY_CIVILIANS object_event 19, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS object_event 17, 10, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 11, 27, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index c8acd9d01..895c8a4fe 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -22,10 +22,10 @@ GoldenrodDeptStore4FCooltrainerMScript: GoldenrodDeptStore4FBugCatcherScript: jumptextfaceplayer GoldenrodDeptStore4FBugCatcherText -GameboyKidScript_0x55ef7: +GoldenrodDeptStore4FGameboyKidScript: faceplayer opentext - writetext UnknownText_0x55f74 + writetext GoldenrodDeptStore4FGameboyKidText waitbutton closetext turnobject GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN @@ -51,7 +51,7 @@ GoldenrodDeptStore4FBugCatcherText: line "#MON's DEFENSE." done -UnknownText_0x55f74: +GoldenrodDeptStore4FGameboyKidText: text "Some #MON" line "evolve only by" @@ -93,4 +93,4 @@ GoldenrodDeptStore4F_MapEvents: object_event 13, 5, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FClerkScript, -1 object_event 11, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FCooltrainerMScript, -1 object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FBugCatcherScript, -1 - object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameboyKidScript_0x55ef7, -1 + object_event 5, 1, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStore4FGameboyKidScript, -1 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 3b669ca43..5ccf7974c 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -49,9 +49,9 @@ GoldenrodGymWhitneyScript: .StoppedCrying: checkevent EVENT_GOT_TM45_ATTRACT - iftrue UnknownScript_0x54077 + iftrue .GotAttract checkflag ENGINE_PLAINBADGE - iftrue UnknownScript_0x54064 + iftrue .GotPlainBadge writetext UnknownText_0x54222 buttonsound waitsfx @@ -61,21 +61,21 @@ GoldenrodGymWhitneyScript: setflag ENGINE_PLAINBADGE checkcode VAR_BADGES scall GoldenrodGymActivateRockets -UnknownScript_0x54064: +.GotPlainBadge: writetext UnknownText_0x5428b buttonsound verbosegiveitem TM_ATTRACT - iffalse UnknownScript_0x5407b + iffalse .NoRoomForAttract setevent EVENT_GOT_TM45_ATTRACT writetext UnknownText_0x54302 waitbutton closetext end -UnknownScript_0x54077: +.GotAttract: writetext UnknownText_0x54360 waitbutton -UnknownScript_0x5407b: +.NoRoomForAttract: closetext end diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 054139331..ba2ba4570 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -70,7 +70,7 @@ GentlemanScript_0x7d9bf: faceplayer opentext checkevent EVENT_RECEIVED_CARD_KEY - iftrue UnknownScript_0x7d9de + iftrue .GotCardKey writetext UnknownText_0x7dbc6 buttonsound verbosegiveitem CARD_KEY @@ -80,7 +80,7 @@ GentlemanScript_0x7d9bf: clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 writetext UnknownText_0x7dc5b buttonsound -UnknownScript_0x7d9de: +.GotCardKey: writetext UnknownText_0x7dc8d waitbutton closetext diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index e06a9b89d..8636fc9b1 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -44,12 +44,12 @@ LancesRoom_MapScripts: Script_ApproachLanceFromLeft: special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromLeft - jump LanceScript_0x180e7b + jump LancesRoomLanceScript Script_ApproachLanceFromRight: special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromRight -LanceScript_0x180e7b: +LancesRoomLanceScript: turnobject LANCESROOM_LANCE, LEFT opentext writetext LanceBattleIntroText @@ -351,6 +351,6 @@ LancesRoom_MapEvents: db 0 ; bg events db 3 ; object events - object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 + object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LancesRoomLanceScript, -1 object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index ca2d258be..51426248c 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -16,8 +16,8 @@ LavRadioTower1FReceptionistScript: LavRadioTower1FOfficerScript: jumptextfaceplayer LavRadioTower1FOfficerText -LavRadioTower1FSuperNerdScript: - jumptextfaceplayer LavRadioTower1FSuperNerdText +LavRadioTower1FSuperNerd1Script: + jumptextfaceplayer LavRadioTower1FSuperNerd1Text GentlemanScript_0x7ee6c: faceplayer @@ -50,18 +50,18 @@ GentlemanScript_0x7ee6c: .expncardname db "EXPN CARD@" -SuperNerdScript_0x7eea2: +LavRadioTower1FSuperNerd2Script: faceplayer opentext checkflag ENGINE_EXPN_CARD - iftrue UnknownScript_0x7eeb0 - writetext UnknownText_0x7f193 + iftrue .GotExpnCard + writetext LavRadioTower1FSuperNerd2Text waitbutton closetext end -UnknownScript_0x7eeb0: - writetext UnknownText_0x7f248 +.GotExpnCard: + writetext LavRadioTower1FSuperNerd2Text_GotExpnCard waitbutton closetext end @@ -99,7 +99,7 @@ LavRadioTower1FOfficerText: line "up our security." done -LavRadioTower1FSuperNerdText: +LavRadioTower1FSuperNerd1Text: text "Many people are" line "hard at work here" @@ -156,7 +156,7 @@ UnknownText_0x7f141: para "Gahahahaha!" done -UnknownText_0x7f193: +LavRadioTower1FSuperNerd2Text: text "Hey there!" para "I am the super" @@ -175,7 +175,7 @@ UnknownText_0x7f193: line "better get one!" done -UnknownText_0x7f248: +LavRadioTower1FSuperNerd2Text_GotExpnCard: text "Hey there!" para "I am the super" @@ -236,6 +236,6 @@ LavRadioTower1F_MapEvents: db 5 ; object events object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1 object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1 - object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1 + object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerd1Script, -1 object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1 - object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1 + object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerd2Script, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 242aa0ed8..ae12d09e8 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -17,7 +17,7 @@ MahoganyMart1F_MapScripts: end .LanceUncoversStaircase: - priorityjump UnknownScript_0x6c38f + priorityjump MahoganyMart1FLanceUncoversStaircaseScript end .MahoganyMart1FStaircase: @@ -29,38 +29,38 @@ MahoganyMart1F_MapScripts: changeblock 6, 2, $1e ; stairs return -PharmacistScript_0x6c367: +MahogayMart1FPharmacistScript: faceplayer opentext checkevent EVENT_DECIDED_TO_HELP_LANCE - iftrue UnknownScript_0x6c375 + iftrue .LanceEntered pokemart MARTTYPE_STANDARD, MART_MAHOGANY_1 closetext end -UnknownScript_0x6c375: - writetext UnknownText_0x6c46b +.LanceEntered: + writetext MahogayMart1FPharmacistText_LanceEntered waitbutton closetext end -BlackBeltScript_0x6c37b: +MahogayMart1FBlackBeltScript: faceplayer opentext checkevent EVENT_DECIDED_TO_HELP_LANCE - iftrue UnknownScript_0x6c389 - writetext UnknownText_0x6c494 + iftrue .LanceEntered + writetext MahogayMart1FBlackBeltText waitbutton closetext end -UnknownScript_0x6c389: - writetext UnknownText_0x6c501 +.LanceEntered: + writetext MahogayMart1FBlackBeltText_LanceEntered waitbutton closetext end -UnknownScript_0x6c38f: +MahoganyMart1FLanceUncoversStaircaseScript: pause 15 opentext writetext UnknownText_0x6c52a @@ -164,13 +164,13 @@ UnknownText_0x6c414: line "eat in MAHOGANY!" done -UnknownText_0x6c46b: +MahogayMart1FPharmacistText_LanceEntered: text "Arrgh… You found" line "the secret stair-" cont "way…" done -UnknownText_0x6c494: +MahogayMart1FBlackBeltText: text "Heheh! The experi-" line "ment worked like a" cont "charm." @@ -182,7 +182,7 @@ UnknownText_0x6c494: line "moneymakers." done -UnknownText_0x6c501: +MahogayMart1FBlackBeltText_LanceEntered: text "Urrgh…" para "That guy's dragon" @@ -231,8 +231,8 @@ MahoganyMart1F_MapEvents: db 0 ; bg events db 5 ; object events - object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION - object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 4, 3, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FPharmacistScript, EVENT_TEAM_ROCKET_BASE_POPULATION + object_event 1, 6, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahogayMart1FBlackBeltScript, EVENT_TEAM_ROCKET_BASE_POPULATION object_event 4, 6, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE object_event 3, 6, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE object_event 1, 3, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 53159ea91..5984c89fb 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -10,26 +10,28 @@ MahoganyRedGyaradosSpeechHouse_MapScripts: MahoganyRedGyaradosSpeechHouseBlackBeltScript: jumptextfaceplayer MahoganyRedGyaradosSpeechHouseBlackBeltText -TeacherScript_0x199982: +MahoganyRedGyaradosSpeechHouseTeacherScript: faceplayer opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER - iftrue UnknownScript_0x199990 - writetext UnknownText_0x199a0e + iftrue .RocketsInRadioTower + writetext MahoganyRedGyaradosSpeechHouseTeacherText waitbutton closetext end -UnknownScript_0x199990: - writetext UnknownText_0x199a3d +.RocketsInRadioTower: + writetext MahoganyRedGyaradosSpeechHouseTeacherText_RocketsInRadioTower waitbutton closetext end -UnknownScript_0x195996: +MahoganyRedGyaradosSpeechHouseUnusedBookshelf1: +; unused jumpstd picturebookshelf -UnknownScript_0x195999: +MahoganyRedGyaradosSpeechHouseUnusedBookshelf2: +; unused jumpstd magazinebookshelf MahoganyRedGyaradosSpeechHouseBlackBeltText: @@ -44,13 +46,13 @@ MahoganyRedGyaradosSpeechHouseBlackBeltText: line "in that lake…" done -UnknownText_0x199a0e: +MahoganyRedGyaradosSpeechHouseTeacherText: text "My favorite radio" line "program? I'd say" cont "#MON MUSIC." done -UnknownText_0x199a3d: +MahoganyRedGyaradosSpeechHouseTeacherText_RocketsInRadioTower: text "I've been hearing" line "laughter on the" @@ -71,4 +73,4 @@ MahoganyRedGyaradosSpeechHouse_MapEvents: db 2 ; object events object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseBlackBeltScript, -1 - object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x199982, -1 + object_event 6, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MahoganyRedGyaradosSpeechHouseTeacherScript, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 23937e60d..c78b60fbf 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -12,13 +12,13 @@ MountMortarB1F_MapScripts: db 0 ; callbacks -BlackBeltScript_0x7e1f6: +MountMortarB1FKiyoScript: faceplayer opentext checkevent EVENT_GOT_TYROGUE_FROM_KIYO - iftrue UnknownScript_0x7e231 + iftrue .GotTyrogue checkevent EVENT_BEAT_BLACKBELT_KIYO - iftrue UnknownScript_0x7e217 + iftrue .BeatKiyo writetext UnknownText_0x7e24d waitbutton closetext @@ -28,24 +28,24 @@ BlackBeltScript_0x7e1f6: reloadmapafterbattle setevent EVENT_BEAT_BLACKBELT_KIYO opentext -UnknownScript_0x7e217: +.BeatKiyo: writetext UnknownText_0x7e2c0 buttonsound waitsfx checkcode VAR_PARTYCOUNT - ifequal PARTY_LENGTH, UnknownScript_0x7e237 + ifequal PARTY_LENGTH, .NoRoom writetext UnknownText_0x7e355 playsound SFX_CAUGHT_MON waitsfx givepoke TYROGUE, 10 setevent EVENT_GOT_TYROGUE_FROM_KIYO -UnknownScript_0x7e231: +.GotTyrogue: writetext UnknownText_0x7e36a waitbutton closetext end -UnknownScript_0x7e237: +.NoRoom: writetext UnknownText_0x7e3df waitbutton closetext @@ -148,7 +148,7 @@ MountMortarB1F_MapEvents: object_event 29, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FHyperPotion, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION object_event 4, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FCarbos, EVENT_MOUNT_MORTAR_B1F_CARBOS object_event 9, 10, SPRITE_BOULDER, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MountMortarB1FBoulder, -1 - object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BlackBeltScript_0x7e1f6, -1 + object_event 16, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MountMortarB1FKiyoScript, -1 object_event 34, 24, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FFullRestore, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE object_event 32, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FMaxEther, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER object_event 21, 26, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MountMortarB1FPPUp, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 6e3ffbe5f..0a4d66c77 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -8,17 +8,17 @@ OlivineCafe_MapScripts: db 0 ; callbacks -SailorScript_0x9c8c1: +OlivineCafeStrengthSailorScript: faceplayer opentext checkevent EVENT_GOT_HM04_STRENGTH - iftrue UnknownScript_0x9c8d3 - writetext UnknownText_0x9c8df + iftrue .GotStrength + writetext OlivineCafeStrengthSailorText buttonsound verbosegiveitem HM_STRENGTH setevent EVENT_GOT_HM04_STRENGTH -UnknownScript_0x9c8d3: - writetext UnknownText_0x9c965 +.GotStrength: + writetext OlivineCafeStrengthSailorText_GotStrength waitbutton closetext end @@ -29,7 +29,7 @@ OlivineCafeFishingGuruScript: OlivineCafeSailorScript: jumptextfaceplayer OlivineCafeSailorText -UnknownText_0x9c8df: +OlivineCafeStrengthSailorText: text "Hah! Your #MON" line "sure look like" cont "lightweights!" @@ -43,7 +43,7 @@ UnknownText_0x9c8df: cont "STRENGTH!" done -UnknownText_0x9c965: +OlivineCafeStrengthSailorText_GotStrength: text "On the sea, the" line "only thing you can" @@ -88,6 +88,6 @@ OlivineCafe_MapEvents: db 0 ; bg events db 3 ; object events - object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x9c8c1, -1 + object_event 4, 3, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeStrengthSailorScript, -1 object_event 7, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeFishingGuruScript, -1 object_event 6, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCafeSailorScript, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 0b3ebb96a..f93c584dc 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -22,7 +22,7 @@ OlivineCity_MapScripts: setflag ENGINE_FLYPOINT_OLIVINE return -UnknownScript_0x1a8833: +OlivineCityRivalSceneTop: turnobject PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 special FadeOutMusic @@ -46,7 +46,7 @@ UnknownScript_0x1a8833: special LoadUsedSpritesGFX end -UnknownScript_0x1a886b: +OlivineCityRivalSceneBottom: turnobject PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 special FadeOutMusic @@ -73,18 +73,18 @@ UnknownScript_0x1a886b: OlivineCitySailor1Script: jumptextfaceplayer OlivineCitySailor1Text -StandingYoungsterScript_0x1a88a6: +OlivineCityStandingYoungsterScript: faceplayer opentext random 2 - ifequal 0, UnknownScript_0x1a88b4 - writetext UnknownText_0x1a8b04 + ifequal 0, .FiftyFifty + writetext OlivineCityStandingYoungsterPokegearText waitbutton closetext end -UnknownScript_0x1a88b4: - writetext UnknownText_0x1a8b41 +.FiftyFifty: + writetext OlivineCityStandingYoungsterPokedexText waitbutton closetext end @@ -223,14 +223,14 @@ OlivineCitySailor1Text: line "ship can sail." done -UnknownText_0x1a8b04: +OlivineCityStandingYoungsterPokegearText: text "That thing you" line "have--it's a #-" cont "GEAR, right? Wow," cont "that's cool." done -UnknownText_0x1a8b41: +OlivineCityStandingYoungsterPokedexText: text "Wow, you have a" line "#DEX!" @@ -303,8 +303,8 @@ OlivineCity_MapEvents: warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2 db 2 ; coord events - coord_event 13, 12, SCENE_DEFAULT, UnknownScript_0x1a8833 - coord_event 13, 13, SCENE_DEFAULT, UnknownScript_0x1a886b + coord_event 13, 12, SCENE_DEFAULT, OlivineCityRivalSceneTop + coord_event 13, 13, SCENE_DEFAULT, OlivineCityRivalSceneBottom db 7 ; bg events bg_event 17, 11, BGEVENT_READ, OlivineCitySign @@ -317,6 +317,6 @@ OlivineCity_MapEvents: db 4 ; object events object_event 26, 27, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor1Script, -1 - object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, StandingYoungsterScript_0x1a88a6, -1 + object_event 20, 13, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineCityStandingYoungsterScript, -1 object_event 17, 21, SPRITE_SAILOR, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineCitySailor2Script, -1 object_event 10, 11, SPRITE_OLIVINE_RIVAL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index ff92907d7..2570de372 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -10,9 +10,9 @@ OlivineHouseBeta_MapScripts: OlivineHouseBetaTeacherScript: jumptextfaceplayer OlivineHouseBetaTeacherText -RhydonScript_0x9c592: +OlivineHouseBetaRhydonScript: opentext - writetext UnknownText_0x9c5f0 + writetext OlivineHouseBetaRhydonText cry RHYDON waitbutton closetext @@ -33,7 +33,7 @@ OlivineHouseBetaTeacherText: cont "medicine for me." done -UnknownText_0x9c5f0: +OlivineHouseBetaRhydonText: text "RHYDON: Gugooh!" done @@ -52,4 +52,4 @@ OlivineHouseBeta_MapEvents: db 2 ; object events object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaTeacherScript, -1 - object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x9c592, -1 + object_event 6, 4, SPRITE_RHYDON, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivineHouseBetaRhydonScript, -1 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 47baa335c..f0121b8ef 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -97,7 +97,8 @@ OlivineLighthouseJasmine: closetext end -UnknownScript_0x60c39: +OlivineLighthouseUnusedDummyScript: +; unused end OlivineLighthouseAmphy: diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 867c960fc..0a994ebbf 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -21,20 +21,20 @@ PewterCityCooltrainerFScript: PewterCityBugCatcherScript: jumptextfaceplayer PewterCityBugCatcherText -GrampsScript_0x18c00f: +PewterCityGrampsScript: faceplayer opentext checkevent EVENT_GOT_SILVER_WING - iftrue UnknownScript_0x18c023 - writetext UnknownText_0x18c0c6 + iftrue .GotSilverWing + writetext PewterCityGrampsText buttonsound verbosegiveitem SILVER_WING setevent EVENT_GOT_SILVER_WING closetext end -UnknownScript_0x18c023: - writetext UnknownText_0x18c1aa +.GotSilverWing: + writetext PewterCityGrampsText_GotSilverWing waitbutton closetext end @@ -83,7 +83,7 @@ PewterCityBugCatcherText: line "night." done -UnknownText_0x18c0c6: +PewterCityGrampsText: text "Ah, you came all" line "the way out here" cont "from JOHTO?" @@ -105,7 +105,7 @@ UnknownText_0x18c0c6: cont "I found in JOHTO." done -UnknownText_0x18c1aa: +PewterCityGrampsText_GotSilverWing: text "Going to new, un-" line "known places and" cont "seeing new people…" @@ -174,6 +174,6 @@ PewterCity_MapEvents: db 5 ; object events object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 - object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 + object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PewterCityGrampsScript, -1 object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterCityFruitTree1, -1 object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterCityFruitTree2, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 1596e9fd1..8107ee022 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -27,7 +27,7 @@ RadioTower1FReceptionistScript: closetext end -GentlemanScript_0x5cd3d: +RadioTower1FLuckyNumberManScript: faceplayer opentext writetext UnknownText_0x5ceba @@ -489,5 +489,5 @@ RadioTower1F_MapEvents: object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER - object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS + object_event 8, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FLuckyNumberManScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 12, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower1FRadioCardWomanScript, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 7bc64ff99..036a19dd5 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -16,25 +16,25 @@ RadioTower2F_MapScripts: db 0 ; callbacks -UnknownScript_0x5d6fd: +RadioTower2FUnusedDummyScene: ; unused end RadioTower2FSuperNerdScript: jumptextfaceplayer RadioTower2FSuperNerdText -TeacherScript_0x5d701: +RadioTower2FTeacherScript: faceplayer opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue .Rockets - writetext UnknownText_0x5d956 + writetext RadioTower2FTeacherText waitbutton closetext end .Rockets: - writetext UnknownText_0x5d983 + writetext RadioTower2FTeacherText_Rockets waitbutton closetext end @@ -348,13 +348,13 @@ RadioTower2FSuperNerdText: cont "where. Tune in!" done -UnknownText_0x5d956: +RadioTower2FTeacherText: text "Lullabies on the" line "radio may make" cont "#MON sleep." done -UnknownText_0x5d983: +RadioTower2FTeacherText_Rockets: text "Why would they" line "want to take over" cont "the RADIO TOWER?" @@ -728,7 +728,7 @@ RadioTower2F_MapEvents: db 11 ; object events object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower2FSuperNerdScript, EVENT_GOLDENROD_CITY_CIVILIANS - object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5d701, -1 + object_event 17, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower2FTeacherScript, -1 object_event 1, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 8, 4, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 0b2828ea9..367223ce4 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -26,23 +26,23 @@ RadioTower3F_MapScripts: RadioTower3FSuperNerdScript: jumptextfaceplayer RadioTower3FSuperNerdText -GymGuyScript_0x5e556: +RadioTower3FGymGuyScript: faceplayer opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue .NoRockets - writetext UnknownText_0x5e682 + writetext RadioTower3FGymGuyText_Rockets waitbutton closetext end .NoRockets: - writetext UnknownText_0x5e6eb + writetext RadioTower3FGymGuyText waitbutton closetext end -CooltrainerFScript_0x5e56a: +RadioTower3FCooltrainerFScript: faceplayer opentext checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER @@ -131,13 +131,13 @@ CardKeySlotScript:: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue .UsedCardKey checkitem CARD_KEY - iftrue UnknownScript_0x5e605 + iftrue .HaveCardKey .UsedCardKey: closetext end -UnknownScript_0x5e605: - writetext UnknownText_0x5eabc +.HaveCardKey: + writetext InsertedTheCardKeyText waitbutton setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound SFX_ENTER_DOOR @@ -165,7 +165,7 @@ RadioTower3FSuperNerdText: line "200 kinds." done -UnknownText_0x5e682: +RadioTower3FGymGuyText_Rockets: text "To trainers, #-" line "MON are their" cont "beloved partners." @@ -177,7 +177,7 @@ UnknownText_0x5e682: line "#MON." done -UnknownText_0x5e6eb: +RadioTower3FGymGuyText: text "We run 24 hours a" line "day to broadcast" @@ -312,7 +312,7 @@ RadioTower3FCardKeySlotText: line "slot." done -UnknownText_0x5eabc: +InsertedTheCardKeyText: text " inserted" line "the CARD KEY." done @@ -343,8 +343,8 @@ RadioTower3F_MapEvents: db 7 ; object events object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x5e556, -1 - object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x5e56a, -1 + object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower3FGymGuyScript, -1 + object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower3FCooltrainerFScript, -1 object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 16, 6, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 7943ca8dc..87efe0b23 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -15,33 +15,33 @@ RadioTower4F_MapScripts: RadioTower4FFisherScript: jumptextfaceplayer RadioTower4FFisherText -TeacherScript_0x5eb85: +RadioTower4FDJMaryScript: faceplayer opentext checkevent EVENT_GOT_PINK_BOW_FROM_MARY - iftrue UnknownScript_0x5ebac + iftrue .GotPinkBow checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x5eb99 - writetext UnknownText_0x5ec68 + iftrue .ClearedRockets + writetext RadioTower4FDJMaryText waitbutton closetext end -UnknownScript_0x5eb99: - writetext UnknownText_0x5ecab +.ClearedRockets: + writetext RadioTower4FDJMaryText_ClearedRockets buttonsound verbosegiveitem PINK_BOW - iffalse UnknownScript_0x5ebb0 - writetext UnknownText_0x5ecef + iffalse .NoRoom + writetext RadioTower4FDJMaryText_GivePinkBow waitbutton closetext setevent EVENT_GOT_PINK_BOW_FROM_MARY end -UnknownScript_0x5ebac: - writetext UnknownText_0x5ed2c +.GotPinkBow: + writetext RadioTower4FDJMaryText_After waitbutton -UnknownScript_0x5ebb0: +.NoRoom: closetext end @@ -112,7 +112,7 @@ RadioTower4FFisherText: line "broadcast there." done -UnknownText_0x5ec68: +RadioTower4FDJMaryText: text "MARY: Why? Why do" line "I have to suffer" cont "through this?" @@ -120,7 +120,7 @@ UnknownText_0x5ec68: para "MEOWTH, help me!" done -UnknownText_0x5ecab: +RadioTower4FDJMaryText_ClearedRockets: text "MARY: Oh! You're" line "my little savior!" @@ -128,7 +128,7 @@ UnknownText_0x5ecab: line "as my thanks?" done -UnknownText_0x5ecef: +RadioTower4FDJMaryText_GivePinkBow: text "MARY: It's just" line "right for #MON" @@ -136,7 +136,7 @@ UnknownText_0x5ecef: line "type moves." done -UnknownText_0x5ed2c: +RadioTower4FDJMaryText_After: text "MARY: Please tune" line "into me on PROF." @@ -260,7 +260,7 @@ RadioTower4F_MapEvents: db 7 ; object events object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower4FFisherScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER - object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x5eb85, -1 + object_event 14, 6, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower4FDJMaryScript, -1 object_event 12, 7, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTowerMeowth, -1 object_event 5, 6, SPRITE_ROCKET, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER object_event 14, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index fe1161bd4..55bdda969 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -10,25 +10,25 @@ FishingGuruScript_0x7f484: faceplayer opentext checkevent EVENT_GOT_SUPER_ROD - iftrue UnknownScript_0x7f4a0 + iftrue .GotSuperRod writetext UnknownText_0x7f4af yesorno - iffalse UnknownScript_0x7f4a6 + iffalse .Refused writetext UnknownText_0x7f52f buttonsound verbosegiveitem SUPER_ROD - iffalse UnknownScript_0x7f4aa + iffalse .NoRoom setevent EVENT_GOT_SUPER_ROD -UnknownScript_0x7f4a0: +.GotSuperRod: writetext UnknownText_0x7f57c waitbutton closetext end -UnknownScript_0x7f4a6: +.Refused: writetext UnknownText_0x7f5ec waitbutton -UnknownScript_0x7f4aa: +.NoRoom: closetext end diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 1c5aacc12..fb135e1b7 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -13,22 +13,22 @@ Route16Gate_MapScripts: Route16GateOfficerScript: jumptextfaceplayer Route16GateOfficerText -UnknownScript_0x733ed: +Route16GateBicycleCheck: checkitem BICYCLE - iffalse UnknownScript_0x733f3 + iffalse .NoBicycle end -UnknownScript_0x733f3: +.NoBicycle: showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15 turnobject PLAYER, UP opentext - writetext UnknownText_0x73496 + writetext Route16GateCannotPassText waitbutton closetext - applymovement PLAYER, MovementData_0x73405 + applymovement PLAYER, Route16GateCannotPassMovement end -MovementData_0x73405: +Route16GateCannotPassMovement: step RIGHT turn_head LEFT step_end @@ -48,7 +48,7 @@ Route16GateOfficerText: line "a ship or train." done -UnknownText_0x73496: +Route16GateCannotPassText: text "Hey! Whoa! Stop!" para "You can't go out" @@ -68,8 +68,8 @@ Route16Gate_MapEvents: warp_event 9, 5, ROUTE_16, 3 db 2 ; coord events - coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed - coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x733ed + coord_event 5, 4, SCENE_DEFAULT, Route16GateBicycleCheck + coord_event 5, 5, SCENE_DEFAULT, Route16GateBicycleCheck db 0 ; bg events diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index e682c4a79..0e434a711 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -13,22 +13,22 @@ Route17Route18Gate_MapScripts: Route17Route18GateOfficerScript: jumptextfaceplayer Route17Route18GateOfficerText -UnknownScript_0x73611: +Route17Route18GateBicycleCheck: checkitem BICYCLE - iffalse UnknownScript_0x73617 + iffalse .NoBicycle end -UnknownScript_0x73617: +.NoBicycle: showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15 turnobject PLAYER, UP opentext - writetext UnknownText_0x7364d + writetext Route17Route18GateCannotPassText waitbutton closetext - applymovement PLAYER, MovementData_0x73629 + applymovement PLAYER, Route17Route18GateCannotPassMovement end -MovementData_0x73629: +Route17Route18GateCannotPassMovement: step RIGHT turn_head LEFT step_end @@ -38,7 +38,7 @@ Route17Route18GateOfficerText: line "Uphill Starts Here" done -UnknownText_0x7364d: +Route17Route18GateCannotPassText: text "Hang on! Don't you" line "have a BICYCLE?" @@ -59,8 +59,8 @@ Route17Route18Gate_MapEvents: warp_event 9, 5, ROUTE_18, 2 db 2 ; coord events - coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x73611 - coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x73611 + coord_event 5, 4, SCENE_DEFAULT, Route17Route18GateBicycleCheck + coord_event 5, 5, SCENE_DEFAULT, Route17Route18GateBicycleCheck db 0 ; bg events diff --git a/maps/Route19.asm b/maps/Route19.asm index a032c5e69..103370a5a 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -68,34 +68,34 @@ TrainerSwimmermTucker: closetext end -FisherScript_0x19ea4d: - faceplayer - opentext - checkevent EVENT_CINNABAR_ROCKS_CLEARED - iftrue UnknownScript_0x19ea5b - writetext UnknownText_0x19ecaf - waitbutton - closetext - end - -UnknownScript_0x19ea5b: - writetext UnknownText_0x19ed24 - waitbutton - closetext - end - -FisherScript_0x19ea61: +Route19Fisher1Script: faceplayer opentext checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue .RocksCleared - writetext Route19FisherText1 + writetext Route19Fisher1Text waitbutton closetext end .RocksCleared: - writetext Route19FisherText2 + writetext Route19Fisher1Text_RocksCleared + waitbutton + closetext + end + +Route19Fisher2Script: + faceplayer + opentext + checkevent EVENT_CINNABAR_ROCKS_CLEARED + iftrue .RocksCleared + writetext Route19Fisher2Text + waitbutton + closetext + end + +.RocksCleared: + writetext Route19Fisher2Text_RocksCleared waitbutton closetext end @@ -185,7 +185,7 @@ SwimmermJeromeAfterBattleText: cont "love the sea." done -UnknownText_0x19ecaf: +Route19Fisher1Text: text "Sorry. This road" line "is closed for" cont "construction." @@ -197,18 +197,18 @@ UnknownText_0x19ecaf: line "from PALLET TOWN." done -UnknownText_0x19ed24: +Route19Fisher1Text_RocksCleared: text "I'm all sweaty." line "Time for a swim!" done -Route19FisherText1: +Route19Fisher2Text: text "Who knows how long" line "it would take to" cont "move this boulder…" done -Route19FisherText2: +Route19Fisher2Text_RocksCleared: text "The roadwork is" line "finally finished." @@ -249,5 +249,5 @@ Route19_MapEvents: object_event 13, 28, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermHarold, -1 object_event 11, 17, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermJerome, -1 object_event 8, 23, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerSwimmermTucker, -1 - object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea4d, -1 - object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, FisherScript_0x19ea61, -1 + object_event 9, 5, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 1, Route19Fisher1Script, -1 + object_event 11, 5, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, Route19Fisher2Script, -1 diff --git a/maps/Route24.asm b/maps/Route24.asm index 042353bb6..227503e73 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -6,7 +6,7 @@ Route24_MapScripts: db 0 ; callbacks -RocketScript_0x1adbfa: +Route24RocketScript: faceplayer playmusic MUSIC_ROCKET_ENCOUNTER opentext @@ -126,4 +126,4 @@ Route24_MapEvents: db 0 ; bg events db 1 ; object events - object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET + object_event 8, 7, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route24RocketScript, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index 536154500..c90025032 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -6,7 +6,7 @@ Route26HealHouse_MapScripts: db 0 ; callbacks -TeacherScript_0x7b125: +Route26HealHouseTeacherScript: faceplayer opentext writetext UnknownText_0x7b14d @@ -60,4 +60,4 @@ Route26HealHouse_MapEvents: bg_event 1, 1, BGEVENT_READ, Route26HealHouseBookshelf db 1 ; object events - object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x7b125, -1 + object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route26HealHouseTeacherScript, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index dd11206a3..bd39db0b7 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -22,17 +22,17 @@ Route27_MapScripts: .DummyScene1: end -UnknownScript_0x1a0873: +FirstStepIntoKantoLeftScene: turnobject ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 applymovement ROUTE27_FISHER, MovementData_0x1a0a66 - jump UnknownScript_0x1a088c + jump FirstStepIntoKantoScene_Continue -UnknownScript_0x1a0881: +FirstStepIntoKantoRightScene: turnobject ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 applymovement ROUTE27_FISHER, MovementData_0x1a0a69 -UnknownScript_0x1a088c: +FirstStepIntoKantoScene_Continue: turnobject PLAYER, RIGHT opentext writetext Route27FisherHeyText @@ -474,8 +474,8 @@ Route27_MapEvents: warp_event 36, 5, TOHJO_FALLS, 2 db 2 ; coord events - coord_event 18, 10, SCENE_DEFAULT, UnknownScript_0x1a0873 - coord_event 19, 10, SCENE_DEFAULT, UnknownScript_0x1a0881 + coord_event 18, 10, SCENE_DEFAULT, FirstStepIntoKantoLeftScene + coord_event 19, 10, SCENE_DEFAULT, FirstStepIntoKantoRightScene db 1 ; bg events bg_event 25, 7, BGEVENT_READ, TohjoFallsSign diff --git a/maps/Route29.asm b/maps/Route29.asm index f5a2cff8b..1a1f83e94 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -145,7 +145,7 @@ Route29TeacherScript: Route29FisherScript: jumptextfaceplayer Route29FisherText -CooltrainerMScript_0x1a1031: +Route29CooltrainerMScript: faceplayer opentext checktime DAY @@ -153,13 +153,13 @@ CooltrainerMScript_0x1a1031: checktime NITE iftrue .nite .day_morn - writetext Text_WaitingForNight + writetext Route29CooltrainerMText_WaitingForNight waitbutton closetext end .nite - writetext Text_WaitingForMorning + writetext Route29CooltrainerMText_WaitingForMorning waitbutton closetext end @@ -331,7 +331,7 @@ Text_WaitingForDay: line "daytime." done -Text_WaitingForNight: +Route29CooltrainerMText_WaitingForNight: text "I'm waiting for" line "#MON that" @@ -339,7 +339,7 @@ Text_WaitingForNight: line "night." done -Text_WaitingForMorning: +Route29CooltrainerMText_WaitingForMorning: text "I'm waiting for" line "#MON that" @@ -433,6 +433,6 @@ Route29_MapEvents: object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1 object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1 object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1 - object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 + object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29CooltrainerMScript, -1 object_event 29, 12, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index a8a560b79..2fa4b8922 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -6,20 +6,20 @@ Route2NuggetHouse_MapScripts: db 0 ; callbacks -FisherScript_0x9b847: +Route2NuggetHouseFisherScript: faceplayer opentext checkevent EVENT_GOT_NUGGET_FROM_GUY - iftrue .GotItem - writetext UnknownText_0x9b865 + iftrue .GotNugget + writetext Route2NuggetHouseFisherText buttonsound verbosegiveitem NUGGET - iffalse .Done + iffalse .NoRoom setevent EVENT_GOT_NUGGET_FROM_GUY -.GotItem: - writetext UnknownText_0x9b8e5 +.GotNugget: + writetext Route2NuggetHouseFisherText_GotNugget waitbutton -.Done: +.NoRoom: closetext end @@ -27,7 +27,7 @@ Route2NuggetHouseBookshelf: ; unused jumpstd difficultbookshelf -UnknownText_0x9b865: +Route2NuggetHouseFisherText: text "Hi! Wow, I'm glad" line "to see you." @@ -40,7 +40,7 @@ UnknownText_0x9b865: cont "little present." done -UnknownText_0x9b8e5: +Route2NuggetHouseFisherText_GotNugget: text "That's a NUGGET." para "I can't give you" @@ -62,4 +62,4 @@ Route2NuggetHouse_MapEvents: db 0 ; bg events db 1 ; object events - object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x9b847, -1 + object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2NuggetHouseFisherScript, -1 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index bd208e61d..7f2c5124d 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -33,41 +33,41 @@ Route34IlexForestGateCelebiEvent: stopfollow turnobject PLAYER, DOWN opentext - writetext UnknownText_0x62e41 + writetext Route34IlexForestGateTeacher_ForestIsRestless waitbutton closetext applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a .skip: end -TeacherScript_0x62d63: +Route34IlexForestGateTeacherScript: faceplayer opentext checkevent EVENT_FOREST_IS_RESTLESS iftrue .ForestIsRestless checkevent EVENT_GOT_TM12_SWEET_SCENT iftrue .GotSweetScent - writetext UnknownText_0x62d9d + writetext Route34IlexForestGateTeacherText buttonsound verbosegiveitem TM_SWEET_SCENT iffalse .NoRoom setevent EVENT_GOT_TM12_SWEET_SCENT .GotSweetScent: - writetext UnknownText_0x62df6 + writetext Route34IlexForestGateTeacher_GotSweetScent waitbutton .NoRoom: closetext end .ForestIsRestless: - writetext UnknownText_0x62e41 + writetext Route34IlexForestGateTeacher_ForestIsRestless buttonsound closetext end -IlexGateButterfree: +Route34IlexForestGateButterfreeScript: opentext - writetext UnknownText_0x62e83 + writetext Route34IlexForestGateButterfreeText cry BUTTERFREE waitbutton closetext @@ -86,7 +86,7 @@ MovementData_0x62d9a: step RIGHT step_end -UnknownText_0x62d9d: +Route34IlexForestGateTeacherText: text "Oh, honey. You're" line "making a #DEX?" @@ -97,7 +97,7 @@ UnknownText_0x62d9d: line "this TM." done -UnknownText_0x62df6: +Route34IlexForestGateTeacher_GotSweetScent: text "It's SWEET SCENT." para "Use it wherever" @@ -107,7 +107,7 @@ UnknownText_0x62df6: line "enticed by it." done -UnknownText_0x62e41: +Route34IlexForestGateTeacher_ForestIsRestless: text "Something's wrong" line "in ILEX FOREST…" @@ -115,7 +115,7 @@ UnknownText_0x62e41: line "away right now." done -UnknownText_0x62e83: +Route34IlexForestGateButterfreeText: text "BUTTERFREE: Freeh!" done @@ -148,7 +148,7 @@ Route34IlexForestGate_MapEvents: db 0 ; bg events db 4 ; object events - object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER - object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, IlexGateButterfree, -1 + object_event 9, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateTeacherScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER + object_event 9, 4, SPRITE_BUTTERFREE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateButterfreeScript, -1 object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateLassScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + object_event 5, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route34IlexForestGateTeacherScript, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route36.asm b/maps/Route36.asm index d5f9d3787..67458e6f5 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -148,18 +148,18 @@ Route36RockSmashGuyScript: closetext end -LassScript_0x1940e0: +Route36LassScript: faceplayer opentext checkevent EVENT_FOUGHT_SUDOWOODO iftrue .ClearedSudowoodo - writetext UnknownText_0x194626 + writetext Route36LassText waitbutton closetext end .ClearedSudowoodo: - writetext UnknownText_0x19469e + writetext Route36LassText_ClearedSudowoodo waitbutton closetext end @@ -521,7 +521,7 @@ UnknownText_0x1945b8: line "opened…" done -UnknownText_0x194626: +Route36LassText: text "An odd tree is" line "blocking the way" cont "to GOLDENROD CITY." @@ -533,7 +533,7 @@ UnknownText_0x194626: line "be done about it." done -UnknownText_0x19469e: +Route36LassText_ClearedSudowoodo: text "That odd tree dis-" line "appeared without a" cont "trace." @@ -680,7 +680,7 @@ Route36_MapEvents: object_event 20, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicMark, -1 object_event 31, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 object_event 35, 9, SPRITE_WEIRD_TREE, SPRITEMOVEDATA_SUDOWOODO, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SudowoodoScript, EVENT_ROUTE_36_SUDOWOODO - object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1940e0, -1 + object_event 51, 8, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36LassScript, -1 object_event 44, 9, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36RockSmashGuyScript, -1 object_event 21, 4, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route36FruitTree, -1 object_event 46, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 61b99e037..15f69e310 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -8,7 +8,7 @@ Route39Barn_MapScripts: db 0 ; callbacks -TwinScript_0x9cc76: +Route39BarnTwin1Script: faceplayer opentext checkevent EVENT_HEALED_MOOMOO @@ -26,7 +26,7 @@ TwinScript_0x9cc76: turnobject ROUTE39BARN_TWIN1, RIGHT end -TwinScript_0x9cc90: +Route39BarnTwin2Script: faceplayer opentext checkevent EVENT_HEALED_MOOMOO @@ -198,6 +198,6 @@ Route39Barn_MapEvents: db 0 ; bg events db 3 ; object events - object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc76, -1 - object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TwinScript_0x9cc90, -1 + object_event 2, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin1Script, -1 + object_event 4, 3, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route39BarnTwin2Script, -1 object_event 3, 3, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MooMoo, -1 diff --git a/maps/Route40.asm b/maps/Route40.asm index 5e37a7bf5..4d58dfe98 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -76,13 +76,13 @@ TrainerSwimmermRandall: Route40Lass1Script: jumptextfaceplayer Route40Lass1Text -PokefanMScript_0x1a61c7: +Route40PokefanMScript: special Mobile_DummyReturnFalse iftrue .mobile - jumptextfaceplayer UnknownText_0x1a646a + jumptextfaceplayer Route40PokefanMText .mobile - jumptextfaceplayer UnknownText_0x1a649b + jumptextfaceplayer Route40PokefanMText_Mobile Route40Lass2Script: jumptextfaceplayer Route40Lass2Text @@ -241,14 +241,14 @@ Route40Lass1Text: line "the sea." done -UnknownText_0x1a646a: +Route40PokefanMText: text "Hm! There's a big" line "building up ahead!" para "What is it?" done -UnknownText_0x1a649b: +Route40PokefanMText_Mobile: text "Hm! Look at all" line "those serious-" cont "looking trainers" @@ -357,6 +357,6 @@ Route40_MapEvents: object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1 object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1 object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY - object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1 + object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40PokefanMScript, -1 object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1 object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index caa1a2873..f30927728 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -80,7 +80,7 @@ RuinsOfAlphKabutoChamberPuzzle: warpcheck end -ScientistScript_0x587a8: +RuinsOfAlphKabutoChamberScientistScript: faceplayer opentext checkcode VAR_UNOWNCOUNT @@ -200,7 +200,7 @@ UnknownText_0x589b8: cont "this wall here…" done -UnusedText_0x58a03: +RuinsOfAlphKabutoChamberUnusedText: ; unused text "The patterns on" line "the wall appear to" @@ -275,4 +275,4 @@ RuinsOfAlphKabutoChamber_MapEvents: db 2 ; object events object_event 5, 5, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberReceptionistScript, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST - object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x587a8, -1 + object_event 3, 1, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphKabutoChamberScientistScript, -1 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 71ac65040..394ea368e 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -44,18 +44,18 @@ RuinsOfAlphOutside_MapScripts: RuinsOfAlphOutsideScientistScene1: turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP turnobject PLAYER, DOWN - jump UnknownScript_0x58044 + jump RuinsOfAlphOutsideScientistSceneContinue RuinsOfAlphOutsideScientistScene2: turnobject RUINSOFALPHOUTSIDE_SCIENTIST, LEFT turnobject PLAYER, RIGHT - jump UnknownScript_0x58044 + jump RuinsOfAlphOutsideScientistSceneContinue -ScientistScript_0x58043: +RuinsOfAlphOutsideScientistScript: faceplayer -UnknownScript_0x58044: +RuinsOfAlphOutsideScientistSceneContinue: opentext - writetext UnknownText_0x580c7 + writetext RuinsOfAlphOutsideScientistText waitbutton closetext playmusic MUSIC_SHOW_ME_AROUND @@ -68,32 +68,32 @@ UnknownScript_0x58044: warpcheck end -FisherScript_0x58061: +RuinsOfAlphOutsideFisherScript: faceplayer opentext checkevent EVENT_TALKED_TO_RUINS_COWARD iftrue .Next setevent EVENT_TALKED_TO_RUINS_COWARD - writetext UnknownText_0x583a4 + writetext RuinsOfAlphOutsideFisherText1 buttonsound .Next: - writetext UnknownText_0x58420 + writetext RuinsOfAlphOutsideFisherText2 waitbutton closetext end -YoungsterScript_0x58076: +RuinsOfAlphOutsideYoungster1Script: faceplayer opentext - writetext UnknownText_0x58449 + writetext RuinsOfAlphOutsideYoungster1Text waitbutton closetext end -YoungsterScript_0x5807e: +RuinsOfAlphOutsideYoungster2Script: faceplayer opentext - writetext UnknownText_0x5848e + writetext RuinsOfAlphOutsideYoungster2Text waitbutton closetext turnobject RUINSOFALPHOUTSIDE_YOUNGSTER3, UP @@ -111,7 +111,7 @@ TrainerPsychicNathan: end TrainerSuperNerdStan: - trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script + trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, SuperNerdStanSeenText, SuperNerdStanBeatenText, 0, .Script .Script: endifjustbattled @@ -121,14 +121,14 @@ TrainerSuperNerdStan: closetext end -RuinsOfAlphOutsideSignpost0Script: - jumptext UnknownText_0x58325 +RuinsOfAlphOutsideMysteryChamberSign: + jumptext RuinsOfAlphOutsideMysteryChamberSignText -RuinsOfAlphOutsideSignpost1Script: - jumptext UnknownText_0x58342 +RuinsOfAlphSign: + jumptext RuinsOfAlphSignText -RuinsOfAlphOutsideSignpost2Script: - jumptext UnknownText_0x58362 +RuinsOfAlphResearchCenterSign: + jumptext RuinsOfAlphResearchCenterSignText MovementData_0x580ba: step RIGHT @@ -147,7 +147,7 @@ MovementData_0x580c5: step UP step_end -UnknownText_0x580c7: +RuinsOfAlphOutsideScientistText: text "Hm? That's a #-" line "DEX, isn't it?" cont "May I see it?" @@ -176,13 +176,13 @@ UnknownText_0x580c7: cont "DEX. Follow me." done -UnknownText_0x581e5: +SuperNerdStanSeenText: text "What do you want?" line "I'm studying--" cont "don't disturb me!" done -UnknownText_0x58217: +SuperNerdStanBeatenText: text "Sorry…" line "I'm frustrated by" @@ -221,17 +221,17 @@ PsychicNathanAfterBattleText: line "here." done -UnknownText_0x58325: +RuinsOfAlphOutsideMysteryChamberSignText: text "MYSTERY STONE" line "PANEL CHAMBER" done -UnknownText_0x58342: +RuinsOfAlphSignText: text "RUINS OF ALPH" line "VISITORS WELCOME" done -UnknownText_0x58362: +RuinsOfAlphResearchCenterSignText: text "RUINS OF ALPH" line "RESEARCH CENTER" @@ -239,7 +239,7 @@ UnknownText_0x58362: line "THE RUINS OF ALPH" done -UnknownText_0x583a4: +RuinsOfAlphOutsideFisherText1: text "While exploring" line "the RUINS, we" @@ -253,14 +253,14 @@ UnknownText_0x583a4: line "careful too." done -UnknownText_0x58420: +RuinsOfAlphOutsideFisherText2: text "The RUINS hide a" line "huge secret!" para "…I think…" done -UnknownText_0x58449: +RuinsOfAlphOutsideYoungster1Text: text "There are many" line "kinds of UNOWN, so" @@ -268,7 +268,7 @@ UnknownText_0x58449: line "our secret codes." done -UnknownText_0x5848e: +RuinsOfAlphOutsideYoungster2Text: text "A… H… E… A… D…" line "Hmm…" @@ -299,13 +299,13 @@ RuinsOfAlphOutside_MapEvents: coord_event 10, 15, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX, RuinsOfAlphOutsideScientistScene2 db 3 ; bg events - bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideSignpost0Script - bg_event 12, 16, BGEVENT_READ, RuinsOfAlphOutsideSignpost1Script - bg_event 18, 12, BGEVENT_READ, RuinsOfAlphOutsideSignpost2Script + bg_event 16, 8, BGEVENT_READ, RuinsOfAlphOutsideMysteryChamberSign + bg_event 12, 16, BGEVENT_READ, RuinsOfAlphSign + bg_event 18, 12, BGEVENT_READ, RuinsOfAlphResearchCenterSign db 5 ; object events object_event 4, 20, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPsychicNathan, -1 - object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST - object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER - object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS - object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideScientistScript, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + object_event 13, 17, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideFisherScript, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + object_event 14, 11, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideYoungster1Script, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + object_event 12, 8, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphOutsideYoungster2Script, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index c6e6d2645..c5f1c321c 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -68,18 +68,18 @@ Script_ArriveFromGoldenrod: closetext end -GymGuyScript_0x18a875: +SaffronMagnetTrainStationGymGuyScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x18a883 - writetext UnknownText_0x18a9ca + iftrue .ReturnedMachinePart + writetext SaffronMagnetTrainStationGymGuyText waitbutton closetext end -UnknownScript_0x18a883: - writetext UnknownText_0x18aa61 +.ReturnedMachinePart: + writetext SaffronMagnetTrainStationGymGuyText_ReturnedMachinePart waitbutton closetext end @@ -164,7 +164,7 @@ UnknownText_0x18a993: line "again." done -UnknownText_0x18a9ca: +SaffronMagnetTrainStationGymGuyText: text "The MAGNET TRAIN" line "is a super-modern" @@ -180,7 +180,7 @@ UnknownText_0x18a9ca: cont "tricity…" done -UnknownText_0x18aa61: +SaffronMagnetTrainStationGymGuyText_ReturnedMachinePart: text "Whew…" para "How many times" @@ -229,6 +229,6 @@ SaffronMagnetTrainStation_MapEvents: db 4 ; object events object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 - object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1 + object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationGymGuyScript, -1 object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 662084b25..d14f19b23 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -7,23 +7,23 @@ SilphCo1F_MapScripts: db 0 ; callbacks -SilphCoReceptionist: +SilphCoReceptionistScript: jumptextfaceplayer SilphCoReceptionistText -OfficerScript_0x18abe8: +SilphCoOfficerScript: faceplayer opentext checkevent EVENT_GOT_UP_GRADE - iftrue UnknownScript_0x18abfd - writetext UnknownText_0x18ac36 + iftrue .GotUpGrade + writetext SilphCoOfficerText buttonsound verbosegiveitem UP_GRADE - iffalse UnknownScript_0x18ac01 + iffalse .NoRoom setevent EVENT_GOT_UP_GRADE -UnknownScript_0x18abfd: - writetext UnknownText_0x18aca8 +.GotUpGrade: + writetext SilphCoOfficerText_GotUpGrade waitbutton -UnknownScript_0x18ac01: +.NoRoom: closetext end @@ -33,7 +33,7 @@ SilphCoReceptionistText: cont "OFFICE BUILDING." done -UnknownText_0x18ac36: +SilphCoOfficerText: text "Only employees are" line "permitted to go" cont "upstairs." @@ -45,7 +45,7 @@ UnknownText_0x18ac36: line "little souvenir." done -UnknownText_0x18aca8: +SilphCoOfficerText_GotUpGrade: text "It's SILPH CO.'s" line "latest product." @@ -65,5 +65,5 @@ SilphCo1F_MapEvents: db 0 ; bg events db 2 ; object events - object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionist, -1 - object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18abe8, -1 + object_event 4, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoReceptionistScript, -1 + object_event 13, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SilphCoOfficerScript, -1 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 21a8f73e4..3098815e2 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -7,12 +7,12 @@ SlowpokeWellB2F_MapScripts: db 0 ; callbacks -GymGuyScript_0x5ad0b: +SlowpokeWellB2FGymGuyScript: faceplayer opentext checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL iftrue .GotKingsRock - writetext UnknownText_0x5ad2a + writetext SlowpokeWellB2FGymGuyText buttonsound verbosegiveitem KINGS_ROCK iffalse .NoRoom @@ -22,7 +22,7 @@ GymGuyScript_0x5ad0b: end .GotKingsRock: - writetext UnknownText_0x5adf2 + writetext SlowpokeWellB2FGymGuyText_GotKingsRock waitbutton closetext end @@ -30,7 +30,7 @@ GymGuyScript_0x5ad0b: SlowpokeWellB2FTMRainDance: itemball TM_RAIN_DANCE -UnknownText_0x5ad2a: +SlowpokeWellB2FGymGuyText: text "I'm waiting to see" line "SLOWPOKE's moment" cont "of evolution." @@ -50,7 +50,7 @@ UnknownText_0x5ad2a: cont "you." done -UnknownText_0x5adf2: +SlowpokeWellB2FGymGuyText_GotKingsRock: text "I'm going to be" line "like SLOWPOKE." @@ -70,5 +70,5 @@ SlowpokeWellB2F_MapEvents: db 0 ; bg events db 2 ; object events - object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1 + object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, SlowpokeWellB2FGymGuyScript, -1 object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 90bd9387c..3bc3ccc21 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -20,7 +20,7 @@ SproutTower3F_MapScripts: .DummyScene1: end -UnknownScript_0x184947: +SproutTower3FRivalScene: turnobject PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 special FadeOutMusic @@ -65,7 +65,7 @@ SageLiScript: faceplayer opentext checkevent EVENT_GOT_HM05_FLASH - iftrue UnknownScript_0x1849d1 + iftrue .GotFlash writetext SageLiSeenText waitbutton closetext @@ -84,7 +84,7 @@ SageLiScript: closetext end -UnknownScript_0x1849d1: +.GotFlash: writetext UnknownText_0x184d88 waitbutton closetext @@ -334,7 +334,7 @@ SproutTower3F_MapEvents: warp_event 10, 14, SPROUT_TOWER_2F, 4 db 1 ; coord events - coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947 + coord_event 11, 9, SCENE_DEFAULT, SproutTower3FRivalScene db 6 ; bg events bg_event 8, 1, BGEVENT_READ, SproutTower3FStatue diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index bd11dd551..f978c8c66 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -81,8 +81,9 @@ UnionCave1FPotion: UnionCave1FAwakening: itemball AWAKENING -UnknownScript_0x59c08: - jumptext UnknownText_0x59f29 +UnionCave1FUnusedSign: +; unused + jumptext UnionCave1FUnusedSignText HikerRussellSeenText: text "You're headed to" @@ -193,7 +194,7 @@ FirebreatherRayAfterBattleText: cont "up this cave." done -UnknownText_0x59f29: +UnionCave1FUnusedSignText: text "UNION CAVE" done diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index ecbbf2f1e..26caecfec 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -41,13 +41,13 @@ VermilionCitySuperNerdScript: VermilionSnorlax: opentext special SnorlaxAwake - iftrue UnknownScript_0x1aa9ab + iftrue .Awake writetext UnknownText_0x1aab64 waitbutton closetext end -UnknownScript_0x1aa9ab: +.Awake: writetext UnknownText_0x1aab84 pause 15 cry SNORLAX diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index b231bfa8b..8b4b3b67d 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -141,7 +141,7 @@ VermilionPortNotRidingMoveAwayScript: applymovement PLAYER, MovementData_0x74ef5 end -SailorScript_0x74e97: +VermilionPortSailorScript: faceplayer opentext checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 @@ -184,7 +184,7 @@ SailorScript_0x74e97: closetext end -SuperNerdScript_0x74ee6: +VermilionPortSuperNerdScript: faceplayer opentext writetext UnknownText_0x750a6 @@ -311,5 +311,5 @@ VermilionPort_MapEvents: db 3 ; object events object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangway, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 - object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 + object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorScript, -1 + object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSuperNerdScript, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 2054d9da3..ec2747865 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -14,10 +14,10 @@ VioletNicknameSpeechHouseTeacherScript: VioletNicknameSpeechHouseLassScript: jumptextfaceplayer VioletNicknameSpeechHouseLassText -BirdScript_0x693ef: +VioletNicknameSpeechHouseBirdScript: faceplayer opentext - writetext UnknownText_0x6947c + writetext VioletNicknameSpeechHouseBirdText cry PIDGEY waitbutton closetext @@ -38,7 +38,7 @@ VioletNicknameSpeechHouseLassText: line "STRAWBERRY!" done -UnknownText_0x6947c: +VioletNicknameSpeechHouseBirdText: text "STRAWBERRY: Pijji!" done @@ -56,4 +56,4 @@ VioletNicknameSpeechHouse_MapEvents: db 3 ; object events object_event 2, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseTeacherScript, -1 object_event 6, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseLassScript, -1 - object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BirdScript_0x693ef, -1 + object_event 5, 2, SPRITE_BIRD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, VioletNicknameSpeechHouseBirdScript, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 2eca18e19..e1136222a 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -50,7 +50,7 @@ WiseTriosRoomSage2Script: WiseTriosRoomSage3Script: jumptextfaceplayer WiseTriosRoomSage3Text -UnknownScript_0x985a3: +WiseTriosRoom_CannotEnterTinTowerScript: turnobject WISETRIOSROOM_SAGE3, UP turnobject PLAYER, DOWN showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20 @@ -91,7 +91,7 @@ TrainerSageKoji: .Script: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x9861b + iftrue .KojiAllowsPassage pause 10 showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE6, 20 opentext @@ -106,7 +106,7 @@ TrainerSageKoji: setscene SCENE_FINISHED end -UnknownScript_0x9861b: +.KojiAllowsPassage: opentext writetext UnknownText_0x98db5 waitbutton @@ -351,7 +351,7 @@ WiseTriosRoom_MapEvents: warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5 db 1 ; coord events - coord_event 7, 4, SCENE_DEFAULT, UnknownScript_0x985a3 + coord_event 7, 4, SCENE_DEFAULT, WiseTriosRoom_CannotEnterTinTowerScript db 0 ; bg events