summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/battle_811DA74.s24
-rw-r--r--asm/battle_ai.s4
-rw-r--r--asm/battle_anim_80CA710.s24
-rw-r--r--asm/battle_anim_813F0F4.s4
-rw-r--r--asm/battle_message.s84
-rw-r--r--asm/cable_club.s28
-rw-r--r--asm/contest.s4
-rw-r--r--asm/item_use.s4
-rw-r--r--asm/party_menu.s8
-rw-r--r--asm/pokeball.s4
-rw-r--r--asm/pokemon_3.s12
-rw-r--r--asm/rom3.s40
-rw-r--r--asm/rom5.s20
-rw-r--r--asm/rom_800D42C.s576
-rw-r--r--asm/rom_804373C.s24
-rw-r--r--asm/rom_8077ABC.s16
-rw-r--r--asm/rom_81258BC.s28
-rw-r--r--src/battle_ai.c16
-rw-r--r--src/battle_setup.c26
-rw-r--r--src/calculate_base_damage.c62
-rw-r--r--src/link.c6
-rw-r--r--src/pokemon_2.c8
-rw-r--r--src/sound.c4
-rw-r--r--src/text.c4
-rw-r--r--sym_ewram.txt2
25 files changed, 516 insertions, 516 deletions
diff --git a/asm/battle_811DA74.s b/asm/battle_811DA74.s
index daba0579b..13a7f974e 100644
--- a/asm/battle_811DA74.s
+++ b/asm/battle_811DA74.s
@@ -190,7 +190,7 @@ sub_811DBC0: @ 811DBC0
lsls r0, 24
cmp r0, 0
beq _0811DC18
- ldr r0, _0811DC04 @ =gUnknown_020239F8
+ ldr r0, _0811DC04 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -214,7 +214,7 @@ _0811DBE4:
bne _0811DC50
b _0811DC4E
.align 2, 0
-_0811DC04: .4byte gUnknown_020239F8
+_0811DC04: .4byte gBattleTypeFlags
_0811DC08: .4byte gSprites
_0811DC0C: .4byte gUnknown_03004340
_0811DC10: .4byte gUnknown_02024A60
@@ -334,7 +334,7 @@ sub_811DCA0: @ 811DCA0
lsls r0, 24
cmp r0, 0
beq _0811DD56
- ldr r0, _0811DDC4 @ =gUnknown_020239F8
+ ldr r0, _0811DDC4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -426,7 +426,7 @@ _0811DDB4:
.align 2, 0
_0811DDBC: .4byte gUnknown_02024A60
_0811DDC0: .4byte 0x02017810
-_0811DDC4: .4byte gUnknown_020239F8
+_0811DDC4: .4byte gBattleTypeFlags
_0811DDC8: .4byte gUnknown_0300434C
_0811DDCC: .4byte gSprites
_0811DDD0: .4byte gUnknown_03004340
@@ -1021,7 +1021,7 @@ sub_811E29C: @ 811E29C
ands r0, r1
cmp r0, 0
bne _0811E302
- ldr r0, _0811E2D0 @ =gUnknown_020239F8
+ ldr r0, _0811E2D0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1038,7 +1038,7 @@ sub_811E29C: @ 811E29C
b _0811E302
.align 2, 0
_0811E2CC: .4byte gPaletteFade
-_0811E2D0: .4byte gUnknown_020239F8
+_0811E2D0: .4byte gBattleTypeFlags
_0811E2D4: .4byte gUnknown_03004330
_0811E2D8: .4byte gUnknown_02024A60
_0811E2DC: .4byte sub_811E258
@@ -1078,7 +1078,7 @@ dp01_tbl3_exec_completed: @ 811E314
adds r0, r1
ldr r1, _0811E35C @ =sub_811DA94
str r1, [r0]
- ldr r0, _0811E360 @ =gUnknown_020239F8
+ ldr r0, _0811E360 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1102,7 +1102,7 @@ dp01_tbl3_exec_completed: @ 811E314
_0811E354: .4byte gUnknown_03004330
_0811E358: .4byte gUnknown_02024A60
_0811E35C: .4byte sub_811DA94
-_0811E360: .4byte gUnknown_020239F8
+_0811E360: .4byte gBattleTypeFlags
_0811E364: .4byte gUnknown_02023A60
_0811E368:
ldr r2, _0811E384 @ =gUnknown_02024A64
@@ -3900,7 +3900,7 @@ sub_811FAE4: @ 811FAE4
push {r4-r6,lr}
mov r6, r8
push {r6}
- ldr r0, _0811FB14 @ =gUnknown_020239F8
+ ldr r0, _0811FB14 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -3921,7 +3921,7 @@ _0811FB0A:
bl sub_803FC34
b _0811FB34
.align 2, 0
-_0811FB14: .4byte gUnknown_020239F8
+_0811FB14: .4byte gBattleTypeFlags
_0811FB18: .4byte gUnknown_02024A60
_0811FB1C: .4byte 0x0000fff0
_0811FB20: .4byte gLinkPlayers
@@ -5471,7 +5471,7 @@ _08120748:
lsls r0, 24
cmp r0, 0
beq _08120768
- ldr r0, _0812078C @ =gUnknown_020239F8
+ ldr r0, _0812078C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -5494,7 +5494,7 @@ _08120768:
b _081207EC
.align 2, 0
_08120788: .4byte gUnknown_02024A60
-_0812078C: .4byte gUnknown_020239F8
+_0812078C: .4byte gBattleTypeFlags
_08120790: .4byte gUnknown_02023A60
_08120794: .4byte gUnknown_02024A6A
_08120798:
diff --git a/asm/battle_ai.s b/asm/battle_ai.s
index 5df4635b2..829768e17 100644
--- a/asm/battle_ai.s
+++ b/asm/battle_ai.s
@@ -1649,7 +1649,7 @@ _08109598: .4byte gUnknown_02024CA8
thumb_func_start BattleAICmd_unk_4C
BattleAICmd_unk_4C: @ 810959C
ldr r2, _081095B4 @ =0x02016800
- ldr r0, _081095B8 @ =gUnknown_020239F8
+ ldr r0, _081095B8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -1661,7 +1661,7 @@ BattleAICmd_unk_4C: @ 810959C
bx lr
.align 2, 0
_081095B4: .4byte 0x02016800
-_081095B8: .4byte gUnknown_020239F8
+_081095B8: .4byte gBattleTypeFlags
_081095BC: .4byte gAIScriptPtr
thumb_func_end BattleAICmd_unk_4C
diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s
index 58064e741..9b362a166 100644
--- a/asm/battle_anim_80CA710.s
+++ b/asm/battle_anim_80CA710.s
@@ -11131,7 +11131,7 @@ _080CFBCA:
lsrs r0, 24
strh r0, [r4, 0x1C]
mov r9, r0
- ldr r0, _080CFC2C @ =gUnknown_020239F8
+ ldr r0, _080CFC2C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -11154,7 +11154,7 @@ _080CFBCA:
.align 2, 0
_080CFC24: .4byte gUnknown_0202F7C8
_080CFC28: .4byte gTasks
-_080CFC2C: .4byte gUnknown_020239F8
+_080CFC2C: .4byte gBattleTypeFlags
_080CFC30: .4byte gUnknown_0202F7C9
_080CFC34:
mov r5, sp
@@ -17876,7 +17876,7 @@ _080D300E:
sub_80D3014: @ 80D3014
push {r4,r5,lr}
adds r5, r0, 0
- ldr r0, _080D3058 @ =gUnknown_020239F8
+ ldr r0, _080D3058 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -17905,7 +17905,7 @@ sub_80D3014: @ 80D3014
bl StartSpriteAffineAnim
b _080D3080
.align 2, 0
-_080D3058: .4byte gUnknown_020239F8
+_080D3058: .4byte gBattleTypeFlags
_080D305C: .4byte gUnknown_0202F7C8
_080D3060:
ldr r4, _080D30A0 @ =gUnknown_0202F7C8
@@ -53422,7 +53422,7 @@ sub_80E43C0: @ 80E43C0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, _080E43D8 @ =gUnknown_020239F8
+ ldr r0, _080E43D8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -53431,7 +53431,7 @@ sub_80E43C0: @ 80E43C0
ldr r0, _080E43DC @ =sub_80E4C34
b _080E4408
.align 2, 0
-_080E43D8: .4byte gUnknown_020239F8
+_080E43D8: .4byte gBattleTypeFlags
_080E43DC: .4byte sub_80E4C34
_080E43E0:
movs r0, 0x80
@@ -53560,7 +53560,7 @@ _080E44D0:
.4byte _080E4588
.4byte _080E46B8
_080E44E4:
- ldr r0, _080E44FC @ =gUnknown_020239F8
+ ldr r0, _080E44FC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -53573,7 +53573,7 @@ _080E44E4:
movs r1, 0x10
b _080E450A
.align 2, 0
-_080E44FC: .4byte gUnknown_020239F8
+_080E44FC: .4byte gBattleTypeFlags
_080E4500:
lsls r0, r4, 2
adds r0, r4
@@ -53929,7 +53929,7 @@ _080E47B0:
adds r2, r0, r1
movs r3, 0x10
strh r3, [r2, 0x10]
- ldr r0, _080E47D0 @ =gUnknown_020239F8
+ ldr r0, _080E47D0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -53939,7 +53939,7 @@ _080E47B0:
b _080E47D8
.align 2, 0
_080E47CC: .4byte gTasks
-_080E47D0: .4byte gUnknown_020239F8
+_080E47D0: .4byte gBattleTypeFlags
_080E47D4:
movs r0, 0x1
strh r0, [r2, 0xC]
@@ -54246,7 +54246,7 @@ _080E4A14:
lsls r0, 3
adds r3, r0, r1
strh r2, [r3, 0x10]
- ldr r0, _080E4A5C @ =gUnknown_020239F8
+ ldr r0, _080E4A5C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -54260,7 +54260,7 @@ _080E4A4C: .4byte 0x00001842
_080E4A50: .4byte REG_BLDALPHA
_080E4A54: .4byte 0x00000808
_080E4A58: .4byte gTasks
-_080E4A5C: .4byte gUnknown_020239F8
+_080E4A5C: .4byte gBattleTypeFlags
_080E4A60:
movs r0, 0x1
_080E4A62:
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index 1fb399349..bbdce5e93 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -1344,7 +1344,7 @@ sub_813FBB8: @ 813FBB8
push {r6,r7}
lsls r0, 24
lsrs r7, r0, 24
- ldr r0, _0813FBD8 @ =gUnknown_020239F8
+ ldr r0, _0813FBD8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 2
@@ -1355,7 +1355,7 @@ sub_813FBB8: @ 813FBB8
movs r5, 0xB
b _0813FBE0
.align 2, 0
-_0813FBD8: .4byte gUnknown_020239F8
+_0813FBD8: .4byte gBattleTypeFlags
_0813FBDC:
movs r6, 0x17
movs r5, 0x5
diff --git a/asm/battle_message.s b/asm/battle_message.s
index 8f903970f..c4e4a7dd0 100644
--- a/asm/battle_message.s
+++ b/asm/battle_message.s
@@ -136,7 +136,7 @@ _08120BB0:
.4byte _08120DE8
.4byte _08120E50
_08120BC8:
- ldr r0, _08120BEC @ =gUnknown_020239F8
+ ldr r0, _08120BEC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -156,7 +156,7 @@ _08120BE8:
ldr r6, _08120BF4 @ =gUnknown_084005DB
b _08120F70
.align 2, 0
-_08120BEC: .4byte gUnknown_020239F8
+_08120BEC: .4byte gBattleTypeFlags
_08120BF0: .4byte gUnknown_084005C7
_08120BF4: .4byte gUnknown_084005DB
_08120BF8:
@@ -203,7 +203,7 @@ _08120C40:
lsls r0, 24
cmp r0, 0
bne _08120C7C
- ldr r0, _08120C68 @ =gUnknown_020239F8
+ ldr r0, _08120C68 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -219,7 +219,7 @@ _08120C64:
ldr r6, _08120C70 @ =gUnknown_084006F1
b _08120F70
.align 2, 0
-_08120C68: .4byte gUnknown_020239F8
+_08120C68: .4byte gBattleTypeFlags
_08120C6C: .4byte gUnknown_084006A4
_08120C70: .4byte gUnknown_084006F1
_08120C74:
@@ -228,7 +228,7 @@ _08120C74:
.align 2, 0
_08120C78: .4byte gUnknown_0840069C
_08120C7C:
- ldr r0, _08120C94 @ =gUnknown_020239F8
+ ldr r0, _08120C94 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -241,7 +241,7 @@ _08120C7C:
ldr r6, _08120C98 @ =gUnknown_0840065C
b _08120F70
.align 2, 0
-_08120C94: .4byte gUnknown_020239F8
+_08120C94: .4byte gBattleTypeFlags
_08120C98: .4byte gUnknown_0840065C
_08120C9C:
movs r0, 0x2
@@ -290,7 +290,7 @@ _08120CF0: .4byte gUnknown_08400709
_08120CF4:
cmp r2, 0x1
beq _08120D04
- ldr r0, _08120D08 @ =gUnknown_020239F8
+ ldr r0, _08120D08 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -300,7 +300,7 @@ _08120D04:
ldr r6, _08120D0C @ =gUnknown_08400727
b _08120F70
.align 2, 0
-_08120D08: .4byte gUnknown_020239F8
+_08120D08: .4byte gBattleTypeFlags
_08120D0C: .4byte gUnknown_08400727
_08120D10:
ldr r6, _08120D1C @ =gUnknown_08400749
@@ -320,7 +320,7 @@ _08120D24:
lsls r0, 4
cmp r1, r0
bne _08120D54
- ldr r0, _08120D48 @ =gUnknown_020239F8
+ ldr r0, _08120D48 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -333,7 +333,7 @@ _08120D40:
b _08120F70
.align 2, 0
_08120D44: .4byte gTrainerBattleOpponent
-_08120D48: .4byte gUnknown_020239F8
+_08120D48: .4byte gBattleTypeFlags
_08120D4C: .4byte gUnknown_08400771
_08120D50: .4byte gUnknown_08400781
_08120D54:
@@ -354,7 +354,7 @@ _08120D5C:
ldrb r3, [r0]
cmp r3, 0
beq _08120D82
- ldr r0, _08120D90 @ =gUnknown_020239F8
+ ldr r0, _08120D90 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -366,7 +366,7 @@ _08120D82:
.align 2, 0
_08120D88: .4byte 0x00016003
_08120D8C: .4byte 0x000160c1
-_08120D90: .4byte gUnknown_020239F8
+_08120D90: .4byte gBattleTypeFlags
_08120D94: .4byte gUnknown_084006B3
_08120D98:
cmp r3, 0x1
@@ -387,7 +387,7 @@ _08120DAC:
_08120DB0: .4byte gUnknown_084006D5
_08120DB4: .4byte gUnknown_084006C6
_08120DB8:
- ldr r0, _08120DD4 @ =gUnknown_020239F8
+ ldr r0, _08120DD4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -403,7 +403,7 @@ _08120DD0:
ldr r6, _08120DDC @ =gUnknown_0840068C
b _08120F70
.align 2, 0
-_08120DD4: .4byte gUnknown_020239F8
+_08120DD4: .4byte gBattleTypeFlags
_08120DD8: .4byte gUnknown_0840067C
_08120DDC: .4byte gUnknown_0840068C
_08120DE0:
@@ -491,7 +491,7 @@ _08120E7C:
_08120E90: .4byte gUnknown_030041C0
_08120E94: .4byte gUnknown_083FFEFC
_08120E98:
- ldr r0, _08120EAC @ =gUnknown_020239F8
+ ldr r0, _08120EAC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -501,7 +501,7 @@ _08120E98:
ldr r6, _08120EB4 @ =gUnknown_083FFFF7
b _08120F70
.align 2, 0
-_08120EAC: .4byte gUnknown_020239F8
+_08120EAC: .4byte gBattleTypeFlags
_08120EB0: .4byte gUnknown_083FFFEA
_08120EB4: .4byte gUnknown_083FFFF7
_08120EB8:
@@ -518,7 +518,7 @@ _08120EB8:
eors r0, r1
strb r0, [r5]
_08120ED2:
- ldr r0, _08120EF0 @ =gUnknown_020239F8
+ ldr r0, _08120EF0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -534,7 +534,7 @@ _08120ED2:
beq _08120EFE
b _08120F70
.align 2, 0
-_08120EF0: .4byte gUnknown_020239F8
+_08120EF0: .4byte gBattleTypeFlags
_08120EF4: .4byte gUnknown_030041C0
_08120EF8:
cmp r0, 0x3
@@ -975,7 +975,7 @@ _081212A8:
adds r2, r4, 0
cmp r0, 0
beq _0812131C
- ldr r0, _081212D0 @ =gUnknown_020239F8
+ ldr r0, _081212D0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -986,7 +986,7 @@ _081212A8:
b _081212E6
.align 2, 0
_081212CC: .4byte gUnknown_02024C07
-_081212D0: .4byte gUnknown_020239F8
+_081212D0: .4byte gBattleTypeFlags
_081212D4: .4byte gUnknown_08400791
_081212D8: .4byte gUnknown_08400797
_081212DC:
@@ -1089,7 +1089,7 @@ _081213A8:
lsls r0, 24
cmp r0, 0
beq _0812140C
- ldr r0, _081213F8 @ =gUnknown_020239F8
+ ldr r0, _081213F8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -1124,7 +1124,7 @@ _081213E8:
b _08121908
.align 2, 0
_081213F4: .4byte gUnknown_02024C07
-_081213F8: .4byte gUnknown_020239F8
+_081213F8: .4byte gBattleTypeFlags
_081213FC: .4byte gUnknown_08400791
_08121400: .4byte gUnknown_08400797
_08121404: .4byte gUnknown_02024A6A
@@ -1145,7 +1145,7 @@ _0812141C:
lsls r0, 24
cmp r0, 0
beq _08121480
- ldr r0, _0812146C @ =gUnknown_020239F8
+ ldr r0, _0812146C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -1180,7 +1180,7 @@ _0812145C:
b _08121908
.align 2, 0
_08121468: .4byte gUnknown_02024C08
-_0812146C: .4byte gUnknown_020239F8
+_0812146C: .4byte gBattleTypeFlags
_08121470: .4byte gUnknown_08400791
_08121474: .4byte gUnknown_08400797
_08121478: .4byte gUnknown_02024A6A
@@ -1201,7 +1201,7 @@ _08121490:
lsls r0, 24
cmp r0, 0
beq _081214F4
- ldr r0, _081214E0 @ =gUnknown_020239F8
+ ldr r0, _081214E0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -1236,7 +1236,7 @@ _081214D0:
b _08121908
.align 2, 0
_081214DC: .4byte gUnknown_02024C0A
-_081214E0: .4byte gUnknown_020239F8
+_081214E0: .4byte gBattleTypeFlags
_081214E4: .4byte gUnknown_08400791
_081214E8: .4byte gUnknown_08400797
_081214EC: .4byte gUnknown_02024A6A
@@ -1257,7 +1257,7 @@ _08121504:
lsls r0, 24
cmp r0, 0
beq _08121568
- ldr r0, _08121554 @ =gUnknown_020239F8
+ ldr r0, _08121554 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -1292,7 +1292,7 @@ _08121544:
b _08121908
.align 2, 0
_08121550: .4byte gUnknown_02024A60
-_08121554: .4byte gUnknown_020239F8
+_08121554: .4byte gBattleTypeFlags
_08121558: .4byte gUnknown_08400791
_0812155C: .4byte gUnknown_08400797
_08121560: .4byte gUnknown_02024A6A
@@ -1316,7 +1316,7 @@ _08121578:
adds r2, r4, 0
cmp r0, 0
beq _081215E8
- ldr r0, _081215D4 @ =gUnknown_020239F8
+ ldr r0, _081215D4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -1353,7 +1353,7 @@ _081215BC:
.align 2, 0
_081215CC: .4byte 0x02000000
_081215D0: .4byte 0x00016003
-_081215D4: .4byte gUnknown_020239F8
+_081215D4: .4byte gBattleTypeFlags
_081215D8: .4byte gUnknown_08400791
_081215DC: .4byte gUnknown_08400797
_081215E0: .4byte gUnknown_02024A6A
@@ -1419,7 +1419,7 @@ _08121652:
.align 2, 0
_0812165C: .4byte gMoveNames
_08121660:
- ldr r0, _081216AC @ =gUnknown_020239F8
+ ldr r0, _081216AC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1456,7 +1456,7 @@ _08121660:
mov r4, sp
b _081219E6
.align 2, 0
-_081216AC: .4byte gUnknown_020239F8
+_081216AC: .4byte gBattleTypeFlags
_081216B0: .4byte gUnknown_02024C04
_081216B4: .4byte gLinkPlayers
_081216B8: .4byte 0x02000000
@@ -1543,7 +1543,7 @@ _0812174C:
.align 2, 0
_08121764: .4byte gTrainerBattleOpponent
_08121768:
- ldr r0, _08121784 @ =gUnknown_020239F8
+ ldr r0, _08121784 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 1
@@ -1556,7 +1556,7 @@ _08121768:
movs r1, 0xD
b _081217AE
.align 2, 0
-_08121784: .4byte gUnknown_020239F8
+_08121784: .4byte gBattleTypeFlags
_08121788:
movs r0, 0x80
lsls r0, 4
@@ -1606,7 +1606,7 @@ _081217C0:
_081217E4: .4byte gTrainerBattleOpponent
_081217E8: .4byte 0x02017002
_081217EC:
- ldr r0, _08121804 @ =gUnknown_020239F8
+ ldr r0, _08121804 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 1
@@ -1618,7 +1618,7 @@ _081217EC:
mov r4, sp
b _081219E6
.align 2, 0
-_08121804: .4byte gUnknown_020239F8
+_08121804: .4byte gBattleTypeFlags
_08121808:
movs r0, 0x80
lsls r0, 4
@@ -1723,7 +1723,7 @@ _081218C0:
lsls r0, 24
cmp r0, 0
beq _08121934
- ldr r0, _08121920 @ =gUnknown_020239F8
+ ldr r0, _08121920 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -1765,7 +1765,7 @@ _0812190E:
.align 2, 0
_08121918: .4byte 0x02000000
_0812191C: .4byte 0x00016003
-_08121920: .4byte gUnknown_020239F8
+_08121920: .4byte gBattleTypeFlags
_08121924: .4byte gUnknown_08400791
_08121928: .4byte gUnknown_08400797
_0812192C: .4byte gEnemyParty
@@ -2076,7 +2076,7 @@ _08121B64:
.align 2, 0
_08121B84: .4byte gPlayerParty
_08121B88:
- ldr r0, _08121BA0 @ =gUnknown_020239F8
+ ldr r0, _08121BA0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -2087,7 +2087,7 @@ _08121B88:
bl StringAppend
b _08121BB0
.align 2, 0
-_08121BA0: .4byte gUnknown_020239F8
+_08121BA0: .4byte gBattleTypeFlags
_08121BA4: .4byte gUnknown_08400797
_08121BA8:
ldr r1, _08121BD4 @ =gUnknown_08400791
@@ -2196,7 +2196,7 @@ _08121C78:
ldrb r0, [r0, 0x2]
lsls r0, 8
orrs r2, r0
- ldr r0, _08121CC4 @ =gUnknown_020239F8
+ ldr r0, _08121CC4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -2228,7 +2228,7 @@ _08121C78:
ldr r1, _08121CDC @ =gUnknown_08400A85
b _08121CE2
.align 2, 0
-_08121CC4: .4byte gUnknown_020239F8
+_08121CC4: .4byte gBattleTypeFlags
_08121CC8: .4byte gLinkPlayers
_08121CCC: .4byte 0x02000000
_08121CD0: .4byte 0x000160cb
diff --git a/asm/cable_club.s b/asm/cable_club.s
index 0518e721c..b33b19e46 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -1031,7 +1031,7 @@ sub_80834E4: @ 80834E4
ldr r2, _08083504 @ =0x00001133
adds r0, r2, 0
strh r0, [r1]
- ldr r1, _08083508 @ =gUnknown_020239F8
+ ldr r1, _08083508 @ =gBattleTypeFlags
movs r0, 0
strh r0, [r1]
movs r0, 0x2
@@ -1042,7 +1042,7 @@ sub_80834E4: @ 80834E4
.align 2, 0
_08083500: .4byte gLinkType
_08083504: .4byte 0x00001133
-_08083508: .4byte gUnknown_020239F8
+_08083508: .4byte gBattleTypeFlags
thumb_func_end sub_80834E4
thumb_func_start sub_808350C
@@ -1055,7 +1055,7 @@ sub_808350C: @ 808350C
ldr r3, _08083534 @ =0x00003311
adds r0, r3, 0
strh r0, [r1]
- ldr r0, _08083538 @ =gUnknown_020239F8
+ ldr r0, _08083538 @ =gBattleTypeFlags
strh r2, [r0]
movs r0, 0x2
movs r1, 0x4
@@ -1066,7 +1066,7 @@ sub_808350C: @ 808350C
_0808352C: .4byte gScriptResult
_08083530: .4byte gLinkType
_08083534: .4byte 0x00003311
-_08083538: .4byte gUnknown_020239F8
+_08083538: .4byte gBattleTypeFlags
thumb_func_end sub_808350C
thumb_func_start sub_808353C
@@ -1185,7 +1185,7 @@ sub_8083614: @ 8083614
ldr r2, _08083634 @ =0x00004411
adds r0, r2, 0
strh r0, [r1]
- ldr r1, _08083638 @ =gUnknown_020239F8
+ ldr r1, _08083638 @ =gBattleTypeFlags
movs r0, 0
strh r0, [r1]
movs r0, 0x2
@@ -1196,7 +1196,7 @@ sub_8083614: @ 8083614
.align 2, 0
_08083630: .4byte gLinkType
_08083634: .4byte 0x00004411
-_08083638: .4byte gUnknown_020239F8
+_08083638: .4byte gBattleTypeFlags
thumb_func_end sub_8083614
thumb_func_start sub_808363C
@@ -1206,7 +1206,7 @@ sub_808363C: @ 808363C
ldr r2, _0808365C @ =0x00006601
adds r0, r2, 0
strh r0, [r1]
- ldr r1, _08083660 @ =gUnknown_020239F8
+ ldr r1, _08083660 @ =gBattleTypeFlags
movs r0, 0
strh r0, [r1]
movs r0, 0x4
@@ -1217,7 +1217,7 @@ sub_808363C: @ 808363C
.align 2, 0
_08083658: .4byte gLinkType
_0808365C: .4byte 0x00006601
-_08083660: .4byte gUnknown_020239F8
+_08083660: .4byte gBattleTypeFlags
thumb_func_end sub_808363C
thumb_func_start sub_8083664
@@ -1562,20 +1562,20 @@ _08083908:
beq _08083924
b _0808392E
_0808390E:
- ldr r1, _08083914 @ =gUnknown_020239F8
+ ldr r1, _08083914 @ =gBattleTypeFlags
movs r0, 0xA
b _0808392C
.align 2, 0
-_08083914: .4byte gUnknown_020239F8
+_08083914: .4byte gBattleTypeFlags
_08083918:
- ldr r1, _08083920 @ =gUnknown_020239F8
+ ldr r1, _08083920 @ =gBattleTypeFlags
movs r0, 0xB
b _0808392C
.align 2, 0
-_08083920: .4byte gUnknown_020239F8
+_08083920: .4byte gBattleTypeFlags
_08083924:
bl ReducePlayerPartyToThree
- ldr r1, _08083948 @ =gUnknown_020239F8
+ ldr r1, _08083948 @ =gBattleTypeFlags
movs r0, 0x4B
_0808392C:
strh r0, [r1]
@@ -1592,7 +1592,7 @@ _08083940:
pop {r0}
bx r0
.align 2, 0
-_08083948: .4byte gUnknown_020239F8
+_08083948: .4byte gBattleTypeFlags
_0808394C: .4byte sub_800E7C4
_08083950: .4byte gMain
_08083954: .4byte sub_8083958
diff --git a/asm/contest.s b/asm/contest.s
index 08a303366..acde6703a 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -876,7 +876,7 @@ _080AB8CC:
strb r3, [r1, 0x2]
movs r2, 0x2
strb r2, [r1, 0x3]
- ldr r0, _080AB92C @ =gUnknown_020239F8
+ ldr r0, _080AB92C @ =gBattleTypeFlags
strh r4, [r0]
ldr r4, _080AB930 @ =gUnknown_02024C07
strb r2, [r4]
@@ -892,7 +892,7 @@ _080AB8CC:
.align 2, 0
_080AB924: .4byte 0x02019204
_080AB928: .4byte gUnknown_02024A72
-_080AB92C: .4byte gUnknown_020239F8
+_080AB92C: .4byte gBattleTypeFlags
_080AB930: .4byte gUnknown_02024C07
_080AB934: .4byte gUnknown_02024C08
_080AB938: .4byte gUnknown_02024BE0
diff --git a/asm/item_use.s b/asm/item_use.s
index 00d337741..0f6077bdc 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -1921,7 +1921,7 @@ ItemUseInBattle_Escape: @ 80CA4C8
movs r2, 0xD
movs r3, 0x14
bl MenuZeroFillWindowRect
- ldr r0, _080CA4F8 @ =gUnknown_020239F8
+ ldr r0, _080CA4F8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -1935,7 +1935,7 @@ ItemUseInBattle_Escape: @ 80CA4C8
bl DisplayItemMessageOnField
b _080CA516
.align 2, 0
-_080CA4F8: .4byte gUnknown_020239F8
+_080CA4F8: .4byte gBattleTypeFlags
_080CA4FC: .4byte gStringVar4
_080CA500: .4byte sub_80A7094
_080CA504:
diff --git a/asm/party_menu.s b/asm/party_menu.s
index a47422dc8..7e2011df3 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -71,7 +71,7 @@ sub_806AF4C: @ 806AF4C
lsrs r3, 24
cmp r1, 0xFF
beq _0806AF64
- ldr r0, _0806AF84 @ =gUnknown_020239F8
+ ldr r0, _0806AF84 @ =gBattleTypeFlags
strh r1, [r0]
_0806AF64:
ldr r0, _0806AF88 @ =0x0201b000
@@ -90,7 +90,7 @@ _0806AF64:
pop {r0}
bx r0
.align 2, 0
-_0806AF84: .4byte gUnknown_020239F8
+_0806AF84: .4byte gBattleTypeFlags
_0806AF88: .4byte 0x0201b000
thumb_func_end sub_806AF4C
@@ -777,7 +777,7 @@ _0806B524: .4byte 0x0000ffff
thumb_func_start IsLinkDoubleBattle
IsLinkDoubleBattle: @ 806B528
push {lr}
- ldr r0, _0806B53C @ =gUnknown_020239F8
+ ldr r0, _0806B53C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x4B
ands r0, r1
@@ -786,7 +786,7 @@ IsLinkDoubleBattle: @ 806B528
movs r0, 0
b _0806B542
.align 2, 0
-_0806B53C: .4byte gUnknown_020239F8
+_0806B53C: .4byte gBattleTypeFlags
_0806B540:
movs r0, 0x1
_0806B542:
diff --git a/asm/pokeball.s b/asm/pokeball.s
index b596494ef..57e4a5a21 100644
--- a/asm/pokeball.s
+++ b/asm/pokeball.s
@@ -1184,7 +1184,7 @@ _08046D5A:
ands r0, r1
cmp r0, 0
beq _08046DAE
- ldr r0, _08046D9C @ =gUnknown_020239F8
+ ldr r0, _08046D9C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -1201,7 +1201,7 @@ _08046D5A:
_08046D90: .4byte gUnknown_02024A6A
_08046D94: .4byte gPlayerParty
_08046D98: .4byte 0x02017840
-_08046D9C: .4byte gUnknown_020239F8
+_08046D9C: .4byte gBattleTypeFlags
_08046DA0: .4byte gMPlay_BGM
_08046DA4:
ldr r0, _08046DC8 @ =gMPlay_BGM
diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index 45652a840..d4bb815b3 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -666,7 +666,7 @@ _0803FD74:
_0803FD84:
cmp r5, 0x3
bne _0803FDB4
- ldr r0, _0803FE60 @ =gUnknown_020239F8
+ ldr r0, _0803FE60 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -776,7 +776,7 @@ _0803FE56:
pop {r0}
bx r0
.align 2, 0
-_0803FE60: .4byte gUnknown_020239F8
+_0803FE60: .4byte gBattleTypeFlags
_0803FE64: .4byte gTrainers
_0803FE68: .4byte gTrainerBattleOpponent
_0803FE6C: .4byte gUnknown_082082FE
@@ -1960,7 +1960,7 @@ _08040724: .4byte gUnknown_02024E84
thumb_func_start sub_8040728
sub_8040728: @ 8040728
push {lr}
- ldr r0, _0804073C @ =gUnknown_020239F8
+ ldr r0, _0804073C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 5
@@ -1970,7 +1970,7 @@ sub_8040728: @ 8040728
ldr r0, _08040740 @ =0x000001cf
b _080408B2
.align 2, 0
-_0804073C: .4byte gUnknown_020239F8
+_0804073C: .4byte gBattleTypeFlags
_08040740: .4byte 0x000001cf
_08040744:
movs r0, 0x80
@@ -2595,7 +2595,7 @@ _08040C34: .4byte gStringVar4
thumb_func_start sub_8040C38
sub_8040C38: @ 8040C38
push {r4,r5,lr}
- ldr r0, _08040C90 @ =gUnknown_020239F8
+ ldr r0, _08040C90 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _08040C94 @ =0x00002008
ands r0, r1
@@ -2636,7 +2636,7 @@ _08040C82:
bl SetMonData
b _08040CAC
.align 2, 0
-_08040C90: .4byte gUnknown_020239F8
+_08040C90: .4byte gBattleTypeFlags
_08040C94: .4byte 0x00002008
_08040C98: .4byte gEnemyParty
_08040C9C: .4byte gBaseStats
diff --git a/asm/rom3.s b/asm/rom3.s
index f5238ddb5..ad1a0ff46 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -9,7 +9,7 @@
thumb_func_start sub_800B858
sub_800B858: @ 800B858
push {lr}
- ldr r0, _0800B87C @ =gUnknown_020239F8
+ ldr r0, _0800B87C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -24,7 +24,7 @@ _0800B876:
pop {r0}
bx r0
.align 2, 0
-_0800B87C: .4byte gUnknown_020239F8
+_0800B87C: .4byte gBattleTypeFlags
_0800B880: .4byte sub_8083C50
thumb_func_end sub_800B858
@@ -70,7 +70,7 @@ _0800B8A0:
bl sub_8075624
bl sub_8040710
bl sub_81070D4
- ldr r0, _0800B940 @ =gUnknown_020239F8
+ ldr r0, _0800B940 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x10
ands r0, r1
@@ -111,7 +111,7 @@ _0800B930: .4byte gUnknown_02024E64
_0800B934: .4byte nullsub_91
_0800B938: .4byte gUnknown_02024A72
_0800B93C: .4byte gUnknown_02024A64
-_0800B940: .4byte gUnknown_020239F8
+_0800B940: .4byte gBattleTypeFlags
_0800B944: .4byte gEnemyParty
_0800B948: .4byte gUnknown_020239FC
_0800B94C: .4byte gUnknown_02024C78
@@ -120,7 +120,7 @@ _0800B94C: .4byte gUnknown_02024C78
thumb_func_start sub_800B950
sub_800B950: @ 800B950
push {r4,r5,lr}
- ldr r0, _0800B964 @ =gUnknown_020239F8
+ ldr r0, _0800B964 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -129,12 +129,12 @@ sub_800B950: @ 800B950
bl sub_800BA78
b _0800B96C
.align 2, 0
-_0800B964: .4byte gUnknown_020239F8
+_0800B964: .4byte gBattleTypeFlags
_0800B968:
bl sub_800B9A8
_0800B96C:
bl sub_800BD54
- ldr r0, _0800B9A0 @ =gUnknown_020239F8
+ ldr r0, _0800B9A0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -160,14 +160,14 @@ _0800B99A:
pop {r0}
bx r0
.align 2, 0
-_0800B9A0: .4byte gUnknown_020239F8
+_0800B9A0: .4byte gBattleTypeFlags
_0800B9A4: .4byte gUnknown_02024A68
thumb_func_end sub_800B950
thumb_func_start sub_800B9A8
sub_800B9A8: @ 800B9A8
push {r4,lr}
- ldr r0, _0800B9CC @ =gUnknown_020239F8
+ ldr r0, _0800B9CC @ =gBattleTypeFlags
ldrh r2, [r0]
movs r0, 0x1
ands r0, r2
@@ -184,7 +184,7 @@ sub_800B9A8: @ 800B9A8
ldr r0, _0800B9DC @ =sub_812B468
b _0800B9FC
.align 2, 0
-_0800B9CC: .4byte gUnknown_020239F8
+_0800B9CC: .4byte gBattleTypeFlags
_0800B9D0: .4byte gUnknown_030042D4
_0800B9D4: .4byte sub_8010800
_0800B9D8: .4byte gUnknown_03004330
@@ -267,7 +267,7 @@ sub_800BA78: @ 800BA78
mov r6, r9
mov r5, r8
push {r5-r7}
- ldr r6, _0800BAB8 @ =gUnknown_020239F8
+ ldr r6, _0800BAB8 @ =gBattleTypeFlags
ldrh r1, [r6]
movs r5, 0x1
movs r4, 0x1
@@ -295,7 +295,7 @@ sub_800BA78: @ 800BA78
movs r0, 0x2
b _0800BD3E
.align 2, 0
-_0800BAB8: .4byte gUnknown_020239F8
+_0800BAB8: .4byte gBattleTypeFlags
_0800BABC: .4byte gUnknown_030042D4
_0800BAC0: .4byte sub_8010800
_0800BAC4: .4byte gUnknown_03004330
@@ -632,7 +632,7 @@ sub_800BD54: @ 800BD54
mov r6, r9
mov r5, r8
push {r5-r7}
- ldr r0, _0800BD74 @ =gUnknown_020239F8
+ ldr r0, _0800BD74 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -644,7 +644,7 @@ _0800BD6C:
mov r8, r0
b _0800BE7E
.align 2, 0
-_0800BD74: .4byte gUnknown_020239F8
+_0800BD74: .4byte gBattleTypeFlags
_0800BD78:
movs r5, 0
movs r0, 0x1
@@ -797,7 +797,7 @@ dp01_prepare_buffer: @ 800BE9C
adds r5, r3, 0
lsls r2, 16
lsrs r2, 16
- ldr r0, _0800BEC4 @ =gUnknown_020239F8
+ ldr r0, _0800BEC4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -809,7 +809,7 @@ dp01_prepare_buffer: @ 800BE9C
bl dp01_prepare_buffer_wireless_probably
b _0800BF1A
.align 2, 0
-_0800BEC4: .4byte gUnknown_020239F8
+_0800BEC4: .4byte gBattleTypeFlags
_0800BEC8:
cmp r5, 0
beq _0800BED2
@@ -1393,7 +1393,7 @@ sub_800C35C: @ 800C35C
ldrb r0, [r0]
cmp r0, 0
beq _0800C458
- ldr r0, _0800C390 @ =gUnknown_020239F8
+ ldr r0, _0800C390 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x20
ands r0, r1
@@ -1410,7 +1410,7 @@ sub_800C35C: @ 800C35C
b _0800C44C
.align 2, 0
_0800C38C: .4byte gReceivedRemoteLinkPlayers
-_0800C390: .4byte gUnknown_020239F8
+_0800C390: .4byte gBattleTypeFlags
_0800C394: .4byte gLinkPlayers
_0800C398: .4byte 0x00002211
_0800C39C: .4byte gBlockRecvBuffer
@@ -1620,7 +1620,7 @@ _0800C50E:
bl memcpy
adds r0, r4, 0
bl sub_80155A4
- ldr r0, _0800C598 @ =gUnknown_020239F8
+ ldr r0, _0800C598 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x4
ands r0, r1
@@ -1664,7 +1664,7 @@ _0800C588: .4byte gUnknown_02024A64
_0800C58C: .4byte gBitTable
_0800C590: .4byte gUnknown_02023A60
_0800C594: .4byte 0x00015008
-_0800C598: .4byte gUnknown_020239F8
+_0800C598: .4byte gBattleTypeFlags
_0800C59C: .4byte gUnknown_02024C07
_0800C5A0: .4byte 0x00015002
_0800C5A4: .4byte gUnknown_02024C08
diff --git a/asm/rom5.s b/asm/rom5.s
index 3879f6c91..3e0ebe208 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -420,7 +420,7 @@ _0807B0E8:
bl sub_8032350
b _0807B168
_0807B0F2:
- ldr r2, _0807B108 @ =gUnknown_020239F8
+ ldr r2, _0807B108 @ =gBattleTypeFlags
ldrh r1, [r2]
movs r0, 0x80
ands r0, r1
@@ -432,7 +432,7 @@ _0807B0F2:
ldrb r0, [r0, 0x8]
b _0807B122
.align 2, 0
-_0807B108: .4byte gUnknown_020239F8
+_0807B108: .4byte gBattleTypeFlags
_0807B10C: .4byte gSaveBlock2
_0807B110:
ldrh r1, [r2]
@@ -650,7 +650,7 @@ _0807B2CC: .4byte gSprites
_0807B2D0: .4byte SpriteCallbackDummy
_0807B2D4: .4byte gUnknown_02024E84
_0807B2D8:
- ldr r2, _0807B328 @ =gUnknown_020239F8
+ ldr r2, _0807B328 @ =gBattleTypeFlags
ldrh r1, [r2]
movs r0, 0x80
ands r0, r1
@@ -688,7 +688,7 @@ _0807B2D8:
adds r0, r6, 0
b _0807B37C
.align 2, 0
-_0807B328: .4byte gUnknown_020239F8
+_0807B328: .4byte gBattleTypeFlags
_0807B32C: .4byte gSaveBlock2
_0807B330: .4byte gUnknown_02024E8C
_0807B334: .4byte gTrainerBackPicCoords
@@ -918,7 +918,7 @@ sub_807B508: @ 807B508
bcc _0807B518
b _0807B68A
_0807B518:
- ldr r2, _0807B534 @ =gUnknown_020239F8
+ ldr r2, _0807B534 @ =gBattleTypeFlags
ldrh r1, [r2]
movs r0, 0x80
ands r0, r1
@@ -930,7 +930,7 @@ _0807B518:
b _0807B550
.align 2, 0
_0807B530: .4byte gUnknown_02024A68
-_0807B534: .4byte gUnknown_020239F8
+_0807B534: .4byte gBattleTypeFlags
_0807B538:
ldrh r1, [r2]
movs r0, 0x80
@@ -976,7 +976,7 @@ _0807B58C: .4byte gUnknown_03004340
_0807B590: .4byte gUnknown_02024A6A
_0807B594: .4byte gEnemyParty
_0807B598:
- ldr r0, _0807B5C0 @ =gUnknown_020239F8
+ ldr r0, _0807B5C0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -995,7 +995,7 @@ _0807B598:
bl sub_8045A5C
b _0807B5E4
.align 2, 0
-_0807B5C0: .4byte gUnknown_020239F8
+_0807B5C0: .4byte gBattleTypeFlags
_0807B5C4: .4byte gUnknown_02024A6A
_0807B5C8: .4byte gPlayerParty
_0807B5CC:
@@ -1065,7 +1065,7 @@ _0807B654: .4byte gUnknown_03004340
_0807B658: .4byte gUnknown_02024A6A
_0807B65C: .4byte gEnemyParty
_0807B660:
- ldr r0, _0807B690 @ =gUnknown_020239F8
+ ldr r0, _0807B690 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -1089,7 +1089,7 @@ _0807B68A:
pop {r0}
bx r0
.align 2, 0
-_0807B690: .4byte gUnknown_020239F8
+_0807B690: .4byte gBattleTypeFlags
_0807B694: .4byte gUnknown_02024A6A
_0807B698: .4byte gPlayerParty
thumb_func_end sub_807B508
diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s
index 4674037d6..6c0ae19b4 100644
--- a/asm/rom_800D42C.s
+++ b/asm/rom_800D42C.s
@@ -493,7 +493,7 @@ _0800D7B4: .4byte gPlttBufferFaded + 0xB8
thumb_func_start sub_800D7B8
sub_800D7B8: @ 800D7B8
push {r4,r5,lr}
- ldr r0, _0800D7DC @ =gUnknown_020239F8
+ ldr r0, _0800D7DC @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0800D7E0 @ =0x00000902
ands r0, r1
@@ -508,7 +508,7 @@ sub_800D7B8: @ 800D7B8
ldr r0, _0800D7F4 @ =gBattleTerrainPalette_BattleTower
b _0800DA66
.align 2, 0
-_0800D7DC: .4byte gUnknown_020239F8
+_0800D7DC: .4byte gBattleTypeFlags
_0800D7E0: .4byte 0x00000902
_0800D7E4: .4byte gBattleTerrainTiles_Building
_0800D7E8: .4byte 0x06008000
@@ -832,7 +832,7 @@ sub_800DAF8: @ 800DAF8
lsls r1, 24
lsrs r3, r1, 24
movs r4, 0
- ldr r0, _0800DB38 @ =gUnknown_020239F8
+ ldr r0, _0800DB38 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -855,7 +855,7 @@ sub_800DAF8: @ 800DAF8
beq _0800DB4A
b _0800DB84
.align 2, 0
-_0800DB38: .4byte gUnknown_020239F8
+_0800DB38: .4byte gBattleTypeFlags
_0800DB3C: .4byte gTasks
_0800DB40:
cmp r3, 0x2
@@ -1005,7 +1005,7 @@ _0800DC40: .4byte gUnknown_02024D26
_0800DC44: .4byte gUnknown_03004210
_0800DC48: .4byte gUnknown_08400E57
_0800DC4C:
- ldr r0, _0800DC80 @ =gUnknown_020239F8
+ ldr r0, _0800DC80 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -1033,7 +1033,7 @@ _0800DC4C:
_0800DC7E:
b _0800DE1C
.align 2, 0
-_0800DC80: .4byte gUnknown_020239F8
+_0800DC80: .4byte gBattleTypeFlags
_0800DC84: .4byte gLinkPlayers
_0800DC88: .4byte 0x02000000
_0800DC8C: .4byte 0x000160cb
@@ -1263,7 +1263,7 @@ _0800DE68:
_0800DE6E:
b _0800E212
_0800DE70:
- ldr r0, _0800DED0 @ =gUnknown_020239F8
+ ldr r0, _0800DED0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -1310,7 +1310,7 @@ _0800DE88:
bge _0800DE88
b _0800DF70
.align 2, 0
-_0800DED0: .4byte gUnknown_020239F8
+_0800DED0: .4byte gBattleTypeFlags
_0800DED4: .4byte gLinkPlayers
_0800DED8: .4byte gUnknown_081F9680
_0800DEDC: .4byte gUnknown_081F9680 + 0x8
@@ -1714,7 +1714,7 @@ _0800E238: .4byte 0xfffffc00
thumb_func_start sub_800E23C
sub_800E23C: @ 800E23C
push {r4,r5,lr}
- ldr r0, _0800E29C @ =gUnknown_020239F8
+ ldr r0, _0800E29C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1756,7 +1756,7 @@ sub_800E23C: @ 800E23C
bl LoadCompressedObjectPic
b _0800E3FC
.align 2, 0
-_0800E29C: .4byte gUnknown_020239F8
+_0800E29C: .4byte gBattleTypeFlags
_0800E2A0: .4byte gVersusFrameGfx
_0800E2A4: .4byte 0x06004000
_0800E2A8: .4byte gVersusFrameTilemap
@@ -1959,7 +1959,7 @@ _0800E474:
.align 2, 0
_0800E480: .4byte gUnknown_08D004E0
_0800E484:
- ldr r0, _0800E4A8 @ =gUnknown_020239F8
+ ldr r0, _0800E4A8 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0800E4AC @ =0x00000902
ands r0, r1
@@ -1979,7 +1979,7 @@ _0800E492:
ldr r0, _0800E4B4 @ =gBattleTerrainTiles_Cave
b _0800E57E
.align 2, 0
-_0800E4A8: .4byte gUnknown_020239F8
+_0800E4A8: .4byte gBattleTypeFlags
_0800E4AC: .4byte 0x00000902
_0800E4B0: .4byte gGameVersion
_0800E4B4: .4byte gBattleTerrainTiles_Cave
@@ -2090,7 +2090,7 @@ _0800E57E:
_0800E588: .4byte gBattleTerrainTiles_Building
_0800E58C: .4byte 0x06008000
_0800E590:
- ldr r0, _0800E5B4 @ =gUnknown_020239F8
+ ldr r0, _0800E5B4 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0800E5B8 @ =0x00000902
ands r0, r1
@@ -2110,7 +2110,7 @@ _0800E59E:
ldr r0, _0800E5C0 @ =gBattleTerrainTilemap_Cave
b _0800E68A
.align 2, 0
-_0800E5B4: .4byte gUnknown_020239F8
+_0800E5B4: .4byte gBattleTypeFlags
_0800E5B8: .4byte 0x00000902
_0800E5BC: .4byte gGameVersion
_0800E5C0: .4byte gBattleTerrainTilemap_Cave
@@ -2222,7 +2222,7 @@ _0800E68A:
_0800E694: .4byte gBattleTerrainTilemap_Building
_0800E698: .4byte 0x0600d000
_0800E69C:
- ldr r0, _0800E6C0 @ =gUnknown_020239F8
+ ldr r0, _0800E6C0 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0800E6C4 @ =0x00000902
ands r0, r1
@@ -2242,7 +2242,7 @@ _0800E6AA:
ldr r0, _0800E6CC @ =gBattleTerrainPalette_Groudon
b _0800E7A6
.align 2, 0
-_0800E6C0: .4byte gUnknown_020239F8
+_0800E6C0: .4byte gBattleTypeFlags
_0800E6C4: .4byte 0x00000902
_0800E6C8: .4byte gGameVersion
_0800E6CC: .4byte gBattleTerrainPalette_Groudon
@@ -2376,7 +2376,7 @@ _0800E7BC:
thumb_func_start sub_800E7C4
sub_800E7C4: @ 800E7C4
push {lr}
- ldr r0, _0800E7E4 @ =gUnknown_020239F8
+ ldr r0, _0800E7E4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -2390,7 +2390,7 @@ sub_800E7C4: @ 800E7C4
strb r0, [r1]
b _0800E7F4
.align 2, 0
-_0800E7E4: .4byte gUnknown_020239F8
+_0800E7E4: .4byte gBattleTypeFlags
_0800E7E8: .4byte sub_800F104
_0800E7EC: .4byte gUnknown_02024D1E
_0800E7F0:
@@ -2512,7 +2512,7 @@ _0800E868:
ldr r0, _0800E96C @ =sub_800FCFC
bl SetVBlankCallback
bl sub_800B884
- ldr r0, _0800E970 @ =gUnknown_020239F8
+ ldr r0, _0800E970 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -2547,13 +2547,13 @@ _0800E960: .4byte gUnknown_03004250
_0800E964: .4byte gWindowConfig_81E71EC
_0800E968: .4byte gReservedSpritePaletteCount
_0800E96C: .4byte sub_800FCFC
-_0800E970: .4byte gUnknown_020239F8
+_0800E970: .4byte gBattleTypeFlags
_0800E974: .4byte sub_800F298
_0800E978:
ldr r0, _0800E9CC @ =sub_800EC9C
bl SetMainCallback2
_0800E97E:
- ldr r0, _0800E9D0 @ =gUnknown_020239F8
+ ldr r0, _0800E9D0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -2592,7 +2592,7 @@ _0800E9AE:
bx r0
.align 2, 0
_0800E9CC: .4byte sub_800EC9C
-_0800E9D0: .4byte gUnknown_020239F8
+_0800E9D0: .4byte gBattleTypeFlags
_0800E9D4: .4byte gEnemyParty
_0800E9D8: .4byte gTrainerBattleOpponent
_0800E9DC: .4byte gMain
@@ -2755,7 +2755,7 @@ sub_800EB08: @ 800EB08
mov r6, r9
mov r5, r8
push {r5-r7}
- ldr r0, _0800EB84 @ =gUnknown_020239F8
+ ldr r0, _0800EB84 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -2815,7 +2815,7 @@ _0800EB4E:
strb r1, [r0]
b _0800EC28
.align 2, 0
-_0800EB84: .4byte gUnknown_020239F8
+_0800EB84: .4byte gBattleTypeFlags
_0800EB88: .4byte gEnigmaBerries
_0800EB8C: .4byte gSaveBlock1
_0800EB90: .4byte 0x00003160
@@ -2996,7 +2996,7 @@ _0800ECE4:
.4byte _0800EFB4
.4byte _0800EFCC
_0800ED0C:
- ldr r2, _0800ED54 @ =gUnknown_020239F8
+ ldr r2, _0800ED54 @ =gBattleTypeFlags
ldrh r1, [r2]
movs r0, 0x2
ands r0, r1
@@ -3030,7 +3030,7 @@ _0800ED2E:
strb r5, [r0]
b _0800F008
.align 2, 0
-_0800ED54: .4byte gUnknown_020239F8
+_0800ED54: .4byte gBattleTypeFlags
_0800ED58: .4byte gReceivedRemoteLinkPlayers
_0800ED5C: .4byte 0x02000000
_0800ED60: .4byte gUnknown_02024D1E
@@ -3063,15 +3063,15 @@ _0800ED8A:
bne _0800EDBC
cmp r4, 0
bne _0800EDB0
- ldr r0, _0800EDAC @ =gUnknown_020239F8
+ ldr r0, _0800EDAC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r2, 0xC
b _0800EDB6
.align 2, 0
_0800EDA8: .4byte gBlockRecvBuffer
-_0800EDAC: .4byte gUnknown_020239F8
+_0800EDAC: .4byte gBattleTypeFlags
_0800EDB0:
- ldr r0, _0800EDE0 @ =gUnknown_020239F8
+ ldr r0, _0800EDE0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r2, 0x8
_0800EDB6:
@@ -3093,15 +3093,15 @@ _0800EDBC:
bne _0800EDF4
cmp r4, 0
bne _0800EDE8
- ldr r0, _0800EDE0 @ =gUnknown_020239F8
+ ldr r0, _0800EDE0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r2, 0xC
b _0800EDEE
.align 2, 0
-_0800EDE0: .4byte gUnknown_020239F8
+_0800EDE0: .4byte gBattleTypeFlags
_0800EDE4: .4byte gBlockRecvBuffer
_0800EDE8:
- ldr r0, _0800EE04 @ =gUnknown_020239F8
+ ldr r0, _0800EE04 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r2, 0x8
_0800EDEE:
@@ -3114,10 +3114,10 @@ _0800EDF4:
bne _0800EE38
ldrh r1, [r6]
ldr r0, _0800EE08 @ =0x00000101
- ldr r2, _0800EE04 @ =gUnknown_020239F8
+ ldr r2, _0800EE04 @ =gBattleTypeFlags
b _0800EE1A
.align 2, 0
-_0800EE04: .4byte gUnknown_020239F8
+_0800EE04: .4byte gBattleTypeFlags
_0800EE08: .4byte 0x00000101
_0800EE0C:
adds r3, 0x1
@@ -3336,7 +3336,7 @@ _0800EFCC:
str r0, [r1]
ldr r0, _0800F020 @ =sub_800F808
bl SetMainCallback2
- ldr r3, _0800F024 @ =gUnknown_020239F8
+ ldr r3, _0800F024 @ =gBattleTypeFlags
ldrh r2, [r3]
movs r0, 0x2
ands r0, r2
@@ -3360,7 +3360,7 @@ _0800F014: .4byte gUnknown_030042D0
_0800F018: .4byte gMain
_0800F01C: .4byte sub_8010824
_0800F020: .4byte sub_800F808
-_0800F024: .4byte gUnknown_020239F8
+_0800F024: .4byte gBattleTypeFlags
_0800F028: .4byte gTrainerBattleOpponent
thumb_func_end sub_800EC9C
@@ -3593,7 +3593,7 @@ _0800F1FA:
ldr r0, [r1, 0x8]
mov r2, r9
str r0, [r2]
- ldr r0, _0800F238 @ =gUnknown_020239F8
+ ldr r0, _0800F238 @ =gBattleTypeFlags
ldrh r0, [r0]
mov r2, r8
strh r0, [r2]
@@ -3608,7 +3608,7 @@ _0800F228: .4byte gBlockRecvBuffer
_0800F22C: .4byte gUnknown_02023A00
_0800F230: .4byte gUnknown_02024D1E
_0800F234: .4byte gMain
-_0800F238: .4byte gUnknown_020239F8
+_0800F238: .4byte gBattleTypeFlags
_0800F23C: .4byte sub_800F104
_0800F240:
ldr r0, _0800F258 @ =gPaletteFade
@@ -3628,7 +3628,7 @@ _0800F25C:
ldrb r0, [r0]
cmp r0, 0
bne _0800F27A
- ldr r1, _0800F28C @ =gUnknown_020239F8
+ ldr r1, _0800F28C @ =gBattleTypeFlags
mov r2, r8
ldrh r0, [r2]
strh r0, [r1]
@@ -3647,7 +3647,7 @@ _0800F27A:
bx r0
.align 2, 0
_0800F288: .4byte gReceivedRemoteLinkPlayers
-_0800F28C: .4byte gUnknown_020239F8
+_0800F28C: .4byte gBattleTypeFlags
_0800F290: .4byte gMain
_0800F294: .4byte sub_800E7F8
thumb_func_end sub_800F104
@@ -3740,15 +3740,15 @@ _0800F34E:
bne _0800F380
cmp r6, 0
bne _0800F374
- ldr r0, _0800F370 @ =gUnknown_020239F8
+ ldr r0, _0800F370 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r2, 0xC
b _0800F37A
.align 2, 0
_0800F36C: .4byte gBlockRecvBuffer
-_0800F370: .4byte gUnknown_020239F8
+_0800F370: .4byte gBattleTypeFlags
_0800F374:
- ldr r0, _0800F3B0 @ =gUnknown_020239F8
+ ldr r0, _0800F3B0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r2, 0x8
_0800F37A:
@@ -3777,15 +3777,15 @@ _0800F39E:
bne _0800F3C4
cmp r6, 0
bne _0800F3B8
- ldr r0, _0800F3B0 @ =gUnknown_020239F8
+ ldr r0, _0800F3B0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r2, 0xC
b _0800F3BE
.align 2, 0
-_0800F3B0: .4byte gUnknown_020239F8
+_0800F3B0: .4byte gBattleTypeFlags
_0800F3B4: .4byte gBlockRecvBuffer
_0800F3B8:
- ldr r0, _0800F408 @ =gUnknown_020239F8
+ ldr r0, _0800F408 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r2, 0x8
_0800F3BE:
@@ -3799,7 +3799,7 @@ _0800F3C4:
ldrh r2, [r0]
ldr r1, _0800F410 @ =0x00000101
adds r3, r0, 0
- ldr r5, _0800F408 @ =gUnknown_020239F8
+ ldr r5, _0800F408 @ =gBattleTypeFlags
cmp r2, r1
beq _0800F3F6
_0800F3D6:
@@ -3832,7 +3832,7 @@ _0800F3FE:
movs r1, 0xC
b _0800F418
.align 2, 0
-_0800F408: .4byte gUnknown_020239F8
+_0800F408: .4byte gBattleTypeFlags
_0800F40C: .4byte gBlockRecvBuffer
_0800F410: .4byte 0x00000101
_0800F414:
@@ -4312,7 +4312,7 @@ _0800F7A4:
str r0, [r1]
ldr r0, _0800F7FC @ =sub_800F808
bl SetMainCallback2
- ldr r3, _0800F800 @ =gUnknown_020239F8
+ ldr r3, _0800F800 @ =gBattleTypeFlags
ldrh r2, [r3]
movs r0, 0x2
ands r0, r2
@@ -4338,7 +4338,7 @@ _0800F7F0: .4byte gUnknown_030042D0
_0800F7F4: .4byte gMain
_0800F7F8: .4byte sub_8010824
_0800F7FC: .4byte sub_800F808
-_0800F800: .4byte gUnknown_020239F8
+_0800F800: .4byte gBattleTypeFlags
_0800F804: .4byte gTrainerBattleOpponent
thumb_func_end sub_800F298
@@ -4484,7 +4484,7 @@ sub_800F8E8: @ 800F8E8
movs r0, 0
b _0800FCB4
_0800F90C:
- ldr r0, _0800F93C @ =gUnknown_020239F8
+ ldr r0, _0800F93C @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0800F940 @ =0x00000908
ands r0, r1
@@ -4508,7 +4508,7 @@ _0800F920:
ldr r4, [sp, 0x18]
b _0800FC86
.align 2, 0
-_0800F93C: .4byte gUnknown_020239F8
+_0800F93C: .4byte gBattleTypeFlags
_0800F940: .4byte 0x00000908
_0800F944: .4byte gTrainers
_0800F948:
@@ -4939,7 +4939,7 @@ _0800FC86:
bge _0800FC8E
b _0800F948
_0800FC8E:
- ldr r2, _0800FCD0 @ =gUnknown_020239F8
+ ldr r2, _0800FCD0 @ =gBattleTypeFlags
ldr r1, _0800FCCC @ =gTrainers
ldr r4, [sp, 0x20]
ldr r3, [sp, 0x14]
@@ -4972,7 +4972,7 @@ _0800FCB4:
_0800FCC4: .4byte gSpeciesNames
_0800FCC8: .4byte gBattleMoves + 0x4 @ PP offset
_0800FCCC: .4byte gTrainers
-_0800FCD0: .4byte gUnknown_020239F8
+_0800FCD0: .4byte gBattleTypeFlags
thumb_func_end sub_800F8E8
thumb_func_start sub_800FCD4
@@ -5172,7 +5172,7 @@ sub_800FE40: @ 800FE40
ldr r2, _0800FE8C @ =0x000160cb
adds r0, r2
ldrb r2, [r0]
- ldr r0, _0800FE90 @ =gUnknown_020239F8
+ ldr r0, _0800FE90 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -5194,7 +5194,7 @@ sub_800FE40: @ 800FE40
.align 2, 0
_0800FE88: .4byte 0x02000000
_0800FE8C: .4byte 0x000160cb
-_0800FE90: .4byte gUnknown_020239F8
+_0800FE90: .4byte gBattleTypeFlags
_0800FE94: .4byte gLinkPlayers
_0800FE98:
cmp r0, 0x2
@@ -6588,7 +6588,7 @@ _0801092E:
movs r0, 0
ldr r1, _08010B0C @ =gUnknown_02024C6C
str r0, [r1]
- ldr r2, _08010B10 @ =gUnknown_020239F8
+ ldr r2, _08010B10 @ =gBattleTypeFlags
ldrh r1, [r2]
movs r0, 0x2
ands r0, r1
@@ -6807,7 +6807,7 @@ _08010B00: .4byte gUnknown_02024C08
_08010B04: .4byte gBattleWeather
_08010B08: .4byte gUnknown_02024DBC
_08010B0C: .4byte gUnknown_02024C6C
-_08010B10: .4byte gUnknown_020239F8
+_08010B10: .4byte gBattleTypeFlags
_08010B14: .4byte gSaveBlock2
_08010B18: .4byte 0x02000000
_08010B1C: .4byte 0x00016084
@@ -7861,7 +7861,7 @@ _080113A4:
mov r9, r0
mov r8, r2
_080113AC:
- ldr r0, _080113F0 @ =gUnknown_020239F8
+ ldr r0, _080113F0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -7891,7 +7891,7 @@ _080113E0: .4byte gUnknown_02024A64
_080113E4: .4byte gUnknown_02024A60
_080113E8: .4byte gUnknown_02024A68
_080113EC: .4byte gBattleMons
-_080113F0: .4byte gUnknown_020239F8
+_080113F0: .4byte gBattleTypeFlags
_080113F4:
mov r2, r8
ldrb r0, [r2]
@@ -8006,7 +8006,7 @@ _080114BE:
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
_080114D8:
- ldr r5, _08011544 @ =gUnknown_020239F8
+ ldr r5, _08011544 @ =gBattleTypeFlags
ldrh r1, [r5]
movs r0, 0x8
ands r0, r1
@@ -8051,7 +8051,7 @@ _08011534: .4byte gUnknown_02024260
_08011538: .4byte gUnknown_02024A60
_0801153C: .4byte 0x020160bc
_08011540: .4byte gUnknown_02024A98
-_08011544: .4byte gUnknown_020239F8
+_08011544: .4byte gBattleTypeFlags
_08011548: .4byte 0x00000902
_0801154C:
ldrb r0, [r4]
@@ -8080,7 +8080,7 @@ _0801154C:
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
_08011588:
- ldr r0, _080115EC @ =gUnknown_020239F8
+ ldr r0, _080115EC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -8129,7 +8129,7 @@ _080115DA:
bx r0
.align 2, 0
_080115E8: .4byte 0x00000902
-_080115EC: .4byte gUnknown_020239F8
+_080115EC: .4byte gBattleTypeFlags
_080115F0: .4byte gUnknown_02024A60
_080115F4: .4byte gUnknown_02024A68
_080115F8: .4byte gUnknown_030042D4
@@ -8148,7 +8148,7 @@ bc_801333C: @ 8011600
beq _08011612
b _0801178C
_08011612:
- ldr r0, _0801165C @ =gUnknown_020239F8
+ ldr r0, _0801165C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -8186,7 +8186,7 @@ _08011650:
b _0801167A
.align 2, 0
_08011658: .4byte gUnknown_02024A64
-_0801165C: .4byte gUnknown_020239F8
+_0801165C: .4byte gBattleTypeFlags
_08011660: .4byte gEnemyParty
_08011664: .4byte 0x0000ffff
_08011668:
@@ -8438,7 +8438,7 @@ _0801184C:
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
_08011866:
- ldr r0, _080118B8 @ =gUnknown_020239F8
+ ldr r0, _080118B8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -8476,7 +8476,7 @@ _080118A4:
_080118AC: .4byte gUnknown_02024A64
_080118B0: .4byte gUnknown_02024A60
_080118B4: .4byte gUnknown_02024A68
-_080118B8: .4byte gUnknown_020239F8
+_080118B8: .4byte gBattleTypeFlags
_080118BC: .4byte gUnknown_030042D4
_080118C0: .4byte bc_801362C
thumb_func_end sub_8011834
@@ -8503,7 +8503,7 @@ _080118DE:
lsrs r0, 24
cmp r0, 0x1
bne _08011912
- ldr r0, _08011940 @ =gUnknown_020239F8
+ ldr r0, _08011940 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r2, _08011944 @ =0x00000902
adds r0, r2, 0
@@ -8543,7 +8543,7 @@ _08011930: .4byte gUnknown_02024A64
_08011934: .4byte gUnknown_02024A60
_08011938: .4byte gUnknown_02024A68
_0801193C: .4byte gBattleMons
-_08011940: .4byte gUnknown_020239F8
+_08011940: .4byte gBattleTypeFlags
_08011944: .4byte 0x00000902
_08011948: .4byte gUnknown_030042D4
_0801194C: .4byte sub_8011970
@@ -8575,7 +8575,7 @@ sub_8011970: @ 8011970
ldr r0, [r0]
cmp r0, 0
bne _0801199E
- ldr r0, _080119A8 @ =gUnknown_020239F8
+ ldr r0, _080119A8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -8597,7 +8597,7 @@ _0801199E:
bx r0
.align 2, 0
_080119A4: .4byte gUnknown_02024A64
-_080119A8: .4byte gUnknown_020239F8
+_080119A8: .4byte gBattleTypeFlags
_080119AC: .4byte gUnknown_030042D4
_080119B0: .4byte sub_80119B4
thumb_func_end sub_8011970
@@ -8627,7 +8627,7 @@ _080119CC:
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
_080119E4:
- ldr r0, _08011A4C @ =gUnknown_020239F8
+ ldr r0, _08011A4C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -8676,7 +8676,7 @@ _08011A38:
_08011A40: .4byte gUnknown_02024A64
_08011A44: .4byte gUnknown_02024A60
_08011A48: .4byte gUnknown_02024A68
-_08011A4C: .4byte gUnknown_020239F8
+_08011A4C: .4byte gBattleTypeFlags
_08011A50: .4byte 0x02000000
_08011A54: .4byte 0x00016058
_08011A58: .4byte 0x000160f9
@@ -9427,7 +9427,7 @@ _08012062:
bne _08012070
b _080121F4
_08012070:
- ldr r0, _08012184 @ =gUnknown_020239F8
+ ldr r0, _08012184 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -9567,7 +9567,7 @@ _0801215E:
.align 2, 0
_0801217C: .4byte gUnknown_02024C0B
_08012180: .4byte gUnknown_02024A60
-_08012184: .4byte gUnknown_020239F8
+_08012184: .4byte gBattleTypeFlags
_08012188: .4byte gBattleMons
_0801218C: .4byte gUnknown_02024A68
_08012190: .4byte 0x02000000
@@ -9609,7 +9609,7 @@ _080121DC: .4byte 0x0400e000
_080121E0: .4byte gUnknown_02024C98
_080121E4: .4byte gUnknown_02024D1E
_080121E8:
- ldr r0, _080121F8 @ =gUnknown_020239F8
+ ldr r0, _080121F8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x10
ands r0, r1
@@ -9619,7 +9619,7 @@ _080121F4:
movs r0, 0
b _0801224A
.align 2, 0
-_080121F8: .4byte gUnknown_020239F8
+_080121F8: .4byte gBattleTypeFlags
_080121FC:
ldr r0, _08012210 @ =0x02000000
ldr r1, _08012214 @ =0x00016003
@@ -9705,7 +9705,7 @@ _08012270:
lsrs r1, 24
adds r0, r4, 0
bl sub_8094C98
- ldr r0, _080122F8 @ =gUnknown_020239F8
+ ldr r0, _080122F8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -9742,7 +9742,7 @@ _080122E8: .4byte gUnknown_02038470
_080122EC: .4byte 0x02000000
_080122F0: .4byte 0x0001606c
_080122F4: .4byte 0x00016068
-_080122F8: .4byte gUnknown_020239F8
+_080122F8: .4byte gBattleTypeFlags
_080122FC:
movs r3, 0
ldr r2, _0801231C @ =0x0001606c
@@ -9827,7 +9827,7 @@ _0801239C:
adds r0, r4
movs r1, 0x6
strb r1, [r0]
- ldr r0, _08012440 @ =gUnknown_020239F8
+ ldr r0, _08012440 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -9880,7 +9880,7 @@ _080123F8:
adds r0, r2, r0
movs r1, 0xD
strb r1, [r0]
- ldr r0, _08012440 @ =gUnknown_020239F8
+ ldr r0, _08012440 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -9896,7 +9896,7 @@ _080123F8:
_08012434: .4byte 0x02000000
_08012438: .4byte gUnknown_02024A60
_0801243C: .4byte 0x00016068
-_08012440: .4byte gUnknown_020239F8
+_08012440: .4byte gBattleTypeFlags
_08012444: .4byte 0x000160a6
_08012448: .4byte gBitTable
_0801244C: .4byte gUnknown_02024D1E
@@ -10162,7 +10162,7 @@ _0801264E:
adds r4, 0x1
cmp r4, 0x3
ble _0801264E
- ldr r0, _080126B0 @ =gUnknown_020239F8
+ ldr r0, _080126B0 @ =gBattleTypeFlags
ldrb r0, [r0]
movs r1, 0x1
ands r1, r0
@@ -10173,9 +10173,9 @@ _0801264E:
b _0801289E
.align 2, 0
_080126AC: .4byte gBattleMons
-_080126B0: .4byte gUnknown_020239F8
+_080126B0: .4byte gBattleTypeFlags
_080126B4:
- ldr r0, _080126D0 @ =gUnknown_020239F8
+ ldr r0, _080126D0 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _080126D4 @ =0x00000902
ands r0, r1
@@ -10191,7 +10191,7 @@ _080126C2:
ldr r1, _080126DC @ =gUnknown_081D9B29
b _080129CC
.align 2, 0
-_080126D0: .4byte gUnknown_020239F8
+_080126D0: .4byte gBattleTypeFlags
_080126D4: .4byte 0x00000902
_080126D8: .4byte gUnknown_02024C1C
_080126DC: .4byte gUnknown_081D9B29
@@ -10494,7 +10494,7 @@ _0801292C:
.align 2, 0
_08012964: .4byte gUnknown_02024D1E
_08012968:
- ldr r0, _08012994 @ =gUnknown_020239F8
+ ldr r0, _08012994 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0xA
ands r0, r1
@@ -10516,7 +10516,7 @@ _08012968:
adds r0, r1
b _08012BFE
.align 2, 0
-_08012994: .4byte gUnknown_020239F8
+_08012994: .4byte gBattleTypeFlags
_08012998: .4byte gUnknown_02024260
_0801299C: .4byte gUnknown_02024A60
_080129A0: .4byte gUnknown_081D8E37
@@ -10809,7 +10809,7 @@ _08012C10:
adds r0, r2, r3
add r0, r12
strb r1, [r0]
- ldr r0, _08012CCC @ =gUnknown_020239F8
+ ldr r0, _08012CCC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -10897,7 +10897,7 @@ _08012CBE:
.align 2, 0
_08012CC4: .4byte 0x02000000
_08012CC8: .4byte 0x00016068
-_08012CCC: .4byte gUnknown_020239F8
+_08012CCC: .4byte gBattleTypeFlags
_08012CD0: .4byte 0x0001606c
_08012CD4: .4byte 0x0001606d
_08012CD8: .4byte 0x0001606e
@@ -11017,7 +11017,7 @@ _08012DA8:
beq _08012DD2
b _08012F66
_08012DD2:
- ldr r0, _08012E1C @ =gUnknown_020239F8
+ ldr r0, _08012E1C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x41
ands r0, r1
@@ -11051,7 +11051,7 @@ _08012E06:
_08012E10: .4byte gUnknown_02024A64
_08012E14: .4byte gBitTable
_08012E18: .4byte gUnknown_02024A60
-_08012E1C: .4byte gUnknown_020239F8
+_08012E1C: .4byte gBattleTypeFlags
_08012E20: .4byte 0x02000000
_08012E24: .4byte 0x000160a6
_08012E28:
@@ -11429,7 +11429,7 @@ _0801310C:
lsls r0, 24
lsrs r5, r0, 24
_08013120:
- ldr r0, _080131DC @ =gUnknown_020239F8
+ ldr r0, _080131DC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -11523,7 +11523,7 @@ _08013198:
ldrb r5, [r0, 0x1A]
b _08013208
.align 2, 0
-_080131DC: .4byte gUnknown_020239F8
+_080131DC: .4byte gBattleTypeFlags
_080131E0: .4byte 0x00000809
_080131E4: .4byte gBattleMons
_080131E8: .4byte gUnknown_02024D1C
@@ -11539,7 +11539,7 @@ _080131F4:
lsls r0, 24
lsrs r5, r0, 24
_08013208:
- ldr r0, _08013280 @ =gUnknown_020239F8
+ ldr r0, _08013280 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -11599,7 +11599,7 @@ _08013274:
movs r3, 0
b _08013334
.align 2, 0
-_08013280: .4byte gUnknown_020239F8
+_08013280: .4byte gBattleTypeFlags
_08013284: .4byte 0x00000809
_08013288: .4byte gBattleMons
_0801328C: .4byte gUnknown_02024D1C
@@ -11774,7 +11774,7 @@ sub_80133C8: @ 80133C8
mov r5, r8
push {r5-r7}
movs r3, 0
- ldr r0, _0801341C @ =gUnknown_020239F8
+ ldr r0, _0801341C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -11813,7 +11813,7 @@ _080133F8:
bcc _080133F8
b _08013622
.align 2, 0
-_0801341C: .4byte gUnknown_020239F8
+_0801341C: .4byte gBattleTypeFlags
_08013420: .4byte gUnknown_02024A60
_08013424: .4byte gUnknown_02024A68
_08013428: .4byte gUnknown_02024A76
@@ -12501,7 +12501,7 @@ sub_8013998: @ 8013998
ldr r1, _080139D0 @ =gUnknown_02024A7F
movs r0, 0
strb r0, [r1]
- ldr r0, _080139D4 @ =gUnknown_020239F8
+ ldr r0, _080139D4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -12525,7 +12525,7 @@ sub_8013998: @ 8013998
b _08013B48
.align 2, 0
_080139D0: .4byte gUnknown_02024A7F
-_080139D4: .4byte gUnknown_020239F8
+_080139D4: .4byte gBattleTypeFlags
_080139D8: .4byte gUnknown_030041C0
_080139DC: .4byte gUnknown_02024D26
_080139E0: .4byte gUnknown_02024C07
@@ -12676,7 +12676,7 @@ sub_8013B64: @ 8013B64
ldr r1, _08013B9C @ =gUnknown_02024A7F
movs r0, 0
strb r0, [r1]
- ldr r0, _08013BA0 @ =gUnknown_020239F8
+ ldr r0, _08013BA0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -12700,7 +12700,7 @@ sub_8013B64: @ 8013B64
b _08013BBE
.align 2, 0
_08013B9C: .4byte gUnknown_02024A7F
-_08013BA0: .4byte gUnknown_020239F8
+_08013BA0: .4byte gBattleTypeFlags
_08013BA4: .4byte gUnknown_030041C0
_08013BA8: .4byte gUnknown_02024D26
_08013BAC: .4byte gUnknown_02024C07
@@ -12824,7 +12824,7 @@ sub_8013C9C: @ 8013C9C
lsrs r0, 24
cmp r0, 0x1
bhi _08013D7C
- ldr r0, _08013D04 @ =gUnknown_020239F8
+ ldr r0, _08013D04 @ =gBattleTypeFlags
ldrh r0, [r0]
ldr r1, _08013D08 @ =0x00000b92
ands r1, r0
@@ -12866,7 +12866,7 @@ _08013CCE:
b _08013D36
.align 2, 0
_08013D00: .4byte gUnknown_02024A7F
-_08013D04: .4byte gUnknown_020239F8
+_08013D04: .4byte gBattleTypeFlags
_08013D08: .4byte 0x00000b92
_08013D0C: .4byte gUnknown_02024A60
_08013D10: .4byte gUnknown_02024A68
@@ -13075,7 +13075,7 @@ _08013EAC: .4byte bc_evolution_cutscene
thumb_func_start c4_overworld
c4_overworld: @ 8013EB0
push {r4-r6,lr}
- ldr r5, _08013F30 @ =gUnknown_020239F8
+ ldr r5, _08013F30 @ =gBattleTypeFlags
ldrh r1, [r5]
movs r6, 0x2
adds r0, r6, 0
@@ -13138,7 +13138,7 @@ _08013F2A:
pop {r0}
bx r0
.align 2, 0
-_08013F30: .4byte gUnknown_020239F8
+_08013F30: .4byte gBattleTypeFlags
_08013F34: .4byte gPlayerParty
_08013F38: .4byte gReceivedRemoteLinkPlayers
_08013F3C: .4byte gScriptResult
@@ -13600,7 +13600,7 @@ _08014324: .4byte gBattleMoves
_08014328: .4byte gBattleMons
_0801432C: .4byte gUnknown_02024C08
_08014330:
- ldr r2, _08014454 @ =gUnknown_020239F8
+ ldr r2, _08014454 @ =gBattleTypeFlags
ldrh r1, [r2]
movs r0, 0x1
ands r0, r1
@@ -13750,7 +13750,7 @@ _0801441E:
movs r0, 0x1
b _08014496
.align 2, 0
-_08014454: .4byte gUnknown_020239F8
+_08014454: .4byte gBattleTypeFlags
_08014458: .4byte gUnknown_02024C07
_0801445C: .4byte gUnknown_02024C80
_08014460: .4byte gBattleMoves
@@ -14433,7 +14433,7 @@ _08014A24: .4byte gUnknown_081D9E7C
_08014A28: .4byte 0x000160a4
_08014A2C: .4byte 0x000160a5
_08014A30:
- ldr r0, _08014A50 @ =gUnknown_020239F8
+ ldr r0, _08014A50 @ =gBattleTypeFlags
ldrh r0, [r0]
movs r1, 0x1
ands r1, r0
@@ -14450,7 +14450,7 @@ _08014A30:
mov r10, r2
b _08014A74
.align 2, 0
-_08014A50: .4byte gUnknown_020239F8
+_08014A50: .4byte gBattleTypeFlags
_08014A54: .4byte gUnknown_02024D1E
_08014A58: .4byte gUnknown_02024C07
_08014A5C: .4byte gUnknown_02024C10
@@ -14584,7 +14584,7 @@ _08014B5C: .4byte gBattleMons
_08014B60: .4byte byte_2024C06
_08014B64: .4byte gUnknown_02024D28
_08014B68:
- ldr r0, _08014BDC @ =gUnknown_020239F8
+ ldr r0, _08014BDC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -14645,7 +14645,7 @@ _08014BD4:
pop {r1}
bx r1
.align 2, 0
-_08014BDC: .4byte gUnknown_020239F8
+_08014BDC: .4byte gBattleTypeFlags
_08014BE0: .4byte 0x02000000
_08014BE4: .4byte 0x00016078
_08014BE8: .4byte gUnknown_02024A7E
@@ -14663,7 +14663,7 @@ sub_8014BF4: @ 8014BF4
adds r0, r1
ldrb r0, [r0]
strb r0, [r4]
- ldr r0, _08014C50 @ =gUnknown_020239F8
+ ldr r0, _08014C50 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -14699,7 +14699,7 @@ _08014C28:
_08014C44: .4byte gUnknown_02024C07
_08014C48: .4byte gUnknown_02024A7A
_08014C4C: .4byte gUnknown_02024A7E
-_08014C50: .4byte gUnknown_020239F8
+_08014C50: .4byte gBattleTypeFlags
_08014C54: .4byte gUnknown_02024A68
_08014C58: .4byte gUnknown_02024A60
_08014C5C: .4byte gUnknown_02024C18
@@ -15756,7 +15756,7 @@ _080154E0: .4byte gUnknown_02024A60
thumb_func_start unref_sub_80154E4
unref_sub_80154E4: @ 80154E4
push {r4,r5,lr}
- ldr r0, _08015514 @ =gUnknown_020239F8
+ ldr r0, _08015514 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -15781,7 +15781,7 @@ _08015500:
blt _08015500
b _08015542
.align 2, 0
-_08015514: .4byte gUnknown_020239F8
+_08015514: .4byte gBattleTypeFlags
_08015518: .4byte gUnknown_02024A68
_0801551C: .4byte gUnknown_02024A64
_08015520: .4byte gBitTable
@@ -15817,7 +15817,7 @@ dp01_battle_side_mark_buffer_for_execution: @ 8015554
push {lr}
lsls r0, 24
lsrs r3, r0, 24
- ldr r0, _0801557C @ =gUnknown_020239F8
+ ldr r0, _0801557C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -15834,7 +15834,7 @@ dp01_battle_side_mark_buffer_for_execution: @ 8015554
str r0, [r2]
b _08015598
.align 2, 0
-_0801557C: .4byte gUnknown_020239F8
+_0801557C: .4byte gBattleTypeFlags
_08015580: .4byte gUnknown_02024A64
_08015584: .4byte gBitTable
_08015588:
@@ -16779,7 +16779,7 @@ sub_8015C90: @ 8015C90
adds r0, r1
ldr r1, _08015D08 @ =gUnknown_081D9365
str r1, [r0]
- ldr r0, _08015D0C @ =gUnknown_020239F8
+ ldr r0, _08015D0C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -16809,7 +16809,7 @@ _08015CFC: .4byte gUnknown_02024A60
_08015D00: .4byte gUnknown_02024D28
_08015D04: .4byte gUnknown_02024C1C
_08015D08: .4byte gUnknown_081D9365
-_08015D0C: .4byte gUnknown_020239F8
+_08015D0C: .4byte gBattleTypeFlags
_08015D10: .4byte gUnknown_02024260
_08015D14:
ldrb r0, [r5]
@@ -19589,7 +19589,7 @@ sub_80173A4: @ 80173A4
mov r5, r8
push {r5-r7}
sub sp, 0x4
- ldr r0, _080173C0 @ =gUnknown_020239F8
+ ldr r0, _080173C0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -19597,7 +19597,7 @@ sub_80173A4: @ 80173A4
beq _080173F8
b _080176AC
.align 2, 0
-_080173C0: .4byte gUnknown_020239F8
+_080173C0: .4byte gBattleTypeFlags
_080173C4:
ldr r0, _080173D4 @ =gUnknown_081D8C72
bl b_call_bc_move_exec
@@ -21071,7 +21071,7 @@ sub_8018018: @ 8018018
lsls r2, 24
lsrs r2, 24
mov r9, r2
- ldr r0, _08018044 @ =gUnknown_020239F8
+ ldr r0, _08018044 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -21080,7 +21080,7 @@ sub_8018018: @ 8018018
movs r0, 0
b _08018198
.align 2, 0
-_08018044: .4byte gUnknown_020239F8
+_08018044: .4byte gBattleTypeFlags
_08018048:
movs r0, 0x40
ands r0, r1
@@ -21574,7 +21574,7 @@ _080183F4:
movs r1, 0
bl GetMonData
str r0, [sp, 0x14]
- ldr r0, _0801844C @ =gUnknown_020239F8
+ ldr r0, _0801844C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -21592,7 +21592,7 @@ _08018436:
.align 2, 0
_08018444: .4byte gUnknown_02024A6A
_08018448: .4byte gEnemyParty
-_0801844C: .4byte gUnknown_020239F8
+_0801844C: .4byte gBattleTypeFlags
_08018450: .4byte byte_2024C06
_08018454:
ldr r2, _08018474 @ =byte_2024C06
@@ -24023,7 +24023,7 @@ _0801997A:
bl battle_get_side_with_given_state
lsls r0, 24
lsrs r7, r0, 24
- ldr r0, _08019A2C @ =gUnknown_020239F8
+ ldr r0, _08019A2C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r2, 0x1
adds r0, r2, 0
@@ -24090,7 +24090,7 @@ _08019A1C: .4byte gUnknown_02024A68
_08019A20: .4byte gUnknown_02024A60
_08019A24: .4byte gBattleMons
_08019A28: .4byte gUnknown_02024C98
-_08019A2C: .4byte gUnknown_020239F8
+_08019A2C: .4byte gBattleTypeFlags
_08019A30: .4byte byte_2024C06
_08019A34:
ldr r3, _08019A74 @ =gBattleMons
@@ -27248,7 +27248,7 @@ unref_sub_801B40C: @ 801B40C
sub sp, 0x8
movs r0, 0
str r0, [sp]
- ldr r0, _0801B464 @ =gUnknown_020239F8
+ ldr r0, _0801B464 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -27288,7 +27288,7 @@ _0801B45A:
lsrs r5, r0, 24
b _0801B556
.align 2, 0
-_0801B464: .4byte gUnknown_020239F8
+_0801B464: .4byte gBattleTypeFlags
_0801B468: .4byte gUnknown_081FC1D0
_0801B46C: .4byte gUnknown_02024C0C
_0801B470: .4byte gBitTable
@@ -27725,7 +27725,7 @@ _0801B854: .4byte gUnknown_02024C07
_0801B858: .4byte gUnknown_02024C80
_0801B85C: .4byte gBattleMons
_0801B860:
- ldr r0, _0801B894 @ =gUnknown_020239F8
+ ldr r0, _0801B894 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r4, 0x1
adds r0, r4, 0
@@ -27750,7 +27750,7 @@ _0801B860:
movs r0, 0x1
b _0801B8B2
.align 2, 0
-_0801B894: .4byte gUnknown_020239F8
+_0801B894: .4byte gBattleTypeFlags
_0801B898: .4byte gUnknown_02024C07
_0801B89C:
movs r0, 0x3
@@ -27830,7 +27830,7 @@ sub_801B928: @ 801B928
mov r6, r8
push {r6,r7}
sub sp, 0x10
- ldr r0, _0801B9E0 @ =gUnknown_020239F8
+ ldr r0, _0801B9E0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -27914,7 +27914,7 @@ _0801B9DA:
movs r0, 0
b _0801BC24
.align 2, 0
-_0801B9E0: .4byte gUnknown_020239F8
+_0801B9E0: .4byte gBattleTypeFlags
_0801B9E4: .4byte gUnknown_02024C07
_0801B9E8: .4byte gBattleMons
_0801B9EC: .4byte 0x0000080e
@@ -29373,7 +29373,7 @@ _0801C5C0:
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
- ldr r0, _0801C614 @ =gUnknown_020239F8
+ ldr r0, _0801C614 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -29397,7 +29397,7 @@ _0801C602:
_0801C608: .4byte gUnknown_02024C0B
_0801C60C: .4byte gUnknown_02024C08
_0801C610: .4byte gUnknown_02024C68
-_0801C614: .4byte gUnknown_020239F8
+_0801C614: .4byte gBattleTypeFlags
_0801C618: .4byte gBattleMoves
_0801C61C: .4byte gUnknown_02024D1E
_0801C620:
@@ -29841,7 +29841,7 @@ _0801C960:
ands r0, r1
cmp r0, 0
bne _0801C9D0
- ldr r0, _0801C9C4 @ =gUnknown_020239F8
+ ldr r0, _0801C9C4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x84
lsls r0, 2
@@ -29865,7 +29865,7 @@ _0801C960:
.align 2, 0
_0801C9BC: .4byte gUnknown_02024C08
_0801C9C0: .4byte gUnknown_02024C98
-_0801C9C4: .4byte gUnknown_020239F8
+_0801C9C4: .4byte gBattleTypeFlags
_0801C9C8: .4byte gCriticalHitChance
_0801C9CC: .4byte gCritMultiplier
_0801C9D0:
@@ -34834,7 +34834,7 @@ _0801F1A4:
lsrs r0, 24
cmp r0, 0x1
bne _0801F1D8
- ldr r0, _0801F258 @ =gUnknown_020239F8
+ ldr r0, _0801F258 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0801F25C @ =0x00000902
ands r0, r1
@@ -34848,7 +34848,7 @@ _0801F1A4:
beq _0801F1D8
b _0801F5DC
_0801F1D8:
- ldr r0, _0801F258 @ =gUnknown_020239F8
+ ldr r0, _0801F258 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0801F25C @ =0x00000902
ands r0, r1
@@ -34911,7 +34911,7 @@ _0801F214:
b _0801F5FA
.align 2, 0
_0801F254: .4byte gUnknown_02024C07
-_0801F258: .4byte gUnknown_020239F8
+_0801F258: .4byte gBattleTypeFlags
_0801F25C: .4byte 0x00000902
_0801F260: .4byte gTrainerBattleOpponent
_0801F264: .4byte gUnknown_02024DBC
@@ -36645,7 +36645,7 @@ _0802007C:
lsrs r0, 24
cmp r0, 0x1
bne _08020098
- ldr r0, _080200AC @ =gUnknown_020239F8
+ ldr r0, _080200AC @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _080200B0 @ =0x00000982
ands r0, r1
@@ -36660,7 +36660,7 @@ _08020098:
bl _08020996
.align 2, 0
_080200A8: .4byte gUnknown_02024C09
-_080200AC: .4byte gUnknown_020239F8
+_080200AC: .4byte gBattleTypeFlags
_080200B0: .4byte 0x00000982
_080200B4: .4byte 0x02000000
_080200B8: .4byte 0x0001600f
@@ -36921,7 +36921,7 @@ _080202DC: .4byte 0x0001605f
_080202E0: .4byte 0x0001600f
_080202E4: .4byte gUnknown_02024BEC
_080202E8:
- ldr r0, _0802034C @ =gUnknown_020239F8
+ ldr r0, _0802034C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -36971,7 +36971,7 @@ _08020332:
mov r8, r1
b _08020376
.align 2, 0
-_0802034C: .4byte gUnknown_020239F8
+_0802034C: .4byte gBattleTypeFlags
_08020350: .4byte gBattleMons
_08020354: .4byte 0x0001601b
_08020358: .4byte 0x00000161
@@ -37005,7 +37005,7 @@ _08020386:
mov r1, r8
str r0, [r1]
_0802039C:
- ldr r0, _080203F4 @ =gUnknown_020239F8
+ ldr r0, _080203F4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -37045,7 +37045,7 @@ _080203B8:
.align 2, 0
_080203EC: .4byte gUnknown_02024BEC
_080203F0: .4byte gUnknown_02024DEE
-_080203F4: .4byte gUnknown_020239F8
+_080203F4: .4byte gBattleTypeFlags
_080203F8: .4byte 0x02000000
_080203FC: .4byte 0x00016018
_08020400: .4byte gPlayerParty
@@ -37054,7 +37054,7 @@ _08020404:
ldr r3, _08020440 @ =gUnknown_02024BEC
mov r8, r3
_0802040A:
- ldr r0, _08020444 @ =gUnknown_020239F8
+ ldr r0, _08020444 @ =gBattleTypeFlags
ldrh r0, [r0]
movs r1, 0x1
ands r1, r0
@@ -37082,7 +37082,7 @@ _0802040A:
.align 2, 0
_0802043C: .4byte 0x00000149
_08020440: .4byte gUnknown_02024BEC
-_08020444: .4byte gUnknown_020239F8
+_08020444: .4byte gBattleTypeFlags
_08020448: .4byte gUnknown_02024A6A
_0802044C: .4byte 0x02000000
_08020450: .4byte 0x00016018
@@ -37339,7 +37339,7 @@ _0802066E:
beq _0802067A
b _080208F0
_0802067A:
- ldr r0, _080208C0 @ =gUnknown_020239F8
+ ldr r0, _080208C0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -37528,7 +37528,7 @@ _080207EC:
ldrh r0, [r0]
cmp r0, 0
beq _080208F6
- ldr r0, _080208C0 @ =gUnknown_020239F8
+ ldr r0, _080208C0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -37606,7 +37606,7 @@ _080208B0: .4byte gUnknown_02024A60
_080208B4: .4byte 0x02000000
_080208B8: .4byte 0x000160a2
_080208BC: .4byte gUnknown_02024260
-_080208C0: .4byte gUnknown_020239F8
+_080208C0: .4byte gBattleTypeFlags
_080208C4: .4byte gUnknown_02024A6A
_080208C8: .4byte 0x00016018
_080208CC: .4byte gPlayerParty
@@ -37799,7 +37799,7 @@ _08020A54:
ldrb r0, [r2]
cmp r0, 0
bne _08020B3E
- ldr r2, _08020B00 @ =gUnknown_020239F8
+ ldr r2, _08020B00 @ =gBattleTypeFlags
ldrh r1, [r2]
movs r0, 0x2
ands r0, r1
@@ -37884,7 +37884,7 @@ _08020AF0: .4byte gUnknown_02024A64
_08020AF4: .4byte gPlayerParty
_08020AF8: .4byte gUnknown_02024D26
_08020AFC: .4byte gEnemyParty
-_08020B00: .4byte gUnknown_020239F8
+_08020B00: .4byte gBattleTypeFlags
_08020B04: .4byte gUnknown_02024A68
_08020B08: .4byte gUnknown_02024C10
_08020B0C: .4byte gUnknown_02024C6C
@@ -40846,7 +40846,7 @@ _080221C0:
ands r0, r2
cmp r0, 0
bne _08022244
- ldr r0, _080222B4 @ =gUnknown_020239F8
+ ldr r0, _080222B4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -40964,7 +40964,7 @@ _0802229E:
bx r0
.align 2, 0
_080222B0: .4byte gUnknown_02024C6C
-_080222B4: .4byte gUnknown_020239F8
+_080222B4: .4byte gBattleTypeFlags
_080222B8: .4byte gUnknown_02024D28
_080222BC: .4byte gUnknown_02024C07
_080222C0: .4byte gBattleMoves
@@ -41571,7 +41571,7 @@ sub_8022784: @ 8022784
lsrs r0, 24
cmp r0, 0x1
bne _080227D0
- ldr r0, _08022818 @ =gUnknown_020239F8
+ ldr r0, _08022818 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0802281C @ =0x00000902
ands r0, r1
@@ -41622,7 +41622,7 @@ _08022806:
_0802280C: .4byte gUnknown_02024A64
_08022810: .4byte gUnknown_02024C10
_08022814: .4byte gUnknown_02024A60
-_08022818: .4byte gUnknown_020239F8
+_08022818: .4byte gBattleTypeFlags
_0802281C: .4byte 0x00000902
_08022820: .4byte gBattleMons
_08022824: .4byte gUnknown_02024C0C
@@ -41689,7 +41689,7 @@ _0802289C: .4byte gBattleMons
_080228A0: .4byte 0x0400e000
_080228A4: .4byte gUnknown_02024C98
_080228A8:
- ldr r5, _08022934 @ =gUnknown_020239F8
+ ldr r5, _08022934 @ =gBattleTypeFlags
ldrh r1, [r5]
movs r0, 0x40
ands r0, r1
@@ -41759,7 +41759,7 @@ _0802292E:
beq _080229FC
b _08022A24
.align 2, 0
-_08022934: .4byte gUnknown_020239F8
+_08022934: .4byte gBattleTypeFlags
_08022938: .4byte gUnknown_02024A60
_0802293C: .4byte gPlayerParty
_08022940: .4byte gEnemyParty
@@ -41963,7 +41963,7 @@ atk50_openpartyscreen: @ 8022A98
beq _08022ACE
b _08022F74
_08022ACE:
- ldr r0, _08022B48 @ =gUnknown_020239F8
+ ldr r0, _08022B48 @ =gBattleTypeFlags
ldrh r0, [r0]
movs r1, 0x41
ands r1, r0
@@ -42023,7 +42023,7 @@ _08022AF2:
b _08022BA2
.align 2, 0
_08022B44: .4byte gUnknown_02024C10
-_08022B48: .4byte gUnknown_020239F8
+_08022B48: .4byte gBattleTypeFlags
_08022B4C: .4byte gUnknown_02024A60
_08022B50: .4byte gUnknown_02024A68
_08022B54: .4byte gUnknown_02024C6C
@@ -42515,7 +42515,7 @@ _08022F74:
beq _08022F7A
b _08023170
_08022F7A:
- ldr r0, _08022FF0 @ =gUnknown_020239F8
+ ldr r0, _08022FF0 @ =gBattleTypeFlags
ldrh r2, [r0]
movs r0, 0x40
ands r0, r2
@@ -42574,7 +42574,7 @@ _08022F92:
bl dp01_battle_side_mark_buffer_for_execution
b _0802303A
.align 2, 0
-_08022FF0: .4byte gUnknown_020239F8
+_08022FF0: .4byte gBattleTypeFlags
_08022FF4: .4byte gUnknown_02024C6C
_08022FF8: .4byte gBitTable
_08022FFC: .4byte gUnknown_02024A60
@@ -42860,7 +42860,7 @@ _080231F8:
adds r0, 0x1
strb r0, [r1, 0x2]
_0802325A:
- ldr r0, _080232BC @ =gUnknown_020239F8
+ ldr r0, _080232BC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -42902,7 +42902,7 @@ _080232AC: .4byte gUnknown_02024A6A
_080232B0: .4byte 0x00016068
_080232B4: .4byte 0x0001606c
_080232B8: .4byte gUnknown_030042E0
-_080232BC: .4byte gUnknown_020239F8
+_080232BC: .4byte gBattleTypeFlags
_080232C0: .4byte gUnknown_02024A68
_080232C4:
adds r0, r7, 0
@@ -43016,7 +43016,7 @@ _08023394: .4byte 0x02000000
_08023398: .4byte gUnknown_02024260
_0802339C: .4byte 0x00016068
_080233A0:
- ldr r0, _080233B8 @ =gUnknown_020239F8
+ ldr r0, _080233B8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -43028,7 +43028,7 @@ _080233AE:
bl sub_8012258
b _080234F6
.align 2, 0
-_080233B8: .4byte gUnknown_020239F8
+_080233B8: .4byte gBattleTypeFlags
_080233BC:
ldr r1, _08023484 @ =gUnknown_02024D1E
ldr r4, _08023488 @ =gUnknown_02024260
@@ -43047,7 +43047,7 @@ _080233BC:
adds r0, r2
ldrb r0, [r0]
strb r0, [r1]
- ldr r0, _08023494 @ =gUnknown_020239F8
+ ldr r0, _08023494 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -43135,7 +43135,7 @@ _08023484: .4byte gUnknown_02024D1E
_08023488: .4byte gUnknown_02024260
_0802348C: .4byte 0x02000000
_08023490: .4byte 0x00016068
-_08023494: .4byte gUnknown_020239F8
+_08023494: .4byte gBattleTypeFlags
_08023498: .4byte 0x0001606c
_0802349C: .4byte 0x0001606d
_080234A0: .4byte 0x0001606e
@@ -43804,7 +43804,7 @@ _080239C8:
adds r1, r5, 0
bl GiveMoveToBattleMon
_08023A08:
- ldr r0, _08023A78 @ =gUnknown_020239F8
+ ldr r0, _08023A78 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -43856,7 +43856,7 @@ _08023A68: .4byte gUnknown_02024A6A
_08023A6C: .4byte 0x02000000
_08023A70: .4byte 0x00016018
_08023A74: .4byte gBattleMons
-_08023A78: .4byte gUnknown_020239F8
+_08023A78: .4byte gBattleTypeFlags
_08023A7C: .4byte gUnknown_02024C10
thumb_func_end atk59_8025230
@@ -44231,7 +44231,7 @@ _08023D20:
adds r2, r5, 0
bl SetBattleMonMoveSlot
_08023DB0:
- ldr r0, _08023E2C @ =gUnknown_020239F8
+ ldr r0, _08023E2C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -44284,7 +44284,7 @@ _08023E1C: .4byte gUnknown_02024A6A
_08023E20: .4byte gBattleMons
_08023E24: .4byte gUnknown_02024CA8
_08023E28: .4byte gBitTable
-_08023E2C: .4byte gUnknown_020239F8
+_08023E2C: .4byte gBattleTypeFlags
_08023E30: .4byte 0x02000000
_08023E34: .4byte 0x00016018
_08023E38:
@@ -44620,7 +44620,7 @@ _080240C4:
mov r12, r0
lsls r4, r5, 2
ldr r5, _08024124 @ =0x02000000
- ldr r7, _08024128 @ =gUnknown_020239F8
+ ldr r7, _08024128 @ =gBattleTypeFlags
ldr r0, _0802412C @ =gSaveBlock1 + 0x490
mov r8, r0
cmp r1, 0xFF
@@ -44664,7 +44664,7 @@ _080240FE:
.align 2, 0
_08024120: .4byte gTrainerMoney
_08024124: .4byte 0x02000000
-_08024128: .4byte gUnknown_020239F8
+_08024128: .4byte gBattleTypeFlags
_0802412C: .4byte gSaveBlock1 + 0x490
_08024130: .4byte gTrainers
_08024134: .4byte gTrainerBattleOpponent
@@ -46205,7 +46205,7 @@ _08024D6C: .4byte gUnknown_02024C10
thumb_func_start atk73_cmd73
atk73_cmd73: @ 8024D70
push {r4,r5,lr}
- ldr r0, _08024DC0 @ =gUnknown_020239F8
+ ldr r0, _08024DC0 @ =gBattleTypeFlags
ldrh r0, [r0]
movs r5, 0x1
ands r5, r0
@@ -46245,7 +46245,7 @@ _08024DB6:
strb r5, [r0]
b _08024E12
.align 2, 0
-_08024DC0: .4byte gUnknown_020239F8
+_08024DC0: .4byte gBattleTypeFlags
_08024DC4: .4byte gUnknown_02024C10
_08024DC8: .4byte gUnknown_02024A60
_08024DCC: .4byte gBattleMons
@@ -46297,7 +46297,7 @@ _08024E28: .4byte gUnknown_02024C10
thumb_func_start atk74_hp_tresholds_2
atk74_hp_tresholds_2: @ 8024E2C
push {r4-r7,lr}
- ldr r0, _08024E8C @ =gUnknown_020239F8
+ ldr r0, _08024E8C @ =gBattleTypeFlags
ldrh r0, [r0]
movs r7, 0x1
ands r7, r0
@@ -46341,7 +46341,7 @@ atk74_hp_tresholds_2: @ 8024E2C
strb r7, [r0]
b _08024ED0
.align 2, 0
-_08024E8C: .4byte gUnknown_020239F8
+_08024E8C: .4byte gBattleTypeFlags
_08024E90: .4byte gUnknown_02024C10
_08024E94: .4byte gUnknown_02024A60
_08024E98: .4byte 0x02000000
@@ -47012,7 +47012,7 @@ sub_80253E8: @ 80253E8
ldrb r0, [r2, 0x4]
lsls r0, 24
orrs r4, r0
- ldr r0, _08025464 @ =gUnknown_020239F8
+ ldr r0, _08025464 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -47063,7 +47063,7 @@ _0802543E:
b _08025484
.align 2, 0
_08025460: .4byte gUnknown_02024C10
-_08025464: .4byte gUnknown_020239F8
+_08025464: .4byte gBattleTypeFlags
_08025468: .4byte gUnknown_02024C08
_0802546C: .4byte gUnknown_02024C07
_08025470: .4byte gUnknown_02024C0C
@@ -47447,7 +47447,7 @@ _08025764:
adds r0, r2
movs r1, 0x5
strb r1, [r0]
- ldr r0, _080257B8 @ =gUnknown_020239F8
+ ldr r0, _080257B8 @ =gBattleTypeFlags
ldrh r1, [r0]
adds r0, r4, 0
ands r0, r1
@@ -47464,7 +47464,7 @@ _08025764:
b _080257C6
.align 2, 0
_080257B4: .4byte gUnknown_02024C80
-_080257B8: .4byte gUnknown_020239F8
+_080257B8: .4byte gBattleTypeFlags
_080257BC: .4byte gUnknown_02024D1E
_080257C0:
ldr r1, _080257D4 @ =gUnknown_02024D1E
@@ -49241,7 +49241,7 @@ sub_8026590: @ 8026590
push {r4-r7,lr}
mov r7, r8
push {r7}
- ldr r4, _08026628 @ =gUnknown_020239F8
+ ldr r4, _08026628 @ =gBattleTypeFlags
ldrh r1, [r4]
movs r0, 0x8
ands r0, r1
@@ -49314,7 +49314,7 @@ _0802661A:
blt _080265E8
b _08026678
.align 2, 0
-_08026628: .4byte gUnknown_020239F8
+_08026628: .4byte gBattleTypeFlags
_0802662C: .4byte gUnknown_02024C08
_08026630: .4byte gEnemyParty
_08026634: .4byte gPlayerParty
@@ -49353,7 +49353,7 @@ _0802666E:
_08026678:
cmp r7, 0x1
bhi _08026688
- ldr r0, _080266BC @ =gUnknown_020239F8
+ ldr r0, _080266BC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x41
ands r0, r1
@@ -49362,7 +49362,7 @@ _08026678:
_08026688:
cmp r7, 0x2
bhi _080266C4
- ldr r0, _080266BC @ =gUnknown_020239F8
+ ldr r0, _080266BC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -49388,7 +49388,7 @@ _080266A0:
str r1, [r3]
b _08026880
.align 2, 0
-_080266BC: .4byte gUnknown_020239F8
+_080266BC: .4byte gBattleTypeFlags
_080266C0: .4byte gUnknown_02024C10
_080266C4:
bl sub_80264C0
@@ -49397,7 +49397,7 @@ _080266C4:
bne _080266D0
b _08026880
_080266D0:
- ldr r0, _08026710 @ =gUnknown_020239F8
+ ldr r0, _08026710 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -49426,7 +49426,7 @@ _080266DC:
lsrs r5, r0, 24
b _0802671A
.align 2, 0
-_08026710: .4byte gUnknown_020239F8
+_08026710: .4byte gBattleTypeFlags
_08026714: .4byte gUnknown_02024C08
_08026718:
adds r5, r6, 0
@@ -49823,7 +49823,7 @@ _08026A2C: .4byte gUnknown_02024C10
thumb_func_start atk91_givemoney
atk91_givemoney: @ 8026A30
push {r4,lr}
- ldr r0, _08026A8C @ =gUnknown_020239F8
+ ldr r0, _08026A8C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -49867,7 +49867,7 @@ atk91_givemoney: @ 8026A30
str r0, [r4]
b _08026AB4
.align 2, 0
-_08026A8C: .4byte gUnknown_020239F8
+_08026A8C: .4byte gBattleTypeFlags
_08026A90: .4byte gUnknown_02024D1A
_08026A94: .4byte gSaveBlock1 + 0x490
_08026A98: .4byte 0x02000000
@@ -49940,7 +49940,7 @@ _08026B00:
adds r0, r2
movs r1, 0x5
strb r1, [r0, 0x1]
- ldr r0, _08026B54 @ =gUnknown_020239F8
+ ldr r0, _08026B54 @ =gBattleTypeFlags
ldrh r1, [r0]
adds r0, r5, 0
ands r0, r1
@@ -49957,7 +49957,7 @@ _08026B00:
b _08026B60
.align 2, 0
_08026B50: .4byte gUnknown_02024C80
-_08026B54: .4byte gUnknown_020239F8
+_08026B54: .4byte gBattleTypeFlags
_08026B58: .4byte gUnknown_02024D1E
_08026B5C:
ldr r1, _08026B70 @ =gUnknown_02024D1E
@@ -50871,7 +50871,7 @@ _08027290:
ldrb r0, [r4]
bl dp01_battle_side_mark_buffer_for_execution
_080272CC:
- ldr r0, _08027340 @ =gUnknown_020239F8
+ ldr r0, _08027340 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -50922,7 +50922,7 @@ _08027330: .4byte gUnknown_02024C07
_08027334: .4byte gUnknown_02024C0C
_08027338: .4byte gBitTable
_0802733C: .4byte gBattleMons
-_08027340: .4byte gUnknown_020239F8
+_08027340: .4byte gBattleTypeFlags
_08027344: .4byte gUnknown_02024C10
thumb_func_end sub_8027238
@@ -53684,7 +53684,7 @@ _080288D4:
adds r1, r2
strb r0, [r1]
strb r0, [r4]
- ldr r0, _08028944 @ =gUnknown_020239F8
+ ldr r0, _08028944 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -53720,7 +53720,7 @@ _08028934: .4byte gUnknown_02024A60
_08028938: .4byte gUnknown_02024C07
_0802893C: .4byte 0x02000000
_08028940: .4byte 0x00016003
-_08028944: .4byte gUnknown_020239F8
+_08028944: .4byte gBattleTypeFlags
_08028948: .4byte gUnknown_02024C0C
_0802894C: .4byte gBitTable
_08028950: .4byte gBattleMons
@@ -53774,7 +53774,7 @@ _080289B0: .4byte gBattleMons
_080289B4: .4byte gUnknown_02024A6A
_080289B8: .4byte gUnknown_02024C07
_080289BC:
- ldr r0, _080289F4 @ =gUnknown_020239F8
+ ldr r0, _080289F4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -53804,7 +53804,7 @@ _080289EC:
ldrb r0, [r0]
b _08028A10
.align 2, 0
-_080289F4: .4byte gUnknown_020239F8
+_080289F4: .4byte gBattleTypeFlags
_080289F8: .4byte gUnknown_02024A60
_080289FC: .4byte gUnknown_02024C0C
_08028A00: .4byte gBitTable
@@ -53850,7 +53850,7 @@ _08028A26:
bl battle_get_side_with_given_state
ldr r3, _08028AC0 @ =gUnknown_02024A60
strb r0, [r3]
- ldr r0, _08028AC4 @ =gUnknown_020239F8
+ ldr r0, _08028AC4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -53900,7 +53900,7 @@ _08028AB4: .4byte gUnknown_02024D1E
_08028AB8: .4byte gBattleMons
_08028ABC: .4byte gUnknown_02024C07
_08028AC0: .4byte gUnknown_02024A60
-_08028AC4: .4byte gUnknown_020239F8
+_08028AC4: .4byte gBattleTypeFlags
_08028AC8: .4byte gUnknown_02024C0C
_08028ACC: .4byte gBitTable
_08028AD0: .4byte gUnknown_02024C10
@@ -56786,7 +56786,7 @@ sub_802A170: @ 802A170
bl battle_get_side_with_given_state
ldr r3, _0802A1DC @ =gUnknown_02024C08
strb r0, [r3]
- ldr r0, _0802A1E0 @ =gUnknown_020239F8
+ ldr r0, _0802A1E0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -56827,7 +56827,7 @@ sub_802A170: @ 802A170
.align 2, 0
_0802A1D8: .4byte gUnknown_02024C07
_0802A1DC: .4byte gUnknown_02024C08
-_0802A1E0: .4byte gUnknown_020239F8
+_0802A1E0: .4byte gBattleTypeFlags
_0802A1E4: .4byte gUnknown_02024C0C
_0802A1E8: .4byte gBitTable
_0802A1EC: .4byte gUnknown_02024D28
@@ -56869,7 +56869,7 @@ sub_802A218: @ 802A218
lsrs r0, 24
cmp r0, 0x1
bne _0802A24C
- ldr r0, _0802A310 @ =gUnknown_020239F8
+ ldr r0, _0802A310 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0802A314 @ =0x00000902
ands r0, r1
@@ -56887,7 +56887,7 @@ _0802A24C:
bl battle_side_get_owner
lsls r0, 24
lsrs r2, r0, 24
- ldr r0, _0802A310 @ =gUnknown_020239F8
+ ldr r0, _0802A310 @ =gBattleTypeFlags
ldrh r1, [r0]
ldr r0, _0802A314 @ =0x00000902
ands r0, r1
@@ -56981,7 +56981,7 @@ _0802A2EE:
b _0802A49A
.align 2, 0
_0802A30C: .4byte gUnknown_02024C07
-_0802A310: .4byte gUnknown_020239F8
+_0802A310: .4byte gBattleTypeFlags
_0802A314: .4byte 0x00000902
_0802A318: .4byte gTrainerBattleOpponent
_0802A31C: .4byte gUnknown_02024DBC
@@ -59135,7 +59135,7 @@ sub_802B3E0: @ 802B3E0
bl battle_get_side_with_given_state
ldr r4, _0802B460 @ =gUnknown_02024A60
strb r0, [r4]
- ldr r0, _0802B464 @ =gUnknown_020239F8
+ ldr r0, _0802B464 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -59187,7 +59187,7 @@ sub_802B3E0: @ 802B3E0
.align 2, 0
_0802B45C: .4byte gUnknown_02024C07
_0802B460: .4byte gUnknown_02024A60
-_0802B464: .4byte gUnknown_020239F8
+_0802B464: .4byte gBattleTypeFlags
_0802B468: .4byte gUnknown_02024C0C
_0802B46C: .4byte gBitTable
_0802B470: .4byte gUnknown_02024C18
@@ -59362,7 +59362,7 @@ _0802B5C6:
movs r1, 0x1
eors r0, r1
strb r0, [r6]
- ldr r0, _0802B608 @ =gUnknown_020239F8
+ ldr r0, _0802B608 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -59381,7 +59381,7 @@ _0802B5F8: .4byte gUnknown_02024A64
_0802B5FC: .4byte gUnknown_02024A60
_0802B600: .4byte gUnknown_02024C07
_0802B604: .4byte gUnknown_02024C08
-_0802B608: .4byte gUnknown_020239F8
+_0802B608: .4byte gBattleTypeFlags
_0802B60C: .4byte gUnknown_02024C10
_0802B610: .4byte gUnknown_081D9F35
_0802B614:
@@ -60579,7 +60579,7 @@ dp01_tbl1_exec_completed: @ 802BF9C
adds r0, r1
ldr r1, _0802BFE4 @ =sub_802C014
str r1, [r0]
- ldr r0, _0802BFE8 @ =gUnknown_020239F8
+ ldr r0, _0802BFE8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -60603,7 +60603,7 @@ dp01_tbl1_exec_completed: @ 802BF9C
_0802BFDC: .4byte gUnknown_03004330
_0802BFE0: .4byte gUnknown_02024A60
_0802BFE4: .4byte sub_802C014
-_0802BFE8: .4byte gUnknown_020239F8
+_0802BFE8: .4byte gBattleTypeFlags
_0802BFEC: .4byte gUnknown_02023A60
_0802BFF0:
ldr r2, _0802C00C @ =gUnknown_02024A64
@@ -60886,7 +60886,7 @@ _0802C218:
ands r0, r1
cmp r0, 0
beq _0802C2A0
- ldr r6, _0802C294 @ =gUnknown_020239F8
+ ldr r6, _0802C294 @ =gBattleTypeFlags
ldrh r1, [r6]
adds r0, r2, 0
ands r0, r1
@@ -60938,7 +60938,7 @@ _0802C278:
bl sub_814A7FC
b _0802C2AC
.align 2, 0
-_0802C294: .4byte gUnknown_020239F8
+_0802C294: .4byte gBattleTypeFlags
_0802C298: .4byte gUnknown_02024C0C
_0802C29C: .4byte gBitTable
_0802C2A0:
@@ -61800,7 +61800,7 @@ _0802C99C:
ldrb r0, [r0]
cmp r0, 0x1
bls _0802CA38
- ldr r0, _0802C9DC @ =gUnknown_020239F8
+ ldr r0, _0802C9DC @ =gBattleTypeFlags
ldrh r1, [r0]
adds r0, r6, 0
ands r0, r1
@@ -61823,7 +61823,7 @@ _0802C99C:
b _0802C9F4
.align 2, 0
_0802C9D8: .4byte gUnknown_03004348
-_0802C9DC: .4byte gUnknown_020239F8
+_0802C9DC: .4byte gBattleTypeFlags
_0802C9E0: .4byte gUnknown_02024E64
_0802C9E4: .4byte gUnknown_081FAE80
_0802C9E8: .4byte gUnknown_03004344
@@ -62760,7 +62760,7 @@ sub_802D18C: @ 802D18C
ands r0, r1
cmp r0, 0
bne _0802D1F2
- ldr r0, _0802D1C0 @ =gUnknown_020239F8
+ ldr r0, _0802D1C0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -62777,7 +62777,7 @@ sub_802D18C: @ 802D18C
b _0802D1F2
.align 2, 0
_0802D1BC: .4byte gPaletteFade
-_0802D1C0: .4byte gUnknown_020239F8
+_0802D1C0: .4byte gBattleTypeFlags
_0802D1C4: .4byte gUnknown_03004330
_0802D1C8: .4byte gUnknown_02024A60
_0802D1CC: .4byte sub_802D148
@@ -62960,7 +62960,7 @@ sub_802D31C: @ 802D31C
lsls r0, 24
cmp r0, 0
beq _0802D374
- ldr r0, _0802D360 @ =gUnknown_020239F8
+ ldr r0, _0802D360 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -62984,7 +62984,7 @@ _0802D340:
bne _0802D3AA
b _0802D3A8
.align 2, 0
-_0802D360: .4byte gUnknown_020239F8
+_0802D360: .4byte gBattleTypeFlags
_0802D364: .4byte gSprites
_0802D368: .4byte gUnknown_03004340
_0802D36C: .4byte gUnknown_02024A60
@@ -63097,7 +63097,7 @@ _0802D3D8:
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
- ldr r0, _0802D474 @ =gUnknown_020239F8
+ ldr r0, _0802D474 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -63113,7 +63113,7 @@ _0802D464: .4byte gUnknown_02024A60
_0802D468: .4byte SpriteCallbackDummy
_0802D46C: .4byte 0x02017810
_0802D470: .4byte 0x000027f9
-_0802D474: .4byte gUnknown_020239F8
+_0802D474: .4byte gBattleTypeFlags
_0802D478: .4byte gMPlay_BGM
_0802D47C:
ldr r0, _0802D4E0 @ =gMPlay_BGM
@@ -63251,7 +63251,7 @@ _0802D55E:
lsls r0, 24
cmp r0, 0
beq _0802D5EE
- ldr r0, _0802D664 @ =gUnknown_020239F8
+ ldr r0, _0802D664 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -63345,7 +63345,7 @@ _0802D654: .4byte gUnknown_02024A60
_0802D658: .4byte 0x02017810
_0802D65C: .4byte gUnknown_02024A6A
_0802D660: .4byte gPlayerParty
-_0802D664: .4byte gUnknown_020239F8
+_0802D664: .4byte gBattleTypeFlags
_0802D668: .4byte gUnknown_0300434C
_0802D66C: .4byte gSprites
_0802D670: .4byte gUnknown_03004340
@@ -65095,7 +65095,7 @@ _0802E488: .4byte 0x02017810
b_link_standby_message: @ 802E48C
push {lr}
sub sp, 0x4
- ldr r0, _0802E4BC @ =gUnknown_020239F8
+ ldr r0, _0802E4BC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -65118,7 +65118,7 @@ _0802E4B6:
pop {r0}
bx r0
.align 2, 0
-_0802E4BC: .4byte gUnknown_020239F8
+_0802E4BC: .4byte gBattleTypeFlags
_0802E4C0: .4byte gUnknown_030042A4
_0802E4C4: .4byte gUnknown_030042A0
_0802E4C8: .4byte gUnknown_03004210
@@ -67845,7 +67845,7 @@ sub_802FBB4: @ 802FBB4
push {r4-r7,lr}
mov r7, r8
push {r7}
- ldr r0, _0802FBDC @ =gUnknown_020239F8
+ ldr r0, _0802FBDC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -67862,7 +67862,7 @@ sub_802FBB4: @ 802FBB4
movs r7, 0x10
b _0802FBEA
.align 2, 0
-_0802FBDC: .4byte gUnknown_020239F8
+_0802FBDC: .4byte gBattleTypeFlags
_0802FBE0: .4byte gUnknown_02024A60
_0802FBE4: .4byte 0x0000fff0
_0802FBE8:
@@ -70185,7 +70185,7 @@ _08030ECC:
lsls r0, 24
cmp r0, 0
beq _08030EEC
- ldr r0, _08030F10 @ =gUnknown_020239F8
+ ldr r0, _08030F10 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -70208,7 +70208,7 @@ _08030EEC:
b _08030F70
.align 2, 0
_08030F0C: .4byte gUnknown_02024A60
-_08030F10: .4byte gUnknown_020239F8
+_08030F10: .4byte gBattleTypeFlags
_08030F14: .4byte gUnknown_02023A60
_08030F18: .4byte gUnknown_02024A6A
_08030F1C:
@@ -71889,7 +71889,7 @@ _08031C5C:
bne _08031CC4
cmp r4, 0x2
bne _08031C94
- ldr r0, _08031C80 @ =gUnknown_020239F8
+ ldr r0, _08031C80 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -71899,7 +71899,7 @@ _08031C5C:
bl LoadCompressedObjectPic
b _08031D52
.align 2, 0
-_08031C80: .4byte gUnknown_020239F8
+_08031C80: .4byte gBattleTypeFlags
_08031C84: .4byte gUnknown_0820A4AC
_08031C88:
ldr r0, _08031C90 @ =gUnknown_0820A47C
@@ -72066,7 +72066,7 @@ _08031DC0:
strb r0, [r4]
b _08031EDE
_08031DC8:
- ldr r0, _08031DE0 @ =gUnknown_020239F8
+ ldr r0, _08031DE0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -72078,7 +72078,7 @@ _08031DC8:
bl battle_make_oam_safari_battle
b _08031DEA
.align 2, 0
-_08031DE0: .4byte gUnknown_020239F8
+_08031DE0: .4byte gBattleTypeFlags
_08031DE4:
ldrb r0, [r4]
bl battle_make_oam_normal_battle
@@ -72123,7 +72123,7 @@ _08031E34:
lsls r0, 24
cmp r0, 0
bne _08031E7C
- ldr r0, _08031E6C @ =gUnknown_020239F8
+ ldr r0, _08031E6C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -72145,7 +72145,7 @@ _08031E34:
bl sub_8045A5C
b _08031E9A
.align 2, 0
-_08031E6C: .4byte gUnknown_020239F8
+_08031E6C: .4byte gBattleTypeFlags
_08031E70: .4byte gUnknown_03004340
_08031E74: .4byte gUnknown_02024A6A
_08031E78: .4byte gPlayerParty
@@ -73939,7 +73939,7 @@ sub_8032C88: @ 8032C88
lsls r0, 24
cmp r0, 0
beq _08032CE0
- ldr r0, _08032CCC @ =gUnknown_020239F8
+ ldr r0, _08032CCC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -73963,7 +73963,7 @@ _08032CAC:
bne _08032D16
b _08032D14
.align 2, 0
-_08032CCC: .4byte gUnknown_020239F8
+_08032CCC: .4byte gBattleTypeFlags
_08032CD0: .4byte gSprites
_08032CD4: .4byte gUnknown_03004340
_08032CD8: .4byte gUnknown_02024A60
@@ -74072,7 +74072,7 @@ _08032D22:
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
- ldr r0, _08032DDC @ =gUnknown_020239F8
+ ldr r0, _08032DDC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -74088,7 +74088,7 @@ _08032DCC: .4byte gUnknown_02024A60
_08032DD0: .4byte SpriteCallbackDummy
_08032DD4: .4byte 0x02017810
_08032DD8: .4byte 0x000027f9
-_08032DDC: .4byte gUnknown_020239F8
+_08032DDC: .4byte gBattleTypeFlags
_08032DE0: .4byte gMPlay_BGM
_08032DE4:
ldr r0, _08032E14 @ =gMPlay_BGM
@@ -74210,7 +74210,7 @@ _08032EC6:
lsls r0, 24
cmp r0, 0
beq _08032F58
- ldr r0, _08032FFC @ =gUnknown_020239F8
+ ldr r0, _08032FFC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -74347,7 +74347,7 @@ _08032FEC: .4byte gUnknown_02024A60
_08032FF0: .4byte 0x02017810
_08032FF4: .4byte gUnknown_02024A6A
_08032FF8: .4byte gEnemyParty
-_08032FFC: .4byte gUnknown_020239F8
+_08032FFC: .4byte gBattleTypeFlags
_08033000: .4byte gUnknown_0300434C
_08033004: .4byte gSprites
_08033008: .4byte gUnknown_03004340
@@ -77707,7 +77707,7 @@ sub_8034BFC: @ 8034BFC
.align 2, 0
_08034C18: .4byte gTrainerBattleOpponent
_08034C1C:
- ldr r0, _08034C30 @ =gUnknown_020239F8
+ ldr r0, _08034C30 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 1
@@ -77717,7 +77717,7 @@ _08034C1C:
bl get_trainer_class_pic_index
b _08034C42
.align 2, 0
-_08034C30: .4byte gUnknown_020239F8
+_08034C30: .4byte gBattleTypeFlags
_08034C34:
movs r0, 0x80
lsls r0, 4
@@ -77918,7 +77918,7 @@ sub_8034DC0: @ 8034DC0
.align 2, 0
_08034DDC: .4byte gTrainerBattleOpponent
_08034DE0:
- ldr r0, _08034DF4 @ =gUnknown_020239F8
+ ldr r0, _08034DF4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 1
@@ -77928,7 +77928,7 @@ _08034DE0:
bl get_trainer_class_pic_index
b _08034E06
.align 2, 0
-_08034DF4: .4byte gUnknown_020239F8
+_08034DF4: .4byte gBattleTypeFlags
_08034DF8:
movs r0, 0x80
lsls r0, 4
@@ -78707,7 +78707,7 @@ sub_8035428: @ 8035428
lsls r0, 9
ldr r1, _08035460 @ =gUnknown_02023A64
adds r5, r0, r1
- ldr r0, _08035464 @ =gUnknown_020239F8
+ ldr r0, _08035464 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x93
lsls r0, 3
@@ -78728,7 +78728,7 @@ sub_8035428: @ 8035428
.align 2, 0
_0803545C: .4byte gUnknown_02024A60
_08035460: .4byte gUnknown_02023A64
-_08035464: .4byte gUnknown_020239F8
+_08035464: .4byte gBattleTypeFlags
_08035468:
movs r0, 0x1
movs r1, 0x3
@@ -78832,7 +78832,7 @@ _080354FA:
_08035534: .4byte gBattleMoves
_08035538: .4byte gUnknown_02024A60
_0803553C:
- ldr r0, _0803556C @ =gUnknown_020239F8
+ ldr r0, _0803556C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -78854,7 +78854,7 @@ _0803553C:
bl dp01_build_cmdbuf_x21_a_bb
b _08035586
.align 2, 0
-_0803556C: .4byte gUnknown_020239F8
+_0803556C: .4byte gBattleTypeFlags
_08035570:
movs r0, 0
bl battle_get_side_with_given_state
@@ -78916,7 +78916,7 @@ sub_80355C0: @ 80355C0
lsrs r4, r0, 24
cmp r4, 0x6
bne _0803568A
- ldr r0, _08035610 @ =gUnknown_020239F8
+ ldr r0, _08035610 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -78932,7 +78932,7 @@ sub_80355C0: @ 80355C0
_08035604: .4byte 0x02000000
_08035608: .4byte gUnknown_02024A60
_0803560C: .4byte 0x000160c8
-_08035610: .4byte gUnknown_020239F8
+_08035610: .4byte gBattleTypeFlags
_08035614:
movs r0, 0x1
bl battle_get_side_with_given_state
@@ -79747,7 +79747,7 @@ sub_8035C44: @ 8035C44
lsls r0, 24
cmp r0, 0
beq _08035C7E
- ldr r0, _08035CA4 @ =gUnknown_020239F8
+ ldr r0, _08035CA4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -79771,7 +79771,7 @@ _08035C7E:
.align 2, 0
_08035C9C: .4byte gUnknown_02024A60
_08035CA0: .4byte gTasks
-_08035CA4: .4byte gUnknown_020239F8
+_08035CA4: .4byte gBattleTypeFlags
_08035CA8: .4byte gUnknown_02023A60
_08035CAC: .4byte gUnknown_02024A6A
_08035CB0:
@@ -80156,7 +80156,7 @@ sub_8035F98: @ 8035F98
thumb_func_start sub_8035FA4
sub_8035FA4: @ 8035FA4
push {lr}
- ldr r0, _08035FD8 @ =gUnknown_020239F8
+ ldr r0, _08035FD8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -80180,7 +80180,7 @@ _08035FCE:
pop {r0}
bx r0
.align 2, 0
-_08035FD8: .4byte gUnknown_020239F8
+_08035FD8: .4byte gBattleTypeFlags
_08035FDC: .4byte gMain
_08035FE0: .4byte 0x0000043d
_08035FE4: .4byte gUnknown_030042D0
@@ -80248,7 +80248,7 @@ sub_8036054: @ 8036054
mov r7, r9
mov r6, r8
push {r6,r7}
- ldr r0, _0803606C @ =gUnknown_020239F8
+ ldr r0, _0803606C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -80256,7 +80256,7 @@ sub_8036054: @ 8036054
beq _080360A0
b _080361C8
.align 2, 0
-_0803606C: .4byte gUnknown_020239F8
+_0803606C: .4byte gBattleTypeFlags
_08036070:
ldr r0, _08036094 @ =gUnknown_02024A60
ldrb r0, [r0]
@@ -80485,7 +80485,7 @@ _0803622E:
bne _08036242
b _08036400
_08036242:
- ldr r0, _0803628C @ =gUnknown_020239F8
+ ldr r0, _0803628C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -80516,7 +80516,7 @@ _0803627C: .4byte gUnknown_02024C3C
_08036280: .4byte gUnknown_02024A60
_08036284: .4byte 0x0000ffff
_08036288: .4byte gBattleMoves
-_0803628C: .4byte gUnknown_020239F8
+_0803628C: .4byte gBattleTypeFlags
_08036290: .4byte gUnknown_02024C0C
_08036294: .4byte gBitTable
_08036298:
@@ -80901,7 +80901,7 @@ _08036596:
cmp r4, 0x3
ble _08036550
_0803659C:
- ldr r0, _080365BC @ =gUnknown_020239F8
+ ldr r0, _080365BC @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -80913,7 +80913,7 @@ _080365AC: .4byte gUnknown_02024C0C
_080365B0: .4byte gBitTable
_080365B4: .4byte gBattleMons
_080365B8: .4byte gUnknown_02024A60
-_080365BC: .4byte gUnknown_020239F8
+_080365BC: .4byte gBattleTypeFlags
_080365C0:
movs r0, 0x1
b _08036640
@@ -81082,7 +81082,7 @@ _080366E2:
bne _080366F6
b _080368D8
_080366F6:
- ldr r0, _08036744 @ =gUnknown_020239F8
+ ldr r0, _08036744 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -81115,7 +81115,7 @@ _08036734: .4byte gUnknown_02024A60
_08036738: .4byte 0x0000ffff
_0803673C: .4byte gUnknown_02024C5C
_08036740: .4byte gBattleMoves
-_08036744: .4byte gUnknown_020239F8
+_08036744: .4byte gBattleTypeFlags
_08036748: .4byte gUnknown_02024C0C
_0803674C: .4byte gBitTable
_08036750:
@@ -81410,7 +81410,7 @@ _08036994:
_080369A0:
movs r0, 0
mov r8, r0
- ldr r0, _080369F0 @ =gUnknown_020239F8
+ ldr r0, _080369F0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -81442,7 +81442,7 @@ _080369E0: .4byte gBattleMons
_080369E4: .4byte gUnknown_02024A60
_080369E8: .4byte 0x0400e000
_080369EC: .4byte gUnknown_02024C98
-_080369F0: .4byte gUnknown_020239F8
+_080369F0: .4byte gBattleTypeFlags
_080369F4: .4byte gUnknown_02024C0C
_080369F8: .4byte gBitTable
_080369FC:
@@ -81576,7 +81576,7 @@ _08036AFE:
thumb_func_start sub_8036B0C
sub_8036B0C: @ 8036B0C
push {r4-r6,lr}
- ldr r5, _08036B68 @ =gUnknown_020239F8
+ ldr r5, _08036B68 @ =gBattleTypeFlags
ldrh r1, [r5]
movs r0, 0x8
ands r0, r1
@@ -81619,7 +81619,7 @@ _08036B28:
adds r6, r5, 0
b _08036B8C
.align 2, 0
-_08036B68: .4byte gUnknown_020239F8
+_08036B68: .4byte gBattleTypeFlags
_08036B6C: .4byte 0x02000000
_08036B70: .4byte gUnknown_02024A60
_08036B74: .4byte 0x000160c8
@@ -81808,7 +81808,7 @@ sub_8036CD4: @ 8036CD4
mov r5, r8
push {r5-r7}
sub sp, 0x1C
- ldr r0, _08036D1C @ =gUnknown_020239F8
+ ldr r0, _08036D1C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -81837,7 +81837,7 @@ sub_8036CD4: @ 8036CD4
str r4, [sp, 0x10]
b _08036D42
.align 2, 0
-_08036D1C: .4byte gUnknown_020239F8
+_08036D1C: .4byte gBattleTypeFlags
_08036D20: .4byte gUnknown_02024A60
_08036D24: .4byte gUnknown_02024C0C
_08036D28: .4byte gBitTable
@@ -83054,7 +83054,7 @@ sub_8037680: @ 8037680
lsls r0, 24
cmp r0, 0
beq _080376D8
- ldr r0, _080376C4 @ =gUnknown_020239F8
+ ldr r0, _080376C4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -83078,7 +83078,7 @@ _080376A4:
bne _0803770E
b _0803770C
.align 2, 0
-_080376C4: .4byte gUnknown_020239F8
+_080376C4: .4byte gBattleTypeFlags
_080376C8: .4byte gSprites
_080376CC: .4byte gUnknown_03004340
_080376D0: .4byte gUnknown_02024A60
@@ -83195,7 +83195,7 @@ _08037720:
adds r0, r4, 0
bl FreeSpritePaletteByTag
_080377B4:
- ldr r0, _080377F0 @ =gUnknown_020239F8
+ ldr r0, _080377F0 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -83217,7 +83217,7 @@ _080377E0: .4byte gUnknown_02024A60
_080377E4: .4byte SpriteCallbackDummy
_080377E8: .4byte 0x02017810
_080377EC: .4byte 0x000027f9
-_080377F0: .4byte gUnknown_020239F8
+_080377F0: .4byte gBattleTypeFlags
_080377F4: .4byte gMPlay_BGM
_080377F8:
ldr r0, _08037828 @ =gMPlay_BGM
@@ -83335,7 +83335,7 @@ _080378BE:
beq _080378DA
b _08037A3A
_080378DA:
- ldr r0, _08037A58 @ =gUnknown_020239F8
+ ldr r0, _08037A58 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -83372,7 +83372,7 @@ _0803791A:
lsls r0, 24
cmp r0, 0
beq _080379B2
- ldr r0, _08037A58 @ =gUnknown_020239F8
+ ldr r0, _08037A58 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -83513,7 +83513,7 @@ _08037A48: .4byte gUnknown_02024A60
_08037A4C: .4byte 0x02017810
_08037A50: .4byte gUnknown_02024A6A
_08037A54: .4byte gEnemyParty
-_08037A58: .4byte gUnknown_020239F8
+_08037A58: .4byte gBattleTypeFlags
_08037A5C: .4byte gUnknown_0300434C
_08037A60: .4byte gSprites
_08037A64: .4byte gUnknown_03004340
@@ -84111,7 +84111,7 @@ sub_8037F34: @ 8037F34
ands r0, r1
cmp r0, 0
bne _08037F9A
- ldr r0, _08037F68 @ =gUnknown_020239F8
+ ldr r0, _08037F68 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -84128,7 +84128,7 @@ sub_8037F34: @ 8037F34
b _08037F9A
.align 2, 0
_08037F64: .4byte gPaletteFade
-_08037F68: .4byte gUnknown_020239F8
+_08037F68: .4byte gBattleTypeFlags
_08037F6C: .4byte gUnknown_03004330
_08037F70: .4byte gUnknown_02024A60
_08037F74: .4byte sub_8037EF0
@@ -84216,7 +84216,7 @@ dp01_tbl4_exec_completed: @ 8038004
adds r0, r1
ldr r1, _0803804C @ =sub_803752C
str r1, [r0]
- ldr r0, _08038050 @ =gUnknown_020239F8
+ ldr r0, _08038050 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -84240,7 +84240,7 @@ dp01_tbl4_exec_completed: @ 8038004
_08038044: .4byte gUnknown_03004330
_08038048: .4byte gUnknown_02024A60
_0803804C: .4byte sub_803752C
-_08038050: .4byte gUnknown_020239F8
+_08038050: .4byte gBattleTypeFlags
_08038054: .4byte gUnknown_02023A60
_08038058:
ldr r2, _08038074 @ =gUnknown_02024A64
@@ -86915,7 +86915,7 @@ sub_80396D0: @ 80396D0
mov r6, r9
mov r5, r8
push {r5,r6}
- ldr r0, _08039704 @ =gUnknown_020239F8
+ ldr r0, _08039704 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -86936,7 +86936,7 @@ _080396F8:
bl sub_803FC34
b _08039724
.align 2, 0
-_08039704: .4byte gUnknown_020239F8
+_08039704: .4byte gBattleTypeFlags
_08039708: .4byte gUnknown_02024A60
_0803970C: .4byte 0x0000fff0
_08039710: .4byte gLinkPlayers
@@ -88445,7 +88445,7 @@ sub_803A2C4: @ 803A2C4
lsls r0, 24
cmp r0, 0
beq _0803A2FE
- ldr r0, _0803A324 @ =gUnknown_020239F8
+ ldr r0, _0803A324 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -88469,7 +88469,7 @@ _0803A2FE:
.align 2, 0
_0803A31C: .4byte gUnknown_02024A60
_0803A320: .4byte gTasks
-_0803A324: .4byte gUnknown_020239F8
+_0803A324: .4byte gBattleTypeFlags
_0803A328: .4byte gUnknown_02023A60
_0803A32C: .4byte gUnknown_02024A6A
_0803A330:
diff --git a/asm/rom_804373C.s b/asm/rom_804373C.s
index b3011de55..b84342e18 100644
--- a/asm/rom_804373C.s
+++ b/asm/rom_804373C.s
@@ -1896,7 +1896,7 @@ _080445BA:
bne _080445FA
b _080447D4
_080445FA:
- ldr r0, _08044684 @ =gUnknown_020239F8
+ ldr r0, _08044684 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -1958,7 +1958,7 @@ _08044674: .4byte gUnknown_02024A6A
_08044678: .4byte gUnknown_03004340
_0804467C: .4byte SpriteCallbackDummy
_08044680: .4byte 0x02017800
-_08044684: .4byte gUnknown_020239F8
+_08044684: .4byte gBattleTypeFlags
_08044688: .4byte 0x06010000
_0804468C: .4byte 0x05000040
_08044690: .4byte gPlayerParty
@@ -1996,7 +1996,7 @@ _080446D8: .4byte REG_BG0CNT
_080446DC:
cmp r6, 0x1
bne _0804478C
- ldr r0, _08044704 @ =gUnknown_020239F8
+ ldr r0, _08044704 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -2014,7 +2014,7 @@ _080446DC:
bl sub_8044338
b _080447BE
.align 2, 0
-_08044704: .4byte gUnknown_020239F8
+_08044704: .4byte gBattleTypeFlags
_08044708: .4byte gEnemyParty
_0804470C:
ldrb r1, [r5]
@@ -2085,7 +2085,7 @@ _0804478C:
adds r1, r4
movs r2, 0x5
bl sub_8045A5C
- ldr r0, _080447F8 @ =gUnknown_020239F8
+ ldr r0, _080447F8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
ands r0, r1
@@ -2129,7 +2129,7 @@ _080447E4:
bx r0
.align 2, 0
_080447F4: .4byte gEnemyParty
-_080447F8: .4byte gUnknown_020239F8
+_080447F8: .4byte gBattleTypeFlags
_080447FC: .4byte gUnknown_03004340
_08044800: .4byte gUnknown_02024A68
thumb_func_end sub_804454C
@@ -2448,7 +2448,7 @@ _08044A76:
cmp r0, 0
bne _08044B5E
movs r6, 0
- ldr r5, _08044AC8 @ =gUnknown_020239F8
+ ldr r5, _08044AC8 @ =gBattleTypeFlags
mov r10, r5
ldr r0, _08044ACC @ =0x0000ffff
mov r9, r0
@@ -2483,7 +2483,7 @@ _08044A9A:
b _08044B46
.align 2, 0
_08044AC4: .4byte 0x0000ff88
-_08044AC8: .4byte gUnknown_020239F8
+_08044AC8: .4byte gBattleTypeFlags
_08044ACC: .4byte 0x0000ffff
_08044AD0: .4byte gSprites
_08044AD4: .4byte 0x000003ff
@@ -2561,7 +2561,7 @@ _08044B52:
b _08044C38
_08044B5E:
movs r6, 0
- ldr r1, _08044BA4 @ =gUnknown_020239F8
+ ldr r1, _08044BA4 @ =gBattleTypeFlags
mov r10, r1
ldr r2, _08044BA8 @ =0x0000ffff
mov r9, r2
@@ -2596,7 +2596,7 @@ _08044B78:
adds r1, 0x3
b _08044C22
.align 2, 0
-_08044BA4: .4byte gUnknown_020239F8
+_08044BA4: .4byte gBattleTypeFlags
_08044BA8: .4byte 0x0000ffff
_08044BAC: .4byte gSprites
_08044BB0: .4byte 0x000003ff
@@ -3748,7 +3748,7 @@ sub_8045458: @ 8045458
lsrs r2, r0, 24
lsls r1, 24
lsrs r7, r1, 24
- ldr r0, _080454F4 @ =gUnknown_020239F8
+ ldr r0, _080454F4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x80
lsls r0, 2
@@ -3815,7 +3815,7 @@ sub_8045458: @ 8045458
bl CpuSet
b _0804552E
.align 2, 0
-_080454F4: .4byte gUnknown_020239F8
+_080454F4: .4byte gBattleTypeFlags
_080454F8: .4byte gSprites
_080454FC: .4byte gUnknown_02024A6A
_08045500: .4byte gEnemyParty
diff --git a/asm/rom_8077ABC.s b/asm/rom_8077ABC.s
index 13be8444a..9a59c265d 100644
--- a/asm/rom_8077ABC.s
+++ b/asm/rom_8077ABC.s
@@ -45,7 +45,7 @@ _08077B00:
bl battle_get_per_side_status
lsls r0, 24
lsrs r0, 22
- ldr r1, _08077B24 @ =gUnknown_020239F8
+ ldr r1, _08077B24 @ =gBattleTypeFlags
ldrh r2, [r1]
movs r1, 0x1
ands r1, r2
@@ -56,14 +56,14 @@ _08077B00:
b _08077BF4
.align 2, 0
_08077B20: .4byte gUnknown_0837F578
-_08077B24: .4byte gUnknown_020239F8
+_08077B24: .4byte gBattleTypeFlags
_08077B28:
ldr r4, _08077B48 @ =gUnknown_0837F578
adds r0, r5, 0
bl battle_get_per_side_status
lsls r0, 24
lsrs r0, 22
- ldr r1, _08077B4C @ =gUnknown_020239F8
+ ldr r1, _08077B4C @ =gBattleTypeFlags
ldrh r2, [r1]
movs r1, 0x1
ands r1, r2
@@ -74,7 +74,7 @@ _08077B28:
b _08077BF4
.align 2, 0
_08077B48: .4byte gUnknown_0837F578
-_08077B4C: .4byte gUnknown_020239F8
+_08077B4C: .4byte gBattleTypeFlags
_08077B50:
bl sub_8076BE0
lsls r0, 24
@@ -506,7 +506,7 @@ _08077E94:
ldr r3, _08077EDC @ =gUnknown_0837F578
lsls r0, 24
lsrs r0, 22
- ldr r1, _08077EE0 @ =gUnknown_020239F8
+ ldr r1, _08077EE0 @ =gBattleTypeFlags
ldrh r2, [r1]
movs r1, 0x1
ands r1, r2
@@ -539,7 +539,7 @@ _08077ED4:
bx r1
.align 2, 0
_08077EDC: .4byte gUnknown_0837F578
-_08077EE0: .4byte gUnknown_020239F8
+_08077EE0: .4byte gBattleTypeFlags
thumb_func_end sub_8077E44
thumb_func_start sub_8077EE4
@@ -1963,13 +1963,13 @@ _080788FE:
thumb_func_start IsDoubleBattle
IsDoubleBattle: @ 8078904
- ldr r0, _08078910 @ =gUnknown_020239F8
+ ldr r0, _08078910 @ =gBattleTypeFlags
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
bx lr
.align 2, 0
-_08078910: .4byte gUnknown_020239F8
+_08078910: .4byte gBattleTypeFlags
thumb_func_end IsDoubleBattle
thumb_func_start sub_8078914
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index ac09ef93a..28a8de060 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -1177,7 +1177,7 @@ dp01_tbl6_exec_completed: @ 812B7C0
adds r0, r1
ldr r1, _0812B808 @ =sub_812B484
str r1, [r0]
- ldr r0, _0812B80C @ =gUnknown_020239F8
+ ldr r0, _0812B80C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -1201,7 +1201,7 @@ dp01_tbl6_exec_completed: @ 812B7C0
_0812B800: .4byte gUnknown_03004330
_0812B804: .4byte gUnknown_02024A60
_0812B808: .4byte sub_812B484
-_0812B80C: .4byte gUnknown_020239F8
+_0812B80C: .4byte gBattleTypeFlags
_0812B810: .4byte gUnknown_02023A60
_0812B814:
ldr r2, _0812B830 @ =gUnknown_02024A64
@@ -2191,7 +2191,7 @@ sub_812BF54: @ 812BF54
movs r0, 0x3
bl BeginFastPaletteFade
bl dp01_tbl6_exec_completed
- ldr r0, _0812BFA4 @ =gUnknown_020239F8
+ ldr r0, _0812BFA4 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -2211,7 +2211,7 @@ _0812BF90:
_0812BF98: .4byte gUnknown_02024D26
_0812BF9C: .4byte gUnknown_02023A60
_0812BFA0: .4byte gUnknown_02024A60
-_0812BFA4: .4byte gUnknown_020239F8
+_0812BFA4: .4byte gBattleTypeFlags
_0812BFA8: .4byte gUnknown_03004330
_0812BFAC: .4byte sub_812B6AC
thumb_func_end sub_812BF54
@@ -21501,7 +21501,7 @@ _08135588:
beq _08135600
b _08135648
_0813558E:
- ldr r1, _081355A4 @ =gUnknown_020239F8
+ ldr r1, _081355A4 @ =gBattleTypeFlags
movs r3, 0x84
lsls r3, 1
adds r0, r3, 0
@@ -21511,7 +21511,7 @@ _0813558E:
bl sub_8134DD4
b _081355D6
.align 2, 0
-_081355A4: .4byte gUnknown_020239F8
+_081355A4: .4byte gBattleTypeFlags
_081355A8: .4byte gTrainerBattleOpponent
_081355AC:
movs r5, 0
@@ -21565,7 +21565,7 @@ _08135606:
adds r5, 0x1
cmp r5, 0x2
ble _08135606
- ldr r1, _08135658 @ =gUnknown_020239F8
+ ldr r1, _08135658 @ =gBattleTypeFlags
ldr r2, _0813565C @ =0x00000808
adds r0, r2, 0
strh r0, [r1]
@@ -21589,7 +21589,7 @@ _08135648:
.align 2, 0
_08135650: .4byte gEnemyParty
_08135654: .4byte gSaveBlock2 + 0x4CC
-_08135658: .4byte gUnknown_020239F8
+_08135658: .4byte gBattleTypeFlags
_0813565C: .4byte 0x00000808
_08135660: .4byte gTrainerBattleOpponent
_08135664: .4byte sub_8135534
@@ -25550,7 +25550,7 @@ _08137596:
lsls r0, 24
cmp r0, 0
beq _08137626
- ldr r0, _0813769C @ =gUnknown_020239F8
+ ldr r0, _0813769C @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -25644,7 +25644,7 @@ _0813768C: .4byte gUnknown_02024A60
_08137690: .4byte 0x02017810
_08137694: .4byte gUnknown_02024A6A
_08137698: .4byte gPlayerParty
-_0813769C: .4byte gUnknown_020239F8
+_0813769C: .4byte gBattleTypeFlags
_081376A0: .4byte gUnknown_0300434C
_081376A4: .4byte gSprites
_081376A8: .4byte gUnknown_03004340
@@ -26001,7 +26001,7 @@ dp01_tbl5_exec_completed: @ 813796C
adds r0, r1
ldr r1, _081379B4 @ =sub_813726C
str r1, [r0]
- ldr r0, _081379B8 @ =gUnknown_020239F8
+ ldr r0, _081379B8 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x2
ands r0, r1
@@ -26025,7 +26025,7 @@ dp01_tbl5_exec_completed: @ 813796C
_081379AC: .4byte gUnknown_03004330
_081379B0: .4byte gUnknown_02024A60
_081379B4: .4byte sub_813726C
-_081379B8: .4byte gUnknown_020239F8
+_081379B8: .4byte gBattleTypeFlags
_081379BC: .4byte gUnknown_02023A60
_081379C0:
ldr r2, _081379DC @ =gUnknown_02024A64
@@ -30171,7 +30171,7 @@ sub_8139BB8: @ 8139BB8
movs r0, 0x3
bl BeginFastPaletteFade
bl dp01_tbl5_exec_completed
- ldr r0, _08139C08 @ =gUnknown_020239F8
+ ldr r0, _08139C08 @ =gBattleTypeFlags
ldrh r1, [r0]
movs r0, 0x6
ands r0, r1
@@ -30191,7 +30191,7 @@ _08139BF4:
_08139BFC: .4byte gUnknown_02024D26
_08139C00: .4byte gUnknown_02023A60
_08139C04: .4byte gUnknown_02024A60
-_08139C08: .4byte gUnknown_020239F8
+_08139C08: .4byte gBattleTypeFlags
_08139C0C: .4byte gUnknown_03004330
_08139C10: .4byte sub_813746C
thumb_func_end sub_8139BB8
diff --git a/src/battle_ai.c b/src/battle_ai.c
index d11e4a118..29fe7e0e0 100644
--- a/src/battle_ai.c
+++ b/src/battle_ai.c
@@ -15,7 +15,7 @@ all the way to at least 0x2016800, in addition to extremely hard functions that
as it currently is until someone bothers to document this huge struct.
*/
-extern u16 gUnknown_020239F8;
+extern u16 gBattleTypeFlags;
extern u8 gUnknown_02024A60;
extern u8 gUnknown_02024C07;
extern u8 gUnknown_02024C08;
@@ -103,7 +103,7 @@ void sub_81070D4(void)
for(i = 0; (u32)i < 48; i++)
data[i] = 0;
- if((gUnknown_020239F8 & 8) && gTrainerBattleOpponent != 0x400 && !(gUnknown_020239F8 & 0x982))
+ if((gBattleTypeFlags & 8) && gTrainerBattleOpponent != 0x400 && !(gBattleTypeFlags & 0x982))
{
for(i = 0; i < 4; i++)
{
@@ -140,7 +140,7 @@ void sub_810715C(void)
unk_2016C00.unk20 = 0;
gUnknown_02024C07 = gUnknown_02024A60;
- if(gUnknown_020239F8 & 1)
+ if(gBattleTypeFlags & 1)
{
gUnknown_02024C08 = Random() & 2;
@@ -150,11 +150,11 @@ void sub_810715C(void)
else
gUnknown_02024C08 = gUnknown_02024A60 ^ 1;
- if(gUnknown_020239F8 & 0x80)
+ if(gBattleTypeFlags & 0x80)
unk_2016800.aiFlags = 0x40000000;
- else if(gUnknown_020239F8 & 0x400)
+ else if(gBattleTypeFlags & 0x400)
unk_2016800.aiFlags = 0x20000000;
- else if(gUnknown_020239F8 & 0x10)
+ else if(gBattleTypeFlags & 0x10)
unk_2016800.aiFlags = 0x80000000;
else
unk_2016800.aiFlags = gTrainers[gTrainerBattleOpponent].aiFlags;
@@ -1134,7 +1134,7 @@ _0810855E:\n\
ldr r0, _081085B0 @ =gPlayerParty\n\
mov r9, r0\n\
_08108574:\n\
- ldr r0, _081085B4 @ =gUnknown_020239F8\n\
+ ldr r0, _081085B4 @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
movs r0, 0x1\n\
ands r0, r1\n\
@@ -1161,7 +1161,7 @@ _08108574:\n\
_081085A8: .4byte gUnknown_02024C08\n\
_081085AC: .4byte gEnemyParty\n\
_081085B0: .4byte gPlayerParty\n\
-_081085B4: .4byte gUnknown_020239F8\n\
+_081085B4: .4byte gBattleTypeFlags\n\
_081085B8: .4byte gUnknown_02024A6A\n\
_081085BC:\n\
ldr r1, _08108624 @ =gUnknown_02024A6A\n\
diff --git a/src/battle_setup.c b/src/battle_setup.c
index ee304c21f..bb69638c4 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -91,7 +91,7 @@ extern struct TrainerEyeTrainer gTrainerEyeTrainers[];
extern u8 gOtherText_CancelWithTerminator[];
-extern u16 gUnknown_020239F8;
+extern u16 gBattleTypeFlags;
extern u16 gScriptLastTalked;
extern u8 gUnknown_02024D26;
extern u16 gBadgeFlags[];
@@ -165,7 +165,7 @@ void sub_8081A18(void)
player_bitmagic();
sub_80597F4();
gMain.field_8 = sub_8081C8C;
- gUnknown_020239F8 = 0;
+ gBattleTypeFlags = 0;
task_add_01_battle_start(GetWildBattleTransition(), 0);
sav12_xor_increment(7);
sav12_xor_increment(8);
@@ -177,7 +177,7 @@ void sub_8081A5C(void)
player_bitmagic();
sub_80597F4();
gMain.field_8 = sub_8081C8C;
- gUnknown_020239F8 = 1024;
+ gBattleTypeFlags = 1024;
task_add_01_battle_start(GetWildBattleTransition(), 0);
sav12_xor_increment(7);
sav12_xor_increment(8);
@@ -189,7 +189,7 @@ void sub_8081AA4(void)
player_bitmagic();
sub_80597F4();
gMain.field_8 = sub_80C824C;
- gUnknown_020239F8 = 128;
+ gBattleTypeFlags = 128;
task_add_01_battle_start(GetWildBattleTransition(), 0);
}
@@ -206,7 +206,7 @@ void sub_8081AFC(void)
CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
ScriptContext2_Enable();
gMain.field_8 = c2_exit_to_overworld_1_continue_scripts_restart_music;
- gUnknown_020239F8 = 512;
+ gBattleTypeFlags = 512;
task_add_01_battle_start(8, 0);
}
@@ -214,7 +214,7 @@ void sub_8081B3C(void)
{
ScriptContext2_Enable();
gMain.field_8 = sub_8081CEC;
- gUnknown_020239F8 = 0;
+ gBattleTypeFlags = 0;
task_add_01_battle_start(GetWildBattleTransition(), 0);
sav12_xor_increment(7);
sav12_xor_increment(8);
@@ -224,7 +224,7 @@ void sub_8081B78(void)
{
ScriptContext2_Enable();
gMain.field_8 = sub_8081CEC;
- gUnknown_020239F8 = 0x2000;
+ gBattleTypeFlags = 0x2000;
task_add_01_battle_start(GetWildBattleTransition(), 0);
sav12_xor_increment(7);
sav12_xor_increment(8);
@@ -234,7 +234,7 @@ void sub_8081BB8(void)
{
ScriptContext2_Enable();
gMain.field_8 = sub_8081CEC;
- gUnknown_020239F8 = 0x2000;
+ gBattleTypeFlags = 0x2000;
task_add_01_battle_start(0, BGM_BATTLE34);
sav12_xor_increment(7);
sav12_xor_increment(8);
@@ -244,7 +244,7 @@ void sub_8081BF8(void)
{
ScriptContext2_Enable();
gMain.field_8 = sub_8081CEC;
- gUnknown_020239F8 = 12288;
+ gBattleTypeFlags = 12288;
if (gGameVersion == 2)
task_add_01_battle_start(0xB, BGM_BATTLE34); // KYOGRE
else
@@ -257,7 +257,7 @@ void sub_8081C50(void)
{
ScriptContext2_Enable();
gMain.field_8 = sub_8081CEC;
- gUnknown_020239F8 = 24576;
+ gBattleTypeFlags = 24576;
task_add_01_battle_start(0xA, BGM_BATTLE36);
sav12_xor_increment(7);
sav12_xor_increment(8);
@@ -523,7 +523,7 @@ void sub_80821D8(void)
if (sub_811AAE8() == TRUE)
{
- gUnknown_020239F8 = 16;
+ gBattleTypeFlags = 16;
gMain.field_8 = sub_8082228;
SetMainCallback2(sub_800E7C4);
prev_quest_postbuffer_cursor_backup_reset();
@@ -733,7 +733,7 @@ void trainer_flag_clear(u16 flag)
void sub_80825E4(void)
{
- gUnknown_020239F8 = 8;
+ gBattleTypeFlags = 8;
gMain.field_8 = sub_808260C;
task_add_01_battle_start_with_music_and_stats();
ScriptContext1_Stop();
@@ -776,7 +776,7 @@ void do_choose_name_or_words_screen(void)
void sub_80826B0(void)
{
- gUnknown_020239F8 = 8;
+ gBattleTypeFlags = 8;
gMain.field_8 = do_choose_name_or_words_screen;
task_add_01_battle_start_with_music_and_stats();
ScriptContext1_Stop();
diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c
index f69e68cc1..b572011ce 100644
--- a/src/calculate_base_damage.c
+++ b/src/calculate_base_damage.c
@@ -19,7 +19,7 @@ extern struct Pokemon gEnemyParty[6];
extern u16 unk_20160BC[];
extern struct SecretBaseRecord gSecretBaseRecord;
extern u32 dword_2017100[];
-extern u16 gUnknown_020239F8;
+extern u16 gBattleTypeFlags;
extern struct BattlePokemon gBattleMons[4];
extern u16 gUnknown_02024BE6;
extern u8 byte_2024C06;
@@ -113,33 +113,33 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
if (attacker->ability == ABILITY_HUGE_POWER || attacker->ability == ABILITY_PURE_POWER)
attack *= 2;
- if (!(gUnknown_020239F8 & 0x902))
+ if (!(gBattleTypeFlags & 0x902))
{
- if ((gUnknown_020239F8 & 8)
+ if ((gBattleTypeFlags & 8)
&& gTrainerBattleOpponent != 1024
&& FlagGet(BADGE01_GET)
&& !battle_side_get_owner(a7))
attack = (110 * attack) / 100;
- if (!(gUnknown_020239F8 & 0x902))
+ if (!(gBattleTypeFlags & 0x902))
{
- if ((gUnknown_020239F8 & 8)
+ if ((gBattleTypeFlags & 8)
&& gTrainerBattleOpponent != 1024
&& FlagGet(BADGE05_GET)
&& !battle_side_get_owner(a8))
defense = (110 * defense) / 100;
- if (!(gUnknown_020239F8 & 0x902))
+ if (!(gBattleTypeFlags & 0x902))
{
- if ((gUnknown_020239F8 & 8)
+ if ((gBattleTypeFlags & 8)
&& gTrainerBattleOpponent != 1024
&& FlagGet(BADGE07_GET)
&& !battle_side_get_owner(a7))
spAttack = (110 * spAttack) / 100;
- if (!(gUnknown_020239F8 & 0x902))
+ if (!(gBattleTypeFlags & 0x902))
{
- if ((gUnknown_020239F8 & 8)
+ if ((gBattleTypeFlags & 8)
&& gTrainerBattleOpponent != 1024
&& FlagGet(BADGE07_GET)
&& !battle_side_get_owner(a8))
@@ -164,9 +164,9 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
if (attackerHoldEffect == HOLD_EFFECT_CHOICE_BAND)
attack = (150 * attack) / 100;
- if (attackerHoldEffect == HOLD_EFFECT_SOUL_DEW && !(gUnknown_020239F8 & 0x100) && (attacker->species == SPECIES_LATIAS || attacker->species == SPECIES_LATIOS))
+ if (attackerHoldEffect == HOLD_EFFECT_SOUL_DEW && !(gBattleTypeFlags & 0x100) && (attacker->species == SPECIES_LATIAS || attacker->species == SPECIES_LATIOS))
spAttack = (150 * spAttack) / 100;
- if (defenderHoldEffect == HOLD_EFFECT_SOUL_DEW && !(gUnknown_020239F8 & 0x100) && (defender->species == SPECIES_LATIAS || defender->species == SPECIES_LATIOS))
+ if (defenderHoldEffect == HOLD_EFFECT_SOUL_DEW && !(gBattleTypeFlags & 0x100) && (defender->species == SPECIES_LATIAS || defender->species == SPECIES_LATIOS))
spDefense = (150 * spDefense) / 100;
if (attackerHoldEffect == HOLD_EFFECT_DEEP_SEA_TOOTH && attacker->species == SPECIES_CLAMPERL)
spAttack *= 2;
@@ -236,13 +236,13 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
if ((a4 & 1) && gCritMultiplier == 1)
{
- if ((gUnknown_020239F8 & 1) && sub_803C348(2) == 2)
+ if ((gBattleTypeFlags & 1) && sub_803C348(2) == 2)
damage = 2 * (damage / 3);
else
damage /= 2;
}
- if ((gUnknown_020239F8 & 1) && gBattleMoves[move].target == 8 && sub_803C348(2) == 2)
+ if ((gBattleTypeFlags & 1) && gBattleMoves[move].target == 8 && sub_803C348(2) == 2)
damage /= 2;
if (damage == 0)
@@ -280,13 +280,13 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
if ((a4 & 2) && gCritMultiplier == 1)
{
- if ((gUnknown_020239F8 & 1) && sub_803C348(2) == 2)
+ if ((gBattleTypeFlags & 1) && sub_803C348(2) == 2)
damage = 2 * (damage / 3);
else
damage /= 2;
}
- if ((gUnknown_020239F8 & 1) && gBattleMoves[move].target == 8 && sub_803C348(2) == 2)
+ if ((gBattleTypeFlags & 1) && gBattleMoves[move].target == 8 && sub_803C348(2) == 2)
damage /= 2;
if (!sub_8018324(0xE, 0, ABILITY_CLOUD_NINE, 0, 0) && !sub_8018324(0xE, 0, ABILITY_AIR_LOCK, 0, 0))
@@ -475,7 +475,7 @@ _0803BB4C:\n\
lsls r0, r6, 17\n\
lsrs r6, r0, 16\n\
_0803BB50:\n\
- ldr r0, _0803BCB8 @ =gUnknown_020239F8\n\
+ ldr r0, _0803BCB8 @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
ldr r0, _0803BCBC @ =0x00000902\n\
ands r0, r1\n\
@@ -510,7 +510,7 @@ _0803BB5E:\n\
lsls r0, 16\n\
lsrs r6, r0, 16\n\
_0803BB98:\n\
- ldr r0, _0803BCB8 @ =gUnknown_020239F8\n\
+ ldr r0, _0803BCB8 @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
ldr r0, _0803BCBC @ =0x00000902\n\
ands r0, r1\n\
@@ -545,7 +545,7 @@ _0803BB98:\n\
lsrs r0, 16\n\
str r0, [sp, 0x14]\n\
_0803BBE2:\n\
- ldr r0, _0803BCB8 @ =gUnknown_020239F8\n\
+ ldr r0, _0803BCB8 @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
ldr r0, _0803BCBC @ =0x00000902\n\
ands r0, r1\n\
@@ -581,7 +581,7 @@ _0803BBE2:\n\
lsrs r0, 16\n\
mov r8, r0\n\
_0803BC2E:\n\
- ldr r0, _0803BCB8 @ =gUnknown_020239F8\n\
+ ldr r0, _0803BCB8 @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
ldr r0, _0803BCBC @ =0x00000902\n\
ands r0, r1\n\
@@ -649,7 +649,7 @@ _0803BC9E:\n\
mov r8, r0\n\
b _0803BCDC\n\
.align 2, 0\n\
-_0803BCB8: .4byte gUnknown_020239F8\n\
+_0803BCB8: .4byte gBattleTypeFlags\n\
_0803BCBC: .4byte 0x00000902\n\
_0803BCC0: .4byte gTrainerBattleOpponent\n\
_0803BCC4: .4byte 0x00000807\n\
@@ -675,7 +675,7 @@ _0803BCF0:\n\
mov r0, r10\n\
cmp r0, 0x22\n\
bne _0803BD28\n\
- ldr r0, _0803BFDC @ =gUnknown_020239F8\n\
+ ldr r0, _0803BFDC @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
movs r0, 0x80\n\
lsls r0, 1\n\
@@ -703,7 +703,7 @@ _0803BD28:\n\
ldr r0, [sp, 0x1C]\n\
cmp r0, 0x22\n\
bne _0803BD60\n\
- ldr r0, _0803BFDC @ =gUnknown_020239F8\n\
+ ldr r0, _0803BFDC @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
movs r0, 0x80\n\
lsls r0, 1\n\
@@ -1049,7 +1049,7 @@ _0803BFC4:\n\
ldr r2, _0803BFF8 @ =gStatStageRatios\n\
b _0803C006\n\
.align 2, 0\n\
-_0803BFDC: .4byte gUnknown_020239F8\n\
+_0803BFDC: .4byte gBattleTypeFlags\n\
_0803BFE0: .4byte 0xfffffe69\n\
_0803BFE4: .4byte 0x00000175\n\
_0803BFE8: .4byte gBattleMovePower\n\
@@ -1154,7 +1154,7 @@ _0803C0A8:\n\
ldrb r1, [r4]\n\
cmp r1, 0x1\n\
bne _0803C0EA\n\
- ldr r0, _0803C0E0 @ =gUnknown_020239F8\n\
+ ldr r0, _0803C0E0 @ =gBattleTypeFlags\n\
ldrh r0, [r0]\n\
ands r1, r0\n\
cmp r1, 0\n\
@@ -1172,13 +1172,13 @@ _0803C0A8:\n\
b _0803C0EA\n\
.align 2, 0\n\
_0803C0DC: .4byte gStatStageRatios\n\
-_0803C0E0: .4byte gUnknown_020239F8\n\
+_0803C0E0: .4byte gBattleTypeFlags\n\
_0803C0E4:\n\
lsrs r0, r5, 31\n\
adds r0, r5, r0\n\
asrs r5, r0, 1\n\
_0803C0EA:\n\
- ldr r0, _0803C148 @ =gUnknown_020239F8\n\
+ ldr r0, _0803C148 @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
movs r0, 0x1\n\
ands r0, r1\n\
@@ -1229,7 +1229,7 @@ _0803C132:\n\
ldr r2, _0803C154 @ =gStatStageRatios\n\
b _0803C162\n\
.align 2, 0\n\
-_0803C148: .4byte gUnknown_020239F8\n\
+_0803C148: .4byte gBattleTypeFlags\n\
_0803C14C: .4byte gBattleMoves\n\
_0803C150: .4byte gCritMultiplier\n\
_0803C154: .4byte gStatStageRatios\n\
@@ -1314,7 +1314,7 @@ _0803C1D6:\n\
ldrb r1, [r4]\n\
cmp r1, 0x1\n\
bne _0803C22A\n\
- ldr r0, _0803C220 @ =gUnknown_020239F8\n\
+ ldr r0, _0803C220 @ =gBattleTypeFlags\n\
ldrh r0, [r0]\n\
ands r1, r0\n\
cmp r1, 0\n\
@@ -1332,13 +1332,13 @@ _0803C1D6:\n\
b _0803C22A\n\
.align 2, 0\n\
_0803C21C: .4byte gStatStageRatios\n\
-_0803C220: .4byte gUnknown_020239F8\n\
+_0803C220: .4byte gBattleTypeFlags\n\
_0803C224:\n\
lsrs r0, r5, 31\n\
adds r0, r5, r0\n\
asrs r5, r0, 1\n\
_0803C22A:\n\
- ldr r0, _0803C2A4 @ =gUnknown_020239F8\n\
+ ldr r0, _0803C2A4 @ =gBattleTypeFlags\n\
ldrh r1, [r0]\n\
movs r0, 0x1\n\
ands r0, r1\n\
@@ -1397,7 +1397,7 @@ _0803C25C:\n\
beq _0803C2B8\n\
b _0803C2C4\n\
.align 2, 0\n\
-_0803C2A4: .4byte gUnknown_020239F8\n\
+_0803C2A4: .4byte gBattleTypeFlags\n\
_0803C2A8: .4byte gBattleMoves\n\
_0803C2AC: .4byte gBattleWeather\n\
_0803C2B0:\n\
diff --git a/src/link.c b/src/link.c
index d2b5770e9..76a112607 100644
--- a/src/link.c
+++ b/src/link.c
@@ -33,7 +33,7 @@ struct LinkTestBGInfo
extern u8 unk_2000000[];
extern u8 unk_2004000[];
-extern u16 gUnknown_020239F8;
+extern u16 gBattleTypeFlags;
extern u16 gScriptItemId;
extern u16 word_3004858;
@@ -1107,7 +1107,7 @@ static void sub_800837C(void)
if (count == totalCount)
{
- gUnknown_020239F8 &= 0xFFDF;
+ gBattleTypeFlags &= 0xFFDF;
gLinkVSyncDisabled = TRUE;
CloseLink();
gLinkCallback = NULL;
@@ -1131,7 +1131,7 @@ static void sub_80083E0(void)
if (count == totalCount)
{
- gUnknown_020239F8 &= 0xFFDF;
+ gBattleTypeFlags &= 0xFFDF;
gLinkVSyncDisabled = TRUE;
CloseLink();
gLinkCallback = 0;
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 28d1cd2bb..8b55baaba 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -17,7 +17,7 @@ extern struct Pokemon gEnemyParty[6];
extern u16 unk_20160BC[];
extern struct SecretBaseRecord gSecretBaseRecord;
extern u32 dword_2017100[];
-extern u16 gUnknown_020239F8;
+extern u16 gBattleTypeFlags;
extern u8 gUnknown_02024A60;
extern struct BattlePokemon gBattleMons[4];
extern u16 gUnknown_02024BE6;
@@ -98,7 +98,7 @@ u8 sub_803C434(u8 a1)
status = status_ ^ mask1;
{
- register u16 val_ asm("r1") = gUnknown_020239F8;
+ register u16 val_ asm("r1") = gBattleTypeFlags;
u32 val = mask2;
val &= val_;
if (!val)
@@ -154,7 +154,7 @@ u8 sub_803C434(u8 a1) {
adds r0, r4, 0\n\
b _0803C4AA\n\
.align 2, 0\n\
-_0803C45C: .4byte gUnknown_020239F8\n\
+_0803C45C: .4byte gBattleTypeFlags\n\
_0803C460:\n\
movs r0, 0\n\
bl sub_803C348\n\
@@ -1187,7 +1187,7 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord)
}
}
- gUnknown_020239F8 = 8;
+ gBattleTypeFlags = 8;
gTrainerBattleOpponent = 1024;
}
diff --git a/src/sound.c b/src/sound.c
index 69accd1c2..7345dde85 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -15,7 +15,7 @@ struct Fanfare
// Hack: different prototype than definition
u32 SpeciesToCryId(u32);
-extern u16 gUnknown_020239F8;
+extern u16 gBattleTypeFlags;
extern struct MusicPlayerInfo *gMPlay_PokemonCry;
extern u8 gPokemonCryBGMDuckingCounter;
@@ -329,7 +329,7 @@ void PlayCry4(u16 species, s8 pan, u8 mode)
}
else
{
- if (!(gUnknown_020239F8 & 0x40))
+ if (!(gBattleTypeFlags & 0x40))
m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
PlayCryInternal(species, pan, 125, 10, mode);
}
diff --git a/src/text.c b/src/text.c
index 265ef5493..2a2d2c0d3 100644
--- a/src/text.c
+++ b/src/text.c
@@ -178,7 +178,7 @@ EWRAM_DATA u8 gStringVar2[0x100] = {0};
EWRAM_DATA u8 gStringVar3[0x100] = {0};
EWRAM_DATA u8 gStringVar4[0x100] = {0};
-extern u16 gUnknown_020239F8;
+extern u16 gBattleTypeFlags;
extern u8 gUnknown_0203869A;
extern u8 gTileBuffer[];
@@ -2911,7 +2911,7 @@ static bool8 PlayerCanInterruptWait(struct Window *win)
retVal = TRUE;
break;
case 1:
- retVal &= ~(gUnknown_020239F8 >> 1);
+ retVal &= ~(gBattleTypeFlags >> 1);
break;
}
diff --git a/sym_ewram.txt b/sym_ewram.txt
index d76fc1e13..919b00f72 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -24,7 +24,7 @@ gUnknown_020238C8: @ 20238C8
gUnknown_020238CC: @ 20238CC
.space 0x12C
-gUnknown_020239F8: @ 20239F8
+gBattleTypeFlags: @ 20239F8
.space 0x4
gUnknown_020239FC: @ 20239FC
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 09:31:53 +0000