From 03b69e1e6cacc9b47aed04c080eed15adbe6cbf9 Mon Sep 17 00:00:00 2001 From: lhearachel Date: Thu, 25 Jan 2024 06:32:58 +0000 Subject: [PATCH] Merge pull request #123 from lhearachel/battle_scripts --- platinumus.xMAP | 526 ++++++++++++++++++++++++------------------------ 1 file changed, 263 insertions(+), 263 deletions(-) diff --git a/platinumus.xMAP b/platinumus.xMAP index 604992da05..2818424bec 100644 --- a/platinumus.xMAP +++ b/platinumus.xMAP @@ -5587,7 +5587,7 @@ 10](PokemonPersonalData_GetLevelAt,func) found in global src_pokemon.c.o 11](PokemonPersonalData_GetValue,func) found in global src_pokemon.c.o 11](Pokemon_LoadExperienceTableOf,func) found in local src_pokemon.c.o - 11](monExpTable$15634,object) found in local src_pokemon.c.o + 11](monExpTable$15633,object) found in local src_pokemon.c.o 10](PokemonPersonalData_Free,func) found in global src_pokemon.c.o 9](_ll_shl,notype) found in global FP_fastI_v5t_LE.a 9](MoveTable_CalcMaxPP,func) found in global src_move_table.c.o @@ -18076,7 +18076,7 @@ 73](sub_02026074,func) found in global src_unk_0202602C.c.o 73](sub_02076FD4,func) found in global src_pokemon.c.o 74](sub_02076F84,func) found in global src_pokemon.c.o - 75](@21295,object) found in local src_pokemon.c.o + 75](@21294,object) found in local src_pokemon.c.o 73](sub_02098808,func) found in global src_unk_02098700.c.o 73](sub_02078838,func) found in global src_pokemon.c.o 74](sub_02078804,func) found in global src_pokemon.c.o @@ -21863,7 +21863,7 @@ 47](ov16_0223F344,func) found in global src_overlay016_ov16_0223DF00.c.o 47](ov16_0223F350,func) found in global src_overlay016_ov16_0223DF00.c.o 44](ov16_0223DECC,func) found in local src_overlay016_ov16_0223B140.c.o - 44](@19534,object) found in local src_overlay016_ov16_0223B140.c.o + 44](@19532,object) found in local src_overlay016_ov16_0223B140.c.o 44](ov16_0223CF1C,func) found in local src_overlay016_ov16_0223B140.c.o 43](ov16_0223D354,func) found in local src_overlay016_ov16_0223B140.c.o 44](sub_02038A1C,func) found in global src_unk_020366A0.c.o @@ -22374,7 +22374,7 @@ 50](ov13_02228A38,func) found in global src_overlay013_ov13_02228A38.c.o 50](ov13_02226ED0,func) found in local src_overlay013_ov13_022264F4.c.o 51](sub_020183A0,func) found in global src_unk_02018340.c.o - 51](@15493,object) found in local src_overlay013_ov13_022264F4.c.o + 51](@15491,object) found in local src_overlay013_ov13_022264F4.c.o 50](ov13_02226FC4,func) found in local src_overlay013_ov13_022264F4.c.o 51](ov13_02228128,func) found in global src_overlay013_ov13_02228128.c.o 52](ov13_02228460,func) found in local src_overlay013_ov13_02228128.c.o @@ -22428,7 +22428,7 @@ 52](ov13_02227910,func) found in local src_overlay013_ov13_02227288.c.o 50](ov13_02227BDC,func) found in global src_overlay013_ov13_02227BDC.c.o 51](ov13_02227C08,func) found in local src_overlay013_ov13_02227BDC.c.o - 52](@13801,object) found in local src_overlay013_ov13_02227BDC.c.o + 52](@13799,object) found in local src_overlay013_ov13_02227BDC.c.o 51](ov13_02227C54,func) found in local src_overlay013_ov13_02227BDC.c.o 51](ov13_02227DE8,func) found in local src_overlay013_ov13_02227BDC.c.o 52](ov13_02227D78,func) found in local src_overlay013_ov13_02227BDC.c.o @@ -22519,7 +22519,7 @@ 49](ov13_0221FE5C,func) found in local src_overlay013_ov13_0221FC20.c.o 50](ov13_02220F98,func) found in local src_overlay013_ov13_0221FC20.c.o 50](ov13_02220C0C,func) found in local src_overlay013_ov13_0221FC20.c.o - 51](@15317,object) found in local src_overlay013_ov13_0221FC20.c.o + 51](@15315,object) found in local src_overlay013_ov13_0221FC20.c.o 50](ov13_02220D4C,func) found in local src_overlay013_ov13_0221FC20.c.o 51](ov13_02225710,func) found in global src_overlay013_ov13_02225710.c.o 52](ov13_02225AF0,func) found in local src_overlay013_ov13_02225710.c.o @@ -22565,7 +22565,7 @@ 50](ov13_02226444,func) found in global src_overlay013_ov13_02225710.c.o 50](ov13_02224500,func) found in global src_overlay013_ov13_02224500.c.o 51](ov13_0222453C,func) found in local src_overlay013_ov13_02224500.c.o - 52](@13800,object) found in local src_overlay013_ov13_02224500.c.o + 52](@13798,object) found in local src_overlay013_ov13_02224500.c.o 51](ov13_02224588,func) found in local src_overlay013_ov13_02224500.c.o 51](ov13_02224670,func) found in local src_overlay013_ov13_02224500.c.o 52](sub_0208E9E4,func) found in global src_unk_0208C324.c.o @@ -22763,11 +22763,11 @@ 49](ov12_02220474,func) found in global src_overlay012_ov12_0221FC20.c.o 49](ov12_022201B4,func) found in global src_overlay012_ov12_0221FC20.c.o 49](ov12_0221FDD4,func) found in global src_overlay012_ov12_0221FC20.c.o - 49](@15899,object) found in local src_overlay012_ov12_0221FC20.c.o + 49](@15897,object) found in local src_overlay012_ov12_0221FC20.c.o 50](ov12_022222B0,func) found in local src_overlay012_ov12_0221FC20.c.o 51](ov12_02221B64,func) found in local src_overlay012_ov12_0221FC20.c.o 52](ov12_02221B54,func) found in local src_overlay012_ov12_0221FC20.c.o - 52](@16878,object) found in local src_overlay012_ov12_0221FC20.c.o + 52](@16876,object) found in local src_overlay012_ov12_0221FC20.c.o 51](ov12_02222338,func) found in global src_overlay012_ov12_0221FC20.c.o 50](ov12_0222206C,func) found in local src_overlay012_ov12_0221FC20.c.o 51](sub_02018898,func) found in global src_unk_02018340.c.o @@ -23845,42 +23845,42 @@ 48](sBattleCommands,object) found in local src_overlay016_battle_script.c.o 49](BtlCmd_End,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_PopScript,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_ReloadPokemon,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_RefreshMonData,func) found in local src_overlay016_battle_script.c.o 50](BattleScript_Iter,func) found in local src_overlay016_battle_script.c.o 50](BattleScript_Read,func) found in local src_overlay016_battle_script.c.o 50](BattleScript_Battler,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_ReloadPokemon,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_LoadPersonalFormData,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_LoadArchivedMonData,func) found in local src_overlay016_battle_script.c.o 50](BattleScript_VarAddress,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CheckMoveIsType,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_WaitFramesNoSkip,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CheckSafariContinues,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_PlayMusic,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CheckCurMoveIsType,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_WaitTime,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CheckSafariGameDone,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PlayBGM,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PlayMusic,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_PlayMoveHitSoundEffect,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PlayMoveHitSound,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PlayMoveHitSoundEffect,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_RefreshSprite,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_RefreshSprite,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_TriggerHeldItemOnPivotMove,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_TriggerHeldItemOnPivotMove,func) found in global src_overlay016_battle_lib.c.o 49](BtlCmd_SetRandomTarget,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CheckWeatherNegated,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CheckIgnoreWeather,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CheckSubstitute,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryRestoreStatusOnSwitch,func) found in local src_overlay016_battle_script.c.o 50](Ability_ForbidsStatus,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_CheckLeaveWith1HP,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_ForfeitMesage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CheckHoldOnWith1HP,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PrintForfeitMessage,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_ForfeitMessage,func) found in global src_overlay016_ov16_0226485C.c.o 51](ov16_0223F58C,func) found in global src_overlay016_ov16_0223DF00.c.o - 49](BtlCmd_EscapeMesage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PrintEscapeMessage,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_EscapeMessage,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_ResultMesage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PrintBattleResultMessage,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_ResultMessage,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_TriggerHeldItemOnHit,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryRecycle,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_RemoveItem,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_BoostRandomStatBy2,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CheckWhiteOut,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CheckBlackOut,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_OAMToSprite,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_OAMToSprite,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_SpriteToOAM,func) found in local src_overlay016_battle_script.c.o @@ -23888,7 +23888,7 @@ 49](BtlCmd_TriggerAbilityOnHit,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_RestoreSprite,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_RestoreSprite,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_IncrementRecord,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_IncrementGameStat,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_FreePartyGaugeGraphics,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_FreePartyGaugeGraphics,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_LoadPartyGaugeGraphics,func) found in local src_overlay016_battle_script.c.o @@ -23905,34 +23905,34 @@ 49](BtlCmd_TryEscape,func) found in local src_overlay016_battle_script.c.o 50](Battler_CanEscape,func) found in global src_overlay016_battle_lib.c.o 49](BtlCmd_UseBagItem,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_UpdateBG,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_SetBattleBackground,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_UpdateBG,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_ChangeWeatherForm,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_ChangeForm,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_ChangeWeatherForm,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_SetMosaic,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SetMosaic,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_GetCurrentMoveData,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CheckActivateChatterEffect,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CheckChatterActivation,func) found in local src_overlay016_battle_script.c.o 50](Sound_Chatter,func) found in global src_unk_02006224.c.o 50](BattleSystem_RecordedChatter,func) found in global src_overlay016_ov16_0223DF00.c.o - 49](BtlCmd_CheckActivateSecondaryEffect,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CheckEffectActivation,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CheckStealthRock,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_SubmitResult,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_SetLinkBattleResult,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SubmitResult,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_WaitPartyScreenResult,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_WaitPokemonMenuResult,func) found in local src_overlay016_battle_script.c.o 50](BattleContext_IOBufferVal,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_ShowPartyScreen,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_ChoosePokemonMenu,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_ShowPartyScreen,func) found in global src_overlay016_ov16_0226485C.c.o 51](BattleIO_ClearBuffer,func) found in global src_overlay016_battle_lib.c.o 49](BtlCmd_WaitYesNoResult,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_Record,func) found in global src_overlay016_ov16_0223DF00.c.o 51](sub_0202F868,func) found in global src_unk_0202F1D4.c.o - 49](BtlCmd_ShowYesNoScreen,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_YesNoMenu,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_ShowYesNoScreen,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_TryFlingItem,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryFling,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_FlingItem,func) found in global src_overlay016_battle_lib.c.o 51](Battler_ItemFlingEffect,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_TryPluckBerry,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryPluck,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_PluckBerry,func) found in global src_overlay016_battle_lib.c.o 51](Battler_ItemPluckEffect,func) found in global src_overlay016_battle_lib.c.o 51](Item_IsBerry,func) found in global src_item.c.o @@ -23943,11 +23943,11 @@ 49](BtlCmd_GetTerrainMove,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryCamouflage,func) found in local src_overlay016_battle_script.c.o 50](sTerrainCamouflageType,object) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_GetItemEffectPower,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_GetItemEffect,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_IfItemEffect,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_GetItemEffectParam,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_GetItemHoldEffect,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CheckItemHoldEffect,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_IfMovedThisTurn,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_SetTrickRoom,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TrickRoom,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_GenerateEndOfBattleItem,func) found in local src_overlay016_battle_script.c.o 50](sCommonPickupRate,object) found in local src_overlay016_battle_script.c.o 50](sHoneyGatherRate,object) found in local src_overlay016_battle_script.c.o @@ -23957,7 +23957,7 @@ 49](BtlCmd_TryToxicSpikes,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryLastResort,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CheckCanShareStatus,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CheckDefenderProtecting,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryFeint,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CheckSideCondition,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TrySuckerPunch,func) found in local src_overlay016_battle_script.c.o 50](Battler_SelectedMove,func) found in global src_overlay016_battle_lib.c.o @@ -23976,11 +23976,11 @@ 49](BtlCmd_CalcGyroBallPower,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_SetTurnFlag,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_IfTurnFlag,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_ApplyTypeMatchup,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CheckForPursuit,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CalcWeatherBallPower,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_ApplyTypeEffectiveness,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryPursuit,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CalcWeatherBallParams,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CalcWeightBasedPower,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_TrySetupSnatch,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TrySnatch,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryGrudge,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryImprison,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CalcHPFalloffPower,func) found in local src_overlay016_battle_script.c.o @@ -23989,11 +23989,11 @@ 49](BtlCmd_TryYawn,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryBreakScreens,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CalcRevengePowerMul,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_MagicCoatReflect,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_TrySetupMagicCoat,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_MagicCoat,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TrySetMagicCoat,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryAssist,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_TrySetupWish,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CanSwapItems,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryWish,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TrySwapItems,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_NotHoldingMail,func) found in global src_overlay016_battle_lib.c.o 49](BtlCmd_TryHelpingHand,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_FollowMe,func) found in local src_overlay016_battle_script.c.o @@ -24003,34 +24003,34 @@ 49](BtlCmd_CheckMoveHit,func) found in local src_overlay016_battle_script.c.o 50](BattleMessage_MoveTag,func) found in local src_overlay016_battle_script.c.o 50](BattleController_CheckMoveHit,func) found in global src_overlay016_battle_controller.c.o - 49](BtlCmd_TrySetupFutureSight,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryFutureSight,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CopyStatStages,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CalcHiddenPowerParams,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_WeatherHPRecovery,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_RapidSpin,func) found in local src_overlay016_battle_script.c.o 50](BattleScript_Call,func) found in local src_overlay016_battle_script.c.o 51](BattleSystem_CallScript,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_TryReplaceBattler,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryReplaceFaintedMon,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_AnyReplacementMons,func) found in global src_overlay016_battle_lib.c.o 49](BtlCmd_CalcMagnitudePower,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_TryPresent,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_Present,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TrySafeguard,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryAttract,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CalcFuryCutterPower,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CalcRolloutPower,func) found in local src_overlay016_battle_script.c.o 50](Battler_LockMoveChoice,func) found in global src_overlay016_battle_lib.c.o 49](BtlCmd_EndOfTurnWeatherEffect,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_IfVarIsValidBattler,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_GetBattlerBySpeedOrder,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_GoToIfValidMon,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_GetMonBySpeedOrder,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryPerishSong,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CheckSpikes,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TrySpikes,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_Transform,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CanWhirlwind,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryWhirlwind,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_CanWhirlwind,func) found in global src_overlay016_battle_lib.c.o 49](BtlCmd_TrySubstitute,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_TryProtectEndure,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CanStealItem,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryProtection,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryStealItem,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_CanStealItem,func) found in global src_overlay016_battle_lib.c.o 49](BtlCmd_TryPartyStatusRefresh,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_RefreshPartyStatus,func) found in global src_overlay016_ov16_0226485C.c.o @@ -24048,61 +24048,61 @@ 49](BtlCmd_Metronome,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryMimic,func) found in local src_overlay016_battle_script.c.o 50](Move_CanBeMimicked,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_DivideByVar,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_Divide,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_DivideVarByVar,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_DivideVarByValue,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryOHKOMove,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryMist,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryReflect,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryLightScreen,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_GivePayDayMoney,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_IfMonDataVar,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_IfVar,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_AddPayDayMoney,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CompareMonDataToVar,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CompareVarToVar,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_TryConversion,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_PreparedTrainerMessage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PrintBufferedTrainerMessage,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_TrainerMessage,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_PrintLeadMonMessage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PrintFirstSendOutMessage,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PrintLeadMonMessage,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_PrintBattleStartMessage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PrintEncounterMessage,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PrintBattleStartMessage,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_PrintSendOutMessage,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PrintSendOutMessage,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_PrintRecallMessage,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PrintRecallMessage,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_PlayStatusEffectFromVar,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PlayBattleAnimationFromVar,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_ShouldShowStatusEffect,func) found in global src_overlay016_battle_lib.c.o 50](BattleIO_PlayStatusEffect,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_PlayStatusEffectAToD,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PlayBattleAnimationOnMons,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PlayStatusEffectAToD,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_PlayStatusEffect,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PlayBattleAnimation,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_PayPrizeMoney,func) found in local src_overlay016_battle_script.c.o 50](BattleScript_CalcPrizeMoney,func) found in local src_overlay016_battle_script.c.o 51](sTrainerClassPrizeMul,object) found in local src_overlay016_battle_script.c.o 50](BattleSystem_CalcMoneyPenalty,func) found in global src_overlay016_ov16_0223DF00.c.o 51](Party_GetMaxLevel,func) found in global src_pokemon.c.o - 51](badgeMul$16621,object) found in local src_overlay016_ov16_0223DF00.c.o + 51](badgeMul$16619,object) found in local src_overlay016_ov16_0223DF00.c.o 50](TrainerInfo_TakeMoney,func) found in global src_trainer_info.c.o - 49](BtlCmd_TrainerMessage,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_SetStatusIcon,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PrintTrainerMessage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_SetHealthbarStatus,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SetStatusIcon,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_UnlockMoveChoice,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_LockMoveChoice,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_ResetStatChanges,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_ResetAllStatChanges,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_SetMirrorMove,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CallSubFromVar,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CallSub,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_Jump,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_SetMonDataFromVar,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CallFromVar,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_Call,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_GoTo,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_UpdateMonDataFromVar,func) found in local src_overlay016_battle_script.c.o 50](BattleAI_SetAbility,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_SetVarFromVar,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_UpdateVarFromVar,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_Random,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_CheckAbility,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_ToggleVanish,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_ToggleVanish,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_ClearVolatileStatus,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_SetMonDataValue,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_UpdateMonData,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_ChangeStatStage,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_SetVarValue,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_SetupMultiHit,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_UpdateVar,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_SetMultiHit,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_WaitCatchMonTask,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_StartCatchMonTask,func) found in local src_overlay016_battle_script.c.o 50](BattleScript_CatchMonTask,func) found in local src_overlay016_battle_script.c.o @@ -24212,15 +24212,15 @@ 51](BattleIO_ShowPokemon,func) found in global src_overlay016_ov16_0226485C.c.o 52](Battler_CryModulation,func) found in global src_overlay016_battle_lib.c.o 52](ov16_0223EF2C,func) found in global src_overlay016_ov16_0223DF00.c.o - 49](BtlCmd_JumpIfAnySwitches,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_Switch,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_GoToIfAnySwitches,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_SwitchAndUpdateMon,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_InitBattleMon,func) found in global src_overlay016_battle_lib.c.o 50](BattleSystem_UpdateAfterSwitch,func) found in global src_overlay016_battle_lib.c.o 51](BattleAI_ClearKnownMoves,func) found in local src_overlay016_battle_lib.c.o 51](BattleAI_ClearKnownAbility,func) found in local src_overlay016_battle_lib.c.o - 49](BtlCmd_WaitPartyList,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_WaitMonSelection,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_LinkWaitMessage,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_ShowPartyList,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_ShowParty,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_Dummy2A,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_WaitGetExpTask,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_StartGetExpTask,func) found in local src_overlay016_battle_script.c.o @@ -24243,34 +24243,34 @@ 51](BattleScript_FreePartyLevelUpIcon,func) found in local src_overlay016_battle_script.c.o 51](BattleIO_ForgetMove,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_CalcExpGain,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_CheckCritical,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CalcCrit,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_CalcCriticalMulti,func) found in global src_overlay016_battle_lib.c.o 51](sCriticalStageRates,object) found in local src_overlay016_battle_lib.c.o - 49](BtlCmd_JumpToMove,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_JumpToBattleEffect,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_JumpToSub,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_FadeOut,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_GoToMoveScript,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_GoToEffectScript,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_GoToSubscript,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_FadeOutBattle,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_FadeOut,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_IfMonData,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_If,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CompareMonDataToValue,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_CompareVarToValue,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_PlaySound,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PlaySound,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_WaitFrames,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_PlayFaintingSequence,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_WaitButtonABTime,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PlayFaintAnimation,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PlayFaintingSequence,func) found in global src_overlay016_ov16_0226485C.c.o 50](BattleSystem_CleanupFaintedMon,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_FaintBattler,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TryFaintMon,func) found in local src_overlay016_battle_script.c.o 50](BattleScript_UpdateFriendship,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_UpdateHPGauge,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_UpdateHealthBar,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_UpdateHPGauge,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_UpdateHPValue,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_FlickerBattler,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_UpdateHealthBarValue,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_FlickerMon,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_FlickerBattler,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_PlayMoveAnimationA2D,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PlayMoveAnimationOnMons,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PlayMoveAnimationA2D,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_PlayMoveAnimation,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PlayMoveAnimation,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_PrintSideLocalMessage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_BufferLocalMessage,func) found in local src_overlay016_battle_script.c.o 50](BattleMessageParams_Make,func) found in local src_overlay016_battle_script.c.o 50](BattleMessage_Make,func) found in local src_overlay016_battle_script.c.o 51](BattleMessage_NameTag,func) found in local src_overlay016_battle_script.c.o @@ -24287,8 +24287,8 @@ 51](BattleMessage_StatusTag,func) found in local src_overlay016_battle_script.c.o 51](BattleMessage_FlavorTag,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_PrintMessage,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_PrepareMessage,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_PrintPreparedMessage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_BufferMessage,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PrintBufferedMessage,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_PrintGlobalMessage,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_PrintMessage,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_PrintAttackMessage,func) found in local src_overlay016_battle_script.c.o @@ -24298,35 +24298,35 @@ 49](BtlCmd_CalcDamage,func) found in local src_overlay016_battle_script.c.o 49](BtlCmd_Wait,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_UpdateTimeout,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_SlideHPGaugeOut,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_HealthbarSlideOut,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SlideHPGaugeOut,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_SlideHPGaugeInWait,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_HealthbarSlideInDelay,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SlideHPGaugeIn,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_SlideHPGaugeIn,func) found in local src_overlay016_battle_script.c.o - 49](BtlCmd_Unused0A,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_HealthbarSlideIn,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_BackgroundSlideIn,func) found in local src_overlay016_battle_script.c.o 50](ov16_02266460,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_SlideTrainerIn,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TrainerSlideIn,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SlideTrainerIn,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_SlideTrainerOut,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_TrainerSlideOut,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SlideTrainerOut,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_ThrowTrainerBall,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_ThrowPokeball,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_ThrowTrainerBall,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_SetTrainerEncounter,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SetTrainerEncounter,func) found in global src_overlay016_ov16_0226485C.c.o 49](BtlCmd_DeletePokemon,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_DeletePokemon,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_ReturnPokemon,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_RecallPokemon,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_ReturnPokemon,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_ShowPokemon,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PokemonSendOut,func) found in local src_overlay016_battle_script.c.o 50](BattleSystem_DexFlagSeen,func) found in global src_overlay016_ov16_0223DF00.c.o 51](sub_020272A4,func) found in global src_unk_0202631C.c.o 50](BattleSystem_FlagBattlerExpGain,func) found in global src_overlay016_battle_lib.c.o 50](BattleSystem_ClearSideExpGain,func) found in global src_overlay016_battle_lib.c.o - 49](BtlCmd_ShowEncounter,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PokemonSlideIn,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_ShowEncounter,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_SetEncounter,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_SetPokemonEncounter,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SetEncounter,func) found in global src_overlay016_ov16_0226485C.c.o - 49](BtlCmd_SetupBattleUI,func) found in local src_overlay016_battle_script.c.o + 49](BtlCmd_PlayEncounterAnimation,func) found in local src_overlay016_battle_script.c.o 50](BattleIO_SetupBattleUI,func) found in global src_overlay016_ov16_0226485C.c.o 51](ov16_0223F4E8,func) found in global src_overlay016_ov16_0223DF00.c.o 46](BattleController_SafariFleeCommand,func) found in local src_overlay016_battle_controller.c.o @@ -66545,7 +66545,7 @@ 020F0550 00000024 .rodata Unk_020F0550 (src_unk_02073838.c.o) 020F0574 00000008 .rodata sHeldItemChance (src_pokemon.c.o) 020F0574 00000000 .rodata .rodata (src_pokemon.c.o) - 020F057C 0000000C .rodata rotomFormMoves$16772 (src_pokemon.c.o) + 020F057C 0000000C .rodata rotomFormMoves$16771 (src_pokemon.c.o) 020F0588 00000018 .rodata Unk_020F0588 (src_pokemon.c.o) 020F05A0 0000001E .rodata Unk_020F05A0 (src_pokemon.c.o) 020F05BE 00000024 .rodata Unk_020F05BE (src_pokemon.c.o) @@ -67278,7 +67278,7 @@ 02100B90 00000014 .data @13835 (src_unk_0206B70C.c.o) 02100BA4 00000000 .data .data (src_unk_0206CCB0.c.o) 02100BA4 0000000A .data Unk_02100BA4 (src_unk_0206CCB0.c.o) - 02100BB0 0000001B .data @21295 (src_pokemon.c.o) + 02100BB0 0000001B .data @21294 (src_pokemon.c.o) 02100BCC 00000013 .data @13744 (src_unk_02082C2C.c.o) 02100BE0 00000016 .data @13741 (src_unk_02082C2C.c.o) 02100BF8 00000016 .data @13740 (src_unk_02082C2C.c.o) @@ -67658,7 +67658,7 @@ 021C0858 00000004 .bss Unk_021C0858 (src_unk_0205B33C.c.o) 021C085C 00000040 .bss Unk_021C085C (src_unk_0205B33C.c.o) 021C089C 00000000 .bss .bss (src_pokemon.c.o) - 021C089C 00000194 .bss monExpTable$15634 (src_pokemon.c.o) + 021C089C 00000194 .bss monExpTable$15633 (src_pokemon.c.o) 021C0A30 00000000 .bss .bss (src_unk_0208694C.c.o) 021C0A30 00000004 .bss Unk_021C0A30 (src_unk_0208694C.c.o) 021C0A34 00003000 .bss Unk_021C0A34 (src_unk_02099D44.c.o) @@ -78099,15 +78099,15 @@ 021F8E48 00000B40 .rodata Unk_ov5_021F8E48 (src_overlay005_ov5_021DB888.c.o) 021F9988 00000008 .rodata Unk_ov5_021F9988 (src_overlay005_ov5_021DDBE8.c.o) 021F9990 00000000 .rodata .rodata (src_overlay005_ov5_021DDBE8.c.o) - 021F9990 0000000C .rodata @15600 (src_overlay005_ov5_021DDBE8.c.o) - 021F999C 00000010 .rodata @15610 (src_overlay005_ov5_021DDBE8.c.o) - 021F99AC 00000010 .rodata @15065 (src_overlay005_ov5_021DDBE8.c.o) - 021F99BC 0000001C .rodata @15067 (src_overlay005_ov5_021DDBE8.c.o) - 021F99D8 0000001C .rodata @15613 (src_overlay005_ov5_021DDBE8.c.o) - 021F99F4 0000001C .rodata @15069 (src_overlay005_ov5_021DDBE8.c.o) - 021F9A10 0000001C .rodata @15071 (src_overlay005_ov5_021DDBE8.c.o) + 021F9990 0000000C .rodata @15599 (src_overlay005_ov5_021DDBE8.c.o) + 021F999C 00000010 .rodata @15609 (src_overlay005_ov5_021DDBE8.c.o) + 021F99AC 00000010 .rodata @15064 (src_overlay005_ov5_021DDBE8.c.o) + 021F99BC 0000001C .rodata @15066 (src_overlay005_ov5_021DDBE8.c.o) + 021F99D8 0000001C .rodata @15612 (src_overlay005_ov5_021DDBE8.c.o) + 021F99F4 0000001C .rodata @15068 (src_overlay005_ov5_021DDBE8.c.o) + 021F9A10 0000001C .rodata @15070 (src_overlay005_ov5_021DDBE8.c.o) 021F9A2C 00000020 .rodata Unk_ov5_021F9A2C (src_overlay005_ov5_021DDBE8.c.o) - 021F9A4C 00000028 .rodata @15608 (src_overlay005_ov5_021DDBE8.c.o) + 021F9A4C 00000028 .rodata @15607 (src_overlay005_ov5_021DDBE8.c.o) 021F9A74 0000007C .rodata Unk_ov5_021F9A74 (src_overlay005_ov5_021DDBE8.c.o) 021F9AF0 00000000 .rodata .rodata (src_overlay005_ov5_021DF440.c.o) 021F9AF0 0000000C .rodata @13596 (src_overlay005_ov5_021DF440.c.o) @@ -84390,19 +84390,19 @@ 022384F0 000000A4 .text IsFormSymmetrical (src_overlay012_is_form_symmetrical.c.o) 02238590 00000000 .text $d (src_overlay012_is_form_symmetrical.c.o) 02238594 00000000 .rodata .rodata (src_overlay012_ov12_0221FC20.c.o) - 02238594 00000010 .rodata @16878 (src_overlay012_ov12_0221FC20.c.o) - 022385A4 00000010 .rodata @16494 (src_overlay012_ov12_0221FC20.c.o) - 022385B4 00000018 .rodata @17635 (src_overlay012_ov12_0221FC20.c.o) + 02238594 00000010 .rodata @16876 (src_overlay012_ov12_0221FC20.c.o) + 022385A4 00000010 .rodata @16492 (src_overlay012_ov12_0221FC20.c.o) + 022385B4 00000018 .rodata @17633 (src_overlay012_ov12_0221FC20.c.o) 022385CC 00000018 .rodata Unk_ov12_022385CC (src_overlay012_ov12_0221FC20.c.o) - 022385E4 00000018 .rodata @16672 (src_overlay012_ov12_0221FC20.c.o) - 022385FC 00000018 .rodata @17579 (src_overlay012_ov12_0221FC20.c.o) - 02238614 00000018 .rodata @17568 (src_overlay012_ov12_0221FC20.c.o) + 022385E4 00000018 .rodata @16670 (src_overlay012_ov12_0221FC20.c.o) + 022385FC 00000018 .rodata @17577 (src_overlay012_ov12_0221FC20.c.o) + 02238614 00000018 .rodata @17566 (src_overlay012_ov12_0221FC20.c.o) 0223862C 00000018 .rodata Unk_ov12_0223862C (src_overlay012_ov12_0221FC20.c.o) 02238644 0000001C .rodata Unk_ov12_02238644 (src_overlay012_ov12_0221FC20.c.o) 02238660 00000020 .rodata Unk_ov12_02238660 (src_overlay012_ov12_0221FC20.c.o) - 02238680 00000034 .rodata @15899 (src_overlay012_ov12_0221FC20.c.o) - 022386B4 00000090 .rodata @16330 (src_overlay012_ov12_0221FC20.c.o) - 02238744 00000090 .rodata @16341 (src_overlay012_ov12_0221FC20.c.o) + 02238680 00000034 .rodata @15897 (src_overlay012_ov12_0221FC20.c.o) + 022386B4 00000090 .rodata @16328 (src_overlay012_ov12_0221FC20.c.o) + 02238744 00000090 .rodata @16339 (src_overlay012_ov12_0221FC20.c.o) 022387D4 00000154 .rodata Unk_ov12_022387D4 (src_overlay012_ov12_0221FC20.c.o) 02238928 00000488 .rodata Unk_ov12_02238928 (src_overlay012_ov12_0221FC20.c.o) 02238DB0 00000000 .rodata .rodata (src_overlay012_ov12_022237EC.c.o) @@ -85250,17 +85250,17 @@ 02228B64 00000198 .text ov13_02228B64 (src_overlay013_ov13_02228A38.c.o) 02228CF0 00000000 .text $d (src_overlay013_ov13_02228A38.c.o) 02228CFC 00000000 .rodata .rodata (src_overlay013_ov13_0221FC20.c.o) - 02228CFC 00000006 .rodata @15475 (src_overlay013_ov13_0221FC20.c.o) - 02228D04 00000010 .rodata @15317 (src_overlay013_ov13_0221FC20.c.o) + 02228CFC 00000006 .rodata @15473 (src_overlay013_ov13_0221FC20.c.o) + 02228D04 00000010 .rodata @15315 (src_overlay013_ov13_0221FC20.c.o) 02228D14 00000010 .rodata Unk_ov13_02228D14 (src_overlay013_ov13_0221FC20.c.o) 02228D24 00000014 .rodata Unk_ov13_02228D24 (src_overlay013_ov13_0221FC20.c.o) 02228D38 00000014 .rodata Unk_ov13_02228D38 (src_overlay013_ov13_0221FC20.c.o) 02228D4C 00000018 .rodata Unk_ov13_02228D4C (src_overlay013_ov13_0221FC20.c.o) 02228D64 00000018 .rodata Unk_ov13_02228D64 (src_overlay013_ov13_0221FC20.c.o) - 02228D7C 0000001C .rodata @15319 (src_overlay013_ov13_0221FC20.c.o) - 02228D98 0000001C .rodata @15325 (src_overlay013_ov13_0221FC20.c.o) - 02228DB4 0000001C .rodata @15321 (src_overlay013_ov13_0221FC20.c.o) - 02228DD0 0000001C .rodata @15323 (src_overlay013_ov13_0221FC20.c.o) + 02228D7C 0000001C .rodata @15317 (src_overlay013_ov13_0221FC20.c.o) + 02228D98 0000001C .rodata @15323 (src_overlay013_ov13_0221FC20.c.o) + 02228DB4 0000001C .rodata @15319 (src_overlay013_ov13_0221FC20.c.o) + 02228DD0 0000001C .rodata @15321 (src_overlay013_ov13_0221FC20.c.o) 02228DEC 00000020 .rodata Unk_ov13_02228DEC (src_overlay013_ov13_0221FC20.c.o) 02228E0C 00000020 .rodata Unk_ov13_02228E0C (src_overlay013_ov13_0221FC20.c.o) 02228E2C 00000024 .rodata Unk_ov13_02228E2C (src_overlay013_ov13_0221FC20.c.o) @@ -85299,7 +85299,7 @@ 022292B4 00000010 .rodata Unk_ov13_022292B4 (src_overlay013_ov13_02224500.c.o) 022292C4 00000010 .rodata Unk_ov13_022292C4 (src_overlay013_ov13_02224500.c.o) 022292D4 00000018 .rodata Unk_ov13_022292D4 (src_overlay013_ov13_02224500.c.o) - 022292EC 00000018 .rodata @13800 (src_overlay013_ov13_02224500.c.o) + 022292EC 00000018 .rodata @13798 (src_overlay013_ov13_02224500.c.o) 02229304 00000020 .rodata Unk_ov13_02229304 (src_overlay013_ov13_02224500.c.o) 02229324 00000020 .rodata Unk_ov13_02229324 (src_overlay013_ov13_02224500.c.o) 02229344 00000020 .rodata Unk_ov13_02229344 (src_overlay013_ov13_02224500.c.o) @@ -85348,10 +85348,10 @@ 02229924 00000088 .rodata Unk_ov13_02229924 (src_overlay013_ov13_02225710.c.o) 022299AC 0000000C .rodata Unk_ov13_022299AC (src_overlay013_ov13_022264F4.c.o) 022299AC 00000000 .rodata .rodata (src_overlay013_ov13_022264F4.c.o) - 022299B8 00000010 .rodata @15493 (src_overlay013_ov13_022264F4.c.o) - 022299C8 0000001C .rodata @15499 (src_overlay013_ov13_022264F4.c.o) - 022299E4 0000001C .rodata @15497 (src_overlay013_ov13_022264F4.c.o) - 02229A00 0000001C .rodata @15495 (src_overlay013_ov13_022264F4.c.o) + 022299B8 00000010 .rodata @15491 (src_overlay013_ov13_022264F4.c.o) + 022299C8 0000001C .rodata @15497 (src_overlay013_ov13_022264F4.c.o) + 022299E4 0000001C .rodata @15495 (src_overlay013_ov13_022264F4.c.o) + 02229A00 0000001C .rodata @15493 (src_overlay013_ov13_022264F4.c.o) 02229A1C 0000001C .rodata Unk_ov13_02229A1C (src_overlay013_ov13_022264F4.c.o) 02229A38 00000028 .rodata Unk_ov13_02229A38 (src_overlay013_ov13_022264F4.c.o) 02229A60 00000000 .rodata .rodata (src_overlay013_ov13_02227288.c.o) @@ -85366,7 +85366,7 @@ 02229BC0 00000008 .rodata Unk_ov13_02229BC0 (src_overlay013_ov13_02227BDC.c.o) 02229BC8 0000000C .rodata Unk_ov13_02229BC8 (src_overlay013_ov13_02227BDC.c.o) 02229BD4 00000010 .rodata Unk_ov13_02229BD4 (src_overlay013_ov13_02227BDC.c.o) - 02229BE4 00000018 .rodata @13801 (src_overlay013_ov13_02227BDC.c.o) + 02229BE4 00000018 .rodata @13799 (src_overlay013_ov13_02227BDC.c.o) 02229BFC 00000018 .rodata Unk_ov13_02229BFC (src_overlay013_ov13_02227BDC.c.o) 02229C14 00000030 .rodata Unk_ov13_02229C14 (src_overlay013_ov13_02227BDC.c.o) 02229C44 00000030 .rodata Unk_ov13_02229C44 (src_overlay013_ov13_02227BDC.c.o) @@ -86335,19 +86335,19 @@ 022405FC 00000000 .text $t (src_overlay016_battle_script.c.o) 022405FC 00000050 .text BattleScript_Exec (src_overlay016_battle_script.c.o) 02240644 00000000 .text $d (src_overlay016_battle_script.c.o) - 0224064C 00000018 .text BtlCmd_SetupBattleUI (src_overlay016_battle_script.c.o) + 0224064C 00000018 .text BtlCmd_PlayEncounterAnimation (src_overlay016_battle_script.c.o) 0224064C 00000000 .text $t (src_overlay016_battle_script.c.o) 02240664 00000000 .text $t (src_overlay016_battle_script.c.o) - 02240664 0000007C .text BtlCmd_SetEncounter (src_overlay016_battle_script.c.o) + 02240664 0000007C .text BtlCmd_SetPokemonEncounter (src_overlay016_battle_script.c.o) 022406DC 00000000 .text $d (src_overlay016_battle_script.c.o) 022406E0 00000000 .text $t (src_overlay016_battle_script.c.o) - 022406E0 000001C0 .text BtlCmd_ShowEncounter (src_overlay016_battle_script.c.o) + 022406E0 000001C0 .text BtlCmd_PokemonSlideIn (src_overlay016_battle_script.c.o) 0224089C 00000000 .text $d (src_overlay016_battle_script.c.o) 022408A0 00000000 .text $t (src_overlay016_battle_script.c.o) - 022408A0 000001DC .text BtlCmd_ShowPokemon (src_overlay016_battle_script.c.o) + 022408A0 000001DC .text BtlCmd_PokemonSendOut (src_overlay016_battle_script.c.o) 02240A78 00000000 .text $d (src_overlay016_battle_script.c.o) 02240A7C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02240A7C 000000C0 .text BtlCmd_ReturnPokemon (src_overlay016_battle_script.c.o) + 02240A7C 000000C0 .text BtlCmd_RecallPokemon (src_overlay016_battle_script.c.o) 02240B34 00000000 .text $d (src_overlay016_battle_script.c.o) 02240B3C 0000002A .text BtlCmd_DeletePokemon (src_overlay016_battle_script.c.o) 02240B3C 00000000 .text $t (src_overlay016_battle_script.c.o) @@ -86355,24 +86355,24 @@ 02240B68 0000011C .text BtlCmd_SetTrainerEncounter (src_overlay016_battle_script.c.o) 02240C80 00000000 .text $d (src_overlay016_battle_script.c.o) 02240C84 00000000 .text $t (src_overlay016_battle_script.c.o) - 02240C84 00000110 .text BtlCmd_ThrowTrainerBall (src_overlay016_battle_script.c.o) + 02240C84 00000110 .text BtlCmd_ThrowPokeball (src_overlay016_battle_script.c.o) 02240D8C 00000000 .text $d (src_overlay016_battle_script.c.o) 02240D94 00000000 .text $t (src_overlay016_battle_script.c.o) - 02240D94 000001B0 .text BtlCmd_SlideTrainerOut (src_overlay016_battle_script.c.o) + 02240D94 000001B0 .text BtlCmd_TrainerSlideOut (src_overlay016_battle_script.c.o) 02240F40 00000000 .text $d (src_overlay016_battle_script.c.o) 02240F44 00000000 .text $t (src_overlay016_battle_script.c.o) - 02240F44 00000198 .text BtlCmd_SlideTrainerIn (src_overlay016_battle_script.c.o) + 02240F44 00000198 .text BtlCmd_TrainerSlideIn (src_overlay016_battle_script.c.o) 022410D8 00000000 .text $d (src_overlay016_battle_script.c.o) - 022410DC 0000002C .text BtlCmd_Unused0A (src_overlay016_battle_script.c.o) + 022410DC 0000002C .text BtlCmd_BackgroundSlideIn (src_overlay016_battle_script.c.o) 022410DC 00000000 .text $t (src_overlay016_battle_script.c.o) 02241108 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241108 000000B8 .text BtlCmd_SlideHPGaugeIn (src_overlay016_battle_script.c.o) + 02241108 000000B8 .text BtlCmd_HealthbarSlideIn (src_overlay016_battle_script.c.o) 022411BC 00000000 .text $d (src_overlay016_battle_script.c.o) 022411C0 00000000 .text $t (src_overlay016_battle_script.c.o) - 022411C0 000000C8 .text BtlCmd_SlideHPGaugeInWait (src_overlay016_battle_script.c.o) + 022411C0 000000C8 .text BtlCmd_HealthbarSlideInDelay (src_overlay016_battle_script.c.o) 02241280 00000000 .text $d (src_overlay016_battle_script.c.o) 02241288 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241288 000000B8 .text BtlCmd_SlideHPGaugeOut (src_overlay016_battle_script.c.o) + 02241288 000000B8 .text BtlCmd_HealthbarSlideOut (src_overlay016_battle_script.c.o) 02241338 00000000 .text $d (src_overlay016_battle_script.c.o) 02241340 00000000 .text $t (src_overlay016_battle_script.c.o) 02241340 00000034 .text BtlCmd_Wait (src_overlay016_battle_script.c.o) @@ -86393,53 +86393,53 @@ 02241584 00000000 .text $t (src_overlay016_battle_script.c.o) 022415B8 0000003E .text BtlCmd_PrintGlobalMessage (src_overlay016_battle_script.c.o) 022415B8 00000000 .text $t (src_overlay016_battle_script.c.o) - 022415F8 0000001E .text BtlCmd_PrintPreparedMessage (src_overlay016_battle_script.c.o) + 022415F8 0000001E .text BtlCmd_PrintBufferedMessage (src_overlay016_battle_script.c.o) 022415F8 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241618 0000002C .text BtlCmd_PrepareMessage (src_overlay016_battle_script.c.o) + 02241618 0000002C .text BtlCmd_BufferMessage (src_overlay016_battle_script.c.o) 02241618 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241644 00000052 .text BtlCmd_PrintSideLocalMessage (src_overlay016_battle_script.c.o) + 02241644 00000052 .text BtlCmd_BufferLocalMessage (src_overlay016_battle_script.c.o) 02241644 00000000 .text $t (src_overlay016_battle_script.c.o) 02241698 00000000 .text $t (src_overlay016_battle_script.c.o) 02241698 0000007C .text BtlCmd_PlayMoveAnimation (src_overlay016_battle_script.c.o) 02241708 00000000 .text $d (src_overlay016_battle_script.c.o) 02241714 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241714 000000AC .text BtlCmd_PlayMoveAnimationA2D (src_overlay016_battle_script.c.o) + 02241714 000000AC .text BtlCmd_PlayMoveAnimationOnMons (src_overlay016_battle_script.c.o) 022417B4 00000000 .text $d (src_overlay016_battle_script.c.o) 022417C0 00000000 .text $t (src_overlay016_battle_script.c.o) - 022417C0 00000034 .text BtlCmd_FlickerBattler (src_overlay016_battle_script.c.o) + 022417C0 00000034 .text BtlCmd_FlickerMon (src_overlay016_battle_script.c.o) 022417F0 00000000 .text $d (src_overlay016_battle_script.c.o) 022417F4 00000000 .text $t (src_overlay016_battle_script.c.o) - 022417F4 000000A0 .text BtlCmd_UpdateHPValue (src_overlay016_battle_script.c.o) + 022417F4 000000A0 .text BtlCmd_UpdateHealthBarValue (src_overlay016_battle_script.c.o) 02241888 00000000 .text $d (src_overlay016_battle_script.c.o) - 02241894 0000002C .text BtlCmd_UpdateHPGauge (src_overlay016_battle_script.c.o) + 02241894 0000002C .text BtlCmd_UpdateHealthBar (src_overlay016_battle_script.c.o) 02241894 00000000 .text $t (src_overlay016_battle_script.c.o) 022418C0 00000000 .text $t (src_overlay016_battle_script.c.o) - 022418C0 00000064 .text BtlCmd_FaintBattler (src_overlay016_battle_script.c.o) + 022418C0 00000064 .text BtlCmd_TryFaintMon (src_overlay016_battle_script.c.o) 0224191C 00000000 .text $d (src_overlay016_battle_script.c.o) 02241924 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241924 00000060 .text BtlCmd_PlayFaintingSequence (src_overlay016_battle_script.c.o) + 02241924 00000060 .text BtlCmd_PlayFaintAnimation (src_overlay016_battle_script.c.o) 02241980 00000000 .text $d (src_overlay016_battle_script.c.o) 02241984 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241984 0000009C .text BtlCmd_WaitFrames (src_overlay016_battle_script.c.o) + 02241984 0000009C .text BtlCmd_WaitButtonABTime (src_overlay016_battle_script.c.o) 02241A10 00000000 .text $d (src_overlay016_battle_script.c.o) 02241A20 00000038 .text BtlCmd_PlaySound (src_overlay016_battle_script.c.o) 02241A20 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241A58 000000B0 .text BtlCmd_If (src_overlay016_battle_script.c.o) + 02241A58 000000B0 .text BtlCmd_CompareVarToValue (src_overlay016_battle_script.c.o) 02241A58 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241B08 000000B6 .text BtlCmd_IfMonData (src_overlay016_battle_script.c.o) + 02241B08 000000B6 .text BtlCmd_CompareMonDataToValue (src_overlay016_battle_script.c.o) 02241B08 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241BC0 0000001A .text BtlCmd_FadeOut (src_overlay016_battle_script.c.o) + 02241BC0 0000001A .text BtlCmd_FadeOutBattle (src_overlay016_battle_script.c.o) 02241BC0 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241BDC 00000020 .text BtlCmd_JumpToSub (src_overlay016_battle_script.c.o) + 02241BDC 00000020 .text BtlCmd_GoToSubscript (src_overlay016_battle_script.c.o) 02241BDC 00000000 .text $t (src_overlay016_battle_script.c.o) 02241BFC 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241BFC 0000002C .text BtlCmd_JumpToBattleEffect (src_overlay016_battle_script.c.o) + 02241BFC 0000002C .text BtlCmd_GoToEffectScript (src_overlay016_battle_script.c.o) 02241C20 00000000 .text $d (src_overlay016_battle_script.c.o) 02241C28 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241C28 000000A8 .text BtlCmd_JumpToMove (src_overlay016_battle_script.c.o) + 02241C28 000000A8 .text BtlCmd_GoToMoveScript (src_overlay016_battle_script.c.o) 02241CC0 00000000 .text $d (src_overlay016_battle_script.c.o) 02241CD0 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241CD0 00000064 .text BtlCmd_CheckCritical (src_overlay016_battle_script.c.o) + 02241CD0 00000064 .text BtlCmd_CalcCrit (src_overlay016_battle_script.c.o) 02241D2C 00000000 .text $d (src_overlay016_battle_script.c.o) 02241D34 00000000 .text $t (src_overlay016_battle_script.c.o) 02241D34 0000017C .text BtlCmd_CalcExpGain (src_overlay016_battle_script.c.o) @@ -86452,15 +86452,15 @@ 02241F18 00000000 .text $d (src_overlay016_battle_script.c.o) 02241F1C 00000016 .text BtlCmd_Dummy2A (src_overlay016_battle_script.c.o) 02241F1C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02241F34 000000D8 .text BtlCmd_ShowPartyList (src_overlay016_battle_script.c.o) + 02241F34 000000D8 .text BtlCmd_ShowParty (src_overlay016_battle_script.c.o) 02241F34 00000000 .text $t (src_overlay016_battle_script.c.o) 0224200C 00000000 .text $t (src_overlay016_battle_script.c.o) - 0224200C 00000128 .text BtlCmd_WaitPartyList (src_overlay016_battle_script.c.o) + 0224200C 00000128 .text BtlCmd_WaitMonSelection (src_overlay016_battle_script.c.o) 02242128 00000000 .text $d (src_overlay016_battle_script.c.o) 02242134 00000000 .text $t (src_overlay016_battle_script.c.o) - 02242134 000000A0 .text BtlCmd_Switch (src_overlay016_battle_script.c.o) + 02242134 000000A0 .text BtlCmd_SwitchAndUpdateMon (src_overlay016_battle_script.c.o) 022421C4 00000000 .text $d (src_overlay016_battle_script.c.o) - 022421D4 00000046 .text BtlCmd_JumpIfAnySwitches (src_overlay016_battle_script.c.o) + 022421D4 00000046 .text BtlCmd_GoToIfAnySwitches (src_overlay016_battle_script.c.o) 022421D4 00000000 .text $t (src_overlay016_battle_script.c.o) 0224221C 00000000 .text $t (src_overlay016_battle_script.c.o) 0224221C 00000050 .text BtlCmd_StartCatchMonTask (src_overlay016_battle_script.c.o) @@ -86469,16 +86469,16 @@ 0224226C 0000002C .text BtlCmd_WaitCatchMonTask (src_overlay016_battle_script.c.o) 02242294 00000000 .text $d (src_overlay016_battle_script.c.o) 02242298 00000000 .text $t (src_overlay016_battle_script.c.o) - 02242298 00000074 .text BtlCmd_SetupMultiHit (src_overlay016_battle_script.c.o) + 02242298 00000074 .text BtlCmd_SetMultiHit (src_overlay016_battle_script.c.o) 02242304 00000000 .text $d (src_overlay016_battle_script.c.o) - 0224230C 000000F2 .text BtlCmd_SetVarValue (src_overlay016_battle_script.c.o) + 0224230C 000000F2 .text BtlCmd_UpdateVar (src_overlay016_battle_script.c.o) 0224230C 00000000 .text $t (src_overlay016_battle_script.c.o) 02242400 00000000 .text $t (src_overlay016_battle_script.c.o) 02242400 00000614 .text BtlCmd_ChangeStatStage (src_overlay016_battle_script.c.o) 02242764 00000000 .text $d (src_overlay016_battle_script.c.o) 02242784 00000000 .text $t (src_overlay016_battle_script.c.o) 022429FC 00000000 .text $d (src_overlay016_battle_script.c.o) - 02242A14 00000122 .text BtlCmd_SetMonDataValue (src_overlay016_battle_script.c.o) + 02242A14 00000122 .text BtlCmd_UpdateMonData (src_overlay016_battle_script.c.o) 02242A14 00000000 .text $t (src_overlay016_battle_script.c.o) 02242B38 00000000 .text $t (src_overlay016_battle_script.c.o) 02242B38 0000003C .text BtlCmd_ClearVolatileStatus (src_overlay016_battle_script.c.o) @@ -86489,29 +86489,29 @@ 02242BAC 00000000 .text $t (src_overlay016_battle_script.c.o) 02242C6C 00000036 .text BtlCmd_Random (src_overlay016_battle_script.c.o) 02242C6C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02242CA4 00000116 .text BtlCmd_SetVarFromVar (src_overlay016_battle_script.c.o) + 02242CA4 00000116 .text BtlCmd_UpdateVarFromVar (src_overlay016_battle_script.c.o) 02242CA4 00000000 .text $t (src_overlay016_battle_script.c.o) - 02242DBC 00000160 .text BtlCmd_SetMonDataFromVar (src_overlay016_battle_script.c.o) + 02242DBC 00000160 .text BtlCmd_UpdateMonDataFromVar (src_overlay016_battle_script.c.o) 02242DBC 00000000 .text $t (src_overlay016_battle_script.c.o) - 02242F1C 0000001E .text BtlCmd_Jump (src_overlay016_battle_script.c.o) + 02242F1C 0000001E .text BtlCmd_GoTo (src_overlay016_battle_script.c.o) 02242F1C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02242F3C 00000020 .text BtlCmd_CallSub (src_overlay016_battle_script.c.o) + 02242F3C 00000020 .text BtlCmd_Call (src_overlay016_battle_script.c.o) 02242F3C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02242F5C 0000002E .text BtlCmd_CallSubFromVar (src_overlay016_battle_script.c.o) + 02242F5C 0000002E .text BtlCmd_CallFromVar (src_overlay016_battle_script.c.o) 02242F5C 00000000 .text $t (src_overlay016_battle_script.c.o) 02242F8C 00000000 .text $t (src_overlay016_battle_script.c.o) 02242F8C 00000118 .text BtlCmd_SetMirrorMove (src_overlay016_battle_script.c.o) 0224308C 00000000 .text $d (src_overlay016_battle_script.c.o) 022430A4 00000000 .text $t (src_overlay016_battle_script.c.o) - 022430A4 00000050 .text BtlCmd_ResetStatChanges (src_overlay016_battle_script.c.o) + 022430A4 00000050 .text BtlCmd_ResetAllStatChanges (src_overlay016_battle_script.c.o) 022430E8 00000000 .text $d (src_overlay016_battle_script.c.o) 022430F4 0000002C .text BtlCmd_LockMoveChoice (src_overlay016_battle_script.c.o) 022430F4 00000000 .text $t (src_overlay016_battle_script.c.o) 02243120 0000002C .text BtlCmd_UnlockMoveChoice (src_overlay016_battle_script.c.o) 02243120 00000000 .text $t (src_overlay016_battle_script.c.o) - 0224314C 00000036 .text BtlCmd_SetStatusIcon (src_overlay016_battle_script.c.o) + 0224314C 00000036 .text BtlCmd_SetHealthbarStatus (src_overlay016_battle_script.c.o) 0224314C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02243184 00000036 .text BtlCmd_TrainerMessage (src_overlay016_battle_script.c.o) + 02243184 00000036 .text BtlCmd_PrintTrainerMessage (src_overlay016_battle_script.c.o) 02243184 00000000 .text $t (src_overlay016_battle_script.c.o) 022431BC 00000000 .text $t (src_overlay016_battle_script.c.o) 022431BC 000000F8 .text BattleScript_CalcPrizeMoney (src_overlay016_battle_script.c.o) @@ -86519,11 +86519,11 @@ 022432B4 00000000 .text $t (src_overlay016_battle_script.c.o) 022432B4 00000080 .text BtlCmd_PayPrizeMoney (src_overlay016_battle_script.c.o) 02243330 00000000 .text $d (src_overlay016_battle_script.c.o) - 02243334 00000062 .text BtlCmd_PlayStatusEffect (src_overlay016_battle_script.c.o) + 02243334 00000062 .text BtlCmd_PlayBattleAnimation (src_overlay016_battle_script.c.o) 02243334 00000000 .text $t (src_overlay016_battle_script.c.o) - 02243398 0000008A .text BtlCmd_PlayStatusEffectAToD (src_overlay016_battle_script.c.o) + 02243398 0000008A .text BtlCmd_PlayBattleAnimationOnMons (src_overlay016_battle_script.c.o) 02243398 00000000 .text $t (src_overlay016_battle_script.c.o) - 02243424 0000006E .text BtlCmd_PlayStatusEffectFromVar (src_overlay016_battle_script.c.o) + 02243424 0000006E .text BtlCmd_PlayBattleAnimationFromVar (src_overlay016_battle_script.c.o) 02243424 00000000 .text $t (src_overlay016_battle_script.c.o) 02243494 00000000 .text $t (src_overlay016_battle_script.c.o) 02243494 00000038 .text BtlCmd_PrintRecallMessage (src_overlay016_battle_script.c.o) @@ -86531,21 +86531,21 @@ 022434CC 00000000 .text $t (src_overlay016_battle_script.c.o) 022434CC 00000038 .text BtlCmd_PrintSendOutMessage (src_overlay016_battle_script.c.o) 02243500 00000000 .text $d (src_overlay016_battle_script.c.o) - 02243504 0000002C .text BtlCmd_PrintBattleStartMessage (src_overlay016_battle_script.c.o) + 02243504 0000002C .text BtlCmd_PrintEncounterMessage (src_overlay016_battle_script.c.o) 02243504 00000000 .text $t (src_overlay016_battle_script.c.o) - 02243530 0000002C .text BtlCmd_PrintLeadMonMessage (src_overlay016_battle_script.c.o) + 02243530 0000002C .text BtlCmd_PrintFirstSendOutMessage (src_overlay016_battle_script.c.o) 02243530 00000000 .text $t (src_overlay016_battle_script.c.o) - 0224355C 00000030 .text BtlCmd_PreparedTrainerMessage (src_overlay016_battle_script.c.o) + 0224355C 00000030 .text BtlCmd_PrintBufferedTrainerMessage (src_overlay016_battle_script.c.o) 0224355C 00000000 .text $t (src_overlay016_battle_script.c.o) 0224358C 00000000 .text $t (src_overlay016_battle_script.c.o) 0224358C 0000017C .text BtlCmd_TryConversion (src_overlay016_battle_script.c.o) 022436FC 00000000 .text $d (src_overlay016_battle_script.c.o) - 02243708 000000CA .text BtlCmd_IfVar (src_overlay016_battle_script.c.o) + 02243708 000000CA .text BtlCmd_CompareVarToVar (src_overlay016_battle_script.c.o) 02243708 00000000 .text $t (src_overlay016_battle_script.c.o) - 022437D4 000000D2 .text BtlCmd_IfMonDataVar (src_overlay016_battle_script.c.o) + 022437D4 000000D2 .text BtlCmd_CompareMonDataToVar (src_overlay016_battle_script.c.o) 022437D4 00000000 .text $t (src_overlay016_battle_script.c.o) 022438A8 00000000 .text $t (src_overlay016_battle_script.c.o) - 022438A8 00000050 .text BtlCmd_GivePayDayMoney (src_overlay016_battle_script.c.o) + 022438A8 00000050 .text BtlCmd_AddPayDayMoney (src_overlay016_battle_script.c.o) 022438F0 00000000 .text $d (src_overlay016_battle_script.c.o) 022438F8 00000000 .text $t (src_overlay016_battle_script.c.o) 022438F8 000000E0 .text BtlCmd_TryLightScreen (src_overlay016_battle_script.c.o) @@ -86559,9 +86559,9 @@ 02243B38 00000000 .text $t (src_overlay016_battle_script.c.o) 02243B38 000001F4 .text BtlCmd_TryOHKOMove (src_overlay016_battle_script.c.o) 02243D0C 00000000 .text $d (src_overlay016_battle_script.c.o) - 02243D2C 00000038 .text BtlCmd_Divide (src_overlay016_battle_script.c.o) + 02243D2C 00000038 .text BtlCmd_DivideVarByValue (src_overlay016_battle_script.c.o) 02243D2C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02243D64 00000058 .text BtlCmd_DivideByVar (src_overlay016_battle_script.c.o) + 02243D64 00000058 .text BtlCmd_DivideVarByVar (src_overlay016_battle_script.c.o) 02243D64 00000000 .text $t (src_overlay016_battle_script.c.o) 02243DBC 00000000 .text $t (src_overlay016_battle_script.c.o) 02243DBC 00000138 .text BtlCmd_TryMimic (src_overlay016_battle_script.c.o) @@ -86600,16 +86600,16 @@ 02244798 00000150 .text BtlCmd_TryPartyStatusRefresh (src_overlay016_battle_script.c.o) 022448D8 00000000 .text $d (src_overlay016_battle_script.c.o) 022448E8 00000000 .text $t (src_overlay016_battle_script.c.o) - 022448E8 00000124 .text BtlCmd_CanStealItem (src_overlay016_battle_script.c.o) + 022448E8 00000124 .text BtlCmd_TryStealItem (src_overlay016_battle_script.c.o) 02244A04 00000000 .text $d (src_overlay016_battle_script.c.o) 02244A0C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02244A0C 0000013C .text BtlCmd_TryProtectEndure (src_overlay016_battle_script.c.o) + 02244A0C 0000013C .text BtlCmd_TryProtection (src_overlay016_battle_script.c.o) 02244B2C 00000000 .text $d (src_overlay016_battle_script.c.o) 02244B48 00000000 .text $t (src_overlay016_battle_script.c.o) 02244B48 0000007C .text BtlCmd_TrySubstitute (src_overlay016_battle_script.c.o) 02244BB4 00000000 .text $d (src_overlay016_battle_script.c.o) 02244BC4 00000000 .text $t (src_overlay016_battle_script.c.o) - 02244BC4 0000019C .text BtlCmd_CanWhirlwind (src_overlay016_battle_script.c.o) + 02244BC4 0000019C .text BtlCmd_TryWhirlwind (src_overlay016_battle_script.c.o) 02244D58 00000000 .text $d (src_overlay016_battle_script.c.o) 02244D60 00000000 .text $t (src_overlay016_battle_script.c.o) 02244D60 000001F4 .text BtlCmd_Transform (src_overlay016_battle_script.c.o) @@ -86623,9 +86623,9 @@ 0224505C 000000B0 .text BtlCmd_TryPerishSong (src_overlay016_battle_script.c.o) 02245100 00000000 .text $d (src_overlay016_battle_script.c.o) 0224510C 00000000 .text $t (src_overlay016_battle_script.c.o) - 0224510C 00000038 .text BtlCmd_GetBattlerBySpeedOrder (src_overlay016_battle_script.c.o) + 0224510C 00000038 .text BtlCmd_GetMonBySpeedOrder (src_overlay016_battle_script.c.o) 0224513C 00000000 .text $d (src_overlay016_battle_script.c.o) - 02245144 00000042 .text BtlCmd_IfVarIsValidBattler (src_overlay016_battle_script.c.o) + 02245144 00000042 .text BtlCmd_GoToIfValidMon (src_overlay016_battle_script.c.o) 02245144 00000000 .text $t (src_overlay016_battle_script.c.o) 02245188 00000000 .text $t (src_overlay016_battle_script.c.o) 02245188 000002C4 .text BtlCmd_EndOfTurnWeatherEffect (src_overlay016_battle_script.c.o) @@ -86643,12 +86643,12 @@ 0224567C 00000094 .text BtlCmd_TrySafeguard (src_overlay016_battle_script.c.o) 02245704 00000000 .text $d (src_overlay016_battle_script.c.o) 02245710 00000000 .text $t (src_overlay016_battle_script.c.o) - 02245710 00000074 .text BtlCmd_TryPresent (src_overlay016_battle_script.c.o) + 02245710 00000074 .text BtlCmd_Present (src_overlay016_battle_script.c.o) 02245778 00000000 .text $d (src_overlay016_battle_script.c.o) 02245784 00000000 .text $t (src_overlay016_battle_script.c.o) 02245784 000000A8 .text BtlCmd_CalcMagnitudePower (src_overlay016_battle_script.c.o) 02245824 00000000 .text $d (src_overlay016_battle_script.c.o) - 0224582C 00000062 .text BtlCmd_TryReplaceBattler (src_overlay016_battle_script.c.o) + 0224582C 00000062 .text BtlCmd_TryReplaceFaintedMon (src_overlay016_battle_script.c.o) 0224582C 00000000 .text $t (src_overlay016_battle_script.c.o) 02245890 00000000 .text $t (src_overlay016_battle_script.c.o) 02245890 00000148 .text BtlCmd_RapidSpin (src_overlay016_battle_script.c.o) @@ -86663,7 +86663,7 @@ 02245B68 00000060 .text BtlCmd_CopyStatStages (src_overlay016_battle_script.c.o) 02245BC0 00000000 .text $d (src_overlay016_battle_script.c.o) 02245BC8 00000000 .text $t (src_overlay016_battle_script.c.o) - 02245BC8 000000EC .text BtlCmd_TrySetupFutureSight (src_overlay016_battle_script.c.o) + 02245BC8 000000EC .text BtlCmd_TryFutureSight (src_overlay016_battle_script.c.o) 02245CB0 00000000 .text $d (src_overlay016_battle_script.c.o) 02245CB4 00000000 .text $t (src_overlay016_battle_script.c.o) 02245CB4 00000080 .text BtlCmd_CheckMoveHit (src_overlay016_battle_script.c.o) @@ -86680,19 +86680,19 @@ 02246004 000000A4 .text BtlCmd_TryHelpingHand (src_overlay016_battle_script.c.o) 0224609C 00000000 .text $d (src_overlay016_battle_script.c.o) 022460A8 00000000 .text $t (src_overlay016_battle_script.c.o) - 022460A8 00000108 .text BtlCmd_CanSwapItems (src_overlay016_battle_script.c.o) + 022460A8 00000108 .text BtlCmd_TrySwapItems (src_overlay016_battle_script.c.o) 022461A8 00000000 .text $d (src_overlay016_battle_script.c.o) 022461B0 00000000 .text $t (src_overlay016_battle_script.c.o) - 022461B0 00000044 .text BtlCmd_TrySetupWish (src_overlay016_battle_script.c.o) + 022461B0 00000044 .text BtlCmd_TryWish (src_overlay016_battle_script.c.o) 022461F0 00000000 .text $d (src_overlay016_battle_script.c.o) 022461F4 00000000 .text $t (src_overlay016_battle_script.c.o) 022461F4 000000E4 .text BtlCmd_TryAssist (src_overlay016_battle_script.c.o) 022462D0 00000000 .text $d (src_overlay016_battle_script.c.o) 022462D8 00000000 .text $t (src_overlay016_battle_script.c.o) - 022462D8 0000005C .text BtlCmd_TrySetupMagicCoat (src_overlay016_battle_script.c.o) + 022462D8 0000005C .text BtlCmd_TrySetMagicCoat (src_overlay016_battle_script.c.o) 02246330 00000000 .text $d (src_overlay016_battle_script.c.o) 02246334 00000000 .text $t (src_overlay016_battle_script.c.o) - 02246334 000000B4 .text BtlCmd_MagicCoatReflect (src_overlay016_battle_script.c.o) + 02246334 000000B4 .text BtlCmd_MagicCoat (src_overlay016_battle_script.c.o) 022463DC 00000000 .text $d (src_overlay016_battle_script.c.o) 022463E8 00000000 .text $t (src_overlay016_battle_script.c.o) 022463E8 00000070 .text BtlCmd_CalcRevengePowerMul (src_overlay016_battle_script.c.o) @@ -86715,19 +86715,19 @@ 022467A0 000000A8 .text BtlCmd_TryGrudge (src_overlay016_battle_script.c.o) 02246844 00000000 .text $d (src_overlay016_battle_script.c.o) 02246848 00000000 .text $t (src_overlay016_battle_script.c.o) - 02246848 0000005C .text BtlCmd_TrySetupSnatch (src_overlay016_battle_script.c.o) + 02246848 0000005C .text BtlCmd_TrySnatch (src_overlay016_battle_script.c.o) 022468A0 00000000 .text $d (src_overlay016_battle_script.c.o) 022468A4 00000000 .text $t (src_overlay016_battle_script.c.o) 022468A4 00000060 .text BtlCmd_CalcWeightBasedPower (src_overlay016_battle_script.c.o) 022468F0 00000000 .text $d (src_overlay016_battle_script.c.o) 02246904 00000000 .text $t (src_overlay016_battle_script.c.o) - 02246904 000000C0 .text BtlCmd_CalcWeatherBallPower (src_overlay016_battle_script.c.o) + 02246904 000000C0 .text BtlCmd_CalcWeatherBallParams (src_overlay016_battle_script.c.o) 022469B0 00000000 .text $d (src_overlay016_battle_script.c.o) 022469C4 00000000 .text $t (src_overlay016_battle_script.c.o) - 022469C4 000001A4 .text BtlCmd_CheckForPursuit (src_overlay016_battle_script.c.o) + 022469C4 000001A4 .text BtlCmd_TryPursuit (src_overlay016_battle_script.c.o) 02246B40 00000000 .text $d (src_overlay016_battle_script.c.o) 02246B68 00000000 .text $t (src_overlay016_battle_script.c.o) - 02246B68 00000048 .text BtlCmd_ApplyTypeMatchup (src_overlay016_battle_script.c.o) + 02246B68 00000048 .text BtlCmd_ApplyTypeEffectiveness (src_overlay016_battle_script.c.o) 02246BA8 00000000 .text $d (src_overlay016_battle_script.c.o) 02246BB0 00000104 .text BtlCmd_IfTurnFlag (src_overlay016_battle_script.c.o) 02246BB0 00000000 .text $t (src_overlay016_battle_script.c.o) @@ -86763,7 +86763,7 @@ 02247194 00000000 .text $t (src_overlay016_battle_script.c.o) 02247194 000001E4 .text BtlCmd_CheckSideCondition (src_overlay016_battle_script.c.o) 02247368 00000000 .text $d (src_overlay016_battle_script.c.o) - 02247378 00000030 .text BtlCmd_CheckDefenderProtecting (src_overlay016_battle_script.c.o) + 02247378 00000030 .text BtlCmd_TryFeint (src_overlay016_battle_script.c.o) 02247378 00000000 .text $t (src_overlay016_battle_script.c.o) 022473A8 00000000 .text $t (src_overlay016_battle_script.c.o) 022473A8 0000004C .text BtlCmd_CheckCanShareStatus (src_overlay016_battle_script.c.o) @@ -86784,15 +86784,15 @@ 022476F8 00000000 .text $t (src_overlay016_battle_script.c.o) 022476F8 00000184 .text BtlCmd_GenerateEndOfBattleItem (src_overlay016_battle_script.c.o) 02247868 00000000 .text $d (src_overlay016_battle_script.c.o) - 0224787C 00000026 .text BtlCmd_SetTrickRoom (src_overlay016_battle_script.c.o) + 0224787C 00000026 .text BtlCmd_TrickRoom (src_overlay016_battle_script.c.o) 0224787C 00000000 .text $t (src_overlay016_battle_script.c.o) 022478A4 00000040 .text BtlCmd_IfMovedThisTurn (src_overlay016_battle_script.c.o) 022478A4 00000000 .text $t (src_overlay016_battle_script.c.o) - 022478E4 0000006C .text BtlCmd_IfItemEffect (src_overlay016_battle_script.c.o) + 022478E4 0000006C .text BtlCmd_CheckItemHoldEffect (src_overlay016_battle_script.c.o) 022478E4 00000000 .text $t (src_overlay016_battle_script.c.o) - 02247950 0000004A .text BtlCmd_GetItemEffect (src_overlay016_battle_script.c.o) + 02247950 0000004A .text BtlCmd_GetItemHoldEffect (src_overlay016_battle_script.c.o) 02247950 00000000 .text $t (src_overlay016_battle_script.c.o) - 0224799C 0000004A .text BtlCmd_GetItemEffectPower (src_overlay016_battle_script.c.o) + 0224799C 0000004A .text BtlCmd_GetItemEffectParam (src_overlay016_battle_script.c.o) 0224799C 00000000 .text $t (src_overlay016_battle_script.c.o) 022479E8 00000000 .text $t (src_overlay016_battle_script.c.o) 022479E8 00000098 .text BtlCmd_TryCamouflage (src_overlay016_battle_script.c.o) @@ -86807,38 +86807,38 @@ 02247AE0 00000048 .text BtlCmd_CalcNaturalGiftParams (src_overlay016_battle_script.c.o) 02247B20 00000000 .text $d (src_overlay016_battle_script.c.o) 02247B28 00000000 .text $t (src_overlay016_battle_script.c.o) - 02247B28 0000007C .text BtlCmd_TryPluckBerry (src_overlay016_battle_script.c.o) + 02247B28 0000007C .text BtlCmd_TryPluck (src_overlay016_battle_script.c.o) 02247BA0 00000000 .text $d (src_overlay016_battle_script.c.o) - 02247BA4 00000030 .text BtlCmd_TryFlingItem (src_overlay016_battle_script.c.o) + 02247BA4 00000030 .text BtlCmd_TryFling (src_overlay016_battle_script.c.o) 02247BA4 00000000 .text $t (src_overlay016_battle_script.c.o) - 02247BD4 0000002E .text BtlCmd_ShowYesNoScreen (src_overlay016_battle_script.c.o) + 02247BD4 0000002E .text BtlCmd_YesNoMenu (src_overlay016_battle_script.c.o) 02247BD4 00000000 .text $t (src_overlay016_battle_script.c.o) 02247C04 00000000 .text $t (src_overlay016_battle_script.c.o) 02247C04 00000060 .text BtlCmd_WaitYesNoResult (src_overlay016_battle_script.c.o) 02247C60 00000000 .text $d (src_overlay016_battle_script.c.o) - 02247C64 0000002E .text BtlCmd_ShowPartyScreen (src_overlay016_battle_script.c.o) + 02247C64 0000002E .text BtlCmd_ChoosePokemonMenu (src_overlay016_battle_script.c.o) 02247C64 00000000 .text $t (src_overlay016_battle_script.c.o) 02247C94 00000000 .text $t (src_overlay016_battle_script.c.o) - 02247C94 0000004C .text BtlCmd_WaitPartyScreenResult (src_overlay016_battle_script.c.o) + 02247C94 0000004C .text BtlCmd_WaitPokemonMenuResult (src_overlay016_battle_script.c.o) 02247CD8 00000000 .text $d (src_overlay016_battle_script.c.o) - 02247CE0 00000022 .text BtlCmd_SubmitResult (src_overlay016_battle_script.c.o) + 02247CE0 00000022 .text BtlCmd_SetLinkBattleResult (src_overlay016_battle_script.c.o) 02247CE0 00000000 .text $t (src_overlay016_battle_script.c.o) 02247D04 00000000 .text $t (src_overlay016_battle_script.c.o) 02247D04 0000010C .text BtlCmd_CheckStealthRock (src_overlay016_battle_script.c.o) 02247E04 00000000 .text $d (src_overlay016_battle_script.c.o) 02247E10 00000000 .text $t (src_overlay016_battle_script.c.o) - 02247E10 00000088 .text BtlCmd_CheckActivateSecondaryEffect (src_overlay016_battle_script.c.o) + 02247E10 00000088 .text BtlCmd_CheckEffectActivation (src_overlay016_battle_script.c.o) 02247E8C 00000000 .text $d (src_overlay016_battle_script.c.o) - 02247E98 000000AA .text BtlCmd_CheckActivateChatterEffect (src_overlay016_battle_script.c.o) + 02247E98 000000AA .text BtlCmd_CheckChatterActivation (src_overlay016_battle_script.c.o) 02247E98 00000000 .text $t (src_overlay016_battle_script.c.o) 02247F44 00000000 .text $t (src_overlay016_battle_script.c.o) 02247F44 00000038 .text BtlCmd_GetCurrentMoveData (src_overlay016_battle_script.c.o) 02247F74 00000000 .text $d (src_overlay016_battle_script.c.o) 02247F7C 00000040 .text BtlCmd_SetMosaic (src_overlay016_battle_script.c.o) 02247F7C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02247FBC 0000002A .text BtlCmd_ChangeWeatherForm (src_overlay016_battle_script.c.o) + 02247FBC 0000002A .text BtlCmd_ChangeForm (src_overlay016_battle_script.c.o) 02247FBC 00000000 .text $t (src_overlay016_battle_script.c.o) - 02247FE8 00000018 .text BtlCmd_UpdateBG (src_overlay016_battle_script.c.o) + 02247FE8 00000018 .text BtlCmd_SetBattleBackground (src_overlay016_battle_script.c.o) 02247FE8 00000000 .text $t (src_overlay016_battle_script.c.o) 02248000 00000000 .text $t (src_overlay016_battle_script.c.o) 02248000 00000040 .text BtlCmd_UseBagItem (src_overlay016_battle_script.c.o) @@ -86857,7 +86857,7 @@ 02248134 00000000 .text $t (src_overlay016_battle_script.c.o) 0224814C 00000016 .text BtlCmd_FreePartyGaugeGraphics (src_overlay016_battle_script.c.o) 0224814C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02248164 00000040 .text BtlCmd_IncrementRecord (src_overlay016_battle_script.c.o) + 02248164 00000040 .text BtlCmd_IncrementGameStat (src_overlay016_battle_script.c.o) 02248164 00000000 .text $t (src_overlay016_battle_script.c.o) 022481A4 0000002C .text BtlCmd_RestoreSprite (src_overlay016_battle_script.c.o) 022481A4 00000000 .text $t (src_overlay016_battle_script.c.o) @@ -86870,7 +86870,7 @@ 02248294 00000090 .text BtlCmd_OAMToSprite (src_overlay016_battle_script.c.o) 02248320 00000000 .text $d (src_overlay016_battle_script.c.o) 02248324 00000000 .text $t (src_overlay016_battle_script.c.o) - 02248324 000001AC .text BtlCmd_CheckWhiteOut (src_overlay016_battle_script.c.o) + 02248324 000001AC .text BtlCmd_CheckBlackOut (src_overlay016_battle_script.c.o) 022484CC 00000000 .text $d (src_overlay016_battle_script.c.o) 022484D0 00000000 .text $t (src_overlay016_battle_script.c.o) 022484D0 00000080 .text BtlCmd_BoostRandomStatBy2 (src_overlay016_battle_script.c.o) @@ -86883,14 +86883,14 @@ 022485DC 00000000 .text $d (src_overlay016_battle_script.c.o) 022485E0 00000034 .text BtlCmd_TriggerHeldItemOnHit (src_overlay016_battle_script.c.o) 022485E0 00000000 .text $t (src_overlay016_battle_script.c.o) - 02248614 00000016 .text BtlCmd_ResultMesage (src_overlay016_battle_script.c.o) + 02248614 00000016 .text BtlCmd_PrintBattleResultMessage (src_overlay016_battle_script.c.o) 02248614 00000000 .text $t (src_overlay016_battle_script.c.o) - 0224862C 0000001A .text BtlCmd_EscapeMesage (src_overlay016_battle_script.c.o) + 0224862C 0000001A .text BtlCmd_PrintEscapeMessage (src_overlay016_battle_script.c.o) 0224862C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02248648 00000016 .text BtlCmd_ForfeitMesage (src_overlay016_battle_script.c.o) + 02248648 00000016 .text BtlCmd_PrintForfeitMessage (src_overlay016_battle_script.c.o) 02248648 00000000 .text $t (src_overlay016_battle_script.c.o) 02248660 00000000 .text $t (src_overlay016_battle_script.c.o) - 02248660 000000A8 .text BtlCmd_CheckLeaveWith1HP (src_overlay016_battle_script.c.o) + 02248660 000000A8 .text BtlCmd_CheckHoldOnWith1HP (src_overlay016_battle_script.c.o) 02248700 00000000 .text $d (src_overlay016_battle_script.c.o) 02248708 00000000 .text $t (src_overlay016_battle_script.c.o) 02248708 0000009C .text BtlCmd_TryRestoreStatusOnSwitch (src_overlay016_battle_script.c.o) @@ -86898,7 +86898,7 @@ 022487A4 00000000 .text $t (src_overlay016_battle_script.c.o) 022487A4 0000005C .text BtlCmd_CheckSubstitute (src_overlay016_battle_script.c.o) 022487FC 00000000 .text $d (src_overlay016_battle_script.c.o) - 02248800 0000004E .text BtlCmd_CheckWeatherNegated (src_overlay016_battle_script.c.o) + 02248800 0000004E .text BtlCmd_CheckIgnoreWeather (src_overlay016_battle_script.c.o) 02248800 00000000 .text $t (src_overlay016_battle_script.c.o) 02248850 0000002E .text BtlCmd_SetRandomTarget (src_overlay016_battle_script.c.o) 02248850 00000000 .text $t (src_overlay016_battle_script.c.o) @@ -86906,23 +86906,23 @@ 02248880 00000000 .text $t (src_overlay016_battle_script.c.o) 022488B4 0000002C .text BtlCmd_RefreshSprite (src_overlay016_battle_script.c.o) 022488B4 00000000 .text $t (src_overlay016_battle_script.c.o) - 022488E0 0000002C .text BtlCmd_PlayMoveHitSoundEffect (src_overlay016_battle_script.c.o) + 022488E0 0000002C .text BtlCmd_PlayMoveHitSound (src_overlay016_battle_script.c.o) 022488E0 00000000 .text $t (src_overlay016_battle_script.c.o) - 0224890C 00000036 .text BtlCmd_PlayMusic (src_overlay016_battle_script.c.o) + 0224890C 00000036 .text BtlCmd_PlayBGM (src_overlay016_battle_script.c.o) 0224890C 00000000 .text $t (src_overlay016_battle_script.c.o) 02248944 00000000 .text $t (src_overlay016_battle_script.c.o) - 02248944 00000044 .text BtlCmd_CheckSafariContinues (src_overlay016_battle_script.c.o) + 02248944 00000044 .text BtlCmd_CheckSafariGameDone (src_overlay016_battle_script.c.o) 02248984 00000000 .text $d (src_overlay016_battle_script.c.o) 02248988 00000000 .text $t (src_overlay016_battle_script.c.o) - 02248988 0000006C .text BtlCmd_WaitFramesNoSkip (src_overlay016_battle_script.c.o) + 02248988 0000006C .text BtlCmd_WaitTime (src_overlay016_battle_script.c.o) 022489EC 00000000 .text $d (src_overlay016_battle_script.c.o) 022489F4 00000000 .text $t (src_overlay016_battle_script.c.o) - 022489F4 00000040 .text BtlCmd_CheckMoveIsType (src_overlay016_battle_script.c.o) + 022489F4 00000040 .text BtlCmd_CheckCurMoveIsType (src_overlay016_battle_script.c.o) 02248A2C 00000000 .text $d (src_overlay016_battle_script.c.o) - 02248A34 00000046 .text BtlCmd_LoadPersonalFormData (src_overlay016_battle_script.c.o) + 02248A34 00000046 .text BtlCmd_LoadArchivedMonData (src_overlay016_battle_script.c.o) 02248A34 00000000 .text $t (src_overlay016_battle_script.c.o) 02248A7C 00000000 .text $t (src_overlay016_battle_script.c.o) - 02248A7C 00000038 .text BtlCmd_ReloadPokemon (src_overlay016_battle_script.c.o) + 02248A7C 00000038 .text BtlCmd_RefreshMonData (src_overlay016_battle_script.c.o) 02248AB0 00000000 .text $d (src_overlay016_battle_script.c.o) 02248AB4 00000000 .text $t (src_overlay016_battle_script.c.o) 02248AB4 0000001C .text BtlCmd_End (src_overlay016_battle_script.c.o) @@ -88893,34 +88893,34 @@ 0226E260 00000000 .rodata .rodata (src_overlay016_ov16_0223B140.c.o) 0226E260 00000004 .rodata Unk_ov16_0226E260 (src_overlay016_ov16_0223B140.c.o) 0226E264 00000008 .rodata Unk_ov16_0226E264 (src_overlay016_ov16_0223B140.c.o) - 0226E26C 00000010 .rodata @19083 (src_overlay016_ov16_0223B140.c.o) - 0226E27C 00000010 .rodata @19536 (src_overlay016_ov16_0223B140.c.o) + 0226E26C 00000010 .rodata @19081 (src_overlay016_ov16_0223B140.c.o) + 0226E27C 00000010 .rodata @19534 (src_overlay016_ov16_0223B140.c.o) 0226E28C 00000010 .rodata Unk_ov16_0226E28C (src_overlay016_ov16_0223B140.c.o) 0226E29C 00000014 .rodata Unk_ov16_0226E29C (src_overlay016_ov16_0223B140.c.o) 0226E2B0 00000018 .rodata Unk_ov16_0226E2B0 (src_overlay016_ov16_0223B140.c.o) - 0226E2C8 0000001C .rodata @19538 (src_overlay016_ov16_0223B140.c.o) + 0226E2C8 0000001C .rodata @19536 (src_overlay016_ov16_0223B140.c.o) 0226E2E4 00000020 .rodata Unk_ov16_0226E2E4 (src_overlay016_ov16_0223B140.c.o) - 0226E304 00000028 .rodata @19534 (src_overlay016_ov16_0223B140.c.o) - 0226E32C 00000028 .rodata @19081 (src_overlay016_ov16_0223B140.c.o) - 0226E354 00000028 .rodata @19446 (src_overlay016_ov16_0223B140.c.o) - 0226E37C 00000028 .rodata @19450 (src_overlay016_ov16_0223B140.c.o) - 0226E3A4 00000054 .rodata @18964 (src_overlay016_ov16_0223B140.c.o) - 0226E3F8 00000054 .rodata @19085 (src_overlay016_ov16_0223B140.c.o) + 0226E304 00000028 .rodata @19532 (src_overlay016_ov16_0223B140.c.o) + 0226E32C 00000028 .rodata @19079 (src_overlay016_ov16_0223B140.c.o) + 0226E354 00000028 .rodata @19444 (src_overlay016_ov16_0223B140.c.o) + 0226E37C 00000028 .rodata @19448 (src_overlay016_ov16_0223B140.c.o) + 0226E3A4 00000054 .rodata @18962 (src_overlay016_ov16_0223B140.c.o) + 0226E3F8 00000054 .rodata @19083 (src_overlay016_ov16_0223B140.c.o) 0226E44C 00000114 .rodata Unk_ov16_0226E44C (src_overlay016_ov16_0223B140.c.o) 0226E560 00000004 .rodata Unk_ov16_0226E560 (src_overlay016_ov16_0223B140.c.o) - 0226E564 00000009 .rodata badgeMul$16621 (src_overlay016_ov16_0223DF00.c.o) + 0226E564 00000009 .rodata badgeMul$16619 (src_overlay016_ov16_0223DF00.c.o) 0226E570 00000004 .rodata sBasicBallMod (src_overlay016_battle_script.c.o) 0226E574 00000005 .rodata sCurrentPPScaledPower (src_overlay016_battle_script.c.o) 0226E57C 00000008 .rodata sProtectSuccessRate (src_overlay016_battle_script.c.o) 0226E57C 00000000 .rodata .rodata (src_overlay016_battle_script.c.o) 0226E584 0000000C .rodata sHPPixelsToFlailPower (src_overlay016_battle_script.c.o) 0226E590 00000016 .rodata sRarePickupItems (src_overlay016_battle_script.c.o) - 0226E5A8 00000018 .rodata @20307 (src_overlay016_battle_script.c.o) - 0226E5C0 00000018 .rodata @20317 (src_overlay016_battle_script.c.o) - 0226E5D8 00000018 .rodata @20319 (src_overlay016_battle_script.c.o) + 0226E5A8 00000018 .rodata @20305 (src_overlay016_battle_script.c.o) + 0226E5C0 00000018 .rodata @20315 (src_overlay016_battle_script.c.o) + 0226E5D8 00000018 .rodata @20317 (src_overlay016_battle_script.c.o) 0226E5F0 00000018 .rodata sWeightToPower (src_overlay016_battle_script.c.o) - 0226E608 00000018 .rodata @20283 (src_overlay016_battle_script.c.o) - 0226E620 00000018 .rodata @20305 (src_overlay016_battle_script.c.o) + 0226E608 00000018 .rodata @20281 (src_overlay016_battle_script.c.o) + 0226E620 00000018 .rodata @20303 (src_overlay016_battle_script.c.o) 0226E638 0000001A .rodata sSafariCatchRate (src_overlay016_battle_script.c.o) 0226E652 0000001A .rodata sTerrainMove (src_overlay016_battle_script.c.o) 0226E66C 00000024 .rodata sCommonPickupItems (src_overlay016_battle_script.c.o) @@ -88953,11 +88953,11 @@ 0226F068 0000010C .rodata Unk_ov16_0226F068 (src_overlay016_ov16_0225BFFC.c.o) 0226F174 00000006 .rodata Unk_ov16_0226F174 (src_overlay016_ov16_0225CBB8.c.o) 0226F17C 00000000 .rodata .rodata (src_overlay016_ov16_0225CBB8.c.o) - 0226F17C 00000018 .rodata @16797 (src_overlay016_ov16_0225CBB8.c.o) + 0226F17C 00000018 .rodata @16795 (src_overlay016_ov16_0225CBB8.c.o) 0226F194 0000001A .rodata Unk_ov16_0226F194 (src_overlay016_ov16_0225CBB8.c.o) 0226F1AE 00000022 .rodata Unk_ov16_0226F1AE (src_overlay016_ov16_0225CBB8.c.o) 0226F1D0 0000005C .rodata Unk_ov16_0226F1D0 (src_overlay016_ov16_0225CBB8.c.o) - 0226F22C 000000F0 .rodata @16925 (src_overlay016_ov16_0225CBB8.c.o) + 0226F22C 000000F0 .rodata @16923 (src_overlay016_ov16_0225CBB8.c.o) 0226F31C 00000018 .rodata Unk_ov16_0226F31C (src_overlay016_ov16_0225CBB8.c.o) 0226F334 00000006 .rodata Unk_ov16_0226F334 (src_overlay016_ov16_02266F1C.c.o) 0226F33C 00000010 .rodata Unk_ov16_0226F33C (src_overlay016_ov16_02266F1C.c.o) @@ -88993,7 +88993,7 @@ 022701C8 00000002 .rodata Unk_ov16_022701C8 (src_overlay016_ov16_0226871C.c.o) 022701CC 00000002 .rodata Unk_ov16_022701CC (src_overlay016_ov16_0226871C.c.o) 022701D0 00000004 .rodata Unk_ov16_022701D0 (src_overlay016_ov16_0226871C.c.o) - 022701D4 00000004 .rodata @16830 (src_overlay016_ov16_0226871C.c.o) + 022701D4 00000004 .rodata @16828 (src_overlay016_ov16_0226871C.c.o) 022701D8 00000004 .rodata Unk_ov16_022701D8 (src_overlay016_ov16_0226871C.c.o) 022701DC 00000006 .rodata Unk_ov16_022701DC (src_overlay016_ov16_0226871C.c.o) 022701E4 00000006 .rodata Unk_ov16_022701E4 (src_overlay016_ov16_0226871C.c.o) @@ -89006,7 +89006,7 @@ 0227021C 00000008 .rodata Unk_ov16_0227021C (src_overlay016_ov16_0226871C.c.o) 02270224 00000008 .rodata Unk_ov16_02270224 (src_overlay016_ov16_0226871C.c.o) 0227022C 00000008 .rodata Unk_ov16_0227022C (src_overlay016_ov16_0226871C.c.o) - 02270234 0000000C .rodata @17864 (src_overlay016_ov16_0226871C.c.o) + 02270234 0000000C .rodata @17862 (src_overlay016_ov16_0226871C.c.o) 02270240 0000000C .rodata Unk_ov16_02270240 (src_overlay016_ov16_0226871C.c.o) 0227024C 0000000C .rodata Unk_ov16_0227024C (src_overlay016_ov16_0226871C.c.o) 02270258 0000000C .rodata Unk_ov16_02270258 (src_overlay016_ov16_0226871C.c.o) @@ -137772,5 +137772,5 @@ 00000000 00000000 00000660 check.ITCM 00000000 00000000 00000880 check.DTCM -# Link start time: Wed Jan 24 06:10:59 2024 -# Link end time: Wed Jan 24 06:11:12 2024 +# Link start time: Thu Jan 25 06:32:00 2024 +# Link end time: Thu Jan 25 06:32:13 2024