From 14b9621d809ff6f8fefbe90247748ebbe2a6abef Mon Sep 17 00:00:00 2001 From: travis Date: Tue, 6 Oct 2020 22:11:24 +0000 Subject: [PATCH] Update battle anim bg function comments, and identify more unnamed labels --- pokecrystal.sym | 123 ++++++++++++++++++++-------------------- pokecrystal11.sym | 123 ++++++++++++++++++++-------------------- pokecrystal11_debug.sym | 123 ++++++++++++++++++++-------------------- pokecrystal_au.sym | 123 ++++++++++++++++++++-------------------- pokecrystal_debug.sym | 123 ++++++++++++++++++++-------------------- 5 files changed, 305 insertions(+), 310 deletions(-) diff --git a/pokecrystal.sym b/pokecrystal.sym index b516853ed..a4839abde 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -4984,7 +4984,7 @@ 05:5f6e SellMenu.declined 05:5f73 MartSellHowManyText 05:5f78 MartSellPriceText -05:5f7d MartSellPriceText.UnusedString15f7d +05:5f7d UnusedDummyString 05:5f83 MartWelcomeText 05:5f88 MenuHeader_BuySell 05:5f90 MenuHeader_BuySell.MenuData @@ -5864,7 +5864,7 @@ 09:505f BuySellToss_InterpretJoypad.right 09:506c BuySellToss_InterpretJoypad.finish_right 09:5072 BuySellToss_UpdateQuantityDisplay -09:5097 ret_25097 +09:5097 NoPriceToDisplay 09:5098 DisplayPurchasePrice 09:509f DisplaySellingPrice 09:50a9 BuySell_MultiplyPrice @@ -9026,11 +9026,11 @@ 0f:5791 OfferSwitch.canceled_switch 0f:579a OfferSwitch.said_no 0f:57a0 ClearEnemyMonBox -0f:57b8 Function_BattleTextEnemySentOut -0f:57c7 Function_SetEnemyMonAndSendOutAnimation -0f:5800 Function_SetEnemyMonAndSendOutAnimation.not_shiny -0f:5821 Function_SetEnemyMonAndSendOutAnimation.cry_no_anim -0f:582c Function_SetEnemyMonAndSendOutAnimation.skip_cry +0f:57b8 ShowBattleTextEnemySentOut +0f:57c7 ShowSetEnemyMonAndSendOutAnimation +0f:5800 ShowSetEnemyMonAndSendOutAnimation.not_shiny +0f:5821 ShowSetEnemyMonAndSendOutAnimation.cry_no_anim +0f:582c ShowSetEnemyMonAndSendOutAnimation.skip_cry 0f:5834 NewEnemyMonStatus 0f:5867 ResetEnemyStatLevels 0f:586e ResetEnemyStatLevels.loop @@ -15890,17 +15890,17 @@ 20:5fcd DebugColor_AreYouFinishedString 20:5fe3 DebugUpArrowGFX 20:5ff3 DebugColor_GFX -20:6153 TilesetColorTest -20:61d2 Function821d2 -20:61d8 Function821d8 -20:61de Function821de -20:61f4 Function821f4 -20:6203 Function821f4.Place +20:6153 TilesetColorPicker +20:61d2 DebugTileset_DrawColorSwatch +20:61d8 DebugColor_DrawAttributeSwatch +20:61de _DebugColor_DrawSwatch +20:61f4 DebugTileset_LoadRGBMeter +20:6203 DebugTileset_LoadRGBMeter.Place 20:620f Function8220f 20:6236 DebugColorMain2 20:6247 DebugColorMain2.loop7 -20:6253 DebugColorMain2.asm_82253 -20:6299 DebugColorMain2.asm_82299 +20:6253 DebugColorMain2.palette_ok +20:6299 DebugColorMain2.cancel 20:62a3 Function822a3 20:62f0 Function822f0 20:6301 Function822f0.PointerTable @@ -17072,11 +17072,11 @@ 23:46ef WipeLYOverrides.wipe 23:46f2 WipeLYOverrides.loop 23:46f7 StartTrainerBattle_DrawSineWave -23:4702 StartTrainerBattle_DrawSineWave.negative_43030 -23:470c StartTrainerBattle_DrawSineWave.apply_43030 -23:471b StartTrainerBattle_DrawSineWave.multiply_43030 -23:4720 StartTrainerBattle_DrawSineWave.even_43030 -23:4728 StartTrainerBattle_DrawSineWave.sinetable_43030 +23:4702 StartTrainerBattle_DrawSineWave.negative_43040 +23:470c StartTrainerBattle_DrawSineWave.apply_43040 +23:471b StartTrainerBattle_DrawSineWave.multiply_43040 +23:4720 StartTrainerBattle_DrawSineWave.even_43040 +23:4728 StartTrainerBattle_DrawSineWave.sinetable_43040 23:4768 StartTrainerBattle_ZoomToBlack 23:4771 StartTrainerBattle_ZoomToBlack.loop 23:478c StartTrainerBattle_ZoomToBlack.done @@ -17420,11 +17420,11 @@ 23:672a Sprites_Cosine 23:672a BrokenStdGFXPointers.deleted 23:672c Sprites_Sine -23:6737 Sprites_Sine.negative_44409 -23:6741 Sprites_Sine.apply_44409 -23:6750 Sprites_Sine.multiply_44409 -23:6755 Sprites_Sine.even_44409 -23:675d Sprites_Sine.sinetable_44409 +23:6737 Sprites_Sine.negative_44419 +23:6741 Sprites_Sine.apply_44419 +23:6750 Sprites_Sine.multiply_44419 +23:6755 Sprites_Sine.even_44419 +23:675d Sprites_Sine.sinetable_44419 23:679d AnimateEndOfExpBar 23:67a8 AnimateEndOfExpBar.load 23:67b5 AnimateEndOfExpBar.loop @@ -17931,12 +17931,12 @@ 24:5b4a _FlyMap.pressedB 24:5b4e _FlyMap.pressedA 24:5b5a _FlyMap.exit -24:5b73 FlyMapScroll -24:5b89 FlyMapScroll.ScrollNext -24:5b93 FlyMapScroll.NotAtEndYet -24:5b9b FlyMapScroll.ScrollPrev -24:5ba5 FlyMapScroll.NotAtStartYet -24:5bab FlyMapScroll.Finally +24:5b73 _FlyMap.HandleDPad +24:5b89 _FlyMap.ScrollNext +24:5b93 _FlyMap.NotAtEndYet +24:5b9b _FlyMap.ScrollPrev +24:5ba5 _FlyMap.NotAtStartYet +24:5bab _FlyMap.Finally 24:5bb5 TownMapBubble 24:5bf4 TownMapBubble.Where 24:5bfb TownMapBubble.Name @@ -17998,19 +17998,19 @@ 24:6168 KantoMap 24:62d1 PokedexNestIconGFX 24:62e1 FlyMapLabelBorderGFX -24:6311 Function92311 -24:636e Function92311.loop -24:638f Function92311.pressedB -24:6393 Function92311.pressedA -24:639f Function92311.finished_a_b -24:63b8 Function92311.HandleDPad -24:63c6 Function92311.down_right -24:63d0 Function92311.okay_dr -24:63d3 Function92311.up_left -24:63dc Function92311.okay_ul -24:63dd Function92311.continue -24:63ec Function92311.johto -24:63f3 Function92311.finish +24:6311 EntireFlyMap +24:636e EntireFlyMap.loop +24:638f EntireFlyMap.pressedB +24:6393 EntireFlyMap.pressedA +24:639f EntireFlyMap.exit +24:63b8 EntireFlyMap.HandleDPad +24:63c6 EntireFlyMap.ScrollNext +24:63d0 EntireFlyMap.NotAtEndYet +24:63d3 EntireFlyMap.ScrollPrev +24:63dc EntireFlyMap.NotAtStartYet +24:63dd EntireFlyMap.FillMap +24:63ec EntireFlyMap.InJohto +24:63f3 EntireFlyMap.Finally 24:6402 Fish 24:641a Fish.Fish 24:642c Fish.loop @@ -18744,8 +18744,7 @@ 25:68ba CheckTileEvent.coord_event 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown -25:68d7 ret_968d7 -25:68d8 SetMinTwoStepWildEncounterCooldown +25:68d7 SetMinTwoStepWildEncounterCooldown 25:68e4 Dummy_CheckScriptFlags3Bit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope @@ -23771,10 +23770,10 @@ 33:672c BattleAnim_IncAnonJumptableIndex 33:6732 BattleAnim_Cosine 33:6734 BattleAnim_Sine -33:673f BattleAnim_Sine.negative_58300 -33:6749 BattleAnim_Sine.apply_58300 -33:6758 BattleAnim_Sine.multiply_58300 -33:675d BattleAnim_Sine.even_58300 +33:673f BattleAnim_Sine.negative_58310 +33:6749 BattleAnim_Sine.apply_58310 +33:6758 BattleAnim_Sine.multiply_58310 +33:675d BattleAnim_Sine.even_58310 33:6765 BattleAnim_Sine_e 33:676b BattleAnim_Cosine_e 33:6771 BattleAnim_AbsSinePrecise @@ -26918,14 +26917,14 @@ 38:6d23 BillsPC_RefreshTextboxes.placeholder_string 38:6d2a BillsPC_RefreshTextboxes.Placeholder 38:6d30 CopyBoxmonSpecies -38:6d57 CopyBoxmonSpecies.loop_64748 -38:6d79 CopyBoxmonSpecies.done_64748 +38:6d57 CopyBoxmonSpecies.loop_64758 +38:6d79 CopyBoxmonSpecies.done_64758 38:6d87 CopyBoxmonSpecies.party -38:6d8a CopyBoxmonSpecies.loop_64749 -38:6dac CopyBoxmonSpecies.done_64749 +38:6d8a CopyBoxmonSpecies.loop_64759 +38:6dac CopyBoxmonSpecies.done_64759 38:6db7 CopyBoxmonSpecies.sBox -38:6dbf CopyBoxmonSpecies.loop_64750 -38:6de1 CopyBoxmonSpecies.done_64750 +38:6dbf CopyBoxmonSpecies.loop_64760 +38:6de1 CopyBoxmonSpecies.done_64760 38:6def BillsPC_GetSelectedPokemonSpecies 38:6e01 BillsPC_UpdateSelectionCursor 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor @@ -29845,17 +29844,17 @@ 3f:4047 TilesetParkAnim 3f:4073 TilesetForestAnim 3f:40a3 TilesetJohtoAnim -3f:40d7 UnusedTilesetAnim_fc0d7 -3f:4103 UnusedTilesetAnim_fc103 +3f:40d7 UnusedTilesetAnim1 +3f:4103 UnusedTilesetAnim2 3f:412f TilesetPortAnim 3f:415f TilesetEliteFourRoomAnim -3f:417f UnusedTilesetAnim_fc17f -3f:41af UnusedTilesetAnim_fc1af +3f:417f UnusedTilesetAnim3 +3f:41af UnusedTilesetAnim4 3f:41e7 TilesetCaveAnim 3f:41e7 TilesetDarkCaveAnim 3f:4233 TilesetIcePathAnim 3f:427f TilesetTowerAnim -3f:42bf UnusedTilesetAnim_fc2bf +3f:42bf UnusedTilesetAnim5 3f:42e7 TilesetBattleTowerOutsideAnim 3f:42e7 TilesetHouseAnim 3f:42e7 TilesetPlayersHouseAnim @@ -42510,7 +42509,7 @@ 77:45a1 TilesetKabutoWordRoomGFX 77:51a9 TilesetRuinsOfAlphMeta 77:55a9 TilesetRuinsOfAlphColl -77:56a9 Function1dd6a9 +77:56a9 PrintFiveDigitNumber 77:56bb PrintHoursMins 77:56c7 PrintHoursMins.AM 77:56cc PrintHoursMins.PM diff --git a/pokecrystal11.sym b/pokecrystal11.sym index 810c15612..29a2836f0 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -4984,7 +4984,7 @@ 05:5f6e SellMenu.declined 05:5f73 MartSellHowManyText 05:5f78 MartSellPriceText -05:5f7d MartSellPriceText.UnusedString15f7d +05:5f7d UnusedDummyString 05:5f83 MartWelcomeText 05:5f88 MenuHeader_BuySell 05:5f90 MenuHeader_BuySell.MenuData @@ -5864,7 +5864,7 @@ 09:505f BuySellToss_InterpretJoypad.right 09:506c BuySellToss_InterpretJoypad.finish_right 09:5072 BuySellToss_UpdateQuantityDisplay -09:5097 ret_25097 +09:5097 NoPriceToDisplay 09:5098 DisplayPurchasePrice 09:509f DisplaySellingPrice 09:50a9 BuySell_MultiplyPrice @@ -9026,11 +9026,11 @@ 0f:5791 OfferSwitch.canceled_switch 0f:579a OfferSwitch.said_no 0f:57a0 ClearEnemyMonBox -0f:57b8 Function_BattleTextEnemySentOut -0f:57c7 Function_SetEnemyMonAndSendOutAnimation -0f:5800 Function_SetEnemyMonAndSendOutAnimation.not_shiny -0f:5821 Function_SetEnemyMonAndSendOutAnimation.cry_no_anim -0f:582c Function_SetEnemyMonAndSendOutAnimation.skip_cry +0f:57b8 ShowBattleTextEnemySentOut +0f:57c7 ShowSetEnemyMonAndSendOutAnimation +0f:5800 ShowSetEnemyMonAndSendOutAnimation.not_shiny +0f:5821 ShowSetEnemyMonAndSendOutAnimation.cry_no_anim +0f:582c ShowSetEnemyMonAndSendOutAnimation.skip_cry 0f:5834 NewEnemyMonStatus 0f:5867 ResetEnemyStatLevels 0f:586e ResetEnemyStatLevels.loop @@ -15890,17 +15890,17 @@ 20:5fcd DebugColor_AreYouFinishedString 20:5fe3 DebugUpArrowGFX 20:5ff3 DebugColor_GFX -20:6153 TilesetColorTest -20:61d2 Function821d2 -20:61d8 Function821d8 -20:61de Function821de -20:61f4 Function821f4 -20:6203 Function821f4.Place +20:6153 TilesetColorPicker +20:61d2 DebugTileset_DrawColorSwatch +20:61d8 DebugColor_DrawAttributeSwatch +20:61de _DebugColor_DrawSwatch +20:61f4 DebugTileset_LoadRGBMeter +20:6203 DebugTileset_LoadRGBMeter.Place 20:620f Function8220f 20:6236 DebugColorMain2 20:6247 DebugColorMain2.loop7 -20:6253 DebugColorMain2.asm_82253 -20:6299 DebugColorMain2.asm_82299 +20:6253 DebugColorMain2.palette_ok +20:6299 DebugColorMain2.cancel 20:62a3 Function822a3 20:62f0 Function822f0 20:6301 Function822f0.PointerTable @@ -17072,11 +17072,11 @@ 23:46ef WipeLYOverrides.wipe 23:46f2 WipeLYOverrides.loop 23:46f7 StartTrainerBattle_DrawSineWave -23:4702 StartTrainerBattle_DrawSineWave.negative_43030 -23:470c StartTrainerBattle_DrawSineWave.apply_43030 -23:471b StartTrainerBattle_DrawSineWave.multiply_43030 -23:4720 StartTrainerBattle_DrawSineWave.even_43030 -23:4728 StartTrainerBattle_DrawSineWave.sinetable_43030 +23:4702 StartTrainerBattle_DrawSineWave.negative_43040 +23:470c StartTrainerBattle_DrawSineWave.apply_43040 +23:471b StartTrainerBattle_DrawSineWave.multiply_43040 +23:4720 StartTrainerBattle_DrawSineWave.even_43040 +23:4728 StartTrainerBattle_DrawSineWave.sinetable_43040 23:4768 StartTrainerBattle_ZoomToBlack 23:4771 StartTrainerBattle_ZoomToBlack.loop 23:478c StartTrainerBattle_ZoomToBlack.done @@ -17420,11 +17420,11 @@ 23:672a Sprites_Cosine 23:672a BrokenStdGFXPointers.deleted 23:672c Sprites_Sine -23:6737 Sprites_Sine.negative_44409 -23:6741 Sprites_Sine.apply_44409 -23:6750 Sprites_Sine.multiply_44409 -23:6755 Sprites_Sine.even_44409 -23:675d Sprites_Sine.sinetable_44409 +23:6737 Sprites_Sine.negative_44419 +23:6741 Sprites_Sine.apply_44419 +23:6750 Sprites_Sine.multiply_44419 +23:6755 Sprites_Sine.even_44419 +23:675d Sprites_Sine.sinetable_44419 23:679d AnimateEndOfExpBar 23:67a8 AnimateEndOfExpBar.load 23:67b5 AnimateEndOfExpBar.loop @@ -17931,12 +17931,12 @@ 24:5b4a _FlyMap.pressedB 24:5b4e _FlyMap.pressedA 24:5b5a _FlyMap.exit -24:5b73 FlyMapScroll -24:5b89 FlyMapScroll.ScrollNext -24:5b93 FlyMapScroll.NotAtEndYet -24:5b9b FlyMapScroll.ScrollPrev -24:5ba5 FlyMapScroll.NotAtStartYet -24:5bab FlyMapScroll.Finally +24:5b73 _FlyMap.HandleDPad +24:5b89 _FlyMap.ScrollNext +24:5b93 _FlyMap.NotAtEndYet +24:5b9b _FlyMap.ScrollPrev +24:5ba5 _FlyMap.NotAtStartYet +24:5bab _FlyMap.Finally 24:5bb5 TownMapBubble 24:5bf4 TownMapBubble.Where 24:5bfb TownMapBubble.Name @@ -17998,19 +17998,19 @@ 24:6168 KantoMap 24:62d1 PokedexNestIconGFX 24:62e1 FlyMapLabelBorderGFX -24:6311 Function92311 -24:636e Function92311.loop -24:638f Function92311.pressedB -24:6393 Function92311.pressedA -24:639f Function92311.finished_a_b -24:63b8 Function92311.HandleDPad -24:63c6 Function92311.down_right -24:63d0 Function92311.okay_dr -24:63d3 Function92311.up_left -24:63dc Function92311.okay_ul -24:63dd Function92311.continue -24:63ec Function92311.johto -24:63f3 Function92311.finish +24:6311 EntireFlyMap +24:636e EntireFlyMap.loop +24:638f EntireFlyMap.pressedB +24:6393 EntireFlyMap.pressedA +24:639f EntireFlyMap.exit +24:63b8 EntireFlyMap.HandleDPad +24:63c6 EntireFlyMap.ScrollNext +24:63d0 EntireFlyMap.NotAtEndYet +24:63d3 EntireFlyMap.ScrollPrev +24:63dc EntireFlyMap.NotAtStartYet +24:63dd EntireFlyMap.FillMap +24:63ec EntireFlyMap.InJohto +24:63f3 EntireFlyMap.Finally 24:6402 Fish 24:641a Fish.Fish 24:642c Fish.loop @@ -18744,8 +18744,7 @@ 25:68ba CheckTileEvent.coord_event 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown -25:68d7 ret_968d7 -25:68d8 SetMinTwoStepWildEncounterCooldown +25:68d7 SetMinTwoStepWildEncounterCooldown 25:68e4 Dummy_CheckScriptFlags3Bit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope @@ -23771,10 +23770,10 @@ 33:672c BattleAnim_IncAnonJumptableIndex 33:6732 BattleAnim_Cosine 33:6734 BattleAnim_Sine -33:673f BattleAnim_Sine.negative_58300 -33:6749 BattleAnim_Sine.apply_58300 -33:6758 BattleAnim_Sine.multiply_58300 -33:675d BattleAnim_Sine.even_58300 +33:673f BattleAnim_Sine.negative_58310 +33:6749 BattleAnim_Sine.apply_58310 +33:6758 BattleAnim_Sine.multiply_58310 +33:675d BattleAnim_Sine.even_58310 33:6765 BattleAnim_Sine_e 33:676b BattleAnim_Cosine_e 33:6771 BattleAnim_AbsSinePrecise @@ -26918,14 +26917,14 @@ 38:6d23 BillsPC_RefreshTextboxes.placeholder_string 38:6d2a BillsPC_RefreshTextboxes.Placeholder 38:6d30 CopyBoxmonSpecies -38:6d57 CopyBoxmonSpecies.loop_64748 -38:6d79 CopyBoxmonSpecies.done_64748 +38:6d57 CopyBoxmonSpecies.loop_64758 +38:6d79 CopyBoxmonSpecies.done_64758 38:6d87 CopyBoxmonSpecies.party -38:6d8a CopyBoxmonSpecies.loop_64749 -38:6dac CopyBoxmonSpecies.done_64749 +38:6d8a CopyBoxmonSpecies.loop_64759 +38:6dac CopyBoxmonSpecies.done_64759 38:6db7 CopyBoxmonSpecies.sBox -38:6dbf CopyBoxmonSpecies.loop_64750 -38:6de1 CopyBoxmonSpecies.done_64750 +38:6dbf CopyBoxmonSpecies.loop_64760 +38:6de1 CopyBoxmonSpecies.done_64760 38:6def BillsPC_GetSelectedPokemonSpecies 38:6e01 BillsPC_UpdateSelectionCursor 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor @@ -29845,17 +29844,17 @@ 3f:4047 TilesetParkAnim 3f:4073 TilesetForestAnim 3f:40a3 TilesetJohtoAnim -3f:40d7 UnusedTilesetAnim_fc0d7 -3f:4103 UnusedTilesetAnim_fc103 +3f:40d7 UnusedTilesetAnim1 +3f:4103 UnusedTilesetAnim2 3f:412f TilesetPortAnim 3f:415f TilesetEliteFourRoomAnim -3f:417f UnusedTilesetAnim_fc17f -3f:41af UnusedTilesetAnim_fc1af +3f:417f UnusedTilesetAnim3 +3f:41af UnusedTilesetAnim4 3f:41e7 TilesetCaveAnim 3f:41e7 TilesetDarkCaveAnim 3f:4233 TilesetIcePathAnim 3f:427f TilesetTowerAnim -3f:42bf UnusedTilesetAnim_fc2bf +3f:42bf UnusedTilesetAnim5 3f:42e7 TilesetBattleTowerOutsideAnim 3f:42e7 TilesetHouseAnim 3f:42e7 TilesetPlayersHouseAnim @@ -42510,7 +42509,7 @@ 77:45a1 TilesetKabutoWordRoomGFX 77:51a9 TilesetRuinsOfAlphMeta 77:55a9 TilesetRuinsOfAlphColl -77:56a9 Function1dd6a9 +77:56a9 PrintFiveDigitNumber 77:56bb PrintHoursMins 77:56c7 PrintHoursMins.AM 77:56cc PrintHoursMins.PM diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index 79e421c26..f671ec32e 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -4989,7 +4989,7 @@ 05:5f6e SellMenu.declined 05:5f73 MartSellHowManyText 05:5f78 MartSellPriceText -05:5f7d MartSellPriceText.UnusedString15f7d +05:5f7d UnusedDummyString 05:5f83 MartWelcomeText 05:5f88 MenuHeader_BuySell 05:5f90 MenuHeader_BuySell.MenuData @@ -5869,7 +5869,7 @@ 09:505f BuySellToss_InterpretJoypad.right 09:506c BuySellToss_InterpretJoypad.finish_right 09:5072 BuySellToss_UpdateQuantityDisplay -09:5097 ret_25097 +09:5097 NoPriceToDisplay 09:5098 DisplayPurchasePrice 09:509f DisplaySellingPrice 09:50a9 BuySell_MultiplyPrice @@ -9032,11 +9032,11 @@ 0f:5791 OfferSwitch.canceled_switch 0f:579a OfferSwitch.said_no 0f:57a0 ClearEnemyMonBox -0f:57b8 Function_BattleTextEnemySentOut -0f:57c7 Function_SetEnemyMonAndSendOutAnimation -0f:5800 Function_SetEnemyMonAndSendOutAnimation.not_shiny -0f:5821 Function_SetEnemyMonAndSendOutAnimation.cry_no_anim -0f:582c Function_SetEnemyMonAndSendOutAnimation.skip_cry +0f:57b8 ShowBattleTextEnemySentOut +0f:57c7 ShowSetEnemyMonAndSendOutAnimation +0f:5800 ShowSetEnemyMonAndSendOutAnimation.not_shiny +0f:5821 ShowSetEnemyMonAndSendOutAnimation.cry_no_anim +0f:582c ShowSetEnemyMonAndSendOutAnimation.skip_cry 0f:5834 NewEnemyMonStatus 0f:5867 ResetEnemyStatLevels 0f:586e ResetEnemyStatLevels.loop @@ -15902,17 +15902,17 @@ 20:5fcd DebugColor_AreYouFinishedString 20:5fe3 DebugUpArrowGFX 20:5ff3 DebugColor_GFX -20:6153 TilesetColorTest -20:61d2 Function821d2 -20:61d8 Function821d8 -20:61de Function821de -20:61f4 Function821f4 -20:6203 Function821f4.Place +20:6153 TilesetColorPicker +20:61d2 DebugTileset_DrawColorSwatch +20:61d8 DebugColor_DrawAttributeSwatch +20:61de _DebugColor_DrawSwatch +20:61f4 DebugTileset_LoadRGBMeter +20:6203 DebugTileset_LoadRGBMeter.Place 20:620f Function8220f 20:6236 DebugColorMain2 20:6247 DebugColorMain2.loop7 -20:6253 DebugColorMain2.asm_82253 -20:6299 DebugColorMain2.asm_82299 +20:6253 DebugColorMain2.palette_ok +20:6299 DebugColorMain2.cancel 20:62a3 Function822a3 20:62f0 Function822f0 20:6301 Function822f0.PointerTable @@ -17084,11 +17084,11 @@ 23:46ef WipeLYOverrides.wipe 23:46f2 WipeLYOverrides.loop 23:46f7 StartTrainerBattle_DrawSineWave -23:4702 StartTrainerBattle_DrawSineWave.negative_43034 -23:470c StartTrainerBattle_DrawSineWave.apply_43034 -23:471b StartTrainerBattle_DrawSineWave.multiply_43034 -23:4720 StartTrainerBattle_DrawSineWave.even_43034 -23:4728 StartTrainerBattle_DrawSineWave.sinetable_43034 +23:4702 StartTrainerBattle_DrawSineWave.negative_43044 +23:470c StartTrainerBattle_DrawSineWave.apply_43044 +23:471b StartTrainerBattle_DrawSineWave.multiply_43044 +23:4720 StartTrainerBattle_DrawSineWave.even_43044 +23:4728 StartTrainerBattle_DrawSineWave.sinetable_43044 23:4768 StartTrainerBattle_ZoomToBlack 23:4771 StartTrainerBattle_ZoomToBlack.loop 23:478c StartTrainerBattle_ZoomToBlack.done @@ -17432,11 +17432,11 @@ 23:672a Sprites_Cosine 23:672a BrokenStdGFXPointers.deleted 23:672c Sprites_Sine -23:6737 Sprites_Sine.negative_44413 -23:6741 Sprites_Sine.apply_44413 -23:6750 Sprites_Sine.multiply_44413 -23:6755 Sprites_Sine.even_44413 -23:675d Sprites_Sine.sinetable_44413 +23:6737 Sprites_Sine.negative_44423 +23:6741 Sprites_Sine.apply_44423 +23:6750 Sprites_Sine.multiply_44423 +23:6755 Sprites_Sine.even_44423 +23:675d Sprites_Sine.sinetable_44423 23:679d AnimateEndOfExpBar 23:67a8 AnimateEndOfExpBar.load 23:67b5 AnimateEndOfExpBar.loop @@ -17943,12 +17943,12 @@ 24:5b4a _FlyMap.pressedB 24:5b4e _FlyMap.pressedA 24:5b5a _FlyMap.exit -24:5b73 FlyMapScroll -24:5b89 FlyMapScroll.ScrollNext -24:5b93 FlyMapScroll.NotAtEndYet -24:5b9b FlyMapScroll.ScrollPrev -24:5ba5 FlyMapScroll.NotAtStartYet -24:5bab FlyMapScroll.Finally +24:5b73 _FlyMap.HandleDPad +24:5b89 _FlyMap.ScrollNext +24:5b93 _FlyMap.NotAtEndYet +24:5b9b _FlyMap.ScrollPrev +24:5ba5 _FlyMap.NotAtStartYet +24:5bab _FlyMap.Finally 24:5bb5 TownMapBubble 24:5bf4 TownMapBubble.Where 24:5bfb TownMapBubble.Name @@ -18010,19 +18010,19 @@ 24:6168 KantoMap 24:62d1 PokedexNestIconGFX 24:62e1 FlyMapLabelBorderGFX -24:6311 Function92311 -24:636e Function92311.loop -24:638f Function92311.pressedB -24:6393 Function92311.pressedA -24:639f Function92311.finished_a_b -24:63b8 Function92311.HandleDPad -24:63c6 Function92311.down_right -24:63d0 Function92311.okay_dr -24:63d3 Function92311.up_left -24:63dc Function92311.okay_ul -24:63dd Function92311.continue -24:63ec Function92311.johto -24:63f3 Function92311.finish +24:6311 EntireFlyMap +24:636e EntireFlyMap.loop +24:638f EntireFlyMap.pressedB +24:6393 EntireFlyMap.pressedA +24:639f EntireFlyMap.exit +24:63b8 EntireFlyMap.HandleDPad +24:63c6 EntireFlyMap.ScrollNext +24:63d0 EntireFlyMap.NotAtEndYet +24:63d3 EntireFlyMap.ScrollPrev +24:63dc EntireFlyMap.NotAtStartYet +24:63dd EntireFlyMap.FillMap +24:63ec EntireFlyMap.InJohto +24:63f3 EntireFlyMap.Finally 24:6402 Fish 24:641a Fish.Fish 24:642c Fish.loop @@ -18756,8 +18756,7 @@ 25:68ba CheckTileEvent.coord_event 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown -25:68d7 ret_968d7 -25:68d8 SetMinTwoStepWildEncounterCooldown +25:68d7 SetMinTwoStepWildEncounterCooldown 25:68e4 Dummy_CheckScriptFlags3Bit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope @@ -23783,10 +23782,10 @@ 33:672c BattleAnim_IncAnonJumptableIndex 33:6732 BattleAnim_Cosine 33:6734 BattleAnim_Sine -33:673f BattleAnim_Sine.negative_58304 -33:6749 BattleAnim_Sine.apply_58304 -33:6758 BattleAnim_Sine.multiply_58304 -33:675d BattleAnim_Sine.even_58304 +33:673f BattleAnim_Sine.negative_58314 +33:6749 BattleAnim_Sine.apply_58314 +33:6758 BattleAnim_Sine.multiply_58314 +33:675d BattleAnim_Sine.even_58314 33:6765 BattleAnim_Sine_e 33:676b BattleAnim_Cosine_e 33:6771 BattleAnim_AbsSinePrecise @@ -26930,14 +26929,14 @@ 38:6d23 BillsPC_RefreshTextboxes.placeholder_string 38:6d2a BillsPC_RefreshTextboxes.Placeholder 38:6d30 CopyBoxmonSpecies -38:6d57 CopyBoxmonSpecies.loop_64752 -38:6d79 CopyBoxmonSpecies.done_64752 +38:6d57 CopyBoxmonSpecies.loop_64762 +38:6d79 CopyBoxmonSpecies.done_64762 38:6d87 CopyBoxmonSpecies.party -38:6d8a CopyBoxmonSpecies.loop_64753 -38:6dac CopyBoxmonSpecies.done_64753 +38:6d8a CopyBoxmonSpecies.loop_64763 +38:6dac CopyBoxmonSpecies.done_64763 38:6db7 CopyBoxmonSpecies.sBox -38:6dbf CopyBoxmonSpecies.loop_64754 -38:6de1 CopyBoxmonSpecies.done_64754 +38:6dbf CopyBoxmonSpecies.loop_64764 +38:6de1 CopyBoxmonSpecies.done_64764 38:6def BillsPC_GetSelectedPokemonSpecies 38:6e01 BillsPC_UpdateSelectionCursor 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor @@ -29857,17 +29856,17 @@ 3f:4047 TilesetParkAnim 3f:4073 TilesetForestAnim 3f:40a3 TilesetJohtoAnim -3f:40d7 UnusedTilesetAnim_fc0d7 -3f:4103 UnusedTilesetAnim_fc103 +3f:40d7 UnusedTilesetAnim1 +3f:4103 UnusedTilesetAnim2 3f:412f TilesetPortAnim 3f:415f TilesetEliteFourRoomAnim -3f:417f UnusedTilesetAnim_fc17f -3f:41af UnusedTilesetAnim_fc1af +3f:417f UnusedTilesetAnim3 +3f:41af UnusedTilesetAnim4 3f:41e7 TilesetCaveAnim 3f:41e7 TilesetDarkCaveAnim 3f:4233 TilesetIcePathAnim 3f:427f TilesetTowerAnim -3f:42bf UnusedTilesetAnim_fc2bf +3f:42bf UnusedTilesetAnim5 3f:42e7 TilesetBattleTowerOutsideAnim 3f:42e7 TilesetHouseAnim 3f:42e7 TilesetPlayersHouseAnim @@ -42522,7 +42521,7 @@ 77:45a1 TilesetKabutoWordRoomGFX 77:51a9 TilesetRuinsOfAlphMeta 77:55a9 TilesetRuinsOfAlphColl -77:56a9 Function1dd6a9 +77:56a9 PrintFiveDigitNumber 77:56bb PrintHoursMins 77:56c7 PrintHoursMins.AM 77:56cc PrintHoursMins.PM diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index 0e8bea8f3..edc1167aa 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -4984,7 +4984,7 @@ 05:5f6e SellMenu.declined 05:5f73 MartSellHowManyText 05:5f78 MartSellPriceText -05:5f7d MartSellPriceText.UnusedString15f7d +05:5f7d UnusedDummyString 05:5f83 MartWelcomeText 05:5f88 MenuHeader_BuySell 05:5f90 MenuHeader_BuySell.MenuData @@ -5864,7 +5864,7 @@ 09:505f BuySellToss_InterpretJoypad.right 09:506c BuySellToss_InterpretJoypad.finish_right 09:5072 BuySellToss_UpdateQuantityDisplay -09:5097 ret_25097 +09:5097 NoPriceToDisplay 09:5098 DisplayPurchasePrice 09:509f DisplaySellingPrice 09:50a9 BuySell_MultiplyPrice @@ -9026,11 +9026,11 @@ 0f:5791 OfferSwitch.canceled_switch 0f:579a OfferSwitch.said_no 0f:57a0 ClearEnemyMonBox -0f:57b8 Function_BattleTextEnemySentOut -0f:57c7 Function_SetEnemyMonAndSendOutAnimation -0f:5800 Function_SetEnemyMonAndSendOutAnimation.not_shiny -0f:5821 Function_SetEnemyMonAndSendOutAnimation.cry_no_anim -0f:582c Function_SetEnemyMonAndSendOutAnimation.skip_cry +0f:57b8 ShowBattleTextEnemySentOut +0f:57c7 ShowSetEnemyMonAndSendOutAnimation +0f:5800 ShowSetEnemyMonAndSendOutAnimation.not_shiny +0f:5821 ShowSetEnemyMonAndSendOutAnimation.cry_no_anim +0f:582c ShowSetEnemyMonAndSendOutAnimation.skip_cry 0f:5834 NewEnemyMonStatus 0f:5867 ResetEnemyStatLevels 0f:586e ResetEnemyStatLevels.loop @@ -15890,17 +15890,17 @@ 20:5fcd DebugColor_AreYouFinishedString 20:5fe3 DebugUpArrowGFX 20:5ff3 DebugColor_GFX -20:6153 TilesetColorTest -20:61d2 Function821d2 -20:61d8 Function821d8 -20:61de Function821de -20:61f4 Function821f4 -20:6203 Function821f4.Place +20:6153 TilesetColorPicker +20:61d2 DebugTileset_DrawColorSwatch +20:61d8 DebugColor_DrawAttributeSwatch +20:61de _DebugColor_DrawSwatch +20:61f4 DebugTileset_LoadRGBMeter +20:6203 DebugTileset_LoadRGBMeter.Place 20:620f Function8220f 20:6236 DebugColorMain2 20:6247 DebugColorMain2.loop7 -20:6253 DebugColorMain2.asm_82253 -20:6299 DebugColorMain2.asm_82299 +20:6253 DebugColorMain2.palette_ok +20:6299 DebugColorMain2.cancel 20:62a3 Function822a3 20:62f0 Function822f0 20:6301 Function822f0.PointerTable @@ -17072,11 +17072,11 @@ 23:46ef WipeLYOverrides.wipe 23:46f2 WipeLYOverrides.loop 23:46f7 StartTrainerBattle_DrawSineWave -23:4702 StartTrainerBattle_DrawSineWave.negative_43030 -23:470c StartTrainerBattle_DrawSineWave.apply_43030 -23:471b StartTrainerBattle_DrawSineWave.multiply_43030 -23:4720 StartTrainerBattle_DrawSineWave.even_43030 -23:4728 StartTrainerBattle_DrawSineWave.sinetable_43030 +23:4702 StartTrainerBattle_DrawSineWave.negative_43040 +23:470c StartTrainerBattle_DrawSineWave.apply_43040 +23:471b StartTrainerBattle_DrawSineWave.multiply_43040 +23:4720 StartTrainerBattle_DrawSineWave.even_43040 +23:4728 StartTrainerBattle_DrawSineWave.sinetable_43040 23:4768 StartTrainerBattle_ZoomToBlack 23:4771 StartTrainerBattle_ZoomToBlack.loop 23:478c StartTrainerBattle_ZoomToBlack.done @@ -17420,11 +17420,11 @@ 23:672a Sprites_Cosine 23:672a BrokenStdGFXPointers.deleted 23:672c Sprites_Sine -23:6737 Sprites_Sine.negative_44409 -23:6741 Sprites_Sine.apply_44409 -23:6750 Sprites_Sine.multiply_44409 -23:6755 Sprites_Sine.even_44409 -23:675d Sprites_Sine.sinetable_44409 +23:6737 Sprites_Sine.negative_44419 +23:6741 Sprites_Sine.apply_44419 +23:6750 Sprites_Sine.multiply_44419 +23:6755 Sprites_Sine.even_44419 +23:675d Sprites_Sine.sinetable_44419 23:679d AnimateEndOfExpBar 23:67a8 AnimateEndOfExpBar.load 23:67b5 AnimateEndOfExpBar.loop @@ -17931,12 +17931,12 @@ 24:5b4a _FlyMap.pressedB 24:5b4e _FlyMap.pressedA 24:5b5a _FlyMap.exit -24:5b73 FlyMapScroll -24:5b89 FlyMapScroll.ScrollNext -24:5b93 FlyMapScroll.NotAtEndYet -24:5b9b FlyMapScroll.ScrollPrev -24:5ba5 FlyMapScroll.NotAtStartYet -24:5bab FlyMapScroll.Finally +24:5b73 _FlyMap.HandleDPad +24:5b89 _FlyMap.ScrollNext +24:5b93 _FlyMap.NotAtEndYet +24:5b9b _FlyMap.ScrollPrev +24:5ba5 _FlyMap.NotAtStartYet +24:5bab _FlyMap.Finally 24:5bb5 TownMapBubble 24:5bf4 TownMapBubble.Where 24:5bfb TownMapBubble.Name @@ -17998,19 +17998,19 @@ 24:6168 KantoMap 24:62d1 PokedexNestIconGFX 24:62e1 FlyMapLabelBorderGFX -24:6311 Function92311 -24:636e Function92311.loop -24:638f Function92311.pressedB -24:6393 Function92311.pressedA -24:639f Function92311.finished_a_b -24:63b8 Function92311.HandleDPad -24:63c6 Function92311.down_right -24:63d0 Function92311.okay_dr -24:63d3 Function92311.up_left -24:63dc Function92311.okay_ul -24:63dd Function92311.continue -24:63ec Function92311.johto -24:63f3 Function92311.finish +24:6311 EntireFlyMap +24:636e EntireFlyMap.loop +24:638f EntireFlyMap.pressedB +24:6393 EntireFlyMap.pressedA +24:639f EntireFlyMap.exit +24:63b8 EntireFlyMap.HandleDPad +24:63c6 EntireFlyMap.ScrollNext +24:63d0 EntireFlyMap.NotAtEndYet +24:63d3 EntireFlyMap.ScrollPrev +24:63dc EntireFlyMap.NotAtStartYet +24:63dd EntireFlyMap.FillMap +24:63ec EntireFlyMap.InJohto +24:63f3 EntireFlyMap.Finally 24:6402 Fish 24:641a Fish.Fish 24:642c Fish.loop @@ -18744,8 +18744,7 @@ 25:68ba CheckTileEvent.coord_event 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown -25:68d7 ret_968d7 -25:68d8 SetMinTwoStepWildEncounterCooldown +25:68d7 SetMinTwoStepWildEncounterCooldown 25:68e4 Dummy_CheckScriptFlags3Bit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope @@ -23771,10 +23770,10 @@ 33:672c BattleAnim_IncAnonJumptableIndex 33:6732 BattleAnim_Cosine 33:6734 BattleAnim_Sine -33:673f BattleAnim_Sine.negative_58300 -33:6749 BattleAnim_Sine.apply_58300 -33:6758 BattleAnim_Sine.multiply_58300 -33:675d BattleAnim_Sine.even_58300 +33:673f BattleAnim_Sine.negative_58310 +33:6749 BattleAnim_Sine.apply_58310 +33:6758 BattleAnim_Sine.multiply_58310 +33:675d BattleAnim_Sine.even_58310 33:6765 BattleAnim_Sine_e 33:676b BattleAnim_Cosine_e 33:6771 BattleAnim_AbsSinePrecise @@ -26918,14 +26917,14 @@ 38:6d23 BillsPC_RefreshTextboxes.placeholder_string 38:6d2a BillsPC_RefreshTextboxes.Placeholder 38:6d30 CopyBoxmonSpecies -38:6d57 CopyBoxmonSpecies.loop_64748 -38:6d79 CopyBoxmonSpecies.done_64748 +38:6d57 CopyBoxmonSpecies.loop_64758 +38:6d79 CopyBoxmonSpecies.done_64758 38:6d87 CopyBoxmonSpecies.party -38:6d8a CopyBoxmonSpecies.loop_64749 -38:6dac CopyBoxmonSpecies.done_64749 +38:6d8a CopyBoxmonSpecies.loop_64759 +38:6dac CopyBoxmonSpecies.done_64759 38:6db7 CopyBoxmonSpecies.sBox -38:6dbf CopyBoxmonSpecies.loop_64750 -38:6de1 CopyBoxmonSpecies.done_64750 +38:6dbf CopyBoxmonSpecies.loop_64760 +38:6de1 CopyBoxmonSpecies.done_64760 38:6def BillsPC_GetSelectedPokemonSpecies 38:6e01 BillsPC_UpdateSelectionCursor 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor @@ -29845,17 +29844,17 @@ 3f:4047 TilesetParkAnim 3f:4073 TilesetForestAnim 3f:40a3 TilesetJohtoAnim -3f:40d7 UnusedTilesetAnim_fc0d7 -3f:4103 UnusedTilesetAnim_fc103 +3f:40d7 UnusedTilesetAnim1 +3f:4103 UnusedTilesetAnim2 3f:412f TilesetPortAnim 3f:415f TilesetEliteFourRoomAnim -3f:417f UnusedTilesetAnim_fc17f -3f:41af UnusedTilesetAnim_fc1af +3f:417f UnusedTilesetAnim3 +3f:41af UnusedTilesetAnim4 3f:41e7 TilesetCaveAnim 3f:41e7 TilesetDarkCaveAnim 3f:4233 TilesetIcePathAnim 3f:427f TilesetTowerAnim -3f:42bf UnusedTilesetAnim_fc2bf +3f:42bf UnusedTilesetAnim5 3f:42e7 TilesetBattleTowerOutsideAnim 3f:42e7 TilesetHouseAnim 3f:42e7 TilesetPlayersHouseAnim @@ -42510,7 +42509,7 @@ 77:45a1 TilesetKabutoWordRoomGFX 77:51a9 TilesetRuinsOfAlphMeta 77:55a9 TilesetRuinsOfAlphColl -77:56a9 Function1dd6a9 +77:56a9 PrintFiveDigitNumber 77:56bb PrintHoursMins 77:56c7 PrintHoursMins.AM 77:56cc PrintHoursMins.PM diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index 3aacbe8ab..650b69cf8 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -4989,7 +4989,7 @@ 05:5f6e SellMenu.declined 05:5f73 MartSellHowManyText 05:5f78 MartSellPriceText -05:5f7d MartSellPriceText.UnusedString15f7d +05:5f7d UnusedDummyString 05:5f83 MartWelcomeText 05:5f88 MenuHeader_BuySell 05:5f90 MenuHeader_BuySell.MenuData @@ -5869,7 +5869,7 @@ 09:505f BuySellToss_InterpretJoypad.right 09:506c BuySellToss_InterpretJoypad.finish_right 09:5072 BuySellToss_UpdateQuantityDisplay -09:5097 ret_25097 +09:5097 NoPriceToDisplay 09:5098 DisplayPurchasePrice 09:509f DisplaySellingPrice 09:50a9 BuySell_MultiplyPrice @@ -9032,11 +9032,11 @@ 0f:5791 OfferSwitch.canceled_switch 0f:579a OfferSwitch.said_no 0f:57a0 ClearEnemyMonBox -0f:57b8 Function_BattleTextEnemySentOut -0f:57c7 Function_SetEnemyMonAndSendOutAnimation -0f:5800 Function_SetEnemyMonAndSendOutAnimation.not_shiny -0f:5821 Function_SetEnemyMonAndSendOutAnimation.cry_no_anim -0f:582c Function_SetEnemyMonAndSendOutAnimation.skip_cry +0f:57b8 ShowBattleTextEnemySentOut +0f:57c7 ShowSetEnemyMonAndSendOutAnimation +0f:5800 ShowSetEnemyMonAndSendOutAnimation.not_shiny +0f:5821 ShowSetEnemyMonAndSendOutAnimation.cry_no_anim +0f:582c ShowSetEnemyMonAndSendOutAnimation.skip_cry 0f:5834 NewEnemyMonStatus 0f:5867 ResetEnemyStatLevels 0f:586e ResetEnemyStatLevels.loop @@ -15902,17 +15902,17 @@ 20:5fcd DebugColor_AreYouFinishedString 20:5fe3 DebugUpArrowGFX 20:5ff3 DebugColor_GFX -20:6153 TilesetColorTest -20:61d2 Function821d2 -20:61d8 Function821d8 -20:61de Function821de -20:61f4 Function821f4 -20:6203 Function821f4.Place +20:6153 TilesetColorPicker +20:61d2 DebugTileset_DrawColorSwatch +20:61d8 DebugColor_DrawAttributeSwatch +20:61de _DebugColor_DrawSwatch +20:61f4 DebugTileset_LoadRGBMeter +20:6203 DebugTileset_LoadRGBMeter.Place 20:620f Function8220f 20:6236 DebugColorMain2 20:6247 DebugColorMain2.loop7 -20:6253 DebugColorMain2.asm_82253 -20:6299 DebugColorMain2.asm_82299 +20:6253 DebugColorMain2.palette_ok +20:6299 DebugColorMain2.cancel 20:62a3 Function822a3 20:62f0 Function822f0 20:6301 Function822f0.PointerTable @@ -17084,11 +17084,11 @@ 23:46ef WipeLYOverrides.wipe 23:46f2 WipeLYOverrides.loop 23:46f7 StartTrainerBattle_DrawSineWave -23:4702 StartTrainerBattle_DrawSineWave.negative_43034 -23:470c StartTrainerBattle_DrawSineWave.apply_43034 -23:471b StartTrainerBattle_DrawSineWave.multiply_43034 -23:4720 StartTrainerBattle_DrawSineWave.even_43034 -23:4728 StartTrainerBattle_DrawSineWave.sinetable_43034 +23:4702 StartTrainerBattle_DrawSineWave.negative_43044 +23:470c StartTrainerBattle_DrawSineWave.apply_43044 +23:471b StartTrainerBattle_DrawSineWave.multiply_43044 +23:4720 StartTrainerBattle_DrawSineWave.even_43044 +23:4728 StartTrainerBattle_DrawSineWave.sinetable_43044 23:4768 StartTrainerBattle_ZoomToBlack 23:4771 StartTrainerBattle_ZoomToBlack.loop 23:478c StartTrainerBattle_ZoomToBlack.done @@ -17432,11 +17432,11 @@ 23:672a Sprites_Cosine 23:672a BrokenStdGFXPointers.deleted 23:672c Sprites_Sine -23:6737 Sprites_Sine.negative_44413 -23:6741 Sprites_Sine.apply_44413 -23:6750 Sprites_Sine.multiply_44413 -23:6755 Sprites_Sine.even_44413 -23:675d Sprites_Sine.sinetable_44413 +23:6737 Sprites_Sine.negative_44423 +23:6741 Sprites_Sine.apply_44423 +23:6750 Sprites_Sine.multiply_44423 +23:6755 Sprites_Sine.even_44423 +23:675d Sprites_Sine.sinetable_44423 23:679d AnimateEndOfExpBar 23:67a8 AnimateEndOfExpBar.load 23:67b5 AnimateEndOfExpBar.loop @@ -17943,12 +17943,12 @@ 24:5b4a _FlyMap.pressedB 24:5b4e _FlyMap.pressedA 24:5b5a _FlyMap.exit -24:5b73 FlyMapScroll -24:5b89 FlyMapScroll.ScrollNext -24:5b93 FlyMapScroll.NotAtEndYet -24:5b9b FlyMapScroll.ScrollPrev -24:5ba5 FlyMapScroll.NotAtStartYet -24:5bab FlyMapScroll.Finally +24:5b73 _FlyMap.HandleDPad +24:5b89 _FlyMap.ScrollNext +24:5b93 _FlyMap.NotAtEndYet +24:5b9b _FlyMap.ScrollPrev +24:5ba5 _FlyMap.NotAtStartYet +24:5bab _FlyMap.Finally 24:5bb5 TownMapBubble 24:5bf4 TownMapBubble.Where 24:5bfb TownMapBubble.Name @@ -18010,19 +18010,19 @@ 24:6168 KantoMap 24:62d1 PokedexNestIconGFX 24:62e1 FlyMapLabelBorderGFX -24:6311 Function92311 -24:636e Function92311.loop -24:638f Function92311.pressedB -24:6393 Function92311.pressedA -24:639f Function92311.finished_a_b -24:63b8 Function92311.HandleDPad -24:63c6 Function92311.down_right -24:63d0 Function92311.okay_dr -24:63d3 Function92311.up_left -24:63dc Function92311.okay_ul -24:63dd Function92311.continue -24:63ec Function92311.johto -24:63f3 Function92311.finish +24:6311 EntireFlyMap +24:636e EntireFlyMap.loop +24:638f EntireFlyMap.pressedB +24:6393 EntireFlyMap.pressedA +24:639f EntireFlyMap.exit +24:63b8 EntireFlyMap.HandleDPad +24:63c6 EntireFlyMap.ScrollNext +24:63d0 EntireFlyMap.NotAtEndYet +24:63d3 EntireFlyMap.ScrollPrev +24:63dc EntireFlyMap.NotAtStartYet +24:63dd EntireFlyMap.FillMap +24:63ec EntireFlyMap.InJohto +24:63f3 EntireFlyMap.Finally 24:6402 Fish 24:641a Fish.Fish 24:642c Fish.loop @@ -18756,8 +18756,7 @@ 25:68ba CheckTileEvent.coord_event 25:68c7 CheckWildEncounterCooldown 25:68d1 SetUpFiveStepWildEncounterCooldown -25:68d7 ret_968d7 -25:68d8 SetMinTwoStepWildEncounterCooldown +25:68d7 SetMinTwoStepWildEncounterCooldown 25:68e4 Dummy_CheckScriptFlags3Bit5 25:68ec RunSceneScript 25:6938 RunSceneScript.nope @@ -23783,10 +23782,10 @@ 33:672c BattleAnim_IncAnonJumptableIndex 33:6732 BattleAnim_Cosine 33:6734 BattleAnim_Sine -33:673f BattleAnim_Sine.negative_58304 -33:6749 BattleAnim_Sine.apply_58304 -33:6758 BattleAnim_Sine.multiply_58304 -33:675d BattleAnim_Sine.even_58304 +33:673f BattleAnim_Sine.negative_58314 +33:6749 BattleAnim_Sine.apply_58314 +33:6758 BattleAnim_Sine.multiply_58314 +33:675d BattleAnim_Sine.even_58314 33:6765 BattleAnim_Sine_e 33:676b BattleAnim_Cosine_e 33:6771 BattleAnim_AbsSinePrecise @@ -26930,14 +26929,14 @@ 38:6d23 BillsPC_RefreshTextboxes.placeholder_string 38:6d2a BillsPC_RefreshTextboxes.Placeholder 38:6d30 CopyBoxmonSpecies -38:6d57 CopyBoxmonSpecies.loop_64752 -38:6d79 CopyBoxmonSpecies.done_64752 +38:6d57 CopyBoxmonSpecies.loop_64762 +38:6d79 CopyBoxmonSpecies.done_64762 38:6d87 CopyBoxmonSpecies.party -38:6d8a CopyBoxmonSpecies.loop_64753 -38:6dac CopyBoxmonSpecies.done_64753 +38:6d8a CopyBoxmonSpecies.loop_64763 +38:6dac CopyBoxmonSpecies.done_64763 38:6db7 CopyBoxmonSpecies.sBox -38:6dbf CopyBoxmonSpecies.loop_64754 -38:6de1 CopyBoxmonSpecies.done_64754 +38:6dbf CopyBoxmonSpecies.loop_64764 +38:6de1 CopyBoxmonSpecies.done_64764 38:6def BillsPC_GetSelectedPokemonSpecies 38:6e01 BillsPC_UpdateSelectionCursor 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor @@ -29857,17 +29856,17 @@ 3f:4047 TilesetParkAnim 3f:4073 TilesetForestAnim 3f:40a3 TilesetJohtoAnim -3f:40d7 UnusedTilesetAnim_fc0d7 -3f:4103 UnusedTilesetAnim_fc103 +3f:40d7 UnusedTilesetAnim1 +3f:4103 UnusedTilesetAnim2 3f:412f TilesetPortAnim 3f:415f TilesetEliteFourRoomAnim -3f:417f UnusedTilesetAnim_fc17f -3f:41af UnusedTilesetAnim_fc1af +3f:417f UnusedTilesetAnim3 +3f:41af UnusedTilesetAnim4 3f:41e7 TilesetCaveAnim 3f:41e7 TilesetDarkCaveAnim 3f:4233 TilesetIcePathAnim 3f:427f TilesetTowerAnim -3f:42bf UnusedTilesetAnim_fc2bf +3f:42bf UnusedTilesetAnim5 3f:42e7 TilesetBattleTowerOutsideAnim 3f:42e7 TilesetHouseAnim 3f:42e7 TilesetPlayersHouseAnim @@ -42522,7 +42521,7 @@ 77:45a1 TilesetKabutoWordRoomGFX 77:51a9 TilesetRuinsOfAlphMeta 77:55a9 TilesetRuinsOfAlphColl -77:56a9 Function1dd6a9 +77:56a9 PrintFiveDigitNumber 77:56bb PrintHoursMins 77:56c7 PrintHoursMins.AM 77:56cc PrintHoursMins.PM