diff --git a/pokeblue.sym b/pokeblue.sym index c443abbea..18cab8e33 100644 --- a/pokeblue.sym +++ b/pokeblue.sym @@ -873,7 +873,7 @@ 00:35d6 Bankswitch 00:35e4 Bankswitch.Return 00:35ec YesNoChoice -00:35f4 Func_35f4 +00:35f4 TwoOptionMenu 00:35ff InitYesNoTextBoxParameters 00:360a YesNoChoicePokeCenter 00:361a WideYesNoChoice @@ -1424,7 +1424,7 @@ 01:5c0a LinkMenu 01:5c52 LinkMenu.waitForInputLoop 01:5c66 LinkMenu.exchangeMenuSelectionLoop -01:5c7d LinkMenu.asm_5c7d +01:5c7d LinkMenu.checkEnemyMenuSelection 01:5c8b LinkMenu.enemyPressedAOrB 01:5c98 LinkMenu.useEnemyMenuSelection 01:5ca1 LinkMenu.doneChoosingMenuSelection @@ -2547,7 +2547,7 @@ 03:43db CheckForceBikeOrSurf.forceSurfing 03:43e6 ForcedBikeOrSurfMaps 03:43ff IsPlayerFacingEdgeOfMap -03:441e IsPlayerFacingEdgeOfMap.asm_c41e +03:441e IsPlayerFacingEdgeOfMap.return 03:4422 IsPlayerFacingEdgeOfMap.functionPointerTable 03:442a IsPlayerFacingEdgeOfMap.facingDown 03:4434 IsPlayerFacingEdgeOfMap.facingUp @@ -2592,7 +2592,7 @@ 03:452e WarpTileIDPointers.ShipPortWarpTileIDs 03:452e WarpTileIDPointers.ClubWarpTileIDs 03:452f PrintSafariZoneSteps -03:456d PrintSafariZoneSteps.asm_c56d +03:456d PrintSafariZoneSteps.tenOrMore 03:4579 SafariSteps 03:457e SafariBallText 03:4586 GetTileAndCoordsInFrontOfPlayer @@ -2633,7 +2633,7 @@ 03:4754 LoadTilesetHeader 03:4765 LoadTilesetHeader.noCarry 03:476f LoadTilesetHeader.copyTilesetHeaderLoop -03:4797 LoadTilesetHeader.asm_c797 +03:4797 LoadTilesetHeader.dungeon 03:47b1 LoadTilesetHeader.done 03:47b2 DungeonTilesets 03:47be Tilesets @@ -2720,7 +2720,7 @@ 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed 03:4dec IsSurfingAllowed.forcedToRideBike -03:4df7 CoordsData_cdf7 +03:4df7 SeafoamIslandsB4FStairsCoords 03:4dfa CurrentTooFastText 03:4dff CyclingIsFunText 03:4e04 AddItemToInventory_ @@ -3174,15 +3174,15 @@ 03:678d IsKeyItem_.checkIfItemIsHM 03:6799 KeyItemFlags 03:67a4 SendNewMonToBox -03:67b1 SendNewMonToBox.asm_e7b1 -03:67db SendNewMonToBox.asm_e7db -03:67ee SendNewMonToBox.asm_e7ee -03:6817 SendNewMonToBox.asm_e817 -03:682a SendNewMonToBox.asm_e82a -03:6854 SendNewMonToBox.asm_e854 -03:6867 SendNewMonToBox.asm_e867 -03:689f SendNewMonToBox.asm_e89f -03:68b1 SendNewMonToBox.asm_e8b1 +03:67b1 SendNewMonToBox.loop +03:67db SendNewMonToBox.loop2 +03:67ee SendNewMonToBox.skip +03:6817 SendNewMonToBox.loop3 +03:682a SendNewMonToBox.skip2 +03:6854 SendNewMonToBox.loop4 +03:6867 SendNewMonToBox.skip3 +03:689f SendNewMonToBox.loop5 +03:68b1 SendNewMonToBox.loop6 03:68b8 IsNextTileShoreOrWater 03:68d8 IsNextTileShoreOrWater.skipShoreTiles 03:68dc IsNextTileShoreOrWater.notShoreOrWater @@ -3258,7 +3258,7 @@ 03:7113 MarkTownVisitedAndLoadMissableObjects 03:7125 MarkTownVisitedAndLoadMissableObjects.notInTown 03:7132 LoadMissableObjects -03:713c LoadMissableObjects.asm_f13c +03:713c LoadMissableObjects.noCarry 03:715f LoadMissableObjects.writeMissableObjectsListLoop 03:7171 LoadMissableObjects.done 03:7175 InitializeMissableObjectsFlags @@ -3374,8 +3374,8 @@ 03:78b7 GetQuantityOfItemInBag.notInBag 03:78ba FindPathToPlayer 03:78c8 FindPathToPlayer.loop -03:78da FindPathToPlayer.asm_f8da -03:78ec FindPathToPlayer.asm_f8ec +03:78da FindPathToPlayer.stillHasYProgress +03:78ec FindPathToPlayer.stillHasXProgress 03:7900 FindPathToPlayer.playerIsLeftOfNPC 03:7902 FindPathToPlayer.next1 03:790a FindPathToPlayer.yDistanceGreater @@ -3419,7 +3419,7 @@ 03:7ae4 UpdateHPBar_CalcHPDifference.oldHPGreater 03:7aeb UpdateHPBar_CalcHPDifference.testLowerByte 03:7af5 UpdateHPBar_PrintHPNumber -03:7b15 UpdateHPBar_PrintHPNumber.asm_fb15 +03:7b15 UpdateHPBar_PrintHPNumber.hpBelowBar 03:7b18 UpdateHPBar_PrintHPNumber.next 03:7b2d UpdateHPBar_PrintHPNumber.done 03:7b30 UpdateHPBar_CalcOldNewHPBarPixels @@ -3857,8 +3857,8 @@ 06:4c86 FuchsiaCity_Blocks 06:4dee TrackPlayTime 06:4e36 CountDownIgnoreInputBitReset -06:4e40 CountDownIgnoreInputBitReset.asm_18e40 -06:4e41 CountDownIgnoreInputBitReset.asm_18e41 +06:4e40 CountDownIgnoreInputBitReset.decrement +06:4e41 CountDownIgnoreInputBitReset.continue 06:4e5b PalletTown_Script 06:4e67 PalletTown_Script.next 06:4e73 PalletTown_ScriptPointers @@ -4948,8 +4948,8 @@ 07:6a80 CinnabarQuizQuestionsText5 07:6a85 CinnabarQuizQuestionsText6 07:6a8a CinnabarGymGateFlagAction -07:6a92 CinnabarGymQuiz_1ea92 -07:6ab8 CinnabarGymQuiz_1ea92.wrongAnswer +07:6a92 CinnabarGymQuiz_AskQuestion +07:6ab8 CinnabarGymQuiz_AskQuestion.wrongAnswer 07:6ae3 CinnabarGymQuizCorrectText 07:6b05 CinnabarGymQuizIncorrectText 07:6b0a UpdateCinnabarGymGateTileBlocks_ @@ -5340,9 +5340,9 @@ 08:534e SFX_Cry22_2_Ch6 08:5361 SFX_Cry22_2_Ch8 08:536e Music_DoLowHealthAlarm -08:5383 Music_DoLowHealthAlarm.asm_21383 -08:538a Music_DoLowHealthAlarm.asm_2138a -08:5395 Music_DoLowHealthAlarm.asm_21395 +08:5383 Music_DoLowHealthAlarm.notToneHi +08:538a Music_DoLowHealthAlarm.noTone +08:5395 Music_DoLowHealthAlarm.resetTimer 08:539b Music_DoLowHealthAlarm.disableAlarm 08:53a7 Music_DoLowHealthAlarm.playToneHi 08:53ac Music_DoLowHealthAlarm.playToneLo @@ -6143,7 +6143,7 @@ 0d:7cd2 PewterGuys.copyMovementDataLoop 0d:7ce1 PewterGuys.nextEntry1 0d:7ce2 PewterGuys.nextEntry2 -0d:7ce6 PointerTable_37ce6 +0d:7ce6 PewterGuysCoordsTable 0d:7cea PewterMuseumGuyCoords 0d:7cfa PewterMuseumGuyCoords.down 0d:7cfd PewterMuseumGuyCoords.up @@ -6160,11 +6160,11 @@ 0d:7d77 _Multiply.smallMultiplier 0d:7d94 _Multiply.done 0d:7da5 _Divide -0d:7db3 _Divide.asm_37db3 -0d:7dce _Divide.asm_37dce -0d:7e04 _Divide.asm_37e04 -0d:7e0a _Divide.asm_37e0a -0d:7e18 _Divide.asm_37e18 +0d:7db3 _Divide.loop +0d:7dce _Divide.next +0d:7e04 _Divide.next2 +0d:7e0a _Divide.okay +0d:7e18 _Divide.done 0d:7e2d StartSlotMachine 0d:7e58 StartSlotMachine.match 0d:7e5a StartSlotMachine.next @@ -7257,7 +7257,7 @@ 0f:6f12 InitBattle 0f:6f18 InitOpponent 0f:6f23 DetermineWildOpponent -0f:6f2f DetermineWildOpponent.asm_3ef2f +0f:6f2f DetermineWildOpponent.notDebug 0f:6f3d InitBattleCommon 0f:6f8b InitWildBattle 0f:6fa2 InitWildBattle.isGhost @@ -8056,9 +8056,9 @@ 11:4fbb RocketHideout2ArrowMovement36 11:4fc2 RocketHideout2Script3 11:4fd7 LoadSpinnerArrowTiles -11:4ff6 LoadSpinnerArrowTiles.asm_44ff6 -11:5001 LoadSpinnerArrowTiles.asm_45001 -11:5006 LoadSpinnerArrowTiles.asm_45006 +11:4ff6 LoadSpinnerArrowTiles.gotSpinnerArrows +11:5001 LoadSpinnerArrowTiles.alternateGraphics +11:5006 LoadSpinnerArrowTiles.loop 11:5023 FacilitySpinnerArrows 11:5053 GymSpinnerArrows 11:5083 SpinnerPlayerFacingDirections @@ -10404,7 +10404,7 @@ 15:6613 SilphCo8F_Object 15:666d SilphCo8F_Blocks 15:66e2 DisplayDiploma -15:6715 DisplayDiploma.asm_56715 +15:6715 DisplayDiploma.placeTextLoop 15:673e DisplayDiploma.adjustPlayerGfxLoop 15:6777 UnusedPlayerNameLengthFunc 15:677d UnusedPlayerNameLengthFunc.loop @@ -12163,7 +12163,7 @@ 18:64da FuchsiaCityPokecenterBenchGuyText 18:64df CinnabarIslandPokecenterBenchGuyText 18:64e4 SaffronCityPokecenterBenchGuyText -18:64f2 SaffronCityPokecenterBenchGuyText.asm_624f2 +18:64f2 SaffronCityPokecenterBenchGuyText.printText 18:64f8 SaffronCityPokecenterBenchGuyText1 18:64fd SaffronCityPokecenterBenchGuyText2 18:6502 CeladonCityHotelText @@ -12719,14 +12719,14 @@ 1c:6518 PctTrnPacket 1c:6528 MaskEnFreezePacket 1c:6538 MaskEnCancelPacket -1c:6548 DataSnd_72548 -1c:6558 DataSnd_72558 -1c:6568 DataSnd_72568 -1c:6578 DataSnd_72578 -1c:6588 DataSnd_72588 -1c:6598 DataSnd_72598 -1c:65a8 DataSnd_725a8 -1c:65b8 DataSnd_725b8 +1c:6548 DataSndPacket1 +1c:6558 DataSndPacket2 +1c:6568 DataSndPacket3 +1c:6578 DataSndPacket4 +1c:6588 DataSndPacket5 +1c:6598 DataSndPacket6 +1c:65a8 DataSndPacket7 +1c:65b8 DataSndPacket8 1c:65c8 MonsterPalettes 1c:6660 SuperPalettes 1c:6788 BorderPalettes diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym index 6e43a0e91..6d78faf2b 100644 --- a/pokeblue_debug.sym +++ b/pokeblue_debug.sym @@ -873,7 +873,7 @@ 00:35ea Bankswitch 00:35f8 Bankswitch.Return 00:3600 YesNoChoice -00:3608 Func_35f4 +00:3608 TwoOptionMenu 00:3613 InitYesNoTextBoxParameters 00:361e YesNoChoicePokeCenter 00:362e WideYesNoChoice @@ -1427,7 +1427,7 @@ 01:5c9c LinkMenu 01:5ce4 LinkMenu.waitForInputLoop 01:5cf8 LinkMenu.exchangeMenuSelectionLoop -01:5d0f LinkMenu.asm_5c7d +01:5d0f LinkMenu.checkEnemyMenuSelection 01:5d1d LinkMenu.enemyPressedAOrB 01:5d2a LinkMenu.useEnemyMenuSelection 01:5d33 LinkMenu.doneChoosingMenuSelection @@ -2556,7 +2556,7 @@ 03:43db CheckForceBikeOrSurf.forceSurfing 03:43e6 ForcedBikeOrSurfMaps 03:43ff IsPlayerFacingEdgeOfMap -03:441e IsPlayerFacingEdgeOfMap.asm_c41e +03:441e IsPlayerFacingEdgeOfMap.return 03:4422 IsPlayerFacingEdgeOfMap.functionPointerTable 03:442a IsPlayerFacingEdgeOfMap.facingDown 03:4434 IsPlayerFacingEdgeOfMap.facingUp @@ -2601,7 +2601,7 @@ 03:452e WarpTileIDPointers.ShipPortWarpTileIDs 03:452e WarpTileIDPointers.ClubWarpTileIDs 03:452f PrintSafariZoneSteps -03:456d PrintSafariZoneSteps.asm_c56d +03:456d PrintSafariZoneSteps.tenOrMore 03:4579 SafariSteps 03:457e SafariBallText 03:4586 GetTileAndCoordsInFrontOfPlayer @@ -2642,7 +2642,7 @@ 03:4754 LoadTilesetHeader 03:4765 LoadTilesetHeader.noCarry 03:476f LoadTilesetHeader.copyTilesetHeaderLoop -03:4797 LoadTilesetHeader.asm_c797 +03:4797 LoadTilesetHeader.dungeon 03:47b1 LoadTilesetHeader.done 03:47b2 DungeonTilesets 03:47be Tilesets @@ -2729,7 +2729,7 @@ 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed 03:4dec IsSurfingAllowed.forcedToRideBike -03:4df7 CoordsData_cdf7 +03:4df7 SeafoamIslandsB4FStairsCoords 03:4dfa CurrentTooFastText 03:4dff CyclingIsFunText 03:4e04 AddItemToInventory_ @@ -3183,15 +3183,15 @@ 03:678d IsKeyItem_.checkIfItemIsHM 03:6799 KeyItemFlags 03:67a4 SendNewMonToBox -03:67b1 SendNewMonToBox.asm_e7b1 -03:67db SendNewMonToBox.asm_e7db -03:67ee SendNewMonToBox.asm_e7ee -03:6817 SendNewMonToBox.asm_e817 -03:682a SendNewMonToBox.asm_e82a -03:6854 SendNewMonToBox.asm_e854 -03:6867 SendNewMonToBox.asm_e867 -03:689f SendNewMonToBox.asm_e89f -03:68b1 SendNewMonToBox.asm_e8b1 +03:67b1 SendNewMonToBox.loop +03:67db SendNewMonToBox.loop2 +03:67ee SendNewMonToBox.skip +03:6817 SendNewMonToBox.loop3 +03:682a SendNewMonToBox.skip2 +03:6854 SendNewMonToBox.loop4 +03:6867 SendNewMonToBox.skip3 +03:689f SendNewMonToBox.loop5 +03:68b1 SendNewMonToBox.loop6 03:68b8 IsNextTileShoreOrWater 03:68d8 IsNextTileShoreOrWater.skipShoreTiles 03:68dc IsNextTileShoreOrWater.notShoreOrWater @@ -3267,7 +3267,7 @@ 03:7113 MarkTownVisitedAndLoadMissableObjects 03:7125 MarkTownVisitedAndLoadMissableObjects.notInTown 03:7132 LoadMissableObjects -03:713c LoadMissableObjects.asm_f13c +03:713c LoadMissableObjects.noCarry 03:715f LoadMissableObjects.writeMissableObjectsListLoop 03:7171 LoadMissableObjects.done 03:7175 InitializeMissableObjectsFlags @@ -3383,8 +3383,8 @@ 03:78b7 GetQuantityOfItemInBag.notInBag 03:78ba FindPathToPlayer 03:78c8 FindPathToPlayer.loop -03:78da FindPathToPlayer.asm_f8da -03:78ec FindPathToPlayer.asm_f8ec +03:78da FindPathToPlayer.stillHasYProgress +03:78ec FindPathToPlayer.stillHasXProgress 03:7900 FindPathToPlayer.playerIsLeftOfNPC 03:7902 FindPathToPlayer.next1 03:790a FindPathToPlayer.yDistanceGreater @@ -3428,7 +3428,7 @@ 03:7ae4 UpdateHPBar_CalcHPDifference.oldHPGreater 03:7aeb UpdateHPBar_CalcHPDifference.testLowerByte 03:7af5 UpdateHPBar_PrintHPNumber -03:7b15 UpdateHPBar_PrintHPNumber.asm_fb15 +03:7b15 UpdateHPBar_PrintHPNumber.hpBelowBar 03:7b18 UpdateHPBar_PrintHPNumber.next 03:7b2d UpdateHPBar_PrintHPNumber.done 03:7b30 UpdateHPBar_CalcOldNewHPBarPixels @@ -3866,8 +3866,8 @@ 06:4c86 FuchsiaCity_Blocks 06:4dee TrackPlayTime 06:4e36 CountDownIgnoreInputBitReset -06:4e40 CountDownIgnoreInputBitReset.asm_18e40 -06:4e41 CountDownIgnoreInputBitReset.asm_18e41 +06:4e40 CountDownIgnoreInputBitReset.decrement +06:4e41 CountDownIgnoreInputBitReset.continue 06:4e5b PalletTown_Script 06:4e67 PalletTown_Script.next 06:4e73 PalletTown_ScriptPointers @@ -4957,8 +4957,8 @@ 07:6a84 CinnabarQuizQuestionsText5 07:6a89 CinnabarQuizQuestionsText6 07:6a8e CinnabarGymGateFlagAction -07:6a96 CinnabarGymQuiz_1ea92 -07:6abc CinnabarGymQuiz_1ea92.wrongAnswer +07:6a96 CinnabarGymQuiz_AskQuestion +07:6abc CinnabarGymQuiz_AskQuestion.wrongAnswer 07:6ae7 CinnabarGymQuizCorrectText 07:6b09 CinnabarGymQuizIncorrectText 07:6b0e UpdateCinnabarGymGateTileBlocks_ @@ -5349,9 +5349,9 @@ 08:534e SFX_Cry22_2_Ch6 08:5361 SFX_Cry22_2_Ch8 08:536e Music_DoLowHealthAlarm -08:5383 Music_DoLowHealthAlarm.asm_21383 -08:538a Music_DoLowHealthAlarm.asm_2138a -08:5395 Music_DoLowHealthAlarm.asm_21395 +08:5383 Music_DoLowHealthAlarm.notToneHi +08:538a Music_DoLowHealthAlarm.noTone +08:5395 Music_DoLowHealthAlarm.resetTimer 08:539b Music_DoLowHealthAlarm.disableAlarm 08:53a7 Music_DoLowHealthAlarm.playToneHi 08:53ac Music_DoLowHealthAlarm.playToneLo @@ -6152,7 +6152,7 @@ 0d:7cd2 PewterGuys.copyMovementDataLoop 0d:7ce1 PewterGuys.nextEntry1 0d:7ce2 PewterGuys.nextEntry2 -0d:7ce6 PointerTable_37ce6 +0d:7ce6 PewterGuysCoordsTable 0d:7cea PewterMuseumGuyCoords 0d:7cfa PewterMuseumGuyCoords.down 0d:7cfd PewterMuseumGuyCoords.up @@ -6169,11 +6169,11 @@ 0d:7d77 _Multiply.smallMultiplier 0d:7d94 _Multiply.done 0d:7da5 _Divide -0d:7db3 _Divide.asm_37db3 -0d:7dce _Divide.asm_37dce -0d:7e04 _Divide.asm_37e04 -0d:7e0a _Divide.asm_37e0a -0d:7e18 _Divide.asm_37e18 +0d:7db3 _Divide.loop +0d:7dce _Divide.next +0d:7e04 _Divide.next2 +0d:7e0a _Divide.okay +0d:7e18 _Divide.done 0d:7e2d StartSlotMachine 0d:7e58 StartSlotMachine.match 0d:7e5a StartSlotMachine.next @@ -7266,7 +7266,7 @@ 0f:6f12 InitBattle 0f:6f18 InitOpponent 0f:6f23 DetermineWildOpponent -0f:6f2f DetermineWildOpponent.asm_3ef2f +0f:6f2f DetermineWildOpponent.notDebug 0f:6f3d InitBattleCommon 0f:6f8b InitWildBattle 0f:6fa2 InitWildBattle.isGhost @@ -8065,9 +8065,9 @@ 11:4fbb RocketHideout2ArrowMovement36 11:4fc2 RocketHideout2Script3 11:4fd7 LoadSpinnerArrowTiles -11:4ff6 LoadSpinnerArrowTiles.asm_44ff6 -11:5001 LoadSpinnerArrowTiles.asm_45001 -11:5006 LoadSpinnerArrowTiles.asm_45006 +11:4ff6 LoadSpinnerArrowTiles.gotSpinnerArrows +11:5001 LoadSpinnerArrowTiles.alternateGraphics +11:5006 LoadSpinnerArrowTiles.loop 11:5023 FacilitySpinnerArrows 11:5053 GymSpinnerArrows 11:5083 SpinnerPlayerFacingDirections @@ -10413,7 +10413,7 @@ 15:6613 SilphCo8F_Object 15:666d SilphCo8F_Blocks 15:66e2 DisplayDiploma -15:6715 DisplayDiploma.asm_56715 +15:6715 DisplayDiploma.placeTextLoop 15:673e DisplayDiploma.adjustPlayerGfxLoop 15:6777 UnusedPlayerNameLengthFunc 15:677d UnusedPlayerNameLengthFunc.loop @@ -12172,7 +12172,7 @@ 18:64de FuchsiaCityPokecenterBenchGuyText 18:64e3 CinnabarIslandPokecenterBenchGuyText 18:64e8 SaffronCityPokecenterBenchGuyText -18:64f6 SaffronCityPokecenterBenchGuyText.asm_624f2 +18:64f6 SaffronCityPokecenterBenchGuyText.printText 18:64fc SaffronCityPokecenterBenchGuyText1 18:6501 SaffronCityPokecenterBenchGuyText2 18:6506 CeladonCityHotelText @@ -12728,14 +12728,14 @@ 1c:6518 PctTrnPacket 1c:6528 MaskEnFreezePacket 1c:6538 MaskEnCancelPacket -1c:6548 DataSnd_72548 -1c:6558 DataSnd_72558 -1c:6568 DataSnd_72568 -1c:6578 DataSnd_72578 -1c:6588 DataSnd_72588 -1c:6598 DataSnd_72598 -1c:65a8 DataSnd_725a8 -1c:65b8 DataSnd_725b8 +1c:6548 DataSndPacket1 +1c:6558 DataSndPacket2 +1c:6568 DataSndPacket3 +1c:6578 DataSndPacket4 +1c:6588 DataSndPacket5 +1c:6598 DataSndPacket6 +1c:65a8 DataSndPacket7 +1c:65b8 DataSndPacket8 1c:65c8 MonsterPalettes 1c:6660 SuperPalettes 1c:6788 BorderPalettes diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index 6f0064aed..56d1aa00d 100644 --- a/pokeblue_vc.sym +++ b/pokeblue_vc.sym @@ -879,7 +879,7 @@ 00:35d6 Bankswitch 00:35e4 Bankswitch.Return 00:35ec YesNoChoice -00:35f4 Func_35f4 +00:35f4 TwoOptionMenu 00:35ff InitYesNoTextBoxParameters 00:360a YesNoChoicePokeCenter 00:361a WideYesNoChoice @@ -1434,7 +1434,7 @@ 01:5c0a LinkMenu 01:5c52 LinkMenu.waitForInputLoop 01:5c66 LinkMenu.exchangeMenuSelectionLoop -01:5c7d LinkMenu.asm_5c7d +01:5c7d LinkMenu.checkEnemyMenuSelection 01:5c8b LinkMenu.enemyPressedAOrB 01:5c98 LinkMenu.useEnemyMenuSelection 01:5ca1 LinkMenu.doneChoosingMenuSelection @@ -2563,7 +2563,7 @@ 03:43db CheckForceBikeOrSurf.forceSurfing 03:43e6 ForcedBikeOrSurfMaps 03:43ff IsPlayerFacingEdgeOfMap -03:441e IsPlayerFacingEdgeOfMap.asm_c41e +03:441e IsPlayerFacingEdgeOfMap.return 03:4422 IsPlayerFacingEdgeOfMap.functionPointerTable 03:442a IsPlayerFacingEdgeOfMap.facingDown 03:4434 IsPlayerFacingEdgeOfMap.facingUp @@ -2608,7 +2608,7 @@ 03:452e WarpTileIDPointers.ShipPortWarpTileIDs 03:452e WarpTileIDPointers.ClubWarpTileIDs 03:452f PrintSafariZoneSteps -03:456d PrintSafariZoneSteps.asm_c56d +03:456d PrintSafariZoneSteps.tenOrMore 03:4579 SafariSteps 03:457e SafariBallText 03:4586 GetTileAndCoordsInFrontOfPlayer @@ -2649,7 +2649,7 @@ 03:4754 LoadTilesetHeader 03:4765 LoadTilesetHeader.noCarry 03:476f LoadTilesetHeader.copyTilesetHeaderLoop -03:4797 LoadTilesetHeader.asm_c797 +03:4797 LoadTilesetHeader.dungeon 03:47b1 LoadTilesetHeader.done 03:47b2 DungeonTilesets 03:47be Tilesets @@ -2736,7 +2736,7 @@ 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed 03:4dec IsSurfingAllowed.forcedToRideBike -03:4df7 CoordsData_cdf7 +03:4df7 SeafoamIslandsB4FStairsCoords 03:4dfa CurrentTooFastText 03:4dff CyclingIsFunText 03:4e04 AddItemToInventory_ @@ -3190,15 +3190,15 @@ 03:678d IsKeyItem_.checkIfItemIsHM 03:6799 KeyItemFlags 03:67a4 SendNewMonToBox -03:67b1 SendNewMonToBox.asm_e7b1 -03:67db SendNewMonToBox.asm_e7db -03:67ee SendNewMonToBox.asm_e7ee -03:6817 SendNewMonToBox.asm_e817 -03:682a SendNewMonToBox.asm_e82a -03:6854 SendNewMonToBox.asm_e854 -03:6867 SendNewMonToBox.asm_e867 -03:689f SendNewMonToBox.asm_e89f -03:68b1 SendNewMonToBox.asm_e8b1 +03:67b1 SendNewMonToBox.loop +03:67db SendNewMonToBox.loop2 +03:67ee SendNewMonToBox.skip +03:6817 SendNewMonToBox.loop3 +03:682a SendNewMonToBox.skip2 +03:6854 SendNewMonToBox.loop4 +03:6867 SendNewMonToBox.skip3 +03:689f SendNewMonToBox.loop5 +03:68b1 SendNewMonToBox.loop6 03:68b8 IsNextTileShoreOrWater 03:68d8 IsNextTileShoreOrWater.skipShoreTiles 03:68dc IsNextTileShoreOrWater.notShoreOrWater @@ -3274,7 +3274,7 @@ 03:7113 MarkTownVisitedAndLoadMissableObjects 03:7125 MarkTownVisitedAndLoadMissableObjects.notInTown 03:7132 LoadMissableObjects -03:713c LoadMissableObjects.asm_f13c +03:713c LoadMissableObjects.noCarry 03:715f LoadMissableObjects.writeMissableObjectsListLoop 03:7171 LoadMissableObjects.done 03:7175 InitializeMissableObjectsFlags @@ -3390,8 +3390,8 @@ 03:78b7 GetQuantityOfItemInBag.notInBag 03:78ba FindPathToPlayer 03:78c8 FindPathToPlayer.loop -03:78da FindPathToPlayer.asm_f8da -03:78ec FindPathToPlayer.asm_f8ec +03:78da FindPathToPlayer.stillHasYProgress +03:78ec FindPathToPlayer.stillHasXProgress 03:7900 FindPathToPlayer.playerIsLeftOfNPC 03:7902 FindPathToPlayer.next1 03:790a FindPathToPlayer.yDistanceGreater @@ -3435,7 +3435,7 @@ 03:7ae4 UpdateHPBar_CalcHPDifference.oldHPGreater 03:7aeb UpdateHPBar_CalcHPDifference.testLowerByte 03:7af5 UpdateHPBar_PrintHPNumber -03:7b15 UpdateHPBar_PrintHPNumber.asm_fb15 +03:7b15 UpdateHPBar_PrintHPNumber.hpBelowBar 03:7b18 UpdateHPBar_PrintHPNumber.next 03:7b2d UpdateHPBar_PrintHPNumber.done 03:7b30 UpdateHPBar_CalcOldNewHPBarPixels @@ -3873,8 +3873,8 @@ 06:4c86 FuchsiaCity_Blocks 06:4dee TrackPlayTime 06:4e36 CountDownIgnoreInputBitReset -06:4e40 CountDownIgnoreInputBitReset.asm_18e40 -06:4e41 CountDownIgnoreInputBitReset.asm_18e41 +06:4e40 CountDownIgnoreInputBitReset.decrement +06:4e41 CountDownIgnoreInputBitReset.continue 06:4e5b PalletTown_Script 06:4e67 PalletTown_Script.next 06:4e73 PalletTown_ScriptPointers @@ -4964,8 +4964,8 @@ 07:6a80 CinnabarQuizQuestionsText5 07:6a85 CinnabarQuizQuestionsText6 07:6a8a CinnabarGymGateFlagAction -07:6a92 CinnabarGymQuiz_1ea92 -07:6ab8 CinnabarGymQuiz_1ea92.wrongAnswer +07:6a92 CinnabarGymQuiz_AskQuestion +07:6ab8 CinnabarGymQuiz_AskQuestion.wrongAnswer 07:6ae3 CinnabarGymQuizCorrectText 07:6b05 CinnabarGymQuizIncorrectText 07:6b0a UpdateCinnabarGymGateTileBlocks_ @@ -5356,9 +5356,9 @@ 08:534e SFX_Cry22_2_Ch6 08:5361 SFX_Cry22_2_Ch8 08:536e Music_DoLowHealthAlarm -08:5383 Music_DoLowHealthAlarm.asm_21383 -08:538a Music_DoLowHealthAlarm.asm_2138a -08:5395 Music_DoLowHealthAlarm.asm_21395 +08:5383 Music_DoLowHealthAlarm.notToneHi +08:538a Music_DoLowHealthAlarm.noTone +08:5395 Music_DoLowHealthAlarm.resetTimer 08:539b Music_DoLowHealthAlarm.disableAlarm 08:53a7 Music_DoLowHealthAlarm.playToneHi 08:53ac Music_DoLowHealthAlarm.playToneLo @@ -6159,7 +6159,7 @@ 0d:7cd2 PewterGuys.copyMovementDataLoop 0d:7ce1 PewterGuys.nextEntry1 0d:7ce2 PewterGuys.nextEntry2 -0d:7ce6 PointerTable_37ce6 +0d:7ce6 PewterGuysCoordsTable 0d:7cea PewterMuseumGuyCoords 0d:7cfa PewterMuseumGuyCoords.down 0d:7cfd PewterMuseumGuyCoords.up @@ -6176,11 +6176,11 @@ 0d:7d77 _Multiply.smallMultiplier 0d:7d94 _Multiply.done 0d:7da5 _Divide -0d:7db3 _Divide.asm_37db3 -0d:7dce _Divide.asm_37dce -0d:7e04 _Divide.asm_37e04 -0d:7e0a _Divide.asm_37e0a -0d:7e18 _Divide.asm_37e18 +0d:7db3 _Divide.loop +0d:7dce _Divide.next +0d:7e04 _Divide.next2 +0d:7e0a _Divide.okay +0d:7e18 _Divide.done 0d:7e2d StartSlotMachine 0d:7e58 StartSlotMachine.match 0d:7e5a StartSlotMachine.next @@ -7284,7 +7284,7 @@ 0f:6f12 InitBattle 0f:6f18 InitOpponent 0f:6f23 DetermineWildOpponent -0f:6f2f DetermineWildOpponent.asm_3ef2f +0f:6f2f DetermineWildOpponent.notDebug 0f:6f3d InitBattleCommon 0f:6f8b InitWildBattle 0f:6fa2 InitWildBattle.isGhost @@ -8083,9 +8083,9 @@ 11:4fbb RocketHideout2ArrowMovement36 11:4fc2 RocketHideout2Script3 11:4fd7 LoadSpinnerArrowTiles -11:4ff6 LoadSpinnerArrowTiles.asm_44ff6 -11:5001 LoadSpinnerArrowTiles.asm_45001 -11:5006 LoadSpinnerArrowTiles.asm_45006 +11:4ff6 LoadSpinnerArrowTiles.gotSpinnerArrows +11:5001 LoadSpinnerArrowTiles.alternateGraphics +11:5006 LoadSpinnerArrowTiles.loop 11:5023 FacilitySpinnerArrows 11:5053 GymSpinnerArrows 11:5083 SpinnerPlayerFacingDirections @@ -10431,7 +10431,7 @@ 15:6613 SilphCo8F_Object 15:666d SilphCo8F_Blocks 15:66e2 DisplayDiploma -15:6715 DisplayDiploma.asm_56715 +15:6715 DisplayDiploma.placeTextLoop 15:673e DisplayDiploma.adjustPlayerGfxLoop 15:6777 UnusedPlayerNameLengthFunc 15:677d UnusedPlayerNameLengthFunc.loop @@ -12190,7 +12190,7 @@ 18:64da FuchsiaCityPokecenterBenchGuyText 18:64df CinnabarIslandPokecenterBenchGuyText 18:64e4 SaffronCityPokecenterBenchGuyText -18:64f2 SaffronCityPokecenterBenchGuyText.asm_624f2 +18:64f2 SaffronCityPokecenterBenchGuyText.printText 18:64f8 SaffronCityPokecenterBenchGuyText1 18:64fd SaffronCityPokecenterBenchGuyText2 18:6502 CeladonCityHotelText @@ -12747,14 +12747,14 @@ 1c:6518 PctTrnPacket 1c:6528 MaskEnFreezePacket 1c:6538 MaskEnCancelPacket -1c:6548 DataSnd_72548 -1c:6558 DataSnd_72558 -1c:6568 DataSnd_72568 -1c:6578 DataSnd_72578 -1c:6588 DataSnd_72588 -1c:6598 DataSnd_72598 -1c:65a8 DataSnd_725a8 -1c:65b8 DataSnd_725b8 +1c:6548 DataSndPacket1 +1c:6558 DataSndPacket2 +1c:6568 DataSndPacket3 +1c:6578 DataSndPacket4 +1c:6588 DataSndPacket5 +1c:6598 DataSndPacket6 +1c:65a8 DataSndPacket7 +1c:65b8 DataSndPacket8 1c:65c8 MonsterPalettes 1c:6660 SuperPalettes 1c:6788 BorderPalettes diff --git a/pokered.sym b/pokered.sym index 6789e3c32..2a6631ef2 100644 --- a/pokered.sym +++ b/pokered.sym @@ -873,7 +873,7 @@ 00:35d6 Bankswitch 00:35e4 Bankswitch.Return 00:35ec YesNoChoice -00:35f4 Func_35f4 +00:35f4 TwoOptionMenu 00:35ff InitYesNoTextBoxParameters 00:360a YesNoChoicePokeCenter 00:361a WideYesNoChoice @@ -1424,7 +1424,7 @@ 01:5c0a LinkMenu 01:5c52 LinkMenu.waitForInputLoop 01:5c66 LinkMenu.exchangeMenuSelectionLoop -01:5c7d LinkMenu.asm_5c7d +01:5c7d LinkMenu.checkEnemyMenuSelection 01:5c8b LinkMenu.enemyPressedAOrB 01:5c98 LinkMenu.useEnemyMenuSelection 01:5ca1 LinkMenu.doneChoosingMenuSelection @@ -2547,7 +2547,7 @@ 03:43db CheckForceBikeOrSurf.forceSurfing 03:43e6 ForcedBikeOrSurfMaps 03:43ff IsPlayerFacingEdgeOfMap -03:441e IsPlayerFacingEdgeOfMap.asm_c41e +03:441e IsPlayerFacingEdgeOfMap.return 03:4422 IsPlayerFacingEdgeOfMap.functionPointerTable 03:442a IsPlayerFacingEdgeOfMap.facingDown 03:4434 IsPlayerFacingEdgeOfMap.facingUp @@ -2592,7 +2592,7 @@ 03:452e WarpTileIDPointers.ShipPortWarpTileIDs 03:452e WarpTileIDPointers.ClubWarpTileIDs 03:452f PrintSafariZoneSteps -03:456d PrintSafariZoneSteps.asm_c56d +03:456d PrintSafariZoneSteps.tenOrMore 03:4579 SafariSteps 03:457e SafariBallText 03:4586 GetTileAndCoordsInFrontOfPlayer @@ -2633,7 +2633,7 @@ 03:4754 LoadTilesetHeader 03:4765 LoadTilesetHeader.noCarry 03:476f LoadTilesetHeader.copyTilesetHeaderLoop -03:4797 LoadTilesetHeader.asm_c797 +03:4797 LoadTilesetHeader.dungeon 03:47b1 LoadTilesetHeader.done 03:47b2 DungeonTilesets 03:47be Tilesets @@ -2720,7 +2720,7 @@ 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed 03:4dec IsSurfingAllowed.forcedToRideBike -03:4df7 CoordsData_cdf7 +03:4df7 SeafoamIslandsB4FStairsCoords 03:4dfa CurrentTooFastText 03:4dff CyclingIsFunText 03:4e04 AddItemToInventory_ @@ -3174,15 +3174,15 @@ 03:678d IsKeyItem_.checkIfItemIsHM 03:6799 KeyItemFlags 03:67a4 SendNewMonToBox -03:67b1 SendNewMonToBox.asm_e7b1 -03:67db SendNewMonToBox.asm_e7db -03:67ee SendNewMonToBox.asm_e7ee -03:6817 SendNewMonToBox.asm_e817 -03:682a SendNewMonToBox.asm_e82a -03:6854 SendNewMonToBox.asm_e854 -03:6867 SendNewMonToBox.asm_e867 -03:689f SendNewMonToBox.asm_e89f -03:68b1 SendNewMonToBox.asm_e8b1 +03:67b1 SendNewMonToBox.loop +03:67db SendNewMonToBox.loop2 +03:67ee SendNewMonToBox.skip +03:6817 SendNewMonToBox.loop3 +03:682a SendNewMonToBox.skip2 +03:6854 SendNewMonToBox.loop4 +03:6867 SendNewMonToBox.skip3 +03:689f SendNewMonToBox.loop5 +03:68b1 SendNewMonToBox.loop6 03:68b8 IsNextTileShoreOrWater 03:68d8 IsNextTileShoreOrWater.skipShoreTiles 03:68dc IsNextTileShoreOrWater.notShoreOrWater @@ -3258,7 +3258,7 @@ 03:7113 MarkTownVisitedAndLoadMissableObjects 03:7125 MarkTownVisitedAndLoadMissableObjects.notInTown 03:7132 LoadMissableObjects -03:713c LoadMissableObjects.asm_f13c +03:713c LoadMissableObjects.noCarry 03:715f LoadMissableObjects.writeMissableObjectsListLoop 03:7171 LoadMissableObjects.done 03:7175 InitializeMissableObjectsFlags @@ -3374,8 +3374,8 @@ 03:78b7 GetQuantityOfItemInBag.notInBag 03:78ba FindPathToPlayer 03:78c8 FindPathToPlayer.loop -03:78da FindPathToPlayer.asm_f8da -03:78ec FindPathToPlayer.asm_f8ec +03:78da FindPathToPlayer.stillHasYProgress +03:78ec FindPathToPlayer.stillHasXProgress 03:7900 FindPathToPlayer.playerIsLeftOfNPC 03:7902 FindPathToPlayer.next1 03:790a FindPathToPlayer.yDistanceGreater @@ -3419,7 +3419,7 @@ 03:7ae4 UpdateHPBar_CalcHPDifference.oldHPGreater 03:7aeb UpdateHPBar_CalcHPDifference.testLowerByte 03:7af5 UpdateHPBar_PrintHPNumber -03:7b15 UpdateHPBar_PrintHPNumber.asm_fb15 +03:7b15 UpdateHPBar_PrintHPNumber.hpBelowBar 03:7b18 UpdateHPBar_PrintHPNumber.next 03:7b2d UpdateHPBar_PrintHPNumber.done 03:7b30 UpdateHPBar_CalcOldNewHPBarPixels @@ -3857,8 +3857,8 @@ 06:4c86 FuchsiaCity_Blocks 06:4dee TrackPlayTime 06:4e36 CountDownIgnoreInputBitReset -06:4e40 CountDownIgnoreInputBitReset.asm_18e40 -06:4e41 CountDownIgnoreInputBitReset.asm_18e41 +06:4e40 CountDownIgnoreInputBitReset.decrement +06:4e41 CountDownIgnoreInputBitReset.continue 06:4e5b PalletTown_Script 06:4e67 PalletTown_Script.next 06:4e73 PalletTown_ScriptPointers @@ -4948,8 +4948,8 @@ 07:6a80 CinnabarQuizQuestionsText5 07:6a85 CinnabarQuizQuestionsText6 07:6a8a CinnabarGymGateFlagAction -07:6a92 CinnabarGymQuiz_1ea92 -07:6ab8 CinnabarGymQuiz_1ea92.wrongAnswer +07:6a92 CinnabarGymQuiz_AskQuestion +07:6ab8 CinnabarGymQuiz_AskQuestion.wrongAnswer 07:6ae3 CinnabarGymQuizCorrectText 07:6b05 CinnabarGymQuizIncorrectText 07:6b0a UpdateCinnabarGymGateTileBlocks_ @@ -5340,9 +5340,9 @@ 08:534e SFX_Cry22_2_Ch6 08:5361 SFX_Cry22_2_Ch8 08:536e Music_DoLowHealthAlarm -08:5383 Music_DoLowHealthAlarm.asm_21383 -08:538a Music_DoLowHealthAlarm.asm_2138a -08:5395 Music_DoLowHealthAlarm.asm_21395 +08:5383 Music_DoLowHealthAlarm.notToneHi +08:538a Music_DoLowHealthAlarm.noTone +08:5395 Music_DoLowHealthAlarm.resetTimer 08:539b Music_DoLowHealthAlarm.disableAlarm 08:53a7 Music_DoLowHealthAlarm.playToneHi 08:53ac Music_DoLowHealthAlarm.playToneLo @@ -6143,7 +6143,7 @@ 0d:7cd2 PewterGuys.copyMovementDataLoop 0d:7ce1 PewterGuys.nextEntry1 0d:7ce2 PewterGuys.nextEntry2 -0d:7ce6 PointerTable_37ce6 +0d:7ce6 PewterGuysCoordsTable 0d:7cea PewterMuseumGuyCoords 0d:7cfa PewterMuseumGuyCoords.down 0d:7cfd PewterMuseumGuyCoords.up @@ -6160,11 +6160,11 @@ 0d:7d77 _Multiply.smallMultiplier 0d:7d94 _Multiply.done 0d:7da5 _Divide -0d:7db3 _Divide.asm_37db3 -0d:7dce _Divide.asm_37dce -0d:7e04 _Divide.asm_37e04 -0d:7e0a _Divide.asm_37e0a -0d:7e18 _Divide.asm_37e18 +0d:7db3 _Divide.loop +0d:7dce _Divide.next +0d:7e04 _Divide.next2 +0d:7e0a _Divide.okay +0d:7e18 _Divide.done 0d:7e2d StartSlotMachine 0d:7e58 StartSlotMachine.match 0d:7e5a StartSlotMachine.next @@ -7257,7 +7257,7 @@ 0f:6f12 InitBattle 0f:6f18 InitOpponent 0f:6f23 DetermineWildOpponent -0f:6f2f DetermineWildOpponent.asm_3ef2f +0f:6f2f DetermineWildOpponent.notDebug 0f:6f3d InitBattleCommon 0f:6f8b InitWildBattle 0f:6fa2 InitWildBattle.isGhost @@ -8056,9 +8056,9 @@ 11:4fbb RocketHideout2ArrowMovement36 11:4fc2 RocketHideout2Script3 11:4fd7 LoadSpinnerArrowTiles -11:4ff6 LoadSpinnerArrowTiles.asm_44ff6 -11:5001 LoadSpinnerArrowTiles.asm_45001 -11:5006 LoadSpinnerArrowTiles.asm_45006 +11:4ff6 LoadSpinnerArrowTiles.gotSpinnerArrows +11:5001 LoadSpinnerArrowTiles.alternateGraphics +11:5006 LoadSpinnerArrowTiles.loop 11:5023 FacilitySpinnerArrows 11:5053 GymSpinnerArrows 11:5083 SpinnerPlayerFacingDirections @@ -10404,7 +10404,7 @@ 15:6613 SilphCo8F_Object 15:666d SilphCo8F_Blocks 15:66e2 DisplayDiploma -15:6715 DisplayDiploma.asm_56715 +15:6715 DisplayDiploma.placeTextLoop 15:673e DisplayDiploma.adjustPlayerGfxLoop 15:6777 UnusedPlayerNameLengthFunc 15:677d UnusedPlayerNameLengthFunc.loop @@ -12163,7 +12163,7 @@ 18:64da FuchsiaCityPokecenterBenchGuyText 18:64df CinnabarIslandPokecenterBenchGuyText 18:64e4 SaffronCityPokecenterBenchGuyText -18:64f2 SaffronCityPokecenterBenchGuyText.asm_624f2 +18:64f2 SaffronCityPokecenterBenchGuyText.printText 18:64f8 SaffronCityPokecenterBenchGuyText1 18:64fd SaffronCityPokecenterBenchGuyText2 18:6502 CeladonCityHotelText @@ -12719,14 +12719,14 @@ 1c:6518 PctTrnPacket 1c:6528 MaskEnFreezePacket 1c:6538 MaskEnCancelPacket -1c:6548 DataSnd_72548 -1c:6558 DataSnd_72558 -1c:6568 DataSnd_72568 -1c:6578 DataSnd_72578 -1c:6588 DataSnd_72588 -1c:6598 DataSnd_72598 -1c:65a8 DataSnd_725a8 -1c:65b8 DataSnd_725b8 +1c:6548 DataSndPacket1 +1c:6558 DataSndPacket2 +1c:6568 DataSndPacket3 +1c:6578 DataSndPacket4 +1c:6588 DataSndPacket5 +1c:6598 DataSndPacket6 +1c:65a8 DataSndPacket7 +1c:65b8 DataSndPacket8 1c:65c8 MonsterPalettes 1c:6660 SuperPalettes 1c:6788 BorderPalettes diff --git a/pokered_vc.sym b/pokered_vc.sym index eb5ff5217..f2fc4368d 100644 --- a/pokered_vc.sym +++ b/pokered_vc.sym @@ -879,7 +879,7 @@ 00:35d6 Bankswitch 00:35e4 Bankswitch.Return 00:35ec YesNoChoice -00:35f4 Func_35f4 +00:35f4 TwoOptionMenu 00:35ff InitYesNoTextBoxParameters 00:360a YesNoChoicePokeCenter 00:361a WideYesNoChoice @@ -1434,7 +1434,7 @@ 01:5c0a LinkMenu 01:5c52 LinkMenu.waitForInputLoop 01:5c66 LinkMenu.exchangeMenuSelectionLoop -01:5c7d LinkMenu.asm_5c7d +01:5c7d LinkMenu.checkEnemyMenuSelection 01:5c8b LinkMenu.enemyPressedAOrB 01:5c98 LinkMenu.useEnemyMenuSelection 01:5ca1 LinkMenu.doneChoosingMenuSelection @@ -2563,7 +2563,7 @@ 03:43db CheckForceBikeOrSurf.forceSurfing 03:43e6 ForcedBikeOrSurfMaps 03:43ff IsPlayerFacingEdgeOfMap -03:441e IsPlayerFacingEdgeOfMap.asm_c41e +03:441e IsPlayerFacingEdgeOfMap.return 03:4422 IsPlayerFacingEdgeOfMap.functionPointerTable 03:442a IsPlayerFacingEdgeOfMap.facingDown 03:4434 IsPlayerFacingEdgeOfMap.facingUp @@ -2608,7 +2608,7 @@ 03:452e WarpTileIDPointers.ShipPortWarpTileIDs 03:452e WarpTileIDPointers.ClubWarpTileIDs 03:452f PrintSafariZoneSteps -03:456d PrintSafariZoneSteps.asm_c56d +03:456d PrintSafariZoneSteps.tenOrMore 03:4579 SafariSteps 03:457e SafariBallText 03:4586 GetTileAndCoordsInFrontOfPlayer @@ -2649,7 +2649,7 @@ 03:4754 LoadTilesetHeader 03:4765 LoadTilesetHeader.noCarry 03:476f LoadTilesetHeader.copyTilesetHeaderLoop -03:4797 LoadTilesetHeader.asm_c797 +03:4797 LoadTilesetHeader.dungeon 03:47b1 LoadTilesetHeader.done 03:47b2 DungeonTilesets 03:47be Tilesets @@ -2736,7 +2736,7 @@ 03:4dbb CanMoveBouldersText 03:4dc0 IsSurfingAllowed 03:4dec IsSurfingAllowed.forcedToRideBike -03:4df7 CoordsData_cdf7 +03:4df7 SeafoamIslandsB4FStairsCoords 03:4dfa CurrentTooFastText 03:4dff CyclingIsFunText 03:4e04 AddItemToInventory_ @@ -3190,15 +3190,15 @@ 03:678d IsKeyItem_.checkIfItemIsHM 03:6799 KeyItemFlags 03:67a4 SendNewMonToBox -03:67b1 SendNewMonToBox.asm_e7b1 -03:67db SendNewMonToBox.asm_e7db -03:67ee SendNewMonToBox.asm_e7ee -03:6817 SendNewMonToBox.asm_e817 -03:682a SendNewMonToBox.asm_e82a -03:6854 SendNewMonToBox.asm_e854 -03:6867 SendNewMonToBox.asm_e867 -03:689f SendNewMonToBox.asm_e89f -03:68b1 SendNewMonToBox.asm_e8b1 +03:67b1 SendNewMonToBox.loop +03:67db SendNewMonToBox.loop2 +03:67ee SendNewMonToBox.skip +03:6817 SendNewMonToBox.loop3 +03:682a SendNewMonToBox.skip2 +03:6854 SendNewMonToBox.loop4 +03:6867 SendNewMonToBox.skip3 +03:689f SendNewMonToBox.loop5 +03:68b1 SendNewMonToBox.loop6 03:68b8 IsNextTileShoreOrWater 03:68d8 IsNextTileShoreOrWater.skipShoreTiles 03:68dc IsNextTileShoreOrWater.notShoreOrWater @@ -3274,7 +3274,7 @@ 03:7113 MarkTownVisitedAndLoadMissableObjects 03:7125 MarkTownVisitedAndLoadMissableObjects.notInTown 03:7132 LoadMissableObjects -03:713c LoadMissableObjects.asm_f13c +03:713c LoadMissableObjects.noCarry 03:715f LoadMissableObjects.writeMissableObjectsListLoop 03:7171 LoadMissableObjects.done 03:7175 InitializeMissableObjectsFlags @@ -3390,8 +3390,8 @@ 03:78b7 GetQuantityOfItemInBag.notInBag 03:78ba FindPathToPlayer 03:78c8 FindPathToPlayer.loop -03:78da FindPathToPlayer.asm_f8da -03:78ec FindPathToPlayer.asm_f8ec +03:78da FindPathToPlayer.stillHasYProgress +03:78ec FindPathToPlayer.stillHasXProgress 03:7900 FindPathToPlayer.playerIsLeftOfNPC 03:7902 FindPathToPlayer.next1 03:790a FindPathToPlayer.yDistanceGreater @@ -3435,7 +3435,7 @@ 03:7ae4 UpdateHPBar_CalcHPDifference.oldHPGreater 03:7aeb UpdateHPBar_CalcHPDifference.testLowerByte 03:7af5 UpdateHPBar_PrintHPNumber -03:7b15 UpdateHPBar_PrintHPNumber.asm_fb15 +03:7b15 UpdateHPBar_PrintHPNumber.hpBelowBar 03:7b18 UpdateHPBar_PrintHPNumber.next 03:7b2d UpdateHPBar_PrintHPNumber.done 03:7b30 UpdateHPBar_CalcOldNewHPBarPixels @@ -3873,8 +3873,8 @@ 06:4c86 FuchsiaCity_Blocks 06:4dee TrackPlayTime 06:4e36 CountDownIgnoreInputBitReset -06:4e40 CountDownIgnoreInputBitReset.asm_18e40 -06:4e41 CountDownIgnoreInputBitReset.asm_18e41 +06:4e40 CountDownIgnoreInputBitReset.decrement +06:4e41 CountDownIgnoreInputBitReset.continue 06:4e5b PalletTown_Script 06:4e67 PalletTown_Script.next 06:4e73 PalletTown_ScriptPointers @@ -4964,8 +4964,8 @@ 07:6a80 CinnabarQuizQuestionsText5 07:6a85 CinnabarQuizQuestionsText6 07:6a8a CinnabarGymGateFlagAction -07:6a92 CinnabarGymQuiz_1ea92 -07:6ab8 CinnabarGymQuiz_1ea92.wrongAnswer +07:6a92 CinnabarGymQuiz_AskQuestion +07:6ab8 CinnabarGymQuiz_AskQuestion.wrongAnswer 07:6ae3 CinnabarGymQuizCorrectText 07:6b05 CinnabarGymQuizIncorrectText 07:6b0a UpdateCinnabarGymGateTileBlocks_ @@ -5356,9 +5356,9 @@ 08:534e SFX_Cry22_2_Ch6 08:5361 SFX_Cry22_2_Ch8 08:536e Music_DoLowHealthAlarm -08:5383 Music_DoLowHealthAlarm.asm_21383 -08:538a Music_DoLowHealthAlarm.asm_2138a -08:5395 Music_DoLowHealthAlarm.asm_21395 +08:5383 Music_DoLowHealthAlarm.notToneHi +08:538a Music_DoLowHealthAlarm.noTone +08:5395 Music_DoLowHealthAlarm.resetTimer 08:539b Music_DoLowHealthAlarm.disableAlarm 08:53a7 Music_DoLowHealthAlarm.playToneHi 08:53ac Music_DoLowHealthAlarm.playToneLo @@ -6159,7 +6159,7 @@ 0d:7cd2 PewterGuys.copyMovementDataLoop 0d:7ce1 PewterGuys.nextEntry1 0d:7ce2 PewterGuys.nextEntry2 -0d:7ce6 PointerTable_37ce6 +0d:7ce6 PewterGuysCoordsTable 0d:7cea PewterMuseumGuyCoords 0d:7cfa PewterMuseumGuyCoords.down 0d:7cfd PewterMuseumGuyCoords.up @@ -6176,11 +6176,11 @@ 0d:7d77 _Multiply.smallMultiplier 0d:7d94 _Multiply.done 0d:7da5 _Divide -0d:7db3 _Divide.asm_37db3 -0d:7dce _Divide.asm_37dce -0d:7e04 _Divide.asm_37e04 -0d:7e0a _Divide.asm_37e0a -0d:7e18 _Divide.asm_37e18 +0d:7db3 _Divide.loop +0d:7dce _Divide.next +0d:7e04 _Divide.next2 +0d:7e0a _Divide.okay +0d:7e18 _Divide.done 0d:7e2d StartSlotMachine 0d:7e58 StartSlotMachine.match 0d:7e5a StartSlotMachine.next @@ -7286,7 +7286,7 @@ 0f:6f12 InitBattle 0f:6f18 InitOpponent 0f:6f23 DetermineWildOpponent -0f:6f2f DetermineWildOpponent.asm_3ef2f +0f:6f2f DetermineWildOpponent.notDebug 0f:6f3d InitBattleCommon 0f:6f8b InitWildBattle 0f:6fa2 InitWildBattle.isGhost @@ -8085,9 +8085,9 @@ 11:4fbb RocketHideout2ArrowMovement36 11:4fc2 RocketHideout2Script3 11:4fd7 LoadSpinnerArrowTiles -11:4ff6 LoadSpinnerArrowTiles.asm_44ff6 -11:5001 LoadSpinnerArrowTiles.asm_45001 -11:5006 LoadSpinnerArrowTiles.asm_45006 +11:4ff6 LoadSpinnerArrowTiles.gotSpinnerArrows +11:5001 LoadSpinnerArrowTiles.alternateGraphics +11:5006 LoadSpinnerArrowTiles.loop 11:5023 FacilitySpinnerArrows 11:5053 GymSpinnerArrows 11:5083 SpinnerPlayerFacingDirections @@ -10433,7 +10433,7 @@ 15:6613 SilphCo8F_Object 15:666d SilphCo8F_Blocks 15:66e2 DisplayDiploma -15:6715 DisplayDiploma.asm_56715 +15:6715 DisplayDiploma.placeTextLoop 15:673e DisplayDiploma.adjustPlayerGfxLoop 15:6777 UnusedPlayerNameLengthFunc 15:677d UnusedPlayerNameLengthFunc.loop @@ -12192,7 +12192,7 @@ 18:64da FuchsiaCityPokecenterBenchGuyText 18:64df CinnabarIslandPokecenterBenchGuyText 18:64e4 SaffronCityPokecenterBenchGuyText -18:64f2 SaffronCityPokecenterBenchGuyText.asm_624f2 +18:64f2 SaffronCityPokecenterBenchGuyText.printText 18:64f8 SaffronCityPokecenterBenchGuyText1 18:64fd SaffronCityPokecenterBenchGuyText2 18:6502 CeladonCityHotelText @@ -12749,14 +12749,14 @@ 1c:6518 PctTrnPacket 1c:6528 MaskEnFreezePacket 1c:6538 MaskEnCancelPacket -1c:6548 DataSnd_72548 -1c:6558 DataSnd_72558 -1c:6568 DataSnd_72568 -1c:6578 DataSnd_72578 -1c:6588 DataSnd_72588 -1c:6598 DataSnd_72598 -1c:65a8 DataSnd_725a8 -1c:65b8 DataSnd_725b8 +1c:6548 DataSndPacket1 +1c:6558 DataSndPacket2 +1c:6568 DataSndPacket3 +1c:6578 DataSndPacket4 +1c:6588 DataSndPacket5 +1c:6598 DataSndPacket6 +1c:65a8 DataSndPacket7 +1c:65b8 DataSndPacket8 1c:65c8 MonsterPalettes 1c:6660 SuperPalettes 1c:6788 BorderPalettes