diff --git a/PAPER_MARIO.u.yaml b/PAPER_MARIO.u.yaml
index 996bb4e293..7bd1463119 100644
--- a/PAPER_MARIO.u.yaml
+++ b/PAPER_MARIO.u.yaml
@@ -6535,6 +6535,457 @@ labels:
   - [0x8014A430, "get_default_variation_for_song"]
   - [0x8014A7E0, "_set_music_track"]
   - [0x8014A918, "set_music_track"]
+  - [0x8023E000, "get_dpad_input_radial"]
+  - [0x8023E130, "initialize_battle"]
+  - [0x8023E438, "update_battle_state"]
+  - [0x8023EA7C, "draw_main_battle_ui"]
+  - [0x80242024, "update_heroes_end_turn"]
+  - [0x80242AC8, "switch_to_player"]
+  - [0x80242BB0, "update_partner_change_turn"]
+  - [0x80242F00, "switch_to_partner"]
+  - [0x80243918, "switch_order"]
+  - [0x80244F00, "update_run_away"]
+  - [0x802456B8, "EnablePartnerBlur"]
+  - [0x802456D8, "DisablePartnerBlur"]
+  - [0x80245AD0, "update_player_action"]
+  - [0x80246B34, "update_partner_action"]
+  - [0x80246450, "update_player_change_turn"]
+  - [0x802472AC, "update_enemy_change_turn"]
+  - [0x80247570, "update_enemy_action"]
+  - [0x802403BC, "update_starpoints_display"]
+  - [0x80240BBC, "delete_actor"]
+  - [0x80240D68, "delete_player_actor"]
+  - [0x80241218, "begin_battle"]
+  - [0x80244A50, "end_battle"]
+  - [0x802456F8, "update_swap_partner"]
+  - [0x8024CF34, "use_cam_preset"]
+  - [0x8024E43C, "cam_target_actor"]
+  - [0x8024E4D8, "move_cam_over"]
+  - [0x8024E520, "set_cam_target_pos"]
+  - [0x8024E594, "set_cam_zoom"]
+  - [0x8024E5B4, "add_cam_zoom"]
+  - [0x8024E5E0, "set_cam_zoffset"]
+  - [0x8024E600, "unfreeze_cam"]
+  - [0x8024E61C, "UseCamPreset"]
+  - [0x8024E90C, "SetBattleCamTarget"]
+  - [0x8024EA58, "SetBattleCamOffsetZ"]
+  - [0x8024EA98, "AddBattleCamOffsetZ"]
+  - [0x8024EAE4, "SetBattleCamYaw"]
+  - [0x8024EB24, "BattleCamTargetActor"]
+  - [0x8024EC08, "MoveBattleCamOver"]
+  - [0x8024EC6C, "SetBattleCamZoom"]
+  - [0x8024ECAC, "AddBattleCamZoom"]
+  - [0x8024ED78, "FreezeBattleCam"]
+  - [0x8024EF68, "create_popup"]
+  - [0x8024F960, "show_battle_message"]
+  - [0x8024FA04, "show_variable_battle_message"]
+  - [0x8024FAB4, "is_popup_displayed"]
+  - [0x8024FAC4, "set_popup_duration"]
+  - [0x8024FB0C, "close_action_command_instruction_popup"]
+  - [0x80250EA4, "show_message_popup"]
+  - [0x802512B4, "ShowMessageBox"]
+  - [0x8025130C, "ShowVariableMessageBox"]
+  - [0x80251384, "IsMessageBoxDisplayed"]
+  - [0x802513CC, "WaitForMessageBoxDone"]
+  - [0x802513F0, "ForceCloseMessageBox"]
+  - [0x80251408, "SetMessageBoxDuration"]
+  - [0x802516E8, "calc_item_damage_enemy"]
+  - [0x802515D0, "calc_item_check_hit"]
+  - [0x80252728, "ItemDamageEnemy"]
+  - [0x80252924, "ItemAfflictEnemy"]
+  - [0x80252D40, "ItemCheckHit"]
+  - [0x80252F30, "ActorSpeak"]
+  - [0x802532D0, "EndActorSpeech"]
+  - [0x80253538, "ShowBattleChoice"]
+  - [0x802535F8, "OverrideBattleDmaDest"]
+  - [0x80253624, "LoadBattleDmaData"]
+  - [0x8025385C, "PlaySoundAtActor"]
+  - [0x802538D0, "PlaySoundAtPart"]
+  - [0x80253AA8, "SetForegroundModelsVisibleUnchecked"]
+  - [0x80253AEC, "SetForegroundModelsVisible"]
+  - [0x80253B94, "MakeStatusField"]
+  - [0x80253C20, "is_actor_hp_bar_visible"]
+  - [0x80253C9C, "is_actortype_hpbar_visible"]
+  - [0x80253D10, "save_tattle_flags"]
+  - [0x80253E78, "load_tattle_flags"]
+  - [0x80253FDC, "MultiplyByActorScale"]
+  - [0x80254048, "MultiplyVec2ByActorScale"]
+  - [0x802540DC, "MultiplyVec3ByActorScale"]
+  - [0x80254198, "ApplyShrinkFromOwner"]
+  - [0x80254218, "StartRumble"]
+  - [0x80254288, "mtx_mirror_y"]
+  - [0x802542CC, "enable_actor_blur"]
+  - [0x8025455C, "disable_actor_blur"]
+  - [0x80254644, "enable_partner_blur"]
+  - [0x80254668, "disable_partner_blur"]
+  - [0x802546D4, "enable_player_blur"]
+  - [0x80254914, "disable_player_blur"]
+  - [0x8025D03C, "_remove_part_decoration"]
+  - [0x80260B04, "activate_defend_command"]
+  - [0x802619C8, "HasMerleeCastsLeft"]
+  - [0x80261BA8, "FXRecoverHP"]
+  - [0x80261C68, "FXRecoverFP"]
+  - [0x80261D28, "IncrementPlayerHP"]
+  - [0x80261D60, "IncrementPlayerFP"]
+  - [0x80262240, "create_target_list"]
+  - [0x8026302C, "player_create_target_list"]
+  - [0x80263048, "enemy_create_target_list"]
+  - [0x80263B10, "count_power_plus"]
+  - [0x80263BC8, "deduct_current_move_fp"]
+  - [0x80263CFC, "set_animation"]
+  - [0x80263EB8, "set_animation_rate"]
+  - [0x80263F68, "set_actor_yaw"]
+  - [0x80263F9C, "set_part_yaw"]
+  - [0x80264128, "add_xz_vec3f"]
+  - [0x802641C0, "add_xz_vec3f_copy1"]
+  - [0x80264258, "add_xz_vec3f_copy2"]
+  - [0x802642F0, "play_movement_dust_effects"]
+  - [0x8026445C, "get_actor_part"]
+  - [0x802644A4, "load_player_actor"]
+  - [0x80264B74, "load_partner_actor"]
+  - [0x802653A4, "create_actor"]
+  - [0x80265E44, "lookup_defense"]
+  - [0x80265E98, "lookup_status_chance"]
+  - [0x80265EEC, "lookup_status_duration_mod"]
+  - [0x80265F40, "inflict_status"]
+  - [0x80266254, "inflict_partner_ko"]
+  - [0x802662BC, "get_defense"]
+  - [0x80266B78, "try_inflict_status"]
+  - [0x80266CF0, "inflict_status_set_duration"]
+  - [0x802665AC, "show_damage_popup"]
+  - [0x80267114, "add_part_decoration"]
+  - [0x80267190, "add_actor_decoration"]
+  - [0x80267218, "remove_part_decoration"]
+  - [0x80267234, "remove_actor_decoration"]
+  - [0x802672AC, "heroes_is_ability_active"]
+  - [0x8026731C, "create_part_shadow"]
+  - [0x802673A0, "remove_part_shadow"]
+  - [0x80267454, "remove_player_buffs"]
+  - [0x80267A9C, "reset_all_actor_sounds"]
+  - [0x80267BDC, "hide_foreground_models_unchecked"]
+  - [0x80267C48, "show_foreground_models_unchecked"]
+  - [0x80267CB4, "hide_foreground_models"]
+  - [0x80267D28, "show_foreground_models"]
+  - [0x80267D9C, "StartRumbleWithParams"]
+  - [0x80267DF4, "start_rumble_type"]
+  - [0x80267ED0, "LoadItemScript"]
+  - [0x8026801C, "LoadFreeItemScript"]
+  - [0x80268130, "LoadMoveScript"]
+  - [0x802681C0, "LoadActionCommand"]
+  - [0x80268ECC, "check_block_input"]
+  - [0x80269294, "GetActionSuccess"]
+  - [0x802692C0, "SetActionSuccess"]
+  - [0x802694F8, "GetActionSuccessCopy"]
+  - [0x8026957C, "GetBlockResult"]
+  - [0x80269410, "CloseActionCommandInfo"]
+  - [0x80269660, "count_targets"]
+  - [0x80269698, "get_nearest_home_index"]
+  - [0x80269754, "set_goal_pos_to_part"]
+  - [0x802699D8, "set_part_goal_to_actor_part"]
+  - [0x80269C24, "set_actor_current_position"]
+  - [0x80269C70, "set_part_absolute_position"]
+  - [0x80269D20, "set_actor_home_position"]
+  - [0x80269D6C, "get_actor"]
+  - [0x80269DE4, "LoadBattleSection"]
+  - [0x80269E28, "GetBattlePhase"]
+  - [0x80269E54, "GetLastElement"]
+  - [0x80269EC4, "SetGoalToHome"]
+  - [0x80269F2C, "SetIdleGoalToHome"]
+  - [0x80269F94, "SetGoalToIndex"]
+  - [0x8026A05C, "GetIndexFromPos"]
+  - [0x8026A0D4, "GetIndexFromHome"]
+  - [0x8026A14C, "CountPlayerTargets"]
+  - [0x8026A1EC, "ForceHomePos"]
+  - [0x8026A2D0, "SetHomePos"]
+  - [0x8026A3A8, "SetGoalToTarget"]
+  - [0x8026A404, "SetPartGoalToTarget"]
+  - [0x8026A49C, "SetGoalToFirstTarget"]
+  - [0x8026A510, "SetGoalPos"]
+  - [0x8026A62C, "SetIdleGoal"]
+  - [0x8026A748, "AddGoalPos"]
+  - [0x8026A820, "GetGoalPos"]
+  - [0x8026A8EC, "GetIdleGoal"]
+  - [0x8026A9B8, "GetPartTarget"]
+  - [0x8026AAA8, "GetActorPos"]
+  - [0x8026AB74, "GetPartOffset"]
+  - [0x8026AC88, "GetPartPos"]
+  - [0x8026AD74, "GetHomePos"]
+  - [0x8026AE40, "SetActorPos"]
+  - [0x8026AF18, "SetPartPos"]
+  - [0x8026B0A0, "SetEnemyTargetOffset"]
+  - [0x8026B1B0, "SetAnimation"]
+  - [0x8026B238, "GetAnimation"]
+  - [0x8026B2D0, "SetAnimationRate"]
+  - [0x8026B358, "SetActorYaw"]
+  - [0x8026B3C8, "GetActorYaw"]
+  - [0x8026B438, "SetPartYaw"]
+  - [0x8026B4C0, "GetPartYaw"]
+  - [0x8026B55C, "SetActorJumpGravity"]
+  - [0x8026B5D8, "SetActorIdleJumpGravity"]
+  - [0x8026B654, "SetActorSpeed"]
+  - [0x8026B6D0, "SetActorIdleSpeed"]
+  - [0x8026B74C, "SetPartJumpGravity"]
+  - [0x8026B7EC, "SetPartMoveSpeed"]
+  - [0x8026B88C, "SetJumpAnimations"]
+  - [0x8026B92C, "AddActorPos"]
+  - [0x8026BA04, "SetActorDispOffset"]
+  - [0x8026BAE8, "GetPartDispOffset"]
+  - [0x8026BC38, "SetPartDispOffset"]
+  - [0x8026BD88, "AddPartDispOffset"]
+  - [0x8026BFB4, "GetActorVar"]
+  - [0x8026C044, "SetActorVar"]
+  - [0x8026C0D4, "AddActorVar"]
+  - [0x8026C170, "GetPartMovementVar"]
+  - [0x8026C22C, "SetPartMovementVar"]
+  - [0x8026C2E8, "AddPartMovementVar"]
+  - [0x8026C3AC, "SetActorRotation"]
+  - [0x8026C4AC, "SetActorRotationOffset"]
+  - [0x8026C56C, "GetActorRotation"]
+  - [0x8026C634, "SetPartRotation"]
+  - [0x8026C740, "SetPartRotationOffset"]
+  - [0x8026C828, "GetPartRotation"]
+  - [0x8026C904, "SetActorScale"]
+  - [0x8026C9C4, "SetActorScaleModifier"]
+  - [0x8026CA84, "GetActorScale"]
+  - [0x8026CB4C, "SetPartScale"]
+  - [0x8026CC34, "GetPartScale"]
+  - [0x8026CD10, "GetBattleFlags"]
+  - [0x8026CD3C, "SetBattleFlagBits"]
+  - [0x8026CDA0, "GetBattleFlags2"]
+  - [0x8026CDCC, "SetBattleFlagBits2"]
+  - [0x8026CE30, "SetActorFlags"]
+  - [0x8026CE8C, "SetActorFlagBits"]
+  - [0x8026CF20, "GetActorFlags"]
+  - [0x8026CF88, "SetPartFlags"]
+  - [0x8026D010, "SetPartFlagBits"]
+  - [0x8026D0D0, "SetPartTargetFlags"]
+  - [0x8026D158, "SetPartTargetFlagBits"]
+  - [0x8026D218, "GetPartFlags"]
+  - [0x8026D2AC, "GetPartTargetFlags"]
+  - [0x8026D340, "SetPartEventFlags"]
+  - [0x8026D3C8, "SetPartEventBits"]
+  - [0x8026D488, "GetPartEventFlags"]
+  - [0x8026D664, "HPBarToHome"]
+  - [0x8026D7A8, "HPBarToCurrent"]
+  - [0x8026DB64, "SummonEnemy"]
+  - [0x8026DE00, "GetOwnerID"]
+  - [0x8026DE28, "SetOwnerID"]
+  - [0x8026DE5C, "ActorExists"]
+  - [0x8026E050, "SetBattleInputMask"]
+  - [0x8026E068, "SetBattleInputButtons"]
+  - [0x8026E098, "CheckButtonPress"]
+  - [0x8026E0D0, "CheckButtonHeld"]
+  - [0x8026E108, "CheckButtonDown"]
+  - [0x8026E140, "GetBattleState"]
+  - [0x8026E2CC, "PlayerCreateTargetList"]
+  - [0x8026E310, "EnemyCreateTargetList"]
+  - [0x8026E354, "InitTargetIterator"]
+  - [0x8026E3A8, "SetOwnerTarget"]
+  - [0x8026E414, "ChooseNextTarget"]
+  - [0x8026E864, "GetTargetListLength"]
+  - [0x8026E8AC, "GetOwnerTarget"]
+  - [0x8026E974, "GetPlayerActorID"]
+  - [0x8026E9FC, "GetDistanceToGoal"]
+  - [0x8026EE88, "AddActorDecoration"]
+  - [0x8026EF4C, "RemoveActorDecoration"]
+  - [0x8026EFF0, "ModifyActorDecoration"]
+  - [0x8026F0EC, "UseIdleAnimation"]
+  - [0x8026F230, "GetStatusFlags"]
+  - [0x8026F44C, "RemovePlayerBuffs"]
+  - [0x8026F470, "SetPartAlpha"]
+  - [0x8026F52C, "CreatePartShadow"]
+  - [0x8026F59C, "RemovePartShadow"]
+  - [0x8026F638, "SetBattleVar"]
+  - [0x8026F694, "GetBattleVar"]
+  - [0x8026F6EC, "ResetAllActorSounds"]
+  - [0x8026F740, "SetActorSounds"]
+  - [0x8026F838, "ResetActorSounds"]
+  - [0x8026FA00, "SetPartSounds"]
+  - [0x8026FB20, "SetActorType"]
+  - [0x8026FBB0, "ShowShockEffect"]
+  - [0x8026FC04, "GetActorAttackBoost"]
+  - [0x8026FC6C, "GetActorDefenseBoost"]
+  - [0x8026FCD4, "BoostAttack"]
+  - [0x80270174, "BoostDefense"]
+  - [0x80270614, "VanishActor"]
+  - [0x8027095C, "ElectrifyActor"]
+  - [0x80270CA4, "HealActor"]
+  - [0x8027114C, "WaitForBuffDone"]
+  - [0x80271160, "CopyBuffs"]
+  - [0x80271658, "dispatch_event_player"]
+  - [0x802716E4, "dispatch_event_player_continue_turn"]
+  - [0x80271754, "calc_player_test_enemy"]
+  - [0x80271944, "calc_player_damage_enemy"]
+  - [0x802731BC, "dispatch_damage_event_player"]
+  - [0x8027337C, "dispatch_damage_event_player_0"]
+  - [0x802733A8, "dispatch_damage_event_player_1"]
+  - [0x802733C4, "GetMenuSelection"]
+  - [0x80273894, "PlayerFallToGoal"]
+  - [0x80273B04, "PlayerLandJump"]
+  - [0x80273C64, "PlayerRunToGoal"]
+  - [0x80273EFC, "CancelablePlayerRunToGoal"]
+  - [0x80274234, "GetPlayerHP"]
+  - [0x80274260, "PlayerDamageEnemy"]
+  - [0x802744A0, "PlayerPowerBounceEnemy"]
+  - [0x802746F0, "PlayerTestEnemy"]
+  - [0x8027491C, "DispatchDamagePlayerEvent"]
+  - [0x80274978, "EnablePlayerBlur"]
+  - [0x80276EB4, "DidActionSucceed"]
+  - [0x80276F8C, "dispatch_event_general"]
+  - [0x80277004, "play_hit_sound"]
+  - [0x80277160, "dispatch_event_actor"]
+  - [0x802771F8, "calc_enemy_test_target"]
+  - [0x8027742C, "calc_enemy_damage_target"]
+  - [0x802786D4, "dispatch_damage_event_actor"]
+  - [0x802788F8, "dispatch_damage_event_actor_0"]
+  - [0x80278914, "dispatch_damage_event_actor_1"]
+  - [0x80278930, "BindTakeTurn"]
+  - [0x802789A4, "PauseTakeTurn"]
+  - [0x80278A1C, "ResumeTakeTurn"]
+  - [0x80278A94, "BindIdle"]
+  - [0x80278B4C, "EnableIdleScript"]
+  - [0x80278C20, "BindHandleEvent"]
+  - [0x80278C94, "BindNextTurn"]
+  - [0x80278D08, "JumpToGoal"]
+  - [0x8027910C, "IdleJumpToGoal"]
+  - [0x80279420, "JumpToGoalSimple2"]
+  - [0x80279728, "JumpWithBounce"]
+  - [0x80279AD4, "LandJump"]
+  - [0x80279BEC, "FallToGoal"]
+  - [0x80279E64, "RunToGoal"]
+  - [0x8027A264, "IdleRunToGoal"]
+  - [0x8027A4E4, "JumpPartTo"]
+  - [0x8027A854, "FallPartTo"]
+  - [0x8027AB5C, "LandJumpPart"]
+  - [0x8027ACAC, "RunPartTo"]
+  - [0x8027B0DC, "update_lerp_battle"]
+  - [0x8027B624, "FlyToGoal"]
+  - [0x8027BBB8, "IdleFlyToGoal"]
+  - [0x8027BF38, "FlyPartTo"]
+  - [0x8027C4E0, "GetLastEvent"]
+  - [0x8027C548, "SetTargetActor"]
+  - [0x8027C5C8, "SetEnemyHP"]
+  - [0x8027C6A0, "GetActorHP"]
+  - [0x8027C748, "GetEnemyMaxHP"]
+  - [0x8027C7B0, "RemoveActor"]
+  - [0x8027C8A4, "DropStarPoints"]
+  - [0x8027CA74, "SetDefenseTable"]
+  - [0x8027CB08, "SetStatusTable"]
+  - [0x8027CB7C, "SetIdleAnimations"]
+  - [0x8027CCB4, "EnemyDamageTarget"]
+  - [0x8027CED4, "EnemyFollowupAfflictTarget"]
+  - [0x8027CFB8, "EnemyTestTarget"]
+  - [0x8027D1BC, "DispatchDamageEvent"]
+  - [0x8027D264, "DispatchEvent"]
+  - [0x8027D380, "SetTargetOffset"]
+  - [0x8027D57C, "EnableActorBlur"]
+  - [0x8027D67C, "AfflictActor"]
+  - [0x8027D7C4, "GetEncounterState"]
+  - [0x8027D7F0, "YieldTurn"]
+  - [0x8027D810, "SetActorSize"]
+  - [0x8027D8E0, "GetActorSize"]
+  - [0x8027D970, "SetPartSize"]
+  - [0x8027DA68, "GetOriginalActorType"]
+  - [0x8027DAD4, "GetCurrentActorType"]
+  - [0x8027DB3C, "GetLastDamage"]
+  - [0x8027DBA4, "EnableActorGlow"]
+  - [0x8027DC68, "WasStatusInflicted"]
+  - [0x8027DCBC, "CopyStatusEffects"]
+  - [0x8027DDA0, "ClearStatusEffects"]
+  - [0x8027DE80, "dispatch_event_partner"]
+  - [0x8027DF0C, "dispatch_event_partner_continue_turn"]
+  - [0x8027DF7C, "calc_partner_test_enemy"]
+  - [0x8027E328, "calc_partner_damage_enemy"]
+  - [0x8027F9CC, "dispatch_damage_event_partner"]
+  - [0x8027FB80, "dispatch_damage_event_partner_0"]
+  - [0x8027FB9C, "dispatch_damage_event_partner_1"]
+  - [0x8027FBB8, "MakeOwnerTargetIndex"]
+  - [0x8027FD48, "GetActorLevel"]
+  - [0x8027FDB4, "PartnerDamageEnemy"]
+  - [0x80280004, "PartnerAfflictEnemy"]
+  - [0x80280270, "PartnerPowerBounceEnemy"]
+  - [0x802804D0, "PartnerTestEnemy"]
+  - [0x802807A8, "DeletePartner"]
+  - [0x80280840, "GetDamageIntensity"]
+  - [0x80280880, "ActorAddMovePos"]
+  - [0x80280950, "LoadStarPowerScript"]
+  - [0x802A5818, "can_switch_to_player"]
+  - [0x802A5988, "update_player_menu"]
+  - [0x802A81C8, "update_partner_menu"]
+  - [0x802AA688, "update_targeting_enemies"]
+  - [0x80284EBC, "PlayerScriptDispatcher"]
+  - [0x80285010, "PeachScriptDispatcher"]
+  - [0x8028505C, "ExecutePlayerAction"]
+  - [0x80285174, "ExecutePeachAction"]
+  - [0x802852D4, "HandleEvent_Player"]
+  - [0x80280A34, "BtlPutPartnerAway"]
+  - [0x80280B6C, "BtlBringPartnerOut"]
+  - [0x80284A40, "MarioEnterStage"]
+  - [0x80284D04, "PeachEnterStage"]
+  - [0x802851FC, "PlayerFirstStrike"]
+  - [0x802852B8, "StartDefend"]
+  - [0x80286194, "PlayerCelebrate"]
+  - [0x80286228, "ExitStage"]
+  - [0x802868BC, "RunAwayStart"]
+  - [0x80287078, "RunAwayFail"]
+  - [0x80287128, "RunAwayReset"]
+  - [0x802878D0, "PlayEatFX"]
+  - [0x80287948, "PlayDrinkFX"]
+  - [0x802879C0, "UseLifeShroom"]
+  - [0x80288398, "MerleeRunOut"]
+  - [0x80288400, "MerleeAttackBonus"]
+  - [0x8028870C, "MerleeDefenseBonus"]
+  - [0x80288A58, "MerleeExpBonus"]
+  - [0x80288D64, "PlayerHappy"]
+  - [0x8028907C, "DoDizzyAttack"]
+  - [0x80289110, "RegainAbility"]
+  - [0x80293E40, "UseMystery"]
+  - [0x802945E0, "DoSleepHit"]
+  - [0x802945FC, "DoDizzyHit"]
+  - [0x80294618, "DoParalyzeHit"]
+  - [0x80294634, "DoPoisonHit"]
+  - [0x80294650, "DoStopHit"]
+  - [0x8029466C, "DoFreezeHit"]
+  - [0x802946B8, "DoShinkHit"]
+  - [0x80298BF0, "ForceNextTarget"]
+  - [0x80299044, "DoNormalHit"]
+  - [0x8029A0D0, "DoBurnHit"]
+  - [0x8029A6FC, "DoShockHit"]
+  - [0x8029AC70, "DoImmune"]
+  - [0x8029AEC0, "DoDeath"]
+  - [0x8029AF08, "Collapse"]
+  - [0x8029B22C, "DoScareAway"]
+  - [0x8029B998, "DoSpinSmashHit"]
+  - [0x8029BD70, "DoJumpBack"]
+  - [0x8029BEB8, "DoReturnHome"]
+  - [0x8029BFA0, "DoRecover"]
+  - [0x8029C37C, "DoAirLift"]
+  - [0x8029C4A8, "DoBlowAway"]
+  - [0x802939C4, "Rumble_1"]
+  - [0x80293A10, "Rumble_2"]
+  - [0x80293A34, "Rumble_3"]
+  - [0x80293A58, "Rumble_4"]
+  - [0x80293A7C, "Rumble_5"]
+  - [0x80293AA0, "Rumble_6"]
+  - [0x80293AC4, "Rumble_7"]
+  - [0x80293AE8, "Rumble_Unused_1"]
+  - [0x80293B0C, "Rumble_Unused_2"]
+  - [0x80293B30, "Rumble_Unused_3"]
+  - [0x80293B54, "Rumble_Unused_4"]
+  - [0x80280E54, "CamPreset_A"]
+  - [0x80280CE8, "CamPreset_B"]
+  - [0x80280DAC, "CamPreset_C"]
+  - [0x80280DC8, "CamPreset_D"]
+  - [0x80280DE4, "CamPreset_E"]
+  - [0x80280D04, "CamPreset_F"]
+  - [0x80280D3C, "CamPreset_G"]
+  - [0x80280D74, "CamPreset_H"]
+  - [0x80280D58, "CamPreset_I"]
+  - [0x80280E00, "CamPreset_J"]
+  - [0x80280E1C, "CamPreset_K"]
+  - [0x80280E38, "CamPreset_L"]
+  - [0x80280D20, "CamPreset_M"]
+  - [0x80280D90, "CamPreset_N"]
   - [0x802C3000, "sort_scripts"]
   - [0x802C3148, "find_script_labels"]
   - [0x802C31DC, "clear_script_list"]
diff --git a/papermario/asm/CODE_163400.s b/papermario/asm/CODE_163400.s
index 37ab50d537..de409173fa 100644
--- a/papermario/asm/CODE_163400.s
+++ b/papermario/asm/CODE_163400.s
@@ -6,6 +6,7 @@ func_80242BA0:
 /* 163404 80242BA4 8FA90014 */  lw    $t1, 0x14($sp)
 /* 163408 80242BA8 8FAA0018 */  lw    $t2, 0x18($sp)
 /* 16340C 80242BAC 8FAB001C */  lw    $t3, 0x1c($sp)
+update_partner_change_turn:
 /* 163410 80242BB0 8FAC0020 */  lw    $t4, 0x20($sp)
 /* 163414 80242BB4 14400075 */  bnez  $v0, .L80242D8C
 /* 163418 80242BB8 28A2F581 */   slti  $v0, $a1, -0xa7f
@@ -252,6 +253,7 @@ func_80242E00:
 /* 163754 80242EF4 3C018025 */  lui   $at, 0x8025
 /* 163758 80242EF8 AC339BA4 */  sw    $s3, -0x645c($at)
 /* 16375C 80242EFC 3C018025 */  lui   $at, 0x8025
+switch_to_partner:
 /* 163760 80242F00 08090BD2 */  j     func_80242F48
 /* 163764 80242F04 AC339B98 */   sw    $s3, -0x6468($at)
 
@@ -988,6 +990,7 @@ func_80243254:
 /* 16416C 8024390C 3C028016 */  lui   $v0, 0x8016
 /* 164170 80243910 24429D50 */  addiu $v0, $v0, -0x62b0
 /* 164174 80243914 00042140 */  sll   $a0, $a0, 5
+switch_order:
 /* 164178 80243918 00824021 */  addu  $t0, $a0, $v0
 /* 16417C 8024391C 81050003 */  lb    $a1, 3($t0)
 /* 164180 80243920 9106001C */  lbu   $a2, 0x1c($t0)
@@ -2152,6 +2155,7 @@ func_80244A30:
 /* 1652A4 80244A44 82620004 */  lb    $v0, 4($s3)
 /* 1652A8 80244A48 1440000E */  bnez  $v0, .L80244A84
 /* 1652AC 80244A4C 0260202D */   daddu $a0, $s3, $zero
+end_battle:
 /* 1652B0 80244A50 0C00ABF6 */  jal   fio_has_valid_backup
 /* 1652B4 80244A54 00000000 */   nop   
 /* 1652B8 80244A58 3C04800E */  lui   $a0, 0x800e
@@ -2489,6 +2493,7 @@ func_80244EF0:
 .L80244EF8:
 /* 165758 80244EF8 0C0926A9 */  jal   func_80249AA4
 /* 16575C 80244EFC 0240202D */   daddu $a0, $s2, $zero
+update_run_away:
 /* 165760 80244F00 0040202D */  daddu $a0, $v0, $zero
 /* 165764 80244F04 02142821 */  addu  $a1, $s0, $s4
 /* 165768 80244F08 02333021 */  addu  $a2, $s1, $s3
@@ -3012,6 +3017,7 @@ func_80245568:
 /* 165F0C 802456AC 24040003 */  addiu $a0, $zero, 3
 /* 165F10 802456B0 AFA20014 */  sw    $v0, 0x14($sp)
 /* 165F14 802456B4 0C0913F5 */  jal   func_80244FD4
+EnablePartnerBlur:
 /* 165F18 802456B8 AFA30018 */   sw    $v1, 0x18($sp)
 /* 165F1C 802456BC 8FBF0020 */  lw    $ra, 0x20($sp)
 /* 165F20 802456C0 03E00008 */  jr    $ra
@@ -3021,6 +3027,7 @@ func_80245568:
 /* 165F2C 802456CC 0080402D */  daddu $t0, $a0, $zero
 /* 165F30 802456D0 00A0482D */  daddu $t1, $a1, $zero
 /* 165F34 802456D4 00C0502D */  daddu $t2, $a2, $zero
+DisablePartnerBlur:
 /* 165F38 802456D8 0100282D */  daddu $a1, $t0, $zero
 /* 165F3C 802456DC 8FA20038 */  lw    $v0, 0x38($sp)
 /* 165F40 802456E0 8FA3003C */  lw    $v1, 0x3c($sp)
@@ -3029,6 +3036,7 @@ func_80245568:
 /* 165F4C 802456EC AFA70010 */  sw    $a3, 0x10($sp)
 /* 165F50 802456F0 0140382D */  daddu $a3, $t2, $zero
 /* 165F54 802456F4 AFBF0020 */  sw    $ra, 0x20($sp)
+update_swap_partner:
 /* 165F58 802456F8 AFA4001C */  sw    $a0, 0x1c($sp)
 /* 165F5C 802456FC 0000202D */  daddu $a0, $zero, $zero
 /* 165F60 80245700 AFA20014 */  sw    $v0, 0x14($sp)
@@ -3293,6 +3301,7 @@ func_802459E0:
 /* 166324 80245AC4 00831021 */  addu  $v0, $a0, $v1
 /* 166328 80245AC8 00451021 */  addu  $v0, $v0, $a1
 /* 16632C 80245ACC 8E630008 */  lw    $v1, 8($s3)
+update_player_action:
 /* 166330 80245AD0 92640003 */  lbu   $a0, 3($s3)
 /* 166334 80245AD4 00621821 */  addu  $v1, $v1, $v0
 /* 166338 80245AD8 90620000 */  lbu   $v0, ($v1)
@@ -3952,6 +3961,7 @@ func_80246348:
 /* 166CA8 80246448 08091A38 */  j     func_802468E0
 /* 166CAC 8024644C 24060002 */   addiu $a2, $zero, 2
 
+update_player_change_turn:
 .L80246450:
 /* 166CB0 80246450 10400125 */  beqz  $v0, .L802468E8
 /* 166CB4 80246454 00000000 */   nop   
@@ -4438,6 +4448,7 @@ func_80246B10:
 
 /* 16738C 80246B2C 3C058015 */  lui   $a1, 0x8015
 /* 167390 80246B30 24A5F150 */  addiu $a1, $a1, -0xeb0
+update_partner_action:
 /* 167394 80246B34 3C068025 */  lui   $a2, 0x8025
 /* 167398 80246B38 24C6BDA8 */  addiu $a2, $a2, -0x4258
 /* 16739C 80246B3C 24C20070 */  addiu $v0, $a2, 0x70
@@ -4961,6 +4972,7 @@ func_80247168:
 /* 167B00 802472A0 00000000 */  nop   
 /* 167B04 802472A4 00620018 */  mult  $v1, $v0
 /* 167B08 802472A8 00001812 */  mflo  $v1
+update_enemy_change_turn:
 /* 167B0C 802472AC 00831821 */  addu  $v1, $a0, $v1
 /* 167B10 802472B0 82440001 */  lb    $a0, 1($s2)
 /* 167B14 802472B4 8E420008 */  lw    $v0, 8($s2)
@@ -5153,6 +5165,7 @@ func_8024755C:
 /* 167DC4 80247564 00021400 */  sll   $v0, $v0, 0x10
 /* 167DC8 80247568 00021C03 */  sra   $v1, $v0, 0x10
 /* 167DCC 8024756C 000217C2 */  srl   $v0, $v0, 0x1f
+update_enemy_action:
 /* 167DD0 80247570 00621821 */  addu  $v1, $v1, $v0
 /* 167DD4 80247574 00032843 */  sra   $a1, $v1, 1
 /* 167DD8 80247578 808305E3 */  lb    $v1, 0x5e3($a0)
diff --git a/papermario/asm/CODE_7e0e80.s b/papermario/asm/CODE_7e0e80.s
index b2255f39d3..c069ada43b 100644
--- a/papermario/asm/CODE_7e0e80.s
+++ b/papermario/asm/CODE_7e0e80.s
@@ -3,6 +3,7 @@
 
 func_80280000:
 /* 7E0E80 80280000 3C028007 */  lui   $v0, 0x8007
+PartnerAfflictEnemy:
 /* 7E0E84 80280004 8C42419C */  lw    $v0, 0x419c($v0)
 /* 7E0E88 80280008 27BDFFE0 */  addiu $sp, $sp, -0x20
 /* 7E0E8C 8028000C AFBF0018 */  sw    $ra, 0x18($sp)
@@ -169,6 +170,7 @@ func_80280208:
 .L80280268:
 /* 7E10E8 80280268 0C0496CF */  jal   set_message_string
 /* 7E10EC 8028026C 24050001 */   addiu $a1, $zero, 1
+PartnerPowerBounceEnemy:
 /* 7E10F0 80280270 3C048028 */  lui   $a0, 0x8028
 /* 7E10F4 80280274 24843EB0 */  addiu $a0, $a0, 0x3eb0
 /* 7E10F8 80280278 24050001 */  addiu $a1, $zero, 1
@@ -330,6 +332,7 @@ func_8028035C:
 /* 7E1344 802804C4 3C018028 */  lui   $at, 0x8028
 /* 7E1348 802804C8 AC256524 */  sw    $a1, 0x6524($at)
 /* 7E134C 802804CC 080A0141 */  j     func_80280504
+PartnerTestEnemy:
 /* 7E1350 802804D0 A6040000 */   sh    $a0, ($s0)
 
 .L802804D4:
@@ -529,13 +532,13 @@ func_80280504:
 /* 7E160C 8028078C 34A55CF0 */  ori   $a1, $a1, 0x5cf0
 /* 7E1610 80280790 0C0B2026 */  jal   set_variable
 /* 7E1614 80280794 24060001 */   addiu $a2, $zero, 1
-/* 7E1618 80280798 080A01EA */  j     func_802807A8
+/* 7E1618 80280798 080A01EA */  j     DeletePartner
 /* 7E161C 8028079C 00000000 */   nop   
 
 .L802807A0:
 /* 7E1620 802807A0 0C039D5D */  jal   add_item
 /* 7E1624 802807A4 00000000 */   nop   
-func_802807A8:
+DeletePartner:
 /* 7E1628 802807A8 0C0A005F */  jal   func_8028017C
 /* 7E162C 802807AC 24040003 */   addiu $a0, $zero, 3
 /* 7E1630 802807B0 AE620074 */  sw    $v0, 0x74($s3)
@@ -582,6 +585,7 @@ func_802807A8:
 /* 7E16B4 80280834 1440003D */  bnez  $v0, .L8028092C
 /* 7E16B8 80280838 0000102D */   daddu $v0, $zero, $zero
 /* 7E16BC 8028083C 8E430000 */  lw    $v1, ($s2)
+GetDamageIntensity:
 /* 7E16C0 80280840 24020001 */  addiu $v0, $zero, 1
 /* 7E16C4 80280844 3C018028 */  lui   $at, 0x8028
 /* 7E16C8 80280848 AC226534 */  sw    $v0, 0x6534($at)
@@ -601,6 +605,7 @@ func_80280850:
 /* 7E16F4 80280874 0000102D */   daddu $v0, $zero, $zero
 /* 7E16F8 80280878 8E430000 */  lw    $v1, ($s2)
 /* 7E16FC 8028087C 24020003 */  addiu $v0, $zero, 3
+ActorAddMovePos:
 /* 7E1700 80280880 3C018028 */  lui   $at, 0x8028
 /* 7E1704 80280884 AC226534 */  sw    $v0, 0x6534($at)
 /* 7E1708 80280888 AE700070 */  sw    $s0, 0x70($s3)
@@ -663,6 +668,7 @@ func_8028092C:
 /* 7E17C4 80280944 8FB10014 */  lw    $s1, 0x14($sp)
 /* 7E17C8 80280948 8FB00010 */  lw    $s0, 0x10($sp)
 /* 7E17CC 8028094C 03E00008 */  jr    $ra
+LoadStarPowerScript:
 /* 7E17D0 80280950 27BD0030 */   addiu $sp, $sp, 0x30
 
 func_80280954:
@@ -731,6 +737,7 @@ func_80280A04:
 /* 7E18A8 80280A28 24050001 */  addiu $a1, $zero, 1
 /* 7E18AC 80280A2C AE120108 */  sw    $s2, 0x108($s0)
 /* 7E18B0 80280A30 AE05018C */  sw    $a1, 0x18c($s0)
+BtlPutPartnerAway:
 /* 7E18B4 80280A34 AE020000 */  sw    $v0, ($s0)
 /* 7E18B8 80280A38 8C620000 */  lw    $v0, ($v1)
 /* 7E18BC 80280A3C AE020084 */  sw    $v0, 0x84($s0)
@@ -821,6 +828,7 @@ func_80280B44:
 /* 7E19E0 80280B60 00000000 */   nop   
 /* 7E19E4 80280B64 0C03A5EE */  jal   func_800E97B8
 /* 7E19E8 80280B68 00000000 */   nop   
+BtlBringPartnerOut:
 /* 7E19EC 80280B6C 8FBF0010 */  lw    $ra, 0x10($sp)
 /* 7E19F0 80280B70 03E00008 */  jr    $ra
 /* 7E19F4 80280B74 27BD0018 */   addiu $sp, $sp, 0x18
@@ -932,6 +940,7 @@ func_80280B78:
 /* 7E1B5C 80280CDC 10620117 */  beq   $v1, $v0, .L8028113C
 /* 7E1B60 80280CE0 28620034 */   slti  $v0, $v1, 0x34
 /* 7E1B64 80280CE4 10400007 */  beqz  $v0, .L80280D04
+CamPreset_B:
 /* 7E1B68 80280CE8 24020029 */   addiu $v0, $zero, 0x29
 /* 7E1B6C 80280CEC 10620027 */  beq   $v1, $v0, .L80280D8C
 /* 7E1B70 80280CF0 2402002A */   addiu $v0, $zero, 0x2a
@@ -940,6 +949,7 @@ func_80280B78:
 /* 7E1B7C 80280CFC 080A0506 */  j     func_80281418
 /* 7E1B80 80280D00 00000000 */   nop   
 
+CamPreset_F:
 .L80280D04:
 /* 7E1B84 80280D04 24020034 */  addiu $v0, $zero, 0x34
 /* 7E1B88 80280D08 10620133 */  beq   $v1, $v0, .L802811D8
@@ -949,6 +959,7 @@ func_80280B78:
 /* 7E1B98 80280D18 080A0506 */  j     func_80281418
 /* 7E1B9C 80280D1C 00000000 */   nop   
 
+CamPreset_M:
 .L80280D20:
 /* 7E1BA0 80280D20 240200C9 */  addiu $v0, $zero, 0xc9
 /* 7E1BA4 80280D24 10620072 */  beq   $v1, $v0, .L80280EF0
@@ -957,6 +968,7 @@ func_80280B78:
 /* 7E1BB0 80280D30 24020048 */   addiu $v0, $zero, 0x48
 /* 7E1BB4 80280D34 1062017E */  beq   $v1, $v0, .L80281330
 /* 7E1BB8 80280D38 24020049 */   addiu $v0, $zero, 0x49
+CamPreset_G:
 /* 7E1BBC 80280D3C 1062018C */  beq   $v1, $v0, .L80281370
 /* 7E1BC0 80280D40 0000102D */   daddu $v0, $zero, $zero
 /* 7E1BC4 80280D44 080A0506 */  j     func_80281418
@@ -966,6 +978,7 @@ func_80280B78:
 /* 7E1BCC 80280D4C 240201F5 */  addiu $v0, $zero, 0x1f5
 /* 7E1BD0 80280D50 106200EA */  beq   $v1, $v0, .L802810FC
 /* 7E1BD4 80280D54 240202BD */   addiu $v0, $zero, 0x2bd
+CamPreset_I:
 /* 7E1BD8 80280D58 10620138 */  beq   $v1, $v0, .L8028123C
 /* 7E1BDC 80280D5C 0000102D */   daddu $v0, $zero, $zero
 /* 7E1BE0 80280D60 080A0506 */  j     func_80281418
@@ -975,6 +988,7 @@ func_80280B78:
 /* 7E1BE8 80280D68 0C0B1059 */  jal   does_script_exist
 /* 7E1BEC 80280D6C 8E240074 */   lw    $a0, 0x74($s1)
 /* 7E1BF0 80280D70 144001A9 */  bnez  $v0, .L80281418
+CamPreset_H:
 /* 7E1BF4 80280D74 0000102D */   daddu $v0, $zero, $zero
 /* 7E1BF8 80280D78 3C04001E */  lui   $a0, 0x1e
 /* 7E1BFC 80280D7C 34840003 */  ori   $a0, $a0, 3
@@ -984,6 +998,7 @@ func_80280B78:
 
 .L80280D8C:
 /* 7E1C0C 80280D8C 8E240078 */  lw    $a0, 0x78($s1)
+CamPreset_N:
 /* 7E1C10 80280D90 24020001 */  addiu $v0, $zero, 1
 /* 7E1C14 80280D94 148201A0 */  bne   $a0, $v0, .L80281418
 /* 7E1C18 80280D98 0000102D */   daddu $v0, $zero, $zero
@@ -991,6 +1006,7 @@ func_80280B78:
 /* 7E1C20 80280DA0 8C426538 */  lw    $v0, 0x6538($v0)
 /* 7E1C24 80280DA4 904304E8 */  lbu   $v1, 0x4e8($v0)
 /* 7E1C28 80280DA8 10640012 */  beq   $v1, $a0, .L80280DF4
+CamPreset_C:
 /* 7E1C2C 80280DAC 28620002 */   slti  $v0, $v1, 2
 /* 7E1C30 80280DB0 10400005 */  beqz  $v0, .L80280DC8
 /* 7E1C34 80280DB4 24020002 */   addiu $v0, $zero, 2
@@ -999,6 +1015,7 @@ func_80280B78:
 /* 7E1C40 80280DC0 080A03B6 */  j     func_80280ED8
 /* 7E1C44 80280DC4 00000000 */   nop   
 
+CamPreset_D:
 .L80280DC8:
 /* 7E1C48 80280DC8 10620018 */  beq   $v1, $v0, .L80280E2C
 /* 7E1C4C 80280DCC 24020003 */   addiu $v0, $zero, 3
@@ -1009,6 +1026,7 @@ func_80280B78:
 
 .L80280DE0:
 /* 7E1C60 80280DE0 0C0A005F */  jal   func_8028017C
+CamPreset_E:
 /* 7E1C64 80280DE4 24040005 */   addiu $a0, $zero, 5
 /* 7E1C68 80280DE8 AE220074 */  sw    $v0, 0x74($s1)
 /* 7E1C6C 80280DEC 080A0505 */  j     func_80281414
@@ -1018,6 +1036,7 @@ func_80280B78:
 /* 7E1C74 80280DF4 0C039D7B */  jal   get_item_count
 /* 7E1C78 80280DF8 00000000 */   nop   
 /* 7E1C7C 80280DFC 14400005 */  bnez  $v0, .L80280E14
+CamPreset_J:
 /* 7E1C80 80280E00 00000000 */   nop   
 /* 7E1C84 80280E04 0C0A005F */  jal   func_8028017C
 /* 7E1C88 80280E08 24040006 */   addiu $a0, $zero, 6
@@ -1027,6 +1046,7 @@ func_80280B78:
 .L80280E14:
 /* 7E1C94 80280E14 0C0A005F */  jal   func_8028017C
 /* 7E1C98 80280E18 24040007 */   addiu $a0, $zero, 7
+CamPreset_K:
 /* 7E1C9C 80280E1C AE220074 */  sw    $v0, 0x74($s1)
 /* 7E1CA0 80280E20 240200C9 */  addiu $v0, $zero, 0xc9
 /* 7E1CA4 80280E24 080A0505 */  j     func_80281414
@@ -1036,6 +1056,7 @@ func_80280B78:
 /* 7E1CAC 80280E2C 0C039D7B */  jal   get_item_count
 /* 7E1CB0 80280E30 00000000 */   nop   
 /* 7E1CB4 80280E34 14400005 */  bnez  $v0, .L80280E4C
+CamPreset_L:
 /* 7E1CB8 80280E38 00000000 */   nop   
 /* 7E1CBC 80280E3C 0C0A005F */  jal   func_8028017C
 /* 7E1CC0 80280E40 2404000C */   addiu $a0, $zero, 0xc
@@ -1045,6 +1066,7 @@ func_80280B78:
 .L80280E4C:
 /* 7E1CCC 80280E4C 0C039E12 */  jal   get_stored_empty_count
 /* 7E1CD0 80280E50 00000000 */   nop   
+CamPreset_A:
 /* 7E1CD4 80280E54 14400005 */  bnez  $v0, .L80280E6C
 /* 7E1CD8 80280E58 00000000 */   nop   
 /* 7E1CDC 80280E5C 0C0A005F */  jal   func_8028017C
diff --git a/papermario/asm/code_ebd0_len_6a0.s b/papermario/asm/code_ebd0_len_6a0.s
index 5e8b40d884..d096a22e5c 100644
--- a/papermario/asm/code_ebd0_len_6a0.s
+++ b/papermario/asm/code_ebd0_len_6a0.s
@@ -204,7 +204,7 @@ step_battle:
 /* 00EE90 80033A90 24C6E000 */  addiu $a2, $a2, -0x2000
 /* 00EE94 80033A94 0C00A5CF */  jal   dma_copy
 /* 00EE98 80033A98 00000000 */   nop   
-/* 00EE9C 80033A9C 0C08F84C */  jal   func_8023E130
+/* 00EE9C 80033A9C 0C08F84C */  jal   initialize_battle
 /* 00EEA0 80033AA0 00000000 */   nop   
 /* 00EEA4 80033AA4 0C09027D */  jal   func_802409F4
 /* 00EEA8 80033AA8 00000000 */   nop   
@@ -235,7 +235,7 @@ step_battle:
 .L80033B0C:
 /* 00EF0C 80033B0C 0C00F949 */  jal   func_8003E524
 /* 00EF10 80033B10 00000000 */   nop   
-/* 00EF14 80033B14 0C08F90E */  jal   func_8023E438
+/* 00EF14 80033B14 0C08F90E */  jal   update_battle_state
 /* 00EF18 80033B18 00000000 */   nop   
 /* 00EF1C 80033B1C 0C00E64C */  jal   func_80039930
 /* 00EF20 80033B20 00000000 */   nop   
@@ -262,7 +262,7 @@ func_80033B44:
 /* 00EF68 80033B68 80420900 */  lb    $v0, 0x900($v0)
 /* 00EF6C 80033B6C 04410003 */  bgez  $v0, .L80033B7C
 /* 00EF70 80033B70 00000000 */   nop   
-/* 00EF74 80033B74 0C08FA9F */  jal   func_8023EA7C
+/* 00EF74 80033B74 0C08FA9F */  jal   draw_main_battle_ui
 /* 00EF78 80033B78 00000000 */   nop   
 .L80033B7C:
 /* 00EF7C 80033B7C 8FBF0010 */  lw    $ra, 0x10($sp)
diff --git a/papermario/globals.inc b/papermario/globals.inc
index 1b8152988f..538da69daa 100644
--- a/papermario/globals.inc
+++ b/papermario/globals.inc
@@ -779,6 +779,457 @@
 .global get_default_variation_for_song
 .global _set_music_track
 .global set_music_track
+.global get_dpad_input_radial
+.global initialize_battle
+.global update_battle_state
+.global draw_main_battle_ui
+.global update_heroes_end_turn
+.global switch_to_player
+.global update_partner_change_turn
+.global switch_to_partner
+.global switch_order
+.global update_run_away
+.global EnablePartnerBlur
+.global DisablePartnerBlur
+.global update_player_action
+.global update_partner_action
+.global update_player_change_turn
+.global update_enemy_change_turn
+.global update_enemy_action
+.global update_starpoints_display
+.global delete_actor
+.global delete_player_actor
+.global begin_battle
+.global end_battle
+.global update_swap_partner
+.global use_cam_preset
+.global cam_target_actor
+.global move_cam_over
+.global set_cam_target_pos
+.global set_cam_zoom
+.global add_cam_zoom
+.global set_cam_zoffset
+.global unfreeze_cam
+.global UseCamPreset
+.global SetBattleCamTarget
+.global SetBattleCamOffsetZ
+.global AddBattleCamOffsetZ
+.global SetBattleCamYaw
+.global BattleCamTargetActor
+.global MoveBattleCamOver
+.global SetBattleCamZoom
+.global AddBattleCamZoom
+.global FreezeBattleCam
+.global create_popup
+.global show_battle_message
+.global show_variable_battle_message
+.global is_popup_displayed
+.global set_popup_duration
+.global close_action_command_instruction_popup
+.global show_message_popup
+.global ShowMessageBox
+.global ShowVariableMessageBox
+.global IsMessageBoxDisplayed
+.global WaitForMessageBoxDone
+.global ForceCloseMessageBox
+.global SetMessageBoxDuration
+.global calc_item_damage_enemy
+.global calc_item_check_hit
+.global ItemDamageEnemy
+.global ItemAfflictEnemy
+.global ItemCheckHit
+.global ActorSpeak
+.global EndActorSpeech
+.global ShowBattleChoice
+.global OverrideBattleDmaDest
+.global LoadBattleDmaData
+.global PlaySoundAtActor
+.global PlaySoundAtPart
+.global SetForegroundModelsVisibleUnchecked
+.global SetForegroundModelsVisible
+.global MakeStatusField
+.global is_actor_hp_bar_visible
+.global is_actortype_hpbar_visible
+.global save_tattle_flags
+.global load_tattle_flags
+.global MultiplyByActorScale
+.global MultiplyVec2ByActorScale
+.global MultiplyVec3ByActorScale
+.global ApplyShrinkFromOwner
+.global StartRumble
+.global mtx_mirror_y
+.global enable_actor_blur
+.global disable_actor_blur
+.global enable_partner_blur
+.global disable_partner_blur
+.global enable_player_blur
+.global disable_player_blur
+.global _remove_part_decoration
+.global activate_defend_command
+.global HasMerleeCastsLeft
+.global FXRecoverHP
+.global FXRecoverFP
+.global IncrementPlayerHP
+.global IncrementPlayerFP
+.global create_target_list
+.global player_create_target_list
+.global enemy_create_target_list
+.global count_power_plus
+.global deduct_current_move_fp
+.global set_animation
+.global set_animation_rate
+.global set_actor_yaw
+.global set_part_yaw
+.global add_xz_vec3f
+.global add_xz_vec3f_copy1
+.global add_xz_vec3f_copy2
+.global play_movement_dust_effects
+.global get_actor_part
+.global load_player_actor
+.global load_partner_actor
+.global create_actor
+.global lookup_defense
+.global lookup_status_chance
+.global lookup_status_duration_mod
+.global inflict_status
+.global inflict_partner_ko
+.global get_defense
+.global try_inflict_status
+.global inflict_status_set_duration
+.global show_damage_popup
+.global add_part_decoration
+.global add_actor_decoration
+.global remove_part_decoration
+.global remove_actor_decoration
+.global heroes_is_ability_active
+.global create_part_shadow
+.global remove_part_shadow
+.global remove_player_buffs
+.global reset_all_actor_sounds
+.global hide_foreground_models_unchecked
+.global show_foreground_models_unchecked
+.global hide_foreground_models
+.global show_foreground_models
+.global StartRumbleWithParams
+.global start_rumble_type
+.global LoadItemScript
+.global LoadFreeItemScript
+.global LoadMoveScript
+.global LoadActionCommand
+.global check_block_input
+.global GetActionSuccess
+.global SetActionSuccess
+.global GetActionSuccessCopy
+.global GetBlockResult
+.global CloseActionCommandInfo
+.global count_targets
+.global get_nearest_home_index
+.global set_goal_pos_to_part
+.global set_part_goal_to_actor_part
+.global set_actor_current_position
+.global set_part_absolute_position
+.global set_actor_home_position
+.global get_actor
+.global LoadBattleSection
+.global GetBattlePhase
+.global GetLastElement
+.global SetGoalToHome
+.global SetIdleGoalToHome
+.global SetGoalToIndex
+.global GetIndexFromPos
+.global GetIndexFromHome
+.global CountPlayerTargets
+.global ForceHomePos
+.global SetHomePos
+.global SetGoalToTarget
+.global SetPartGoalToTarget
+.global SetGoalToFirstTarget
+.global SetGoalPos
+.global SetIdleGoal
+.global AddGoalPos
+.global GetGoalPos
+.global GetIdleGoal
+.global GetPartTarget
+.global GetActorPos
+.global GetPartOffset
+.global GetPartPos
+.global GetHomePos
+.global SetActorPos
+.global SetPartPos
+.global SetEnemyTargetOffset
+.global SetAnimation
+.global GetAnimation
+.global SetAnimationRate
+.global SetActorYaw
+.global GetActorYaw
+.global SetPartYaw
+.global GetPartYaw
+.global SetActorJumpGravity
+.global SetActorIdleJumpGravity
+.global SetActorSpeed
+.global SetActorIdleSpeed
+.global SetPartJumpGravity
+.global SetPartMoveSpeed
+.global SetJumpAnimations
+.global AddActorPos
+.global SetActorDispOffset
+.global GetPartDispOffset
+.global SetPartDispOffset
+.global AddPartDispOffset
+.global GetActorVar
+.global SetActorVar
+.global AddActorVar
+.global GetPartMovementVar
+.global SetPartMovementVar
+.global AddPartMovementVar
+.global SetActorRotation
+.global SetActorRotationOffset
+.global GetActorRotation
+.global SetPartRotation
+.global SetPartRotationOffset
+.global GetPartRotation
+.global SetActorScale
+.global SetActorScaleModifier
+.global GetActorScale
+.global SetPartScale
+.global GetPartScale
+.global GetBattleFlags
+.global SetBattleFlagBits
+.global GetBattleFlags2
+.global SetBattleFlagBits2
+.global SetActorFlags
+.global SetActorFlagBits
+.global GetActorFlags
+.global SetPartFlags
+.global SetPartFlagBits
+.global SetPartTargetFlags
+.global SetPartTargetFlagBits
+.global GetPartFlags
+.global GetPartTargetFlags
+.global SetPartEventFlags
+.global SetPartEventBits
+.global GetPartEventFlags
+.global HPBarToHome
+.global HPBarToCurrent
+.global SummonEnemy
+.global GetOwnerID
+.global SetOwnerID
+.global ActorExists
+.global SetBattleInputMask
+.global SetBattleInputButtons
+.global CheckButtonPress
+.global CheckButtonHeld
+.global CheckButtonDown
+.global GetBattleState
+.global PlayerCreateTargetList
+.global EnemyCreateTargetList
+.global InitTargetIterator
+.global SetOwnerTarget
+.global ChooseNextTarget
+.global GetTargetListLength
+.global GetOwnerTarget
+.global GetPlayerActorID
+.global GetDistanceToGoal
+.global AddActorDecoration
+.global RemoveActorDecoration
+.global ModifyActorDecoration
+.global UseIdleAnimation
+.global GetStatusFlags
+.global RemovePlayerBuffs
+.global SetPartAlpha
+.global CreatePartShadow
+.global RemovePartShadow
+.global SetBattleVar
+.global GetBattleVar
+.global ResetAllActorSounds
+.global SetActorSounds
+.global ResetActorSounds
+.global SetPartSounds
+.global SetActorType
+.global ShowShockEffect
+.global GetActorAttackBoost
+.global GetActorDefenseBoost
+.global BoostAttack
+.global BoostDefense
+.global VanishActor
+.global ElectrifyActor
+.global HealActor
+.global WaitForBuffDone
+.global CopyBuffs
+.global dispatch_event_player
+.global dispatch_event_player_continue_turn
+.global calc_player_test_enemy
+.global calc_player_damage_enemy
+.global dispatch_damage_event_player
+.global dispatch_damage_event_player_0
+.global dispatch_damage_event_player_1
+.global GetMenuSelection
+.global PlayerFallToGoal
+.global PlayerLandJump
+.global PlayerRunToGoal
+.global CancelablePlayerRunToGoal
+.global GetPlayerHP
+.global PlayerDamageEnemy
+.global PlayerPowerBounceEnemy
+.global PlayerTestEnemy
+.global DispatchDamagePlayerEvent
+.global EnablePlayerBlur
+.global DidActionSucceed
+.global dispatch_event_general
+.global play_hit_sound
+.global dispatch_event_actor
+.global calc_enemy_test_target
+.global calc_enemy_damage_target
+.global dispatch_damage_event_actor
+.global dispatch_damage_event_actor_0
+.global dispatch_damage_event_actor_1
+.global BindTakeTurn
+.global PauseTakeTurn
+.global ResumeTakeTurn
+.global BindIdle
+.global EnableIdleScript
+.global BindHandleEvent
+.global BindNextTurn
+.global JumpToGoal
+.global IdleJumpToGoal
+.global JumpToGoalSimple2
+.global JumpWithBounce
+.global LandJump
+.global FallToGoal
+.global RunToGoal
+.global IdleRunToGoal
+.global JumpPartTo
+.global FallPartTo
+.global LandJumpPart
+.global RunPartTo
+.global update_lerp_battle
+.global FlyToGoal
+.global IdleFlyToGoal
+.global FlyPartTo
+.global GetLastEvent
+.global SetTargetActor
+.global SetEnemyHP
+.global GetActorHP
+.global GetEnemyMaxHP
+.global RemoveActor
+.global DropStarPoints
+.global SetDefenseTable
+.global SetStatusTable
+.global SetIdleAnimations
+.global EnemyDamageTarget
+.global EnemyFollowupAfflictTarget
+.global EnemyTestTarget
+.global DispatchDamageEvent
+.global DispatchEvent
+.global SetTargetOffset
+.global EnableActorBlur
+.global AfflictActor
+.global GetEncounterState
+.global YieldTurn
+.global SetActorSize
+.global GetActorSize
+.global SetPartSize
+.global GetOriginalActorType
+.global GetCurrentActorType
+.global GetLastDamage
+.global EnableActorGlow
+.global WasStatusInflicted
+.global CopyStatusEffects
+.global ClearStatusEffects
+.global dispatch_event_partner
+.global dispatch_event_partner_continue_turn
+.global calc_partner_test_enemy
+.global calc_partner_damage_enemy
+.global dispatch_damage_event_partner
+.global dispatch_damage_event_partner_0
+.global dispatch_damage_event_partner_1
+.global MakeOwnerTargetIndex
+.global GetActorLevel
+.global PartnerDamageEnemy
+.global PartnerAfflictEnemy
+.global PartnerPowerBounceEnemy
+.global PartnerTestEnemy
+.global DeletePartner
+.global GetDamageIntensity
+.global ActorAddMovePos
+.global LoadStarPowerScript
+.global can_switch_to_player
+.global update_player_menu
+.global update_partner_menu
+.global update_targeting_enemies
+.global PlayerScriptDispatcher
+.global PeachScriptDispatcher
+.global ExecutePlayerAction
+.global ExecutePeachAction
+.global HandleEvent_Player
+.global BtlPutPartnerAway
+.global BtlBringPartnerOut
+.global MarioEnterStage
+.global PeachEnterStage
+.global PlayerFirstStrike
+.global StartDefend
+.global PlayerCelebrate
+.global ExitStage
+.global RunAwayStart
+.global RunAwayFail
+.global RunAwayReset
+.global PlayEatFX
+.global PlayDrinkFX
+.global UseLifeShroom
+.global MerleeRunOut
+.global MerleeAttackBonus
+.global MerleeDefenseBonus
+.global MerleeExpBonus
+.global PlayerHappy
+.global DoDizzyAttack
+.global RegainAbility
+.global UseMystery
+.global DoSleepHit
+.global DoDizzyHit
+.global DoParalyzeHit
+.global DoPoisonHit
+.global DoStopHit
+.global DoFreezeHit
+.global DoShinkHit
+.global ForceNextTarget
+.global DoNormalHit
+.global DoBurnHit
+.global DoShockHit
+.global DoImmune
+.global DoDeath
+.global Collapse
+.global DoScareAway
+.global DoSpinSmashHit
+.global DoJumpBack
+.global DoReturnHome
+.global DoRecover
+.global DoAirLift
+.global DoBlowAway
+.global Rumble_1
+.global Rumble_2
+.global Rumble_3
+.global Rumble_4
+.global Rumble_5
+.global Rumble_6
+.global Rumble_7
+.global Rumble_Unused_1
+.global Rumble_Unused_2
+.global Rumble_Unused_3
+.global Rumble_Unused_4
+.global CamPreset_A
+.global CamPreset_B
+.global CamPreset_C
+.global CamPreset_D
+.global CamPreset_E
+.global CamPreset_F
+.global CamPreset_G
+.global CamPreset_H
+.global CamPreset_I
+.global CamPreset_J
+.global CamPreset_K
+.global CamPreset_L
+.global CamPreset_M
+.global CamPreset_N
 .global sort_scripts
 .global find_script_labels
 .global clear_script_list
diff --git a/papermario/undefined_syms.txt b/papermario/undefined_syms.txt
index 41c4030e69..549e37572a 100644
--- a/papermario/undefined_syms.txt
+++ b/papermario/undefined_syms.txt
@@ -4,9 +4,9 @@ func_04000900 = 0x04000900;
 func_04000974 = 0x04000974;
 func_04000A34 = 0x04000A34;
 func_04000AC4 = 0x04000AC4;
-func_8023E130 = 0x8023E130;
-func_8023E438 = 0x8023E438;
-func_8023EA7C = 0x8023EA7C;
+initialize_battle = 0x8023E130;
+update_battle_state = 0x8023E438;
+draw_main_battle_ui = 0x8023EA7C;
 func_802409F4 = 0x802409F4;
 func_80240AA8 = 0x80240AA8;
 func_80241190 = 0x80241190;