Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-25 15:49:02 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Identify unk_02017728 -> system and zip core_sys.h into it

Browse Source
This commit is contained in:
Rachel 2025-02-07 21:53:06 -08:00
parent b48080e37e
commit d5476dfba4
241 changed files with 1421 additions and 1505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/3d_rendering.md
View File

@ -105,14 +105,14 @@ angle = (angle + 100) % 0xFFFF;
Easy3DObject_SetRotation(&giratinaObj, angle, ROTATION_AXIS_Y);
// Resize using L and R
if (gCoreSys.heldKeys & PAD_BUTTON_R) {
if (gSystem.heldKeys & PAD_BUTTON_R) {
VecFx32 scale;
Easy3DObject_GetScale(&giratinaObj, &scale.x, &scale.y, &scale.z);
scale.x = FX_Mul(scale.x, FX32_CONST(1.01));
scale.y = FX_Mul(scale.y, FX32_CONST(1.01));
scale.z = FX_Mul(scale.z, FX32_CONST(1.01));
Easy3DObject_SetScale(&giratinaObj, scale.x, scale.y, scale.z);
} else if (gCoreSys.heldKeys & PAD_BUTTON_L) {
} else if (gSystem.heldKeys & PAD_BUTTON_L) {
VecFx32 scale;
Easy3DObject_GetScale(&giratinaObj, &scale.x, &scale.y, &scale.z);
scale.x = FX_Mul(scale.x, FX32_CONST(0.99));
@ -120,4 +120,4 @@ if (gCoreSys.heldKeys & PAD_BUTTON_R) {
scale.z = FX_Mul(scale.z, FX32_CONST(0.99));
Easy3DObject_SetScale(&giratinaObj, scale.x, scale.y, scale.z);
}
```
```

62
include/core_sys.h
View File

@ -1,62 +0,0 @@
#ifndef POKEPLATINUM_CORE_SYS_H
#define POKEPLATINUM_CORE_SYS_H
#include "overlay023/funcptr_ov23_022537D4.h"
#include "sys_task_manager.h"
typedef void (*Callback)(void *);
enum ButtonMode {
BUTTON_MODE_NORMAL = 0,
BUTTON_MODE_START_IS_X = 1,
BUTTON_MODE_SWAP_XY = 2,
BUTTON_MODE_L_IS_A = 3,
};
#define PAD_KEY (PAD_KEY_UP | PAD_KEY_DOWN | PAD_KEY_LEFT | PAD_KEY_RIGHT)
#define JOY_NEW(buttons) (gCoreSys.pressedKeys & (buttons))
#define JOY_HELD(buttons) (gCoreSys.heldKeys & (buttons))
#define JOY_REPEAT(buttons) (gCoreSys.pressedKeysRepeatable & (buttons))
typedef struct CoreSys {
Callback mainCallback;
void *mainCallbackData;
Callback hblankCallback;
void *hblankCallbackData;
UnkFuncPtr_ov23_022537D4 unk_10;
UnkFuncPtr_ov23_022537D4 unk_14;
SysTaskManager *mainTaskMgr;
SysTaskManager *vBlankTaskMgr;
SysTaskManager *postVBlankTaskMgr;
SysTaskManager *printTaskMgr;
u32 *unk_28;
u32 vblankCounter;
u32 frameCounter;
enum ButtonMode buttonMode;
u32 heldKeysRaw;
u32 pressedKeysRaw;
u32 pressedKeysRepeatableRaw;
u32 heldKeys;
u32 pressedKeys;
u32 pressedKeysRepeatable;
int autorepeatTimer;
int autorepeatRate;
int autorepeatDelay;
u16 touchX;
u16 touchY;
u16 touchPressed;
u16 touchHeld;
u8 unk_64;
u8 unk_65;
u8 gbaCartridgeVersion;
u8 inhibitSleep;
u8 inhibitReset;
u8 padding_69[3];
BOOL unk_6C;
u32 *heapCanary;
} CoreSys;
extern CoreSys gCoreSys;
#endif // POKEPLATINUM_CORE_SYS_H

6
include/overlay023/funcptr_ov23_022537D4.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_FUNCPTR_OV23_022537D4_H
#define POKEPLATINUM_FUNCPTR_OV23_022537D4_H
typedef void (*UnkFuncPtr_ov23_022537D4)(void);
#endif // POKEPLATINUM_FUNCPTR_OV23_022537D4_H

82
include/system.h Normal file
View File

@ -0,0 +1,82 @@
#ifndef POKEPLATINUM_SYSTEM_H
#define POKEPLATINUM_SYSTEM_H
#include "sys_task_manager.h"
typedef void (*Callback)(void *);
typedef void (*UnkCallback)(void);
enum ButtonMode {
BUTTON_MODE_NORMAL = 0,
BUTTON_MODE_START_IS_X = 1,
BUTTON_MODE_SWAP_XY = 2,
BUTTON_MODE_L_IS_A = 3,
};
#define PAD_KEY (PAD_KEY_UP | PAD_KEY_DOWN | PAD_KEY_LEFT | PAD_KEY_RIGHT)
#define JOY_NEW(buttons) (gSystem.pressedKeys & (buttons))
#define JOY_HELD(buttons) (gSystem.heldKeys & (buttons))
#define JOY_REPEAT(buttons) (gSystem.pressedKeysRepeatable & (buttons))
typedef struct System {
Callback mainCallback;
void *mainCallbackData;
Callback hblankCallback;
void *hblankCallbackData;
UnkCallback dummyCallback_10;
UnkCallback dummyCallback_14;
SysTaskManager *mainTaskMgr;
SysTaskManager *vBlankTaskMgr;
SysTaskManager *postVBlankTaskMgr;
SysTaskManager *printTaskMgr;
u32 *unk_28;
u32 vblankCounter;
u32 frameCounter;
enum ButtonMode buttonMode;
u32 heldKeysRaw;
u32 pressedKeysRaw;
u32 pressedKeysRepeatableRaw;
u32 heldKeys;
u32 pressedKeys;
u32 pressedKeysRepeatable;
int autorepeatTimer;
int autorepeatRate;
int autorepeatDelay;
u16 touchX;
u16 touchY;
u16 touchPressed;
u16 touchHeld;
u8 unk_64;
u8 unk_65;
u8 gbaCartridgeVersion;
u8 inhibitSleep;
u8 inhibitReset;
u8 padding_69[3];
BOOL unk_6C;
u32 *heapCanary;
} System;
extern System gSystem;
void sub_02017728(void);
void SetMainCallback(Callback cb, void *data);
void DisableHBlank(void);
BOOL SetHBlankCallback(Callback cb, void *data);
void sub_0201789C(void);
void InitGraphics(void);
void *ReadFileToHeap(int heapID, const char *filename);
void ReadFileToBuffer(const char *filename, void **buf);
void sub_02017ACC(void);
void InitKeypadAndTouchpad(void);
void SetGBACartridgeVersion(int version);
void SleepLock(u8 param0);
void SleepUnlock(u8 param0);
void ReadKeypadAndTouchpad(void);
void SetAutorepeat(int rate, int delay);
void ResetLock(u8 param0);
void ResetUnlock(u8 param0);
void InitHeapCanary(int param0);
void FreeHeapCanary(void);
BOOL HeapCanaryOK(void);
#endif // POKEPLATINUM_SYSTEM_H

27
include/unk_02017728.h
View File

@ -1,27 +0,0 @@
#ifndef POKEPLATINUM_UNK_02017728_H
#define POKEPLATINUM_UNK_02017728_H
#include "core_sys.h"
void sub_02017728(void);
void SetMainCallback(Callback cb, void *data);
void DisableHBlank(void);
BOOL SetHBlankCallback(Callback cb, void *data);
void sub_0201789C(void);
void InitGraphics(void);
void *ReadFileToHeap(int heapID, const char *filename);
void ReadFileToBuffer(const char *filename, void **buf);
void sub_02017ACC(void);
void InitKeypadAndTouchpad(void);
void SetGBACartridgeVersion(int version);
void SleepLock(u8 param0);
void SleepUnlock(u8 param0);
void ReadKeypadAndTouchpad(void);
void SetAutorepeat(int rate, int delay);
void ResetLock(u8 param0);
void ResetUnlock(u8 param0);
void InitHeapCanary(int param0);
void FreeHeapCanary(void);
BOOL HeapCanaryOK(void);
#endif // POKEPLATINUM_UNK_02017728_H

2
platinum.us/main.lsf
View File

@ -66,7 +66,7 @@ Static main
Object main.nef.p/src_easy3d_object.c.o
Object main.nef.p/src_unk_02017428.c.o
Object main.nef.p/src_unk_02017498.c.o
Object main.nef.p/src_unk_02017728.c.o
Object main.nef.p/src_system.c.o
Object main.nef.p/src_heap.c.o
Object main.nef.p/src_bg_window.c.o
Object main.nef.p/src_easy3d.c.o

11
src/applications/journal_display/journal_controller.c
View File

@ -13,7 +13,6 @@
#include "applications/journal_display/journal_printer.h"
#include "bg_window.h"
#include "core_sys.h"
#include "font.h"
#include "graphics.h"
#include "gx_layers.h"
@ -26,11 +25,11 @@
#include "savedata.h"
#include "strbuf.h"
#include "string_template.h"
#include "system.h"
#include "trainer_info.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_020393C8.h"
#include "unk_0208C098.h"
@ -330,7 +329,7 @@ static int JournalController_IsOpeningTransitionDone(JournalManager *journalMana
static int JournalController_HandleInput(JournalManager *journalManager)
{
if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
if (gSystem.pressedKeys & PAD_KEY_LEFT) {
if (JournalController_NewDirectionPageExists(journalManager, -1) == TRUE) {
return JOURNAL_STATE_TURN_LEFT;
}
@ -338,7 +337,7 @@ static int JournalController_HandleInput(JournalManager *journalManager)
return JOURNAL_STATE_HANDLE_INPUT;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_KEY_RIGHT)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_KEY_RIGHT)) {
if (JournalController_NewDirectionPageExists(journalManager, 1) == TRUE) {
return JOURNAL_STATE_TURN_RIGHT;
}
@ -346,7 +345,7 @@ static int JournalController_HandleInput(JournalManager *journalManager)
return JOURNAL_STATE_HANDLE_INPUT;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
if (journalManager->page != 0) {
if (JournalController_NewDirectionPageExists(journalManager, -1) == TRUE) {
return JOURNAL_STATE_TURN_LEFT;
@ -357,7 +356,7 @@ static int JournalController_HandleInput(JournalManager *journalManager)
}
}
if (gCoreSys.pressedKeys & PAD_BUTTON_START) {
if (gSystem.pressedKeys & PAD_BUTTON_START) {
sub_0208C120(1, HEAP_ID_JOURNAL);
return JOURNAL_STATE_CLOSE;
}

3
src/applications/options_menu.c
View File

@ -11,7 +11,6 @@
#include "struct_defs/struct_02099F80.h"
#include "bg_window.h"
#include "core_sys.h"
#include "font.h"
#include "game_options.h"
#include "graphics.h"
@ -25,12 +24,12 @@
#include "render_text.h"
#include "render_window.h"
#include "strbuf.h"
#include "system.h"
#include "text.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_020393C8.h"
#include "vram_transfer.h"

3
src/applications/pokemon_summary_screen/main.c
View File

@ -21,7 +21,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "font.h"
#include "game_options.h"
#include "graphics.h"
@ -40,6 +39,7 @@
#include "savedata.h"
#include "strbuf.h"
#include "string_template.h"
#include "system.h"
#include "system_flags.h"
#include "trainer_info.h"
#include "unk_020041CC.h"
@ -50,7 +50,6 @@
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_02015F84.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_020393C8.h"
#include "unk_0208C098.h"

4
src/applications/pokemon_summary_screen/subscreen.c
View File

@ -9,7 +9,7 @@
#include "applications/pokemon_summary_screen/sprite.h"
#include "bg_window.h"
#include "core_sys.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_02005474.h"
@ -177,7 +177,7 @@ static int sub_02092224(PokemonSummaryScreen *summaryScreen)
if (v0 != TOUCHSCREEN_INPUT_NONE) {
u16 v1 = 0xFFFE;
if (Bg_DoesPixelAtXYMatchVal(summaryScreen->bgConfig, BG_LAYER_SUB_0, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) {
if (Bg_DoesPixelAtXYMatchVal(summaryScreen->bgConfig, BG_LAYER_SUB_0, gSystem.touchX, gSystem.touchY, &v1) == 0) {
return TOUCHSCREEN_INPUT_NONE;
}
}

4
src/battle/battle_display.c
View File

@ -120,7 +120,6 @@
#include "assert.h"
#include "bg_window.h"
#include "core_sys.h"
#include "enums.h"
#include "flags.h"
#include "heap.h"
@ -134,6 +133,7 @@
#include "render_window.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "trainer_info.h"
#include "unk_020041CC.h"
@ -3022,7 +3022,7 @@ static void ov16_022604C8(SysTask *param0, void *param1)
v0->unk_0A = 5;
break;
case 5:
if (gCoreSys.pressedKeys & PAD_BUTTON_START) {
if (gSystem.pressedKeys & PAD_BUTTON_START) {
BattlerData *v14;
int i;

8
src/battle/battle_script.c
View File

@ -50,7 +50,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "char_transfer.h"
#include "core_sys.h"
#include "flags.h"
#include "heap.h"
#include "item.h"
@ -65,6 +64,7 @@
#include "strbuf.h"
#include "string_template.h"
#include "sys_task.h"
#include "system.h"
#include "text.h"
#include "touch_screen.h"
#include "trainer_data.h"
@ -2055,7 +2055,7 @@ static BOOL BtlCmd_WaitButtonABTime(BattleSystem *battleSys, BattleContext *batt
int frames = BattleScript_Read(battleCtx);
if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE) {
if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y)) || TouchScreen_Tapped()) {
if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y)) || TouchScreen_Tapped()) {
battleCtx->waitCounter = frames;
}
}
@ -10207,7 +10207,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData)
case SEQ_GET_EXP_LEVEL_UP_SUMMARY_PRINT_DIFF_WAIT:
case SEQ_GET_EXP_LEVEL_UP_SUMMARY_PRINT_TRUE_WAIT:
if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y)) || TouchScreen_Tapped()) {
if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y)) || TouchScreen_Tapped()) {
Sound_PlayEffect(SEQ_SE_CONFIRM);
data->seqNum++;
}
@ -10784,7 +10784,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1)
break;
case 13:
if (ov21_021E8DEC(v2->tmpPtr[0])) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
v2->seqNum = 14;
} else if (TouchScreen_Tapped()) {
Sound_PlayEffect(1500);

2
src/battle/ov16_0223B140.c
View File

@ -67,6 +67,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "trainer_info.h"
#include "unk_020041CC.h"
@ -78,7 +79,6 @@
#include "unk_02014000.h"
#include "unk_0201567C.h"
#include "unk_02015F84.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_0202419C.h"
#include "unk_02024220.h"

25
src/battle/ov16_0226871C.c
View File

@ -31,7 +31,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "char_transfer.h"
#include "core_sys.h"
#include "enums.h"
#include "font.h"
#include "graphics.h"
@ -51,12 +50,12 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "touch_screen.h"
#include "unk_02005474.h"
#include "unk_0200C6E4.h"
#include "unk_02012744.h"
#include "unk_02017728.h"
#include "unk_0207C908.h"
#include "unk_0208C098.h"
@ -3755,7 +3754,7 @@ static void ov16_0226BD74(SysTask *param0, void *param1)
v2 = PaletteData_GetFadedBuffer(v1, 1);
v3 = (16 - 8) * 2;
if (gCoreSys.touchHeld && ((v4 == 1) || (v5 == 1))) {
if (gSystem.touchHeld && ((v4 == 1) || (v5 == 1))) {
if (memcmp(&v2[8], &v0->unk_5C[8], v3) == 0) {
if (BattleSystem_BattleType(v0->unk_00) & 0x80) {
MI_CpuCopy16(&v0->unk_60[0], &v2[0], 0x20);
@ -3789,7 +3788,7 @@ static int ov16_0226BE48(UnkStruct_ov16_02268A14 *param0)
}
if (v0->unk_00 == 0) {
if ((param0->unk_6C0 == 1) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) {
if ((param0->unk_6C0 == 1) || (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) {
if (param0->unk_6C0 == 0) {
Sound_PlayEffect(1500);
}
@ -3834,18 +3833,18 @@ static int ov16_0226BEC0(UnkStruct_ov16_02268A14 *param0, int param1)
default:
v4 = Unk_ov16_022701EC[v0->unk_01][v0->unk_02];
if ((v4 == 3) && (gCoreSys.pressedKeys & PAD_KEY_UP)) {
if ((v4 == 3) && (gSystem.pressedKeys & PAD_KEY_UP)) {
(void)0;
} else {
v1 = ov16_0226CB10(v0, 3, 2, Unk_ov16_022701EC[0]);
if ((v1 == 0) && (v4 == 0)) {
if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
if (gSystem.pressedKeys & PAD_KEY_LEFT) {
v0->unk_02 = 0;
v0->unk_01 = 1;
Sound_PlayEffect(1500);
v1 = PAD_KEY_LEFT;
} else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
} else if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
v0->unk_02 = 2;
v0->unk_01 = 1;
Sound_PlayEffect(1500);
@ -4356,7 +4355,7 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2
v1 = param0->unk_02;
v0 = param0->unk_01;
if (gCoreSys.pressedKeys & PAD_KEY_UP) {
if (gSystem.pressedKeys & PAD_KEY_UP) {
param0->unk_01--;
if (param0->unk_01 < 0) {
@ -4375,7 +4374,7 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2
}
v2 = PAD_KEY_UP;
} else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
} else if (gSystem.pressedKeys & PAD_KEY_DOWN) {
param0->unk_01++;
if (param0->unk_01 >= param2) {
@ -4394,7 +4393,7 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2
}
v2 = PAD_KEY_DOWN;
} else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
} else if (gSystem.pressedKeys & PAD_KEY_LEFT) {
param0->unk_02--;
if (param0->unk_02 < 0) {
@ -4413,7 +4412,7 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2
}
v2 = PAD_KEY_LEFT;
} else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
} else if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
param0->unk_02++;
if (param0->unk_02 >= param1) {
@ -4432,9 +4431,9 @@ static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2
}
v2 = PAD_KEY_RIGHT;
} else if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
} else if (gSystem.pressedKeys & PAD_BUTTON_A) {
v2 = PAD_BUTTON_A;
} else if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
} else if (gSystem.pressedKeys & PAD_BUTTON_B) {
v2 = PAD_BUTTON_B;
} else {
return 0;

2
src/cell_actor.c
View File

@ -8,7 +8,7 @@
#include "nnsys/g2d/g2d_RendererCore.h"
#include "heap.h"
#include "unk_02017728.h"
#include "system.h"
typedef void (*CellActorDrawFunc)(const CellActorCollection *, CellActor *);
typedef void (*CellActorAnimUpdateFunc)(CellActor *);

9
src/choose_starter/choose_starter_app.c
View File

@ -28,7 +28,6 @@
#include "camera.h"
#include "cell_actor.h"
#include "char_transfer.h"
#include "core_sys.h"
#include "easy3d.h"
#include "font.h"
#include "game_options.h"
@ -49,13 +48,13 @@
#include "strbuf.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
#include "unk_0200762C.h"
#include "unk_0200F174.h"
#include "unk_02015064.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_0202419C.h"
#include "vram_transfer.h"
@ -954,7 +953,7 @@ static BOOL IsSelectionMade(ChooseStarterApp *param0, int param1)
case 3:
ov78_021D1C58(param0);
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
ov78_021D1C98(param0, 1);
Sound_PlayEffect(1500);
@ -1128,14 +1127,14 @@ static void SetSelectionMatrixObjects(ChooseStarterApp *param0)
static void ov78_021D1C58(ChooseStarterApp *param0)
{
if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
if (gSystem.pressedKeys & PAD_KEY_LEFT) {
if (param0->cursorPosition - 1 >= 0) {
param0->cursorPosition -= 1;
Sound_PlayEffect(1500);
}
}
if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
if (param0->cursorPosition + 1 < 3) {
param0->cursorPosition += 1;
Sound_PlayEffect(1500);

4
src/comm_player_manager.c
View File

@ -29,7 +29,6 @@
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_system.h"
#include "game_records.h"
#include "heap.h"
@ -40,6 +39,7 @@
#include "player_avatar.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "trainer_info.h"
#include "unk_0202854C.h"
#include "unk_020366A0.h"
@ -473,7 +473,7 @@ static void CommPlayer_SendMoveSpeed()
{
u8 moveSpeed = 2;
if (PAD_BUTTON_B & gCoreSys.heldKeys) {
if (PAD_BUTTON_B & gSystem.heldKeys) {
moveSpeed = 1;
}

6
src/communication_system.c
View File

@ -14,11 +14,11 @@
#include "comm_ring.h"
#include "communication_information.h"
#include "core_sys.h"
#include "heap.h"
#include "rtc.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02030EE0.h"
#include "unk_020322D8.h"
#include "unk_0203266C.h"
@ -509,7 +509,7 @@ BOOL CommSys_Update(void)
sCommunicationSystem->unk_6B5++;
Unk_021C07C5 = 0;
CommSys_UpdateTransitionType();
sCommunicationSystem->sendHeldKeys |= (gCoreSys.heldKeys & 0x7fff);
sCommunicationSystem->sendHeldKeys |= (gSystem.heldKeys & 0x7fff);
sub_02035534();
sub_02034B50();
sCommunicationSystem->sendHeldKeys &= 0x8000;
@ -1827,7 +1827,7 @@ void CommSys_Seed(MATHRandContext32 *rand)
RTCTime time;
GetCurrentDateTime(&date, &time);
seed = (((((((u64)date.year * 16ULL + date.month) * 32ULL) + date.day) * 32ULL + time.hour) * 64ULL + time.minute) * 64ULL + (time.second + gCoreSys.vblankCounter));
seed = (((((((u64)date.year * 16ULL + date.month) * 32ULL) + date.day) * 32ULL + time.hour) * 64ULL + time.minute) * 64ULL + (time.second + gSystem.vblankCounter));
MATH_InitRand32(rand, seed);
}

5
src/dw_warp/dw_warp.c
View File

@ -11,7 +11,6 @@
#include "overlay115/camera_angle.h"
#include "camera.h"
#include "core_sys.h"
#include "easy3d_object.h"
#include "gx_layers.h"
#include "heap.h"
@ -20,9 +19,9 @@
#include "render_text.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_0202419C.h"
#include "unk_02024220.h"
@ -90,7 +89,7 @@ BOOL DWWarp_Init(OverlayManager *ovy, int *state)
DWWarp_InitCamera(dww);
StartScreenTransition(0, 1, 1, 0x0, 16, 1, HEAP_ID_DISTORTION_WORLD_WARP);
gCoreSys.unk_65 = 0;
gSystem.unk_65 = 0;
GXLayers_SwapDisplay();
GXLayers_TurnBothDispOn();

2
src/easy3d.c
View File

@ -7,7 +7,7 @@
#include "struct_defs/struct_0207C690.h"
#include "gx_layers.h"
#include "unk_02017728.h"
#include "system.h"
#include "unk_02024220.h"
#define G3X_DEPTH_MAX 0x7FFF

5
src/error_message_reset.c
View File

@ -7,7 +7,6 @@
#include "bg_window.h"
#include "communication_system.h"
#include "core_sys.h"
#include "font.h"
#include "gx_layers.h"
#include "heap.h"
@ -15,10 +14,10 @@
#include "message.h"
#include "render_window.h"
#include "strbuf.h"
#include "system.h"
#include "text.h"
#include "unk_0200A9DC.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_020366A0.h"
static const UnkStruct_02099F80 sErrorMessageBanksConfig = {
@ -117,7 +116,7 @@ void ErrorMessageReset_PrintErrorAndReset(void)
GXS_SetVisiblePlane(0);
SetAutorepeat(4, 8);
gCoreSys.unk_65 = 0;
gSystem.unk_65 = 0;
GXLayers_SwapDisplay();
G2_BlendNone();

4
src/field_battle_data_transfer.c
View File

@ -27,7 +27,6 @@
#include "bag.h"
#include "charcode_util.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_overworld_state.h"
#include "game_options.h"
#include "game_records.h"
@ -45,6 +44,7 @@
#include "save_player.h"
#include "savedata.h"
#include "strbuf.h"
#include "system.h"
#include "system_data.h"
#include "system_flags.h"
#include "trainer_info.h"
@ -121,7 +121,7 @@ FieldBattleDTO *FieldBattleDTO_New(enum HeapId heapID, u32 battleType)
+ date.month * 0x100 * date.day * 0x10000
+ time.hour * 0x10000
+ (time.minute + time.second) * 0x1000000
+ gCoreSys.vblankCounter;
+ gSystem.vblankCounter;
if (CommSys_IsInitialized() == TRUE) {
for (i = 0; i < CommSys_ConnectedCount(); i++) {

4
src/field_map_change.c
View File

@ -24,7 +24,6 @@
#include "bg_window.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_message.h"
#include "field_overworld_state.h"
#include "field_system.h"
@ -50,6 +49,7 @@
#include "script_manager.h"
#include "strbuf.h"
#include "sys_task_manager.h"
#include "system.h"
#include "system_flags.h"
#include "trainer_info.h"
#include "unk_020041CC.h"
@ -231,7 +231,7 @@ static void FieldMapChange_SetNewLocation(FieldSystem *fieldSystem, const Locati
void FieldMapChange_Set3DDisplay(FieldSystem *fieldSystem)
{
GF_ASSERT(fieldSystem->mapLoadType < MAP_LOAD_TYPE_MAX);
gCoreSys.unk_65 = fieldSystem->mapLoadMode->unk_00_12;
gSystem.unk_65 = fieldSystem->mapLoadMode->unk_00_12;
}
void FieldMapChange_UpdateGameData(FieldSystem *fieldSystem, BOOL noWarp)

8
src/field_system.c
View File

@ -21,7 +21,6 @@
#include "bg_window.h"
#include "comm_player_manager.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_map_change.h"
#include "field_overworld_state.h"
#include "field_system.h"
@ -34,6 +33,7 @@
#include "overlay_manager.h"
#include "pokeradar.h"
#include "savedata.h"
#include "system.h"
#include "unk_0205F180.h"
#include "unk_0209ACBC.h"
#include "unk_0209C370.h"
@ -239,7 +239,7 @@ static void HandleFieldInput(FieldSystem *fieldSystem)
FieldInput fieldInput;
if (processInput) {
sub_0205F490(fieldSystem->playerAvatar);
FieldInput_Update(&fieldInput, fieldSystem, gCoreSys.pressedKeys, gCoreSys.heldKeys);
FieldInput_Update(&fieldInput, fieldSystem, gSystem.pressedKeys, gSystem.heldKeys);
}
enum MapLoadType loadType = fieldSystem->mapLoadType;
@ -286,7 +286,7 @@ static void HandleFieldInput(FieldSystem *fieldSystem)
ov5_021E0EEC(fieldSystem->playerAvatar);
ov5_021EA714(fieldSystem, 0, 1);
} else {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
MapNamePopUp_Hide(fieldSystem->unk_04->unk_08);
}
@ -310,7 +310,7 @@ static void HandleFieldInput(FieldSystem *fieldSystem)
ov5_021E0EEC(fieldSystem->playerAvatar);
ov5_021EA714(fieldSystem, 0, 1);
} else {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
MapNamePopUp_Hide(fieldSystem->unk_04->unk_08);
}

8
src/game_options.c
View File

@ -3,10 +3,10 @@
#include <nitro.h>
#include <string.h>
#include "core_sys.h"
#include "heap.h"
#include "save_player.h"
#include "savedata.h"
#include "system.h"
#include "text.h"
Options *Options_New(u32 heapID)
@ -42,14 +42,14 @@ void Options_SetSystemButtonMode(SaveData *saveData, enum OptionsButtonMode mode
switch (mode) {
case OPTIONS_BUTTON_MODE_START_IS_X:
gCoreSys.buttonMode = BUTTON_MODE_START_IS_X;
gSystem.buttonMode = BUTTON_MODE_START_IS_X;
break;
case OPTIONS_BUTTON_MODE_L_IS_A:
gCoreSys.buttonMode = BUTTON_MODE_L_IS_A;
gSystem.buttonMode = BUTTON_MODE_L_IS_A;
break;
case OPTIONS_BUTTON_MODE_NORMAL:
default:
gCoreSys.buttonMode = BUTTON_MODE_NORMAL;
gSystem.buttonMode = BUTTON_MODE_NORMAL;
break;
}
}

4
src/great_marsh_lookout.c
View File

@ -12,7 +12,6 @@
#include "overlay006/great_marsh_binoculars.h"
#include "overlay006/ov6_022426AC.h"
#include "core_sys.h"
#include "field_map_change.h"
#include "field_task.h"
#include "field_transition.h"
@ -20,6 +19,7 @@
#include "location.h"
#include "map_object.h"
#include "player_avatar.h"
#include "system.h"
#include "system_flags.h"
#include "unk_02005474.h"
#include "unk_02056B30.h"
@ -109,7 +109,7 @@ static BOOL Task_GreatMarshLookout(FieldTask *taskMan)
case 5:
lookout->timer++;
if ((lookout->timer >= 60) || (gCoreSys.pressedKeys & PAD_BUTTON_A)) {
if ((lookout->timer >= 60) || (gSystem.pressedKeys & PAD_BUTTON_A)) {
GreatMarshBinoculars_SetNextLocationWithCoords(lookout->numCycles, lookout->binocularsData);
lookout->nextLocation = GreatMarshBinoculars_GetLocation(lookout->binocularsData);
Sound_PlayEffect(SEQ_SE_DP_KASYA);

4
src/gx_layers.c
View File

@ -6,7 +6,7 @@
#include "struct_defs/struct_02099F80.h"
#include "core_sys.h"
#include "system.h"
static int sEngineALayers;
static int sEngineBLayers;
@ -98,7 +98,7 @@ void GXLayers_TurnBothDispOn(void)
void GXLayers_SwapDisplay(void)
{
if (gCoreSys.unk_65 == 0) {
if (gSystem.unk_65 == 0) {
GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB);
} else {
GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN);

2
src/library_tv/library_tv.c
View File

@ -14,9 +14,9 @@
#include "heap.h"
#include "message.h"
#include "overlay_manager.h"
#include "system.h"
#include "text.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#define LIBRARY_TV_DURATION 90 + 150

2
src/list_menu.c
View File

@ -6,10 +6,10 @@
#include "bg_window.h"
#include "colored_arrow.h"
#include "core_sys.h"
#include "font.h"
#include "heap.h"
#include "string_list.h"
#include "system.h"
#include "text.h"
static void PrintEntry(ListMenu *menu, void *strbuf, u8 xOffset, u8 yOffset);

45
src/main.c
View File

@ -12,7 +12,6 @@
#include "assert.h"
#include "bg_window.h"
#include "communication_system.h"
#include "core_sys.h"
#include "font.h"
#include "game_overlay.h"
#include "game_start.h"
@ -23,11 +22,11 @@
#include "save_player.h"
#include "savedata.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02003B60.h"
#include "unk_0200A9DC.h"
#include "unk_0200F174.h"
#include "unk_02017428.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_02022844.h"
#include "unk_0202419C.h"
@ -114,8 +113,8 @@ void NitroMain(void)
}
}
gCoreSys.unk_6C = 1;
gCoreSys.frameCounter = 0;
gSystem.unk_6C = 1;
gSystem.frameCounter = 0;
InitRNG();
sub_0200AB84();
@ -128,41 +127,41 @@ void NitroMain(void)
HandleConsoleFold();
ReadKeypadAndTouchpad();
if ((gCoreSys.heldKeysRaw & RESET_COMBO) == RESET_COMBO && !gCoreSys.inhibitReset) {
if ((gSystem.heldKeysRaw & RESET_COMBO) == RESET_COMBO && !gSystem.inhibitReset) {
SoftReset(RESET_CLEAN);
}
if (CommSys_Update()) {
CheckHeapCanary();
RunApplication();
SysTaskManager_ExecuteTasks(gCoreSys.mainTaskMgr);
SysTaskManager_ExecuteTasks(gCoreSys.printTaskMgr);
SysTaskManager_ExecuteTasks(gSystem.mainTaskMgr);
SysTaskManager_ExecuteTasks(gSystem.printTaskMgr);
if (!gCoreSys.frameCounter) {
if (!gSystem.frameCounter) {
OS_WaitIrq(TRUE, OS_IE_V_BLANK);
gCoreSys.vblankCounter++;
gSystem.vblankCounter++;
}
}
UpdateRTC();
sub_02017458();
sub_020241CC();
SysTaskManager_ExecuteTasks(gCoreSys.printTaskMgr);
SysTaskManager_ExecuteTasks(gSystem.printTaskMgr);
OS_WaitIrq(TRUE, OS_IE_V_BLANK);
gCoreSys.vblankCounter++;
gCoreSys.frameCounter = 0;
gSystem.vblankCounter++;
gSystem.frameCounter = 0;
sub_0200ABF0();
sub_0200F27C();
if (gCoreSys.mainCallback != NULL) {
gCoreSys.mainCallback(gCoreSys.mainCallbackData);
if (gSystem.mainCallback != NULL) {
gSystem.mainCallback(gSystem.mainCallbackData);
}
UpdateSound();
SysTaskManager_ExecuteTasks(gCoreSys.postVBlankTaskMgr);
SysTaskManager_ExecuteTasks(gSystem.postVBlankTaskMgr);
}
}
@ -215,11 +214,11 @@ static void WaitFrame(void)
OS_WaitIrq(TRUE, OS_IE_V_BLANK);
gCoreSys.vblankCounter++;
gCoreSys.frameCounter = 0;
gSystem.vblankCounter++;
gSystem.frameCounter = 0;
if (gCoreSys.mainCallback != NULL) {
gCoreSys.mainCallback(gCoreSys.mainCallbackData);
if (gSystem.mainCallback != NULL) {
gSystem.mainCallback(gSystem.mainCallbackData);
}
}
@ -294,7 +293,7 @@ static void HeapCanaryFailed(int resetParam, int param1)
HandleConsoleFold();
ReadKeypadAndTouchpad();
if (elapsed >= 30 && gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (elapsed >= 30 && gSystem.pressedKeys & PAD_BUTTON_A) {
break;
}
@ -314,7 +313,7 @@ void InitRNG(void)
RTCTime time;
GetCurrentDateTime(&date, &time);
u32 seed = date.year + date.month * 0x100 * date.day * 0x10000 + time.hour * 0x10000 + (time.minute + time.second) * 0x1000000 + gCoreSys.vblankCounter;
u32 seed = date.year + date.month * 0x100 * date.day * 0x10000 + time.hour * 0x10000 + (time.minute + time.second) * 0x1000000 + gSystem.vblankCounter;
MTRNG_SetSeed(seed);
LCRNG_SetSeed(seed);
@ -326,7 +325,7 @@ void HandleConsoleFold(void)
PMWakeUpTrigger trigger;
if (PAD_DetectFold()) {
if (gCoreSys.inhibitSleep == 0) {
if (gSystem.inhibitSleep == 0) {
BeforeSleep();
if (CTRDG_IsPulledOut() == TRUE) {
@ -336,7 +335,7 @@ void HandleConsoleFold(void)
sleep_again:
trigger = PM_TRIGGER_COVER_OPEN | PM_TRIGGER_CARD;
if (gCoreSys.gbaCartridgeVersion && !gIgnoreCartridgeForWake) {
if (gSystem.gbaCartridgeVersion && !gIgnoreCartridgeForWake) {
trigger |= PM_TRIGGER_CARTRIDGE;
}

2
src/menu.c
View File

@ -8,12 +8,12 @@
#include "bg_window.h"
#include "colored_arrow.h"
#include "core_sys.h"
#include "font.h"
#include "heap.h"
#include "message.h"
#include "render_window.h"
#include "string_list.h"
#include "system.h"
#include "text.h"
#include "unk_02005474.h"

2
src/meson.build
View File

@ -62,7 +62,7 @@ pokeplatinum_c = files(
'easy3d_object.c',
'unk_02017428.c',
'unk_02017498.c',
'unk_02017728.c',
'system.c',
'bg_window.c',
'easy3d.c',
'sys_task_manager.c',

2
src/overlay005/field_control.c
View File

@ -33,7 +33,6 @@
#include "comm_player_manager.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "encounter.h"
#include "field_comm_manager.h"
#include "field_map_change.h"
@ -52,6 +51,7 @@
#include "pokeradar.h"
#include "save_player.h"
#include "script_manager.h"
#include "system.h"
#include "system_flags.h"
#include "trainer_info.h"
#include "unk_02005474.h"

3
src/overlay005/fieldmap.c
View File

@ -52,7 +52,6 @@
#include "camera.h"
#include "char_transfer.h"
#include "comm_player_manager.h"
#include "core_sys.h"
#include "easy3d.h"
#include "field_map_change.h"
#include "field_message.h"
@ -75,8 +74,8 @@
#include "render_oam.h"
#include "savedata_misc.h"
#include "script_manager.h"
#include "system.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_02020AEC.h"
#include "unk_0202419C.h"
#include "unk_02027F50.h"

2
src/overlay005/hblank_system.c
View File

@ -4,7 +4,7 @@
#include <string.h>
#include "heap.h"
#include "unk_02017728.h"
#include "system.h"
static void HBlankSystem_Init(HBlankSystem *hBlankSystem);
static void HBlankTask_Init(HBlankTask *task);

2
src/overlay005/ov5_021D2F14.c
View File

@ -17,7 +17,7 @@
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "unk_02017728.h"
#include "system.h"
static BOOL ov5_021D3478(SpriteResourceList *param0, SpriteResource *param1);
static void ov5_021D34AC(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4, int param5);

4
src/overlay005/ov5_021DC018.c
View File

@ -8,7 +8,6 @@
#include "bg_window.h"
#include "coins.h"
#include "core_sys.h"
#include "font.h"
#include "heap.h"
#include "list_menu.h"
@ -21,6 +20,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "trainer_info.h"
#include "unk_02005474.h"
@ -550,7 +550,7 @@ static void ov5_021DC95C(SysTask *param0, void *param1)
Sound_PlayEffect(1500);
}
if ((gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) || (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) || (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) || (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT)) {
if ((gSystem.pressedKeysRepeatable & PAD_KEY_UP) || (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) || (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) || (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT)) {
ov5_021DCAF4(v2);
}

4
src/overlay005/ov5_021DFB54.c
View File

@ -26,7 +26,6 @@
#include "overlay009/struct_ov9_0224F6EC_decl.h"
#include "overlay101/struct_ov101_021D5D90_decl.h"
#include "core_sys.h"
#include "encounter.h"
#include "field_battle_data_transfer.h"
#include "field_task.h"
@ -40,6 +39,7 @@
#include "pokemon.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_020553DC.h"
#include "unk_0205F180.h"
@ -872,7 +872,7 @@ static BOOL ov5_021E0560(FieldTask *param0)
v0->unk_00++;
case 2: {
int v2 = PlayerAvatar_GetDir(v0->playerAvatar);
u32 v3, v4 = gCoreSys.pressedKeys, v5 = gCoreSys.heldKeys;
u32 v3, v4 = gSystem.pressedKeys, v5 = gSystem.heldKeys;
int v6 = sub_02061308(v0->playerAvatar, v4, v5);
if ((v6 == -1) || (v6 == v2)) {

2
src/overlay005/ov5_021E779C.c
View File

@ -23,7 +23,7 @@
#include "narc.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "unk_02017728.h"
#include "system.h"
#include "unk_020366A0.h"
typedef struct {

6
src/overlay005/ov5_021F08CC.c
View File

@ -15,7 +15,6 @@
#include "overlay101/struct_ov101_021D5D90_decl.h"
#include "bg_window.h"
#include "core_sys.h"
#include "encounter.h"
#include "field_battle_data_transfer.h"
#include "field_message.h"
@ -34,6 +33,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_020655F4.h"
#include "unk_0206CCB0.h"
@ -483,7 +483,7 @@ static void *ov5_021F0D1C(u32 param0)
static int ov5_021F0D40(void)
{
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
return 1;
}
@ -492,7 +492,7 @@ static int ov5_021F0D40(void)
static int ov5_021F0D54(void)
{
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
return 1;
}

4
src/overlay006/dual_slot_encounters.c
View File

@ -5,7 +5,7 @@
#include "overlay006/wild_encounters.h"
#include "core_sys.h"
#include "system.h"
void WildEncounters_ReplaceDualSlotEncounters(const WildEncounters *encounterData, const BOOL nationalDexObtained, int *param2, int *param3)
{
@ -13,7 +13,7 @@ void WildEncounters_ReplaceDualSlotEncounters(const WildEncounters *encounterDat
return;
}
switch (gCoreSys.gbaCartridgeVersion) {
switch (gSystem.gbaCartridgeVersion) {
case SAPPHIRE:
(*param2) = encounterData->dualSlotSapphireEncounters[0];
(*param3) = encounterData->dualSlotSapphireEncounters[1];

10
src/overlay006/ov6_0223E140.c
View File

@ -22,7 +22,6 @@
#include "bg_window.h"
#include "camera.h"
#include "core_sys.h"
#include "easy3d_object.h"
#include "field_system.h"
#include "field_task.h"
@ -35,6 +34,7 @@
#include "player_avatar.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_020655F4.h"
@ -2177,12 +2177,12 @@ static BOOL ov6_02240364(UnkStruct_ov6_022401B8 *param0, int param1, int param2)
BOOL v1[2] = { 0, 0 };
UnkStruct_ov6_02240260 *v2 = &param0->unk_34;
if (gCoreSys.pressedKeys & PAD_KEY_UP) {
if (gSystem.pressedKeys & PAD_KEY_UP) {
v2->unk_00++;
v2->unk_00 %= 32;
}
if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
if (gSystem.pressedKeys & PAD_KEY_DOWN) {
if (v2->unk_00) {
v2->unk_00--;
} else {
@ -2190,12 +2190,12 @@ static BOOL ov6_02240364(UnkStruct_ov6_022401B8 *param0, int param1, int param2)
}
}
if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
v2->unk_04++;
v2->unk_04 %= 32;
}
if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
if (gSystem.pressedKeys & PAD_KEY_LEFT) {
if (v2->unk_04) {
v2->unk_04--;
} else {

4
src/overlay006/ov6_02247A0C.c
View File

@ -6,7 +6,6 @@
#include "field/field_system.h"
#include "bg_window.h"
#include "core_sys.h"
#include "field_system.h"
#include "field_task.h"
#include "font.h"
@ -17,6 +16,7 @@
#include "savedata.h"
#include "strbuf.h"
#include "string_template.h"
#include "system.h"
#include "text.h"
#include "unk_0202F108.h"
@ -109,7 +109,7 @@ static BOOL ov6_02247A34(FieldTask *param0)
v1->unk_04++;
break;
case 1:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov6_02247CC8(v1->unk_00);
v1->unk_04++;
}

14
src/overlay007/communication_club.c
View File

@ -11,7 +11,6 @@
#include "bg_window.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_comm_manager.h"
#include "field_message.h"
#include "field_system.h"
@ -27,6 +26,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "trainer_info.h"
#include "unk_02005474.h"
@ -578,7 +578,7 @@ static void ov7_0224A34C(SysTask *task, void *param1)
return;
}
if ((PAD_BUTTON_B)&gCoreSys.pressedKeys) {
if ((PAD_BUTTON_B)&gSystem.pressedKeys) {
CommClubMan_PrintMessage(pl_msg_00000353_00003, FALSE); // Do you want to leave the group?
CommClubMan_SetTask(CommClubTask_WaitConfirmLeaveGroup);
}
@ -1050,7 +1050,7 @@ static void CommClubTask_DifferentRegulation(SysTask *task, void *param1)
CommClubManager *commClubMan = (CommClubManager *)param1;
if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
CommClubMan_DestroyList(task, commClubMan);
CommClubMan_Disconnect();
sCommClubMan->retCode = 4;
@ -1066,7 +1066,7 @@ static void ov7_0224ABA4(SysTask *task, void *param1)
ov7_0224A64C(commClubMan);
if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov7_0224A5D0();
CommClubMan_SetTask(ov7_0224ABE0);
}
@ -1239,7 +1239,7 @@ static void ov7_0224AD68(SysTask *task, void *param1)
static void ov7_0224ADD8(SysTask *task, void *param1)
{
if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
sCommClubMan->retCode = COMM_CLUB_RET_CANCEL;
SysTask_Done(task);
}
@ -1518,7 +1518,7 @@ static void CommClubTask_ExitGuestRoomEnd(SysTask *task, void *param1)
CommClubManager *commClubMan = (CommClubManager *)param1;
if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
SysTask_Done(task);
CommClubMan_Disconnect();
sCommClubMan->retCode = COMM_CLUB_RET_CANCEL;
@ -1564,7 +1564,7 @@ static void ov7_0224B370(SysTask *task, void *param1)
CommClubManager *commClubMan = (CommClubManager *)param1;
if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
CommClubMan_PrintChooseJoinMsg(commClubMan);
SysTask_Done(task);
}

6
src/overlay007/ov7_0224B4E8.c
View File

@ -9,7 +9,6 @@
#include "field/field_system.h"
#include "bg_window.h"
#include "core_sys.h"
#include "field_message.h"
#include "field_task.h"
#include "font.h"
@ -22,6 +21,7 @@
#include "strbuf.h"
#include "string_list.h"
#include "string_template.h"
#include "system.h"
#include "text.h"
#include "unk_02005474.h"
#include "unk_0202602C.h"
@ -503,7 +503,7 @@ static BOOL ov7_0224BC74(FieldTask *param0)
break;
case 6:
if (FieldMessage_FinishedPrinting(v1->unk_74)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
v1->unk_7C = 0;
}
}
@ -514,7 +514,7 @@ static BOOL ov7_0224BC74(FieldTask *param0)
v1->unk_7C++;
break;
case 8:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov7_0224BBA0(v1);
ov7_0224B4E8(v1, 106);
ov7_0224B5A8(v1);

4
src/overlay007/ov7_0224BE9C.c
View File

@ -10,7 +10,6 @@
#include "bag.h"
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "field_message.h"
#include "font.h"
#include "game_options.h"
@ -28,6 +27,7 @@
#include "strbuf.h"
#include "string_list.h"
#include "string_template.h"
#include "system.h"
#include "text.h"
#include "unk_02005474.h"
#include "unk_020298BC.h"
@ -329,7 +329,7 @@ BOOL ov7_0224BF2C(UnkStruct_ov7_0224BEFC *param0)
break;
case 11:
if (ov7_0224C4B8(&param0->unk_1B8)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
param0->unk_00 = param0->unk_04;
}
}

12
src/overlay007/ov7_0224CD28.c
View File

@ -16,7 +16,6 @@
#include "bg_window.h"
#include "camera.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "field_message.h"
#include "field_task.h"
#include "font.h"
@ -40,6 +39,7 @@
#include "strbuf.h"
#include "string_list.h"
#include "string_template.h"
#include "system.h"
#include "text.h"
#include "trainer_info.h"
#include "unk_02005474.h"
@ -392,7 +392,7 @@ static u8 ov7_0224D250(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1)
return 0;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
void *journalEntryLocationEvent;
Window_EraseMessageBox(&param1->unk_08[1], 0);
@ -962,7 +962,7 @@ static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0)
return 6;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
CellActor_SetDrawFlag(param0->unk_25C[0], 0);
CellActor_SetDrawFlag(param0->unk_25C[1], 0);
Window_EraseStandardFrame(&param0->unk_08[4], 1);
@ -973,7 +973,7 @@ static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0)
return ov7_0224E098(param0);
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
Window_EraseStandardFrame(&param0->unk_08[4], 1);
Window_EraseStandardFrame(&param0->unk_08[3], 1);
Window_EraseMessageBox(&param0->unk_08[5], 0);
@ -1214,7 +1214,7 @@ static u8 ov7_0224E6B8(UnkStruct_ov7_0224D008 *param0)
return 10;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (param0->unk_28C == 1) {
sub_0206B3B4(param0->unk_288);
}
@ -1257,7 +1257,7 @@ static u8 ov7_0224E7C8(UnkStruct_ov7_0224D008 *param0)
return 11;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
Window_EraseMessageBox(&param0->unk_08[5], 0);
ov7_0224EB38(param0, 0);
CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);

4
src/overlay008/ov8_02249960.c
View File

@ -36,7 +36,6 @@
#include "bg_window.h"
#include "camera.h"
#include "core_sys.h"
#include "field_message.h"
#include "field_system.h"
#include "field_task.h"
@ -55,6 +54,7 @@
#include "strbuf.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "trainer_info.h"
#include "unk_02005474.h"
#include "unk_02027F50.h"
@ -2857,7 +2857,7 @@ static BOOL ov8_0224B3D4(FieldTask *param0)
v2->unk_00++;
case 12:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
int v9 = Player_GetXPos(fieldSystem->playerAvatar);
int v10 = Player_GetZPos(fieldSystem->playerAvatar);

5
src/overlay010/ov10_0221F800.c
View File

@ -27,7 +27,6 @@
#include "cell_actor.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "font.h"
#include "game_options.h"
#include "graphics.h"
@ -48,6 +47,7 @@
#include "strbuf.h"
#include "string_template.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "trainer_data.h"
#include "trainer_info.h"
@ -58,7 +58,6 @@
#include "unk_0200F174.h"
#include "unk_02012744.h"
#include "unk_02014000.h"
#include "unk_02017728.h"
#include "unk_0202419C.h"
#include "unk_02024220.h"
#include "unk_0202F1D4.h"
@ -480,7 +479,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
break;
case 2:
if (param0->unk_BBC == 1) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
param0->unk_BB0 = 3;
}
}

8
src/overlay012/ov12_0221FC20.c
View File

@ -36,7 +36,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "graphics.h"
#include "heap.h"
#include "inlines.h"
@ -48,6 +47,7 @@
#include "sprite_util.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
@ -1042,9 +1042,9 @@ static void ov12_0222048C(UnkStruct_ov12_0221FCDC *param0)
{
param0->unk_89 = 1;
if (gCoreSys.heldKeys & PAD_BUTTON_L) {
if (gCoreSys.heldKeys & PAD_BUTTON_R) {
if (gCoreSys.pressedKeys & PAD_BUTTON_X) {
if (gSystem.heldKeys & PAD_BUTTON_L) {
if (gSystem.heldKeys & PAD_BUTTON_R) {
if (gSystem.pressedKeys & PAD_BUTTON_X) {
param0->unk_18 += 1;
param0->unk_89 = 0;
}

4
src/overlay013/ov13_0221FC20.c
View File

@ -18,7 +18,6 @@
#include "bag.h"
#include "bg_window.h"
#include "core_sys.h"
#include "font.h"
#include "graphics.h"
#include "gx_layers.h"
@ -34,6 +33,7 @@
#include "strbuf.h"
#include "string_template.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "touch_screen.h"
#include "unk_02005474.h"
@ -851,7 +851,7 @@ static u8 ov13_02220848(UnkStruct_ov13_022213F0 *param0)
static u8 ov13_02220864(UnkStruct_ov13_022213F0 *param0)
{
if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || (TouchScreen_Tapped() == 1)) {
if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || (TouchScreen_Tapped() == 1)) {
return param0->unk_2075;
}

4
src/overlay013/ov13_022264F4.c
View File

@ -19,7 +19,6 @@
#include "bag.h"
#include "bg_window.h"
#include "core_sys.h"
#include "font.h"
#include "graphics.h"
#include "gx_layers.h"
@ -34,6 +33,7 @@
#include "strbuf.h"
#include "string_template.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "touch_screen.h"
#include "unk_02005474.h"
@ -515,7 +515,7 @@ static u8 ov13_02226C7C(UnkStruct_ov13_02227244 *param0)
static u8 ov13_02226C94(UnkStruct_ov13_02227244 *param0)
{
if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || (TouchScreen_Tapped() == 1)) {
if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || (TouchScreen_Tapped() == 1)) {
return param0->unk_114B;
}

16
src/overlay013/ov13_02228A38.c
View File

@ -9,8 +9,8 @@
#include "battle/struct_ov16_0226DC24_decl.h"
#include "overlay013/struct_ov13_02228A50_decl.h"
#include "core_sys.h"
#include "heap.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_0201E010.h"
@ -93,7 +93,7 @@ static u8 ov13_02228ACC(UnkStruct_ov13_02228A50 *param0)
return 1;
}
if (gCoreSys.pressedKeys & (PAD_KEY | PAD_BUTTON_B | PAD_BUTTON_A)) {
if (gSystem.pressedKeys & (PAD_KEY | PAD_BUTTON_B | PAD_BUTTON_A)) {
param0->unk_08 = 1;
ov16_0226DD7C(param0->unk_00, param0->unk_04[param0->unk_09].unk_00, param0->unk_04[param0->unk_09].unk_02, param0->unk_04[param0->unk_09].unk_01, param0->unk_04[param0->unk_09].unk_03);
@ -141,16 +141,16 @@ u32 ov13_02228B64(UnkStruct_ov13_02228A50 *param0)
return 0xffffffff;
}
if (gCoreSys.pressedKeys & PAD_KEY_UP) {
if (gSystem.pressedKeys & PAD_KEY_UP) {
v4 = sub_0201E028(param0->unk_04, NULL, NULL, NULL, NULL, param0->unk_09, 0);
v5 = 0;
} else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
} else if (gSystem.pressedKeys & PAD_KEY_DOWN) {
v4 = sub_0201E028(param0->unk_04, NULL, NULL, NULL, NULL, param0->unk_09, 1);
v5 = 1;
} else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
} else if (gSystem.pressedKeys & PAD_KEY_LEFT) {
v4 = sub_0201E028(param0->unk_04, NULL, NULL, NULL, NULL, param0->unk_09, 2);
v5 = 2;
} else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
} else if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
v4 = sub_0201E028(param0->unk_04, NULL, NULL, NULL, NULL, param0->unk_09, 3);
v5 = 3;
} else {
@ -205,11 +205,11 @@ u32 ov13_02228B64(UnkStruct_ov13_02228A50 *param0)
return 0xffffffff;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
return param0->unk_09;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
Sound_PlayEffect(1501);
return 0xfffffffe;
}

2
src/overlay017/ov17_0223B140.c
View File

@ -42,13 +42,13 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_020041CC.h"
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_02012744.h"
#include "unk_02014000.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_020366A0.h"
#include "unk_020393C8.h"

2
src/overlay017/ov17_0223CB1C.c
View File

@ -34,13 +34,13 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
#include "unk_0200762C.h"
#include "unk_0200C6E4.h"
#include "unk_0200F174.h"
#include "unk_02014000.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_020366A0.h"
#include "unk_020393C8.h"

2
src/overlay017/ov17_0223DAD0.c
View File

@ -42,6 +42,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
#include "unk_0200762C.h"
@ -49,7 +50,6 @@
#include "unk_0200F174.h"
#include "unk_02012744.h"
#include "unk_02014000.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_020366A0.h"
#include "unk_020393C8.h"

16
src/overlay017/ov17_0223F7E4.c
View File

@ -24,7 +24,6 @@
#include "assert.h"
#include "bg_window.h"
#include "char_transfer.h"
#include "core_sys.h"
#include "font.h"
#include "graphics.h"
#include "heap.h"
@ -37,6 +36,7 @@
#include "strbuf.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "touch_screen.h"
#include "unk_02005474.h"
@ -1536,7 +1536,7 @@ static int ov17_02240C90(UnkStruct_ov17_0223F7E4 *param0)
}
if (v0->unk_00 == 0) {
if ((param0->unk_304 == 1) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) {
if ((param0->unk_304 == 1) || (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_KEY_RIGHT | PAD_KEY_LEFT | PAD_KEY_UP | PAD_KEY_DOWN))) {
if (param0->unk_304 == 0) {
Sound_PlayEffect(1500);
}
@ -1697,7 +1697,7 @@ static u32 ov17_02241004(UnkStruct_ov17_02241004 *param0, int param1, int param2
v1 = param0->unk_02;
v0 = param0->unk_01;
if (gCoreSys.pressedKeys & PAD_KEY_UP) {
if (gSystem.pressedKeys & PAD_KEY_UP) {
param0->unk_01--;
if (param0->unk_01 < 0) {
@ -1716,7 +1716,7 @@ static u32 ov17_02241004(UnkStruct_ov17_02241004 *param0, int param1, int param2
}
v2 = PAD_KEY_UP;
} else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
} else if (gSystem.pressedKeys & PAD_KEY_DOWN) {
param0->unk_01++;
if (param0->unk_01 >= param2) {
@ -1735,7 +1735,7 @@ static u32 ov17_02241004(UnkStruct_ov17_02241004 *param0, int param1, int param2
}
v2 = PAD_KEY_DOWN;
} else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
} else if (gSystem.pressedKeys & PAD_KEY_LEFT) {
param0->unk_02--;
if (param0->unk_02 < 0) {
@ -1754,7 +1754,7 @@ static u32 ov17_02241004(UnkStruct_ov17_02241004 *param0, int param1, int param2
}
v2 = PAD_KEY_LEFT;
} else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
} else if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
param0->unk_02++;
if (param0->unk_02 >= param1) {
@ -1773,9 +1773,9 @@ static u32 ov17_02241004(UnkStruct_ov17_02241004 *param0, int param1, int param2
}
v2 = PAD_KEY_RIGHT;
} else if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
} else if (gSystem.pressedKeys & PAD_BUTTON_A) {
v2 = PAD_BUTTON_A;
} else if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
} else if (gSystem.pressedKeys & PAD_BUTTON_B) {
v2 = PAD_BUTTON_B;
} else {
return 0;

4
src/overlay017/ov17_02247A48.c
View File

@ -35,7 +35,6 @@
#include "assert.h"
#include "bg_window.h"
#include "core_sys.h"
#include "graphics.h"
#include "heap.h"
#include "palette.h"
@ -44,6 +43,7 @@
#include "spl.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_0200762C.h"
#include "unk_0200A9DC.h"
@ -1328,7 +1328,7 @@ static void ov17_02249014(SysTask *param0, void *param1)
v0->unk_15 = 1;
}
if ((v0->unk_00->unk_00->unk_155 == 0) && (v0->unk_18 < 30) && ((gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.touchPressed))) {
if ((v0->unk_00->unk_00->unk_155 == 0) && (v0->unk_18 < 30) && ((gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.touchPressed))) {
v0->unk_18 = 30;
v1 = 0;
v0->unk_13 = 0;

10
src/overlay017/ov17_022492DC.c
View File

@ -15,7 +15,6 @@
#include "bg_window.h"
#include "char_transfer.h"
#include "core_sys.h"
#include "font.h"
#include "graphics.h"
#include "heap.h"
@ -24,6 +23,7 @@
#include "strbuf.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "touch_screen.h"
#include "unk_0200C6E4.h"
@ -477,13 +477,13 @@ int ov17_02249760(UnkStruct_ov17_022492DC *param0)
if (v1 == 0xffffffff) {
if (v3->unk_18 == Unk_ov17_02254554) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_KEY_RIGHT)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_KEY_RIGHT)) {
v1 = 3;
} else if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_KEY_DOWN)) {
} else if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_KEY_DOWN)) {
v1 = 1;
} else if (gCoreSys.pressedKeys & (PAD_BUTTON_X | PAD_KEY_UP)) {
} else if (gSystem.pressedKeys & (PAD_BUTTON_X | PAD_KEY_UP)) {
v1 = 0;
} else if (gCoreSys.pressedKeys & (PAD_BUTTON_Y | PAD_KEY_LEFT)) {
} else if (gSystem.pressedKeys & (PAD_BUTTON_Y | PAD_KEY_LEFT)) {
v1 = 2;
}
}

2
src/overlay017/ov17_0224F4D4.c
View File

@ -30,6 +30,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
#include "unk_0200762C.h"
@ -37,7 +38,6 @@
#include "unk_0200F174.h"
#include "unk_02012744.h"
#include "unk_02014000.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_020366A0.h"
#include "unk_020393C8.h"

114
src/overlay019/ov19_021D0D80.c
View File

@ -33,7 +33,6 @@
#include "savedata/save_table.h"
#include "bag.h"
#include "core_sys.h"
#include "enums.h"
#include "game_options.h"
#include "game_overlay.h"
@ -50,6 +49,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_02005474.h"
#include "unk_02023FCC.h"
@ -302,7 +302,7 @@ int ov19_021D0DEC(OverlayManager *param0, int *param1)
return 0;
} else {
if (v0->unk_1A8 != NULL) {
if (gCoreSys.pressedKeys & PAD_BUTTON_Y) {
if (gSystem.pressedKeys & PAD_BUTTON_Y) {
if (ov19_021D6628(v0->unk_114) == 1) {
ov19_021D5DD8(&v0->unk_00);
ov19_021D6594(v0->unk_114, 43);
@ -478,7 +478,7 @@ static int ov19_021D0FF0(UnkStruct_ov19_021D5DF8 *param0)
{
switch (param0->unk_1B0) {
case 0:
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
if (ov19_021D5E4C(&param0->unk_00)) {
if (ov19_021D5E08(&param0->unk_00) != 3) {
ov19_021D0EB0(param0, ov19_021D20A4);
@ -489,24 +489,24 @@ static int ov19_021D0FF0(UnkStruct_ov19_021D5DF8 *param0)
}
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov19_021D0EB0(param0, ov19_021D1F5C);
break;
}
if (gCoreSys.heldKeys & PAD_BUTTON_L) {
if (gSystem.heldKeys & PAD_BUTTON_L) {
ov19_021D5CE8(&param0->unk_00);
ov19_021D0EB0(param0, ov19_021D45A8);
break;
}
if (gCoreSys.heldKeys & PAD_BUTTON_R) {
if (gSystem.heldKeys & PAD_BUTTON_R) {
ov19_021D5CBC(&(param0->unk_00));
ov19_021D0EB0(param0, ov19_021D45A8);
break;
}
if (ov19_021D4F74(gCoreSys.heldKeys, param0)) {
if (ov19_021D4F74(gSystem.heldKeys, param0)) {
ov19_021D6594(param0->unk_114, 5);
if (ov19_021D5E38(&param0->unk_00) == 1) {
@ -555,7 +555,7 @@ static int ov19_021D1270(UnkStruct_ov19_021D5DF8 *param0)
{
switch (param0->unk_1B0) {
case 0:
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
if (ov19_021D5E2C(&param0->unk_00) == 6) {
param0->unk_1B0 = 2;
break;
@ -572,12 +572,12 @@ static int ov19_021D1270(UnkStruct_ov19_021D5DF8 *param0)
break;
}
if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || ((gCoreSys.pressedKeys & PAD_KEY_RIGHT) && (ov19_021D5E2C(&param0->unk_00) & 1)) || ((gCoreSys.pressedKeys & PAD_KEY_RIGHT) && (ov19_021D5E2C(&param0->unk_00) == 6))) {
if ((gSystem.pressedKeys & PAD_BUTTON_B) || ((gSystem.pressedKeys & PAD_KEY_RIGHT) && (ov19_021D5E2C(&param0->unk_00) & 1)) || ((gSystem.pressedKeys & PAD_KEY_RIGHT) && (ov19_021D5E2C(&param0->unk_00) == 6))) {
param0->unk_1B0 = 2;
break;
}
if (ov19_021D4F74(gCoreSys.heldKeys, param0)) {
if (ov19_021D4F74(gSystem.heldKeys, param0)) {
ov19_021D6594(param0->unk_114, 5);
if (ov19_021D5E38(&param0->unk_00) == 1) {
@ -638,7 +638,7 @@ static int ov19_021D1270(UnkStruct_ov19_021D5DF8 *param0)
break;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
param0->unk_1B0 = 0;
}
@ -657,29 +657,29 @@ static int ov19_021D15C0(UnkStruct_ov19_021D5DF8 *param0)
{
switch (param0->unk_1B0) {
case 0:
if (gCoreSys.heldKeys & (PAD_KEY_LEFT | PAD_BUTTON_L)) {
if (gSystem.heldKeys & (PAD_KEY_LEFT | PAD_BUTTON_L)) {
ov19_021D5CE8(&param0->unk_00);
ov19_021D0EB0(param0, ov19_021D45A8);
break;
}
if (gCoreSys.heldKeys & (PAD_KEY_RIGHT | PAD_BUTTON_R)) {
if (gSystem.heldKeys & (PAD_KEY_RIGHT | PAD_BUTTON_R)) {
ov19_021D5CBC(&(param0->unk_00));
ov19_021D0EB0(param0, ov19_021D45A8);
break;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
ov19_021D0EB0(param0, ov19_021D2694);
break;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov19_021D0EB0(param0, ov19_021D1F5C);
break;
}
if (ov19_021D4F74(gCoreSys.heldKeys, param0)) {
if (ov19_021D4F74(gSystem.heldKeys, param0)) {
ov19_021D6594(param0->unk_114, 5);
if (ov19_021D5E38(&param0->unk_00) == 1) {
@ -706,29 +706,29 @@ static int ov19_021D17AC(UnkStruct_ov19_021D5DF8 *param0)
{
switch (param0->unk_1B0) {
case 0:
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
ov19_021D0EB0(param0, ov19_021D1DEC);
break;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov19_021D0EB0(param0, ov19_021D1F5C);
break;
}
if (gCoreSys.heldKeys & PAD_BUTTON_L) {
if (gSystem.heldKeys & PAD_BUTTON_L) {
ov19_021D5CE8(&param0->unk_00);
ov19_021D0EB0(param0, ov19_021D45A8);
break;
}
if (gCoreSys.heldKeys & PAD_BUTTON_R) {
if (gSystem.heldKeys & PAD_BUTTON_R) {
ov19_021D5CBC(&(param0->unk_00));
ov19_021D0EB0(param0, ov19_021D45A8);
break;
}
if (ov19_021D4F74(gCoreSys.heldKeys, param0)) {
if (ov19_021D4F74(gSystem.heldKeys, param0)) {
ov19_021D6594(param0->unk_114, 5);
if (ov19_021D5E38(&param0->unk_00) == 1) {
@ -760,7 +760,7 @@ static int ov19_021D19B8(UnkStruct_ov19_021D5DF8 *param0)
{
switch (param0->unk_1B0) {
case 0:
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
if (ov19_021D5E08(&param0->unk_00) != 1) {
ov19_021D6594(param0->unk_114, 34);
param0->unk_1B0 = 1;
@ -773,24 +773,24 @@ static int ov19_021D19B8(UnkStruct_ov19_021D5DF8 *param0)
break;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov19_021D0EB0(param0, ov19_021D1F5C);
break;
}
if (gCoreSys.heldKeys & PAD_BUTTON_L) {
if (gSystem.heldKeys & PAD_BUTTON_L) {
ov19_021D5CE8(&param0->unk_00);
ov19_021D0EB0(param0, ov19_021D45A8);
break;
}
if (gCoreSys.heldKeys & PAD_BUTTON_R) {
if (gSystem.heldKeys & PAD_BUTTON_R) {
ov19_021D5CBC(&(param0->unk_00));
ov19_021D0EB0(param0, ov19_021D45A8);
break;
}
if (ov19_021D4F74(gCoreSys.heldKeys, param0)) {
if (ov19_021D4F74(gSystem.heldKeys, param0)) {
ov19_021D6594(param0->unk_114, 5);
if (ov19_021D5E38(&param0->unk_00) == 1) {
@ -833,7 +833,7 @@ static int ov19_021D19B8(UnkStruct_ov19_021D5DF8 *param0)
}
break;
case 5:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
param0->unk_1B0 = 0;
}
@ -954,7 +954,7 @@ static void ov19_021D1DEC(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
}
(*param1) = 5;
case 5:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
(*param1) = 6;
}
@ -1010,7 +1010,7 @@ static void ov19_021D1F5C(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
}
(*param1) = 3;
case 3:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
(*param1) = 4;
}
@ -1272,7 +1272,7 @@ static void ov19_021D2308(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
}
break;
case 7:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
(*param1) = 6;
}
@ -1527,7 +1527,7 @@ static void ov19_021D2B54(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
{
switch (*param1) {
case 0:
if (gCoreSys.heldKeys & PAD_BUTTON_A) {
if (gSystem.heldKeys & PAD_BUTTON_A) {
ov19_021D5594(param0, &param0->unk_00);
ov19_021D6594(param0->unk_114, 44);
Sound_PlayEffect(1500);
@ -1538,10 +1538,10 @@ static void ov19_021D2B54(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
case 1:
if (gCoreSys.heldKeys & PAD_BUTTON_A) {
switch (ov19_021D5150(gCoreSys.heldKeys, param0)) {
if (gSystem.heldKeys & PAD_BUTTON_A) {
switch (ov19_021D5150(gSystem.heldKeys, param0)) {
case 2:
if ((gCoreSys.heldKeys & PAD_PLUS_KEY_MASK) == (gCoreSys.pressedKeys & PAD_PLUS_KEY_MASK)) {
if ((gSystem.heldKeys & PAD_PLUS_KEY_MASK) == (gSystem.pressedKeys & PAD_PLUS_KEY_MASK)) {
Sound_PlayEffect(1523);
}
break;
@ -1572,9 +1572,9 @@ static void ov19_021D2B54(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
}
switch (ov19_021D5150(gCoreSys.heldKeys, param0)) {
switch (ov19_021D5150(gSystem.heldKeys, param0)) {
case 2:
if ((gCoreSys.heldKeys & PAD_PLUS_KEY_MASK) == (gCoreSys.pressedKeys & PAD_PLUS_KEY_MASK)) {
if ((gSystem.heldKeys & PAD_PLUS_KEY_MASK) == (gSystem.pressedKeys & PAD_PLUS_KEY_MASK)) {
Sound_PlayEffect(1523);
}
break;
@ -1601,7 +1601,7 @@ static void ov19_021D2B54(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
case 0:
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
if (ov19_021D2DD0(&param0->unk_00)) {
ov19_021D56AC(param0, &param0->unk_00);
ov19_021D6594(param0->unk_114, 10);
@ -1612,7 +1612,7 @@ static void ov19_021D2B54(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
}
break;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
Sound_PlayEffect(1523);
}
break;
@ -1696,7 +1696,7 @@ static void ov19_021D2E1C(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
}
break;
case 2:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
(*param1) = 3;
}
@ -1791,7 +1791,7 @@ static void ov19_021D3010(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
(*param1) = 2;
}
@ -1868,7 +1868,7 @@ static void ov19_021D30D0(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
(*param1) = 8;
}
@ -1950,7 +1950,7 @@ static void ov19_021D3294(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D4458(param0);
(*param1) = 1;
}
@ -1960,7 +1960,7 @@ static void ov19_021D3294(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
(*param1) = 6;
}
@ -2138,7 +2138,7 @@ static void ov19_021D35F8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D5408(&param0->unk_00, 4);
ov19_021D6594(param0->unk_114, 24);
(*param1) = 6;
@ -2149,7 +2149,7 @@ static void ov19_021D35F8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D5408(&param0->unk_00, 33);
ov19_021D6594(param0->unk_114, 24);
(*param1) = 6;
@ -2160,7 +2160,7 @@ static void ov19_021D35F8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
(*param1) = 7;
}
@ -2184,7 +2184,7 @@ static void ov19_021D35F8(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
}
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov19_021D6594(param0->unk_114, 26);
(*param1) = 9;
}
@ -2500,7 +2500,7 @@ static void ov19_021D3D44(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
case 5:
if (ov19_021D6600(param0->unk_114, 24)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
Sound_PlayEffect(1501);
ov19_021D6594(param0->unk_114, 26);
(*param1)++;
@ -2577,7 +2577,7 @@ static void ov19_021D3FB0(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
case 4:
if (ov19_021D6600(param0->unk_114, 24)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
Sound_PlayEffect(1501);
ov19_021D6594(param0->unk_114, 26);
(*param1) = 5;
@ -2666,7 +2666,7 @@ static void ov19_021D4184(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
break;
case 5:
if (ov19_021D6600(param0->unk_114, 24)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
Sound_PlayEffect(1501);
ov19_021D6594(param0->unk_114, 26);
(*param1) = 6;
@ -2700,7 +2700,7 @@ static void ov19_021D4390(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
}
break;
case 3:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_PLUS_KEY_MASK)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_PLUS_KEY_MASK)) {
ov19_021D6594(param0->unk_114, 18);
(*param1)++;
}
@ -2764,7 +2764,7 @@ static BOOL ov19_021D4468(UnkStruct_ov19_021D5DF8 *param0)
break;
}
if (gCoreSys.pressedKeys & (PAD_KEY_LEFT | PAD_BUTTON_L)) {
if (gSystem.pressedKeys & (PAD_KEY_LEFT | PAD_BUTTON_L)) {
v0->unk_05--;
if (v0->unk_05 < 0) {
@ -2776,7 +2776,7 @@ static BOOL ov19_021D4468(UnkStruct_ov19_021D5DF8 *param0)
break;
}
if (gCoreSys.pressedKeys & (PAD_KEY_RIGHT | PAD_BUTTON_R)) {
if (gSystem.pressedKeys & (PAD_KEY_RIGHT | PAD_BUTTON_R)) {
if (++(v0->unk_05) >= 18) {
v0->unk_05 = 0;
}
@ -2786,12 +2786,12 @@ static BOOL ov19_021D4468(UnkStruct_ov19_021D5DF8 *param0)
break;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
Sound_PlayEffect(1501);
return 1;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
Sound_PlayEffect(1501);
v0->unk_05 = -1;
return 1;
@ -2858,7 +2858,7 @@ static void ov19_021D4640(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
}
}
if (gCoreSys.pressedKeys & (PAD_PLUS_KEY_MASK | PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_PLUS_KEY_MASK | PAD_BUTTON_A | PAD_BUTTON_B)) {
Sound_PlayEffect(1501);
ov19_021D5D94(&(param0->unk_00), 0);
ov19_021D5D9C(&(param0->unk_00), ov19_021D5E68(&param0->unk_00));
@ -3000,7 +3000,7 @@ static void ov19_021D4938(UnkStruct_ov19_021D5DF8 *param0, u32 *param1)
}
}
if (gCoreSys.pressedKeys & (PAD_PLUS_KEY_MASK | PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_PLUS_KEY_MASK | PAD_BUTTON_A | PAD_BUTTON_B)) {
Sound_PlayEffect(1501);
ov19_021D5D94(&param0->unk_00, 0);
ov19_021D6594(param0->unk_114, 40);

2
src/overlay019/ov19_021D61B0.c
View File

@ -46,10 +46,10 @@
#include "sprite_util.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_0200762C.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
struct UnkStruct_ov19_021D61B0_t {
SysTask *unk_00;

10
src/overlay019/ov19_021DF964.c
View File

@ -10,8 +10,8 @@
#include "overlay019/struct_ov19_021D5BAC.h"
#include "overlay019/struct_ov19_021DF964.h"
#include "core_sys.h"
#include "enums.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_020797C8.h"
@ -254,7 +254,7 @@ int ov19_021DFD2C(UnkStruct_ov19_021D4DF0 *param0)
{
UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74);
if (gCoreSys.pressedKeys & PAD_KEY_UP) {
if (gSystem.pressedKeys & PAD_KEY_UP) {
if (v0->unk_20) {
v0->unk_20--;
return -2;
@ -264,7 +264,7 @@ int ov19_021DFD2C(UnkStruct_ov19_021D4DF0 *param0)
}
}
if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
if (gSystem.pressedKeys & PAD_KEY_DOWN) {
if (v0->unk_20 < (v0->unk_21 - 1)) {
v0->unk_20++;
return -2;
@ -274,12 +274,12 @@ int ov19_021DFD2C(UnkStruct_ov19_021D4DF0 *param0)
}
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
Sound_PlayEffect(1501);
return -1;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
Sound_PlayEffect(1501);
return v0->unk_00[v0->unk_20];
}

8
src/overlay020/ov20_021D0D80.c
View File

@ -12,10 +12,10 @@
#include "overlay020/ov20_021D5044.h"
#include "overlay020/struct_ov20_021D2128_decl.h"
#include "core_sys.h"
#include "heap.h"
#include "overlay_manager.h"
#include "strbuf.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
@ -154,9 +154,9 @@ int ov20_021D0DF8(OverlayManager *param0, int *param1)
{
UnkStruct_ov20_021D16E8 *v0 = OverlayManager_Data(param0);
v0->unk_30 = gCoreSys.pressedKeys;
v0->unk_32 = gCoreSys.heldKeys;
v0->unk_34 = gCoreSys.pressedKeysRepeatable;
v0->unk_30 = gSystem.pressedKeys;
v0->unk_32 = gSystem.heldKeys;
v0->unk_34 = gSystem.pressedKeysRepeatable;
sub_0202404C(v0->unk_40);

2
src/overlay020/ov20_021D2098.c
View File

@ -29,8 +29,8 @@
#include "sprite_util.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
typedef struct UnkStruct_ov20_021D2128_t {
SysTask *unk_00;

2
src/overlay021/ov21_021D0D80.c
View File

@ -64,13 +64,13 @@
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "strbuf.h"
#include "system.h"
#include "text.h"
#include "touch_screen.h"
#include "unk_020041CC.h"
#include "unk_0200A9DC.h"
#include "unk_0200F174.h"
#include "unk_02012744.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_0202419C.h"
#include "unk_0209ACBC.h"

18
src/overlay021/ov21_021D5AEC.c
View File

@ -26,7 +26,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "message.h"
#include "narc.h"
@ -34,6 +33,7 @@
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "strbuf.h"
#include "system.h"
#include "text.h"
#include "unk_02005474.h"
#include "unk_0200762C.h"
@ -532,7 +532,7 @@ static void ov21_021D5FC4(UnkStruct_ov21_021D5B68 *param0)
static void ov21_021D5FD4(UnkStruct_ov21_021D5B68 *param0)
{
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
if (param0->unk_04->unk_1740 == 0) {
param0->unk_28 = 1;
} else {
@ -542,17 +542,17 @@ static void ov21_021D5FD4(UnkStruct_ov21_021D5B68 *param0)
return;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
param0->unk_2C = 1;
return;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_X) {
if (gSystem.pressedKeys & PAD_BUTTON_X) {
param0->unk_34 = 1;
return;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_SELECT) {
if (gSystem.pressedKeys & PAD_BUTTON_SELECT) {
param0->unk_30 = 1;
return;
}
@ -1756,7 +1756,7 @@ static void ov21_021D7590(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B
static void ov21_021D75DC(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B68 *param1)
{
if (gCoreSys.heldKeys & PAD_KEY_UP) {
if (gSystem.heldKeys & PAD_KEY_UP) {
if (ov21_021D6108(param1, -1)) {
ov21_021D60FC(param1, param0, 2);
param1->unk_20 = 1;
@ -1769,7 +1769,7 @@ static void ov21_021D75DC(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B
return;
}
if (gCoreSys.heldKeys & PAD_KEY_DOWN) {
if (gSystem.heldKeys & PAD_KEY_DOWN) {
if (ov21_021D6108(param1, 1)) {
ov21_021D60FC(param1, param0, 1);
param1->unk_20 = 1;
@ -1782,7 +1782,7 @@ static void ov21_021D75DC(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B
return;
}
if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
if (gSystem.pressedKeys & PAD_KEY_LEFT) {
param0->unk_14 = 1;
param0->unk_18 = 5;
param0->unk_1C = -1;
@ -1791,7 +1791,7 @@ static void ov21_021D75DC(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B
return;
}
if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
param0->unk_14 = 1;
param0->unk_18 = 5;
param0->unk_1C = 1;

14
src/overlay021/ov21_021D76B0.c
View File

@ -26,7 +26,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
@ -34,6 +33,7 @@
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_02005474.h"
#include "unk_0200A9DC.h"
@ -456,8 +456,8 @@ static void ov21_021D7B8C(u32 param0, u32 param1, void *param2)
switch (param1) {
case 0:
v2->unk_14 = gCoreSys.touchX;
v2->unk_18 = gCoreSys.touchY;
v2->unk_14 = gSystem.touchX;
v2->unk_18 = gSystem.touchY;
break;
case 2:
switch (param0) {
@ -501,8 +501,8 @@ static void ov21_021D7B8C(u32 param0, u32 param1, void *param2)
}
}
v2->unk_14 = gCoreSys.touchX;
v2->unk_18 = gCoreSys.touchY;
v2->unk_14 = gSystem.touchX;
v2->unk_18 = gSystem.touchY;
}
v2->unk_20 = 1;
@ -832,8 +832,8 @@ static void ov21_021D8324(UnkStruct_ov21_021D7A64 *param0)
v1 = param0->unk_14 - (128 + 120);
v0 = param0->unk_18 - (104 + -0);
v3 = gCoreSys.touchX - (128 + 120);
v2 = gCoreSys.touchY - (104 + -0);
v3 = gSystem.touchX - (128 + 120);
v2 = gSystem.touchY - (104 + -0);
param0->unk_0C = CalcDotProduct2D(v1, v0, v3, v2, 524);
param0->unk_0C *= 10;

24
src/overlay021/ov21_021D94BC.c
View File

@ -29,13 +29,13 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "narc.h"
#include "pltt_transfer.h"
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_02005474.h"
#include "unk_0200A9DC.h"
@ -1387,7 +1387,7 @@ static void ov21_021DA534(UnkStruct_ov21_021D4FE4 *param0, int param1)
static void ov21_021DA5A8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1)
{
if (gCoreSys.heldKeys & PAD_BUTTON_A) {
if (gSystem.heldKeys & PAD_BUTTON_A) {
if (param0->unk_8C == 0) {
switch (ov21_021D4F7C(param0->unk_18)) {
case 1:
@ -1425,7 +1425,7 @@ static void ov21_021DA5A8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
param0->unk_8C = 0;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
param0->unk_80 = 0;
param0->unk_2C[param0->unk_80] = 2;
}
@ -1506,7 +1506,7 @@ static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
static void ov21_021DA7B0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1)
{
if (gCoreSys.heldKeys & PAD_BUTTON_A) {
if (gSystem.heldKeys & PAD_BUTTON_A) {
if (param0->unk_8C == 0) {
switch (ov21_021D4F7C(param0->unk_18)) {
case 8:
@ -1617,7 +1617,7 @@ static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
static void ov21_021DA988(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1)
{
if (gCoreSys.heldKeys & PAD_BUTTON_A) {
if (gSystem.heldKeys & PAD_BUTTON_A) {
if (param0->unk_8C == 0) {
switch (ov21_021D4F7C(param0->unk_18)) {
case 6:
@ -1764,7 +1764,7 @@ static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
static void ov21_021DAC08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1)
{
if (gCoreSys.heldKeys & PAD_BUTTON_A) {
if (gSystem.heldKeys & PAD_BUTTON_A) {
if (param0->unk_8C == 0) {
switch (ov21_021D4F7C(param0->unk_18)) {
case 6:
@ -1930,7 +1930,7 @@ static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
static void ov21_021DAED8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1)
{
if (gCoreSys.heldKeys & PAD_BUTTON_A) {
if (gSystem.heldKeys & PAD_BUTTON_A) {
if (param0->unk_8C == 0) {
switch (ov21_021D4F7C(param0->unk_18)) {
case 6:
@ -2058,7 +2058,7 @@ static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, enum HeapId heapID)
static void ov21_021DB12C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1)
{
if (gCoreSys.heldKeys & PAD_BUTTON_A) {
if (gSystem.heldKeys & PAD_BUTTON_A) {
if (param0->unk_8C == 0) {
switch (ov21_021D4F7C(param0->unk_18)) {
case 6:
@ -2132,22 +2132,22 @@ static void ov21_021DB12C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95
static void ov21_021DB2FC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1)
{
if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
ov21_021D4F20(param0->unk_18, 0, 1);
param0->unk_8C = 1;
}
if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
if (gSystem.pressedKeys & PAD_KEY_LEFT) {
ov21_021D4F20(param0->unk_18, 0, -1);
param0->unk_8C = 1;
}
if (gCoreSys.pressedKeys & PAD_KEY_UP) {
if (gSystem.pressedKeys & PAD_KEY_UP) {
ov21_021D4F20(param0->unk_18, 1, -1);
param0->unk_8C = 1;
}
if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
if (gSystem.pressedKeys & PAD_KEY_DOWN) {
ov21_021D4F20(param0->unk_18, 1, 1);
param0->unk_8C = 1;
}

18
src/overlay021/ov21_021DDD2C.c
View File

@ -20,12 +20,12 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "narc.h"
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_02005474.h"
#include "unk_0200A9DC.h"
@ -478,14 +478,14 @@ static void ov21_021DE358(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDD
{
s32 v0;
if (gCoreSys.touchHeld) {
if (gSystem.touchHeld) {
return;
}
if ((ov21_021E33BC(param1->unk_08) == 1) && (ov21_021D3998(param1->unk_04) == 2)) {
v0 = ov21_021DCA28(param1->unk_00);
if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
if (gSystem.pressedKeys & PAD_KEY_LEFT) {
v0--;
if (v0 < 0) {
@ -495,7 +495,7 @@ static void ov21_021DE358(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDD
ov21_021DCA30(param1->unk_00, v0);
ov21_021DE5A4(param0, param1);
param0->unk_24 = 1;
} else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
} else if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
v0++;
if (v0 >= 3) {
@ -517,9 +517,9 @@ static void ov21_021DE3D0(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDD
param0->unk_24 = 0;
if (param0->unk_20) {
if (gCoreSys.touchHeld) {
param0->unk_00 = gCoreSys.touchX - param0->unk_08;
param0->unk_04 = gCoreSys.touchY - param0->unk_0C;
if (gSystem.touchHeld) {
param0->unk_00 = gSystem.touchX - param0->unk_08;
param0->unk_04 = gSystem.touchY - param0->unk_0C;
if (param0->unk_00 < 24) {
param0->unk_00 = 24;
@ -566,8 +566,8 @@ static void ov21_021DE44C(u32 param0, u32 param1, void *param2)
Sound_PlayEffect(1501);
v2->unk_20 = 1;
v2->unk_08 = gCoreSys.touchX - v2->unk_00;
v2->unk_0C = gCoreSys.touchY - v2->unk_04;
v2->unk_08 = gSystem.touchX - v2->unk_00;
v2->unk_0C = gSystem.touchY - v2->unk_04;
break;
default:
break;

6
src/overlay021/ov21_021E1924.c
View File

@ -29,13 +29,13 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "narc.h"
#include "pltt_transfer.h"
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_02005474.h"
#include "unk_0200A9DC.h"
@ -1070,12 +1070,12 @@ static void ov21_021E2864(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A
static void ov21_021E28A8(UnkStruct_ov21_021E1E74 *param0)
{
if (gCoreSys.pressedKeys & PAD_KEY_UP) {
if (gSystem.pressedKeys & PAD_KEY_UP) {
param0->unk_34 = 1;
return;
}
if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
if (gSystem.pressedKeys & PAD_KEY_DOWN) {
param0->unk_34 = 0;
return;
}

14
src/overlay021/ov21_021E29DC.c
View File

@ -32,13 +32,13 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "narc.h"
#include "pltt_transfer.h"
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_02005474.h"
#include "unk_0200A9DC.h"
@ -1382,7 +1382,7 @@ static void ov21_021E3C34(UnkStruct_ov21_021E342C *param0)
ov21_021E3C64(param0);
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov21_021E2E00(v0);
param0->unk_2C = 1;
Sound_PlayEffect(1501);
@ -1427,15 +1427,15 @@ static void ov21_021E3D48(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E34
return;
}
if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
if (gSystem.pressedKeys & PAD_KEY_RIGHT) {
ov21_021D4F20(param0->unk_14, 0, 1);
}
if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
if (gSystem.pressedKeys & PAD_KEY_LEFT) {
ov21_021D4F20(param0->unk_14, 0, -1);
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
switch (ov21_021D4F7C(param0->unk_14)) {
case 0:
if (v0->unk_08 != 0) {
@ -1540,11 +1540,11 @@ static void ov21_021E3EEC(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E34
}
if (param1->unk_30 == 0) {
if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
if (gSystem.pressedKeys & PAD_KEY_DOWN) {
param1->unk_30 = 1;
}
} else {
if (gCoreSys.pressedKeys & PAD_KEY_UP) {
if (gSystem.pressedKeys & PAD_KEY_UP) {
param1->unk_30 = 0;
}
}

30
src/overlay021/ov21_021E4CA4.c
View File

@ -24,7 +24,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "math.h"
#include "narc.h"
@ -32,6 +31,7 @@
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
@ -628,7 +628,7 @@ static void ov21_021E530C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct
ov21_021E5E18(param2);
}
param2->unk_38 = gCoreSys.touchX;
param2->unk_38 = gSystem.touchX;
param2->unk_30 = 1;
break;
case 1:
@ -637,8 +637,8 @@ static void ov21_021E530C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct
}
param2->unk_4C = 1;
param2->unk_54 = gCoreSys.touchX;
param2->unk_58 = gCoreSys.touchY;
param2->unk_54 = gSystem.touchX;
param2->unk_58 = gSystem.touchY;
break;
case 2:
if (param2->unk_2C) {
@ -660,18 +660,18 @@ static void ov21_021E537C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct
switch (param0) {
case 0:
if (param2->unk_30 == 1) {
v0 = gCoreSys.touchX - param2->unk_38;
v0 = gSystem.touchX - param2->unk_38;
if (param2->unk_34 == 0) {
if (12 <= v0) {
param2->unk_34 = 1;
param2->unk_38 = gCoreSys.touchX;
param2->unk_38 = gSystem.touchX;
Sound_PlayEffect(1527);
}
} else {
if (-12 >= v0) {
param2->unk_34 = 0;
param2->unk_38 = gCoreSys.touchX;
param2->unk_38 = gSystem.touchX;
Sound_PlayEffect(1527);
}
}
@ -683,8 +683,8 @@ static void ov21_021E537C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct
ov21_021E5AAC(param2);
ov21_021E5AD8(param2);
param2->unk_54 = gCoreSys.touchX;
param2->unk_58 = gCoreSys.touchY;
param2->unk_54 = gSystem.touchX;
param2->unk_58 = gSystem.touchY;
}
break;
case 2:
@ -693,11 +693,11 @@ static void ov21_021E537C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct
param2->unk_20 = 1;
ov21_021E5ED8(param2, 0);
} else {
if (gCoreSys.touchY < (99 - -16) + 16) {
if (gSystem.touchY < (99 - -16) + 16) {
if (param2->unk_34 == 0) {
ov21_021E5BE4(param2, gCoreSys.touchX);
ov21_021E5BE4(param2, gSystem.touchX);
} else {
ov21_021E5C18(param2, gCoreSys.touchX);
ov21_021E5C18(param2, gSystem.touchX);
}
param2->unk_3C = 0;
@ -1019,8 +1019,8 @@ static void ov21_021E5A44(UnkStruct_ov21_021E51DC *param0)
v1 = param0->unk_54 - 51;
v0 = param0->unk_58 - 157;
v3 = gCoreSys.touchX - 51;
v2 = gCoreSys.touchY - 157;
v3 = gSystem.touchX - 51;
v2 = gSystem.touchY - 157;
v4 = CalcDotProduct2D(v1, v0, v3, v2, 0);
if (MATH_IAbs(v4) < 1) {
@ -1380,7 +1380,7 @@ static void ov21_021E5F5C(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D
{
int species = PokedexSort_CurrentSpecies(param1->unk_04);
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
param0->unk_28 = 1;
param0->unk_18[0] = 0;

4
src/overlay021/ov21_021E68F4.c
View File

@ -25,13 +25,13 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "narc.h"
#include "pltt_transfer.h"
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_02005474.h"
#include "unk_0200A9DC.h"
@ -731,7 +731,7 @@ static void ov21_021E728C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A
static void ov21_021E72E8(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1)
{
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
if (param1->unk_04 == 1) {
param1->unk_04 = 0;
*param1->unk_00 |= (1 << 0);

4
src/overlay021/ov21_021E8484.c
View File

@ -25,13 +25,13 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "heap.h"
#include "narc.h"
#include "pltt_transfer.h"
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_0200A9DC.h"
#include "unk_02012744.h"
@ -688,7 +688,7 @@ static void ov21_021E8CBC(UnkStruct_ov21_021E8584 *param0, UnkStruct_ov21_021E87
static void ov21_021E8CF0(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1)
{
if (gCoreSys.heldKeys & PAD_BUTTON_A) {
if (gSystem.heldKeys & PAD_BUTTON_A) {
param0->unk_14 = 1;
}
}

6
src/overlay021/pokedex_sort.c
View File

@ -11,13 +11,13 @@
#include "overlay021/struct_ov21_021D3208.h"
#include "overlay021/struct_ov21_021D3320.h"
#include "core_sys.h"
#include "graphics.h"
#include "heap.h"
#include "pokedex.h"
#include "pokedex_data_index.h"
#include "pokedex_heightweight.h"
#include "strbuf.h"
#include "system.h"
#include "trainer_info.h"
#define NUMSTATFILES 11
@ -611,12 +611,12 @@ BOOL PokedexSort_CanDetectForms(const UnkStruct_ov21_021D3320 *param0)
void ov21_021D3960(UnkStruct_ov21_021D3320 *param0)
{
if (gCoreSys.touchHeld) {
if (gSystem.touchHeld) {
param0->unk_1758 = 0;
return;
}
if (gCoreSys.pressedKeys) {
if (gSystem.pressedKeys) {
if (param0->unk_1758 == 0) {
param0->unk_1758 = 1;
} else {

6
src/overlay022/ov22_02254DE0.c
View File

@ -11,8 +11,8 @@
#include "overlay022/struct_ov22_0225500C.h"
#include "overlay022/struct_ov22_02255040.h"
#include "core_sys.h"
#include "heap.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_02015064.h"
@ -74,8 +74,8 @@ BOOL ov22_02254E54(UnkStruct_ov22_02255040 *param0, int *param1, int *param2, NN
ov22_02254F00(param0, &v1, &v2);
*param1 = gCoreSys.touchX - v1;
*param2 = gCoreSys.touchY - v2;
*param1 = gSystem.touchX - v1;
*param2 = gSystem.touchY - v2;
for (v3 = (*param2 - 4); v3 < (*param2 + 4); v3++) {
if (v3 >= 0) {

6
src/overlay022/ov22_02255094.c
View File

@ -16,7 +16,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "char_transfer.h"
#include "core_sys.h"
#include "graphics.h"
#include "gx_layers.h"
#include "heap.h"
@ -27,6 +26,7 @@
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "system.h"
#include "unk_0200762C.h"
#include "unk_02015064.h"
#include "unk_0202419C.h"
@ -63,14 +63,14 @@ void ov22_02255094(void)
ov22_02255654();
ov22_022556DC();
gCoreSys.unk_65 = 1;
gSystem.unk_65 = 1;
GXLayers_SwapDisplay();
}
void ov22_022550B4(void)
{
gCoreSys.unk_65 = 0;
gSystem.unk_65 = 0;
GXLayers_SwapDisplay();
ov22_02255738();

5
src/overlay022/ov22_02255D44.c
View File

@ -50,7 +50,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "font.h"
#include "game_options.h"
#include "game_records.h"
@ -65,6 +64,7 @@
#include "strbuf.h"
#include "string_template.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "trainer_info.h"
#include "unk_020041CC.h"
@ -73,7 +73,6 @@
#include "unk_0200A9DC.h"
#include "unk_0200F174.h"
#include "unk_02015920.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_020298BC.h"
#include "unk_020363E8.h"
@ -271,7 +270,7 @@ int ov22_02255E50(OverlayManager *param0, int *param1)
}
break;
case 5:
if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) | (gCoreSys.touchPressed)) {
if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) | (gSystem.touchPressed)) {
ov22_0225A628(&v0->unk_5C4, 26, 385, 48);
RenderControlFlags_SetSpeedUpOnTouch(0);
(*param1)++;

12
src/overlay022/ov22_022588F0.c
View File

@ -5,7 +5,7 @@
#include "overlay022/struct_ov22_02258A48.h"
#include "core_sys.h"
#include "system.h"
static void ov22_02258948(UnkStruct_ov22_02258A48 *param0);
@ -20,10 +20,10 @@ void ov22_022588F0(UnkStruct_ov22_02258A48 *param0)
void ov22_0225890C(UnkStruct_ov22_02258A48 *param0)
{
if (gCoreSys.touchPressed) {
if (gSystem.touchPressed) {
param0->unk_04(param0);
} else {
if (gCoreSys.touchHeld) {
if (gSystem.touchHeld) {
param0->unk_0C(param0);
} else {
if (param0->unk_18) {
@ -32,9 +32,9 @@ void ov22_0225890C(UnkStruct_ov22_02258A48 *param0)
}
}
param0->unk_14 = gCoreSys.touchX;
param0->unk_16 = gCoreSys.touchY;
param0->unk_18 = gCoreSys.touchHeld;
param0->unk_14 = gSystem.touchX;
param0->unk_16 = gSystem.touchY;
param0->unk_18 = gSystem.touchHeld;
}
static void ov22_02258948(UnkStruct_ov22_02258A48 *param0)

14
src/overlay022/ov22_022589E0.c
View File

@ -18,10 +18,10 @@
#include "overlay022/struct_ov22_0225A0E4.h"
#include "overlay022/struct_ov22_0225A428.h"
#include "core_sys.h"
#include "heap.h"
#include "math.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_0200679C.h"
@ -273,9 +273,9 @@ static void ov22_02258D4C(UnkStruct_ov22_02258A48 *param0)
int v1, v2;
if (v0->unk_10 != NULL) {
if ((gCoreSys.touchX != 0xffff) && (gCoreSys.touchX != 0xffff)) {
v1 = gCoreSys.touchX - v0->unk_14;
v2 = gCoreSys.touchY - v0->unk_18;
if ((gSystem.touchX != 0xffff) && (gSystem.touchX != 0xffff)) {
v1 = gSystem.touchX - v0->unk_14;
v2 = gSystem.touchY - v0->unk_18;
ov22_022595F8(v0->unk_10, v1, v2);
}
@ -310,12 +310,12 @@ static void ov22_02258DAC(UnkStruct_ov22_02258A48 *param0)
int v9, v10;
if (v0->unk_10 != NULL) {
if ((gCoreSys.touchX != 0xffff) && (gCoreSys.touchX != 0xffff)) {
if ((gSystem.touchX != 0xffff) && (gSystem.touchX != 0xffff)) {
ov22_022596B0(v0->unk_10, &v7, &v9, &v8, &v10);
ov22_02259698(v0->unk_10, &v1, &v2);
v3 = gCoreSys.touchX - v0->unk_14;
v4 = gCoreSys.touchY - v0->unk_18;
v3 = gSystem.touchX - v0->unk_14;
v4 = gSystem.touchY - v0->unk_18;
v5 = v3 + v7;
v6 = v4 + v8;

6
src/overlay022/ov22_02259098.c
View File

@ -11,10 +11,10 @@
#include "overlay022/struct_ov22_022596B0.h"
#include "overlay022/struct_ov22_0225A0E4.h"
#include "core_sys.h"
#include "graphics.h"
#include "heap.h"
#include "pokemon.h"
#include "system.h"
#include "touch_screen.h"
#include "unk_0200762C.h"
@ -156,8 +156,8 @@ BOOL ov22_02259278(UnkStruct_020298D8 *param0, int *param1, int *param2, NNSG2dC
v3 -= (v1 / 2);
v4 -= (v2 / 2);
*param1 = gCoreSys.touchX - v3;
*param2 = gCoreSys.touchY - v4;
*param1 = gSystem.touchX - v3;
*param2 = gSystem.touchY - v4;
v0 = ov22_02255420(param3, *param1, *param2, 0);

7
src/overlay022/ov22_0225B660.c
View File

@ -15,7 +15,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "font.h"
#include "graphics.h"
#include "gx_layers.h"
@ -25,9 +24,9 @@
#include "pokemon.h"
#include "strbuf.h"
#include "string_template.h"
#include "system.h"
#include "text.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0202419C.h"
#include "unk_020298BC.h"
#include "unk_02094EDC.h"
@ -80,7 +79,7 @@ int ov22_0225B660(OverlayManager *param0, int *param1)
v0->unk_0C = v1->unk_08;
ov22_02255094();
gCoreSys.unk_65 = 0;
gSystem.unk_65 = 0;
GXLayers_SwapDisplay();
ov22_022555D4(&v0->unk_14, 14);
@ -136,7 +135,7 @@ int ov22_0225B738(OverlayManager *param0, int *param1)
}
break;
case 3:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
(*param1)++;
}
break;

25
src/overlay023/ov23_0223E140.c
View File

@ -29,7 +29,6 @@
#include "comm_player_manager.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_system.h"
#include "field_task.h"
#include "game_records.h"
@ -53,6 +52,7 @@
#include "strbuf.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "system_flags.h"
#include "text.h"
#include "trainer_info.h"
@ -60,7 +60,6 @@
#include "unk_02005474.h"
#include "unk_0200A9DC.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0202854C.h"
#include "unk_020393C8.h"
#include "unk_02054D00.h"
@ -1490,7 +1489,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
break;
case 12:
if (Text_IsPrinterActive(Unk_ov23_02257740->unk_A24) == 0) {
if (gCoreSys.touchPressed || (gCoreSys.pressedKeys & PAD_BUTTON_A)) {
if (gSystem.touchPressed || (gSystem.pressedKeys & PAD_BUTTON_A)) {
ov23_02254044(ov23_0224219C());
v0->unk_00++;
}
@ -1521,7 +1520,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
if (Text_IsPrinterActive(Unk_ov23_02257740->unk_A24) == 0) {
v0->unk_4C--;
if (gCoreSys.touchPressed || (gCoreSys.pressedKeys & PAD_BUTTON_A) || (v0->unk_4C == 0)) {
if (gSystem.touchPressed || (gSystem.pressedKeys & PAD_BUTTON_A) || (v0->unk_4C == 0)) {
ov23_02254044(ov23_0224219C());
v0->unk_00 = 16;
}
@ -1543,7 +1542,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
if (Text_IsPrinterActive(Unk_ov23_02257740->unk_A24) == 0) {
v0->unk_4C--;
if (gCoreSys.touchPressed || (gCoreSys.pressedKeys & PAD_BUTTON_A) || (v0->unk_4C == 0)) {
if (gSystem.touchPressed || (gSystem.pressedKeys & PAD_BUTTON_A) || (v0->unk_4C == 0)) {
if (ov23_02240A90(v0)) {
v0->unk_4C = 60;
v0->unk_00 = 15;
@ -1652,7 +1651,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
if (Text_IsPrinterActive(Unk_ov23_02257740->unk_A24) == 0) {
v0->unk_4C--;
if (gCoreSys.touchPressed || (gCoreSys.pressedKeys & PAD_BUTTON_A) || (v0->unk_4C == 0)) {
if (gSystem.touchPressed || (gSystem.pressedKeys & PAD_BUTTON_A) || (v0->unk_4C == 0)) {
ov23_02254044(ov23_0224219C());
v0->unk_00 = 19;
}
@ -2687,12 +2686,12 @@ static BOOL ov23_02240CFC(UnkStruct_ov23_0223EE80 *param0)
Unk_ov23_02257740->unk_A29 = 0;
}
if (gCoreSys.touchPressed) {
if ((gCoreSys.touchX < 2 * 8 * 13) && (gCoreSys.touchY >= 4 * 8)) {
v0[0] = gCoreSys.touchX;
v0[1] = gCoreSys.touchY;
if (gSystem.touchPressed) {
if ((gSystem.touchX < 2 * 8 * 13) && (gSystem.touchY >= 4 * 8)) {
v0[0] = gSystem.touchX;
v0[1] = gSystem.touchY;
ov23_022402B8(gCoreSys.touchX, gCoreSys.touchY, Unk_ov23_02257740->unk_A28, param0);
ov23_022402B8(gSystem.touchX, gSystem.touchY, Unk_ov23_02257740->unk_A28, param0);
if (Unk_ov23_02257740->unk_A28) {
v1 = 4;
@ -2712,7 +2711,7 @@ static BOOL ov23_02240CFC(UnkStruct_ov23_0223EE80 *param0)
ov23_02240688(Unk_ov23_02257740->unk_04);
Unk_ov23_02257740->unk_A2C = 1;
} else if (gCoreSys.touchX >= (2 * 8 * 13)) {
} else if (gSystem.touchX >= (2 * 8 * 13)) {
Unk_ov23_02257740->unk_A29 = 2;
}
}
@ -2725,7 +2724,7 @@ static BOOL ov23_02240CFC(UnkStruct_ov23_0223EE80 *param0)
}
}
ov23_022404F8(Unk_ov23_02257740->unk_04, gCoreSys.touchX, gCoreSys.touchY, Unk_ov23_02257740->unk_A29);
ov23_022404F8(Unk_ov23_02257740->unk_04, gSystem.touchX, gSystem.touchY, Unk_ov23_02257740->unk_A29);
if (Unk_ov23_02257740->unk_A29 >= 2) {
Unk_ov23_02257740->unk_A29++;

10
src/overlay023/ov23_02241F74.c
View File

@ -31,7 +31,6 @@
#include "comm_player_manager.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_system.h"
#include "game_options.h"
#include "graphics.h"
@ -44,6 +43,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "system_flags.h"
#include "trainer_info.h"
#include "unk_0202854C.h"
@ -353,7 +353,7 @@ BOOL ov23_02242458(void)
return 0;
}
if (gCoreSys.touchPressed) {
if (gSystem.touchPressed) {
sCommManUnderground->unk_134 = 30;
if (!sCommManUnderground->unk_14B) {
@ -366,13 +366,13 @@ BOOL ov23_02242458(void)
return 0;
}
v0 = ov5_021EAFA4(gCoreSys.touchX, gCoreSys.touchY, sCommManUnderground->fieldSystem->unk_8C);
v0 = ov5_021EAFA4(gSystem.touchX, gSystem.touchY, sCommManUnderground->fieldSystem->unk_8C);
ov5_021E9230(v0.x, v0.z, &v2, &v3);
v4.unk_00 = v2;
v4.unk_02 = v3;
sCommManUnderground->unk_18.unk_00 = gCoreSys.touchX;
sCommManUnderground->unk_18.unk_02 = gCoreSys.touchY;
sCommManUnderground->unk_18.unk_00 = gSystem.touchX;
sCommManUnderground->unk_18.unk_02 = gSystem.touchY;
sCommManUnderground->unk_1C.unk_00 = v2;
sCommManUnderground->unk_1C.unk_02 = v3;

20
src/overlay023/ov23_0224340C.c
View File

@ -28,7 +28,6 @@
#include "comm_player_manager.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_system.h"
#include "field_task.h"
#include "game_records.h"
@ -46,6 +45,7 @@
#include "strbuf.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "trainer_info.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
@ -2385,11 +2385,11 @@ static void ov23_022451C8(SysTask *param0, void *param1)
}
break;
case 7:
if (gCoreSys.touchHeld) {
if (gSystem.touchHeld) {
UnkStruct_ov23_0224271C v4;
v4.unk_00 = gCoreSys.touchX;
v4.unk_02 = gCoreSys.touchY;
v4.unk_00 = gSystem.touchX;
v4.unk_02 = gSystem.touchY;
if (ov23_02245064(&v4, v0->unk_10, v0)) {
if (v0->unk_19) {
@ -3736,14 +3736,14 @@ static BOOL ov23_02246F20(BgConfig *param0, UnkStruct_ov23_022468DC *param1)
return 1;
}
if (gCoreSys.touchPressed) {
if (gSystem.touchPressed) {
for (v0 = 0; v0 < ov23_022468C0(); v0++) {
if (param1->unk_E4[v0]) {
continue;
}
v8 = gCoreSys.touchX * FX32_ONE - param1->unk_44[v0].unk_00;
v9 = gCoreSys.touchY * FX32_ONE - param1->unk_44[v0].unk_04;
v8 = gSystem.touchX * FX32_ONE - param1->unk_44[v0].unk_00;
v9 = gSystem.touchY * FX32_ONE - param1->unk_44[v0].unk_04;
v11 = FX_Mul(v8, v8) + FX_Mul(v9, v9);
v11 = FX_Sqrt(v11);
@ -3981,9 +3981,9 @@ static BOOL ov23_02247568(BgConfig *param0, UnkStruct_ov23_022471D8 *param1)
}
break;
case 3:
if (gCoreSys.touchPressed) {
v7 = (gCoreSys.touchX - 128) * FX32_ONE;
v8 = (gCoreSys.touchY - param1->unk_120) * FX32_ONE;
if (gSystem.touchPressed) {
v7 = (gSystem.touchX - 128) * FX32_ONE;
v8 = (gSystem.touchY - param1->unk_120) * FX32_ONE;
v10 = FX_Mul(v7, v7) + FX_Mul(v8, v8);
v10 = FX_Sqrt(v10);

6
src/overlay023/ov23_02248C08.c
View File

@ -10,10 +10,10 @@
#include "bg_window.h"
#include "colored_arrow.h"
#include "core_sys.h"
#include "heap.h"
#include "list_menu.h"
#include "string_list.h"
#include "system.h"
#include "unk_02005474.h"
#include "unk_0202854C.h"
@ -95,7 +95,7 @@ u32 ov23_02248D20(UnkStruct_ov23_02248D20 *param0)
if (param0->unk_1C) {
ov23_02248CA4(v1, v2, param0);
if ((gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.pressedKeys & PAD_BUTTON_SELECT)) {
if ((gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.pressedKeys & PAD_BUTTON_SELECT)) {
Sound_PlayEffect(1500);
if (v1 + v2 == v8 - 1) {
@ -159,7 +159,7 @@ u32 ov23_02248D20(UnkStruct_ov23_02248D20 *param0)
return 0xffffffff;
}
} else {
if (gCoreSys.pressedKeys & PAD_BUTTON_SELECT) {
if (gSystem.pressedKeys & PAD_BUTTON_SELECT) {
Sound_PlayEffect(1500);
if (v1 + v2 == v8 - 1) {

12
src/overlay023/ov23_0224B05C.c
View File

@ -30,7 +30,6 @@
#include "comm_player_manager.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_map_change.h"
#include "field_system.h"
#include "field_task.h"
@ -50,6 +49,7 @@
#include "string_list.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "system_flags.h"
#include "trainer_info.h"
#include "unk_02005474.h"
@ -1677,7 +1677,7 @@ static BOOL ov23_0224C790(FieldTask *param0)
break;
case 12:
if (ov23_02254238(ov23_0224219C()) == 0) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
v1->unk_0C = 13;
ov23_02254044(ov23_0224219C());
CommPlayer_SetDir(0);
@ -1712,7 +1712,7 @@ static BOOL ov23_0224C790(FieldTask *param0)
return 1;
case 8:
if (ov23_02254238(ov23_0224219C()) == 0) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
v1->unk_0C = 13;
ov23_02254044(ov23_0224219C());
return 0;
@ -1803,7 +1803,7 @@ static void ov23_0224CB1C(SysTask *param0, void *param1)
break;
case 4:
if (ov23_02254238(ov23_0224219C()) == 0) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
v4 = 1;
}
}
@ -2364,7 +2364,7 @@ static void ov23_0224D5BC(SysTask *param0, void *param1)
break;
case 1:
if (ov23_02254238(ov23_022421AC()) == 0) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
int v1 = v0->unk_05;
ov23_02253F40(ov23_022421AC(), 14 + v1, 0, NULL);
@ -2374,7 +2374,7 @@ static void ov23_0224D5BC(SysTask *param0, void *param1)
break;
case 2:
if (ov23_02254238(ov23_022421AC()) == 0) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov23_0224D54C(v0);
v0->unk_00 = 4;
ov23_02254044(ov23_022421AC());

14
src/overlay023/ov23_0224DC40.c
View File

@ -17,7 +17,6 @@
#include "comm_player_manager.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_system.h"
#include "game_records.h"
#include "heap.h"
@ -29,6 +28,7 @@
#include "string_list.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "trainer_info.h"
#include "unk_02005474.h"
#include "unk_0202854C.h"
@ -620,7 +620,7 @@ static void ov23_0224E2D8(SysTask *param0, void *param1)
break;
case 7:
if (ov23_02254238(ov23_0224219C()) == 0) {
if ((PAD_BUTTON_A)&gCoreSys.pressedKeys) {
if ((PAD_BUTTON_A)&gSystem.pressedKeys) {
v0->unk_37 = 4;
}
}
@ -657,7 +657,7 @@ static void ov23_0224E2D8(SysTask *param0, void *param1)
break;
case 15:
if (ov23_02254238(ov23_0224219C()) == 0) {
if ((PAD_BUTTON_A)&gCoreSys.pressedKeys) {
if ((PAD_BUTTON_A)&gSystem.pressedKeys) {
v0->unk_37 = 14;
}
}
@ -806,7 +806,7 @@ static void ov23_0224E2D8(SysTask *param0, void *param1)
break;
case 37:
if (ov23_02254238(ov23_0224219C()) == 0) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
v0->unk_37 = 38;
}
}
@ -1084,7 +1084,7 @@ static void ov23_0224EC50(SysTask *param0, void *param1)
case 2:
v0->unk_2E = 12;
if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov23_0224DC40(v0, 8);
v0->unk_34 = 8;
} else if (v0->unk_35 == 5) {
@ -1112,7 +1112,7 @@ static void ov23_0224EC50(SysTask *param0, void *param1)
break;
case 9:
if (ov23_02254238(ov23_0224219C()) == 0) {
if ((PAD_BUTTON_A)&gCoreSys.pressedKeys) {
if ((PAD_BUTTON_A)&gSystem.pressedKeys) {
v0->unk_34 = 4;
}
}
@ -1170,7 +1170,7 @@ static void ov23_0224EC50(SysTask *param0, void *param1)
break;
case 21:
if (ov23_02254238(ov23_0224219C()) == 0) {
if ((PAD_BUTTON_A)&gCoreSys.pressedKeys) {
if ((PAD_BUTTON_A)&gSystem.pressedKeys) {
ov23_0224DC40(v0, 15);
v0->unk_34 = 15;
}

8
src/overlay023/ov23_0224F294.c
View File

@ -33,7 +33,6 @@
#include "cell_actor.h"
#include "comm_player_manager.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_map_change.h"
#include "field_system.h"
#include "font.h"
@ -51,6 +50,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "trainer_info.h"
#include "unk_02005474.h"
#include "unk_0200A9DC.h"
@ -572,7 +572,7 @@ static void ov23_0224F914(SysTask *param0, void *param1)
break;
case 13:
if (ov23_02254238(ov23_0224219C()) == 0) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
ov23_02254044(ov23_0224219C());
ov23_02250B34(param0, v0, 0);
ov23_02243204();
@ -582,7 +582,7 @@ static void ov23_0224F914(SysTask *param0, void *param1)
break;
case 14:
if (ov23_02254238(ov23_0224219C()) == 0) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
UnkFuncPtr_ov23_0224F914 v2 = (UnkFuncPtr_ov23_0224F914)v0->unk_00;
v2(v0);
@ -1523,7 +1523,7 @@ static void ov23_02250B9C(SysTask *param0, void *param1)
return;
case 4:
if (ov23_02254238(ov23_022421AC()) == 0) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
v0->unk_2AA = 2;
}
}

8
src/overlay023/ov23_0225128C.c
View File

@ -27,7 +27,6 @@
#include "comm_player_manager.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_system.h"
#include "field_task.h"
#include "heap.h"
@ -43,6 +42,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "system_flags.h"
#include "unk_02005474.h"
#include "unk_0200A9DC.h"
@ -578,7 +578,7 @@ static BOOL ov23_02251960(SysTask *param0, void *param1)
static BOOL ov23_02251A58(UnkStruct_ov23_02250CD4 *param0)
{
if (ov23_02254238(ov23_022421BC()) == 0) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov23_02254044(ov23_022421BC());
return 1;
}
@ -705,7 +705,7 @@ static void ov23_02251C04(SysTask *param0, void *param1)
v0->unk_2AA = 7;
break;
case 7:
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov23_02253D10(v0->unk_270);
v0->unk_270 = NULL;
v0->unk_2AA = 0;
@ -760,7 +760,7 @@ static void ov23_02251C04(SysTask *param0, void *param1)
break;
case 16:
if (ov23_02254238(ov23_022421BC()) == 0) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (!sub_02033DFC()) {
sub_0200AAE0(1, 0, -6, GX_BLEND_PLANEMASK_BG0, 1);
}

12
src/overlay023/ov23_022521F0.c
View File

@ -19,7 +19,6 @@
#include "comm_player_manager.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "field_system.h"
#include "heap.h"
#include "list_menu.h"
@ -35,6 +34,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "unk_02005474.h"
#include "unk_0202854C.h"
@ -712,7 +712,7 @@ static void ov23_02252E70(SysTask *param0, void *param1)
break;
case 6:
if (ov23_02254238(ov23_022421BC()) == 0) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
v0->unk_2AA = 7;
}
}
@ -780,7 +780,7 @@ static void ov23_02252E70(SysTask *param0, void *param1)
break;
case 9:
if (ov23_02254238(ov23_022421BC()) == 0) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
if (v0->unk_2AC == 1) {
ov23_02252CF4(2, v0->unk_2A8);
} else if (v0->unk_2AC == 0) {
@ -796,7 +796,7 @@ static void ov23_02252E70(SysTask *param0, void *param1)
break;
case 10:
if (ov23_02254238(ov23_022421BC()) == 0) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
ov23_02252C9C(8);
v0->unk_2AA = 2;
}
@ -877,7 +877,7 @@ static void ov23_02252E70(SysTask *param0, void *param1)
break;
case 16:
if (ov23_02254238(ov23_022421BC()) == 0) {
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
ov23_0225412C(ov23_022421BC(), v0->unk_27E[0]);
ov23_02252CE0(2, v0->unk_279[0]);
ov23_02252C9C(7);
@ -894,7 +894,7 @@ static void ov23_02252E70(SysTask *param0, void *param1)
break;
case 18:
if (ov23_02254238(ov23_022421BC()) == 0) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov23_02252CD4();
ov23_02252C78(v0);
ov23_02243204();

4
src/overlay023/ov23_02253598.c
View File

@ -17,7 +17,6 @@
#include "bg_window.h"
#include "comm_player_manager.h"
#include "communication_system.h"
#include "core_sys.h"
#include "game_records.h"
#include "heap.h"
#include "list_menu.h"
@ -29,6 +28,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "trainer_info.h"
#include "unk_02005474.h"
@ -203,7 +203,7 @@ static void ov23_0225381C(SysTask *param0, void *param1)
{
UnkStruct_ov23_022537D4 *v0 = param1;
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
ov23_022537D4(param0, param1);
}
}

4
src/overlay023/ov23_02253D40.c
View File

@ -7,7 +7,6 @@
#include "overlay023/struct_ov23_02253F60.h"
#include "bg_window.h"
#include "core_sys.h"
#include "heap.h"
#include "list_menu.h"
#include "message.h"
@ -16,6 +15,7 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "trainer_info.h"
@ -143,7 +143,7 @@ static void ov23_02253E40(SysTask *param0, void *param1)
}
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
ov23_02254044(v0);
}
}

77
src/overlay023/ov23_02254A14.c
View File

@ -21,14 +21,13 @@
#include "overlay023/struct_ov23_022542D8_decl.h"
#include "overlay023/struct_ov23_02254594_decl.h"
#include "core_sys.h"
#include "easy3d.h"
#include "field_task.h"
#include "heap.h"
#include "system.h"
#include "text.h"
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_0202854C.h"
#include "unk_020573FC.h"
@ -413,22 +412,22 @@ static BOOL ov23_02254DF8(FieldTask *param0)
v12 = 1;
v13 = v6->unk_3C.unk_00;
if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) {
if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) {
v0 = -(FX32_ONE * 16);
v1 = 0;
v13.unk_00--;
v13.unk_08--;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) {
v0 = (FX32_ONE * 16);
v1 = 0;
v13.unk_00++;
v13.unk_08++;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) {
v0 = 0;
v1 = -(FX32_ONE * 16);
v13.unk_04--;
v13.unk_0C--;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) {
v0 = 0;
v1 = (FX32_ONE * 16);
v13.unk_04++;
@ -452,9 +451,9 @@ static BOOL ov23_02254DF8(FieldTask *param0)
}
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
v4 = 1;
} else if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
} else if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov23_02254A94(fieldSystem, v6->unk_3C.unk_10);
v6->unk_04 = 0;
return 0;
@ -568,22 +567,22 @@ static BOOL ov23_02255100(FieldTask *param0)
v3 = v7->unk_4FC->unk_58.z;
if (!v4) {
if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) {
if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) {
Sound_PlayEffect(1509);
v2 -= (FX32_ONE * 16);
v1.unk_00--;
v1.unk_08--;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) {
Sound_PlayEffect(1509);
v2 += (FX32_ONE * 16);
v1.unk_00++;
v1.unk_08++;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) {
Sound_PlayEffect(1509);
v3 -= (FX32_ONE * 16);
v1.unk_04--;
v1.unk_0C--;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) {
Sound_PlayEffect(1509);
v3 += (FX32_ONE * 16);
v1.unk_04++;
@ -592,9 +591,9 @@ static BOOL ov23_02255100(FieldTask *param0)
v0 = 0;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
v5 = 1;
} else if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
} else if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov23_02255F20(v7->unk_4FC);
ov23_0225628C(fieldSystem, &v7->unk_4DC);
ov23_02255EBC(3, v7);
@ -803,22 +802,22 @@ static BOOL ov23_02255580(FieldTask *param0)
v3 = v7->unk_4FC->unk_58.z;
if (!v4) {
if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) {
if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) {
Sound_PlayEffect(1509);
v2 -= (FX32_ONE * 16);
v1.unk_00--;
v1.unk_08--;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) {
Sound_PlayEffect(1509);
v2 += (FX32_ONE * 16);
v1.unk_00++;
v1.unk_08++;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) {
Sound_PlayEffect(1509);
v3 -= (FX32_ONE * 16);
v1.unk_04--;
v1.unk_0C--;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) {
Sound_PlayEffect(1509);
v3 += (FX32_ONE * 16);
v1.unk_04++;
@ -827,9 +826,9 @@ static BOOL ov23_02255580(FieldTask *param0)
v0 = 0;
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
v5 = 1;
} else if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
} else if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov23_02255F20(v7->unk_4FC);
ov23_0225628C(fieldSystem, &v7->unk_4DC);
ov23_02255EBC(3, v7);
@ -941,22 +940,22 @@ static BOOL ov23_02255850(FieldTask *param0)
v7 = 1;
v8 = v6->unk_3C.unk_00;
if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) {
if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) {
v0 = -(FX32_ONE * 16);
v1 = 0;
v8.unk_00--;
v8.unk_08--;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) {
v0 = (FX32_ONE * 16);
v1 = 0;
v8.unk_00++;
v8.unk_08++;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) {
v0 = 0;
v1 = -(FX32_ONE * 16);
v8.unk_04--;
v8.unk_0C--;
} else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) {
} else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) {
v0 = 0;
v1 = (FX32_ONE * 16);
v8.unk_04++;
@ -980,9 +979,9 @@ static BOOL ov23_02255850(FieldTask *param0)
}
}
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
v4 = 1;
} else if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
} else if (gSystem.pressedKeys & PAD_BUTTON_B) {
ov23_02255BB8(&v6->unk_0C.unk_10, v6->unk_0C.unk_00, v6->unk_5C);
ov23_02255E8C(v6);
ov23_0225628C(fieldSystem, &v6->unk_4DC);
@ -1363,7 +1362,7 @@ static void ov23_02255F40(FieldSystem *fieldSystem, UnkStruct_ov23_02255A98 *par
v6 = fieldSystem->unk_8C;
ov23_02255F28(gCoreSys.touchX, gCoreSys.touchY, param2);
ov23_02255F28(gSystem.touchX, gSystem.touchY, param2);
v1 = ov5_021EAFA4(param2->unk_00, param2->unk_04, v6);
v2 = v1.x / (FX32_ONE * 16);
@ -1405,7 +1404,7 @@ static void ov23_02256000(FieldSystem *fieldSystem, UnkStruct_ov23_02256000 *par
v4 = fieldSystem->unk_8C;
ov23_02255F28(gCoreSys.touchX, gCoreSys.touchY, param1);
ov23_02255F28(gSystem.touchX, gSystem.touchY, param1);
v1 = ov5_021EAFA4(param1->unk_00, param1->unk_04, v4);
v2 = v1.x / (FX32_ONE * 16);
@ -1435,14 +1434,14 @@ static BOOL ov23_02256098(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSys
v1 = 0;
*param2 = 0;
if (gCoreSys.touchPressed) {
if (!gCoreSys.heldKeys) {
if (gSystem.touchPressed) {
if (!gSystem.heldKeys) {
param0->unk_4F0.unk_08 = 1;
ov23_02255F40(fieldSystem, &(param0->unk_3C), &param0->unk_4F0);
}
v1 = 1;
} else if (gCoreSys.touchHeld) {
} else if (gSystem.touchHeld) {
if (param0->unk_4F0.unk_08) {
ov23_02255F40(fieldSystem, &(param0->unk_3C), &param0->unk_4F0);
}
@ -1466,14 +1465,14 @@ static BOOL ov23_02256104(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSys
v1 = 0;
*param2 = 0;
if (gCoreSys.touchPressed) {
if (!gCoreSys.heldKeys) {
if (gSystem.touchPressed) {
if (!gSystem.heldKeys) {
param0->unk_4F0.unk_08 = 1;
ov23_02256000(fieldSystem, &param0->unk_4F0, param0->unk_4FC);
}
v1 = 1;
} else if (gCoreSys.touchHeld) {
} else if (gSystem.touchHeld) {
if (param0->unk_4F0.unk_08) {
ov23_02256000(fieldSystem, &param0->unk_4F0, param0->unk_4FC);
}
@ -1497,8 +1496,8 @@ static BOOL ov23_02256174(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSys
v1 = 0;
*param2 = 0;
if (gCoreSys.touchPressed) {
if (!gCoreSys.heldKeys) {
if (gSystem.touchPressed) {
if (!gSystem.heldKeys) {
param0->unk_4F0.unk_08 = 1;
*param2 = 1;
ov23_02256000(fieldSystem, &param0->unk_4F0, param0->unk_4FC);
@ -1520,14 +1519,14 @@ static BOOL ov23_022561BC(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSys
v1 = 0;
*param2 = 0;
if (gCoreSys.touchPressed) {
if (!gCoreSys.heldKeys) {
if (gSystem.touchPressed) {
if (!gSystem.heldKeys) {
param0->unk_4F0.unk_08 = 1;
ov23_02255F40(fieldSystem, &(param0->unk_3C), &param0->unk_4F0);
}
v1 = 1;
} else if (gCoreSys.touchHeld) {
} else if (gSystem.touchHeld) {
if (param0->unk_4F0.unk_08) {
ov23_02255F40(fieldSystem, &(param0->unk_3C), &param0->unk_4F0);
}

4
src/overlay033/ov33_02256474.c
View File

@ -17,7 +17,6 @@
#include "overlay033/struct_ov33_02256474_decl.h"
#include "bg_window.h"
#include "core_sys.h"
#include "graphics.h"
#include "heap.h"
#include "inlines.h"
@ -27,6 +26,7 @@
#include "pokemon_icon.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
typedef struct {
UnkStruct_ov25_022558C4 *unk_00;
@ -509,7 +509,7 @@ static void ov33_02256B08(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_
static void ov33_02256B3C(const char *param0, ...)
{
if (gCoreSys.heldKeys & PAD_BUTTON_B) {
if (gSystem.heldKeys & PAD_BUTTON_B) {
va_list v0;
va_start(v0, param0);
va_end(v0);

17
src/overlay056/ov56_022561C0.c
View File

@ -16,7 +16,6 @@
#include "bg_window.h"
#include "cell_actor.h"
#include "core_sys.h"
#include "field_message.h"
#include "field_task.h"
#include "font.h"
@ -32,13 +31,13 @@
#include "strbuf.h"
#include "string_template.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "touch_screen.h"
#include "trainer_info.h"
#include "unk_02005474.h"
#include "unk_0200679C.h"
#include "unk_02014A84.h"
#include "unk_02017728.h"
#include "unk_02027F84.h"
#include "unk_02033200.h"
#include "unk_0205B33C.h"
@ -591,7 +590,7 @@ static int ov56_02256A68(UnkStruct_ov56_02256468 *param0)
param0->unk_228 = v0 - 2;
break;
default:
if (gCoreSys.touchPressed == 0) {
if (gSystem.touchPressed == 0) {
break;
}
@ -677,19 +676,19 @@ static int ov56_02256BC0(UnkStruct_ov56_02256468 *param0)
static void ov56_02256C84(UnkStruct_ov56_02256468 *param0)
{
if (gCoreSys.heldKeys & PAD_BUTTON_L) {
if (gSystem.heldKeys & PAD_BUTTON_L) {
ov56_0225718C(param0, 0);
if (gCoreSys.pressedKeysRepeatable & PAD_BUTTON_L) {
if (gSystem.pressedKeysRepeatable & PAD_BUTTON_L) {
if (param0->unk_2D8.unk_04 != 0) {
param0->unk_2D8.unk_04--;
Sound_PlayEffect(1509);
}
}
} else if (gCoreSys.heldKeys & PAD_BUTTON_R) {
} else if (gSystem.heldKeys & PAD_BUTTON_R) {
ov56_0225718C(param0, 1);
if (gCoreSys.pressedKeysRepeatable & PAD_BUTTON_R) {
if (gSystem.pressedKeysRepeatable & PAD_BUTTON_R) {
if (param0->unk_2D8.unk_04 < param0->unk_2D8.unk_00 - 3) {
param0->unk_2D8.unk_04++;
Sound_PlayEffect(1509);
@ -919,10 +918,10 @@ static void ov56_0225712C(UnkStruct_ov56_02256468 *param0)
{
param0->unk_2EC = 0;
if (gCoreSys.touchPressed) {
if (gSystem.touchPressed) {
param0->unk_2EC = 1;
} else {
if (gCoreSys.touchHeld) {
if (gSystem.touchHeld) {
param0->unk_2ED--;
if (param0->unk_2ED < 0) {

5
src/overlay058/ov58_021D0D80.c
View File

@ -19,7 +19,6 @@
#include "char_transfer.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "font.h"
#include "game_options.h"
#include "graphics.h"
@ -38,6 +37,7 @@
#include "sprite_util.h"
#include "strbuf.h"
#include "string_template.h"
#include "system.h"
#include "text.h"
#include "touch_screen.h"
#include "trainer_info.h"
@ -45,7 +45,6 @@
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_02015920.h"
#include "unk_02017728.h"
#include "unk_0201E3D8.h"
#include "unk_02030EE0.h"
#include "unk_02033200.h"
@ -876,7 +875,7 @@ static void ov58_021D1A80(UnkStruct_02095EAC *param0)
CellActor_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 0);
if (v1 != 0xffffffff) {
ov58_021D1A10(param0->unk_23C[CommSys_CurNetId()], gCoreSys.touchX, gCoreSys.touchY);
ov58_021D1A10(param0->unk_23C[CommSys_CurNetId()], gSystem.touchX, gSystem.touchY);
CellActor_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 1);
}

19
src/overlay059/ov59_021D0D80.c
View File

@ -19,7 +19,6 @@
#include "char_transfer.h"
#include "communication_information.h"
#include "communication_system.h"
#include "core_sys.h"
#include "font.h"
#include "game_options.h"
#include "game_records.h"
@ -43,12 +42,12 @@
#include "string_template.h"
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "text.h"
#include "trainer_info.h"
#include "unk_020041CC.h"
#include "unk_02005474.h"
#include "unk_0200F174.h"
#include "unk_02017728.h"
#include "unk_02030EE0.h"
#include "unk_020363E8.h"
#include "unk_020366A0.h"
@ -750,7 +749,7 @@ static int ov59_021D1838(UnkStruct_020961E8 *param0, int param1)
static void ov59_021D1864(UnkStruct_020961E8 *param0)
{
if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
if (gSystem.pressedKeys & PAD_BUTTON_A) {
if (CommSys_CurNetId() == 0) {
if ((ov59_021D2528() == param0->unk_4AAC) && (param0->unk_4AB4 == 0)) {
u8 v0 = 1;
@ -765,7 +764,7 @@ static void ov59_021D1864(UnkStruct_020961E8 *param0)
Sound_PlayEffect(1522);
}
}
} else if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
} else if (gSystem.pressedKeys & PAD_BUTTON_B) {
if (CommSys_CurNetId()) {
if (param0->unk_4AA0 == 0) {
ov59_021D2628(param0, 4, 0);
@ -867,7 +866,7 @@ static int ov59_021D1A44(UnkStruct_020961E8 *param0, int param1)
if (CommSys_CurNetId()) {
if (param0->unk_4AA0) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_KEY_UP | PAD_KEY_DOWN)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_KEY_UP | PAD_KEY_DOWN)) {
Sound_PlayEffect(1522);
}
@ -876,7 +875,7 @@ static int ov59_021D1A44(UnkStruct_020961E8 *param0, int param1)
}
} else {
if (param0->unk_4AB4 != 0) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_KEY_UP | PAD_KEY_DOWN)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_KEY_UP | PAD_KEY_DOWN)) {
Sound_PlayEffect(1522);
}
@ -993,7 +992,7 @@ static int ov59_021D1C64(UnkStruct_020961E8 *param0, int param1)
u32 v1;
if ((ov59_021D2528() != param0->unk_4AAC) || (param0->unk_4AB4 != 0)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_KEY_UP | PAD_KEY_DOWN)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_KEY_UP | PAD_KEY_DOWN)) {
Sound_PlayEffect(1522);
}
@ -1079,7 +1078,7 @@ static int ov59_021D1DA0(UnkStruct_020961E8 *param0, int param1)
static int ov59_021D1DC8(UnkStruct_020961E8 *param0, int param1)
{
gCoreSys.inhibitReset = 1;
gSystem.inhibitReset = 1;
void *journalEntryOnlineEvent = JournalEntry_CreateEventMixedRecords(51);
@ -1105,7 +1104,7 @@ static int ov59_021D1E0C(UnkStruct_020961E8 *param0, int param1)
param0->unk_0C.unk_00 = 0;
param0->unk_3B4 = 0;
gCoreSys.inhibitReset = 0;
gSystem.inhibitReset = 0;
param0->unk_4AA4 = 0;
}
@ -1161,7 +1160,7 @@ static int ov59_021D1F24(UnkStruct_020961E8 *param0, int param1)
int v0;
if ((param0->unk_4AAC != ov59_021D2528()) || (param0->unk_4AB4 != 0)) {
if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_KEY_UP | PAD_KEY_DOWN)) {
if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_KEY_UP | PAD_KEY_DOWN)) {
Sound_PlayEffect(1522);
}

4
src/overlay061/ov61_0222B008.c
View File

@ -26,7 +26,6 @@
#include "overlay062/struct_ov62_0223D518_sub1_sub1.h"
#include "overlay062/struct_ov62_02241130.h"
#include "core_sys.h"
#include "gds.h"
#include "heap.h"
#include "message.h"
@ -34,6 +33,7 @@
#include "save_player.h"
#include "strbuf.h"
#include "string_template.h"
#include "system.h"
#include "unk_0202F1D4.h"
#include "unk_020366A0.h"
@ -155,7 +155,7 @@ static int ov61_0222B168(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B13
static int ov61_0222B190(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B138 *param1)
{
if ((gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.pressedKeys & PAD_BUTTON_B)) {
if ((gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.pressedKeys & PAD_BUTTON_B)) {
ov61_0222BB54(param0, NULL);
return 1;
}

Some files were not shown because too many files have changed in this diff Show More