summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c6
-rw-r--r--src/dewford_trend.c58
-rw-r--r--src/flag.c1
-rw-r--r--src/lottery_corner.c4
-rw-r--r--src/pokemon_2.c2
-rw-r--r--src/pokemon_size_record.c5
-rw-r--r--src/record_mixing.c4
-rw-r--r--src/rom4.c4
-rw-r--r--src/save_menu_util.c2
-rw-r--r--src/scrcmd.c7
-rw-r--r--src/script.c3
-rw-r--r--src/start_menu.c2
-rw-r--r--src/var.c1
-rw-r--r--src/wild_encounter.c4
14 files changed, 47 insertions, 56 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index fd0183038..e8fb9f259 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -7,6 +7,8 @@
#include "fieldmap.h"
#include "string_util.h"
#include "rng.h"
+#include "flag.h"
+#include "var.h"
extern void prev_quest_postbuffer_cursor_backup_reset(void);
extern void overworld_poison_timer_set(void);
@@ -14,9 +16,6 @@ extern void current_map_music_set__default_for_battle(u16);
extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
extern void c2_exit_to_overworld_2_switch(void);
extern void npc_set_running_behaviour_etc(struct MapObject *, u8);
-extern u8 FlagGet(u16);
-extern u8 FlagSet(u16);
-extern void FlagReset(u16);
extern void c2_whiteout(void);
extern void sub_800E7C4(void);
extern void sub_8081AA4(void);
@@ -93,7 +92,6 @@ extern void PlayNewMapMusic(u16);
extern u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
extern void (*gUnknown_0300485C)(void);
-extern u16 *GetVarPointer(u16);
extern struct Pokemon gEnemyParty[];
extern struct Pokemon gPlayerParty[];
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index 63ae4157a..5fecf66f4 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -1,13 +1,11 @@
#include "global.h"
#include "link.h"
#include "rng.h"
-
+#include "flag.h"
extern u8 GetLinkPlayerCount(void);
extern u16 sub_80EB72C(u16);
extern u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16);
-extern u8 FlagGet(u16);
-extern u8 FlagSet(u16);
extern struct EasyChatPair unk_2007800[5];
extern struct EasyChatPair unk_2007900[5];
@@ -23,16 +21,16 @@ bool8 SB1ContainsWords(u16 *);
void sub_80FA17C(void)
{
u16 i;
-
+
for(i = 0; i < 5; i++)
{
gSaveBlock1.easyChatPairs[i].words[0] = sub_80EB72C(10);
-
+
if(Random() & 1)
gSaveBlock1.easyChatPairs[i].words[1] = sub_80EB72C(12);
else
gSaveBlock1.easyChatPairs[i].words[1] = sub_80EB72C(13);
-
+
gSaveBlock1.easyChatPairs[i].unk1_6 = Random() & 1;
sub_80FA740(&gSaveBlock1.easyChatPairs[i]);
}
@@ -45,17 +43,17 @@ void sub_80FA220(u16 a)
u16 i;
u32 sp0;
u32 sp4;
-
+
if(a != 0)
{
sp0 = a * 5;
-
+
for(i = 0; i < 5; i++)
{
//_080FA24A
u32 r2 = sp0;
u32 r4;
-
+
if(gSaveBlock1.easyChatPairs[i].unk1_6 == 0)
{
if(gSaveBlock1.easyChatPairs[i].unk0_0 >= r2)
@@ -75,13 +73,13 @@ void sub_80FA220(u16 a)
{
sp4 = r4 % gSaveBlock1.easyChatPairs[i].unk0_7;
r4 = r4 / gSaveBlock1.easyChatPairs[i].unk0_7;
-
+
if(r4 == 0)
gSaveBlock1.easyChatPairs[i].unk1_6 = 1;
else
gSaveBlock1.easyChatPairs[i].unk1_6 = 0;
-
-
+
+
if(gSaveBlock1.easyChatPairs[i].unk1_6)
{
gSaveBlock1.easyChatPairs[i].unk0_0 += sp4;
@@ -93,7 +91,7 @@ void sub_80FA220(u16 a)
}
//_080FA310
gSaveBlock1.easyChatPairs[i].unk0_0 = r4;
-
+
if(gSaveBlock1.easyChatPairs[i].unk0_0 == gSaveBlock1.easyChatPairs[i].unk0_7)
gSaveBlock1.easyChatPairs[i].unk1_6 = 0;
}
@@ -281,7 +279,7 @@ bool8 sub_80FA364(u16 *a)
{
struct EasyChatPair s = {0};
u16 i;
-
+
if(!SB1ContainsWords(a))
{
if(!FlagGet(0x833))
@@ -294,19 +292,19 @@ bool8 sub_80FA364(u16 *a)
return 1;
}
}
-
+
//_080FA3C8
s.words[0] = a[0];
s.words[1] = a[1];
s.unk1_6 = 1;
sub_80FA740(&s);
-
+
for(i = 0; i < 5; i++)
{
if(sub_80FA670(&s, &gSaveBlock1.easyChatPairs[i], 0))
{
u16 r3 = 4;
-
+
while(r3 > i)
{
gSaveBlock1.easyChatPairs[r3] = gSaveBlock1.easyChatPairs[r3 - 1];
@@ -325,17 +323,17 @@ bool8 sub_80FA364(u16 *a)
void sub_80FA46C(struct EasyChatPair *s, u16 b, u8 c)
{
u16 h;
-
+
for(h = 0; h < b; h++)
{
u16 i;
-
+
for(i = h + 1; i < b; i++)
{
if(sub_80FA670(&s[i], &s[h], c))
{
struct EasyChatPair temp;
-
+
temp = s[i];
s[i] = s[h];
s[h] = temp;
@@ -353,16 +351,16 @@ void sub_80FA4E4(u8 *a, u32 b)
struct EasyChatPair *src;
struct EasyChatPair *dst;
u16 players = GetLinkPlayerCount();
-
+
for(i = 0; i < players; i++)
memcpy(&unk_2007800[i * 5], a + i * b, 40);
-
+
//_080FA520
-
+
src = unk_2007800;
//dst = unk_2007900
dst = (u8 *)src + 0x100; //ToDo: Get this part to match
-
+
r7 = 0;
//_080FA530
for(i = 0; i < players; i++)
@@ -517,14 +515,14 @@ _080FA5B8: .4byte gSaveBlock1 + 0x2DD4\n\
void sub_80FA5BC(void)
{
struct EasyChatPair *s = &gSaveBlock1.easyChatPairs[gUnknown_0202E8CC];
-
+
ConvertEasyChatWordsToString(gStringVar1, s->words, 2, 1);
}
void sub_80FA5E4(void)
{
u16 result = 0;
-
+
if (gSaveBlock1.easyChatPairs[0].unk0_0 - gSaveBlock1.easyChatPairs[1].unk0_0 < 2)
{
asm("":::"r2"); //Force the compiler to store address of gSaveBlock1 in r3 instead of r2
@@ -592,7 +590,7 @@ bool8 sub_80FA670(struct EasyChatPair *a, struct EasyChatPair *b, u8 c)
void sub_80FA740(struct EasyChatPair *s)
{
u16 r4;
-
+
r4 = Random() % 98;
if(r4 > 50)
{
@@ -608,7 +606,7 @@ void sub_80FA740(struct EasyChatPair *s)
bool8 SB1ContainsWords(u16 *a)
{
u16 i;
-
+
for(i = 0; i < 5; i++)
{
if(IsEasyChatPairEqual(a, gSaveBlock1.easyChatPairs[i].words) != 0)
@@ -620,7 +618,7 @@ bool8 SB1ContainsWords(u16 *a)
bool8 IsEasyChatPairEqual(u16 *words1, u16 *words2)
{
u16 i;
-
+
for(i = 0; i < 2; i++)
{
if(*(words1++) != *(words2++))
@@ -633,7 +631,7 @@ s16 sub_80FA828(struct EasyChatPair *a, u16 b)
{
s16 i;
struct EasyChatPair *s = unk_2007900;
-
+
for(i = 0; i < b; i++)
{
if(IsEasyChatPairEqual(a->words, s->words))
diff --git a/src/flag.c b/src/flag.c
index a4798fb49..e7347ad0d 100644
--- a/src/flag.c
+++ b/src/flag.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "flag.h"
extern u8 gUnknown_0202E8E2[];
diff --git a/src/lottery_corner.c b/src/lottery_corner.c
index 4085bcff7..7b0ca6153 100644
--- a/src/lottery_corner.c
+++ b/src/lottery_corner.c
@@ -2,9 +2,7 @@
#include "pokemon.h"
#include "rng.h"
#include "string_util.h"
-
-extern bool8 VarSet(u16 id, u16 value);
-extern u16 VarGet(u16 id);
+#include "var.h"
extern u16 gScriptResult;
extern u16 gUnknown_0202E8CC;
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 588b01168..c8d07f88d 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -6,6 +6,7 @@
#include "main.h"
#include "sprite.h"
#include "berry.h"
+#include "flag.h"
extern u8 gPlayerPartyCount;
extern struct Pokemon gPlayerParty[6];
@@ -52,7 +53,6 @@ extern u8 gHoldEffectToType[][2];
extern u8 battle_side_get_owner(u8);
extern u8 battle_get_side_with_given_state(u8);
extern u32 battle_get_per_side_status(u8);
-extern u8 FlagGet(u16);
extern u8 sub_8018324(u8, u8, u8, u8, u16);
extern u8 sub_803C348(u8);
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 1c54352a8..96ab85fbe 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -2,12 +2,11 @@
#include "global.h"
#include "pokemon.h"
#include "species.h"
+#include "flag.h"
+#include "var.h"
extern u16 SpeciesToNationalPokedexNum(u16);
extern u16 sub_8090D54(u16, u8);
-extern bool8 VarSet(u16, u16);
-extern u16 *GetVarPointer(u16);
-extern u8 FlagSet(u16);
struct UnknownStruct
{
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 3900b6e31..bfa9681c0 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -8,6 +8,8 @@
#include "sound.h"
#include "string_util.h"
#include "task.h"
+#include "flag.h"
+#include "var.h"
extern void *recordMixingSecretBases;
extern void *recordMixingTvShows;
@@ -41,8 +43,6 @@ extern void sub_80FA4E4(void *, u32, u8);
extern void sub_80B9C6C(void *, u32, u8, void *);
extern void sub_80B9F3C(void *, u8);
extern u16 sub_8126338(void);
-extern bool8 VarSet(u16, u8);
-extern u8 FlagSet(u16);
extern u8 sub_8083664(void);
extern void sub_80720B0(void);
extern void CreateRecordMixingSprite(void);
diff --git a/src/rom4.c b/src/rom4.c
index c70876d9a..c15aadbc6 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -9,6 +9,8 @@
#include "text.h"
#include "link.h"
#include "sprite.h"
+#include "flag.h"
+#include "var.h"
#ifdef SAPPHIRE
#define LEGENDARY_MUSIC BGM_OOAME // Heavy Rain
@@ -133,8 +135,6 @@ extern s32 gUnknown_0839ACE8;
extern u32 gUnknown_08216694[];
extern struct UnkWarpStruct *GetHealLocation(u8);
-extern u16 VarGet(u16);
-extern u8 FlagGet(u16);
extern u8 GetSav1Weather(void);
extern void PlayerGetDestCoords(u16 *, u16 *);
extern u8 sub_810D32C(void);
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index c5c00500e..6d3d23e25 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "menu.h"
+#include "flag.h"
-extern u8 FlagGet(u16);
extern u8 gOtherText_Player[];
extern u8 gOtherText_Badges[];
extern u8 gOtherText_Pokedex[];
diff --git a/src/scrcmd.c b/src/scrcmd.c
index d25ce88e0..dbdbc6674 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -11,10 +11,10 @@
#include "field_message_box.h"
#include "sound.h"
#include "string_util.h"
+#include "flag.h"
+#include "var.h"
extern void ClearRamScript(void);
-extern u16 *GetVarPointer(u16);
-extern u16 VarGet(u16);
extern void sub_8126160(u8);
extern u8 AddBagItem(u16, u16);
extern u8 RemoveBagItem(u16, u16);
@@ -27,9 +27,6 @@ extern u8 IsThereStorageSpaceForDecoration(u8);
extern s8 sub_81340A8(u8);
extern u8 sub_8134074(u8);
extern u8 sub_8133FE4(u8);
-extern void FlagSet(u16);
-extern void FlagReset(u16);
-extern u8 FlagGet(u16);
extern void sav12_xor_increment(u8);
extern void sub_8081594(u8);
extern void sub_8053CE4(u32);
diff --git a/src/script.c b/src/script.c
index fdce4f7d2..8e07a580e 100644
--- a/src/script.c
+++ b/src/script.c
@@ -1,11 +1,10 @@
#include "global.h"
#include "script.h"
#include "fieldmap.h"
+#include "var.h"
#define RAM_SCRIPT_MAGIC 51
-extern u16 VarGet(u16);
-
extern u8 *gUnknown_0202E8AC;
extern u32 gUnknown_0202E8B0;
diff --git a/src/start_menu.c b/src/start_menu.c
index 3c5971dd4..fee6a7b8f 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -8,6 +8,7 @@
#include "sprite.h"
#include "string_util.h"
#include "task.h"
+#include "flag.h"
//External functions
extern void sub_8064E2C(void);
@@ -40,7 +41,6 @@ extern void sub_80597F4(void);
extern void player_bitmagic(void);
extern bool32 GetSafariZoneFlag(void);
extern u8 *sub_8072C44(u8 *, s32, u8, u8);
-extern u8 FlagGet(u16);
extern bool32 is_c1_link_related_active(void);
//Menu actions
diff --git a/src/var.c b/src/var.c
index b6639aa5f..08b109e6f 100644
--- a/src/var.c
+++ b/src/var.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "var.h"
extern u16 *gSpecialVars[];
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index b2d662e13..fc1776d07 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -3,6 +3,8 @@
#include "pokemon.h"
#include "rng.h"
#include "script.h"
+#include "flag.h"
+#include "var.h"
struct WildPokemon {
u8 minLevel;
@@ -38,8 +40,6 @@ extern u8 MetatileBehavior_IsBridge(u8);
extern void PlayerGetDestCoords(u16 *x, u16 *y);
extern void sub_80BEA50(u16);
extern void sav12_xor_increment(u8);
-extern u8 FlagGet(u16);
-extern u16 VarGet(u16);
extern int MapGridGetMetatileBehaviorAt(int x, int y);
extern u8 gWildEncountersDisabled;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:29:41 +0000