summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/hall_of_fame.c8
-rw-r--r--src/item_pc.c8
-rw-r--r--src/pc_screen_effect.c154
-rw-r--r--src/pokemon_storage_system_2.c60
-rw-r--r--src/pokemon_storage_system_3.c708
-rw-r--r--src/pokemon_storage_system_4.c582
-rw-r--r--src/pokemon_storage_system_5.c602
-rw-r--r--src/pokemon_storage_system_6.c50
-rw-r--r--src/pokemon_storage_system_7.c18
-rw-r--r--src/pokemon_storage_system_8.c196
-rw-r--r--src/pokemon_storage_system_9.c2
11 files changed, 1206 insertions, 1182 deletions
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 4ed0d3f04..2284cbc3f 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -738,7 +738,7 @@ void CB2_InitHofPC(void)
case 3:
if (!DrawHofBackground())
{
- sub_80A0A48(0, 0, 0);
+ BeginPCScreenEffect_TurnOn(0, 0, 0);
SetVBlankCallback(VBlankCB_HofIdle);
gMain.state++;
}
@@ -748,7 +748,7 @@ void CB2_InitHofPC(void)
AnimateSprites();
BuildOamBuffer();
UpdatePaletteFade();
- if (!sub_80A0A98())
+ if (!IsPCScreenEffectRunning_TurnOn())
gMain.state++;
break;
case 5:
@@ -946,13 +946,13 @@ static void Task_HofPC_HandlePaletteOnExit(u8 taskId)
struct HallofFameTeam* fameTeam;
CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
- sub_80A0A70(0, 0, 0);
+ BeginPCScreenEffect_TurnOff(0, 0, 0);
gTasks[taskId].func = Task_HofPC_HandleExit;
}
static void Task_HofPC_HandleExit(u8 taskId)
{
- if (!sub_80A0AAC())
+ if (!IsPCScreenEffectRunning_TurnOff())
{
HideBg(0);
HideBg(1);
diff --git a/src/item_pc.c b/src/item_pc.c
index 46419f2f3..af57d9f03 100644
--- a/src/item_pc.c
+++ b/src/item_pc.c
@@ -378,7 +378,7 @@ static bool8 ItemPc_DoGfxSetup(void)
}
else
{
- sub_80A0A48(0, 0, 0);
+ BeginPCScreenEffect_TurnOn(0, 0, 0);
ItemPc_SetInitializedFlag(1);
PlaySE(SE_PC_LOGIN);
}
@@ -642,7 +642,7 @@ static void Task_ItemPcTurnOff1(u8 taskId)
}
else
{
- sub_80A0A70(0, 0, 0);
+ BeginPCScreenEffect_TurnOff(0, 0, 0);
PlaySE(SE_PC_OFF);
}
gTasks[taskId].func = Task_ItemPcTurnOff2;
@@ -652,7 +652,7 @@ static void Task_ItemPcTurnOff2(u8 taskId)
{
s16 * data = gTasks[taskId].data;
- if (!gPaletteFade.active && !sub_80A0AAC())
+ if (!gPaletteFade.active && !IsPCScreenEffectRunning_TurnOff())
{
DestroyListMenuTask(data[0], &sListMenuState.scroll, &sListMenuState.row);
if (sStateDataPtr->savedCallback != NULL)
@@ -726,7 +726,7 @@ static void Task_ItemPcMain(u8 taskId)
u16 row;
s32 input;
- if (!gPaletteFade.active && !sub_80A0A98())
+ if (!gPaletteFade.active && !IsPCScreenEffectRunning_TurnOn())
{
if (JOY_NEW(SELECT_BUTTON))
{
diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c
index 5cc09df71..5ee8e2b7b 100644
--- a/src/pc_screen_effect.c
+++ b/src/pc_screen_effect.c
@@ -3,146 +3,160 @@
#include "gpu_regs.h"
#include "palette.h"
-static void sub_80A0AC0(TaskFunc func, u16 a2, UNUSED u16 a3, u8 priority);
-static void sub_80A0B0C(u8 taskId);
-static void sub_80A0C78(u8 taskId);
+/*
+ * Animates the screen as though it was a CRT monitor turning on or off.
+ */
-void sub_80A0A48(u16 a1, u16 a2, u8 a3)
+#define tState data[0]
+#define tXSpeed data[1]
+#define tYSpeed data[2]
+#define tWin0Left data[3]
+#define tWin0Right data[4]
+#define tWin0Top data[5]
+#define tWin0Bottom data[6]
+#define tBldCntBak data[7]
+#define tBldYBak data[8]
+
+static void BeginPCScreenEffect(TaskFunc func, u16 a2, UNUSED u16 a3, u8 priority);
+static void Task_PCScreenEffect_TurnOn(u8 taskId);
+static void Task_PCScreenEffect_TurnOff(u8 taskId);
+
+void BeginPCScreenEffect_TurnOn(u16 xspeed, u16 yspeed, u8 priority)
{
- sub_80A0AC0(sub_80A0B0C, a1, a2, a3);
+ BeginPCScreenEffect(Task_PCScreenEffect_TurnOn, xspeed, yspeed, priority);
}
-void sub_80A0A70(u16 a1, u16 a2, u8 a3)
+void BeginPCScreenEffect_TurnOff(u16 xspeed, u16 yspeed, u8 priority)
{
- sub_80A0AC0(sub_80A0C78, a1, a2, a3);
+ BeginPCScreenEffect(Task_PCScreenEffect_TurnOff, xspeed, yspeed, priority);
}
-bool8 sub_80A0A98(void)
+bool8 IsPCScreenEffectRunning_TurnOn(void)
{
- return FuncIsActiveTask(sub_80A0B0C);
+ return FuncIsActiveTask(Task_PCScreenEffect_TurnOn);
}
-bool8 sub_80A0AAC(void)
+bool8 IsPCScreenEffectRunning_TurnOff(void)
{
- return FuncIsActiveTask(sub_80A0C78);
+ return FuncIsActiveTask(Task_PCScreenEffect_TurnOff);
}
-static void sub_80A0AC0(TaskFunc func, u16 a2, UNUSED u16 a3, u8 priority)
+static void BeginPCScreenEffect(TaskFunc func, u16 speed, UNUSED u16 unused, u8 priority)
{
u8 taskId = CreateTask(func, priority);
- gTasks[taskId].data[0] = 0;
- gTasks[taskId].data[1] = a2 == 0 ? 16 : a2;
- gTasks[taskId].data[2] = a2 == 0 ? 20 : a2;
+ gTasks[taskId].tState = 0;
+ gTasks[taskId].tXSpeed = speed == 0 ? 16 : speed;
+ gTasks[taskId].tYSpeed = speed == 0 ? 20 : speed; // Bug? should be the unused param, not speed
gTasks[taskId].func(taskId);
}
-static void sub_80A0B0C(u8 taskId)
+static void Task_PCScreenEffect_TurnOn(u8 taskId)
{
struct Task *task = &gTasks[taskId];
- switch (task->data[0])
+ switch (task->tState)
{
case 0:
- task->data[3] = 120;
- task->data[4] = 120;
- task->data[5] = 80;
- task->data[6] = 81;
+ task->tWin0Left = 120;
+ task->tWin0Right = 120;
+ task->tWin0Top = 80;
+ task->tWin0Bottom = 81;
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
- SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
- SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
+ SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWin0Left, task->tWin0Right));
+ SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWin0Top, task->tWin0Bottom));
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
SetGpuReg(REG_OFFSET_WINOUT, 0);
break;
case 1:
- task->data[7] = GetGpuReg(REG_OFFSET_BLDCNT);
- task->data[8] = GetGpuReg(REG_OFFSET_BLDY);
+ task->tBldCntBak = GetGpuReg(REG_OFFSET_BLDCNT);
+ task->tBldYBak = GetGpuReg(REG_OFFSET_BLDY);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_LIGHTEN);
SetGpuReg(REG_OFFSET_BLDY, 16);
break;
case 2:
- task->data[3] -= task->data[1];
- task->data[4] += task->data[1];
- if (task->data[3] <= 0 || task->data[4] >= DISPLAY_WIDTH)
+ task->tWin0Left -= task->tXSpeed;
+ task->tWin0Right += task->tXSpeed;
+ if (task->tWin0Left <= 0 || task->tWin0Right >= DISPLAY_WIDTH)
{
- task->data[3] = 0;
- task->data[4] = DISPLAY_WIDTH;
+ task->tWin0Left = 0;
+ task->tWin0Right = DISPLAY_WIDTH;
SetGpuReg(REG_OFFSET_BLDY, 0);
- SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]);
+ SetGpuReg(REG_OFFSET_BLDCNT, task->tBldCntBak);
BlendPalettes(0xFFFFFFFF, 0, RGB_BLACK);
gPlttBufferFaded[0] = 0;
}
- SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
- if (task->data[3])
+ SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWin0Left, task->tWin0Right));
+ if (task->tWin0Left)
return;
break;
case 3:
- task->data[5] -= task->data[2];
- task->data[6] += task->data[2];
- if (task->data[5] <= 0 || task->data[6] >= DISPLAY_HEIGHT)
+ task->tWin0Top -= task->tYSpeed;
+ task->tWin0Bottom += task->tYSpeed;
+ if (task->tWin0Top <= 0 || task->tWin0Bottom >= DISPLAY_HEIGHT)
{
- task->data[5] = 0;
- task->data[6] = DISPLAY_HEIGHT;
+ task->tWin0Top = 0;
+ task->tWin0Bottom = DISPLAY_HEIGHT;
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
}
- SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
- if (task->data[5])
+ SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWin0Top, task->tWin0Bottom));
+ if (task->tWin0Top)
return;
break;
default:
- SetGpuReg(REG_OFFSET_BLDCNT, task->data[7]);
+ SetGpuReg(REG_OFFSET_BLDCNT, task->tBldCntBak);
DestroyTask(taskId);
return;
}
- ++task->data[0];
+ ++task->tState;
}
-static void sub_80A0C78(u8 taskId)
+static void Task_PCScreenEffect_TurnOff(u8 taskId)
{
struct Task *task = &gTasks[taskId];
- switch (task->data[0])
+ switch (task->tState)
{
case 0:
gPlttBufferFaded[0] = 0;
break;
case 1:
- task->data[3] = 0;
- task->data[4] = DISPLAY_WIDTH;
- task->data[5] = 0;
- task->data[6] = DISPLAY_HEIGHT;
+ task->tWin0Left = 0;
+ task->tWin0Right = DISPLAY_WIDTH;
+ task->tWin0Top = 0;
+ task->tWin0Bottom = DISPLAY_HEIGHT;
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
- SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
- SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
+ SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWin0Left, task->tWin0Right));
+ SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWin0Top, task->tWin0Bottom));
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
SetGpuReg(REG_OFFSET_WINOUT, 0);
break;
case 2:
- task->data[5] += task->data[2];
- task->data[6] -= task->data[2];
- if (task->data[5] >= 80 || task->data[6] <= 81)
+ task->tWin0Top += task->tYSpeed;
+ task->tWin0Bottom -= task->tYSpeed;
+ if (task->tWin0Top >= 80 || task->tWin0Bottom <= 81)
{
- task->data[5] = 80;
- task->data[6] = 81;
+ task->tWin0Top = 80;
+ task->tWin0Bottom = 81;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_LIGHTEN);
SetGpuReg(REG_OFFSET_BLDY, 16);
}
- SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[6]));
- if (task->data[5] != 80)
+ SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWin0Top, task->tWin0Bottom));
+ if (task->tWin0Top != 80)
return;
break;
case 3:
- task->data[3] += task->data[1];
- task->data[4] -= task->data[1];
- if (task->data[3] >= 120 || task->data[4] <= 120)
+ task->tWin0Left += task->tXSpeed;
+ task->tWin0Right -= task->tXSpeed;
+ if (task->tWin0Left >= 120 || task->tWin0Right <= 120)
{
- task->data[3] = 120;
- task->data[4] = 120;
+ task->tWin0Left = 120;
+ task->tWin0Right = 120;
BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK);
gPlttBufferFaded[0] = 0;
}
- SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[4]));
- if (task->data[3] != 120)
+ SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWin0Left, task->tWin0Right));
+ if (task->tWin0Left != 120)
return;
break;
default:
@@ -152,5 +166,15 @@ static void sub_80A0C78(u8 taskId)
DestroyTask(taskId);
return;
}
- ++task->data[0];
+ ++task->tState;
}
+
+#undef tBldYBak
+#undef tBldCntBak
+#undef tWin0Bottom
+#undef tWin0Top
+#undef tWin0Right
+#undef tWin0Left
+#undef tYSpeed
+#undef tXSpeed
+#undef tState
diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c
index b964d3385..b806e7afa 100644
--- a/src/pokemon_storage_system_2.c
+++ b/src/pokemon_storage_system_2.c
@@ -36,11 +36,11 @@ static void sub_808CD64(struct Sprite * sprite);
// Forward declarations
-static const u16 gBoxSelectionPopupPalette[];
-static const u16 gBoxSelectionPopupCenterTiles[];
-static const u16 gBoxSelectionPopupSidesTiles[];
+static const u16 sBoxSelectionPopupPalette[];
+static const u16 sBoxSelectionPopupCenterTiles[];
+static const u16 sBoxSelectionPopupSidesTiles[];
-static const struct PSS_MenuStringPtrs gUnknown_83CDA20[] = {
+static const struct PSS_MenuStringPtrs sUnknown_83CDA20[] = {
{gText_WithdrawPokemon, gText_WithdrawMonDescription},
{gText_DepositPokemon, gText_DepositMonDescription },
{gText_MovePokemon, gText_MoveMonDescription },
@@ -60,7 +60,7 @@ void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 zero1, u8 zero
winTemplate.height = 2;
windowId = AddWindow(&winTemplate);
FillWindowPixelBuffer(windowId, PIXEL_FILL(zero2));
- tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA);
+ tileData1 = (u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA);
tileData2 = (winTemplate.width * 32) + tileData1;
if (!zero1)
@@ -107,7 +107,7 @@ static void PrintStringToBufferCopyNow(const u8 *string, void *dst, u16 rise, u8
var = winTemplate.width * 32;
windowId = AddWindow(&winTemplate);
FillWindowPixelBuffer(windowId, PIXEL_FILL(bgClr));
- tileData1 = (u8*) GetWindowAttribute(windowId, WINDOW_TILE_DATA);
+ tileData1 = (u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA);
tileData2 = (winTemplate.width * 32) + tileData1;
txtColor[0] = bgClr;
txtColor[1] = fgClr;
@@ -246,7 +246,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
LoadStdWindowFrameGfx();
DrawDialogueFrame(0, 0);
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, 2, gUnknown_83CDA20[task->data[1]].desc, TEXT_SPEED_FF, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SPEED_FF, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
CopyWindowToVram(0, 3);
CopyWindowToVram(task->data[15], 3);
task->data[0]++;
@@ -263,16 +263,16 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
{
case MENU_NOTHING_CHOSEN:
task->data[3] = task->data[1];
- if (gMain.newKeys & DPAD_UP && --task->data[3] < 0)
+ if (JOY_NEW(DPAD_UP) && --task->data[3] < 0)
task->data[3] = 4;
- if (gMain.newKeys & DPAD_DOWN && ++task->data[3] > 4)
+ if (JOY_NEW(DPAD_DOWN) && ++task->data[3] > 4)
task->data[3] = 0;
if (task->data[1] != task->data[3])
{
task->data[1] = task->data[3];
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, 2, gUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
}
break;
case MENU_B_PRESSED:
@@ -305,30 +305,30 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
}
break;
case 3:
- if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+ if (JOY_NEW(A_BUTTON | B_BUTTON))
{
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, 2, gUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
task->data[0] = 2;
}
- else if (gMain.newKeys & DPAD_UP)
+ else if (JOY_NEW(DPAD_UP))
{
if (--task->data[1] < 0)
task->data[1] = 4;
Menu_MoveCursor(-1);
task->data[1] = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, 2, gUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
task->data[0] = 2;
}
- else if (gMain.newKeys & DPAD_DOWN)
+ else if (JOY_NEW(DPAD_DOWN))
{
if (++task->data[1] > 3)
task->data[1] = 0;
Menu_MoveCursor(1);
task->data[1] = Menu_GetCursorPos();
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- AddTextPrinterParameterized2(0, 2, gUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
task->data[0] = 2;
}
break;
@@ -365,7 +365,7 @@ static void FieldCb_ReturnToPcMenu(void)
FadeInFromBlack();
}
-static const struct WindowTemplate gUnknown_83CDA48 = {
+static const struct WindowTemplate sUnknown_83CDA48 = {
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
@@ -378,11 +378,11 @@ static const struct WindowTemplate gUnknown_83CDA48 = {
static void PSS_CreatePCMenu(u8 whichMenu, s16 *windowIdPtr)
{
s16 windowId;
- windowId = AddWindow(&gUnknown_83CDA48);
+ windowId = AddWindow(&sUnknown_83CDA48);
DrawStdWindowFrame(windowId, FALSE);
- PrintTextArray(windowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, NELEMS(gUnknown_83CDA20), (void *)gUnknown_83CDA20);
- Menu_InitCursor(windowId, 2, 0, 2, 16, NELEMS(gUnknown_83CDA20), whichMenu);
+ PrintTextArray(windowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, NELEMS(sUnknown_83CDA20), (void *)sUnknown_83CDA20);
+ Menu_InitCursor(windowId, 2, 0, 2, 16, NELEMS(sUnknown_83CDA20), whichMenu);
*windowIdPtr = windowId;
}
@@ -417,11 +417,11 @@ void ResetPokemonStorageSystem(void)
void LoadBoxSelectionPopupSpriteGfx(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3, bool32 loadPal)
{
struct SpritePalette palette = {
- gBoxSelectionPopupPalette, palTag
+ sBoxSelectionPopupPalette, palTag
};
struct SpriteSheet sheets[] = {
- {gBoxSelectionPopupCenterTiles, 0x800, tileTag},
- {gBoxSelectionPopupSidesTiles, 0x180, tileTag + 1},
+ {sBoxSelectionPopupCenterTiles, 0x800, tileTag},
+ {sBoxSelectionPopupSidesTiles, 0x180, tileTag + 1},
{}
};
@@ -456,22 +456,22 @@ void sub_808C950(void)
u8 HandleBoxChooseSelectionInput(void)
{
- if (gMain.newKeys & B_BUTTON)
+ if (JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
return 201;
}
- if (gMain.newKeys & A_BUTTON)
+ if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
return sBoxSelectionPopupSpriteManager->curBox;
}
- if (gMain.newKeys & DPAD_LEFT)
+ if (JOY_NEW(DPAD_LEFT))
{
PlaySE(SE_SELECT);
UpdateBoxNameAndCountSprite_WraparoundLeft();
}
- else if (gMain.newKeys & DPAD_RIGHT)
+ else if (JOY_NEW(DPAD_RIGHT))
{
PlaySE(SE_SELECT);
UpdateBoxNameAndCountSprite_WraparoundRight();
@@ -648,6 +648,6 @@ static void sub_808CD64(struct Sprite *sprite)
// Forward-declared rodata
-static const u16 gBoxSelectionPopupPalette[] = INCBIN_U16("graphics/interface/pss_unk_83CDA98.gbapal");
-static const u16 gBoxSelectionPopupCenterTiles[] = INCBIN_U16("graphics/interface/pss_unk_83CDAB8.4bpp");
-static const u16 gBoxSelectionPopupSidesTiles[] = INCBIN_U16("graphics/interface/pss_unk_83CE2B8.4bpp");
+static const u16 sBoxSelectionPopupPalette[] = INCBIN_U16("graphics/interface/pss_unk_83CDA98.gbapal");
+static const u16 sBoxSelectionPopupCenterTiles[] = INCBIN_U16("graphics/interface/pss_unk_83CDAB8.4bpp");
+static const u16 sBoxSelectionPopupSidesTiles[] = INCBIN_U16("graphics/interface/pss_unk_83CE2B8.4bpp");
diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c
index 48007ad0f..7ae451b69 100644
--- a/src/pokemon_storage_system_3.c
+++ b/src/pokemon_storage_system_3.c
@@ -28,7 +28,7 @@
#include "constants/flags.h"
#include "constants/vars.h"
-EWRAM_DATA struct PokemonStorageSystemData *sPSSData = NULL;
+EWRAM_DATA struct PokemonStorageSystemData *gPSSData = NULL;
static EWRAM_DATA bool8 sInPartyMenu = 0;
static EWRAM_DATA u8 sCurrentBoxOption = 0;
static EWRAM_DATA u8 gUnknown_20397B6 = 0;
@@ -106,9 +106,9 @@ static void sub_808FDFC(void);
static void sub_808FE54(u8 species);
static void sub_808FF70(void);
-static const u32 gPokemonStorageScrollingBGTileset[] = INCBIN_U32("graphics/interface/pss_unk_83CE438.4bpp.lz");
-static const u32 gPokemonStorageScrollingBGTilemap[] = INCBIN_U32("graphics/interface/pss_unk_83CE4D0.bin.lz");
-static const u16 gPokemonStorageScrollingBGPalette[] = INCBIN_U16("graphics/interface/pss_unk_83CE5DC.gbapal");
+static const u32 sPokemonStorageScrollingBGTileset[] = INCBIN_U32("graphics/interface/pss_unk_83CE438.4bpp.lz");
+static const u32 sPokemonStorageScrollingBGTilemap[] = INCBIN_U32("graphics/interface/pss_unk_83CE4D0.bin.lz");
+static const u16 sPokemonStorageScrollingBGPalette[] = INCBIN_U16("graphics/interface/pss_unk_83CE5DC.gbapal");
static const u32 gUnknown_83CE5FC[] = INCBIN_U32("graphics/interface/pss_unk_83CE5FC.bin.lz");
static const u16 gUnknown_83CE6F8[] = {
@@ -209,11 +209,11 @@ static const struct BgTemplate gUnknown_83CEA50[] = {
}
};
-static const struct SpritePalette gWaveformSpritePalette = {
+static const struct SpritePalette sWaveformSpritePalette = {
gUnknown_83CE7F0, TAG_PAL_WAVEFORM
};
-static const struct SpriteSheet gWaveformSpriteSheet = {
+static const struct SpriteSheet sWaveformSpriteSheet = {
gUnknown_83CE810, 0x01c0, TAG_TILE_WAVEFORM
};
@@ -229,7 +229,7 @@ static const struct SpriteTemplate sSpriteTemplate_CursorMon = {
.callback = SpriteCallbackDummy
};
-static const struct StorageAction gPCStorageActionTexts[] = {
+static const struct StorageAction sPCStorageActionTexts[] = {
[PC_TEXT_EXIT_BOX] = {gText_ExitFromBox, PC_TEXT_FMT_NORMAL},
[PC_TEXT_WHAT_YOU_DO] = {gText_WhatDoYouWantToDo, PC_TEXT_FMT_NORMAL},
[PC_TEXT_PICK_A_THEME] = {gText_PleasePickATheme, PC_TEXT_FMT_NORMAL},
@@ -353,7 +353,7 @@ static void VblankCb_PSS(void)
ProcessSpriteCopyRequests();
sub_8096BF8();
TransferPlttBuffer();
- SetGpuReg(REG_OFFSET_BG2HOFS, sPSSData->bg2_X);
+ SetGpuReg(REG_OFFSET_BG2HOFS, gPSSData->bg2_X);
}
static void Cb2_PSS(void)
@@ -370,16 +370,16 @@ void Cb2_EnterPSS(u8 boxOption)
{
ResetTasks();
sCurrentBoxOption = boxOption;
- sPSSData = Alloc(sizeof(struct PokemonStorageSystemData));
- if (sPSSData == NULL)
+ gPSSData = Alloc(sizeof(struct PokemonStorageSystemData));
+ if (gPSSData == NULL)
SetMainCallback2(Cb2_ExitPSS);
else
{
- sPSSData->boxOption = boxOption;
- sPSSData->isReshowingPSS = FALSE;
+ gPSSData->boxOption = boxOption;
+ gPSSData->isReshowingPSS = FALSE;
gUnknown_20397BA = 0;
- sPSSData->state = 0;
- sPSSData->taskId = CreateTask(Cb_InitPSS, 3);
+ gPSSData->state = 0;
+ gPSSData->taskId = CreateTask(Cb_InitPSS, 3);
SetHelpContext(HELPCONTEXT_BILLS_PC);
sLastUsedBox = StorageGetCurrentBox();
SetMainCallback2(Cb2_PSS);
@@ -389,15 +389,15 @@ void Cb2_EnterPSS(u8 boxOption)
void Cb2_ReturnToPSS(void)
{
ResetTasks();
- sPSSData = Alloc(sizeof(struct PokemonStorageSystemData));
- if (sPSSData == NULL)
+ gPSSData = Alloc(sizeof(struct PokemonStorageSystemData));
+ if (gPSSData == NULL)
SetMainCallback2(Cb2_ExitPSS);
else
{
- sPSSData->boxOption = sCurrentBoxOption;
- sPSSData->isReshowingPSS = TRUE;
- sPSSData->state = 0;
- sPSSData->taskId = CreateTask(Cb_InitPSS, 3);
+ gPSSData->boxOption = sCurrentBoxOption;
+ gPSSData->isReshowingPSS = TRUE;
+ gPSSData->state = 0;
+ gPSSData->taskId = CreateTask(Cb_InitPSS, 3);
SetHelpContext(HELPCONTEXT_BILLS_PC);
SetMainCallback2(Cb2_PSS);
}
@@ -423,25 +423,25 @@ static void sub_808CF10(void)
FreeAllSpritePalettes();
ClearDma3Requests();
gReservedSpriteTileCount = 0x280;
- sub_8096BE4(&sPSSData->unk_0020, sPSSData->unk_0028, 8);
+ sub_8096BE4(&gPSSData->unk_0020, gPSSData->unk_0028, 8);
gKeyRepeatStartDelay = 20;
ClearScheduledBgCopiesToVram();
AllocBoxPartyPokemonDropdowns(3);
SetBoxPartyPokemonDropdownMap2(0, 1, gUnknown_83CE6F8, 8, 4);
SetBoxPartyPokemonDropdownMap2Pos(0, 1, 0);
- sPSSData->unk_02C7 = FALSE;
+ gPSSData->unk_02C7 = FALSE;
}
static void sub_808CF94(void)
{
sub_8092B50();
- sInPartyMenu = sPSSData->boxOption == BOX_OPTION_DEPOSIT;
+ sInPartyMenu = gPSSData->boxOption == BOX_OPTION_DEPOSIT;
gUnknown_20397B6 = 0;
}
static void sub_808CFC4(void)
{
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
{
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(7, 11));
@@ -451,19 +451,19 @@ static void sub_808CFC4(void)
static void SetPSSCallback(TaskFunc newFunc)
{
- gTasks[sPSSData->taskId].func = newFunc;
- sPSSData->state = 0;
+ gTasks[gPSSData->taskId].func = newFunc;
+ gPSSData->state = 0;
}
static void Cb_InitPSS(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
SetVBlankCallback(NULL);
SetGpuReg(REG_OFFSET_DISPCNT, 0);
sub_808CF10();
- if (sPSSData->isReshowingPSS)
+ if (gPSSData->isReshowingPSS)
{
switch (sWhichToReshow)
{
@@ -496,12 +496,12 @@ static void Cb_InitPSS(u8 taskId)
break;
case 3:
ResetAllBgCoords();
- if (!sPSSData->isReshowingPSS)
+ if (!gPSSData->isReshowingPSS)
sub_808CF94();
break;
case 4:
sub_808FFAC();
- if (!sPSSData->isReshowingPSS)
+ if (!gPSSData->isReshowingPSS)
sub_80922C0();
else
sub_8092340();
@@ -531,11 +531,11 @@ static void Cb_InitPSS(u8 taskId)
if (sub_809140C())
return;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{
- sPSSData->field_DA4.baseTileTag = TAG_TILE_D;
- sPSSData->field_DA4.basePaletteTag = TAG_PAL_DACE;
- SetMonMarkingsMenuPointer(&sPSSData->field_DA4);
+ gPSSData->field_DA4.baseTileTag = TAG_TILE_D;
+ gPSSData->field_DA4.basePaletteTag = TAG_PAL_DACE;
+ SetMonMarkingsMenuPointer(&gPSSData->field_DA4);
LoadMonMarkingsFrameGfx();
}
else
@@ -546,7 +546,7 @@ static void Cb_InitPSS(u8 taskId)
break;
case 10:
sub_808CFC4();
- if (!sPSSData->isReshowingPSS)
+ if (!gPSSData->isReshowingPSS)
{
BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK);
SetPSSCallback(Cb_ShowPSS);
@@ -562,20 +562,20 @@ static void Cb_InitPSS(u8 taskId)
return;
}
- sPSSData->state++;
+ gPSSData->state++;
}
static void Cb_ShowPSS(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
PlaySE(SE_PC_LOGIN);
- sub_80A0A48(0x14, 0, 1);
- sPSSData->state++;
+ BeginPCScreenEffect_TurnOn(20, 0, 1);
+ gPSSData->state++;
break;
case 1:
- if (!sub_80A0A98())
+ if (!IsPCScreenEffectRunning_TurnOn())
SetPSSCallback(Cb_MainPSS);
break;
}
@@ -583,11 +583,11 @@ static void Cb_ShowPSS(u8 taskId)
static void Cb_ReshowPSS(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, RGB_BLACK);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!UpdatePaletteFade())
@@ -600,20 +600,20 @@ static void Cb_ReshowPSS(u8 taskId)
static void Cb_MainPSS(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
switch (HandleInput())
{
case 1:
PlaySE(SE_SELECT);
- sPSSData->state = 1;
+ gPSSData->state = 1;
break;
case 5:
- if (sPSSData->boxOption != BOX_OPTION_MOVE_MONS && sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_MONS && gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{
PrintStorageActionText(PC_TEXT_WHICH_ONE_WILL_TAKE);
- sPSSData->state = 3;
+ gPSSData->state = 3;
}
else
{
@@ -622,14 +622,14 @@ static void Cb_MainPSS(u8 taskId)
}
break;
case 6:
- if (sPSSData->boxOption == BOX_OPTION_MOVE_MONS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_MONS)
{
- if (IsMonBeingMoved() && ItemIsMail(sPSSData->cursorMonItem))
- sPSSData->state = 5;
+ if (IsMonBeingMoved() && ItemIsMail(gPSSData->cursorMonItem))
+ gPSSData->state = 5;
else
SetPSSCallback(Cb_HidePartyPokemon);
}
- else if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ else if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
{
SetPSSCallback(Cb_HidePartyPokemon);
}
@@ -649,42 +649,42 @@ static void Cb_MainPSS(u8 taskId)
break;
case 9:
PlaySE(SE_SELECT);
- sPSSData->newCurrBoxId = StorageGetCurrentBox() + 1;
- if (sPSSData->newCurrBoxId >= TOTAL_BOXES_COUNT)
- sPSSData->newCurrBoxId = 0;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ gPSSData->newCurrBoxId = StorageGetCurrentBox() + 1;
+ if (gPSSData->newCurrBoxId >= TOTAL_BOXES_COUNT)
+ gPSSData->newCurrBoxId = 0;
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{
- SetUpScrollToBox(sPSSData->newCurrBoxId);
- sPSSData->state = 2;
+ SetUpScrollToBox(gPSSData->newCurrBoxId);
+ gPSSData->state = 2;
}
else
{
sub_8094D60();
- sPSSData->state = 10;
+ gPSSData->state = 10;
}
break;
case 10:
PlaySE(SE_SELECT);
- sPSSData->newCurrBoxId = StorageGetCurrentBox() - 1;
- if (sPSSData->newCurrBoxId < 0)
- sPSSData->newCurrBoxId = TOTAL_BOXES_COUNT - 1;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ gPSSData->newCurrBoxId = StorageGetCurrentBox() - 1;
+ if (gPSSData->newCurrBoxId < 0)
+ gPSSData->newCurrBoxId = TOTAL_BOXES_COUNT - 1;
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{
- SetUpScrollToBox(sPSSData->newCurrBoxId);
- sPSSData->state = 2;
+ SetUpScrollToBox(gPSSData->newCurrBoxId);
+ gPSSData->state = 2;
}
else
{
sub_8094D60();
- sPSSData->state = 10;
+ gPSSData->state = 10;
}
break;
case 11:
if (!CanMovePartyMon())
{
- if (ItemIsMail(sPSSData->cursorMonItem))
+ if (ItemIsMail(gPSSData->cursorMonItem))
{
- sPSSData->state = 5;
+ gPSSData->state = 5;
}
else
{
@@ -694,13 +694,13 @@ static void Cb_MainPSS(u8 taskId)
}
else
{
- sPSSData->state = 4;
+ gPSSData->state = 4;
}
break;
case 13:
if (CanMovePartyMon())
{
- sPSSData->state = 4;
+ gPSSData->state = 4;
}
else
{
@@ -711,7 +711,7 @@ static void Cb_MainPSS(u8 taskId)
case 14:
if (!CanShiftMon())
{
- sPSSData->state = 4;
+ gPSSData->state = 4;
}
else
{
@@ -742,31 +742,31 @@ static void Cb_MainPSS(u8 taskId)
case 20:
PlaySE(SE_SELECT);
sub_80950BC(0);
- sPSSData->state = 7;
+ gPSSData->state = 7;
break;
case 22:
sub_80950BC(1);
- sPSSData->state = 8;
+ gPSSData->state = 8;
break;
case 21:
PlaySE(SE_SELECT);
sub_80950BC(2);
- sPSSData->state = 9;
+ gPSSData->state = 9;
break;
case 23:
sub_80950BC(3);
- sPSSData->state = 7;
+ gPSSData->state = 7;
break;
case 25:
PlaySE(SE_SELECT);
sub_80950BC(4);
- sPSSData->state = 9;
+ gPSSData->state = 9;
break;
case 26:
PlaySE(SE_SELECT);
sub_808FE54(3);
sub_80950BC(5);
- sPSSData->state = 7;
+ gPSSData->state = 7;
break;
case 24:
PlaySE(SE_HAZURE);
@@ -781,29 +781,29 @@ static void Cb_MainPSS(u8 taskId)
else
sub_808F974();
- if (sPSSData->setMosaic)
+ if (gPSSData->setMosaic)
BoxSetMosaic();
- sPSSData->state = 0;
+ gPSSData->state = 0;
}
break;
case 2:
if (!ScrollToBox())
{
- SetCurrentBox(sPSSData->newCurrBoxId);
+ SetCurrentBox(gPSSData->newCurrBoxId);
if (!sInPartyMenu && !IsMonBeingMoved())
{
sub_8092F54();
BoxSetMosaic();
}
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
{
sub_8094D84();
- sPSSData->state = 11;
+ gPSSData->state = 11;
}
else
{
- sPSSData->state = 0;
+ gPSSData->state = 0;
}
}
break;
@@ -811,18 +811,18 @@ static void Cb_MainPSS(u8 taskId)
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
ClearBottomWindow();
- sPSSData->state = 0;
+ gPSSData->state = 0;
}
break;
case 4:
PlaySE(SE_HAZURE);
PrintStorageActionText(PC_TEXT_LAST_POKE);
- sPSSData->state = 6;
+ gPSSData->state = 6;
break;
case 5:
PlaySE(SE_HAZURE);
PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL);
- sPSSData->state = 6;
+ gPSSData->state = 6;
break;
case 6:
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
@@ -833,7 +833,7 @@ static void Cb_MainPSS(u8 taskId)
break;
case 7:
if (!sub_80950D0())
- sPSSData->state = 0;
+ gPSSData->state = 0;
break;
case 8:
if (!sub_80950D0())
@@ -842,32 +842,32 @@ static void Cb_MainPSS(u8 taskId)
case 9:
if (!sub_80950D0())
{
- if (sPSSData->setMosaic)
+ if (gPSSData->setMosaic)
BoxSetMosaic();
- sPSSData->state = 0;
+ gPSSData->state = 0;
}
break;
case 10:
if (!sub_809610C())
{
- SetUpScrollToBox(sPSSData->newCurrBoxId);
- sPSSData->state = 2;
+ SetUpScrollToBox(gPSSData->newCurrBoxId);
+ gPSSData->state = 2;
}
break;
case 11:
if (!sub_809610C())
- sPSSData->state = 0;
+ gPSSData->state = 0;
break;
}
}
static void Cb_ShowPartyPokemon(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
SetUpDoShowPartyMenu();
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!DoShowPartyMenu())
@@ -878,24 +878,24 @@ static void Cb_ShowPartyPokemon(u8 taskId)
static void Cb_HidePartyPokemon(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
PlaySE(SE_SELECT);
SetUpHidePartyMenu();
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!HidePartyMenu())
{
sub_8092B3C(sub_8092B70());
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 2:
if (!sub_80924A8())
{
- if (sPSSData->setMosaic)
+ if (gPSSData->setMosaic)
BoxSetMosaic();
SetPSSCallback(Cb_MainPSS);
}
@@ -905,26 +905,26 @@ static void Cb_HidePartyPokemon(u8 taskId)
static void Cb_OnSelectedMon(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
if (!BoxGetMosaic())
{
PlaySE(SE_SELECT);
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
PrintStorageActionText(PC_TEXT_IS_SELECTED);
- else if (IsActiveItemMoving() || sPSSData->cursorMonItem != 0)
+ else if (IsActiveItemMoving() || gPSSData->cursorMonItem != 0)
PrintStorageActionText(PC_TEXT_IS_SELECTED2);
else
PrintStorageActionText(PC_TEXT_GIVE_TO_MON);
AddMenu();
- sPSSData->state = 1;
+ gPSSData->state = 1;
}
break;
case 1: // debug?
if (!sub_8094F90())
- sPSSData->state = 2;
+ gPSSData->state = 2;
break;
case 2:
switch (sub_8094F94())
@@ -937,7 +937,7 @@ static void Cb_OnSelectedMon(u8 taskId)
case 3:
if (CanMovePartyMon())
{
- sPSSData->state = 3;
+ gPSSData->state = 3;
}
else
{
@@ -954,7 +954,7 @@ static void Cb_OnSelectedMon(u8 taskId)
case 4:
if (!CanShiftMon())
{
- sPSSData->state = 3;
+ gPSSData->state = 3;
}
else
{
@@ -971,11 +971,11 @@ static void Cb_OnSelectedMon(u8 taskId)
case 1:
if (CanMovePartyMon())
{
- sPSSData->state = 3;
+ gPSSData->state = 3;
}
- else if (ItemIsMail(sPSSData->cursorMonItem))
+ else if (ItemIsMail(gPSSData->cursorMonItem))
{
- sPSSData->state = 4;
+ gPSSData->state = 4;
}
else
{
@@ -987,15 +987,15 @@ static void Cb_OnSelectedMon(u8 taskId)
case 7:
if (CanMovePartyMon())
{
- sPSSData->state = 3;
+ gPSSData->state = 3;
}
- else if (sPSSData->cursorMonIsEgg)
+ else if (gPSSData->cursorMonIsEgg)
{
- sPSSData->state = 5; // Cannot release an Egg.
+ gPSSData->state = 5; // Cannot release an Egg.
}
- else if (ItemIsMail(sPSSData->cursorMonItem))
+ else if (ItemIsMail(gPSSData->cursorMonItem))
{
- sPSSData->state = 4;
+ gPSSData->state = 4;
}
else
{
@@ -1036,17 +1036,17 @@ static void Cb_OnSelectedMon(u8 taskId)
case 3:
PlaySE(SE_HAZURE);
PrintStorageActionText(PC_TEXT_LAST_POKE);
- sPSSData->state = 6;
+ gPSSData->state = 6;
break;
case 5:
PlaySE(SE_HAZURE);
PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG);
- sPSSData->state = 6;
+ gPSSData->state = 6;
break;
case 4:
PlaySE(SE_HAZURE);
PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL);
- sPSSData->state = 6;
+ gPSSData->state = 6;
break;
case 6:
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
@@ -1060,11 +1060,11 @@ static void Cb_OnSelectedMon(u8 taskId)
static void Cb_MoveMon(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
InitMonPlaceChange(0);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!DoMonPlaceChange())
@@ -1080,12 +1080,12 @@ static void Cb_MoveMon(u8 taskId)
static void Cb_PlaceMon(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
sub_808FE54(1);
InitMonPlaceChange(1);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!DoMonPlaceChange())
@@ -1101,12 +1101,12 @@ static void Cb_PlaceMon(u8 taskId)
static void Cb_ShiftMon(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
sub_808FE54(0);
InitMonPlaceChange(2);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!DoMonPlaceChange())
@@ -1120,19 +1120,19 @@ static void Cb_ShiftMon(u8 taskId)
static void Cb_WithdrawMon(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
if (CalculatePlayerPartyCount() == PARTY_SIZE)
{
PrintStorageActionText(PC_TEXT_PARTY_FULL);
- sPSSData->state = 1;
+ gPSSData->state = 1;
}
else
{
sub_8092B5C();
InitMonPlaceChange(0);
- sPSSData->state = 2;
+ gPSSData->state = 2;
}
break;
case 1:
@@ -1147,7 +1147,7 @@ static void Cb_WithdrawMon(u8 taskId)
{
SetMovingMonPriority(1);
SetUpDoShowPartyMenu();
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 3:
@@ -1155,14 +1155,14 @@ static void Cb_WithdrawMon(u8 taskId)
{
sub_808FE54(1);
InitMonPlaceChange(1);
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 4:
if (!DoMonPlaceChange())
{
sub_808FAA8();
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 5:
@@ -1175,13 +1175,13 @@ static void Cb_DepositMenu(u8 taskId)
{
u8 boxId;
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX);
- LoadBoxSelectionPopupSpriteGfx(&sPSSData->field_1E5C, TAG_TILE_A, TAG_PAL_DAC7, 3, FALSE);
+ LoadBoxSelectionPopupSpriteGfx(&gPSSData->field_1E5C, TAG_TILE_A, TAG_PAL_DAC7, 3, FALSE);
sub_808C940(gUnknown_20397B6);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
boxId = HandleBoxChooseSelectionInput();
@@ -1205,19 +1205,19 @@ static void Cb_DepositMenu(u8 taskId)
ClearBottomWindow();
sub_808C950();
FreeBoxSelectionPopupSpriteGfx();
- sPSSData->state = 2;
+ gPSSData->state = 2;
}
else
{
PrintStorageActionText(PC_TEXT_BOX_IS_FULL);
- sPSSData->state = 4;
+ gPSSData->state = 4;
}
}
break;
case 2:
CompactPartySlots();
sub_80909F4();
- sPSSData->state++;
+ gPSSData->state++;
break;
case 3:
if (!sub_8090A60())
@@ -1232,7 +1232,7 @@ static void Cb_DepositMenu(u8 taskId)
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX);
- sPSSData->state = 1;
+ gPSSData->state = 1;
}
break;
}
@@ -1240,12 +1240,12 @@ static void Cb_DepositMenu(u8 taskId)
static void Cb_ReleaseMon(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
PrintStorageActionText(PC_TEXT_RELEASE_POKE);
ShowYesNoWindow(1);
- sPSSData->state++;
+ gPSSData->state++;
// fallthrough
case 1:
switch (Menu_ProcessInputNoWrapClearOnChoose())
@@ -1259,7 +1259,7 @@ static void Cb_ReleaseMon(u8 taskId)
ClearBottomWindow();
InitCanReleaseMonVars();
sub_8093194();
- sPSSData->state++;
+ gPSSData->state++;
break;
}
break;
@@ -1272,12 +1272,12 @@ static void Cb_ReleaseMon(u8 taskId)
s8 r0 = RunCanReleaseMon();
if (r0 == 1)
{
- sPSSData->state++;
+ gPSSData->state++;
break;
}
else if (r0 == 0)
{
- sPSSData->state = 8; // Can't release the mon.
+ gPSSData->state = 8; // Can't release the mon.
break;
}
}
@@ -1287,13 +1287,13 @@ static void Cb_ReleaseMon(u8 taskId)
ReleaseMon();
RefreshCursorMonData();
PrintStorageActionText(PC_TEXT_WAS_RELEASED);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 4:
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
PrintStorageActionText(PC_TEXT_BYE_BYE);
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 5:
@@ -1304,11 +1304,11 @@ static void Cb_ReleaseMon(u8 taskId)
{
CompactPartySlots();
sub_80909F4();
- sPSSData->state++;
+ gPSSData->state++;
}
else
{
- sPSSData->state = 7;
+ gPSSData->state = 7;
}
}
break;
@@ -1318,7 +1318,7 @@ static void Cb_ReleaseMon(u8 taskId)
sub_8092F54();
BoxSetMosaic();
sub_808FAA8();
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 7:
@@ -1326,13 +1326,13 @@ static void Cb_ReleaseMon(u8 taskId)
break;
case 8:
PrintStorageActionText(PC_TEXT_WAS_RELEASED);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 9:
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
PrintStorageActionText(PC_TEXT_SURPRISE);
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 10:
@@ -1340,7 +1340,7 @@ static void Cb_ReleaseMon(u8 taskId)
{
ClearBottomWindow();
sub_8091114();
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 11:
@@ -1348,14 +1348,14 @@ static void Cb_ReleaseMon(u8 taskId)
{
sub_8093264();
PrintStorageActionText(PC_TEXT_CAME_BACK);
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 12:
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
PrintStorageActionText(PC_TEXT_WORRIED);
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 13:
@@ -1370,20 +1370,20 @@ static void Cb_ReleaseMon(u8 taskId)
static void Cb_ShowMarkMenu(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
PrintStorageActionText(PC_TEXT_MARK_POKE);
- sPSSData->field_DA4.markings = sPSSData->cursorMonMarkings;
- DrawMonMarkingsMenu(sPSSData->cursorMonMarkings, 0xb0, 0x10);
- sPSSData->state++;
+ gPSSData->field_DA4.markings = gPSSData->cursorMonMarkings;
+ DrawMonMarkingsMenu(gPSSData->cursorMonMarkings, 0xb0, 0x10);
+ gPSSData->state++;
break;
case 1:
if (!MonMarkingsHandleInput())
{
TeardownMonMarkingsMenu();
ClearBottomWindow();
- SetMonMarkings(sPSSData->field_DA4.markings);
+ SetMonMarkings(gPSSData->field_DA4.markings);
RefreshCursorMonData();
SetPSSCallback(Cb_MainPSS);
}
@@ -1393,13 +1393,13 @@ static void Cb_ShowMarkMenu(u8 taskId)
static void Cb_TakeItemForMoving(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
- if (!ItemIsMail(sPSSData->cursorMonItem))
+ if (!ItemIsMail(gPSSData->cursorMonItem))
{
ClearBottomWindow();
- sPSSData->state++;
+ gPSSData->state++;
}
else
{
@@ -1408,8 +1408,8 @@ static void Cb_TakeItemForMoving(u8 taskId)
break;
case 1:
sub_8094D14(2);
- Item_FromMonToMoving((sInPartyMenu != FALSE) ? CURSOR_AREA_IN_PARTY : CURSOR_AREA_IN_BOX, GetBoxCursorPosition());
- sPSSData->state++;
+ Item_FromMonToMoving(sInPartyMenu ? CURSOR_AREA_IN_PARTY : CURSOR_AREA_IN_BOX, GetBoxCursorPosition());
+ gPSSData->state++;
break;
case 2:
if (!sub_809610C())
@@ -1418,7 +1418,7 @@ static void Cb_TakeItemForMoving(u8 taskId)
ClearBottomWindow();
sub_8092F54();
PrintCursorMonInfo();
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 3:
@@ -1430,16 +1430,16 @@ static void Cb_TakeItemForMoving(u8 taskId)
static void Cb_GiveMovingItemToMon(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
ClearBottomWindow();
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
sub_8094D14(2);
- Item_GiveMovingToMon((sInPartyMenu != FALSE) ? CURSOR_AREA_IN_PARTY : CURSOR_AREA_IN_BOX, GetBoxCursorPosition());
- sPSSData->state++;
+ Item_GiveMovingToMon(sInPartyMenu ? CURSOR_AREA_IN_PARTY : CURSOR_AREA_IN_BOX, GetBoxCursorPosition());
+ gPSSData->state++;
break;
case 2:
if (!sub_809610C())
@@ -1448,14 +1448,14 @@ static void Cb_GiveMovingItemToMon(u8 taskId)
sub_8092F54();
PrintCursorMonInfo();
PrintStorageActionText(PC_TEXT_ITEM_IS_HELD);
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 3:
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
ClearBottomWindow();
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 4:
@@ -1467,27 +1467,27 @@ static void Cb_GiveMovingItemToMon(u8 taskId)
static void Cb_ItemToBag(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
- if (!AddBagItem(sPSSData->cursorMonItem, 1))
+ if (!AddBagItem(gPSSData->cursorMonItem, 1))
{
PlaySE(SE_HAZURE);
PrintStorageActionText(PC_TEXT_BAG_FULL);
- sPSSData->state = 3;
+ gPSSData->state = 3;
}
else
{
PlaySE(SE_SELECT);
- Item_TakeMons((sInPartyMenu != FALSE) ? CURSOR_AREA_IN_PARTY : CURSOR_AREA_IN_BOX, GetBoxCursorPosition());
- sPSSData->state = 1;
+ Item_TakeMons(sInPartyMenu ? CURSOR_AREA_IN_PARTY : CURSOR_AREA_IN_BOX, GetBoxCursorPosition());
+ gPSSData->state = 1;
}
break;
case 1:
if (!sub_809610C())
{
PrintStorageActionText(PC_TEXT_PLACED_IN_BAG);
- sPSSData->state = 2;
+ gPSSData->state = 2;
}
break;
case 2:
@@ -1496,7 +1496,7 @@ static void Cb_ItemToBag(u8 taskId)
ClearBottomWindow();
sub_8092F54();
PrintCursorMonInfo();
- sPSSData->state = 4;
+ gPSSData->state = 4;
}
break;
case 4:
@@ -1515,13 +1515,13 @@ static void Cb_ItemToBag(u8 taskId)
static void Cb_SwitchSelectedItem(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
- if (!ItemIsMail(sPSSData->cursorMonItem))
+ if (!ItemIsMail(gPSSData->cursorMonItem))
{
ClearBottomWindow();
- sPSSData->state++;
+ gPSSData->state++;
}
else
{
@@ -1530,8 +1530,8 @@ static void Cb_SwitchSelectedItem(u8 taskId)
break;
case 1:
sub_8094D14(2);
- Item_SwitchMonsWithMoving((sInPartyMenu != FALSE) ? CURSOR_AREA_IN_PARTY : CURSOR_AREA_IN_BOX, GetBoxCursorPosition());
- sPSSData->state++;
+ Item_SwitchMonsWithMoving(sInPartyMenu ? CURSOR_AREA_IN_PARTY : CURSOR_AREA_IN_BOX, GetBoxCursorPosition());
+ gPSSData->state++;
break;
case 2:
if (!sub_809610C())
@@ -1540,14 +1540,14 @@ static void Cb_SwitchSelectedItem(u8 taskId)
sub_8092F54();
PrintCursorMonInfo();
PrintStorageActionText(PC_TEXT_CHANGED_TO_ITEM);
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 3:
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
ClearBottomWindow();
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 4:
@@ -1559,11 +1559,11 @@ static void Cb_SwitchSelectedItem(u8 taskId)
static void Cb_ShowItemInfo(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
ClearBottomWindow();
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!IsDma3ManagerBusyWithBgCopy())
@@ -1571,27 +1571,27 @@ static void Cb_ShowItemInfo(u8 taskId)
PlaySE(SE_WIN_OPEN);
PrintItemDescription();
sub_80966F4();
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 2:
if (!sub_8096728())
- sPSSData->state++;
+ gPSSData->state++;
break;
case 3:
if (!IsDma3ManagerBusyWithBgCopy())
- sPSSData->state++;
+ gPSSData->state++;
break;
case 4:
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
PlaySE(SE_WIN_OPEN);
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 5:
if (!sub_80967C0())
- sPSSData->state++;
+ gPSSData->state++;
break;
case 6:
if (!IsDma3ManagerBusyWithBgCopy())
@@ -1602,13 +1602,13 @@ static void Cb_ShowItemInfo(u8 taskId)
static void Cb_CloseBoxWhileHoldingItem(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
PlaySE(SE_SELECT);
PrintStorageActionText(PC_TEXT_PUT_IN_BAG);
ShowYesNoWindow(0);
- sPSSData->state = 1;
+ gPSSData->state = 1;
break;
case 1:
switch (Menu_ProcessInputNoWrapClearOnChoose())
@@ -1619,15 +1619,15 @@ static void Cb_CloseBoxWhileHoldingItem(u8 taskId)
SetPSSCallback(Cb_MainPSS);
break;
case 0:
- if (AddBagItem(sPSSData->movingItem, 1) == TRUE)
+ if (AddBagItem(gPSSData->movingItem, 1) == TRUE)
{
ClearBottomWindow();
- sPSSData->state = 3;
+ gPSSData->state = 3;
}
else
{
PrintStorageActionText(PC_TEXT_BAG_FULL);
- sPSSData->state = 2;
+ gPSSData->state = 2;
}
break;
}
@@ -1636,12 +1636,12 @@ static void Cb_CloseBoxWhileHoldingItem(u8 taskId)
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
ClearBottomWindow();
- sPSSData->state = 5;
+ gPSSData->state = 5;
}
break;
case 3:
sub_8096088();
- sPSSData->state = 4;
+ gPSSData->state = 4;
break;
case 4:
if (!sub_809610C())
@@ -1659,12 +1659,12 @@ static void Cb_CloseBoxWhileHoldingItem(u8 taskId)
static void Cb_HandleMovingMonFromParty(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
CompactPartySlots();
sub_80909F4();
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!sub_8090A60())
@@ -1678,21 +1678,21 @@ static void Cb_HandleMovingMonFromParty(u8 taskId)
static void Cb_PrintCantStoreMail(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
PrintStorageActionText(PC_TEXT_CANT_STORE_MAIL);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!IsDma3ManagerBusyWithBgCopy())
- sPSSData->state++;
+ gPSSData->state++;
break;
case 2:
if (JOY_NEW(A_BUTTON | B_BUTTON | DPAD_ANY))
{
ClearBottomWindow();
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 3:
@@ -1704,17 +1704,17 @@ static void Cb_PrintCantStoreMail(u8 taskId)
static void Cb_HandleBoxOptions(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
PrintStorageActionText(PC_TEXT_WHAT_YOU_DO);
AddMenu();
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (sub_8094F90())
return;
- sPSSData->state++;
+ gPSSData->state++;
case 2:
switch (sub_8094F94())
{
@@ -1745,20 +1745,20 @@ static void Cb_HandleBoxOptions(u8 taskId)
static void Cb_HandleWallpapers(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
AddWallpaperSetsMenu();
PrintStorageActionText(PC_TEXT_PICK_A_THEME);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!sub_8094F90())
- sPSSData->state++;
+ gPSSData->state++;
break;
case 2:
- sPSSData->wallpaperSetId = sub_8094F94();
- switch (sPSSData->wallpaperSetId)
+ gPSSData->wallpaperSetId = sub_8094F94();
+ switch (gPSSData->wallpaperSetId)
{
case -1:
sub_80920FC(TRUE);
@@ -1768,35 +1768,35 @@ static void Cb_HandleWallpapers(u8 taskId)
case 18 ... 21:
PlaySE(SE_SELECT);
sub_8095024();
- sPSSData->wallpaperSetId -= 18;
- sPSSData->state++;
+ gPSSData->wallpaperSetId -= 18;
+ gPSSData->state++;
break;
}
break;
case 3:
if (!IsDma3ManagerBusyWithBgCopy())
{
- AddWallpapersMenu(sPSSData->wallpaperSetId);
+ AddWallpapersMenu(gPSSData->wallpaperSetId);
PrintStorageActionText(PC_TEXT_PICK_A_WALLPAPER);
- sPSSData->state++;
+ gPSSData->state++;
}
break;
case 4:
- sPSSData->wallpaperId = sub_8094F94();
- switch (sPSSData->wallpaperId)
+ gPSSData->wallpaperId = sub_8094F94();
+ switch (gPSSData->wallpaperId)
{
case MENU_NOTHING_CHOSEN:
break;
case MENU_B_PRESSED:
ClearBottomWindow();
- sPSSData->state = 0;
+ gPSSData->state = 0;
break;
default:
PlaySE(SE_SELECT);
ClearBottomWindow();
- sPSSData->wallpaperId -= 22;
- SetWallpaperForCurrentBox(sPSSData->wallpaperId);
- sPSSData->state++;
+ gPSSData->wallpaperId -= 22;
+ SetWallpaperForCurrentBox(gPSSData->wallpaperId);
+ gPSSData->state++;
break;
}
break;
@@ -1812,17 +1812,17 @@ static void Cb_HandleWallpapers(u8 taskId)
static void Cb_JumpBox(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
PrintStorageActionText(PC_TEXT_JUMP_TO_WHICH_BOX);
- LoadBoxSelectionPopupSpriteGfx(&sPSSData->field_1E5C, TAG_TILE_A, TAG_PAL_DAC7, 3, FALSE);
+ LoadBoxSelectionPopupSpriteGfx(&gPSSData->field_1E5C, TAG_TILE_A, TAG_PAL_DAC7, 3, FALSE);
sub_808C940(StorageGetCurrentBox());
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
- sPSSData->newCurrBoxId = HandleBoxChooseSelectionInput();
- switch (sPSSData->newCurrBoxId)
+ gPSSData->newCurrBoxId = HandleBoxChooseSelectionInput();
+ switch (gPSSData->newCurrBoxId)
{
case 200:
break;
@@ -1830,26 +1830,26 @@ static void Cb_JumpBox(u8 taskId)
ClearBottomWindow();
sub_808C950();
FreeBoxSelectionPopupSpriteGfx();
- if (sPSSData->newCurrBoxId == 201 || sPSSData->newCurrBoxId == StorageGetCurrentBox())
+ if (gPSSData->newCurrBoxId == 201 || gPSSData->newCurrBoxId == StorageGetCurrentBox())
{
sub_80920FC(TRUE);
SetPSSCallback(Cb_MainPSS);
}
else
{
- sPSSData->state++;
+ gPSSData->state++;
}
break;
}
break;
case 2:
- SetUpScrollToBox(sPSSData->newCurrBoxId);
- sPSSData->state++;
+ SetUpScrollToBox(gPSSData->newCurrBoxId);
+ gPSSData->state++;
break;
case 3:
if (!ScrollToBox())
{
- SetCurrentBox(sPSSData->newCurrBoxId);
+ SetCurrentBox(gPSSData->newCurrBoxId);
SetPSSCallback(Cb_MainPSS);
}
break;
@@ -1858,18 +1858,18 @@ static void Cb_JumpBox(u8 taskId)
static void Cb_NameBox(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
sub_8093630();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!UpdatePaletteFade())
{
sWhichToReshow = 1;
- sPSSData->screenChangeType = SCREEN_CHANGE_NAME_BOX;
+ gPSSData->screenChangeType = SCREEN_CHANGE_NAME_BOX;
SetPSSCallback(Cb_ChangeScreen);
}
break;
@@ -1878,18 +1878,18 @@ static void Cb_NameBox(u8 taskId)
static void Cb_ShowMonSummary(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
sub_80936B8();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!UpdatePaletteFade())
{
sWhichToReshow = 0;
- sPSSData->screenChangeType = SCREEN_CHANGE_SUMMARY_SCREEN;
+ gPSSData->screenChangeType = SCREEN_CHANGE_SUMMARY_SCREEN;
SetPSSCallback(Cb_ChangeScreen);
}
break;
@@ -1898,17 +1898,17 @@ static void Cb_ShowMonSummary(u8 taskId)
static void Cb_GiveItemFromBag(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
- sPSSData->state++;
+ gPSSData->state++;
break;
case 1:
if (!UpdatePaletteFade())
{
sWhichToReshow = 2;
- sPSSData->screenChangeType = SCREEN_CHANGE_ITEM_FROM_BAG;
+ gPSSData->screenChangeType = SCREEN_CHANGE_ITEM_FROM_BAG;
SetPSSCallback(Cb_ChangeScreen);
}
break;
@@ -1917,14 +1917,14 @@ static void Cb_GiveItemFromBag(u8 taskId)
static void Cb_OnCloseBoxPressed(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
if (IsMonBeingMoved())
{
PlaySE(SE_HAZURE);
PrintStorageActionText(PC_TEXT_HOLDING_POKE);
- sPSSData->state = 1;
+ gPSSData->state = 1;
}
else if (IsActiveItemMoving())
{
@@ -1935,7 +1935,7 @@ static void Cb_OnCloseBoxPressed(u8 taskId)
PlaySE(SE_SELECT);
PrintStorageActionText(PC_TEXT_EXIT_BOX);
ShowYesNoWindow(0);
- sPSSData->state = 2;
+ gPSSData->state = 2;
}
break;
case 1:
@@ -1956,20 +1956,20 @@ static void Cb_OnCloseBoxPressed(u8 taskId)
case 0:
PlaySE(SE_PC_OFF);
ClearBottomWindow();
- sPSSData->state++;
+ gPSSData->state++;
break;
}
break;
case 3:
- sub_80A0A70(0x14, 0, 1);
- sPSSData->state++;
+ BeginPCScreenEffect_TurnOff(20, 0, 1);
+ gPSSData->state++;
break;
case 4:
- if (!sub_80A0AAC())
+ if (!IsPCScreenEffectRunning_TurnOff())
{
sub_808FF70();
gPlayerPartyCount = CalculatePlayerPartyCount();
- sPSSData->screenChangeType = SCREEN_CHANGE_EXIT_BOX;
+ gPSSData->screenChangeType = SCREEN_CHANGE_EXIT_BOX;
SetPSSCallback(Cb_ChangeScreen);
}
break;
@@ -1978,14 +1978,14 @@ static void Cb_OnCloseBoxPressed(u8 taskId)
static void Cb_OnBPressed(u8 taskId)
{
- switch (sPSSData->state)
+ switch (gPSSData->state)
{
case 0:
if (IsMonBeingMoved())
{
PlaySE(SE_HAZURE);
PrintStorageActionText(PC_TEXT_HOLDING_POKE);
- sPSSData->state = 1;
+ gPSSData->state = 1;
}
else if (IsActiveItemMoving())
{
@@ -1996,7 +1996,7 @@ static void Cb_OnBPressed(u8 taskId)
PlaySE(SE_SELECT);
PrintStorageActionText(PC_TEXT_CONTINUE_BOX);
ShowYesNoWindow(0);
- sPSSData->state = 2;
+ gPSSData->state = 2;
}
break;
case 1:
@@ -2017,20 +2017,20 @@ static void Cb_OnBPressed(u8 taskId)
case MENU_B_PRESSED:
PlaySE(SE_PC_OFF);
ClearBottomWindow();
- sPSSData->state++;
+ gPSSData->state++;
break;
}
break;
case 3:
- sub_80A0A70(0x14, 0, 0);
- sPSSData->state++;
+ BeginPCScreenEffect_TurnOff(20, 0, 0);
+ gPSSData->state++;
break;
case 4:
- if (!sub_80A0AAC())
+ if (!IsPCScreenEffectRunning_TurnOff())
{
sub_808FF70();
gPlayerPartyCount = CalculatePlayerPartyCount();
- sPSSData->screenChangeType = SCREEN_CHANGE_EXIT_BOX;
+ gPSSData->screenChangeType = SCREEN_CHANGE_EXIT_BOX;
SetPSSCallback(Cb_ChangeScreen);
}
break;
@@ -2041,9 +2041,9 @@ static void Cb_ChangeScreen(u8 taskId)
{
struct Pokemon * partyMon;
u8 mode, monIndex, maxMonIndex;
- u8 screenChangeType = sPSSData->screenChangeType;
+ u8 screenChangeType = gPSSData->screenChangeType;
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS && IsActiveItemMoving() == TRUE)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS && IsActiveItemMoving() == TRUE)
gUnknown_20397BA = GetMovingItem();
else
gUnknown_20397BA = ITEM_NONE;
@@ -2056,10 +2056,10 @@ static void Cb_ChangeScreen(u8 taskId)
SetMainCallback2(Cb2_ExitPSS);
break;
case SCREEN_CHANGE_SUMMARY_SCREEN:
- partyMon = sPSSData->field_218C.mon;
- monIndex = sPSSData->field_2187;
- maxMonIndex = sPSSData->field_2186;
- mode = sPSSData->field_2188;
+ partyMon = gPSSData->field_218C.mon;
+ monIndex = gPSSData->field_2187;
+ maxMonIndex = gPSSData->field_2186;
+ mode = gPSSData->field_2188;
FreePSSData();
ShowPokemonSummaryScreen(partyMon, monIndex, maxMonIndex, Cb2_ReturnToPSS, mode);
break;
@@ -2080,7 +2080,7 @@ static void GiveChosenBagItem(void)
{
u16 item = gSpecialVar_ItemId;
- if (item != 0)
+ if (item != ITEM_NONE)
{
u8 id = GetBoxCursorPosition();
@@ -2097,7 +2097,7 @@ static void FreePSSData(void)
{
FreeBoxPartyPokemonDropdowns();
sub_80950A4();
- FREE_AND_SET_NULL(sPSSData);
+ FREE_AND_SET_NULL(gPSSData);
FreeAllWindowBuffers();
}
@@ -2108,8 +2108,8 @@ static void FreePSSData(void)
static void SetScrollingBackground(void)
{
SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_16COLOR | BGCNT_SCREENBASE(31));
- DecompressAndLoadBgGfxUsingHeap(3, gPokemonStorageScrollingBGTileset, 0, 0, 0);
- LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, (void *)BG_SCREEN_ADDR(31));
+ DecompressAndLoadBgGfxUsingHeap(3, sPokemonStorageScrollingBGTileset, 0, 0, 0);
+ LZ77UnCompVram(sPokemonStorageScrollingBGTilemap, (void *)BG_SCREEN_ADDR(31));
}
static void ScrollBackground(void)
@@ -2122,8 +2122,8 @@ static void LoadPSSMenuGfx(void)
{
InitBgsFromTemplates(0, gUnknown_83CEA50, NELEMS(gUnknown_83CEA50));
DecompressAndLoadBgGfxUsingHeap(1, gPSSMenu_Gfx, 0, 0, 0);
- LZ77UnCompWram(gUnknown_83CE5FC, sPSSData->field_5AC4);
- SetBgTilemapBuffer(1, sPSSData->field_5AC4);
+ LZ77UnCompWram(gUnknown_83CE5FC, gPSSData->field_5AC4);
+ SetBgTilemapBuffer(1, gPSSData->field_5AC4);
ShowBg(1);
ScheduleBgCopyTilemapToVram(1);
}
@@ -2143,7 +2143,7 @@ static bool8 InitPSSWindows(void)
static void LoadWaveformSpritePalette(void)
{
- LoadSpritePalette(&gWaveformSpritePalette);
+ LoadSpritePalette(&sWaveformSpritePalette);
}
static void sub_808F078(void)
@@ -2151,7 +2151,7 @@ static void sub_808F078(void)
LoadPalette(gUnknown_8E9C3F8, 0, 0x20);
LoadPalette(gUnknown_8E9C418, 0x20, 0x20);
LoadPalette(gUnknown_83CEA10, 0xF0, 0x20);
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
LoadPalette(gUnknown_83CE738, 0x30, 0x20);
else
LoadPalette(gUnknown_83CE758, 0x30, 0x20);
@@ -2165,30 +2165,30 @@ static void sub_808F078(void)
static void sub_808F0F4(void)
{
- sPSSData->field_D94 = CreateMonMarkingSprite_AllOff(TAG_TILE_10, TAG_PAL_DAC8, NULL);
- sPSSData->field_D94->oam.priority = 1;
- sPSSData->field_D94->subpriority = 1;
- sPSSData->field_D94->pos1.x = 40;
- sPSSData->field_D94->pos1.y = 150;
- sPSSData->field_DA0 = (void *)OBJ_VRAM0 + 32 * GetSpriteTileStartByTag(TAG_TILE_10);
+ gPSSData->field_D94 = CreateMonMarkingSprite_AllOff(TAG_TILE_10, TAG_PAL_DAC8, NULL);
+ gPSSData->field_D94->oam.priority = 1;
+ gPSSData->field_D94->subpriority = 1;
+ gPSSData->field_D94->pos1.x = 40;
+ gPSSData->field_D94->pos1.y = 150;
+ gPSSData->field_DA0 = (void *)OBJ_VRAM0 + 32 * GetSpriteTileStartByTag(TAG_TILE_10);
}
static void sub_808F164(void)
{
u16 i;
- struct SpriteSheet sheet = gWaveformSpriteSheet;
+ struct SpriteSheet sheet = sWaveformSpriteSheet;
LoadSpriteSheet(&sheet);
for (i = 0; i < 2; i++)
{
u8 spriteId = CreateSprite(&sSpriteTemplate_Waveform, i * 63 + 8, 9, 2);
- sPSSData->field_D98[i] = &gSprites[spriteId];
+ gPSSData->field_D98[i] = &gSprites[spriteId];
}
}
static void RefreshCursorMonData(void)
{
- LoadCursorMonGfx(sPSSData->cursorMonSpecies, sPSSData->cursorMonPersonality);
+ LoadCursorMonGfx(gPSSData->cursorMonSpecies, gPSSData->cursorMonPersonality);
PrintCursorMonInfo();
sub_808F5E8();
ScheduleBgCopyTilemapToVram(0);
@@ -2197,19 +2197,19 @@ static void RefreshCursorMonData(void)
static void BoxSetMosaic(void)
{
RefreshCursorMonData();
- if (sPSSData->cursorMonSprite)
+ if (gPSSData->cursorMonSprite)
{
- sPSSData->cursorMonSprite->oam.mosaic = TRUE;
- sPSSData->cursorMonSprite->data[0] = 10;
- sPSSData->cursorMonSprite->data[1] = 1;
- sPSSData->cursorMonSprite->callback = SpriteCB_CursorMon_Mosaic;
- SetGpuReg(REG_OFFSET_MOSAIC, (sPSSData->cursorMonSprite->data[0] << 12) | (sPSSData->cursorMonSprite->data[0] << 8));
+ gPSSData->cursorMonSprite->oam.mosaic = TRUE;
+ gPSSData->cursorMonSprite->data[0] = 10;
+ gPSSData->cursorMonSprite->data[1] = 1;
+ gPSSData->cursorMonSprite->callback = SpriteCB_CursorMon_Mosaic;
+ SetGpuReg(REG_OFFSET_MOSAIC, (gPSSData->cursorMonSprite->data[0] << 12) | (gPSSData->cursorMonSprite->data[0] << 8));
}
}
static u8 BoxGetMosaic(void)
{
- return sPSSData->cursorMonSprite->oam.mosaic;
+ return gPSSData->cursorMonSprite->oam.mosaic;
}
static void SpriteCB_CursorMon_Mosaic(struct Sprite *sprite)
@@ -2231,16 +2231,16 @@ static void LoadCursorMonSprite(void)
u16 tileStart;
u8 palSlot;
u8 spriteId;
- struct SpriteSheet sheet = {sPSSData->field_22C4, 0x800, TAG_TILE_2};
- struct SpritePalette palette = {sPSSData->field_2244, TAG_PAL_DAC6};
+ struct SpriteSheet sheet = {gPSSData->field_22C4, 0x800, TAG_TILE_2};
+ struct SpritePalette palette = {gPSSData->field_2244, TAG_PAL_DAC6};
struct SpriteTemplate template = sSpriteTemplate_CursorMon;
for (i = 0; i < 0x800; i++)
- sPSSData->field_22C4[i] = 0;
+ gPSSData->field_22C4[i] = 0;
for (i = 0; i < 0x10; i++)
- sPSSData->field_2244[i] = 0;
+ gPSSData->field_2244[i] = 0;
- sPSSData->cursorMonSprite = NULL;
+ gPSSData->cursorMonSprite = NULL;
do
{
@@ -2256,12 +2256,12 @@ static void LoadCursorMonSprite(void)
if (spriteId == MAX_SPRITES)
break;
- sPSSData->cursorMonSprite = &gSprites[spriteId];
- sPSSData->field_223A = palSlot * 16 + 0x100;
- sPSSData->field_223C = (void *)OBJ_VRAM0 + tileStart * 32;
+ gPSSData->cursorMonSprite = &gSprites[spriteId];
+ gPSSData->field_223A = palSlot * 16 + 0x100;
+ gPSSData->field_223C = (void *)OBJ_VRAM0 + tileStart * 32;
} while (0);
- if (sPSSData->cursorMonSprite == NULL)
+ if (gPSSData->cursorMonSprite == NULL)
{
FreeSpriteTilesByTag(TAG_TILE_2);
FreeSpritePaletteByTag(TAG_PAL_DAC6);
@@ -2270,20 +2270,20 @@ static void LoadCursorMonSprite(void)
static void LoadCursorMonGfx(u16 species, u32 pid)
{
- if (sPSSData->cursorMonSprite == NULL)
+ if (gPSSData->cursorMonSprite == NULL)
return;
if (species != SPECIES_NONE)
{
- HandleLoadSpecialPokePic(&gMonFrontPicTable[species], sPSSData->field_22C4, species, pid);
- LZ77UnCompWram(sPSSData->cursorMonPalette, sPSSData->field_2244);
- CpuCopy32(sPSSData->field_22C4, sPSSData->field_223C, 0x800);
- LoadPalette(sPSSData->field_2244, sPSSData->field_223A, 0x20);
- sPSSData->cursorMonSprite->invisible = FALSE;
+ HandleLoadSpecialPokePic(&gMonFrontPicTable[species], gPSSData->field_22C4, species, pid);
+ LZ77UnCompWram(gPSSData->cursorMonPalette, gPSSData->field_2244);
+ CpuCopy32(gPSSData->field_22C4, gPSSData->field_223C, 0x800);
+ LoadPalette(gPSSData->field_2244, gPSSData->field_223A, 0x20);
+ gPSSData->cursorMonSprite->invisible = FALSE;
}
else
{
- sPSSData->cursorMonSprite->invisible = TRUE;
+ gPSSData->cursorMonSprite->invisible = TRUE;
}
}
@@ -2292,32 +2292,32 @@ static void PrintCursorMonInfo(void)
u16 i;
u16 y;
FillWindowPixelBuffer(0, PIXEL_FILL(1));
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{
for (i = 0, y = 0; i < 3; i++, y += 14)
{
- AddTextPrinterParameterized(0, 2, sPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SPEED_FF, NULL);
+ AddTextPrinterParameterized(0, 2, gPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SPEED_FF, NULL);
}
- AddTextPrinterParameterized(0, 0, sPSSData->cursorMonTexts[3], 6, y + 2, TEXT_SPEED_FF, NULL);
+ AddTextPrinterParameterized(0, 0, gPSSData->cursorMonTexts[3], 6, y + 2, TEXT_SPEED_FF, NULL);
}
else
{
- AddTextPrinterParameterized(0, 0, sPSSData->cursorMonTexts[3], 6, 0, TEXT_SPEED_FF, NULL);
+ AddTextPrinterParameterized(0, 0, gPSSData->cursorMonTexts[3], 6, 0, TEXT_SPEED_FF, NULL);
for (i = 0, y = 15; i < 3; i++, y += 14)
{
- AddTextPrinterParameterized(0, 2, sPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SPEED_FF, NULL);
+ AddTextPrinterParameterized(0, 2, gPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SPEED_FF, NULL);
}
}
CopyWindowToVram(0, 2);
- if (sPSSData->cursorMonSpecies != SPECIES_NONE)
+ if (gPSSData->cursorMonSpecies != SPECIES_NONE)
{
- sub_80BEBD0(sPSSData->cursorMonMarkings, sPSSData->field_DA0);
- sPSSData->field_D94->invisible = FALSE;
+ sub_80BEBD0(gPSSData->cursorMonMarkings, gPSSData->field_DA0);
+ gPSSData->field_D94->invisible = FALSE;
}
else
{
- sPSSData->field_D94->invisible = TRUE;
+ gPSSData->field_D94->invisible = TRUE;
}
}
@@ -2325,17 +2325,17 @@ static void sub_808F5E8(void)
{
u16 i;
- if (sPSSData->cursorMonSpecies != SPECIES_NONE)
+ if (gPSSData->cursorMonSpecies != SPECIES_NONE)
{
SetBoxPartyPokemonDropdownMap2Rect(0, 0, 0, 8, 2);
for (i = 0; i < 2; i++)
- StartSpriteAnimIfDifferent(sPSSData->field_D98[i], i * 2 + 1);
+ StartSpriteAnimIfDifferent(gPSSData->field_D98[i], i * 2 + 1);
}
else
{
SetBoxPartyPokemonDropdownMap2Rect(0, 0, 2, 8, 2);
for (i = 0; i < 2; i++)
- StartSpriteAnim(sPSSData->field_D98[i], i * 2);
+ StartSpriteAnim(gPSSData->field_D98[i], i * 2);
}
CopyBoxPartyPokemonDropdownToBgTilemapBuffer(0);
@@ -2344,9 +2344,9 @@ static void sub_808F5E8(void)
static void sub_808F68C(void)
{
- LZ77UnCompWram(gUnknown_8E9CAEC, sPSSData->field_B0);
+ LZ77UnCompWram(gUnknown_8E9CAEC, gPSSData->field_B0);
LoadPalette(gPSSMenu_Pal, 0x10, 0x20);
- SetBoxPartyPokemonDropdownMap2(1, 1, sPSSData->field_B0, 12, 22);
+ SetBoxPartyPokemonDropdownMap2(1, 1, gPSSData->field_B0, 12, 22);
SetBoxPartyPokemonDropdownMap2(2, 1, gUnknown_83CE778, 9, 4);
SetBoxPartyPokemonDropdownMap2Pos(1, 10, 0);
SetBoxPartyPokemonDropdownMap2Pos(2, 21, 0);
@@ -2367,29 +2367,29 @@ static void sub_808F68C(void)
}
ScheduleBgCopyTilemapToVram(1);
- sPSSData->unk_02C7 = FALSE;
+ gPSSData->unk_02C7 = FALSE;
}
static void SetUpShowPartyMenu(void)
{
- sPSSData->field_2C0 = 20;
- sPSSData->field_2C2 = 2;
- sPSSData->field_2C5 = 0;
+ gPSSData->field_2C0 = 20;
+ gPSSData->field_2C2 = 2;
+ gPSSData->field_2C5 = 0;
CreatePartyMonsSprites(FALSE);
}
static bool8 ShowPartyMenu(void)
{
- if (sPSSData->field_2C5 == 20)
+ if (gPSSData->field_2C5 == 20)
return FALSE;
- sPSSData->field_2C0--;
- sPSSData->field_2C2++;
+ gPSSData->field_2C0--;
+ gPSSData->field_2C2++;
AdjustBoxPartyPokemonDropdownPos(1, 3, 1);
CopyBoxPartyPokemonDropdownToBgTilemapBuffer(1);
ScheduleBgCopyTilemapToVram(1);
sub_8090B98(8);
- if (++sPSSData->field_2C5 == 20)
+ if (++gPSSData->field_2C5 == 20)
{
sInPartyMenu = TRUE;
return FALSE;
@@ -2402,24 +2402,24 @@ static bool8 ShowPartyMenu(void)
static void SetUpHidePartyMenu(void)
{
- sPSSData->field_2C0 = 0;
- sPSSData->field_2C2 = 22;
- sPSSData->field_2C5 = 0;
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ gPSSData->field_2C0 = 0;
+ gPSSData->field_2C2 = 22;
+ gPSSData->field_2C5 = 0;
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
sub_80960C0();
}
static bool8 HidePartyMenu(void)
{
- if (sPSSData->field_2C5 != 20)
+ if (gPSSData->field_2C5 != 20)
{
- sPSSData->field_2C0++;
- sPSSData->field_2C2--;
+ gPSSData->field_2C0++;
+ gPSSData->field_2C2--;
AdjustBoxPartyPokemonDropdownPos(1, 3, -1);
CopyBoxPartyPokemonDropdownToBgTilemapBuffer(1);
- FillBgTilemapBufferRect_Palette0(1, 0x100, 10, sPSSData->field_2C2, 12, 1);
+ FillBgTilemapBufferRect_Palette0(1, 0x100, 10, gPSSData->field_2C2, 12, 1);
sub_8090B98(-8);
- if (++sPSSData->field_2C5 != 20)
+ if (++gPSSData->field_2C5 != 20)
{
ScheduleBgCopyTilemapToVram(1);
return TRUE;
@@ -2452,27 +2452,27 @@ static void sub_808F90C(bool8 arg0)
static void sub_808F948(void)
{
- sPSSData->unk_02C7 = TRUE;
- sPSSData->unk_02C8 = 30;
- sPSSData->unk_02C9 = TRUE;
+ gPSSData->unk_02C7 = TRUE;
+ gPSSData->unk_02C8 = 30;
+ gPSSData->unk_02C9 = TRUE;
}
static void sub_808F974(void)
{
- if (sPSSData->unk_02C7)
+ if (gPSSData->unk_02C7)
{
- sPSSData->unk_02C7 = FALSE;
+ gPSSData->unk_02C7 = FALSE;
sub_808F90C(TRUE);
}
}
static void sub_808F99C(void)
{
- if (sPSSData->unk_02C7 && ++sPSSData->unk_02C8 > 30)
+ if (gPSSData->unk_02C7 && ++gPSSData->unk_02C8 > 30)
{
- sPSSData->unk_02C8 = 0;
- sPSSData->unk_02C9 = (sPSSData->unk_02C9 == FALSE);
- sub_808F90C(sPSSData->unk_02C9);
+ gPSSData->unk_02C8 = 0;
+ gPSSData->unk_02C9 = (gPSSData->unk_02C9 == FALSE);
+ sub_808F90C(gPSSData->unk_02C9);
}
}
@@ -2504,7 +2504,7 @@ static void sub_808FA30(u8 pos, bool8 isPartyMon)
{
for (j = 0; j < 4; j++)
{
- sPSSData->field_B0[index + j] = data[j];
+ gPSSData->field_B0[index + j] = data[j];
}
data += 4;
index += 12;
@@ -2521,28 +2521,28 @@ static void sub_808FAA8(void)
static void SetUpDoShowPartyMenu(void)
{
- sPSSData->showPartyMenuState = 0;
+ gPSSData->showPartyMenuState = 0;
PlaySE(SE_WIN_OPEN);
SetUpShowPartyMenu();
}
static bool8 DoShowPartyMenu(void)
{
- switch (sPSSData->showPartyMenuState)
+ switch (gPSSData->showPartyMenuState)
{
case 0:
if (!ShowPartyMenu())
{
sub_8092AE4();
- sPSSData->showPartyMenuState++;
+ gPSSData->showPartyMenuState++;
}
break;
case 1:
if (!sub_80924A8())
{
- if (sPSSData->setMosaic)
+ if (gPSSData->setMosaic)
BoxSetMosaic();
- sPSSData->showPartyMenuState++;
+ gPSSData->showPartyMenuState++;
}
break;
case 2:
@@ -2564,37 +2564,37 @@ static void PrintStorageActionText(u8 id)
u8 *txtPtr;
DynamicPlaceholderTextUtil_Reset();
- switch (gPCStorageActionTexts[id].format)
+ switch (sPCStorageActionTexts[id].format)
{
case PC_TEXT_FMT_NORMAL:
break;
case PC_TEXT_FMT_MON_NAME_1:
case PC_TEXT_FMT_MON_NAME_2:
case PC_TEXT_FMT_MON_NAME_3:
- DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPSSData->cursorMonNick);
+ DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gPSSData->cursorMonNick);
break;
case PC_TEXT_FMT_MON_NAME_4:
case PC_TEXT_FMT_MON_NAME_5:
case PC_TEXT_FMT_MON_NAME_6:
- DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPSSData->field_21E0);
+ DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gPSSData->field_21E0);
break;
case PC_TEXT_FMT_ITEM_NAME:
if (IsActiveItemMoving())
- txtPtr = StringCopy(sPSSData->itemName, GetMovingItemName());
+ txtPtr = StringCopy(gPSSData->itemName, GetMovingItemName());
else
- txtPtr = StringCopy(sPSSData->itemName, sPSSData->cursorMonTexts[3]);
+ txtPtr = StringCopy(gPSSData->itemName, gPSSData->cursorMonTexts[3]);
while (*(txtPtr - 1) == CHAR_SPACE)
txtPtr--;
*txtPtr = EOS;
- DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPSSData->itemName);
+ DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gPSSData->itemName);
break;
}
- DynamicPlaceholderTextUtil_ExpandPlaceholders(sPSSData->field_2190, gPCStorageActionTexts[id].text);
+ DynamicPlaceholderTextUtil_ExpandPlaceholders(gPSSData->field_2190, sPCStorageActionTexts[id].text);
FillWindowPixelBuffer(1, PIXEL_FILL(1));
- AddTextPrinterParameterized(1, 1, sPSSData->field_2190, 0, 2, TEXT_SPEED_FF, NULL);
+ AddTextPrinterParameterized(1, 1, gPSSData->field_2190, 0, 2, TEXT_SPEED_FF, NULL);
DrawTextBorderOuter(1, 2, 13);
PutWindowTilemap(1);
CopyWindowToVram(1, 2);
@@ -2682,7 +2682,7 @@ static void sub_808FE54(u8 action)
{
u16 event;
u8 fromBox = sub_8094D34();
- u16 species = sPSSData->cursorMonSpecies;
+ u16 species = gPSSData->cursorMonSpecies;
u16 species2;
u8 toBox;
struct PssQuestLogBuffer * qlogBuffer;
@@ -2696,7 +2696,7 @@ static void sub_808FE54(u8 action)
toBox = StorageGetCurrentBox();
species2 = GetCurrentBoxMonData(GetBoxCursorPosition(), MON_DATA_SPECIES2);
}
- qlogBuffer = &sPSSData->qlogBuffer;
+ qlogBuffer = &gPSSData->qlogBuffer;
switch (action)
{
diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c
index 05226838e..392d17574 100644
--- a/src/pokemon_storage_system_4.c
+++ b/src/pokemon_storage_system_4.c
@@ -150,7 +150,7 @@ static const u16 gUnknown_83D29D0[][2] = {
{RGB( 7, 7, 7), RGB(31, 31, 31)}
};
-static const struct WallpaperTable gWallpaperTable[] = {
+static const struct WallpaperTable sWallpaperTable[] = {
{gUnknown_83CEC80, gUnknown_83CF050, gUnknown_83CEC40},
{gUnknown_83CF16C, gUnknown_83CF374, gUnknown_83CF12C},
{gUnknown_83CF464, gUnknown_83CF750, gUnknown_83CF424},
@@ -262,16 +262,16 @@ void sub_808FFAC(void)
LoadMonIconPalettes();
for (i = 0; i < MAX_MON_ICONS; i++)
- sPSSData->field_B08[i] = 0;
+ gPSSData->field_B08[i] = 0;
for (i = 0; i < MAX_MON_ICONS; i++)
- sPSSData->field_B58[i] = 0;
+ gPSSData->field_B58[i] = 0;
for (i = 0; i < PARTY_SIZE; i++)
- sPSSData->partySprites[i] = NULL;
+ gPSSData->partySprites[i] = NULL;
for (i = 0; i < IN_BOX_COUNT; i++)
- sPSSData->boxMonsSprites[i] = NULL;
+ gPSSData->boxMonsSprites[i] = NULL;
- sPSSData->movingMonSprite = NULL;
- sPSSData->field_78C = 0;
+ gPSSData->movingMonSprite = NULL;
+ gPSSData->field_78C = 0;
}
static u8 sub_8090058(void)
@@ -281,12 +281,12 @@ static u8 sub_8090058(void)
void CreateMovingMonIcon(void)
{
- u32 personality = GetMonData(&sPSSData->movingMon, MON_DATA_PERSONALITY);
- u16 species = GetMonData(&sPSSData->movingMon, MON_DATA_SPECIES2);
+ u32 personality = GetMonData(&gPSSData->movingMon, MON_DATA_PERSONALITY);
+ u16 species = GetMonData(&gPSSData->movingMon, MON_DATA_SPECIES2);
u8 priority = sub_8090058();
- sPSSData->movingMonSprite = CreateMonIconSprite(species, personality, 0, 0, priority, 7);
- sPSSData->movingMonSprite->callback = sub_80911B0;
+ gPSSData->movingMonSprite = CreateMonIconSprite(species, personality, 0, 0, priority, 7);
+ gPSSData->movingMonSprite->callback = sub_80911B0;
}
static void sub_80900D4(u8 boxId)
@@ -306,23 +306,23 @@ static void sub_80900D4(u8 boxId)
if (species != SPECIES_NONE)
{
personality = GetBoxMonDataAt(boxId, boxPosition, MON_DATA_PERSONALITY);
- sPSSData->boxMonsSprites[count] = CreateMonIconSprite(species, personality, 8 * (3 * j) + 100, 8 * (3 * i) + 44, 2, 19 - j);
+ gPSSData->boxMonsSprites[count] = CreateMonIconSprite(species, personality, 8 * (3 * j) + 100, 8 * (3 * i) + 44, 2, 19 - j);
}
else
{
- sPSSData->boxMonsSprites[count] = NULL;
+ gPSSData->boxMonsSprites[count] = NULL;
}
boxPosition++;
count++;
}
}
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
{
for (boxPosition = 0; boxPosition < IN_BOX_COUNT; boxPosition++)
{
if (GetBoxMonDataAt(boxId, boxPosition, MON_DATA_HELD_ITEM) == 0)
- sPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND;
+ gPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND;
}
}
}
@@ -337,9 +337,9 @@ void sub_80901EC(u8 boxPosition)
s16 y = 8 * (3 * (boxPosition / IN_BOX_ROWS)) + 44;
u32 personality = GetCurrentBoxMonData(boxPosition, MON_DATA_PERSONALITY);
- sPSSData->boxMonsSprites[boxPosition] = CreateMonIconSprite(species, personality, x, y, 2, 19 - (boxPosition % IN_BOX_ROWS));
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
- sPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND;
+ gPSSData->boxMonsSprites[boxPosition] = CreateMonIconSprite(species, personality, x, y, 2, 19 - (boxPosition % IN_BOX_ROWS));
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ gPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND;
}
}
@@ -349,11 +349,11 @@ static void sub_809029C(s16 arg0)
for (i = 0; i < IN_BOX_COUNT; i++)
{
- if (sPSSData->boxMonsSprites[i] != NULL)
+ if (gPSSData->boxMonsSprites[i] != NULL)
{
- sPSSData->boxMonsSprites[i]->data[2] = arg0;
- sPSSData->boxMonsSprites[i]->data[4] = 1;
- sPSSData->boxMonsSprites[i]->callback = sub_8090324;
+ gPSSData->boxMonsSprites[i]->data[2] = arg0;
+ gPSSData->boxMonsSprites[i]->data[4] = 1;
+ gPSSData->boxMonsSprites[i]->callback = sub_8090324;
}
}
}
@@ -367,7 +367,7 @@ static void sub_80902E0(struct Sprite *sprite)
}
else
{
- sPSSData->field_C66--;
+ gPSSData->field_C66--;
sprite->pos1.x = sprite->data[3];
sprite->callback = SpriteCallbackDummy;
}
@@ -395,10 +395,10 @@ static void DestroyAllIconsInRow(u8 row)
for (column = 0; column < IN_BOX_COLUMNS; column++)
{
- if (sPSSData->boxMonsSprites[boxPosition] != NULL)
+ if (gPSSData->boxMonsSprites[boxPosition] != NULL)
{
- DestroyBoxMonIcon(sPSSData->boxMonsSprites[boxPosition]);
- sPSSData->boxMonsSprites[boxPosition] = NULL;
+ DestroyBoxMonIcon(gPSSData->boxMonsSprites[boxPosition]);
+ gPSSData->boxMonsSprites[boxPosition] = NULL;
}
boxPosition += IN_BOX_ROWS;
}
@@ -414,21 +414,21 @@ static u8 sub_80903A4(u8 row, u16 times, s16 xDelta)
u8 count = 0;
u8 boxPosition = row;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{
for (i = 0; i < IN_BOX_COLUMNS; i++)
{
- if (sPSSData->boxSpecies[boxPosition] != SPECIES_NONE)
+ if (gPSSData->boxSpecies[boxPosition] != SPECIES_NONE)
{
- sPSSData->boxMonsSprites[boxPosition] = CreateMonIconSprite(sPSSData->boxSpecies[boxPosition],
- sPSSData->boxPersonalities[boxPosition],
+ gPSSData->boxMonsSprites[boxPosition] = CreateMonIconSprite(gPSSData->boxSpecies[boxPosition],
+ gPSSData->boxPersonalities[boxPosition],
x, y, 2, subpriority);
- if (sPSSData->boxMonsSprites[boxPosition] != NULL)
+ if (gPSSData->boxMonsSprites[boxPosition] != NULL)
{
- sPSSData->boxMonsSprites[boxPosition]->data[1] = times;
- sPSSData->boxMonsSprites[boxPosition]->data[2] = xDelta;
- sPSSData->boxMonsSprites[boxPosition]->data[3] = xDest;
- sPSSData->boxMonsSprites[boxPosition]->callback = sub_80902E0;
+ gPSSData->boxMonsSprites[boxPosition]->data[1] = times;
+ gPSSData->boxMonsSprites[boxPosition]->data[2] = xDelta;
+ gPSSData->boxMonsSprites[boxPosition]->data[3] = xDest;
+ gPSSData->boxMonsSprites[boxPosition]->callback = sub_80902E0;
count++;
}
}
@@ -440,19 +440,19 @@ static u8 sub_80903A4(u8 row, u16 times, s16 xDelta)
{
for (i = 0; i < IN_BOX_COLUMNS; i++)
{
- if (sPSSData->boxSpecies[boxPosition] != SPECIES_NONE)
+ if (gPSSData->boxSpecies[boxPosition] != SPECIES_NONE)
{
- sPSSData->boxMonsSprites[boxPosition] = CreateMonIconSprite(sPSSData->boxSpecies[boxPosition],
- sPSSData->boxPersonalities[boxPosition],
+ gPSSData->boxMonsSprites[boxPosition] = CreateMonIconSprite(gPSSData->boxSpecies[boxPosition],
+ gPSSData->boxPersonalities[boxPosition],
x, y, 2, subpriority);
- if (sPSSData->boxMonsSprites[boxPosition] != NULL)
+ if (gPSSData->boxMonsSprites[boxPosition] != NULL)
{
- sPSSData->boxMonsSprites[boxPosition]->data[1] = times;
- sPSSData->boxMonsSprites[boxPosition]->data[2] = xDelta;
- sPSSData->boxMonsSprites[boxPosition]->data[3] = xDest;
- sPSSData->boxMonsSprites[boxPosition]->callback = sub_80902E0;
- if (GetBoxMonDataAt(sPSSData->field_C5C, boxPosition, MON_DATA_HELD_ITEM) == 0)
- sPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND;
+ gPSSData->boxMonsSprites[boxPosition]->data[1] = times;
+ gPSSData->boxMonsSprites[boxPosition]->data[2] = xDelta;
+ gPSSData->boxMonsSprites[boxPosition]->data[3] = xDest;
+ gPSSData->boxMonsSprites[boxPosition]->callback = sub_80902E0;
+ if (GetBoxMonDataAt(gPSSData->field_C5C, boxPosition, MON_DATA_HELD_ITEM) == 0)
+ gPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND;
count++;
}
}
@@ -466,56 +466,56 @@ static u8 sub_80903A4(u8 row, u16 times, s16 xDelta)
static void sub_8090574(u8 boxId, s8 direction)
{
- sPSSData->field_C6A = 0;
- sPSSData->field_C6B = boxId;
- sPSSData->field_C69 = direction;
- sPSSData->field_C60 = 32;
- sPSSData->field_C64 = -(6 * direction);
- sPSSData->field_C66 = 0;
+ gPSSData->field_C6A = 0;
+ gPSSData->field_C6B = boxId;
+ gPSSData->field_C69 = direction;
+ gPSSData->field_C60 = 32;
+ gPSSData->field_C64 = -(6 * direction);
+ gPSSData->field_C66 = 0;
SetBoxSpeciesAndPersonalities(boxId);
if (direction > 0)
- sPSSData->field_C68 = 0;
+ gPSSData->field_C68 = 0;
else
- sPSSData->field_C68 = IN_BOX_ROWS - 1;
+ gPSSData->field_C68 = IN_BOX_ROWS - 1;
- sPSSData->field_C62 = (24 * sPSSData->field_C68) + 100;
- sub_809029C(sPSSData->field_C64);
+ gPSSData->field_C62 = (24 * gPSSData->field_C68) + 100;
+ sub_809029C(gPSSData->field_C64);
}
static bool8 sub_809062C(void)
{
- if (sPSSData->field_C60 != 0)
- sPSSData->field_C60--;
+ if (gPSSData->field_C60 != 0)
+ gPSSData->field_C60--;
- switch (sPSSData->field_C6A)
+ switch (gPSSData->field_C6A)
{
case 0:
- sPSSData->field_C62 += sPSSData->field_C64;
- if (sPSSData->field_C62 <= 64 || sPSSData->field_C62 >= 252)
+ gPSSData->field_C62 += gPSSData->field_C64;
+ if (gPSSData->field_C62 <= 64 || gPSSData->field_C62 >= 252)
{
- DestroyAllIconsInRow(sPSSData->field_C68);
- sPSSData->field_C62 += sPSSData->field_C69 * 24;
- sPSSData->field_C6A++;
+ DestroyAllIconsInRow(gPSSData->field_C68);
+ gPSSData->field_C62 += gPSSData->field_C69 * 24;
+ gPSSData->field_C6A++;
}
break;
case 1:
- sPSSData->field_C62 += sPSSData->field_C64;
- sPSSData->field_C66 += sub_80903A4(sPSSData->field_C68, sPSSData->field_C60, sPSSData->field_C64);
- if ((sPSSData->field_C69 > 0 && sPSSData->field_C68 == IN_BOX_ROWS - 1)
- || (sPSSData->field_C69 < 0 && sPSSData->field_C68 == 0))
+ gPSSData->field_C62 += gPSSData->field_C64;
+ gPSSData->field_C66 += sub_80903A4(gPSSData->field_C68, gPSSData->field_C60, gPSSData->field_C64);
+ if ((gPSSData->field_C69 > 0 && gPSSData->field_C68 == IN_BOX_ROWS - 1)
+ || (gPSSData->field_C69 < 0 && gPSSData->field_C68 == 0))
{
- sPSSData->field_C6A++;
+ gPSSData->field_C6A++;
}
else
{
- sPSSData->field_C68 += sPSSData->field_C69;
- sPSSData->field_C6A = 0;
+ gPSSData->field_C68 += gPSSData->field_C69;
+ gPSSData->field_C6A = 0;
}
break;
case 2:
- if (sPSSData->field_C66 == 0)
+ if (gPSSData->field_C66 == 0)
{
- sPSSData->field_C60++;
+ gPSSData->field_C60++;
return FALSE;
}
break;
@@ -535,30 +535,30 @@ static void SetBoxSpeciesAndPersonalities(u8 boxId)
{
for (j = 0; j < IN_BOX_ROWS; j++)
{
- sPSSData->boxSpecies[boxPosition] = GetBoxMonDataAt(boxId, boxPosition, MON_DATA_SPECIES2);
- if (sPSSData->boxSpecies[boxPosition] != SPECIES_NONE)
- sPSSData->boxPersonalities[boxPosition] = GetBoxMonDataAt(boxId, boxPosition, MON_DATA_PERSONALITY);
+ gPSSData->boxSpecies[boxPosition] = GetBoxMonDataAt(boxId, boxPosition, MON_DATA_SPECIES2);
+ if (gPSSData->boxSpecies[boxPosition] != SPECIES_NONE)
+ gPSSData->boxPersonalities[boxPosition] = GetBoxMonDataAt(boxId, boxPosition, MON_DATA_PERSONALITY);
boxPosition++;
}
}
- sPSSData->field_C5C = boxId;
+ gPSSData->field_C5C = boxId;
}
void DestroyBoxMonIconAtPosition(u8 boxPosition)
{
- if (sPSSData->boxMonsSprites[boxPosition] != NULL)
+ if (gPSSData->boxMonsSprites[boxPosition] != NULL)
{
- DestroyBoxMonIcon(sPSSData->boxMonsSprites[boxPosition]);
- sPSSData->boxMonsSprites[boxPosition] = NULL;
+ DestroyBoxMonIcon(gPSSData->boxMonsSprites[boxPosition]);
+ gPSSData->boxMonsSprites[boxPosition] = NULL;
}
}
void SetBoxMonIconObjMode(u8 boxPosition, u8 objMode)
{
- if (sPSSData->boxMonsSprites[boxPosition] != NULL)
+ if (gPSSData->boxMonsSprites[boxPosition] != NULL)
{
- sPSSData->boxMonsSprites[boxPosition]->oam.objMode = objMode;
+ gPSSData->boxMonsSprites[boxPosition]->oam.objMode = objMode;
}
}
@@ -568,7 +568,7 @@ void CreatePartyMonsSprites(bool8 arg0)
u16 species = GetMonData(&gPlayerParty[0], MON_DATA_SPECIES2);
u32 personality = GetMonData(&gPlayerParty[0], MON_DATA_PERSONALITY);
- sPSSData->partySprites[0] = CreateMonIconSprite(species, personality, 104, 64, 1, 12);
+ gPSSData->partySprites[0] = CreateMonIconSprite(species, personality, 104, 64, 1, 12);
count = 1;
for (i = 1; i < PARTY_SIZE; i++)
{
@@ -576,12 +576,12 @@ void CreatePartyMonsSprites(bool8 arg0)
if (species != SPECIES_NONE)
{
personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
- sPSSData->partySprites[i] = CreateMonIconSprite(species, personality, 152, 8 * (3 * (i - 1)) + 16, 1, 12);
+ gPSSData->partySprites[i] = CreateMonIconSprite(species, personality, 152, 8 * (3 * (i - 1)) + 16, 1, 12);
count++;
}
else
{
- sPSSData->partySprites[i] = NULL;
+ gPSSData->partySprites[i] = NULL;
}
}
@@ -589,17 +589,17 @@ void CreatePartyMonsSprites(bool8 arg0)
{
for (i = 0; i < count; i++)
{
- sPSSData->partySprites[i]->pos1.y -= 160;
- sPSSData->partySprites[i]->invisible = TRUE;
+ gPSSData->partySprites[i]->pos1.y -= 160;
+ gPSSData->partySprites[i]->invisible = TRUE;
}
}
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
{
for (i = 0; i < PARTY_SIZE; i++)
{
- if (sPSSData->partySprites[i] != NULL && GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) == 0)
- sPSSData->partySprites[i]->oam.objMode = ST_OAM_OBJ_BLEND;
+ if (gPSSData->partySprites[i] != NULL && GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) == 0)
+ gPSSData->partySprites[i]->oam.objMode = ST_OAM_OBJ_BLEND;
}
}
}
@@ -608,16 +608,16 @@ void sub_80909F4(void)
{
u16 i, count;
- sPSSData->field_C5E = 0;
+ gPSSData->field_C5E = 0;
for (i = 0, count = 0; i < PARTY_SIZE; i++)
{
- if (sPSSData->partySprites[i] != NULL)
+ if (gPSSData->partySprites[i] != NULL)
{
if (i != count)
{
- sub_8090A74(sPSSData->partySprites[i], count);
- sPSSData->partySprites[i] = NULL;
- sPSSData->field_C5E++;
+ sub_8090A74(gPSSData->partySprites[i], count);
+ gPSSData->partySprites[i] = NULL;
+ gPSSData->field_C5E++;
}
count++;
}
@@ -626,7 +626,7 @@ void sub_80909F4(void)
u8 sub_8090A60(void)
{
- return sPSSData->field_C5E;
+ return gPSSData->field_C5E;
}
static void sub_8090A74(struct Sprite *sprite, u16 partyId)
@@ -670,17 +670,17 @@ static void sub_8090AE0(struct Sprite *sprite)
sprite->pos1.y = 8 * (3 * (sprite->data[1] - 1)) + 16;
}
sprite->callback = SpriteCallbackDummy;
- sPSSData->partySprites[sprite->data[1]] = sprite;
- sPSSData->field_C5E--;
+ gPSSData->partySprites[sprite->data[1]] = sprite;
+ gPSSData->field_C5E--;
}
}
void DestroyMovingMonIcon(void)
{
- if (sPSSData->movingMonSprite != NULL)
+ if (gPSSData->movingMonSprite != NULL)
{
- DestroyBoxMonIcon(sPSSData->movingMonSprite);
- sPSSData->movingMonSprite = NULL;
+ DestroyBoxMonIcon(gPSSData->movingMonSprite);
+ gPSSData->movingMonSprite = NULL;
}
}
@@ -690,25 +690,25 @@ void sub_8090B98(s16 yDelta)
for (i = 0; i < PARTY_SIZE; i++)
{
- if (sPSSData->partySprites[i] != NULL)
+ if (gPSSData->partySprites[i] != NULL)
{
- sPSSData->partySprites[i]->pos1.y += yDelta;
- posY = sPSSData->partySprites[i]->pos1.y + sPSSData->partySprites[i]->pos2.y + sPSSData->partySprites[i]->centerToCornerVecY;
+ gPSSData->partySprites[i]->pos1.y += yDelta;
+ posY = gPSSData->partySprites[i]->pos1.y + gPSSData->partySprites[i]->pos2.y + gPSSData->partySprites[i]->centerToCornerVecY;
posY += 16;
if (posY > 192)
- sPSSData->partySprites[i]->invisible = TRUE;
+ gPSSData->partySprites[i]->invisible = TRUE;
else
- sPSSData->partySprites[i]->invisible = FALSE;
+ gPSSData->partySprites[i]->invisible = FALSE;
}
}
}
void DestroyPartyMonIcon(u8 partyId)
{
- if (sPSSData->partySprites[partyId] != NULL)
+ if (gPSSData->partySprites[partyId] != NULL)
{
- DestroyBoxMonIcon(sPSSData->partySprites[partyId]);
- sPSSData->partySprites[partyId] = NULL;
+ DestroyBoxMonIcon(gPSSData->partySprites[partyId]);
+ gPSSData->partySprites[partyId] = NULL;
}
}
@@ -718,19 +718,19 @@ void DestroyAllPartyMonIcons(void)
for (i = 0; i < PARTY_SIZE; i++)
{
- if (sPSSData->partySprites[i] != NULL)
+ if (gPSSData->partySprites[i] != NULL)
{
- DestroyBoxMonIcon(sPSSData->partySprites[i]);
- sPSSData->partySprites[i] = NULL;
+ DestroyBoxMonIcon(gPSSData->partySprites[i]);
+ gPSSData->partySprites[i] = NULL;
}
}
}
void SetPartyMonIconObjMode(u8 partyId, u8 objMode)
{
- if (sPSSData->partySprites[partyId] != NULL)
+ if (gPSSData->partySprites[partyId] != NULL)
{
- sPSSData->partySprites[partyId]->oam.objMode = objMode;
+ gPSSData->partySprites[partyId]->oam.objMode = objMode;
}
}
@@ -738,83 +738,83 @@ void sub_8090CC0(u8 mode, u8 id)
{
if (mode == MODE_PARTY)
{
- sPSSData->movingMonSprite = sPSSData->partySprites[id];
- sPSSData->partySprites[id] = NULL;
+ gPSSData->movingMonSprite = gPSSData->partySprites[id];
+ gPSSData->partySprites[id] = NULL;
}
else if (mode == MODE_BOX)
{
- sPSSData->movingMonSprite = sPSSData->boxMonsSprites[id];
- sPSSData->boxMonsSprites[id] = NULL;
+ gPSSData->movingMonSprite = gPSSData->boxMonsSprites[id];
+ gPSSData->boxMonsSprites[id] = NULL;
}
else
{
return;
}
- sPSSData->movingMonSprite->callback = sub_80911B0;
- sPSSData->movingMonSprite->oam.priority = sub_8090058();
- sPSSData->movingMonSprite->subpriority = 7;
+ gPSSData->movingMonSprite->callback = sub_80911B0;
+ gPSSData->movingMonSprite->oam.priority = sub_8090058();
+ gPSSData->movingMonSprite->subpriority = 7;
}
void sub_8090D58(u8 boxId, u8 position)
{
if (boxId == TOTAL_BOXES_COUNT) // party mon
{
- sPSSData->partySprites[position] = sPSSData->movingMonSprite;
- sPSSData->partySprites[position]->oam.priority = 1;
- sPSSData->partySprites[position]->subpriority = 12;
+ gPSSData->partySprites[position] = gPSSData->movingMonSprite;
+ gPSSData->partySprites[position]->oam.priority = 1;
+ gPSSData->partySprites[position]->subpriority = 12;
}
else
{
- sPSSData->boxMonsSprites[position] = sPSSData->movingMonSprite;
- sPSSData->boxMonsSprites[position]->oam.priority = 2;
- sPSSData->boxMonsSprites[position]->subpriority = 19 - (position % IN_BOX_ROWS);
+ gPSSData->boxMonsSprites[position] = gPSSData->movingMonSprite;
+ gPSSData->boxMonsSprites[position]->oam.priority = 2;
+ gPSSData->boxMonsSprites[position]->subpriority = 19 - (position % IN_BOX_ROWS);
}
- sPSSData->movingMonSprite->callback = SpriteCallbackDummy;
- sPSSData->movingMonSprite = NULL;
+ gPSSData->movingMonSprite->callback = SpriteCallbackDummy;
+ gPSSData->movingMonSprite = NULL;
}
void sub_8090E08(u8 boxId, u8 position)
{
if (boxId == TOTAL_BOXES_COUNT) // party mon
- sPSSData->field_B00 = &sPSSData->partySprites[position];
+ gPSSData->field_B00 = &gPSSData->partySprites[position];
else
- sPSSData->field_B00 = &sPSSData->boxMonsSprites[position];
+ gPSSData->field_B00 = &gPSSData->boxMonsSprites[position];
- sPSSData->movingMonSprite->callback = SpriteCallbackDummy;
- sPSSData->field_C5D = 0;
+ gPSSData->movingMonSprite->callback = SpriteCallbackDummy;
+ gPSSData->field_C5D = 0;
}
bool8 sub_8090E74(void)
{
- if (sPSSData->field_C5D == 16)
+ if (gPSSData->field_C5D == 16)
return FALSE;
- sPSSData->field_C5D++;
- if (sPSSData->field_C5D & 1)
+ gPSSData->field_C5D++;
+ if (gPSSData->field_C5D & 1)
{
- (*sPSSData->field_B00)->pos1.y--;
- sPSSData->movingMonSprite->pos1.y++;
+ (*gPSSData->field_B00)->pos1.y--;
+ gPSSData->movingMonSprite->pos1.y++;
}
- (*sPSSData->field_B00)->pos2.x = gSineTable[sPSSData->field_C5D * 8] / 16;
- sPSSData->movingMonSprite->pos2.x = -(gSineTable[sPSSData->field_C5D * 8] / 16);
- if (sPSSData->field_C5D == 8)
+ (*gPSSData->field_B00)->pos2.x = gSineTable[gPSSData->field_C5D * 8] / 16;
+ gPSSData->movingMonSprite->pos2.x = -(gSineTable[gPSSData->field_C5D * 8] / 16);
+ if (gPSSData->field_C5D == 8)
{
- sPSSData->movingMonSprite->oam.priority = (*sPSSData->field_B00)->oam.priority;
- sPSSData->movingMonSprite->subpriority = (*sPSSData->field_B00)->subpriority;
- (*sPSSData->field_B00)->oam.priority = sub_8090058();
- (*sPSSData->field_B00)->subpriority = 7;
+ gPSSData->movingMonSprite->oam.priority = (*gPSSData->field_B00)->oam.priority;
+ gPSSData->movingMonSprite->subpriority = (*gPSSData->field_B00)->subpriority;
+ (*gPSSData->field_B00)->oam.priority = sub_8090058();
+ (*gPSSData->field_B00)->subpriority = 7;
}
- if (sPSSData->field_C5D == 16)
+ if (gPSSData->field_C5D == 16)
{
- struct Sprite *sprite = sPSSData->movingMonSprite;
- sPSSData->movingMonSprite = (*sPSSData->field_B00);
- *sPSSData->field_B00 = sprite;
+ struct Sprite *sprite = gPSSData->movingMonSprite;
+ gPSSData->movingMonSprite = (*gPSSData->field_B00);
+ *gPSSData->field_B00 = sprite;
- sPSSData->movingMonSprite->callback = sub_80911B0;
- (*sPSSData->field_B00)->callback = SpriteCallbackDummy;
+ gPSSData->movingMonSprite->callback = sub_80911B0;
+ (*gPSSData->field_B00)->callback = SpriteCallbackDummy;
}
return TRUE;
@@ -825,77 +825,77 @@ void sub_8090FC4(u8 mode, u8 position)
switch (mode)
{
case MODE_PARTY:
- sPSSData->field_B04 = &sPSSData->partySprites[position];
+ gPSSData->field_B04 = &gPSSData->partySprites[position];
break;
case MODE_BOX:
- sPSSData->field_B04 = &sPSSData->boxMonsSprites[position];
+ gPSSData->field_B04 = &gPSSData->boxMonsSprites[position];
break;
case MODE_2:
- sPSSData->field_B04 = &sPSSData->movingMonSprite;
+ gPSSData->field_B04 = &gPSSData->movingMonSprite;
break;
default:
return;
}
- if (*sPSSData->field_B04 != NULL)
+ if (*gPSSData->field_B04 != NULL)
{
- InitSpriteAffineAnim(*sPSSData->field_B04);
- (*sPSSData->field_B04)->oam.affineMode = ST_OAM_AFFINE_NORMAL;
- (*sPSSData->field_B04)->affineAnims = gUnknown_83CEC38;
- StartSpriteAffineAnim(*sPSSData->field_B04, 0);
+ InitSpriteAffineAnim(*gPSSData->field_B04);
+ (*gPSSData->field_B04)->oam.affineMode = ST_OAM_AFFINE_NORMAL;
+ (*gPSSData->field_B04)->affineAnims = gUnknown_83CEC38;
+ StartSpriteAffineAnim(*gPSSData->field_B04, 0);
}
}
bool8 sub_8091084(void)
{
- if (*sPSSData->field_B04 == NULL || (*sPSSData->field_B04)->invisible)
+ if (*gPSSData->field_B04 == NULL || (*gPSSData->field_B04)->invisible)
return FALSE;
- if ((*sPSSData->field_B04)->affineAnimEnded)
- (*sPSSData->field_B04)->invisible = TRUE;
+ if ((*gPSSData->field_B04)->affineAnimEnded)
+ (*gPSSData->field_B04)->invisible = TRUE;
return TRUE;
}
void sub_80910CC(void)
{
- if (*sPSSData->field_B04 != NULL)
+ if (*gPSSData->field_B04 != NULL)
{
- FreeOamMatrix((*sPSSData->field_B04)->oam.matrixNum);
- DestroyBoxMonIcon(*sPSSData->field_B04);
- *sPSSData->field_B04 = NULL;
+ FreeOamMatrix((*gPSSData->field_B04)->oam.matrixNum);
+ DestroyBoxMonIcon(*gPSSData->field_B04);
+ *gPSSData->field_B04 = NULL;
}
}
void sub_8091114(void)
{
- if (*sPSSData->field_B04 != NULL)
+ if (*gPSSData->field_B04 != NULL)
{
- (*sPSSData->field_B04)->invisible = FALSE;
- StartSpriteAffineAnim(*sPSSData->field_B04, 1);
+ (*gPSSData->field_B04)->invisible = FALSE;
+ StartSpriteAffineAnim(*gPSSData->field_B04, 1);
}
}
bool8 sub_8091150(void)
{
- if (sPSSData->field_B04 == NULL)
+ if (gPSSData->field_B04 == NULL)
return FALSE;
- if ((*sPSSData->field_B04)->affineAnimEnded)
- sPSSData->field_B04 = NULL;
+ if ((*gPSSData->field_B04)->affineAnimEnded)
+ gPSSData->field_B04 = NULL;
return TRUE;
}
void SetMovingMonPriority(u8 priority)
{
- sPSSData->movingMonSprite->oam.priority = priority;
+ gPSSData->movingMonSprite->oam.priority = priority;
}
static void sub_80911B0(struct Sprite *sprite)
{
- sprite->pos1.x = sPSSData->field_CB4->pos1.x;
- sprite->pos1.y = sPSSData->field_CB4->pos1.y + sPSSData->field_CB4->pos2.y + 4;
+ sprite->pos1.x = gPSSData->field_CB4->pos1.x;
+ sprite->pos1.y = gPSSData->field_CB4->pos1.y + gPSSData->field_CB4->pos2.y + 4;
}
static u16 sub_80911D4(u16 species)
@@ -905,7 +905,7 @@ static u16 sub_80911D4(u16 species)
// Find the currently-allocated slot
for (i = 0; i < MAX_MON_ICONS; i++)
{
- if (sPSSData->field_B58[i] == species)
+ if (gPSSData->field_B58[i] == species)
break;
}
@@ -914,15 +914,15 @@ static u16 sub_80911D4(u16 species)
// Find the first empty slot
for (i = 0; i < MAX_MON_ICONS; i++)
{
- if (sPSSData->field_B58[i] == SPECIES_NONE)
+ if (gPSSData->field_B58[i] == SPECIES_NONE)
break;
}
if (i == MAX_MON_ICONS)
return 0xFFFF;
}
- sPSSData->field_B58[i] = species;
- sPSSData->field_B08[i]++;
+ gPSSData->field_B58[i] = species;
+ gPSSData->field_B08[i]++;
var = 16 * i;
CpuCopy32(GetMonIconTiles(species, TRUE), (void*)(OBJ_VRAM0) + var * 32, 0x200);
@@ -935,10 +935,10 @@ static void sub_8091290(u16 species)
for (i = 0; i < MAX_MON_ICONS; i++)
{
- if (sPSSData->field_B58[i] == species)
+ if (gPSSData->field_B58[i] == species)
{
- if (--sPSSData->field_B08[i] == 0)
- sPSSData->field_B58[i] = 0;
+ if (--gPSSData->field_B08[i] == 0)
+ gPSSData->field_B58[i] = 0;
break;
}
}
@@ -994,15 +994,15 @@ static void sub_8091420(u8 taskId)
switch (task->data[0])
{
case 0:
- sPSSData->field_2D2 = 0;
- sPSSData->bg2_X = 0;
- task->data[1] = RequestDma3Fill(0, sPSSData->field_4AC4, 0x1000, 1);
+ gPSSData->field_2D2 = 0;
+ gPSSData->bg2_X = 0;
+ task->data[1] = RequestDma3Fill(0, gPSSData->field_4AC4, 0x1000, 1);
break;
case 1:
if (CheckForSpaceForDma3Request(task->data[1]) == -1)
return;
- SetBgTilemapBuffer(2, sPSSData->field_4AC4);
+ SetBgTilemapBuffer(2, gPSSData->field_4AC4);
ShowBg(2);
break;
case 2:
@@ -1032,44 +1032,44 @@ void SetUpScrollToBox(u8 boxId)
{
s8 direction = sub_80916F4(boxId);
- sPSSData->field_2CE = (direction > 0) ? 6 : -6;
- sPSSData->field_2D3 = (direction > 0) ? 1 : 2;
- sPSSData->field_2D0 = 32;
- sPSSData->field_2D4 = boxId;
- sPSSData->field_2D6 = (direction <= 0) ? 5 : 0;
- sPSSData->field_2D8 = direction;
- sPSSData->field_2DA = (direction > 0) ? 264 : 56;
- sPSSData->field_2DC = (direction <= 0) ? 5 : 0;
- sPSSData->field_2DE = 0;
- sPSSData->field_2E0 = 2;
- sPSSData->field_A64 = boxId;
- sPSSData->field_A65 = direction;
- sPSSData->field_A63 = 0;
+ gPSSData->field_2CE = (direction > 0) ? 6 : -6;
+ gPSSData->field_2D3 = (direction > 0) ? 1 : 2;
+ gPSSData->field_2D0 = 32;
+ gPSSData->field_2D4 = boxId;
+ gPSSData->field_2D6 = (direction <= 0) ? 5 : 0;
+ gPSSData->field_2D8 = direction;
+ gPSSData->field_2DA = (direction > 0) ? 264 : 56;
+ gPSSData->field_2DC = (direction <= 0) ? 5 : 0;
+ gPSSData->field_2DE = 0;
+ gPSSData->field_2E0 = 2;
+ gPSSData->field_A64 = boxId;
+ gPSSData->field_A65 = direction;
+ gPSSData->field_A63 = 0;
}
bool8 ScrollToBox(void)
{
bool8 var;
- switch (sPSSData->field_A63)
+ switch (gPSSData->field_A63)
{
case 0:
- LoadWallpaperGfx(sPSSData->field_A64, sPSSData->field_A65);
- sPSSData->field_A63++;
+ LoadWallpaperGfx(gPSSData->field_A64, gPSSData->field_A65);
+ gPSSData->field_A63++;
case 1:
if (!WaitForWallpaperGfxLoad())
return TRUE;
- sub_8090574(sPSSData->field_A64, sPSSData->field_A65);
- sub_8091C48(sPSSData->field_A64, sPSSData->field_A65);
- sub_809200C(sPSSData->field_A65);
+ sub_8090574(gPSSData->field_A64, gPSSData->field_A65);
+ sub_8091C48(gPSSData->field_A64, gPSSData->field_A65);
+ sub_809200C(gPSSData->field_A65);
break;
case 2:
var = sub_809062C();
- if (sPSSData->field_2D0 != 0)
+ if (gPSSData->field_2D0 != 0)
{
- sPSSData->bg2_X += sPSSData->field_2CE;
- if (--sPSSData->field_2D0 != 0)
+ gPSSData->bg2_X += gPSSData->field_2CE;
+ if (--gPSSData->field_2D0 != 0)
return TRUE;
sub_8091E34();
sub_80920AC();
@@ -1077,7 +1077,7 @@ bool8 ScrollToBox(void)
return var;
}
- sPSSData->field_A63++;
+ gPSSData->field_A63++;
return TRUE;
}
@@ -1100,36 +1100,36 @@ void SetWallpaperForCurrentBox(u8 wallpaperId)
{
u8 boxId = StorageGetCurrentBox();
SetBoxWallpaper(boxId, wallpaperId);
- sPSSData->wallpaperChangeState = 0;
+ gPSSData->wallpaperChangeState = 0;
}
bool8 DoWallpaperGfxChange(void)
{
- switch (sPSSData->wallpaperChangeState)
+ switch (gPSSData->wallpaperChangeState)
{
case 0:
- BeginNormalPaletteFade(sPSSData->field_738, 1, 0, 16, RGB_WHITEALPHA);
- sPSSData->wallpaperChangeState++;
+ BeginNormalPaletteFade(gPSSData->field_738, 1, 0, 16, RGB_WHITEALPHA);
+ gPSSData->wallpaperChangeState++;
break;
case 1:
if (!UpdatePaletteFade())
{
u8 curBox = StorageGetCurrentBox();
LoadWallpaperGfx(curBox, 0);
- sPSSData->wallpaperChangeState++;
+ gPSSData->wallpaperChangeState++;
}
break;
case 2:
if (WaitForWallpaperGfxLoad() == TRUE)
{
sub_8091EF0();
- BeginNormalPaletteFade(sPSSData->field_738, 1, 16, 0, RGB_WHITEALPHA);
- sPSSData->wallpaperChangeState++;
+ BeginNormalPaletteFade(gPSSData->field_738, 1, 16, 0, RGB_WHITEALPHA);
+ gPSSData->wallpaperChangeState++;
}
break;
case 3:
if (!UpdatePaletteFade())
- sPSSData->wallpaperChangeState++;
+ gPSSData->wallpaperChangeState++;
break;
case 4:
return FALSE;
@@ -1145,26 +1145,26 @@ static void LoadWallpaperGfx(u8 boxId, s8 direction)
void *iconGfx;
u32 size1, size2;
- sPSSData->field_6F9 = 0;
- sPSSData->field_6FA = boxId;
- sPSSData->field_6FB = direction;
- if (sPSSData->field_6FB != 0)
+ gPSSData->field_6F9 = 0;
+ gPSSData->field_6FA = boxId;
+ gPSSData->field_6FB = direction;
+ if (gPSSData->field_6FB != 0)
{
- sPSSData->field_2D2 = (sPSSData->field_2D2 == 0);
- sub_8091A24(sPSSData->field_4AC4);
+ gPSSData->field_2D2 = (gPSSData->field_2D2 == 0);
+ sub_8091A24(gPSSData->field_4AC4);
}
- wallpaperId = GetBoxWallpaper(sPSSData->field_6FA);
- wallpaperGfx = &gWallpaperTable[wallpaperId];
- LZ77UnCompWram(wallpaperGfx->tileMap, sPSSData->field_792);
- sub_8091984(sPSSData->field_4AC4, sPSSData->field_792, sPSSData->field_6FB, sPSSData->field_2D2);
+ wallpaperId = GetBoxWallpaper(gPSSData->field_6FA);
+ wallpaperGfx = &sWallpaperTable[wallpaperId];
+ LZ77UnCompWram(wallpaperGfx->tileMap, gPSSData->field_792);
+ sub_8091984(gPSSData->field_4AC4, gPSSData->field_792, gPSSData->field_6FB, gPSSData->field_2D2);
- if (sPSSData->field_6FB != 0)
- LoadPalette(wallpaperGfx->palettes, (sPSSData->field_2D2 * 32) + 0x40, 0x40);
+ if (gPSSData->field_6FB != 0)
+ LoadPalette(wallpaperGfx->palettes, (gPSSData->field_2D2 * 32) + 0x40, 0x40);
else
- CpuCopy16(wallpaperGfx->palettes, &gPlttBufferUnfaded[(sPSSData->field_2D2 * 32) + 0x40], 0x40);
+ CpuCopy16(wallpaperGfx->palettes, &gPlttBufferUnfaded[(gPSSData->field_2D2 * 32) + 0x40], 0x40);
- DecompressAndLoadBgGfxUsingHeap(2, wallpaperGfx->tiles, 0, 256 * sPSSData->field_2D2, 0);
+ DecompressAndLoadBgGfxUsingHeap(2, wallpaperGfx->tiles, 0, 256 * gPSSData->field_2D2, 0);
CopyBgTilemapBufferToVram(2);
}
@@ -1180,7 +1180,7 @@ static bool32 WaitForWallpaperGfxLoad(void)
static void sub_8091984(void *buffer, const void *tilemap, s8 direction, u8 arg2)
{
s16 var = (arg2 * 2) + 3;
- s16 x = ((sPSSData->bg2_X / 8 + 10) + (direction * 24)) & 0x3F;
+ s16 x = ((gPSSData->bg2_X / 8 + 10) + (direction * 24)) & 0x3F;
CopyRectToBgTilemapBufferRect(2, tilemap, 0, 0, 0x14, 0x12, x, 2, 0x14, 0x12, 0x11, arg2 << 8, var);
@@ -1198,7 +1198,7 @@ static void sub_8091A24(void *arg0)
{
u16 i;
u16 *dest = arg0;
- s16 r3 = ((sPSSData->bg2_X / 8) + 30) & 0x3F;
+ s16 r3 = ((gPSSData->bg2_X / 8) + 30) & 0x3F;
if (r3 <= 31)
dest += r3 + 0x260;
@@ -1222,39 +1222,39 @@ static void sub_8091A94(u8 boxId)
s16 r6;
u16 i;
- struct SpriteSheet spriteSheet = {sPSSData->field_2F8, 0x200, TAG_TILE_3};
+ struct SpriteSheet spriteSheet = {gPSSData->field_2F8, 0x200, TAG_TILE_3};
struct SpritePalette palettes[] = {
- {sPSSData->field_6FC, TAG_PAL_DAC9},
+ {gPSSData->field_6FC, TAG_PAL_DAC9},
{}
};
u16 wallpaperId = GetBoxWallpaper(boxId);
- sPSSData->field_6FC[14] = gUnknown_83D29D0[wallpaperId][0];
- sPSSData->field_6FC[15] = gUnknown_83D29D0[wallpaperId][1];
+ gPSSData->field_6FC[14] = gUnknown_83D29D0[wallpaperId][0];
+ gPSSData->field_6FC[15] = gUnknown_83D29D0[wallpaperId][1];
LoadSpritePalettes(palettes);
- sPSSData->field_738 = 0x3f0;
+ gPSSData->field_738 = 0x3f0;
tagIndex = IndexOfSpritePaletteTag(TAG_PAL_DAC9);
- sPSSData->field_71C = 0x10e + 16 * tagIndex;
- sPSSData->field_738 |= 0x10000 << tagIndex;
+ gPSSData->field_71C = 0x10e + 16 * tagIndex;
+ gPSSData->field_738 |= 0x10000 << tagIndex;
tagIndex = IndexOfSpritePaletteTag(TAG_PAL_DAC9);
- sPSSData->field_71E = 0x10e + 16 * tagIndex;
- sPSSData->field_738 |= 0x10000 << tagIndex;
+ gPSSData->field_71E = 0x10e + 16 * tagIndex;
+ gPSSData->field_738 |= 0x10000 << tagIndex;
- StringCopyPadded(sPSSData->field_21B8, GetBoxNamePtr(boxId), 0, 8);
- DrawTextWindowAndBufferTiles(sPSSData->field_21B8, sPSSData->field_2F8, 0, 0, sPSSData->field_4F8, 2);
+ StringCopyPadded(gPSSData->field_21B8, GetBoxNamePtr(boxId), 0, 8);
+ DrawTextWindowAndBufferTiles(gPSSData->field_21B8, gPSSData->field_2F8, 0, 0, gPSSData->field_4F8, 2);
LoadSpriteSheet(&spriteSheet);
r6 = sub_8091F60(GetBoxNamePtr(boxId));
for (i = 0; i < 2; i++)
{
u8 spriteId = CreateSprite(&gUnknown_83D2B7C, r6 + i * 32, 28, 24);
- sPSSData->field_720[i] = &gSprites[spriteId];
- StartSpriteAnim(sPSSData->field_720[i], i);
+ gPSSData->field_720[i] = &gSprites[spriteId];
+ StartSpriteAnim(gPSSData->field_720[i], i);
}
- sPSSData->field_6F8 = 0;
+ gPSSData->field_6F8 = 0;
}
static void sub_8091C48(u8 boxId, s8 direction)
@@ -1262,25 +1262,25 @@ static void sub_8091C48(u8 boxId, s8 direction)
u16 r8;
s16 x, x2;
u16 i;
- struct SpriteSheet spriteSheet = {sPSSData->field_2F8, 0x200, TAG_TILE_3};
+ struct SpriteSheet spriteSheet = {gPSSData->field_2F8, 0x200, TAG_TILE_3};
struct SpriteTemplate template = gUnknown_83D2B7C;
- sPSSData->field_6F8 = (sPSSData->field_6F8 == 0);
- if (sPSSData->field_6F8 == 0)
+ gPSSData->field_6F8 = (gPSSData->field_6F8 == 0);
+ if (gPSSData->field_6F8 == 0)
{
spriteSheet.tag = TAG_TILE_3;
- r8 = sPSSData->field_71C;
+ r8 = gPSSData->field_71C;
}
else
{
spriteSheet.tag = TAG_TILE_4;
- r8 = sPSSData->field_71C;
+ r8 = gPSSData->field_71C;
template.tileTag = TAG_TILE_4;
template.paletteTag = TAG_PAL_DAC9;
}
- StringCopyPadded(sPSSData->field_21B8, GetBoxNamePtr(boxId), 0, 8);
- DrawTextWindowAndBufferTiles(sPSSData->field_21B8, sPSSData->field_2F8, 0, 0, sPSSData->field_4F8, 2);
+ StringCopyPadded(gPSSData->field_21B8, GetBoxNamePtr(boxId), 0, 8);
+ DrawTextWindowAndBufferTiles(gPSSData->field_21B8, gPSSData->field_2F8, 0, 0, gPSSData->field_4F8, 2);
LoadSpriteSheet(&spriteSheet);
LoadPalette(gUnknown_83D29D0[GetBoxWallpaper(boxId)], r8, 4);
x = sub_8091F60(GetBoxNamePtr(boxId));
@@ -1291,28 +1291,28 @@ static void sub_8091C48(u8 boxId, s8 direction)
{
u8 spriteId = CreateSprite(&template, i * 32 + x2, 28, 24);
- sPSSData->field_728[i] = &gSprites[spriteId];
- sPSSData->field_728[i]->data[0] = (-direction) * 6;
- sPSSData->field_728[i]->data[1] = i * 32 + x;
- sPSSData->field_728[i]->data[2] = 0;
- sPSSData->field_728[i]->callback = sub_8091E84;
- StartSpriteAnim(sPSSData->field_728[i], i);
+ gPSSData->field_728[i] = &gSprites[spriteId];
+ gPSSData->field_728[i]->data[0] = (-direction) * 6;
+ gPSSData->field_728[i]->data[1] = i * 32 + x;
+ gPSSData->field_728[i]->data[2] = 0;
+ gPSSData->field_728[i]->callback = sub_8091E84;
+ StartSpriteAnim(gPSSData->field_728[i], i);
- sPSSData->field_720[i]->data[0] = (-direction) * 6;
- sPSSData->field_720[i]->data[1] = 1;
- sPSSData->field_720[i]->callback = sub_8091EB8;
+ gPSSData->field_720[i]->data[0] = (-direction) * 6;
+ gPSSData->field_720[i]->data[1] = 1;
+ gPSSData->field_720[i]->callback = sub_8091EB8;
}
}
static void sub_8091E34(void)
{
- if (sPSSData->field_6F8 == 0)
+ if (gPSSData->field_6F8 == 0)
FreeSpriteTilesByTag(TAG_TILE_4);
else
FreeSpriteTilesByTag(TAG_TILE_3);
- sPSSData->field_720[0] = sPSSData->field_728[0];
- sPSSData->field_720[1] = sPSSData->field_728[1];
+ gPSSData->field_720[0] = gPSSData->field_728[0];
+ gPSSData->field_720[1] = gPSSData->field_728[1];
}
static void sub_8091E84(struct Sprite *sprite)
@@ -1342,10 +1342,10 @@ static void sub_8091EF0(void)
{
u8 boxId = StorageGetCurrentBox();
u8 wallpaperId = GetBoxWallpaper(boxId);
- if (sPSSData->field_6F8 == 0)
- CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + sPSSData->field_71C, 4);
+ if (gPSSData->field_6F8 == 0)
+ CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + gPSSData->field_71C, 4);
else
- CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + sPSSData->field_71E, 4);
+ CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + gPSSData->field_71E, 4);
}
static s16 sub_8091F60(const u8 *string)
@@ -1366,7 +1366,7 @@ static void sub_8091F80(void)
struct Sprite *sprite = &gSprites[spriteId];
StartSpriteAnim(sprite, i);
sprite->data[3] = (i == 0) ? -1 : 1;
- sPSSData->field_730[i] = sprite;
+ gPSSData->field_730[i] = sprite;
}
}
if (IsCursorOnBox())
@@ -1379,25 +1379,25 @@ static void sub_809200C(s8 direction)
for (i = 0; i < 2; i++)
{
- sPSSData->field_730[i]->pos2.x = 0;
- sPSSData->field_730[i]->data[0] = 2;
+ gPSSData->field_730[i]->pos2.x = 0;
+ gPSSData->field_730[i]->data[0] = 2;
}
if (direction < 0)
{
- sPSSData->field_730[0]->data[1] = 29;
- sPSSData->field_730[1]->data[1] = 5;
- sPSSData->field_730[0]->data[2] = 0x48;
- sPSSData->field_730[1]->data[2] = 0x48;
+ gPSSData->field_730[0]->data[1] = 29;
+ gPSSData->field_730[1]->data[1] = 5;
+ gPSSData->field_730[0]->data[2] = 0x48;
+ gPSSData->field_730[1]->data[2] = 0x48;
}
else
{
- sPSSData->field_730[0]->data[1] = 5;
- sPSSData->field_730[1]->data[1] = 29;
- sPSSData->field_730[0]->data[2] = 0xF8;
- sPSSData->field_730[1]->data[2] = 0xF8;
+ gPSSData->field_730[0]->data[1] = 5;
+ gPSSData->field_730[1]->data[1] = 29;
+ gPSSData->field_730[0]->data[2] = 0xF8;
+ gPSSData->field_730[1]->data[2] = 0xF8;
}
- sPSSData->field_730[0]->data[7] = 0;
- sPSSData->field_730[1]->data[7] = 1;
+ gPSSData->field_730[0]->data[7] = 0;
+ gPSSData->field_730[1]->data[7] = 1;
}
static void sub_80920AC(void)
@@ -1406,9 +1406,9 @@ static void sub_80920AC(void)
for (i = 0; i < 2; i++)
{
- sPSSData->field_730[i]->pos1.x = 0x88 * i + 0x5c;
- sPSSData->field_730[i]->pos2.x = 0;
- sPSSData->field_730[i]->invisible = FALSE;
+ gPSSData->field_730[i]->pos1.x = 0x88 * i + 0x5c;
+ gPSSData->field_730[i]->pos2.x = 0;
+ gPSSData->field_730[i]->invisible = FALSE;
}
sub_80920FC(TRUE);
}
@@ -1421,17 +1421,17 @@ void sub_80920FC(bool8 a0)
{
for (i = 0; i < 2; i++)
{
- sPSSData->field_730[i]->data[0] = 1;
- sPSSData->field_730[i]->data[1] = 0;
- sPSSData->field_730[i]->data[2] = 0;
- sPSSData->field_730[i]->data[4] = 0;
+ gPSSData->field_730[i]->data[0] = 1;
+ gPSSData->field_730[i]->data[1] = 0;
+ gPSSData->field_730[i]->data[2] = 0;
+ gPSSData->field_730[i]->data[4] = 0;
}
}
else
{
for (i = 0; i < 2; i++)
{
- sPSSData->field_730[i]->data[0] = 0;
+ gPSSData->field_730[i]->data[0] = 0;
}
}
}
@@ -1459,7 +1459,7 @@ static void sub_8092164(struct Sprite *sprite)
sprite->data[0] = 3;
break;
case 3:
- sprite->pos1.x -= sPSSData->field_2CE;
+ sprite->pos1.x -= gPSSData->field_2CE;
if (sprite->pos1.x < 73 || sprite->pos1.x > 247)
sprite->invisible = TRUE;
if (--sprite->data[1] == 0)
@@ -1470,7 +1470,7 @@ static void sub_8092164(struct Sprite *sprite)
}
break;
case 4:
- sprite->pos1.x -= sPSSData->field_2CE;
+ sprite->pos1.x -= gPSSData->field_2CE;
break;
}
}
diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c
index 0b707537e..a977d0118 100644
--- a/src/pokemon_storage_system_5.c
+++ b/src/pokemon_storage_system_5.c
@@ -45,13 +45,13 @@ static bool8 sub_8094A0C(void);
static void sub_8094AD8(void);
static void sub_8094C84(void);
-static const u16 gHandCursorPalette[] = INCBIN_U16("graphics/interface/pss_unk_83D2BCC.gbapal");
-static const u16 gHandCursorTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D2BEC.4bpp");
-static const u16 gHandCursorShadowTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D33EC.4bpp");
+static const u16 sHandCursorPalette[] = INCBIN_U16("graphics/interface/pss_unk_83D2BCC.gbapal");
+static const u16 sHandCursorTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D2BEC.4bpp");
+static const u16 sHandCursorShadowTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D33EC.4bpp");
void sub_80922C0(void)
{
- if (sPSSData->boxOption != BOX_OPTION_DEPOSIT)
+ if (gPSSData->boxOption != BOX_OPTION_DEPOSIT)
sBoxCursorArea = CURSOR_AREA_IN_BOX;
else
sBoxCursorArea = CURSOR_AREA_IN_PARTY;
@@ -63,8 +63,8 @@ void sub_80922C0(void)
sCanOnlyMove = FALSE;
sub_8092B50();
sub_8094AD8();
- sPSSData->field_CD6 = 1;
- sPSSData->inBoxMovingMode = 0;
+ gPSSData->field_CD6 = 1;
+ gPSSData->inBoxMovingMode = 0;
sub_8093A10();
}
@@ -72,11 +72,11 @@ void sub_8092340(void)
{
sub_8094AD8();
sub_8093AAC();
- sPSSData->field_CD6 = 1;
- sPSSData->inBoxMovingMode = 0;
+ gPSSData->field_CD6 = 1;
+ gPSSData->inBoxMovingMode = 0;
if (sIsMonBeingMoved)
{
- sPSSData->movingMon = gUnknown_20397BC;
+ gPSSData->movingMon = gUnknown_20397BC;
CreateMovingMonIcon();
}
}
@@ -138,46 +138,46 @@ bool8 sub_80924A8(void)
{
s16 tmp;
- if (sPSSData->field_CD0 == 0)
+ if (gPSSData->field_CD0 == 0)
{
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
return FALSE;
else
return sub_809610C();
}
- else if (--sPSSData->field_CD0 != 0)
+ else if (--gPSSData->field_CD0 != 0)
{
- sPSSData->field_CBC += sPSSData->field_CC4;
- sPSSData->field_CC0 += sPSSData->field_CC8;
- sPSSData->field_CB4->pos1.x = sPSSData->field_CBC >> 8;
- sPSSData->field_CB4->pos1.y = sPSSData->field_CC0 >> 8;
- if (sPSSData->field_CB4->pos1.x > 0x100)
+ gPSSData->field_CBC += gPSSData->field_CC4;
+ gPSSData->field_CC0 += gPSSData->field_CC8;
+ gPSSData->field_CB4->pos1.x = gPSSData->field_CBC >> 8;
+ gPSSData->field_CB4->pos1.y = gPSSData->field_CC0 >> 8;
+ if (gPSSData->field_CB4->pos1.x > 0x100)
{
- tmp = sPSSData->field_CB4->pos1.x - 0x100;
- sPSSData->field_CB4->pos1.x = tmp + 0x40;
+ tmp = gPSSData->field_CB4->pos1.x - 0x100;
+ gPSSData->field_CB4->pos1.x = tmp + 0x40;
}
- if (sPSSData->field_CB4->pos1.x < 0x40)
+ if (gPSSData->field_CB4->pos1.x < 0x40)
{
- tmp = 0x40 - sPSSData->field_CB4->pos1.x;
- sPSSData->field_CB4->pos1.x = 0x100 - tmp;
+ tmp = 0x40 - gPSSData->field_CB4->pos1.x;
+ gPSSData->field_CB4->pos1.x = 0x100 - tmp;
}
- if (sPSSData->field_CB4->pos1.y > 0xb0)
+ if (gPSSData->field_CB4->pos1.y > 0xb0)
{
- tmp = sPSSData->field_CB4->pos1.y - 0xb0;
- sPSSData->field_CB4->pos1.y = tmp - 0x10;
+ tmp = gPSSData->field_CB4->pos1.y - 0xb0;
+ gPSSData->field_CB4->pos1.y = tmp - 0x10;
}
- if (sPSSData->field_CB4->pos1.y < -0x10)
+ if (gPSSData->field_CB4->pos1.y < -0x10)
{
- tmp = -0x10 - sPSSData->field_CB4->pos1.y;
- sPSSData->field_CB4->pos1.y = 0xb0 - tmp;
+ tmp = -0x10 - gPSSData->field_CB4->pos1.y;
+ gPSSData->field_CB4->pos1.y = 0xb0 - tmp;
}
- if (sPSSData->field_CD7 && --sPSSData->field_CD7 == 0)
- sPSSData->field_CB4->vFlip = (sPSSData->field_CB4->vFlip == FALSE);
+ if (gPSSData->field_CD7 && --gPSSData->field_CD7 == 0)
+ gPSSData->field_CB4->vFlip = (gPSSData->field_CB4->vFlip == FALSE);
}
else
{
- sPSSData->field_CB4->pos1.x = sPSSData->field_CCC;
- sPSSData->field_CB4->pos1.y = sPSSData->field_CCE;
+ gPSSData->field_CB4->pos1.x = gPSSData->field_CCC;
+ gPSSData->field_CB4->pos1.y = gPSSData->field_CCE;
sub_80929B0();
}
@@ -189,74 +189,74 @@ static void sub_8092604(u8 newCurosrArea, u8 newCursorPosition)
u16 x, y;
sub_8092398(newCurosrArea, newCursorPosition, &x, &y);
- sPSSData->field_CD4 = newCurosrArea;
- sPSSData->field_CD5 = newCursorPosition;
- sPSSData->field_CCC = x;
- sPSSData->field_CCE = y;
+ gPSSData->field_CD4 = newCurosrArea;
+ gPSSData->field_CD5 = newCursorPosition;
+ gPSSData->field_CCC = x;
+ gPSSData->field_CCE = y;
}
static void sub_8092660(void)
{
int r7, r0;
- if (sPSSData->field_CD2 != 0 || sPSSData->field_CD3 != 0)
- sPSSData->field_CD0 = 12;
+ if (gPSSData->field_CD2 != 0 || gPSSData->field_CD3 != 0)
+ gPSSData->field_CD0 = 12;
else
- sPSSData->field_CD0 = 6;
+ gPSSData->field_CD0 = 6;
- if (sPSSData->field_CD7)
- sPSSData->field_CD7 = sPSSData->field_CD0 >> 1;
+ if (gPSSData->field_CD7)
+ gPSSData->field_CD7 = gPSSData->field_CD0 >> 1;
- switch (sPSSData->field_CD2)
+ switch (gPSSData->field_CD2)
{
default:
- r7 = sPSSData->field_CCE - sPSSData->field_CB4->pos1.y;
+ r7 = gPSSData->field_CCE - gPSSData->field_CB4->pos1.y;
break;
case -1:
- r7 = sPSSData->field_CCE - 0xc0 - sPSSData->field_CB4->pos1.y;
+ r7 = gPSSData->field_CCE - 0xc0 - gPSSData->field_CB4->pos1.y;
break;
case 1:
- r7 = sPSSData->field_CCE + 0xc0 - sPSSData->field_CB4->pos1.y;
+ r7 = gPSSData->field_CCE + 0xc0 - gPSSData->field_CB4->pos1.y;
break;
}
- switch (sPSSData->field_CD3)
+ switch (gPSSData->field_CD3)
{
default:
- r0 = sPSSData->field_CCC - sPSSData->field_CB4->pos1.x;
+ r0 = gPSSData->field_CCC - gPSSData->field_CB4->pos1.x;
break;
case -1:
- r0 = sPSSData->field_CCC - 0xc0 - sPSSData->field_CB4->pos1.x;
+ r0 = gPSSData->field_CCC - 0xc0 - gPSSData->field_CB4->pos1.x;
break;
case 1:
- r0 = sPSSData->field_CCC + 0xc0 - sPSSData->field_CB4->pos1.x;
+ r0 = gPSSData->field_CCC + 0xc0 - gPSSData->field_CB4->pos1.x;
break;
}
r7 <<= 8;
r0 <<= 8;
- sPSSData->field_CC4 = r0 / sPSSData->field_CD0;
- sPSSData->field_CC8 = r7 / sPSSData->field_CD0;
- sPSSData->field_CBC = sPSSData->field_CB4->pos1.x << 8;
- sPSSData->field_CC0 = sPSSData->field_CB4->pos1.y << 8;
+ gPSSData->field_CC4 = r0 / gPSSData->field_CD0;
+ gPSSData->field_CC8 = r7 / gPSSData->field_CD0;
+ gPSSData->field_CBC = gPSSData->field_CB4->pos1.x << 8;
+ gPSSData->field_CC0 = gPSSData->field_CB4->pos1.y << 8;
}
static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition)
{
sub_8092604(newCurosrArea, newCursorPosition);
sub_8092660();
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{
- if (sPSSData->inBoxMovingMode == 0 && !sIsMonBeingMoved)
- StartSpriteAnim(sPSSData->field_CB4, 1);
+ if (gPSSData->inBoxMovingMode == 0 && !sIsMonBeingMoved)
+ StartSpriteAnim(gPSSData->field_CB4, 1);
}
else
{
if (!IsActiveItemMoving())
- StartSpriteAnim(sPSSData->field_CB4, 1);
+ StartSpriteAnim(gPSSData->field_CB4, 1);
}
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
{
if (sBoxCursorArea == CURSOR_AREA_IN_BOX)
sub_8095D44(CURSOR_AREA_IN_BOX, sBoxCursorPosition);
@@ -271,8 +271,8 @@ static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition)
if (newCurosrArea == CURSOR_AREA_IN_PARTY && sBoxCursorArea != CURSOR_AREA_IN_PARTY)
{
- sPSSData->field_CD6 = newCurosrArea;
- sPSSData->field_CB8->invisible = TRUE;
+ gPSSData->field_CD6 = newCurosrArea;
+ gPSSData->field_CB8->invisible = TRUE;
}
switch (newCurosrArea)
@@ -280,19 +280,19 @@ static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition)
case CURSOR_AREA_IN_PARTY:
case CURSOR_AREA_BOX:
case CURSOR_AREA_BUTTONS:
- sPSSData->field_CB4->oam.priority = 1;
- sPSSData->field_CB8->invisible = TRUE;
- sPSSData->field_CB8->oam.priority = 1;
+ gPSSData->field_CB4->oam.priority = 1;
+ gPSSData->field_CB8->invisible = TRUE;
+ gPSSData->field_CB8->oam.priority = 1;
break;
case CURSOR_AREA_IN_BOX:
- if (sPSSData->inBoxMovingMode != 0)
+ if (gPSSData->inBoxMovingMode != 0)
{
- sPSSData->field_CB4->oam.priority = 0;
- sPSSData->field_CB8->invisible = TRUE;
+ gPSSData->field_CB4->oam.priority = 0;
+ gPSSData->field_CB8->invisible = TRUE;
}
else
{
- sPSSData->field_CB4->oam.priority = 2;
+ gPSSData->field_CB4->oam.priority = 2;
if (sBoxCursorArea == CURSOR_AREA_IN_BOX && sIsMonBeingMoved)
SetMovingMonPriority(2);
}
@@ -302,17 +302,17 @@ static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition)
static void sub_80929B0(void)
{
- sBoxCursorArea = sPSSData->field_CD4;
- sBoxCursorPosition = sPSSData->field_CD5;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ sBoxCursorArea = gPSSData->field_CD4;
+ sBoxCursorPosition = gPSSData->field_CD5;
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
{
- if (sPSSData->inBoxMovingMode == 0 && !sIsMonBeingMoved)
- StartSpriteAnim(sPSSData->field_CB4, 1);
+ if (gPSSData->inBoxMovingMode == 0 && !sIsMonBeingMoved)
+ StartSpriteAnim(gPSSData->field_CB4, 1);
}
else
{
if (!IsActiveItemMoving())
- StartSpriteAnim(sPSSData->field_CB4, 1);
+ StartSpriteAnim(gPSSData->field_CB4, 1);
}
sub_8093A10();
@@ -325,16 +325,16 @@ static void sub_80929B0(void)
sub_80920FC(TRUE);
break;
case CURSOR_AREA_IN_PARTY:
- sPSSData->field_CB8->subpriority = 13;
+ gPSSData->field_CB8->subpriority = 13;
SetMovingMonPriority(1);
break;
case CURSOR_AREA_IN_BOX:
- if (sPSSData->inBoxMovingMode == 0)
+ if (gPSSData->inBoxMovingMode == 0)
{
- sPSSData->field_CB4->oam.priority = 1;
- sPSSData->field_CB8->oam.priority = 2;
- sPSSData->field_CB8->subpriority = 21;
- sPSSData->field_CB8->invisible = FALSE;
+ gPSSData->field_CB4->oam.priority = 1;
+ gPSSData->field_CB8->oam.priority = 2;
+ gPSSData->field_CB8->subpriority = 21;
+ gPSSData->field_CB8->invisible = FALSE;
SetMovingMonPriority(2);
}
break;
@@ -355,8 +355,8 @@ void sub_8092AE4(void)
if (partyCount >= PARTY_SIZE)
partyCount = PARTY_SIZE - 1;
}
- if (sPSSData->field_CB4->vFlip)
- sPSSData->field_CD7 = 1;
+ if (gPSSData->field_CB4->vFlip)
+ gPSSData->field_CD7 = 1;
sub_80927E8(CURSOR_AREA_IN_PARTY, partyCount);
}
@@ -388,46 +388,46 @@ void InitMonPlaceChange(u8 a0)
MonPlaceChange_Shift,
};
- sPSSData->monPlaceChangeFunc = placeChangeFuncs[a0];
- sPSSData->monPlaceChangeState = 0;
+ gPSSData->monPlaceChangeFunc = placeChangeFuncs[a0];
+ gPSSData->monPlaceChangeState = 0;
}
void sub_8092BAC(bool8 arg0)
{
if (!arg0)
- sPSSData->monPlaceChangeFunc = sub_8092E00;
+ gPSSData->monPlaceChangeFunc = sub_8092E00;
else
- sPSSData->monPlaceChangeFunc = sub_8092E10;
+ gPSSData->monPlaceChangeFunc = sub_8092E10;
- sPSSData->monPlaceChangeState = 0;
+ gPSSData->monPlaceChangeState = 0;
}
bool8 DoMonPlaceChange(void)
{
- return sPSSData->monPlaceChangeFunc();
+ return gPSSData->monPlaceChangeFunc();
}
static bool8 MonPlaceChange_Move(void)
{
- switch (sPSSData->monPlaceChangeState)
+ switch (gPSSData->monPlaceChangeState)
{
case 0:
if (sIsMonBeingMoved)
return FALSE;
- StartSpriteAnim(sPSSData->field_CB4, 2);
- sPSSData->monPlaceChangeState++;
+ StartSpriteAnim(gPSSData->field_CB4, 2);
+ gPSSData->monPlaceChangeState++;
break;
case 1:
if (!sub_8092E20())
{
- StartSpriteAnim(sPSSData->field_CB4, 3);
+ StartSpriteAnim(gPSSData->field_CB4, 3);
MoveMon();
- sPSSData->monPlaceChangeState++;
+ gPSSData->monPlaceChangeState++;
}
break;
case 2:
if (!sub_8092E54())
- sPSSData->monPlaceChangeState++;
+ gPSSData->monPlaceChangeState++;
break;
case 3:
return FALSE;
@@ -438,21 +438,21 @@ static bool8 MonPlaceChange_Move(void)
static bool8 MonPlaceChange_Place(void)
{
- switch (sPSSData->monPlaceChangeState)
+ switch (gPSSData->monPlaceChangeState)
{
case 0:
if (!sub_8092E20())
{
- StartSpriteAnim(sPSSData->field_CB4, 2);
+ StartSpriteAnim(gPSSData->field_CB4, 2);
PlaceMon();
- sPSSData->monPlaceChangeState++;
+ gPSSData->monPlaceChangeState++;
}
break;
case 1:
if (!sub_8092E54())
{
- StartSpriteAnim(sPSSData->field_CB4, 0);
- sPSSData->monPlaceChangeState++;
+ StartSpriteAnim(gPSSData->field_CB4, 0);
+ gPSSData->monPlaceChangeState++;
}
break;
case 2:
@@ -464,30 +464,30 @@ static bool8 MonPlaceChange_Place(void)
static bool8 MonPlaceChange_Shift(void)
{
- switch (sPSSData->monPlaceChangeState)
+ switch (gPSSData->monPlaceChangeState)
{
case 0:
switch (sBoxCursorArea)
{
case CURSOR_AREA_IN_PARTY:
- sPSSData->field_D91 = TOTAL_BOXES_COUNT;
+ gPSSData->field_D91 = TOTAL_BOXES_COUNT;
break;
case CURSOR_AREA_IN_BOX:
- sPSSData->field_D91 = StorageGetCurrentBox();
+ gPSSData->field_D91 = StorageGetCurrentBox();
break;
default:
return FALSE;
}
- StartSpriteAnim(sPSSData->field_CB4, 2);
- sub_8090E08(sPSSData->field_D91, sBoxCursorPosition);
- sPSSData->monPlaceChangeState++;
+ StartSpriteAnim(gPSSData->field_CB4, 2);
+ sub_8090E08(gPSSData->field_D91, sBoxCursorPosition);
+ gPSSData->monPlaceChangeState++;
break;
case 1:
if (!sub_8090E74())
{
- StartSpriteAnim(sPSSData->field_CB4, 3);
- SetShiftedMonData(sPSSData->field_D91, sBoxCursorPosition);
- sPSSData->monPlaceChangeState++;
+ StartSpriteAnim(gPSSData->field_CB4, 3);
+ SetShiftedMonData(gPSSData->field_D91, sBoxCursorPosition);
+ gPSSData->monPlaceChangeState++;
}
break;
case 2:
@@ -509,13 +509,13 @@ static bool8 sub_8092E10(void)
static bool8 sub_8092E20(void)
{
- switch (sPSSData->field_CB4->pos2.y)
+ switch (gPSSData->field_CB4->pos2.y)
{
default:
- sPSSData->field_CB4->pos2.y++;
+ gPSSData->field_CB4->pos2.y++;
break;
case 0:
- sPSSData->field_CB4->pos2.y++;
+ gPSSData->field_CB4->pos2.y++;
break;
case 8:
return FALSE;
@@ -526,12 +526,12 @@ static bool8 sub_8092E20(void)
static bool8 sub_8092E54(void)
{
- switch (sPSSData->field_CB4->pos2.y)
+ switch (gPSSData->field_CB4->pos2.y)
{
case 0:
return FALSE;
default:
- sPSSData->field_CB4->pos2.y--;
+ gPSSData->field_CB4->pos2.y--;
break;
}
@@ -547,7 +547,7 @@ static void MoveMon(void)
sub_8090CC0(MODE_PARTY, sBoxCursorPosition);
break;
case CURSOR_AREA_IN_BOX:
- if (sPSSData->inBoxMovingMode == 0)
+ if (gPSSData->inBoxMovingMode == 0)
{
SetMovedMonData(StorageGetCurrentBox(), sBoxCursorPosition);
sub_8090CC0(MODE_BOX, sBoxCursorPosition);
@@ -590,9 +590,9 @@ void sub_8092F54(void)
static void SetMovedMonData(u8 boxId, u8 position)
{
if (boxId == TOTAL_BOXES_COUNT)
- sPSSData->movingMon = gPlayerParty[sBoxCursorPosition];
+ gPSSData->movingMon = gPlayerParty[sBoxCursorPosition];
else
- BoxMonAtToMon(boxId, position, &sPSSData->movingMon);
+ BoxMonAtToMon(boxId, position, &gPSSData->movingMon);
PurgeMonOrBoxMon(boxId, position);
sMovingMonOrigBoxId = boxId;
@@ -603,12 +603,12 @@ static void SetPlacedMonData(u8 boxId, u8 position)
{
if (boxId == TOTAL_BOXES_COUNT)
{
- gPlayerParty[position] = sPSSData->movingMon;
+ gPlayerParty[position] = gPSSData->movingMon;
}
else
{
- BoxMonRestorePP(&sPSSData->movingMon.box);
- SetBoxMonAt(boxId, position, &sPSSData->movingMon.box);
+ BoxMonRestorePP(&gPSSData->movingMon.box);
+ SetBoxMonAt(boxId, position, &gPSSData->movingMon.box);
}
}
@@ -623,13 +623,13 @@ static void PurgeMonOrBoxMon(u8 boxId, u8 position)
static void SetShiftedMonData(u8 boxId, u8 position)
{
if (boxId == TOTAL_BOXES_COUNT)
- sPSSData->field_2108 = gPlayerParty[position];
+ gPSSData->field_2108 = gPlayerParty[position];
else
- BoxMonAtToMon(boxId, position, &sPSSData->field_2108);
+ BoxMonAtToMon(boxId, position, &gPSSData->field_2108);
SetPlacedMonData(boxId, position);
- sPSSData->movingMon = sPSSData->field_2108;
- SetCursorMonData(&sPSSData->movingMon, MODE_PARTY);
+ gPSSData->movingMon = gPSSData->field_2108;
+ SetCursorMonData(&gPSSData->movingMon, MODE_PARTY);
sMovingMonOrigBoxId = boxId;
sMovingMonOrigBoxPos = position;
}
@@ -656,13 +656,13 @@ bool8 TryStorePartyMonInBox(u8 boxId)
if (boxId == StorageGetCurrentBox())
sub_80901EC(boxPosition);
- StartSpriteAnim(sPSSData->field_CB4, 1);
+ StartSpriteAnim(gPSSData->field_CB4, 1);
return TRUE;
}
void sub_8093174(void)
{
- StartSpriteAnim(sPSSData->field_CB4, 0);
+ StartSpriteAnim(gPSSData->field_CB4, 0);
sub_8093A10();
}
@@ -678,14 +678,14 @@ void sub_8093194(void)
mode = MODE_BOX;
sub_8090FC4(mode, sBoxCursorPosition);
- StringCopy(sPSSData->field_21E0, sPSSData->cursorMonNick);
+ StringCopy(gPSSData->field_21E0, gPSSData->cursorMonNick);
}
bool8 sub_80931EC(void)
{
if (!sub_8091084())
{
- StartSpriteAnim(sPSSData->field_CB4, 0);
+ StartSpriteAnim(gPSSData->field_CB4, 0);
return FALSE;
}
else
@@ -718,7 +718,7 @@ void ReleaseMon(void)
void sub_8093264(void)
{
if (sIsMonBeingMoved)
- StartSpriteAnim(sPSSData->field_CB4, 3);
+ StartSpriteAnim(gPSSData->field_CB4, 3);
}
void InitCanReleaseMonVars(void)
@@ -726,44 +726,44 @@ void InitCanReleaseMonVars(void)
u16 knownIdx;
if (sIsMonBeingMoved)
{
- sPSSData->field_2108 = sPSSData->movingMon;
- sPSSData->field_2170 = -1;
- sPSSData->field_2171 = -1;
+ gPSSData->field_2108 = gPSSData->movingMon;
+ gPSSData->field_2170 = -1;
+ gPSSData->field_2171 = -1;
}
else
{
if (sBoxCursorArea == CURSOR_AREA_IN_PARTY)
{
- sPSSData->field_2108 = gPlayerParty[sBoxCursorPosition];
- sPSSData->field_2170 = TOTAL_BOXES_COUNT;
+ gPSSData->field_2108 = gPlayerParty[sBoxCursorPosition];
+ gPSSData->field_2170 = TOTAL_BOXES_COUNT;
}
else
{
- BoxMonAtToMon(StorageGetCurrentBox(), sBoxCursorPosition, &sPSSData->field_2108);
- sPSSData->field_2170 = StorageGetCurrentBox();
+ BoxMonAtToMon(StorageGetCurrentBox(), sBoxCursorPosition, &gPSSData->field_2108);
+ gPSSData->field_2170 = StorageGetCurrentBox();
}
- sPSSData->field_2171 = sBoxCursorPosition;
+ gPSSData->field_2171 = sBoxCursorPosition;
}
- sPSSData->isSurfMon = FALSE;
- sPSSData->isDiveMon = FALSE;
- sPSSData->field_2176[0] = MOVE_SURF;
- sPSSData->field_2176[1] = MOVE_DIVE;
- sPSSData->field_2176[2] = MOVES_COUNT;
- knownIdx = GetMonData(&sPSSData->field_2108, MON_DATA_KNOWN_MOVES, (u8*)sPSSData->field_2176);
- sPSSData->isSurfMon = knownIdx & 1;
- sPSSData->isDiveMon = (knownIdx >> 1) & 1;
- if (sPSSData->isSurfMon || sPSSData->isDiveMon)
+ gPSSData->isSurfMon = FALSE;
+ gPSSData->isDiveMon = FALSE;
+ gPSSData->field_2176[0] = MOVE_SURF;
+ gPSSData->field_2176[1] = MOVE_DIVE;
+ gPSSData->field_2176[2] = MOVES_COUNT;
+ knownIdx = GetMonData(&gPSSData->field_2108, MON_DATA_KNOWN_MOVES, (u8*)gPSSData->field_2176);
+ gPSSData->isSurfMon = knownIdx & 1;
+ gPSSData->isDiveMon = (knownIdx >> 1) & 1;
+ if (gPSSData->isSurfMon || gPSSData->isDiveMon)
{
- sPSSData->field_216D = 0;
+ gPSSData->field_216D = 0;
}
else
{
- sPSSData->field_216D = 1;
- sPSSData->field_216C = 1;
+ gPSSData->field_216D = 1;
+ gPSSData->field_216C = 1;
}
- sPSSData->field_2172 = 0;
+ gPSSData->field_2172 = 0;
}
s8 RunCanReleaseMon(void)
@@ -771,62 +771,62 @@ s8 RunCanReleaseMon(void)
u16 i;
u16 knownMoves;
- if (sPSSData->field_216D)
- return sPSSData->field_216C;
+ if (gPSSData->field_216D)
+ return gPSSData->field_216C;
- switch (sPSSData->field_2172)
+ switch (gPSSData->field_2172)
{
case 0:
for (i = 0; i < PARTY_SIZE; i++)
{
- if (sPSSData->field_2170 != TOTAL_BOXES_COUNT || sPSSData->field_2171 != i)
+ if (gPSSData->field_2170 != TOTAL_BOXES_COUNT || gPSSData->field_2171 != i)
{
- knownMoves = GetMonData(gPlayerParty + i, MON_DATA_KNOWN_MOVES, (u8*)sPSSData->field_2176);
+ knownMoves = GetMonData(gPlayerParty + i, MON_DATA_KNOWN_MOVES, (u8*)gPSSData->field_2176);
if (knownMoves & 1)
- sPSSData->isSurfMon = FALSE;
+ gPSSData->isSurfMon = FALSE;
if (knownMoves & 2)
- sPSSData->isDiveMon = FALSE;
+ gPSSData->isDiveMon = FALSE;
}
}
- if (!(sPSSData->isSurfMon || sPSSData->isDiveMon))
+ if (!(gPSSData->isSurfMon || gPSSData->isDiveMon))
{
- sPSSData->field_216D = 1;
- sPSSData->field_216C = 1;
+ gPSSData->field_216D = 1;
+ gPSSData->field_216C = 1;
}
else
{
- sPSSData->field_216E = 0;
- sPSSData->field_216F = 0;
- sPSSData->field_2172++;
+ gPSSData->field_216E = 0;
+ gPSSData->field_216F = 0;
+ gPSSData->field_2172++;
}
break;
case 1:
for (i = 0; i < 5; i++)
{
- knownMoves = GetAndCopyBoxMonDataAt(sPSSData->field_216E, sPSSData->field_216F, MON_DATA_KNOWN_MOVES, (u8*)sPSSData->field_2176);
+ knownMoves = GetAndCopyBoxMonDataAt(gPSSData->field_216E, gPSSData->field_216F, MON_DATA_KNOWN_MOVES, (u8*)gPSSData->field_2176);
if (knownMoves != 0
- && !(sPSSData->field_2170 == sPSSData->field_216E && sPSSData->field_2171 == sPSSData->field_216F))
+ && !(gPSSData->field_2170 == gPSSData->field_216E && gPSSData->field_2171 == gPSSData->field_216F))
{
if (knownMoves & 1)
- sPSSData->isSurfMon = FALSE;
+ gPSSData->isSurfMon = FALSE;
if (knownMoves & 2)
- sPSSData->isDiveMon = FALSE;
+ gPSSData->isDiveMon = FALSE;
}
- if (++sPSSData->field_216F >= IN_BOX_COUNT)
+ if (++gPSSData->field_216F >= IN_BOX_COUNT)
{
- sPSSData->field_216F = 0;
- if (++sPSSData->field_216E >= TOTAL_BOXES_COUNT)
+ gPSSData->field_216F = 0;
+ if (++gPSSData->field_216E >= TOTAL_BOXES_COUNT)
{
- sPSSData->field_216D = 1;
- sPSSData->field_216C = 0;
+ gPSSData->field_216D = 1;
+ gPSSData->field_216C = 0;
break;
}
}
}
- if (!(sPSSData->isSurfMon || sPSSData->isDiveMon))
+ if (!(gPSSData->isSurfMon || gPSSData->isDiveMon))
{
- sPSSData->field_216D = 1;
- sPSSData->field_216C = 1;
+ gPSSData->field_216D = 1;
+ gPSSData->field_216C = 1;
}
break;
}
@@ -837,7 +837,7 @@ s8 RunCanReleaseMon(void)
void sub_8093630(void)
{
if (sIsMonBeingMoved)
- gUnknown_20397BC = sPSSData->movingMon;
+ gUnknown_20397BC = gPSSData->movingMon;
}
void sub_8093660(void)
@@ -845,9 +845,9 @@ void sub_8093660(void)
if (sIsMonBeingMoved)
{
if (sMovingMonOrigBoxId == TOTAL_BOXES_COUNT)
- sPSSData->movingMon = gUnknown_20397BC;
+ gPSSData->movingMon = gUnknown_20397BC;
else
- sPSSData->movingMon.box = gUnknown_20397BC.box;
+ gPSSData->movingMon.box = gUnknown_20397BC.box;
}
}
@@ -856,24 +856,24 @@ void sub_80936B8(void)
if (sIsMonBeingMoved)
{
sub_8093630();
- sPSSData->field_218C.mon = &gUnknown_20397BC;
- sPSSData->field_2187 = 0;
- sPSSData->field_2186 = 0;
- sPSSData->field_2188 = 0;
+ gPSSData->field_218C.mon = &gUnknown_20397BC;
+ gPSSData->field_2187 = 0;
+ gPSSData->field_2186 = 0;
+ gPSSData->field_2188 = 0;
}
else if (sBoxCursorArea == CURSOR_AREA_IN_PARTY)
{
- sPSSData->field_218C.mon = gPlayerParty;
- sPSSData->field_2187 = sBoxCursorPosition;
- sPSSData->field_2186 = CountPartyMons() - 1;
- sPSSData->field_2188 = 0;
+ gPSSData->field_218C.mon = gPlayerParty;
+ gPSSData->field_2187 = sBoxCursorPosition;
+ gPSSData->field_2186 = CountPartyMons() - 1;
+ gPSSData->field_2188 = 0;
}
else
{
- sPSSData->field_218C.box = GetBoxedMonPtr(StorageGetCurrentBox(), 0);
- sPSSData->field_2187 = sBoxCursorPosition;
- sPSSData->field_2186 = IN_BOX_COUNT - 1;
- sPSSData->field_2188 = 5;
+ gPSSData->field_218C.box = GetBoxedMonPtr(StorageGetCurrentBox(), 0);
+ gPSSData->field_2187 = sBoxCursorPosition;
+ gPSSData->field_2186 = IN_BOX_COUNT - 1;
+ gPSSData->field_2188 = 5;
}
}
@@ -914,10 +914,10 @@ s16 CompactPartySlots(void)
void SetMonMarkings(u8 markings)
{
- sPSSData->cursorMonMarkings = markings;
+ gPSSData->cursorMonMarkings = markings;
if (sIsMonBeingMoved)
{
- SetMonData(&sPSSData->movingMon, MON_DATA_MARKINGS, &markings);
+ SetMonData(&gPSSData->movingMon, MON_DATA_MARKINGS, &markings);
}
else
{
@@ -942,7 +942,7 @@ bool8 CanShiftMon(void)
{
if (sBoxCursorArea == CURSOR_AREA_IN_PARTY && CountPartyAliveNonEggMonsExcept(sBoxCursorPosition) == 0)
{
- if (sPSSData->cursorMonIsEgg || GetMonData(&sPSSData->movingMon, MON_DATA_HP) == 0)
+ if (gPSSData->cursorMonIsEgg || GetMonData(&gPSSData->movingMon, MON_DATA_HP) == 0)
return FALSE;
}
return TRUE;
@@ -972,7 +972,7 @@ bool8 IsCursorInBox(void)
static void sub_8093A10(void)
{
- sPSSData->setMosaic = (sIsMonBeingMoved == FALSE);
+ gPSSData->setMosaic = (sIsMonBeingMoved == FALSE);
if (!sIsMonBeingMoved)
{
switch (sBoxCursorArea)
@@ -1009,94 +1009,94 @@ static void SetCursorMonData(void *pokemon, u8 mode)
u16 gender;
bool8 sanityIsBagEgg;
- sPSSData->cursorMonItem = 0;
+ gPSSData->cursorMonItem = 0;
gender = MON_MALE;
sanityIsBagEgg = FALSE;
if (mode == MODE_PARTY)
{
struct Pokemon *mon = (struct Pokemon *)pokemon;
- sPSSData->cursorMonSpecies = GetMonData(mon, MON_DATA_SPECIES2);
- if (sPSSData->cursorMonSpecies != SPECIES_NONE)
+ gPSSData->cursorMonSpecies = GetMonData(mon, MON_DATA_SPECIES2);
+ if (gPSSData->cursorMonSpecies != SPECIES_NONE)
{
sanityIsBagEgg = GetMonData(mon, MON_DATA_SANITY_IS_BAD_EGG);
if (sanityIsBagEgg)
- sPSSData->cursorMonIsEgg = TRUE;
+ gPSSData->cursorMonIsEgg = TRUE;
else
- sPSSData->cursorMonIsEgg = GetMonData(mon, MON_DATA_IS_EGG);
-
- GetMonData(mon, MON_DATA_NICKNAME, sPSSData->cursorMonNick);
- StringGetEnd10(sPSSData->cursorMonNick);
- sPSSData->cursorMonLevel = GetMonData(mon, MON_DATA_LEVEL);
- sPSSData->cursorMonMarkings = GetMonData(mon, MON_DATA_MARKINGS);
- sPSSData->cursorMonPersonality = GetMonData(mon, MON_DATA_PERSONALITY);
- sPSSData->cursorMonPalette = GetMonFrontSpritePal(mon);
+ gPSSData->cursorMonIsEgg = GetMonData(mon, MON_DATA_IS_EGG);
+
+ GetMonData(mon, MON_DATA_NICKNAME, gPSSData->cursorMonNick);
+ StringGetEnd10(gPSSData->cursorMonNick);
+ gPSSData->cursorMonLevel = GetMonData(mon, MON_DATA_LEVEL);
+ gPSSData->cursorMonMarkings = GetMonData(mon, MON_DATA_MARKINGS);
+ gPSSData->cursorMonPersonality = GetMonData(mon, MON_DATA_PERSONALITY);
+ gPSSData->cursorMonPalette = GetMonFrontSpritePal(mon);
gender = GetMonGender(mon);
- sPSSData->cursorMonItem = GetMonData(mon, MON_DATA_HELD_ITEM);
+ gPSSData->cursorMonItem = GetMonData(mon, MON_DATA_HELD_ITEM);
}
}
else if (mode == MODE_BOX)
{
struct BoxPokemon *boxMon = (struct BoxPokemon *)pokemon;
- sPSSData->cursorMonSpecies = GetBoxMonData(pokemon, MON_DATA_SPECIES2);
- if (sPSSData->cursorMonSpecies != SPECIES_NONE)
+ gPSSData->cursorMonSpecies = GetBoxMonData(pokemon, MON_DATA_SPECIES2);
+ if (gPSSData->cursorMonSpecies != SPECIES_NONE)
{
u32 otId = GetBoxMonData(boxMon, MON_DATA_OT_ID);
sanityIsBagEgg = GetBoxMonData(boxMon, MON_DATA_SANITY_IS_BAD_EGG);
if (sanityIsBagEgg)
- sPSSData->cursorMonIsEgg = TRUE;
+ gPSSData->cursorMonIsEgg = TRUE;
else
- sPSSData->cursorMonIsEgg = GetBoxMonData(boxMon, MON_DATA_IS_EGG);
+ gPSSData->cursorMonIsEgg = GetBoxMonData(boxMon, MON_DATA_IS_EGG);
- GetBoxMonData(boxMon, MON_DATA_NICKNAME, sPSSData->cursorMonNick);
- StringGetEnd10(sPSSData->cursorMonNick);
- sPSSData->cursorMonLevel = GetLevelFromBoxMonExp(boxMon);
- sPSSData->cursorMonMarkings = GetBoxMonData(boxMon, MON_DATA_MARKINGS);
- sPSSData->cursorMonPersonality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY);
- sPSSData->cursorMonPalette = GetMonSpritePalFromSpeciesAndPersonality(sPSSData->cursorMonSpecies, otId, sPSSData->cursorMonPersonality);
- gender = GetGenderFromSpeciesAndPersonality(sPSSData->cursorMonSpecies, sPSSData->cursorMonPersonality);
- sPSSData->cursorMonItem = GetBoxMonData(boxMon, MON_DATA_HELD_ITEM);
+ GetBoxMonData(boxMon, MON_DATA_NICKNAME, gPSSData->cursorMonNick);
+ StringGetEnd10(gPSSData->cursorMonNick);
+ gPSSData->cursorMonLevel = GetLevelFromBoxMonExp(boxMon);
+ gPSSData->cursorMonMarkings = GetBoxMonData(boxMon, MON_DATA_MARKINGS);
+ gPSSData->cursorMonPersonality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY);
+ gPSSData->cursorMonPalette = GetMonSpritePalFromSpeciesAndPersonality(gPSSData->cursorMonSpecies, otId, gPSSData->cursorMonPersonality);
+ gender = GetGenderFromSpeciesAndPersonality(gPSSData->cursorMonSpecies, gPSSData->cursorMonPersonality);
+ gPSSData->cursorMonItem = GetBoxMonData(boxMon, MON_DATA_HELD_ITEM);
}
}
else
{
- sPSSData->cursorMonSpecies = SPECIES_NONE;
- sPSSData->cursorMonItem = 0;
+ gPSSData->cursorMonSpecies = SPECIES_NONE;
+ gPSSData->cursorMonItem = 0;
}
- if (sPSSData->cursorMonSpecies == SPECIES_NONE)
+ if (gPSSData->cursorMonSpecies == SPECIES_NONE)
{
- StringFill(sPSSData->cursorMonNick, CHAR_SPACE, 5);
- StringFill(sPSSData->cursorMonTexts[0], CHAR_SPACE, 8);
- StringFill(sPSSData->cursorMonTexts[1], CHAR_SPACE, 8);
- StringFill(sPSSData->cursorMonTexts[2], CHAR_SPACE, 8);
- StringFill(sPSSData->cursorMonTexts[3], CHAR_SPACE, 8);
+ StringFill(gPSSData->cursorMonNick, CHAR_SPACE, 5);
+ StringFill(gPSSData->cursorMonTexts[0], CHAR_SPACE, 8);
+ StringFill(gPSSData->cursorMonTexts[1], CHAR_SPACE, 8);
+ StringFill(gPSSData->cursorMonTexts[2], CHAR_SPACE, 8);
+ StringFill(gPSSData->cursorMonTexts[3], CHAR_SPACE, 8);
}
- else if (sPSSData->cursorMonIsEgg)
+ else if (gPSSData->cursorMonIsEgg)
{
if (sanityIsBagEgg)
- StringCopyPadded(sPSSData->cursorMonTexts[0], sPSSData->cursorMonNick, CHAR_SPACE, 5);
+ StringCopyPadded(gPSSData->cursorMonTexts[0], gPSSData->cursorMonNick, CHAR_SPACE, 5);
else
- StringCopyPadded(sPSSData->cursorMonTexts[0], gText_EggNickname, CHAR_SPACE, 8);
+ StringCopyPadded(gPSSData->cursorMonTexts[0], gText_EggNickname, CHAR_SPACE, 8);
- StringFill(sPSSData->cursorMonTexts[1], CHAR_SPACE, 8);
- StringFill(sPSSData->cursorMonTexts[2], CHAR_SPACE, 8);
- StringFill(sPSSData->cursorMonTexts[3], CHAR_SPACE, 8);
+ StringFill(gPSSData->cursorMonTexts[1], CHAR_SPACE, 8);
+ StringFill(gPSSData->cursorMonTexts[2], CHAR_SPACE, 8);
+ StringFill(gPSSData->cursorMonTexts[3], CHAR_SPACE, 8);
}
else
{
- if (sPSSData->cursorMonSpecies == SPECIES_NIDORAN_F || sPSSData->cursorMonSpecies == SPECIES_NIDORAN_M)
+ if (gPSSData->cursorMonSpecies == SPECIES_NIDORAN_F || gPSSData->cursorMonSpecies == SPECIES_NIDORAN_M)
gender = MON_GENDERLESS;
- StringCopyPadded(sPSSData->cursorMonTexts[0], sPSSData->cursorMonNick, CHAR_SPACE, 5);
+ StringCopyPadded(gPSSData->cursorMonTexts[0], gPSSData->cursorMonNick, CHAR_SPACE, 5);
- txtPtr = sPSSData->cursorMonTexts[1];
+ txtPtr = gPSSData->cursorMonTexts[1];
*(txtPtr)++ = CHAR_SLASH;
- StringCopyPadded(txtPtr, gSpeciesNames[sPSSData->cursorMonSpecies], CHAR_SPACE, 5);
+ StringCopyPadded(txtPtr, gSpeciesNames[gPSSData->cursorMonSpecies], CHAR_SPACE, 5);
- txtPtr = sPSSData->cursorMonTexts[2];
+ txtPtr = gPSSData->cursorMonTexts[2];
*(txtPtr)++ = EXT_CTRL_CODE_BEGIN;
*(txtPtr)++ = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW;
switch (gender)
@@ -1130,20 +1130,20 @@ static void SetCursorMonData(void *pokemon, u8 mode)
*(txtPtr++) = CHAR_EXTRA_EMOJI;
*(txtPtr++) = 5; // LV_2
- txtPtr = ConvertIntToDecimalStringN(txtPtr, sPSSData->cursorMonLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
+ txtPtr = ConvertIntToDecimalStringN(txtPtr, gPSSData->cursorMonLevel, STR_CONV_MODE_LEFT_ALIGN, 3);
txtPtr[0] = CHAR_SPACE;
txtPtr[1] = EOS;
- if (sPSSData->cursorMonItem != 0)
- StringCopyPadded(sPSSData->cursorMonTexts[3], ItemId_GetName(sPSSData->cursorMonItem), CHAR_SPACE, 8);
+ if (gPSSData->cursorMonItem != 0)
+ StringCopyPadded(gPSSData->cursorMonTexts[3], ItemId_GetName(gPSSData->cursorMonItem), CHAR_SPACE, 8);
else
- StringFill(sPSSData->cursorMonTexts[3], CHAR_SPACE, 8);
+ StringFill(gPSSData->cursorMonTexts[3], CHAR_SPACE, 8);
}
}
static u8 HandleInput_InBox(void)
{
- switch (sPSSData->inBoxMovingMode)
+ switch (gPSSData->inBoxMovingMode)
{
case 0:
default:
@@ -1165,9 +1165,9 @@ static u8 InBoxInput_Normal(void)
{
cursorArea = sBoxCursorArea;
cursorPosition = sBoxCursorPosition;
- sPSSData->field_CD2 = 0;
- sPSSData->field_CD3 = 0;
- sPSSData->field_CD7 = 0;
+ gPSSData->field_CD2 = 0;
+ gPSSData->field_CD3 = 0;
+ gPSSData->field_CD7 = 0;
if (JOY_REPT(DPAD_UP))
{
retVal = TRUE;
@@ -1191,8 +1191,8 @@ static u8 InBoxInput_Normal(void)
cursorArea = CURSOR_AREA_BUTTONS;
cursorPosition -= IN_BOX_COUNT;
cursorPosition /= 3;
- sPSSData->field_CD2 = 1;
- sPSSData->field_CD7 = 1;
+ gPSSData->field_CD2 = 1;
+ gPSSData->field_CD7 = 1;
}
break;
}
@@ -1205,7 +1205,7 @@ static u8 InBoxInput_Normal(void)
}
else
{
- sPSSData->field_CD3 = -1;
+ gPSSData->field_CD3 = -1;
cursorPosition += (IN_BOX_ROWS - 1);
}
break;
@@ -1219,7 +1219,7 @@ static u8 InBoxInput_Normal(void)
}
else
{
- sPSSData->field_CD3 = 1;
+ gPSSData->field_CD3 = 1;
cursorPosition -= (IN_BOX_ROWS - 1);
}
break;
@@ -1237,7 +1237,7 @@ static u8 InBoxInput_Normal(void)
if (!sCanOnlyMove)
return 8;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_MONS || sIsMonBeingMoved == TRUE)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_MONS || sIsMonBeingMoved == TRUE)
{
switch (sub_8094E50(0))
{
@@ -1261,7 +1261,7 @@ static u8 InBoxInput_Normal(void)
}
else
{
- sPSSData->inBoxMovingMode = 1;
+ gPSSData->inBoxMovingMode = 1;
return 20;
}
}
@@ -1354,14 +1354,14 @@ static u8 InBoxInput_GrabbingMultiple(void)
{
if (sub_8095AA0() == sBoxCursorPosition)
{
- sPSSData->inBoxMovingMode = 0;
- sPSSData->field_CB8->invisible = FALSE;
+ gPSSData->inBoxMovingMode = 0;
+ gPSSData->field_CB8->invisible = FALSE;
return 22;
}
else
{
- sIsMonBeingMoved = (sPSSData->cursorMonSpecies != SPECIES_NONE);
- sPSSData->inBoxMovingMode = 2;
+ sIsMonBeingMoved = (gPSSData->cursorMonSpecies != SPECIES_NONE);
+ gPSSData->inBoxMovingMode = 2;
sMovingMonOrigBoxId = StorageGetCurrentBox();
return 23;
}
@@ -1423,7 +1423,7 @@ static u8 InBoxInput_MovingMultiple(void)
if (sub_8095ABC())
{
sIsMonBeingMoved = FALSE;
- sPSSData->inBoxMovingMode = 0;
+ gPSSData->inBoxMovingMode = 0;
return 26;
}
else
@@ -1460,9 +1460,9 @@ static u8 HandleInput_InParty(void)
{
cursorArea = sBoxCursorArea;
cursorPosition = sBoxCursorPosition;
- sPSSData->field_CD3 = 0;
- sPSSData->field_CD2 = 0;
- sPSSData->field_CD7 = 0;
+ gPSSData->field_CD3 = 0;
+ gPSSData->field_CD2 = 0;
+ gPSSData->field_CD7 = 0;
gotoBox = FALSE;
retVal = 0;
@@ -1485,7 +1485,7 @@ static u8 HandleInput_InParty(void)
else if (JOY_REPT(DPAD_LEFT) && sBoxCursorPosition != 0)
{
retVal = 1;
- sPSSData->field_CD6 = sBoxCursorPosition;
+ gPSSData->field_CD6 = sBoxCursorPosition;
cursorPosition = 0;
break;
}
@@ -1494,7 +1494,7 @@ static u8 HandleInput_InParty(void)
if (sBoxCursorPosition == 0)
{
retVal = 1;
- cursorPosition = sPSSData->field_CD6;
+ cursorPosition = gPSSData->field_CD6;
}
else
{
@@ -1509,7 +1509,7 @@ static u8 HandleInput_InParty(void)
{
if (sBoxCursorPosition == PARTY_SIZE)
{
- if (sPSSData->boxOption == BOX_OPTION_DEPOSIT)
+ if (gPSSData->boxOption == BOX_OPTION_DEPOSIT)
return 4;
gotoBox = TRUE;
@@ -1543,7 +1543,7 @@ static u8 HandleInput_InParty(void)
if (JOY_NEW(B_BUTTON))
{
- if (sPSSData->boxOption == BOX_OPTION_DEPOSIT)
+ if (gPSSData->boxOption == BOX_OPTION_DEPOSIT)
return 19;
gotoBox = TRUE;
@@ -1580,16 +1580,16 @@ static u8 HandleInput_OnBox(void)
do
{
- sPSSData->field_CD3 = 0;
- sPSSData->field_CD2 = 0;
- sPSSData->field_CD7 = 0;
+ gPSSData->field_CD3 = 0;
+ gPSSData->field_CD2 = 0;
+ gPSSData->field_CD7 = 0;
if (JOY_REPT(DPAD_UP))
{
retVal = 1;
cursorArea = CURSOR_AREA_BUTTONS;
cursorPosition = 0;
- sPSSData->field_CD7 = 1;
+ gPSSData->field_CD7 = 1;
break;
}
else if (JOY_REPT(DPAD_DOWN))
@@ -1654,20 +1654,20 @@ static u8 HandleInput_OnButtons(void)
{
cursorArea = sBoxCursorArea;
cursorPosition = sBoxCursorPosition;
- sPSSData->field_CD3 = 0;
- sPSSData->field_CD2 = 0;
- sPSSData->field_CD7 = 0;
+ gPSSData->field_CD3 = 0;
+ gPSSData->field_CD2 = 0;
+ gPSSData->field_CD7 = 0;
if (JOY_REPT(DPAD_UP))
{
retVal = 1;
cursorArea = CURSOR_AREA_IN_BOX;
- sPSSData->field_CD2 = -1;
+ gPSSData->field_CD2 = -1;
if (sBoxCursorPosition == 0)
cursorPosition = IN_BOX_COUNT - 1 - 5;
else
cursorPosition = IN_BOX_COUNT - 1;
- sPSSData->field_CD7 = 1;
+ gPSSData->field_CD7 = 1;
break;
}
else if (JOY_REPT(DPAD_DOWN | START_BUTTON))
@@ -1675,7 +1675,7 @@ static u8 HandleInput_OnButtons(void)
retVal = 1;
cursorArea = CURSOR_AREA_BOX;
cursorPosition = 0;
- sPSSData->field_CD7 = 1;
+ gPSSData->field_CD7 = 1;
break;
}
@@ -1754,7 +1754,7 @@ static void AddBoxMenu(void)
static bool8 sub_8094924(void)
{
InitMenu();
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
return sub_809494C();
else
return sub_8094A0C();
@@ -1764,7 +1764,7 @@ static bool8 sub_809494C(void)
{
u16 var0 = sub_8092458();
- switch (sPSSData->boxOption)
+ switch (gPSSData->boxOption)
{
case BOX_OPTION_DEPOSIT:
if (var0)
@@ -1800,7 +1800,7 @@ static bool8 sub_809494C(void)
}
SetMenuText(PC_TEXT_SUMMARY);
- if (sPSSData->boxOption == BOX_OPTION_MOVE_MONS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_MONS)
{
if (!sBoxCursorArea)
SetMenuText(PC_TEXT_WITHDRAW);
@@ -1816,21 +1816,21 @@ static bool8 sub_809494C(void)
static bool8 sub_8094A0C(void)
{
- if (sPSSData->cursorMonSpecies == SPECIES_EGG)
+ if (gPSSData->cursorMonSpecies == SPECIES_EGG)
return FALSE;
if (!IsActiveItemMoving())
{
- if (sPSSData->cursorMonItem == ITEM_NONE)
+ if (gPSSData->cursorMonItem == ITEM_NONE)
{
- if (sPSSData->cursorMonSpecies == SPECIES_NONE)
+ if (gPSSData->cursorMonSpecies == SPECIES_NONE)
return FALSE;
SetMenuText(PC_TEXT_GIVE2);
}
else
{
- if (!ItemIsMail(sPSSData->cursorMonItem))
+ if (!ItemIsMail(gPSSData->cursorMonItem))
{
SetMenuText(PC_TEXT_TAKE);
SetMenuText(PC_TEXT_BAG);
@@ -1840,16 +1840,16 @@ static bool8 sub_8094A0C(void)
}
else
{
- if (sPSSData->cursorMonItem == ITEM_NONE)
+ if (gPSSData->cursorMonItem == ITEM_NONE)
{
- if (sPSSData->cursorMonSpecies == SPECIES_NONE)
+ if (gPSSData->cursorMonSpecies == SPECIES_NONE)
return FALSE;
SetMenuText(PC_TEXT_GIVE);
}
else
{
- if (ItemIsMail(sPSSData->cursorMonItem) == TRUE)
+ if (ItemIsMail(gPSSData->cursorMonItem) == TRUE)
return FALSE;
SetMenuText(PC_TEXT_SWITCH);
@@ -1862,8 +1862,8 @@ static bool8 sub_8094A0C(void)
static void sub_8094AB8(struct Sprite *sprite)
{
- sprite->pos1.x = sPSSData->field_CB4->pos1.x;
- sprite->pos1.y = sPSSData->field_CB4->pos1.y + 20;
+ sprite->pos1.x = gPSSData->field_CB4->pos1.x;
+ sprite->pos1.y = gPSSData->field_CB4->pos1.y + 20;
}
static void sub_8094AD8(void)
@@ -1872,13 +1872,13 @@ static void sub_8094AD8(void)
u8 spriteId;
u8 priority, subpriority;
struct SpriteSheet spriteSheets[] = {
- {gHandCursorTiles, 0x800, TAG_TILE_0},
- {gHandCursorShadowTiles, 0x80, TAG_TILE_1},
+ {sHandCursorTiles, 0x800, TAG_TILE_0},
+ {sHandCursorShadowTiles, 0x80, TAG_TILE_1},
{}
};
struct SpritePalette spritePalettes[] = {
- {gHandCursorPalette, TAG_PAL_DAC7},
+ {sHandCursorPalette, TAG_PAL_DAC7},
{}
};
@@ -1940,22 +1940,22 @@ static void sub_8094AD8(void)
LoadSpriteSheets(spriteSheets);
LoadSpritePalettes(spritePalettes);
- sPSSData->field_CD8[0] = IndexOfSpritePaletteTag(TAG_PAL_WAVEFORM);
- sPSSData->field_CD8[1] = IndexOfSpritePaletteTag(TAG_PAL_DAC7);
+ gPSSData->field_CD8[0] = IndexOfSpritePaletteTag(TAG_PAL_WAVEFORM);
+ gPSSData->field_CD8[1] = IndexOfSpritePaletteTag(TAG_PAL_DAC7);
sub_8092398(sBoxCursorArea, sBoxCursorPosition, &x, &y);
spriteId = CreateSprite(&gSpriteTemplate_857BA50, x, y, 6);
if (spriteId != MAX_SPRITES)
{
- sPSSData->field_CB4 = &gSprites[spriteId];
- sPSSData->field_CB4->oam.paletteNum = sPSSData->field_CD8[sCanOnlyMove];
- sPSSData->field_CB4->oam.priority = 1;
+ gPSSData->field_CB4 = &gSprites[spriteId];
+ gPSSData->field_CB4->oam.paletteNum = gPSSData->field_CD8[sCanOnlyMove];
+ gPSSData->field_CB4->oam.priority = 1;
if (sIsMonBeingMoved)
- StartSpriteAnim(sPSSData->field_CB4, 3);
+ StartSpriteAnim(gPSSData->field_CB4, 3);
}
else
{
- sPSSData->field_CB4 = NULL;
+ gPSSData->field_CB4 = NULL;
}
if (sBoxCursorArea == CURSOR_AREA_IN_PARTY)
@@ -1972,21 +1972,21 @@ static void sub_8094AD8(void)
spriteId = CreateSprite(&gSpriteTemplate_857BA68, 0, 0, subpriority);
if (spriteId != MAX_SPRITES)
{
- sPSSData->field_CB8 = &gSprites[spriteId];
- sPSSData->field_CB8->oam.priority = priority;
+ gPSSData->field_CB8 = &gSprites[spriteId];
+ gPSSData->field_CB8->oam.priority = priority;
if (sBoxCursorArea)
- sPSSData->field_CB8->invisible = 1;
+ gPSSData->field_CB8->invisible = 1;
}
else
{
- sPSSData->field_CB8 = NULL;
+ gPSSData->field_CB8 = NULL;
}
}
static void sub_8094C84(void)
{
sCanOnlyMove = !sCanOnlyMove;
- sPSSData->field_CB4->oam.paletteNum = sPSSData->field_CD8[sCanOnlyMove];
+ gPSSData->field_CB4->oam.paletteNum = gPSSData->field_CD8[sCanOnlyMove];
}
u8 GetBoxCursorPosition(void)
@@ -2010,7 +2010,7 @@ void sub_8094CD4(u8 *arg0, u8 *arg1)
void sub_8094D14(u8 animNum)
{
- StartSpriteAnim(sPSSData->field_CB4, animNum);
+ StartSpriteAnim(gPSSData->field_CB4, animNum);
}
u8 sub_8094D34(void)
@@ -2020,7 +2020,7 @@ u8 sub_8094D34(void)
void sub_8094D40(void)
{
- sPSSData->field_CB4->oam.priority = 1;
+ gPSSData->field_CB4->oam.priority = 1;
}
void sub_8094D60(void)
diff --git a/src/pokemon_storage_system_6.c b/src/pokemon_storage_system_6.c
index a8cca28d5..a1d3af8f2 100644
--- a/src/pokemon_storage_system_6.c
+++ b/src/pokemon_storage_system_6.c
@@ -8,11 +8,11 @@
void InitMenu(void)
{
- sPSSData->menuItemsCount = 0;
- sPSSData->menuWidth = 0;
- sPSSData->menuWindow.bg = 0;
- sPSSData->menuWindow.paletteNum = 15;
- sPSSData->menuWindow.baseBlock = 92;
+ gPSSData->menuItemsCount = 0;
+ gPSSData->menuWidth = 0;
+ gPSSData->menuWindow.bg = 0;
+ gPSSData->menuWindow.paletteNum = 15;
+ gPSSData->menuWindow.baseBlock = 92;
}
static const u8 *const sMenuTexts[] = {
@@ -58,42 +58,42 @@ static const u8 *const sMenuTexts[] = {
void SetMenuText(u8 textId)
{
- if (sPSSData->menuItemsCount < MAX_MENU_ITEMS)
+ if (gPSSData->menuItemsCount < MAX_MENU_ITEMS)
{
u8 len;
- struct StorageMenu *menu = &sPSSData->menuItems[sPSSData->menuItemsCount];
+ struct StorageMenu *menu = &gPSSData->menuItems[gPSSData->menuItemsCount];
menu->text = sMenuTexts[textId];
menu->textId = textId;
len = StringLength(menu->text);
- if (len > sPSSData->menuWidth)
- sPSSData->menuWidth = len;
+ if (len > gPSSData->menuWidth)
+ gPSSData->menuWidth = len;
- sPSSData->menuItemsCount++;
+ gPSSData->menuItemsCount++;
}
}
s8 sub_8094E50(u8 arg0)
{
- if (arg0 >= sPSSData->menuItemsCount)
+ if (arg0 >= gPSSData->menuItemsCount)
return -1;
else
- return sPSSData->menuItems[arg0].textId;
+ return gPSSData->menuItems[arg0].textId;
}
void AddMenu(void)
{
- sPSSData->menuWindow.width = sPSSData->menuWidth + 2;
- sPSSData->menuWindow.height = 2 * sPSSData->menuItemsCount;
- sPSSData->menuWindow.tilemapLeft = 29 - sPSSData->menuWindow.width;
- sPSSData->menuWindow.tilemapTop = 15 - sPSSData->menuWindow.height;
- sPSSData->field_CB0 = AddWindow(&sPSSData->menuWindow);
- ClearWindowTilemap(sPSSData->field_CB0);
- DrawStdFrameWithCustomTileAndPalette(sPSSData->field_CB0, FALSE, 0x00b, 14);
- PrintTextArray(sPSSData->field_CB0, 1, 8, 2, 16, sPSSData->menuItemsCount, (void*)sPSSData->menuItems);
- Menu_InitCursor(sPSSData->field_CB0, 1, 0, 2, 16, sPSSData->menuItemsCount, 0);
+ gPSSData->menuWindow.width = gPSSData->menuWidth + 2;
+ gPSSData->menuWindow.height = 2 * gPSSData->menuItemsCount;
+ gPSSData->menuWindow.tilemapLeft = 29 - gPSSData->menuWindow.width;
+ gPSSData->menuWindow.tilemapTop = 15 - gPSSData->menuWindow.height;
+ gPSSData->field_CB0 = AddWindow(&gPSSData->menuWindow);
+ ClearWindowTilemap(gPSSData->field_CB0);
+ DrawStdFrameWithCustomTileAndPalette(gPSSData->field_CB0, FALSE, 0x00b, 14);
+ PrintTextArray(gPSSData->field_CB0, 1, 8, 2, 16, gPSSData->menuItemsCount, (void*)gPSSData->menuItems);
+ Menu_InitCursor(gPSSData->field_CB0, 1, 0, 2, 16, gPSSData->menuItemsCount, 0);
ScheduleBgCopyTilemapToVram(0);
- sPSSData->field_CAE = 0;
+ gPSSData->field_CAE = 0;
}
bool8 sub_8094F90(void)
@@ -135,13 +135,13 @@ s16 sub_8094F94(void)
sub_8095024();
if (textId >= 0)
- textId = sPSSData->menuItems[textId].textId;
+ textId = gPSSData->menuItems[textId].textId;
return textId;
}
void sub_8095024(void)
{
- ClearStdWindowAndFrameToTransparent(sPSSData->field_CB0, TRUE);
- RemoveWindow(sPSSData->field_CB0);
+ ClearStdWindowAndFrameToTransparent(gPSSData->field_CB0, TRUE);
+ RemoveWindow(gPSSData->field_CB0);
}
diff --git a/src/pokemon_storage_system_7.c b/src/pokemon_storage_system_7.c
index 1b2bc045a..367477a89 100644
--- a/src/pokemon_storage_system_7.c
+++ b/src/pokemon_storage_system_7.c
@@ -64,10 +64,10 @@ bool8 sub_8095050(void)
sMoveMonsPtr = Alloc(sizeof(*sMoveMonsPtr));
if (sMoveMonsPtr != NULL)
{
- sPSSData->field_2200 = AddWindow8Bit(&gUnknown_83D35D4);
- if (sPSSData->field_2200 != 0xFF)
+ gPSSData->field_2200 = AddWindow8Bit(&gUnknown_83D35D4);
+ if (gPSSData->field_2200 != 0xFF)
{
- FillWindowPixelBuffer(sPSSData->field_2200, PIXEL_FILL(0));
+ FillWindowPixelBuffer(gPSSData->field_2200, PIXEL_FILL(0));
return TRUE;
}
}
@@ -124,11 +124,11 @@ static bool8 sub_8095138(void)
ChangeBgX(0, -1024, 0);
ChangeBgY(0, -1024, 0);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);
- FillWindowPixelBuffer8Bit(sPSSData->field_2200, PIXEL_FILL(0));
+ FillWindowPixelBuffer8Bit(gPSSData->field_2200, PIXEL_FILL(0));
sub_80956A4(sMoveMonsPtr->fromRow, sMoveMonsPtr->fromColumn);
SetBgAttribute(0, BG_ATTR_PALETTEMODE, 1);
- PutWindowTilemap(sPSSData->field_2200);
- CopyWindowToVram8Bit(sPSSData->field_2200, 3);
+ PutWindowTilemap(gPSSData->field_2200);
+ CopyWindowToVram8Bit(gPSSData->field_2200, 3);
BlendPalettes(0x3F00, 8, RGB_WHITE);
sub_8094D14(2);
SetGpuRegBits(REG_OFFSET_BG0CNT, BGCNT_256COLOR);
@@ -184,7 +184,7 @@ static bool8 sub_80952A0(void)
sub_8095520();
sMoveMonsPtr->toRow = sMoveMonsPtr->field_6;
sMoveMonsPtr->toColumn = sMoveMonsPtr->field_7;
- CopyWindowToVram8Bit(sPSSData->field_2200, 2);
+ CopyWindowToVram8Bit(gPSSData->field_2200, 2);
sMoveMonsPtr->state++;
}
break;
@@ -404,7 +404,7 @@ static void sub_80956A4(u8 x, u8 y)
const u8 *iconGfx = GetMonIconPtr(species, personality, 1);
u8 index = GetValidMonIconPalIndex(species) + 8;
- BlitBitmapRectToWindow4BitTo8Bit(sPSSData->field_2200,
+ BlitBitmapRectToWindow4BitTo8Bit(gPSSData->field_2200,
iconGfx,
0,
0,
@@ -425,7 +425,7 @@ static void sub_809572C(u8 x, u8 y)
if (species != SPECIES_NONE)
{
- FillWindowPixelRect8Bit(sPSSData->field_2200,
+ FillWindowPixelRect8Bit(gPSSData->field_2200,
PIXEL_FILL(0),
24 * x,
24 * y,
diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c
index 39bec436e..3e9c27555 100644
--- a/src/pokemon_storage_system_8.c
+++ b/src/pokemon_storage_system_8.c
@@ -34,13 +34,13 @@ static const struct OamData gUnknown_83D365C = {
.y = 0,
.affineMode = ST_OAM_AFFINE_NORMAL,
.objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
+ .mosaic = FALSE,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(32x32),
.x = 0,
.matrixNum = 0,
.size = SPRITE_SIZE(32x32),
- .tileNum = 0,
+ .tileNum = 0x000,
.priority = 1,
.paletteNum = 0,
.affineParam = 0
@@ -116,7 +116,7 @@ void sub_8095B5C(void)
struct SpriteTemplate spriteTemplate;
static u32 gUnknown_3000FE8[0x61];
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
{
spriteSheet.data = gUnknown_3000FE8;
spriteSheet.size = 0x200;
@@ -126,26 +126,26 @@ void sub_8095B5C(void)
{
spriteSheet.tag = TAG_TILE_7 + i;
LoadCompressedSpriteSheet(&spriteSheet);
- sPSSData->itemIconSprites[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * 32 + (void*)(OBJ_VRAM0);
- sPSSData->itemIconSprites[i].palIndex = AllocSpritePalette(TAG_PAL_DACB + i);
- sPSSData->itemIconSprites[i].palIndex *= 16;
- sPSSData->itemIconSprites[i].palIndex += 0x100;
+ gPSSData->itemIconSprites[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * 32 + (void*)(OBJ_VRAM0);
+ gPSSData->itemIconSprites[i].palIndex = AllocSpritePalette(TAG_PAL_DACB + i);
+ gPSSData->itemIconSprites[i].palIndex *= 16;
+ gPSSData->itemIconSprites[i].palIndex += 0x100;
spriteTemplate.tileTag = TAG_TILE_7 + i;
spriteTemplate.paletteTag = TAG_PAL_DACB + i;
spriteId = CreateSprite(&spriteTemplate, 0, 0, 11);
- sPSSData->itemIconSprites[i].sprite = &gSprites[spriteId];
- sPSSData->itemIconSprites[i].sprite->invisible = TRUE;
- sPSSData->itemIconSprites[i].active = 0;
+ gPSSData->itemIconSprites[i].sprite = &gSprites[spriteId];
+ gPSSData->itemIconSprites[i].sprite->invisible = TRUE;
+ gPSSData->itemIconSprites[i].active = 0;
}
}
- sPSSData->movingItem = ITEM_NONE;
+ gPSSData->movingItem = ITEM_NONE;
}
void sub_8095C84(u8 cursorArea, u8 cursorPos)
{
u16 heldItem;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
return;
if (sub_8096210(cursorArea, cursorPos))
return;
@@ -183,7 +183,7 @@ void sub_8095D44(u8 cursorArea, u8 cursorPos)
{
u8 id;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
return;
id = sub_8096258(cursorArea, cursorPos);
@@ -196,7 +196,7 @@ void Item_FromMonToMoving(u8 cursorArea, u8 cursorPos)
u8 id;
u16 item;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
return;
id = sub_8096258(cursorArea, cursorPos);
@@ -215,7 +215,7 @@ void Item_FromMonToMoving(u8 cursorArea, u8 cursorPos)
SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND);
}
- sPSSData->movingItem = sPSSData->cursorMonItem;
+ gPSSData->movingItem = gPSSData->cursorMonItem;
}
void sub_8095E2C(u16 item)
@@ -229,7 +229,7 @@ void sub_8095E2C(u16 item)
sub_80964E8(id, 1, CURSOR_AREA_IN_BOX, 0);
sub_80962F0(id, CURSOR_AREA_BOX, 0);
sub_8096624(id, TRUE);
- sPSSData->movingItem = item;
+ gPSSData->movingItem = item;
}
void Item_SwitchMonsWithMoving(u8 cursorArea, u8 cursorPos)
@@ -237,7 +237,7 @@ void Item_SwitchMonsWithMoving(u8 cursorArea, u8 cursorPos)
u8 id;
u16 item;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
return;
id = sub_8096258(cursorArea, cursorPos);
@@ -246,14 +246,14 @@ void Item_SwitchMonsWithMoving(u8 cursorArea, u8 cursorPos)
if (cursorArea == CURSOR_AREA_IN_BOX)
{
item = GetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM);
- SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &sPSSData->movingItem);
- sPSSData->movingItem = item;
+ SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &gPSSData->movingItem);
+ gPSSData->movingItem = item;
}
else
{
item = GetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM);
- SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &sPSSData->movingItem);
- sPSSData->movingItem = item;
+ SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &gPSSData->movingItem);
+ gPSSData->movingItem = item;
}
id = sub_8096258(2, 0);
@@ -265,7 +265,7 @@ void Item_GiveMovingToMon(u8 cursorArea, u8 cursorPos)
{
u8 id;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
return;
id = sub_8096258(2, 0);
@@ -273,12 +273,12 @@ void Item_GiveMovingToMon(u8 cursorArea, u8 cursorPos)
sub_80964E8(id, 2, cursorArea, cursorPos);
if (cursorArea == CURSOR_AREA_IN_BOX)
{
- SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &sPSSData->movingItem);
+ SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &gPSSData->movingItem);
SetBoxMonIconObjMode(cursorPos, ST_OAM_OBJ_NORMAL);
}
else
{
- SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &sPSSData->movingItem);
+ SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &gPSSData->movingItem);
SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_NORMAL);
}
}
@@ -288,7 +288,7 @@ void Item_TakeMons(u8 cursorArea, u8 cursorPos)
u8 id;
u16 item;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
return;
item = 0;
@@ -309,7 +309,7 @@ void Item_TakeMons(u8 cursorArea, u8 cursorPos)
void sub_8096088(void)
{
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
{
u8 id = sub_8096258(2, 0);
sub_80964B8(id, 5);
@@ -321,12 +321,12 @@ void sub_80960C0(void)
{
s32 i;
- if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
return;
for (i = 0; i < MAX_ITEM_ICONS; i++)
{
- if (sPSSData->itemIconSprites[i].active && sPSSData->itemIconSprites[i].cursorArea == CURSOR_AREA_IN_PARTY)
+ if (gPSSData->itemIconSprites[i].active && gPSSData->itemIconSprites[i].cursorArea == CURSOR_AREA_IN_PARTY)
sub_80964E8(i, 7, CURSOR_AREA_BOX, 0);
}
}
@@ -337,11 +337,11 @@ bool8 sub_809610C(void)
for (i = 0; i < MAX_ITEM_ICONS; i++)
{
- if (sPSSData->itemIconSprites[i].active)
+ if (gPSSData->itemIconSprites[i].active)
{
- if (!sPSSData->itemIconSprites[i].sprite->affineAnimEnded && sPSSData->itemIconSprites[i].sprite->affineAnimBeginning)
+ if (!gPSSData->itemIconSprites[i].sprite->affineAnimEnded && gPSSData->itemIconSprites[i].sprite->affineAnimBeginning)
return TRUE;
- if (sPSSData->itemIconSprites[i].sprite->callback != SpriteCallbackDummy && sPSSData->itemIconSprites[i].sprite->callback != sub_80969BC)
+ if (gPSSData->itemIconSprites[i].sprite->callback != SpriteCallbackDummy && gPSSData->itemIconSprites[i].sprite->callback != sub_80969BC)
return TRUE;
}
}
@@ -353,11 +353,11 @@ bool8 IsActiveItemMoving(void)
{
s32 i;
- if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
+ if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
{
for (i = 0; i < MAX_ITEM_ICONS; i++)
{
- if (sPSSData->itemIconSprites[i].active && sPSSData->itemIconSprites[i].cursorArea == CURSOR_AREA_BOX)
+ if (gPSSData->itemIconSprites[i].active && gPSSData->itemIconSprites[i].cursorArea == CURSOR_AREA_BOX)
return TRUE;
}
}
@@ -367,12 +367,12 @@ bool8 IsActiveItemMoving(void)
const u8 *GetMovingItemName(void)
{
- return ItemId_GetName(sPSSData->movingItem);
+ return ItemId_GetName(gPSSData->movingItem);
}
u16 GetMovingItem(void)
{
- return sPSSData->movingItem;
+ return gPSSData->movingItem;
}
static u8 sub_80961D8(void)
@@ -381,9 +381,9 @@ static u8 sub_80961D8(void)
for (i = 0; i < MAX_ITEM_ICONS; i++)
{
- if (!sPSSData->itemIconSprites[i].active)
+ if (!gPSSData->itemIconSprites[i].active)
{
- sPSSData->itemIconSprites[i].active = TRUE;
+ gPSSData->itemIconSprites[i].active = TRUE;
return i;
}
}
@@ -397,9 +397,9 @@ static bool32 sub_8096210(u8 cursorArea, u8 cursorPos)
for (i = 0; i < MAX_ITEM_ICONS; i++)
{
- if (sPSSData->itemIconSprites[i].active
- && sPSSData->itemIconSprites[i].cursorArea == cursorArea
- && sPSSData->itemIconSprites[i].cursorPos == cursorPos)
+ if (gPSSData->itemIconSprites[i].active
+ && gPSSData->itemIconSprites[i].cursorArea == cursorArea
+ && gPSSData->itemIconSprites[i].cursorPos == cursorPos)
return TRUE;
}
@@ -412,9 +412,9 @@ static u8 sub_8096258(u8 cursorArea, u8 cursorPos)
for (i = 0; i < MAX_ITEM_ICONS; i++)
{
- if (sPSSData->itemIconSprites[i].active
- && sPSSData->itemIconSprites[i].cursorArea == cursorArea
- && sPSSData->itemIconSprites[i].cursorPos == cursorPos)
+ if (gPSSData->itemIconSprites[i].active
+ && gPSSData->itemIconSprites[i].cursorArea == cursorArea
+ && gPSSData->itemIconSprites[i].cursorPos == cursorPos)
return i;
}
@@ -427,8 +427,8 @@ static u8 sub_80962A8(struct Sprite *sprite)
for (i = 0; i < MAX_ITEM_ICONS; i++)
{
- if (sPSSData->itemIconSprites[i].active
- && sPSSData->itemIconSprites[i].sprite == sprite)
+ if (gPSSData->itemIconSprites[i].active
+ && gPSSData->itemIconSprites[i].sprite == sprite)
return i;
}
@@ -447,27 +447,27 @@ static void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos)
case CURSOR_AREA_IN_BOX:
row = cursorPos % IN_BOX_ROWS;
column = cursorPos / IN_BOX_ROWS;
- sPSSData->itemIconSprites[id].sprite->pos1.x = (24 * row) + 112;
- sPSSData->itemIconSprites[id].sprite->pos1.y = (24 * column) + 56;
- sPSSData->itemIconSprites[id].sprite->oam.priority = 2;
+ gPSSData->itemIconSprites[id].sprite->pos1.x = (24 * row) + 112;
+ gPSSData->itemIconSprites[id].sprite->pos1.y = (24 * column) + 56;
+ gPSSData->itemIconSprites[id].sprite->oam.priority = 2;
break;
case CURSOR_AREA_IN_PARTY:
if (cursorPos == 0)
{
- sPSSData->itemIconSprites[id].sprite->pos1.x = 116;
- sPSSData->itemIconSprites[id].sprite->pos1.y = 76;
+ gPSSData->itemIconSprites[id].sprite->pos1.x = 116;
+ gPSSData->itemIconSprites[id].sprite->pos1.y = 76;
}
else
{
- sPSSData->itemIconSprites[id].sprite->pos1.x = 164;
- sPSSData->itemIconSprites[id].sprite->pos1.y = 24 * (cursorPos - 1) + 28;
+ gPSSData->itemIconSprites[id].sprite->pos1.x = 164;
+ gPSSData->itemIconSprites[id].sprite->pos1.y = 24 * (cursorPos - 1) + 28;
}
- sPSSData->itemIconSprites[id].sprite->oam.priority = 1;
+ gPSSData->itemIconSprites[id].sprite->oam.priority = 1;
break;
}
- sPSSData->itemIconSprites[id].cursorArea = cursorArea;
- sPSSData->itemIconSprites[id].cursorPos = cursorPos;
+ gPSSData->itemIconSprites[id].cursorArea = cursorArea;
+ gPSSData->itemIconSprites[id].cursorPos = cursorPos;
}
static void sub_8096408(u8 id, const u32 *itemTiles, const u32 *itemPal)
@@ -477,14 +477,14 @@ static void sub_8096408(u8 id, const u32 *itemTiles, const u32 *itemPal)
if (id >= MAX_ITEM_ICONS)
return;
- CpuFastFill(0, sPSSData->field_42C4, 0x200);
- LZ77UnCompWram(itemTiles, sPSSData->field_22C4);
+ CpuFastFill(0, gPSSData->field_42C4, 0x200);
+ LZ77UnCompWram(itemTiles, gPSSData->field_22C4);
for (i = 0; i < 3; i++)
- CpuFastCopy(sPSSData->field_22C4 + (i * 0x60), sPSSData->field_42C4 + (i * 0x80), 0x60);
+ CpuFastCopy(gPSSData->field_22C4 + (i * 0x60), gPSSData->field_42C4 + (i * 0x80), 0x60);
- CpuFastCopy(sPSSData->field_42C4, sPSSData->itemIconSprites[id].tiles, 0x200);
- LZ77UnCompWram(itemPal, sPSSData->field_42C4);
- LoadPalette(sPSSData->field_42C4, sPSSData->itemIconSprites[id].palIndex, 0x20);
+ CpuFastCopy(gPSSData->field_42C4, gPSSData->itemIconSprites[id].tiles, 0x200);
+ LZ77UnCompWram(itemPal, gPSSData->field_42C4);
+ LoadPalette(gPSSData->field_42C4, gPSSData->itemIconSprites[id].palIndex, 0x20);
}
static void sub_80964B8(u8 id, u8 animNum)
@@ -492,7 +492,7 @@ static void sub_80964B8(u8 id, u8 animNum)
if (id >= MAX_ITEM_ICONS)
return;
- StartSpriteAffineAnim(sPSSData->itemIconSprites[id].sprite, animNum);
+ StartSpriteAffineAnim(gPSSData->itemIconSprites[id].sprite, animNum);
}
static void sub_80964E8(u8 id, u8 command, u8 cursorArea, u8 cursorPos)
@@ -503,33 +503,33 @@ static void sub_80964E8(u8 id, u8 command, u8 cursorArea, u8 cursorPos)
switch (command)
{
case 0:
- sPSSData->itemIconSprites[id].sprite->data[0] = id;
- sPSSData->itemIconSprites[id].sprite->callback = sub_809692C;
+ gPSSData->itemIconSprites[id].sprite->data[0] = id;
+ gPSSData->itemIconSprites[id].sprite->callback = sub_809692C;
break;
case 1:
- sPSSData->itemIconSprites[id].sprite->data[0] = 0;
- sPSSData->itemIconSprites[id].sprite->callback = sub_8096958;
+ gPSSData->itemIconSprites[id].sprite->data[0] = 0;
+ gPSSData->itemIconSprites[id].sprite->callback = sub_8096958;
break;
case 2:
- sPSSData->itemIconSprites[id].sprite->data[0] = 0;
- sPSSData->itemIconSprites[id].sprite->data[6] = cursorArea;
- sPSSData->itemIconSprites[id].sprite->data[7] = cursorPos;
- sPSSData->itemIconSprites[id].sprite->callback = sub_80969F4;
+ gPSSData->itemIconSprites[id].sprite->data[0] = 0;
+ gPSSData->itemIconSprites[id].sprite->data[6] = cursorArea;
+ gPSSData->itemIconSprites[id].sprite->data[7] = cursorPos;
+ gPSSData->itemIconSprites[id].sprite->callback = sub_80969F4;
break;
case 3:
- sPSSData->itemIconSprites[id].sprite->data[0] = 0;
- sPSSData->itemIconSprites[id].sprite->callback = sub_8096A74;
- sPSSData->itemIconSprites[id].sprite->data[6] = cursorArea;
- sPSSData->itemIconSprites[id].sprite->data[7] = cursorPos;
+ gPSSData->itemIconSprites[id].sprite->data[0] = 0;
+ gPSSData->itemIconSprites[id].sprite->callback = sub_8096A74;
+ gPSSData->itemIconSprites[id].sprite->data[6] = cursorArea;
+ gPSSData->itemIconSprites[id].sprite->data[7] = cursorPos;
break;
case 4:
- sPSSData->itemIconSprites[id].sprite->data[0] = 0;
- sPSSData->itemIconSprites[id].sprite->data[6] = cursorArea;
- sPSSData->itemIconSprites[id].sprite->data[7] = cursorPos;
- sPSSData->itemIconSprites[id].sprite->callback = sub_8096B10;
+ gPSSData->itemIconSprites[id].sprite->data[0] = 0;
+ gPSSData->itemIconSprites[id].sprite->data[6] = cursorArea;
+ gPSSData->itemIconSprites[id].sprite->data[7] = cursorPos;
+ gPSSData->itemIconSprites[id].sprite->callback = sub_8096B10;
break;
case 7:
- sPSSData->itemIconSprites[id].sprite->callback = sub_8096BAC;
+ gPSSData->itemIconSprites[id].sprite->callback = sub_8096BAC;
break;
}
}
@@ -539,8 +539,8 @@ static void sub_8096624(u8 id, bool8 show)
if (id >= MAX_ITEM_ICONS)
return;
- sPSSData->itemIconSprites[id].active = show;
- sPSSData->itemIconSprites[id].sprite->invisible = (show == FALSE);
+ gPSSData->itemIconSprites[id].active = show;
+ gPSSData->itemIconSprites[id].sprite->invisible = (show == FALSE);
}
static const u32 *GetItemIconPic(u16 itemId)
@@ -558,9 +558,9 @@ void PrintItemDescription(void)
const u8 *description;
if (IsActiveItemMoving())
- description = ItemId_GetDescription(sPSSData->movingItem);
+ description = ItemId_GetDescription(gPSSData->movingItem);
else
- description = ItemId_GetDescription(sPSSData->cursorMonItem);
+ description = ItemId_GetDescription(gPSSData->cursorMonItem);
FillWindowPixelBuffer(2, PIXEL_FILL(1));
AddTextPrinterParameterized5(2, 2, description, 2, 0, 0, NULL, 0, 0);
@@ -568,7 +568,7 @@ void PrintItemDescription(void)
void sub_80966F4(void)
{
- sPSSData->field_2236 = 25;
+ gPSSData->field_2236 = 25;
LoadBgTiles(0, gUnknown_83D35DC, 0x80, 0x1A4);
sub_8096898(0);
}
@@ -577,41 +577,41 @@ bool8 sub_8096728(void)
{
s32 i, var;
- if (sPSSData->field_2236 == 0)
+ if (gPSSData->field_2236 == 0)
return FALSE;
- sPSSData->field_2236--;
- var = 25 - sPSSData->field_2236;
+ gPSSData->field_2236--;
+ var = 25 - gPSSData->field_2236;
for (i = 0; i < var; i++)
{
- WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + sPSSData->field_2236 + i, i, 12, 1, 8, 15, 25);
+ WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + gPSSData->field_2236 + i, i, 12, 1, 8, 15, 25);
}
sub_8096898(var);
- return (sPSSData->field_2236 != 0);
+ return (gPSSData->field_2236 != 0);
}
bool8 sub_80967C0(void)
{
s32 i, var;
- if (sPSSData->field_2236 == 25)
+ if (gPSSData->field_2236 == 25)
return FALSE;
- if (sPSSData->field_2236 == 0)
+ if (gPSSData->field_2236 == 0)
FillBgTilemapBufferRect(0, 0, 25, 11, 1, 10, 17);
- sPSSData->field_2236++;
- var = 25 - sPSSData->field_2236;
+ gPSSData->field_2236++;
+ var = 25 - gPSSData->field_2236;
for (i = 0; i < var; i++)
{
- WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + sPSSData->field_2236 + i, i, 12, 1, 8, 15, 25);
+ WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + gPSSData->field_2236 + i, i, 12, 1, 8, 15, 25);
}
sub_8096898(var);
FillBgTilemapBufferRect(0, 0, var, 11, 1, 10, 0x11);
- return (sPSSData->field_2236 != 25);
+ return (gPSSData->field_2236 != 25);
}
static void sub_8096898(u32 x)
@@ -660,9 +660,9 @@ static void sub_8096958(struct Sprite *sprite)
static void sub_80969BC(struct Sprite *sprite)
{
- sprite->pos1.x = sPSSData->field_CB4->pos1.x + 4;
- sprite->pos1.y = sPSSData->field_CB4->pos1.y + sPSSData->field_CB4->pos2.y + 8;
- sprite->oam.priority = sPSSData->field_CB4->oam.priority;
+ sprite->pos1.x = gPSSData->field_CB4->pos1.x + 4;
+ sprite->pos1.y = gPSSData->field_CB4->pos1.y + gPSSData->field_CB4->pos2.y + 8;
+ sprite->oam.priority = gPSSData->field_CB4->oam.priority;
}
static void sub_80969F4(struct Sprite *sprite)
diff --git a/src/pokemon_storage_system_9.c b/src/pokemon_storage_system_9.c
index 0f3078127..42fecfd97 100644
--- a/src/pokemon_storage_system_9.c
+++ b/src/pokemon_storage_system_9.c
@@ -54,7 +54,7 @@ static void sub_8096CDC(struct UnkStruct_2000028 *unkStruct)
for (i = 0; i < unkStruct->newField; i++)
{
- CpuSet(unkStruct->unk_00, unkStruct->unk_04, (unkStruct->unk_08 / 2));
+ CpuCopy16(unkStruct->unk_00, unkStruct->unk_04, unkStruct->unk_08);
unkStruct->unk_04 += 64;
unkStruct->unk_00 += (unkStruct->unk_0a * 2);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-09 02:09:41 +0000