From 1b8bf4fd7e7b23af716240d8986e5fa018eaba6c Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sun, 19 Nov 2023 00:46:03 +0000 Subject: [PATCH] Identify more map script labels --- pokeblue.map | 92 +++++++++++++++++++++++----------------------- pokeblue.sym | 92 +++++++++++++++++++++++----------------------- pokeblue_debug.map | 92 +++++++++++++++++++++++----------------------- pokeblue_debug.sym | 92 +++++++++++++++++++++++----------------------- pokeblue_vc.map | 92 +++++++++++++++++++++++----------------------- pokeblue_vc.sym | 92 +++++++++++++++++++++++----------------------- pokered.map | 92 +++++++++++++++++++++++----------------------- pokered.sym | 92 +++++++++++++++++++++++----------------------- pokered_vc.map | 92 +++++++++++++++++++++++----------------------- pokered_vc.sym | 92 +++++++++++++++++++++++----------------------- 10 files changed, 460 insertions(+), 460 deletions(-) diff --git a/pokeblue.map b/pokeblue.map index 425899fea..67a4eaacb 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -4015,7 +4015,7 @@ ROMX bank #6: $5476 = PewterCityGymSignText $547b = PewterCitySignText $5480 = CeruleanCity_Script - $548c = CeruleanCityScript_1948c + $548c = CeruleanCityClearScripts $549d = CeruleanCity_ScriptPointers $54a7 = CeruleanCityRocketDefeatedScript $54c8 = CeruleanCityDefaultScript @@ -4026,7 +4026,7 @@ ROMX bank #6: $554f = CeruleanCityCoords1 $5554 = CeruleanCityCoords2 $5559 = CeruleanCityMovement1 - $555d = CeruleanCityScript_1955d + $555d = CeruleanCityFaceRivalScript $5567 = CeruleanCityRivalBattleScript $5598 = CeruleanCityRivalBattleScript.NotSquirtle $55a0 = CeruleanCityRivalBattleScript.Charmander @@ -8219,7 +8219,7 @@ ROMX bank #17: $552d = RocketHideout4TrainerHeader2 $553a = RocketHideoutB4FGiovanniText $5571 = RocketHideoutB4FGiovanniText.beat_giovanni - $5577 = RocketHideoutB4FGiovanniText.asm_209f0 + $5577 = RocketHideoutB4FGiovanniText.done $557a = RocketHideoutB4FGiovanniText.ImpressedYouGotHereText $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8235,19 +8235,19 @@ ROMX bank #17: $55c5 = RocketHideoutB4FRocket2BattleText $55ca = RocketHideoutB4FRocket2EndBattleText $55cf = RocketHideoutB4FRocket2AfterBattleText - $55e9 = RocketHideoutB4FRocket2AfterBattleText.asm_455e9 + $55e9 = RocketHideoutB4FRocket2AfterBattleText.done $55ec = RocketHideoutB4FRocket2AfterBattleText.Text $55f1 = RocketHideoutB4F_Object $5650 = RocketHideoutB4F_Blocks $5704 = RocketHideoutElevator_h $5710 = RocketHideoutElevator_Script - $572c = RocketHideoutElevatorGetWarpsScript - $573a = RocketHideoutElevatorGetWarpsScript.SetWarpEntries + $572c = RocketHideoutElevatorStoreWarpEntriesScript + $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry $5741 = RocketHideoutElevatorScript $5754 = RocketHideoutElavatorFloors $5759 = RocketHideoutElevatorWarpMaps $575f = RocketHideoutElevatorShakeScript - $575f = RocketHideoutElevatorWarpMapsEnd + $575f = RocketHideoutElevatorWarpMaps.End $576b = RocketHideoutElevator_TextPointers $576d = RocketHideoutElevatorText $5782 = RocketHideoutElevatorText.no_key @@ -8257,13 +8257,13 @@ ROMX bank #17: $57a8 = RocketHideoutElevator_Blocks $57b4 = SilphCoElevator_h $57c0 = SilphCoElevator_Script - $57dc = SilphCoElevatorScript_457dc - $57ea = SilphCoElevatorScript_457dc.StoreWarpEntry + $57dc = SilphCoElevatorStoreWarpEntriesScript + $57ea = SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry $57f1 = SilphCoElevatorCopyWarpMapsScript $5804 = SilphCoElevatorFloors $5811 = SilphCoElevatorWarpMaps - $5827 = SilphCoElevatorShakeElevatorScript - $5827 = SilphCoElevatorWarpMapsEnd + $5827 = SilphCoElevatorShakeScript + $5827 = SilphCoElevatorWarpMaps.End $5833 = SilphCoElevator_TextPointers $5835 = SilphCoElevatorElevatorText $5844 = SilphCoElevator_Object @@ -8669,13 +8669,13 @@ ROMX bank #18: $45cc = CeladonMartRoof_Blocks $45f4 = CeladonMartElevator_h $4600 = CeladonMartElevator_Script - $461c = CeladonMartElevatorScript_4861c - $462a = CeladonMartElevatorScript_4862a - $4631 = CeladonMartElevatorScript_48631 + $461c = CeladonMartElevatorStoreWarpEntriesScript + $462a = CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry + $4631 = CeladonMartElevatorCopyWarpMapsScript $4643 = CeladonMartElevatorFloors $464a = CeladonMartElevatorWarpMaps - $4654 = CeladonMartElevatorScript_48654 - $4654 = CeladonMartElevatorWarpMapsEnd + $4654 = CeladonMartElevatorShakeScript + $4654 = CeladonMartElevatorWarpMaps.End $465c = CeladonMartElevator_TextPointers $465e = CeladonMartElevatorText $466d = CeladonMartElevator_Object @@ -8791,16 +8791,16 @@ ROMX bank #18: $4bb1 = GameCorner_h $4bbd = GameCorner_Script $4bcf = GameCornerSelectLuckySlotMachine - $4be2 = GameCornerSelectLuckySlotMachine.asm_48be2 + $4be2 = GameCornerSelectLuckySlotMachine.not_max $4bec = GameCornerSetRocketHideoutDoorTile $4c07 = GameCornerReenterMapAfterPlayerLoss $4c12 = GameCorner_ScriptPointers $4c18 = GameCornerDefaultScript $4c19 = GameCornerRocketBattleScript - $4c43 = GameCornerRocketBattleScript.asm_48c43 - $4c4d = GameCornerRocketBattleScript.asm_48c4d - $4c5a = GameCornerMovement_Grunt_WalkAroundPlayer - $4c63 = GameCornerMovement_Grunt_WalkDirect + $4c43 = GameCornerRocketBattleScript.not_direct_movement + $4c4d = GameCornerRocketBattleScript.got_rocket_movement + $4c5a = GameCornerMovement_Rocket_WalkAroundPlayer + $4c63 = GameCornerMovement_Rocket_WalkDirect $4c69 = GameCornerRocketExitScript $4c8a = GameCorner_TextPointers $4ca4 = GameCornerBeauty1Text @@ -9106,8 +9106,8 @@ ROMX bank #18: $5b97 = MtMoon1F_Blocks $5cff = MtMoonB2F_h $5d0b = MtMoonB2F_Script - $5d31 = MtMoonB2F_Script.asm_49d31 - $5d37 = CoordsData_49d37 + $5d31 = MtMoonB2F_Script.enable_battles + $5d37 = MtMoonB2FFossilAreaCoords $5d58 = MtMoonB2FResetScripts $5d63 = MtMoonB2F_ScriptPointers $5d6f = MtMoonB2FDefaultScript @@ -9487,7 +9487,7 @@ ROMX bank #20: $4eda = Route22GetRivalTrainerNoByStarterScript.next_trainer_no $4ee1 = Route22GetRivalTrainerNoByStarterScript.got_trainer_no $4ee6 = Route22MoveRivalRightScript - $4ef1 = Route22MoveRivalRightScript.asm_50ef1 + $4ef1 = Route22MoveRivalRightScript.skip_first_right $4efb = Route22RivalMovementData $4f00 = Route22DefaultScript $4f2d = Route22DefaultScript.Route22RivalBattleCoords @@ -9545,9 +9545,9 @@ ROMX bank #20: $51e9 = Route23SetVictoryRoadBoulders $5213 = Route23_ScriptPointers $5219 = Route23DefaultScript - $5224 = Route23DefaultScript.asm_51224 - $5237 = Route23DefaultScript.asm_51237 - $5255 = YCoordsData_51255 + $5224 = Route23DefaultScript.loop + $5237 = Route23DefaultScript.not_past_victory_road + $5255 = Route23GuardsYCoords $525d = Route23CopyBadgeTextScript $526e = Route23CopyBadgeTextScript.copyTextLoop $5276 = BadgeTextPointers @@ -10930,11 +10930,11 @@ ROMX bank #22: $5929 = Route15CooltrainerF4AfterBattleText $592e = Route15SignText $5933 = Route16_Script - $5946 = Route16Script_59946 + $5946 = Route16ResetScripts $5951 = Route16_ScriptPointers $5959 = Route16DefaultScript - $598f = Route16SnorlaxBattleScript - $59a8 = Route16SnorlaxBattleScript.caught + $598f = Route16SnorlaxPostBattleScript + $59a8 = Route16SnorlaxPostBattleScript.caught $59b9 = Route16_TextPointers $59cf = Route16TrainerHeaders $59cf = Route16TrainerHeader0 @@ -11147,13 +11147,13 @@ ROMX bank #22: $63e9 = LancesRoom_Blocks $6492 = HallOfFame_h $649e = HallOfFame_Script - $64aa = HallofFameRoomScript_5a4aa + $64aa = HallofFameRoomClearScripts $64b2 = HallOfFame_ScriptPointers $64ba = HallOfFameNoopScript $64bb = HallOfFameResetEventsAndSaveScript $64ff = HallOfFameResetEventsAndSaveScript.delayLoop $650d = HallOfFameDefaultScript - $6528 = RLEMovement5a528 + $6528 = HallOfFakeEntryMovement $652b = HallOfFameOakCongratulationsScript $656a = HallOfFame_TextPointers $656c = HallOfFameOakText @@ -11462,11 +11462,11 @@ ROMX bank #23: $4d21 = CopycatsHouse2F_Object $4d51 = FightingDojo_h $4d5d = FightingDojo_Script - $4d70 = FightingDojoScript_5cd70 + $4d70 = FightingDojoResetScripts $4d7b = FightingDojo_ScriptPointers $4d83 = FightingDojoDefaultScript $4dc6 = FightingDojoKarateMasterPostBattleScript - $4de4 = FightingDojoKarateMasterPostBattleScript.asm_5cde4 + $4de4 = FightingDojoKarateMasterPostBattleScript.already_facing $4e03 = FightingDojo_TextPointers $4e13 = FightingDojoTrainerHeaders $4e13 = FightingDojoTrainerHeader0 @@ -11960,10 +11960,10 @@ ROMX bank #24: $506b = GiveFossilToCinnabarLab.choseDomeFossil $506d = GiveFossilToCinnabarLab.fossilSelected $50a7 = GiveFossilToCinnabarLab.cancelledGivingFossil - $50ae = LabFossil_610ae - $50b3 = LabFossil_610b3 - $50b8 = LabFossil_610b8 - $50bd = LabFossil_610bd + $50ae = GiveFossilToCinnabarLab.ScientistSeesFossilText + $50b3 = GiveFossilToCinnabarLab.ScientistTakesFossilText + $50b8 = GiveFossilToCinnabarLab.GoForAWalkText + $50bd = GiveFossilToCinnabarLab.ComeAgainText $50c2 = PrintFossilsInBag $50c8 = PrintFossilsInBag.loop $50eb = LoadFossilItemAndMonName @@ -13169,8 +13169,8 @@ ROMX bank #29: $4e0a = CeruleanBadgeHouse_Script $4e14 = CeruleanBadgeHouse_TextPointers $4e16 = CeruleanBadgeHouseMiddleAgedManText - $4e24 = CeruleanBadgeHouseMiddleAgedManText.asm_74e23 - $4e61 = CeruleanBadgeHouseMiddleAgedManText.asm_74e60 + $4e24 = CeruleanBadgeHouseMiddleAgedManText.loop + $4e61 = CeruleanBadgeHouseMiddleAgedManText.done $4e6e = CeruleanBadgeHouseMiddleAgedManText.BadgeItemList $4e78 = CeruleanBadgeHouseMiddleAgedManText.Text $4e7d = CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13364,7 +13364,7 @@ ROMX bank #29: $57dd = CinnabarGymGetOpponentTextScript $57f2 = CinnabarGymFlagAction $57f7 = CinnabarGymOpenGateScript - $581c = CinnabarGymOpenGateScript.asm_7581b + $581c = CinnabarGymOpenGateScript.no_sound $584b = CinnabarGymBlainePostBattleScript $5858 = CinnabarGymReceiveTM38 $587a = CinnabarGymReceiveTM38.BagFull @@ -13522,7 +13522,7 @@ ROMX bank #29: $609a = ChampionsRoomPlayerFollowsOakScript $60b5 = WalkToHallOfFame_RLEMovement $60ba = ChampionsRoomCleanupScript - $60c9 = RivalScript_760c8 + $60c9 = ChampionsRoom_DisplayTextID_AllowABSelectStart $60d7 = ChampionsRoom_TextPointers $60e1 = ChampionsRoomRivalText $60ef = ChampionsRoomRivalText.printText @@ -17199,10 +17199,10 @@ ROMX bank #40: $5145 = _CinnabarLabFossilRoomScientist1NoFossilsText $5156 = _CinnabarLabFossilRoomScientist1GoForAWalkText $518d = _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText - $51d6 = _Lab4Text_610ae - $5259 = _Lab4Text_610b3 - $528f = _Lab4Text_610b8 - $52c6 = _Lab4Text_610bd + $51d6 = _CinnabarLabFossilRoomScientist1SeesFossilText + $5259 = _CinnabarLabFossilRoomScientist1TakesFossilText + $528f = _CinnabarLabFossilRoomScientist1GoForAWalkText2 + $52c6 = _CinnabarLabFossilRoomScientist1ComeAgainText $52de = _CinnabarPokecenterCooltrainerFText $533e = _CinnabarPokecenterGentlemanText $539b = _CinnabarMartSilphWorkerFText diff --git a/pokeblue.sym b/pokeblue.sym index d72fe884c..a36614c71 100644 --- a/pokeblue.sym +++ b/pokeblue.sym @@ -3958,7 +3958,7 @@ 06:5476 PewterCityGymSignText 06:547b PewterCitySignText 06:5480 CeruleanCity_Script -06:548c CeruleanCityScript_1948c +06:548c CeruleanCityClearScripts 06:549d CeruleanCity_ScriptPointers 06:54a7 CeruleanCityRocketDefeatedScript 06:54c8 CeruleanCityDefaultScript @@ -3969,7 +3969,7 @@ 06:554f CeruleanCityCoords1 06:5554 CeruleanCityCoords2 06:5559 CeruleanCityMovement1 -06:555d CeruleanCityScript_1955d +06:555d CeruleanCityFaceRivalScript 06:5567 CeruleanCityRivalBattleScript 06:5598 CeruleanCityRivalBattleScript.NotSquirtle 06:55a0 CeruleanCityRivalBattleScript.Charmander @@ -8090,7 +8090,7 @@ 11:552d RocketHideout4TrainerHeader2 11:553a RocketHideoutB4FGiovanniText 11:5571 RocketHideoutB4FGiovanniText.beat_giovanni -11:5577 RocketHideoutB4FGiovanniText.asm_209f0 +11:5577 RocketHideoutB4FGiovanniText.done 11:557a RocketHideoutB4FGiovanniText.ImpressedYouGotHereText 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8106,19 +8106,19 @@ 11:55c5 RocketHideoutB4FRocket2BattleText 11:55ca RocketHideoutB4FRocket2EndBattleText 11:55cf RocketHideoutB4FRocket2AfterBattleText -11:55e9 RocketHideoutB4FRocket2AfterBattleText.asm_455e9 +11:55e9 RocketHideoutB4FRocket2AfterBattleText.done 11:55ec RocketHideoutB4FRocket2AfterBattleText.Text 11:55f1 RocketHideoutB4F_Object 11:5650 RocketHideoutB4F_Blocks 11:5704 RocketHideoutElevator_h 11:5710 RocketHideoutElevator_Script -11:572c RocketHideoutElevatorGetWarpsScript -11:573a RocketHideoutElevatorGetWarpsScript.SetWarpEntries +11:572c RocketHideoutElevatorStoreWarpEntriesScript +11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry 11:5741 RocketHideoutElevatorScript 11:5754 RocketHideoutElavatorFloors 11:5759 RocketHideoutElevatorWarpMaps 11:575f RocketHideoutElevatorShakeScript -11:575f RocketHideoutElevatorWarpMapsEnd +11:575f RocketHideoutElevatorWarpMaps.End 11:576b RocketHideoutElevator_TextPointers 11:576d RocketHideoutElevatorText 11:5782 RocketHideoutElevatorText.no_key @@ -8128,13 +8128,13 @@ 11:57a8 RocketHideoutElevator_Blocks 11:57b4 SilphCoElevator_h 11:57c0 SilphCoElevator_Script -11:57dc SilphCoElevatorScript_457dc -11:57ea SilphCoElevatorScript_457dc.StoreWarpEntry +11:57dc SilphCoElevatorStoreWarpEntriesScript +11:57ea SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry 11:57f1 SilphCoElevatorCopyWarpMapsScript 11:5804 SilphCoElevatorFloors 11:5811 SilphCoElevatorWarpMaps -11:5827 SilphCoElevatorShakeElevatorScript -11:5827 SilphCoElevatorWarpMapsEnd +11:5827 SilphCoElevatorShakeScript +11:5827 SilphCoElevatorWarpMaps.End 11:5833 SilphCoElevator_TextPointers 11:5835 SilphCoElevatorElevatorText 11:5844 SilphCoElevator_Object @@ -8532,13 +8532,13 @@ 12:45cc CeladonMartRoof_Blocks 12:45f4 CeladonMartElevator_h 12:4600 CeladonMartElevator_Script -12:461c CeladonMartElevatorScript_4861c -12:462a CeladonMartElevatorScript_4862a -12:4631 CeladonMartElevatorScript_48631 +12:461c CeladonMartElevatorStoreWarpEntriesScript +12:462a CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry +12:4631 CeladonMartElevatorCopyWarpMapsScript 12:4643 CeladonMartElevatorFloors 12:464a CeladonMartElevatorWarpMaps -12:4654 CeladonMartElevatorScript_48654 -12:4654 CeladonMartElevatorWarpMapsEnd +12:4654 CeladonMartElevatorShakeScript +12:4654 CeladonMartElevatorWarpMaps.End 12:465c CeladonMartElevator_TextPointers 12:465e CeladonMartElevatorText 12:466d CeladonMartElevator_Object @@ -8654,16 +8654,16 @@ 12:4bb1 GameCorner_h 12:4bbd GameCorner_Script 12:4bcf GameCornerSelectLuckySlotMachine -12:4be2 GameCornerSelectLuckySlotMachine.asm_48be2 +12:4be2 GameCornerSelectLuckySlotMachine.not_max 12:4bec GameCornerSetRocketHideoutDoorTile 12:4c07 GameCornerReenterMapAfterPlayerLoss 12:4c12 GameCorner_ScriptPointers 12:4c18 GameCornerDefaultScript 12:4c19 GameCornerRocketBattleScript -12:4c43 GameCornerRocketBattleScript.asm_48c43 -12:4c4d GameCornerRocketBattleScript.asm_48c4d -12:4c5a GameCornerMovement_Grunt_WalkAroundPlayer -12:4c63 GameCornerMovement_Grunt_WalkDirect +12:4c43 GameCornerRocketBattleScript.not_direct_movement +12:4c4d GameCornerRocketBattleScript.got_rocket_movement +12:4c5a GameCornerMovement_Rocket_WalkAroundPlayer +12:4c63 GameCornerMovement_Rocket_WalkDirect 12:4c69 GameCornerRocketExitScript 12:4c8a GameCorner_TextPointers 12:4ca4 GameCornerBeauty1Text @@ -8969,8 +8969,8 @@ 12:5b97 MtMoon1F_Blocks 12:5cff MtMoonB2F_h 12:5d0b MtMoonB2F_Script -12:5d31 MtMoonB2F_Script.asm_49d31 -12:5d37 CoordsData_49d37 +12:5d31 MtMoonB2F_Script.enable_battles +12:5d37 MtMoonB2FFossilAreaCoords 12:5d58 MtMoonB2FResetScripts 12:5d63 MtMoonB2F_ScriptPointers 12:5d6f MtMoonB2FDefaultScript @@ -9338,7 +9338,7 @@ 14:4eda Route22GetRivalTrainerNoByStarterScript.next_trainer_no 14:4ee1 Route22GetRivalTrainerNoByStarterScript.got_trainer_no 14:4ee6 Route22MoveRivalRightScript -14:4ef1 Route22MoveRivalRightScript.asm_50ef1 +14:4ef1 Route22MoveRivalRightScript.skip_first_right 14:4efb Route22RivalMovementData 14:4f00 Route22DefaultScript 14:4f2d Route22DefaultScript.Route22RivalBattleCoords @@ -9396,9 +9396,9 @@ 14:51e9 Route23SetVictoryRoadBoulders 14:5213 Route23_ScriptPointers 14:5219 Route23DefaultScript -14:5224 Route23DefaultScript.asm_51224 -14:5237 Route23DefaultScript.asm_51237 -14:5255 YCoordsData_51255 +14:5224 Route23DefaultScript.loop +14:5237 Route23DefaultScript.not_past_victory_road +14:5255 Route23GuardsYCoords 14:525d Route23CopyBadgeTextScript 14:526e Route23CopyBadgeTextScript.copyTextLoop 14:5276 BadgeTextPointers @@ -10763,11 +10763,11 @@ 16:5929 Route15CooltrainerF4AfterBattleText 16:592e Route15SignText 16:5933 Route16_Script -16:5946 Route16Script_59946 +16:5946 Route16ResetScripts 16:5951 Route16_ScriptPointers 16:5959 Route16DefaultScript -16:598f Route16SnorlaxBattleScript -16:59a8 Route16SnorlaxBattleScript.caught +16:598f Route16SnorlaxPostBattleScript +16:59a8 Route16SnorlaxPostBattleScript.caught 16:59b9 Route16_TextPointers 16:59cf Route16TrainerHeaders 16:59cf Route16TrainerHeader0 @@ -10980,13 +10980,13 @@ 16:63e9 LancesRoom_Blocks 16:6492 HallOfFame_h 16:649e HallOfFame_Script -16:64aa HallofFameRoomScript_5a4aa +16:64aa HallofFameRoomClearScripts 16:64b2 HallOfFame_ScriptPointers 16:64ba HallOfFameNoopScript 16:64bb HallOfFameResetEventsAndSaveScript 16:64ff HallOfFameResetEventsAndSaveScript.delayLoop 16:650d HallOfFameDefaultScript -16:6528 RLEMovement5a528 +16:6528 HallOfFakeEntryMovement 16:652b HallOfFameOakCongratulationsScript 16:656a HallOfFame_TextPointers 16:656c HallOfFameOakText @@ -11287,11 +11287,11 @@ 17:4d21 CopycatsHouse2F_Object 17:4d51 FightingDojo_h 17:4d5d FightingDojo_Script -17:4d70 FightingDojoScript_5cd70 +17:4d70 FightingDojoResetScripts 17:4d7b FightingDojo_ScriptPointers 17:4d83 FightingDojoDefaultScript 17:4dc6 FightingDojoKarateMasterPostBattleScript -17:4de4 FightingDojoKarateMasterPostBattleScript.asm_5cde4 +17:4de4 FightingDojoKarateMasterPostBattleScript.already_facing 17:4e03 FightingDojo_TextPointers 17:4e13 FightingDojoTrainerHeaders 17:4e13 FightingDojoTrainerHeader0 @@ -11778,10 +11778,10 @@ 18:506b GiveFossilToCinnabarLab.choseDomeFossil 18:506d GiveFossilToCinnabarLab.fossilSelected 18:50a7 GiveFossilToCinnabarLab.cancelledGivingFossil -18:50ae LabFossil_610ae -18:50b3 LabFossil_610b3 -18:50b8 LabFossil_610b8 -18:50bd LabFossil_610bd +18:50ae GiveFossilToCinnabarLab.ScientistSeesFossilText +18:50b3 GiveFossilToCinnabarLab.ScientistTakesFossilText +18:50b8 GiveFossilToCinnabarLab.GoForAWalkText +18:50bd GiveFossilToCinnabarLab.ComeAgainText 18:50c2 PrintFossilsInBag 18:50c8 PrintFossilsInBag.loop 18:50eb LoadFossilItemAndMonName @@ -12958,8 +12958,8 @@ 1d:4e0a CeruleanBadgeHouse_Script 1d:4e14 CeruleanBadgeHouse_TextPointers 1d:4e16 CeruleanBadgeHouseMiddleAgedManText -1d:4e24 CeruleanBadgeHouseMiddleAgedManText.asm_74e23 -1d:4e61 CeruleanBadgeHouseMiddleAgedManText.asm_74e60 +1d:4e24 CeruleanBadgeHouseMiddleAgedManText.loop +1d:4e61 CeruleanBadgeHouseMiddleAgedManText.done 1d:4e6e CeruleanBadgeHouseMiddleAgedManText.BadgeItemList 1d:4e78 CeruleanBadgeHouseMiddleAgedManText.Text 1d:4e7d CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13151,7 +13151,7 @@ 1d:57dd CinnabarGymGetOpponentTextScript 1d:57f2 CinnabarGymFlagAction 1d:57f7 CinnabarGymOpenGateScript -1d:581c CinnabarGymOpenGateScript.asm_7581b +1d:581c CinnabarGymOpenGateScript.no_sound 1d:584b CinnabarGymBlainePostBattleScript 1d:5858 CinnabarGymReceiveTM38 1d:587a CinnabarGymReceiveTM38.BagFull @@ -13309,7 +13309,7 @@ 1d:609a ChampionsRoomPlayerFollowsOakScript 1d:60b5 WalkToHallOfFame_RLEMovement 1d:60ba ChampionsRoomCleanupScript -1d:60c9 RivalScript_760c8 +1d:60c9 ChampionsRoom_DisplayTextID_AllowABSelectStart 1d:60d7 ChampionsRoom_TextPointers 1d:60e1 ChampionsRoomRivalText 1d:60ef ChampionsRoomRivalText.printText @@ -16926,10 +16926,10 @@ 28:5145 _CinnabarLabFossilRoomScientist1NoFossilsText 28:5156 _CinnabarLabFossilRoomScientist1GoForAWalkText 28:518d _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText -28:51d6 _Lab4Text_610ae -28:5259 _Lab4Text_610b3 -28:528f _Lab4Text_610b8 -28:52c6 _Lab4Text_610bd +28:51d6 _CinnabarLabFossilRoomScientist1SeesFossilText +28:5259 _CinnabarLabFossilRoomScientist1TakesFossilText +28:528f _CinnabarLabFossilRoomScientist1GoForAWalkText2 +28:52c6 _CinnabarLabFossilRoomScientist1ComeAgainText 28:52de _CinnabarPokecenterCooltrainerFText 28:533e _CinnabarPokecenterGentlemanText 28:539b _CinnabarMartSilphWorkerFText diff --git a/pokeblue_debug.map b/pokeblue_debug.map index f21ef36ad..87e46077d 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -4025,7 +4025,7 @@ ROMX bank #6: $547a = PewterCityGymSignText $547f = PewterCitySignText $5484 = CeruleanCity_Script - $5490 = CeruleanCityScript_1948c + $5490 = CeruleanCityClearScripts $54a1 = CeruleanCity_ScriptPointers $54ab = CeruleanCityRocketDefeatedScript $54cc = CeruleanCityDefaultScript @@ -4036,7 +4036,7 @@ ROMX bank #6: $5557 = CeruleanCityCoords1 $555c = CeruleanCityCoords2 $5561 = CeruleanCityMovement1 - $5565 = CeruleanCityScript_1955d + $5565 = CeruleanCityFaceRivalScript $556f = CeruleanCityRivalBattleScript $55a0 = CeruleanCityRivalBattleScript.NotSquirtle $55a8 = CeruleanCityRivalBattleScript.Charmander @@ -8229,7 +8229,7 @@ ROMX bank #17: $552d = RocketHideout4TrainerHeader2 $553a = RocketHideoutB4FGiovanniText $5571 = RocketHideoutB4FGiovanniText.beat_giovanni - $5577 = RocketHideoutB4FGiovanniText.asm_209f0 + $5577 = RocketHideoutB4FGiovanniText.done $557a = RocketHideoutB4FGiovanniText.ImpressedYouGotHereText $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8245,19 +8245,19 @@ ROMX bank #17: $55c5 = RocketHideoutB4FRocket2BattleText $55ca = RocketHideoutB4FRocket2EndBattleText $55cf = RocketHideoutB4FRocket2AfterBattleText - $55e9 = RocketHideoutB4FRocket2AfterBattleText.asm_455e9 + $55e9 = RocketHideoutB4FRocket2AfterBattleText.done $55ec = RocketHideoutB4FRocket2AfterBattleText.Text $55f1 = RocketHideoutB4F_Object $5650 = RocketHideoutB4F_Blocks $5704 = RocketHideoutElevator_h $5710 = RocketHideoutElevator_Script - $572c = RocketHideoutElevatorGetWarpsScript - $573a = RocketHideoutElevatorGetWarpsScript.SetWarpEntries + $572c = RocketHideoutElevatorStoreWarpEntriesScript + $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry $5741 = RocketHideoutElevatorScript $5754 = RocketHideoutElavatorFloors $5759 = RocketHideoutElevatorWarpMaps $575f = RocketHideoutElevatorShakeScript - $575f = RocketHideoutElevatorWarpMapsEnd + $575f = RocketHideoutElevatorWarpMaps.End $576b = RocketHideoutElevator_TextPointers $576d = RocketHideoutElevatorText $5782 = RocketHideoutElevatorText.no_key @@ -8267,13 +8267,13 @@ ROMX bank #17: $57a8 = RocketHideoutElevator_Blocks $57b4 = SilphCoElevator_h $57c0 = SilphCoElevator_Script - $57dc = SilphCoElevatorScript_457dc - $57ea = SilphCoElevatorScript_457dc.StoreWarpEntry + $57dc = SilphCoElevatorStoreWarpEntriesScript + $57ea = SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry $57f1 = SilphCoElevatorCopyWarpMapsScript $5804 = SilphCoElevatorFloors $5811 = SilphCoElevatorWarpMaps - $5827 = SilphCoElevatorShakeElevatorScript - $5827 = SilphCoElevatorWarpMapsEnd + $5827 = SilphCoElevatorShakeScript + $5827 = SilphCoElevatorWarpMaps.End $5833 = SilphCoElevator_TextPointers $5835 = SilphCoElevatorElevatorText $5844 = SilphCoElevator_Object @@ -8679,13 +8679,13 @@ ROMX bank #18: $45cc = CeladonMartRoof_Blocks $45f4 = CeladonMartElevator_h $4600 = CeladonMartElevator_Script - $461c = CeladonMartElevatorScript_4861c - $462a = CeladonMartElevatorScript_4862a - $4631 = CeladonMartElevatorScript_48631 + $461c = CeladonMartElevatorStoreWarpEntriesScript + $462a = CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry + $4631 = CeladonMartElevatorCopyWarpMapsScript $4643 = CeladonMartElevatorFloors $464a = CeladonMartElevatorWarpMaps - $4654 = CeladonMartElevatorScript_48654 - $4654 = CeladonMartElevatorWarpMapsEnd + $4654 = CeladonMartElevatorShakeScript + $4654 = CeladonMartElevatorWarpMaps.End $465c = CeladonMartElevator_TextPointers $465e = CeladonMartElevatorText $466d = CeladonMartElevator_Object @@ -8801,16 +8801,16 @@ ROMX bank #18: $4bb1 = GameCorner_h $4bbd = GameCorner_Script $4bcf = GameCornerSelectLuckySlotMachine - $4be2 = GameCornerSelectLuckySlotMachine.asm_48be2 + $4be2 = GameCornerSelectLuckySlotMachine.not_max $4bec = GameCornerSetRocketHideoutDoorTile $4c07 = GameCornerReenterMapAfterPlayerLoss $4c12 = GameCorner_ScriptPointers $4c18 = GameCornerDefaultScript $4c19 = GameCornerRocketBattleScript - $4c43 = GameCornerRocketBattleScript.asm_48c43 - $4c4d = GameCornerRocketBattleScript.asm_48c4d - $4c5a = GameCornerMovement_Grunt_WalkAroundPlayer - $4c63 = GameCornerMovement_Grunt_WalkDirect + $4c43 = GameCornerRocketBattleScript.not_direct_movement + $4c4d = GameCornerRocketBattleScript.got_rocket_movement + $4c5a = GameCornerMovement_Rocket_WalkAroundPlayer + $4c63 = GameCornerMovement_Rocket_WalkDirect $4c69 = GameCornerRocketExitScript $4c8a = GameCorner_TextPointers $4ca4 = GameCornerBeauty1Text @@ -9116,8 +9116,8 @@ ROMX bank #18: $5b97 = MtMoon1F_Blocks $5cff = MtMoonB2F_h $5d0b = MtMoonB2F_Script - $5d31 = MtMoonB2F_Script.asm_49d31 - $5d37 = CoordsData_49d37 + $5d31 = MtMoonB2F_Script.enable_battles + $5d37 = MtMoonB2FFossilAreaCoords $5d58 = MtMoonB2FResetScripts $5d63 = MtMoonB2F_ScriptPointers $5d6f = MtMoonB2FDefaultScript @@ -9497,7 +9497,7 @@ ROMX bank #20: $4eda = Route22GetRivalTrainerNoByStarterScript.next_trainer_no $4ee1 = Route22GetRivalTrainerNoByStarterScript.got_trainer_no $4ee6 = Route22MoveRivalRightScript - $4ef1 = Route22MoveRivalRightScript.asm_50ef1 + $4ef1 = Route22MoveRivalRightScript.skip_first_right $4efb = Route22RivalMovementData $4f00 = Route22DefaultScript $4f2d = Route22DefaultScript.Route22RivalBattleCoords @@ -9555,9 +9555,9 @@ ROMX bank #20: $51e9 = Route23SetVictoryRoadBoulders $5213 = Route23_ScriptPointers $5219 = Route23DefaultScript - $5224 = Route23DefaultScript.asm_51224 - $5237 = Route23DefaultScript.asm_51237 - $5255 = YCoordsData_51255 + $5224 = Route23DefaultScript.loop + $5237 = Route23DefaultScript.not_past_victory_road + $5255 = Route23GuardsYCoords $525d = Route23CopyBadgeTextScript $526e = Route23CopyBadgeTextScript.copyTextLoop $5276 = BadgeTextPointers @@ -10940,11 +10940,11 @@ ROMX bank #22: $5929 = Route15CooltrainerF4AfterBattleText $592e = Route15SignText $5933 = Route16_Script - $5946 = Route16Script_59946 + $5946 = Route16ResetScripts $5951 = Route16_ScriptPointers $5959 = Route16DefaultScript - $598f = Route16SnorlaxBattleScript - $59a8 = Route16SnorlaxBattleScript.caught + $598f = Route16SnorlaxPostBattleScript + $59a8 = Route16SnorlaxPostBattleScript.caught $59b9 = Route16_TextPointers $59cf = Route16TrainerHeaders $59cf = Route16TrainerHeader0 @@ -11157,13 +11157,13 @@ ROMX bank #22: $63e9 = LancesRoom_Blocks $6492 = HallOfFame_h $649e = HallOfFame_Script - $64aa = HallofFameRoomScript_5a4aa + $64aa = HallofFameRoomClearScripts $64b2 = HallOfFame_ScriptPointers $64ba = HallOfFameNoopScript $64bb = HallOfFameResetEventsAndSaveScript $64ff = HallOfFameResetEventsAndSaveScript.delayLoop $650d = HallOfFameDefaultScript - $6528 = RLEMovement5a528 + $6528 = HallOfFakeEntryMovement $652b = HallOfFameOakCongratulationsScript $656a = HallOfFame_TextPointers $656c = HallOfFameOakText @@ -11472,11 +11472,11 @@ ROMX bank #23: $4d21 = CopycatsHouse2F_Object $4d51 = FightingDojo_h $4d5d = FightingDojo_Script - $4d70 = FightingDojoScript_5cd70 + $4d70 = FightingDojoResetScripts $4d7b = FightingDojo_ScriptPointers $4d83 = FightingDojoDefaultScript $4dc6 = FightingDojoKarateMasterPostBattleScript - $4de4 = FightingDojoKarateMasterPostBattleScript.asm_5cde4 + $4de4 = FightingDojoKarateMasterPostBattleScript.already_facing $4e03 = FightingDojo_TextPointers $4e13 = FightingDojoTrainerHeaders $4e13 = FightingDojoTrainerHeader0 @@ -11970,10 +11970,10 @@ ROMX bank #24: $506f = GiveFossilToCinnabarLab.choseDomeFossil $5071 = GiveFossilToCinnabarLab.fossilSelected $50ab = GiveFossilToCinnabarLab.cancelledGivingFossil - $50b2 = LabFossil_610ae - $50b7 = LabFossil_610b3 - $50bc = LabFossil_610b8 - $50c1 = LabFossil_610bd + $50b2 = GiveFossilToCinnabarLab.ScientistSeesFossilText + $50b7 = GiveFossilToCinnabarLab.ScientistTakesFossilText + $50bc = GiveFossilToCinnabarLab.GoForAWalkText + $50c1 = GiveFossilToCinnabarLab.ComeAgainText $50c6 = PrintFossilsInBag $50cc = PrintFossilsInBag.loop $50ef = LoadFossilItemAndMonName @@ -13179,8 +13179,8 @@ ROMX bank #29: $4e0a = CeruleanBadgeHouse_Script $4e14 = CeruleanBadgeHouse_TextPointers $4e16 = CeruleanBadgeHouseMiddleAgedManText - $4e24 = CeruleanBadgeHouseMiddleAgedManText.asm_74e23 - $4e61 = CeruleanBadgeHouseMiddleAgedManText.asm_74e60 + $4e24 = CeruleanBadgeHouseMiddleAgedManText.loop + $4e61 = CeruleanBadgeHouseMiddleAgedManText.done $4e6e = CeruleanBadgeHouseMiddleAgedManText.BadgeItemList $4e78 = CeruleanBadgeHouseMiddleAgedManText.Text $4e7d = CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13374,7 +13374,7 @@ ROMX bank #29: $57dd = CinnabarGymGetOpponentTextScript $57f2 = CinnabarGymFlagAction $57f7 = CinnabarGymOpenGateScript - $581c = CinnabarGymOpenGateScript.asm_7581b + $581c = CinnabarGymOpenGateScript.no_sound $584b = CinnabarGymBlainePostBattleScript $5858 = CinnabarGymReceiveTM38 $587a = CinnabarGymReceiveTM38.BagFull @@ -13532,7 +13532,7 @@ ROMX bank #29: $609a = ChampionsRoomPlayerFollowsOakScript $60b5 = WalkToHallOfFame_RLEMovement $60ba = ChampionsRoomCleanupScript - $60c9 = RivalScript_760c8 + $60c9 = ChampionsRoom_DisplayTextID_AllowABSelectStart $60d7 = ChampionsRoom_TextPointers $60e1 = ChampionsRoomRivalText $60ef = ChampionsRoomRivalText.printText @@ -17209,10 +17209,10 @@ ROMX bank #40: $5145 = _CinnabarLabFossilRoomScientist1NoFossilsText $5156 = _CinnabarLabFossilRoomScientist1GoForAWalkText $518d = _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText - $51d6 = _Lab4Text_610ae - $5259 = _Lab4Text_610b3 - $528f = _Lab4Text_610b8 - $52c6 = _Lab4Text_610bd + $51d6 = _CinnabarLabFossilRoomScientist1SeesFossilText + $5259 = _CinnabarLabFossilRoomScientist1TakesFossilText + $528f = _CinnabarLabFossilRoomScientist1GoForAWalkText2 + $52c6 = _CinnabarLabFossilRoomScientist1ComeAgainText $52de = _CinnabarPokecenterCooltrainerFText $533e = _CinnabarPokecenterGentlemanText $539b = _CinnabarMartSilphWorkerFText diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym index 48f37e6e9..56dbcbc59 100644 --- a/pokeblue_debug.sym +++ b/pokeblue_debug.sym @@ -3968,7 +3968,7 @@ 06:547a PewterCityGymSignText 06:547f PewterCitySignText 06:5484 CeruleanCity_Script -06:5490 CeruleanCityScript_1948c +06:5490 CeruleanCityClearScripts 06:54a1 CeruleanCity_ScriptPointers 06:54ab CeruleanCityRocketDefeatedScript 06:54cc CeruleanCityDefaultScript @@ -3979,7 +3979,7 @@ 06:5557 CeruleanCityCoords1 06:555c CeruleanCityCoords2 06:5561 CeruleanCityMovement1 -06:5565 CeruleanCityScript_1955d +06:5565 CeruleanCityFaceRivalScript 06:556f CeruleanCityRivalBattleScript 06:55a0 CeruleanCityRivalBattleScript.NotSquirtle 06:55a8 CeruleanCityRivalBattleScript.Charmander @@ -8100,7 +8100,7 @@ 11:552d RocketHideout4TrainerHeader2 11:553a RocketHideoutB4FGiovanniText 11:5571 RocketHideoutB4FGiovanniText.beat_giovanni -11:5577 RocketHideoutB4FGiovanniText.asm_209f0 +11:5577 RocketHideoutB4FGiovanniText.done 11:557a RocketHideoutB4FGiovanniText.ImpressedYouGotHereText 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8116,19 +8116,19 @@ 11:55c5 RocketHideoutB4FRocket2BattleText 11:55ca RocketHideoutB4FRocket2EndBattleText 11:55cf RocketHideoutB4FRocket2AfterBattleText -11:55e9 RocketHideoutB4FRocket2AfterBattleText.asm_455e9 +11:55e9 RocketHideoutB4FRocket2AfterBattleText.done 11:55ec RocketHideoutB4FRocket2AfterBattleText.Text 11:55f1 RocketHideoutB4F_Object 11:5650 RocketHideoutB4F_Blocks 11:5704 RocketHideoutElevator_h 11:5710 RocketHideoutElevator_Script -11:572c RocketHideoutElevatorGetWarpsScript -11:573a RocketHideoutElevatorGetWarpsScript.SetWarpEntries +11:572c RocketHideoutElevatorStoreWarpEntriesScript +11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry 11:5741 RocketHideoutElevatorScript 11:5754 RocketHideoutElavatorFloors 11:5759 RocketHideoutElevatorWarpMaps 11:575f RocketHideoutElevatorShakeScript -11:575f RocketHideoutElevatorWarpMapsEnd +11:575f RocketHideoutElevatorWarpMaps.End 11:576b RocketHideoutElevator_TextPointers 11:576d RocketHideoutElevatorText 11:5782 RocketHideoutElevatorText.no_key @@ -8138,13 +8138,13 @@ 11:57a8 RocketHideoutElevator_Blocks 11:57b4 SilphCoElevator_h 11:57c0 SilphCoElevator_Script -11:57dc SilphCoElevatorScript_457dc -11:57ea SilphCoElevatorScript_457dc.StoreWarpEntry +11:57dc SilphCoElevatorStoreWarpEntriesScript +11:57ea SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry 11:57f1 SilphCoElevatorCopyWarpMapsScript 11:5804 SilphCoElevatorFloors 11:5811 SilphCoElevatorWarpMaps -11:5827 SilphCoElevatorShakeElevatorScript -11:5827 SilphCoElevatorWarpMapsEnd +11:5827 SilphCoElevatorShakeScript +11:5827 SilphCoElevatorWarpMaps.End 11:5833 SilphCoElevator_TextPointers 11:5835 SilphCoElevatorElevatorText 11:5844 SilphCoElevator_Object @@ -8542,13 +8542,13 @@ 12:45cc CeladonMartRoof_Blocks 12:45f4 CeladonMartElevator_h 12:4600 CeladonMartElevator_Script -12:461c CeladonMartElevatorScript_4861c -12:462a CeladonMartElevatorScript_4862a -12:4631 CeladonMartElevatorScript_48631 +12:461c CeladonMartElevatorStoreWarpEntriesScript +12:462a CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry +12:4631 CeladonMartElevatorCopyWarpMapsScript 12:4643 CeladonMartElevatorFloors 12:464a CeladonMartElevatorWarpMaps -12:4654 CeladonMartElevatorScript_48654 -12:4654 CeladonMartElevatorWarpMapsEnd +12:4654 CeladonMartElevatorShakeScript +12:4654 CeladonMartElevatorWarpMaps.End 12:465c CeladonMartElevator_TextPointers 12:465e CeladonMartElevatorText 12:466d CeladonMartElevator_Object @@ -8664,16 +8664,16 @@ 12:4bb1 GameCorner_h 12:4bbd GameCorner_Script 12:4bcf GameCornerSelectLuckySlotMachine -12:4be2 GameCornerSelectLuckySlotMachine.asm_48be2 +12:4be2 GameCornerSelectLuckySlotMachine.not_max 12:4bec GameCornerSetRocketHideoutDoorTile 12:4c07 GameCornerReenterMapAfterPlayerLoss 12:4c12 GameCorner_ScriptPointers 12:4c18 GameCornerDefaultScript 12:4c19 GameCornerRocketBattleScript -12:4c43 GameCornerRocketBattleScript.asm_48c43 -12:4c4d GameCornerRocketBattleScript.asm_48c4d -12:4c5a GameCornerMovement_Grunt_WalkAroundPlayer -12:4c63 GameCornerMovement_Grunt_WalkDirect +12:4c43 GameCornerRocketBattleScript.not_direct_movement +12:4c4d GameCornerRocketBattleScript.got_rocket_movement +12:4c5a GameCornerMovement_Rocket_WalkAroundPlayer +12:4c63 GameCornerMovement_Rocket_WalkDirect 12:4c69 GameCornerRocketExitScript 12:4c8a GameCorner_TextPointers 12:4ca4 GameCornerBeauty1Text @@ -8979,8 +8979,8 @@ 12:5b97 MtMoon1F_Blocks 12:5cff MtMoonB2F_h 12:5d0b MtMoonB2F_Script -12:5d31 MtMoonB2F_Script.asm_49d31 -12:5d37 CoordsData_49d37 +12:5d31 MtMoonB2F_Script.enable_battles +12:5d37 MtMoonB2FFossilAreaCoords 12:5d58 MtMoonB2FResetScripts 12:5d63 MtMoonB2F_ScriptPointers 12:5d6f MtMoonB2FDefaultScript @@ -9348,7 +9348,7 @@ 14:4eda Route22GetRivalTrainerNoByStarterScript.next_trainer_no 14:4ee1 Route22GetRivalTrainerNoByStarterScript.got_trainer_no 14:4ee6 Route22MoveRivalRightScript -14:4ef1 Route22MoveRivalRightScript.asm_50ef1 +14:4ef1 Route22MoveRivalRightScript.skip_first_right 14:4efb Route22RivalMovementData 14:4f00 Route22DefaultScript 14:4f2d Route22DefaultScript.Route22RivalBattleCoords @@ -9406,9 +9406,9 @@ 14:51e9 Route23SetVictoryRoadBoulders 14:5213 Route23_ScriptPointers 14:5219 Route23DefaultScript -14:5224 Route23DefaultScript.asm_51224 -14:5237 Route23DefaultScript.asm_51237 -14:5255 YCoordsData_51255 +14:5224 Route23DefaultScript.loop +14:5237 Route23DefaultScript.not_past_victory_road +14:5255 Route23GuardsYCoords 14:525d Route23CopyBadgeTextScript 14:526e Route23CopyBadgeTextScript.copyTextLoop 14:5276 BadgeTextPointers @@ -10773,11 +10773,11 @@ 16:5929 Route15CooltrainerF4AfterBattleText 16:592e Route15SignText 16:5933 Route16_Script -16:5946 Route16Script_59946 +16:5946 Route16ResetScripts 16:5951 Route16_ScriptPointers 16:5959 Route16DefaultScript -16:598f Route16SnorlaxBattleScript -16:59a8 Route16SnorlaxBattleScript.caught +16:598f Route16SnorlaxPostBattleScript +16:59a8 Route16SnorlaxPostBattleScript.caught 16:59b9 Route16_TextPointers 16:59cf Route16TrainerHeaders 16:59cf Route16TrainerHeader0 @@ -10990,13 +10990,13 @@ 16:63e9 LancesRoom_Blocks 16:6492 HallOfFame_h 16:649e HallOfFame_Script -16:64aa HallofFameRoomScript_5a4aa +16:64aa HallofFameRoomClearScripts 16:64b2 HallOfFame_ScriptPointers 16:64ba HallOfFameNoopScript 16:64bb HallOfFameResetEventsAndSaveScript 16:64ff HallOfFameResetEventsAndSaveScript.delayLoop 16:650d HallOfFameDefaultScript -16:6528 RLEMovement5a528 +16:6528 HallOfFakeEntryMovement 16:652b HallOfFameOakCongratulationsScript 16:656a HallOfFame_TextPointers 16:656c HallOfFameOakText @@ -11297,11 +11297,11 @@ 17:4d21 CopycatsHouse2F_Object 17:4d51 FightingDojo_h 17:4d5d FightingDojo_Script -17:4d70 FightingDojoScript_5cd70 +17:4d70 FightingDojoResetScripts 17:4d7b FightingDojo_ScriptPointers 17:4d83 FightingDojoDefaultScript 17:4dc6 FightingDojoKarateMasterPostBattleScript -17:4de4 FightingDojoKarateMasterPostBattleScript.asm_5cde4 +17:4de4 FightingDojoKarateMasterPostBattleScript.already_facing 17:4e03 FightingDojo_TextPointers 17:4e13 FightingDojoTrainerHeaders 17:4e13 FightingDojoTrainerHeader0 @@ -11788,10 +11788,10 @@ 18:506f GiveFossilToCinnabarLab.choseDomeFossil 18:5071 GiveFossilToCinnabarLab.fossilSelected 18:50ab GiveFossilToCinnabarLab.cancelledGivingFossil -18:50b2 LabFossil_610ae -18:50b7 LabFossil_610b3 -18:50bc LabFossil_610b8 -18:50c1 LabFossil_610bd +18:50b2 GiveFossilToCinnabarLab.ScientistSeesFossilText +18:50b7 GiveFossilToCinnabarLab.ScientistTakesFossilText +18:50bc GiveFossilToCinnabarLab.GoForAWalkText +18:50c1 GiveFossilToCinnabarLab.ComeAgainText 18:50c6 PrintFossilsInBag 18:50cc PrintFossilsInBag.loop 18:50ef LoadFossilItemAndMonName @@ -12968,8 +12968,8 @@ 1d:4e0a CeruleanBadgeHouse_Script 1d:4e14 CeruleanBadgeHouse_TextPointers 1d:4e16 CeruleanBadgeHouseMiddleAgedManText -1d:4e24 CeruleanBadgeHouseMiddleAgedManText.asm_74e23 -1d:4e61 CeruleanBadgeHouseMiddleAgedManText.asm_74e60 +1d:4e24 CeruleanBadgeHouseMiddleAgedManText.loop +1d:4e61 CeruleanBadgeHouseMiddleAgedManText.done 1d:4e6e CeruleanBadgeHouseMiddleAgedManText.BadgeItemList 1d:4e78 CeruleanBadgeHouseMiddleAgedManText.Text 1d:4e7d CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13161,7 +13161,7 @@ 1d:57dd CinnabarGymGetOpponentTextScript 1d:57f2 CinnabarGymFlagAction 1d:57f7 CinnabarGymOpenGateScript -1d:581c CinnabarGymOpenGateScript.asm_7581b +1d:581c CinnabarGymOpenGateScript.no_sound 1d:584b CinnabarGymBlainePostBattleScript 1d:5858 CinnabarGymReceiveTM38 1d:587a CinnabarGymReceiveTM38.BagFull @@ -13319,7 +13319,7 @@ 1d:609a ChampionsRoomPlayerFollowsOakScript 1d:60b5 WalkToHallOfFame_RLEMovement 1d:60ba ChampionsRoomCleanupScript -1d:60c9 RivalScript_760c8 +1d:60c9 ChampionsRoom_DisplayTextID_AllowABSelectStart 1d:60d7 ChampionsRoom_TextPointers 1d:60e1 ChampionsRoomRivalText 1d:60ef ChampionsRoomRivalText.printText @@ -16936,10 +16936,10 @@ 28:5145 _CinnabarLabFossilRoomScientist1NoFossilsText 28:5156 _CinnabarLabFossilRoomScientist1GoForAWalkText 28:518d _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText -28:51d6 _Lab4Text_610ae -28:5259 _Lab4Text_610b3 -28:528f _Lab4Text_610b8 -28:52c6 _Lab4Text_610bd +28:51d6 _CinnabarLabFossilRoomScientist1SeesFossilText +28:5259 _CinnabarLabFossilRoomScientist1TakesFossilText +28:528f _CinnabarLabFossilRoomScientist1GoForAWalkText2 +28:52c6 _CinnabarLabFossilRoomScientist1ComeAgainText 28:52de _CinnabarPokecenterCooltrainerFText 28:533e _CinnabarPokecenterGentlemanText 28:539b _CinnabarMartSilphWorkerFText diff --git a/pokeblue_vc.map b/pokeblue_vc.map index 971287251..54f4f2e69 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -4031,7 +4031,7 @@ ROMX bank #6: $5476 = PewterCityGymSignText $547b = PewterCitySignText $5480 = CeruleanCity_Script - $548c = CeruleanCityScript_1948c + $548c = CeruleanCityClearScripts $549d = CeruleanCity_ScriptPointers $54a7 = CeruleanCityRocketDefeatedScript $54c8 = CeruleanCityDefaultScript @@ -4042,7 +4042,7 @@ ROMX bank #6: $554f = CeruleanCityCoords1 $5554 = CeruleanCityCoords2 $5559 = CeruleanCityMovement1 - $555d = CeruleanCityScript_1955d + $555d = CeruleanCityFaceRivalScript $5567 = CeruleanCityRivalBattleScript $5598 = CeruleanCityRivalBattleScript.NotSquirtle $55a0 = CeruleanCityRivalBattleScript.Charmander @@ -8246,7 +8246,7 @@ ROMX bank #17: $552d = RocketHideout4TrainerHeader2 $553a = RocketHideoutB4FGiovanniText $5571 = RocketHideoutB4FGiovanniText.beat_giovanni - $5577 = RocketHideoutB4FGiovanniText.asm_209f0 + $5577 = RocketHideoutB4FGiovanniText.done $557a = RocketHideoutB4FGiovanniText.ImpressedYouGotHereText $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8262,19 +8262,19 @@ ROMX bank #17: $55c5 = RocketHideoutB4FRocket2BattleText $55ca = RocketHideoutB4FRocket2EndBattleText $55cf = RocketHideoutB4FRocket2AfterBattleText - $55e9 = RocketHideoutB4FRocket2AfterBattleText.asm_455e9 + $55e9 = RocketHideoutB4FRocket2AfterBattleText.done $55ec = RocketHideoutB4FRocket2AfterBattleText.Text $55f1 = RocketHideoutB4F_Object $5650 = RocketHideoutB4F_Blocks $5704 = RocketHideoutElevator_h $5710 = RocketHideoutElevator_Script - $572c = RocketHideoutElevatorGetWarpsScript - $573a = RocketHideoutElevatorGetWarpsScript.SetWarpEntries + $572c = RocketHideoutElevatorStoreWarpEntriesScript + $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry $5741 = RocketHideoutElevatorScript $5754 = RocketHideoutElavatorFloors $5759 = RocketHideoutElevatorWarpMaps $575f = RocketHideoutElevatorShakeScript - $575f = RocketHideoutElevatorWarpMapsEnd + $575f = RocketHideoutElevatorWarpMaps.End $576b = RocketHideoutElevator_TextPointers $576d = RocketHideoutElevatorText $5782 = RocketHideoutElevatorText.no_key @@ -8284,13 +8284,13 @@ ROMX bank #17: $57a8 = RocketHideoutElevator_Blocks $57b4 = SilphCoElevator_h $57c0 = SilphCoElevator_Script - $57dc = SilphCoElevatorScript_457dc - $57ea = SilphCoElevatorScript_457dc.StoreWarpEntry + $57dc = SilphCoElevatorStoreWarpEntriesScript + $57ea = SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry $57f1 = SilphCoElevatorCopyWarpMapsScript $5804 = SilphCoElevatorFloors $5811 = SilphCoElevatorWarpMaps - $5827 = SilphCoElevatorShakeElevatorScript - $5827 = SilphCoElevatorWarpMapsEnd + $5827 = SilphCoElevatorShakeScript + $5827 = SilphCoElevatorWarpMaps.End $5833 = SilphCoElevator_TextPointers $5835 = SilphCoElevatorElevatorText $5844 = SilphCoElevator_Object @@ -8696,13 +8696,13 @@ ROMX bank #18: $45cc = CeladonMartRoof_Blocks $45f4 = CeladonMartElevator_h $4600 = CeladonMartElevator_Script - $461c = CeladonMartElevatorScript_4861c - $462a = CeladonMartElevatorScript_4862a - $4631 = CeladonMartElevatorScript_48631 + $461c = CeladonMartElevatorStoreWarpEntriesScript + $462a = CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry + $4631 = CeladonMartElevatorCopyWarpMapsScript $4643 = CeladonMartElevatorFloors $464a = CeladonMartElevatorWarpMaps - $4654 = CeladonMartElevatorScript_48654 - $4654 = CeladonMartElevatorWarpMapsEnd + $4654 = CeladonMartElevatorShakeScript + $4654 = CeladonMartElevatorWarpMaps.End $465c = CeladonMartElevator_TextPointers $465e = CeladonMartElevatorText $466d = CeladonMartElevator_Object @@ -8818,16 +8818,16 @@ ROMX bank #18: $4bb1 = GameCorner_h $4bbd = GameCorner_Script $4bcf = GameCornerSelectLuckySlotMachine - $4be2 = GameCornerSelectLuckySlotMachine.asm_48be2 + $4be2 = GameCornerSelectLuckySlotMachine.not_max $4bec = GameCornerSetRocketHideoutDoorTile $4c07 = GameCornerReenterMapAfterPlayerLoss $4c12 = GameCorner_ScriptPointers $4c18 = GameCornerDefaultScript $4c19 = GameCornerRocketBattleScript - $4c43 = GameCornerRocketBattleScript.asm_48c43 - $4c4d = GameCornerRocketBattleScript.asm_48c4d - $4c5a = GameCornerMovement_Grunt_WalkAroundPlayer - $4c63 = GameCornerMovement_Grunt_WalkDirect + $4c43 = GameCornerRocketBattleScript.not_direct_movement + $4c4d = GameCornerRocketBattleScript.got_rocket_movement + $4c5a = GameCornerMovement_Rocket_WalkAroundPlayer + $4c63 = GameCornerMovement_Rocket_WalkDirect $4c69 = GameCornerRocketExitScript $4c8a = GameCorner_TextPointers $4ca4 = GameCornerBeauty1Text @@ -9133,8 +9133,8 @@ ROMX bank #18: $5b97 = MtMoon1F_Blocks $5cff = MtMoonB2F_h $5d0b = MtMoonB2F_Script - $5d31 = MtMoonB2F_Script.asm_49d31 - $5d37 = CoordsData_49d37 + $5d31 = MtMoonB2F_Script.enable_battles + $5d37 = MtMoonB2FFossilAreaCoords $5d58 = MtMoonB2FResetScripts $5d63 = MtMoonB2F_ScriptPointers $5d6f = MtMoonB2FDefaultScript @@ -9514,7 +9514,7 @@ ROMX bank #20: $4eda = Route22GetRivalTrainerNoByStarterScript.next_trainer_no $4ee1 = Route22GetRivalTrainerNoByStarterScript.got_trainer_no $4ee6 = Route22MoveRivalRightScript - $4ef1 = Route22MoveRivalRightScript.asm_50ef1 + $4ef1 = Route22MoveRivalRightScript.skip_first_right $4efb = Route22RivalMovementData $4f00 = Route22DefaultScript $4f2d = Route22DefaultScript.Route22RivalBattleCoords @@ -9572,9 +9572,9 @@ ROMX bank #20: $51e9 = Route23SetVictoryRoadBoulders $5213 = Route23_ScriptPointers $5219 = Route23DefaultScript - $5224 = Route23DefaultScript.asm_51224 - $5237 = Route23DefaultScript.asm_51237 - $5255 = YCoordsData_51255 + $5224 = Route23DefaultScript.loop + $5237 = Route23DefaultScript.not_past_victory_road + $5255 = Route23GuardsYCoords $525d = Route23CopyBadgeTextScript $526e = Route23CopyBadgeTextScript.copyTextLoop $5276 = BadgeTextPointers @@ -10957,11 +10957,11 @@ ROMX bank #22: $5929 = Route15CooltrainerF4AfterBattleText $592e = Route15SignText $5933 = Route16_Script - $5946 = Route16Script_59946 + $5946 = Route16ResetScripts $5951 = Route16_ScriptPointers $5959 = Route16DefaultScript - $598f = Route16SnorlaxBattleScript - $59a8 = Route16SnorlaxBattleScript.caught + $598f = Route16SnorlaxPostBattleScript + $59a8 = Route16SnorlaxPostBattleScript.caught $59b9 = Route16_TextPointers $59cf = Route16TrainerHeaders $59cf = Route16TrainerHeader0 @@ -11174,13 +11174,13 @@ ROMX bank #22: $63e9 = LancesRoom_Blocks $6492 = HallOfFame_h $649e = HallOfFame_Script - $64aa = HallofFameRoomScript_5a4aa + $64aa = HallofFameRoomClearScripts $64b2 = HallOfFame_ScriptPointers $64ba = HallOfFameNoopScript $64bb = HallOfFameResetEventsAndSaveScript $64ff = HallOfFameResetEventsAndSaveScript.delayLoop $650d = HallOfFameDefaultScript - $6528 = RLEMovement5a528 + $6528 = HallOfFakeEntryMovement $652b = HallOfFameOakCongratulationsScript $656a = HallOfFame_TextPointers $656c = HallOfFameOakText @@ -11489,11 +11489,11 @@ ROMX bank #23: $4d21 = CopycatsHouse2F_Object $4d51 = FightingDojo_h $4d5d = FightingDojo_Script - $4d70 = FightingDojoScript_5cd70 + $4d70 = FightingDojoResetScripts $4d7b = FightingDojo_ScriptPointers $4d83 = FightingDojoDefaultScript $4dc6 = FightingDojoKarateMasterPostBattleScript - $4de4 = FightingDojoKarateMasterPostBattleScript.asm_5cde4 + $4de4 = FightingDojoKarateMasterPostBattleScript.already_facing $4e03 = FightingDojo_TextPointers $4e13 = FightingDojoTrainerHeaders $4e13 = FightingDojoTrainerHeader0 @@ -11987,10 +11987,10 @@ ROMX bank #24: $506b = GiveFossilToCinnabarLab.choseDomeFossil $506d = GiveFossilToCinnabarLab.fossilSelected $50a7 = GiveFossilToCinnabarLab.cancelledGivingFossil - $50ae = LabFossil_610ae - $50b3 = LabFossil_610b3 - $50b8 = LabFossil_610b8 - $50bd = LabFossil_610bd + $50ae = GiveFossilToCinnabarLab.ScientistSeesFossilText + $50b3 = GiveFossilToCinnabarLab.ScientistTakesFossilText + $50b8 = GiveFossilToCinnabarLab.GoForAWalkText + $50bd = GiveFossilToCinnabarLab.ComeAgainText $50c2 = PrintFossilsInBag $50c8 = PrintFossilsInBag.loop $50eb = LoadFossilItemAndMonName @@ -13198,8 +13198,8 @@ ROMX bank #29: $4e0a = CeruleanBadgeHouse_Script $4e14 = CeruleanBadgeHouse_TextPointers $4e16 = CeruleanBadgeHouseMiddleAgedManText - $4e24 = CeruleanBadgeHouseMiddleAgedManText.asm_74e23 - $4e61 = CeruleanBadgeHouseMiddleAgedManText.asm_74e60 + $4e24 = CeruleanBadgeHouseMiddleAgedManText.loop + $4e61 = CeruleanBadgeHouseMiddleAgedManText.done $4e6e = CeruleanBadgeHouseMiddleAgedManText.BadgeItemList $4e78 = CeruleanBadgeHouseMiddleAgedManText.Text $4e7d = CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13393,7 +13393,7 @@ ROMX bank #29: $57dd = CinnabarGymGetOpponentTextScript $57f2 = CinnabarGymFlagAction $57f7 = CinnabarGymOpenGateScript - $581c = CinnabarGymOpenGateScript.asm_7581b + $581c = CinnabarGymOpenGateScript.no_sound $584b = CinnabarGymBlainePostBattleScript $5858 = CinnabarGymReceiveTM38 $587a = CinnabarGymReceiveTM38.BagFull @@ -13551,7 +13551,7 @@ ROMX bank #29: $609a = ChampionsRoomPlayerFollowsOakScript $60b5 = WalkToHallOfFame_RLEMovement $60ba = ChampionsRoomCleanupScript - $60c9 = RivalScript_760c8 + $60c9 = ChampionsRoom_DisplayTextID_AllowABSelectStart $60d7 = ChampionsRoom_TextPointers $60e1 = ChampionsRoomRivalText $60ef = ChampionsRoomRivalText.printText @@ -17249,10 +17249,10 @@ ROMX bank #40: $5145 = _CinnabarLabFossilRoomScientist1NoFossilsText $5156 = _CinnabarLabFossilRoomScientist1GoForAWalkText $518d = _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText - $51d6 = _Lab4Text_610ae - $5259 = _Lab4Text_610b3 - $528f = _Lab4Text_610b8 - $52c6 = _Lab4Text_610bd + $51d6 = _CinnabarLabFossilRoomScientist1SeesFossilText + $5259 = _CinnabarLabFossilRoomScientist1TakesFossilText + $528f = _CinnabarLabFossilRoomScientist1GoForAWalkText2 + $52c6 = _CinnabarLabFossilRoomScientist1ComeAgainText $52de = _CinnabarPokecenterCooltrainerFText $533e = _CinnabarPokecenterGentlemanText $539b = _CinnabarMartSilphWorkerFText diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index 040570ca2..a573ad8c4 100644 --- a/pokeblue_vc.sym +++ b/pokeblue_vc.sym @@ -3974,7 +3974,7 @@ 06:5476 PewterCityGymSignText 06:547b PewterCitySignText 06:5480 CeruleanCity_Script -06:548c CeruleanCityScript_1948c +06:548c CeruleanCityClearScripts 06:549d CeruleanCity_ScriptPointers 06:54a7 CeruleanCityRocketDefeatedScript 06:54c8 CeruleanCityDefaultScript @@ -3985,7 +3985,7 @@ 06:554f CeruleanCityCoords1 06:5554 CeruleanCityCoords2 06:5559 CeruleanCityMovement1 -06:555d CeruleanCityScript_1955d +06:555d CeruleanCityFaceRivalScript 06:5567 CeruleanCityRivalBattleScript 06:5598 CeruleanCityRivalBattleScript.NotSquirtle 06:55a0 CeruleanCityRivalBattleScript.Charmander @@ -8117,7 +8117,7 @@ 11:552d RocketHideout4TrainerHeader2 11:553a RocketHideoutB4FGiovanniText 11:5571 RocketHideoutB4FGiovanniText.beat_giovanni -11:5577 RocketHideoutB4FGiovanniText.asm_209f0 +11:5577 RocketHideoutB4FGiovanniText.done 11:557a RocketHideoutB4FGiovanniText.ImpressedYouGotHereText 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8133,19 +8133,19 @@ 11:55c5 RocketHideoutB4FRocket2BattleText 11:55ca RocketHideoutB4FRocket2EndBattleText 11:55cf RocketHideoutB4FRocket2AfterBattleText -11:55e9 RocketHideoutB4FRocket2AfterBattleText.asm_455e9 +11:55e9 RocketHideoutB4FRocket2AfterBattleText.done 11:55ec RocketHideoutB4FRocket2AfterBattleText.Text 11:55f1 RocketHideoutB4F_Object 11:5650 RocketHideoutB4F_Blocks 11:5704 RocketHideoutElevator_h 11:5710 RocketHideoutElevator_Script -11:572c RocketHideoutElevatorGetWarpsScript -11:573a RocketHideoutElevatorGetWarpsScript.SetWarpEntries +11:572c RocketHideoutElevatorStoreWarpEntriesScript +11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry 11:5741 RocketHideoutElevatorScript 11:5754 RocketHideoutElavatorFloors 11:5759 RocketHideoutElevatorWarpMaps 11:575f RocketHideoutElevatorShakeScript -11:575f RocketHideoutElevatorWarpMapsEnd +11:575f RocketHideoutElevatorWarpMaps.End 11:576b RocketHideoutElevator_TextPointers 11:576d RocketHideoutElevatorText 11:5782 RocketHideoutElevatorText.no_key @@ -8155,13 +8155,13 @@ 11:57a8 RocketHideoutElevator_Blocks 11:57b4 SilphCoElevator_h 11:57c0 SilphCoElevator_Script -11:57dc SilphCoElevatorScript_457dc -11:57ea SilphCoElevatorScript_457dc.StoreWarpEntry +11:57dc SilphCoElevatorStoreWarpEntriesScript +11:57ea SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry 11:57f1 SilphCoElevatorCopyWarpMapsScript 11:5804 SilphCoElevatorFloors 11:5811 SilphCoElevatorWarpMaps -11:5827 SilphCoElevatorShakeElevatorScript -11:5827 SilphCoElevatorWarpMapsEnd +11:5827 SilphCoElevatorShakeScript +11:5827 SilphCoElevatorWarpMaps.End 11:5833 SilphCoElevator_TextPointers 11:5835 SilphCoElevatorElevatorText 11:5844 SilphCoElevator_Object @@ -8559,13 +8559,13 @@ 12:45cc CeladonMartRoof_Blocks 12:45f4 CeladonMartElevator_h 12:4600 CeladonMartElevator_Script -12:461c CeladonMartElevatorScript_4861c -12:462a CeladonMartElevatorScript_4862a -12:4631 CeladonMartElevatorScript_48631 +12:461c CeladonMartElevatorStoreWarpEntriesScript +12:462a CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry +12:4631 CeladonMartElevatorCopyWarpMapsScript 12:4643 CeladonMartElevatorFloors 12:464a CeladonMartElevatorWarpMaps -12:4654 CeladonMartElevatorScript_48654 -12:4654 CeladonMartElevatorWarpMapsEnd +12:4654 CeladonMartElevatorShakeScript +12:4654 CeladonMartElevatorWarpMaps.End 12:465c CeladonMartElevator_TextPointers 12:465e CeladonMartElevatorText 12:466d CeladonMartElevator_Object @@ -8681,16 +8681,16 @@ 12:4bb1 GameCorner_h 12:4bbd GameCorner_Script 12:4bcf GameCornerSelectLuckySlotMachine -12:4be2 GameCornerSelectLuckySlotMachine.asm_48be2 +12:4be2 GameCornerSelectLuckySlotMachine.not_max 12:4bec GameCornerSetRocketHideoutDoorTile 12:4c07 GameCornerReenterMapAfterPlayerLoss 12:4c12 GameCorner_ScriptPointers 12:4c18 GameCornerDefaultScript 12:4c19 GameCornerRocketBattleScript -12:4c43 GameCornerRocketBattleScript.asm_48c43 -12:4c4d GameCornerRocketBattleScript.asm_48c4d -12:4c5a GameCornerMovement_Grunt_WalkAroundPlayer -12:4c63 GameCornerMovement_Grunt_WalkDirect +12:4c43 GameCornerRocketBattleScript.not_direct_movement +12:4c4d GameCornerRocketBattleScript.got_rocket_movement +12:4c5a GameCornerMovement_Rocket_WalkAroundPlayer +12:4c63 GameCornerMovement_Rocket_WalkDirect 12:4c69 GameCornerRocketExitScript 12:4c8a GameCorner_TextPointers 12:4ca4 GameCornerBeauty1Text @@ -8996,8 +8996,8 @@ 12:5b97 MtMoon1F_Blocks 12:5cff MtMoonB2F_h 12:5d0b MtMoonB2F_Script -12:5d31 MtMoonB2F_Script.asm_49d31 -12:5d37 CoordsData_49d37 +12:5d31 MtMoonB2F_Script.enable_battles +12:5d37 MtMoonB2FFossilAreaCoords 12:5d58 MtMoonB2FResetScripts 12:5d63 MtMoonB2F_ScriptPointers 12:5d6f MtMoonB2FDefaultScript @@ -9365,7 +9365,7 @@ 14:4eda Route22GetRivalTrainerNoByStarterScript.next_trainer_no 14:4ee1 Route22GetRivalTrainerNoByStarterScript.got_trainer_no 14:4ee6 Route22MoveRivalRightScript -14:4ef1 Route22MoveRivalRightScript.asm_50ef1 +14:4ef1 Route22MoveRivalRightScript.skip_first_right 14:4efb Route22RivalMovementData 14:4f00 Route22DefaultScript 14:4f2d Route22DefaultScript.Route22RivalBattleCoords @@ -9423,9 +9423,9 @@ 14:51e9 Route23SetVictoryRoadBoulders 14:5213 Route23_ScriptPointers 14:5219 Route23DefaultScript -14:5224 Route23DefaultScript.asm_51224 -14:5237 Route23DefaultScript.asm_51237 -14:5255 YCoordsData_51255 +14:5224 Route23DefaultScript.loop +14:5237 Route23DefaultScript.not_past_victory_road +14:5255 Route23GuardsYCoords 14:525d Route23CopyBadgeTextScript 14:526e Route23CopyBadgeTextScript.copyTextLoop 14:5276 BadgeTextPointers @@ -10790,11 +10790,11 @@ 16:5929 Route15CooltrainerF4AfterBattleText 16:592e Route15SignText 16:5933 Route16_Script -16:5946 Route16Script_59946 +16:5946 Route16ResetScripts 16:5951 Route16_ScriptPointers 16:5959 Route16DefaultScript -16:598f Route16SnorlaxBattleScript -16:59a8 Route16SnorlaxBattleScript.caught +16:598f Route16SnorlaxPostBattleScript +16:59a8 Route16SnorlaxPostBattleScript.caught 16:59b9 Route16_TextPointers 16:59cf Route16TrainerHeaders 16:59cf Route16TrainerHeader0 @@ -11007,13 +11007,13 @@ 16:63e9 LancesRoom_Blocks 16:6492 HallOfFame_h 16:649e HallOfFame_Script -16:64aa HallofFameRoomScript_5a4aa +16:64aa HallofFameRoomClearScripts 16:64b2 HallOfFame_ScriptPointers 16:64ba HallOfFameNoopScript 16:64bb HallOfFameResetEventsAndSaveScript 16:64ff HallOfFameResetEventsAndSaveScript.delayLoop 16:650d HallOfFameDefaultScript -16:6528 RLEMovement5a528 +16:6528 HallOfFakeEntryMovement 16:652b HallOfFameOakCongratulationsScript 16:656a HallOfFame_TextPointers 16:656c HallOfFameOakText @@ -11314,11 +11314,11 @@ 17:4d21 CopycatsHouse2F_Object 17:4d51 FightingDojo_h 17:4d5d FightingDojo_Script -17:4d70 FightingDojoScript_5cd70 +17:4d70 FightingDojoResetScripts 17:4d7b FightingDojo_ScriptPointers 17:4d83 FightingDojoDefaultScript 17:4dc6 FightingDojoKarateMasterPostBattleScript -17:4de4 FightingDojoKarateMasterPostBattleScript.asm_5cde4 +17:4de4 FightingDojoKarateMasterPostBattleScript.already_facing 17:4e03 FightingDojo_TextPointers 17:4e13 FightingDojoTrainerHeaders 17:4e13 FightingDojoTrainerHeader0 @@ -11805,10 +11805,10 @@ 18:506b GiveFossilToCinnabarLab.choseDomeFossil 18:506d GiveFossilToCinnabarLab.fossilSelected 18:50a7 GiveFossilToCinnabarLab.cancelledGivingFossil -18:50ae LabFossil_610ae -18:50b3 LabFossil_610b3 -18:50b8 LabFossil_610b8 -18:50bd LabFossil_610bd +18:50ae GiveFossilToCinnabarLab.ScientistSeesFossilText +18:50b3 GiveFossilToCinnabarLab.ScientistTakesFossilText +18:50b8 GiveFossilToCinnabarLab.GoForAWalkText +18:50bd GiveFossilToCinnabarLab.ComeAgainText 18:50c2 PrintFossilsInBag 18:50c8 PrintFossilsInBag.loop 18:50eb LoadFossilItemAndMonName @@ -12987,8 +12987,8 @@ 1d:4e0a CeruleanBadgeHouse_Script 1d:4e14 CeruleanBadgeHouse_TextPointers 1d:4e16 CeruleanBadgeHouseMiddleAgedManText -1d:4e24 CeruleanBadgeHouseMiddleAgedManText.asm_74e23 -1d:4e61 CeruleanBadgeHouseMiddleAgedManText.asm_74e60 +1d:4e24 CeruleanBadgeHouseMiddleAgedManText.loop +1d:4e61 CeruleanBadgeHouseMiddleAgedManText.done 1d:4e6e CeruleanBadgeHouseMiddleAgedManText.BadgeItemList 1d:4e78 CeruleanBadgeHouseMiddleAgedManText.Text 1d:4e7d CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13180,7 +13180,7 @@ 1d:57dd CinnabarGymGetOpponentTextScript 1d:57f2 CinnabarGymFlagAction 1d:57f7 CinnabarGymOpenGateScript -1d:581c CinnabarGymOpenGateScript.asm_7581b +1d:581c CinnabarGymOpenGateScript.no_sound 1d:584b CinnabarGymBlainePostBattleScript 1d:5858 CinnabarGymReceiveTM38 1d:587a CinnabarGymReceiveTM38.BagFull @@ -13338,7 +13338,7 @@ 1d:609a ChampionsRoomPlayerFollowsOakScript 1d:60b5 WalkToHallOfFame_RLEMovement 1d:60ba ChampionsRoomCleanupScript -1d:60c9 RivalScript_760c8 +1d:60c9 ChampionsRoom_DisplayTextID_AllowABSelectStart 1d:60d7 ChampionsRoom_TextPointers 1d:60e1 ChampionsRoomRivalText 1d:60ef ChampionsRoomRivalText.printText @@ -16976,10 +16976,10 @@ 28:5145 _CinnabarLabFossilRoomScientist1NoFossilsText 28:5156 _CinnabarLabFossilRoomScientist1GoForAWalkText 28:518d _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText -28:51d6 _Lab4Text_610ae -28:5259 _Lab4Text_610b3 -28:528f _Lab4Text_610b8 -28:52c6 _Lab4Text_610bd +28:51d6 _CinnabarLabFossilRoomScientist1SeesFossilText +28:5259 _CinnabarLabFossilRoomScientist1TakesFossilText +28:528f _CinnabarLabFossilRoomScientist1GoForAWalkText2 +28:52c6 _CinnabarLabFossilRoomScientist1ComeAgainText 28:52de _CinnabarPokecenterCooltrainerFText 28:533e _CinnabarPokecenterGentlemanText 28:539b _CinnabarMartSilphWorkerFText diff --git a/pokered.map b/pokered.map index a8229a7a5..ee7c6b810 100644 --- a/pokered.map +++ b/pokered.map @@ -4015,7 +4015,7 @@ ROMX bank #6: $5476 = PewterCityGymSignText $547b = PewterCitySignText $5480 = CeruleanCity_Script - $548c = CeruleanCityScript_1948c + $548c = CeruleanCityClearScripts $549d = CeruleanCity_ScriptPointers $54a7 = CeruleanCityRocketDefeatedScript $54c8 = CeruleanCityDefaultScript @@ -4026,7 +4026,7 @@ ROMX bank #6: $554f = CeruleanCityCoords1 $5554 = CeruleanCityCoords2 $5559 = CeruleanCityMovement1 - $555d = CeruleanCityScript_1955d + $555d = CeruleanCityFaceRivalScript $5567 = CeruleanCityRivalBattleScript $5598 = CeruleanCityRivalBattleScript.NotSquirtle $55a0 = CeruleanCityRivalBattleScript.Charmander @@ -8219,7 +8219,7 @@ ROMX bank #17: $552d = RocketHideout4TrainerHeader2 $553a = RocketHideoutB4FGiovanniText $5571 = RocketHideoutB4FGiovanniText.beat_giovanni - $5577 = RocketHideoutB4FGiovanniText.asm_209f0 + $5577 = RocketHideoutB4FGiovanniText.done $557a = RocketHideoutB4FGiovanniText.ImpressedYouGotHereText $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8235,19 +8235,19 @@ ROMX bank #17: $55c5 = RocketHideoutB4FRocket2BattleText $55ca = RocketHideoutB4FRocket2EndBattleText $55cf = RocketHideoutB4FRocket2AfterBattleText - $55e9 = RocketHideoutB4FRocket2AfterBattleText.asm_455e9 + $55e9 = RocketHideoutB4FRocket2AfterBattleText.done $55ec = RocketHideoutB4FRocket2AfterBattleText.Text $55f1 = RocketHideoutB4F_Object $5650 = RocketHideoutB4F_Blocks $5704 = RocketHideoutElevator_h $5710 = RocketHideoutElevator_Script - $572c = RocketHideoutElevatorGetWarpsScript - $573a = RocketHideoutElevatorGetWarpsScript.SetWarpEntries + $572c = RocketHideoutElevatorStoreWarpEntriesScript + $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry $5741 = RocketHideoutElevatorScript $5754 = RocketHideoutElavatorFloors $5759 = RocketHideoutElevatorWarpMaps $575f = RocketHideoutElevatorShakeScript - $575f = RocketHideoutElevatorWarpMapsEnd + $575f = RocketHideoutElevatorWarpMaps.End $576b = RocketHideoutElevator_TextPointers $576d = RocketHideoutElevatorText $5782 = RocketHideoutElevatorText.no_key @@ -8257,13 +8257,13 @@ ROMX bank #17: $57a8 = RocketHideoutElevator_Blocks $57b4 = SilphCoElevator_h $57c0 = SilphCoElevator_Script - $57dc = SilphCoElevatorScript_457dc - $57ea = SilphCoElevatorScript_457dc.StoreWarpEntry + $57dc = SilphCoElevatorStoreWarpEntriesScript + $57ea = SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry $57f1 = SilphCoElevatorCopyWarpMapsScript $5804 = SilphCoElevatorFloors $5811 = SilphCoElevatorWarpMaps - $5827 = SilphCoElevatorShakeElevatorScript - $5827 = SilphCoElevatorWarpMapsEnd + $5827 = SilphCoElevatorShakeScript + $5827 = SilphCoElevatorWarpMaps.End $5833 = SilphCoElevator_TextPointers $5835 = SilphCoElevatorElevatorText $5844 = SilphCoElevator_Object @@ -8669,13 +8669,13 @@ ROMX bank #18: $45cc = CeladonMartRoof_Blocks $45f4 = CeladonMartElevator_h $4600 = CeladonMartElevator_Script - $461c = CeladonMartElevatorScript_4861c - $462a = CeladonMartElevatorScript_4862a - $4631 = CeladonMartElevatorScript_48631 + $461c = CeladonMartElevatorStoreWarpEntriesScript + $462a = CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry + $4631 = CeladonMartElevatorCopyWarpMapsScript $4643 = CeladonMartElevatorFloors $464a = CeladonMartElevatorWarpMaps - $4654 = CeladonMartElevatorScript_48654 - $4654 = CeladonMartElevatorWarpMapsEnd + $4654 = CeladonMartElevatorShakeScript + $4654 = CeladonMartElevatorWarpMaps.End $465c = CeladonMartElevator_TextPointers $465e = CeladonMartElevatorText $466d = CeladonMartElevator_Object @@ -8791,16 +8791,16 @@ ROMX bank #18: $4bb1 = GameCorner_h $4bbd = GameCorner_Script $4bcf = GameCornerSelectLuckySlotMachine - $4be2 = GameCornerSelectLuckySlotMachine.asm_48be2 + $4be2 = GameCornerSelectLuckySlotMachine.not_max $4bec = GameCornerSetRocketHideoutDoorTile $4c07 = GameCornerReenterMapAfterPlayerLoss $4c12 = GameCorner_ScriptPointers $4c18 = GameCornerDefaultScript $4c19 = GameCornerRocketBattleScript - $4c43 = GameCornerRocketBattleScript.asm_48c43 - $4c4d = GameCornerRocketBattleScript.asm_48c4d - $4c5a = GameCornerMovement_Grunt_WalkAroundPlayer - $4c63 = GameCornerMovement_Grunt_WalkDirect + $4c43 = GameCornerRocketBattleScript.not_direct_movement + $4c4d = GameCornerRocketBattleScript.got_rocket_movement + $4c5a = GameCornerMovement_Rocket_WalkAroundPlayer + $4c63 = GameCornerMovement_Rocket_WalkDirect $4c69 = GameCornerRocketExitScript $4c8a = GameCorner_TextPointers $4ca4 = GameCornerBeauty1Text @@ -9106,8 +9106,8 @@ ROMX bank #18: $5b97 = MtMoon1F_Blocks $5cff = MtMoonB2F_h $5d0b = MtMoonB2F_Script - $5d31 = MtMoonB2F_Script.asm_49d31 - $5d37 = CoordsData_49d37 + $5d31 = MtMoonB2F_Script.enable_battles + $5d37 = MtMoonB2FFossilAreaCoords $5d58 = MtMoonB2FResetScripts $5d63 = MtMoonB2F_ScriptPointers $5d6f = MtMoonB2FDefaultScript @@ -9487,7 +9487,7 @@ ROMX bank #20: $4eda = Route22GetRivalTrainerNoByStarterScript.next_trainer_no $4ee1 = Route22GetRivalTrainerNoByStarterScript.got_trainer_no $4ee6 = Route22MoveRivalRightScript - $4ef1 = Route22MoveRivalRightScript.asm_50ef1 + $4ef1 = Route22MoveRivalRightScript.skip_first_right $4efb = Route22RivalMovementData $4f00 = Route22DefaultScript $4f2d = Route22DefaultScript.Route22RivalBattleCoords @@ -9545,9 +9545,9 @@ ROMX bank #20: $51e9 = Route23SetVictoryRoadBoulders $5213 = Route23_ScriptPointers $5219 = Route23DefaultScript - $5224 = Route23DefaultScript.asm_51224 - $5237 = Route23DefaultScript.asm_51237 - $5255 = YCoordsData_51255 + $5224 = Route23DefaultScript.loop + $5237 = Route23DefaultScript.not_past_victory_road + $5255 = Route23GuardsYCoords $525d = Route23CopyBadgeTextScript $526e = Route23CopyBadgeTextScript.copyTextLoop $5276 = BadgeTextPointers @@ -10930,11 +10930,11 @@ ROMX bank #22: $5929 = Route15CooltrainerF4AfterBattleText $592e = Route15SignText $5933 = Route16_Script - $5946 = Route16Script_59946 + $5946 = Route16ResetScripts $5951 = Route16_ScriptPointers $5959 = Route16DefaultScript - $598f = Route16SnorlaxBattleScript - $59a8 = Route16SnorlaxBattleScript.caught + $598f = Route16SnorlaxPostBattleScript + $59a8 = Route16SnorlaxPostBattleScript.caught $59b9 = Route16_TextPointers $59cf = Route16TrainerHeaders $59cf = Route16TrainerHeader0 @@ -11147,13 +11147,13 @@ ROMX bank #22: $63e9 = LancesRoom_Blocks $6492 = HallOfFame_h $649e = HallOfFame_Script - $64aa = HallofFameRoomScript_5a4aa + $64aa = HallofFameRoomClearScripts $64b2 = HallOfFame_ScriptPointers $64ba = HallOfFameNoopScript $64bb = HallOfFameResetEventsAndSaveScript $64ff = HallOfFameResetEventsAndSaveScript.delayLoop $650d = HallOfFameDefaultScript - $6528 = RLEMovement5a528 + $6528 = HallOfFakeEntryMovement $652b = HallOfFameOakCongratulationsScript $656a = HallOfFame_TextPointers $656c = HallOfFameOakText @@ -11462,11 +11462,11 @@ ROMX bank #23: $4d21 = CopycatsHouse2F_Object $4d51 = FightingDojo_h $4d5d = FightingDojo_Script - $4d70 = FightingDojoScript_5cd70 + $4d70 = FightingDojoResetScripts $4d7b = FightingDojo_ScriptPointers $4d83 = FightingDojoDefaultScript $4dc6 = FightingDojoKarateMasterPostBattleScript - $4de4 = FightingDojoKarateMasterPostBattleScript.asm_5cde4 + $4de4 = FightingDojoKarateMasterPostBattleScript.already_facing $4e03 = FightingDojo_TextPointers $4e13 = FightingDojoTrainerHeaders $4e13 = FightingDojoTrainerHeader0 @@ -11960,10 +11960,10 @@ ROMX bank #24: $506b = GiveFossilToCinnabarLab.choseDomeFossil $506d = GiveFossilToCinnabarLab.fossilSelected $50a7 = GiveFossilToCinnabarLab.cancelledGivingFossil - $50ae = LabFossil_610ae - $50b3 = LabFossil_610b3 - $50b8 = LabFossil_610b8 - $50bd = LabFossil_610bd + $50ae = GiveFossilToCinnabarLab.ScientistSeesFossilText + $50b3 = GiveFossilToCinnabarLab.ScientistTakesFossilText + $50b8 = GiveFossilToCinnabarLab.GoForAWalkText + $50bd = GiveFossilToCinnabarLab.ComeAgainText $50c2 = PrintFossilsInBag $50c8 = PrintFossilsInBag.loop $50eb = LoadFossilItemAndMonName @@ -13169,8 +13169,8 @@ ROMX bank #29: $4e09 = CeruleanBadgeHouse_Script $4e13 = CeruleanBadgeHouse_TextPointers $4e15 = CeruleanBadgeHouseMiddleAgedManText - $4e23 = CeruleanBadgeHouseMiddleAgedManText.asm_74e23 - $4e60 = CeruleanBadgeHouseMiddleAgedManText.asm_74e60 + $4e23 = CeruleanBadgeHouseMiddleAgedManText.loop + $4e60 = CeruleanBadgeHouseMiddleAgedManText.done $4e6d = CeruleanBadgeHouseMiddleAgedManText.BadgeItemList $4e77 = CeruleanBadgeHouseMiddleAgedManText.Text $4e7c = CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13364,7 +13364,7 @@ ROMX bank #29: $57dc = CinnabarGymGetOpponentTextScript $57f1 = CinnabarGymFlagAction $57f6 = CinnabarGymOpenGateScript - $581b = CinnabarGymOpenGateScript.asm_7581b + $581b = CinnabarGymOpenGateScript.no_sound $584a = CinnabarGymBlainePostBattleScript $5857 = CinnabarGymReceiveTM38 $5879 = CinnabarGymReceiveTM38.BagFull @@ -13522,7 +13522,7 @@ ROMX bank #29: $6099 = ChampionsRoomPlayerFollowsOakScript $60b4 = WalkToHallOfFame_RLEMovement $60b9 = ChampionsRoomCleanupScript - $60c8 = RivalScript_760c8 + $60c8 = ChampionsRoom_DisplayTextID_AllowABSelectStart $60d6 = ChampionsRoom_TextPointers $60e0 = ChampionsRoomRivalText $60ee = ChampionsRoomRivalText.printText @@ -17199,10 +17199,10 @@ ROMX bank #40: $5145 = _CinnabarLabFossilRoomScientist1NoFossilsText $5156 = _CinnabarLabFossilRoomScientist1GoForAWalkText $518d = _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText - $51d6 = _Lab4Text_610ae - $5259 = _Lab4Text_610b3 - $528f = _Lab4Text_610b8 - $52c6 = _Lab4Text_610bd + $51d6 = _CinnabarLabFossilRoomScientist1SeesFossilText + $5259 = _CinnabarLabFossilRoomScientist1TakesFossilText + $528f = _CinnabarLabFossilRoomScientist1GoForAWalkText2 + $52c6 = _CinnabarLabFossilRoomScientist1ComeAgainText $52de = _CinnabarPokecenterCooltrainerFText $533e = _CinnabarPokecenterGentlemanText $539b = _CinnabarMartSilphWorkerFText diff --git a/pokered.sym b/pokered.sym index 8613887da..64fed7b05 100644 --- a/pokered.sym +++ b/pokered.sym @@ -3958,7 +3958,7 @@ 06:5476 PewterCityGymSignText 06:547b PewterCitySignText 06:5480 CeruleanCity_Script -06:548c CeruleanCityScript_1948c +06:548c CeruleanCityClearScripts 06:549d CeruleanCity_ScriptPointers 06:54a7 CeruleanCityRocketDefeatedScript 06:54c8 CeruleanCityDefaultScript @@ -3969,7 +3969,7 @@ 06:554f CeruleanCityCoords1 06:5554 CeruleanCityCoords2 06:5559 CeruleanCityMovement1 -06:555d CeruleanCityScript_1955d +06:555d CeruleanCityFaceRivalScript 06:5567 CeruleanCityRivalBattleScript 06:5598 CeruleanCityRivalBattleScript.NotSquirtle 06:55a0 CeruleanCityRivalBattleScript.Charmander @@ -8090,7 +8090,7 @@ 11:552d RocketHideout4TrainerHeader2 11:553a RocketHideoutB4FGiovanniText 11:5571 RocketHideoutB4FGiovanniText.beat_giovanni -11:5577 RocketHideoutB4FGiovanniText.asm_209f0 +11:5577 RocketHideoutB4FGiovanniText.done 11:557a RocketHideoutB4FGiovanniText.ImpressedYouGotHereText 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8106,19 +8106,19 @@ 11:55c5 RocketHideoutB4FRocket2BattleText 11:55ca RocketHideoutB4FRocket2EndBattleText 11:55cf RocketHideoutB4FRocket2AfterBattleText -11:55e9 RocketHideoutB4FRocket2AfterBattleText.asm_455e9 +11:55e9 RocketHideoutB4FRocket2AfterBattleText.done 11:55ec RocketHideoutB4FRocket2AfterBattleText.Text 11:55f1 RocketHideoutB4F_Object 11:5650 RocketHideoutB4F_Blocks 11:5704 RocketHideoutElevator_h 11:5710 RocketHideoutElevator_Script -11:572c RocketHideoutElevatorGetWarpsScript -11:573a RocketHideoutElevatorGetWarpsScript.SetWarpEntries +11:572c RocketHideoutElevatorStoreWarpEntriesScript +11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry 11:5741 RocketHideoutElevatorScript 11:5754 RocketHideoutElavatorFloors 11:5759 RocketHideoutElevatorWarpMaps 11:575f RocketHideoutElevatorShakeScript -11:575f RocketHideoutElevatorWarpMapsEnd +11:575f RocketHideoutElevatorWarpMaps.End 11:576b RocketHideoutElevator_TextPointers 11:576d RocketHideoutElevatorText 11:5782 RocketHideoutElevatorText.no_key @@ -8128,13 +8128,13 @@ 11:57a8 RocketHideoutElevator_Blocks 11:57b4 SilphCoElevator_h 11:57c0 SilphCoElevator_Script -11:57dc SilphCoElevatorScript_457dc -11:57ea SilphCoElevatorScript_457dc.StoreWarpEntry +11:57dc SilphCoElevatorStoreWarpEntriesScript +11:57ea SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry 11:57f1 SilphCoElevatorCopyWarpMapsScript 11:5804 SilphCoElevatorFloors 11:5811 SilphCoElevatorWarpMaps -11:5827 SilphCoElevatorShakeElevatorScript -11:5827 SilphCoElevatorWarpMapsEnd +11:5827 SilphCoElevatorShakeScript +11:5827 SilphCoElevatorWarpMaps.End 11:5833 SilphCoElevator_TextPointers 11:5835 SilphCoElevatorElevatorText 11:5844 SilphCoElevator_Object @@ -8532,13 +8532,13 @@ 12:45cc CeladonMartRoof_Blocks 12:45f4 CeladonMartElevator_h 12:4600 CeladonMartElevator_Script -12:461c CeladonMartElevatorScript_4861c -12:462a CeladonMartElevatorScript_4862a -12:4631 CeladonMartElevatorScript_48631 +12:461c CeladonMartElevatorStoreWarpEntriesScript +12:462a CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry +12:4631 CeladonMartElevatorCopyWarpMapsScript 12:4643 CeladonMartElevatorFloors 12:464a CeladonMartElevatorWarpMaps -12:4654 CeladonMartElevatorScript_48654 -12:4654 CeladonMartElevatorWarpMapsEnd +12:4654 CeladonMartElevatorShakeScript +12:4654 CeladonMartElevatorWarpMaps.End 12:465c CeladonMartElevator_TextPointers 12:465e CeladonMartElevatorText 12:466d CeladonMartElevator_Object @@ -8654,16 +8654,16 @@ 12:4bb1 GameCorner_h 12:4bbd GameCorner_Script 12:4bcf GameCornerSelectLuckySlotMachine -12:4be2 GameCornerSelectLuckySlotMachine.asm_48be2 +12:4be2 GameCornerSelectLuckySlotMachine.not_max 12:4bec GameCornerSetRocketHideoutDoorTile 12:4c07 GameCornerReenterMapAfterPlayerLoss 12:4c12 GameCorner_ScriptPointers 12:4c18 GameCornerDefaultScript 12:4c19 GameCornerRocketBattleScript -12:4c43 GameCornerRocketBattleScript.asm_48c43 -12:4c4d GameCornerRocketBattleScript.asm_48c4d -12:4c5a GameCornerMovement_Grunt_WalkAroundPlayer -12:4c63 GameCornerMovement_Grunt_WalkDirect +12:4c43 GameCornerRocketBattleScript.not_direct_movement +12:4c4d GameCornerRocketBattleScript.got_rocket_movement +12:4c5a GameCornerMovement_Rocket_WalkAroundPlayer +12:4c63 GameCornerMovement_Rocket_WalkDirect 12:4c69 GameCornerRocketExitScript 12:4c8a GameCorner_TextPointers 12:4ca4 GameCornerBeauty1Text @@ -8969,8 +8969,8 @@ 12:5b97 MtMoon1F_Blocks 12:5cff MtMoonB2F_h 12:5d0b MtMoonB2F_Script -12:5d31 MtMoonB2F_Script.asm_49d31 -12:5d37 CoordsData_49d37 +12:5d31 MtMoonB2F_Script.enable_battles +12:5d37 MtMoonB2FFossilAreaCoords 12:5d58 MtMoonB2FResetScripts 12:5d63 MtMoonB2F_ScriptPointers 12:5d6f MtMoonB2FDefaultScript @@ -9338,7 +9338,7 @@ 14:4eda Route22GetRivalTrainerNoByStarterScript.next_trainer_no 14:4ee1 Route22GetRivalTrainerNoByStarterScript.got_trainer_no 14:4ee6 Route22MoveRivalRightScript -14:4ef1 Route22MoveRivalRightScript.asm_50ef1 +14:4ef1 Route22MoveRivalRightScript.skip_first_right 14:4efb Route22RivalMovementData 14:4f00 Route22DefaultScript 14:4f2d Route22DefaultScript.Route22RivalBattleCoords @@ -9396,9 +9396,9 @@ 14:51e9 Route23SetVictoryRoadBoulders 14:5213 Route23_ScriptPointers 14:5219 Route23DefaultScript -14:5224 Route23DefaultScript.asm_51224 -14:5237 Route23DefaultScript.asm_51237 -14:5255 YCoordsData_51255 +14:5224 Route23DefaultScript.loop +14:5237 Route23DefaultScript.not_past_victory_road +14:5255 Route23GuardsYCoords 14:525d Route23CopyBadgeTextScript 14:526e Route23CopyBadgeTextScript.copyTextLoop 14:5276 BadgeTextPointers @@ -10763,11 +10763,11 @@ 16:5929 Route15CooltrainerF4AfterBattleText 16:592e Route15SignText 16:5933 Route16_Script -16:5946 Route16Script_59946 +16:5946 Route16ResetScripts 16:5951 Route16_ScriptPointers 16:5959 Route16DefaultScript -16:598f Route16SnorlaxBattleScript -16:59a8 Route16SnorlaxBattleScript.caught +16:598f Route16SnorlaxPostBattleScript +16:59a8 Route16SnorlaxPostBattleScript.caught 16:59b9 Route16_TextPointers 16:59cf Route16TrainerHeaders 16:59cf Route16TrainerHeader0 @@ -10980,13 +10980,13 @@ 16:63e9 LancesRoom_Blocks 16:6492 HallOfFame_h 16:649e HallOfFame_Script -16:64aa HallofFameRoomScript_5a4aa +16:64aa HallofFameRoomClearScripts 16:64b2 HallOfFame_ScriptPointers 16:64ba HallOfFameNoopScript 16:64bb HallOfFameResetEventsAndSaveScript 16:64ff HallOfFameResetEventsAndSaveScript.delayLoop 16:650d HallOfFameDefaultScript -16:6528 RLEMovement5a528 +16:6528 HallOfFakeEntryMovement 16:652b HallOfFameOakCongratulationsScript 16:656a HallOfFame_TextPointers 16:656c HallOfFameOakText @@ -11287,11 +11287,11 @@ 17:4d21 CopycatsHouse2F_Object 17:4d51 FightingDojo_h 17:4d5d FightingDojo_Script -17:4d70 FightingDojoScript_5cd70 +17:4d70 FightingDojoResetScripts 17:4d7b FightingDojo_ScriptPointers 17:4d83 FightingDojoDefaultScript 17:4dc6 FightingDojoKarateMasterPostBattleScript -17:4de4 FightingDojoKarateMasterPostBattleScript.asm_5cde4 +17:4de4 FightingDojoKarateMasterPostBattleScript.already_facing 17:4e03 FightingDojo_TextPointers 17:4e13 FightingDojoTrainerHeaders 17:4e13 FightingDojoTrainerHeader0 @@ -11778,10 +11778,10 @@ 18:506b GiveFossilToCinnabarLab.choseDomeFossil 18:506d GiveFossilToCinnabarLab.fossilSelected 18:50a7 GiveFossilToCinnabarLab.cancelledGivingFossil -18:50ae LabFossil_610ae -18:50b3 LabFossil_610b3 -18:50b8 LabFossil_610b8 -18:50bd LabFossil_610bd +18:50ae GiveFossilToCinnabarLab.ScientistSeesFossilText +18:50b3 GiveFossilToCinnabarLab.ScientistTakesFossilText +18:50b8 GiveFossilToCinnabarLab.GoForAWalkText +18:50bd GiveFossilToCinnabarLab.ComeAgainText 18:50c2 PrintFossilsInBag 18:50c8 PrintFossilsInBag.loop 18:50eb LoadFossilItemAndMonName @@ -12958,8 +12958,8 @@ 1d:4e09 CeruleanBadgeHouse_Script 1d:4e13 CeruleanBadgeHouse_TextPointers 1d:4e15 CeruleanBadgeHouseMiddleAgedManText -1d:4e23 CeruleanBadgeHouseMiddleAgedManText.asm_74e23 -1d:4e60 CeruleanBadgeHouseMiddleAgedManText.asm_74e60 +1d:4e23 CeruleanBadgeHouseMiddleAgedManText.loop +1d:4e60 CeruleanBadgeHouseMiddleAgedManText.done 1d:4e6d CeruleanBadgeHouseMiddleAgedManText.BadgeItemList 1d:4e77 CeruleanBadgeHouseMiddleAgedManText.Text 1d:4e7c CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13151,7 +13151,7 @@ 1d:57dc CinnabarGymGetOpponentTextScript 1d:57f1 CinnabarGymFlagAction 1d:57f6 CinnabarGymOpenGateScript -1d:581b CinnabarGymOpenGateScript.asm_7581b +1d:581b CinnabarGymOpenGateScript.no_sound 1d:584a CinnabarGymBlainePostBattleScript 1d:5857 CinnabarGymReceiveTM38 1d:5879 CinnabarGymReceiveTM38.BagFull @@ -13309,7 +13309,7 @@ 1d:6099 ChampionsRoomPlayerFollowsOakScript 1d:60b4 WalkToHallOfFame_RLEMovement 1d:60b9 ChampionsRoomCleanupScript -1d:60c8 RivalScript_760c8 +1d:60c8 ChampionsRoom_DisplayTextID_AllowABSelectStart 1d:60d6 ChampionsRoom_TextPointers 1d:60e0 ChampionsRoomRivalText 1d:60ee ChampionsRoomRivalText.printText @@ -16926,10 +16926,10 @@ 28:5145 _CinnabarLabFossilRoomScientist1NoFossilsText 28:5156 _CinnabarLabFossilRoomScientist1GoForAWalkText 28:518d _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText -28:51d6 _Lab4Text_610ae -28:5259 _Lab4Text_610b3 -28:528f _Lab4Text_610b8 -28:52c6 _Lab4Text_610bd +28:51d6 _CinnabarLabFossilRoomScientist1SeesFossilText +28:5259 _CinnabarLabFossilRoomScientist1TakesFossilText +28:528f _CinnabarLabFossilRoomScientist1GoForAWalkText2 +28:52c6 _CinnabarLabFossilRoomScientist1ComeAgainText 28:52de _CinnabarPokecenterCooltrainerFText 28:533e _CinnabarPokecenterGentlemanText 28:539b _CinnabarMartSilphWorkerFText diff --git a/pokered_vc.map b/pokered_vc.map index 8930f6509..fb0180436 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -4031,7 +4031,7 @@ ROMX bank #6: $5476 = PewterCityGymSignText $547b = PewterCitySignText $5480 = CeruleanCity_Script - $548c = CeruleanCityScript_1948c + $548c = CeruleanCityClearScripts $549d = CeruleanCity_ScriptPointers $54a7 = CeruleanCityRocketDefeatedScript $54c8 = CeruleanCityDefaultScript @@ -4042,7 +4042,7 @@ ROMX bank #6: $554f = CeruleanCityCoords1 $5554 = CeruleanCityCoords2 $5559 = CeruleanCityMovement1 - $555d = CeruleanCityScript_1955d + $555d = CeruleanCityFaceRivalScript $5567 = CeruleanCityRivalBattleScript $5598 = CeruleanCityRivalBattleScript.NotSquirtle $55a0 = CeruleanCityRivalBattleScript.Charmander @@ -8248,7 +8248,7 @@ ROMX bank #17: $552d = RocketHideout4TrainerHeader2 $553a = RocketHideoutB4FGiovanniText $5571 = RocketHideoutB4FGiovanniText.beat_giovanni - $5577 = RocketHideoutB4FGiovanniText.asm_209f0 + $5577 = RocketHideoutB4FGiovanniText.done $557a = RocketHideoutB4FGiovanniText.ImpressedYouGotHereText $557f = RocketHideoutB4FGiovanniText.WhatCannotBeText $5584 = RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8264,19 +8264,19 @@ ROMX bank #17: $55c5 = RocketHideoutB4FRocket2BattleText $55ca = RocketHideoutB4FRocket2EndBattleText $55cf = RocketHideoutB4FRocket2AfterBattleText - $55e9 = RocketHideoutB4FRocket2AfterBattleText.asm_455e9 + $55e9 = RocketHideoutB4FRocket2AfterBattleText.done $55ec = RocketHideoutB4FRocket2AfterBattleText.Text $55f1 = RocketHideoutB4F_Object $5650 = RocketHideoutB4F_Blocks $5704 = RocketHideoutElevator_h $5710 = RocketHideoutElevator_Script - $572c = RocketHideoutElevatorGetWarpsScript - $573a = RocketHideoutElevatorGetWarpsScript.SetWarpEntries + $572c = RocketHideoutElevatorStoreWarpEntriesScript + $573a = RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry $5741 = RocketHideoutElevatorScript $5754 = RocketHideoutElavatorFloors $5759 = RocketHideoutElevatorWarpMaps $575f = RocketHideoutElevatorShakeScript - $575f = RocketHideoutElevatorWarpMapsEnd + $575f = RocketHideoutElevatorWarpMaps.End $576b = RocketHideoutElevator_TextPointers $576d = RocketHideoutElevatorText $5782 = RocketHideoutElevatorText.no_key @@ -8286,13 +8286,13 @@ ROMX bank #17: $57a8 = RocketHideoutElevator_Blocks $57b4 = SilphCoElevator_h $57c0 = SilphCoElevator_Script - $57dc = SilphCoElevatorScript_457dc - $57ea = SilphCoElevatorScript_457dc.StoreWarpEntry + $57dc = SilphCoElevatorStoreWarpEntriesScript + $57ea = SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry $57f1 = SilphCoElevatorCopyWarpMapsScript $5804 = SilphCoElevatorFloors $5811 = SilphCoElevatorWarpMaps - $5827 = SilphCoElevatorShakeElevatorScript - $5827 = SilphCoElevatorWarpMapsEnd + $5827 = SilphCoElevatorShakeScript + $5827 = SilphCoElevatorWarpMaps.End $5833 = SilphCoElevator_TextPointers $5835 = SilphCoElevatorElevatorText $5844 = SilphCoElevator_Object @@ -8698,13 +8698,13 @@ ROMX bank #18: $45cc = CeladonMartRoof_Blocks $45f4 = CeladonMartElevator_h $4600 = CeladonMartElevator_Script - $461c = CeladonMartElevatorScript_4861c - $462a = CeladonMartElevatorScript_4862a - $4631 = CeladonMartElevatorScript_48631 + $461c = CeladonMartElevatorStoreWarpEntriesScript + $462a = CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry + $4631 = CeladonMartElevatorCopyWarpMapsScript $4643 = CeladonMartElevatorFloors $464a = CeladonMartElevatorWarpMaps - $4654 = CeladonMartElevatorScript_48654 - $4654 = CeladonMartElevatorWarpMapsEnd + $4654 = CeladonMartElevatorShakeScript + $4654 = CeladonMartElevatorWarpMaps.End $465c = CeladonMartElevator_TextPointers $465e = CeladonMartElevatorText $466d = CeladonMartElevator_Object @@ -8820,16 +8820,16 @@ ROMX bank #18: $4bb1 = GameCorner_h $4bbd = GameCorner_Script $4bcf = GameCornerSelectLuckySlotMachine - $4be2 = GameCornerSelectLuckySlotMachine.asm_48be2 + $4be2 = GameCornerSelectLuckySlotMachine.not_max $4bec = GameCornerSetRocketHideoutDoorTile $4c07 = GameCornerReenterMapAfterPlayerLoss $4c12 = GameCorner_ScriptPointers $4c18 = GameCornerDefaultScript $4c19 = GameCornerRocketBattleScript - $4c43 = GameCornerRocketBattleScript.asm_48c43 - $4c4d = GameCornerRocketBattleScript.asm_48c4d - $4c5a = GameCornerMovement_Grunt_WalkAroundPlayer - $4c63 = GameCornerMovement_Grunt_WalkDirect + $4c43 = GameCornerRocketBattleScript.not_direct_movement + $4c4d = GameCornerRocketBattleScript.got_rocket_movement + $4c5a = GameCornerMovement_Rocket_WalkAroundPlayer + $4c63 = GameCornerMovement_Rocket_WalkDirect $4c69 = GameCornerRocketExitScript $4c8a = GameCorner_TextPointers $4ca4 = GameCornerBeauty1Text @@ -9135,8 +9135,8 @@ ROMX bank #18: $5b97 = MtMoon1F_Blocks $5cff = MtMoonB2F_h $5d0b = MtMoonB2F_Script - $5d31 = MtMoonB2F_Script.asm_49d31 - $5d37 = CoordsData_49d37 + $5d31 = MtMoonB2F_Script.enable_battles + $5d37 = MtMoonB2FFossilAreaCoords $5d58 = MtMoonB2FResetScripts $5d63 = MtMoonB2F_ScriptPointers $5d6f = MtMoonB2FDefaultScript @@ -9516,7 +9516,7 @@ ROMX bank #20: $4eda = Route22GetRivalTrainerNoByStarterScript.next_trainer_no $4ee1 = Route22GetRivalTrainerNoByStarterScript.got_trainer_no $4ee6 = Route22MoveRivalRightScript - $4ef1 = Route22MoveRivalRightScript.asm_50ef1 + $4ef1 = Route22MoveRivalRightScript.skip_first_right $4efb = Route22RivalMovementData $4f00 = Route22DefaultScript $4f2d = Route22DefaultScript.Route22RivalBattleCoords @@ -9574,9 +9574,9 @@ ROMX bank #20: $51e9 = Route23SetVictoryRoadBoulders $5213 = Route23_ScriptPointers $5219 = Route23DefaultScript - $5224 = Route23DefaultScript.asm_51224 - $5237 = Route23DefaultScript.asm_51237 - $5255 = YCoordsData_51255 + $5224 = Route23DefaultScript.loop + $5237 = Route23DefaultScript.not_past_victory_road + $5255 = Route23GuardsYCoords $525d = Route23CopyBadgeTextScript $526e = Route23CopyBadgeTextScript.copyTextLoop $5276 = BadgeTextPointers @@ -10959,11 +10959,11 @@ ROMX bank #22: $5929 = Route15CooltrainerF4AfterBattleText $592e = Route15SignText $5933 = Route16_Script - $5946 = Route16Script_59946 + $5946 = Route16ResetScripts $5951 = Route16_ScriptPointers $5959 = Route16DefaultScript - $598f = Route16SnorlaxBattleScript - $59a8 = Route16SnorlaxBattleScript.caught + $598f = Route16SnorlaxPostBattleScript + $59a8 = Route16SnorlaxPostBattleScript.caught $59b9 = Route16_TextPointers $59cf = Route16TrainerHeaders $59cf = Route16TrainerHeader0 @@ -11176,13 +11176,13 @@ ROMX bank #22: $63e9 = LancesRoom_Blocks $6492 = HallOfFame_h $649e = HallOfFame_Script - $64aa = HallofFameRoomScript_5a4aa + $64aa = HallofFameRoomClearScripts $64b2 = HallOfFame_ScriptPointers $64ba = HallOfFameNoopScript $64bb = HallOfFameResetEventsAndSaveScript $64ff = HallOfFameResetEventsAndSaveScript.delayLoop $650d = HallOfFameDefaultScript - $6528 = RLEMovement5a528 + $6528 = HallOfFakeEntryMovement $652b = HallOfFameOakCongratulationsScript $656a = HallOfFame_TextPointers $656c = HallOfFameOakText @@ -11491,11 +11491,11 @@ ROMX bank #23: $4d21 = CopycatsHouse2F_Object $4d51 = FightingDojo_h $4d5d = FightingDojo_Script - $4d70 = FightingDojoScript_5cd70 + $4d70 = FightingDojoResetScripts $4d7b = FightingDojo_ScriptPointers $4d83 = FightingDojoDefaultScript $4dc6 = FightingDojoKarateMasterPostBattleScript - $4de4 = FightingDojoKarateMasterPostBattleScript.asm_5cde4 + $4de4 = FightingDojoKarateMasterPostBattleScript.already_facing $4e03 = FightingDojo_TextPointers $4e13 = FightingDojoTrainerHeaders $4e13 = FightingDojoTrainerHeader0 @@ -11989,10 +11989,10 @@ ROMX bank #24: $506b = GiveFossilToCinnabarLab.choseDomeFossil $506d = GiveFossilToCinnabarLab.fossilSelected $50a7 = GiveFossilToCinnabarLab.cancelledGivingFossil - $50ae = LabFossil_610ae - $50b3 = LabFossil_610b3 - $50b8 = LabFossil_610b8 - $50bd = LabFossil_610bd + $50ae = GiveFossilToCinnabarLab.ScientistSeesFossilText + $50b3 = GiveFossilToCinnabarLab.ScientistTakesFossilText + $50b8 = GiveFossilToCinnabarLab.GoForAWalkText + $50bd = GiveFossilToCinnabarLab.ComeAgainText $50c2 = PrintFossilsInBag $50c8 = PrintFossilsInBag.loop $50eb = LoadFossilItemAndMonName @@ -13200,8 +13200,8 @@ ROMX bank #29: $4e09 = CeruleanBadgeHouse_Script $4e13 = CeruleanBadgeHouse_TextPointers $4e15 = CeruleanBadgeHouseMiddleAgedManText - $4e23 = CeruleanBadgeHouseMiddleAgedManText.asm_74e23 - $4e60 = CeruleanBadgeHouseMiddleAgedManText.asm_74e60 + $4e23 = CeruleanBadgeHouseMiddleAgedManText.loop + $4e60 = CeruleanBadgeHouseMiddleAgedManText.done $4e6d = CeruleanBadgeHouseMiddleAgedManText.BadgeItemList $4e77 = CeruleanBadgeHouseMiddleAgedManText.Text $4e7c = CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13395,7 +13395,7 @@ ROMX bank #29: $57dc = CinnabarGymGetOpponentTextScript $57f1 = CinnabarGymFlagAction $57f6 = CinnabarGymOpenGateScript - $581b = CinnabarGymOpenGateScript.asm_7581b + $581b = CinnabarGymOpenGateScript.no_sound $584a = CinnabarGymBlainePostBattleScript $5857 = CinnabarGymReceiveTM38 $5879 = CinnabarGymReceiveTM38.BagFull @@ -13553,7 +13553,7 @@ ROMX bank #29: $6099 = ChampionsRoomPlayerFollowsOakScript $60b4 = WalkToHallOfFame_RLEMovement $60b9 = ChampionsRoomCleanupScript - $60c8 = RivalScript_760c8 + $60c8 = ChampionsRoom_DisplayTextID_AllowABSelectStart $60d6 = ChampionsRoom_TextPointers $60e0 = ChampionsRoomRivalText $60ee = ChampionsRoomRivalText.printText @@ -17252,10 +17252,10 @@ ROMX bank #40: $5145 = _CinnabarLabFossilRoomScientist1NoFossilsText $5156 = _CinnabarLabFossilRoomScientist1GoForAWalkText $518d = _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText - $51d6 = _Lab4Text_610ae - $5259 = _Lab4Text_610b3 - $528f = _Lab4Text_610b8 - $52c6 = _Lab4Text_610bd + $51d6 = _CinnabarLabFossilRoomScientist1SeesFossilText + $5259 = _CinnabarLabFossilRoomScientist1TakesFossilText + $528f = _CinnabarLabFossilRoomScientist1GoForAWalkText2 + $52c6 = _CinnabarLabFossilRoomScientist1ComeAgainText $52de = _CinnabarPokecenterCooltrainerFText $533e = _CinnabarPokecenterGentlemanText $539b = _CinnabarMartSilphWorkerFText diff --git a/pokered_vc.sym b/pokered_vc.sym index f481c5cad..f101064ad 100644 --- a/pokered_vc.sym +++ b/pokered_vc.sym @@ -3974,7 +3974,7 @@ 06:5476 PewterCityGymSignText 06:547b PewterCitySignText 06:5480 CeruleanCity_Script -06:548c CeruleanCityScript_1948c +06:548c CeruleanCityClearScripts 06:549d CeruleanCity_ScriptPointers 06:54a7 CeruleanCityRocketDefeatedScript 06:54c8 CeruleanCityDefaultScript @@ -3985,7 +3985,7 @@ 06:554f CeruleanCityCoords1 06:5554 CeruleanCityCoords2 06:5559 CeruleanCityMovement1 -06:555d CeruleanCityScript_1955d +06:555d CeruleanCityFaceRivalScript 06:5567 CeruleanCityRivalBattleScript 06:5598 CeruleanCityRivalBattleScript.NotSquirtle 06:55a0 CeruleanCityRivalBattleScript.Charmander @@ -8119,7 +8119,7 @@ 11:552d RocketHideout4TrainerHeader2 11:553a RocketHideoutB4FGiovanniText 11:5571 RocketHideoutB4FGiovanniText.beat_giovanni -11:5577 RocketHideoutB4FGiovanniText.asm_209f0 +11:5577 RocketHideoutB4FGiovanniText.done 11:557a RocketHideoutB4FGiovanniText.ImpressedYouGotHereText 11:557f RocketHideoutB4FGiovanniText.WhatCannotBeText 11:5584 RocketHideoutB4FGiovanniHopeWeMeetAgainText @@ -8135,19 +8135,19 @@ 11:55c5 RocketHideoutB4FRocket2BattleText 11:55ca RocketHideoutB4FRocket2EndBattleText 11:55cf RocketHideoutB4FRocket2AfterBattleText -11:55e9 RocketHideoutB4FRocket2AfterBattleText.asm_455e9 +11:55e9 RocketHideoutB4FRocket2AfterBattleText.done 11:55ec RocketHideoutB4FRocket2AfterBattleText.Text 11:55f1 RocketHideoutB4F_Object 11:5650 RocketHideoutB4F_Blocks 11:5704 RocketHideoutElevator_h 11:5710 RocketHideoutElevator_Script -11:572c RocketHideoutElevatorGetWarpsScript -11:573a RocketHideoutElevatorGetWarpsScript.SetWarpEntries +11:572c RocketHideoutElevatorStoreWarpEntriesScript +11:573a RocketHideoutElevatorStoreWarpEntriesScript.StoreWarpEntry 11:5741 RocketHideoutElevatorScript 11:5754 RocketHideoutElavatorFloors 11:5759 RocketHideoutElevatorWarpMaps 11:575f RocketHideoutElevatorShakeScript -11:575f RocketHideoutElevatorWarpMapsEnd +11:575f RocketHideoutElevatorWarpMaps.End 11:576b RocketHideoutElevator_TextPointers 11:576d RocketHideoutElevatorText 11:5782 RocketHideoutElevatorText.no_key @@ -8157,13 +8157,13 @@ 11:57a8 RocketHideoutElevator_Blocks 11:57b4 SilphCoElevator_h 11:57c0 SilphCoElevator_Script -11:57dc SilphCoElevatorScript_457dc -11:57ea SilphCoElevatorScript_457dc.StoreWarpEntry +11:57dc SilphCoElevatorStoreWarpEntriesScript +11:57ea SilphCoElevatorStoreWarpEntriesScript.StoreWarpEntry 11:57f1 SilphCoElevatorCopyWarpMapsScript 11:5804 SilphCoElevatorFloors 11:5811 SilphCoElevatorWarpMaps -11:5827 SilphCoElevatorShakeElevatorScript -11:5827 SilphCoElevatorWarpMapsEnd +11:5827 SilphCoElevatorShakeScript +11:5827 SilphCoElevatorWarpMaps.End 11:5833 SilphCoElevator_TextPointers 11:5835 SilphCoElevatorElevatorText 11:5844 SilphCoElevator_Object @@ -8561,13 +8561,13 @@ 12:45cc CeladonMartRoof_Blocks 12:45f4 CeladonMartElevator_h 12:4600 CeladonMartElevator_Script -12:461c CeladonMartElevatorScript_4861c -12:462a CeladonMartElevatorScript_4862a -12:4631 CeladonMartElevatorScript_48631 +12:461c CeladonMartElevatorStoreWarpEntriesScript +12:462a CeladonMartElevatorStoreWarpEntriesScript.StoreWarpEntry +12:4631 CeladonMartElevatorCopyWarpMapsScript 12:4643 CeladonMartElevatorFloors 12:464a CeladonMartElevatorWarpMaps -12:4654 CeladonMartElevatorScript_48654 -12:4654 CeladonMartElevatorWarpMapsEnd +12:4654 CeladonMartElevatorShakeScript +12:4654 CeladonMartElevatorWarpMaps.End 12:465c CeladonMartElevator_TextPointers 12:465e CeladonMartElevatorText 12:466d CeladonMartElevator_Object @@ -8683,16 +8683,16 @@ 12:4bb1 GameCorner_h 12:4bbd GameCorner_Script 12:4bcf GameCornerSelectLuckySlotMachine -12:4be2 GameCornerSelectLuckySlotMachine.asm_48be2 +12:4be2 GameCornerSelectLuckySlotMachine.not_max 12:4bec GameCornerSetRocketHideoutDoorTile 12:4c07 GameCornerReenterMapAfterPlayerLoss 12:4c12 GameCorner_ScriptPointers 12:4c18 GameCornerDefaultScript 12:4c19 GameCornerRocketBattleScript -12:4c43 GameCornerRocketBattleScript.asm_48c43 -12:4c4d GameCornerRocketBattleScript.asm_48c4d -12:4c5a GameCornerMovement_Grunt_WalkAroundPlayer -12:4c63 GameCornerMovement_Grunt_WalkDirect +12:4c43 GameCornerRocketBattleScript.not_direct_movement +12:4c4d GameCornerRocketBattleScript.got_rocket_movement +12:4c5a GameCornerMovement_Rocket_WalkAroundPlayer +12:4c63 GameCornerMovement_Rocket_WalkDirect 12:4c69 GameCornerRocketExitScript 12:4c8a GameCorner_TextPointers 12:4ca4 GameCornerBeauty1Text @@ -8998,8 +8998,8 @@ 12:5b97 MtMoon1F_Blocks 12:5cff MtMoonB2F_h 12:5d0b MtMoonB2F_Script -12:5d31 MtMoonB2F_Script.asm_49d31 -12:5d37 CoordsData_49d37 +12:5d31 MtMoonB2F_Script.enable_battles +12:5d37 MtMoonB2FFossilAreaCoords 12:5d58 MtMoonB2FResetScripts 12:5d63 MtMoonB2F_ScriptPointers 12:5d6f MtMoonB2FDefaultScript @@ -9367,7 +9367,7 @@ 14:4eda Route22GetRivalTrainerNoByStarterScript.next_trainer_no 14:4ee1 Route22GetRivalTrainerNoByStarterScript.got_trainer_no 14:4ee6 Route22MoveRivalRightScript -14:4ef1 Route22MoveRivalRightScript.asm_50ef1 +14:4ef1 Route22MoveRivalRightScript.skip_first_right 14:4efb Route22RivalMovementData 14:4f00 Route22DefaultScript 14:4f2d Route22DefaultScript.Route22RivalBattleCoords @@ -9425,9 +9425,9 @@ 14:51e9 Route23SetVictoryRoadBoulders 14:5213 Route23_ScriptPointers 14:5219 Route23DefaultScript -14:5224 Route23DefaultScript.asm_51224 -14:5237 Route23DefaultScript.asm_51237 -14:5255 YCoordsData_51255 +14:5224 Route23DefaultScript.loop +14:5237 Route23DefaultScript.not_past_victory_road +14:5255 Route23GuardsYCoords 14:525d Route23CopyBadgeTextScript 14:526e Route23CopyBadgeTextScript.copyTextLoop 14:5276 BadgeTextPointers @@ -10792,11 +10792,11 @@ 16:5929 Route15CooltrainerF4AfterBattleText 16:592e Route15SignText 16:5933 Route16_Script -16:5946 Route16Script_59946 +16:5946 Route16ResetScripts 16:5951 Route16_ScriptPointers 16:5959 Route16DefaultScript -16:598f Route16SnorlaxBattleScript -16:59a8 Route16SnorlaxBattleScript.caught +16:598f Route16SnorlaxPostBattleScript +16:59a8 Route16SnorlaxPostBattleScript.caught 16:59b9 Route16_TextPointers 16:59cf Route16TrainerHeaders 16:59cf Route16TrainerHeader0 @@ -11009,13 +11009,13 @@ 16:63e9 LancesRoom_Blocks 16:6492 HallOfFame_h 16:649e HallOfFame_Script -16:64aa HallofFameRoomScript_5a4aa +16:64aa HallofFameRoomClearScripts 16:64b2 HallOfFame_ScriptPointers 16:64ba HallOfFameNoopScript 16:64bb HallOfFameResetEventsAndSaveScript 16:64ff HallOfFameResetEventsAndSaveScript.delayLoop 16:650d HallOfFameDefaultScript -16:6528 RLEMovement5a528 +16:6528 HallOfFakeEntryMovement 16:652b HallOfFameOakCongratulationsScript 16:656a HallOfFame_TextPointers 16:656c HallOfFameOakText @@ -11316,11 +11316,11 @@ 17:4d21 CopycatsHouse2F_Object 17:4d51 FightingDojo_h 17:4d5d FightingDojo_Script -17:4d70 FightingDojoScript_5cd70 +17:4d70 FightingDojoResetScripts 17:4d7b FightingDojo_ScriptPointers 17:4d83 FightingDojoDefaultScript 17:4dc6 FightingDojoKarateMasterPostBattleScript -17:4de4 FightingDojoKarateMasterPostBattleScript.asm_5cde4 +17:4de4 FightingDojoKarateMasterPostBattleScript.already_facing 17:4e03 FightingDojo_TextPointers 17:4e13 FightingDojoTrainerHeaders 17:4e13 FightingDojoTrainerHeader0 @@ -11807,10 +11807,10 @@ 18:506b GiveFossilToCinnabarLab.choseDomeFossil 18:506d GiveFossilToCinnabarLab.fossilSelected 18:50a7 GiveFossilToCinnabarLab.cancelledGivingFossil -18:50ae LabFossil_610ae -18:50b3 LabFossil_610b3 -18:50b8 LabFossil_610b8 -18:50bd LabFossil_610bd +18:50ae GiveFossilToCinnabarLab.ScientistSeesFossilText +18:50b3 GiveFossilToCinnabarLab.ScientistTakesFossilText +18:50b8 GiveFossilToCinnabarLab.GoForAWalkText +18:50bd GiveFossilToCinnabarLab.ComeAgainText 18:50c2 PrintFossilsInBag 18:50c8 PrintFossilsInBag.loop 18:50eb LoadFossilItemAndMonName @@ -12989,8 +12989,8 @@ 1d:4e09 CeruleanBadgeHouse_Script 1d:4e13 CeruleanBadgeHouse_TextPointers 1d:4e15 CeruleanBadgeHouseMiddleAgedManText -1d:4e23 CeruleanBadgeHouseMiddleAgedManText.asm_74e23 -1d:4e60 CeruleanBadgeHouseMiddleAgedManText.asm_74e60 +1d:4e23 CeruleanBadgeHouseMiddleAgedManText.loop +1d:4e60 CeruleanBadgeHouseMiddleAgedManText.done 1d:4e6d CeruleanBadgeHouseMiddleAgedManText.BadgeItemList 1d:4e77 CeruleanBadgeHouseMiddleAgedManText.Text 1d:4e7c CeruleanBadgeHouseMiddleAgedManText.WhichBadgeText @@ -13182,7 +13182,7 @@ 1d:57dc CinnabarGymGetOpponentTextScript 1d:57f1 CinnabarGymFlagAction 1d:57f6 CinnabarGymOpenGateScript -1d:581b CinnabarGymOpenGateScript.asm_7581b +1d:581b CinnabarGymOpenGateScript.no_sound 1d:584a CinnabarGymBlainePostBattleScript 1d:5857 CinnabarGymReceiveTM38 1d:5879 CinnabarGymReceiveTM38.BagFull @@ -13340,7 +13340,7 @@ 1d:6099 ChampionsRoomPlayerFollowsOakScript 1d:60b4 WalkToHallOfFame_RLEMovement 1d:60b9 ChampionsRoomCleanupScript -1d:60c8 RivalScript_760c8 +1d:60c8 ChampionsRoom_DisplayTextID_AllowABSelectStart 1d:60d6 ChampionsRoom_TextPointers 1d:60e0 ChampionsRoomRivalText 1d:60ee ChampionsRoomRivalText.printText @@ -16979,10 +16979,10 @@ 28:5145 _CinnabarLabFossilRoomScientist1NoFossilsText 28:5156 _CinnabarLabFossilRoomScientist1GoForAWalkText 28:518d _CinnabarLabFossilRoomScientist1FossilIsBackToLifeText -28:51d6 _Lab4Text_610ae -28:5259 _Lab4Text_610b3 -28:528f _Lab4Text_610b8 -28:52c6 _Lab4Text_610bd +28:51d6 _CinnabarLabFossilRoomScientist1SeesFossilText +28:5259 _CinnabarLabFossilRoomScientist1TakesFossilText +28:528f _CinnabarLabFossilRoomScientist1GoForAWalkText2 +28:52c6 _CinnabarLabFossilRoomScientist1ComeAgainText 28:52de _CinnabarPokecenterCooltrainerFText 28:533e _CinnabarPokecenterGentlemanText 28:539b _CinnabarMartSilphWorkerFText