summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
7 files changed, 63 insertions, 63 deletions
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;
}