Miscellaneoush Decomp 323 (#323)

* more images

* new data file

* 2 undefined syms

* func_80048E34

* Shorten BattleStatus

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "2fbdbb9df8"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "2fbdbb9df8"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* chop away 0x460-onward in BattleState

* battle.c complete!

* .

include/common_structs.h

@@ -223,7 +223,8 @@ typedef struct PlayerData {
     /* 0x28E */ s8 maxStarPower;
     /* 0x28F */ char unk_28F;
     /* 0x290 */ s16 specialBarsFilled;
-    /* 0x292 */ char unk_292[2];
+    /* 0x292 */ s8 unk_292;
+    /* 0x293 */ char unk_293[0x1];
     /* 0x294 */ s16 otherHitsTaken;
     /* 0x296 */ s16 unk_296;
     /* 0x298 */ s16 hitsTaken;
@@ -758,22 +759,7 @@ typedef struct BattleStatus {
     /* 0x43C */ BattleStatusUnk* unk_43C;
     /* 0x440 */ u8 tattleFlags[27];
     /* 0x45B */ char unk_45B[5];
-    /* 0x460 */ s32 unk_460;
+} BattleStatus; // size = 0x460
-    /* 0x464 */ s32 unk_464;
-    /* 0x468 */ s32 unk_468;
-    /* 0x46C */ s32 battleState; /* 0 = load assets, 1 = create actors, 4 = start scripts, 7 & 8 = unk */
-    /* 0x470 */ s32 unk_470;
-    /* 0x474 */ s32 unk_474;
-    /* 0x478 */ s8 unk_478;
-    /* 0x479 */ char unk_479;
-    /* 0x47A */ u8 currentBattleSection;
-    /* 0x47B */ u8 unk_47B;
-    /* 0x47C */ s32 unk_47C;
-    /* 0x480 */ s32 unk_480;
-    /* 0x484 */ s32 unk_484;
-    /* 0x488 */ s32 unk_488;
-    /* 0x48C */ struct BattleList* unk_48C;
-} BattleStatus; // size = 0x490
 
 typedef struct TextureHeader {
     /* 0x00 */ s8 name[32];

include/enums.h

@@ -605,6 +605,7 @@ enum SoundIDs {
     SOUND_SPELL_CAST4,
     SOUND_SPELL_CAST5,
     SOUND_UNKNOWN_20F6              = 8438,
+    SOUND_UNKNOWN_2106              = 8454,
 };
 
 typedef UNK_TYPE Cam;

include/functions.h

@@ -102,6 +102,8 @@ s32 entity_block_handle_collision(Entity* entity);
 void entity_BlueSwitch_init(Entity* entity);
 void entity_HugeBlueSwitch_init(Entity* entity);
 
+s32 dispatch_damage_event_actor_0(Actor* actor, s32 damageAmount, s32 event);
+
 // todo remove once we have libultra's def
 extern void guOrtho(Mtx *m, float l, float r, float b, float t,
 		    float n, float f, float scale);
@@ -281,6 +283,7 @@ f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz);
 void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta);
 
 s32 sfx_adjust_env_sound_pos(s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4);
+void sfx_play_sound(s32 soundID);
 s32 sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
 s32 bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume);
 void func_801497FC(s32 arg0);

include/map.h

@@ -291,8 +291,9 @@ typedef struct Enemy {
     /* 0xB4 */ s8 unk_B4;
     /* 0xB5 */ s8 unk_B5;
     /* 0xB6 */ char unk_B6[2];
-    /* 0xB8 */ s32 unkSettings24;
+    /* 0xB8 */ Script* unk_B8; // some bytecode
-    /* 0xBC */ char unk_BC[8];
+    /* 0xBC */ struct ScriptInstance* unk_BC; // some script
+    /* 0xC0 */ s32 unk_C0; // some script ID
     /* 0xC4 */ s32 unk_C4;
     /* 0xC8 */ s32 unk_C8;
     /* 0xCC */ s32* animList;

include/variables.h

@@ -22,6 +22,17 @@ extern UNK_FUN_PTR(gCurrentUpdateFunction);
 
 extern s32 gBattleState;
 extern BattleStatus gBattleStatus;
+extern s32 D_800DC4D0;
+extern s32 D_800DC4D4;
+extern s32 gBattleState2;
+extern s32 D_800DC4E8;
+extern u8 gCurrentBattleSection; // in the middle of the previous var
+extern u8 D_800DC4EB; // in the middle of the previous var
+extern s32 D_800DC4E0;
+extern s32 D_800DC4EC;
+extern s32 D_800DC4F0;
+extern s32 D_800DC4F4;
+extern s32 D_800DC4F8;
 extern s32 gBattleDmaDest;
 
 extern ScriptList gWorldScriptList;

src/16F740.c

@@ -11,12 +11,9 @@ INCLUDE_ASM(s32, "16F740", btl_merlee_on_first_strike);
 
 void btl_set_state(s32 battleState) {
     s32 flags = gBattleStatus.flags2;
-    if (0) { do { } while (1); }
     gBattleState = battleState;
-    gBattleStatus.unk_470 = 1;
+    D_800DC4E0 = 1;
-    if (0) { do { } while (1); }
+    gBattleState2 = 0;
-
-    gBattleStatus.battleState = 0;
 
     flags &= 0x40;
     if (flags) {
@@ -80,7 +77,6 @@ INCLUDE_ASM(s32, "16F740", func_80242FE0);
 void func_80243910(void) {
 }
 
-#ifdef NON_MATCHING
 void btl_state_update_prepare_menu(void) {
     BattleStatus* battleStatus = &gBattleStatus;
 
@@ -97,21 +93,15 @@ void btl_state_update_prepare_menu(void) {
 
     dma_copy(_415D90_ROM_START, _415D90_ROM_END, _415D90_VRAM);
 
-    // // TODO Needed to match
-    // if (0) { s32 new_var; do { } while (new_var); }
-
     if (battleStatus->flags1 & 0x80000) {
         btl_set_state(14);
-    } else if (battleStatus->battleState == 70) {
+    } else if (gBattleState2 == 70) {
         btl_set_state(13);
-        battleStatus->battleState = 70;
+        gBattleState2 = 70;
     } else {
         btl_set_state(13);
     }
 }
-#else
-INCLUDE_ASM(s32, "16F740", btl_state_update_prepare_menu);
-#endif
 
 void btl_state_draw_prepare_menu(void) {
 }
@@ -188,17 +178,10 @@ INCLUDE_ASM(s32, "16F740", btl_state_update_partner_move);
 void btl_state_draw_partner_move(void) {
 }
 
-// Something weird with using battleStatus twice but in specific ways
-#ifdef NON_MATCHING
-s32 btl_check_enemies_defeated(void);
 void btl_state_update_end_partner_turn(void) {
-    BattleStatus* battleStatus;
+    BattleStatus* battleStatus = &gBattleStatus;
-    s32 battleState = gBattleStatus.battleState;
 
-    if (0) { do {} while (1); }
+    if (gBattleState2 == 0) {
-    battleStatus = &gBattleStatus;
-
-    if (battleState == 0) {
         battleStatus->flags2 |= 0x4;
         if (!btl_check_enemies_defeated()) {
             battleStatus->flags1 &= ~0x80000;
@@ -213,10 +196,6 @@ void btl_state_update_end_partner_turn(void) {
         }
     }
 }
-#else
-INCLUDE_ASM(s32, "16F740", btl_state_update_end_partner_turn);
-#endif
-
 
 void btl_state_draw_end_partner_turn(void) {
 }

src/23680.c

@@ -57,7 +57,37 @@ s32 get_coin_drop_amount(Enemy* enemy) {
 INCLUDE_ASM(s32, "23680", get_coin_drop_amount);
 #endif
 
-INCLUDE_ASM(s32, "23680", func_80048E34);
+void func_80048E34(Enemy* enemy, s32 arg1, s32 arg2) {
+    ScriptInstance* newScript;
+
+    if (enemy->aiScript != NULL) {
+        kill_script_by_ID(enemy->aiScriptID);
+        enemy->aiScript = NULL;
+    }
+
+    if (enemy->unk_BC != 0) {
+        kill_script_by_ID(enemy->unk_C0);
+        enemy->unk_BC = NULL;
+    }
+
+    if (enemy->aiBytecode != NULL) {
+        enemy->unk_C8 = arg2;
+        newScript = start_script(enemy->aiBytecode, 10, 0x20);
+        enemy->aiScript = newScript;
+        enemy->aiScriptID = newScript->id;
+        newScript->owner2.npcID = enemy->npcID;
+        newScript->owner1.enemy = enemy;
+    }
+
+    if (enemy->unk_B8 != NULL) {
+        enemy->unk_C4 = arg1;
+        newScript = start_script(enemy->unk_B8, 10, 0x20);
+        enemy->unk_BC = newScript;
+        enemy->unk_C0 = newScript->id;
+        newScript->owner2.npcID = enemy->npcID;
+        newScript->owner1.enemy = enemy;
+    }
+}
 
 s32 func_80048F0C(void) {
     EncounterStatus* currentEncounter = &gCurrentEncounter;

src/26840_len_20d0.c

@@ -185,56 +185,56 @@ INCLUDE_ASM(s32, "26840_len_20d0", snd_set_voice_volume);
 
 INCLUDE_ASM(s32, "26840_len_20d0", func_8004CDF8);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_00_SetVolume);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_00_SetVolume, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_01_SetPan);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_01_SetPan, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_02_SetInstrument);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_02_SetInstrument, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_03_SetReverb);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_03_SetReverb, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_04);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_04, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_05);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_05, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_06);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_06, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_07);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_07, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_08);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_08, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_09_StartLoop);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_09_StartLoop, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_0A_EndLoop);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0A_EndLoop, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_0B);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0B, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_0C);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0C, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_0D);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0D, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_0E);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0E, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_0F);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0F, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_10_Jump);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_10_Jump, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_11_Restart);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_11_Restart, SoundManager* manager, SoundPlayer* player);
 
-void snd_SEFCmd_12_NOP(void) {
+void snd_SEFCmd_12_NOP(SoundManager* manager, SoundPlayer* player) {
 }
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_13);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_13, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_14);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_14, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_15);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_15, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_16);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_16, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_17);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_17, SoundManager* manager, SoundPlayer* player);
 
-INCLUDE_ASM(s32, "26840_len_20d0", snd_SEFCmd_18);
+INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_18, SoundManager* manager, SoundPlayer* player);
 
 INCLUDE_ASM(s32, "26840_len_20d0", func_8004D428);
 

src/415D90.c

@@ -332,7 +332,6 @@ void func_802A4718(void) {
     D_802AD604 = 10;
 }
 
-//INCLUDE_ASM(s32, "415D90", func_802A472C);
 void func_802A472C(void) {
     s32* temp = &D_802AD628;
     s32 i;
@@ -489,31 +488,35 @@ s32 func_802A9B30(void) {
 
 INCLUDE_ASM(s32, "415D90", btl_state_update_peach_menu);
 
+// Needs the above jtbl to be decompiled and then this will work
+#ifdef NON_MATCHING
+void btl_state_draw_peach_menu(void) {
+    switch (gBattleState2) {
+        case 1:
+            btl_draw_menu_wheel();
+            break;
+        case 2:
+            btl_draw_menu_wheel();
+            break;
+        case 3:
+            btl_draw_menu_wheel();
+            break;
+        case 4:
+            btl_draw_menu_wheel();
+            break;
+        case 5:
+            btl_draw_menu_wheel();
+            break;
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+            break;
+    }
+}
+#else
 INCLUDE_ASM(s32, "415D90", btl_state_draw_peach_menu);
-// void btl_state_draw_peach_menu(void) {
+#endif
-//     switch (gBattleStatus.battleState) {
-//         case 1:
-//             btl_draw_menu_wheel();
-//             break;
-//         case 2:
-//             btl_draw_menu_wheel();
-//             break;
-//         case 3:
-//             btl_draw_menu_wheel();
-//             break;
-//         case 4:
-//             btl_draw_menu_wheel();
-//             break;
-//         case 5:
-//             btl_draw_menu_wheel();
-//             break;
-//         case 6:
-//         case 7:
-//         case 8:
-//         case 9:
-//             break;
-//     }
-// }
 
 s32 func_802AA0A4(void) {
     return (gBattleStatus.flags2 & 2) <= 0;
@@ -522,7 +525,7 @@ s32 func_802AA0A4(void) {
 INCLUDE_ASM(s32, "415D90", btl_state_update_twink_menu); // look into m2c bug
 
 void btl_state_draw_twink_menu(void) {
-    switch (gBattleStatus.battleState) {
+    switch (gBattleState2) {
         case 1:
             btl_draw_menu_wheel();
             break;

src/80850_len_3060.c

@@ -29,7 +29,7 @@ void clear_player_data(void) {
     playerData->merleeTurnCount = -1;
     playerData->maxStarPower = 0;
     playerData->specialBarsFilled = 0;
-    playerData->unk_292[0] = 0;
+    playerData->unk_292 = 0;
     playerData->currentPartner = 0;
 
     for (i = 0; i < ARRAY_COUNT(playerData->partners); i++) {

src/battle/battle.c

@@ -278,59 +278,63 @@ BattleArea gBattleAreas[0x30] = {
     {},
 };
 
-INCLUDE_ASM(s32, "battle/battle", reset_battle_status);
+void reset_battle_status(void) {
+    gGameStatusPtr->demoFlags = 0;
+    gBattleState = 0;
+    D_800DC4E0 = 1;
+    gBattleState2 = 0;
+    D_800DC4D0 = 0;
+    D_800DC4F0 = 0;
+    D_800DC4D4 = 0;
+    D_800DC4FC = NULL;
+    D_800DC4F8 = 0;
+    D_800DC4E8 = 0;
+    D_800DC064 = NULL;
+    D_800DC060 = 0;
+    D_800DC4EC = 0;
+    D_800DC4F4 = 0;
+}
 
 void ALT_reset_battle_status(void) {
     reset_battle_status();
 }
 
 void func_80072BCC(s32 arg0) {
-    gBattleStatus.unk_488 = arg0;
+    D_800DC4F8 = arg0;
 }
 
-//weird stuff with loading gBattleStatus
-#ifdef NON_MATCHING
 void load_battle_section(void) {
-    BattleArea* battleArea;
+    BattleArea* battleArea = &gBattleAreas[gCurrentBattleSection];
-    s32 temp_a0;
+    s32 battleIdx = D_800DC4EB;
 
-    battleArea = &gBattleAreas[gBattleStatus.currentBattleSection];
     dma_copy(battleArea->dmaStart, battleArea->dmaEnd, battleArea->dmaDest);
 
-    gBattleStatus.unk_48C = &(*battleArea->battles)[gBattleStatus.unk_47B];
+    D_800DC4FC = &(*battleArea->battles)[battleIdx];
 
-    if (gBattleStatus.unk_47C >= 0) {
+    if (D_800DC4EC < 0) {
         D_800DC064 = NULL;
     } else {
-        D_800DC064 = &(*battleArea->stages)[gBattleStatus.unk_47C];
+        D_800DC064 = &(*battleArea->stages)[D_800DC4EC];
     }
 
     btl_set_state(1);
-    gBattleStatus.unk_460 = 0;
+    D_800DC4D0 = 0;
 }
-#else
-INCLUDE_ASM(s32, "battle/battle", load_battle_section);
-#endif
 
-// gBattleStatus is possibly shorter than we think
-#ifdef NON_MATCHING
 void load_battle(s32 arg0) {
-    gBattleStatus.unk_478 = arg0;
+    D_800DC4E8 = arg0;
     set_game_mode(8);
     gBattleState = 0;
-    gBattleStatus.unk_460 = 0;
+    D_800DC4D0 = 0;
-    gBattleStatus.battleState = 0;
+    gBattleState2 = 0;
 }
-#else
-INCLUDE_ASM(s32, "battle/battle", load_battle);
-#endif
 
 void set_battle_stage(s32 arg0) {
-    gBattleStatus.unk_47C = arg0;
+    D_800DC4EC = arg0;
 }
 
 void set_battle_formation(s32 arg0) {
-    gBattleStatus.unk_484 = arg0;
+    D_800DC4F4 = arg0;
 }
 
 void func_80072CEC(f32 arg0, f32 arg1, f32 arg2) {
@@ -340,6 +344,168 @@ void func_80072CF4(void) {
     func_80072CEC(1.0f, 1.1f, 1.2f);
 }
 
-INCLUDE_ASM(s32, "battle/battle", setup_demo_player);
+void setup_demo_player(void) {
+    PlayerData* playerData = &gPlayerData;
+    s32 i;
 
-INCLUDE_ASM(s32, "battle/battle", load_demo_battle);
+    playerData->curHP = 15;
+    playerData->curMaxHP = 15;
+    playerData->hardMaxHP = 15;
+    playerData->curFP = 10;
+    playerData->curMaxFP = 10;
+    playerData->hardMaxFP = 10;
+    playerData->level = 3;
+    playerData->hasActionCommands = 1;
+    playerData->starPoints = 55;
+    playerData->bootsLevel = 0;
+    playerData->hammerLevel = 0;
+    playerData->coins = 34;
+
+    for (i = 1; i < ARRAY_COUNT(playerData->partners); i++) {
+        playerData->partners[i].enabled = TRUE;
+        playerData->partners[i].level = 2;
+    }
+
+    playerData->currentPartner = PARTNER_GOOMBARIO;
+
+    for (i = 0; i < ARRAY_COUNT(playerData->badges); i++) {
+        playerData->badges[i] = 0;
+    }
+
+    for (i = 0; i < ARRAY_COUNT(playerData->equippedBadges); i++) {
+        playerData->equippedBadges[i] = 0;
+    }
+
+    for (i = 0; i < ARRAY_COUNT(playerData->invItems); i++) {
+        playerData->invItems[i] = 0;
+    }
+
+    playerData->unk_288 = 0;
+    playerData->merleeSpellType = 0;
+    playerData->merleeCastsLeft = 0;
+    playerData->merleeTurnCount = 0;
+    playerData->maxStarPower = 0;
+    playerData->specialBarsFilled = 0;
+    playerData->unk_292 = 0;
+}
+
+void load_demo_battle(u32 index) {
+    PlayerData* playerData = &gPlayerData;
+    u32 mode;
+    s32 battleID;
+
+    gGameStatusPtr->demoFlags = 0;
+    gGameStatusPtr->areaID = 0;
+    gGameStatusPtr->mapID = 0;
+    gGameStatusPtr->isBattle = FALSE;
+
+    general_heap_create();
+    clear_generic_entity_list();
+    clear_script_list();
+    create_cameras_a();
+    spr_init_sprites(0);
+    clear_animator_list();
+    clear_entity_models();
+    clear_npcs();
+    clear_hud_element_cache();
+    clear_trigger_data();
+    clear_model_data();
+    clear_sprite_shading_data();
+    reset_background_settings();
+    func_80138188();
+    reset_battle_status();
+    clear_encounter_status();
+    clear_entity_data(1);
+    clear_effect_data();
+    clear_player_status();
+    clear_printers();
+    clear_item_entity_data();
+    clear_player_data();
+    initialize_status_menu();
+    clear_item_entity_data();
+    set_screen_overlay_params_front(9, 255.0f);
+
+    switch (index) {
+        case 0:
+            setup_demo_player();
+            mode = 0;
+            playerData->hasActionCommands = FALSE;
+            battleID = 0x2700;
+            break;
+        case 1:
+            setup_demo_player();
+            mode = 0;
+            playerData->currentPartner = PARTNER_BOW;
+            battleID = 0x2701;
+            break;
+        case 2:
+            setup_demo_player();
+            mode = 0;
+            playerData->currentPartner = PARTNER_PARAKARRY;
+            gGameStatusPtr->demoFlags |= 2;
+            battleID = 0x2702;
+            break;
+        case 3:
+            setup_demo_player();
+            mode = 0;
+            playerData->currentPartner = PARTNER_WATT;
+            battleID = 0x2703;
+            break;
+        case 4:
+            setup_demo_player();
+            playerData->currentPartner = PARTNER_KOOPER;
+            gGameStatusPtr->demoFlags |= 4;
+            mode = 0;
+            battleID = 0x2704;
+            break;
+        default:
+            setup_demo_player();
+            mode = 2;
+            battleID = 0x2700;
+    }
+
+    gGameStatusPtr->debugEnemyContact = 0;
+    gGameStatusPtr->unk_7C = 1;
+
+    switch (mode) {
+        case 0:
+            gCurrentEncounter.eFirstStrike = 0;
+            gCurrentEncounter.hitType = 1;
+            gCurrentEncounter.hitTier = 0;
+            gGameStatusPtr->demoFlags |= 0x10;
+            gGameStatusPtr->demoFlags |= 0x20;
+            gGameStatusPtr->demoFlags |= 0x40;
+            break;
+        case 1:
+            gCurrentEncounter.eFirstStrike = 1;
+            gCurrentEncounter.hitType = 4;
+            gCurrentEncounter.hitTier = playerData->hammerLevel;
+            gGameStatusPtr->demoFlags |= 0x10;
+            break;
+        case 2:
+            gCurrentEncounter.eFirstStrike = 1;
+            gCurrentEncounter.hitType = 2;
+            gCurrentEncounter.hitTier = playerData->bootsLevel;
+            gGameStatusPtr->demoFlags |= 0x10;
+            break;
+        case 3:
+            gCurrentEncounter.eFirstStrike = 1;
+            gCurrentEncounter.hitType = 6;
+            gGameStatusPtr->demoFlags |= 0x20;
+            break;
+        case 4:
+            gCurrentEncounter.eFirstStrike = 2;
+            gCurrentEncounter.hitType = 1;
+            gCurrentEncounter.hitTier = 0;
+            gGameStatusPtr->demoFlags |= 0x40;
+            break;
+    }
+
+    set_variable(NULL, SI_SAVE_FLAG(1817), 1);
+    gCurrentEncounter.unk_07 = 0;
+    gCurrentEncounter.unk_10 = 0;
+    set_battle_stage(-1);
+    gGameStatusPtr->demoFlags |= 1;
+    gOverrideFlags &= ~0x8;
+    load_battle(battleID);
+}

src/battle/battle.h

@@ -316,4 +316,6 @@ typedef struct ActorOffsets {
     /* 0x03 */ s8 shadow;
 } ActorOffsets; // size = 0x04
 
+extern BattleList* D_800DC4FC;
+
 #endif

tools/splat/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/ethteck/splat.git
 	branch = master
-	commit = 8588eaae7b57f6eab91e3aa5df2bce4affa84308
+	commit = 2fbdbb9df826da4252cdd1dab25311dd0a07d4ef
-	parent = 00d93ef991911893fadc245169fc8b8f1dfddd68
+	parent = 7a8229616c4e8dabbd31366b5dc0a3b6256cd88f
 	method = merge
 	cmdver = 0.4.3

tools/splat/segtypes/n64/data.py

@@ -1,3 +1,4 @@
+from segtypes.n64.code import N64SegCode
 from segtypes.n64.codesubsegment import N64SegCodeSubsegment
 from segtypes.n64.group import N64SegGroup
 from pathlib import Path
@@ -56,9 +57,9 @@ class N64SegData(N64SegCodeSubsegment, N64SegGroup):
     def check_jtbls(self, rom_bytes, syms: List[Symbol]):
         for i, sym in enumerate(syms):
             if sym.type == "jtbl":
-                start = self.parent.ram_to_rom(syms[i].vram_start)
+                start = self.get_most_parent().ram_to_rom(syms[i].vram_start)
                 assert isinstance(start, int)
-                end = self.parent.ram_to_rom(syms[i + 1].vram_start)
+                end = self.get_most_parent().ram_to_rom(syms[i + 1].vram_start)
                 sym_bytes = rom_bytes[start:end]
 
                 b = 0
@@ -68,10 +69,10 @@ class N64SegData(N64SegCodeSubsegment, N64SegGroup):
 
                     if last_bits != 0 and bits != 0 and abs(last_bits - bits) > 0x100000:
                         new_sym_rom_start = start + b
-                        new_sym_ram_start = self.parent.rom_to_ram(new_sym_rom_start)
+                        new_sym_ram_start = self.get_most_parent().rom_to_ram(new_sym_rom_start)
                         sym.size = new_sym_rom_start - sym.rom
 
-                        syms.insert(i + 1, self.parent.get_symbol(new_sym_ram_start, create=True, define=True, local_only=True))
+                        syms.insert(i + 1, self.get_most_parent().get_symbol(new_sym_ram_start, create=True, define=True, local_only=True))
                         return False
 
                     if bits != 0:
@@ -87,7 +88,7 @@ class N64SegData(N64SegCodeSubsegment, N64SegGroup):
         for i in range(self.rom_start, self.rom_end, 4):
             bits = int.from_bytes(rom_bytes[i : i + 4], "big")
             if self.contains_vram(bits):
-                symset.add(self.parent.get_symbol(bits, create=True, define=True, local_only=True))
+                symset.add(self.get_most_parent().get_symbol(bits, create=True, define=True, local_only=True))
 
         for symbol_addr in self.seg_symbols:
             for symbol in self.seg_symbols[symbol_addr]:
@@ -99,7 +100,7 @@ class N64SegData(N64SegCodeSubsegment, N64SegGroup):
 
         # Ensure we start at the beginning
         if len(ret) == 0 or ret[0].vram_start != self.vram_start:
-            ret.insert(0, self.parent.get_symbol(self.vram_start, create=True, define=True, local_only=True))
+            ret.insert(0, self.get_most_parent().get_symbol(self.vram_start, create=True, define=True, local_only=True))
 
         # Make a dummy symbol here that marks the end of the previous symbol's disasm range
         ret.append(Symbol(self.vram_end))
@@ -217,14 +218,14 @@ class N64SegData(N64SegCodeSubsegment, N64SegGroup):
                 if bits == 0:
                     byte_str = "0"
                 else:
-                    rom_addr = self.parent.ram_to_rom(bits)
+                    rom_addr = self.get_most_parent().ram_to_rom(bits)
 
                     if rom_addr:
                         byte_str = f"L{bits:X}_{rom_addr:X}"
                     else:
                         byte_str = f"0x{bits:X}"
             elif slen == 4 and bits >= 0x80000000:
-                sym = self.parent.get_symbol(bits, reference=True)
+                sym = self.get_most_parent().get_symbol(bits, reference=True)
                 if sym:
                     byte_str = sym.name
                 else:
@@ -266,11 +267,11 @@ class N64SegData(N64SegCodeSubsegment, N64SegGroup):
 
         for i in range(len(syms) - 1):
             mnemonic = syms[i].access_mnemonic
-            sym = self.parent.get_symbol(syms[i].vram_start, create=True, define=True, local_only=True)
+            sym = self.get_most_parent().get_symbol(syms[i].vram_start, create=True, define=True, local_only=True)
             
             sym_str = f"\n\nglabel {sym.name}\n"
-            dis_start = self.parent.ram_to_rom(syms[i].vram_start)
+            dis_start = self.get_most_parent().ram_to_rom(syms[i].vram_start)
-            dis_end = self.parent.ram_to_rom(syms[i + 1].vram_start)
+            dis_end = self.get_most_parent().ram_to_rom(syms[i + 1].vram_start)
             sym_len = dis_end - dis_start
 
             if self.type == "bss":

tools/splat/segtypes/n64/group.py

@@ -1,5 +1,5 @@
 from collections import OrderedDict
-from typing import List, Dict, Optional
+from typing import List, Dict
 import sys
 from util.range import Range
 from util import log, options
@@ -160,14 +160,15 @@ class N64SegGroup(N64Segment):
                 print(f"Error: Code segment {self.name} contains subsegments which are out of ascending rom order (0x{prev_start:X} followed by 0x{start:X})")
                 sys.exit(1)
 
-            segment: Segment = Segment.from_yaml(segment_class, subsection_yaml, start, end)
+            vram = None
+            if start != "auto":
+                assert isinstance(start, int)
+                vram = self.get_most_parent().rom_to_ram(start)
+
+            segment: Segment = Segment.from_yaml(segment_class, subsection_yaml, start, end, vram)
             segment.sibling = base_segments.get(segment.name, None)
             segment.parent = self
 
-            if segment.rom_start != "auto":
-                assert isinstance(segment.rom_start, int)
-                segment.vram_start = self.rom_to_ram(segment.rom_start)
-
             # TODO: assumes section order - generalize and stuff
             if not self.section_boundaries["data"].has_start() and "data" in segment.type:
                 self.section_boundaries["data"].start = segment.vram_start
@@ -240,3 +241,11 @@ class N64SegGroup(N64Segment):
             c.append(sub.cache())
         
         return c
+
+    def get_most_parent(self):
+        seg = self
+
+        while seg.parent:
+            seg = seg.parent
+
+        return seg

tools/splat/segtypes/segment.py

@@ -141,10 +141,10 @@ class Segment:
                 sys.exit(1)
 
     @staticmethod
-    def from_yaml(cls: Type["Segment"], yaml: Union[dict, list], rom_start: RomAddr, rom_end: RomAddr):
+    def from_yaml(cls: Type["Segment"], yaml: Union[dict, list], rom_start: RomAddr, rom_end: RomAddr, vram=None):
         type = Segment.parse_segment_type(yaml)
         name = Segment.parse_segment_name(cls, rom_start, yaml)
-        vram_start = parse_segment_vram(yaml)
+        vram_start = vram if vram else parse_segment_vram(yaml)
         extract = bool(yaml.get("extract", True)) if isinstance(yaml, dict) else True
         given_subalign = parse_segment_subalign(yaml)
         given_is_overlay:Optional[bool] = yaml.get("overlay", False) if isinstance(yaml, dict) else False

ver/us/asm/data/1AF2D0.data.s

@@ -27,7 +27,7 @@ glabel D_80283DF8
 .word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFCFFFFFF, 0xFFFCF279, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00000000, 0xE3001201, 0x00003000, 0xE3001402, 0x00000C00, 0xE3001001, 0x00008000, 0xFD100000, D_8028F840, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xFD48000F, D_8028F640, 0xF5480400, 0x07000000, 0xE6000000, 0x00000000, 0xF4000000, 0x0703E07C, 0xE7000000, 0x00000000, 0xF5400400, 0x00000000, 0xF2000000, 0x0007C07C, 0xD9FDFFFF, 0x00000000, 0xD9DFFFFF, 0x00000000, 0x01004008, D_80283DB8, 0x05000204, 0x00000000, 0x05000406, 0x00000000, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0x00000004, 0x0000000D, 0x00000001, 0x0000003C, D_80283DF8, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 glabel D_80283F10
-.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006F10E0, 0x006F5E80, func_80238000_6F5E80, 0x802392C8, 0x00000000, 0x006F5E80, 0x006FAD10, func_80238000_6F5E80, 0x80238548, 0x00000000, 0x006FAD10, 0x006FFD80, func_80238000_6F5E80, 0x80238758, 0x00000000, 0x006FFD80, 0x00703AF0, func_80238000_6F5E80, 0x80239928, 0x0000001E, 0x006F0B30, 0x006F10E0, func_80238000_6F5E80, 0x802380E8, 0x00000000, 0x00703AF0, 0x00707CA0, func_80238000_6F5E80, battle_partner_goombario_IsGlowing, 0x00000014, 0x00707CA0, 0x0070BD10, func_80238000_6F5E80, 0x80238FE8, 0x00000000, 0x0070BD10, 0x00710EF0, func_80238000_6F5E80, 0x8023A2F8, 0x0000000A, 0x00710EF0, 0x00714CF0, func_80238000_6F5E80, 0x80238418, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00714CF0, 0x00715850, func_80238000_6F5E80, 0x802381C0, 0x0000001E
+.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006F10E0, 0x006F5E80, battle_partner_goombario_func_80238000_6F10E0, 0x802392C8, 0x00000000, 0x006F5E80, 0x006FAD10, battle_partner_goombario_func_80238000_6F10E0, 0x80238548, 0x00000000, 0x006FAD10, 0x006FFD80, battle_partner_goombario_func_80238000_6F10E0, 0x80238758, 0x00000000, 0x006FFD80, 0x00703AF0, battle_partner_goombario_func_80238000_6F10E0, 0x80239928, 0x0000001E, 0x006F0B30, 0x006F10E0, battle_partner_goombario_func_80238000_6F10E0, 0x802380E8, 0x00000000, 0x00703AF0, 0x00707CA0, battle_partner_goombario_func_80238000_6F10E0, battle_partner_goombario_IsGlowing, 0x00000014, 0x00707CA0, 0x0070BD10, battle_partner_goombario_func_80238000_6F10E0, 0x80238FE8, 0x00000000, 0x0070BD10, 0x00710EF0, battle_partner_goombario_func_80238000_6F10E0, 0x8023A2F8, 0x0000000A, 0x00710EF0, 0x00714CF0, battle_partner_goombario_func_80238000_6F10E0, 0x80238418, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00714CF0, 0x00715850, battle_partner_goombario_func_80238000_6F10E0, 0x802381C0, 0x0000001E
 
 glabel gBattleDmaDest
 .word 0x00000000

ver/us/asm/data/9DE60.data.s

@@ -12,7 +12,7 @@ glabel D_80104A28
 .word 0x00000008, 0x00000005, 0x00000001, 0x00000004, 0x0000000A, 0xFFFFFFFF, 0x00000002, 0x00000004, D_800FBB60, D_800FBBE0, 0x0000000A, 0x00000001, 0x00000002, 0x00000008, D_800FBB60, D_800FBBE0, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x800FBC00, 0x800FBC20, 0x00000003, 0x00000000, 0x00000008, 0x00000005, 0x00000000, 0x00000004, 0x00000002, 0x0000003C, 0x800FBC40, 0x800FBC60, 0x00000003, 0x00000000
 
 glabel D_80104AC0
-.word 0x00000004, 0x0000000D, 0x00000007, 0x00000001, 0x800FBC80, 0x800FBCA0, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBCC0, 0x800FBCE0, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD00, 0x800FBD20, 0x00000008, 0x00000008, 0x00000007, 0x00000002, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD00, 0x800FBD20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD40, 0x800FBD60, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD80, 0x800FBDA0, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBDC0, 0x800FBDE0, 0x00000008, 0x00000008, 0x00000007, 0x0000007F, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x0000007F, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000000
+.word 0x00000004, 0x0000000D, 0x00000007, 0x00000001, D_800FBC80, 0x800FBCA0, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBCC0, 0x800FBCE0, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD00, 0x800FBD20, 0x00000008, 0x00000008, 0x00000007, 0x00000002, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD00, 0x800FBD20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD40, 0x800FBD60, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBD80, 0x800FBDA0, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x00000001, 0x800FBDC0, 0x800FBDE0, 0x00000008, 0x00000008, 0x00000007, 0x0000007F, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000007, 0x0000007F, 0x800FBE00, 0x800FBE20, 0x00000008, 0x00000008, 0x00000000
 
 glabel D_80104BEC
 .word 0x00000012, 0x00000005, 0x00000002, 0x00000004, 0x00000001, 0x0000003C, 0x800FBE40, 0x00000003, 0x00000000

ver/us/asm/data/battle/area_sbk/4DA860.data.s

@@ -147,7 +147,7 @@ glabel D_8021F8F8_4E1ED8
 .word 0x00000028, 0x00000027, 0x00000026, 0x00000025, 0x00000000
 
 glabel D_8021F90C_4E1EEC
-.word 0x80220028, 0x80220018, 0x80220008, D_8021F800_4E1DE0, D_8021F8E8_4E1EC8, 0x80220000, D_8021F8F8_4E1ED8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word D_80220028_4E2608, D_80220018_4E25F8, D_80220008_4E25E8, D_8021F800_4E1DE0, D_8021F8E8_4E1EC8, D_80220000_4E25E0, D_8021F8F8_4E1ED8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 glabel D_8021F940_4E1F20
 .word D_80218410_4DA9F0, 0x00000001, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000
@@ -198,7 +198,70 @@ glabel D_8021FDBC_4E239C
 .word D_8021D6D8_4DFCB8, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8021D6D8_4DFCB8, 0x00000001, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80218410_4DA9F0, 0x00000002, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80218410_4DA9F0, 0x00000003, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 glabel D_8021FE2C_4E240C
-.word D_8021D6D8_4DFCB8, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80218410_4DA9F0, 0x00000001, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8021D6D8_4DFCB8, 0x00000002, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80220148, 0x00000001, D_8021F940_4E1F20, D_8021F90C_4E1EEC, 0x00000000, 0x8022013C, 0x00000002, D_8021F95C_4E1F3C, D_8021F90C_4E1EEC, 0x00000000, 0x80220130, 0x00000003, D_8021F994_4E1F74, D_8021F90C_4E1EEC, 0x00000000, 0x80220120, 0x00000004, D_8021F9E8_4E1FC8, D_8021F90C_4E1EEC, 0x00000000, 0x80220110, 0x00000002, D_8021FA58_4E2038, D_8021F90C_4E1EEC, 0x00000000, 0x802200FC, 0x00000003, D_8021FA90_4E2070, D_8021F90C_4E1EEC, 0x00000000, 0x802200E8, 0x00000004, D_8021FAE4_4E20C4, D_8021F90C_4E1EEC, 0x00000000, 0x802200D0, 0x00000003, D_8021FB54_4E2134, D_8021F90C_4E1EEC, 0x00000000, 0x802200B4, 0x00000004, D_8021FBA8_4E2188, D_8021F90C_4E1EEC, 0x00000000, 0x802200A8, 0x00000001, D_8021FC18_4E21F8, D_8021F90C_4E1EEC, 0x00000000, 0x8022009C, 0x00000002, D_8021FC34_4E2214, D_8021F90C_4E1EEC, 0x00000000, 0x80220090, 0x00000003, D_8021FC6C_4E224C, D_8021F90C_4E1EEC, 0x00000000, 0x80220084, 0x00000004, D_8021FCC0_4E22A0, D_8021F90C_4E1EEC, 0x00000000, 0x80220074, 0x00000002, D_8021FD30_4E2310, D_8021F90C_4E1EEC, 0x00000000, 0x80220060, 0x00000003, D_8021FD68_4E2348, D_8021F90C_4E1EEC, 0x00000000, 0x8022004C, 0x00000004, D_8021FDBC_4E239C, D_8021F90C_4E1EEC, 0x00000000, 0x80220030, 0x00000003, D_8021FE2C_4E240C, D_8021F90C_4E1EEC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80220150, D_8021F90C_4E1EEC, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word D_8021D6D8_4DFCB8, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80218410_4DA9F0, 0x00000001, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8021D6D8_4DFCB8, 0x00000002, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80220148_4E2728, 0x00000001, D_8021F940_4E1F20, D_8021F90C_4E1EEC, 0x00000000, D_8022013C_4E271C, 0x00000002, D_8021F95C_4E1F3C, D_8021F90C_4E1EEC, 0x00000000, D_80220130_4E2710, 0x00000003, D_8021F994_4E1F74, D_8021F90C_4E1EEC, 0x00000000, D_80220120_4E2700, 0x00000004, D_8021F9E8_4E1FC8, D_8021F90C_4E1EEC, 0x00000000, D_80220110_4E26F0, 0x00000002, D_8021FA58_4E2038, D_8021F90C_4E1EEC, 0x00000000, D_802200FC_4E26DC, 0x00000003, D_8021FA90_4E2070, D_8021F90C_4E1EEC, 0x00000000, D_802200E8_4E26C8, 0x00000004, D_8021FAE4_4E20C4, D_8021F90C_4E1EEC, 0x00000000, D_802200D0_4E26B0, 0x00000003, D_8021FB54_4E2134, D_8021F90C_4E1EEC, 0x00000000, D_802200B4_4E2694, 0x00000004, D_8021FBA8_4E2188, D_8021F90C_4E1EEC, 0x00000000, D_802200A8_4E2688, 0x00000001, D_8021FC18_4E21F8, D_8021F90C_4E1EEC, 0x00000000, D_8022009C_4E267C, 0x00000002, D_8021FC34_4E2214, D_8021F90C_4E1EEC, 0x00000000, D_80220090_4E2670, 0x00000003, D_8021FC6C_4E224C, D_8021F90C_4E1EEC, 0x00000000, D_80220084_4E2664, 0x00000004, D_8021FCC0_4E22A0, D_8021F90C_4E1EEC, 0x00000000, D_80220074_4E2654, 0x00000002, D_8021FD30_4E2310, D_8021F90C_4E1EEC, 0x00000000, D_80220060_4E2640, 0x00000003, D_8021FD68_4E2348, D_8021F90C_4E1EEC, 0x00000000, D_8022004C_4E262C, 0x00000004, D_8021FDBC_4E239C, D_8021F90C_4E1EEC, 0x00000000, D_80220030_4E2610, 0x00000003, D_8021FE2C_4E240C, D_8021F90C_4E1EEC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80220150_4E2730, D_8021F90C_4E1EEC, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 
 glabel D_80220000_4E25E0
-.word 0x73626B5F, 0x62670000, 0x73626B5F, 0x62743032, 0x5F686974, 0x00000000, 0x73626B5F, 0x62743032, 0x5F736861, 0x70650000, 0x73626B5F, 0x74657800, 0x837B838D, 0x8368815B, 0x2C835483, 0x93837B2C, 0x837B838D, 0x8368815B, 0x00000000, 0x837B838D, 0x8368815B, 0x78322C83, 0x54839383, 0x7B783200, 0x837B838D, 0x8368815B, 0x78322C83, 0x54839383, 0x7B000000, 0x837B838D, 0x8368815B, 0x2C835483, 0x93837B00, 0x837B838D, 0x8368815B, 0x78340000, 0x837B838D, 0x8368815B, 0x78330000, 0x837B838D, 0x8368815B, 0x78320000, 0x837B838D, 0x8368815B, 0x00000000, 0x83548393, 0x837B7832, 0x2C837B83, 0x8D836881, 0x5B2C8354, 0x8393837B, 0x00000000, 0x83548393, 0x837B2C83, 0x7B838D83, 0x68815B2C, 0x83548393, 0x837B0000, 0x83548393, 0x837B7832, 0x2C837B83, 0x8D836881, 0x5B783200, 0x83548393, 0x837B7832, 0x2C837B83, 0x8D836881, 0x5B000000, 0x83548393, 0x837B2C83, 0x7B838D83, 0x68815B00, 0x82AB82A2, 0x82EB8354, 0x8393837B, 0x78340000, 0x83548393, 0x837B7833, 0x00000000, 0x83548393, 0x837B7832, 0x00000000, 0x83548393, 0x837B0000, 0x73626B5F, 0x30310000, 0x00000000, 0x00000000
+.word 0x73626B5F, 0x62670000
+
+glabel D_80220008_4E25E8
+.word 0x73626B5F, 0x62743032, 0x5F686974, 0x00000000
+
+glabel D_80220018_4E25F8
+.word 0x73626B5F, 0x62743032, 0x5F736861, 0x70650000
+
+glabel D_80220028_4E2608
+.word 0x73626B5F, 0x74657800
+
+glabel D_80220030_4E2610
+.word 0x837B838D, 0x8368815B, 0x2C835483, 0x93837B2C, 0x837B838D, 0x8368815B, 0x00000000
+
+glabel D_8022004C_4E262C
+.word 0x837B838D, 0x8368815B, 0x78322C83, 0x54839383, 0x7B783200
+
+glabel D_80220060_4E2640
+.word 0x837B838D, 0x8368815B, 0x78322C83, 0x54839383, 0x7B000000
+
+glabel D_80220074_4E2654
+.word 0x837B838D, 0x8368815B, 0x2C835483, 0x93837B00
+
+glabel D_80220084_4E2664
+.word 0x837B838D, 0x8368815B, 0x78340000
+
+glabel D_80220090_4E2670
+.word 0x837B838D, 0x8368815B, 0x78330000
+
+glabel D_8022009C_4E267C
+.word 0x837B838D, 0x8368815B, 0x78320000
+
+glabel D_802200A8_4E2688
+.word 0x837B838D, 0x8368815B, 0x00000000
+
+glabel D_802200B4_4E2694
+.word 0x83548393, 0x837B7832, 0x2C837B83, 0x8D836881, 0x5B2C8354, 0x8393837B, 0x00000000
+
+glabel D_802200D0_4E26B0
+.word 0x83548393, 0x837B2C83, 0x7B838D83, 0x68815B2C, 0x83548393, 0x837B0000
+
+glabel D_802200E8_4E26C8
+.word 0x83548393, 0x837B7832, 0x2C837B83, 0x8D836881, 0x5B783200
+
+glabel D_802200FC_4E26DC
+.word 0x83548393, 0x837B7832, 0x2C837B83, 0x8D836881, 0x5B000000
+
+glabel D_80220110_4E26F0
+.word 0x83548393, 0x837B2C83, 0x7B838D83, 0x68815B00
+
+glabel D_80220120_4E2700
+.word 0x82AB82A2, 0x82EB8354, 0x8393837B, 0x78340000
+
+glabel D_80220130_4E2710
+.word 0x83548393, 0x837B7833, 0x00000000
+
+glabel D_8022013C_4E271C
+.word 0x83548393, 0x837B7832, 0x00000000
+
+glabel D_80220148_4E2728
+.word 0x83548393, 0x837B0000
+
+glabel D_80220150_4E2730
+.word 0x73626B5F, 0x30310000, 0x00000000, 0x00000000

ver/us/asm/data/world/area_kkj/kkj_19/AF8660.data.s

@@ -3,7 +3,10 @@
 .section .data
 
 glabel D_80240D10_AF8660
-.word 0x43F28000, 0x00000000, 0x41C80000, 0x43A50000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802410C0, D_80240D10_AF8660, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190014, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x43F28000, 0x00000000, 0x41C80000, 0x43A50000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802410C0_AF8A10, D_80240D10_AF8660, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190014
+
+glabel D_80240D60_AF86B0
+.word 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240E10_AF8760
 .word 0x0000005D, 0x00000011, 0x00000000, 0x0000005E, 0x00000012, 0x00000000, 0x0000005F, 0x00000013, 0x00000000, 0x00000061, 0x00000015, 0x00000000, 0x00000060, 0x00000016, 0x00000000, 0x00000062, 0x00000017, 0x00000000, 0x00000063, 0x00000018, 0x00000000, 0x00000064, 0x00000019, 0x00000000, 0x00000065, 0x00000010, 0x00000000, 0x00000066, 0x00000014, 0x00000000
@@ -33,4 +36,7 @@ glabel D_80241010_AF8960
 .word 0x00000047, 0x00000005, D_80240F38_AF8888, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024103C_AF898C
-.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000044, 0x00000001, 0x80243F14, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, D_80241010_AF8960, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802416E4, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241AF4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x80240D60, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000044, 0x00000001, D_8024103C_AF898C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000001, func_802401FC_AF7B4C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000044, 0x00000001, 0x80243F14, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, D_80241010_AF8960, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+
+glabel D_802410C0_AF8A10
+.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802416E4, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241AF4, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80240D60_AF86B0, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000044, 0x00000001, D_8024103C_AF898C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000001, func_802401FC_AF7B4C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000

ver/us/asm/nonmatchings/16F740/btl_state_update_begin_partner_turn.s

@@ -7,8 +7,8 @@ glabel btl_state_update_begin_partner_turn
 /* 171498 80242BB8 3C12800E */  lui       $s2, %hi(gBattleStatus)
 /* 17149C 80242BBC 2652C070 */  addiu     $s2, $s2, %lo(gBattleStatus)
 /* 1714A0 80242BC0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 1714A4 80242BC4 3C11800E */  lui       $s1, %hi(gBattleStatus+0x46C)
+/* 1714A4 80242BC4 3C11800E */  lui       $s1, %hi(gBattleState2)
-/* 1714A8 80242BC8 2631C4DC */  addiu     $s1, $s1, %lo(gBattleStatus+0x46C)
+/* 1714A8 80242BC8 2631C4DC */  addiu     $s1, $s1, %lo(gBattleState2)
 /* 1714AC 80242BCC AFBF0020 */  sw        $ra, 0x20($sp)
 /* 1714B0 80242BD0 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 1714B4 80242BD4 AFB00010 */  sw        $s0, 0x10($sp)
@@ -39,8 +39,8 @@ glabel btl_state_update_begin_partner_turn
 .L80242C34:
 /* 171514 80242C34 AE220000 */  sw        $v0, ($s1)
 .L80242C38:
-/* 171518 80242C38 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 171518 80242C38 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 17151C 80242C3C 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 17151C 80242C3C 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 171520 80242C40 24020064 */  addiu     $v0, $zero, 0x64
 /* 171524 80242C44 14620048 */  bne       $v1, $v0, .L80242D68
 /* 171528 80242C48 24020001 */   addiu    $v0, $zero, 1
@@ -114,11 +114,11 @@ glabel btl_state_update_begin_partner_turn
 /* 171628 80242D48 1440FFF8 */  bnez      $v0, .L80242D2C
 /* 17162C 80242D4C 24840004 */   addiu    $a0, $a0, 4
 /* 171630 80242D50 24020001 */  addiu     $v0, $zero, 1
-/* 171634 80242D54 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 171634 80242D54 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 171638 80242D58 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 171638 80242D58 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80242D5C:
-/* 17163C 80242D5C 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 17163C 80242D5C 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 171640 80242D60 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 171640 80242D60 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 171644 80242D64 24020001 */  addiu     $v0, $zero, 1
 .L80242D68:
 /* 171648 80242D68 1462001B */  bne       $v1, $v0, .L80242DD8
@@ -148,11 +148,11 @@ glabel btl_state_update_begin_partner_turn
 /* 1716A4 80242DC4 00000000 */   nop
 /* 1716A8 80242DC8 14400044 */  bnez      $v0, .L80242EDC
 /* 1716AC 80242DCC 24020008 */   addiu    $v0, $zero, 8
-/* 1716B0 80242DD0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1716B0 80242DD0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1716B4 80242DD4 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1716B4 80242DD4 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80242DD8:
-/* 1716B8 80242DD8 3C11800E */  lui       $s1, %hi(gBattleStatus+0x46C)
+/* 1716B8 80242DD8 3C11800E */  lui       $s1, %hi(gBattleState2)
-/* 1716BC 80242DDC 2631C4DC */  addiu     $s1, $s1, %lo(gBattleStatus+0x46C)
+/* 1716BC 80242DDC 2631C4DC */  addiu     $s1, $s1, %lo(gBattleState2)
 /* 1716C0 80242DE0 8E230000 */  lw        $v1, ($s1)
 /* 1716C4 80242DE4 24020008 */  addiu     $v0, $zero, 8
 /* 1716C8 80242DE8 14620014 */  bne       $v1, $v0, .L80242E3C
@@ -173,8 +173,8 @@ glabel btl_state_update_begin_partner_turn
 .L80242E24:
 /* 171704 80242E24 24020009 */  addiu     $v0, $zero, 9
 /* 171708 80242E28 AE220000 */  sw        $v0, ($s1)
-/* 17170C 80242E2C 3C11800E */  lui       $s1, %hi(gBattleStatus+0x46C)
+/* 17170C 80242E2C 3C11800E */  lui       $s1, %hi(gBattleState2)
-/* 171710 80242E30 2631C4DC */  addiu     $s1, $s1, %lo(gBattleStatus+0x46C)
+/* 171710 80242E30 2631C4DC */  addiu     $s1, $s1, %lo(gBattleState2)
 /* 171714 80242E34 8E230000 */  lw        $v1, ($s1)
 /* 171718 80242E38 24020009 */  addiu     $v0, $zero, 9
 .L80242E3C:
@@ -191,8 +191,8 @@ glabel btl_state_update_begin_partner_turn
 .L80242E64:
 /* 171744 80242E64 AE220000 */  sw        $v0, ($s1)
 .L80242E68:
-/* 171748 80242E68 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 171748 80242E68 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 17174C 80242E6C 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 17174C 80242E6C 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 171750 80242E70 2402000A */  addiu     $v0, $zero, 0xa
 /* 171754 80242E74 14620019 */  bne       $v1, $v0, .L80242EDC
 /* 171758 80242E78 00000000 */   nop

ver/us/asm/nonmatchings/16F740/btl_state_update_begin_player_turn.s

@@ -10,8 +10,8 @@ glabel btl_state_update_begin_player_turn
 /* 170918 80242038 3C168011 */  lui       $s6, %hi(gPlayerData)
 /* 17091C 8024203C 26D6F290 */  addiu     $s6, $s6, %lo(gPlayerData)
 /* 170920 80242040 AFB20020 */  sw        $s2, 0x20($sp)
-/* 170924 80242044 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 170924 80242044 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 170928 80242048 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 170928 80242048 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 17092C 8024204C AFBF0034 */  sw        $ra, 0x34($sp)
 /* 170930 80242050 AFB5002C */  sw        $s5, 0x2c($sp)
 /* 170934 80242054 AFB40028 */  sw        $s4, 0x28($sp)
@@ -106,8 +106,8 @@ glabel btl_state_update_begin_player_turn
 /* 170A88 802421A8 34420004 */  ori       $v0, $v0, 4
 /* 170A8C 802421AC AE620004 */  sw        $v0, 4($s3)
 .L802421B0:
-/* 170A90 802421B0 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 170A90 802421B0 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 170A94 802421B4 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 170A94 802421B4 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 170A98 802421B8 8E440000 */  lw        $a0, ($s2)
 /* 170A9C 802421BC 24150002 */  addiu     $s5, $zero, 2
 /* 170AA0 802421C0 10950066 */  beq       $a0, $s5, .L8024235C
@@ -223,8 +223,8 @@ glabel btl_state_update_begin_player_turn
 .L80242370:
 /* 170C50 80242370 AE420000 */  sw        $v0, ($s2)
 .L80242374:
-/* 170C54 80242374 3C10800E */  lui       $s0, %hi(gBattleStatus+0x46C)
+/* 170C54 80242374 3C10800E */  lui       $s0, %hi(gBattleState2)
-/* 170C58 80242378 2610C4DC */  addiu     $s0, $s0, %lo(gBattleStatus+0x46C)
+/* 170C58 80242378 2610C4DC */  addiu     $s0, $s0, %lo(gBattleState2)
 /* 170C5C 8024237C 8E030000 */  lw        $v1, ($s0)
 /* 170C60 80242380 2402000B */  addiu     $v0, $zero, 0xb
 /* 170C64 80242384 10620005 */  beq       $v1, $v0, .L8024239C
@@ -266,8 +266,8 @@ glabel btl_state_update_begin_player_turn
 .L80242408:
 /* 170CE8 80242408 AE020000 */  sw        $v0, ($s0)
 .L8024240C:
-/* 170CEC 8024240C 3C10800E */  lui       $s0, %hi(gBattleStatus+0x46C)
+/* 170CEC 8024240C 3C10800E */  lui       $s0, %hi(gBattleState2)
-/* 170CF0 80242410 2610C4DC */  addiu     $s0, $s0, %lo(gBattleStatus+0x46C)
+/* 170CF0 80242410 2610C4DC */  addiu     $s0, $s0, %lo(gBattleState2)
 /* 170CF4 80242414 8E030000 */  lw        $v1, ($s0)
 /* 170CF8 80242418 2402000F */  addiu     $v0, $zero, 0xf
 .L8024241C:
@@ -324,8 +324,8 @@ glabel btl_state_update_begin_player_turn
 .L802424D0:
 /* 170DB0 802424D0 AE020000 */  sw        $v0, ($s0)
 .L802424D4:
-/* 170DB4 802424D4 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 170DB4 802424D4 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 170DB8 802424D8 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 170DB8 802424D8 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 170DBC 802424DC 24020015 */  addiu     $v0, $zero, 0x15
 /* 170DC0 802424E0 14620042 */  bne       $v1, $v0, .L802425EC
 /* 170DC4 802424E4 24020016 */   addiu    $v0, $zero, 0x16
@@ -393,10 +393,10 @@ glabel btl_state_update_begin_player_turn
 .L802425D4:
 /* 170EB4 802425D4 24020016 */  addiu     $v0, $zero, 0x16
 .L802425D8:
-/* 170EB8 802425D8 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 170EB8 802425D8 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 170EBC 802425DC AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 170EBC 802425DC AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
-/* 170EC0 802425E0 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 170EC0 802425E0 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 170EC4 802425E4 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 170EC4 802425E4 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 170EC8 802425E8 24020016 */  addiu     $v0, $zero, 0x16
 .L802425EC:
 /* 170ECC 802425EC 146200A8 */  bne       $v1, $v0, .L80242890
@@ -582,11 +582,11 @@ glabel btl_state_update_begin_player_turn
 /* 17115C 8024287C 1440FFE9 */  bnez      $v0, .L80242824
 /* 171160 80242880 26100004 */   addiu    $s0, $s0, 4
 /* 171164 80242884 24020001 */  addiu     $v0, $zero, 1
-/* 171168 80242888 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 171168 80242888 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 17116C 8024288C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 17116C 8024288C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80242890:
-/* 171170 80242890 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 171170 80242890 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 171174 80242894 8E52C4DC */  lw        $s2, %lo(gBattleStatus+0x46C)($s2)
+/* 171174 80242894 8E52C4DC */  lw        $s2, %lo(gBattleState2)($s2)
 /* 171178 80242898 24020001 */  addiu     $v0, $zero, 1
 /* 17117C 8024289C 16420051 */  bne       $s2, $v0, .L802429E4
 /* 171180 802428A0 00000000 */   nop
@@ -672,11 +672,11 @@ glabel btl_state_update_begin_player_turn
 .L802429D8:
 /* 1712B8 802429D8 2402001E */  addiu     $v0, $zero, 0x1e
 .L802429DC:
-/* 1712BC 802429DC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1712BC 802429DC 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1712C0 802429E0 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1712C0 802429E0 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L802429E4:
-/* 1712C4 802429E4 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 1712C4 802429E4 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 1712C8 802429E8 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 1712C8 802429E8 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 1712CC 802429EC 2402001E */  addiu     $v0, $zero, 0x1e
 /* 1712D0 802429F0 14620026 */  bne       $v1, $v0, .L80242A8C
 /* 1712D4 802429F4 00000000 */   nop

ver/us/asm/nonmatchings/16F740/btl_state_update_begin_turn.s

@@ -15,8 +15,8 @@ glabel btl_state_update_begin_turn
 /* 17041C 80241B3C AFB10014 */  sw        $s1, 0x14($sp)
 /* 170420 80241B40 AFB00010 */  sw        $s0, 0x10($sp)
 /* 170424 80241B44 8E9500DC */  lw        $s5, 0xdc($s4)
-/* 170428 80241B48 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 170428 80241B48 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 17042C 80241B4C 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 17042C 80241B4C 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 170430 80241B50 8E8500D8 */  lw        $a1, 0xd8($s4)
 /* 170434 80241B54 144000E9 */  bnez      $v0, .L80241EFC
 /* 170438 80241B58 3C04FEFF */   lui      $a0, 0xfeff
@@ -273,11 +273,11 @@ glabel btl_state_update_begin_turn
 .L80241EF0:
 /* 1707D0 80241EF0 24020005 */  addiu     $v0, $zero, 5
 .L80241EF4:
-/* 1707D4 80241EF4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1707D4 80241EF4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1707D8 80241EF8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1707D8 80241EF8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80241EFC:
-/* 1707DC 80241EFC 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 1707DC 80241EFC 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 1707E0 80241F00 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 1707E0 80241F00 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 1707E4 80241F04 24020005 */  addiu     $v0, $zero, 5
 /* 1707E8 80241F08 14620020 */  bne       $v1, $v0, .L80241F8C
 /* 1707EC 80241F0C 2402000A */   addiu    $v0, $zero, 0xa
@@ -314,8 +314,8 @@ glabel btl_state_update_begin_turn
 .L80241F7C:
 /* 17085C 80241F7C 12600018 */  beqz      $s3, .L80241FE0
 /* 170860 80241F80 2402000A */   addiu    $v0, $zero, 0xa
-/* 170864 80241F84 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 170864 80241F84 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 170868 80241F88 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 170868 80241F88 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 .L80241F8C:
 /* 17086C 80241F8C 1462001A */  bne       $v1, $v0, .L80241FF8
 /* 170870 80241F90 0000982D */   daddu    $s3, $zero, $zero

ver/us/asm/nonmatchings/16F740/btl_state_update_change_partner.s

@@ -19,8 +19,8 @@ glabel btl_state_update_change_partner
 /* 173FF4 80245714 AFB00010 */  sw        $s0, 0x10($sp)
 /* 173FF8 80245718 8E5000D8 */  lw        $s0, 0xd8($s2)
 /* 173FFC 8024571C 8E5100DC */  lw        $s1, 0xdc($s2)
-/* 174000 80245720 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 174000 80245720 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 174004 80245724 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 174004 80245724 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 174008 80245728 2C620008 */  sltiu     $v0, $v1, 8
 /* 17400C 8024572C 104000DF */  beqz      $v0, L80245AAC_17438C
 /* 174010 80245730 2613000C */   addiu    $s3, $s0, 0xc
@@ -86,8 +86,8 @@ glabel L8024574C_17402C
 /* 1740F4 80245814 3C01802A */  lui       $at, %hi(D_8029F248)
 /* 1740F8 80245818 AC22F248 */  sw        $v0, %lo(D_8029F248)($at)
 /* 1740FC 8024581C 24020002 */  addiu     $v0, $zero, 2
-/* 174100 80245820 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174100 80245820 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174104 80245824 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174104 80245824 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L80245828_174108
 /* 174108 80245828 3C03802A */  lui       $v1, %hi(D_8029F248)
 /* 17410C 8024582C 2463F248 */  addiu     $v1, $v1, %lo(D_8029F248)
@@ -115,8 +115,8 @@ glabel L80245828_174108
 /* 174160 80245880 E6600018 */  swc1      $f0, 0x18($s3)
 /* 174164 80245884 C620014C */  lwc1      $f0, 0x14c($s1)
 /* 174168 80245888 24020003 */  addiu     $v0, $zero, 3
-/* 17416C 8024588C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 17416C 8024588C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174170 80245890 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174170 80245890 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 174174 80245894 080916AB */  j         L80245AAC_17438C
 /* 174178 80245898 E6600020 */   swc1     $f0, 0x20($s3)
 glabel L8024589C_17417C
@@ -155,8 +155,8 @@ glabel L8024589C_17417C
 /* 1741FC 8024591C E6200148 */  swc1      $f0, 0x148($s1)
 /* 174200 80245920 C600014C */  lwc1      $f0, 0x14c($s0)
 /* 174204 80245924 24020004 */  addiu     $v0, $zero, 4
-/* 174208 80245928 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174208 80245928 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 17420C 8024592C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 17420C 8024592C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 174210 80245930 080916AB */  j         L80245AAC_17438C
 /* 174214 80245934 E620014C */   swc1     $f0, 0x14c($s1)
 glabel L80245938_174218
@@ -178,8 +178,8 @@ glabel L80245938_174218
 /* 174250 80245970 AE4400BC */  sw        $a0, 0xbc($s2)
 /* 174254 80245974 8C820144 */  lw        $v0, 0x144($a0)
 /* 174258 80245978 24030005 */  addiu     $v1, $zero, 5
-/* 17425C 8024597C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 17425C 8024597C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174260 80245980 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 174260 80245980 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 174264 80245984 AE4200C0 */  sw        $v0, 0xc0($s2)
 /* 174268 80245988 24020100 */  addiu     $v0, $zero, 0x100
 /* 17426C 8024598C 080916AB */  j         L80245AAC_17438C
@@ -210,8 +210,8 @@ glabel L80245994_174274
 .L802459EC:
 /* 1742CC 802459EC 24020006 */  addiu     $v0, $zero, 6
 .L802459F0:
-/* 1742D0 802459F0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1742D0 802459F0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1742D4 802459F4 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1742D4 802459F4 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 1742D8 802459F8 080916AB */  j         L80245AAC_17438C
 /* 1742DC 802459FC 00000000 */   nop
 glabel L80245A00_1742E0
@@ -229,8 +229,8 @@ glabel L80245A00_1742E0
 /* 174308 80245A28 0C093903 */  jal       func_8024E40C
 /* 17430C 80245A2C 24040002 */   addiu    $a0, $zero, 2
 /* 174310 80245A30 24020007 */  addiu     $v0, $zero, 7
-/* 174314 80245A34 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174314 80245A34 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174318 80245A38 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174318 80245A38 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 17431C 80245A3C 080916AB */  j         L80245AAC_17438C
 /* 174320 80245A40 00000000 */   nop
 glabel L80245A44_174324

ver/us/asm/nonmatchings/16F740/btl_state_update_defeat.s

@@ -7,8 +7,8 @@ glabel btl_state_update_defeat
 /* 173D28 80245448 3C11800E */  lui       $s1, %hi(gBattleStatus)
 /* 173D2C 8024544C 2631C070 */  addiu     $s1, $s1, %lo(gBattleStatus)
 /* 173D30 80245450 AFB30024 */  sw        $s3, 0x24($sp)
-/* 173D34 80245454 3C13800E */  lui       $s3, %hi(gBattleStatus+0x46C)
+/* 173D34 80245454 3C13800E */  lui       $s3, %hi(gBattleState2)
-/* 173D38 80245458 2673C4DC */  addiu     $s3, $s3, %lo(gBattleStatus+0x46C)
+/* 173D38 80245458 2673C4DC */  addiu     $s3, $s3, %lo(gBattleState2)
 /* 173D3C 8024545C 24020001 */  addiu     $v0, $zero, 1
 /* 173D40 80245460 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 173D44 80245464 AFB20020 */  sw        $s2, 0x20($sp)
@@ -95,8 +95,8 @@ glabel btl_state_update_defeat
 /* 173E78 80245598 AC820148 */  sw        $v0, 0x148($a0)
 .L8024559C:
 /* 173E7C 8024559C 24020001 */  addiu     $v0, $zero, 1
-/* 173E80 802455A0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 173E80 802455A0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 173E84 802455A4 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 173E84 802455A4 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 173E88 802455A8 0809158F */  j         .L8024563C
 /* 173E8C 802455AC 00000000 */   nop
 .L802455B0:
@@ -138,8 +138,8 @@ glabel btl_state_update_defeat
 /* 173F14 80245634 2402000A */  addiu     $v0, $zero, 0xa
 /* 173F18 80245638 AE620000 */  sw        $v0, ($s3)
 .L8024563C:
-/* 173F1C 8024563C 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 173F1C 8024563C 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 173F20 80245640 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 173F20 80245640 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 173F24 80245644 2402000A */  addiu     $v0, $zero, 0xa
 /* 173F28 80245648 14620012 */  bne       $v1, $v0, .L80245694
 /* 173F2C 8024564C 24030001 */   addiu    $v1, $zero, 1

ver/us/asm/nonmatchings/16F740/btl_state_update_defend.s

@@ -7,8 +7,8 @@ glabel btl_state_update_defend
 /* 173720 80244E40 3C11800E */  lui       $s1, %hi(gBattleStatus)
 /* 173724 80244E44 2631C070 */  addiu     $s1, $s1, %lo(gBattleStatus)
 /* 173728 80244E48 AFB20018 */  sw        $s2, 0x18($sp)
-/* 17372C 80244E4C 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 17372C 80244E4C 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 173730 80244E50 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 173730 80244E50 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 173734 80244E54 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 173738 80244E58 AFB00010 */  sw        $s0, 0x10($sp)
 /* 17373C 80244E5C 8E430000 */  lw        $v1, ($s2)

ver/us/asm/nonmatchings/16F740/btl_state_update_end_battle.s

@@ -12,10 +12,10 @@ glabel jtbl_8029CAB8
 .section .text
 
 glabel btl_state_update_end_battle
-/* 173330 80244A50 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 173330 80244A50 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 173334 80244A54 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 173334 80244A54 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
-/* 173338 80244A58 3C06800E */  lui       $a2, %hi(gBattleStatus+0x48C)
+/* 173338 80244A58 3C06800E */  lui       $a2, %hi(D_800DC4FC)
-/* 17333C 80244A5C 8CC6C4FC */  lw        $a2, %lo(gBattleStatus+0x48C)($a2)
+/* 17333C 80244A5C 8CC6C4FC */  lw        $a2, %lo(D_800DC4FC)($a2)
 /* 173340 80244A60 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 173344 80244A64 AFB30024 */  sw        $s3, 0x24($sp)
 /* 173348 80244A68 3C13800B */  lui       $s3, %hi(gCurrentEncounter)
@@ -71,8 +71,8 @@ glabel L80244AA8_173388
 /* 173408 80244B28 24070078 */   addiu    $a3, $zero, 0x78
 /* 17340C 80244B2C 24020001 */  addiu     $v0, $zero, 1
 .L80244B30:
-/* 173410 80244B30 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 173410 80244B30 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 173414 80244B34 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 173414 80244B34 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 173418 80244B38 0809135D */  j         .L80244D74
 /* 17341C 80244B3C 00000000 */   nop
 glabel L80244B40_173420
@@ -82,8 +82,8 @@ glabel L80244B40_173420
 /* 17342C 80244B4C 240500FF */  addiu     $a1, $zero, 0xff
 /* 173430 80244B50 14650005 */  bne       $v1, $a1, .L80244B68
 /* 173434 80244B54 24020002 */   addiu    $v0, $zero, 2
-/* 173438 80244B58 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 173438 80244B58 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 17343C 80244B5C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 17343C 80244B5C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 173440 80244B60 0809135D */  j         .L80244D74
 /* 173444 80244B64 00000000 */   nop
 .L80244B68:
@@ -118,8 +118,8 @@ glabel L80244B88_173468
 /* 1734AC 80244BCC 14800006 */  bnez      $a0, .L80244BE8
 /* 1734B0 80244BD0 2405000A */   addiu    $a1, $zero, 0xa
 /* 1734B4 80244BD4 24020004 */  addiu     $v0, $zero, 4
-/* 1734B8 80244BD8 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1734B8 80244BD8 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1734BC 80244BDC AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1734BC 80244BDC AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 1734C0 80244BE0 0809135D */  j         .L80244D74
 /* 1734C4 80244BE4 00000000 */   nop
 .L80244BE8:
@@ -128,8 +128,8 @@ glabel L80244B88_173468
 /* 1734D0 80244BF0 AE4200BC */  sw        $v0, 0xbc($s2)
 /* 1734D4 80244BF4 8C430144 */  lw        $v1, 0x144($v0)
 /* 1734D8 80244BF8 24020003 */  addiu     $v0, $zero, 3
-/* 1734DC 80244BFC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1734DC 80244BFC 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1734E0 80244C00 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1734E0 80244C00 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 1734E4 80244C04 0809135D */  j         .L80244D74
 /* 1734E8 80244C08 AE4300C0 */   sw       $v1, 0xc0($s2)
 glabel L80244C0C_1734EC
@@ -138,8 +138,8 @@ glabel L80244C0C_1734EC
 /* 1734F4 80244C14 00000000 */   nop
 /* 1734F8 80244C18 14400056 */  bnez      $v0, .L80244D74
 /* 1734FC 80244C1C 24020004 */   addiu    $v0, $zero, 4
-/* 173500 80244C20 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 173500 80244C20 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 173504 80244C24 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 173504 80244C24 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L80244C28_173508
 /* 173508 80244C28 0C0B1045 */  jal       kill_all_scripts
 /* 17350C 80244C2C 0000882D */   daddu    $s1, $zero, $zero
@@ -206,8 +206,8 @@ glabel L80244C28_173508
 /* 1735E8 80244D08 27A50010 */  addiu     $a1, $sp, 0x10
 /* 1735EC 80244D0C 3C02800E */  lui       $v0, %hi(gBattleState)
 /* 1735F0 80244D10 8C42C068 */  lw        $v0, %lo(gBattleState)($v0)
-/* 1735F4 80244D14 3C01800E */  lui       $at, %hi(gBattleStatus+0x460)
+/* 1735F4 80244D14 3C01800E */  lui       $at, %hi(D_800DC4D0)
-/* 1735F8 80244D18 AC22C4D0 */  sw        $v0, %lo(gBattleStatus+0x460)($at)
+/* 1735F8 80244D18 AC22C4D0 */  sw        $v0, %lo(D_800DC4D0)($at)
 /* 1735FC 80244D1C 0C016AFE */  jal       get_map_IDs_by_name
 /* 173600 80244D20 27A60012 */   addiu    $a2, $sp, 0x12
 /* 173604 80244D24 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
@@ -224,8 +224,8 @@ glabel L80244C28_173508
 /* 17362C 80244D4C 0000202D */   daddu    $a0, $zero, $zero
 /* 173630 80244D50 3C02800E */  lui       $v0, %hi(gBattleState)
 /* 173634 80244D54 8C42C068 */  lw        $v0, %lo(gBattleState)($v0)
-/* 173638 80244D58 3C01800E */  lui       $at, %hi(gBattleStatus+0x460)
+/* 173638 80244D58 3C01800E */  lui       $at, %hi(D_800DC4D0)
-/* 17363C 80244D5C AC22C4D0 */  sw        $v0, %lo(gBattleStatus+0x460)($at)
+/* 17363C 80244D5C AC22C4D0 */  sw        $v0, %lo(D_800DC4D0)($at)
 /* 173640 80244D60 0C00F945 */  jal       func_8003E514
 /* 173644 80244D64 24040001 */   addiu    $a0, $zero, 1
 /* 173648 80244D68 24040009 */  addiu     $a0, $zero, 9

ver/us/asm/nonmatchings/16F740/btl_state_update_end_demo_battle.s

@@ -9,10 +9,10 @@ glabel jtbl_8029CBE0
 .section .text
 
 glabel btl_state_update_end_demo_battle
-/* 1773E8 80248B08 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 1773E8 80248B08 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 1773EC 80248B0C 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 1773EC 80248B0C 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
-/* 1773F0 80248B10 3C06800E */  lui       $a2, %hi(gBattleStatus+0x48C)
+/* 1773F0 80248B10 3C06800E */  lui       $a2, %hi(D_800DC4FC)
-/* 1773F4 80248B14 8CC6C4FC */  lw        $a2, %lo(gBattleStatus+0x48C)($a2)
+/* 1773F4 80248B14 8CC6C4FC */  lw        $a2, %lo(D_800DC4FC)($a2)
 /* 1773F8 80248B18 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 1773FC 80248B1C AFB20018 */  sw        $s2, 0x18($sp)
 /* 177400 80248B20 3C12800E */  lui       $s2, %hi(gBattleStatus)
@@ -47,8 +47,8 @@ glabel L80248B54_177434
 .L80248B90:
 /* 177470 80248B90 24020001 */  addiu     $v0, $zero, 1
 .L80248B94:
-/* 177474 80248B94 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 177474 80248B94 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 177478 80248B98 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 177478 80248B98 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 17747C 80248B9C 08092358 */  j         .L80248D60
 /* 177480 80248BA0 00000000 */   nop
 glabel L80248BA4_177484
@@ -70,8 +70,8 @@ glabel L80248BA4_177484
 /* 1774BC 80248BDC 24420032 */   addiu    $v0, $v0, 0x32
 /* 1774C0 80248BE0 24020002 */  addiu     $v0, $zero, 2
 .L80248BE4:
-/* 1774C4 80248BE4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1774C4 80248BE4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1774C8 80248BE8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1774C8 80248BE8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 1774CC 80248BEC 08092358 */  j         .L80248D60
 /* 1774D0 80248BF0 00000000 */   nop
 .L80248BF4:
@@ -104,8 +104,8 @@ glabel L80248C0C_1774EC
 /* 177530 80248C50 14800006 */  bnez      $a0, .L80248C6C
 /* 177534 80248C54 2405000A */   addiu    $a1, $zero, 0xa
 /* 177538 80248C58 24020004 */  addiu     $v0, $zero, 4
-/* 17753C 80248C5C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 17753C 80248C5C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 177540 80248C60 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 177540 80248C60 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 177544 80248C64 08092358 */  j         .L80248D60
 /* 177548 80248C68 00000000 */   nop
 .L80248C6C:
@@ -114,8 +114,8 @@ glabel L80248C0C_1774EC
 /* 177554 80248C74 AE4200BC */  sw        $v0, 0xbc($s2)
 /* 177558 80248C78 8C430144 */  lw        $v1, 0x144($v0)
 /* 17755C 80248C7C 24020003 */  addiu     $v0, $zero, 3
-/* 177560 80248C80 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 177560 80248C80 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 177564 80248C84 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 177564 80248C84 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 177568 80248C88 08092358 */  j         .L80248D60
 /* 17756C 80248C8C AE4300C0 */   sw       $v1, 0xc0($s2)
 glabel L80248C90_177570
@@ -124,8 +124,8 @@ glabel L80248C90_177570
 /* 177578 80248C98 00000000 */   nop
 /* 17757C 80248C9C 14400030 */  bnez      $v0, .L80248D60
 /* 177580 80248CA0 24020004 */   addiu    $v0, $zero, 4
-/* 177584 80248CA4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 177584 80248CA4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 177588 80248CA8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 177588 80248CA8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L80248CAC_17758C
 /* 17758C 80248CAC 0C0B1045 */  jal       kill_all_scripts
 /* 177590 80248CB0 0000882D */   daddu    $s1, $zero, $zero
@@ -173,8 +173,8 @@ glabel L80248CAC_17758C
 /* 177624 80248D44 0000202D */   daddu    $a0, $zero, $zero
 /* 177628 80248D48 3C02800E */  lui       $v0, %hi(gBattleState)
 /* 17762C 80248D4C 8C42C068 */  lw        $v0, %lo(gBattleState)($v0)
-/* 177630 80248D50 3C01800E */  lui       $at, %hi(gBattleStatus+0x460)
+/* 177630 80248D50 3C01800E */  lui       $at, %hi(D_800DC4D0)
-/* 177634 80248D54 AC22C4D0 */  sw        $v0, %lo(gBattleStatus+0x460)($at)
+/* 177634 80248D54 AC22C4D0 */  sw        $v0, %lo(D_800DC4D0)($at)
 /* 177638 80248D58 0C00CD3C */  jal       set_game_mode
 /* 17763C 80248D5C 24040009 */   addiu    $a0, $zero, 9
 .L80248D60:

ver/us/asm/nonmatchings/16F740/btl_state_update_end_partner_turn.s

@@ -1,41 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_state_update_end_partner_turn
-/* 175AFC 8024721C 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
-/* 175B00 80247220 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
-/* 175B04 80247224 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 175B08 80247228 AFB00010 */  sw        $s0, 0x10($sp)
-/* 175B0C 8024722C 3C10800E */  lui       $s0, %hi(gBattleStatus)
-/* 175B10 80247230 2610C070 */  addiu     $s0, $s0, %lo(gBattleStatus)
-/* 175B14 80247234 14400017 */  bnez      $v0, .L80247294
-/* 175B18 80247238 AFBF0014 */   sw       $ra, 0x14($sp)
-/* 175B1C 8024723C 8E020004 */  lw        $v0, 4($s0)
-/* 175B20 80247240 34420004 */  ori       $v0, $v0, 4
-/* 175B24 80247244 0C098D0D */  jal       btl_check_enemies_defeated
-/* 175B28 80247248 AE020004 */   sw       $v0, 4($s0)
-/* 175B2C 8024724C 14400011 */  bnez      $v0, .L80247294
-/* 175B30 80247250 3C03FFF7 */   lui      $v1, 0xfff7
-/* 175B34 80247254 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 175B38 80247258 8E020000 */  lw        $v0, ($s0)
-/* 175B3C 8024725C 82040094 */  lb        $a0, 0x94($s0)
-/* 175B40 80247260 00431024 */  and       $v0, $v0, $v1
-/* 175B44 80247264 AE020000 */  sw        $v0, ($s0)
-/* 175B48 80247268 8E020004 */  lw        $v0, 4($s0)
-/* 175B4C 8024726C 2403FFEF */  addiu     $v1, $zero, -0x11
-/* 175B50 80247270 00431024 */  and       $v0, $v0, $v1
-/* 175B54 80247274 04810004 */  bgez      $a0, .L80247288
-/* 175B58 80247278 AE020004 */   sw       $v0, 4($s0)
-/* 175B5C 8024727C A2000094 */  sb        $zero, 0x94($s0)
-/* 175B60 80247280 08091CA3 */  j         .L8024728C
-/* 175B64 80247284 24040006 */   addiu    $a0, $zero, 6
-.L80247288:
-/* 175B68 80247288 24040009 */  addiu     $a0, $zero, 9
-.L8024728C:
-/* 175B6C 8024728C 0C090464 */  jal       btl_set_state
-/* 175B70 80247290 00000000 */   nop
-.L80247294:
-/* 175B74 80247294 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 175B78 80247298 8FB00010 */  lw        $s0, 0x10($sp)
-/* 175B7C 8024729C 03E00008 */  jr        $ra
-/* 175B80 802472A0 27BD0018 */   addiu    $sp, $sp, 0x18

ver/us/asm/nonmatchings/16F740/btl_state_update_end_player_turn.s

@@ -6,8 +6,8 @@ glabel btl_state_update_end_player_turn
 /* 174D34 80246454 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 174D38 80246458 3C13800E */  lui       $s3, %hi(gBattleStatus)
 /* 174D3C 8024645C 2673C070 */  addiu     $s3, $s3, %lo(gBattleStatus)
-/* 174D40 80246460 3C04800E */  lui       $a0, %hi(gBattleStatus+0x46C)
+/* 174D40 80246460 3C04800E */  lui       $a0, %hi(gBattleState2)
-/* 174D44 80246464 2484C4DC */  addiu     $a0, $a0, %lo(gBattleStatus+0x46C)
+/* 174D44 80246464 2484C4DC */  addiu     $a0, $a0, %lo(gBattleState2)
 /* 174D48 80246468 AFBF0030 */  sw        $ra, 0x30($sp)
 /* 174D4C 8024646C AFB7002C */  sw        $s7, 0x2c($sp)
 /* 174D50 80246470 AFB60028 */  sw        $s6, 0x28($sp)
@@ -106,8 +106,8 @@ glabel btl_state_update_end_player_turn
 /* 174EAC 802465CC 2402001E */   addiu    $v0, $zero, 0x1e
 /* 174EB0 802465D0 24020005 */  addiu     $v0, $zero, 5
 .L802465D4:
-/* 174EB4 802465D4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174EB4 802465D4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174EB8 802465D8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174EB8 802465D8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 174EBC 802465DC 080919A8 */  j         .L802466A0
 /* 174EC0 802465E0 00000000 */   nop
 .L802465E4:
@@ -158,13 +158,13 @@ glabel btl_state_update_end_player_turn
 /* 174F64 80246684 3442FFFF */  ori       $v0, $v0, 0xffff
 /* 174F68 80246688 8EC30004 */  lw        $v1, 4($s6)
 /* 174F6C 8024668C 24040005 */  addiu     $a0, $zero, 5
-/* 174F70 80246690 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174F70 80246690 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174F74 80246694 AC24C4DC */  sw        $a0, %lo(gBattleStatus+0x46C)($at)
+/* 174F74 80246694 AC24C4DC */  sw        $a0, %lo(gBattleState2)($at)
 /* 174F78 80246698 00621824 */  and       $v1, $v1, $v0
 /* 174F7C 8024669C AEC30004 */  sw        $v1, 4($s6)
 .L802466A0:
-/* 174F80 802466A0 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 174F80 802466A0 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 174F84 802466A4 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 174F84 802466A4 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 174F88 802466A8 8E430000 */  lw        $v1, ($s2)
 /* 174F8C 802466AC 24020005 */  addiu     $v0, $zero, 5
 /* 174F90 802466B0 14620027 */  bne       $v1, $v0, .L80246750
@@ -207,8 +207,8 @@ glabel btl_state_update_end_player_turn
 /* 175018 80246738 AE000054 */  sw        $zero, 0x54($s0)
 /* 17501C 8024673C E6000020 */  swc1      $f0, 0x20($s0)
 .L80246740:
-/* 175020 80246740 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 175020 80246740 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 175024 80246744 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 175024 80246744 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 .L80246748:
 /* 175028 80246748 8E430000 */  lw        $v1, ($s2)
 /* 17502C 8024674C 24020006 */  addiu     $v0, $zero, 6
@@ -325,8 +325,8 @@ glabel btl_state_update_end_player_turn
 /* 1751DC 802468FC 00431025 */  or        $v0, $v0, $v1
 /* 1751E0 80246900 AC820000 */  sw        $v0, ($a0)
 .L80246904:
-/* 1751E4 80246904 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 1751E4 80246904 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 1751E8 80246908 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 1751E8 80246908 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 1751EC 8024690C 2402000A */  addiu     $v0, $zero, 0xa
 /* 1751F0 80246910 14620078 */  bne       $v1, $v0, .L80246AF4
 /* 1751F4 80246914 00000000 */   nop
@@ -377,8 +377,8 @@ glabel btl_state_update_end_player_turn
 /* 17529C 802469BC 0C090464 */  jal       btl_set_state
 /* 1752A0 802469C0 2404000C */   addiu    $a0, $zero, 0xc
 /* 1752A4 802469C4 24020046 */  addiu     $v0, $zero, 0x46
-/* 1752A8 802469C8 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1752A8 802469C8 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1752AC 802469CC AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1752AC 802469CC AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 1752B0 802469D0 08091ABD */  j         .L80246AF4
 /* 1752B4 802469D4 00000000 */   nop
 .L802469D8:

ver/us/asm/nonmatchings/16F740/btl_state_update_end_training_battle.s

@@ -10,8 +10,8 @@ glabel btl_state_update_end_training_battle
 /* 173004 80244724 3C158011 */  lui       $s5, %hi(gPlayerData)
 /* 173008 80244728 26B5F290 */  addiu     $s5, $s5, %lo(gPlayerData)
 /* 17300C 8024472C AFB20020 */  sw        $s2, 0x20($sp)
-/* 173010 80244730 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 173010 80244730 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 173014 80244734 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 173014 80244734 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 173018 80244738 AFBF0030 */  sw        $ra, 0x30($sp)
 /* 17301C 8024473C AFB40028 */  sw        $s4, 0x28($sp)
 /* 173020 80244740 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -107,11 +107,11 @@ glabel btl_state_update_end_training_battle
 /* 173170 80244890 AE2001D8 */  sw        $zero, 0x1d8($s1)
 .L80244894:
 /* 173174 80244894 2402000B */  addiu     $v0, $zero, 0xb
-/* 173178 80244898 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 173178 80244898 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 17317C 8024489C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 17317C 8024489C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L802448A0:
-/* 173180 802448A0 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 173180 802448A0 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 173184 802448A4 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 173184 802448A4 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 173188 802448A8 8E500000 */  lw        $s0, ($s2)
 /* 17318C 802448AC 2402000B */  addiu     $v0, $zero, 0xb
 /* 173190 802448B0 12020005 */  beq       $s0, $v0, .L802448C8
@@ -163,8 +163,8 @@ glabel btl_state_update_end_training_battle
 /* 17323C 8024495C A260009A */  sb        $zero, 0x9a($s3)
 /* 173240 80244960 AE500000 */  sw        $s0, ($s2)
 .L80244964:
-/* 173244 80244964 3C10800E */  lui       $s0, %hi(gBattleStatus+0x46C)
+/* 173244 80244964 3C10800E */  lui       $s0, %hi(gBattleState2)
-/* 173248 80244968 2610C4DC */  addiu     $s0, $s0, %lo(gBattleStatus+0x46C)
+/* 173248 80244968 2610C4DC */  addiu     $s0, $s0, %lo(gBattleState2)
 /* 17324C 8024496C 8E030000 */  lw        $v1, ($s0)
 /* 173250 80244970 2402000D */  addiu     $v0, $zero, 0xd
 /* 173254 80244974 10620005 */  beq       $v1, $v0, .L8024498C

ver/us/asm/nonmatchings/16F740/btl_state_update_end_turn.s

@@ -20,8 +20,8 @@ glabel btl_state_update_end_turn
 /* 1722F4 80243A14 F7B60040 */  sdc1      $f22, 0x40($sp)
 /* 1722F8 80243A18 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 1722FC 80243A1C 8ED500D8 */  lw        $s5, 0xd8($s6)
-/* 172300 80243A20 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 172300 80243A20 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 172304 80243A24 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 172304 80243A24 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 172308 80243A28 8ED300DC */  lw        $s3, 0xdc($s6)
 /* 17230C 80243A2C 1440002E */  bnez      $v0, .L80243AE8
 /* 172310 80243A30 0000A02D */   daddu    $s4, $zero, $zero
@@ -74,11 +74,11 @@ glabel btl_state_update_end_turn
 /* 1723B4 80243AD4 0C093903 */  jal       func_8024E40C
 /* 1723B8 80243AD8 24040002 */   addiu    $a0, $zero, 2
 /* 1723BC 80243ADC 24020001 */  addiu     $v0, $zero, 1
-/* 1723C0 80243AE0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1723C0 80243AE0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1723C4 80243AE4 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1723C4 80243AE4 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80243AE8:
-/* 1723C8 80243AE8 3C04800E */  lui       $a0, %hi(gBattleStatus+0x46C)
+/* 1723C8 80243AE8 3C04800E */  lui       $a0, %hi(gBattleState2)
-/* 1723CC 80243AEC 2484C4DC */  addiu     $a0, $a0, %lo(gBattleStatus+0x46C)
+/* 1723CC 80243AEC 2484C4DC */  addiu     $a0, $a0, %lo(gBattleState2)
 /* 1723D0 80243AF0 8C830000 */  lw        $v1, ($a0)
 /* 1723D4 80243AF4 24020001 */  addiu     $v0, $zero, 1
 /* 1723D8 80243AF8 1462002A */  bne       $v1, $v0, .L80243BA4
@@ -127,8 +127,8 @@ glabel btl_state_update_end_turn
 /* 17247C 80243B9C AE600054 */  sw        $zero, 0x54($s3)
 /* 172480 80243BA0 E6600020 */  swc1      $f0, 0x20($s3)
 .L80243BA4:
-/* 172484 80243BA4 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 172484 80243BA4 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 172488 80243BA8 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 172488 80243BA8 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 17248C 80243BAC 2402000B */  addiu     $v0, $zero, 0xb
 /* 172490 80243BB0 1462007D */  bne       $v1, $v0, .L80243DA8
 /* 172494 80243BB4 2402000C */   addiu    $v0, $zero, 0xc
@@ -255,11 +255,11 @@ glabel btl_state_update_end_turn
 .L80243D8C:
 /* 17266C 80243D8C AC820000 */  sw        $v0, ($a0)
 /* 172670 80243D90 2402000C */  addiu     $v0, $zero, 0xc
-/* 172674 80243D94 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 172674 80243D94 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 172678 80243D98 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 172678 80243D98 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80243D9C:
-/* 17267C 80243D9C 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 17267C 80243D9C 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 172680 80243DA0 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 172680 80243DA0 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 172684 80243DA4 2402000C */  addiu     $v0, $zero, 0xc
 .L80243DA8:
 /* 172688 80243DA8 1462004C */  bne       $v1, $v0, .L80243EDC
@@ -343,11 +343,11 @@ glabel btl_state_update_end_turn
 .L80243ED0:
 /* 1727B0 80243ED0 24020002 */  addiu     $v0, $zero, 2
 .L80243ED4:
-/* 1727B4 80243ED4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1727B4 80243ED4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1727B8 80243ED8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1727B8 80243ED8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80243EDC:
-/* 1727BC 80243EDC 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 1727BC 80243EDC 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 1727C0 80243EE0 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 1727C0 80243EE0 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 1727C4 80243EE4 24020002 */  addiu     $v0, $zero, 2
 /* 1727C8 80243EE8 14620026 */  bne       $v1, $v0, .L80243F84
 /* 1727CC 80243EEC 28620005 */   slti     $v0, $v1, 5
@@ -387,11 +387,11 @@ glabel btl_state_update_end_turn
 /* 172844 80243F64 0C093903 */  jal       func_8024E40C
 /* 172848 80243F68 24040002 */   addiu    $a0, $zero, 2
 /* 17284C 80243F6C 24020003 */  addiu     $v0, $zero, 3
-/* 172850 80243F70 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 172850 80243F70 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 172854 80243F74 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 172854 80243F74 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80243F78:
-/* 172858 80243F78 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 172858 80243F78 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 17285C 80243F7C 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 17285C 80243F7C 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 172860 80243F80 28620005 */  slti      $v0, $v1, 5
 .L80243F84:
 /* 172864 80243F84 10400005 */  beqz      $v0, .L80243F9C

ver/us/asm/nonmatchings/16F740/btl_state_update_enemy_move.s

@@ -12,8 +12,8 @@ glabel jtbl_8029CBC0
 .section .text
 
 glabel btl_state_update_enemy_move
-/* 175E50 80247570 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 175E50 80247570 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 175E54 80247574 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 175E54 80247574 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 175E58 80247578 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 175E5C 8024757C AFB60028 */  sw        $s6, 0x28($sp)
 /* 175E60 80247580 3C16800E */  lui       $s6, %hi(gBattleStatus)
@@ -288,8 +288,8 @@ glabel L80247944_176224
 glabel L8024794C_17622C
 /* 17622C 8024794C 0000202D */  daddu     $a0, $zero, $zero
 /* 176230 80247950 24020014 */  addiu     $v0, $zero, 0x14
-/* 176234 80247954 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 176234 80247954 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 176238 80247958 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 176238 80247958 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L8024795C:
 /* 17623C 8024795C 0C093E58 */  jal       btl_show_battle_message
 /* 176240 80247960 2405003C */   addiu    $a1, $zero, 0x3c
@@ -321,11 +321,11 @@ glabel L802479A4_176284
 .L802479C0:
 /* 1762A0 802479C0 24020014 */  addiu     $v0, $zero, 0x14
 .L802479C4:
-/* 1762A4 802479C4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1762A4 802479C4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1762A8 802479C8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1762A8 802479C8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L802479CC_1762AC
-/* 1762AC 802479CC 3C10800E */  lui       $s0, %hi(gBattleStatus+0x46C)
+/* 1762AC 802479CC 3C10800E */  lui       $s0, %hi(gBattleState2)
-/* 1762B0 802479D0 2610C4DC */  addiu     $s0, $s0, %lo(gBattleStatus+0x46C)
+/* 1762B0 802479D0 2610C4DC */  addiu     $s0, $s0, %lo(gBattleState2)
 /* 1762B4 802479D4 8E030000 */  lw        $v1, ($s0)
 /* 1762B8 802479D8 24110015 */  addiu     $s1, $zero, 0x15
 /* 1762BC 802479DC 10710020 */  beq       $v1, $s1, .L80247A60
@@ -390,8 +390,8 @@ glabel L802479CC_1762AC
 .L80247AB4:
 /* 176394 80247AB4 AE020000 */  sw        $v0, ($s0)
 .L80247AB8:
-/* 176398 80247AB8 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 176398 80247AB8 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 17639C 80247ABC 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 17639C 80247ABC 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 1763A0 80247AC0 2402001E */  addiu     $v0, $zero, 0x1e
 /* 1763A4 80247AC4 14620003 */  bne       $v1, $v0, .L80247AD4
 /* 1763A8 80247AC8 00000000 */   nop

ver/us/asm/nonmatchings/16F740/btl_state_update_enemy_striking_first.s

@@ -14,8 +14,8 @@ glabel btl_state_update_enemy_striking_first
 /* 176F64 80248684 AFB10014 */  sw        $s1, 0x14($sp)
 /* 176F68 80248688 AFB00010 */  sw        $s0, 0x10($sp)
 /* 176F6C 8024868C 8E7200D8 */  lw        $s2, 0xd8($s3)
-/* 176F70 80248690 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 176F70 80248690 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 176F74 80248694 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 176F74 80248694 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 176F78 80248698 8E7100DC */  lw        $s1, 0xdc($s3)
 /* 176F7C 8024869C 10600005 */  beqz      $v1, .L802486B4
 /* 176F80 802486A0 24020002 */   addiu    $v0, $zero, 2
@@ -168,8 +168,8 @@ glabel btl_state_update_enemy_striking_first
 /* 177194 802488B4 AE0401E4 */  sw        $a0, 0x1e4($s0)
 /* 177198 802488B8 86640172 */  lh        $a0, 0x172($s3)
 /* 17719C 802488BC 24030002 */  addiu     $v1, $zero, 2
-/* 1771A0 802488C0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1771A0 802488C0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1771A4 802488C4 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 1771A4 802488C4 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 1771A8 802488C8 080922A1 */  j         .L80248A84
 /* 1771AC 802488CC AC440148 */   sw       $a0, 0x148($v0)
 .L802488D0:

ver/us/asm/nonmatchings/16F740/btl_state_update_first_strike.s

@@ -13,8 +13,8 @@ glabel btl_state_update_first_strike
 /* 176404 80247B24 3C13800B */  lui       $s3, %hi(gCurrentEncounter)
 /* 176408 80247B28 26730F10 */  addiu     $s3, $s3, %lo(gCurrentEncounter)
 /* 17640C 80247B2C AFB60028 */  sw        $s6, 0x28($sp)
-/* 176410 80247B30 3C16800E */  lui       $s6, %hi(gBattleStatus+0x46C)
+/* 176410 80247B30 3C16800E */  lui       $s6, %hi(gBattleState2)
-/* 176414 80247B34 26D6C4DC */  addiu     $s6, $s6, %lo(gBattleStatus+0x46C)
+/* 176414 80247B34 26D6C4DC */  addiu     $s6, $s6, %lo(gBattleState2)
 /* 176418 80247B38 AFB20018 */  sw        $s2, 0x18($sp)
 /* 17641C 80247B3C 24120001 */  addiu     $s2, $zero, 1
 /* 176420 80247B40 AFBF002C */  sw        $ra, 0x2c($sp)
@@ -150,8 +150,8 @@ glabel btl_state_update_first_strike
 /* 176600 80247D20 AC830148 */  sw        $v1, 0x148($a0)
 .L80247D24:
 /* 176604 80247D24 24020001 */  addiu     $v0, $zero, 1
-/* 176608 80247D28 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 176608 80247D28 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 17660C 80247D2C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 17660C 80247D2C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 176610 80247D30 08092032 */  j         .L802480C8
 /* 176614 80247D34 00000000 */   nop
 .L80247D38:
@@ -364,8 +364,8 @@ glabel btl_state_update_first_strike
 .L80248034:
 /* 176914 80248034 24020003 */  addiu     $v0, $zero, 3
 .L80248038:
-/* 176918 80248038 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 176918 80248038 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 17691C 8024803C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 17691C 8024803C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 176920 80248040 08092032 */  j         .L802480C8
 /* 176924 80248044 00000000 */   nop
 .L80248048:

ver/us/asm/nonmatchings/16F740/btl_state_update_next_enemy.s

@@ -9,8 +9,8 @@ glabel btl_state_update_next_enemy
 /* 175B9C 802472BC AFBF0018 */  sw        $ra, 0x18($sp)
 /* 175BA0 802472C0 AFB00010 */  sw        $s0, 0x10($sp)
 /* 175BA4 802472C4 8E2A00D8 */  lw        $t2, 0xd8($s1)
-/* 175BA8 802472C8 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 175BA8 802472C8 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 175BAC 802472CC 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 175BAC 802472CC 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 175BB0 802472D0 8E2700DC */  lw        $a3, 0xdc($s1)
 /* 175BB4 802472D4 0460009F */  bltz      $v1, .L80247554
 /* 175BB8 802472D8 28620002 */   slti     $v0, $v1, 2
@@ -102,8 +102,8 @@ glabel btl_state_update_next_enemy
 .L80247400:
 /* 175CE0 80247400 10600005 */  beqz      $v1, .L80247418
 /* 175CE4 80247404 3C03FFFB */   lui      $v1, 0xfffb
-/* 175CE8 80247408 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 175CE8 80247408 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 175CEC 8024740C AC20C4DC */  sw        $zero, %lo(gBattleStatus+0x46C)($at)
+/* 175CEC 8024740C AC20C4DC */  sw        $zero, %lo(gBattleState2)($at)
 /* 175CF0 80247410 08091D55 */  j         .L80247554
 /* 175CF4 80247414 00000000 */   nop
 .L80247418:
@@ -157,8 +157,8 @@ glabel btl_state_update_next_enemy
 /* 175DB0 802474D0 AC430148 */  sw        $v1, 0x148($v0)
 .L802474D4:
 /* 175DB4 802474D4 24020002 */  addiu     $v0, $zero, 2
-/* 175DB8 802474D8 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 175DB8 802474D8 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 175DBC 802474DC AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 175DBC 802474DC AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 175DC0 802474E0 08091D55 */  j         .L80247554
 /* 175DC4 802474E4 00000000 */   nop
 .L802474E8:

ver/us/asm/nonmatchings/16F740/btl_state_update_normal_start.s

@@ -11,10 +11,10 @@ glabel jtbl_8029CA88
 glabel btl_state_update_normal_start
 /* 16FAF8 80241218 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 16FAFC 8024121C AFB60038 */  sw        $s6, 0x38($sp)
-/* 16FB00 80241220 3C16800E */  lui       $s6, %hi(gBattleStatus+0x48C)
+/* 16FB00 80241220 3C16800E */  lui       $s6, %hi(D_800DC4FC)
-/* 16FB04 80241224 8ED6C4FC */  lw        $s6, %lo(gBattleStatus+0x48C)($s6)
+/* 16FB04 80241224 8ED6C4FC */  lw        $s6, %lo(D_800DC4FC)($s6)
-/* 16FB08 80241228 3C02800E */  lui       $v0, %hi(gBattleStatus+0x484)
+/* 16FB08 80241228 3C02800E */  lui       $v0, %hi(D_800DC4F4)
-/* 16FB0C 8024122C 8C42C4F4 */  lw        $v0, %lo(gBattleStatus+0x484)($v0)
+/* 16FB0C 8024122C 8C42C4F4 */  lw        $v0, %lo(D_800DC4F4)($v0)
 /* 16FB10 80241230 AFB40030 */  sw        $s4, 0x30($sp)
 /* 16FB14 80241234 3C14800E */  lui       $s4, %hi(gBattleStatus)
 /* 16FB18 80241238 2694C070 */  addiu     $s4, $s4, %lo(gBattleStatus)
@@ -40,8 +40,8 @@ glabel btl_state_update_normal_start
 .L80241284:
 /* 16FB64 80241284 8C950004 */  lw        $s5, 4($a0)
 .L80241288:
-/* 16FB68 80241288 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 16FB68 80241288 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 16FB6C 8024128C 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 16FB6C 8024128C 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 16FB70 80241290 2C620009 */  sltiu     $v0, $v1, 9
 /* 16FB74 80241294 104001FC */  beqz      $v0, L80241A88_170368
 /* 16FB78 80241298 AE950438 */   sw       $s5, 0x438($s4)
@@ -239,8 +239,8 @@ glabel L802412B4_16FB94
 /* 16FE54 80241574 0040182D */  daddu     $v1, $v0, $zero
 /* 16FE58 80241578 AE8300C4 */  sw        $v1, 0xc4($s4)
 /* 16FE5C 8024157C 8C620144 */  lw        $v0, 0x144($v1)
-/* 16FE60 80241580 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 16FE60 80241580 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 16FE64 80241584 AC30C4DC */  sw        $s0, %lo(gBattleStatus+0x46C)($at)
+/* 16FE64 80241584 AC30C4DC */  sw        $s0, %lo(gBattleState2)($at)
 /* 16FE68 80241588 080906A2 */  j         L80241A88_170368
 /* 16FE6C 8024158C AE8200C8 */   sw       $v0, 0xc8($s4)
 glabel L80241590_16FE70
@@ -400,8 +400,8 @@ glabel L80241590_16FE70
 /* 170098 802417B8 0C0992DD */  jal       load_partner_actor
 /* 17009C 802417BC AC600148 */   sw       $zero, 0x148($v1)
 /* 1700A0 802417C0 24020004 */  addiu     $v0, $zero, 4
-/* 1700A4 802417C4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1700A4 802417C4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1700A8 802417C8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1700A8 802417C8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 1700AC 802417CC 080906A2 */  j         L80241A88_170368
 /* 1700B0 802417D0 00000000 */   nop
 .L802417D4:
@@ -540,8 +540,8 @@ glabel L802417DC_1700BC
 /* 170290 802419B0 24020007 */  addiu     $v0, $zero, 7
 /* 170294 802419B4 3C01802A */  lui       $at, %hi(D_8029F248)
 /* 170298 802419B8 AC20F248 */  sw        $zero, %lo(D_8029F248)($at)
-/* 17029C 802419BC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 17029C 802419BC 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1702A0 802419C0 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1702A0 802419C0 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 1702A4 802419C4 080906A2 */  j         L80241A88_170368
 /* 1702A8 802419C8 00000000 */   nop
 glabel L802419CC_1702AC
@@ -550,8 +550,8 @@ glabel L802419CC_1702AC
 /* 1702B4 802419D4 8E020000 */  lw        $v0, ($s0)
 /* 1702B8 802419D8 14400005 */  bnez      $v0, .L802419F0
 /* 1702BC 802419DC 24020008 */   addiu    $v0, $zero, 8
-/* 1702C0 802419E0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1702C0 802419E0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1702C4 802419E4 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1702C4 802419E4 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 1702C8 802419E8 080906A2 */  j         L80241A88_170368
 /* 1702CC 802419EC 00000000 */   nop
 .L802419F0:

ver/us/asm/nonmatchings/16F740/btl_state_update_partner_move.s

@@ -12,8 +12,8 @@ glabel jtbl_8029CB68
 .section .text
 
 glabel btl_state_update_partner_move
-/* 175414 80246B34 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 175414 80246B34 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 175418 80246B38 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 175418 80246B38 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 17541C 80246B3C 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 175420 80246B40 AFB50024 */  sw        $s5, 0x24($sp)
 /* 175424 80246B44 3C15800E */  lui       $s5, %hi(gBattleStatus)
@@ -127,8 +127,8 @@ glabel L80246C5C_17553C
 /* 1755B8 80246CD8 AE8201D4 */  sw        $v0, 0x1d4($s4)
 /* 1755BC 80246CDC 8C440144 */  lw        $a0, 0x144($v0)
 /* 1755C0 80246CE0 24030003 */  addiu     $v1, $zero, 3
-/* 1755C4 80246CE4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1755C4 80246CE4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1755C8 80246CE8 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 1755C8 80246CE8 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 1755CC 80246CEC 24030100 */  addiu     $v1, $zero, 0x100
 /* 1755D0 80246CF0 AE8401E4 */  sw        $a0, 0x1e4($s4)
 /* 1755D4 80246CF4 08091BFF */  j         L80246FFC_1758DC
@@ -311,8 +311,8 @@ glabel L80246CFC_1755DC
 /* 175858 80246F78 2402000B */  addiu     $v0, $zero, 0xb
 /* 17585C 80246F7C A280021C */  sb        $zero, 0x21c($s4)
 /* 175860 80246F80 A280021D */  sb        $zero, 0x21d($s4)
-/* 175864 80246F84 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 175864 80246F84 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 175868 80246F88 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 175868 80246F88 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 17586C 80246F8C 8E820000 */  lw        $v0, ($s4)
 /* 175870 80246F90 3C030800 */  lui       $v1, 0x800
 /* 175874 80246F94 00431025 */  or        $v0, $v0, $v1
@@ -343,11 +343,11 @@ glabel L80246FD4_1758B4
 .L80246FF0:
 /* 1758D0 80246FF0 24020014 */  addiu     $v0, $zero, 0x14
 .L80246FF4:
-/* 1758D4 80246FF4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1758D4 80246FF4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1758D8 80246FF8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1758D8 80246FF8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L80246FFC_1758DC
-/* 1758DC 80246FFC 3C10800E */  lui       $s0, %hi(gBattleStatus+0x46C)
+/* 1758DC 80246FFC 3C10800E */  lui       $s0, %hi(gBattleState2)
-/* 1758E0 80247000 2610C4DC */  addiu     $s0, $s0, %lo(gBattleStatus+0x46C)
+/* 1758E0 80247000 2610C4DC */  addiu     $s0, $s0, %lo(gBattleState2)
 /* 1758E4 80247004 8E030000 */  lw        $v1, ($s0)
 /* 1758E8 80247008 24020015 */  addiu     $v0, $zero, 0x15
 /* 1758EC 8024700C 10620052 */  beq       $v1, $v0, .L80247158
@@ -381,8 +381,8 @@ glabel L80246FFC_1758DC
 .L8024706C:
 /* 17594C 8024706C 16600005 */  bnez      $s3, .L80247084
 /* 175950 80247070 2402001E */   addiu    $v0, $zero, 0x1e
-/* 175954 80247074 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 175954 80247074 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 175958 80247078 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 175958 80247078 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 17595C 8024707C 08091C6C */  j         .L802471B0
 /* 175960 80247080 00000000 */   nop
 .L80247084:
@@ -427,8 +427,8 @@ glabel L802470F4_1759D4
 .L802470FC:
 /* 1759DC 802470FC 0000802D */  daddu     $s0, $zero, $zero
 /* 1759E0 80247100 24020014 */  addiu     $v0, $zero, 0x14
-/* 1759E4 80247104 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1759E4 80247104 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1759E8 80247108 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1759E8 80247108 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L8024710C:
 /* 1759EC 8024710C 0C05272D */  jal       sfx_play_sound
 /* 1759F0 80247110 24042107 */   addiu    $a0, $zero, 0x2107
@@ -447,8 +447,8 @@ glabel L802470F4_1759D4
 /* 175A1C 8024713C 1440FFFA */  bnez      $v0, .L80247128
 /* 175A20 80247140 24630004 */   addiu    $v1, $v1, 4
 /* 175A24 80247144 24020015 */  addiu     $v0, $zero, 0x15
-/* 175A28 80247148 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 175A28 80247148 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 175A2C 8024714C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 175A2C 8024714C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 175A30 80247150 08091C6C */  j         .L802471B0
 /* 175A34 80247154 00000000 */   nop
 .L80247158:
@@ -478,8 +478,8 @@ glabel L802470F4_1759D4
 .L802471AC:
 /* 175A8C 802471AC AE020000 */  sw        $v0, ($s0)
 .L802471B0:
-/* 175A90 802471B0 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 175A90 802471B0 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 175A94 802471B4 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 175A94 802471B4 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 175A98 802471B8 2402001E */  addiu     $v0, $zero, 0x1e
 /* 175A9C 802471BC 1462000C */  bne       $v1, $v0, .L802471F0
 /* 175AA0 802471C0 00000000 */   nop

ver/us/asm/nonmatchings/16F740/btl_state_update_partner_striking_first.s

@@ -7,8 +7,8 @@ glabel btl_state_update_partner_striking_first
 /* 176A78 80248198 3C15800E */  lui       $s5, %hi(gBattleStatus)
 /* 176A7C 8024819C 26B5C070 */  addiu     $s5, $s5, %lo(gBattleStatus)
 /* 176A80 802481A0 AFB20018 */  sw        $s2, 0x18($sp)
-/* 176A84 802481A4 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 176A84 802481A4 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 176A88 802481A8 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 176A88 802481A8 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 176A8C 802481AC AFB10014 */  sw        $s1, 0x14($sp)
 /* 176A90 802481B0 24110001 */  addiu     $s1, $zero, 1
 /* 176A94 802481B4 AFBF0028 */  sw        $ra, 0x28($sp)
@@ -84,8 +84,8 @@ glabel btl_state_update_partner_striking_first
 /* 176B94 802482B4 AC830148 */  sw        $v1, 0x148($a0)
 .L802482B8:
 /* 176B98 802482B8 24020001 */  addiu     $v0, $zero, 1
-/* 176B9C 802482BC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 176B9C 802482BC 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 176BA0 802482C0 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 176BA0 802482C0 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 176BA4 802482C4 08092176 */  j         .L802485D8
 /* 176BA8 802482C8 00000000 */   nop
 .L802482CC:
@@ -274,8 +274,8 @@ glabel btl_state_update_partner_striking_first
 .L8024856C:
 /* 176E4C 8024856C 24020003 */  addiu     $v0, $zero, 3
 .L80248570:
-/* 176E50 80248570 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 176E50 80248570 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 176E54 80248574 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 176E54 80248574 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 176E58 80248578 08092176 */  j         .L802485D8
 /* 176E5C 8024857C 00000000 */   nop
 .L80248580:

ver/us/asm/nonmatchings/16F740/btl_state_update_player_move.s

@@ -23,8 +23,8 @@ glabel btl_state_update_player_move
 /* 1743D0 80245AF0 AFB10014 */  sw        $s1, 0x14($sp)
 /* 1743D4 80245AF4 AFB00010 */  sw        $s0, 0x10($sp)
 /* 1743D8 80245AF8 8E9500D8 */  lw        $s5, 0xd8($s4)
-/* 1743DC 80245AFC 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 1743DC 80245AFC 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 1743E0 80245B00 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 1743E0 80245B00 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 1743E4 80245B04 8E9200DC */  lw        $s2, 0xdc($s4)
 /* 1743E8 80245B08 14400068 */  bnez      $v0, .L80245CAC
 /* 1743EC 80245B0C 2402007F */   addiu    $v0, $zero, 0x7f
@@ -123,8 +123,8 @@ glabel btl_state_update_player_move
 /* 17454C 80245C6C 00431025 */  or        $v0, $v0, $v1
 /* 174550 80245C70 0C093EC3 */  jal       close_action_command_instruction_popup
 /* 174554 80245C74 AC820000 */   sw       $v0, ($a0)
-/* 174558 80245C78 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174558 80245C78 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 17455C 80245C7C AC30C4DC */  sw        $s0, %lo(gBattleStatus+0x46C)($at)
+/* 17455C 80245C7C AC30C4DC */  sw        $s0, %lo(gBattleState2)($at)
 /* 174560 80245C80 0809172B */  j         .L80245CAC
 /* 174564 80245C84 00000000 */   nop
 .L80245C88:
@@ -132,15 +132,15 @@ glabel btl_state_update_player_move
 .L80245C8C:
 /* 17456C 80245C8C 3C04800E */  lui       $a0, %hi(gBattleStatus)
 /* 174570 80245C90 2484C070 */  addiu     $a0, $a0, %lo(gBattleStatus)
-/* 174574 80245C94 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174574 80245C94 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174578 80245C98 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174578 80245C98 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 17457C 80245C9C 8C820000 */  lw        $v0, ($a0)
 /* 174580 80245CA0 2403FFFD */  addiu     $v1, $zero, -3
 /* 174584 80245CA4 00431024 */  and       $v0, $v0, $v1
 /* 174588 80245CA8 AC820000 */  sw        $v0, ($a0)
 .L80245CAC:
-/* 17458C 80245CAC 3C04800E */  lui       $a0, %hi(gBattleStatus+0x46C)
+/* 17458C 80245CAC 3C04800E */  lui       $a0, %hi(gBattleState2)
-/* 174590 80245CB0 2484C4DC */  addiu     $a0, $a0, %lo(gBattleStatus+0x46C)
+/* 174590 80245CB0 2484C4DC */  addiu     $a0, $a0, %lo(gBattleState2)
 /* 174594 80245CB4 8C830000 */  lw        $v1, ($a0)
 /* 174598 80245CB8 24020001 */  addiu     $v0, $zero, 1
 /* 17459C 80245CBC 10620005 */  beq       $v1, $v0, .L80245CD4
@@ -181,8 +181,8 @@ glabel btl_state_update_player_move
 .L80245D3C:
 /* 17461C 80245D3C 3C01802A */  lui       $at, %hi(D_8029F248)
 /* 174620 80245D40 AC22F248 */  sw        $v0, %lo(D_8029F248)($at)
-/* 174624 80245D44 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174624 80245D44 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174628 80245D48 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174628 80245D48 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 17462C 80245D4C 0809175E */  j         .L80245D78
 /* 174630 80245D50 00000000 */   nop
 .L80245D54:
@@ -197,8 +197,8 @@ glabel btl_state_update_player_move
 /* 174650 80245D70 24020003 */  addiu     $v0, $zero, 3
 /* 174654 80245D74 AC820000 */  sw        $v0, ($a0)
 .L80245D78:
-/* 174658 80245D78 3C10800E */  lui       $s0, %hi(gBattleStatus+0x46C)
+/* 174658 80245D78 3C10800E */  lui       $s0, %hi(gBattleState2)
-/* 17465C 80245D7C 2610C4DC */  addiu     $s0, $s0, %lo(gBattleStatus+0x46C)
+/* 17465C 80245D7C 2610C4DC */  addiu     $s0, $s0, %lo(gBattleState2)
 /* 174660 80245D80 8E030000 */  lw        $v1, ($s0)
 /* 174664 80245D84 24020004 */  addiu     $v0, $zero, 4
 /* 174668 80245D88 10620031 */  beq       $v1, $v0, .L80245E50
@@ -249,8 +249,8 @@ glabel btl_state_update_player_move
 /* 174710 80245E30 AEA401D4 */  sw        $a0, 0x1d4($s5)
 /* 174714 80245E34 8C830144 */  lw        $v1, 0x144($a0)
 /* 174718 80245E38 24020004 */  addiu     $v0, $zero, 4
-/* 17471C 80245E3C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 17471C 80245E3C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174720 80245E40 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174720 80245E40 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 174724 80245E44 AEA301E4 */  sw        $v1, 0x1e4($s5)
 /* 174728 80245E48 080918A2 */  j         .L80246288
 /* 17472C 80245E4C AC800148 */   sw       $zero, 0x148($a0)
@@ -467,8 +467,8 @@ glabel btl_state_update_player_move
 .L80246144:
 /* 174A24 80246144 16600005 */  bnez      $s3, .L8024615C
 /* 174A28 80246148 24020014 */   addiu    $v0, $zero, 0x14
-/* 174A2C 8024614C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174A2C 8024614C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174A30 80246150 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174A30 80246150 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 174A34 80246154 080918A2 */  j         .L80246288
 /* 174A38 80246158 00000000 */   nop
 .L8024615C:
@@ -513,8 +513,8 @@ glabel L802461CC_174AAC
 .L802461D4:
 /* 174AB4 802461D4 0000802D */  daddu     $s0, $zero, $zero
 /* 174AB8 802461D8 24020014 */  addiu     $v0, $zero, 0x14
-/* 174ABC 802461DC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174ABC 802461DC 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174AC0 802461E0 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174AC0 802461E0 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L802461E4:
 /* 174AC4 802461E4 0C05272D */  jal       sfx_play_sound
 /* 174AC8 802461E8 24042107 */   addiu    $a0, $zero, 0x2107
@@ -533,8 +533,8 @@ glabel L802461CC_174AAC
 /* 174AF4 80246214 1440FFFA */  bnez      $v0, .L80246200
 /* 174AF8 80246218 24630004 */   addiu    $v1, $v1, 4
 /* 174AFC 8024621C 2402000B */  addiu     $v0, $zero, 0xb
-/* 174B00 80246220 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174B00 80246220 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174B04 80246224 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174B04 80246224 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 174B08 80246228 080918A2 */  j         .L80246288
 /* 174B0C 8024622C 00000000 */   nop
 .L80246230:
@@ -564,8 +564,8 @@ glabel L802461CC_174AAC
 .L80246284:
 /* 174B64 80246284 AE020000 */  sw        $v0, ($s0)
 .L80246288:
-/* 174B68 80246288 3C10800E */  lui       $s0, %hi(gBattleStatus+0x46C)
+/* 174B68 80246288 3C10800E */  lui       $s0, %hi(gBattleState2)
-/* 174B6C 8024628C 2610C4DC */  addiu     $s0, $s0, %lo(gBattleStatus+0x46C)
+/* 174B6C 8024628C 2610C4DC */  addiu     $s0, $s0, %lo(gBattleState2)
 /* 174B70 80246290 8E030000 */  lw        $v1, ($s0)
 /* 174B74 80246294 24020015 */  addiu     $v0, $zero, 0x15
 .L80246298:
@@ -625,8 +625,8 @@ glabel L80246340_174C20
 glabel L80246348_174C28
 /* 174C28 80246348 0000802D */  daddu     $s0, $zero, $zero
 /* 174C2C 8024634C 2402001E */  addiu     $v0, $zero, 0x1e
-/* 174C30 80246350 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174C30 80246350 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174C34 80246354 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174C34 80246354 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80246358:
 /* 174C38 80246358 0200202D */  daddu     $a0, $s0, $zero
 /* 174C3C 8024635C 0C093E58 */  jal       btl_show_battle_message
@@ -634,8 +634,8 @@ glabel L80246348_174C28
 /* 174C44 80246364 24020015 */  addiu     $v0, $zero, 0x15
 /* 174C48 80246368 A2A0021C */  sb        $zero, 0x21c($s5)
 /* 174C4C 8024636C A2A0021D */  sb        $zero, 0x21d($s5)
-/* 174C50 80246370 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 174C50 80246370 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 174C54 80246374 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 174C54 80246374 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 174C58 80246378 8EA20000 */  lw        $v0, ($s5)
 /* 174C5C 8024637C 3C030800 */  lui       $v1, 0x800
 /* 174C60 80246380 00431025 */  or        $v0, $v0, $v1
@@ -668,8 +668,8 @@ glabel L80246348_174C28
 .L802463E0:
 /* 174CC0 802463E0 AE020000 */  sw        $v0, ($s0)
 .L802463E4:
-/* 174CC4 802463E4 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 174CC4 802463E4 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 174CC8 802463E8 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 174CC8 802463E8 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 174CCC 802463EC 2402001E */  addiu     $v0, $zero, 0x1e
 /* 174CD0 802463F0 1462000C */  bne       $v1, $v0, .L80246424
 /* 174CD4 802463F4 00000000 */   nop

ver/us/asm/nonmatchings/16F740/btl_state_update_prepare_menu.s

@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_state_update_prepare_menu
-/* 1721F8 80243918 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 1721FC 8024391C 3C040041 */  lui       $a0, 0x41
-/* 172200 80243920 24845D90 */  addiu     $a0, $a0, 0x5d90
-/* 172204 80243924 AFB00010 */  sw        $s0, 0x10($sp)
-/* 172208 80243928 3C10800E */  lui       $s0, %hi(gBattleStatus)
-/* 17220C 8024392C 2610C070 */  addiu     $s0, $s0, %lo(gBattleStatus)
-/* 172210 80243930 2402FFFF */  addiu     $v0, $zero, -1
-/* 172214 80243934 3C050042 */  lui       $a1, 0x42
-/* 172218 80243938 24A519F0 */  addiu     $a1, $a1, 0x19f0
-/* 17221C 8024393C 3C06802A */  lui       $a2, %hi(func_802A1000)
-/* 172220 80243940 24C61000 */  addiu     $a2, $a2, %lo(func_802A1000)
-/* 172224 80243944 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 172228 80243948 AFB10014 */  sw        $s1, 0x14($sp)
-/* 17222C 8024394C A202004D */  sb        $v0, 0x4d($s0)
-/* 172230 80243950 A202004E */  sb        $v0, 0x4e($s0)
-/* 172234 80243954 A202004F */  sb        $v0, 0x4f($s0)
-/* 172238 80243958 A2020050 */  sb        $v0, 0x50($s0)
-/* 17223C 8024395C A2020051 */  sb        $v0, 0x51($s0)
-/* 172240 80243960 A2020052 */  sb        $v0, 0x52($s0)
-/* 172244 80243964 A2020053 */  sb        $v0, 0x53($s0)
-/* 172248 80243968 A202005D */  sb        $v0, 0x5d($s0)
-/* 17224C 8024396C A2020062 */  sb        $v0, 0x62($s0)
-/* 172250 80243970 0C00A5CF */  jal       dma_copy
-/* 172254 80243974 A2020063 */   sb       $v0, 0x63($s0)
-/* 172258 80243978 8E020000 */  lw        $v0, ($s0)
-/* 17225C 8024397C 3C030008 */  lui       $v1, 8
-/* 172260 80243980 00431024 */  and       $v0, $v0, $v1
-/* 172264 80243984 1440000B */  bnez      $v0, .L802439B4
-/* 172268 80243988 2404000E */   addiu    $a0, $zero, 0xe
-/* 17226C 8024398C 3C11800E */  lui       $s1, %hi(gBattleStatus+0x46C)
-/* 172270 80243990 2631C4DC */  addiu     $s1, $s1, %lo(gBattleStatus+0x46C)
-/* 172274 80243994 8E300000 */  lw        $s0, ($s1)
-/* 172278 80243998 24020046 */  addiu     $v0, $zero, 0x46
-/* 17227C 8024399C 16020005 */  bne       $s0, $v0, .L802439B4
-/* 172280 802439A0 2404000D */   addiu    $a0, $zero, 0xd
-/* 172284 802439A4 0C090464 */  jal       btl_set_state
-/* 172288 802439A8 2404000D */   addiu    $a0, $zero, 0xd
-/* 17228C 802439AC 08090E6F */  j         .L802439BC
-/* 172290 802439B0 AE300000 */   sw       $s0, ($s1)
-.L802439B4:
-/* 172294 802439B4 0C090464 */  jal       btl_set_state
-/* 172298 802439B8 00000000 */   nop
-.L802439BC:
-/* 17229C 802439BC 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 1722A0 802439C0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 1722A4 802439C4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 1722A8 802439C8 03E00008 */  jr        $ra
-/* 1722AC 802439CC 27BD0020 */   addiu    $sp, $sp, 0x20

ver/us/asm/nonmatchings/16F740/btl_state_update_run_away.s

@@ -10,8 +10,8 @@ glabel btl_state_update_run_away
 /* 1737F4 80244F14 3C158011 */  lui       $s5, %hi(gPlayerData)
 /* 1737F8 80244F18 26B5F290 */  addiu     $s5, $s5, %lo(gPlayerData)
 /* 1737FC 80244F1C AFB40028 */  sw        $s4, 0x28($sp)
-/* 173800 80244F20 3C14800E */  lui       $s4, %hi(gBattleStatus+0x46C)
+/* 173800 80244F20 3C14800E */  lui       $s4, %hi(gBattleState2)
-/* 173804 80244F24 2694C4DC */  addiu     $s4, $s4, %lo(gBattleStatus+0x46C)
+/* 173804 80244F24 2694C4DC */  addiu     $s4, $s4, %lo(gBattleState2)
 /* 173808 80244F28 AFBF0030 */  sw        $ra, 0x30($sp)
 /* 17380C 80244F2C AFB30024 */  sw        $s3, 0x24($sp)
 /* 173810 80244F30 AFB20020 */  sw        $s2, 0x20($sp)
@@ -121,8 +121,8 @@ glabel btl_state_update_run_away
 .L802450BC:
 /* 17399C 802450BC 24020002 */  addiu     $v0, $zero, 2
 .L802450C0:
-/* 1739A0 802450C0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 1739A0 802450C0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1739A4 802450C4 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 1739A4 802450C4 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 1739A8 802450C8 0809146D */  j         .L802451B4
 /* 1739AC 802450CC 00000000 */   nop
 .L802450D0:
@@ -188,8 +188,8 @@ glabel btl_state_update_run_away
 /* 173A8C 802451AC 3C01802A */  lui       $at, %hi(D_8029F260)
 /* 173A90 802451B0 AC24F260 */  sw        $a0, %lo(D_8029F260)($at)
 .L802451B4:
-/* 173A94 802451B4 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 173A94 802451B4 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 173A98 802451B8 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 173A98 802451B8 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 173A9C 802451BC 2402000A */  addiu     $v0, $zero, 0xa
 /* 173AA0 802451C0 14620043 */  bne       $v1, $v0, .L802452D0
 /* 173AA4 802451C4 2402000B */   addiu    $v0, $zero, 0xb
@@ -258,11 +258,11 @@ glabel btl_state_update_run_away
 /* 173B90 802452B0 0C08F847 */  jal       func_8023E11C
 /* 173B94 802452B4 00000000 */   nop
 /* 173B98 802452B8 2402000B */  addiu     $v0, $zero, 0xb
-/* 173B9C 802452BC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 173B9C 802452BC 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 173BA0 802452C0 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 173BA0 802452C0 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L802452C4:
-/* 173BA4 802452C4 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 173BA4 802452C4 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 173BA8 802452C8 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 173BA8 802452C8 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 173BAC 802452CC 2402000B */  addiu     $v0, $zero, 0xb
 .L802452D0:
 /* 173BB0 802452D0 14620011 */  bne       $v1, $v0, .L80245318
@@ -285,8 +285,8 @@ glabel btl_state_update_run_away
 /* 173BF0 80245310 0C090464 */  jal       btl_set_state
 /* 173BF4 80245314 24040020 */   addiu    $a0, $zero, 0x20
 .L80245318:
-/* 173BF8 80245318 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 173BF8 80245318 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 173BFC 8024531C 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 173BFC 8024531C 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 173C00 80245320 24020003 */  addiu     $v0, $zero, 3
 /* 173C04 80245324 10620005 */  beq       $v1, $v0, .L8024533C
 /* 173C08 80245328 24020004 */   addiu    $v0, $zero, 4
@@ -324,8 +324,8 @@ glabel btl_state_update_run_away
 .L802453A4:
 /* 173C84 802453A4 24020004 */  addiu     $v0, $zero, 4
 .L802453A8:
-/* 173C88 802453A8 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 173C88 802453A8 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 173C8C 802453AC AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 173C8C 802453AC AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 173C90 802453B0 08091505 */  j         .L80245414
 /* 173C94 802453B4 00000000 */   nop
 .L802453B8:

ver/us/asm/nonmatchings/16F740/btl_state_update_switch_to_partner.s

@@ -10,8 +10,8 @@ glabel btl_state_update_switch_to_partner
 /* 1717F4 80242F14 AFB20018 */  sw        $s2, 0x18($sp)
 /* 1717F8 80242F18 AFB10014 */  sw        $s1, 0x14($sp)
 /* 1717FC 80242F1C 8E1100D8 */  lw        $s1, 0xd8($s0)
-/* 171800 80242F20 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 171800 80242F20 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 171804 80242F24 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 171804 80242F24 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 171808 80242F28 14400025 */  bnez      $v0, .L80242FC0
 /* 17180C 80242F2C 8E1200DC */   lw       $s2, 0xdc($s0)
 /* 171810 80242F30 0C098F18 */  jal       reset_actor_turn_info

ver/us/asm/nonmatchings/16F740/btl_state_update_switch_to_player.s

@@ -10,8 +10,8 @@ glabel btl_state_update_switch_to_player
 /* 1713BC 80242ADC AFB20018 */  sw        $s2, 0x18($sp)
 /* 1713C0 80242AE0 AFB10014 */  sw        $s1, 0x14($sp)
 /* 1713C4 80242AE4 8E1200D8 */  lw        $s2, 0xd8($s0)
-/* 1713C8 80242AE8 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 1713C8 80242AE8 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 1713CC 80242AEC 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 1713CC 80242AEC 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 1713D0 80242AF0 8E1100DC */  lw        $s1, 0xdc($s0)
 /* 1713D4 80242AF4 14400026 */  bnez      $v0, .L80242B90
 /* 1713D8 80242AF8 3C03FFF7 */   lui      $v1, 0xfff7

ver/us/asm/nonmatchings/16F740/btl_state_update_victory.s

@@ -13,8 +13,8 @@ glabel btl_state_update_victory
 /* 172908 80244028 3C158011 */  lui       $s5, %hi(gPlayerData)
 /* 17290C 8024402C 26B5F290 */  addiu     $s5, $s5, %lo(gPlayerData)
 /* 172910 80244030 AFB20020 */  sw        $s2, 0x20($sp)
-/* 172914 80244034 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 172914 80244034 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 172918 80244038 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 172918 80244038 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 17291C 8024403C AFBF0034 */  sw        $ra, 0x34($sp)
 /* 172920 80244040 AFB40028 */  sw        $s4, 0x28($sp)
 /* 172924 80244044 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -78,8 +78,8 @@ glabel btl_state_update_victory
 .L80244118:
 /* 1729F8 80244118 AE420000 */  sw        $v0, ($s2)
 .L8024411C:
-/* 1729FC 8024411C 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 1729FC 8024411C 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 172A00 80244120 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 172A00 80244120 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 172A04 80244124 8E430000 */  lw        $v1, ($s2)
 /* 172A08 80244128 24020005 */  addiu     $v0, $zero, 5
 .L8024412C:
@@ -176,11 +176,11 @@ glabel btl_state_update_victory
 /* 172B5C 8024427C AE0001D8 */  sw        $zero, 0x1d8($s0)
 .L80244280:
 /* 172B60 80244280 2402000B */  addiu     $v0, $zero, 0xb
-/* 172B64 80244284 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 172B64 80244284 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 172B68 80244288 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 172B68 80244288 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L8024428C:
-/* 172B6C 8024428C 3C04800E */  lui       $a0, %hi(gBattleStatus+0x46C)
+/* 172B6C 8024428C 3C04800E */  lui       $a0, %hi(gBattleState2)
-/* 172B70 80244290 2484C4DC */  addiu     $a0, $a0, %lo(gBattleStatus+0x46C)
+/* 172B70 80244290 2484C4DC */  addiu     $a0, $a0, %lo(gBattleState2)
 /* 172B74 80244294 8C830000 */  lw        $v1, ($a0)
 /* 172B78 80244298 2402000B */  addiu     $v0, $zero, 0xb
 /* 172B7C 8024429C 14620017 */  bne       $v1, $v0, .L802442FC
@@ -210,8 +210,8 @@ glabel btl_state_update_victory
 /* 172BD4 802442F4 AE000054 */  sw        $zero, 0x54($s0)
 /* 172BD8 802442F8 E6000020 */  swc1      $f0, 0x20($s0)
 .L802442FC:
-/* 172BDC 802442FC 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 172BDC 802442FC 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 172BE0 80244300 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 172BE0 80244300 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 172BE4 80244304 8E430000 */  lw        $v1, ($s2)
 /* 172BE8 80244308 2402000C */  addiu     $v0, $zero, 0xc
 /* 172BEC 8024430C 1462006D */  bne       $v1, $v0, .L802444C4
@@ -327,8 +327,8 @@ glabel btl_state_update_victory
 /* 172D9C 802444BC 00451024 */  and       $v0, $v0, $a1
 /* 172DA0 802444C0 AC820000 */  sw        $v0, ($a0)
 .L802444C4:
-/* 172DA4 802444C4 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 172DA4 802444C4 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 172DA8 802444C8 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 172DA8 802444C8 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 172DAC 802444CC 24020002 */  addiu     $v0, $zero, 2
 /* 172DB0 802444D0 14620026 */  bne       $v1, $v0, .L8024456C
 /* 172DB4 802444D4 00000000 */   nop
@@ -364,8 +364,8 @@ glabel btl_state_update_victory
 .L80244544:
 /* 172E24 80244544 3C04800E */  lui       $a0, %hi(gBattleStatus)
 /* 172E28 80244548 2484C070 */  addiu     $a0, $a0, %lo(gBattleStatus)
-/* 172E2C 8024454C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 172E2C 8024454C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 172E30 80244550 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 172E30 80244550 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 172E34 80244554 8C820000 */  lw        $v0, ($a0)
 /* 172E38 80244558 2403FFFD */  addiu     $v1, $zero, -3
 /* 172E3C 8024455C 3C01802A */  lui       $at, %hi(D_8029F248)
@@ -373,8 +373,8 @@ glabel btl_state_update_victory
 /* 172E44 80244564 00431024 */  and       $v0, $v0, $v1
 /* 172E48 80244568 AC820000 */  sw        $v0, ($a0)
 .L8024456C:
-/* 172E4C 8024456C 3C12800E */  lui       $s2, %hi(gBattleStatus+0x46C)
+/* 172E4C 8024456C 3C12800E */  lui       $s2, %hi(gBattleState2)
-/* 172E50 80244570 2652C4DC */  addiu     $s2, $s2, %lo(gBattleStatus+0x46C)
+/* 172E50 80244570 2652C4DC */  addiu     $s2, $s2, %lo(gBattleState2)
 /* 172E54 80244574 8E500000 */  lw        $s0, ($s2)
 /* 172E58 80244578 24020003 */  addiu     $v0, $zero, 3
 /* 172E5C 8024457C 16020020 */  bne       $s0, $v0, .L80244600
@@ -414,8 +414,8 @@ glabel btl_state_update_victory
 /* 172ED8 802445F8 00441021 */  addu      $v0, $v0, $a0
 /* 172EDC 802445FC A2620079 */  sb        $v0, 0x79($s3)
 .L80244600:
-/* 172EE0 80244600 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 172EE0 80244600 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 172EE4 80244604 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 172EE4 80244604 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 172EE8 80244608 24020004 */  addiu     $v0, $zero, 4
 /* 172EEC 8024460C 14620031 */  bne       $v1, $v0, .L802446D4
 /* 172EF0 80244610 00000000 */   nop

ver/us/asm/nonmatchings/16F740/func_80242FE0.s

@@ -17,8 +17,8 @@ glabel func_80242FE0
 /* 1718F0 80243010 F7B60038 */  sdc1      $f22, 0x38($sp)
 /* 1718F4 80243014 F7B40030 */  sdc1      $f20, 0x30($sp)
 /* 1718F8 80243018 8ED500D8 */  lw        $s5, 0xd8($s6)
-/* 1718FC 8024301C 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 1718FC 8024301C 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 171900 80243020 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 171900 80243020 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 171904 80243024 1440002D */  bnez      $v0, .L802430DC
 /* 171908 80243028 8ED200DC */   lw       $s2, 0xdc($s6)
 /* 17190C 8024302C 8EC30004 */  lw        $v1, 4($s6)
@@ -54,8 +54,8 @@ glabel func_80242FE0
 /* 171978 80243098 24020001 */  addiu     $v0, $zero, 1
 /* 17197C 8024309C 3C04800E */  lui       $a0, %hi(gBattleStatus)
 /* 171980 802430A0 2484C070 */  addiu     $a0, $a0, %lo(gBattleStatus)
-/* 171984 802430A4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 171984 802430A4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 171988 802430A8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 171988 802430A8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 17198C 802430AC 8C820004 */  lw        $v0, 4($a0)
 /* 171990 802430B0 2403FFFD */  addiu     $v1, $zero, -3
 /* 171994 802430B4 3C01802A */  lui       $at, %hi(D_8029F258)
@@ -69,8 +69,8 @@ glabel func_80242FE0
 /* 1719B4 802430D4 00431024 */  and       $v0, $v0, $v1
 /* 1719B8 802430D8 AC820004 */  sw        $v0, 4($a0)
 .L802430DC:
-/* 1719BC 802430DC 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 1719BC 802430DC 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 1719C0 802430E0 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 1719C0 802430E0 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 1719C4 802430E4 24020001 */  addiu     $v0, $zero, 1
 /* 1719C8 802430E8 14620091 */  bne       $v1, $v0, .L80243330
 /* 1719CC 802430EC 24020002 */   addiu    $v0, $zero, 2
@@ -225,11 +225,11 @@ glabel func_80242FE0
 /* 171BF0 80243310 1440FF92 */  bnez      $v0, .L8024315C
 /* 171BF4 80243314 00111080 */   sll      $v0, $s1, 2
 /* 171BF8 80243318 24020002 */  addiu     $v0, $zero, 2
-/* 171BFC 8024331C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 171BFC 8024331C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 171C00 80243320 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 171C00 80243320 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80243324:
-/* 171C04 80243324 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 171C04 80243324 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 171C08 80243328 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 171C08 80243328 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 171C0C 8024332C 24020002 */  addiu     $v0, $zero, 2
 .L80243330:
 /* 171C10 80243330 14620070 */  bne       $v1, $v0, .L802434F4
@@ -353,11 +353,11 @@ glabel func_80242FE0
 /* 171DC4 802434E4 24020003 */  addiu     $v0, $zero, 3
 /* 171DC8 802434E8 AC600048 */  sw        $zero, 0x48($v1)
 .L802434EC:
-/* 171DCC 802434EC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 171DCC 802434EC 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 171DD0 802434F0 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 171DD0 802434F0 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L802434F4:
-/* 171DD4 802434F4 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 171DD4 802434F4 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 171DD8 802434F8 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 171DD8 802434F8 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 171DDC 802434FC 24020003 */  addiu     $v0, $zero, 3
 /* 171DE0 80243500 1462006F */  bne       $v1, $v0, .L802436C0
 /* 171DE4 80243504 00000000 */   nop
@@ -470,13 +470,13 @@ glabel func_80242FE0
 /* 171F84 802436A4 2484C070 */  addiu     $a0, $a0, %lo(gBattleStatus)
 /* 171F88 802436A8 8C820000 */  lw        $v0, ($a0)
 /* 171F8C 802436AC 24030004 */  addiu     $v1, $zero, 4
-/* 171F90 802436B0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 171F90 802436B0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 171F94 802436B4 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 171F94 802436B4 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 171F98 802436B8 00451024 */  and       $v0, $v0, $a1
 /* 171F9C 802436BC AC820000 */  sw        $v0, ($a0)
 .L802436C0:
-/* 171FA0 802436C0 3C10800E */  lui       $s0, %hi(gBattleStatus+0x46C)
+/* 171FA0 802436C0 3C10800E */  lui       $s0, %hi(gBattleState2)
-/* 171FA4 802436C4 2610C4DC */  addiu     $s0, $s0, %lo(gBattleStatus+0x46C)
+/* 171FA4 802436C4 2610C4DC */  addiu     $s0, $s0, %lo(gBattleState2)
 /* 171FA8 802436C8 8E030000 */  lw        $v1, ($s0)
 /* 171FAC 802436CC 24020004 */  addiu     $v0, $zero, 4
 /* 171FB0 802436D0 14620038 */  bne       $v1, $v0, .L802437B4
@@ -540,8 +540,8 @@ glabel func_80242FE0
 /* 17208C 802437AC 00431024 */  and       $v0, $v0, $v1
 /* 172090 802437B0 ACA20004 */  sw        $v0, 4($a1)
 .L802437B4:
-/* 172094 802437B4 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 172094 802437B4 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 172098 802437B8 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 172098 802437B8 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 17209C 802437BC 24020005 */  addiu     $v0, $zero, 5
 /* 1720A0 802437C0 14620028 */  bne       $v1, $v0, .L80243864
 /* 1720A4 802437C4 24020006 */   addiu    $v0, $zero, 6
@@ -582,11 +582,11 @@ glabel func_80242FE0
 /* 172124 80243844 1440FFEC */  bnez      $v0, .L802437F8
 /* 172128 80243848 26520004 */   addiu    $s2, $s2, 4
 /* 17212C 8024384C 24020006 */  addiu     $v0, $zero, 6
-/* 172130 80243850 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 172130 80243850 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 172134 80243854 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 172134 80243854 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L80243858:
-/* 172138 80243858 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 172138 80243858 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 17213C 8024385C 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 17213C 8024385C 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 172140 80243860 24020006 */  addiu     $v0, $zero, 6
 .L80243864:
 /* 172144 80243864 14620016 */  bne       $v1, $v0, .L802438C0
@@ -613,11 +613,11 @@ glabel func_80242FE0
 /* 17218C 802438AC 26520004 */   addiu    $s2, $s2, 4
 /* 172190 802438B0 16800003 */  bnez      $s4, .L802438C0
 /* 172194 802438B4 24020007 */   addiu    $v0, $zero, 7
-/* 172198 802438B8 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 172198 802438B8 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 17219C 802438BC AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 17219C 802438BC AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 .L802438C0:
-/* 1721A0 802438C0 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 1721A0 802438C0 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 1721A4 802438C4 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 1721A4 802438C4 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 1721A8 802438C8 24020007 */  addiu     $v0, $zero, 7
 /* 1721AC 802438CC 14620003 */  bne       $v1, $v0, .L802438DC
 /* 1721B0 802438D0 24040014 */   addiu    $a0, $zero, 0x14

ver/us/asm/nonmatchings/16c8e0/btl_draw_ui.s

@@ -16,8 +16,8 @@ glabel btl_draw_ui
 /* 16D36C 8023EA8C AFB00010 */  sw        $s0, 0x10($sp)
 /* 16D370 8023EA90 3C10800E */  lui       $s0, %hi(gBattleState)
 /* 16D374 8023EA94 8E10C068 */  lw        $s0, %lo(gBattleState)($s0)
-/* 16D378 8023EA98 3C04800E */  lui       $a0, %hi(gBattleStatus+0x460)
+/* 16D378 8023EA98 3C04800E */  lui       $a0, %hi(D_800DC4D0)
-/* 16D37C 8023EA9C 2484C4D0 */  addiu     $a0, $a0, %lo(gBattleStatus+0x460)
+/* 16D37C 8023EA9C 2484C4D0 */  addiu     $a0, $a0, %lo(D_800DC4D0)
 /* 16D380 8023EAA0 8C820000 */  lw        $v0, ($a0)
 /* 16D384 8023EAA4 12020005 */  beq       $s0, $v0, .L8023EABC
 /* 16D388 8023EAA8 0200182D */   daddu    $v1, $s0, $zero

ver/us/asm/nonmatchings/181810/LoadBattleDmaData.s

@@ -8,8 +8,8 @@ glabel LoadBattleDmaData
 /* 181F10 80253630 0C0B1EAF */  jal       get_variable
 /* 181F14 80253634 8C450000 */   lw       $a1, ($v0)
 /* 181F18 80253638 00021840 */  sll       $v1, $v0, 1
-/* 181F1C 8025363C 3C04800E */  lui       $a0, %hi(gBattleStatus+0x47A)
+/* 181F1C 8025363C 3C04800E */  lui       $a0, %hi(gCurrentBattleSection)
-/* 181F20 80253640 9084C4EA */  lbu       $a0, %lo(gBattleStatus+0x47A)($a0)
+/* 181F20 80253640 9084C4EA */  lbu       $a0, %lo(gCurrentBattleSection)($a0)
 /* 181F24 80253644 00621821 */  addu      $v1, $v1, $v0
 /* 181F28 80253648 00042140 */  sll       $a0, $a0, 5
 /* 181F2C 8025364C 3C028009 */  lui       $v0, %hi(gBattleAreas+0x1C)

ver/us/asm/nonmatchings/18C790/btl_state_draw_celebration.s

@@ -9,8 +9,8 @@ glabel jtbl_8029D550
 .section .text
 
 glabel btl_state_draw_celebration
-/* 18EA9C 802601BC 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 18EA9C 802601BC 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 18EAA0 802601C0 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 18EAA0 802601C0 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 18EAA4 802601C4 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 18EAA8 802601C8 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 18EAAC 802601CC AFB50024 */  sw        $s5, 0x24($sp)
@@ -453,8 +453,8 @@ glabel L80260810_18F0F0
 /* 18F110 80260830 0C04DF62 */  jal       set_screen_overlay_params_front
 /* 18F114 80260834 0000202D */   daddu    $a0, $zero, $zero
 glabel L80260838_18F118
-/* 18F118 80260838 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 18F118 80260838 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 18F11C 8026083C 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 18F11C 8026083C 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 18F120 80260840 28620007 */  slti      $v0, $v1, 7
 /* 18F124 80260844 14400037 */  bnez      $v0, .L80260924
 /* 18F128 80260848 2862000A */   slti     $v0, $v1, 0xa

ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s

@@ -9,8 +9,8 @@ glabel jtbl_8029D4F0
 .section .text
 
 glabel btl_state_update_celebration
-/* 18CA70 8025E190 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 18CA70 8025E190 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 18CA74 8025E194 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 18CA74 8025E194 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 18CA78 8025E198 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 18CA7C 8025E19C AFBE0060 */  sw        $fp, 0x60($sp)
 /* 18CA80 8025E1A0 3C1E800E */  lui       $fp, %hi(gBattleStatus)
@@ -94,8 +94,8 @@ glabel L8025E1FC_18CADC
 /* 18CBAC 8025E2CC AC20FB54 */  sw        $zero, %lo(D_8029FB54)($at)
 /* 18CBB0 8025E2D0 3C01802A */  lui       $at, %hi(D_8029FB4C)
 /* 18CBB4 8025E2D4 AC24FB4C */  sw        $a0, %lo(D_8029FB4C)($at)
-/* 18CBB8 8025E2D8 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 18CBB8 8025E2D8 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 18CBBC 8025E2DC AC24C4DC */  sw        $a0, %lo(gBattleStatus+0x46C)($at)
+/* 18CBBC 8025E2DC AC24C4DC */  sw        $a0, %lo(gBattleState2)($at)
 /* 18CBC0 8025E2E0 00641825 */  or        $v1, $v1, $a0
 /* 18CBC4 8025E2E4 08097FD2 */  j         L8025FF48_18E828
 /* 18CBC8 8025E2E8 AC430004 */   sw       $v1, 4($v0)
@@ -150,8 +150,8 @@ glabel L8025E2EC_18CBCC
 /* 18CC7C 8025E39C AE020000 */  sw        $v0, ($s0)
 /* 18CC80 8025E3A0 8CA30144 */  lw        $v1, 0x144($a1)
 /* 18CC84 8025E3A4 24020002 */  addiu     $v0, $zero, 2
-/* 18CC88 8025E3A8 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 18CC88 8025E3A8 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 18CC8C 8025E3AC AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 18CC8C 8025E3AC AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 18CC90 8025E3B0 AE2301E4 */  sw        $v1, 0x1e4($s1)
 /* 18CC94 8025E3B4 ACA00148 */  sw        $zero, 0x148($a1)
 /* 18CC98 8025E3B8 3C01802A */  lui       $at, %hi(D_8029FB70)
@@ -334,8 +334,8 @@ glabel L8025E62C_18CF0C
 /* 18CF30 8025E650 3C01802A */  lui       $at, %hi(D_8029FB7C)
 /* 18CF34 8025E654 AC22FB7C */  sw        $v0, %lo(D_8029FB7C)($at)
 /* 18CF38 8025E658 24020006 */  addiu     $v0, $zero, 6
-/* 18CF3C 8025E65C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 18CF3C 8025E65C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 18CF40 8025E660 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 18CF40 8025E660 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 18CF44 8025E664 3C01802A */  lui       $at, %hi(D_8029FB80)
 /* 18CF48 8025E668 AC23FB80 */  sw        $v1, %lo(D_8029FB80)($at)
 /* 18CF4C 8025E66C 0C04760B */  jal       mdl_set_all_fog_mode
@@ -2008,8 +2008,8 @@ glabel L8025FEFC_18E7DC
 /* 18E818 8025FF38 24040020 */   addiu    $a0, $zero, 0x20
 /* 18E81C 8025FF3C 24020002 */  addiu     $v0, $zero, 2
 .L8025FF40:
-/* 18E820 8025FF40 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 18E820 8025FF40 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 18E824 8025FF44 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 18E824 8025FF44 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L8025FF48_18E828
 /* 18E828 8025FF48 3C03802A */  lui       $v1, %hi(D_8029FB84)
 /* 18E82C 8025FF4C 2463FB84 */  addiu     $v1, $v1, %lo(D_8029FB84)

ver/us/asm/nonmatchings/18C790/func_80260948.s

@@ -3,8 +3,8 @@
 
 glabel func_80260948
 /* 18F228 80260948 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 18F22C 8026094C 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 18F22C 8026094C 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 18F230 80260950 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 18F230 80260950 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 18F234 80260954 24020008 */  addiu     $v0, $zero, 8
 /* 18F238 80260958 10620008 */  beq       $v1, $v0, .L8026097C
 /* 18F23C 8026095C AFBF0018 */   sw       $ra, 0x18($sp)

ver/us/asm/nonmatchings/18F340/RestorePreDefeatState.s

@@ -6,8 +6,8 @@ glabel RestorePreDefeatState
 /* 18FB60 80261280 3C04F7FF */  lui       $a0, 0xf7ff
 /* 18FB64 80261284 3C02800E */  lui       $v0, %hi(gBattleStatus+0x474)
 /* 18FB68 80261288 8C42C4E4 */  lw        $v0, %lo(gBattleStatus+0x474)($v0)
-/* 18FB6C 8026128C 3C03800E */  lui       $v1, %hi(gBattleStatus+0x468)
+/* 18FB6C 8026128C 3C03800E */  lui       $v1, %hi(D_800DC4D8)
-/* 18FB70 80261290 8C63C4D8 */  lw        $v1, %lo(gBattleStatus+0x468)($v1)
+/* 18FB70 80261290 8C63C4D8 */  lw        $v1, %lo(D_800DC4D8)($v1)
 /* 18FB74 80261294 3484FFFF */  ori       $a0, $a0, 0xffff
 /* 18FB78 80261298 AFB00010 */  sw        $s0, 0x10($sp)
 /* 18FB7C 8026129C 3C10800E */  lui       $s0, %hi(gBattleStatus)
@@ -20,8 +20,8 @@ glabel RestorePreDefeatState
 /* 18FB98 802612B8 8E020000 */  lw        $v0, ($s0)
 /* 18FB9C 802612BC 3C118011 */  lui       $s1, %hi(gPlayerData)
 /* 18FBA0 802612C0 2631F290 */  addiu     $s1, $s1, %lo(gPlayerData)
-/* 18FBA4 802612C4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 18FBA4 802612C4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 18FBA8 802612C8 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 18FBA8 802612C8 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 18FBAC 802612CC 8E030004 */  lw        $v1, 4($s0)
 /* 18FBB0 802612D0 34420008 */  ori       $v0, $v0, 8
 /* 18FBB4 802612D4 00642024 */  and       $a0, $v1, $a0

ver/us/asm/nonmatchings/190B20/btl_check_player_defeated.s

@@ -9,12 +9,12 @@ glabel btl_check_player_defeated
 /* 191D54 80263474 AFBF0010 */   sw       $ra, 0x10($sp)
 /* 191D58 80263478 3C02800E */  lui       $v0, %hi(gBattleState)
 /* 191D5C 8026347C 8C42C068 */  lw        $v0, %lo(gBattleState)($v0)
-/* 191D60 80263480 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 191D60 80263480 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 191D64 80263484 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 191D64 80263484 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 191D68 80263488 3C01800E */  lui       $at, %hi(gBattleStatus+0x474)
 /* 191D6C 8026348C AC22C4E4 */  sw        $v0, %lo(gBattleStatus+0x474)($at)
-/* 191D70 80263490 3C01800E */  lui       $at, %hi(gBattleStatus+0x468)
+/* 191D70 80263490 3C01800E */  lui       $at, %hi(D_800DC4D8)
-/* 191D74 80263494 AC23C4D8 */  sw        $v1, %lo(gBattleStatus+0x468)($at)
+/* 191D74 80263494 AC23C4D8 */  sw        $v1, %lo(D_800DC4D8)($at)
 /* 191D78 80263498 0C090464 */  jal       btl_set_state
 /* 191D7C 8026349C 2404001B */   addiu    $a0, $zero, 0x1b
 /* 191D80 802634A0 08098D2B */  j         .L802634AC

ver/us/asm/nonmatchings/23680/func_80048E34.s

@@ -1,62 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80048E34
-/* 24234 80048E34 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 24238 80048E38 AFB00010 */  sw        $s0, 0x10($sp)
-/* 2423C 80048E3C 0080802D */  daddu     $s0, $a0, $zero
-/* 24240 80048E40 AFB20018 */  sw        $s2, 0x18($sp)
-/* 24244 80048E44 00A0902D */  daddu     $s2, $a1, $zero
-/* 24248 80048E48 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 2424C 80048E4C AFB10014 */  sw        $s1, 0x14($sp)
-/* 24250 80048E50 8E02003C */  lw        $v0, 0x3c($s0)
-/* 24254 80048E54 10400005 */  beqz      $v0, .L80048E6C
-/* 24258 80048E58 00C0882D */   daddu    $s1, $a2, $zero
-/* 2425C 80048E5C 8E040054 */  lw        $a0, 0x54($s0)
-/* 24260 80048E60 0C0B102B */  jal       kill_script_by_ID
-/* 24264 80048E64 00000000 */   nop
-/* 24268 80048E68 AE00003C */  sw        $zero, 0x3c($s0)
-.L80048E6C:
-/* 2426C 80048E6C 8E0200BC */  lw        $v0, 0xbc($s0)
-/* 24270 80048E70 10400004 */  beqz      $v0, .L80048E84
-/* 24274 80048E74 00000000 */   nop
-/* 24278 80048E78 0C0B102B */  jal       kill_script_by_ID
-/* 2427C 80048E7C 8E0400C0 */   lw       $a0, 0xc0($s0)
-/* 24280 80048E80 AE0000BC */  sw        $zero, 0xbc($s0)
-.L80048E84:
-/* 24284 80048E84 8E020024 */  lw        $v0, 0x24($s0)
-/* 24288 80048E88 1040000C */  beqz      $v0, .L80048EBC
-/* 2428C 80048E8C 2405000A */   addiu    $a1, $zero, 0xa
-/* 24290 80048E90 0040202D */  daddu     $a0, $v0, $zero
-/* 24294 80048E94 24060020 */  addiu     $a2, $zero, 0x20
-/* 24298 80048E98 0C0B0CF8 */  jal       start_script
-/* 2429C 80048E9C AE1100C8 */   sw       $s1, 0xc8($s0)
-/* 242A0 80048EA0 0040202D */  daddu     $a0, $v0, $zero
-/* 242A4 80048EA4 AE04003C */  sw        $a0, 0x3c($s0)
-/* 242A8 80048EA8 8C820144 */  lw        $v0, 0x144($a0)
-/* 242AC 80048EAC 86030008 */  lh        $v1, 8($s0)
-/* 242B0 80048EB0 AE020054 */  sw        $v0, 0x54($s0)
-/* 242B4 80048EB4 AC83014C */  sw        $v1, 0x14c($a0)
-/* 242B8 80048EB8 AC900148 */  sw        $s0, 0x148($a0)
-.L80048EBC:
-/* 242BC 80048EBC 8E0200B8 */  lw        $v0, 0xb8($s0)
-/* 242C0 80048EC0 1040000C */  beqz      $v0, .L80048EF4
-/* 242C4 80048EC4 2405000A */   addiu    $a1, $zero, 0xa
-/* 242C8 80048EC8 0040202D */  daddu     $a0, $v0, $zero
-/* 242CC 80048ECC 24060020 */  addiu     $a2, $zero, 0x20
-/* 242D0 80048ED0 0C0B0CF8 */  jal       start_script
-/* 242D4 80048ED4 AE1200C4 */   sw       $s2, 0xc4($s0)
-/* 242D8 80048ED8 0040202D */  daddu     $a0, $v0, $zero
-/* 242DC 80048EDC AE0400BC */  sw        $a0, 0xbc($s0)
-/* 242E0 80048EE0 8C820144 */  lw        $v0, 0x144($a0)
-/* 242E4 80048EE4 86030008 */  lh        $v1, 8($s0)
-/* 242E8 80048EE8 AE0200C0 */  sw        $v0, 0xc0($s0)
-/* 242EC 80048EEC AC83014C */  sw        $v1, 0x14c($a0)
-/* 242F0 80048EF0 AC900148 */  sw        $s0, 0x148($a0)
-.L80048EF4:
-/* 242F4 80048EF4 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 242F8 80048EF8 8FB20018 */  lw        $s2, 0x18($sp)
-/* 242FC 80048EFC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 24300 80048F00 8FB00010 */  lw        $s0, 0x10($sp)
-/* 24304 80048F04 03E00008 */  jr        $ra
-/* 24308 80048F08 27BD0020 */   addiu    $sp, $sp, 0x20

ver/us/asm/nonmatchings/415D90/btl_state_draw_partner_menu.s

@@ -9,8 +9,8 @@ glabel D_802AC880
 .section .text
 
 glabel btl_state_draw_partner_menu
-/* 41E878 802A9AE8 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 41E878 802A9AE8 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 41E87C 802A9AEC 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 41E87C 802A9AEC 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 41E880 802A9AF0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 41E884 802A9AF4 2443FFFE */  addiu     $v1, $v0, -2
 /* 41E888 802A9AF8 2C6200CC */  sltiu     $v0, $v1, 0xcc

ver/us/asm/nonmatchings/415D90/btl_state_draw_peach_menu.s

@@ -9,8 +9,8 @@ glabel D_802ACBE0
 .section .text
 
 glabel btl_state_draw_peach_menu
-/* 41EDEC 802AA05C 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 41EDEC 802AA05C 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 41EDF0 802AA060 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 41EDF0 802AA060 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 41EDF4 802AA064 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 41EDF8 802AA068 2443FFFF */  addiu     $v1, $v0, -1
 /* 41EDFC 802AA06C 2C620009 */  sltiu     $v0, $v1, 9

ver/us/asm/nonmatchings/415D90/btl_state_draw_player_menu.s

@@ -9,8 +9,8 @@ glabel D_802AC090
 .section .text
 
 glabel btl_state_draw_player_menu
-/* 41CF10 802A8180 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 41CF10 802A8180 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 41CF14 802A8184 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 41CF14 802A8184 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 41CF18 802A8188 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 41CF1C 802A818C 2443FFFF */  addiu     $v1, $v0, -1
 /* 41CF20 802A8190 2C6200CD */  sltiu     $v0, $v1, 0xcd

ver/us/asm/nonmatchings/415D90/btl_state_update_partner_menu.s

@@ -20,8 +20,8 @@ glabel btl_state_update_partner_menu
 /* 41CF78 802A81E8 3C12802B */  lui       $s2, %hi(D_802ACCD0)
 /* 41CF7C 802A81EC 2652CCD0 */  addiu     $s2, $s2, %lo(D_802ACCD0)
 /* 41CF80 802A81F0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 41CF84 802A81F4 3C11800E */  lui       $s1, %hi(gBattleStatus+0x46C)
+/* 41CF84 802A81F4 3C11800E */  lui       $s1, %hi(gBattleState2)
-/* 41CF88 802A81F8 2631C4DC */  addiu     $s1, $s1, %lo(gBattleStatus+0x46C)
+/* 41CF88 802A81F8 2631C4DC */  addiu     $s1, $s1, %lo(gBattleState2)
 /* 41CF8C 802A81FC AFBF0034 */  sw        $ra, 0x34($sp)
 /* 41CF90 802A8200 AFBE0030 */  sw        $fp, 0x30($sp)
 /* 41CF94 802A8204 AFB60028 */  sw        $s6, 0x28($sp)
@@ -82,8 +82,8 @@ glabel btl_state_update_partner_menu
 /* 41D068 802A82D8 AE000054 */  sw        $zero, 0x54($s0)
 /* 41D06C 802A82DC E6000020 */  swc1      $f0, 0x20($s0)
 .L802A82E0:
-/* 41D070 802A82E0 3C11800E */  lui       $s1, %hi(gBattleStatus+0x46C)
+/* 41D070 802A82E0 3C11800E */  lui       $s1, %hi(gBattleState2)
-/* 41D074 802A82E4 2631C4DC */  addiu     $s1, $s1, %lo(gBattleStatus+0x46C)
+/* 41D074 802A82E4 2631C4DC */  addiu     $s1, $s1, %lo(gBattleState2)
 .L802A82E8:
 /* 41D078 802A82E8 8E230000 */  lw        $v1, ($s1)
 /* 41D07C 802A82EC 2402012D */  addiu     $v0, $zero, 0x12d
@@ -199,8 +199,8 @@ glabel btl_state_update_partner_menu
 /* 41D22C 802A849C 00431025 */  or        $v0, $v0, $v1
 /* 41D230 802A84A0 AC820000 */  sw        $v0, ($a0)
 .L802A84A4:
-/* 41D234 802A84A4 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 41D234 802A84A4 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 41D238 802A84A8 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 41D238 802A84A8 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 41D23C 802A84AC 2443FFFE */  addiu     $v1, $v0, -2
 /* 41D240 802A84B0 2C62012D */  sltiu     $v0, $v1, 0x12d
 /* 41D244 802A84B4 1040057D */  beqz      $v0, L802A9AAC_41E83C
@@ -393,8 +393,8 @@ glabel L802A8754_41D4E4
 /* 41D4FC 802A876C 0C098F3F */  jal       set_animation
 /* 41D500 802A8770 0000282D */   daddu    $a1, $zero, $zero
 /* 41D504 802A8774 24020003 */  addiu     $v0, $zero, 3
-/* 41D508 802A8778 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41D508 802A8778 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41D50C 802A877C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41D50C 802A877C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L802A8780_41D510
 /* 41D510 802A8780 0C0A846C */  jal       func_802A11B0
 /* 41D514 802A8784 00000000 */   nop
@@ -1475,8 +1475,8 @@ glabel L802A9684_41E414
 /* 41E4A0 802A9710 00000000 */   nop
 .L802A9714:
 /* 41E4A4 802A9714 240200CD */  addiu     $v0, $zero, 0xcd
-/* 41E4A8 802A9718 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41E4A8 802A9718 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41E4AC 802A971C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41E4AC 802A971C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41E4B0 802A9720 0C0AA072 */  jal       btl_state_update_partner_menu
 /* 41E4B4 802A9724 00000000 */   nop
 /* 41E4B8 802A9728 0C090464 */  jal       btl_set_state
@@ -1484,8 +1484,8 @@ glabel L802A9684_41E414
 /* 41E4C0 802A9730 080AA6AB */  j         L802A9AAC_41E83C
 /* 41E4C4 802A9734 00000000 */   nop
 .L802A9738:
-/* 41E4C8 802A9738 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41E4C8 802A9738 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41E4CC 802A973C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41E4CC 802A973C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41E4D0 802A9740 0C0AA072 */  jal       btl_state_update_partner_menu
 /* 41E4D4 802A9744 00000000 */   nop
 /* 41E4D8 802A9748 24040018 */  addiu     $a0, $zero, 0x18
@@ -1496,8 +1496,8 @@ glabel L802A9684_41E414
 /* 41E4EC 802A975C 080AA6AB */  j         L802A9AAC_41E83C
 /* 41E4F0 802A9760 00000000 */   nop
 .L802A9764:
-/* 41E4F4 802A9764 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41E4F4 802A9764 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41E4F8 802A9768 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41E4F8 802A9768 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41E4FC 802A976C 0C0AA072 */  jal       btl_state_update_partner_menu
 /* 41E500 802A9770 00000000 */   nop
 .L802A9774:
@@ -1610,8 +1610,8 @@ glabel L802A98D8_41E668
 /* 41E68C 802A98FC 00000000 */   nop
 /* 41E690 802A9900 240200C9 */  addiu     $v0, $zero, 0xc9
 .L802A9904:
-/* 41E694 802A9904 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41E694 802A9904 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41E698 802A9908 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41E698 802A9908 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41E69C 802A990C 0C0AA072 */  jal       btl_state_update_partner_menu
 /* 41E6A0 802A9910 00000000 */   nop
 /* 41E6A4 802A9914 0C0AA072 */  jal       btl_state_update_partner_menu
@@ -1672,8 +1672,8 @@ glabel L802A9994_41E724
 /* 41E770 802A99E0 10400032 */  beqz      $v0, L802A9AAC_41E83C
 /* 41E774 802A99E4 00000000 */   nop
 /* 41E778 802A99E8 8682006E */  lh        $v0, 0x6e($s4)
-/* 41E77C 802A99EC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41E77C 802A99EC 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41E780 802A99F0 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41E780 802A99F0 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41E784 802A99F4 0C0AA072 */  jal       btl_state_update_partner_menu
 /* 41E788 802A99F8 00000000 */   nop
 /* 41E78C 802A99FC 0C090464 */  jal       btl_set_state
@@ -1724,8 +1724,8 @@ glabel L802A9A64_41E7F4
 /* 41E82C 802A9A9C 24050009 */   addiu    $a1, $zero, 9
 /* 41E830 802A9AA0 2402001F */  addiu     $v0, $zero, 0x1f
 .L802A9AA4:
-/* 41E834 802A9AA4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41E834 802A9AA4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41E838 802A9AA8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41E838 802A9AA8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L802A9AAC_41E83C
 /* 41E83C 802A9AAC 8FBF0034 */  lw        $ra, 0x34($sp)
 /* 41E840 802A9AB0 8FBE0030 */  lw        $fp, 0x30($sp)

ver/us/asm/nonmatchings/415D90/btl_state_update_peach_menu.s

@@ -9,8 +9,8 @@ glabel jtbl_802ACBB0
 .section .text
 
 glabel btl_state_update_peach_menu
-/* 41E8D4 802A9B44 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 41E8D4 802A9B44 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 41E8D8 802A9B48 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 41E8D8 802A9B48 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 41E8DC 802A9B4C 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 41E8E0 802A9B50 AFB20018 */  sw        $s2, 0x18($sp)
 /* 41E8E4 802A9B54 3C12800E */  lui       $s2, %hi(gBattleStatus)
@@ -50,8 +50,8 @@ glabel L802A9B9C_41E92C
 /* 41E964 802A9BD4 E600000C */  swc1      $f0, 0xc($s0)
 /* 41E968 802A9BD8 E6020014 */  swc1      $f2, 0x14($s0)
 /* 41E96C 802A9BDC C6200138 */  lwc1      $f0, 0x138($s1)
-/* 41E970 802A9BE0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41E970 802A9BE0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41E974 802A9BE4 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41E974 802A9BE4 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41E978 802A9BE8 E6000018 */  swc1      $f0, 0x18($s0)
 /* 41E97C 802A9BEC C6200140 */  lwc1      $f0, 0x140($s1)
 /* 41E980 802A9BF0 24020004 */  addiu     $v0, $zero, 4
@@ -309,8 +309,8 @@ glabel L802A9FB0_41ED40
 /* 41ED40 802A9FB0 0C0A8414 */  jal       func_802A1050
 /* 41ED44 802A9FB4 00000000 */   nop
 /* 41ED48 802A9FB8 24020001 */  addiu     $v0, $zero, 1
-/* 41ED4C 802A9FBC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41ED4C 802A9FBC 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41ED50 802A9FC0 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41ED50 802A9FC0 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41ED54 802A9FC4 0C0AA6D1 */  jal       btl_state_update_peach_menu
 /* 41ED58 802A9FC8 00000000 */   nop
 /* 41ED5C 802A9FCC 0C0AA6D1 */  jal       btl_state_update_peach_menu
@@ -342,8 +342,8 @@ glabel L802AA010_41EDA0
 /* 41EDB8 802AA028 3C01802B */  lui       $at, %hi(D_802ACC60)
 /* 41EDBC 802AA02C AC20CC60 */  sw        $zero, %lo(D_802ACC60)($at)
 .L802AA030:
-/* 41EDC0 802AA030 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41EDC0 802AA030 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41EDC4 802AA034 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41EDC4 802AA034 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L802AA038_41EDC8
 /* 41EDC8 802AA038 8FBF001C */  lw        $ra, 0x1c($sp)
 /* 41EDCC 802AA03C 8FB20018 */  lw        $s2, 0x18($sp)

ver/us/asm/nonmatchings/415D90/btl_state_update_player_menu.s

@@ -17,8 +17,8 @@ glabel btl_state_update_player_menu
 /* 41A72C 802A599C 3C158011 */  lui       $s5, %hi(gPlayerData)
 /* 41A730 802A59A0 26B5F290 */  addiu     $s5, $s5, %lo(gPlayerData)
 /* 41A734 802A59A4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 41A738 802A59A8 3C10800E */  lui       $s0, %hi(gBattleStatus+0x46C)
+/* 41A738 802A59A8 3C10800E */  lui       $s0, %hi(gBattleState2)
-/* 41A73C 802A59AC 2610C4DC */  addiu     $s0, $s0, %lo(gBattleStatus+0x46C)
+/* 41A73C 802A59AC 2610C4DC */  addiu     $s0, $s0, %lo(gBattleState2)
 /* 41A740 802A59B0 AFBF0034 */  sw        $ra, 0x34($sp)
 /* 41A744 802A59B4 AFBE0030 */  sw        $fp, 0x30($sp)
 /* 41A748 802A59B8 AFB7002C */  sw        $s7, 0x2c($sp)
@@ -182,8 +182,8 @@ glabel btl_state_update_player_menu
 /* 41A9AC 802A5C1C 00441024 */  and       $v0, $v0, $a0
 /* 41A9B0 802A5C20 AEC20000 */  sw        $v0, ($s6)
 .L802A5C24:
-/* 41A9B4 802A5C24 3C02800E */  lui       $v0, %hi(gBattleStatus+0x46C)
+/* 41A9B4 802A5C24 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 41A9B8 802A5C28 8C42C4DC */  lw        $v0, %lo(gBattleStatus+0x46C)($v0)
+/* 41A9B8 802A5C28 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
 /* 41A9BC 802A5C2C 2443FFFF */  addiu     $v1, $v0, -1
 /* 41A9C0 802A5C30 2C62012E */  sltiu     $v0, $v1, 0x12e
 /* 41A9C4 802A5C34 10400943 */  beqz      $v0, L802A8144_41CED4
@@ -1257,8 +1257,8 @@ glabel L802A6A88_41B818
 /* 41B908 802A6B78 00000000 */   nop
 .L802A6B7C:
 /* 41B90C 802A6B7C 86C2006E */  lh        $v0, 0x6e($s6)
-/* 41B910 802A6B80 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41B910 802A6B80 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41B914 802A6B84 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41B914 802A6B84 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41B918 802A6B88 0C0A9662 */  jal       btl_state_update_player_menu
 /* 41B91C 802A6B8C 00000000 */   nop
 /* 41B920 802A6B90 080A9F69 */  j         .L802A7DA4
@@ -2486,8 +2486,8 @@ glabel L802A7C7C_41CA0C
 /* 41CA9C 802A7D0C 080AA051 */  j         L802A8144_41CED4
 /* 41CAA0 802A7D10 00000000 */   nop
 .L802A7D14:
-/* 41CAA4 802A7D14 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41CAA4 802A7D14 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41CAA8 802A7D18 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41CAA8 802A7D18 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41CAAC 802A7D1C 0C0A9662 */  jal       btl_state_update_player_menu
 /* 41CAB0 802A7D20 00000000 */   nop
 /* 41CAB4 802A7D24 24040018 */  addiu     $a0, $zero, 0x18
@@ -2507,8 +2507,8 @@ glabel L802A7C7C_41CA0C
 /* 41CAE8 802A7D58 86C4006E */  lh        $a0, 0x6e($s6)
 /* 41CAEC 802A7D5C 00451024 */  and       $v0, $v0, $a1
 /* 41CAF0 802A7D60 AC620000 */  sw        $v0, ($v1)
-/* 41CAF4 802A7D64 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41CAF4 802A7D64 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41CAF8 802A7D68 AC24C4DC */  sw        $a0, %lo(gBattleStatus+0x46C)($at)
+/* 41CAF8 802A7D68 AC24C4DC */  sw        $a0, %lo(gBattleState2)($at)
 /* 41CAFC 802A7D6C 0C0A9662 */  jal       btl_state_update_player_menu
 /* 41CB00 802A7D70 00000000 */   nop
 .L802A7D74:
@@ -2518,8 +2518,8 @@ glabel L802A7C7C_41CA0C
 /* 41CB10 802A7D80 00000000 */   nop
 .L802A7D84:
 /* 41CB14 802A7D84 240200CD */  addiu     $v0, $zero, 0xcd
-/* 41CB18 802A7D88 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41CB18 802A7D88 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41CB1C 802A7D8C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41CB1C 802A7D8C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41CB20 802A7D90 0C0A9662 */  jal       btl_state_update_player_menu
 /* 41CB24 802A7D94 00000000 */   nop
 /* 41CB28 802A7D98 24040019 */  addiu     $a0, $zero, 0x19
@@ -2531,8 +2531,8 @@ glabel L802A7C7C_41CA0C
 /* 41CB3C 802A7DAC 080AA051 */  j         L802A8144_41CED4
 /* 41CB40 802A7DB0 00000000 */   nop
 .L802A7DB4:
-/* 41CB44 802A7DB4 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41CB44 802A7DB4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41CB48 802A7DB8 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41CB48 802A7DB8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41CB4C 802A7DBC 0C0A9662 */  jal       btl_state_update_player_menu
 /* 41CB50 802A7DC0 00000000 */   nop
 .L802A7DC4:
@@ -2658,8 +2658,8 @@ glabel L802A7F54_41CCE4
 /* 41CD0C 802A7F7C 00000000 */   nop
 /* 41CD10 802A7F80 240200C9 */  addiu     $v0, $zero, 0xc9
 .L802A7F84:
-/* 41CD14 802A7F84 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41CD14 802A7F84 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41CD18 802A7F88 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41CD18 802A7F88 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41CD1C 802A7F8C 0C0A9662 */  jal       btl_state_update_player_menu
 /* 41CD20 802A7F90 00000000 */   nop
 /* 41CD24 802A7F94 0C0A9662 */  jal       btl_state_update_player_menu
@@ -2724,8 +2724,8 @@ glabel L802A8024_41CDB4
 /* 41CE04 802A8074 10400033 */  beqz      $v0, L802A8144_41CED4
 /* 41CE08 802A8078 00000000 */   nop
 /* 41CE0C 802A807C 86C2006E */  lh        $v0, 0x6e($s6)
-/* 41CE10 802A8080 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41CE10 802A8080 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41CE14 802A8084 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41CE14 802A8084 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41CE18 802A8088 0C0A9662 */  jal       btl_state_update_player_menu
 /* 41CE1C 802A808C 00000000 */   nop
 /* 41CE20 802A8090 0C090464 */  jal       btl_set_state
@@ -2777,8 +2777,8 @@ glabel L802A80F8_41CE88
 /* 41CEC4 802A8134 24050009 */   addiu    $a1, $zero, 9
 /* 41CEC8 802A8138 2402001F */  addiu     $v0, $zero, 0x1f
 .L802A813C:
-/* 41CECC 802A813C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41CECC 802A813C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41CED0 802A8140 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41CED0 802A8140 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L802A8144_41CED4
 /* 41CED4 802A8144 8FBF0034 */  lw        $ra, 0x34($sp)
 /* 41CED8 802A8148 8FBE0030 */  lw        $fp, 0x30($sp)

ver/us/asm/nonmatchings/415D90/btl_state_update_select_target.s

@@ -29,8 +29,8 @@ glabel btl_state_update_select_target
 /* 41F470 802AA6E0 82500425 */  lb        $s0, 0x425($s2)
 /* 41F474 802AA6E4 00621824 */  and       $v1, $v1, $v0
 /* 41F478 802AA6E8 AE430000 */  sw        $v1, ($s2)
-/* 41F47C 802AA6EC 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 41F47C 802AA6EC 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 41F480 802AA6F0 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 41F480 802AA6F0 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 41F484 802AA6F4 24020001 */  addiu     $v0, $zero, 1
 /* 41F488 802AA6F8 10620085 */  beq       $v1, $v0, .L802AA910
 /* 41F48C 802AA6FC 2655040D */   addiu    $s5, $s2, 0x40d
@@ -125,16 +125,16 @@ glabel btl_state_update_select_target
 /* 41F5D8 802AA848 00000000 */   nop
 .L802AA84C:
 /* 41F5DC 802AA84C 8683006E */  lh        $v1, 0x6e($s4)
-/* 41F5E0 802AA850 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F5E0 802AA850 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F5E4 802AA854 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 41F5E4 802AA854 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 41F5E8 802AA858 080AAACE */  j         .L802AAB38
 /* 41F5EC 802AA85C 00000000 */   nop
 .L802AA860:
 /* 41F5F0 802AA860 8C820004 */  lw        $v0, 4($a0)
 /* 41F5F4 802AA864 8683006E */  lh        $v1, 0x6e($s4)
 /* 41F5F8 802AA868 30420040 */  andi      $v0, $v0, 0x40
-/* 41F5FC 802AA86C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F5FC 802AA86C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F600 802AA870 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 41F600 802AA870 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 41F604 802AA874 104000C1 */  beqz      $v0, .L802AAB7C
 /* 41F608 802AA878 00000000 */   nop
 /* 41F60C 802AA87C 080AAADB */  j         .L802AAB6C
@@ -174,8 +174,8 @@ glabel btl_state_update_select_target
 /* 41F688 802AA8F8 26520004 */   addiu    $s2, $s2, 4
 .L802AA8FC:
 /* 41F68C 802AA8FC 24020001 */  addiu     $v0, $zero, 1
-/* 41F690 802AA900 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F690 802AA900 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F694 802AA904 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41F694 802AA904 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41F698 802AA908 080AAB2D */  j         .L802AACB4
 /* 41F69C 802AA90C 00000000 */   nop
 .L802AA910:
@@ -195,8 +195,8 @@ glabel btl_state_update_select_target
 /* 41F6D0 802AA940 0C05272D */  jal       sfx_play_sound
 /* 41F6D4 802AA944 240400CA */   addiu    $a0, $zero, 0xca
 /* 41F6D8 802AA948 2402000A */  addiu     $v0, $zero, 0xa
-/* 41F6DC 802AA94C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F6DC 802AA94C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F6E0 802AA950 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41F6E0 802AA950 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41F6E4 802AA954 080AAB2D */  j         .L802AACB4
 /* 41F6E8 802AA958 00000000 */   nop
 .L802AA95C:
@@ -211,8 +211,8 @@ glabel btl_state_update_select_target
 /* 41F70C 802AA97C 3C01802B */  lui       $at, %hi(D_802ACC6C)
 /* 41F710 802AA980 AC22CC6C */  sw        $v0, %lo(D_802ACC6C)($at)
 /* 41F714 802AA984 24020002 */  addiu     $v0, $zero, 2
-/* 41F718 802AA988 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F718 802AA988 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F71C 802AA98C AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41F71C 802AA98C AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41F720 802AA990 080AAB2D */  j         .L802AACB4
 /* 41F724 802AA994 00000000 */   nop
 .L802AA998:
@@ -323,8 +323,8 @@ glabel btl_state_update_select_target
 /* 41F89C 802AAB0C 8C820004 */  lw        $v0, 4($a0)
 /* 41F8A0 802AAB10 8683006E */  lh        $v1, 0x6e($s4)
 /* 41F8A4 802AAB14 30420040 */  andi      $v0, $v0, 0x40
-/* 41F8A8 802AAB18 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F8A8 802AAB18 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F8AC 802AAB1C AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 41F8AC 802AAB1C AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 41F8B0 802AAB20 10400005 */  beqz      $v0, .L802AAB38
 /* 41F8B4 802AAB24 00000000 */   nop
 /* 41F8B8 802AAB28 0C0AA6D1 */  jal       btl_state_update_peach_menu
@@ -343,8 +343,8 @@ glabel btl_state_update_select_target
 /* 41F8E0 802AAB50 8C820004 */  lw        $v0, 4($a0)
 /* 41F8E4 802AAB54 8683006E */  lh        $v1, 0x6e($s4)
 /* 41F8E8 802AAB58 30420040 */  andi      $v0, $v0, 0x40
-/* 41F8EC 802AAB5C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F8EC 802AAB5C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F8F0 802AAB60 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 41F8F0 802AAB60 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 41F8F4 802AAB64 10400005 */  beqz      $v0, .L802AAB7C
 /* 41F8F8 802AAB68 00000000 */   nop
 .L802AAB6C:
@@ -393,8 +393,8 @@ glabel btl_state_update_select_target
 /* 41F990 802AAC00 8E020004 */  lw        $v0, 4($s0)
 /* 41F994 802AAC04 8683006C */  lh        $v1, 0x6c($s4)
 /* 41F998 802AAC08 30420040 */  andi      $v0, $v0, 0x40
-/* 41F99C 802AAC0C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F99C 802AAC0C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F9A0 802AAC10 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 41F9A0 802AAC10 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 41F9A4 802AAC14 10400014 */  beqz      $v0, .L802AAC68
 /* 41F9A8 802AAC18 00000000 */   nop
 /* 41F9AC 802AAC1C 080AAB16 */  j         .L802AAC58
@@ -409,8 +409,8 @@ glabel btl_state_update_select_target
 /* 41F9CC 802AAC3C 8E020004 */  lw        $v0, 4($s0)
 /* 41F9D0 802AAC40 8683006C */  lh        $v1, 0x6c($s4)
 /* 41F9D4 802AAC44 30420040 */  andi      $v0, $v0, 0x40
-/* 41F9D8 802AAC48 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F9D8 802AAC48 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F9DC 802AAC4C AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 41F9DC 802AAC4C AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 41F9E0 802AAC50 10400005 */  beqz      $v0, .L802AAC68
 /* 41F9E4 802AAC54 00000000 */   nop
 .L802AAC58:
@@ -429,8 +429,8 @@ glabel btl_state_update_select_target
 /* 41FA10 802AAC80 8E020004 */  lw        $v0, 4($s0)
 /* 41FA14 802AAC84 8683006C */  lh        $v1, 0x6c($s4)
 /* 41FA18 802AAC88 30420040 */  andi      $v0, $v0, 0x40
-/* 41FA1C 802AAC8C 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41FA1C 802AAC8C 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41FA20 802AAC90 AC23C4DC */  sw        $v1, %lo(gBattleStatus+0x46C)($at)
+/* 41FA20 802AAC90 AC23C4DC */  sw        $v1, %lo(gBattleState2)($at)
 /* 41FA24 802AAC94 10400005 */  beqz      $v0, .L802AACAC
 /* 41FA28 802AAC98 00000000 */   nop
 /* 41FA2C 802AAC9C 0C0AA82E */  jal       btl_state_update_twink_menu

ver/us/asm/nonmatchings/415D90/btl_state_update_twink_menu.s

@@ -9,8 +9,8 @@ glabel jtbl_802ACC08
 .section .text
 
 glabel btl_state_update_twink_menu
-/* 41EE48 802AA0B8 3C03800E */  lui       $v1, %hi(gBattleStatus+0x46C)
+/* 41EE48 802AA0B8 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 41EE4C 802AA0BC 8C63C4DC */  lw        $v1, %lo(gBattleStatus+0x46C)($v1)
+/* 41EE4C 802AA0BC 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
 /* 41EE50 802AA0C0 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 41EE54 802AA0C4 AFB20018 */  sw        $s2, 0x18($sp)
 /* 41EE58 802AA0C8 3C12800E */  lui       $s2, %hi(gBattleStatus)
@@ -90,8 +90,8 @@ glabel L802AA110_41EEA0
 /* 41EF5C 802AA1CC E6000018 */  swc1      $f0, 0x18($s0)
 /* 41EF60 802AA1D0 C6200140 */  lwc1      $f0, 0x140($s1)
 /* 41EF64 802AA1D4 2402000A */  addiu     $v0, $zero, 0xa
-/* 41EF68 802AA1D8 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41EF68 802AA1D8 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41EF6C 802AA1DC AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41EF6C 802AA1DC AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41EF70 802AA1E0 A6120070 */  sh        $s2, 0x70($s0)
 /* 41EF74 802AA1E4 AE000054 */  sw        $zero, 0x54($s0)
 /* 41EF78 802AA1E8 080AA987 */  j         L802AA61C_41F3AC
@@ -344,8 +344,8 @@ glabel L802AA594_41F324
 /* 41F324 802AA594 0C0A8414 */  jal       func_802A1050
 /* 41F328 802AA598 00000000 */   nop
 /* 41F32C 802AA59C 24020001 */  addiu     $v0, $zero, 1
-/* 41F330 802AA5A0 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F330 802AA5A0 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F334 802AA5A4 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41F334 802AA5A4 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 /* 41F338 802AA5A8 0C0AA82E */  jal       btl_state_update_twink_menu
 /* 41F33C 802AA5AC 00000000 */   nop
 /* 41F340 802AA5B0 0C0AA82E */  jal       btl_state_update_twink_menu
@@ -377,8 +377,8 @@ glabel L802AA5F4_41F384
 /* 41F39C 802AA60C 3C01802B */  lui       $at, %hi(D_802ACC60)
 /* 41F3A0 802AA610 AC20CC60 */  sw        $zero, %lo(D_802ACC60)($at)
 .L802AA614:
-/* 41F3A4 802AA614 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
+/* 41F3A4 802AA614 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 41F3A8 802AA618 AC22C4DC */  sw        $v0, %lo(gBattleStatus+0x46C)($at)
+/* 41F3A8 802AA618 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
 glabel L802AA61C_41F3AC
 /* 41F3AC 802AA61C 8FBF001C */  lw        $ra, 0x1c($sp)
 /* 41F3B0 802AA620 8FB20018 */  lw        $s2, 0x18($sp)

ver/us/asm/nonmatchings/battle/battle/load_battle.s

@@ -1,19 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel load_battle
-/* 4E090 80072C90 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 4E094 80072C94 3C01800E */  lui       $at, %hi(gBattleStatus+0x478)
-/* 4E098 80072C98 AC24C4E8 */  sw        $a0, %lo(gBattleStatus+0x478)($at)
-/* 4E09C 80072C9C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 4E0A0 80072CA0 0C00CD3C */  jal       set_game_mode
-/* 4E0A4 80072CA4 24040008 */   addiu    $a0, $zero, 8
-/* 4E0A8 80072CA8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 4E0AC 80072CAC 3C01800E */  lui       $at, %hi(gBattleState)
-/* 4E0B0 80072CB0 AC20C068 */  sw        $zero, %lo(gBattleState)($at)
-/* 4E0B4 80072CB4 3C01800E */  lui       $at, %hi(gBattleStatus+0x460)
-/* 4E0B8 80072CB8 AC20C4D0 */  sw        $zero, %lo(gBattleStatus+0x460)($at)
-/* 4E0BC 80072CBC 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
-/* 4E0C0 80072CC0 AC20C4DC */  sw        $zero, %lo(gBattleStatus+0x46C)($at)
-/* 4E0C4 80072CC4 03E00008 */  jr        $ra
-/* 4E0C8 80072CC8 27BD0018 */   addiu    $sp, $sp, 0x18

ver/us/asm/nonmatchings/battle/battle/load_battle_section.s

@@ -1,51 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel load_battle_section
-/* 4DFDC 80072BDC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 4DFE0 80072BE0 3C02800E */  lui       $v0, %hi(gBattleStatus+0x47A)
-/* 4DFE4 80072BE4 9042C4EA */  lbu       $v0, %lo(gBattleStatus+0x47A)($v0)
-/* 4DFE8 80072BE8 3C038009 */  lui       $v1, %hi(gBattleAreas)
-/* 4DFEC 80072BEC 24635A30 */  addiu     $v1, $v1, %lo(gBattleAreas)
-/* 4DFF0 80072BF0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 4DFF4 80072BF4 AFB10014 */  sw        $s1, 0x14($sp)
-/* 4DFF8 80072BF8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 4DFFC 80072BFC 00021140 */  sll       $v0, $v0, 5
-/* 4E000 80072C00 00438821 */  addu      $s1, $v0, $v1
-/* 4E004 80072C04 8E240004 */  lw        $a0, 4($s1)
-/* 4E008 80072C08 8E250008 */  lw        $a1, 8($s1)
-/* 4E00C 80072C0C 8E26000C */  lw        $a2, 0xc($s1)
-/* 4E010 80072C10 3C10800E */  lui       $s0, %hi(gBattleStatus+0x47B)
-/* 4E014 80072C14 9210C4EB */  lbu       $s0, %lo(gBattleStatus+0x47B)($s0)
-/* 4E018 80072C18 0C00A5CF */  jal       dma_copy
-/* 4E01C 80072C1C 00000000 */   nop
-/* 4E020 80072C20 00101880 */  sll       $v1, $s0, 2
-/* 4E024 80072C24 00701821 */  addu      $v1, $v1, $s0
-/* 4E028 80072C28 00031880 */  sll       $v1, $v1, 2
-/* 4E02C 80072C2C 8E220010 */  lw        $v0, 0x10($s1)
-/* 4E030 80072C30 3C04800E */  lui       $a0, %hi(gBattleStatus+0x47C)
-/* 4E034 80072C34 8C84C4EC */  lw        $a0, %lo(gBattleStatus+0x47C)($a0)
-/* 4E038 80072C38 00431021 */  addu      $v0, $v0, $v1
-/* 4E03C 80072C3C 3C01800E */  lui       $at, %hi(gBattleStatus+0x48C)
-/* 4E040 80072C40 AC22C4FC */  sw        $v0, %lo(gBattleStatus+0x48C)($at)
-/* 4E044 80072C44 04810005 */  bgez      $a0, .L80072C5C
-/* 4E048 80072C48 000418C0 */   sll      $v1, $a0, 3
-/* 4E04C 80072C4C 3C01800E */  lui       $at, %hi(D_800DC064)
-/* 4E050 80072C50 AC20C064 */  sw        $zero, %lo(D_800DC064)($at)
-/* 4E054 80072C54 0801CB1B */  j         .L80072C6C
-/* 4E058 80072C58 00000000 */   nop
-.L80072C5C:
-/* 4E05C 80072C5C 8E220014 */  lw        $v0, 0x14($s1)
-/* 4E060 80072C60 00431021 */  addu      $v0, $v0, $v1
-/* 4E064 80072C64 3C01800E */  lui       $at, %hi(D_800DC064)
-/* 4E068 80072C68 AC22C064 */  sw        $v0, %lo(D_800DC064)($at)
-.L80072C6C:
-/* 4E06C 80072C6C 0C090464 */  jal       btl_set_state
-/* 4E070 80072C70 24040001 */   addiu    $a0, $zero, 1
-/* 4E074 80072C74 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 4E078 80072C78 8FB10014 */  lw        $s1, 0x14($sp)
-/* 4E07C 80072C7C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 4E080 80072C80 3C01800E */  lui       $at, %hi(gBattleStatus+0x460)
-/* 4E084 80072C84 AC20C4D0 */  sw        $zero, %lo(gBattleStatus+0x460)($at)
-/* 4E088 80072C88 03E00008 */  jr        $ra
-/* 4E08C 80072C8C 27BD0020 */   addiu    $sp, $sp, 0x20

ver/us/asm/nonmatchings/battle/battle/load_demo_battle.s

@@ -1,256 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-glabel jtbl_8009A578
-.word L80072F38_4E338, L80072F4C_4E34C, L80072F64_4E364, L80072F90_4E390, L80072FA8_4E3A8, 0
-
-glabel jtbl_8009A590
-.word L8007301C_4E41C, L80073070_4E470, L80073094_4E494, L800730CC_4E4CC, L800730F8_4E4F8, 0, 0, 0
-
-.section .text
-
-glabel load_demo_battle
-/* 4E214 80072E14 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 4E218 80072E18 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 4E21C 80072E1C 2463419C */  addiu     $v1, $v1, %lo(gGameStatusPtr)
-/* 4E220 80072E20 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 4E224 80072E24 AFB10014 */  sw        $s1, 0x14($sp)
-/* 4E228 80072E28 AFB00010 */  sw        $s0, 0x10($sp)
-/* 4E22C 80072E2C 8C620000 */  lw        $v0, ($v1)
-/* 4E230 80072E30 A04000AA */  sb        $zero, 0xaa($v0)
-/* 4E234 80072E34 8C620000 */  lw        $v0, ($v1)
-/* 4E238 80072E38 0080882D */  daddu     $s1, $a0, $zero
-/* 4E23C 80072E3C A4400086 */  sh        $zero, 0x86($v0)
-/* 4E240 80072E40 A440008C */  sh        $zero, 0x8c($v0)
-/* 4E244 80072E44 0C00AB00 */  jal       general_heap_create
-/* 4E248 80072E48 A0400070 */   sb       $zero, 0x70($v0)
-/* 4E24C 80072E4C 0C048C2E */  jal       clear_generic_entity_list
-/* 4E250 80072E50 00000000 */   nop
-/* 4E254 80072E54 0C0B0C77 */  jal       clear_script_list
-/* 4E258 80072E58 00000000 */   nop
-/* 4E25C 80072E5C 0C00B7BD */  jal       create_cameras_a
-/* 4E260 80072E60 00000000 */   nop
-/* 4E264 80072E64 0C0B763E */  jal       spr_init_sprites
-/* 4E268 80072E68 0000202D */   daddu    $a0, $zero, $zero
-/* 4E26C 80072E6C 0C047889 */  jal       clear_animator_list
-/* 4E270 80072E70 00000000 */   nop
-/* 4E274 80072E74 0C0482EC */  jal       clear_entity_models
-/* 4E278 80072E78 00000000 */   nop
-/* 4E27C 80072E7C 0C00E12F */  jal       clear_npcs
-/* 4E280 80072E80 00000000 */   nop
-/* 4E284 80072E84 0C050440 */  jal       clear_hud_element_cache
-/* 4E288 80072E88 00000000 */   nop
-/* 4E28C 80072E8C 0C0515A0 */  jal       clear_trigger_data
-/* 4E290 80072E90 00000000 */   nop
-/* 4E294 80072E94 0C045751 */  jal       clear_model_data
-/* 4E298 80072E98 00000000 */   nop
-/* 4E29C 80072E9C 0C052010 */  jal       clear_sprite_shading_data
-/* 4E2A0 80072EA0 00000000 */   nop
-/* 4E2A4 80072EA4 0C05177E */  jal       reset_background_settings
-/* 4E2A8 80072EA8 00000000 */   nop
-/* 4E2AC 80072EAC 0C04E062 */  jal       func_80138188
-/* 4E2B0 80072EB0 00000000 */   nop
-/* 4E2B4 80072EB4 0C01CACC */  jal       reset_battle_status
-/* 4E2B8 80072EB8 00000000 */   nop
-/* 4E2BC 80072EBC 0C00F900 */  jal       clear_encounter_status
-/* 4E2C0 80072EC0 00000000 */   nop
-/* 4E2C4 80072EC4 0C04432E */  jal       clear_entity_data
-/* 4E2C8 80072EC8 24040001 */   addiu    $a0, $zero, 1
-/* 4E2CC 80072ECC 0C016727 */  jal       clear_effect_data
-/* 4E2D0 80072ED0 00000000 */   nop
-/* 4E2D4 80072ED4 0C037F14 */  jal       clear_player_status
-/* 4E2D8 80072ED8 00000000 */   nop
-/* 4E2DC 80072EDC 0C048D9D */  jal       clear_printers
-/* 4E2E0 80072EE0 00000000 */   nop
-/* 4E2E4 80072EE4 0C04C3FC */  jal       clear_item_entity_data
-/* 4E2E8 80072EE8 00000000 */   nop
-/* 4E2EC 80072EEC 0C039CE8 */  jal       clear_player_data
-/* 4E2F0 80072EF0 00000000 */   nop
-/* 4E2F4 80072EF4 0C039E4D */  jal       initialize_status_menu
-/* 4E2F8 80072EF8 00000000 */   nop
-/* 4E2FC 80072EFC 0C04C3FC */  jal       clear_item_entity_data
-/* 4E300 80072F00 00000000 */   nop
-/* 4E304 80072F04 3C05437F */  lui       $a1, 0x437f
-/* 4E308 80072F08 0C04DF62 */  jal       set_screen_overlay_params_front
-/* 4E30C 80072F0C 24040009 */   addiu    $a0, $zero, 9
-/* 4E310 80072F10 3C108011 */  lui       $s0, %hi(gPlayerData)
-/* 4E314 80072F14 2610F290 */  addiu     $s0, $s0, %lo(gPlayerData)
-/* 4E318 80072F18 2E220005 */  sltiu     $v0, $s1, 5
-/* 4E31C 80072F1C 1040002D */  beqz      $v0, .L80072FD4
-/* 4E320 80072F20 00111080 */   sll      $v0, $s1, 2
-/* 4E324 80072F24 3C01800A */  lui       $at, %hi(jtbl_8009A578)
-/* 4E328 80072F28 00220821 */  addu      $at, $at, $v0
-/* 4E32C 80072F2C 8C22A578 */  lw        $v0, %lo(jtbl_8009A578)($at)
-/* 4E330 80072F30 00400008 */  jr        $v0
-/* 4E334 80072F34 00000000 */   nop
-glabel L80072F38_4E338
-/* 4E338 80072F38 0C01CB4B */  jal       setup_demo_player
-/* 4E33C 80072F3C 24112700 */   addiu    $s1, $zero, 0x2700
-/* 4E340 80072F40 0000202D */  daddu     $a0, $zero, $zero
-/* 4E344 80072F44 0801CBF8 */  j         .L80072FE0
-/* 4E348 80072F48 A200000A */   sb       $zero, 0xa($s0)
-glabel L80072F4C_4E34C
-/* 4E34C 80072F4C 0C01CB4B */  jal       setup_demo_player
-/* 4E350 80072F50 24112701 */   addiu    $s1, $zero, 0x2701
-/* 4E354 80072F54 0000202D */  daddu     $a0, $zero, $zero
-/* 4E358 80072F58 24020009 */  addiu     $v0, $zero, 9
-/* 4E35C 80072F5C 0801CBF8 */  j         .L80072FE0
-/* 4E360 80072F60 A2020012 */   sb       $v0, 0x12($s0)
-glabel L80072F64_4E364
-/* 4E364 80072F64 0C01CB4B */  jal       setup_demo_player
-/* 4E368 80072F68 24112702 */   addiu    $s1, $zero, 0x2702
-/* 4E36C 80072F6C 0000202D */  daddu     $a0, $zero, $zero
-/* 4E370 80072F70 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 4E374 80072F74 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 4E378 80072F78 24020004 */  addiu     $v0, $zero, 4
-/* 4E37C 80072F7C A2020012 */  sb        $v0, 0x12($s0)
-/* 4E380 80072F80 906200AA */  lbu       $v0, 0xaa($v1)
-/* 4E384 80072F84 34420002 */  ori       $v0, $v0, 2
-/* 4E388 80072F88 0801CBF8 */  j         .L80072FE0
-/* 4E38C 80072F8C A06200AA */   sb       $v0, 0xaa($v1)
-glabel L80072F90_4E390
-/* 4E390 80072F90 0C01CB4B */  jal       setup_demo_player
-/* 4E394 80072F94 24112703 */   addiu    $s1, $zero, 0x2703
-/* 4E398 80072F98 0000202D */  daddu     $a0, $zero, $zero
-/* 4E39C 80072F9C 24020006 */  addiu     $v0, $zero, 6
-/* 4E3A0 80072FA0 0801CBF8 */  j         .L80072FE0
-/* 4E3A4 80072FA4 A2020012 */   sb       $v0, 0x12($s0)
-glabel L80072FA8_4E3A8
-/* 4E3A8 80072FA8 0C01CB4B */  jal       setup_demo_player
-/* 4E3AC 80072FAC 24112704 */   addiu    $s1, $zero, 0x2704
-/* 4E3B0 80072FB0 0000202D */  daddu     $a0, $zero, $zero
-/* 4E3B4 80072FB4 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 4E3B8 80072FB8 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 4E3BC 80072FBC 24020002 */  addiu     $v0, $zero, 2
-/* 4E3C0 80072FC0 A2020012 */  sb        $v0, 0x12($s0)
-/* 4E3C4 80072FC4 906200AA */  lbu       $v0, 0xaa($v1)
-/* 4E3C8 80072FC8 34420004 */  ori       $v0, $v0, 4
-/* 4E3CC 80072FCC 0801CBF8 */  j         .L80072FE0
-/* 4E3D0 80072FD0 A06200AA */   sb       $v0, 0xaa($v1)
-.L80072FD4:
-/* 4E3D4 80072FD4 0C01CB4B */  jal       setup_demo_player
-/* 4E3D8 80072FD8 24112700 */   addiu    $s1, $zero, 0x2700
-/* 4E3DC 80072FDC 24040002 */  addiu     $a0, $zero, 2
-.L80072FE0:
-/* 4E3E0 80072FE0 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 4E3E4 80072FE4 2463419C */  addiu     $v1, $v1, %lo(gGameStatusPtr)
-/* 4E3E8 80072FE8 8C620000 */  lw        $v0, ($v1)
-/* 4E3EC 80072FEC A0400074 */  sb        $zero, 0x74($v0)
-/* 4E3F0 80072FF0 8C630000 */  lw        $v1, ($v1)
-/* 4E3F4 80072FF4 24020001 */  addiu     $v0, $zero, 1
-/* 4E3F8 80072FF8 A062007C */  sb        $v0, 0x7c($v1)
-/* 4E3FC 80072FFC 2C820005 */  sltiu     $v0, $a0, 5
-/* 4E400 80073000 10400049 */  beqz      $v0, .L80073128
-/* 4E404 80073004 00041080 */   sll      $v0, $a0, 2
-/* 4E408 80073008 3C01800A */  lui       $at, %hi(jtbl_8009A590)
-/* 4E40C 8007300C 00220821 */  addu      $at, $at, $v0
-/* 4E410 80073010 8C22A590 */  lw        $v0, %lo(jtbl_8009A590)($at)
-/* 4E414 80073014 00400008 */  jr        $v0
-/* 4E418 80073018 00000000 */   nop
-glabel L8007301C_4E41C
-/* 4E41C 8007301C 3C03800B */  lui       $v1, %hi(gCurrentEncounter)
-/* 4E420 80073020 24630F10 */  addiu     $v1, $v1, %lo(gCurrentEncounter)
-/* 4E424 80073024 3C048007 */  lui       $a0, %hi(gGameStatusPtr)
-/* 4E428 80073028 2484419C */  addiu     $a0, $a0, %lo(gGameStatusPtr)
-/* 4E42C 8007302C A0600004 */  sb        $zero, 4($v1)
-/* 4E430 80073030 8C850000 */  lw        $a1, ($a0)
-/* 4E434 80073034 24020001 */  addiu     $v0, $zero, 1
-/* 4E438 80073038 A0620005 */  sb        $v0, 5($v1)
-/* 4E43C 8007303C A0600006 */  sb        $zero, 6($v1)
-/* 4E440 80073040 90A200AA */  lbu       $v0, 0xaa($a1)
-/* 4E444 80073044 34420010 */  ori       $v0, $v0, 0x10
-/* 4E448 80073048 A0A200AA */  sb        $v0, 0xaa($a1)
-/* 4E44C 8007304C 8C830000 */  lw        $v1, ($a0)
-/* 4E450 80073050 906200AA */  lbu       $v0, 0xaa($v1)
-/* 4E454 80073054 34420020 */  ori       $v0, $v0, 0x20
-/* 4E458 80073058 A06200AA */  sb        $v0, 0xaa($v1)
-/* 4E45C 8007305C 8C830000 */  lw        $v1, ($a0)
-/* 4E460 80073060 906200AA */  lbu       $v0, 0xaa($v1)
-/* 4E464 80073064 34420040 */  ori       $v0, $v0, 0x40
-/* 4E468 80073068 0801CC4A */  j         .L80073128
-/* 4E46C 8007306C A06200AA */   sb       $v0, 0xaa($v1)
-glabel L80073070_4E470
-/* 4E470 80073070 3C03800B */  lui       $v1, %hi(gCurrentEncounter)
-/* 4E474 80073074 24630F10 */  addiu     $v1, $v1, %lo(gCurrentEncounter)
-/* 4E478 80073078 24020001 */  addiu     $v0, $zero, 1
-/* 4E47C 8007307C A0620004 */  sb        $v0, 4($v1)
-/* 4E480 80073080 92040001 */  lbu       $a0, 1($s0)
-/* 4E484 80073084 3C058007 */  lui       $a1, %hi(gGameStatusPtr)
-/* 4E488 80073088 8CA5419C */  lw        $a1, %lo(gGameStatusPtr)($a1)
-/* 4E48C 8007308C 0801CC2D */  j         .L800730B4
-/* 4E490 80073090 24020004 */   addiu    $v0, $zero, 4
-glabel L80073094_4E494
-/* 4E494 80073094 3C03800B */  lui       $v1, %hi(gCurrentEncounter)
-/* 4E498 80073098 24630F10 */  addiu     $v1, $v1, %lo(gCurrentEncounter)
-/* 4E49C 8007309C 24020001 */  addiu     $v0, $zero, 1
-/* 4E4A0 800730A0 A0620004 */  sb        $v0, 4($v1)
-/* 4E4A4 800730A4 92040000 */  lbu       $a0, ($s0)
-/* 4E4A8 800730A8 3C058007 */  lui       $a1, %hi(gGameStatusPtr)
-/* 4E4AC 800730AC 8CA5419C */  lw        $a1, %lo(gGameStatusPtr)($a1)
-/* 4E4B0 800730B0 24020002 */  addiu     $v0, $zero, 2
-.L800730B4:
-/* 4E4B4 800730B4 A0620005 */  sb        $v0, 5($v1)
-/* 4E4B8 800730B8 A0640006 */  sb        $a0, 6($v1)
-/* 4E4BC 800730BC 90A200AA */  lbu       $v0, 0xaa($a1)
-/* 4E4C0 800730C0 34420010 */  ori       $v0, $v0, 0x10
-/* 4E4C4 800730C4 0801CC4A */  j         .L80073128
-/* 4E4C8 800730C8 A0A200AA */   sb       $v0, 0xaa($a1)
-glabel L800730CC_4E4CC
-/* 4E4CC 800730CC 3C03800B */  lui       $v1, %hi(gCurrentEncounter)
-/* 4E4D0 800730D0 24630F10 */  addiu     $v1, $v1, %lo(gCurrentEncounter)
-/* 4E4D4 800730D4 24020001 */  addiu     $v0, $zero, 1
-/* 4E4D8 800730D8 A0620004 */  sb        $v0, 4($v1)
-/* 4E4DC 800730DC 3C048007 */  lui       $a0, %hi(gGameStatusPtr)
-/* 4E4E0 800730E0 8C84419C */  lw        $a0, %lo(gGameStatusPtr)($a0)
-/* 4E4E4 800730E4 24020006 */  addiu     $v0, $zero, 6
-/* 4E4E8 800730E8 A0620005 */  sb        $v0, 5($v1)
-/* 4E4EC 800730EC 908200AA */  lbu       $v0, 0xaa($a0)
-/* 4E4F0 800730F0 0801CC49 */  j         .L80073124
-/* 4E4F4 800730F4 34420020 */   ori      $v0, $v0, 0x20
-glabel L800730F8_4E4F8
-/* 4E4F8 800730F8 3C03800B */  lui       $v1, %hi(gCurrentEncounter)
-/* 4E4FC 800730FC 24630F10 */  addiu     $v1, $v1, %lo(gCurrentEncounter)
-/* 4E500 80073100 24020002 */  addiu     $v0, $zero, 2
-/* 4E504 80073104 A0620004 */  sb        $v0, 4($v1)
-/* 4E508 80073108 3C048007 */  lui       $a0, %hi(gGameStatusPtr)
-/* 4E50C 8007310C 8C84419C */  lw        $a0, %lo(gGameStatusPtr)($a0)
-/* 4E510 80073110 24020001 */  addiu     $v0, $zero, 1
-/* 4E514 80073114 A0620005 */  sb        $v0, 5($v1)
-/* 4E518 80073118 A0600006 */  sb        $zero, 6($v1)
-/* 4E51C 8007311C 908200AA */  lbu       $v0, 0xaa($a0)
-/* 4E520 80073120 34420040 */  ori       $v0, $v0, 0x40
-.L80073124:
-/* 4E524 80073124 A08200AA */  sb        $v0, 0xaa($a0)
-.L80073128:
-/* 4E528 80073128 0000202D */  daddu     $a0, $zero, $zero
-/* 4E52C 8007312C 3C05F840 */  lui       $a1, 0xf840
-/* 4E530 80073130 34A56299 */  ori       $a1, $a1, 0x6299
-/* 4E534 80073134 0C0B2026 */  jal       set_variable
-/* 4E538 80073138 24060001 */   addiu    $a2, $zero, 1
-/* 4E53C 8007313C 2404FFFF */  addiu     $a0, $zero, -1
-/* 4E540 80073140 3C02800B */  lui       $v0, %hi(gCurrentEncounter)
-/* 4E544 80073144 24420F10 */  addiu     $v0, $v0, %lo(gCurrentEncounter)
-/* 4E548 80073148 A0400007 */  sb        $zero, 7($v0)
-/* 4E54C 8007314C 0C01CB33 */  jal       set_battle_stage
-/* 4E550 80073150 A0400010 */   sb       $zero, 0x10($v0)
-/* 4E554 80073154 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
-/* 4E558 80073158 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
-/* 4E55C 8007315C 0220202D */  daddu     $a0, $s1, $zero
-/* 4E560 80073160 906200AA */  lbu       $v0, 0xaa($v1)
-/* 4E564 80073164 3C05800A */  lui       $a1, %hi(gOverrideFlags)
-/* 4E568 80073168 24A5A650 */  addiu     $a1, $a1, %lo(gOverrideFlags)
-/* 4E56C 8007316C 34420001 */  ori       $v0, $v0, 1
-/* 4E570 80073170 A06200AA */  sb        $v0, 0xaa($v1)
-/* 4E574 80073174 8CA20000 */  lw        $v0, ($a1)
-/* 4E578 80073178 2403FFF7 */  addiu     $v1, $zero, -9
-/* 4E57C 8007317C 00431024 */  and       $v0, $v0, $v1
-/* 4E580 80073180 0C01CB24 */  jal       load_battle
-/* 4E584 80073184 ACA20000 */   sw       $v0, ($a1)
-/* 4E588 80073188 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 4E58C 8007318C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 4E590 80073190 8FB00010 */  lw        $s0, 0x10($sp)
-/* 4E594 80073194 03E00008 */  jr        $ra
-/* 4E598 80073198 27BD0020 */   addiu    $sp, $sp, 0x20
-/* 4E59C 8007319C 00000000 */  nop

ver/us/asm/nonmatchings/battle/battle/reset_battle_status.s

@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel reset_battle_status
-/* 4DF30 80072B30 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 4DF34 80072B34 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 4DF38 80072B38 A04000AA */  sb        $zero, 0xaa($v0)
-/* 4DF3C 80072B3C 24020001 */  addiu     $v0, $zero, 1
-/* 4DF40 80072B40 3C01800E */  lui       $at, %hi(gBattleState)
-/* 4DF44 80072B44 AC20C068 */  sw        $zero, %lo(gBattleState)($at)
-/* 4DF48 80072B48 3C01800E */  lui       $at, %hi(gBattleStatus+0x470)
-/* 4DF4C 80072B4C AC22C4E0 */  sw        $v0, %lo(gBattleStatus+0x470)($at)
-/* 4DF50 80072B50 3C01800E */  lui       $at, %hi(gBattleStatus+0x46C)
-/* 4DF54 80072B54 AC20C4DC */  sw        $zero, %lo(gBattleStatus+0x46C)($at)
-/* 4DF58 80072B58 3C01800E */  lui       $at, %hi(gBattleStatus+0x460)
-/* 4DF5C 80072B5C AC20C4D0 */  sw        $zero, %lo(gBattleStatus+0x460)($at)
-/* 4DF60 80072B60 3C01800E */  lui       $at, %hi(gBattleStatus+0x480)
-/* 4DF64 80072B64 AC20C4F0 */  sw        $zero, %lo(gBattleStatus+0x480)($at)
-/* 4DF68 80072B68 3C01800E */  lui       $at, %hi(gBattleStatus+0x464)
-/* 4DF6C 80072B6C AC20C4D4 */  sw        $zero, %lo(gBattleStatus+0x464)($at)
-/* 4DF70 80072B70 3C01800E */  lui       $at, %hi(gBattleStatus+0x48C)
-/* 4DF74 80072B74 AC20C4FC */  sw        $zero, %lo(gBattleStatus+0x48C)($at)
-/* 4DF78 80072B78 3C01800E */  lui       $at, %hi(gBattleStatus+0x488)
-/* 4DF7C 80072B7C AC20C4F8 */  sw        $zero, %lo(gBattleStatus+0x488)($at)
-/* 4DF80 80072B80 3C01800E */  lui       $at, %hi(gBattleStatus+0x478)
-/* 4DF84 80072B84 AC20C4E8 */  sw        $zero, %lo(gBattleStatus+0x478)($at)
-/* 4DF88 80072B88 3C01800E */  lui       $at, %hi(D_800DC064)
-/* 4DF8C 80072B8C AC20C064 */  sw        $zero, %lo(D_800DC064)($at)
-/* 4DF90 80072B90 3C01800E */  lui       $at, %hi(D_800DC060)
-/* 4DF94 80072B94 AC20C060 */  sw        $zero, %lo(D_800DC060)($at)
-/* 4DF98 80072B98 3C01800E */  lui       $at, %hi(gBattleStatus+0x47C)
-/* 4DF9C 80072B9C AC20C4EC */  sw        $zero, %lo(gBattleStatus+0x47C)($at)
-/* 4DFA0 80072BA0 3C01800E */  lui       $at, %hi(gBattleStatus+0x484)
-/* 4DFA4 80072BA4 AC20C4F4 */  sw        $zero, %lo(gBattleStatus+0x484)($at)
-/* 4DFA8 80072BA8 03E00008 */  jr        $ra
-/* 4DFAC 80072BAC 00000000 */   nop

ver/us/asm/nonmatchings/battle/battle/setup_demo_player.s

@@ -1,66 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel setup_demo_player
-/* 4E12C 80072D2C 24030001 */  addiu     $v1, $zero, 1
-/* 4E130 80072D30 0060382D */  daddu     $a3, $v1, $zero
-/* 4E134 80072D34 24060002 */  addiu     $a2, $zero, 2
-/* 4E138 80072D38 3C058011 */  lui       $a1, %hi(gPlayerData)
-/* 4E13C 80072D3C 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* 4E140 80072D40 24A40008 */  addiu     $a0, $a1, 8
-/* 4E144 80072D44 2402000F */  addiu     $v0, $zero, 0xf
-/* 4E148 80072D48 A0A20002 */  sb        $v0, 2($a1)
-/* 4E14C 80072D4C A0A20003 */  sb        $v0, 3($a1)
-/* 4E150 80072D50 A0A20004 */  sb        $v0, 4($a1)
-/* 4E154 80072D54 2402000A */  addiu     $v0, $zero, 0xa
-/* 4E158 80072D58 A0A20005 */  sb        $v0, 5($a1)
-/* 4E15C 80072D5C A0A20006 */  sb        $v0, 6($a1)
-/* 4E160 80072D60 A0A20007 */  sb        $v0, 7($a1)
-/* 4E164 80072D64 24020003 */  addiu     $v0, $zero, 3
-/* 4E168 80072D68 A0A20009 */  sb        $v0, 9($a1)
-/* 4E16C 80072D6C 0060102D */  daddu     $v0, $v1, $zero
-/* 4E170 80072D70 A0A2000A */  sb        $v0, 0xa($a1)
-/* 4E174 80072D74 24020037 */  addiu     $v0, $zero, 0x37
-/* 4E178 80072D78 A0A20010 */  sb        $v0, 0x10($a1)
-/* 4E17C 80072D7C 24020022 */  addiu     $v0, $zero, 0x22
-/* 4E180 80072D80 A0A00000 */  sb        $zero, ($a1)
-/* 4E184 80072D84 A0A00001 */  sb        $zero, 1($a1)
-/* 4E188 80072D88 A4A2000C */  sh        $v0, 0xc($a1)
-.L80072D8C:
-/* 4E18C 80072D8C A0870014 */  sb        $a3, 0x14($a0)
-/* 4E190 80072D90 A0860015 */  sb        $a2, 0x15($a0)
-/* 4E194 80072D94 24630001 */  addiu     $v1, $v1, 1
-/* 4E198 80072D98 2862000C */  slti      $v0, $v1, 0xc
-/* 4E19C 80072D9C 1440FFFB */  bnez      $v0, .L80072D8C
-/* 4E1A0 80072DA0 24840008 */   addiu    $a0, $a0, 8
-/* 4E1A4 80072DA4 24020001 */  addiu     $v0, $zero, 1
-/* 4E1A8 80072DA8 A0A20012 */  sb        $v0, 0x12($a1)
-/* 4E1AC 80072DAC 2403007F */  addiu     $v1, $zero, 0x7f
-/* 4E1B0 80072DB0 24A200FE */  addiu     $v0, $a1, 0xfe
-.L80072DB4:
-/* 4E1B4 80072DB4 A44000B4 */  sh        $zero, 0xb4($v0)
-/* 4E1B8 80072DB8 2463FFFF */  addiu     $v1, $v1, -1
-/* 4E1BC 80072DBC 0461FFFD */  bgez      $v1, .L80072DB4
-/* 4E1C0 80072DC0 2442FFFE */   addiu    $v0, $v0, -2
-/* 4E1C4 80072DC4 2403003F */  addiu     $v1, $zero, 0x3f
-/* 4E1C8 80072DC8 24A2007E */  addiu     $v0, $a1, 0x7e
-.L80072DCC:
-/* 4E1CC 80072DCC A4400208 */  sh        $zero, 0x208($v0)
-/* 4E1D0 80072DD0 2463FFFF */  addiu     $v1, $v1, -1
-/* 4E1D4 80072DD4 0461FFFD */  bgez      $v1, .L80072DCC
-/* 4E1D8 80072DD8 2442FFFE */   addiu    $v0, $v0, -2
-/* 4E1DC 80072DDC 24030009 */  addiu     $v1, $zero, 9
-/* 4E1E0 80072DE0 24A20012 */  addiu     $v0, $a1, 0x12
-.L80072DE4:
-/* 4E1E4 80072DE4 A44001B4 */  sh        $zero, 0x1b4($v0)
-/* 4E1E8 80072DE8 2463FFFF */  addiu     $v1, $v1, -1
-/* 4E1EC 80072DEC 0461FFFD */  bgez      $v1, .L80072DE4
-/* 4E1F0 80072DF0 2442FFFE */   addiu    $v0, $v0, -2
-/* 4E1F4 80072DF4 A0A00288 */  sb        $zero, 0x288($a1)
-/* 4E1F8 80072DF8 A0A00289 */  sb        $zero, 0x289($a1)
-/* 4E1FC 80072DFC A0A0028A */  sb        $zero, 0x28a($a1)
-/* 4E200 80072E00 A4A0028C */  sh        $zero, 0x28c($a1)
-/* 4E204 80072E04 A0A0028E */  sb        $zero, 0x28e($a1)
-/* 4E208 80072E08 A4A00290 */  sh        $zero, 0x290($a1)
-/* 4E20C 80072E0C 03E00008 */  jr        $ra
-/* 4E210 80072E10 A0A00292 */   sb       $zero, 0x292($a1)

ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11C0_743FB0.s

@@ -15,7 +15,7 @@ glabel func_802A11C0_743FB0
 /* 743FD8 802A11E8 A4A202A0 */  sh        $v0, 0x2a0($a1)
 .L802A11EC:
 /* 743FDC 802A11EC 03E00008 */  jr        $ra
-/* 743FE0 802A11F0 24020002 */  addiu     $v0, $zero, 2
+/* 743FE0 802A11F0 24020002 */   addiu    $v0, $zero, 2
-nop
+/* 743FE4 802A11F4 00000000 */  nop
-nop
+/* 743FE8 802A11F8 00000000 */  nop
-nop
+/* 743FEC 802A11FC 00000000 */  nop

ver/us/asm/nonmatchings/battle/move/unknown_move/779C90/func_802A10E4_779D74.s

@@ -47,7 +47,7 @@ glabel func_802A10E4_779D74
 /* 779E14 802A1184 8FB00010 */  lw        $s0, 0x10($sp)
 /* 779E18 802A1188 24020002 */  addiu     $v0, $zero, 2
 /* 779E1C 802A118C 03E00008 */  jr        $ra
-/* 779E20 802A1190 27BD0020 */  addiu     $sp, $sp, 0x20
+/* 779E20 802A1190 27BD0020 */   addiu    $sp, $sp, 0x20
-nop
+/* 779E24 802A1194 00000000 */  nop
-nop
+/* 779E28 802A1198 00000000 */  nop
-nop
+/* 779E2C 802A119C 00000000 */  nop

ver/us/asm/nonmatchings/state_battle/state_step_battle.s

@@ -59,11 +59,11 @@ glabel state_step_battle
 /* EDB4 800339B4 0C05259C */  jal       sfx_clear_env_sounds
 /* EDB8 800339B8 0000202D */   daddu    $a0, $zero, $zero
 /* EDBC 800339BC 8E100000 */  lw        $s0, ($s0)
-/* EDC0 800339C0 3C03800E */  lui       $v1, %hi(gBattleStatus+0x47A)
+/* EDC0 800339C0 3C03800E */  lui       $v1, %hi(gCurrentBattleSection)
-/* EDC4 800339C4 9063C4EA */  lbu       $v1, %lo(gBattleStatus+0x47A)($v1)
+/* EDC4 800339C4 9063C4EA */  lbu       $v1, %lo(gCurrentBattleSection)($v1)
 /* EDC8 800339C8 9205007E */  lbu       $a1, 0x7e($s0)
-/* EDCC 800339CC 3C04800E */  lui       $a0, %hi(gBattleStatus+0x47B)
+/* EDCC 800339CC 3C04800E */  lui       $a0, %hi(D_800DC4EB)
-/* EDD0 800339D0 9084C4EB */  lbu       $a0, %lo(gBattleStatus+0x47B)($a0)
+/* EDD0 800339D0 9084C4EB */  lbu       $a0, %lo(D_800DC4EB)($a0)
 /* EDD4 800339D4 30A20001 */  andi      $v0, $a1, 1
 /* EDD8 800339D8 14400007 */  bnez      $v0, .L800339F8
 /* EDDC 800339DC 34A20001 */   ori      $v0, $a1, 1

ver/us/main_bss_syms.txt

@@ -325,6 +325,20 @@ D_800DC060 = 0x800DC060;
 D_800DC064 = 0x800DC064;
 gBattleState = 0x800DC068;
 gBattleStatus = 0x800DC070;
+D_800DC4D0 = 0x800DC4D0;
+D_800DC4D4 = 0x800DC4D4;
+D_800DC4D8 = 0x800DC4D8;
+gBattleState2 = 0x800DC4DC;
+D_800DC4E0 = 0x800DC4E0;
+D_800DC4E4 = 0x800DC4E4;
+D_800DC4E8 = 0x800DC4E8;
+gCurrentBattleSection = 0x800DC4EA;
+D_800DC4EB = 0x800DC4EB;
+D_800DC4EC = 0x800DC4EC;
+D_800DC4F0 = 0x800DC4F0;
+D_800DC4F4 = 0x800DC4F4;
+D_800DC4F8 = 0x800DC4F8;
+D_800DC4FC = 0x800DC4FC;
 D_8010C920 = 0x8010C920;
 D_8010C924 = 0x8010C924;
 D_8010C928 = 0x8010C928;

ver/us/splat.yaml

@@ -383,7 +383,38 @@ segments:
     - [0x93CD0, ci4,     ui/hammer, 32, 32]
     - [0x93ED0, palette, ui/hammer]
     - [0x93EF0, palette, ui/hammer.disabled]
-    - [0x93FF0, data]
+    - [0x93F10, ci4,     ui/super_hammer, 32, 32]
+    - [0x94110, palette, ui/super_hammer]
+    - [0x94130, palette, ui/super_hammer.disabled]
+    - [0x94150, ci4,     ui/ultra_hammer, 32, 32]
+    - [0x94350, palette, ui/ultra_hammer]
+    - [0x94370, palette, ui/ultra_hammer.disabled]
+    - [0x94390, ci4,     ui/boots, 32, 32]
+    - [0x94590, palette, ui/boots]
+    - [0x945B0, palette, ui/boots.disabled]
+    - [0x945D0, ci4,     ui/super_boots, 32, 32]
+    - [0x947D0, palette, ui/super_boots]
+    - [0x947F0, palette, ui/super_boots.disabled]
+    - [0x94810, ci4,     ui/ultra_boots, 32, 32]
+    - [0x94A10, palette, ui/ultra_boots]
+    - [0x94A30, palette, ui/ultra_boots.disabled]
+    - [0x94A50, ci4,     ui/item, 32, 32]
+    - [0x94C50, palette, ui/item]
+    - [0x94C70, palette, ui/item.disabled]
+    - [0x94C90, ci4,     ui/star_spirit, 32, 32]
+    - [0x94E90, palette, ui/star_spirit]
+    - [0x94EB0, palette, ui/star_spirit.disabled]
+    - [0x94ED0, ci4,     ui/arrow_left, 16, 16]
+    - [0x94F50, palette, ui/arrow_left]
+    - [0x94F70, ci4,     ui/arrow_right, 16, 16]
+    - [0x94FF0, palette, ui/arrow_right]
+    - [0x95010, ci4,     ui/point_right, 16, 16]
+    - [0x95090, palette, ui/point_right]
+    - [0x950B0, ci4,     ui/pip, 8, 8]
+    - [0x950D0, palette, ui/pip]
+    - [0x950F0, ci4,     ui/pip2, 8, 8]
+    - [0x95110, palette, ui/pip2]
+    - [0x95130, data]
     - [0x9D658, rgba32,  ui/stat_heart, 16, 16]
     - [0x9DA58, data]
     - [0x9DA60, rgba32,  ui/stat_flower, 16, 16]
@@ -458,7 +489,7 @@ segments:
     subsegments:
     - [0x0fee30, c, sprite]
     - [0x101b90, c, 101b90_len_8f0]
-    # - [0x102480, .data, sprite]
+    - [0x102480]
   - type: code
     start: 0x102610
     vram: 0x802E0D90

ver/us/symbol_addrs.txt

@@ -18344,7 +18344,21 @@ D_800DC040 = 0x800DC040; // type:data
 D_800DC060 = 0x800DC060; // type:data
 D_800DC064 = 0x800DC064; // type:data
 gBattleState = 0x800DC068; //
-gBattleStatus = 0x800DC070; // size:0x490
+gBattleStatus = 0x800DC070; // size:0x460
+D_800DC4D0 = 0x800DC4D0; // type:data
+D_800DC4D4 = 0x800DC4D4; // type:data
+D_800DC4D8 = 0x800DC4D8; // type:data
+gBattleState2 = 0x800DC4DC; // type:data
+D_800DC4E0 = 0x800DC4E0; // type:data
+D_800DC4E4 = 0x800DC4E4; // type:data
+D_800DC4E8 = 0x800DC4E8; // type:data
+gCurrentBattleSection = 0x800DC4EA; // type:data
+D_800DC4EB = 0x800DC4EB; // type:data
+D_800DC4EC = 0x800DC4EC; // type:data
+D_800DC4F0 = 0x800DC4F0; // type:data
+D_800DC4F4 = 0x800DC4F4; // type:data
+D_800DC4F8 = 0x800DC4F8; // type:data
+D_800DC4FC = 0x800DC4FC; // type:data
 _use_partner_ability = 0x800EA6CC; // type:func
 D_800F7BBC = 0x800F7BBC; // type:data
 D_800F7BE8 = 0x800F7BE8; // type:data

ver/us/undefined_syms.txt

@@ -58,3 +58,5 @@ D_8038F800 = 0x8038F800;
 D_803B5000 = 0x803B5000;
 B_80240FD0_tst_04 = 0x80240FD0;
 D_802EF0D0 = 0x802EF0D0;
+D_800FBB60 = 0x800FBB60;
+D_800FBBE0 = 0x800FBBE0;

ver/us/undefined_syms_auto.txt

@@ -149,7 +149,6 @@ gCurrentDynamicEntityListPtr = 0x80154420;
 gMessageBuffers = 0x80154430;
 gMessagePrinters = 0x80154C30;
 gMessageStringVars = 0x80155C38;
-gMessageStringVars = 0x80155C38;
 D_80155C98 = 0x80155C98;
 gMessageWindowProjMatrix = 0x80155CA0;
 D_80155D20 = 0x80155D20;