summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_2.c2
-rw-r--r--src/battle/battle_4.c4
-rw-r--r--src/battle_tower.c3
-rw-r--r--src/braille_puzzles.c2
-rw-r--r--src/choose_party.c9
-rw-r--r--src/tv.c12
6 files changed, 14 insertions, 18 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 728a1bdf7..79d60125e 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -3698,7 +3698,7 @@ void sub_8010874(void)
ewram160C9 = 6;
ewram16113 = 0;
for (i = 0; i < 11; i++)
- gBattleResults.unk36[i] = 0;
+ gBattleResults.usedBalls[i] = 0;
gBattleResults.battleTurnCounter = 0;
gBattleResults.playerFaintCounter = 0;
gBattleResults.opponentFaintCounter = 0;
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index bb36c3520..d1435d8ea 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -15770,8 +15770,8 @@ void atkEF_handleballthrow(void)
}
else
{
- if (gBattleResults.unk36[gLastUsedItem - ITEM_ULTRA_BALL] < 0xFF)
- gBattleResults.unk36[gLastUsedItem - ITEM_ULTRA_BALL]++;
+ if (gBattleResults.usedBalls[gLastUsedItem - ITEM_ULTRA_BALL] < 0xFF)
+ gBattleResults.usedBalls[gLastUsedItem - ITEM_ULTRA_BALL]++;
}
}
if (odds > 254) //poke caught
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 99e8af4b2..4de8eba1f 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -284,7 +284,6 @@ extern u16 gTrainerBattleOpponent;
extern u16 gBattleTypeFlags;
extern u8 gSelectedOrderFromParty[];
extern u8 gBattleOutcome;
-extern struct Pokemon gUnknown_030042FC[];
extern struct BattlePokemon gBattleMons[];
void sub_8134548(void)
@@ -1795,7 +1794,7 @@ void sub_8135AC4(void)
playerRecord->greeting[i] = gSaveBlock1.easyChats.unk2B28[i];
for (i = 0; i < 3; i++)
- sub_803AF78(&gUnknown_030042FC[gSaveBlock2.battleTower.selectedPartyMons[i]], &playerRecord->party[i]);
+ sub_803AF78(&gPlayerParty[gSaveBlock2.battleTower.selectedPartyMons[i] - 1], &playerRecord->party[i]);
SetBattleTowerRecordChecksum(&gSaveBlock2.battleTower.playerRecord);
SaveCurrentWinStreak();
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index f81861ca0..3cf1661b5 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -84,7 +84,7 @@ bool8 ShouldDoBrailleStrengthEffect(void)
void DoBrailleStrengthEffect(void)
{
- FieldEffectActiveListRemove(0x28);
+ FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
MapGridSetMetatileIdAt(14, 26, 554);
MapGridSetMetatileIdAt(15, 26, 555);
MapGridSetMetatileIdAt(16, 26, 556);
diff --git a/src/choose_party.c b/src/choose_party.c
index 5aed5b22e..e81f53a1b 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -25,7 +25,6 @@ extern u8 gLastFieldPokeMenuOpened;
extern u8 gUnknown_020384F0;
extern struct UnknownPokemonStruct2 gMultiPartnerParty[3];
extern u8 gUnknown_0202E8F6;
-extern struct Pokemon gUnknown_030042FC[];
extern const u16 gBattleTowerBannedSpecies[];
EWRAM_DATA u8 gSelectedOrderFromParty[3] = {0};
@@ -204,13 +203,13 @@ static u8 sub_81220C8(void)
{
u8 j;
- ewram1B000.unk282 = GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[i]], MON_DATA_SPECIES);
- ewram1B000.unk280 = GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[i]], MON_DATA_HELD_ITEM);
+ ewram1B000.unk282 = GetMonData(&gPlayerParty[gSelectedOrderFromParty[i] - 1], MON_DATA_SPECIES);
+ ewram1B000.unk280 = GetMonData(&gPlayerParty[gSelectedOrderFromParty[i] - 1], MON_DATA_HELD_ITEM);
for (j = i + 1; j < 3; j++)
{
- if (ewram1B000.unk282 == GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[j]], MON_DATA_SPECIES))
+ if (ewram1B000.unk282 == GetMonData(&gPlayerParty[gSelectedOrderFromParty[j] - 1], MON_DATA_SPECIES))
return 0x12;
- if (ewram1B000.unk280 != 0 && ewram1B000.unk280 == GetMonData(&gUnknown_030042FC[gSelectedOrderFromParty[j]], MON_DATA_HELD_ITEM))
+ if (ewram1B000.unk280 != 0 && ewram1B000.unk280 == GetMonData(&gPlayerParty[gSelectedOrderFromParty[j] - 1], MON_DATA_HELD_ITEM))
return 0x13;
}
}
diff --git a/src/tv.c b/src/tv.c
index 234091d58..f95a73bea 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -70,7 +70,6 @@ extern u16 gSpecialVar_LastTalked;
extern u8 gSpecialVar_ContestCategory;
extern u8 gSpecialVar_ContestRank;
-extern u8 gUnknown_03004316[11];
extern u8 gBattleOutcome;
extern u16 gLastUsedItem;
@@ -447,7 +446,6 @@ bool8 sub_80BF1B4(u8);
void sub_80BF20C(void);
extern u8 gSpecialVar_ContestCategory;
extern u8 gSpecialVar_ContestRank;
-extern u8 gUnknown_03004316[11];
extern u8 gBattleOutcome;
void InterviewBefore_FanClubLetter(void);
@@ -667,7 +665,7 @@ void GabbyAndTyBeforeInterview(void)
{
for (i=0; i<11; i++)
{
- if (gBattleResults.unk36[i] != 0)
+ if (gBattleResults.usedBalls[i] != 0)
{
gSaveBlock1.gabbyAndTyData.valA_3 = 1;
break;
@@ -832,7 +830,7 @@ void PutPokemonTodayCaughtOnAir(void)
if (gUnknown_03005D38.var0 != -1 && sub_80BF1B4(TVSHOW_POKEMON_TODAY_CAUGHT) != 1)
{
for (i = 0; i < 11; i++)
- total += gBattleResults.unk36[i];
+ total += gBattleResults.usedBalls[i];
if (total != 0 || gBattleResults.unk5_1 != 0)
{
struct TVShowPokemonToday *pokemonToday;
@@ -849,7 +847,7 @@ void PutPokemonTodayCaughtOnAir(void)
else
{
for (i = 0; i < 11; i++)
- total += gBattleResults.unk36[i];
+ total += gBattleResults.usedBalls[i];
if (total > 0xff)
total = 0xff;
item = gLastUsedItem;
@@ -893,8 +891,8 @@ void sub_80BE074(void)
if (sub_80BF77C(0xffff) == 0)
{
- for (i = 0, total = 0; i < ARRAY_COUNT(gUnknown_03004316); i++)
- total += gUnknown_03004316[i];
+ for (i = 0, total = 0; i < 11; i++)
+ total += gBattleResults.usedBalls[i];
if (total > 0xff)
total = 0xff;
if (total > 2 && gBattleOutcome == 1)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 03:13:21 +0000