fix reported battleID

bates64 · Jan 28, 2024 · d886e71 · d886e71
1 parent db5fa4a
commit d886e71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/include/variables.h b/include/variables.h
@@ -22,6 +22,7 @@ extern s32 gDefeatedBattleSubstate;
 extern s32 gBattleSubState;
 extern s32 gDefeatedBattleState;
 extern s32 gCurrentBattleID;
+extern s32 gCurrentStageID;
 extern s32 D_800DC4E0;
 extern struct Battle* gOverrideBattlePtr;
 

diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c
@@ -221,7 +221,7 @@ void btl_state_update_normal_start(void) {
     switch (gBattleSubState) {
         case BTL_SUBSTATE_NORMAL_START_INIT:
             #if DX_DEBUG_MENU
-            dx_debug_set_battle_info(gCurrentBattleID, stage->shape);
+            dx_debug_set_battle_info(gCurrentBattleID << 16 | (gCurrentStageID & 0xFFFF), stage->shape);
             #endif
 
             BattleEnemiesCreated = battle->formationSize;