From 4601e53bb51a966de33365eaee640a4fe29734a0 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Tue, 19 Oct 2021 12:14:31 +0000 Subject: [PATCH] Merge pull request #1516 from GriffinRichards/doc-miscbattle --- pokeemerald.sym | 222 ++++++++++++++++++++++++------------------------ 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index aae064e355..4434c32daa 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -102,14 +102,14 @@ 02022f58 g 00000010 gBattleTextBuff1 02022f68 g 00000010 gBattleTextBuff2 02022f78 g 00000010 gBattleTextBuff3 -02022f88 l 00000064 sUnusedUnknownArray +02022f88 l 00000064 sFlickerArray 02022fec g 00000004 gBattleTypeFlags 02022ff0 g 00000001 gBattleTerrain 02022ff4 g 00000004 gUnusedFirstBattleVar1 02022ff8 g 00000060 gMultiPartnerParty 02023058 l 00000004 sMultiPartnerPartyBuffer -0202305c g 00000004 gUnknown_0202305C -02023060 g 00000004 gUnknown_02023060 +0202305c g 00000004 gBattleAnimBgTileBuffer +02023060 g 00000004 gBattleAnimBgTilemapBuffer 02023064 g 00000800 gBattleBufferA 02023864 g 00000800 gBattleBufferB 02024064 g 00000001 gActiveBattler @@ -304,7 +304,7 @@ 020383f0 l 00000004 sBattleAnimScriptPtr 020383f4 l 00000004 sBattleAnimScriptRetAddr 020383f8 g 00000004 gAnimScriptCallback -020383fc l 00000001 gAnimFramesToWait +020383fc l 00000001 sAnimFramesToWait 020383fd g 00000001 gAnimScriptActive 020383fe g 00000001 gAnimVisualTaskCount 020383ff g 00000001 gAnimSoundTaskCount @@ -623,7 +623,7 @@ 0203ca18 l 00000258 sSavedOpponentParty 0203cc70 l 00000010 sPlayerMonMoves 0203cc80 l 00000050 sPlayers -0203ccd0 l 00000001 sUnknown_0203CCD0 +0203ccd0 l 00000001 sIsPlaybackFinished 0203ccd1 l 00000008 sRecordMixFriendName 0203ccd9 l 00000001 sRecordMixFriendClass 0203ccda l 00000001 sApprenticeId @@ -2902,8 +2902,8 @@ 080355b4 l 00000044 SharesPalWithAnyActive 080355f8 g 00000010 GetTilesPerImage 08035608 l 00000000 .gcc2_compiled. -08035608 l 00000040 sub_8035608 -08035648 l 0000000e sub_8035648 +08035608 l 00000040 UnusedBattleInit +08035648 l 0000000e CB2_UnusedBattleInit 08035658 g 00000078 BattleInitBgsAndWindows 080356d0 g 0000003c InitBattleBgsVideo 0803570c g 00000064 LoadBattleMenuWindowGfx @@ -2923,17 +2923,17 @@ 08036eb8 l 000000f2 FindLinkBattleMaster 08036fac l 000004ac CB2_HandleStartBattle 08037458 l 000005a0 CB2_HandleStartMultiPartnerBattle -080379f8 l 000000e4 sub_80379F8 +080379f8 l 000000e4 SetMultiPartnerMenuParty 08037adc l 00000250 CB2_PreInitMultiBattle 08037d2c l 000000c8 CB2_PreInitIngamePlayerPartnerBattle 08037df4 l 0000062c CB2_HandleStartMultiBattle 08038420 g 0000007c BattleMainCB2 0803849c l 00000048 FreeRestoreBattleData 080384e4 g 00000044 CB2_QuitRecordedBattle -08038528 g 00000010 sub_8038528 -08038538 l 000000b0 sub_8038538 +08038528 l 00000010 SpriteCB_UnusedBattleInit +08038538 l 000000b0 SpriteCB_UnusedBattleInit_Main 080385e8 l 0000041c CreateNPCTrainerParty -08038a04 g 00000024 sub_8038A04 +08038a04 l 00000024 HBlankCB_Battle 08038a28 g 000000d8 VBlankCB_Battle 08038b00 g 00000002 SpriteCB_VsLetterDummy 08038b04 l 00000070 SpriteCB_VsLetter @@ -2943,9 +2943,9 @@ 08038f14 l 0000001e CB2_EndLinkBattle 08038f34 l 000002ac EndLinkBattleInSteps 080391e0 g 000000c8 GetBattleBgTemplateData -080392a8 l 000000d4 sub_80392A8 -0803937c l 0000001e sub_803937C -0803939c l 000003d0 sub_803939C +080392a8 l 000000d4 CB2_InitAskRecordBattle +0803937c l 0000001e CB2_AskRecordBattle +0803939c l 000003d0 AskRecordBattle 0803976c l 00000058 TryCorrectShedinjaLanguage 080397c4 g 00000018 GetBattleWindowTemplatePixelWidth 080397dc g 00000030 SpriteCb_WildMon @@ -2953,24 +2953,24 @@ 08039838 l 0000005c SpriteCb_WildMonShowHealthbox 08039894 l 00000024 SpriteCb_WildMonAnimate 080398b8 g 00000002 SpriteCallbackDummy_2 -080398bc l 00000014 sub_80398BC -080398d0 l 00000064 sub_80398D0 +080398bc l 00000014 SpriteCB_InitFlicker +080398d0 l 00000064 SpriteCB_Flicker 08039934 g 00000114 SpriteCB_FaintOpponentMon 08039a48 l 00000090 SpriteCB_AnimFaintOpponent 08039ad8 g 0000001c SpriteCb_ShowAsMoveTarget 08039af4 l 00000036 SpriteCb_BlinkVisible 08039b2c g 0000002c SpriteCb_HideAsMoveTarget -08039b58 g 0000005c SpriteCb_OpponentMonFromBall +08039b58 g 0000005c SpriteCB_OpponentMonFromBall 08039bb4 g 0000000c SpriteCB_BattleSpriteStartSlideLeft 08039bc0 l 00000030 SpriteCB_BattleSpriteSlideLeft -08039bf0 l 0000000c sub_80105DC -08039bfc l 00000002 SpriteCallbackDummy_3 +08039bf0 l 0000000c SetIdleSpriteCallback +08039bfc l 00000002 SpriteCB_Idle 08039c00 g 00000028 SpriteCB_FaintSlideAnim 08039c28 g 00000120 DoBounceEffect 08039d48 g 000000b0 EndBounceEffect 08039df8 l 0000004c SpriteCB_BounceEffect -08039e44 g 0000001c SpriteCb_PlayerMonFromBall -08039e60 g 00000024 sub_8039E60 +08039e44 g 0000001c SpriteCB_PlayerMonFromBall +08039e60 l 00000024 SpriteCB_TrainerThrowObject_Main 08039e84 g 00000018 SpriteCB_TrainerThrowObject 08039e9c g 0000002c sub_8039E9C 08039ec8 g 00000002 BeginBattleIntroDummy @@ -2989,11 +2989,11 @@ 0803b1dc l 00000080 BattleIntroOpponent2SendsOutMonAnimation 0803b25c l 000000b8 BattleIntroOpponent1SendsOutMonAnimation 0803b314 l 00000098 BattleIntroRecordMonsToDex -0803b3ac g 00000020 sub_803B3AC +0803b3ac l 00000020 BattleIntroSkipRecordMonsToDex 0803b3cc l 00000060 BattleIntroPrintPlayerSendsOut 0803b42c l 0000009c BattleIntroPlayer2SendsOutMonAnimation 0803b4c8 l 000000d0 BattleIntroPlayer1SendsOutMonAnimation -0803b598 g 00000090 sub_803B598 +0803b598 l 00000090 BattleIntroSwitchInPlayerMons 0803b628 l 000002dc TryDoEventsBeforeFirstTurn 0803b904 l 000000b8 HandleEndTurn_ContinueBattle 0803b9bc g 000001cc BattleTurnPassed @@ -3001,7 +3001,7 @@ 0803bda0 g 000000d4 SwitchPartyOrder 0803be74 l 00000f44 HandleTurnActionSelectionState 0803cdb8 l 00000040 AllAtActionConfirmed -0803cdf8 l 000000e4 sub_803CDF8 +0803cdf8 l 000000e4 UpdateBattlerPartyOrdersOnSwitch 0803cedc g 00000034 SwapTurnOrder 0803cf10 g 000003d8 GetWhoStrikesFirst 0803d2e8 l 00000298 SetActionsAndBattlersTurnOrder @@ -3122,7 +3122,7 @@ 0804a24c l 00000084 Cmd_jumpifstatus3condition 0804a2d0 l 0000005a Cmd_jumpiftype 0804a32c l 000009a4 Cmd_getexp -0804acd0 l 00000260 Cmd_unknown_24 +0804acd0 l 00000260 Cmd_checkteamslost 0804af30 l 00000040 MoveValuesCleanUp 0804af70 l 00000018 Cmd_movevaluescleanup 0804af88 l 00000018 Cmd_setmultihit @@ -3156,7 +3156,7 @@ 0804b784 l 0000004a Cmd_jumpifabilitypresent 0804b7d0 l 0000001c Cmd_endselectionscript 0804b7ec l 000000c4 Cmd_playanimation -0804b8b0 l 000000cc Cmd_playanimation2 +0804b8b0 l 000000cc Cmd_playanimation_var 0804b97c l 0000005c Cmd_setgraphicalstatchangevalues 0804b9d8 l 000001f4 Cmd_playstatchangeanimation 0804bbcc l 00000a28 Cmd_moveend @@ -3182,7 +3182,7 @@ 0804e508 l 00000090 Cmd_hitanimation 0804e598 l 00000140 GetTrainerMoneyToGive 0804e6d8 l 0000008c Cmd_getmoneyreward -0804e764 l 000000b4 Cmd_unknown_5E +0804e764 l 000000b4 Cmd_updatebattlermoves 0804e818 l 00000050 Cmd_swapattackerwithtarget 0804e868 l 00000030 Cmd_incrementgamestat 0804e898 l 000000c8 Cmd_drawpartystatussummary @@ -3199,12 +3199,12 @@ 0804ef04 l 000001fc Cmd_drawlvlupbox 0804f100 l 00000044 DrawLevelUpWindow1 0804f144 l 00000038 DrawLevelUpWindow2 -0804f17c l 00000050 sub_804F17C -0804f1cc l 00000054 sub_804F1CC -0804f220 l 00000124 PutLevelAndGenderOnLvlUpBox -0804f344 l 00000040 sub_804F344 -0804f384 l 000000cc PutMonIconOnLvlUpBox -0804f450 l 00000048 SpriteCB_MonIconOnLvlUpBox +0804f17c l 00000050 InitLevelUpBanner +0804f1cc l 00000054 SlideInLevelUpBanner +0804f220 l 00000124 DrawLevelUpBannerText +0804f344 l 00000040 SlideOutLevelUpBanner +0804f384 l 000000cc PutMonIconOnLvlUpBanner +0804f450 l 00000048 SpriteCB_MonIconOnLvlUpBanner 0804f498 l 0000003a IsMonGettingExpSentOut 0804f4d4 l 00000018 Cmd_resetsentmonsvalue 0804f4ec l 00000020 Cmd_setatktoplayer0 @@ -3342,7 +3342,7 @@ 08055f5c l 000000b8 Cmd_setweatherballtype 08056014 l 000000a8 Cmd_tryrecycleitem 080560bc l 000000b0 Cmd_settypetoterrain -0805616c l 000000c4 Cmd_pursuitrelated +0805616c l 000000c4 Cmd_pursuitdoubles 08056230 l 00000054 Cmd_snatchsetbattlers 08056284 l 0000007c Cmd_removelightscreenreflect 08056300 l 000003a8 Cmd_handleballthrow @@ -6577,74 +6577,74 @@ 080a3c84 l 00000032 ClearSpriteIndex 080a3cb8 l 0000002c WaitAnimFrameCount 080a3ce4 l 00000040 RunAnimScriptCommand -080a3d24 l 00000068 ScriptCmd_loadspritegfx -080a3d8c l 0000004c ScriptCmd_unloadspritegfx -080a3dd8 l 000000f4 ScriptCmd_createsprite -080a3ecc l 0000007c ScriptCmd_createvisualtask -080a3f48 l 00000040 ScriptCmd_delay -080a3f88 l 00000034 ScriptCmd_waitforvisualfinish -080a3fbc l 00000002 ScriptCmd_hang1 -080a3fc0 l 00000002 ScriptCmd_hang2 -080a3fc4 l 00000108 ScriptCmd_end -080a40cc l 00000028 ScriptCmd_playse -080a40f4 l 000000e4 sub_80A40F4 -080a41d8 l 00000138 ScriptCmd_monbg +080a3d24 l 00000068 Cmd_loadspritegfx +080a3d8c l 0000004c Cmd_unloadspritegfx +080a3dd8 l 000000f4 Cmd_createsprite +080a3ecc l 0000007c Cmd_createvisualtask +080a3f48 l 00000040 Cmd_delay +080a3f88 l 00000034 Cmd_waitforvisualfinish +080a3fbc l 00000002 Cmd_nop +080a3fc0 l 00000002 Cmd_nop2 +080a3fc4 l 00000108 Cmd_end +080a40cc l 00000028 Cmd_playse +080a40f4 l 000000e4 Task_InitUpdateMonBg +080a41d8 l 00000138 Cmd_monbg 080a4310 g 0000007c IsBattlerSpriteVisible 080a438c g 00000314 MoveBattlerSpriteToBG -080a46a0 l 00000080 sub_80A46A0 -080a4720 g 0000005c sub_80A4720 +080a46a0 l 00000080 FlipBattlerBgTiles +080a4720 g 0000005c RelocateBattleBgPal 080a477c g 0000005c ResetBattleAnimBg -080a47d8 l 000000d8 task_pA_ma0A_obj_to_bg_pal -080a48b0 l 000000d0 ScriptCmd_clearmonbg -080a4980 l 00000098 sub_80A4980 -080a4a18 l 000000c4 ScriptCmd_monbg_22 -080a4adc l 000000d4 ScriptCmd_clearmonbg_23 -080a4bb0 l 00000098 sub_80A4BB0 -080a4c48 l 00000038 ScriptCmd_setalpha -080a4c80 l 00000028 ScriptCmd_setbldcnt -080a4ca8 l 00000024 ScriptCmd_blendoff -080a4ccc l 00000034 ScriptCmd_call -080a4d00 l 00000014 ScriptCmd_return -080a4d14 l 00000034 ScriptCmd_setarg -080a4d48 l 00000040 ScriptCmd_choosetwoturnanim -080a4d88 l 00000042 ScriptCmd_jumpifmoveturn -080a4dcc l 00000024 ScriptCmd_goto +080a47d8 l 000000d8 Task_UpdateMonBg +080a48b0 l 000000d0 Cmd_clearmonbg +080a4980 l 00000098 Task_ClearMonBg +080a4a18 l 000000c4 Cmd_monbg_static +080a4adc l 000000d4 Cmd_clearmonbg_static +080a4bb0 l 00000098 Task_ClearMonBgStatic +080a4c48 l 00000038 Cmd_setalpha +080a4c80 l 00000028 Cmd_setbldcnt +080a4ca8 l 00000024 Cmd_blendoff +080a4ccc l 00000034 Cmd_call +080a4d00 l 00000014 Cmd_return +080a4d14 l 00000034 Cmd_setarg +080a4d48 l 00000040 Cmd_choosetwoturnanim +080a4d88 l 00000042 Cmd_jumpifmoveturn +080a4dcc l 00000024 Cmd_goto 080a4df0 g 00000026 IsContest -080a4e18 l 00000044 ScriptCmd_fadetobg -080a4e5c l 00000098 ScriptCmd_fadetobgfromset +080a4e18 l 00000044 Cmd_fadetobg +080a4e5c l 00000098 Cmd_fadetobgfromset 080a4ef4 l 000000d4 Task_FadeToBg 080a4fc8 l 000000c8 LoadMoveBg 080a5090 l 0000001a LoadDefaultBg -080a50ac l 00000044 ScriptCmd_restorebg -080a50f0 l 00000034 ScriptCmd_waitbgfadeout -080a5124 l 00000034 ScriptCmd_waitbgfadein -080a5158 l 00000020 ScriptCmd_changebg +080a50ac l 00000044 Cmd_restorebg +080a50f0 l 00000034 Cmd_waitbgfadeout +080a5124 l 00000034 Cmd_waitbgfadein +080a5158 l 00000020 Cmd_changebg 080a5178 g 000000fe BattleAnimAdjustPanning 080a5278 g 00000074 BattleAnimAdjustPanning2 080a52ec g 00000028 KeepPanInRange 080a5314 g 0000003e CalculatePanIncrement -080a5354 l 00000038 ScriptCmd_playsewithpan -080a538c l 0000002c ScriptCmd_setpan -080a53b8 l 000000c0 ScriptCmd_panse_1B +080a5354 l 00000038 Cmd_playsewithpan +080a538c l 0000002c Cmd_setpan +080a53b8 l 000000c0 Cmd_panse 080a5478 l 00000090 Task_PanFromInitialToTarget -080a5508 l 00000094 ScriptCmd_panse_26 -080a559c l 000000c0 ScriptCmd_panse_27 -080a565c l 00000088 ScriptCmd_loopsewithpan +080a5508 l 00000094 Cmd_panse_adjustnone +080a559c l 000000c0 Cmd_panse_adjustall +080a565c l 00000088 Cmd_loopsewithpan 080a56e4 l 0000005c Task_LoopAndPlaySE -080a5740 l 00000074 ScriptCmd_waitplaysewithpan +080a5740 l 00000074 Cmd_waitplaysewithpan 080a57b4 l 00000044 Task_WaitAndPlaySE -080a57f8 l 00000074 ScriptCmd_createsoundtask -080a586c l 00000084 ScriptCmd_waitsound -080a58f0 l 00000054 ScriptCmd_jumpargeq -080a5944 l 00000040 ScriptCmd_jumpifcontest -080a5984 l 00000058 ScriptCmd_monbgprio_28 -080a59dc l 00000030 ScriptCmd_monbgprio_29 -080a5a0c l 00000072 ScriptCmd_monbgprio_2A -080a5a80 l 0000003c ScriptCmd_invisible -080a5abc l 00000040 ScriptCmd_visible -080a5afc l 000000b0 ScriptCmd_doublebattle_2D -080a5bac l 00000098 ScriptCmd_doublebattle_2E -080a5c44 l 00000028 ScriptCmd_stopsound +080a57f8 l 00000074 Cmd_createsoundtask +080a586c l 00000084 Cmd_waitsound +080a58f0 l 00000054 Cmd_jumpargeq +080a5944 l 00000040 Cmd_jumpifcontest +080a5984 l 00000058 Cmd_splitbgprio +080a59dc l 00000030 Cmd_splitbgprio_all +080a5a0c l 00000072 Cmd_splitbgprio_foes +080a5a80 l 0000003c Cmd_invisible +080a5abc l 00000040 Cmd_visible +080a5afc l 000000b0 Cmd_teamattack_moveback +080a5bac l 00000098 Cmd_teamattack_movefwd +080a5c44 l 00000028 Cmd_stopsound 080a5c6c g 0000014a GetBattlerSpriteCoord 080a5c6c l 00000000 .gcc2_compiled. 080a5db8 g 000001e8 GetBattlerYDelta @@ -6754,8 +6754,8 @@ 080a805c g 0000006a PrepareEruptAnimTaskData 080a80c8 g 00000078 UpdateEruptAnimTask 080a8140 g 00000034 AnimTask_GetFrustrationPowerLevel -080a8174 g 00000104 sub_80A8174 -080a8278 g 0000006c sub_80A8278 +080a8174 l 00000104 SetPriorityForVisibleBattlers +080a8278 g 0000006c InitPrioritiesForVisibleBattlers 080a82e4 g 00000042 GetBattlerSpriteSubpriority 080a8328 g 0000003a GetBattlerSpriteBGPriority 080a8364 g 0000002e GetBattlerSpriteBGPriorityRank @@ -7075,7 +7075,7 @@ 080b077c l 00000038 DoSafariBattle 080b07b4 l 00000050 DoBattlePikeWildBattle 080b0804 l 00000024 DoTrainerBattle -080b0828 l 00000042 sub_80B0828 +080b0828 l 00000042 DoBattlePyramidTrainerHillBattle 080b086c g 0000003c StartWallyTutorialBattle 080b08a8 g 00000044 BattleSetup_StartScriptedWildBattle 080b08ec g 00000048 BattleSetup_StartLatiBattle @@ -7137,7 +7137,7 @@ 080b1d18 l 00000014 GetTrainerCantBattleSpeech 080b1d2c l 00000024 FirstBattleTrainerIdToRematchTableId 080b1d50 l 00000042 TrainerIdToRematchTableId -080b1d94 l 00000028 sub_80B1D94 +080b1d94 l 00000028 IsRematchForbidden 080b1dbc l 00000040 SetRematchIdForTrainer 080b1dfc l 00000098 UpdateRandomTrainerRematches 080b1e94 g 0000002c UpdateRematchIfDefeated @@ -10385,8 +10385,8 @@ 08118844 l 0000027c BattleIntroSlide3 08118ac0 l 000002a8 BattleIntroSlideLink 08118d68 l 00000252 BattleIntroSlidePartner -08118fbc g 000000d8 sub_8118FBC -08119094 g 000000d0 unref_sub_8119094 +08118fbc g 000000d8 DrawBattlerOnBg +08119094 l 000000d0 DrawBattlerOnBgDMA 08119164 g 00000036 MovePlayerOnBike 08119164 l 00000000 .gcc2_compiled. 0811919c l 00000030 MovePlayerOnMachBike @@ -13979,7 +13979,7 @@ 08184d88 l 0000001c WaitAnimEnd 08184da4 g 000000b4 RecordedBattle_Init 08184da4 l 00000000 .gcc2_compiled. -08184e58 g 00000164 sub_8184E58 +08184e58 g 00000164 RecordedBattle_SetTrainerInfo 08184fbc g 0000004c RecordedBattle_SetBattlerAction 08185008 g 0000004c RecordedBattle_ClearBattlerAction 08185054 g 0000007a RecordedBattle_GetBattlerAction @@ -14009,10 +14009,10 @@ 08185fb8 g 0000000c GetBattleSceneInRecordedBattle 08185fc4 g 0000000c GetTextSpeedInRecordedBattle 08185fd0 g 0000006c RecordedBattle_CopyBattlerMoves -0818603c g 000003fc sub_818603C +0818603c g 000003fc RecordedBattle_CheckMovesetChanges 08186438 g 0000000c GetAiScriptsInRecordedBattle -08186444 g 0000000c sub_8186444 -08186450 g 00000018 sub_8186450 +08186444 g 0000000c RecordedBattle_SetPlaybackFinished +08186450 g 00000018 RecordedBattle_CanStopPlayback 08186468 g 00000034 GetRecordedBattleRecordMixFriendName 0818649c g 0000000c GetRecordedBattleRecordMixFriendClass 081864a8 g 0000000c GetRecordedBattleApprenticeId @@ -35154,13 +35154,13 @@ 082da7b7 g 00000000 BattleScript_FaintTarget 082da7c4 g 00000000 BattleScript_GiveExp 082da7cd g 00000000 BattleScript_HandleFaintedMon -082da816 g 00000000 BattleScript_FaintedMonTryChooseAnother -082da8d0 g 00000000 BattleScript_FaintedMonChooseAnother +082da816 g 00000000 BattleScript_FaintedMonTryChoose +082da8d0 g 00000000 BattleScript_FaintedMonSendOutNew 082da8f5 g 00000000 BattleScript_FaintedMonEnd -082da8f6 g 00000000 BattleScript_HandleFaintedMonMultiple -082da8fc g 00000000 BattleScript_HandleFaintedMonMultipleStart -082da908 g 00000000 BattleScript_HandleFaintedMonLoop -082da92c g 00000000 BattleScript_HandleFaintedMonMultipleEnd +082da8f6 g 00000000 BattleScript_LinkHandleFaintedMonMultiple +082da8fc g 00000000 BattleScript_LinkHandleFaintedMonMultipleStart +082da908 g 00000000 BattleScript_LinkHandleFaintedMonLoop +082da92c g 00000000 BattleScript_LinkHandleFaintedMonMultipleEnd 082da92d g 00000000 BattleScript_LocalTrainerBattleWon 082da943 g 00000000 BattleScript_LocalTwoTrainersDefeated 082da946 g 00000000 BattleScript_LocalBattleWonLoseTexts @@ -40261,7 +40261,7 @@ 0831aba8 l 000000c8 gBattleTerrainTable 0831ac70 l 0000000c sIntroScanlineParams16Bit 0831ac7c l 0000000c sIntroScanlineParams32Bit -0831ac88 g 00000018 gUnknown_0831AC88 +0831ac88 g 00000018 gUnusedBattleInitSprite 0831aca0 l 00000005 sText_ShedinjaJpnName 0831aca8 g 00000008 gOamData_BattleSpriteOpponentSide 0831acb0 g 00000008 gOamData_BattleSpritePlayerSide @@ -40373,11 +40373,11 @@ 0831c134 l 000000f0 sStatusFlagsForMoveEffects 0831c224 l 0000009c sMoveEffectBS_Ptrs 0831c2c0 l 00000008 sUnusedWinTemplate -0831c2c8 l 00000020 sUnknown_0831C2C8 -0831c2e8 l 000000c8 sUnknown_0831C2E8 +0831c2c8 l 00000020 sLevelUpBanner_Pal +0831c2e8 l 000000c8 sLevelUpBanner_Gfx 0831c3b0 l 00000006 sRubyLevelUpStatBoxStats -0831c3b8 l 00000008 sOamData_MonIconOnLvlUpBox -0831c3c0 l 00000018 sSpriteTemplate_MonIconOnLvlUpBox +0831c3b8 l 00000008 sOamData_MonIconOnLvlUpBanner +0831c3c0 l 00000018 sSpriteTemplate_MonIconOnLvlUpBanner 0831c3d8 l 00000008 sProtectSuccessRates 0831c3e0 l 00000028 sMovesForbiddenToCopy 0831c408 l 0000000c sFlailHpScaleToPowerTable @@ -50101,8 +50101,8 @@ 08593c4c g 00000010 gGuardRingAffineAnimCmds2 08593c5c g 00000008 gGuardRingAffineAnimTable 08593c64 g 00000018 gGuardRingSpriteTemplate -08593c7c g 00000380 gUnknown_8593C80 -08593ffc g 00001000 gUnknown_8593FFC +08593c7c l 00000380 sUnusedWater_Gfx +08593ffc l 00001000 sUnusedWater 08594ffc l 00000020 sAnim_RainDrop 0859501c l 00000004 sAnims_RainDrop 08595020 g 00000018 gRainDropSpriteTemplate