Broken Fix Fixed Broke

bates64 · Mar 24, 2024 · 0540ea9 · 0540ea9
1 parent de4c7e0
commit 0540ea9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/7BB60.c b/src/7BB60.c
@@ -4,7 +4,7 @@
 #include "dx/debug_menu.h"
 
 CollisionStatus gCollisionStatus;
-f32 D_8010C928;
+f32 StepUpLastY;
 f32 JumpedOnSwitchX;
 f32 JumpedOnSwitchZ;
 f32 StepUpLastYaw;

diff --git a/src/battle/battle.h b/src/battle/battle.h
@@ -259,6 +259,8 @@ extern Battle* gCurrentBattlePtr;
 
 extern ActorOffsets bActorOffsets[];
 
+#endif
+
 void load_demo_battle(u32 index);
 Actor* create_actor(Formation formation);
 

diff --git a/src/bss/engine1_pre_bss.c b/src/bss/engine1_pre_bss.c
@@ -31,7 +31,7 @@ BSS s32 NpcHitQueryColliderID;
 BSS f32 JumpedOnSwitchZ;
 BSS s32 PlayerRunStateTime;
 BSS f32 StepUpLastYaw;
-BSS s32 D_8010C988;
+BSS s32 StepUpLastY;
 BSS s32 NpcHitQueryAheadCollider;
 BSS f32 PlayerNormalPitch;
 

diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
@@ -402,7 +402,6 @@ segments:
     - [auto, c, world/actions]
     - [auto, c, world/partners]
     - [auto, c, global_hud_scripts]
-    - [auto, hasm, bss2_2]
     - [auto, c, world/surfaces]
     - [auto, c, 8a160_len_700]
     - [auto, c, 8a860_len_3f30]