summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/cable_club.c26
-rw-r--r--src/engine/clock.c6
-rw-r--r--src/engine/link.c2
-rw-r--r--src/engine/record_mixing.c4
-rw-r--r--src/engine/save_menu_util.c6
-rw-r--r--src/engine/sprite.c8
-rw-r--r--src/engine/time_events.c4
-rw-r--r--src/engine/trade.c2
-rw-r--r--src/engine/trainer_card.c6
9 files changed, 28 insertions, 36 deletions
diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c
index 4dda372f4..3187de7ed 100644
--- a/src/engine/cable_club.c
+++ b/src/engine/cable_club.c
@@ -23,7 +23,7 @@
#include "text.h"
#include "trainer_card.h"
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
extern struct TrainerCard gTrainerCards[4];
extern u8 gUnknown_03004860;
extern u8 gFieldLinkPlayerCount;
@@ -343,8 +343,8 @@ static void sub_8083188(u8 taskId)
}
else
{
- gScriptResult = sub_8082D9C(local1, local2);
- if (gScriptResult != 0)
+ gSpecialVar_Result = sub_8082D9C(local1, local2);
+ if (gSpecialVar_Result != 0)
gTasks[taskId].func = sub_8083288;
}
}
@@ -360,10 +360,10 @@ void sub_80831F8(u8 taskId)
|| sub_8082DF4(taskId) == TRUE)
return;
- gScriptResult = sub_8082D9C(local1, local2);
- if (gScriptResult == 0)
+ gSpecialVar_Result = sub_8082D9C(local1, local2);
+ if (gSpecialVar_Result == 0)
return;
- if (gScriptResult == 3)
+ if (gSpecialVar_Result == 3)
{
sub_800832C();
HideFieldMessageBox();
@@ -384,7 +384,7 @@ static void sub_8083288(u8 taskId)
if (sub_8082DF4(taskId) == TRUE)
return;
- if (gScriptResult == 3)
+ if (gSpecialVar_Result == 3)
{
sub_800832C();
HideFieldMessageBox();
@@ -425,7 +425,7 @@ static void sub_8083314(u8 taskId)
ResetBlockReceivedFlags();
HideFieldMessageBox();
- if (gScriptResult == 1)
+ if (gSpecialVar_Result == 1)
{
#if ENGLISH
u16 linkType;
@@ -461,7 +461,7 @@ static void sub_80833C4(u8 taskId)
static void sub_80833EC(u8 taskId)
{
- gScriptResult = 5;
+ gSpecialVar_Result = 5;
sub_8082D4C();
HideFieldMessageBox();
EnableBothScriptContexts();
@@ -470,7 +470,7 @@ static void sub_80833EC(u8 taskId)
static void sub_8083418(u8 taskId)
{
- gScriptResult = 6;
+ gSpecialVar_Result = 6;
sub_8082D4C();
HideFieldMessageBox();
EnableBothScriptContexts();
@@ -523,7 +523,7 @@ void sub_80834E4(void)
void sub_808350C(void)
{
- gScriptResult = 0;
+ gSpecialVar_Result = 0;
gLinkType = 0x3311;
gBattleTypeFlags = 0;
sub_8082CD4(2, 4);
@@ -537,14 +537,14 @@ static void sub_808353C(u8 taskId)
switch (gTasks[taskId].data[0])
{
case 0:
- if (gScriptResult == 1)
+ if (gSpecialVar_Result == 1)
{
playerCount = GetLinkPlayerCount();
for (i = 0; i < playerCount; i++)
{
if (gLinkPlayers[i].language == LANGUAGE_JAPANESE)
{
- gScriptResult = 7;
+ gSpecialVar_Result = 7;
sub_8008480();
gTasks[taskId].data[0] = 1;
return;
diff --git a/src/engine/clock.c b/src/engine/clock.c
index cb8af64a8..416aaa6bb 100644
--- a/src/engine/clock.c
+++ b/src/engine/clock.c
@@ -20,7 +20,7 @@ static void ReturnFromStartWallClock(void);
static void InitTimeBasedEvents(void)
{
- FlagSet(SYS_CLOCK_SET);
+ FlagSet(FLAG_SYS_CLOCK_SET);
RtcCalcLocalTime();
gSaveBlock2.lastBerryTreeUpdate = gLocalTime;
VarSet(VAR_DAYS, gLocalTime.days);
@@ -28,7 +28,7 @@ static void InitTimeBasedEvents(void)
void DoTimeBasedEvents(void)
{
- if (FlagGet(SYS_CLOCK_SET))
+ if (FlagGet(FLAG_SYS_CLOCK_SET))
{
RtcCalcLocalTime();
UpdatePerDay(&gLocalTime);
@@ -45,7 +45,7 @@ static void UpdatePerDay(struct Time *time)
if (days != time->days && days <= time->days)
{
newDays = time->days - days;
- ClearUpperFlags();
+ ClearDailyFlags();
UpdateDewfordTrendPerDay(newDays);
UpdateTVShowsPerDay(newDays);
UpdateWeatherPerDay(newDays);
diff --git a/src/engine/link.c b/src/engine/link.c
index 27afef937..28323207c 100644
--- a/src/engine/link.c
+++ b/src/engine/link.c
@@ -635,7 +635,7 @@ static void BuildSendCmd(u16 code)
break;
case 0xAAAB:
gSendCmd[0] = 0xAAAB;
- gSendCmd[1] = gScriptItemId;
+ gSendCmd[1] = gSpecialVar_ItemId;
break;
case 0xCCCC:
gSendCmd[0] = 0xCCCC;
diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c
index 2624837c7..6cb1e54b2 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -131,7 +131,7 @@ void Task_RecordMixing_Main(u8 taskId)
if (!gTasks[data[10]].isActive)
{
tState = 2;
- FlagSet(SYS_MIX_RECORD);
+ FlagSet(FLAG_SYS_MIX_RECORD);
DestroyRecordMixingSprite();
DestroyTask(tSndEffTaskId);
}
@@ -1019,7 +1019,7 @@ void sub_80B9F3C(u16 *a, u8 b)
VarSet(VAR_0x4001, *a);
StringCopy(gStringVar1, gLinkPlayers[0].name);
if (*a == ITEM_EON_TICKET)
- FlagSet(SYS_HAS_EON_TICKET);
+ FlagSet(FLAG_SYS_HAS_EON_TICKET);
}
else
{
diff --git a/src/engine/save_menu_util.c b/src/engine/save_menu_util.c
index a2d17bd36..771cb72c7 100644
--- a/src/engine/save_menu_util.c
+++ b/src/engine/save_menu_util.c
@@ -15,7 +15,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top)
if (IsResizeSaveWindowEnabled())
width = 13;
- if (FlagGet(SYS_POKEDEX_GET))
+ if (FlagGet(FLAG_SYS_POKEDEX_GET))
{
// print info + dex information.
MenuDrawTextWindow(left, top, left + width, top + 11);
@@ -44,7 +44,7 @@ void HandleCloseSaveWindow(u16 left, u16 top)
if (IsResizeSaveWindowEnabled())
width = 13;
- if (FlagGet(SYS_POKEDEX_GET))
+ if (FlagGet(FLAG_SYS_POKEDEX_GET))
MenuZeroFillWindowRect(left, top, left + width, top + 11);
else
MenuZeroFillWindowRect(left, top, left + width, top + 9);
@@ -106,7 +106,7 @@ u8 GetBadgeCount(void)
u8 badgeCount = 0;
int badgeFlag;
- for (badgeFlag = BADGE01_GET; badgeFlag <= BADGE08_GET; badgeFlag++)
+ for (badgeFlag = FLAG_BADGE01_GET; badgeFlag <= FLAG_BADGE08_GET; badgeFlag++)
if (FlagGet(badgeFlag))
badgeCount++;
diff --git a/src/engine/sprite.c b/src/engine/sprite.c
index 69fa860c1..c1bb36917 100644
--- a/src/engine/sprite.c
+++ b/src/engine/sprite.c
@@ -26,14 +26,6 @@
#define SPRITE_TILE_IS_ALLOCATED(n) ((gSpriteTileAllocBitmap[(n) / 8] >> ((n) % 8)) & 1)
-struct OamMatrix
-{
- s16 a;
- s16 b;
- s16 c;
- s16 d;
-};
-
struct SpriteCopyRequest
{
const u8 *src;
diff --git a/src/engine/time_events.c b/src/engine/time_events.c
index 831048add..3e3054aa3 100644
--- a/src/engine/time_events.c
+++ b/src/engine/time_events.c
@@ -85,9 +85,9 @@ void UpdateShoalTideFlag(void)
{
RtcCalcLocalTime();
if (tide[gLocalTime.hours])
- FlagSet(SYS_SHOAL_TIDE);
+ FlagSet(FLAG_SYS_SHOAL_TIDE);
else
- FlagClear(SYS_SHOAL_TIDE);
+ FlagClear(FLAG_SYS_SHOAL_TIDE);
}
}
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 06a6b96c7..0567b4d2f 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -5696,7 +5696,7 @@ static void sub_804E1DC(void)
numRibbons += GetMonData(&gEnemyParty[gUnknown_020297D8[1] % 6], MON_DATA_CHAMPION_RIBBON + i);
}
if (numRibbons != 0)
- FlagSet(SYS_RIBBON_GET);
+ FlagSet(FLAG_SYS_RIBBON_GET);
}
void sub_804E22C(void)
diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c
index 468890ca5..207fa5f77 100644
--- a/src/engine/trainer_card.c
+++ b/src/engine/trainer_card.c
@@ -323,7 +323,7 @@ void sub_8093390(struct TrainerCard *trainerCard)
trainerCard->firstHallOfFameB = (playTime >> 8) & 0xFF;
trainerCard->firstHallOfFameC = playTime & 0xFF;
- trainerCard->hasPokedex = FlagGet(SYS_POKEDEX_GET);
+ trainerCard->hasPokedex = FlagGet(FLAG_SYS_POKEDEX_GET);
trainerCard->var_3 = sub_8090FC0();
trainerCard->pokedexSeen = GetPokedexSeenCount();
@@ -543,14 +543,14 @@ void sub_80936D4(void)
u32 badgeFlag;
int i = 0;
- badgeFlag = BADGE01_GET;
+ badgeFlag = FLAG_BADGE01_GET;
while (1)
{
if (FlagGet(badgeFlag))
ewram0_2.var_e[i]++;
badgeFlag++;
i++;
- if (badgeFlag > BADGE08_GET)
+ if (badgeFlag > FLAG_BADGE08_GET)
{
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 16:41:15 +0000