From 5ed00a5cb50bddf6ea9154c9911ace77bcdbea33 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sat, 19 Nov 2022 21:46:31 +0000 Subject: [PATCH] Merge pull request #583 from GriffinRichards/sync-btrans --- pokefirered.sym | 432 ++++++++++++++++++++--------------------- pokefirered_rev1.sym | 432 ++++++++++++++++++++--------------------- pokeleafgreen.sym | 432 ++++++++++++++++++++--------------------- pokeleafgreen_rev1.sym | 432 ++++++++++++++++++++--------------------- 4 files changed, 864 insertions(+), 864 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index be9ef7c04..5655ddd5e 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -377,7 +377,7 @@ 02039a20 l 00000004 sEvoStructPtr 02039a24 l 00000004 sBgAnimPal 02039a28 l 00000001 sCoinsWindowId -02039a2c l 00000004 sTransitionStructPtr +02039a2c l 00000004 sTransitionData 02039a30 l 00000004 sBattlerAbilities 02039a34 l 00000004 sBattleMsgDataPtr 02039a38 g 00001000 gSaveDataBuffer @@ -1064,7 +1064,7 @@ 08002f8c g 0000003e DecompressGlyphTile 08002fcc g 00000046 GetLastTextColor 08003014 g 00000600 CopyGlyphToWindow -08003614 g 00000508 sub_8003614 +08003614 l 00000508 CopyGlyphToWindow_Parameterized 08003b1c g 00000002 ClearTextSpan 08003b20 l 00000000 .gcc2_compiled. 08003b20 l 00000002 nullsub_8 @@ -3912,7 +3912,7 @@ 08063470 l 00000010 GetMoveDirectionFastestAnimNum 08063480 g 00000010 GetJumpSpecialDirectionAnimNum 08063490 g 00000010 GetAcroWheelieDirectionAnimNum -080634a0 g 00000010 Unref_GetAnimNums_080634A0 +080634a0 g 00000010 GetAcroBunnyHopFrontWheelDirectionAnimNum 080634b0 g 00000010 GetAcroEndWheelieDirectionAnimNum 080634c0 g 00000010 GetSpinDirectionAnimNum 080634d0 g 00000010 GetAcroUnusedActionDirectionAnimNum @@ -8425,141 +8425,141 @@ 080d0840 l 00000020 FieldCB_UseStrength 080d0860 g 00000048 FldEff_UseStrength 080d08a8 l 00000010 ShowMonCB_UseStrength -080d08b8 g 00000030 BT_StartOnField +080d08b8 g 00000030 BattleTransition_StartOnField 080d08b8 l 00000000 .gcc2_compiled. -080d08e8 l 0000000e BT_StartWithoutAlloc -080d08f8 g 00000050 BT_IsDone -080d0948 l 00000030 BT_LaunchTask -080d0978 l 00000038 BT_TaskMain -080d09b0 l 00000050 BT_Phase1Blink -080d0a00 l 00000032 BT_WaitForPhase1 -080d0a34 l 00000028 BT_Phase2LaunchAnimTask -080d0a5c l 00000030 BT_WaitForPhase2 -080d0a8c l 00000050 BT_Phase1Task -080d0adc l 00000038 BT_Phase2Blur -080d0b14 l 00000032 BT_Phase2Blur_InitBgMosaic -080d0b48 l 00000060 BT_Phase2Blur_Anim -080d0ba8 l 0000002c BT_Phase2Blur_IsDone -080d0bd4 l 00000038 BT_Phase2DistortedWave -080d0c0c l 0000006c BT_Phase2DistortedWave_InitWave -080d0c78 l 00000078 BT_Phase2DistortedWave_UpdateWave -080d0cf0 l 00000038 VBCB_BT_Phase2DistortedWave -080d0d28 l 0000002c HBCB_BT_Phase2DistortedWave -080d0d54 l 00000038 BT_Phase2HorizontalCorrugate -080d0d8c l 00000064 BT_Phase2HorizontalCorrugate_Init -080d0df0 l 00000090 BT_Phase2HorizontalCorrugate_UpdateWave -080d0e80 l 00000038 VBCB_BT_Phase2HorizontalCorrugate -080d0eb8 l 0000002c HBCB_BT_Phase2HorizontalCorrugate -080d0ee4 l 00000038 BT_Phase2BigPokeball -080d0f1c l 000000b8 BT_Phase2BigPokeball_Init -080d0fd4 l 00000090 BT_Phase2BigPokeball_LoadTilemapAndWave -080d1064 l 00000094 BT_Phase2BigPokeball_UpdateWave1IncEva -080d10f8 l 000000a4 BT_Phase2BigPokeball_UpdateWave2DecEvb -080d119c l 00000084 BT_Phase2BigPokeball_UpdateWave3 -080d1220 l 000000c4 BT_Phase2BigPokeball_CircleEffect -080d12e4 l 0000008c BT_VBStopDma0SyncSrcBufferSetLcdRegs -080d1370 l 0000002c VBCB_BT_Phase2BigPokeball1 -080d139c l 0000002c VBCB_BT_Phase2BigPokeball2 -080d13c8 l 00000038 BT_Phase2SlidingPokeballs -080d1400 l 0000004c BT_Phase2SlidingPokeballs_LoadBgGfx -080d144c l 0000008c BT_Phase2SlidingPokeballs_SetupFldeffArgs -080d14d8 l 0000002c BT_Phase2SlidingPokeballs_IsDone -080d1504 g 0000006c FldEff_Pokeball -080d1570 l 000000c8 SpriteCB_BT_Phase2SlidingPokeballs -080d1638 l 00000038 BT_Phase2ClockwiseBlackFade -080d1670 l 00000068 BT_Phase2ClockwiseBlackFade_Init -080d16d8 l 00000090 BT_Phase2ClockwiseBlackFade_Step1 -080d1768 l 000000f4 BT_Phase2ClockwiseBlackFade_Step2 -080d185c l 00000088 BT_Phase2ClockwiseBlackFade_Step3 -080d18e4 l 00000100 BT_Phase2ClockwiseBlackFade_Step4 -080d19e4 l 00000098 BT_Phase2ClockwiseBlackFade_Step5 -080d1a7c l 00000040 BT_Phase2ClockwiseBlackFade_End -080d1abc l 0000009c VBCB_BT_Phase2ClockwiseBlackFade -080d1b58 l 00000038 BT_Phase2FullScreenWave -080d1b90 l 00000058 BT_Phase2FullScreenWave_Init -080d1be8 l 000000e0 BT_Phase2FullScreenWave_UpdateWave -080d1cc8 l 00000038 VBCB_BT_Phase2FullScreenWave -080d1d00 l 0000002c HBCB_BT_Phase2FullScreenWave -080d1d2c l 00000038 BT_Phase2BlackWaveToRight -080d1d64 l 00000058 BT_Phase2BlackWaveToRight_Init -080d1dbc l 0000009c BT_Phase2BlackWaveToRight_UpdateWave -080d1e58 l 00000040 BT_Phase2BlackWaveToRight_End -080d1e98 l 00000094 VBCB_BT_Phase2BlackWaveToRight -080d1f2c l 00000038 BT_Phase2AntiClockwiseSpiral -080d1f64 l 000005d8 BT_AntiClockwiseSpiral_DoUpdateFrame -080d253c l 00000088 BT_Phase2AntiClockwiseSpiral_Init -080d25c4 l 000000d4 BT_Phase2AntiClockwiseSpiral_Update -080d2698 l 000000d0 VBCB_BT_Phase2AntiClockwiseBlackFade -080d2768 l 00000020 BT_Phase2StartLoreleiMugshot -080d2788 l 00000020 BT_Phase2StartBrunoMugshot -080d27a8 l 00000020 BT_Phase2StartAgathaMugshot -080d27c8 l 00000020 BT_Phase2StartLanceMugshot -080d27e8 l 00000020 BT_Phase2StartBlueMugshot -080d2808 l 00000038 BT_Phase2Mugshot -080d2840 l 00000068 BT_Phase2Mugshot_Init -080d28a8 l 000000c0 BT_Phase2Mugshot_LoadGfx -080d2968 l 000000ec BT_Phase2Mugshot_VsBarsSlideIn -080d2a54 l 0000007c BT_Phase2Mugshot_StartSpriteSlide -080d2ad0 l 0000003c BT_Phase2Mugshot_WaitForOpponentInPlace -080d2b0c l 000000b8 BT_Phase2Mugshot_WaitForPlayerInPlace -080d2bc4 l 000000c8 BT_Phase2Mugshot_ExpandWhiteBand -080d2c8c l 00000038 BT_Phase2Mugshot_StartBlackFade -080d2cc4 l 0000004c BT_Phase2Mugshot_WaitForBlackFade -080d2d10 l 00000040 BT_Phase2Mugshot_End -080d2d50 l 0000009c VBCB_BT_Phase2Mugshot1_Slide -080d2dec l 00000080 VBCB_BT_Phase2Mugshot2_WhiteFade -080d2e6c l 00000038 HBCB_BT_Phase2Mugshot -080d2ea4 l 00000178 BT_Phase2Mugshots_CreateSprites -080d301c l 00000028 SpriteCB_BT_Phase2Mugshots -080d3044 l 00000004 BT_Phase2MugshotsSpriteFuncs_Wait -080d3048 l 0000004c BT_Phase2MugshotsSpriteFuncs_InitParams -080d3094 l 00000032 BT_Phase2MugshotsSpriteFuncs_SlideSpriteIn -080d30c8 l 0000002c BT_Phase2MugshotsSpriteFuncs_DecelerateSprite -080d30f4 l 0000002a BT_Phase2MugshotsSpriteFuncs_DecelerateSprite2 -080d3120 l 00000018 BT_SetSpriteAsOpponentOrPlayer -080d3138 l 0000001c BT_StartSpriteSlide -080d3154 l 00000018 BT_IsSpriteSlideFinished -080d316c l 00000038 BT_Phase2SlicedScreen -080d31a4 l 0000007c BT_Phase2SlicedScreen_Init -080d3220 l 000000cc BT_Phase2SlicedScreen_UpdateOffsets -080d32ec l 00000040 BT_Phase2SlicedScreen_End -080d332c l 00000094 VBCB_BT_Phase2SlicedScreen -080d33c0 l 0000002c HBCB_BT_Phase2SlicedScreen -080d33ec l 00000038 BT_Phase2WhiteFadeInStripes -080d3424 l 00000078 BT_Phase2WhiteFadeInStripes_Init -080d349c l 00000074 BT_Phase2WhiteFadeInStripes_SetupSprites -080d3510 l 0000003c BT_Phase2WhiteFadeInStripes_IsWhiteFadeDone -080d354c l 00000068 BT_Phase2WhiteFadeInStripes_Stop -080d35b4 l 00000040 BT_Phase2WhiteFadeInStripes_IsDone -080d35f4 l 0000009c VBCB_BT_Phase2WhiteFadeInStripes1 -080d3690 l 00000050 VBCB_BT_Phase2WhiteFadeInStripes2 -080d36e0 l 00000040 HBCB_BT_Phase2WhiteFadeInStripes -080d3720 l 000000f8 SpriteCB_BT_Phase2WhiteFadeInStripes -080d3818 l 00000038 BT_Phase2GridSquares -080d3850 l 00000054 BT_Phase2GridSquares_LoadGfx -080d38a4 l 00000058 BT_Phase2GridSquares_UpdateTileset -080d38fc l 0000002c BT_Phase2GridSquares_IsDone -080d3928 l 00000038 BT_Phase2BlackDoodles -080d3960 l 00000064 BT_Phase2BlackDoodles_Init -080d39c4 l 0000007c BT_Phase2BlackDoodles_InitSingleBrush -080d3a40 l 000000dc BT_Phase2BlackDoodles_DrawSingleBrush -080d3b1c l 0000006c BT_Phase2BlackDoodles_IsDone -080d3b88 l 0000001c BT_Phase2BlackDoodles_NextBrush -080d3ba4 l 0000009c VBCB_BT_Phase2BlackDoodles -080d3c40 l 00000064 BT_CreatePhase1SubTask -080d3ca4 l 0000001e BT_IsPhase1Done -080d3cc4 l 00000038 BT_Phase1SubTask -080d3cfc l 0000005c BT_Phase1_FadeOut -080d3d58 l 00000076 BT_Phase1_FadeIn -080d3dd0 l 00000024 BT_InitCtrlBlk -080d3df4 l 00000012 BT_VBSyncOamAndPltt -080d3e08 l 00000020 BT_GetBg0TilesetBase -080d3e28 l 00000038 BT_GetBg0TilemapAndTilesetBase -080d3e60 l 00000012 BT_BlendPalettesToBlack -080d3e74 l 0000007c BT_LoadWaveIntoBuffer -080d3ef0 l 00000198 BT_GenerateCircle -080d4088 l 0000007a BT_DiagonalSegment_InitParams -080d4104 l 000000fc BT_DiagonalSegment_ComputePointOnSegment +080d08e8 l 0000000e BattleTransition_Start +080d08f8 g 00000050 IsBattleTransitionDone +080d0948 l 00000030 LaunchBattleTransitionTask +080d0978 l 00000038 Task_BattleTransition +080d09b0 l 00000050 Transition_StartIntro +080d0a00 l 00000032 Transition_WaitForIntro +080d0a34 l 00000028 Transition_StartMain +080d0a5c l 00000030 Transition_WaitForMain +080d0a8c l 00000050 Task_Intro +080d0adc l 00000038 Task_Blur +080d0b14 l 00000032 Blur_Init +080d0b48 l 00000060 Blur_Main +080d0ba8 l 0000002c Blur_End +080d0bd4 l 00000038 Task_Swirl +080d0c0c l 0000006c Swirl_Init +080d0c78 l 00000078 Swirl_End +080d0cf0 l 00000038 VBlankCB_Swirl +080d0d28 l 0000002c HBlankCB_Swirl +080d0d54 l 00000038 Task_Shuffle +080d0d8c l 00000064 Shuffle_Init +080d0df0 l 00000090 Shuffle_End +080d0e80 l 00000038 VBlankCB_Shuffle +080d0eb8 l 0000002c HBlankCB_Shuffle +080d0ee4 l 00000038 Task_BigPokeball +080d0f1c l 000000b8 BigPokeball_Init +080d0fd4 l 00000090 BigPokeball_SetGfx +080d1064 l 00000094 PatternWeave_Blend1 +080d10f8 l 000000a4 PatternWeave_Blend2 +080d119c l 00000084 PatternWeave_FinishAppear +080d1220 l 000000c4 PatternWeave_CircularMask +080d12e4 l 0000008c VBlankCB_SetWinAndBlend +080d1370 l 0000002c VBlankCB_PatternWeave +080d139c l 0000002c VBlankCB_CircularMask +080d13c8 l 00000038 Task_PokeballsTrail +080d1400 l 0000004c PokeballsTrail_Init +080d144c l 0000008c PokeballsTrail_Main +080d14d8 l 0000002c PokeballsTrail_End +080d1504 g 0000006c FldEff_PokeballTrail +080d1570 l 000000c8 SpriteCB_FldEffPokeballTrail +080d1638 l 00000038 Task_ClockwiseWipe +080d1670 l 00000068 ClockwiseWipe_Init +080d16d8 l 00000090 ClockwiseWipe_TopRight +080d1768 l 000000f4 ClockwiseWipe_Right +080d185c l 00000088 ClockwiseWipe_Bottom +080d18e4 l 00000100 ClockwiseWipe_Left +080d19e4 l 00000098 ClockwiseWipe_TopLeft +080d1a7c l 00000040 ClockwiseWipe_End +080d1abc l 0000009c VBlankCB_ClockwiseWipe +080d1b58 l 00000038 Task_Ripple +080d1b90 l 00000058 Ripple_Init +080d1be8 l 000000e0 Ripple_Main +080d1cc8 l 00000038 VBlankCB_Ripple +080d1d00 l 0000002c HBlankCB_Ripple +080d1d2c l 00000038 Task_Wave +080d1d64 l 00000058 Wave_Init +080d1dbc l 0000009c Wave_Main +080d1e58 l 00000040 Wave_End +080d1e98 l 00000094 VBlankCB_Wave +080d1f2c l 00000038 Task_Spiral +080d1f64 l 000005d8 Spiral_UpdateFrame +080d253c l 00000088 Spiral_Init +080d25c4 l 000000d4 Spiral_End +080d2698 l 000000d0 VBlankCB_Spiral +080d2768 l 00000020 Task_Lorelei +080d2788 l 00000020 Task_Bruno +080d27a8 l 00000020 Task_Agatha +080d27c8 l 00000020 Task_Lance +080d27e8 l 00000020 Task_Blue +080d2808 l 00000038 DoMugshotTransition +080d2840 l 00000068 Mugshot_Init +080d28a8 l 000000c0 Mugshot_SetGfx +080d2968 l 000000ec Mugshot_ShowBanner +080d2a54 l 0000007c Mugshot_StartOpponentSlide +080d2ad0 l 0000003c Mugshot_WaitStartPlayerSlide +080d2b0c l 000000b8 Mugshot_WaitPlayerSlide +080d2bc4 l 000000c8 Mugshot_GradualWhiteFade +080d2c8c l 00000038 Mugshot_InitFadeWhiteToBlack +080d2cc4 l 0000004c Mugshot_FadeToBlack +080d2d10 l 00000040 Mugshot_End +080d2d50 l 0000009c VBlankCB_Mugshots +080d2dec l 00000080 VBlankCB_MugshotsFadeOut +080d2e6c l 00000038 HBlankCB_Mugshots +080d2ea4 l 00000178 Mugshots_CreateTrainerPics +080d301c l 00000028 SpriteCB_MugshotTrainerPic +080d3044 l 00000004 MugshotTrainerPic_Pause +080d3048 l 0000004c MugshotTrainerPic_Init +080d3094 l 00000032 MugshotTrainerPic_Slide +080d30c8 l 0000002c MugshotTrainerPic_SlideSlow +080d30f4 l 0000002a MugshotTrainerPic_SlideOffscreen +080d3120 l 00000018 SetTrainerPicSlideDirection +080d3138 l 0000001c IncrementTrainerPicState +080d3154 l 00000018 IsTrainerPicSlideDone +080d316c l 00000038 Task_Slice +080d31a4 l 0000007c Slice_Init +080d3220 l 000000cc Slice_Main +080d32ec l 00000040 Slice_End +080d332c l 00000094 VBlankCB_Slice +080d33c0 l 0000002c HBlankCB_Slice +080d33ec l 00000038 Task_WhiteBarsFade +080d3424 l 00000078 WhiteBarsFade_Init +080d349c l 00000074 WhiteBarsFade_StartBars +080d3510 l 0000003c WhiteBarsFade_WaitBars +080d354c l 00000068 WhiteBarsFade_BlendToBlack +080d35b4 l 00000040 WhiteBarsFade_End +080d35f4 l 0000009c VBlankCB_WhiteBarsFade +080d3690 l 00000050 VBlankCB_WhiteBarsFade_Blend +080d36e0 l 00000040 HBlankCB_WhiteBarsFade +080d3720 l 000000f8 SpriteCB_WhiteBarFade +080d3818 l 00000038 Task_GridSquares +080d3850 l 00000054 GridSquares_Init +080d38a4 l 00000058 GridSquares_Main +080d38fc l 0000002c GridSquares_End +080d3928 l 00000038 Task_AngledWipes +080d3960 l 00000064 AngledWipes_Init +080d39c4 l 0000007c AngledWipes_SetWipeData +080d3a40 l 000000dc AngledWipes_DoWipe +080d3b1c l 0000006c AngledWipes_TryEnd +080d3b88 l 0000001c AngledWipes_StartNext +080d3ba4 l 0000009c VBlankCB_AngledWipes +080d3c40 l 00000064 CreateIntroTask +080d3ca4 l 0000001e IsIntroTaskDone +080d3cc4 l 00000038 Task_BattleTransition_Intro +080d3cfc l 0000005c TransitionIntro_FadeToGray +080d3d58 l 00000076 TransitionIntro_FadeFromGray +080d3dd0 l 00000024 InitTransitionData +080d3df4 l 00000012 VBlankCB_BattleTransition +080d3e08 l 00000020 GetBg0TilemapDst +080d3e28 l 00000038 GetBg0TilesDst +080d3e60 l 00000012 FadeScreenBlack +080d3e74 l 0000007c SetSinWave +080d3ef0 l 00000198 SetCircularMask +080d4088 l 0000007a InitBlackWipe +080d4104 l 000000fc UpdateBlackWipe 080d4200 l 00000000 .gcc2_compiled. 080d4200 l 00000002 LinkPartnerDummy 080d4204 g 0000001c SetControllerToLinkPartner @@ -10325,7 +10325,7 @@ 0810c2e8 g 00000012 FreeAndDestroyTrainerPicSprite 0810c2fc g 00000034 LoadTrainerPicInWindow 0810c330 g 00000044 CreateTrainerCardTrainerPicSprite -0810c374 g 00000030 PlayerGenderToFrontTrainerPicId_Debug +0810c374 g 00000030 PlayerGenderToFrontTrainerPicId 0810c3a4 g 00000014 VsSeekerFreezeObjectsAfterChargeComplete 0810c3a4 l 00000000 .gcc2_compiled. 0810c3b8 l 0000008c Task_ResetObjectsRematchWantedState @@ -10457,7 +10457,7 @@ 0810f740 g 00000034 DestroyTopBarWindow 0810f774 g 00000064 Menu_InitCursorInternal 0810f7d8 g 00000040 Menu_InitCursor -0810f818 l 0000005c sub_810F818 +0810f818 l 0000005c InitMenuDefaultCursorHeight 0810f874 l 00000090 Menu_RedrawCursor 0810f904 g 00000044 Menu_MoveCursor 0810f948 g 00000044 Menu_MoveCursorNoWrapAround @@ -10470,7 +10470,7 @@ 0810fbe8 g 00000098 MultichoiceList_PrintItems 0810fc80 g 0000004e UnionRoomAndTradeMenuPrintOptions 0810fcd0 g 00000112 AddItemMenuActionTextPrinters -0810fde4 l 0000006c sub_810FDE4 +0810fde4 l 0000006c PrintMenuActionTextsAtTopById 0810fe50 g 000000b4 SetWindowTemplateFields 0810ff04 l 0000005a CreateWindowTemplate 0810ff60 g 00000144 CreateYesNoMenu @@ -10484,10 +10484,10 @@ 0811037c l 000000d4 MultichoiceGrid_RedrawCursor 08110450 l 000000c2 MultichoiceGrid_MoveCursor 08110514 l 0000008a MultichoiceGrid_MoveCursorIfValid -081105a0 l 000000ae sub_81105A0 +081105a0 l 000000ae Menu_ProcessGridInput_NoSoundLimit 08110650 g 000000a4 Menu_ProcessInputGridLayout -081106f4 l 000000aa sub_81106F4 -081107a0 l 000000a0 sub_81107A0 +081106f4 l 000000aa Menu_ProcessGridInputRepeat_NoSoundLimit +081107a0 l 000000a0 Menu_ProcessGridInputRepeat 08110840 g 0000005c SetQuestLogRecordAndPlaybackPointers 08110840 l 00000000 .gcc2_compiled. 0811089c g 00000054 ResetQuestLog @@ -26765,10 +26765,10 @@ 0824f008 l 00000005 sText_ShedinjaJpnName 0824f010 g 00000008 gOamData_BattlerOpponent 0824f018 g 00000008 gOamData_BattlerPlayer -0824f020 l 00000008 gUnknown_824F020 -0824f028 l 00000004 gUnknown_824F028 -0824f02c l 00000018 gUnknown_824F02C -0824f044 l 00000004 gUnknown_824F044 +0824f020 l 00000008 sAnim_Unused +0824f028 l 00000004 sAnims_Unused +0824f02c l 00000018 sAffineAnim_Unused +0824f044 l 00000004 sAffineAnims_Unused 0824f048 l 00000008 sPlayerThrowXTranslation 0824f050 g 00000150 gTypeEffectiveness 0824f1a0 g 0000007e gTypeNames @@ -29860,7 +29860,7 @@ 0835b944 l 00000018 gCameraSpriteTemplate 0835b95c g 0000000c gCameraObjectFuncs 0835b968 g 00000020 gObjectEventPal_Player -0835b988 g 00000020 gUnknown_835B988 +0835b988 g 00000020 gObjectEventPal_PlayerUnused 0835b9a8 g 00000020 gObjectEventPaletteNull1 0835b9c8 g 00000020 gObjectEventPaletteNull2 0835b9e8 g 00000020 gObjectEventPaletteNull3 @@ -30051,7 +30051,7 @@ 08398068 g 00000040 gFieldEffectObjectPic_ShadowMedium 083980a8 g 00000080 gFieldEffectObjectPic_ShadowLarge 08398128 g 00000400 gFieldEffectObjectPic_ShadowExtraLarge -08398528 g 00000120 filler_8398188 +08398528 g 00000120 sFiller1 08398648 g 00000020 gFieldEffectObjectPic_CutGrass 08398668 g 00000020 gFieldEffectObjectPic_CutGrass2 08398688 g 00000020 gFieldEffectPal_CutGrass @@ -30060,7 +30060,7 @@ 08398ba8 g 00000400 gFieldEffectObjectPic_Arrow 08398fa8 g 00000020 gFieldEffectObjectPalette0 08398fc8 g 00000020 gFieldEffectObjectPalette1 -08398fe8 g 00000020 filler_8398FE8 +08398fe8 g 00000020 sFiller2 08399008 g 000000c0 gFieldEffectObjectPic_GroundImpactDust 083990c8 g 000000c0 gFieldEffectObjectPic_UnusedGrass3 08399188 g 00000100 gFieldEffectObjectPic_JumpTallGrass @@ -36452,72 +36452,72 @@ 083f844f l 0000001e sText_UnusedArrows 083f846d l 00000010 sBgAnim_PaletteControl 083f847d l 00000320 sBgAnim_PalIndexes -083f87a0 l 00000580 sBigPokeballTileset -083f8d20 l 00000040 sSlidingPokeballTilemap -083f8d60 l 00000200 sSpriteImage_SlidingPokeball -083f8f60 l 000001e0 sVsBarTileset -083f9140 l 00000800 sSpriteImage_UnusedBrendan -083f9940 l 00000800 sSpriteImage_UnusedLass -083fa140 l 000001e0 sGridSquareTileset -083fa320 l 00000048 sBT_Phase1Tasks -083fa368 l 00000048 sBT_Phase2Tasks -083fa3b0 l 00000010 sBT_MainPhases -083fa3c0 l 0000000c sBT_Phase2BlurFuncs -083fa3cc l 00000008 sBT_Phase2DistortedWaveFuncs -083fa3d4 l 00000008 sBT_Phase2HorizontalCorrugateFuncs -083fa3dc l 00000018 sBT_Phase2BigPokeballFuncs -083fa3f4 l 0000000c sBT_Phase2SlidingPokeballsFuncs -083fa400 l 00000004 gUnknown_83FA400 -083fa404 l 0000000a gUnknown_83FA404 -083fa40e l 00000004 gUnknown_83FA40E -083fa414 l 0000001c sBT_Phase2ClockwiseBlackFadeFuncs -083fa430 l 00000008 sBT_Phase2FullScreenWaveFuncs -083fa438 l 0000000c sBT_Phase2BlackWaveToRightFuncs -083fa444 l 00000020 gUnknown_83FA444 -083fa464 l 00000008 sBT_Phase2AntiClockwiseSpiralFuncs -083fa46c l 00000028 sBT_Phase2MugshotFuncs +083f87a0 l 00000580 sBigPokeball_Gfx +083f8d20 l 00000040 sSlidingPokeball_Tilemap +083f8d60 l 00000200 sSlidingPokeball_Gfx +083f8f60 l 000001e0 sMugshotBanner_Gfx +083f9140 l 00000800 sUnusedBrendan_Gfx +083f9940 l 00000800 sUnusedLass_Gfx +083fa140 l 000001e0 sGridSquare_Gfx +083fa320 l 00000048 sTasks_Intro +083fa368 l 00000048 sTasks_Main +083fa3b0 l 00000010 sTaskHandlers +083fa3c0 l 0000000c sBlur_Funcs +083fa3cc l 00000008 sSwirl_Funcs +083fa3d4 l 00000008 sShuffle_Funcs +083fa3dc l 00000018 sBigPokeball_Funcs +083fa3f4 l 0000000c sPokeballsTrail_Funcs +083fa400 l 00000004 sPokeballsTrail_StartXCoords +083fa404 l 0000000a sPokeballsTrail_Delays +083fa40e l 00000004 sPokeballsTrail_Speeds +083fa414 l 0000001c sClockwiseWipe_Funcs +083fa430 l 00000008 sRipple_Funcs +083fa438 l 0000000c sWave_Funcs +083fa444 l 00000020 sSpiral_AngleData +083fa464 l 00000008 sSpiral_Funcs +083fa46c l 00000028 sMugshot_Funcs 083fa494 l 00000005 sMugshotsTrainerPicIDsTable 083fa49a l 00000014 sMugshotsOpponentRotationScales 083fa4ae l 00000014 sMugshotsOpponentCoords -083fa4c4 l 0000001c sBT_Phase2MugshotSpriteFuncs -083fa4e0 l 00000004 sMugShotSlideVelocity -083fa4e4 l 00000004 sMugShotSlideDeceleration -083fa4e8 l 0000000c sBT_Phase2SlicedScreenFuncs -083fa4f4 l 00000014 sBT_Phase2WhiteFadeInStripesFuncs -083fa508 l 0000000c sWhiteStripeDelay -083fa514 l 0000000c sBT_Phase2GridSquaresFuncs -083fa520 l 00000014 sBT_Phase2BlackDoodlesFuncs -083fa534 l 00000046 sBlackDoodlesSegments -083fa57a l 0000000e sBlackDoodlesDelay -083fa588 l 00000008 sBT_Phase1FadeFuncs -083fa590 l 00000008 sSpriteImageTable_SlidingPokeball -083fa598 l 00000008 sSpriteAnim_SlidingPokeball -083fa5a0 l 00000004 sSpriteAnimTable_SlidingPokeball -083fa5a4 l 00000010 sSpriteAffineAnim_SlidingPokeball1 -083fa5b4 l 00000010 sSpriteAffineAnim_SlidingPokeball2 -083fa5c4 l 00000008 sSpriteAffineAnimTable_SlidingPokeball -083fa5cc l 00000018 sSpriteTemplate_SlidingPokeball -083fa5e4 l 00000008 sOamData_Unused -083fa5ec l 00000008 sSpriteImageTable_UnusedBrendan -083fa5f4 l 00000008 sSpriteImageTable_UnusedLass -083fa5fc l 00000008 sSpriteAnim_Unused -083fa604 l 00000004 sSpriteAnimTable_Unused -083fa608 l 00000030 sSpriteTemplateTable_Unused -083fa638 l 00000020 sSlidingPokeballBigPokeballPalette -083fa658 g 00000008 sSpritePalette_SlidingPokeball -083fa660 l 00000020 sVsBarLoreleiPalette -083fa680 l 00000020 sVsBarBrunoPalette -083fa6a0 l 00000020 sVsBarAgathaPalette -083fa6c0 l 00000020 sVsBarLancePalette -083fa6e0 l 00000020 sVsBarBluePalette -083fa700 l 00000020 sVsBarMalePlayerPalette -083fa720 l 00000020 sVsBarFemalePlayerPalette -083fa740 l 00000014 sVsBarOpponentPalettes -083fa754 l 00000008 sVsBarPlayerPalettes +083fa4c4 l 0000001c sMugshotTrainerPicFuncs +083fa4e0 l 00000004 sTrainerPicSlideSpeeds +083fa4e4 l 00000004 sTrainerPicSlideAccels +083fa4e8 l 0000000c sSlice_Funcs +083fa4f4 l 00000014 sWhiteBarsFade_Funcs +083fa508 l 0000000c sWhiteBarsFade_StartDelays +083fa514 l 0000000c sGridSquares_Funcs +083fa520 l 00000014 sAngledWipes_Funcs +083fa534 l 00000046 sAngledWipes_MoveData +083fa57a l 0000000e sAngledWipes_EndDelays +083fa588 l 00000008 sTransitionIntroFuncs +083fa590 l 00000008 sSpriteImage_Pokeball +083fa598 l 00000008 sSpriteAnim_Pokeball +083fa5a0 l 00000004 sSpriteAnimTable_Pokeball +083fa5a4 l 00000010 sSpriteAffineAnim_Pokeball1 +083fa5b4 l 00000010 sSpriteAffineAnim_Pokeball2 +083fa5c4 l 00000008 sSpriteAffineAnimTable_Pokeball +083fa5cc l 00000018 sSpriteTemplate_Pokeball +083fa5e4 l 00000008 sOam_UnusedBrendanLass +083fa5ec l 00000008 sImageTable_UnusedBrendan +083fa5f4 l 00000008 sImageTable_UnusedLass +083fa5fc l 00000008 sSpriteAnim_UnusedBrendanLass +083fa604 l 00000004 sSpriteAnimTable_UnusedBrendanLass +083fa608 l 00000030 sSpriteTemplate_UnusedBrendanLass +083fa638 l 00000020 sFieldEffectPal_Pokeball +083fa658 g 00000008 gSpritePalette_Pokeball +083fa660 l 00000020 sMugshotPal_Lorelei +083fa680 l 00000020 sMugshotPal_Bruno +083fa6a0 l 00000020 sMugshotPal_Agatha +083fa6c0 l 00000020 sMugshotPal_Lance +083fa6e0 l 00000020 sMugshotPal_Blue +083fa700 l 00000020 sMugshotPal_Red +083fa720 l 00000020 sMugshotPal_Green +083fa740 l 00000014 sOpponentMugshotsPals +083fa754 l 00000008 sPlayerMugshotsPals 083fa75c l 00000020 sUnusedTrainerPalette 083fa77c l 00000008 sSpritePalette_UnusedTrainer -083fa784 l 000004b0 sBigPokeballTilemap -083fac34 l 00000500 sVsBarTilemap +083fa784 l 000004b0 sBigPokeball_Tilemap +083fac34 l 00000500 sMugshotsTilemap 083fb134 l 000000e4 sLinkPartnerBufferCommands 083fb218 l 00000001 sText_Empty1 083fb219 l 00000003 sText_Trainer1LoseText @@ -40475,7 +40475,7 @@ 084556a0 g 0000002b DecorDesc_REGICE_DOLL 084556cb g 0000002b DecorDesc_REGISTEEL_DOLL 084556f8 g 00000f20 gDecorations -08456618 l 00000003 gUnknown_8456618 +08456618 l 00000003 sTopBarWindowTextColors 0845661c l 00000018 sQuestLogHeaderWindowTemplates 08456634 l 00000003 sTextColors 08456638 l 00000060 sUnknown_8456638 @@ -42050,7 +42050,7 @@ 0847aba2 g 00000008 gText_UnionRoomChatKeyboard_Emoji10 0847abac l 000003e0 sTrainerTowerFloor_Single_4 0847af8c l 000003e0 sTrainerTowerFloor_Single_7 -0847b36c l 000003e0 gUnknown_847B36C +0847b36c l 000003e0 sTrainerTowerFloor_Single_Unused 0847b74c l 000003e0 sTrainerTowerFloor_Double_5 0847bb2c l 000003e0 sTrainerTowerFloor_Double_6 0847bf0c l 000003e0 sTrainerTowerFloor_Double_2 @@ -42069,15 +42069,15 @@ 0847f16c l 000003e0 sTrainerTowerFloor_Single_1 0847f54c l 000003e0 sTrainerTowerFloor_Mixed_5 0847f92c l 000003e0 sTrainerTowerFloor_Double_8 -0847fd0c l 000003e0 gUnknown_847FD0C +0847fd0c l 000003e0 sTrainerTowerFloor_Double_Unused1 084800ec l 000003e0 sTrainerTowerFloor_Knockout_7 084804cc l 000003e0 sTrainerTowerFloor_Knockout_4 084808ac l 000003e0 sTrainerTowerFloor_Single_3 08480c8c l 000003e0 sTrainerTowerFloor_Mixed_3 0848106c l 000003e0 sTrainerTowerFloor_Mixed_2 -0848144c l 000003e0 gUnknown_848144C +0848144c l 000003e0 sTrainerTowerFloor_Double_Unused2 0848182c l 000003e0 sTrainerTowerFloor_Double_7 -08481c0c l 000003e0 gUnknown_8481C0C +08481c0c l 000003e0 sTrainerTowerFloor_Double_Unused3 08481fec l 000003e0 sTrainerTowerFloor_Knockout_6 084823cc l 000003e0 sTrainerTowerFloor_Knockout_5 084827ac g 00000008 gTrainerTowerLocalHeader diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 6760366d0..bf5711bcd 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -377,7 +377,7 @@ 02039a20 l 00000004 sEvoStructPtr 02039a24 l 00000004 sBgAnimPal 02039a28 l 00000001 sCoinsWindowId -02039a2c l 00000004 sTransitionStructPtr +02039a2c l 00000004 sTransitionData 02039a30 l 00000004 sBattlerAbilities 02039a34 l 00000004 sBattleMsgDataPtr 02039a38 g 00001000 gSaveDataBuffer @@ -1064,7 +1064,7 @@ 08002fa0 g 0000003e DecompressGlyphTile 08002fe0 g 00000046 GetLastTextColor 08003028 g 00000600 CopyGlyphToWindow -08003628 g 00000508 sub_8003614 +08003628 l 00000508 CopyGlyphToWindow_Parameterized 08003b30 g 00000002 ClearTextSpan 08003b34 l 00000000 .gcc2_compiled. 08003b34 l 00000002 nullsub_8 @@ -3912,7 +3912,7 @@ 08063484 l 00000010 GetMoveDirectionFastestAnimNum 08063494 g 00000010 GetJumpSpecialDirectionAnimNum 080634a4 g 00000010 GetAcroWheelieDirectionAnimNum -080634b4 g 00000010 Unref_GetAnimNums_080634A0 +080634b4 g 00000010 GetAcroBunnyHopFrontWheelDirectionAnimNum 080634c4 g 00000010 GetAcroEndWheelieDirectionAnimNum 080634d4 g 00000010 GetSpinDirectionAnimNum 080634e4 g 00000010 GetAcroUnusedActionDirectionAnimNum @@ -8425,141 +8425,141 @@ 080d0854 l 00000020 FieldCB_UseStrength 080d0874 g 00000048 FldEff_UseStrength 080d08bc l 00000010 ShowMonCB_UseStrength -080d08cc g 00000030 BT_StartOnField +080d08cc g 00000030 BattleTransition_StartOnField 080d08cc l 00000000 .gcc2_compiled. -080d08fc l 0000000e BT_StartWithoutAlloc -080d090c g 00000050 BT_IsDone -080d095c l 00000030 BT_LaunchTask -080d098c l 00000038 BT_TaskMain -080d09c4 l 00000050 BT_Phase1Blink -080d0a14 l 00000032 BT_WaitForPhase1 -080d0a48 l 00000028 BT_Phase2LaunchAnimTask -080d0a70 l 00000030 BT_WaitForPhase2 -080d0aa0 l 00000050 BT_Phase1Task -080d0af0 l 00000038 BT_Phase2Blur -080d0b28 l 00000032 BT_Phase2Blur_InitBgMosaic -080d0b5c l 00000060 BT_Phase2Blur_Anim -080d0bbc l 0000002c BT_Phase2Blur_IsDone -080d0be8 l 00000038 BT_Phase2DistortedWave -080d0c20 l 0000006c BT_Phase2DistortedWave_InitWave -080d0c8c l 00000078 BT_Phase2DistortedWave_UpdateWave -080d0d04 l 00000038 VBCB_BT_Phase2DistortedWave -080d0d3c l 0000002c HBCB_BT_Phase2DistortedWave -080d0d68 l 00000038 BT_Phase2HorizontalCorrugate -080d0da0 l 00000064 BT_Phase2HorizontalCorrugate_Init -080d0e04 l 00000090 BT_Phase2HorizontalCorrugate_UpdateWave -080d0e94 l 00000038 VBCB_BT_Phase2HorizontalCorrugate -080d0ecc l 0000002c HBCB_BT_Phase2HorizontalCorrugate -080d0ef8 l 00000038 BT_Phase2BigPokeball -080d0f30 l 000000b8 BT_Phase2BigPokeball_Init -080d0fe8 l 00000090 BT_Phase2BigPokeball_LoadTilemapAndWave -080d1078 l 00000094 BT_Phase2BigPokeball_UpdateWave1IncEva -080d110c l 000000a4 BT_Phase2BigPokeball_UpdateWave2DecEvb -080d11b0 l 00000084 BT_Phase2BigPokeball_UpdateWave3 -080d1234 l 000000c4 BT_Phase2BigPokeball_CircleEffect -080d12f8 l 0000008c BT_VBStopDma0SyncSrcBufferSetLcdRegs -080d1384 l 0000002c VBCB_BT_Phase2BigPokeball1 -080d13b0 l 0000002c VBCB_BT_Phase2BigPokeball2 -080d13dc l 00000038 BT_Phase2SlidingPokeballs -080d1414 l 0000004c BT_Phase2SlidingPokeballs_LoadBgGfx -080d1460 l 0000008c BT_Phase2SlidingPokeballs_SetupFldeffArgs -080d14ec l 0000002c BT_Phase2SlidingPokeballs_IsDone -080d1518 g 0000006c FldEff_Pokeball -080d1584 l 000000c8 SpriteCB_BT_Phase2SlidingPokeballs -080d164c l 00000038 BT_Phase2ClockwiseBlackFade -080d1684 l 00000068 BT_Phase2ClockwiseBlackFade_Init -080d16ec l 00000090 BT_Phase2ClockwiseBlackFade_Step1 -080d177c l 000000f4 BT_Phase2ClockwiseBlackFade_Step2 -080d1870 l 00000088 BT_Phase2ClockwiseBlackFade_Step3 -080d18f8 l 00000100 BT_Phase2ClockwiseBlackFade_Step4 -080d19f8 l 00000098 BT_Phase2ClockwiseBlackFade_Step5 -080d1a90 l 00000040 BT_Phase2ClockwiseBlackFade_End -080d1ad0 l 0000009c VBCB_BT_Phase2ClockwiseBlackFade -080d1b6c l 00000038 BT_Phase2FullScreenWave -080d1ba4 l 00000058 BT_Phase2FullScreenWave_Init -080d1bfc l 000000e0 BT_Phase2FullScreenWave_UpdateWave -080d1cdc l 00000038 VBCB_BT_Phase2FullScreenWave -080d1d14 l 0000002c HBCB_BT_Phase2FullScreenWave -080d1d40 l 00000038 BT_Phase2BlackWaveToRight -080d1d78 l 00000058 BT_Phase2BlackWaveToRight_Init -080d1dd0 l 0000009c BT_Phase2BlackWaveToRight_UpdateWave -080d1e6c l 00000040 BT_Phase2BlackWaveToRight_End -080d1eac l 00000094 VBCB_BT_Phase2BlackWaveToRight -080d1f40 l 00000038 BT_Phase2AntiClockwiseSpiral -080d1f78 l 000005d8 BT_AntiClockwiseSpiral_DoUpdateFrame -080d2550 l 00000088 BT_Phase2AntiClockwiseSpiral_Init -080d25d8 l 000000d4 BT_Phase2AntiClockwiseSpiral_Update -080d26ac l 000000d0 VBCB_BT_Phase2AntiClockwiseBlackFade -080d277c l 00000020 BT_Phase2StartLoreleiMugshot -080d279c l 00000020 BT_Phase2StartBrunoMugshot -080d27bc l 00000020 BT_Phase2StartAgathaMugshot -080d27dc l 00000020 BT_Phase2StartLanceMugshot -080d27fc l 00000020 BT_Phase2StartBlueMugshot -080d281c l 00000038 BT_Phase2Mugshot -080d2854 l 00000068 BT_Phase2Mugshot_Init -080d28bc l 000000c0 BT_Phase2Mugshot_LoadGfx -080d297c l 000000ec BT_Phase2Mugshot_VsBarsSlideIn -080d2a68 l 0000007c BT_Phase2Mugshot_StartSpriteSlide -080d2ae4 l 0000003c BT_Phase2Mugshot_WaitForOpponentInPlace -080d2b20 l 000000b8 BT_Phase2Mugshot_WaitForPlayerInPlace -080d2bd8 l 000000c8 BT_Phase2Mugshot_ExpandWhiteBand -080d2ca0 l 00000038 BT_Phase2Mugshot_StartBlackFade -080d2cd8 l 0000004c BT_Phase2Mugshot_WaitForBlackFade -080d2d24 l 00000040 BT_Phase2Mugshot_End -080d2d64 l 0000009c VBCB_BT_Phase2Mugshot1_Slide -080d2e00 l 00000080 VBCB_BT_Phase2Mugshot2_WhiteFade -080d2e80 l 00000038 HBCB_BT_Phase2Mugshot -080d2eb8 l 00000178 BT_Phase2Mugshots_CreateSprites -080d3030 l 00000028 SpriteCB_BT_Phase2Mugshots -080d3058 l 00000004 BT_Phase2MugshotsSpriteFuncs_Wait -080d305c l 0000004c BT_Phase2MugshotsSpriteFuncs_InitParams -080d30a8 l 00000032 BT_Phase2MugshotsSpriteFuncs_SlideSpriteIn -080d30dc l 0000002c BT_Phase2MugshotsSpriteFuncs_DecelerateSprite -080d3108 l 0000002a BT_Phase2MugshotsSpriteFuncs_DecelerateSprite2 -080d3134 l 00000018 BT_SetSpriteAsOpponentOrPlayer -080d314c l 0000001c BT_StartSpriteSlide -080d3168 l 00000018 BT_IsSpriteSlideFinished -080d3180 l 00000038 BT_Phase2SlicedScreen -080d31b8 l 0000007c BT_Phase2SlicedScreen_Init -080d3234 l 000000cc BT_Phase2SlicedScreen_UpdateOffsets -080d3300 l 00000040 BT_Phase2SlicedScreen_End -080d3340 l 00000094 VBCB_BT_Phase2SlicedScreen -080d33d4 l 0000002c HBCB_BT_Phase2SlicedScreen -080d3400 l 00000038 BT_Phase2WhiteFadeInStripes -080d3438 l 00000078 BT_Phase2WhiteFadeInStripes_Init -080d34b0 l 00000074 BT_Phase2WhiteFadeInStripes_SetupSprites -080d3524 l 0000003c BT_Phase2WhiteFadeInStripes_IsWhiteFadeDone -080d3560 l 00000068 BT_Phase2WhiteFadeInStripes_Stop -080d35c8 l 00000040 BT_Phase2WhiteFadeInStripes_IsDone -080d3608 l 0000009c VBCB_BT_Phase2WhiteFadeInStripes1 -080d36a4 l 00000050 VBCB_BT_Phase2WhiteFadeInStripes2 -080d36f4 l 00000040 HBCB_BT_Phase2WhiteFadeInStripes -080d3734 l 000000f8 SpriteCB_BT_Phase2WhiteFadeInStripes -080d382c l 00000038 BT_Phase2GridSquares -080d3864 l 00000054 BT_Phase2GridSquares_LoadGfx -080d38b8 l 00000058 BT_Phase2GridSquares_UpdateTileset -080d3910 l 0000002c BT_Phase2GridSquares_IsDone -080d393c l 00000038 BT_Phase2BlackDoodles -080d3974 l 00000064 BT_Phase2BlackDoodles_Init -080d39d8 l 0000007c BT_Phase2BlackDoodles_InitSingleBrush -080d3a54 l 000000dc BT_Phase2BlackDoodles_DrawSingleBrush -080d3b30 l 0000006c BT_Phase2BlackDoodles_IsDone -080d3b9c l 0000001c BT_Phase2BlackDoodles_NextBrush -080d3bb8 l 0000009c VBCB_BT_Phase2BlackDoodles -080d3c54 l 00000064 BT_CreatePhase1SubTask -080d3cb8 l 0000001e BT_IsPhase1Done -080d3cd8 l 00000038 BT_Phase1SubTask -080d3d10 l 0000005c BT_Phase1_FadeOut -080d3d6c l 00000076 BT_Phase1_FadeIn -080d3de4 l 00000024 BT_InitCtrlBlk -080d3e08 l 00000012 BT_VBSyncOamAndPltt -080d3e1c l 00000020 BT_GetBg0TilesetBase -080d3e3c l 00000038 BT_GetBg0TilemapAndTilesetBase -080d3e74 l 00000012 BT_BlendPalettesToBlack -080d3e88 l 0000007c BT_LoadWaveIntoBuffer -080d3f04 l 00000198 BT_GenerateCircle -080d409c l 0000007a BT_DiagonalSegment_InitParams -080d4118 l 000000fc BT_DiagonalSegment_ComputePointOnSegment +080d08fc l 0000000e BattleTransition_Start +080d090c g 00000050 IsBattleTransitionDone +080d095c l 00000030 LaunchBattleTransitionTask +080d098c l 00000038 Task_BattleTransition +080d09c4 l 00000050 Transition_StartIntro +080d0a14 l 00000032 Transition_WaitForIntro +080d0a48 l 00000028 Transition_StartMain +080d0a70 l 00000030 Transition_WaitForMain +080d0aa0 l 00000050 Task_Intro +080d0af0 l 00000038 Task_Blur +080d0b28 l 00000032 Blur_Init +080d0b5c l 00000060 Blur_Main +080d0bbc l 0000002c Blur_End +080d0be8 l 00000038 Task_Swirl +080d0c20 l 0000006c Swirl_Init +080d0c8c l 00000078 Swirl_End +080d0d04 l 00000038 VBlankCB_Swirl +080d0d3c l 0000002c HBlankCB_Swirl +080d0d68 l 00000038 Task_Shuffle +080d0da0 l 00000064 Shuffle_Init +080d0e04 l 00000090 Shuffle_End +080d0e94 l 00000038 VBlankCB_Shuffle +080d0ecc l 0000002c HBlankCB_Shuffle +080d0ef8 l 00000038 Task_BigPokeball +080d0f30 l 000000b8 BigPokeball_Init +080d0fe8 l 00000090 BigPokeball_SetGfx +080d1078 l 00000094 PatternWeave_Blend1 +080d110c l 000000a4 PatternWeave_Blend2 +080d11b0 l 00000084 PatternWeave_FinishAppear +080d1234 l 000000c4 PatternWeave_CircularMask +080d12f8 l 0000008c VBlankCB_SetWinAndBlend +080d1384 l 0000002c VBlankCB_PatternWeave +080d13b0 l 0000002c VBlankCB_CircularMask +080d13dc l 00000038 Task_PokeballsTrail +080d1414 l 0000004c PokeballsTrail_Init +080d1460 l 0000008c PokeballsTrail_Main +080d14ec l 0000002c PokeballsTrail_End +080d1518 g 0000006c FldEff_PokeballTrail +080d1584 l 000000c8 SpriteCB_FldEffPokeballTrail +080d164c l 00000038 Task_ClockwiseWipe +080d1684 l 00000068 ClockwiseWipe_Init +080d16ec l 00000090 ClockwiseWipe_TopRight +080d177c l 000000f4 ClockwiseWipe_Right +080d1870 l 00000088 ClockwiseWipe_Bottom +080d18f8 l 00000100 ClockwiseWipe_Left +080d19f8 l 00000098 ClockwiseWipe_TopLeft +080d1a90 l 00000040 ClockwiseWipe_End +080d1ad0 l 0000009c VBlankCB_ClockwiseWipe +080d1b6c l 00000038 Task_Ripple +080d1ba4 l 00000058 Ripple_Init +080d1bfc l 000000e0 Ripple_Main +080d1cdc l 00000038 VBlankCB_Ripple +080d1d14 l 0000002c HBlankCB_Ripple +080d1d40 l 00000038 Task_Wave +080d1d78 l 00000058 Wave_Init +080d1dd0 l 0000009c Wave_Main +080d1e6c l 00000040 Wave_End +080d1eac l 00000094 VBlankCB_Wave +080d1f40 l 00000038 Task_Spiral +080d1f78 l 000005d8 Spiral_UpdateFrame +080d2550 l 00000088 Spiral_Init +080d25d8 l 000000d4 Spiral_End +080d26ac l 000000d0 VBlankCB_Spiral +080d277c l 00000020 Task_Lorelei +080d279c l 00000020 Task_Bruno +080d27bc l 00000020 Task_Agatha +080d27dc l 00000020 Task_Lance +080d27fc l 00000020 Task_Blue +080d281c l 00000038 DoMugshotTransition +080d2854 l 00000068 Mugshot_Init +080d28bc l 000000c0 Mugshot_SetGfx +080d297c l 000000ec Mugshot_ShowBanner +080d2a68 l 0000007c Mugshot_StartOpponentSlide +080d2ae4 l 0000003c Mugshot_WaitStartPlayerSlide +080d2b20 l 000000b8 Mugshot_WaitPlayerSlide +080d2bd8 l 000000c8 Mugshot_GradualWhiteFade +080d2ca0 l 00000038 Mugshot_InitFadeWhiteToBlack +080d2cd8 l 0000004c Mugshot_FadeToBlack +080d2d24 l 00000040 Mugshot_End +080d2d64 l 0000009c VBlankCB_Mugshots +080d2e00 l 00000080 VBlankCB_MugshotsFadeOut +080d2e80 l 00000038 HBlankCB_Mugshots +080d2eb8 l 00000178 Mugshots_CreateTrainerPics +080d3030 l 00000028 SpriteCB_MugshotTrainerPic +080d3058 l 00000004 MugshotTrainerPic_Pause +080d305c l 0000004c MugshotTrainerPic_Init +080d30a8 l 00000032 MugshotTrainerPic_Slide +080d30dc l 0000002c MugshotTrainerPic_SlideSlow +080d3108 l 0000002a MugshotTrainerPic_SlideOffscreen +080d3134 l 00000018 SetTrainerPicSlideDirection +080d314c l 0000001c IncrementTrainerPicState +080d3168 l 00000018 IsTrainerPicSlideDone +080d3180 l 00000038 Task_Slice +080d31b8 l 0000007c Slice_Init +080d3234 l 000000cc Slice_Main +080d3300 l 00000040 Slice_End +080d3340 l 00000094 VBlankCB_Slice +080d33d4 l 0000002c HBlankCB_Slice +080d3400 l 00000038 Task_WhiteBarsFade +080d3438 l 00000078 WhiteBarsFade_Init +080d34b0 l 00000074 WhiteBarsFade_StartBars +080d3524 l 0000003c WhiteBarsFade_WaitBars +080d3560 l 00000068 WhiteBarsFade_BlendToBlack +080d35c8 l 00000040 WhiteBarsFade_End +080d3608 l 0000009c VBlankCB_WhiteBarsFade +080d36a4 l 00000050 VBlankCB_WhiteBarsFade_Blend +080d36f4 l 00000040 HBlankCB_WhiteBarsFade +080d3734 l 000000f8 SpriteCB_WhiteBarFade +080d382c l 00000038 Task_GridSquares +080d3864 l 00000054 GridSquares_Init +080d38b8 l 00000058 GridSquares_Main +080d3910 l 0000002c GridSquares_End +080d393c l 00000038 Task_AngledWipes +080d3974 l 00000064 AngledWipes_Init +080d39d8 l 0000007c AngledWipes_SetWipeData +080d3a54 l 000000dc AngledWipes_DoWipe +080d3b30 l 0000006c AngledWipes_TryEnd +080d3b9c l 0000001c AngledWipes_StartNext +080d3bb8 l 0000009c VBlankCB_AngledWipes +080d3c54 l 00000064 CreateIntroTask +080d3cb8 l 0000001e IsIntroTaskDone +080d3cd8 l 00000038 Task_BattleTransition_Intro +080d3d10 l 0000005c TransitionIntro_FadeToGray +080d3d6c l 00000076 TransitionIntro_FadeFromGray +080d3de4 l 00000024 InitTransitionData +080d3e08 l 00000012 VBlankCB_BattleTransition +080d3e1c l 00000020 GetBg0TilemapDst +080d3e3c l 00000038 GetBg0TilesDst +080d3e74 l 00000012 FadeScreenBlack +080d3e88 l 0000007c SetSinWave +080d3f04 l 00000198 SetCircularMask +080d409c l 0000007a InitBlackWipe +080d4118 l 000000fc UpdateBlackWipe 080d4214 l 00000000 .gcc2_compiled. 080d4214 l 00000002 LinkPartnerDummy 080d4218 g 0000001c SetControllerToLinkPartner @@ -10326,7 +10326,7 @@ 0810c360 g 00000012 FreeAndDestroyTrainerPicSprite 0810c374 g 00000034 LoadTrainerPicInWindow 0810c3a8 g 00000044 CreateTrainerCardTrainerPicSprite -0810c3ec g 00000030 PlayerGenderToFrontTrainerPicId_Debug +0810c3ec g 00000030 PlayerGenderToFrontTrainerPicId 0810c41c g 00000014 VsSeekerFreezeObjectsAfterChargeComplete 0810c41c l 00000000 .gcc2_compiled. 0810c430 l 0000008c Task_ResetObjectsRematchWantedState @@ -10458,7 +10458,7 @@ 0810f7b8 g 00000034 DestroyTopBarWindow 0810f7ec g 00000064 Menu_InitCursorInternal 0810f850 g 00000040 Menu_InitCursor -0810f890 l 0000005c sub_810F818 +0810f890 l 0000005c InitMenuDefaultCursorHeight 0810f8ec l 00000090 Menu_RedrawCursor 0810f97c g 00000044 Menu_MoveCursor 0810f9c0 g 00000044 Menu_MoveCursorNoWrapAround @@ -10471,7 +10471,7 @@ 0810fc60 g 00000098 MultichoiceList_PrintItems 0810fcf8 g 0000004e UnionRoomAndTradeMenuPrintOptions 0810fd48 g 00000112 AddItemMenuActionTextPrinters -0810fe5c l 0000006c sub_810FDE4 +0810fe5c l 0000006c PrintMenuActionTextsAtTopById 0810fec8 g 000000b4 SetWindowTemplateFields 0810ff7c l 0000005a CreateWindowTemplate 0810ffd8 g 00000144 CreateYesNoMenu @@ -10485,10 +10485,10 @@ 081103f4 l 000000d4 MultichoiceGrid_RedrawCursor 081104c8 l 000000c2 MultichoiceGrid_MoveCursor 0811058c l 0000008a MultichoiceGrid_MoveCursorIfValid -08110618 l 000000ae sub_81105A0 +08110618 l 000000ae Menu_ProcessGridInput_NoSoundLimit 081106c8 g 000000a4 Menu_ProcessInputGridLayout -0811076c l 000000aa sub_81106F4 -08110818 l 000000a0 sub_81107A0 +0811076c l 000000aa Menu_ProcessGridInputRepeat_NoSoundLimit +08110818 l 000000a0 Menu_ProcessGridInputRepeat 081108b8 g 0000005c SetQuestLogRecordAndPlaybackPointers 081108b8 l 00000000 .gcc2_compiled. 08110914 g 00000054 ResetQuestLog @@ -26766,10 +26766,10 @@ 0824f078 l 00000005 sText_ShedinjaJpnName 0824f080 g 00000008 gOamData_BattlerOpponent 0824f088 g 00000008 gOamData_BattlerPlayer -0824f090 l 00000008 gUnknown_824F020 -0824f098 l 00000004 gUnknown_824F028 -0824f09c l 00000018 gUnknown_824F02C -0824f0b4 l 00000004 gUnknown_824F044 +0824f090 l 00000008 sAnim_Unused +0824f098 l 00000004 sAnims_Unused +0824f09c l 00000018 sAffineAnim_Unused +0824f0b4 l 00000004 sAffineAnims_Unused 0824f0b8 l 00000008 sPlayerThrowXTranslation 0824f0c0 g 00000150 gTypeEffectiveness 0824f210 g 0000007e gTypeNames @@ -29861,7 +29861,7 @@ 0835b9b4 l 00000018 gCameraSpriteTemplate 0835b9cc g 0000000c gCameraObjectFuncs 0835b9d8 g 00000020 gObjectEventPal_Player -0835b9f8 g 00000020 gUnknown_835B988 +0835b9f8 g 00000020 gObjectEventPal_PlayerUnused 0835ba18 g 00000020 gObjectEventPaletteNull1 0835ba38 g 00000020 gObjectEventPaletteNull2 0835ba58 g 00000020 gObjectEventPaletteNull3 @@ -30052,7 +30052,7 @@ 083980d8 g 00000040 gFieldEffectObjectPic_ShadowMedium 08398118 g 00000080 gFieldEffectObjectPic_ShadowLarge 08398198 g 00000400 gFieldEffectObjectPic_ShadowExtraLarge -08398598 g 00000120 filler_8398188 +08398598 g 00000120 sFiller1 083986b8 g 00000020 gFieldEffectObjectPic_CutGrass 083986d8 g 00000020 gFieldEffectObjectPic_CutGrass2 083986f8 g 00000020 gFieldEffectPal_CutGrass @@ -30061,7 +30061,7 @@ 08398c18 g 00000400 gFieldEffectObjectPic_Arrow 08399018 g 00000020 gFieldEffectObjectPalette0 08399038 g 00000020 gFieldEffectObjectPalette1 -08399058 g 00000020 filler_8398FE8 +08399058 g 00000020 sFiller2 08399078 g 000000c0 gFieldEffectObjectPic_GroundImpactDust 08399138 g 000000c0 gFieldEffectObjectPic_UnusedGrass3 083991f8 g 00000100 gFieldEffectObjectPic_JumpTallGrass @@ -36453,72 +36453,72 @@ 083f84bf l 0000001e sText_UnusedArrows 083f84dd l 00000010 sBgAnim_PaletteControl 083f84ed l 00000320 sBgAnim_PalIndexes -083f8810 l 00000580 sBigPokeballTileset -083f8d90 l 00000040 sSlidingPokeballTilemap -083f8dd0 l 00000200 sSpriteImage_SlidingPokeball -083f8fd0 l 000001e0 sVsBarTileset -083f91b0 l 00000800 sSpriteImage_UnusedBrendan -083f99b0 l 00000800 sSpriteImage_UnusedLass -083fa1b0 l 000001e0 sGridSquareTileset -083fa390 l 00000048 sBT_Phase1Tasks -083fa3d8 l 00000048 sBT_Phase2Tasks -083fa420 l 00000010 sBT_MainPhases -083fa430 l 0000000c sBT_Phase2BlurFuncs -083fa43c l 00000008 sBT_Phase2DistortedWaveFuncs -083fa444 l 00000008 sBT_Phase2HorizontalCorrugateFuncs -083fa44c l 00000018 sBT_Phase2BigPokeballFuncs -083fa464 l 0000000c sBT_Phase2SlidingPokeballsFuncs -083fa470 l 00000004 gUnknown_83FA400 -083fa474 l 0000000a gUnknown_83FA404 -083fa47e l 00000004 gUnknown_83FA40E -083fa484 l 0000001c sBT_Phase2ClockwiseBlackFadeFuncs -083fa4a0 l 00000008 sBT_Phase2FullScreenWaveFuncs -083fa4a8 l 0000000c sBT_Phase2BlackWaveToRightFuncs -083fa4b4 l 00000020 gUnknown_83FA444 -083fa4d4 l 00000008 sBT_Phase2AntiClockwiseSpiralFuncs -083fa4dc l 00000028 sBT_Phase2MugshotFuncs +083f8810 l 00000580 sBigPokeball_Gfx +083f8d90 l 00000040 sSlidingPokeball_Tilemap +083f8dd0 l 00000200 sSlidingPokeball_Gfx +083f8fd0 l 000001e0 sMugshotBanner_Gfx +083f91b0 l 00000800 sUnusedBrendan_Gfx +083f99b0 l 00000800 sUnusedLass_Gfx +083fa1b0 l 000001e0 sGridSquare_Gfx +083fa390 l 00000048 sTasks_Intro +083fa3d8 l 00000048 sTasks_Main +083fa420 l 00000010 sTaskHandlers +083fa430 l 0000000c sBlur_Funcs +083fa43c l 00000008 sSwirl_Funcs +083fa444 l 00000008 sShuffle_Funcs +083fa44c l 00000018 sBigPokeball_Funcs +083fa464 l 0000000c sPokeballsTrail_Funcs +083fa470 l 00000004 sPokeballsTrail_StartXCoords +083fa474 l 0000000a sPokeballsTrail_Delays +083fa47e l 00000004 sPokeballsTrail_Speeds +083fa484 l 0000001c sClockwiseWipe_Funcs +083fa4a0 l 00000008 sRipple_Funcs +083fa4a8 l 0000000c sWave_Funcs +083fa4b4 l 00000020 sSpiral_AngleData +083fa4d4 l 00000008 sSpiral_Funcs +083fa4dc l 00000028 sMugshot_Funcs 083fa504 l 00000005 sMugshotsTrainerPicIDsTable 083fa50a l 00000014 sMugshotsOpponentRotationScales 083fa51e l 00000014 sMugshotsOpponentCoords -083fa534 l 0000001c sBT_Phase2MugshotSpriteFuncs -083fa550 l 00000004 sMugShotSlideVelocity -083fa554 l 00000004 sMugShotSlideDeceleration -083fa558 l 0000000c sBT_Phase2SlicedScreenFuncs -083fa564 l 00000014 sBT_Phase2WhiteFadeInStripesFuncs -083fa578 l 0000000c sWhiteStripeDelay -083fa584 l 0000000c sBT_Phase2GridSquaresFuncs -083fa590 l 00000014 sBT_Phase2BlackDoodlesFuncs -083fa5a4 l 00000046 sBlackDoodlesSegments -083fa5ea l 0000000e sBlackDoodlesDelay -083fa5f8 l 00000008 sBT_Phase1FadeFuncs -083fa600 l 00000008 sSpriteImageTable_SlidingPokeball -083fa608 l 00000008 sSpriteAnim_SlidingPokeball -083fa610 l 00000004 sSpriteAnimTable_SlidingPokeball -083fa614 l 00000010 sSpriteAffineAnim_SlidingPokeball1 -083fa624 l 00000010 sSpriteAffineAnim_SlidingPokeball2 -083fa634 l 00000008 sSpriteAffineAnimTable_SlidingPokeball -083fa63c l 00000018 sSpriteTemplate_SlidingPokeball -083fa654 l 00000008 sOamData_Unused -083fa65c l 00000008 sSpriteImageTable_UnusedBrendan -083fa664 l 00000008 sSpriteImageTable_UnusedLass -083fa66c l 00000008 sSpriteAnim_Unused -083fa674 l 00000004 sSpriteAnimTable_Unused -083fa678 l 00000030 sSpriteTemplateTable_Unused -083fa6a8 l 00000020 sSlidingPokeballBigPokeballPalette -083fa6c8 g 00000008 sSpritePalette_SlidingPokeball -083fa6d0 l 00000020 sVsBarLoreleiPalette -083fa6f0 l 00000020 sVsBarBrunoPalette -083fa710 l 00000020 sVsBarAgathaPalette -083fa730 l 00000020 sVsBarLancePalette -083fa750 l 00000020 sVsBarBluePalette -083fa770 l 00000020 sVsBarMalePlayerPalette -083fa790 l 00000020 sVsBarFemalePlayerPalette -083fa7b0 l 00000014 sVsBarOpponentPalettes -083fa7c4 l 00000008 sVsBarPlayerPalettes +083fa534 l 0000001c sMugshotTrainerPicFuncs +083fa550 l 00000004 sTrainerPicSlideSpeeds +083fa554 l 00000004 sTrainerPicSlideAccels +083fa558 l 0000000c sSlice_Funcs +083fa564 l 00000014 sWhiteBarsFade_Funcs +083fa578 l 0000000c sWhiteBarsFade_StartDelays +083fa584 l 0000000c sGridSquares_Funcs +083fa590 l 00000014 sAngledWipes_Funcs +083fa5a4 l 00000046 sAngledWipes_MoveData +083fa5ea l 0000000e sAngledWipes_EndDelays +083fa5f8 l 00000008 sTransitionIntroFuncs +083fa600 l 00000008 sSpriteImage_Pokeball +083fa608 l 00000008 sSpriteAnim_Pokeball +083fa610 l 00000004 sSpriteAnimTable_Pokeball +083fa614 l 00000010 sSpriteAffineAnim_Pokeball1 +083fa624 l 00000010 sSpriteAffineAnim_Pokeball2 +083fa634 l 00000008 sSpriteAffineAnimTable_Pokeball +083fa63c l 00000018 sSpriteTemplate_Pokeball +083fa654 l 00000008 sOam_UnusedBrendanLass +083fa65c l 00000008 sImageTable_UnusedBrendan +083fa664 l 00000008 sImageTable_UnusedLass +083fa66c l 00000008 sSpriteAnim_UnusedBrendanLass +083fa674 l 00000004 sSpriteAnimTable_UnusedBrendanLass +083fa678 l 00000030 sSpriteTemplate_UnusedBrendanLass +083fa6a8 l 00000020 sFieldEffectPal_Pokeball +083fa6c8 g 00000008 gSpritePalette_Pokeball +083fa6d0 l 00000020 sMugshotPal_Lorelei +083fa6f0 l 00000020 sMugshotPal_Bruno +083fa710 l 00000020 sMugshotPal_Agatha +083fa730 l 00000020 sMugshotPal_Lance +083fa750 l 00000020 sMugshotPal_Blue +083fa770 l 00000020 sMugshotPal_Red +083fa790 l 00000020 sMugshotPal_Green +083fa7b0 l 00000014 sOpponentMugshotsPals +083fa7c4 l 00000008 sPlayerMugshotsPals 083fa7cc l 00000020 sUnusedTrainerPalette 083fa7ec l 00000008 sSpritePalette_UnusedTrainer -083fa7f4 l 000004b0 sBigPokeballTilemap -083faca4 l 00000500 sVsBarTilemap +083fa7f4 l 000004b0 sBigPokeball_Tilemap +083faca4 l 00000500 sMugshotsTilemap 083fb1a4 l 000000e4 sLinkPartnerBufferCommands 083fb288 l 00000001 sText_Empty1 083fb289 l 00000003 sText_Trainer1LoseText @@ -40476,7 +40476,7 @@ 08455700 g 0000002b DecorDesc_REGICE_DOLL 0845572b g 0000002b DecorDesc_REGISTEEL_DOLL 08455758 g 00000f20 gDecorations -08456678 l 00000003 gUnknown_8456618 +08456678 l 00000003 sTopBarWindowTextColors 0845667c l 00000018 sQuestLogHeaderWindowTemplates 08456694 l 00000003 sTextColors 08456698 l 00000060 sUnknown_8456638 @@ -42051,7 +42051,7 @@ 0847ac02 g 00000008 gText_UnionRoomChatKeyboard_Emoji10 0847ac0c l 000003e0 sTrainerTowerFloor_Single_4 0847afec l 000003e0 sTrainerTowerFloor_Single_7 -0847b3cc l 000003e0 gUnknown_847B36C +0847b3cc l 000003e0 sTrainerTowerFloor_Single_Unused 0847b7ac l 000003e0 sTrainerTowerFloor_Double_5 0847bb8c l 000003e0 sTrainerTowerFloor_Double_6 0847bf6c l 000003e0 sTrainerTowerFloor_Double_2 @@ -42070,15 +42070,15 @@ 0847f1cc l 000003e0 sTrainerTowerFloor_Single_1 0847f5ac l 000003e0 sTrainerTowerFloor_Mixed_5 0847f98c l 000003e0 sTrainerTowerFloor_Double_8 -0847fd6c l 000003e0 gUnknown_847FD0C +0847fd6c l 000003e0 sTrainerTowerFloor_Double_Unused1 0848014c l 000003e0 sTrainerTowerFloor_Knockout_7 0848052c l 000003e0 sTrainerTowerFloor_Knockout_4 0848090c l 000003e0 sTrainerTowerFloor_Single_3 08480cec l 000003e0 sTrainerTowerFloor_Mixed_3 084810cc l 000003e0 sTrainerTowerFloor_Mixed_2 -084814ac l 000003e0 gUnknown_848144C +084814ac l 000003e0 sTrainerTowerFloor_Double_Unused2 0848188c l 000003e0 sTrainerTowerFloor_Double_7 -08481c6c l 000003e0 gUnknown_8481C0C +08481c6c l 000003e0 sTrainerTowerFloor_Double_Unused3 0848204c l 000003e0 sTrainerTowerFloor_Knockout_6 0848242c l 000003e0 sTrainerTowerFloor_Knockout_5 0848280c g 00000008 gTrainerTowerLocalHeader diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 4edcb084c..e48de273e 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -377,7 +377,7 @@ 02039a20 l 00000004 sEvoStructPtr 02039a24 l 00000004 sBgAnimPal 02039a28 l 00000001 sCoinsWindowId -02039a2c l 00000004 sTransitionStructPtr +02039a2c l 00000004 sTransitionData 02039a30 l 00000004 sBattlerAbilities 02039a34 l 00000004 sBattleMsgDataPtr 02039a38 g 00001000 gSaveDataBuffer @@ -1064,7 +1064,7 @@ 08002f8c g 0000003e DecompressGlyphTile 08002fcc g 00000046 GetLastTextColor 08003014 g 00000600 CopyGlyphToWindow -08003614 g 00000508 sub_8003614 +08003614 l 00000508 CopyGlyphToWindow_Parameterized 08003b1c g 00000002 ClearTextSpan 08003b20 l 00000000 .gcc2_compiled. 08003b20 l 00000002 nullsub_8 @@ -3912,7 +3912,7 @@ 08063470 l 00000010 GetMoveDirectionFastestAnimNum 08063480 g 00000010 GetJumpSpecialDirectionAnimNum 08063490 g 00000010 GetAcroWheelieDirectionAnimNum -080634a0 g 00000010 Unref_GetAnimNums_080634A0 +080634a0 g 00000010 GetAcroBunnyHopFrontWheelDirectionAnimNum 080634b0 g 00000010 GetAcroEndWheelieDirectionAnimNum 080634c0 g 00000010 GetSpinDirectionAnimNum 080634d0 g 00000010 GetAcroUnusedActionDirectionAnimNum @@ -8427,141 +8427,141 @@ 080d0814 l 00000020 FieldCB_UseStrength 080d0834 g 00000048 FldEff_UseStrength 080d087c l 00000010 ShowMonCB_UseStrength -080d088c g 00000030 BT_StartOnField +080d088c g 00000030 BattleTransition_StartOnField 080d088c l 00000000 .gcc2_compiled. -080d08bc l 0000000e BT_StartWithoutAlloc -080d08cc g 00000050 BT_IsDone -080d091c l 00000030 BT_LaunchTask -080d094c l 00000038 BT_TaskMain -080d0984 l 00000050 BT_Phase1Blink -080d09d4 l 00000032 BT_WaitForPhase1 -080d0a08 l 00000028 BT_Phase2LaunchAnimTask -080d0a30 l 00000030 BT_WaitForPhase2 -080d0a60 l 00000050 BT_Phase1Task -080d0ab0 l 00000038 BT_Phase2Blur -080d0ae8 l 00000032 BT_Phase2Blur_InitBgMosaic -080d0b1c l 00000060 BT_Phase2Blur_Anim -080d0b7c l 0000002c BT_Phase2Blur_IsDone -080d0ba8 l 00000038 BT_Phase2DistortedWave -080d0be0 l 0000006c BT_Phase2DistortedWave_InitWave -080d0c4c l 00000078 BT_Phase2DistortedWave_UpdateWave -080d0cc4 l 00000038 VBCB_BT_Phase2DistortedWave -080d0cfc l 0000002c HBCB_BT_Phase2DistortedWave -080d0d28 l 00000038 BT_Phase2HorizontalCorrugate -080d0d60 l 00000064 BT_Phase2HorizontalCorrugate_Init -080d0dc4 l 00000090 BT_Phase2HorizontalCorrugate_UpdateWave -080d0e54 l 00000038 VBCB_BT_Phase2HorizontalCorrugate -080d0e8c l 0000002c HBCB_BT_Phase2HorizontalCorrugate -080d0eb8 l 00000038 BT_Phase2BigPokeball -080d0ef0 l 000000b8 BT_Phase2BigPokeball_Init -080d0fa8 l 00000090 BT_Phase2BigPokeball_LoadTilemapAndWave -080d1038 l 00000094 BT_Phase2BigPokeball_UpdateWave1IncEva -080d10cc l 000000a4 BT_Phase2BigPokeball_UpdateWave2DecEvb -080d1170 l 00000084 BT_Phase2BigPokeball_UpdateWave3 -080d11f4 l 000000c4 BT_Phase2BigPokeball_CircleEffect -080d12b8 l 0000008c BT_VBStopDma0SyncSrcBufferSetLcdRegs -080d1344 l 0000002c VBCB_BT_Phase2BigPokeball1 -080d1370 l 0000002c VBCB_BT_Phase2BigPokeball2 -080d139c l 00000038 BT_Phase2SlidingPokeballs -080d13d4 l 0000004c BT_Phase2SlidingPokeballs_LoadBgGfx -080d1420 l 0000008c BT_Phase2SlidingPokeballs_SetupFldeffArgs -080d14ac l 0000002c BT_Phase2SlidingPokeballs_IsDone -080d14d8 g 0000006c FldEff_Pokeball -080d1544 l 000000c8 SpriteCB_BT_Phase2SlidingPokeballs -080d160c l 00000038 BT_Phase2ClockwiseBlackFade -080d1644 l 00000068 BT_Phase2ClockwiseBlackFade_Init -080d16ac l 00000090 BT_Phase2ClockwiseBlackFade_Step1 -080d173c l 000000f4 BT_Phase2ClockwiseBlackFade_Step2 -080d1830 l 00000088 BT_Phase2ClockwiseBlackFade_Step3 -080d18b8 l 00000100 BT_Phase2ClockwiseBlackFade_Step4 -080d19b8 l 00000098 BT_Phase2ClockwiseBlackFade_Step5 -080d1a50 l 00000040 BT_Phase2ClockwiseBlackFade_End -080d1a90 l 0000009c VBCB_BT_Phase2ClockwiseBlackFade -080d1b2c l 00000038 BT_Phase2FullScreenWave -080d1b64 l 00000058 BT_Phase2FullScreenWave_Init -080d1bbc l 000000e0 BT_Phase2FullScreenWave_UpdateWave -080d1c9c l 00000038 VBCB_BT_Phase2FullScreenWave -080d1cd4 l 0000002c HBCB_BT_Phase2FullScreenWave -080d1d00 l 00000038 BT_Phase2BlackWaveToRight -080d1d38 l 00000058 BT_Phase2BlackWaveToRight_Init -080d1d90 l 0000009c BT_Phase2BlackWaveToRight_UpdateWave -080d1e2c l 00000040 BT_Phase2BlackWaveToRight_End -080d1e6c l 00000094 VBCB_BT_Phase2BlackWaveToRight -080d1f00 l 00000038 BT_Phase2AntiClockwiseSpiral -080d1f38 l 000005d8 BT_AntiClockwiseSpiral_DoUpdateFrame -080d2510 l 00000088 BT_Phase2AntiClockwiseSpiral_Init -080d2598 l 000000d4 BT_Phase2AntiClockwiseSpiral_Update -080d266c l 000000d0 VBCB_BT_Phase2AntiClockwiseBlackFade -080d273c l 00000020 BT_Phase2StartLoreleiMugshot -080d275c l 00000020 BT_Phase2StartBrunoMugshot -080d277c l 00000020 BT_Phase2StartAgathaMugshot -080d279c l 00000020 BT_Phase2StartLanceMugshot -080d27bc l 00000020 BT_Phase2StartBlueMugshot -080d27dc l 00000038 BT_Phase2Mugshot -080d2814 l 00000068 BT_Phase2Mugshot_Init -080d287c l 000000c0 BT_Phase2Mugshot_LoadGfx -080d293c l 000000ec BT_Phase2Mugshot_VsBarsSlideIn -080d2a28 l 0000007c BT_Phase2Mugshot_StartSpriteSlide -080d2aa4 l 0000003c BT_Phase2Mugshot_WaitForOpponentInPlace -080d2ae0 l 000000b8 BT_Phase2Mugshot_WaitForPlayerInPlace -080d2b98 l 000000c8 BT_Phase2Mugshot_ExpandWhiteBand -080d2c60 l 00000038 BT_Phase2Mugshot_StartBlackFade -080d2c98 l 0000004c BT_Phase2Mugshot_WaitForBlackFade -080d2ce4 l 00000040 BT_Phase2Mugshot_End -080d2d24 l 0000009c VBCB_BT_Phase2Mugshot1_Slide -080d2dc0 l 00000080 VBCB_BT_Phase2Mugshot2_WhiteFade -080d2e40 l 00000038 HBCB_BT_Phase2Mugshot -080d2e78 l 00000178 BT_Phase2Mugshots_CreateSprites -080d2ff0 l 00000028 SpriteCB_BT_Phase2Mugshots -080d3018 l 00000004 BT_Phase2MugshotsSpriteFuncs_Wait -080d301c l 0000004c BT_Phase2MugshotsSpriteFuncs_InitParams -080d3068 l 00000032 BT_Phase2MugshotsSpriteFuncs_SlideSpriteIn -080d309c l 0000002c BT_Phase2MugshotsSpriteFuncs_DecelerateSprite -080d30c8 l 0000002a BT_Phase2MugshotsSpriteFuncs_DecelerateSprite2 -080d30f4 l 00000018 BT_SetSpriteAsOpponentOrPlayer -080d310c l 0000001c BT_StartSpriteSlide -080d3128 l 00000018 BT_IsSpriteSlideFinished -080d3140 l 00000038 BT_Phase2SlicedScreen -080d3178 l 0000007c BT_Phase2SlicedScreen_Init -080d31f4 l 000000cc BT_Phase2SlicedScreen_UpdateOffsets -080d32c0 l 00000040 BT_Phase2SlicedScreen_End -080d3300 l 00000094 VBCB_BT_Phase2SlicedScreen -080d3394 l 0000002c HBCB_BT_Phase2SlicedScreen -080d33c0 l 00000038 BT_Phase2WhiteFadeInStripes -080d33f8 l 00000078 BT_Phase2WhiteFadeInStripes_Init -080d3470 l 00000074 BT_Phase2WhiteFadeInStripes_SetupSprites -080d34e4 l 0000003c BT_Phase2WhiteFadeInStripes_IsWhiteFadeDone -080d3520 l 00000068 BT_Phase2WhiteFadeInStripes_Stop -080d3588 l 00000040 BT_Phase2WhiteFadeInStripes_IsDone -080d35c8 l 0000009c VBCB_BT_Phase2WhiteFadeInStripes1 -080d3664 l 00000050 VBCB_BT_Phase2WhiteFadeInStripes2 -080d36b4 l 00000040 HBCB_BT_Phase2WhiteFadeInStripes -080d36f4 l 000000f8 SpriteCB_BT_Phase2WhiteFadeInStripes -080d37ec l 00000038 BT_Phase2GridSquares -080d3824 l 00000054 BT_Phase2GridSquares_LoadGfx -080d3878 l 00000058 BT_Phase2GridSquares_UpdateTileset -080d38d0 l 0000002c BT_Phase2GridSquares_IsDone -080d38fc l 00000038 BT_Phase2BlackDoodles -080d3934 l 00000064 BT_Phase2BlackDoodles_Init -080d3998 l 0000007c BT_Phase2BlackDoodles_InitSingleBrush -080d3a14 l 000000dc BT_Phase2BlackDoodles_DrawSingleBrush -080d3af0 l 0000006c BT_Phase2BlackDoodles_IsDone -080d3b5c l 0000001c BT_Phase2BlackDoodles_NextBrush -080d3b78 l 0000009c VBCB_BT_Phase2BlackDoodles -080d3c14 l 00000064 BT_CreatePhase1SubTask -080d3c78 l 0000001e BT_IsPhase1Done -080d3c98 l 00000038 BT_Phase1SubTask -080d3cd0 l 0000005c BT_Phase1_FadeOut -080d3d2c l 00000076 BT_Phase1_FadeIn -080d3da4 l 00000024 BT_InitCtrlBlk -080d3dc8 l 00000012 BT_VBSyncOamAndPltt -080d3ddc l 00000020 BT_GetBg0TilesetBase -080d3dfc l 00000038 BT_GetBg0TilemapAndTilesetBase -080d3e34 l 00000012 BT_BlendPalettesToBlack -080d3e48 l 0000007c BT_LoadWaveIntoBuffer -080d3ec4 l 00000198 BT_GenerateCircle -080d405c l 0000007a BT_DiagonalSegment_InitParams -080d40d8 l 000000fc BT_DiagonalSegment_ComputePointOnSegment +080d08bc l 0000000e BattleTransition_Start +080d08cc g 00000050 IsBattleTransitionDone +080d091c l 00000030 LaunchBattleTransitionTask +080d094c l 00000038 Task_BattleTransition +080d0984 l 00000050 Transition_StartIntro +080d09d4 l 00000032 Transition_WaitForIntro +080d0a08 l 00000028 Transition_StartMain +080d0a30 l 00000030 Transition_WaitForMain +080d0a60 l 00000050 Task_Intro +080d0ab0 l 00000038 Task_Blur +080d0ae8 l 00000032 Blur_Init +080d0b1c l 00000060 Blur_Main +080d0b7c l 0000002c Blur_End +080d0ba8 l 00000038 Task_Swirl +080d0be0 l 0000006c Swirl_Init +080d0c4c l 00000078 Swirl_End +080d0cc4 l 00000038 VBlankCB_Swirl +080d0cfc l 0000002c HBlankCB_Swirl +080d0d28 l 00000038 Task_Shuffle +080d0d60 l 00000064 Shuffle_Init +080d0dc4 l 00000090 Shuffle_End +080d0e54 l 00000038 VBlankCB_Shuffle +080d0e8c l 0000002c HBlankCB_Shuffle +080d0eb8 l 00000038 Task_BigPokeball +080d0ef0 l 000000b8 BigPokeball_Init +080d0fa8 l 00000090 BigPokeball_SetGfx +080d1038 l 00000094 PatternWeave_Blend1 +080d10cc l 000000a4 PatternWeave_Blend2 +080d1170 l 00000084 PatternWeave_FinishAppear +080d11f4 l 000000c4 PatternWeave_CircularMask +080d12b8 l 0000008c VBlankCB_SetWinAndBlend +080d1344 l 0000002c VBlankCB_PatternWeave +080d1370 l 0000002c VBlankCB_CircularMask +080d139c l 00000038 Task_PokeballsTrail +080d13d4 l 0000004c PokeballsTrail_Init +080d1420 l 0000008c PokeballsTrail_Main +080d14ac l 0000002c PokeballsTrail_End +080d14d8 g 0000006c FldEff_PokeballTrail +080d1544 l 000000c8 SpriteCB_FldEffPokeballTrail +080d160c l 00000038 Task_ClockwiseWipe +080d1644 l 00000068 ClockwiseWipe_Init +080d16ac l 00000090 ClockwiseWipe_TopRight +080d173c l 000000f4 ClockwiseWipe_Right +080d1830 l 00000088 ClockwiseWipe_Bottom +080d18b8 l 00000100 ClockwiseWipe_Left +080d19b8 l 00000098 ClockwiseWipe_TopLeft +080d1a50 l 00000040 ClockwiseWipe_End +080d1a90 l 0000009c VBlankCB_ClockwiseWipe +080d1b2c l 00000038 Task_Ripple +080d1b64 l 00000058 Ripple_Init +080d1bbc l 000000e0 Ripple_Main +080d1c9c l 00000038 VBlankCB_Ripple +080d1cd4 l 0000002c HBlankCB_Ripple +080d1d00 l 00000038 Task_Wave +080d1d38 l 00000058 Wave_Init +080d1d90 l 0000009c Wave_Main +080d1e2c l 00000040 Wave_End +080d1e6c l 00000094 VBlankCB_Wave +080d1f00 l 00000038 Task_Spiral +080d1f38 l 000005d8 Spiral_UpdateFrame +080d2510 l 00000088 Spiral_Init +080d2598 l 000000d4 Spiral_End +080d266c l 000000d0 VBlankCB_Spiral +080d273c l 00000020 Task_Lorelei +080d275c l 00000020 Task_Bruno +080d277c l 00000020 Task_Agatha +080d279c l 00000020 Task_Lance +080d27bc l 00000020 Task_Blue +080d27dc l 00000038 DoMugshotTransition +080d2814 l 00000068 Mugshot_Init +080d287c l 000000c0 Mugshot_SetGfx +080d293c l 000000ec Mugshot_ShowBanner +080d2a28 l 0000007c Mugshot_StartOpponentSlide +080d2aa4 l 0000003c Mugshot_WaitStartPlayerSlide +080d2ae0 l 000000b8 Mugshot_WaitPlayerSlide +080d2b98 l 000000c8 Mugshot_GradualWhiteFade +080d2c60 l 00000038 Mugshot_InitFadeWhiteToBlack +080d2c98 l 0000004c Mugshot_FadeToBlack +080d2ce4 l 00000040 Mugshot_End +080d2d24 l 0000009c VBlankCB_Mugshots +080d2dc0 l 00000080 VBlankCB_MugshotsFadeOut +080d2e40 l 00000038 HBlankCB_Mugshots +080d2e78 l 00000178 Mugshots_CreateTrainerPics +080d2ff0 l 00000028 SpriteCB_MugshotTrainerPic +080d3018 l 00000004 MugshotTrainerPic_Pause +080d301c l 0000004c MugshotTrainerPic_Init +080d3068 l 00000032 MugshotTrainerPic_Slide +080d309c l 0000002c MugshotTrainerPic_SlideSlow +080d30c8 l 0000002a MugshotTrainerPic_SlideOffscreen +080d30f4 l 00000018 SetTrainerPicSlideDirection +080d310c l 0000001c IncrementTrainerPicState +080d3128 l 00000018 IsTrainerPicSlideDone +080d3140 l 00000038 Task_Slice +080d3178 l 0000007c Slice_Init +080d31f4 l 000000cc Slice_Main +080d32c0 l 00000040 Slice_End +080d3300 l 00000094 VBlankCB_Slice +080d3394 l 0000002c HBlankCB_Slice +080d33c0 l 00000038 Task_WhiteBarsFade +080d33f8 l 00000078 WhiteBarsFade_Init +080d3470 l 00000074 WhiteBarsFade_StartBars +080d34e4 l 0000003c WhiteBarsFade_WaitBars +080d3520 l 00000068 WhiteBarsFade_BlendToBlack +080d3588 l 00000040 WhiteBarsFade_End +080d35c8 l 0000009c VBlankCB_WhiteBarsFade +080d3664 l 00000050 VBlankCB_WhiteBarsFade_Blend +080d36b4 l 00000040 HBlankCB_WhiteBarsFade +080d36f4 l 000000f8 SpriteCB_WhiteBarFade +080d37ec l 00000038 Task_GridSquares +080d3824 l 00000054 GridSquares_Init +080d3878 l 00000058 GridSquares_Main +080d38d0 l 0000002c GridSquares_End +080d38fc l 00000038 Task_AngledWipes +080d3934 l 00000064 AngledWipes_Init +080d3998 l 0000007c AngledWipes_SetWipeData +080d3a14 l 000000dc AngledWipes_DoWipe +080d3af0 l 0000006c AngledWipes_TryEnd +080d3b5c l 0000001c AngledWipes_StartNext +080d3b78 l 0000009c VBlankCB_AngledWipes +080d3c14 l 00000064 CreateIntroTask +080d3c78 l 0000001e IsIntroTaskDone +080d3c98 l 00000038 Task_BattleTransition_Intro +080d3cd0 l 0000005c TransitionIntro_FadeToGray +080d3d2c l 00000076 TransitionIntro_FadeFromGray +080d3da4 l 00000024 InitTransitionData +080d3dc8 l 00000012 VBlankCB_BattleTransition +080d3ddc l 00000020 GetBg0TilemapDst +080d3dfc l 00000038 GetBg0TilesDst +080d3e34 l 00000012 FadeScreenBlack +080d3e48 l 0000007c SetSinWave +080d3ec4 l 00000198 SetCircularMask +080d405c l 0000007a InitBlackWipe +080d40d8 l 000000fc UpdateBlackWipe 080d41d4 l 00000000 .gcc2_compiled. 080d41d4 l 00000002 LinkPartnerDummy 080d41d8 g 0000001c SetControllerToLinkPartner @@ -10327,7 +10327,7 @@ 0810c2c0 g 00000012 FreeAndDestroyTrainerPicSprite 0810c2d4 g 00000034 LoadTrainerPicInWindow 0810c308 g 00000044 CreateTrainerCardTrainerPicSprite -0810c34c g 00000030 PlayerGenderToFrontTrainerPicId_Debug +0810c34c g 00000030 PlayerGenderToFrontTrainerPicId 0810c37c g 00000014 VsSeekerFreezeObjectsAfterChargeComplete 0810c37c l 00000000 .gcc2_compiled. 0810c390 l 0000008c Task_ResetObjectsRematchWantedState @@ -10459,7 +10459,7 @@ 0810f718 g 00000034 DestroyTopBarWindow 0810f74c g 00000064 Menu_InitCursorInternal 0810f7b0 g 00000040 Menu_InitCursor -0810f7f0 l 0000005c sub_810F818 +0810f7f0 l 0000005c InitMenuDefaultCursorHeight 0810f84c l 00000090 Menu_RedrawCursor 0810f8dc g 00000044 Menu_MoveCursor 0810f920 g 00000044 Menu_MoveCursorNoWrapAround @@ -10472,7 +10472,7 @@ 0810fbc0 g 00000098 MultichoiceList_PrintItems 0810fc58 g 0000004e UnionRoomAndTradeMenuPrintOptions 0810fca8 g 00000112 AddItemMenuActionTextPrinters -0810fdbc l 0000006c sub_810FDE4 +0810fdbc l 0000006c PrintMenuActionTextsAtTopById 0810fe28 g 000000b4 SetWindowTemplateFields 0810fedc l 0000005a CreateWindowTemplate 0810ff38 g 00000144 CreateYesNoMenu @@ -10486,10 +10486,10 @@ 08110354 l 000000d4 MultichoiceGrid_RedrawCursor 08110428 l 000000c2 MultichoiceGrid_MoveCursor 081104ec l 0000008a MultichoiceGrid_MoveCursorIfValid -08110578 l 000000ae sub_81105A0 +08110578 l 000000ae Menu_ProcessGridInput_NoSoundLimit 08110628 g 000000a4 Menu_ProcessInputGridLayout -081106cc l 000000aa sub_81106F4 -08110778 l 000000a0 sub_81107A0 +081106cc l 000000aa Menu_ProcessGridInputRepeat_NoSoundLimit +08110778 l 000000a0 Menu_ProcessGridInputRepeat 08110818 g 0000005c SetQuestLogRecordAndPlaybackPointers 08110818 l 00000000 .gcc2_compiled. 08110874 g 00000054 ResetQuestLog @@ -26767,10 +26767,10 @@ 0824efe4 l 00000005 sText_ShedinjaJpnName 0824efec g 00000008 gOamData_BattlerOpponent 0824eff4 g 00000008 gOamData_BattlerPlayer -0824effc l 00000008 gUnknown_824F020 -0824f004 l 00000004 gUnknown_824F028 -0824f008 l 00000018 gUnknown_824F02C -0824f020 l 00000004 gUnknown_824F044 +0824effc l 00000008 sAnim_Unused +0824f004 l 00000004 sAnims_Unused +0824f008 l 00000018 sAffineAnim_Unused +0824f020 l 00000004 sAffineAnims_Unused 0824f024 l 00000008 sPlayerThrowXTranslation 0824f02c g 00000150 gTypeEffectiveness 0824f17c g 0000007e gTypeNames @@ -29862,7 +29862,7 @@ 0835b924 l 00000018 gCameraSpriteTemplate 0835b93c g 0000000c gCameraObjectFuncs 0835b948 g 00000020 gObjectEventPal_Player -0835b968 g 00000020 gUnknown_835B988 +0835b968 g 00000020 gObjectEventPal_PlayerUnused 0835b988 g 00000020 gObjectEventPaletteNull1 0835b9a8 g 00000020 gObjectEventPaletteNull2 0835b9c8 g 00000020 gObjectEventPaletteNull3 @@ -30053,7 +30053,7 @@ 08398048 g 00000040 gFieldEffectObjectPic_ShadowMedium 08398088 g 00000080 gFieldEffectObjectPic_ShadowLarge 08398108 g 00000400 gFieldEffectObjectPic_ShadowExtraLarge -08398508 g 00000120 filler_8398188 +08398508 g 00000120 sFiller1 08398628 g 00000020 gFieldEffectObjectPic_CutGrass 08398648 g 00000020 gFieldEffectObjectPic_CutGrass2 08398668 g 00000020 gFieldEffectPal_CutGrass @@ -30062,7 +30062,7 @@ 08398b88 g 00000400 gFieldEffectObjectPic_Arrow 08398f88 g 00000020 gFieldEffectObjectPalette0 08398fa8 g 00000020 gFieldEffectObjectPalette1 -08398fc8 g 00000020 filler_8398FE8 +08398fc8 g 00000020 sFiller2 08398fe8 g 000000c0 gFieldEffectObjectPic_GroundImpactDust 083990a8 g 000000c0 gFieldEffectObjectPic_UnusedGrass3 08399168 g 00000100 gFieldEffectObjectPic_JumpTallGrass @@ -36454,72 +36454,72 @@ 083f828b l 0000001e sText_UnusedArrows 083f82a9 l 00000010 sBgAnim_PaletteControl 083f82b9 l 00000320 sBgAnim_PalIndexes -083f85dc l 00000580 sBigPokeballTileset -083f8b5c l 00000040 sSlidingPokeballTilemap -083f8b9c l 00000200 sSpriteImage_SlidingPokeball -083f8d9c l 000001e0 sVsBarTileset -083f8f7c l 00000800 sSpriteImage_UnusedBrendan -083f977c l 00000800 sSpriteImage_UnusedLass -083f9f7c l 000001e0 sGridSquareTileset -083fa15c l 00000048 sBT_Phase1Tasks -083fa1a4 l 00000048 sBT_Phase2Tasks -083fa1ec l 00000010 sBT_MainPhases -083fa1fc l 0000000c sBT_Phase2BlurFuncs -083fa208 l 00000008 sBT_Phase2DistortedWaveFuncs -083fa210 l 00000008 sBT_Phase2HorizontalCorrugateFuncs -083fa218 l 00000018 sBT_Phase2BigPokeballFuncs -083fa230 l 0000000c sBT_Phase2SlidingPokeballsFuncs -083fa23c l 00000004 gUnknown_83FA400 -083fa240 l 0000000a gUnknown_83FA404 -083fa24a l 00000004 gUnknown_83FA40E -083fa250 l 0000001c sBT_Phase2ClockwiseBlackFadeFuncs -083fa26c l 00000008 sBT_Phase2FullScreenWaveFuncs -083fa274 l 0000000c sBT_Phase2BlackWaveToRightFuncs -083fa280 l 00000020 gUnknown_83FA444 -083fa2a0 l 00000008 sBT_Phase2AntiClockwiseSpiralFuncs -083fa2a8 l 00000028 sBT_Phase2MugshotFuncs +083f85dc l 00000580 sBigPokeball_Gfx +083f8b5c l 00000040 sSlidingPokeball_Tilemap +083f8b9c l 00000200 sSlidingPokeball_Gfx +083f8d9c l 000001e0 sMugshotBanner_Gfx +083f8f7c l 00000800 sUnusedBrendan_Gfx +083f977c l 00000800 sUnusedLass_Gfx +083f9f7c l 000001e0 sGridSquare_Gfx +083fa15c l 00000048 sTasks_Intro +083fa1a4 l 00000048 sTasks_Main +083fa1ec l 00000010 sTaskHandlers +083fa1fc l 0000000c sBlur_Funcs +083fa208 l 00000008 sSwirl_Funcs +083fa210 l 00000008 sShuffle_Funcs +083fa218 l 00000018 sBigPokeball_Funcs +083fa230 l 0000000c sPokeballsTrail_Funcs +083fa23c l 00000004 sPokeballsTrail_StartXCoords +083fa240 l 0000000a sPokeballsTrail_Delays +083fa24a l 00000004 sPokeballsTrail_Speeds +083fa250 l 0000001c sClockwiseWipe_Funcs +083fa26c l 00000008 sRipple_Funcs +083fa274 l 0000000c sWave_Funcs +083fa280 l 00000020 sSpiral_AngleData +083fa2a0 l 00000008 sSpiral_Funcs +083fa2a8 l 00000028 sMugshot_Funcs 083fa2d0 l 00000005 sMugshotsTrainerPicIDsTable 083fa2d6 l 00000014 sMugshotsOpponentRotationScales 083fa2ea l 00000014 sMugshotsOpponentCoords -083fa300 l 0000001c sBT_Phase2MugshotSpriteFuncs -083fa31c l 00000004 sMugShotSlideVelocity -083fa320 l 00000004 sMugShotSlideDeceleration -083fa324 l 0000000c sBT_Phase2SlicedScreenFuncs -083fa330 l 00000014 sBT_Phase2WhiteFadeInStripesFuncs -083fa344 l 0000000c sWhiteStripeDelay -083fa350 l 0000000c sBT_Phase2GridSquaresFuncs -083fa35c l 00000014 sBT_Phase2BlackDoodlesFuncs -083fa370 l 00000046 sBlackDoodlesSegments -083fa3b6 l 0000000e sBlackDoodlesDelay -083fa3c4 l 00000008 sBT_Phase1FadeFuncs -083fa3cc l 00000008 sSpriteImageTable_SlidingPokeball -083fa3d4 l 00000008 sSpriteAnim_SlidingPokeball -083fa3dc l 00000004 sSpriteAnimTable_SlidingPokeball -083fa3e0 l 00000010 sSpriteAffineAnim_SlidingPokeball1 -083fa3f0 l 00000010 sSpriteAffineAnim_SlidingPokeball2 -083fa400 l 00000008 sSpriteAffineAnimTable_SlidingPokeball -083fa408 l 00000018 sSpriteTemplate_SlidingPokeball -083fa420 l 00000008 sOamData_Unused -083fa428 l 00000008 sSpriteImageTable_UnusedBrendan -083fa430 l 00000008 sSpriteImageTable_UnusedLass -083fa438 l 00000008 sSpriteAnim_Unused -083fa440 l 00000004 sSpriteAnimTable_Unused -083fa444 l 00000030 sSpriteTemplateTable_Unused -083fa474 l 00000020 sSlidingPokeballBigPokeballPalette -083fa494 g 00000008 sSpritePalette_SlidingPokeball -083fa49c l 00000020 sVsBarLoreleiPalette -083fa4bc l 00000020 sVsBarBrunoPalette -083fa4dc l 00000020 sVsBarAgathaPalette -083fa4fc l 00000020 sVsBarLancePalette -083fa51c l 00000020 sVsBarBluePalette -083fa53c l 00000020 sVsBarMalePlayerPalette -083fa55c l 00000020 sVsBarFemalePlayerPalette -083fa57c l 00000014 sVsBarOpponentPalettes -083fa590 l 00000008 sVsBarPlayerPalettes +083fa300 l 0000001c sMugshotTrainerPicFuncs +083fa31c l 00000004 sTrainerPicSlideSpeeds +083fa320 l 00000004 sTrainerPicSlideAccels +083fa324 l 0000000c sSlice_Funcs +083fa330 l 00000014 sWhiteBarsFade_Funcs +083fa344 l 0000000c sWhiteBarsFade_StartDelays +083fa350 l 0000000c sGridSquares_Funcs +083fa35c l 00000014 sAngledWipes_Funcs +083fa370 l 00000046 sAngledWipes_MoveData +083fa3b6 l 0000000e sAngledWipes_EndDelays +083fa3c4 l 00000008 sTransitionIntroFuncs +083fa3cc l 00000008 sSpriteImage_Pokeball +083fa3d4 l 00000008 sSpriteAnim_Pokeball +083fa3dc l 00000004 sSpriteAnimTable_Pokeball +083fa3e0 l 00000010 sSpriteAffineAnim_Pokeball1 +083fa3f0 l 00000010 sSpriteAffineAnim_Pokeball2 +083fa400 l 00000008 sSpriteAffineAnimTable_Pokeball +083fa408 l 00000018 sSpriteTemplate_Pokeball +083fa420 l 00000008 sOam_UnusedBrendanLass +083fa428 l 00000008 sImageTable_UnusedBrendan +083fa430 l 00000008 sImageTable_UnusedLass +083fa438 l 00000008 sSpriteAnim_UnusedBrendanLass +083fa440 l 00000004 sSpriteAnimTable_UnusedBrendanLass +083fa444 l 00000030 sSpriteTemplate_UnusedBrendanLass +083fa474 l 00000020 sFieldEffectPal_Pokeball +083fa494 g 00000008 gSpritePalette_Pokeball +083fa49c l 00000020 sMugshotPal_Lorelei +083fa4bc l 00000020 sMugshotPal_Bruno +083fa4dc l 00000020 sMugshotPal_Agatha +083fa4fc l 00000020 sMugshotPal_Lance +083fa51c l 00000020 sMugshotPal_Blue +083fa53c l 00000020 sMugshotPal_Red +083fa55c l 00000020 sMugshotPal_Green +083fa57c l 00000014 sOpponentMugshotsPals +083fa590 l 00000008 sPlayerMugshotsPals 083fa598 l 00000020 sUnusedTrainerPalette 083fa5b8 l 00000008 sSpritePalette_UnusedTrainer -083fa5c0 l 000004b0 sBigPokeballTilemap -083faa70 l 00000500 sVsBarTilemap +083fa5c0 l 000004b0 sBigPokeball_Tilemap +083faa70 l 00000500 sMugshotsTilemap 083faf70 l 000000e4 sLinkPartnerBufferCommands 083fb054 l 00000001 sText_Empty1 083fb055 l 00000003 sText_Trainer1LoseText @@ -40477,7 +40477,7 @@ 084550c0 g 0000002b DecorDesc_REGICE_DOLL 084550eb g 0000002b DecorDesc_REGISTEEL_DOLL 08455118 g 00000f20 gDecorations -08456038 l 00000003 gUnknown_8456618 +08456038 l 00000003 sTopBarWindowTextColors 0845603c l 00000018 sQuestLogHeaderWindowTemplates 08456054 l 00000003 sTextColors 08456058 l 00000060 sUnknown_8456638 @@ -42052,7 +42052,7 @@ 0847a47e g 00000008 gText_UnionRoomChatKeyboard_Emoji10 0847a488 l 000003e0 sTrainerTowerFloor_Single_4 0847a868 l 000003e0 sTrainerTowerFloor_Single_7 -0847ac48 l 000003e0 gUnknown_847B36C +0847ac48 l 000003e0 sTrainerTowerFloor_Single_Unused 0847b028 l 000003e0 sTrainerTowerFloor_Double_5 0847b408 l 000003e0 sTrainerTowerFloor_Double_6 0847b7e8 l 000003e0 sTrainerTowerFloor_Double_2 @@ -42071,15 +42071,15 @@ 0847ea48 l 000003e0 sTrainerTowerFloor_Single_1 0847ee28 l 000003e0 sTrainerTowerFloor_Mixed_5 0847f208 l 000003e0 sTrainerTowerFloor_Double_8 -0847f5e8 l 000003e0 gUnknown_847FD0C +0847f5e8 l 000003e0 sTrainerTowerFloor_Double_Unused1 0847f9c8 l 000003e0 sTrainerTowerFloor_Knockout_7 0847fda8 l 000003e0 sTrainerTowerFloor_Knockout_4 08480188 l 000003e0 sTrainerTowerFloor_Single_3 08480568 l 000003e0 sTrainerTowerFloor_Mixed_3 08480948 l 000003e0 sTrainerTowerFloor_Mixed_2 -08480d28 l 000003e0 gUnknown_848144C +08480d28 l 000003e0 sTrainerTowerFloor_Double_Unused2 08481108 l 000003e0 sTrainerTowerFloor_Double_7 -084814e8 l 000003e0 gUnknown_8481C0C +084814e8 l 000003e0 sTrainerTowerFloor_Double_Unused3 084818c8 l 000003e0 sTrainerTowerFloor_Knockout_6 08481ca8 l 000003e0 sTrainerTowerFloor_Knockout_5 08482088 g 00000008 gTrainerTowerLocalHeader diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 3d93890e4..070a0b7fc 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -377,7 +377,7 @@ 02039a20 l 00000004 sEvoStructPtr 02039a24 l 00000004 sBgAnimPal 02039a28 l 00000001 sCoinsWindowId -02039a2c l 00000004 sTransitionStructPtr +02039a2c l 00000004 sTransitionData 02039a30 l 00000004 sBattlerAbilities 02039a34 l 00000004 sBattleMsgDataPtr 02039a38 g 00001000 gSaveDataBuffer @@ -1064,7 +1064,7 @@ 08002fa0 g 0000003e DecompressGlyphTile 08002fe0 g 00000046 GetLastTextColor 08003028 g 00000600 CopyGlyphToWindow -08003628 g 00000508 sub_8003614 +08003628 l 00000508 CopyGlyphToWindow_Parameterized 08003b30 g 00000002 ClearTextSpan 08003b34 l 00000000 .gcc2_compiled. 08003b34 l 00000002 nullsub_8 @@ -3912,7 +3912,7 @@ 08063484 l 00000010 GetMoveDirectionFastestAnimNum 08063494 g 00000010 GetJumpSpecialDirectionAnimNum 080634a4 g 00000010 GetAcroWheelieDirectionAnimNum -080634b4 g 00000010 Unref_GetAnimNums_080634A0 +080634b4 g 00000010 GetAcroBunnyHopFrontWheelDirectionAnimNum 080634c4 g 00000010 GetAcroEndWheelieDirectionAnimNum 080634d4 g 00000010 GetSpinDirectionAnimNum 080634e4 g 00000010 GetAcroUnusedActionDirectionAnimNum @@ -8427,141 +8427,141 @@ 080d0828 l 00000020 FieldCB_UseStrength 080d0848 g 00000048 FldEff_UseStrength 080d0890 l 00000010 ShowMonCB_UseStrength -080d08a0 g 00000030 BT_StartOnField +080d08a0 g 00000030 BattleTransition_StartOnField 080d08a0 l 00000000 .gcc2_compiled. -080d08d0 l 0000000e BT_StartWithoutAlloc -080d08e0 g 00000050 BT_IsDone -080d0930 l 00000030 BT_LaunchTask -080d0960 l 00000038 BT_TaskMain -080d0998 l 00000050 BT_Phase1Blink -080d09e8 l 00000032 BT_WaitForPhase1 -080d0a1c l 00000028 BT_Phase2LaunchAnimTask -080d0a44 l 00000030 BT_WaitForPhase2 -080d0a74 l 00000050 BT_Phase1Task -080d0ac4 l 00000038 BT_Phase2Blur -080d0afc l 00000032 BT_Phase2Blur_InitBgMosaic -080d0b30 l 00000060 BT_Phase2Blur_Anim -080d0b90 l 0000002c BT_Phase2Blur_IsDone -080d0bbc l 00000038 BT_Phase2DistortedWave -080d0bf4 l 0000006c BT_Phase2DistortedWave_InitWave -080d0c60 l 00000078 BT_Phase2DistortedWave_UpdateWave -080d0cd8 l 00000038 VBCB_BT_Phase2DistortedWave -080d0d10 l 0000002c HBCB_BT_Phase2DistortedWave -080d0d3c l 00000038 BT_Phase2HorizontalCorrugate -080d0d74 l 00000064 BT_Phase2HorizontalCorrugate_Init -080d0dd8 l 00000090 BT_Phase2HorizontalCorrugate_UpdateWave -080d0e68 l 00000038 VBCB_BT_Phase2HorizontalCorrugate -080d0ea0 l 0000002c HBCB_BT_Phase2HorizontalCorrugate -080d0ecc l 00000038 BT_Phase2BigPokeball -080d0f04 l 000000b8 BT_Phase2BigPokeball_Init -080d0fbc l 00000090 BT_Phase2BigPokeball_LoadTilemapAndWave -080d104c l 00000094 BT_Phase2BigPokeball_UpdateWave1IncEva -080d10e0 l 000000a4 BT_Phase2BigPokeball_UpdateWave2DecEvb -080d1184 l 00000084 BT_Phase2BigPokeball_UpdateWave3 -080d1208 l 000000c4 BT_Phase2BigPokeball_CircleEffect -080d12cc l 0000008c BT_VBStopDma0SyncSrcBufferSetLcdRegs -080d1358 l 0000002c VBCB_BT_Phase2BigPokeball1 -080d1384 l 0000002c VBCB_BT_Phase2BigPokeball2 -080d13b0 l 00000038 BT_Phase2SlidingPokeballs -080d13e8 l 0000004c BT_Phase2SlidingPokeballs_LoadBgGfx -080d1434 l 0000008c BT_Phase2SlidingPokeballs_SetupFldeffArgs -080d14c0 l 0000002c BT_Phase2SlidingPokeballs_IsDone -080d14ec g 0000006c FldEff_Pokeball -080d1558 l 000000c8 SpriteCB_BT_Phase2SlidingPokeballs -080d1620 l 00000038 BT_Phase2ClockwiseBlackFade -080d1658 l 00000068 BT_Phase2ClockwiseBlackFade_Init -080d16c0 l 00000090 BT_Phase2ClockwiseBlackFade_Step1 -080d1750 l 000000f4 BT_Phase2ClockwiseBlackFade_Step2 -080d1844 l 00000088 BT_Phase2ClockwiseBlackFade_Step3 -080d18cc l 00000100 BT_Phase2ClockwiseBlackFade_Step4 -080d19cc l 00000098 BT_Phase2ClockwiseBlackFade_Step5 -080d1a64 l 00000040 BT_Phase2ClockwiseBlackFade_End -080d1aa4 l 0000009c VBCB_BT_Phase2ClockwiseBlackFade -080d1b40 l 00000038 BT_Phase2FullScreenWave -080d1b78 l 00000058 BT_Phase2FullScreenWave_Init -080d1bd0 l 000000e0 BT_Phase2FullScreenWave_UpdateWave -080d1cb0 l 00000038 VBCB_BT_Phase2FullScreenWave -080d1ce8 l 0000002c HBCB_BT_Phase2FullScreenWave -080d1d14 l 00000038 BT_Phase2BlackWaveToRight -080d1d4c l 00000058 BT_Phase2BlackWaveToRight_Init -080d1da4 l 0000009c BT_Phase2BlackWaveToRight_UpdateWave -080d1e40 l 00000040 BT_Phase2BlackWaveToRight_End -080d1e80 l 00000094 VBCB_BT_Phase2BlackWaveToRight -080d1f14 l 00000038 BT_Phase2AntiClockwiseSpiral -080d1f4c l 000005d8 BT_AntiClockwiseSpiral_DoUpdateFrame -080d2524 l 00000088 BT_Phase2AntiClockwiseSpiral_Init -080d25ac l 000000d4 BT_Phase2AntiClockwiseSpiral_Update -080d2680 l 000000d0 VBCB_BT_Phase2AntiClockwiseBlackFade -080d2750 l 00000020 BT_Phase2StartLoreleiMugshot -080d2770 l 00000020 BT_Phase2StartBrunoMugshot -080d2790 l 00000020 BT_Phase2StartAgathaMugshot -080d27b0 l 00000020 BT_Phase2StartLanceMugshot -080d27d0 l 00000020 BT_Phase2StartBlueMugshot -080d27f0 l 00000038 BT_Phase2Mugshot -080d2828 l 00000068 BT_Phase2Mugshot_Init -080d2890 l 000000c0 BT_Phase2Mugshot_LoadGfx -080d2950 l 000000ec BT_Phase2Mugshot_VsBarsSlideIn -080d2a3c l 0000007c BT_Phase2Mugshot_StartSpriteSlide -080d2ab8 l 0000003c BT_Phase2Mugshot_WaitForOpponentInPlace -080d2af4 l 000000b8 BT_Phase2Mugshot_WaitForPlayerInPlace -080d2bac l 000000c8 BT_Phase2Mugshot_ExpandWhiteBand -080d2c74 l 00000038 BT_Phase2Mugshot_StartBlackFade -080d2cac l 0000004c BT_Phase2Mugshot_WaitForBlackFade -080d2cf8 l 00000040 BT_Phase2Mugshot_End -080d2d38 l 0000009c VBCB_BT_Phase2Mugshot1_Slide -080d2dd4 l 00000080 VBCB_BT_Phase2Mugshot2_WhiteFade -080d2e54 l 00000038 HBCB_BT_Phase2Mugshot -080d2e8c l 00000178 BT_Phase2Mugshots_CreateSprites -080d3004 l 00000028 SpriteCB_BT_Phase2Mugshots -080d302c l 00000004 BT_Phase2MugshotsSpriteFuncs_Wait -080d3030 l 0000004c BT_Phase2MugshotsSpriteFuncs_InitParams -080d307c l 00000032 BT_Phase2MugshotsSpriteFuncs_SlideSpriteIn -080d30b0 l 0000002c BT_Phase2MugshotsSpriteFuncs_DecelerateSprite -080d30dc l 0000002a BT_Phase2MugshotsSpriteFuncs_DecelerateSprite2 -080d3108 l 00000018 BT_SetSpriteAsOpponentOrPlayer -080d3120 l 0000001c BT_StartSpriteSlide -080d313c l 00000018 BT_IsSpriteSlideFinished -080d3154 l 00000038 BT_Phase2SlicedScreen -080d318c l 0000007c BT_Phase2SlicedScreen_Init -080d3208 l 000000cc BT_Phase2SlicedScreen_UpdateOffsets -080d32d4 l 00000040 BT_Phase2SlicedScreen_End -080d3314 l 00000094 VBCB_BT_Phase2SlicedScreen -080d33a8 l 0000002c HBCB_BT_Phase2SlicedScreen -080d33d4 l 00000038 BT_Phase2WhiteFadeInStripes -080d340c l 00000078 BT_Phase2WhiteFadeInStripes_Init -080d3484 l 00000074 BT_Phase2WhiteFadeInStripes_SetupSprites -080d34f8 l 0000003c BT_Phase2WhiteFadeInStripes_IsWhiteFadeDone -080d3534 l 00000068 BT_Phase2WhiteFadeInStripes_Stop -080d359c l 00000040 BT_Phase2WhiteFadeInStripes_IsDone -080d35dc l 0000009c VBCB_BT_Phase2WhiteFadeInStripes1 -080d3678 l 00000050 VBCB_BT_Phase2WhiteFadeInStripes2 -080d36c8 l 00000040 HBCB_BT_Phase2WhiteFadeInStripes -080d3708 l 000000f8 SpriteCB_BT_Phase2WhiteFadeInStripes -080d3800 l 00000038 BT_Phase2GridSquares -080d3838 l 00000054 BT_Phase2GridSquares_LoadGfx -080d388c l 00000058 BT_Phase2GridSquares_UpdateTileset -080d38e4 l 0000002c BT_Phase2GridSquares_IsDone -080d3910 l 00000038 BT_Phase2BlackDoodles -080d3948 l 00000064 BT_Phase2BlackDoodles_Init -080d39ac l 0000007c BT_Phase2BlackDoodles_InitSingleBrush -080d3a28 l 000000dc BT_Phase2BlackDoodles_DrawSingleBrush -080d3b04 l 0000006c BT_Phase2BlackDoodles_IsDone -080d3b70 l 0000001c BT_Phase2BlackDoodles_NextBrush -080d3b8c l 0000009c VBCB_BT_Phase2BlackDoodles -080d3c28 l 00000064 BT_CreatePhase1SubTask -080d3c8c l 0000001e BT_IsPhase1Done -080d3cac l 00000038 BT_Phase1SubTask -080d3ce4 l 0000005c BT_Phase1_FadeOut -080d3d40 l 00000076 BT_Phase1_FadeIn -080d3db8 l 00000024 BT_InitCtrlBlk -080d3ddc l 00000012 BT_VBSyncOamAndPltt -080d3df0 l 00000020 BT_GetBg0TilesetBase -080d3e10 l 00000038 BT_GetBg0TilemapAndTilesetBase -080d3e48 l 00000012 BT_BlendPalettesToBlack -080d3e5c l 0000007c BT_LoadWaveIntoBuffer -080d3ed8 l 00000198 BT_GenerateCircle -080d4070 l 0000007a BT_DiagonalSegment_InitParams -080d40ec l 000000fc BT_DiagonalSegment_ComputePointOnSegment +080d08d0 l 0000000e BattleTransition_Start +080d08e0 g 00000050 IsBattleTransitionDone +080d0930 l 00000030 LaunchBattleTransitionTask +080d0960 l 00000038 Task_BattleTransition +080d0998 l 00000050 Transition_StartIntro +080d09e8 l 00000032 Transition_WaitForIntro +080d0a1c l 00000028 Transition_StartMain +080d0a44 l 00000030 Transition_WaitForMain +080d0a74 l 00000050 Task_Intro +080d0ac4 l 00000038 Task_Blur +080d0afc l 00000032 Blur_Init +080d0b30 l 00000060 Blur_Main +080d0b90 l 0000002c Blur_End +080d0bbc l 00000038 Task_Swirl +080d0bf4 l 0000006c Swirl_Init +080d0c60 l 00000078 Swirl_End +080d0cd8 l 00000038 VBlankCB_Swirl +080d0d10 l 0000002c HBlankCB_Swirl +080d0d3c l 00000038 Task_Shuffle +080d0d74 l 00000064 Shuffle_Init +080d0dd8 l 00000090 Shuffle_End +080d0e68 l 00000038 VBlankCB_Shuffle +080d0ea0 l 0000002c HBlankCB_Shuffle +080d0ecc l 00000038 Task_BigPokeball +080d0f04 l 000000b8 BigPokeball_Init +080d0fbc l 00000090 BigPokeball_SetGfx +080d104c l 00000094 PatternWeave_Blend1 +080d10e0 l 000000a4 PatternWeave_Blend2 +080d1184 l 00000084 PatternWeave_FinishAppear +080d1208 l 000000c4 PatternWeave_CircularMask +080d12cc l 0000008c VBlankCB_SetWinAndBlend +080d1358 l 0000002c VBlankCB_PatternWeave +080d1384 l 0000002c VBlankCB_CircularMask +080d13b0 l 00000038 Task_PokeballsTrail +080d13e8 l 0000004c PokeballsTrail_Init +080d1434 l 0000008c PokeballsTrail_Main +080d14c0 l 0000002c PokeballsTrail_End +080d14ec g 0000006c FldEff_PokeballTrail +080d1558 l 000000c8 SpriteCB_FldEffPokeballTrail +080d1620 l 00000038 Task_ClockwiseWipe +080d1658 l 00000068 ClockwiseWipe_Init +080d16c0 l 00000090 ClockwiseWipe_TopRight +080d1750 l 000000f4 ClockwiseWipe_Right +080d1844 l 00000088 ClockwiseWipe_Bottom +080d18cc l 00000100 ClockwiseWipe_Left +080d19cc l 00000098 ClockwiseWipe_TopLeft +080d1a64 l 00000040 ClockwiseWipe_End +080d1aa4 l 0000009c VBlankCB_ClockwiseWipe +080d1b40 l 00000038 Task_Ripple +080d1b78 l 00000058 Ripple_Init +080d1bd0 l 000000e0 Ripple_Main +080d1cb0 l 00000038 VBlankCB_Ripple +080d1ce8 l 0000002c HBlankCB_Ripple +080d1d14 l 00000038 Task_Wave +080d1d4c l 00000058 Wave_Init +080d1da4 l 0000009c Wave_Main +080d1e40 l 00000040 Wave_End +080d1e80 l 00000094 VBlankCB_Wave +080d1f14 l 00000038 Task_Spiral +080d1f4c l 000005d8 Spiral_UpdateFrame +080d2524 l 00000088 Spiral_Init +080d25ac l 000000d4 Spiral_End +080d2680 l 000000d0 VBlankCB_Spiral +080d2750 l 00000020 Task_Lorelei +080d2770 l 00000020 Task_Bruno +080d2790 l 00000020 Task_Agatha +080d27b0 l 00000020 Task_Lance +080d27d0 l 00000020 Task_Blue +080d27f0 l 00000038 DoMugshotTransition +080d2828 l 00000068 Mugshot_Init +080d2890 l 000000c0 Mugshot_SetGfx +080d2950 l 000000ec Mugshot_ShowBanner +080d2a3c l 0000007c Mugshot_StartOpponentSlide +080d2ab8 l 0000003c Mugshot_WaitStartPlayerSlide +080d2af4 l 000000b8 Mugshot_WaitPlayerSlide +080d2bac l 000000c8 Mugshot_GradualWhiteFade +080d2c74 l 00000038 Mugshot_InitFadeWhiteToBlack +080d2cac l 0000004c Mugshot_FadeToBlack +080d2cf8 l 00000040 Mugshot_End +080d2d38 l 0000009c VBlankCB_Mugshots +080d2dd4 l 00000080 VBlankCB_MugshotsFadeOut +080d2e54 l 00000038 HBlankCB_Mugshots +080d2e8c l 00000178 Mugshots_CreateTrainerPics +080d3004 l 00000028 SpriteCB_MugshotTrainerPic +080d302c l 00000004 MugshotTrainerPic_Pause +080d3030 l 0000004c MugshotTrainerPic_Init +080d307c l 00000032 MugshotTrainerPic_Slide +080d30b0 l 0000002c MugshotTrainerPic_SlideSlow +080d30dc l 0000002a MugshotTrainerPic_SlideOffscreen +080d3108 l 00000018 SetTrainerPicSlideDirection +080d3120 l 0000001c IncrementTrainerPicState +080d313c l 00000018 IsTrainerPicSlideDone +080d3154 l 00000038 Task_Slice +080d318c l 0000007c Slice_Init +080d3208 l 000000cc Slice_Main +080d32d4 l 00000040 Slice_End +080d3314 l 00000094 VBlankCB_Slice +080d33a8 l 0000002c HBlankCB_Slice +080d33d4 l 00000038 Task_WhiteBarsFade +080d340c l 00000078 WhiteBarsFade_Init +080d3484 l 00000074 WhiteBarsFade_StartBars +080d34f8 l 0000003c WhiteBarsFade_WaitBars +080d3534 l 00000068 WhiteBarsFade_BlendToBlack +080d359c l 00000040 WhiteBarsFade_End +080d35dc l 0000009c VBlankCB_WhiteBarsFade +080d3678 l 00000050 VBlankCB_WhiteBarsFade_Blend +080d36c8 l 00000040 HBlankCB_WhiteBarsFade +080d3708 l 000000f8 SpriteCB_WhiteBarFade +080d3800 l 00000038 Task_GridSquares +080d3838 l 00000054 GridSquares_Init +080d388c l 00000058 GridSquares_Main +080d38e4 l 0000002c GridSquares_End +080d3910 l 00000038 Task_AngledWipes +080d3948 l 00000064 AngledWipes_Init +080d39ac l 0000007c AngledWipes_SetWipeData +080d3a28 l 000000dc AngledWipes_DoWipe +080d3b04 l 0000006c AngledWipes_TryEnd +080d3b70 l 0000001c AngledWipes_StartNext +080d3b8c l 0000009c VBlankCB_AngledWipes +080d3c28 l 00000064 CreateIntroTask +080d3c8c l 0000001e IsIntroTaskDone +080d3cac l 00000038 Task_BattleTransition_Intro +080d3ce4 l 0000005c TransitionIntro_FadeToGray +080d3d40 l 00000076 TransitionIntro_FadeFromGray +080d3db8 l 00000024 InitTransitionData +080d3ddc l 00000012 VBlankCB_BattleTransition +080d3df0 l 00000020 GetBg0TilemapDst +080d3e10 l 00000038 GetBg0TilesDst +080d3e48 l 00000012 FadeScreenBlack +080d3e5c l 0000007c SetSinWave +080d3ed8 l 00000198 SetCircularMask +080d4070 l 0000007a InitBlackWipe +080d40ec l 000000fc UpdateBlackWipe 080d41e8 l 00000000 .gcc2_compiled. 080d41e8 l 00000002 LinkPartnerDummy 080d41ec g 0000001c SetControllerToLinkPartner @@ -10328,7 +10328,7 @@ 0810c338 g 00000012 FreeAndDestroyTrainerPicSprite 0810c34c g 00000034 LoadTrainerPicInWindow 0810c380 g 00000044 CreateTrainerCardTrainerPicSprite -0810c3c4 g 00000030 PlayerGenderToFrontTrainerPicId_Debug +0810c3c4 g 00000030 PlayerGenderToFrontTrainerPicId 0810c3f4 g 00000014 VsSeekerFreezeObjectsAfterChargeComplete 0810c3f4 l 00000000 .gcc2_compiled. 0810c408 l 0000008c Task_ResetObjectsRematchWantedState @@ -10460,7 +10460,7 @@ 0810f790 g 00000034 DestroyTopBarWindow 0810f7c4 g 00000064 Menu_InitCursorInternal 0810f828 g 00000040 Menu_InitCursor -0810f868 l 0000005c sub_810F818 +0810f868 l 0000005c InitMenuDefaultCursorHeight 0810f8c4 l 00000090 Menu_RedrawCursor 0810f954 g 00000044 Menu_MoveCursor 0810f998 g 00000044 Menu_MoveCursorNoWrapAround @@ -10473,7 +10473,7 @@ 0810fc38 g 00000098 MultichoiceList_PrintItems 0810fcd0 g 0000004e UnionRoomAndTradeMenuPrintOptions 0810fd20 g 00000112 AddItemMenuActionTextPrinters -0810fe34 l 0000006c sub_810FDE4 +0810fe34 l 0000006c PrintMenuActionTextsAtTopById 0810fea0 g 000000b4 SetWindowTemplateFields 0810ff54 l 0000005a CreateWindowTemplate 0810ffb0 g 00000144 CreateYesNoMenu @@ -10487,10 +10487,10 @@ 081103cc l 000000d4 MultichoiceGrid_RedrawCursor 081104a0 l 000000c2 MultichoiceGrid_MoveCursor 08110564 l 0000008a MultichoiceGrid_MoveCursorIfValid -081105f0 l 000000ae sub_81105A0 +081105f0 l 000000ae Menu_ProcessGridInput_NoSoundLimit 081106a0 g 000000a4 Menu_ProcessInputGridLayout -08110744 l 000000aa sub_81106F4 -081107f0 l 000000a0 sub_81107A0 +08110744 l 000000aa Menu_ProcessGridInputRepeat_NoSoundLimit +081107f0 l 000000a0 Menu_ProcessGridInputRepeat 08110890 g 0000005c SetQuestLogRecordAndPlaybackPointers 08110890 l 00000000 .gcc2_compiled. 081108ec g 00000054 ResetQuestLog @@ -26768,10 +26768,10 @@ 0824f054 l 00000005 sText_ShedinjaJpnName 0824f05c g 00000008 gOamData_BattlerOpponent 0824f064 g 00000008 gOamData_BattlerPlayer -0824f06c l 00000008 gUnknown_824F020 -0824f074 l 00000004 gUnknown_824F028 -0824f078 l 00000018 gUnknown_824F02C -0824f090 l 00000004 gUnknown_824F044 +0824f06c l 00000008 sAnim_Unused +0824f074 l 00000004 sAnims_Unused +0824f078 l 00000018 sAffineAnim_Unused +0824f090 l 00000004 sAffineAnims_Unused 0824f094 l 00000008 sPlayerThrowXTranslation 0824f09c g 00000150 gTypeEffectiveness 0824f1ec g 0000007e gTypeNames @@ -29863,7 +29863,7 @@ 0835b994 l 00000018 gCameraSpriteTemplate 0835b9ac g 0000000c gCameraObjectFuncs 0835b9b8 g 00000020 gObjectEventPal_Player -0835b9d8 g 00000020 gUnknown_835B988 +0835b9d8 g 00000020 gObjectEventPal_PlayerUnused 0835b9f8 g 00000020 gObjectEventPaletteNull1 0835ba18 g 00000020 gObjectEventPaletteNull2 0835ba38 g 00000020 gObjectEventPaletteNull3 @@ -30054,7 +30054,7 @@ 083980b8 g 00000040 gFieldEffectObjectPic_ShadowMedium 083980f8 g 00000080 gFieldEffectObjectPic_ShadowLarge 08398178 g 00000400 gFieldEffectObjectPic_ShadowExtraLarge -08398578 g 00000120 filler_8398188 +08398578 g 00000120 sFiller1 08398698 g 00000020 gFieldEffectObjectPic_CutGrass 083986b8 g 00000020 gFieldEffectObjectPic_CutGrass2 083986d8 g 00000020 gFieldEffectPal_CutGrass @@ -30063,7 +30063,7 @@ 08398bf8 g 00000400 gFieldEffectObjectPic_Arrow 08398ff8 g 00000020 gFieldEffectObjectPalette0 08399018 g 00000020 gFieldEffectObjectPalette1 -08399038 g 00000020 filler_8398FE8 +08399038 g 00000020 sFiller2 08399058 g 000000c0 gFieldEffectObjectPic_GroundImpactDust 08399118 g 000000c0 gFieldEffectObjectPic_UnusedGrass3 083991d8 g 00000100 gFieldEffectObjectPic_JumpTallGrass @@ -36455,72 +36455,72 @@ 083f82fb l 0000001e sText_UnusedArrows 083f8319 l 00000010 sBgAnim_PaletteControl 083f8329 l 00000320 sBgAnim_PalIndexes -083f864c l 00000580 sBigPokeballTileset -083f8bcc l 00000040 sSlidingPokeballTilemap -083f8c0c l 00000200 sSpriteImage_SlidingPokeball -083f8e0c l 000001e0 sVsBarTileset -083f8fec l 00000800 sSpriteImage_UnusedBrendan -083f97ec l 00000800 sSpriteImage_UnusedLass -083f9fec l 000001e0 sGridSquareTileset -083fa1cc l 00000048 sBT_Phase1Tasks -083fa214 l 00000048 sBT_Phase2Tasks -083fa25c l 00000010 sBT_MainPhases -083fa26c l 0000000c sBT_Phase2BlurFuncs -083fa278 l 00000008 sBT_Phase2DistortedWaveFuncs -083fa280 l 00000008 sBT_Phase2HorizontalCorrugateFuncs -083fa288 l 00000018 sBT_Phase2BigPokeballFuncs -083fa2a0 l 0000000c sBT_Phase2SlidingPokeballsFuncs -083fa2ac l 00000004 gUnknown_83FA400 -083fa2b0 l 0000000a gUnknown_83FA404 -083fa2ba l 00000004 gUnknown_83FA40E -083fa2c0 l 0000001c sBT_Phase2ClockwiseBlackFadeFuncs -083fa2dc l 00000008 sBT_Phase2FullScreenWaveFuncs -083fa2e4 l 0000000c sBT_Phase2BlackWaveToRightFuncs -083fa2f0 l 00000020 gUnknown_83FA444 -083fa310 l 00000008 sBT_Phase2AntiClockwiseSpiralFuncs -083fa318 l 00000028 sBT_Phase2MugshotFuncs +083f864c l 00000580 sBigPokeball_Gfx +083f8bcc l 00000040 sSlidingPokeball_Tilemap +083f8c0c l 00000200 sSlidingPokeball_Gfx +083f8e0c l 000001e0 sMugshotBanner_Gfx +083f8fec l 00000800 sUnusedBrendan_Gfx +083f97ec l 00000800 sUnusedLass_Gfx +083f9fec l 000001e0 sGridSquare_Gfx +083fa1cc l 00000048 sTasks_Intro +083fa214 l 00000048 sTasks_Main +083fa25c l 00000010 sTaskHandlers +083fa26c l 0000000c sBlur_Funcs +083fa278 l 00000008 sSwirl_Funcs +083fa280 l 00000008 sShuffle_Funcs +083fa288 l 00000018 sBigPokeball_Funcs +083fa2a0 l 0000000c sPokeballsTrail_Funcs +083fa2ac l 00000004 sPokeballsTrail_StartXCoords +083fa2b0 l 0000000a sPokeballsTrail_Delays +083fa2ba l 00000004 sPokeballsTrail_Speeds +083fa2c0 l 0000001c sClockwiseWipe_Funcs +083fa2dc l 00000008 sRipple_Funcs +083fa2e4 l 0000000c sWave_Funcs +083fa2f0 l 00000020 sSpiral_AngleData +083fa310 l 00000008 sSpiral_Funcs +083fa318 l 00000028 sMugshot_Funcs 083fa340 l 00000005 sMugshotsTrainerPicIDsTable 083fa346 l 00000014 sMugshotsOpponentRotationScales 083fa35a l 00000014 sMugshotsOpponentCoords -083fa370 l 0000001c sBT_Phase2MugshotSpriteFuncs -083fa38c l 00000004 sMugShotSlideVelocity -083fa390 l 00000004 sMugShotSlideDeceleration -083fa394 l 0000000c sBT_Phase2SlicedScreenFuncs -083fa3a0 l 00000014 sBT_Phase2WhiteFadeInStripesFuncs -083fa3b4 l 0000000c sWhiteStripeDelay -083fa3c0 l 0000000c sBT_Phase2GridSquaresFuncs -083fa3cc l 00000014 sBT_Phase2BlackDoodlesFuncs -083fa3e0 l 00000046 sBlackDoodlesSegments -083fa426 l 0000000e sBlackDoodlesDelay -083fa434 l 00000008 sBT_Phase1FadeFuncs -083fa43c l 00000008 sSpriteImageTable_SlidingPokeball -083fa444 l 00000008 sSpriteAnim_SlidingPokeball -083fa44c l 00000004 sSpriteAnimTable_SlidingPokeball -083fa450 l 00000010 sSpriteAffineAnim_SlidingPokeball1 -083fa460 l 00000010 sSpriteAffineAnim_SlidingPokeball2 -083fa470 l 00000008 sSpriteAffineAnimTable_SlidingPokeball -083fa478 l 00000018 sSpriteTemplate_SlidingPokeball -083fa490 l 00000008 sOamData_Unused -083fa498 l 00000008 sSpriteImageTable_UnusedBrendan -083fa4a0 l 00000008 sSpriteImageTable_UnusedLass -083fa4a8 l 00000008 sSpriteAnim_Unused -083fa4b0 l 00000004 sSpriteAnimTable_Unused -083fa4b4 l 00000030 sSpriteTemplateTable_Unused -083fa4e4 l 00000020 sSlidingPokeballBigPokeballPalette -083fa504 g 00000008 sSpritePalette_SlidingPokeball -083fa50c l 00000020 sVsBarLoreleiPalette -083fa52c l 00000020 sVsBarBrunoPalette -083fa54c l 00000020 sVsBarAgathaPalette -083fa56c l 00000020 sVsBarLancePalette -083fa58c l 00000020 sVsBarBluePalette -083fa5ac l 00000020 sVsBarMalePlayerPalette -083fa5cc l 00000020 sVsBarFemalePlayerPalette -083fa5ec l 00000014 sVsBarOpponentPalettes -083fa600 l 00000008 sVsBarPlayerPalettes +083fa370 l 0000001c sMugshotTrainerPicFuncs +083fa38c l 00000004 sTrainerPicSlideSpeeds +083fa390 l 00000004 sTrainerPicSlideAccels +083fa394 l 0000000c sSlice_Funcs +083fa3a0 l 00000014 sWhiteBarsFade_Funcs +083fa3b4 l 0000000c sWhiteBarsFade_StartDelays +083fa3c0 l 0000000c sGridSquares_Funcs +083fa3cc l 00000014 sAngledWipes_Funcs +083fa3e0 l 00000046 sAngledWipes_MoveData +083fa426 l 0000000e sAngledWipes_EndDelays +083fa434 l 00000008 sTransitionIntroFuncs +083fa43c l 00000008 sSpriteImage_Pokeball +083fa444 l 00000008 sSpriteAnim_Pokeball +083fa44c l 00000004 sSpriteAnimTable_Pokeball +083fa450 l 00000010 sSpriteAffineAnim_Pokeball1 +083fa460 l 00000010 sSpriteAffineAnim_Pokeball2 +083fa470 l 00000008 sSpriteAffineAnimTable_Pokeball +083fa478 l 00000018 sSpriteTemplate_Pokeball +083fa490 l 00000008 sOam_UnusedBrendanLass +083fa498 l 00000008 sImageTable_UnusedBrendan +083fa4a0 l 00000008 sImageTable_UnusedLass +083fa4a8 l 00000008 sSpriteAnim_UnusedBrendanLass +083fa4b0 l 00000004 sSpriteAnimTable_UnusedBrendanLass +083fa4b4 l 00000030 sSpriteTemplate_UnusedBrendanLass +083fa4e4 l 00000020 sFieldEffectPal_Pokeball +083fa504 g 00000008 gSpritePalette_Pokeball +083fa50c l 00000020 sMugshotPal_Lorelei +083fa52c l 00000020 sMugshotPal_Bruno +083fa54c l 00000020 sMugshotPal_Agatha +083fa56c l 00000020 sMugshotPal_Lance +083fa58c l 00000020 sMugshotPal_Blue +083fa5ac l 00000020 sMugshotPal_Red +083fa5cc l 00000020 sMugshotPal_Green +083fa5ec l 00000014 sOpponentMugshotsPals +083fa600 l 00000008 sPlayerMugshotsPals 083fa608 l 00000020 sUnusedTrainerPalette 083fa628 l 00000008 sSpritePalette_UnusedTrainer -083fa630 l 000004b0 sBigPokeballTilemap -083faae0 l 00000500 sVsBarTilemap +083fa630 l 000004b0 sBigPokeball_Tilemap +083faae0 l 00000500 sMugshotsTilemap 083fafe0 l 000000e4 sLinkPartnerBufferCommands 083fb0c4 l 00000001 sText_Empty1 083fb0c5 l 00000003 sText_Trainer1LoseText @@ -40478,7 +40478,7 @@ 08455130 g 0000002b DecorDesc_REGICE_DOLL 0845515b g 0000002b DecorDesc_REGISTEEL_DOLL 08455188 g 00000f20 gDecorations -084560a8 l 00000003 gUnknown_8456618 +084560a8 l 00000003 sTopBarWindowTextColors 084560ac l 00000018 sQuestLogHeaderWindowTemplates 084560c4 l 00000003 sTextColors 084560c8 l 00000060 sUnknown_8456638 @@ -42053,7 +42053,7 @@ 0847a4ee g 00000008 gText_UnionRoomChatKeyboard_Emoji10 0847a4f8 l 000003e0 sTrainerTowerFloor_Single_4 0847a8d8 l 000003e0 sTrainerTowerFloor_Single_7 -0847acb8 l 000003e0 gUnknown_847B36C +0847acb8 l 000003e0 sTrainerTowerFloor_Single_Unused 0847b098 l 000003e0 sTrainerTowerFloor_Double_5 0847b478 l 000003e0 sTrainerTowerFloor_Double_6 0847b858 l 000003e0 sTrainerTowerFloor_Double_2 @@ -42072,15 +42072,15 @@ 0847eab8 l 000003e0 sTrainerTowerFloor_Single_1 0847ee98 l 000003e0 sTrainerTowerFloor_Mixed_5 0847f278 l 000003e0 sTrainerTowerFloor_Double_8 -0847f658 l 000003e0 gUnknown_847FD0C +0847f658 l 000003e0 sTrainerTowerFloor_Double_Unused1 0847fa38 l 000003e0 sTrainerTowerFloor_Knockout_7 0847fe18 l 000003e0 sTrainerTowerFloor_Knockout_4 084801f8 l 000003e0 sTrainerTowerFloor_Single_3 084805d8 l 000003e0 sTrainerTowerFloor_Mixed_3 084809b8 l 000003e0 sTrainerTowerFloor_Mixed_2 -08480d98 l 000003e0 gUnknown_848144C +08480d98 l 000003e0 sTrainerTowerFloor_Double_Unused2 08481178 l 000003e0 sTrainerTowerFloor_Double_7 -08481558 l 000003e0 gUnknown_8481C0C +08481558 l 000003e0 sTrainerTowerFloor_Double_Unused3 08481938 l 000003e0 sTrainerTowerFloor_Knockout_6 08481d18 l 000003e0 sTrainerTowerFloor_Knockout_5 084820f8 g 00000008 gTrainerTowerLocalHeader