From 6fd993909acb86dd5deec0e11b73607630b750be Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 7 Feb 2025 20:59:36 -0800 Subject: [PATCH 1/5] Identify + document boot.c --- include/boot.h | 7 ++++ include/unk_02024358.h | 7 ---- platinum.us/main.lsf | 2 +- src/boot.c | 59 ++++++++++++++++++++++++++++++++++ src/meson.build | 2 +- src/overlay097/ov97_0222AE60.c | 4 +-- src/unk_02017728.c | 6 ++-- src/unk_02024358.c | 57 -------------------------------- 8 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 include/boot.h delete mode 100644 include/unk_02024358.h create mode 100644 src/boot.c delete mode 100644 src/unk_02024358.c diff --git a/include/boot.h b/include/boot.h new file mode 100644 index 0000000000..80c2831de0 --- /dev/null +++ b/include/boot.h @@ -0,0 +1,7 @@ +#ifndef POKEPLATINUM_BOOT_H +#define POKEPLATINUM_BOOT_H + +void CheckForMemoryTampering(void); +void RebootAndLoadROM(const char *filesystemPath); + +#endif // POKEPLATINUM_BOOT_H diff --git a/include/unk_02024358.h b/include/unk_02024358.h deleted file mode 100644 index 8876610647..0000000000 --- a/include/unk_02024358.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef POKEPLATINUM_UNK_02024358_H -#define POKEPLATINUM_UNK_02024358_H - -void sub_02024358(void); -void sub_020243E0(const char *param0); - -#endif // POKEPLATINUM_UNK_02024358_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 0b45270d0e..8b6e7019df 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -101,7 +101,7 @@ Static main Object main.nef.p/src_unk_0202419C.c.o Object main.nef.p/src_hardware_palette.c.o Object main.nef.p/src_unk_02024220.c.o - Object main.nef.p/src_unk_02024358.c.o + Object main.nef.p/src_boot.c.o Object main.nef.p/src_savedata_save_table.c.o Object main.nef.p/src_savedata.c.o Object main.nef.p/src_system_data.c.o diff --git a/src/boot.c b/src/boot.c new file mode 100644 index 0000000000..f1659bc007 --- /dev/null +++ b/src/boot.c @@ -0,0 +1,59 @@ +#include "boot.h" + +#include + +#define GAME_CODE_POKEMON_DIAMOND_JP (('A' << 0) | ('D' << 8) | ('A' << 16) | ('J' << 24)) +#define MAKER_CODE_NINTENDO (('0' << 0) | ('1' << 8)) + +static const char sLoadName[] = "rom"; +static const int sLoadNameLen = sizeof(sLoadName) - 1; + +void CheckForMemoryTampering() +{ + if (!FS_IsAvailable()) { + OS_Terminate(); + } else { + const CARDRomHeader *sanityHeader; + + // Deliberately keeping this scope block so that the declared variables fall out of scope + // and cannot be reused + { + CARDRomHeader *const checkHeader = (CARDRomHeader *)HW_MAIN_MEM_SHARED; // 0x027FF000 + CARDRomHeader *const loadedHeader = (CARDRomHeader *)HW_ROM_HEADER_BUF; // 0x027FFE00 + CARDRomHeader *const backupHeader = (CARDRomHeader *)HW_CARD_ROM_HEADER; // 0x027FFA80 + + if (checkHeader->game_code == 0) { + CARD_Init(); + MI_CpuCopy8(loadedHeader, checkHeader, HW_CARD_ROM_HEADER_SIZE); + MI_CpuCopy8(loadedHeader, backupHeader, HW_CARD_ROM_HEADER_SIZE); + checkHeader->game_code = GAME_CODE_POKEMON_DIAMOND_JP; + } + + sanityHeader = checkHeader; + } + + FSArchive *archive = FS_FindArchive(sLoadName, sLoadNameLen); + archive->fat = sanityHeader->fat.offset; + archive->fat_size = sanityHeader->fat.length; + archive->fnt = sanityHeader->fnt.offset; + archive->fnt_size = sanityHeader->fnt.length; + + if (sanityHeader->game_code != GAME_CODE_POKEMON_DIAMOND_JP + || sanityHeader->maker_code != MAKER_CODE_NINTENDO) { + OS_Terminate(); + } + } +} + +void RebootAndLoadROM(const char *filesystemPath) +{ + FSFile file; + FS_InitFile(&file); + if (!FS_OpenFile(&file, filesystemPath)) { + return; + } + + u32 fileStartAddress = FS_GetFileImageTop(&file); + *(u32 *)HW_ROM_BASE_OFFSET_BUF = fileStartAddress; + OS_ResetSystem(0); +} diff --git a/src/meson.build b/src/meson.build index 98f7c6c868..a4f603ee50 100644 --- a/src/meson.build +++ b/src/meson.build @@ -93,7 +93,7 @@ pokeplatinum_c = files( 'unk_0202419C.c', 'hardware_palette.c', 'unk_02024220.c', - 'unk_02024358.c', + 'boot.c', 'savedata/save_table.c', 'savedata.c', 'system_data.c', diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 288961b54a..893cc71ddb 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -14,6 +14,7 @@ #include "savedata/save_table.h" #include "bg_window.h" +#include "boot.h" #include "cell_actor.h" #include "core_sys.h" #include "font.h" @@ -40,7 +41,6 @@ #include "unk_02005474.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "unk_02024358.h" #include "unk_0202DAB4.h" #include "unk_020366A0.h" #include "unk_0209A74C.h" @@ -1178,7 +1178,7 @@ static void ov97_0222C094(UnkStruct_0222AE60 *param0) EnqueueApplication(FS_OVERLAY_ID(overlay97), &Unk_ov97_0223D6BC); break; case 6: - sub_020243E0("data/eoo.dat"); + RebootAndLoadROM("data/eoo.dat"); break; case 7: sub_0200569C(); diff --git a/src/unk_02017728.c b/src/unk_02017728.c index 549b08c9d1..0270699e30 100644 --- a/src/unk_02017728.c +++ b/src/unk_02017728.c @@ -7,11 +7,11 @@ #include "struct_defs/struct_02017E74.h" +#include "boot.h" #include "core_sys.h" #include "heap.h" #include "math.h" #include "sys_task_manager.h" -#include "unk_02024358.h" typedef struct { void *unk_00; @@ -27,10 +27,8 @@ CoreSys gCoreSys; void sub_02017728(void) { OS_SetIrqCheckFlag(OS_IE_V_BLANK); - MI_WaitDma(GX_DEFAULT_DMAID); SysTaskManager_ExecuteTasks(gCoreSys.vBlankTaskMgr); - gCoreSys.frameCounter++; } @@ -165,7 +163,7 @@ void sub_0201789C(void) (void)GX_VBlankIntr(1); FS_Init(1); - sub_02024358(); + CheckForMemoryTampering(); { u32 v0 = FS_GetTableSize(); diff --git a/src/unk_02024358.c b/src/unk_02024358.c deleted file mode 100644 index b82751660e..0000000000 --- a/src/unk_02024358.c +++ /dev/null @@ -1,57 +0,0 @@ -#include "unk_02024358.h" - -#include -#include - -void sub_02024358() -{ - if (!FS_IsAvailable()) { - OS_Terminate(); - } else { - static const char v0[] = "rom"; - static const int v1 = sizeof(v0) - 1; - const CARDRomHeader *v2; - FSArchive *v3; - { - CARDRomHeader *const v4 = (CARDRomHeader *)0x27FF000; - CARDRomHeader *const v5 = (CARDRomHeader *)HW_ROM_HEADER_BUF; - CARDRomHeader *const v6 = (CARDRomHeader *)HW_CARD_ROM_HEADER; - - if (v4->game_code == 0) { - CARD_Init(); - MI_CpuCopy8(v5, v4, HW_CARD_ROM_HEADER_SIZE); - MI_CpuCopy8(v5, v6, HW_CARD_ROM_HEADER_SIZE); - v4->game_code = (('A' << 0) | ('D' << 8) | ('A' << 16) | ('J' << 24)); - } - - v2 = v4; - } - - v3 = FS_FindArchive(v0, v1); - v3->fat = v2->fat.offset; - v3->fat_size = v2->fat.length; - v3->fnt = v2->fnt.offset; - v3->fnt_size = v2->fnt.length; - - if ((v2->game_code != (('A' << 0) | ('D' << 8) | ('A' << 16) | ('J' << 24))) || (v2->maker_code != (('0' << 0) | ('1' << 8)))) { - OS_Terminate(); - } - } -} - -void sub_020243E0(const char *param0) -{ - FSFile v0; - u32 v1; - - FS_InitFile(&v0); - - if (!FS_OpenFile(&v0, param0)) { - return; - } - - v1 = FS_GetFileImageTop(&v0); - - *(u32 *)HW_ROM_BASE_OFFSET_BUF = v1; - OS_ResetSystem(0); -} From b48080e37ef39a960b6ea63882e22971c943567f Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 7 Feb 2025 21:25:38 -0800 Subject: [PATCH 2/5] Clean up some lingering mess in heap.{h,c} --- include/heap.h | 8 +-- include/overlay021/ov21_021D423C.h | 4 +- include/overlay021/ov21_021D4340.h | 4 +- include/overlay021/ov21_021D4EE4.h | 4 +- include/overlay021/pokedex_sort.h | 3 +- include/overlay021/pokedex_text.h | 3 +- include/struct_defs/struct_02017E74.h | 11 ---- src/error_message_reset.c | 1 - src/heap.c | 50 ++++++++----------- src/overlay006/great_marsh_daily_encounters.c | 4 +- src/overlay021/ov21_021D423C.c | 2 + src/overlay021/ov21_021D4340.c | 2 + src/overlay021/ov21_021D4EE4.c | 3 +- src/overlay021/pokedex_sort.c | 4 +- src/overlay021/pokedex_text.c | 7 +-- src/overlay024/ov24_02253CE0.c | 3 +- src/overlay028/ov28_02256E9C.c | 4 +- src/overlay055/ov55_0225632C.c | 3 +- src/unk_02017728.c | 3 -- src/unk_02033200.c | 4 +- 20 files changed, 52 insertions(+), 75 deletions(-) delete mode 100644 include/struct_defs/struct_02017E74.h diff --git a/include/heap.h b/include/heap.h index 0496e52f72..a98f4d49a3 100644 --- a/include/heap.h +++ b/include/heap.h @@ -3,10 +3,12 @@ #include -#include "constants/heap.h" - -#include "struct_defs/struct_02017E74.h" +typedef struct HeapParam { + u32 size; + OSArenaId arena; +} HeapParam; +void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 preSize); BOOL Heap_Create(u32 parent, u32 child, u32 size); BOOL Heap_CreateAtEnd(u32 parent, u32 child, u32 size); void Heap_Destroy(u32 heapID); diff --git a/include/overlay021/ov21_021D423C.h b/include/overlay021/ov21_021D423C.h index 9c305b7539..d621451948 100644 --- a/include/overlay021/ov21_021D423C.h +++ b/include/overlay021/ov21_021D423C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV21_021D423C_H #define POKEPLATINUM_OV21_021D423C_H +#include "constants/heap.h" + #include "overlay021/struct_ov21_021D423C_decl.h" #include "overlay021/struct_ov21_021D4660.h" -#include "heap.h" - UnkStruct_ov21_021D423C *ov21_021D423C(enum HeapId heapID); void ov21_021D426C(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1, int param2); const UnkStruct_ov21_021D4660 *ov21_021D4284(UnkStruct_ov21_021D423C *param0, int param1); diff --git a/include/overlay021/ov21_021D4340.h b/include/overlay021/ov21_021D4340.h index d75d68d3b1..e303162744 100644 --- a/include/overlay021/ov21_021D4340.h +++ b/include/overlay021/ov21_021D4340.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_OV21_021D4340_H #define POKEPLATINUM_OV21_021D4340_H +#include "constants/heap.h" + #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D4340_1.h" #include "overlay021/struct_ov21_021D4660.h" -#include "heap.h" - BOOL ov21_021D4340(UnkStruct_ov21_021D4340_1 *param0); BOOL ov21_021D43A8(UnkStruct_ov21_021D4340_1 *param0); BOOL ov21_021D4434(UnkStruct_ov21_021D4340_1 *param0); diff --git a/include/overlay021/ov21_021D4EE4.h b/include/overlay021/ov21_021D4EE4.h index 42148eda8d..1bc11491b7 100644 --- a/include/overlay021/ov21_021D4EE4.h +++ b/include/overlay021/ov21_021D4EE4.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV21_021D4EE4_H #define POKEPLATINUM_OV21_021D4EE4_H +#include "constants/heap.h" + #include "overlay021/struct_ov21_021D4EE4_decl.h" #include "overlay021/struct_ov21_021D4FE4.h" -#include "heap.h" - UnkStruct_ov21_021D4EE4 *ov21_021D4EE4(enum HeapId heapID); void ov21_021D4EFC(UnkStruct_ov21_021D4EE4 *param0); void ov21_021D4F04(UnkStruct_ov21_021D4EE4 *param0, const UnkStruct_ov21_021D4FE4 *param1, int param2, int param3); diff --git a/include/overlay021/pokedex_sort.h b/include/overlay021/pokedex_sort.h index b85b8128ee..ae1ad374a8 100644 --- a/include/overlay021/pokedex_sort.h +++ b/include/overlay021/pokedex_sort.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_POKEDEXSORT_H #define POKEPLATINUM_POKEDEXSORT_H +#include "constants/heap.h" + #include "overlay021/species_caught_status.h" #include "overlay021/struct_ov21_021D3208.h" #include "overlay021/struct_ov21_021D3320.h" -#include "heap.h" #include "strbuf.h" enum SortOrder { diff --git a/include/overlay021/pokedex_text.h b/include/overlay021/pokedex_text.h index 5256c5261f..c398fd0a74 100644 --- a/include/overlay021/pokedex_text.h +++ b/include/overlay021/pokedex_text.h @@ -1,7 +1,8 @@ #ifndef POKEPLATINUM_POKEDEX_TEXT_H #define POKEPLATINUM_POKEDEX_TEXT_H -#include "heap.h" +#include "constants/heap.h" + #include "strbuf.h" void PokedexText_Free(Strbuf *strbuf); diff --git a/include/struct_defs/struct_02017E74.h b/include/struct_defs/struct_02017E74.h deleted file mode 100644 index d78661a8aa..0000000000 --- a/include/struct_defs/struct_02017E74.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02017E74_H -#define POKEPLATINUM_STRUCT_02017E74_H - -#include - -typedef struct { - u32 size; - OSArenaId arena; -} HeapParam; - -#endif // POKEPLATINUM_STRUCT_02017E74_H diff --git a/src/error_message_reset.c b/src/error_message_reset.c index 349fdbfd7c..3e66877095 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/struct_02017E74.h" #include "struct_defs/struct_02099F80.h" #include "bg_window.h" diff --git a/src/heap.c b/src/heap.c index 9382ed6bcd..970b8642ae 100644 --- a/src/heap.c +++ b/src/heap.c @@ -3,8 +3,6 @@ #include #include -#include "struct_defs/struct_02017E74.h" - #include "error_message_reset.h" #include "unk_020366A0.h" @@ -32,34 +30,31 @@ static void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignmen static HeapInfo sHeapInfo = { 0 }; -void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size) +void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 preSize) { void *ptr; - u32 unk_size, i; - - unk_size = nTemplates + 24; - - if (totalNumHeaps < unk_size) { - totalNumHeaps = unk_size; + u32 i; + u32 usableHeaps = nTemplates + 24; + if (totalNumHeaps < usableHeaps) { + totalNumHeaps = usableHeaps; } - if (pre_size) { - while (pre_size & 3) { - pre_size++; + if (preSize) { + while (preSize & 3) { + preSize++; } - - OS_AllocFromMainArenaLo(pre_size, 4); + OS_AllocFromMainArenaLo(preSize, 4); } - sHeapInfo.heapHandles = OS_AllocFromMainArenaLo(sizeof(NNSFndHeapHandle) * (unk_size + 1) + sizeof(NNSFndHeapHandle) * (unk_size) + sizeof(void *) * (unk_size) + sizeof(u16) * (totalNumHeaps) + totalNumHeaps, 4); - sHeapInfo.parentHeapHandles = sHeapInfo.heapHandles + (unk_size + 1); - sHeapInfo.subHeapRawPtrs = (void **)((u8 *)(sHeapInfo.parentHeapHandles) + (sizeof(NNSFndHeapHandle) * unk_size)); - sHeapInfo.numMemBlocks = (u16 *)((u8 *)(sHeapInfo.subHeapRawPtrs) + (sizeof(void *) * unk_size)); + sHeapInfo.heapHandles = OS_AllocFromMainArenaLo((sizeof(NNSFndHeapHandle) * (usableHeaps + 1)) + (sizeof(NNSFndHeapHandle) * usableHeaps) + (sizeof(void *) * usableHeaps) + (sizeof(u16) * (totalNumHeaps)) + totalNumHeaps, 4); + sHeapInfo.parentHeapHandles = sHeapInfo.heapHandles + (usableHeaps + 1); + sHeapInfo.subHeapRawPtrs = (void **)((u8 *)(sHeapInfo.parentHeapHandles) + (sizeof(NNSFndHeapHandle) * usableHeaps)); + sHeapInfo.numMemBlocks = (u16 *)((u8 *)(sHeapInfo.subHeapRawPtrs) + (sizeof(void *) * usableHeaps)); sHeapInfo.heapIdxs = (u8 *)(sHeapInfo.numMemBlocks) + (sizeof(u16) * (totalNumHeaps)); sHeapInfo.totalNumHeaps = totalNumHeaps; sHeapInfo.nTemplates = nTemplates; - sHeapInfo.unallocatedHeapID = unk_size; - sHeapInfo.maxHeaps = unk_size; + sHeapInfo.unallocatedHeapID = usableHeaps; + sHeapInfo.maxHeaps = usableHeaps; for (i = 0; i < nTemplates; i++) { switch (templates[i].arena) { @@ -80,7 +75,7 @@ void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHea } } - for (i = nTemplates; i < (unk_size + 1); i++) { + for (i = nTemplates; i < (usableHeaps + 1); i++) { sHeapInfo.heapHandles[i] = NNS_FND_HEAP_INVALID_HANDLE; sHeapInfo.heapIdxs[i] = sHeapInfo.unallocatedHeapID; } @@ -96,9 +91,7 @@ void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHea static int FindFirstAvailableHeapHandle(void) { - int i; - - for (i = sHeapInfo.nTemplates; i < sHeapInfo.maxHeaps; i++) { + for (int i = sHeapInfo.nTemplates; i < sHeapInfo.maxHeaps; i++) { if (sHeapInfo.heapHandles[i] == NNS_FND_HEAP_INVALID_HANDLE) { return i; } @@ -202,7 +195,7 @@ static void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignmen if (ptr != NULL) { ((MemoryBlock *)ptr)->heapID = heapID; - (u8 *)ptr += sizeof(MemoryBlock); + ptr += sizeof(MemoryBlock); } return ptr; @@ -255,7 +248,7 @@ void *Heap_AllocFromHeapAtEnd(u32 heapID, u32 size) void Heap_FreeToHeap(void *ptr) { - (u8 *)ptr -= sizeof(MemoryBlock); + ptr -= sizeof(MemoryBlock); u32 heapID = ((MemoryBlock *)ptr)->heapID; if (heapID < sHeapInfo.totalNumHeaps) { @@ -294,7 +287,7 @@ void Heap_FreeToHeapExplicit(u32 heapID, void *ptr) GF_ASSERT(heap != NNS_FND_HEAP_INVALID_HANDLE); - (u8 *)ptr -= sizeof(MemoryBlock); + ptr -= sizeof(MemoryBlock); if (((MemoryBlock *)ptr)->heapID != heapID) { GF_ASSERT(0); @@ -337,7 +330,7 @@ void Heap_ReallocFromHeap(void *ptr, u32 newSize) GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); newSize += sizeof(MemoryBlock); - (u8 *)ptr -= sizeof(MemoryBlock); + ptr -= sizeof(MemoryBlock); if (NNS_FndGetSizeForMBlockExpHeap(ptr) >= newSize) { u32 heapID = ((MemoryBlock *)ptr)->heapID; @@ -351,7 +344,6 @@ void Heap_ReallocFromHeap(void *ptr, u32 newSize) } BOOL GF_heap_c_dummy_return_true(u32 heapID) -#pragma unused(heapID) { return TRUE; } diff --git a/src/overlay006/great_marsh_daily_encounters.c b/src/overlay006/great_marsh_daily_encounters.c index 2f3c5a7ec4..77cd0745cc 100644 --- a/src/overlay006/great_marsh_daily_encounters.c +++ b/src/overlay006/great_marsh_daily_encounters.c @@ -1,8 +1,6 @@ #include "overlay006/great_marsh_daily_encounters.h" -#include -#include - +#include "constants/heap.h" #include "generated/map_headers.h" #include "heap.h" diff --git a/src/overlay021/ov21_021D423C.c b/src/overlay021/ov21_021D423C.c index b36d527186..93ecc6b24e 100644 --- a/src/overlay021/ov21_021D423C.c +++ b/src/overlay021/ov21_021D423C.c @@ -3,6 +3,8 @@ #include #include +#include "constants/heap.h" + #include "overlay021/struct_ov21_021D4660.h" #include "heap.h" diff --git a/src/overlay021/ov21_021D4340.c b/src/overlay021/ov21_021D4340.c index 9ab140bb9f..0496d70fb1 100644 --- a/src/overlay021/ov21_021D4340.c +++ b/src/overlay021/ov21_021D4340.c @@ -3,6 +3,8 @@ #include #include +#include "constants/heap.h" + #include "overlay021/ov21_021D0D80.h" #include "overlay021/ov21_021D3FE0.h" #include "overlay021/ov21_021D423C.h" diff --git a/src/overlay021/ov21_021D4EE4.c b/src/overlay021/ov21_021D4EE4.c index 17ec34e2f0..226ace9a12 100644 --- a/src/overlay021/ov21_021D4EE4.c +++ b/src/overlay021/ov21_021D4EE4.c @@ -3,10 +3,11 @@ #include #include +#include "constants/heap.h" + #include "overlay021/struct_ov21_021D4FE4.h" #include "heap.h" -#include "inlines.h" typedef struct UnkStruct_ov21_021D4EE4_t { const UnkStruct_ov21_021D4FE4 *unk_00; diff --git a/src/overlay021/pokedex_sort.c b/src/overlay021/pokedex_sort.c index 3200b52bfa..af03e3e860 100644 --- a/src/overlay021/pokedex_sort.c +++ b/src/overlay021/pokedex_sort.c @@ -1,8 +1,9 @@ #include "overlay021/pokedex_sort.h" -#include #include +#include "constants/heap.h" + #include "struct_decls/pokedexdata_decl.h" #include "overlay021/sorted_pokedex.h" @@ -13,7 +14,6 @@ #include "core_sys.h" #include "graphics.h" #include "heap.h" -#include "narc.h" #include "pokedex.h" #include "pokedex_data_index.h" #include "pokedex_heightweight.h" diff --git a/src/overlay021/pokedex_text.c b/src/overlay021/pokedex_text.c index e287e9936f..7375f389d9 100644 --- a/src/overlay021/pokedex_text.c +++ b/src/overlay021/pokedex_text.c @@ -1,15 +1,10 @@ #include "overlay021/pokedex_text.h" -#include -#include - +#include "constants/heap.h" #include "constants/narc.h" #include "constants/species.h" #include "generated/text_banks.h" -#include "error_handling.h" -#include "heap.h" -#include "inlines.h" #include "message.h" #include "message_util.h" #include "pokedex_language.h" diff --git a/src/overlay024/ov24_02253CE0.c b/src/overlay024/ov24_02253CE0.c index b044d2551a..665550813a 100644 --- a/src/overlay024/ov24_02253CE0.c +++ b/src/overlay024/ov24_02253CE0.c @@ -1,7 +1,6 @@ #include "overlay024/ov24_02253CE0.h" -#include -#include +#include "constants/heap.h" #include "bg_window.h" #include "graphics.h" diff --git a/src/overlay028/ov28_02256E9C.c b/src/overlay028/ov28_02256E9C.c index b6aaa6dad4..885cd1f9d1 100644 --- a/src/overlay028/ov28_02256E9C.c +++ b/src/overlay028/ov28_02256E9C.c @@ -1,8 +1,6 @@ #include "overlay028/ov28_02256E9C.h" -#include -#include -#include +#include "constants/heap.h" #include "overlay028/struct_ov28_02256E9C_decl.h" diff --git a/src/overlay055/ov55_0225632C.c b/src/overlay055/ov55_0225632C.c index 0bf9025936..1bf6237847 100644 --- a/src/overlay055/ov55_0225632C.c +++ b/src/overlay055/ov55_0225632C.c @@ -1,8 +1,9 @@ #include "overlay055/ov55_0225632C.h" -#include #include +#include "constants/heap.h" + #include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" diff --git a/src/unk_02017728.c b/src/unk_02017728.c index 0270699e30..e7da972452 100644 --- a/src/unk_02017728.c +++ b/src/unk_02017728.c @@ -1,12 +1,9 @@ #include "unk_02017728.h" -#include #include #include "constants/heap.h" -#include "struct_defs/struct_02017E74.h" - #include "boot.h" #include "core_sys.h" #include "heap.h" diff --git a/src/unk_02033200.c b/src/unk_02033200.c index 640b771186..40d60fb955 100644 --- a/src/unk_02033200.c +++ b/src/unk_02033200.c @@ -1,9 +1,9 @@ #include "unk_02033200.h" -#include -#include #include +#include "constants/heap.h" + #include "struct_defs/sentence.h" #include "struct_defs/struct_0202610C.h" #include "struct_defs/struct_0203330C.h" From d5476dfba4fedbe0815120340bbd9a74efcde87c Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 7 Feb 2025 21:53:06 -0800 Subject: [PATCH 3/5] Identify unk_02017728 -> system and zip core_sys.h into it --- docs/3d_rendering.md | 6 +- include/core_sys.h | 62 ----- include/overlay023/funcptr_ov23_022537D4.h | 6 - include/system.h | 82 +++++++ include/unk_02017728.h | 27 --- platinum.us/main.lsf | 2 +- .../journal_display/journal_controller.c | 11 +- src/applications/options_menu.c | 3 +- .../pokemon_summary_screen/main.c | 3 +- .../pokemon_summary_screen/subscreen.c | 4 +- src/battle/battle_display.c | 4 +- src/battle/battle_script.c | 8 +- src/battle/ov16_0223B140.c | 2 +- src/battle/ov16_0226871C.c | 25 +- src/cell_actor.c | 2 +- src/choose_starter/choose_starter_app.c | 9 +- src/comm_player_manager.c | 4 +- src/communication_system.c | 6 +- src/dw_warp/dw_warp.c | 5 +- src/easy3d.c | 2 +- src/error_message_reset.c | 5 +- src/field_battle_data_transfer.c | 4 +- src/field_map_change.c | 4 +- src/field_system.c | 8 +- src/game_options.c | 8 +- src/great_marsh_lookout.c | 4 +- src/gx_layers.c | 4 +- src/library_tv/library_tv.c | 2 +- src/list_menu.c | 2 +- src/main.c | 45 ++-- src/menu.c | 2 +- src/meson.build | 2 +- src/overlay005/field_control.c | 2 +- src/overlay005/fieldmap.c | 3 +- src/overlay005/hblank_system.c | 2 +- src/overlay005/ov5_021D2F14.c | 2 +- src/overlay005/ov5_021DC018.c | 4 +- src/overlay005/ov5_021DFB54.c | 4 +- src/overlay005/ov5_021E779C.c | 2 +- src/overlay005/ov5_021F08CC.c | 6 +- src/overlay006/dual_slot_encounters.c | 4 +- src/overlay006/ov6_0223E140.c | 10 +- src/overlay006/ov6_02247A0C.c | 4 +- src/overlay007/communication_club.c | 14 +- src/overlay007/ov7_0224B4E8.c | 6 +- src/overlay007/ov7_0224BE9C.c | 4 +- src/overlay007/ov7_0224CD28.c | 12 +- src/overlay008/ov8_02249960.c | 4 +- src/overlay010/ov10_0221F800.c | 5 +- src/overlay012/ov12_0221FC20.c | 8 +- src/overlay013/ov13_0221FC20.c | 4 +- src/overlay013/ov13_022264F4.c | 4 +- src/overlay013/ov13_02228A38.c | 16 +- src/overlay017/ov17_0223B140.c | 2 +- src/overlay017/ov17_0223CB1C.c | 2 +- src/overlay017/ov17_0223DAD0.c | 2 +- src/overlay017/ov17_0223F7E4.c | 16 +- src/overlay017/ov17_02247A48.c | 4 +- src/overlay017/ov17_022492DC.c | 10 +- src/overlay017/ov17_0224F4D4.c | 2 +- src/overlay019/ov19_021D0D80.c | 114 ++++----- src/overlay019/ov19_021D61B0.c | 2 +- src/overlay019/ov19_021DF964.c | 10 +- src/overlay020/ov20_021D0D80.c | 8 +- src/overlay020/ov20_021D2098.c | 2 +- src/overlay021/ov21_021D0D80.c | 2 +- src/overlay021/ov21_021D5AEC.c | 18 +- src/overlay021/ov21_021D76B0.c | 14 +- src/overlay021/ov21_021D94BC.c | 24 +- src/overlay021/ov21_021DDD2C.c | 18 +- src/overlay021/ov21_021E1924.c | 6 +- src/overlay021/ov21_021E29DC.c | 14 +- src/overlay021/ov21_021E4CA4.c | 30 +-- src/overlay021/ov21_021E68F4.c | 4 +- src/overlay021/ov21_021E8484.c | 4 +- src/overlay021/pokedex_sort.c | 6 +- src/overlay022/ov22_02254DE0.c | 6 +- src/overlay022/ov22_02255094.c | 6 +- src/overlay022/ov22_02255D44.c | 5 +- src/overlay022/ov22_022588F0.c | 12 +- src/overlay022/ov22_022589E0.c | 14 +- src/overlay022/ov22_02259098.c | 6 +- src/overlay022/ov22_0225B660.c | 7 +- src/overlay023/ov23_0223E140.c | 25 +- src/overlay023/ov23_02241F74.c | 10 +- src/overlay023/ov23_0224340C.c | 20 +- src/overlay023/ov23_02248C08.c | 6 +- src/overlay023/ov23_0224B05C.c | 12 +- src/overlay023/ov23_0224DC40.c | 14 +- src/overlay023/ov23_0224F294.c | 8 +- src/overlay023/ov23_0225128C.c | 8 +- src/overlay023/ov23_022521F0.c | 12 +- src/overlay023/ov23_02253598.c | 4 +- src/overlay023/ov23_02253D40.c | 4 +- src/overlay023/ov23_02254A14.c | 77 +++---- src/overlay033/ov33_02256474.c | 4 +- src/overlay056/ov56_022561C0.c | 17 +- src/overlay058/ov58_021D0D80.c | 5 +- src/overlay059/ov59_021D0D80.c | 19 +- src/overlay061/ov61_0222B008.c | 4 +- src/overlay061/ov61_0222BF44.c | 7 +- src/overlay062/ov62_0222F2C0.c | 5 +- src/overlay062/ov62_02231690.c | 4 +- src/overlay062/ov62_02237D24.c | 2 +- src/overlay062/ov62_02248408.c | 2 +- src/overlay064/ov64_0222DCE0.c | 44 ++-- src/overlay065/ov65_0222DCE0.c | 32 +-- src/overlay065/ov65_02235060.c | 18 +- src/overlay065/ov65_0223648C.c | 11 +- src/overlay066/ov66_0222DCE0.c | 2 +- src/overlay067/ov67_0225C700.c | 5 +- src/overlay068/ov68_0225C700.c | 19 +- src/overlay069/ov69_0225C700.c | 33 ++- src/overlay070/ov70_0225C9B4.c | 12 +- src/overlay070/ov70_0225D9A4.c | 7 +- src/overlay070/ov70_022630A4.c | 12 +- src/overlay070/ov70_02265F38.c | 6 +- src/overlay070/ov70_02269190.c | 10 +- src/overlay071/ov71_0223B140.c | 39 ++-- src/overlay072/ov72_0223D7A0.c | 27 ++- src/overlay073/ov73_021D0D80.c | 31 ++- src/overlay073/ov73_021D3250.c | 6 +- src/overlay075/ov75_021D0D80.c | 19 +- src/overlay076/ov76_0223B140.c | 4 +- src/overlay076/ov76_0223D338.c | 23 +- src/overlay077/ov77_021D0D80.c | 19 +- src/overlay077/ov77_021D25B0.c | 23 +- src/overlay077/ov77_021D54B0.c | 6 +- src/overlay079/ov79_021D0D80.c | 15 +- src/overlay079/ov79_021D2268.c | 5 +- src/overlay080/ov80_021D0D80.c | 2 +- src/overlay080/ov80_021D1458.c | 18 +- src/overlay083/ov83_0223B5A0.c | 9 +- src/overlay083/ov83_0223C958.c | 6 +- src/overlay083/ov83_0223F7F4.c | 10 +- src/overlay084/ov84_0223B5A0.c | 53 +++-- src/overlay085/ov85_02241440.c | 9 +- src/overlay086/ov86_0223B140.c | 5 +- src/overlay087/ov87_021D0D80.c | 14 +- src/overlay087/ov87_021D106C.c | 2 +- src/overlay088/ov88_0223B140.c | 17 +- src/overlay090/ov90_021D0D80.c | 17 +- src/overlay091/ov91_021D0D80.c | 5 +- src/overlay092/ov92_021D0D80.c | 39 ++-- src/overlay093/ov93_021D0D80.c | 2 +- src/overlay093/ov93_021D111C.c | 2 +- src/overlay094/ov94_0223BCB0.c | 2 +- src/overlay094/ov94_0223C610.c | 10 +- src/overlay094/ov94_0223D0C4.c | 6 +- src/overlay094/ov94_0223DC04.c | 10 +- src/overlay094/ov94_0223E46C.c | 14 +- src/overlay094/ov94_0223FB48.c | 18 +- src/overlay094/ov94_022414B8.c | 4 +- src/overlay094/ov94_02244950.c | 4 +- src/overlay095/ov95_02246C20.c | 2 +- src/overlay095/ov95_02249740.c | 2 +- src/overlay095/ov95_0224A390.c | 2 +- src/overlay096/ov96_0223B6A0.c | 2 +- src/overlay096/ov96_0223BCE0.c | 28 +-- src/overlay097/ov97_0222AE60.c | 17 +- src/overlay097/ov97_0222C174.c | 16 +- src/overlay097/ov97_0222D30C.c | 17 +- src/overlay097/ov97_02230410.c | 28 +-- src/overlay097/ov97_02233B18.c | 17 +- src/overlay097/ov97_02236380.c | 4 +- src/overlay097/ov97_02237694.c | 2 +- src/overlay097/ov97_02238D74.c | 14 +- src/overlay098/ov98_02246C20.c | 2 +- src/overlay098/ov98_022471C8.c | 12 +- src/overlay099/ov99_021D0D80.c | 7 +- src/overlay099/ov99_021D1A54.c | 4 +- src/overlay099/ov99_021D3DE0.c | 4 +- src/overlay100/ov100_021D0D80.c | 5 +- src/overlay100/ov100_021D46C8.c | 4 +- src/overlay101/ov101_021D0D80.c | 2 +- src/overlay101/ov101_021D1A28.c | 12 +- src/overlay102/ov102_021D0D80.c | 5 +- src/overlay104/ov104_0222FBE4.c | 7 +- src/overlay104/ov104_02231F74.c | 6 +- src/overlay104/ov104_0223C2D4.c | 2 +- src/overlay105/ov105_02241AE0.c | 23 +- src/overlay105/ov105_02245FB8.c | 16 +- src/overlay106/ov106_02241AE0.c | 15 +- src/overlay107/ov107_02241AE0.c | 48 ++-- src/overlay107/ov107_02245EB0.c | 40 ++-- src/overlay108/ov108_02241AE0.c | 5 +- src/overlay109/ov109_021D0D80.c | 7 +- src/overlay109/ov109_021D3D50.c | 19 +- src/overlay110/ov110_021D0D80.c | 6 +- src/overlay111/ov111_021D0D80.c | 2 +- src/overlay112/ov112_0225C700.c | 9 +- src/overlay113/ov113_0225C700.c | 11 +- src/overlay114/ov114_0225C700.c | 5 +- src/overlay115/ov115_02260440.c | 5 +- src/overlay115/ov115_02260CEC.c | 14 +- src/overlay116/ov116_022604C4.c | 7 +- src/overlay117/ov117_02260668.c | 5 +- src/overlay117/ov117_022626B0.c | 10 +- src/render_text.c | 8 +- src/resource_collection.c | 2 +- src/savedata.c | 2 +- src/scrcmd.c | 52 ++--- src/sys_task.c | 10 +- src/{unk_02017728.c => system.c} | 217 +++++++++--------- src/touch_screen.c | 50 ++-- src/unk_0200C6E4.c | 2 +- src/unk_0200F174.c | 2 +- src/unk_02017498.c | 2 +- src/unk_0201E3D8.c | 4 +- src/unk_0202854C.c | 4 +- src/unk_0202F1D4.c | 2 +- src/unk_02033200.c | 2 +- src/unk_020366A0.c | 5 +- src/unk_020393C8.c | 2 +- src/unk_02039814.c | 5 +- src/unk_02039A64.c | 5 +- src/unk_020482D4.c | 4 +- src/unk_02050568.c | 4 +- src/unk_020528D0.c | 4 +- src/unk_02055C50.c | 10 +- src/unk_0205A0D8.c | 14 +- src/unk_020683F4.c | 4 +- src/unk_0206F314.c | 22 +- src/unk_020722AC.c | 14 +- src/unk_0207AE68.c | 5 +- src/unk_0207E0B8.c | 39 ++-- src/unk_02083370.c | 12 +- src/unk_02084B70.c | 18 +- src/unk_0208694C.c | 33 ++- src/unk_020890F4.c | 5 +- src/unk_02089604.c | 8 +- src/unk_0208BEBC.c | 4 +- src/unk_0208C098.c | 10 +- src/unk_02097B18.c | 2 +- src/unk_02098218.c | 2 +- src/unk_02099DFC.c | 5 +- src/unk_0209A2C4.c | 5 +- src/unk_0209A74C.c | 7 +- src/unk_0209AA74.c | 5 +- src/unk_0209ACF4.c | 12 +- src/unk_0209B6F8.c | 4 +- 241 files changed, 1421 insertions(+), 1505 deletions(-) delete mode 100644 include/core_sys.h delete mode 100644 include/overlay023/funcptr_ov23_022537D4.h create mode 100644 include/system.h delete mode 100644 include/unk_02017728.h rename src/{unk_02017728.c => system.c} (56%) diff --git a/docs/3d_rendering.md b/docs/3d_rendering.md index 865432ce9d..c5d47fa8ff 100644 --- a/docs/3d_rendering.md +++ b/docs/3d_rendering.md @@ -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); } -``` \ No newline at end of file +``` diff --git a/include/core_sys.h b/include/core_sys.h deleted file mode 100644 index e867946a39..0000000000 --- a/include/core_sys.h +++ /dev/null @@ -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 diff --git a/include/overlay023/funcptr_ov23_022537D4.h b/include/overlay023/funcptr_ov23_022537D4.h deleted file mode 100644 index 302667e572..0000000000 --- a/include/overlay023/funcptr_ov23_022537D4.h +++ /dev/null @@ -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 diff --git a/include/system.h b/include/system.h new file mode 100644 index 0000000000..e9e781cc5d --- /dev/null +++ b/include/system.h @@ -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 diff --git a/include/unk_02017728.h b/include/unk_02017728.h deleted file mode 100644 index 904f4fffbc..0000000000 --- a/include/unk_02017728.h +++ /dev/null @@ -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 diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 8b6e7019df..de742268e1 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -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 diff --git a/src/applications/journal_display/journal_controller.c b/src/applications/journal_display/journal_controller.c index 9d7c76d1e3..b614137025 100644 --- a/src/applications/journal_display/journal_controller.c +++ b/src/applications/journal_display/journal_controller.c @@ -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; } diff --git a/src/applications/options_menu.c b/src/applications/options_menu.c index fa39698603..3009047674 100644 --- a/src/applications/options_menu.c +++ b/src/applications/options_menu.c @@ -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" diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c index aa20524bb2..7277b3e00a 100644 --- a/src/applications/pokemon_summary_screen/main.c +++ b/src/applications/pokemon_summary_screen/main.c @@ -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" diff --git a/src/applications/pokemon_summary_screen/subscreen.c b/src/applications/pokemon_summary_screen/subscreen.c index 7121c879dc..0780176ea0 100644 --- a/src/applications/pokemon_summary_screen/subscreen.c +++ b/src/applications/pokemon_summary_screen/subscreen.c @@ -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; } } diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index eb10b18a24..fcf24a70d9 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -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; diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 7baec09be1..5041f13f61 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -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); diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 2c50be1f3b..edfa6f66f1 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -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" diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 7f177fd533..6cb30f72ba 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -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; diff --git a/src/cell_actor.c b/src/cell_actor.c index 5698ab752f..3fe70db742 100644 --- a/src/cell_actor.c +++ b/src/cell_actor.c @@ -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 *); diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index 170e2f9341..48171e8276 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -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); diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index 8aed26cb78..1c54a2fd62 100644 --- a/src/comm_player_manager.c +++ b/src/comm_player_manager.c @@ -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; } diff --git a/src/communication_system.c b/src/communication_system.c index a6d7241337..e4e32bf954 100644 --- a/src/communication_system.c +++ b/src/communication_system.c @@ -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); } diff --git a/src/dw_warp/dw_warp.c b/src/dw_warp/dw_warp.c index 0b1d6f5811..8f321f907e 100644 --- a/src/dw_warp/dw_warp.c +++ b/src/dw_warp/dw_warp.c @@ -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(); diff --git a/src/easy3d.c b/src/easy3d.c index 3207b8bec0..a422e02bf3 100644 --- a/src/easy3d.c +++ b/src/easy3d.c @@ -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 diff --git a/src/error_message_reset.c b/src/error_message_reset.c index 3e66877095..d4fe03fae3 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -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(); diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 30fa530e81..0a8d7f8541 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -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++) { diff --git a/src/field_map_change.c b/src/field_map_change.c index 31c464693d..8d6eb07283 100644 --- a/src/field_map_change.c +++ b/src/field_map_change.c @@ -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) diff --git a/src/field_system.c b/src/field_system.c index a77ed40824..21b88adf3e 100644 --- a/src/field_system.c +++ b/src/field_system.c @@ -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); } diff --git a/src/game_options.c b/src/game_options.c index fd5e902ff1..b127a72812 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -3,10 +3,10 @@ #include #include -#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; } } diff --git a/src/great_marsh_lookout.c b/src/great_marsh_lookout.c index 732c5f628d..63f8d01fa2 100644 --- a/src/great_marsh_lookout.c +++ b/src/great_marsh_lookout.c @@ -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); diff --git a/src/gx_layers.c b/src/gx_layers.c index b902253d85..38e40dd649 100644 --- a/src/gx_layers.c +++ b/src/gx_layers.c @@ -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); diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index 0a9c2740c7..1c0f60deaa 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -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 diff --git a/src/list_menu.c b/src/list_menu.c index c5caa7739f..937e4f79a9 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -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); diff --git a/src/main.c b/src/main.c index 6b010f75cf..68d4e0dfd2 100644 --- a/src/main.c +++ b/src/main.c @@ -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; } diff --git a/src/menu.c b/src/menu.c index ed75768a1f..787f1d270c 100644 --- a/src/menu.c +++ b/src/menu.c @@ -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" diff --git a/src/meson.build b/src/meson.build index a4f603ee50..bd913d2a53 100644 --- a/src/meson.build +++ b/src/meson.build @@ -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', diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c index dc5acef6e0..1e10ee96a2 100644 --- a/src/overlay005/field_control.c +++ b/src/overlay005/field_control.c @@ -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" diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index 709a0ec2cb..7342f61806 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -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" diff --git a/src/overlay005/hblank_system.c b/src/overlay005/hblank_system.c index 233be8b959..08535f0679 100644 --- a/src/overlay005/hblank_system.c +++ b/src/overlay005/hblank_system.c @@ -4,7 +4,7 @@ #include #include "heap.h" -#include "unk_02017728.h" +#include "system.h" static void HBlankSystem_Init(HBlankSystem *hBlankSystem); static void HBlankTask_Init(HBlankTask *task); diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c index b8790dac24..bff1451733 100644 --- a/src/overlay005/ov5_021D2F14.c +++ b/src/overlay005/ov5_021D2F14.c @@ -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); diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c index 2d56585c18..c0e51c28b3 100644 --- a/src/overlay005/ov5_021DC018.c +++ b/src/overlay005/ov5_021DC018.c @@ -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); } diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index 2502b94e68..f3bd08fd70 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -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)) { diff --git a/src/overlay005/ov5_021E779C.c b/src/overlay005/ov5_021E779C.c index 1578dce951..73b9d858e9 100644 --- a/src/overlay005/ov5_021E779C.c +++ b/src/overlay005/ov5_021E779C.c @@ -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 { diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index 14fee6b0a6..0118e3dc54 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -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; } diff --git a/src/overlay006/dual_slot_encounters.c b/src/overlay006/dual_slot_encounters.c index 81ff73a97c..617176576f 100644 --- a/src/overlay006/dual_slot_encounters.c +++ b/src/overlay006/dual_slot_encounters.c @@ -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]; diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index eda9daecac..a1984378cd 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -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 = ¶m0->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 { diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index fd136c6716..abe2b8e17b 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -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++; } diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c index cc467642c0..0a691b4191 100644 --- a/src/overlay007/communication_club.c +++ b/src/overlay007/communication_club.c @@ -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); } diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index aeda57e000..22430c4339 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -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); diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index 9ba462aace..f73f72d6b3 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -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(¶m0->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; } } diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index 5bb3b71beb..7c2d0048c1 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -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(¶m1->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(¶m0->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(¶m0->unk_08[4], 1); Window_EraseStandardFrame(¶m0->unk_08[3], 1); Window_EraseMessageBox(¶m0->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(¶m0->unk_08[5], 0); ov7_0224EB38(param0, 0); CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index ed887bde3c..abfb35f3ea 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -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); diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 3a2247e1a3..bf74512bc8 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -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; } } diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index 6ed5453793..ab90926cee 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -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; } diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 5bcd8e52aa..fb944ce641 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -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; } diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 54e2feb921..48f86ae43a 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -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; } diff --git a/src/overlay013/ov13_02228A38.c b/src/overlay013/ov13_02228A38.c index aa0da7bb73..d0648c2eae 100644 --- a/src/overlay013/ov13_02228A38.c +++ b/src/overlay013/ov13_02228A38.c @@ -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; } diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 13813ceef7..59affa8ad5 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -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" diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 9a982b8592..41ba1040f5 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -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" diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 8bb84be135..7114819228 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -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" diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index 3014b069c3..b2acacb88d 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -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; diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index 1d26b23e2e..120579de9d 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -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; diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index d07d08005a..e62dd59917 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -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; } } diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index 1c4fc0d95a..d52c13c888 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -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" diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 43afcd07cb..9a1256ef5e 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -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(¶m0->unk_00)) { if (ov19_021D5E08(¶m0->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(¶m0->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(¶m0->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(¶m0->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(¶m0->unk_00) & 1)) || ((gCoreSys.pressedKeys & PAD_KEY_RIGHT) && (ov19_021D5E2C(¶m0->unk_00) == 6))) { + if ((gSystem.pressedKeys & PAD_BUTTON_B) || ((gSystem.pressedKeys & PAD_KEY_RIGHT) && (ov19_021D5E2C(¶m0->unk_00) & 1)) || ((gSystem.pressedKeys & PAD_KEY_RIGHT) && (ov19_021D5E2C(¶m0->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(¶m0->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(¶m0->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(¶m0->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(¶m0->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(¶m0->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(¶m0->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(¶m0->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(¶m0->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, ¶m0->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(¶m0->unk_00)) { ov19_021D56AC(param0, ¶m0->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(¶m0->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(¶m0->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(¶m0->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(¶m0->unk_00, 0); ov19_021D6594(param0->unk_114, 40); diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index 4c37d7ceb1..a1a6f11e38 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -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; diff --git a/src/overlay019/ov19_021DF964.c b/src/overlay019/ov19_021DF964.c index e495fb5a4e..69e73bdc3d 100644 --- a/src/overlay019/ov19_021DF964.c +++ b/src/overlay019/ov19_021DF964.c @@ -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]; } diff --git a/src/overlay020/ov20_021D0D80.c b/src/overlay020/ov20_021D0D80.c index bcf2d295ed..512211c847 100644 --- a/src/overlay020/ov20_021D0D80.c +++ b/src/overlay020/ov20_021D0D80.c @@ -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); diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c index 68d3195fae..3eb72086da 100644 --- a/src/overlay020/ov20_021D2098.c +++ b/src/overlay020/ov20_021D2098.c @@ -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; diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 62cb203a95..1d7f48bb0a 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -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" diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index 27e53d72e3..8e14f4a748 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -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; diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 3aa695040e..0e8b935a4f 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -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; diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index e6712d3075..a52d5d4b80 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -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; } diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c index b8f7b59214..d820c46ebd 100644 --- a/src/overlay021/ov21_021DDD2C.c +++ b/src/overlay021/ov21_021DDD2C.c @@ -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; diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index ab22d4bcb1..9a636f499d 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -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; } diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index f2daec0d95..3954024b8e 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -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; } } diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index 5462a21bef..4271c1f4db 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -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; diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index f9ecd01d24..9e9c02f64f 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -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); diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index 2dd9258cfb..7700de7d84 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -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; } } diff --git a/src/overlay021/pokedex_sort.c b/src/overlay021/pokedex_sort.c index af03e3e860..7865079b10 100644 --- a/src/overlay021/pokedex_sort.c +++ b/src/overlay021/pokedex_sort.c @@ -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 { diff --git a/src/overlay022/ov22_02254DE0.c b/src/overlay022/ov22_02254DE0.c index bdad15f81e..6f53c0387b 100644 --- a/src/overlay022/ov22_02254DE0.c +++ b/src/overlay022/ov22_02254DE0.c @@ -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) { diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index 33976fd932..4844dd962e 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -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(); diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 8dca4e619e..6bfdf30fd5 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -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)++; diff --git a/src/overlay022/ov22_022588F0.c b/src/overlay022/ov22_022588F0.c index d38f5ef818..6520f7eba7 100644 --- a/src/overlay022/ov22_022588F0.c +++ b/src/overlay022/ov22_022588F0.c @@ -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) diff --git a/src/overlay022/ov22_022589E0.c b/src/overlay022/ov22_022589E0.c index 17422ffd63..e11fcd8d4b 100644 --- a/src/overlay022/ov22_022589E0.c +++ b/src/overlay022/ov22_022589E0.c @@ -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; diff --git a/src/overlay022/ov22_02259098.c b/src/overlay022/ov22_02259098.c index cfa96e83a6..ace81441ad 100644 --- a/src/overlay022/ov22_02259098.c +++ b/src/overlay022/ov22_02259098.c @@ -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); diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index 6bcb9da413..e0aafe6e7e 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -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; diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index c99d9d3780..714e5217f5 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -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++; diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index 42d89f6139..b3b916986c 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -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; diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index 67de1b2695..940169e03a 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -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); diff --git a/src/overlay023/ov23_02248C08.c b/src/overlay023/ov23_02248C08.c index 60ace9a5ea..d6326d8b6c 100644 --- a/src/overlay023/ov23_02248C08.c +++ b/src/overlay023/ov23_02248C08.c @@ -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) { diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index c77e61be26..d542f82ed5 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -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()); diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c index d36ae77fe8..5465f31760 100644 --- a/src/overlay023/ov23_0224DC40.c +++ b/src/overlay023/ov23_0224DC40.c @@ -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; } diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index c09788795f..c6ef1a72b3 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -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; } } diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c index be629b836f..ca3701a919 100644 --- a/src/overlay023/ov23_0225128C.c +++ b/src/overlay023/ov23_0225128C.c @@ -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); } diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index d27bbe27ec..6c4f649a7d 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -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(); diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index 58e50103d2..35d6428853 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -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); } } diff --git a/src/overlay023/ov23_02253D40.c b/src/overlay023/ov23_02253D40.c index 12931ebebe..1e89611625 100644 --- a/src/overlay023/ov23_02253D40.c +++ b/src/overlay023/ov23_02253D40.c @@ -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); } } diff --git a/src/overlay023/ov23_02254A14.c b/src/overlay023/ov23_02254A14.c index a1ec13b49b..026fc962d3 100644 --- a/src/overlay023/ov23_02254A14.c +++ b/src/overlay023/ov23_02254A14.c @@ -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), ¶m0->unk_4F0); } v1 = 1; - } else if (gCoreSys.touchHeld) { + } else if (gSystem.touchHeld) { if (param0->unk_4F0.unk_08) { ov23_02255F40(fieldSystem, &(param0->unk_3C), ¶m0->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, ¶m0->unk_4F0, param0->unk_4FC); } v1 = 1; - } else if (gCoreSys.touchHeld) { + } else if (gSystem.touchHeld) { if (param0->unk_4F0.unk_08) { ov23_02256000(fieldSystem, ¶m0->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, ¶m0->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), ¶m0->unk_4F0); } v1 = 1; - } else if (gCoreSys.touchHeld) { + } else if (gSystem.touchHeld) { if (param0->unk_4F0.unk_08) { ov23_02255F40(fieldSystem, &(param0->unk_3C), ¶m0->unk_4F0); } diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index 71e50aa6e6..114935e259 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -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); diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 8829b50920..c89a443253 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -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) { diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 3ddfb408e7..37a3f33e15 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -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); } diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 04da7c5f43..a8f78efb73 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -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); } diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index 314421fa65..c76a1d4477 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -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; } diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index d65274fc2b..511775911d 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -12,7 +12,6 @@ #include "overlay061/struct_ov61_0222C3B0.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -31,10 +30,10 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "system_data.h" #include "text.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0202ACE0.h" #include "unk_020366A0.h" @@ -183,7 +182,7 @@ int ov61_0222BF44(OverlayManager *param0, int *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); RenderControlFlags_SetCanABSpeedUpPrint(1); @@ -833,7 +832,7 @@ static int ov61_0222CC40(UnkStruct_ov61_0222C664 *param0) static int ov61_0222CC64(UnkStruct_ov61_0222C664 *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A || gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_A || gSystem.pressedKeys & PAD_BUTTON_B) { Window_EraseStandardFrame(¶m0->unk_64, 0); param0->unk_90 = 0; diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index 4d40362b5e..1797428075 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -17,7 +17,6 @@ #include "overlay104/struct_ov104_0224133C.h" #include "bg_window.h" -#include "core_sys.h" #include "gx_layers.h" #include "heap.h" #include "message.h" @@ -27,11 +26,11 @@ #include "savedata_misc.h" #include "sprite_util.h" #include "sys_task.h" +#include "system.h" #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_02023FCC.h" #include "unk_0202419C.h" @@ -304,7 +303,7 @@ static void ov62_0222F670(BgConfig *param0) void ov62_0222F824(int param0) { - gCoreSys.unk_65 = param0; + gSystem.unk_65 = param0; GXLayers_SwapDisplay(); } diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index ed8db7520f..f3af314d4e 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -32,7 +32,6 @@ #include "overlay062/struct_ov62_02248CDC.h" #include "bg_window.h" -#include "core_sys.h" #include "enums.h" #include "font.h" #include "game_records.h" @@ -48,6 +47,7 @@ #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" @@ -2747,7 +2747,7 @@ static void ov62_02234440(UnkStruct_0208C06C *param0) param0->unk_41D8.unk_0C = NULL; } - if (gCoreSys.unk_65 == 0) { + if (gSystem.unk_65 == 0) { param0->unk_41D8.unk_08 = param0->unk_6F4; } else { param0->unk_41D8.unk_08 = param0->unk_6F0; diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 475d1bdd2c..9f02f2e874 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -40,12 +40,12 @@ #include "pokedex.h" #include "strbuf.h" #include "string_template.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_02023FCC.h" #include "unk_0202419C.h" #include "unk_020298BC.h" diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c index 66d6a2d126..25a616d44d 100644 --- a/src/overlay062/ov62_02248408.c +++ b/src/overlay062/ov62_02248408.c @@ -18,7 +18,7 @@ #include "pokemon.h" #include "savedata.h" #include "strbuf.h" -#include "unk_02017728.h" +#include "system.h" #include "unk_0202F1D4.h" static void ov62_0224856C(Strbuf *param0, int param1); diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index d7de6f6478..5ad227fc27 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -22,7 +22,7 @@ #include "bg_window.h" #include "cell_actor.h" #include "char_transfer.h" -#include "core_sys.h" +#include "system.h" #include "enums.h" #include "font.h" #include "game_options.h" @@ -56,7 +56,7 @@ #include "render_oam.h" #include "unk_0200F174.h" #include "unk_020131EC.h" -#include "unk_02017728.h" +#include "system.h" #include "render_view.h" #include "unk_0202ACE0.h" #include "unk_0203061C.h" @@ -832,7 +832,7 @@ static void ov64_0222E164(UnkStruct_ov64_0222E060 *param0) static void ov64_0222E1A4(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, u32 param2) { - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); param0->unk_21C = NARC_ctor(NARC_INDEX_GRAPHIC__PL_WIFINOTE, param2); @@ -1346,7 +1346,7 @@ static int ov64_0222EA70(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E06 break; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { ov64_0222F050(param0); param1->unk_04 = 3; } @@ -1569,23 +1569,23 @@ static BOOL ov64_0222EE84(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E0 { BOOL v0 = 0; - 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); param0->unk_00 = 3; return 1; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { if (param0->unk_00 > 0) { param0->unk_00--; v0 = 1; } - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { if (param0->unk_00 < 3) { param0->unk_00++; v0 = 1; @@ -1879,7 +1879,7 @@ static int ov64_0222F0C4(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E06 break; } - if (gCoreSys.pressedKeys) { + if (gSystem.pressedKeys) { ov64_0222EA28(param2, 1); param1->unk_04 = 2; ov64_0222FF18(param0); @@ -2197,7 +2197,7 @@ static u32 ov64_0222F798 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E BOOL v2; int v3; - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (param0->unk_04 == 8) { Sound_PlayEffect(1501); return 3; @@ -2211,7 +2211,7 @@ static u32 ov64_0222F798 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E return 4; } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1501); return 3; } @@ -2220,7 +2220,7 @@ static u32 ov64_0222F798 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E v1 = 0; v2 = 0; - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { if (param0->unk_04 == 8) { param0->unk_04 = param0->unk_06; v1 = 1; @@ -2238,7 +2238,7 @@ static u32 ov64_0222F798 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E } } } - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { if ((param0->unk_04 == 3) || (param0->unk_04 == 7)) { param0->unk_04 = 8; v1 = 1; @@ -2257,7 +2257,7 @@ static u32 ov64_0222F798 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E } } } - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) { if (param0->unk_04 != 8) { if (param0->unk_04 < (8 / 2)) { param0->unk_04 += (8 / 2); @@ -2269,7 +2269,7 @@ static u32 ov64_0222F798 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222E v1 = 1; } } - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) { if (param0->unk_04 != 8) { if (param0->unk_04 < (8 / 2)) { param0->unk_04 += (8 / 2); @@ -2899,7 +2899,7 @@ static int ov64_02230628 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_0222E param1->unk_04 = 1; break; case 1: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1501); ov64_0222E074(param1, 0, 2); ov64_0223087C(param0, param2); @@ -3143,30 +3143,30 @@ static int ov64_02230904(UnkStruct_ov64_02230904 *param0, UnkStruct_ov64_0222E06 param1->unk_04 = 2; break; case 2: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1501); param1->unk_04 = 6; } else { - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) { ov64_02232138(param0, -1); param1->unk_04 = 3; param0->unk_08 = 2; - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) { ov64_02232138(param0, 1); param1->unk_04 = 3; param0->unk_08 = 3; - } else if (gCoreSys.heldKeys & PAD_KEY_UP) { + } else if (gSystem.heldKeys & PAD_KEY_UP) { param1->unk_04 = 5; param0->unk_08 = 0; param0->unk_0C = 4; - } else if (gCoreSys.heldKeys & PAD_KEY_DOWN) { + } else if (gSystem.heldKeys & PAD_KEY_DOWN) { param1->unk_04 = 5; param0->unk_08 = 1; param0->unk_0C = 4; } } - if ((gCoreSys.heldKeys & (PAD_KEY_UP | PAD_KEY_DOWN)) == 0) { + if ((gSystem.heldKeys & (PAD_KEY_UP | PAD_KEY_DOWN)) == 0) { param0->unk_0E = 0; } break; diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 284310c6eb..15fd809853 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -33,7 +33,7 @@ #include "char_transfer.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" +#include "system.h" #include "enums.h" #include "error_handling.h" #include "font.h" @@ -74,7 +74,7 @@ #include "render_oam.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "unk_02017728.h" +#include "system.h" #include "vram_transfer.h" #include "unk_0201E3D8.h" #include "pltt_transfer.h" @@ -1680,7 +1680,7 @@ static int ov65_0222F1A8(UnkStruct_ov65_0222EBE0 *param0, int param1) static int ov65_0222F21C(UnkStruct_ov65_0222EBE0 *param0, int param1) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { ov65_02232CA8(param0, 21); Bg_SetPriority(3, 0); Bg_SetPriority(2, 1); @@ -1952,7 +1952,7 @@ static void ov65_0222F6EC(UnkStruct_ov65_0222EBE0 *param0) static int ov65_0222F7AC(UnkStruct_ov65_0222EBE0 *param0, int param1) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { if (Window_IsInUse(¶m0->unk_360)) { Window_EraseMessageBox(¶m0->unk_360, 0); Window_Remove(¶m0->unk_360); @@ -1983,7 +1983,7 @@ static int ov65_0222F808(UnkStruct_ov65_0222EBE0 *param0, int param1) return param1; } - if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { if (Window_IsInUse(¶m0->unk_360)) { Window_EraseMessageBox(¶m0->unk_360, 0); Window_Remove(¶m0->unk_360); @@ -2266,7 +2266,7 @@ static int ov65_0222FCB8(UnkStruct_ov65_0222EBE0 *param0, int param1) static int ov65_0222FCDC(UnkStruct_ov65_0222EBE0 *param0, int param1) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { if (param0->unk_3B4 == 1) { param0->unk_3AC = 10; param0->unk_3A8 = 34; @@ -2595,7 +2595,7 @@ static int ov65_022302C4(UnkStruct_ov65_0222EBE0 *param0, int param1) if (ov65_0223537C(¶m0->unk_3EC) == 0) { if (ov4_021D2568() == -1) { - if (PAD_BUTTON_X & gCoreSys.pressedKeys) { + if (PAD_BUTTON_X & gSystem.pressedKeys) { if (ov65_02232F00(param0)) { ov65_02232B58(param0, 90, 0); } else { @@ -2654,7 +2654,7 @@ static int ov65_022302C4(UnkStruct_ov65_0222EBE0 *param0, int param1) v4 = ov65_0222DD20(param0, ¶m0->unk_04->unk_00); if (param0->unk_3D0 == -1) { - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { if (ov65_0222DDFC(v4)) { Sound_PlayEffect(1501); param0->unk_3A8 = 39; @@ -2825,7 +2825,7 @@ static int ov65_022307B0(UnkStruct_ov65_0222EBE0 *param0, int param1) } if (Text_IsPrinterActive(param0->unk_180) == 0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { ov65_02232DFC(param0); param0->unk_3A8 = 24; } else { @@ -2871,7 +2871,7 @@ static int ov65_02230860(UnkStruct_ov65_0222EBE0 *param0, int param1) ov65_02232DC0(param0, ov4_021D2388()); ov65_02232B58(param0, 16, 0); param0->unk_3A8 = 27; - } else if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + } else if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { ov65_02232B58(param0, 20, 0); param0->unk_3A8 = 25; } else { @@ -2961,7 +2961,7 @@ static int ov65_02230AF8(UnkStruct_ov65_0222EBE0 *param0, int param1) param0->unk_3BC--; - if ((gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) || (param0->unk_3BC == 0)) { + if ((gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) || (param0->unk_3BC == 0)) { ov65_02232DFC(param0); sub_02038378(); sub_02038B60(); @@ -2989,7 +2989,7 @@ static int ov65_02230BB4(UnkStruct_ov65_0222EBE0 *param0, int param1) return param1; } - if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { ov65_02232DFC(param0); ov65_02232E58(param0, 16); sub_02038378(); @@ -3014,7 +3014,7 @@ static int ov65_02230C04(UnkStruct_ov65_0222EBE0 *param0, int param1) param0->unk_3BC--; - if ((gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) || (param0->unk_3BC == 0)) { + if ((gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) || (param0->unk_3BC == 0)) { ov65_02232DFC(param0); ov65_02232E58(param0, 16); @@ -3058,7 +3058,7 @@ static int ov65_02230CB8(UnkStruct_ov65_0222EBE0 *param0, int param1) return param1; } - if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { ov65_02232B58(param0, 26, 1); param0->unk_3A8 = 59; param0->unk_3BC = 1; @@ -4423,7 +4423,7 @@ static int ov65_02232564(UnkStruct_ov65_0222EBE0 *param0, int param1) param0->unk_3A8 = 56; } - if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { param0->unk_3A8 = 56; } @@ -5062,7 +5062,7 @@ static BOOL ov65_02233208(UnkStruct_ov65_0222EBE0 *param0, u32 param1) return 0; } - if ((gCoreSys.heldKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT | PAD_KEY_UP | PAD_KEY_DOWN)) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X)) || (param1 == 2)) { + if ((gSystem.heldKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT | PAD_KEY_UP | PAD_KEY_DOWN)) || (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X)) || (param1 == 2)) { return 1; } diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c index b3e748042d..e401289bb9 100644 --- a/src/overlay065/ov65_02235060.c +++ b/src/overlay065/ov65_02235060.c @@ -24,7 +24,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "graphics.h" #include "heap.h" #include "math.h" @@ -32,6 +31,7 @@ #include "sprite_resource.h" #include "sprite_transfer.h" #include "sprite_util.h" +#include "system.h" #include "vram_transfer.h" #define MCR_PCANM_DESTPL(x) ((7 * 32) + (((x) + 1) * 2)) @@ -196,12 +196,12 @@ u32 ov65_02235198(UnkStruct_ov65_02235130 *param0) if (v0 == 1) { ov65_02235B30(param0); - if (gCoreSys.heldKeys & PAD_KEY_DOWN) { + if (gSystem.heldKeys & PAD_KEY_DOWN) { return 1; } } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (ov65_02235254(param0) > 0) { return 2; } else if (ov65_02235654(param0) == 1) { @@ -984,7 +984,7 @@ static BOOL ov65_02236044(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354 return 0; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { v4 = ov65_022357A8(param0, param1, v0); if (v4 != NULL) { @@ -1002,31 +1002,31 @@ static BOOL ov65_02236044(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354 return 0; } - if (gCoreSys.heldKeys & PAD_BUTTON_B) { + if (gSystem.heldKeys & PAD_BUTTON_B) { v3 = 3; } else { v3 = 2; } - if (gCoreSys.heldKeys & PAD_KEY_UP) { + if (gSystem.heldKeys & PAD_KEY_UP) { if (v0 == 0) { ov65_02236230(param0, v3, v0, v1); } else { ov65_02236230(param0, 1, 0, v1); } - } else if (gCoreSys.heldKeys & PAD_KEY_DOWN) { + } else if (gSystem.heldKeys & PAD_KEY_DOWN) { if (v0 == 1) { ov65_02236230(param0, v3, v0, v1); } else { ov65_02236230(param0, 1, 1, v1); } - } else if (gCoreSys.heldKeys & PAD_KEY_LEFT) { + } else if (gSystem.heldKeys & PAD_KEY_LEFT) { if (v0 == 2) { ov65_02236230(param0, v3, v0, v1); } else { ov65_02236230(param0, 1, 2, v1); } - } else if (gCoreSys.heldKeys & PAD_KEY_RIGHT) { + } else if (gSystem.heldKeys & PAD_KEY_RIGHT) { if (v0 == 3) { ov65_02236230(param0, v3, v0, v1); } else { diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 164c75c7c5..d281252d4e 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -27,7 +27,6 @@ #include "char_transfer.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "enums.h" #include "font.h" #include "game_options.h" @@ -48,12 +47,12 @@ #include "sprite_util.h" #include "strbuf.h" #include "string_template.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_020363E8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" @@ -1692,7 +1691,7 @@ static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p } do { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1501); if (ov65_02237450(param0) == 0) { @@ -1709,7 +1708,7 @@ static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p } } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1501); param0->unk_00.unk_05 = 22; break; @@ -1721,7 +1720,7 @@ static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p break; } - if (gCoreSys.pressedKeys & PAD_BUTTON_X) { + if (gSystem.pressedKeys & PAD_BUTTON_X) { param0->unk_00.unk_05 = 30; Sound_PlayEffect(1501); break; @@ -2427,7 +2426,7 @@ static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *p ov65_0223789C(param0); param0->unk_00.unk_05 = 11; } else { - if (gCoreSys.pressedKeys & PAD_BUTTON_X) { + if (gSystem.pressedKeys & PAD_BUTTON_X) { ov65_022378C4(param0, param1, param2); param0->unk_00.unk_05 = 18; } diff --git a/src/overlay066/ov66_0222DCE0.c b/src/overlay066/ov66_0222DCE0.c index dc8f0447a5..0b1aec23b0 100644 --- a/src/overlay066/ov66_0222DCE0.c +++ b/src/overlay066/ov66_0222DCE0.c @@ -16,7 +16,7 @@ #include "savedata.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02017728.h" +#include "system.h" #include "unk_02099550.h" FS_EXTERN_OVERLAY(overlay63); diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 9dd2af5181..9f799bd52f 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -17,7 +17,6 @@ #include "overlay066/struct_ov66_02231300.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "game_records.h" @@ -35,10 +34,10 @@ #include "savedata.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_020041CC.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_020366A0.h" #include "unk_020393C8.h" @@ -301,7 +300,7 @@ int ov67_0225C820(OverlayManager *param0, int *param1) (*param1)++; } break; case 10: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { int v8; int v9; diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index a3c6ab5950..786e70bbaa 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -20,7 +20,6 @@ #include "bg_window.h" #include "cell_actor.h" #include "char_transfer.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -40,11 +39,11 @@ #include "sprite_util.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "trainer_info.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_02030EA4.h" #include "unk_020393C8.h" #include "vram_transfer.h" @@ -469,7 +468,7 @@ static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 SetAllGraphicsModes(&Unk_ov68_0225DD48); param0->unk_00 = BgConfig_New(param2); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); @@ -765,18 +764,18 @@ static BOOL ov68_0225CE48(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB param0->unk_28 = 5; break; case 5: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); param0->unk_28++; break; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { if ((param0->unk_10 - 1) >= 0) { Sound_PlayEffect(1504); param0->unk_10--; } - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { if ((param0->unk_10 + 1) < 3) { Sound_PlayEffect(1504); param0->unk_10++; @@ -1087,7 +1086,7 @@ static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB param0->unk_60 = 22; break; case 2: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { v0 = ov68_0225CBEC(param1, 0, 104); ov68_0225D1B4(param3, v0); param0->unk_62 = 3; @@ -1133,7 +1132,7 @@ static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB } } break; case 6: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (param0->unk_A8.unk_00 != (PPW_LOBBY_INVALID_QUESTION_NO)) { param0->unk_60 = 7; } else { @@ -1202,7 +1201,7 @@ static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB param0->unk_60 = 22; break; case 15: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { v0 = ov68_0225CBEC(param1, 0, 114); ov68_0225D1B4(param3, v0); param0->unk_62 = 16; @@ -1247,7 +1246,7 @@ static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB } } break; case 19: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { param0->unk_60 = 20; } break; diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 33b849e297..b4f212f698 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -22,7 +22,6 @@ #include "camera.h" #include "cell_actor.h" #include "char_transfer.h" -#include "core_sys.h" #include "easy3d_object.h" #include "font.h" #include "game_options.h" @@ -45,11 +44,11 @@ #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_0200F174.h" #include "unk_02015920.h" -#include "unk_02017728.h" #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_0202C858.h" @@ -905,8 +904,8 @@ static void ov69_0225CBE4(int param0, int param1, int *param2, int *param3, int int v2 = 0; int v3 = 0; - if (gCoreSys.touchX != 0xffff) { - v2 = gCoreSys.touchX - param0; + if (gSystem.touchX != 0xffff) { + v2 = gSystem.touchX - param0; if (v2 < 0) { v2 ^= -1; @@ -923,8 +922,8 @@ static void ov69_0225CBE4(int param0, int param1, int *param2, int *param3, int *param2 = v0; *param3 = v2; - if (gCoreSys.touchY != 0xffff) { - v3 = gCoreSys.touchY - param1; + if (gSystem.touchY != 0xffff) { + v3 = gSystem.touchY - param1; if (v3 < 0) { v3 ^= -1; @@ -1155,7 +1154,7 @@ static u32 ov69_0225CF9C(UnkStruct_ov69_0225CE64 *param0) Sound_PlayEffect(1501); return 2; } else { - if (gCoreSys.pressedKeys & PAD_BUTTON_X) { + if (gSystem.pressedKeys & PAD_BUTTON_X) { { UnkStruct_ov69_0225E0C0 v2; @@ -1177,7 +1176,7 @@ static u32 ov69_0225CF9C(UnkStruct_ov69_0225CE64 *param0) } } } else { - v0 = ov69_0225CC54(param0, gCoreSys.pressedKeys, gCoreSys.heldKeys); + v0 = ov69_0225CC54(param0, gSystem.pressedKeys, gSystem.heldKeys); } } @@ -1407,7 +1406,7 @@ static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 SetAllGraphicsModes(&Unk_ov69_0225F040); param0->unk_00 = BgConfig_New(param2); - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); @@ -1459,7 +1458,7 @@ static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0) } Heap_FreeToHeap(param0->unk_00); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); } @@ -1855,8 +1854,8 @@ static void ov69_0225DC54(UnkStruct_ov69_0225DC48 *param0) param0->unk_00 = 0; - if (gCoreSys.touchPressed) { - if ((gCoreSys.touchX >= (25 * 8)) && (gCoreSys.touchX <= ((25 + 6) * 8)) && (gCoreSys.touchY >= (21 * 8)) && (gCoreSys.touchY <= ((21 + 2) * 8))) { + if (gSystem.touchPressed) { + if ((gSystem.touchX >= (25 * 8)) && (gSystem.touchX <= ((25 + 6) * 8)) && (gSystem.touchY >= (21 * 8)) && (gSystem.touchY <= ((21 + 2) * 8))) { param0->unk_00 = PAD_BUTTON_B; return; } else { @@ -1865,13 +1864,13 @@ static void ov69_0225DC54(UnkStruct_ov69_0225DC48 *param0) param0->unk_14 = 0; param0->unk_18 = 0; param0->unk_00 = 0; - param0->unk_08 = gCoreSys.touchX; - param0->unk_0C = gCoreSys.touchY; + param0->unk_08 = gSystem.touchX; + param0->unk_0C = gSystem.touchY; param0->unk_18 = 4; } } - if (gCoreSys.touchHeld) { + if (gSystem.touchHeld) { switch (param0->unk_04) { case 0: @@ -1885,8 +1884,8 @@ static void ov69_0225DC54(UnkStruct_ov69_0225DC48 *param0) param0->unk_00 = v0 | v2; param0->unk_10 = v1; param0->unk_14 = v3; - param0->unk_08 = gCoreSys.touchX; - param0->unk_0C = gCoreSys.touchY; + param0->unk_08 = gSystem.touchX; + param0->unk_0C = gSystem.touchY; break; } } else { diff --git a/src/overlay070/ov70_0225C9B4.c b/src/overlay070/ov70_0225C9B4.c index ccb5c509cd..6d721c6e7f 100644 --- a/src/overlay070/ov70_0225C9B4.c +++ b/src/overlay070/ov70_0225C9B4.c @@ -20,9 +20,9 @@ #include "overlay070/ov70_0225C858.h" #include "overlay070/struct_ov70_0225C894_decl.h" -#include "core_sys.h" #include "heap.h" #include "math.h" +#include "system.h" #include "unk_02005474.h" typedef struct { @@ -807,31 +807,31 @@ static void ov70_0225D310(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA return; } - if (gCoreSys.heldKeys & PAD_BUTTON_B) { + if (gSystem.heldKeys & PAD_BUTTON_B) { v3 = 3; } else { v3 = 2; } - if (gCoreSys.heldKeys & PAD_KEY_UP) { + if (gSystem.heldKeys & PAD_KEY_UP) { if (v0 == 0) { ov70_0225D17C(param1, v3, v0, v1); } else { ov70_0225D17C(param1, 1, 0, v1); } - } else if (gCoreSys.heldKeys & PAD_KEY_DOWN) { + } else if (gSystem.heldKeys & PAD_KEY_DOWN) { if (v0 == 1) { ov70_0225D17C(param1, v3, v0, v1); } else { ov70_0225D17C(param1, 1, 1, v1); } - } else if (gCoreSys.heldKeys & PAD_KEY_LEFT) { + } else if (gSystem.heldKeys & PAD_KEY_LEFT) { if (v0 == 2) { ov70_0225D17C(param1, v3, v0, v1); } else { ov70_0225D17C(param1, 1, 2, v1); } - } else if (gCoreSys.heldKeys & PAD_KEY_RIGHT) { + } else if (gSystem.heldKeys & PAD_KEY_RIGHT) { if (v0 == 3) { ov70_0225D17C(param1, v3, v0, v1); } else { diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index b4604d005a..2054d59e71 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -38,7 +38,6 @@ #include "cell_actor.h" #include "cell_transfer.h" #include "char_transfer.h" -#include "core_sys.h" #include "enums.h" #include "error_handling.h" #include "font.h" @@ -65,12 +64,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 "trainer_info.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_02023FCC.h" #include "unk_0202419C.h" #include "unk_02024220.h" @@ -716,7 +715,7 @@ int ov70_0225DB90(OverlayManager *param0, int *param1) (*param1) = 4; } break; case 4: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { (*param1) = 7; } break; @@ -1263,7 +1262,7 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 VramTransfer_New(32, param2); GXLayers_SetBanks(&Unk_ov70_0226D664); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); { diff --git a/src/overlay070/ov70_022630A4.c b/src/overlay070/ov70_022630A4.c index efdcdd59a9..f2fc206034 100644 --- a/src/overlay070/ov70_022630A4.c +++ b/src/overlay070/ov70_022630A4.c @@ -33,11 +33,11 @@ #include "overlay070/struct_ov70_02265F38.h" #include "overlay070/struct_ov70_0226DA18.h" -#include "core_sys.h" #include "enums.h" #include "list_menu.h" #include "math.h" #include "strbuf.h" +#include "system.h" #include "unk_02005474.h" typedef struct { @@ -463,7 +463,7 @@ static BOOL ov70_02263120(int param0) break; } - if (gCoreSys.heldKeys & v0) { + if (gSystem.heldKeys & v0) { return 1; } @@ -895,7 +895,7 @@ static BOOL ov70_02263414(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DE ov70_02262E88(param0, 21); break; case 18: - if (!((Sound_IsEffectPlaying(1448) == 0) && (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)))) { + if (!((Sound_IsEffectPlaying(1448) == 0) && (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)))) { break; } @@ -1308,7 +1308,7 @@ static BOOL ov70_02263CC8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DE return 0; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { { UnkStruct_ov70_0225CC54 *v17; u32 v18; @@ -1396,7 +1396,7 @@ static BOOL ov70_02263CC8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DE } } - if (gCoreSys.pressedKeys & PAD_BUTTON_X) { + if (gSystem.pressedKeys & PAD_BUTTON_X) { if (ov70_0225E3F0(param1) == 0) { ov70_0225E328(param1, ov66_0222E338(v11), 0); Sound_PlayEffect(1500); @@ -2415,7 +2415,7 @@ static BOOL ov70_02264D38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DE } break; case 2: - if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || (gCoreSys.pressedKeys & PAD_KEY_DOWN)) { + if ((gSystem.pressedKeys & PAD_BUTTON_B) || (gSystem.pressedKeys & PAD_KEY_DOWN)) { ov66_0222EBC4(v4, param2); ov70_0225DFCC(param1); v0->unk_0A = 6; diff --git a/src/overlay070/ov70_02265F38.c b/src/overlay070/ov70_02265F38.c index 3f857acb99..08aa59e736 100644 --- a/src/overlay070/ov70_02265F38.c +++ b/src/overlay070/ov70_02265F38.c @@ -19,10 +19,10 @@ #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "enums.h" #include "list_menu.h" #include "strbuf.h" +#include "system.h" #include "unk_02005474.h" #include "unk_020363E8.h" #include "unk_020366A0.h" @@ -340,7 +340,7 @@ BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par } if (v0->unk_14 == 0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); if (ov66_02233374() == 0) { @@ -805,7 +805,7 @@ BOOL ov70_022669FC(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *par ov70_02262E8C(param0); } break; case 1: - if ((gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.pressedKeys & PAD_KEY_RIGHT) || (gCoreSys.pressedKeys & PAD_KEY_LEFT) || (gCoreSys.pressedKeys & PAD_KEY_DOWN)) { + if ((gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.pressedKeys & PAD_KEY_RIGHT) || (gSystem.pressedKeys & PAD_KEY_LEFT) || (gSystem.pressedKeys & PAD_KEY_DOWN)) { ov70_02266CB0(&v0->unk_00, param1); ov70_0225DFEC(param1); diff --git a/src/overlay070/ov70_02269190.c b/src/overlay070/ov70_02269190.c index e65fbb88b7..fc911ed028 100644 --- a/src/overlay070/ov70_02269190.c +++ b/src/overlay070/ov70_02269190.c @@ -14,11 +14,11 @@ #include "overlay070/struct_ov70_0225CC54_decl.h" #include "overlay070/struct_ov70_02260AD4_decl.h" -#include "core_sys.h" #include "easy3d_object.h" #include "graphics.h" #include "heap.h" #include "narc.h" +#include "system.h" #include "unk_02005474.h" typedef struct { @@ -1936,19 +1936,19 @@ static BOOL ov70_0226AC24(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_022698 if (param1->unk_08 == ov70_0225CCAC(param0->unk_04)) { u32 v4 = 4; - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { v4 = 0; } - if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + if (gSystem.pressedKeys & PAD_KEY_DOWN) { v4 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + if (gSystem.pressedKeys & PAD_KEY_RIGHT) { v4 = 3; } - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { v4 = 2; } diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index 100654cf6e..db17e8b58e 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -13,7 +13,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "graphics.h" #include "gx_layers.h" #include "heap.h" @@ -22,11 +21,11 @@ #include "overlay_manager.h" #include "render_oam.h" #include "strbuf.h" +#include "system.h" #include "touch_screen.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_020393C8.h" #include "vram_transfer.h" @@ -930,7 +929,7 @@ static int ov71_0223BEF8(UnkStruct_ov71_0223B620 *param0) param0->unk_30D4 = 0xffffffff; - if (gCoreSys.touchPressed) { + if (gSystem.touchPressed) { param0->unk_30C4 = 1; } @@ -939,7 +938,7 @@ static int ov71_0223BEF8(UnkStruct_ov71_0223B620 *param0) if (param0->unk_30D4 != 0xffffffff) { v1 = 1; v0 = 1; - } else if (gCoreSys.touchHeld) { + } else if (gSystem.touchHeld) { param0->unk_30D4 = ov71_0223C654(param0->unk_00, Unk_ov71_0223D4D0[param0->unk_B4->unk_04_0].unk_00[param0->unk_337C]); if (param0->unk_30C4) { @@ -951,9 +950,9 @@ static int ov71_0223BEF8(UnkStruct_ov71_0223B620 *param0) } if (v1 == 0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { v0 = 3; - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { v0 = 4; } } @@ -968,23 +967,23 @@ static void ov71_0223BFBC(UnkStruct_ov71_0223B620 *param0) v0 = 0; - if ((gCoreSys.touchX != 0xffff) && (gCoreSys.touchY != 0xffff) && (param0->unk_30DC != 0xffff) && (param0->unk_30E0 != 0xffff)) { + if ((gSystem.touchX != 0xffff) && (gSystem.touchY != 0xffff) && (param0->unk_30DC != 0xffff) && (param0->unk_30E0 != 0xffff)) { if ((param0->unk_30D4 != 0xffffffff) && (param0->unk_30D4 != 0)) { if (param0->unk_B4->unk_48[param0->unk_30D4 - 1].unk_00_0) { - if (param0->unk_30DC > gCoreSys.touchX) { - v1 = param0->unk_30DC - gCoreSys.touchX; + if (param0->unk_30DC > gSystem.touchX) { + v1 = param0->unk_30DC - gSystem.touchX; param0->unk_3364.unk_02 = -1; } else { - v1 = gCoreSys.touchX - param0->unk_30DC; + v1 = gSystem.touchX - param0->unk_30DC; param0->unk_3364.unk_02 = 1; } if ((v1 >= 3) && (v1 <= 40)) { - if (param0->unk_30E0 > gCoreSys.touchY) { - v1 = param0->unk_30E0 - gCoreSys.touchY; + if (param0->unk_30E0 > gSystem.touchY) { + v1 = param0->unk_30E0 - gSystem.touchY; param0->unk_3364.unk_03 = -1; } else { - v1 = gCoreSys.touchY - param0->unk_30E0; + v1 = gSystem.touchY - param0->unk_30E0; param0->unk_3364.unk_03 = 1; } @@ -995,11 +994,11 @@ static void ov71_0223BFBC(UnkStruct_ov71_0223B620 *param0) ov71_0223C444(¶m0->unk_3364); } } else if (v1 <= 40) { - if (param0->unk_30E0 > gCoreSys.touchY) { - v1 = param0->unk_30E0 - gCoreSys.touchY; + if (param0->unk_30E0 > gSystem.touchY) { + v1 = param0->unk_30E0 - gSystem.touchY; param0->unk_3364.unk_03 = -1; } else { - v1 = gCoreSys.touchY - param0->unk_30E0; + v1 = gSystem.touchY - param0->unk_30E0; param0->unk_3364.unk_03 = 1; } @@ -1018,8 +1017,8 @@ static void ov71_0223BFBC(UnkStruct_ov71_0223B620 *param0) } } - param0->unk_30DC = gCoreSys.touchX; - param0->unk_30E0 = gCoreSys.touchY; + param0->unk_30DC = gSystem.touchX; + param0->unk_30E0 = gSystem.touchY; } static void ov71_0223C0D8(UnkStruct_ov71_0223B620 *param0, const u8 param1) @@ -1324,7 +1323,7 @@ static int ov71_0223C60C(BgConfig *param0, const TouchScreenRect *rect) if (v0 != 0) { u16 v1 = 0x40; - if (Bg_DoesPixelAtXYMatchVal(param0, 2, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0, 2, gSystem.touchX, gSystem.touchY, &v1) == 0) { return 0xffffffff; } } else { @@ -1343,7 +1342,7 @@ static int ov71_0223C654(BgConfig *param0, const TouchScreenRect *rect) if (v0 != 0) { u16 v1 = 0x40; - if (Bg_DoesPixelAtXYMatchVal(param0, 2, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0, 2, gSystem.touchX, gSystem.touchY, &v1) == 0) { return 0xffffffff; } } else { diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 0fc7ca8dc1..ffa3423c0b 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -21,7 +21,6 @@ #include "bg_window.h" #include "cell_actor.h" #include "char_transfer.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "game_records.h" @@ -43,6 +42,7 @@ #include "sprite_util.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "touch_screen.h" #include "unk_020041CC.h" @@ -50,7 +50,6 @@ #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02015920.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0202C7FC.h" #include "vram_transfer.h" @@ -1166,21 +1165,21 @@ static void ov72_0223EA18(UnkStruct_ov72_0223DB98 *param0) v0 = 0; - if ((gCoreSys.touchX != 0xffff) && (gCoreSys.touchY != 0xffff) && (param0->unk_5D0C != 0xffff) && (param0->unk_5D10 != 0xffff)) { - if (param0->unk_5D0C > gCoreSys.touchX) { - v1 = param0->unk_5D0C - gCoreSys.touchX; + if ((gSystem.touchX != 0xffff) && (gSystem.touchY != 0xffff) && (param0->unk_5D0C != 0xffff) && (param0->unk_5D10 != 0xffff)) { + if (param0->unk_5D0C > gSystem.touchX) { + v1 = param0->unk_5D0C - gSystem.touchX; param0->unk_5D04.unk_02 = -1; } else { - v1 = gCoreSys.touchX - param0->unk_5D0C; + v1 = gSystem.touchX - param0->unk_5D0C; param0->unk_5D04.unk_02 = 1; } if ((v1 >= 3) && (v1 <= 40)) { - if (param0->unk_5D10 > gCoreSys.touchY) { - v1 = param0->unk_5D10 - gCoreSys.touchY; + if (param0->unk_5D10 > gSystem.touchY) { + v1 = param0->unk_5D10 - gSystem.touchY; param0->unk_5D04.unk_03 = -1; } else { - v1 = gCoreSys.touchY - param0->unk_5D10; + v1 = gSystem.touchY - param0->unk_5D10; param0->unk_5D04.unk_03 = 1; } @@ -1191,11 +1190,11 @@ static void ov72_0223EA18(UnkStruct_ov72_0223DB98 *param0) (void)0; } } else if (v1 <= 40) { - if (param0->unk_5D10 > gCoreSys.touchY) { - v1 = param0->unk_5D10 - gCoreSys.touchY; + if (param0->unk_5D10 > gSystem.touchY) { + v1 = param0->unk_5D10 - gSystem.touchY; param0->unk_5D04.unk_03 = -1; } else { - v1 = gCoreSys.touchY - param0->unk_5D10; + v1 = gSystem.touchY - param0->unk_5D10; param0->unk_5D04.unk_03 = 1; } @@ -1208,8 +1207,8 @@ static void ov72_0223EA18(UnkStruct_ov72_0223DB98 *param0) } } - param0->unk_5D0C = gCoreSys.touchX; - param0->unk_5D10 = gCoreSys.touchY; + param0->unk_5D0C = gSystem.touchX; + param0->unk_5D10 = gSystem.touchY; } static void ov72_0223EAD8(UnkStruct_ov72_0223EAD8 *param0) diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 67b7e4d3db..11d47e3352 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -8,7 +8,6 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "game_start.h" @@ -30,6 +29,7 @@ #include "string_list.h" #include "string_template.h" #include "sys_task_manager.h" +#include "system.h" #include "text.h" #include "trainer_info.h" #include "unk_020041CC.h" @@ -39,7 +39,6 @@ #include "unk_020131EC.h" #include "unk_0201567C.h" #include "unk_02015920.h" -#include "unk_02017728.h" #include "unk_0208694C.h" #include "constdata/const_020F2DAC.h" @@ -264,18 +263,18 @@ static BOOL ov73_021D0FFC(void) BOOL v0 = 0; u16 v1, v2; - if (gCoreSys.touchPressed) { - if ((gCoreSys.touchX < 256) && (gCoreSys.touchY < 192)) { - if (gCoreSys.touchX < 128) { - v1 = 128 - gCoreSys.touchX; + if (gSystem.touchPressed) { + if ((gSystem.touchX < 256) && (gSystem.touchY < 192)) { + if (gSystem.touchX < 128) { + v1 = 128 - gSystem.touchX; } else { - v1 = gCoreSys.touchX - 128; + v1 = gSystem.touchX - 128; } - if (gCoreSys.touchY < 100) { - v2 = 100 - gCoreSys.touchY; + if (gSystem.touchY < 100) { + v2 = 100 - gSystem.touchY; } else { - v2 = gCoreSys.touchY - 100; + v2 = gSystem.touchY - 100; } if ((v1 * v1 + v2 * v2) <= 16 * 16) { @@ -722,7 +721,7 @@ static BOOL ov73_021D1510(UnkStruct_ov73_021D1058 *param0, u32 param1, int param } break; case 2: - if ((param2 != 0) || ((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A)) { + if ((param2 != 0) || ((gSystem.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A)) { Window_Remove(¶m0->unk_1C); param0->unk_50 = 0; v0 = 1; @@ -876,7 +875,7 @@ static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param } break; case 3: - if (((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gCoreSys.pressedKeys & PAD_BUTTON_B) == PAD_BUTTON_B)) { + if (((gSystem.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gSystem.pressedKeys & PAD_BUTTON_B) == PAD_BUTTON_B)) { Sound_PlayEffect(1500); param0->unk_54 = 4; } @@ -1570,7 +1569,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) param0->unk_0C = 22; break; case 22: - if (gCoreSys.pressedKeys) { + if (gSystem.pressedKeys) { param0->unk_0C = 27; break; } @@ -1744,7 +1743,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) Bg_ClearTilemap(param0->unk_18, 0); } param0->unk_0C = 48; - } else if (gCoreSys.pressedKeys) { + } else if (gSystem.pressedKeys) { param0->unk_0C = 49; } break; @@ -1879,7 +1878,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) } break; case 67: - if ((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) { + if ((gSystem.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) { param0->unk_7C = 6; param0->unk_80 = 10; param0->unk_78 = 2; @@ -1892,7 +1891,7 @@ static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) break; } - if ((gCoreSys.pressedKeys & PAD_KEY_LEFT) == PAD_KEY_LEFT || (gCoreSys.pressedKeys & PAD_KEY_RIGHT) == PAD_KEY_RIGHT) { + if ((gSystem.pressedKeys & PAD_KEY_LEFT) == PAD_KEY_LEFT || (gSystem.pressedKeys & PAD_KEY_RIGHT) == PAD_KEY_RIGHT) { if (param0->unk_84 == 0) { param0->unk_84 = 1; } else { diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index ea7f080d50..bc40834fd3 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -4,7 +4,7 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" +#include "system.h" #include "font.h" #include "graphics.h" #include "gx_layers.h" @@ -17,7 +17,7 @@ #include "text.h" #include "unk_020041CC.h" #include "unk_0200F174.h" -#include "unk_02017728.h" +#include "system.h" typedef struct { int unk_00; @@ -444,7 +444,7 @@ asm static BOOL ov73_021D3698 (UnkStruct_ov73_021D342C * param0, int param1, int str r0, [r4, #0xc] b _021D3798 _021D3768: - ldr r0, = gCoreSys + ldr r0, = gSystem ldr r1, [r0, #0x48] mov r0, #1 and r0, r1 diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index c22193c322..f68d6207aa 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -15,7 +15,6 @@ #include "overlay104/struct_ov104_0224133C.h" #include "bg_window.h" -#include "core_sys.h" #include "enums.h" #include "font.h" #include "game_options.h" @@ -33,12 +32,12 @@ #include "strbuf.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02014A84.h" -#include "unk_02017728.h" #include "unk_020393C8.h" #include "vram_transfer.h" @@ -182,7 +181,7 @@ static BOOL ov75_021D0E34(UnkStruct_ov75_021D1184 *param0) static int ov75_021D0E5C(UnkStruct_ov75_021D1184 *param0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1507); return 1; } @@ -194,7 +193,7 @@ static int ov75_021D0E80(UnkStruct_ov75_021D1184 *param0) { u8 v0 = 0; - if (gCoreSys.pressedKeys & (PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A)) { if (param0->unk_11 == 3) { if (param0->unk_12 == 0) { if (ov75_021D0E34(param0)) { @@ -219,23 +218,23 @@ static int ov75_021D0E80(UnkStruct_ov75_021D1184 *param0) } return 1; - } else if (gCoreSys.pressedKeys & (PAD_BUTTON_B)) { + } else if (gSystem.pressedKeys & (PAD_BUTTON_B)) { Sound_PlayEffect(1501); param0->unk_0C = UnkEnum_ov75_021D0E80_03; return 0; } - if (gCoreSys.pressedKeys & PAD_BUTTON_START) { + if (gSystem.pressedKeys & PAD_BUTTON_START) { param0->unk_11 = 3; param0->unk_12 = 0; v0 = 1; - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { param0->unk_11 = (param0->unk_11 + 1) % 4; v0 = 1; - } else if (gCoreSys.pressedKeys & PAD_KEY_UP) { + } else if (gSystem.pressedKeys & PAD_KEY_UP) { param0->unk_11 = (param0->unk_11 + 4 - 1) % 4; v0 = 1; - } else if (gCoreSys.pressedKeys & (PAD_KEY_RIGHT | PAD_KEY_LEFT)) { + } else if (gSystem.pressedKeys & (PAD_KEY_RIGHT | PAD_KEY_LEFT)) { if (param0->unk_11 == 3) { param0->unk_12 ^= 1; v0 = 1; @@ -276,7 +275,7 @@ static int ov75_021D0FA0(UnkStruct_ov75_021D1184 *param0) break; case 1: - if (!(gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { + if (!(gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { return 0; } diff --git a/src/overlay076/ov76_0223B140.c b/src/overlay076/ov76_0223B140.c index 591a29577a..be5bd2e0ab 100644 --- a/src/overlay076/ov76_0223B140.c +++ b/src/overlay076/ov76_0223B140.c @@ -14,9 +14,9 @@ #include "overlay076/struct_ov76_0223B52C.h" #include "overlay076/struct_ov76_0223DE00.h" -#include "core_sys.h" #include "game_overlay.h" #include "palette.h" +#include "system.h" #include "touch_screen.h" #include "unk_0200C6E4.h" #include "unk_0202C9F4.h" @@ -56,7 +56,7 @@ void ov76_0223B184(TouchScreenRect *rect, CellActorData *param1, BOOL param2) } if (param2 == 1) { - SpriteActor_SetSpritePositionXY(param1, gCoreSys.touchX, gCoreSys.touchY); + SpriteActor_SetSpritePositionXY(param1, gSystem.touchX, gSystem.touchY); SpriteActor_GetSpritePositionXY(param1, &v0, &v1); ov76_0223B174(rect); } else { diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index b8c02c0837..d68bfc6284 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -25,7 +25,6 @@ #include "overlay076/struct_ov76_0223DE00.h" #include "bg_window.h" -#include "core_sys.h" #include "game_records.h" #include "gx_layers.h" #include "heap.h" @@ -37,6 +36,7 @@ #include "string_list.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "touch_screen.h" #include "unk_02005474.h" #include "unk_0200762C.h" @@ -45,7 +45,6 @@ #include "unk_02012744.h" #include "unk_02015920.h" #include "unk_02015F84.h" -#include "unk_02017728.h" #include "unk_02023FCC.h" #include "unk_0202C9F4.h" #include "unk_02097B18.h" @@ -253,23 +252,23 @@ static BOOL ov76_0223D574(int *param0) { int *v0 = param0; - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) { (*v0)++; (*v0) %= 12; - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) { if (*v0 > 0) { (*v0)--; } else { *v0 = 12 - 1; } - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { if ((*v0 / 4) != 0) { (*v0) -= 4; (*v0) %= 12; } else { return 0; } - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { if ((*v0 / 4) != (3 - 1)) { (*v0) += 4; (*v0) %= 12; @@ -385,12 +384,12 @@ static BOOL ov76_0223D674(UnkStruct_ov76_0223DE00 *param0) ov76_0223B1E0(param0); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { param0->unk_3D4++; ov76_0223CA30(¶m0->unk_D4.unk_18[0], 8); ov76_0223BF74(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[1], 1, param0, param0->unk_3C4[0]); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { param0->unk_3D4 = 5; Sound_PlayEffect(1501); } @@ -1234,7 +1233,7 @@ static BOOL ov76_0223E950(UnkStruct_ov76_0223DE00 *param0) param0->unk_3D4++; break; case 1: - if (gCoreSys.pressedKeys & (0x1 | 0x2 | 0x400 | 0x800 | 0x40 | 0x80 | 0x20 | 0x10)) { + if (gSystem.pressedKeys & (0x1 | 0x2 | 0x400 | 0x800 | 0x40 | 0x80 | 0x20 | 0x10)) { param0->unk_3D4++; } break; @@ -1269,13 +1268,13 @@ static BOOL ov76_0223E9C4(UnkStruct_ov76_0223DE00 *param0) ov76_0223D600(param0, 1, 0); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { ov76_0223C80C(param0, param0->unk_3C4[0], param0->unk_3C4[1]); ov76_0223D600(param0, 1, 1); ov76_0223CA30(¶m0->unk_D4.unk_18[0], 11); param0->unk_3D4 = 2; Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { SpriteActor_EnableObject(param0->unk_2F4[1], 0); ov76_0223D600(param0, 0, 1); param0->unk_3D4 = 3; @@ -1283,7 +1282,7 @@ static BOOL ov76_0223E9C4(UnkStruct_ov76_0223DE00 *param0) } } break; case 2: - if (gCoreSys.pressedKeys & (0x1 | 0x2 | 0x400 | 0x800 | 0x40 | 0x80 | 0x20 | 0x10)) { + if (gSystem.pressedKeys & (0x1 | 0x2 | 0x400 | 0x800 | 0x40 | 0x80 | 0x20 | 0x10)) { param0->unk_3D4 = 3; } break; diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index d9fba3736f..95c73aa71b 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -9,7 +9,6 @@ #include "bg_window.h" #include "camera.h" -#include "core_sys.h" #include "easy3d.h" #include "easy3d_object.h" #include "font.h" @@ -23,12 +22,12 @@ #include "narc.h" #include "overlay_manager.h" #include "strbuf.h" +#include "system.h" #include "text.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200A9DC.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0202419C.h" #include "unk_02024220.h" @@ -204,14 +203,14 @@ static int ov77_021D0E3C(OverlayManager *param0, int *param1) if (ov77_021D1A60(&v0->unk_238, v0->unk_04, v0->unk_00) == 1) { v0->unk_238.unk_00 = 0; - if (gCoreSys.unk_6C == 0) { + if (gSystem.unk_6C == 0) { v0->unk_4EC = 30 * 1; v0->unk_238.unk_29C = 1; v0->unk_238.unk_2A0 = 0; *param1 = 2; } else { v0->unk_4EC = 0; - gCoreSys.unk_6C = 0; + gSystem.unk_6C = 0; v0->unk_238.unk_2A0 = 1; *param1 = 1; } @@ -242,7 +241,7 @@ static int ov77_021D0E3C(OverlayManager *param0, int *param1) v0->unk_4F8++; - if (((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gCoreSys.pressedKeys & PAD_BUTTON_START) == PAD_BUTTON_START)) { + if (((gSystem.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gSystem.pressedKeys & PAD_BUTTON_START) == PAD_BUTTON_START)) { v0->unk_4E8 = 1; sub_0200564C(0, 60); sub_02005844(487, 1); @@ -251,7 +250,7 @@ static int ov77_021D0E3C(OverlayManager *param0, int *param1) break; } - if ((gCoreSys.heldKeys & (PAD_BUTTON_B | PAD_KEY_UP | PAD_BUTTON_SELECT)) == (PAD_BUTTON_B | PAD_KEY_UP | PAD_BUTTON_SELECT)) { + if ((gSystem.heldKeys & (PAD_BUTTON_B | PAD_KEY_UP | PAD_BUTTON_SELECT)) == (PAD_BUTTON_B | PAD_KEY_UP | PAD_BUTTON_SELECT)) { v0->unk_4E8 = 2; StartScreenTransition(0, 0, 0, 0x0, 6, 1, v0->unk_00); *param1 = 6; @@ -260,7 +259,7 @@ static int ov77_021D0E3C(OverlayManager *param0, int *param1) if (v0->unk_4F8 > 30 * 30) { v0->unk_4E8 = 3; - gCoreSys.unk_6C = 1; + gSystem.unk_6C = 1; { GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); } @@ -371,7 +370,7 @@ static void ov77_021D1184(void) static BOOL ov77_021D11A4(void) { - if (((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gCoreSys.pressedKeys & PAD_BUTTON_START) == PAD_BUTTON_START) || ((gCoreSys.pressedKeys & PAD_BUTTON_SELECT) == PAD_BUTTON_SELECT)) { + if (((gSystem.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gSystem.pressedKeys & PAD_BUTTON_START) == PAD_BUTTON_START) || ((gSystem.pressedKeys & PAD_BUTTON_SELECT) == PAD_BUTTON_SELECT)) { return 1; } @@ -893,7 +892,7 @@ static BOOL ov77_021D1A60(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int G3X_AntiAlias(1); } - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); param0->unk_04.unk_00 = 2; @@ -1205,7 +1204,7 @@ static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int G2_BlendNone(); G3X_EdgeMarking(0); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); return 1; diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index 9e7ffa0449..14a0b32335 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -16,7 +16,6 @@ #include "bg_window.h" #include "camera.h" -#include "core_sys.h" #include "easy3d.h" #include "graphics.h" #include "gx_layers.h" @@ -28,11 +27,11 @@ #include "render_oam.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "unk_020041CC.h" #include "unk_0200A9DC.h" #include "unk_0200F174.h" #include "unk_02014000.h" -#include "unk_02017728.h" #include "unk_0202419C.h" #include "unk_02024220.h" #include "vram_transfer.h" @@ -859,7 +858,7 @@ static void ov77_021D2B38(void *param0) UnkStruct_ov77_021D37C0 *v2 = &v1->unk_34; if (v2->unk_25B == 1) { - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); @@ -948,7 +947,7 @@ static int ov77_021D2D08(OverlayManager *param0, int *param1) v0->unk_08 = 0; v0->unk_2A8 = 0; - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); v0->unk_14 = LCRNG_GetSeed(); @@ -961,9 +960,9 @@ static int ov77_021D2D94(OverlayManager *param0, int *param1) { UnkStruct_ov77_021D2E9C *v0 = OverlayManager_Data(param0); - if ((v0->unk_2A8) && ((gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.pressedKeys & PAD_BUTTON_START))) { + if ((v0->unk_2A8) && ((gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.pressedKeys & PAD_BUTTON_START))) { v0->unk_08 = 1; - gCoreSys.unk_6C = 0; + gSystem.unk_6C = 0; sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); } @@ -1344,7 +1343,7 @@ static void ov77_021D34A8(UnkStruct_ov77_021D2E9C *param0) ov77_021D6CFC(param0->unk_34.unk_1C); param0->unk_34.unk_10 = param0->unk_0C; - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); for (v0 = 0; v0 < 4; v0++) { @@ -1630,7 +1629,7 @@ static void ov77_021D3D4C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 static void ov77_021D3DC4(UnkStruct_ov77_021D37C0 *param0) { - if (gCoreSys.unk_65 == 0) { + if (gSystem.unk_65 == 0) { Bg_SetOffset(param0->unk_10, 1, 3, 0); Bg_SetOffset(param0->unk_10, 2, 3, 0); Bg_SetOffset(param0->unk_10, 3, 3, 0); @@ -2056,7 +2055,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 ov77_021D603C(param1->unk_14, 16, 1); ov77_021D636C(param1->unk_14, 0); ov77_021D3B5C(param0, param1); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); ov77_021D3DC4(param1); param1->unk_246 = 1; @@ -2102,7 +2101,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 if (IsScreenTransitionDone()) { if (1) { - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); ov77_021D3DC4(param1); @@ -2130,7 +2129,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 if (IsScreenTransitionDone()) { MI_CpuCopy16(param1->unk_240, (void *)HW_BG_PLTT, 0x200); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); ov77_021D3D4C(param0, param1); @@ -2176,7 +2175,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 ov77_021D6290(param1->unk_14, (16 << FX32_SHIFT)); if (IsScreenTransitionDone()) { - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); (*v0)++; } diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c index 1029e541e0..99981022db 100644 --- a/src/overlay077/ov77_021D54B0.c +++ b/src/overlay077/ov77_021D54B0.c @@ -9,13 +9,13 @@ #include "cell_actor.h" #include "cell_transfer.h" #include "char_transfer.h" -#include "core_sys.h" #include "gx_layers.h" #include "pltt_transfer.h" #include "render_oam.h" #include "sprite_resource.h" #include "sprite_transfer.h" #include "sprite_util.h" +#include "system.h" #include "vram_transfer.h" SDK_COMPILER_ASSERT(((3 + 1 + 1 + 2 + 4) + 6) == 17); @@ -521,7 +521,7 @@ void ov77_021D6290(UnkStruct_ov77_021D5564 *param0, fx32 param1) VecFx32 v1; int v2, v3; - if (gCoreSys.unk_65 == 0) { + if (gSystem.unk_65 == 0) { v2 = 13; v3 = 15; } else { @@ -560,7 +560,7 @@ void ov77_021D636C(UnkStruct_ov77_021D5564 *param0, int param1) VecFx32 v1; if (param1 == 0) { - if (gCoreSys.unk_65 == 0) { + if (gSystem.unk_65 == 0) { CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 0); CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 0); CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 1); diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index 26e62f78a7..c115185858 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -13,7 +13,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "gx_layers.h" @@ -26,13 +25,13 @@ #include "render_window.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "touch_screen.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_020158A8.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0208C098.h" #include "unk_02098FFC.h" @@ -249,7 +248,7 @@ static int ov79_021D0FEC(UnkStruct_ov79_021D0E1C *param0) v1 = ov79_021D0FB0(param0); - if (gCoreSys.heldKeys != 0) { + if (gSystem.heldKeys != 0) { if (param0->unk_14 == 0) { v0 = ListMenu_ProcessInput(param0->unk_C4); } @@ -264,14 +263,14 @@ static int ov79_021D0FEC(UnkStruct_ov79_021D0E1C *param0) return 0; } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); param0->unk_1A = 0xFF; param0->unk_10 = 0; return 1; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); switch (v0) { @@ -309,7 +308,7 @@ static int ov79_021D10B8(UnkStruct_ov79_021D0E1C *param0) v0 = ListMenu_ProcessInput(param0->unk_C8); - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); ov79_021D1F60(param0); ov79_021D2214(param0, 0); @@ -317,7 +316,7 @@ static int ov79_021D10B8(UnkStruct_ov79_021D0E1C *param0) return 0; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); switch (v0) { @@ -377,7 +376,7 @@ static int ov79_021D11C0(UnkStruct_ov79_021D0E1C *param0) return 0; } - if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) == 0) { + if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) == 0) { return 0; } diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 4f54d9eacd..02d06255e2 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -21,7 +21,6 @@ #include "bg_window.h" #include "cell_actor.h" #include "communication_system.h" -#include "core_sys.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -36,12 +35,12 @@ #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_0200762C.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_020393C8.h" #include "unk_0208C098.h" #include "unk_020989DC.h" @@ -750,7 +749,7 @@ static int ov79_021D2C08(UnkStruct_ov79_021D2928 *param0) return 7; } - if (((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) == 0) && (param0->unk_0E++ < 90)) { + if (((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) == 0) && (param0->unk_0E++ < 90)) { return 7; } diff --git a/src/overlay080/ov80_021D0D80.c b/src/overlay080/ov80_021D0D80.c index 331e1ac555..c771a1ed6d 100644 --- a/src/overlay080/ov80_021D0D80.c +++ b/src/overlay080/ov80_021D0D80.c @@ -20,9 +20,9 @@ #include "narc.h" #include "overlay_manager.h" #include "strbuf.h" +#include "system.h" #include "unk_020041CC.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0208C098.h" diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c index 9e822e3950..8bc83f7f89 100644 --- a/src/overlay080/ov80_021D1458.c +++ b/src/overlay080/ov80_021D1458.c @@ -12,7 +12,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "heap.h" #include "map_header_util.h" @@ -22,6 +21,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" @@ -238,7 +238,7 @@ int ov80_021D163C(UnkStruct_ov80_021D2A08 *param0) { UnkStruct_ov80_021D1478 *v0 = param0->unk_34; - if ((v0->unk_14 <= 1) && gCoreSys.pressedKeys & PAD_BUTTON_B) { + if ((v0->unk_14 <= 1) && gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1501); return 1; } @@ -247,7 +247,7 @@ int ov80_021D163C(UnkStruct_ov80_021D2A08 *param0) return 0; } - ov80_021D18F8(param0, gCoreSys.heldKeys); + ov80_021D18F8(param0, gSystem.heldKeys); return 0; } @@ -257,14 +257,14 @@ int ov80_021D1678(UnkStruct_ov80_021D2A08 *param0) UnkStruct_ov80_021D1478 *v0 = param0->unk_34; if (v0->unk_14 <= 1) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (ov80_021D29BC(param0)) { Sound_PlayEffect(1501); return 1; } return 0; - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1501); return 1; } @@ -274,7 +274,7 @@ int ov80_021D1678(UnkStruct_ov80_021D2A08 *param0) return 0; } - ov80_021D18F8(param0, gCoreSys.heldKeys); + ov80_021D18F8(param0, gSystem.heldKeys); return 0; } @@ -282,12 +282,12 @@ int ov80_021D16D0(UnkStruct_ov80_021D2A08 *param0) { UnkStruct_ov80_021D1478 *v0 = param0->unk_34; - if (gCoreSys.pressedKeys & (PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B)) { Sound_PlayEffect(1501); return 1; } - ov80_021D18F8(param0, gCoreSys.heldKeys); + ov80_021D18F8(param0, gSystem.heldKeys); return 0; } @@ -387,7 +387,7 @@ static int ov80_021D1848(UnkStruct_ov80_021D2A08 *param0, int param1) v1 = 0x12; - if (Bg_DoesPixelAtXYMatchVal(param0->unk_28, 5, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_28, 5, gSystem.touchX, gSystem.touchY, &v1) == 0) { return v0; } diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c index 644ca18d27..5789d4a156 100644 --- a/src/overlay083/ov83_0223B5A0.c +++ b/src/overlay083/ov83_0223B5A0.c @@ -24,7 +24,6 @@ #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "game_options.h" #include "game_records.h" #include "gx_layers.h" @@ -32,10 +31,10 @@ #include "journal.h" #include "overlay_manager.h" #include "poffin.h" +#include "system.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0202ACE0.h" #include "unk_020363E8.h" #include "unk_020366A0.h" @@ -681,7 +680,7 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 case 4: param1->unk_1C--; - if ((param1->unk_1C < 0) || (gCoreSys.touchPressed) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { + if ((param1->unk_1C < 0) || (gSystem.touchPressed) || (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { (*param2)++; break; } @@ -699,7 +698,7 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 case 6: param1->unk_1C--; - if ((gCoreSys.touchPressed) || (param1->unk_1C < 0) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { + if ((gSystem.touchPressed) || (param1->unk_1C < 0) || (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { (*param2)++; } break; @@ -749,7 +748,7 @@ static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78 case 10: param1->unk_1C--; - if ((gCoreSys.touchPressed) || (param1->unk_1C < 0) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { + if ((gSystem.touchPressed) || (param1->unk_1C < 0) || (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { if (param1->unk_1488 > 1) { ov83_0223EC8C(¶m1->unk_6A0, 6); ov83_0223E9BC(¶m1->unk_6A0); diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index 152bc11ed8..3ecce8016f 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -12,7 +12,6 @@ #include "bg_window.h" #include "cell_actor.h" #include "char_transfer.h" -#include "core_sys.h" #include "gx_layers.h" #include "heap.h" #include "message.h" @@ -21,6 +20,7 @@ #include "render_oam.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "unk_02015064.h" #include "unk_0202419C.h" @@ -68,7 +68,7 @@ void ov83_0223C958(UnkStruct_ov83_0223B784 *param0) NARC_dtor(v0); - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); } @@ -93,7 +93,7 @@ void ov83_0223CAA4(UnkStruct_ov83_0223B784 *param0) ov83_0223CF20(param0); ov83_0223D068(param0); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); } diff --git a/src/overlay083/ov83_0223F7F4.c b/src/overlay083/ov83_0223F7F4.c index 1d57885d4b..f855895936 100644 --- a/src/overlay083/ov83_0223F7F4.c +++ b/src/overlay083/ov83_0223F7F4.c @@ -17,11 +17,11 @@ #include "overlay083/struct_ov83_022401AC.h" #include "berry_data.h" -#include "core_sys.h" #include "heap.h" #include "int_distance.h" #include "math.h" #include "poffin.h" +#include "system.h" s32 ov83_0223F7F4(int param0, int param1, int param2, int param3, int param4, int param5) { @@ -55,9 +55,9 @@ void ov83_0223F83C(UnkStruct_ov83_0223F820 *param0) { s32 v0; - if (gCoreSys.touchHeld) { - param0->unk_00 = gCoreSys.touchX; - param0->unk_04 = gCoreSys.touchY; + if (gSystem.touchHeld) { + param0->unk_00 = gSystem.touchX; + param0->unk_04 = gSystem.touchY; if (param0->unk_14 == 0) { param0->unk_08 = param0->unk_00; @@ -68,7 +68,7 @@ void ov83_0223F83C(UnkStruct_ov83_0223F820 *param0) param0->unk_10 = ov83_0223F7F4(param0->unk_00, param0->unk_04, param0->unk_08, param0->unk_0C, 128, 96); param0->unk_08 = param0->unk_00; param0->unk_0C = param0->unk_04; - param0->unk_14 = gCoreSys.touchHeld; + param0->unk_14 = gSystem.touchHeld; } void ov83_0223F88C(UnkStruct_ov83_0223F88C *param0, UnkStruct_ov83_0223F820 *param1) diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index d9817dfdc7..d1cfc3ac7d 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -20,7 +20,6 @@ #include "bag.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -40,6 +39,7 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "touch_screen.h" #include "trainer_info.h" @@ -48,7 +48,6 @@ #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_020393C8.h" #include "unk_020683F4.h" @@ -1229,7 +1228,7 @@ static u8 ov84_0223C5B8(UnkStruct_ov84_0223B5A0 *param0) v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; ListMenu_GetListAndCursorPos(param0->unk_15C, &v0->unk_06, &v0->unk_04); - if (gCoreSys.pressedKeys & PAD_BUTTON_SELECT) { + if (gSystem.pressedKeys & PAD_BUTTON_SELECT) { if (ov84_0223D244(param0) == 1) { Sound_PlayEffect(1500); return 2; @@ -1292,7 +1291,7 @@ static void ov84_0223C720(UnkStruct_ov84_0223B5A0 *param0) static u8 ov84_0223C750(UnkStruct_ov84_0223B5A0 *param0) { - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) { if (param0->unk_424 == 1) { return 0; } @@ -1314,7 +1313,7 @@ static u8 ov84_0223C750(UnkStruct_ov84_0223B5A0 *param0) return 1; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) { if (param0->unk_424 == 1) { return 0; } @@ -1449,7 +1448,7 @@ static u8 ov84_0223CA5C(UnkStruct_ov84_0223B5A0 *param0) { UnkStruct_ov84_0223C920 *v0 = ¶m0->unk_429; - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { if (param0->unk_424 == 1) { return 1; } @@ -1482,7 +1481,7 @@ static u8 ov84_0223CA5C(UnkStruct_ov84_0223B5A0 *param0) ov84_02240B68(param0); return 1; } - if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + if (gSystem.pressedKeys & PAD_KEY_RIGHT) { if (param0->unk_424 == 1) { return 1; } @@ -1598,7 +1597,7 @@ static int ov84_0223CDB0(UnkStruct_ov84_0223B5A0 *param0) if (v0 != 0xffffffff) { u16 v1 = 0xfffe; - if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gSystem.touchX, gSystem.touchY, &v1) == 0) { return 0xffffffff; } } @@ -1613,7 +1612,7 @@ static int ov84_0223CE08(UnkStruct_ov84_0223B5A0 *param0) if (v0 != 0xffffffff) { u16 v1 = 0xfffe; - if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gSystem.touchX, gSystem.touchY, &v1) == 0) { return 0xffffffff; } } @@ -1795,7 +1794,7 @@ static BOOL ov84_0223D1F4(UnkStruct_ov84_0223B5A0 *param0) if (v0 != 0xffffffff) { u16 v1 = 0xfffe; - if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gSystem.touchX, gSystem.touchY, &v1) == 0) { return 0; } @@ -1858,7 +1857,7 @@ static u8 ov84_0223D2F8(UnkStruct_ov84_0223B5A0 *param0) return 1; } - if (gCoreSys.pressedKeys & PAD_BUTTON_SELECT) { + if (gSystem.pressedKeys & PAD_BUTTON_SELECT) { Sound_PlayEffect(1500); ov84_0223D42C(param0); return 1; @@ -1887,7 +1886,7 @@ static u8 ov84_0223D2F8(UnkStruct_ov84_0223B5A0 *param0) case 0xfffffffe: Sound_PlayEffect(1500); - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { ov84_0223D42C(param0); } else { ov84_0223D484(param0); @@ -2123,7 +2122,7 @@ static int ov84_0223D858(UnkStruct_ov84_0223B5A0 *param0) static int ov84_0223D8EC(UnkStruct_ov84_0223B5A0 *param0) { if (Text_IsPrinterActive(param0->unk_426) == 0) { - if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { + if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gSystem.touchPressed) { Window_EraseMessageBox(¶m0->unk_04[6], 0); Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); @@ -2199,7 +2198,7 @@ static int ov84_0223DA14(UnkStruct_ov84_0223B5A0 *param0) break; } - if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { + if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gSystem.touchPressed) { Strbuf *v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 60); Window_FillTilemap(¶m0->unk_04[6], 15); @@ -2331,7 +2330,7 @@ static int ov84_0223DDD0(UnkStruct_ov84_0223B5A0 *param0) break; } - if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { + if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gSystem.touchPressed) { Window_EraseMessageBox(¶m0->unk_04[6], 0); param0->unk_483 = 2; } @@ -2413,13 +2412,13 @@ static int ov84_0223DF0C(UnkStruct_ov84_0223B5A0 *param0) Sound_PlayEffect(1592); return 7; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { ov84_0223FFF0(param0); ov84_02240D3C(param0, 0); Sound_PlayEffect(1500); return 8; } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { ov84_0223FFC0(param0); ov84_02240D3C(param0, 0); ov84_02240B34(param0, 1); @@ -2508,7 +2507,7 @@ static int ov84_0223E158(UnkStruct_ov84_0223B5A0 *param0) static int ov84_0223E18C(UnkStruct_ov84_0223B5A0 *param0) { if (Text_IsPrinterActive(param0->unk_426) == 0) { - if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { + if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gSystem.touchPressed) { param0->unk_479 = 0; Window_EraseMessageBox(¶m0->unk_04[6], 0); Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); @@ -2604,7 +2603,7 @@ static int ov84_0223E27C(UnkStruct_ov84_0223B5A0 *param0) static int ov84_0223E36C(UnkStruct_ov84_0223B5A0 *param0) { if (Text_IsPrinterActive(param0->unk_426) == 0) { - if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { + if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gSystem.touchPressed) { Window_EraseMessageBox(¶m0->unk_04[6], 0); Window_ScheduleCopyToVRAM(¶m0->unk_04[1]); ov84_02240B34(param0, 1); @@ -2732,7 +2731,7 @@ static int ov84_0223E5C4(UnkStruct_ov84_0223B5A0 *param0) Sound_PlayEffect(1592); return 18; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Strbuf *v1; ov84_02240D3C(param0, 0); @@ -2749,7 +2748,7 @@ static int ov84_0223E5C4(UnkStruct_ov84_0223B5A0 *param0) return 19; } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { param0->unk_48C = 0; ov84_02240D3C(param0, 0); @@ -2859,7 +2858,7 @@ static int ov84_0223E920(UnkStruct_ov84_0223B5A0 *param0) static int ov84_0223E9B0(UnkStruct_ov84_0223B5A0 *param0) { if (Text_IsPrinterActive(param0->unk_426) == 0) { - if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { + if ((gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gSystem.touchPressed) { param0->unk_479 = 0; param0->unk_48C = 0; @@ -2961,15 +2960,15 @@ static BOOL ov84_0223EB84(UnkStruct_ov84_0223B5A0 *param0, u16 param1) param0->unk_492 = 1; param0->unk_498 = 0; param0->unk_494 = 0; - param0->unk_49E = gCoreSys.touchX; - param0->unk_4A0 = gCoreSys.touchY; + param0->unk_49E = gSystem.touchX; + param0->unk_4A0 = gSystem.touchY; } if (param0->unk_492 == 1) { if (ov84_0223EB6C() == 1) { s32 v0, v1; - v0 = CalcDotProduct2D(128 - param0->unk_49E, 80 - param0->unk_4A0, 128 - gCoreSys.touchX, 80 - gCoreSys.touchY, 80); + v0 = CalcDotProduct2D(128 - param0->unk_49E, 80 - param0->unk_4A0, 128 - gSystem.touchX, 80 - gSystem.touchY, 80); v1 = CalcRadialAngle(80, v0 * 2); v1 = ((v1 << 8) / 182) >> 8; param0->unk_49A += v1; @@ -3005,8 +3004,8 @@ static BOOL ov84_0223EB84(UnkStruct_ov84_0223B5A0 *param0, u16 param1) } } } - param0->unk_49E = gCoreSys.touchX; - param0->unk_4A0 = gCoreSys.touchY; + param0->unk_49E = gSystem.touchX; + param0->unk_4A0 = gSystem.touchY; } else { param0->unk_492 = 0; param0->unk_498 = 0; diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index f981e0aa2b..3af159d980 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -12,7 +12,6 @@ #include "berry_data.h" #include "bg_window.h" #include "camera.h" -#include "core_sys.h" #include "font.h" #include "graphics.h" #include "gx_layers.h" @@ -22,10 +21,10 @@ #include "overlay_manager.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_0200C440.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" #include "unk_020393C8.h" @@ -705,7 +704,7 @@ static int ov85_02241D10(UnkStruct_ov85_022417E4 *param0) { u32 v0; - if (gCoreSys.heldKeys & PAD_KEY_UP) { + if (gSystem.heldKeys & PAD_KEY_UP) { v0 = ov85_02241EB8(param0->unk_1F8->unk_00, param0->unk_1F8->unk_08, -1); if (param0->unk_1F8->unk_08 != v0) { @@ -725,7 +724,7 @@ static int ov85_02241D10(UnkStruct_ov85_022417E4 *param0) return 1; } - if (gCoreSys.heldKeys & PAD_KEY_DOWN) { + if (gSystem.heldKeys & PAD_KEY_DOWN) { v0 = ov85_02241EB8(param0->unk_1F8->unk_00, param0->unk_1F8->unk_08, 1); if (param0->unk_1F8->unk_08 != v0) { @@ -745,7 +744,7 @@ static int ov85_02241D10(UnkStruct_ov85_022417E4 *param0) return 1; } - if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || (gCoreSys.touchPressed)) { + if ((gSystem.pressedKeys & PAD_BUTTON_B) || (gSystem.touchPressed)) { sub_0208C120(1, 36); return 3; } diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 18fb192e62..9c4bed79b7 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -16,7 +16,6 @@ #include "bg_window.h" #include "camera.h" #include "cell_actor.h" -#include "core_sys.h" #include "enums.h" #include "font.h" #include "graphics.h" @@ -36,6 +35,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" @@ -43,7 +43,6 @@ #include "unk_0200762C.h" #include "unk_0200F174.h" #include "unk_020131EC.h" -#include "unk_02017728.h" typedef struct { fx32 unk_00; @@ -540,7 +539,7 @@ static BOOL ov86_0223B574(UnkStruct_ov86_0223B3C8 *param0) param0->unk_00++; break; case 8: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; } break; diff --git a/src/overlay087/ov87_021D0D80.c b/src/overlay087/ov87_021D0D80.c index f77abdaec2..1581bdd7a9 100644 --- a/src/overlay087/ov87_021D0D80.c +++ b/src/overlay087/ov87_021D0D80.c @@ -9,10 +9,10 @@ #include "overlay087/struct_ov87_021D106C_decl.h" #include "overlay087/struct_ov87_021D12C0.h" -#include "core_sys.h" #include "heap.h" #include "overlay_manager.h" #include "strbuf.h" +#include "system.h" #include "unk_0202DF8C.h" typedef struct UnkStruct_ov87_021D0D80_t { @@ -81,33 +81,33 @@ int ov87_021D0E2C(OverlayManager *param0, int *param1) switch (*param1) { case 0: - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { ov87_021D0F38(v0, 1); (*param1)++; break; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { v0->unk_00.unk_1C ^= 1; ov87_021D0F38(v0, 4); break; } - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { if (ov87_021D0F4C(v0)) { ov87_021D0F38(v0, 3); } break; } - if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + if (gSystem.pressedKeys & PAD_KEY_RIGHT) { if (ov87_021D0F88(v0)) { ov87_021D0F38(v0, 3); } break; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { if (--(v0->unk_00.unk_18) < 0) { if (ov87_021D0F4C(v0)) { v0->unk_00.unk_18 = v0->unk_00.unk_14 - 1; @@ -119,7 +119,7 @@ int ov87_021D0E2C(OverlayManager *param0, int *param1) break; } - if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + if (gSystem.pressedKeys & PAD_KEY_DOWN) { if (++(v0->unk_00.unk_18) >= v0->unk_00.unk_14) { if (ov87_021D0F88(v0)) { ov87_021D0F38(v0, 3); diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index fcb3f60d3b..42286821f6 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -25,12 +25,12 @@ #include "sprite_util.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_02006224.h" #include "unk_0200F174.h" #include "unk_020131EC.h" -#include "unk_02017728.h" typedef struct UnkStruct_ov87_021D106C_t { UnkStruct_ov87_021D0D80 *unk_00; diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index c465960855..af245907dc 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -26,7 +26,6 @@ #include "charcode_util.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "game_records.h" @@ -57,6 +56,7 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "touch_screen.h" #include "trainer_info.h" @@ -66,7 +66,6 @@ #include "unk_0200A9DC.h" #include "unk_0200F174.h" #include "unk_020131EC.h" -#include "unk_02017728.h" #include "unk_0202ACE0.h" #include "unk_0202CC64.h" #include "unk_0202D778.h" @@ -1471,22 +1470,22 @@ static void ov88_0223CE34(u32 *param0) int v0 = 0; int v1 = 0; - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { v1 = 1; v0++; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { v1 = 2; v0++; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) { v1 = 3; v0++; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) { v1 = 4; v0++; } @@ -1687,7 +1686,7 @@ static void ov88_0223D140(ChatotCry *param0) static int ov88_0223D150(UnkStruct_02095E80 *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); param0->unk_88[0] = 12; ov88_0223BE28(param0); @@ -1695,7 +1694,7 @@ static int ov88_0223D150(UnkStruct_02095E80 *param0) } else { ov88_0223CE34(¶m0->unk_14C[0]); - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (param0->unk_14C[0] == 0) { if (param0->unk_88[0] == 12) { param0->unk_226C = ov88_0223D2C4; @@ -1796,7 +1795,7 @@ static int ov88_0223D3E0(UnkStruct_02095E80 *param0) static int ov88_0223D434(UnkStruct_02095E80 *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Bg_FillTilemapRect(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[21], 15, FONT_MESSAGE, param0->unk_184, param0->unk_178); param0->unk_226C = ov88_0223D150; diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 8fb505f8e9..31c5121443 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -21,7 +21,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "gx_layers.h" @@ -34,12 +33,12 @@ #include "save_player.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02014A84.h" -#include "unk_02017728.h" #include "unk_0202D05C.h" #include "unk_0203061C.h" #include "unk_0208C098.h" @@ -320,7 +319,7 @@ static void ov90_021D1034(void *param0) static int ov90_021D105C(UnkStruct_ov90_021D0ECC *param0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); return 1; } @@ -366,12 +365,12 @@ static int ov90_021D1080(UnkStruct_ov90_021D0ECC *param0) { int v0 = 0; - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); return 1; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); if (param0->unk_0B >= 10) { @@ -381,26 +380,26 @@ static int ov90_021D1080(UnkStruct_ov90_021D0ECC *param0) param0->unk_0D = (param0->unk_0D + 1) % 2; v0 = 1; } else { - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { v0 = inline_ov90_021D1080(param0); if (v0) { Sound_PlayEffect(1500); } - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { v0 = inline_ov90_021D1080_1(param0); if (v0) { Sound_PlayEffect(1500); } - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) { param0->unk_0C = (param0->unk_0C + 2) % 3; v0 = 1; if (param0->unk_0B != 10) { Sound_PlayEffect(1500); } - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) { param0->unk_0C = (param0->unk_0C + 1) % 3; v0 = 1; diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index efdcab265f..4a56b19d9f 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -17,7 +17,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -35,11 +34,11 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0207C908.h" #include "unk_0208C098.h" #include "unk_02094EDC.h" @@ -657,7 +656,7 @@ static int ov91_021D122C(UnkStruct_ov91_021D0ED8 *param0) u32 v0; u16 v1, v2; - if (gCoreSys.pressedKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT)) { + if (gSystem.pressedKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT)) { Sound_PlayEffect(1501); param0->unk_00->unk_14 ^= 1; ov91_021D1498(param0); diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index eaf1f968c6..53a4657b99 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -11,7 +11,6 @@ #include "bg_window.h" #include "camera.h" -#include "core_sys.h" #include "easy3d.h" #include "font.h" #include "game_options.h" @@ -31,10 +30,10 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0202419C.h" #include "unk_0202C858.h" #include "unk_020996D0.h" @@ -346,7 +345,7 @@ int ov92_021D0D80(OverlayManager *param0, int *param1) v0->camera = Camera_Alloc(v0->unk_00); v0->unk_BAE8 = 0; - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); SetAutorepeat(4, 8); @@ -585,7 +584,7 @@ int ov92_021D0EB8(OverlayManager *param0, int *param1) u16 v10 = v0->unk_BAD8; ov92_021D1700(v0); - if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || (v0->unk_BAF8 & PAD_BUTTON_B)) { + if ((gSystem.pressedKeys & PAD_BUTTON_B) || (v0->unk_BAF8 & PAD_BUTTON_B)) { Window_EraseStandardFrame(&v0->unk_B834, 0); Sound_PlayEffect(1501); Window_FillRectWithColor(&v0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); @@ -598,7 +597,7 @@ int ov92_021D0EB8(OverlayManager *param0, int *param1) *param1 = 17; } } else { - if ((gCoreSys.pressedKeys & PAD_BUTTON_X) && (v0->unk_BB28 == 0)) { + if ((gSystem.pressedKeys & PAD_BUTTON_X) && (v0->unk_BB28 == 0)) { v0->unk_BB28 = 1; ov92_021D1F90(v0); @@ -608,7 +607,7 @@ int ov92_021D0EB8(OverlayManager *param0, int *param1) break; } - if ((gCoreSys.pressedKeys & (PAD_BUTTON_X | PAD_BUTTON_A | PAD_BUTTON_B)) && (v0->unk_BB28 == 1)) { + if ((gSystem.pressedKeys & (PAD_BUTTON_X | PAD_BUTTON_A | PAD_BUTTON_B)) && (v0->unk_BB28 == 1)) { v0->unk_BB28 = 0; ov92_021D1F90(v0); break; @@ -617,7 +616,7 @@ int ov92_021D0EB8(OverlayManager *param0, int *param1) { BOOL v11; - v11 = ov92_021D2460(v0, gCoreSys.pressedKeys, gCoreSys.heldKeys); + v11 = ov92_021D2460(v0, gSystem.pressedKeys, gSystem.heldKeys); if ((v11 == 1) && (v0->unk_BB28 == 1)) { v0->unk_BB28 = 0; @@ -683,7 +682,7 @@ int ov92_021D1478(OverlayManager *param0, int *param1) OverlayManager_FreeData(param0); Heap_Destroy(v1); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; return 1; } @@ -822,8 +821,8 @@ static void ov92_021D1700(UnkStruct_ov92_021D1B24 *param0) param0->unk_BAF8 = 0; - if (gCoreSys.touchPressed) { - if ((gCoreSys.touchX >= (25 * 8)) && (gCoreSys.touchX <= ((25 + 6) * 8)) && (gCoreSys.touchY >= (21 * 8)) && (gCoreSys.touchY <= ((21 + 2) * 8))) { + if (gSystem.touchPressed) { + if ((gSystem.touchX >= (25 * 8)) && (gSystem.touchX <= ((25 + 6) * 8)) && (gSystem.touchY >= (21 * 8)) && (gSystem.touchY <= ((21 + 2) * 8))) { param0->unk_BAF8 = PAD_BUTTON_B; return; } else { @@ -832,13 +831,13 @@ static void ov92_021D1700(UnkStruct_ov92_021D1B24 *param0) param0->unk_BB0C = 0; param0->unk_BB10 = 0; param0->unk_BAF8 = 0; - param0->unk_BB00 = gCoreSys.touchX; - param0->unk_BB04 = gCoreSys.touchY; + param0->unk_BB00 = gSystem.touchX; + param0->unk_BB04 = gSystem.touchY; param0->unk_BB10 = 4; } } - if (gCoreSys.touchHeld) { + if (gSystem.touchHeld) { switch (param0->unk_BAFC) { case 0: if (!param0->unk_BB10) { @@ -851,8 +850,8 @@ static void ov92_021D1700(UnkStruct_ov92_021D1B24 *param0) param0->unk_BAF8 = v0 | v2; param0->unk_BB08 = v1; param0->unk_BB0C = v3; - param0->unk_BB00 = gCoreSys.touchX; - param0->unk_BB04 = gCoreSys.touchY; + param0->unk_BB00 = gSystem.touchX; + param0->unk_BB04 = gSystem.touchY; break; } } else { @@ -874,8 +873,8 @@ static void ov92_021D1818(int param0, int param1, int *param2, int *param3, int int v2 = 0; int v3 = 0; - if (gCoreSys.touchX != 0xffff) { - v2 = gCoreSys.touchX - param0; + if (gSystem.touchX != 0xffff) { + v2 = gSystem.touchX - param0; if (v2 < 0) { v2 ^= -1; @@ -891,8 +890,8 @@ static void ov92_021D1818(int param0, int param1, int *param2, int *param3, int *param2 = v0; *param3 = v2; - if (gCoreSys.touchY != 0xffff) { - v3 = gCoreSys.touchY - param1; + if (gSystem.touchY != 0xffff) { + v3 = gSystem.touchY - param1; if (v3 < 0) { v3 ^= -1; @@ -1000,7 +999,7 @@ static BOOL ov92_021D1B70(UnkStruct_ov92_021D1B24 *param0, u32 param1, int param } break; case 2: - if ((param2 != 0) || (gCoreSys.pressedKeys & PAD_BUTTON_A)) { + if ((param2 != 0) || (gSystem.pressedKeys & PAD_BUTTON_A)) { param0->unk_B864 = 0; v0 = 1; } diff --git a/src/overlay093/ov93_021D0D80.c b/src/overlay093/ov93_021D0D80.c index da1f640959..4730316f6c 100644 --- a/src/overlay093/ov93_021D0D80.c +++ b/src/overlay093/ov93_021D0D80.c @@ -14,9 +14,9 @@ #include "heap.h" #include "narc.h" #include "overlay_manager.h" +#include "system.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0202419C.h" #include "unk_0208C098.h" diff --git a/src/overlay093/ov93_021D111C.c b/src/overlay093/ov93_021D111C.c index 7b50bcb89d..a4a2aab5ca 100644 --- a/src/overlay093/ov93_021D111C.c +++ b/src/overlay093/ov93_021D111C.c @@ -14,9 +14,9 @@ #include "heap.h" #include "narc.h" #include "overlay_manager.h" +#include "system.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0202419C.h" #include "unk_0208C098.h" diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 519dcb2ded..3f3586cdbc 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -41,10 +41,10 @@ #include "sprite_transfer.h" #include "sprite_util.h" #include "string_template.h" +#include "system.h" #include "trainer_info.h" #include "unk_020041CC.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_02033200.h" #include "unk_020797C8.h" #include "unk_02099550.h" diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index 666660fa3b..093c24cd66 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -11,7 +11,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -21,6 +20,7 @@ #include "narc.h" #include "render_window.h" #include "strbuf.h" +#include "system.h" #include "text.h" #include "trainer_info.h" #include "unk_020041CC.h" @@ -422,11 +422,11 @@ static int ov94_0223CBEC(UnkStruct_ov94_0223FD4C *param0) static int ov94_0223CC28(UnkStruct_ov94_0223FD4C *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { ov94_0223CFD8(param0, 7, ov94_0223C4D4(param0), 0, 0xf0f); ov94_0223C3F4(param0, 10, 12); CellActor_SetAnimateFlag(param0->unk_E20, 0); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { switch (param0->unk_10C) { case 0: if (param0->unk_36 == 0) { @@ -461,13 +461,13 @@ static int ov94_0223CC28(UnkStruct_ov94_0223FD4C *param0) Sound_PlayEffect(1500); break; } - } else if (gCoreSys.pressedKeys & PAD_KEY_UP) { + } else if (gSystem.pressedKeys & PAD_KEY_UP) { if (param0->unk_10C != 0) { param0->unk_10C--; Sound_PlayEffect(1500); ov94_0223C3FC(param0->unk_E20, Unk_ov94_02245A48[param0->unk_10C][0], Unk_ov94_02245A48[param0->unk_10C][1]); } - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { if (param0->unk_10C < 2) { param0->unk_10C++; Sound_PlayEffect(1500); diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index 20e4e1d47f..239458bc0a 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -16,7 +16,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -32,6 +31,7 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200F174.h" @@ -350,11 +350,11 @@ static int ov94_0223D5B0(UnkStruct_ov94_0223FD4C *param0) static int ov94_0223D5B8(UnkStruct_ov94_0223FD4C *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { ov94_0223D88C(param0, 5, TEXT_SPEED_FAST, 0, 0xf0f, (Pokemon *)param0->unk_12C.unk_00.unk_00); ov94_0223C3F4(param0, 3, 7); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { param0->unk_2C = 2; ov94_0223C4C0(param0, 1, 0); Sound_PlayEffect(1500); diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index e20a3d89d9..8f3ce03c2f 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -15,7 +15,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -26,6 +25,7 @@ #include "render_window.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200F174.h" @@ -322,22 +322,22 @@ static int ov94_0223E09C(UnkStruct_ov94_0223FD4C *param0) static int ov94_0223E0A4(UnkStruct_ov94_0223FD4C *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { ov94_0223E300(param0, 16, TEXT_SPEED_FAST, 0, 0xf0f); ov94_0223C3F4(param0, 3, 4); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { param0->unk_2C = 2; ov94_0223C4C0(param0, 4, 0); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { if (param0->unk_10E == 0) { param0->unk_10E = 1; param0->unk_2C = 6; Sound_PlayEffect(1500); } - } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeys & PAD_KEY_LEFT) { if (param0->unk_10E != 0) { param0->unk_10E = 0; param0->unk_2C = 6; diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index 27e284b07f..ee0ae749f3 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -17,7 +17,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -31,6 +30,7 @@ #include "render_window.h" #include "strbuf.h" #include "string_list.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200F174.h" @@ -409,7 +409,7 @@ static int ov94_0223EA84(UnkStruct_ov94_0223FD4C *param0) { ov94_0223EFAC(param0); - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { int v0 = ov94_0223EF94(param0); switch (v0) { @@ -446,7 +446,7 @@ static int ov94_0223EA84(UnkStruct_ov94_0223FD4C *param0) Sound_PlayEffect(1500); break; } - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { ov94_0223F9A4(param0, 15, TEXT_SPEED_FAST, 0, 0xf0f); ov94_0223C3F4(param0, 23, 25); Sound_PlayEffect(1500); @@ -681,7 +681,7 @@ static void ov94_0223EFAC(UnkStruct_ov94_0223FD4C *param0) { int v0; - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { if (param0->unk_10E4->unk_24 == 0) { if (param0->unk_10E4->unk_28 > 0) { param0->unk_10E4->unk_28--; @@ -694,7 +694,7 @@ static void ov94_0223EFAC(UnkStruct_ov94_0223FD4C *param0) param0->unk_10E4->unk_2C = 0; } - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { if (param0->unk_10E4->unk_24 == 0) { if (param0->unk_10E4->unk_28 < 3) { param0->unk_10E4->unk_28++; @@ -707,13 +707,13 @@ static void ov94_0223EFAC(UnkStruct_ov94_0223FD4C *param0) param0->unk_10E4->unk_2C = 1; } - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { if (param0->unk_10E4->unk_24 != 1) { Sound_PlayEffect(1500); } param0->unk_10E4->unk_24 = 1; - } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeys & PAD_KEY_LEFT) { if (param0->unk_10E4->unk_24 != 0) { Sound_PlayEffect(1500); } diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 6f3b148f2d..b7a8305f5e 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -20,7 +20,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -37,6 +36,7 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200F174.h" @@ -543,11 +543,11 @@ static int ov94_022402BC(UnkStruct_ov94_0223FD4C *param0) ov94_022404F0(param0); if (param0->unk_24 == 5) { - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { ov94_0223C4C0(param0, 1, 0); param0->unk_2C = 2; Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { if (param0->unk_112 == 30) { ov94_0223C4C0(param0, 1, 0); param0->unk_2C = 2; @@ -576,11 +576,11 @@ static int ov94_022402BC(UnkStruct_ov94_0223FD4C *param0) } } } else if (param0->unk_24 == 6) { - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { ov94_0223C4C0(param0, 3, 0); param0->unk_2C = 2; Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { if (param0->unk_112 == 30) { ov94_0223C4C0(param0, 3, 0); param0->unk_2C = 2; @@ -622,13 +622,13 @@ static void ov94_022404F0(UnkStruct_ov94_0223FD4C *param0) { int v0 = 0, v1 = 0, v2 = 0; - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { v1 = 1; - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { v1 = 2; - } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeys & PAD_KEY_LEFT) { v1 = 3; - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { v1 = 4; } diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index b377ec5651..e9741322d3 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -23,7 +23,6 @@ #include "bg_window.h" #include "charcode_util.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -39,6 +38,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" @@ -527,7 +527,7 @@ static int ov94_0224195C(UnkStruct_ov94_0223FD4C *param0) static int ov94_02241990(UnkStruct_ov94_0223FD4C *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { ov94_0223C4C0(param0, 5, 5); param0->unk_2C = 2; } diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index ba76749334..f9b7febc40 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -10,7 +10,6 @@ #include "overlay094/struct_ov94_0223FD4C.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -22,6 +21,7 @@ #include "render_window.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "system_data.h" #include "text.h" #include "unk_0200F174.h" @@ -745,7 +745,7 @@ static int ov94_02245540(UnkStruct_ov94_0223FD4C *param0) static int ov94_02245564(UnkStruct_ov94_0223FD4C *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A || gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_A || gSystem.pressedKeys & PAD_BUTTON_B) { Window_EraseStandardFrame(¶m0->unk_F8C, 0); param0->unk_2C = 0; } diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index a195107b38..d4b48929fc 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -34,11 +34,11 @@ #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_0200F174.h" #include "unk_020131EC.h" -#include "unk_02017728.h" #include "unk_020393C8.h" struct UnkStruct_ov95_02247628_t { diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c index 1f4c106e6b..9585e9199d 100644 --- a/src/overlay095/ov95_02249740.c +++ b/src/overlay095/ov95_02249740.c @@ -22,9 +22,9 @@ #include "math.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_0202419C.h" enum { diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c index e0d9d66b0f..f422c458cf 100644 --- a/src/overlay095/ov95_0224A390.c +++ b/src/overlay095/ov95_0224A390.c @@ -22,9 +22,9 @@ #include "math.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_0202419C.h" #include "unk_020393C8.h" diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c index 0f20d1a25f..5c2f928fff 100644 --- a/src/overlay096/ov96_0223B6A0.c +++ b/src/overlay096/ov96_0223B6A0.c @@ -28,9 +28,9 @@ #include "sprite_transfer.h" #include "sprite_util.h" #include "string_template.h" +#include "system.h" #include "unk_020041CC.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_02033200.h" #include "unk_020393C8.h" #include "unk_02099550.h" diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index e25408f7ff..8f9e04279b 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -17,7 +17,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -30,6 +29,7 @@ #include "savedata.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "system_data.h" #include "text.h" #include "unk_02005474.h" @@ -881,7 +881,7 @@ static int ov96_0223CA28(UnkStruct_ov96_0223BF40 *param0) static int ov96_0223CA70(UnkStruct_ov96_0223BF40 *param0) { - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { param0->unk_98++; if (param0->unk_98 > param0->unk_94) { @@ -890,7 +890,7 @@ static int ov96_0223CA70(UnkStruct_ov96_0223BF40 *param0) ov96_0223D90C(¶m0->unk_E58, param0->unk_BE4, param0->unk_98, 3); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { param0->unk_98--; if (param0->unk_98 < 1) { @@ -899,7 +899,7 @@ static int ov96_0223CA70(UnkStruct_ov96_0223BF40 *param0) ov96_0223D90C(¶m0->unk_E58, param0->unk_BE4, param0->unk_98, 3); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { { RTCTime v0; RTCDate v1; @@ -915,7 +915,7 @@ static int ov96_0223CA70(UnkStruct_ov96_0223BF40 *param0) ov96_0223D950(param0, 0, 0); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { ov96_0223D950(param0, 0, 0); param0->unk_1C = 21; Sound_PlayEffect(1500); @@ -1146,7 +1146,7 @@ static int ov96_0223CF5C(UnkStruct_ov96_0223BF40 *param0) static int ov96_0223CFAC(UnkStruct_ov96_0223BF40 *param0) { - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { param0->unk_90++; if (param0->unk_90 > 10) { @@ -1155,7 +1155,7 @@ static int ov96_0223CFAC(UnkStruct_ov96_0223BF40 *param0) ov96_0223D90C(¶m0->unk_E48, param0->unk_BE8, param0->unk_90, 2); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { param0->unk_90--; if (param0->unk_90 < 1) { @@ -1164,11 +1164,11 @@ static int ov96_0223CFAC(UnkStruct_ov96_0223BF40 *param0) ov96_0223D90C(¶m0->unk_E48, param0->unk_BE8, param0->unk_90, 2); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { ov96_0223D950(param0, 0, 0); ov96_0223BBFC(param0, 11, 32); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { ov96_0223D950(param0, 0, 0); param0->unk_1C = 23; Sound_PlayEffect(1500); @@ -1201,7 +1201,7 @@ static int ov96_0223D0B0(UnkStruct_ov96_0223BF40 *param0) static int ov96_0223D100(UnkStruct_ov96_0223BF40 *param0) { - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { param0->unk_98++; if (param0->unk_98 == param0->unk_94 + 1) { @@ -1210,7 +1210,7 @@ static int ov96_0223D100(UnkStruct_ov96_0223BF40 *param0) ov96_0223D90C(¶m0->unk_E58, param0->unk_BE4, param0->unk_98, 3); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { param0->unk_98--; if (param0->unk_98 < 1) { @@ -1219,11 +1219,11 @@ static int ov96_0223D100(UnkStruct_ov96_0223BF40 *param0) ov96_0223D90C(¶m0->unk_E58, param0->unk_BE4, param0->unk_98, 3); Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { ov96_0223D950(param0, 0, 0); param0->unk_1C = 35; Sound_PlayEffect(1500); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { ov96_0223D950(param0, 0, 0); param0->unk_1C = 29; Sound_PlayEffect(1500); @@ -1580,7 +1580,7 @@ static int ov96_0223D7B8(UnkStruct_ov96_0223BF40 *param0) static int ov96_0223D7E4(UnkStruct_ov96_0223BF40 *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A || gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_A || gSystem.pressedKeys & PAD_BUTTON_B) { Window_EraseStandardFrame(¶m0->unk_E78, 0); param0->unk_1C = 0; } diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 893cc71ddb..4a2a4066f4 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -16,7 +16,6 @@ #include "bg_window.h" #include "boot.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_start.h" #include "graphics.h" @@ -34,13 +33,13 @@ #include "savedata.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "system_data.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_0202DAB4.h" #include "unk_020366A0.h" #include "unk_0209A74C.h" @@ -192,7 +191,7 @@ static BOOL ov97_0222AE64(UnkStruct_0222AE60 *param0) } } } else { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); Window_EraseStandardFrame(¶m0->unk_158, 0); Window_Remove(¶m0->unk_158); @@ -377,10 +376,10 @@ static BOOL ov97_0222B07C(UnkStruct_0222AE60 *param0) if (param0->unk_134) { param0->unk_134--; } else { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Window_Remove(¶m0->unk_13C); param0->unk_12C = 19; - param0->unk_138 = gCoreSys.pressedKeys; + param0->unk_138 = gSystem.pressedKeys; Sound_PlayEffect(1500); } } @@ -1064,8 +1063,8 @@ static int ov97_0222BE24(OverlayManager *param0, int *param1) v1->unk_124 = 10; break; case 5: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); v1->unk_58 = v1->unk_DC[v1->unk_54]; @@ -1108,11 +1107,11 @@ static int ov97_0222BE24(OverlayManager *param0, int *param1) break; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { ov97_0222BB88(v1, -1); } - if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + if (gSystem.pressedKeys & PAD_KEY_DOWN) { ov97_0222BB88(v1, 1); } diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 61d0f9fa10..a50319b5c8 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -18,7 +18,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "enums.h" #include "font.h" #include "game_options.h" @@ -36,6 +35,7 @@ #include "savedata.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "trainer_info.h" #include "unk_020041CC.h" @@ -574,7 +574,7 @@ static BOOL ov97_0222C404(UnkStruct_ov97_0222C388 *param0) ov97_0223795C(param0->unk_04, &v0, 5, 4, 2); return 1; } else { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Window_EraseStandardFrame(¶m0->unk_18, 0); Window_Remove(¶m0->unk_18); return 0; @@ -732,7 +732,7 @@ static int ov97_0222C78C(OverlayManager *param0, int *param1) } break; case UnkEnum_ov97_0222C78C_03: - if ((Text_IsPrinterActive(v0->unk_317C) == 0) && gCoreSys.pressedKeys & PAD_BUTTON_A) { + if ((Text_IsPrinterActive(v0->unk_317C) == 0) && gSystem.pressedKeys & PAD_BUTTON_A) { ov97_02237784(1); ov97_02237790(0, UnkEnum_ov97_0222C78C_12, param1, UnkEnum_ov97_0222C78C_13); } @@ -759,7 +759,7 @@ static int ov97_0222C78C(OverlayManager *param0, int *param1) v0->unk_3180.unk_104.unk_4E_2 = 0; break; case UnkEnum_ov97_0222C78C_06: - if (gCoreSys.pressedKeys) { + if (gSystem.pressedKeys) { ov97_02237790(0, UnkEnum_ov97_0222C78C_11, param1, UnkEnum_ov97_0222C78C_13); } break; @@ -859,7 +859,7 @@ static int ov97_0222CAB4(UnkStruct_ov97_0222C388 *param0, int *param1, int param } } - if (param3 && gCoreSys.pressedKeys & param3) { + if (param3 && gSystem.pressedKeys & param3) { ov97_022333BC(); *param1 = UnkEnum_ov97_0222C6F8_26; return 1; @@ -939,7 +939,7 @@ int ov97_0222CB10(UnkStruct_ov97_0222C388 *param0) *v3 = UnkEnum_ov97_0222C6F8_30; break; case UnkEnum_ov97_0222C6F8_30: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { *v3 = UnkEnum_ov97_0222C6F8_08; } @@ -1077,7 +1077,7 @@ int ov97_0222CB10(UnkStruct_ov97_0222C388 *param0) param0->unk_148 = 0; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { *v3 = UnkEnum_ov97_0222C6F8_27; return 4; } @@ -1104,7 +1104,7 @@ int ov97_0222CB10(UnkStruct_ov97_0222C388 *param0) param0->unk_148 = 0; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { OS_ResetSystem(0); } } diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index 23f587d510..2956d5e659 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -23,7 +23,6 @@ #include "bg_window.h" #include "cell_actor.h" #include "communication_system.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -48,12 +47,12 @@ #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "system_data.h" #include "text.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0202DAB4.h" #include "unk_02033200.h" #include "unk_020363E8.h" @@ -2141,7 +2140,7 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) *param1 = 8; } - if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || (--v3->unk_434 == 0)) { + if ((gSystem.pressedKeys & PAD_BUTTON_B) || (--v3->unk_434 == 0)) { ov97_0222D30C(v3, 0); ov97_0222D2DC(); sub_02039794(); @@ -2173,7 +2172,7 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) break; } - if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || (--v3->unk_434 == 0)) { + if ((gSystem.pressedKeys & PAD_BUTTON_B) || (--v3->unk_434 == 0)) { ov97_0222D2DC(); sub_02039794(); ov97_0222D40C(v3, -1); @@ -2188,7 +2187,7 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) v1 = CommSys_CurNetId(); - if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || (--v3->unk_434 == 0) || ((v1 != 0) && (CommSys_IsPlayerConnected(v1) == 0))) { + if ((gSystem.pressedKeys & PAD_BUTTON_B) || (--v3->unk_434 == 0) || ((v1 != 0) && (CommSys_IsPlayerConnected(v1) == 0))) { ov97_0222D30C(v3, 0); ov97_0222D2DC(); sub_02039794(); @@ -2273,7 +2272,7 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) *param1 = 18; break; case 18: - if (gCoreSys.pressedKeys) { + if (gSystem.pressedKeys) { Sound_PlayEffect(1500); ov97_0222DDD0(param0, (((1 + (18 + 12)) + 9) + 26 * 6), 0); *param1 = 3; @@ -2362,7 +2361,7 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) *param1 = ov97_0222E228(param0, NULL, NULL, *param1); break; case 51: - if (gCoreSys.pressedKeys) { + if (gSystem.pressedKeys) { ov97_0222D444(&v3->unk_58, 0); *param1 = ov97_0222DA64(param0); } @@ -2383,7 +2382,7 @@ static int ov97_0222F75C(OverlayManager *param0, int *param1) return 1; break; case 55: - if (gCoreSys.pressedKeys) { + if (gSystem.pressedKeys) { Sound_PlayEffect(1500); if (v3->unk_8C.unk_00.unk_4E_2 == 1) { @@ -2566,7 +2565,7 @@ static void ov97_022302F4(UnkStruct_ov97_0222D04C *param0) break; } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { switch (Unk_ov97_0223F1A8) { case 40: case 41: diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index ded33649ec..cdd3b7a77a 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -17,7 +17,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" @@ -39,6 +38,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" @@ -980,11 +980,11 @@ static void ov97_022314FC(UnkStruct_ov97_02230868 *param0, int param1, int *para int v0; int v1 = param0->unk_3E10; - if (gCoreSys.pressedKeys & PAD_KEY_RIGHT && (param0->unk_3E10 != 1)) { + if (gSystem.pressedKeys & PAD_KEY_RIGHT && (param0->unk_3E10 != 1)) { param0->unk_3E10 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_LEFT && (param0->unk_3E10 != 0)) { + if (gSystem.pressedKeys & PAD_KEY_LEFT && (param0->unk_3E10 != 0)) { param0->unk_3E10 = 0; } @@ -995,13 +995,13 @@ static void ov97_022314FC(UnkStruct_ov97_02230868 *param0, int param1, int *para v0 = 0; - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { v0 = 2; - } else if ((gCoreSys.pressedKeys & PAD_BUTTON_A) && param1 && (param0->unk_3E10 == 0)) { + } else if ((gSystem.pressedKeys & PAD_BUTTON_A) && param1 && (param0->unk_3E10 == 0)) { v0 = 1; - } else if ((gCoreSys.pressedKeys & PAD_BUTTON_A) && (param0->unk_3E10 == 1)) { + } else if ((gSystem.pressedKeys & PAD_BUTTON_A) && (param0->unk_3E10 == 1)) { v0 = 2; - } else if ((gCoreSys.pressedKeys & PAD_BUTTON_A) && (param1 == 0)) { + } else if ((gSystem.pressedKeys & PAD_BUTTON_A) && (param1 == 0)) { v0 = 3; } @@ -1063,14 +1063,14 @@ static int ov97_0223161C(OverlayManager *param0, int *param1) case 3: v0 = v4->unk_2C20; - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { v0 = ov97_02230F20(v4, v4->unk_2C20, -1); - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { v0 = ov97_02230F20(v4, v4->unk_2C20, 1); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); ov97_02230C10(v4, 0, 28, param1); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); *param1 = 4; } @@ -1089,7 +1089,7 @@ static int ov97_0223161C(OverlayManager *param0, int *param1) case 5: ov97_02231088(param0, param1, NULL); - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); *param1 = 11; } @@ -1112,7 +1112,7 @@ static int ov97_0223161C(OverlayManager *param0, int *param1) case 8: ov97_02231354(v4); - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1536); ov97_022312B4(v4, 1, 1 * FX32_ONE, 0.025 * FX32_ONE); *param1 = 9; @@ -1230,7 +1230,7 @@ static int ov97_0223161C(OverlayManager *param0, int *param1) } break; case 25: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { *param1 = 19; } break; diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 14f2ebdef6..f5f7fa3ea6 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -22,7 +22,6 @@ #include "bg_window.h" #include "cell_actor.h" #include "char_transfer.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -46,6 +45,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" @@ -53,7 +53,6 @@ #include "unk_02005474.h" #include "unk_0200F174.h" #include "unk_02015920.h" -#include "unk_02017728.h" #include "unk_0202EEC0.h" #include "unk_0209A74C.h" #include "vram_transfer.h" @@ -702,7 +701,7 @@ static void ov97_022343A8(UnkStruct_ov97_02234A2C *param0) v1 = ov97_02234124(param0, param0->unk_E8E4, v0); v2 = ov97_02234148(param0, param0->unk_E8E4, v0); v5 = ov97_0223416C(param0, param0->unk_E8E4, v0); - v3 = gCoreSys.gbaCartridgeVersion; + v3 = gSystem.gbaCartridgeVersion; v4 = GBASpeciesToDSFormId(ov97_02236DD0(v1), v5, v3); ov97_022342E4(v1, v2, v4, v0, param0->unk_20C[v0].unk_00, v6, v7); @@ -1394,7 +1393,7 @@ static void ov97_02234DFC(UnkStruct_ov97_02234A2C *param0) GXLayers_SetBanks(&v0); ov97_02234D28(param0->unk_20); - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); Text_ResetAllPrinters(); @@ -1469,7 +1468,7 @@ static void ov97_02234F88(UnkStruct_ov97_02234A2C *param0) v1 = ov97_02234124(param0, param0->unk_42C[v0].unk_08, param0->unk_42C[v0].unk_04); v2 = ov97_02234148(param0, param0->unk_42C[v0].unk_08, param0->unk_42C[v0].unk_04); v4 = ov97_0223416C(param0, param0->unk_42C[v0].unk_08, param0->unk_42C[v0].unk_04); - v3 = gCoreSys.gbaCartridgeVersion; + v3 = gSystem.gbaCartridgeVersion; ov97_02234278(v1, v2, v4, v3, v0, param0->unk_478[v0]); } @@ -1573,7 +1572,7 @@ static void ov97_022351F0(UnkStruct_ov97_02234A2C *param0) PlttTransfer_Free(); sub_02015938(param0->unk_E8EC); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); Bg_FreeTilemapBuffer(param0->unk_20, 0); @@ -1751,7 +1750,7 @@ static BOOL ov97_02235590(UnkStruct_ov97_02234A2C *param0, int param1) return 1; } } else { - if (gCoreSys.touchPressed || gCoreSys.pressedKeys) { + if (gSystem.touchPressed || gSystem.pressedKeys) { RenderControlFlags_SetSpeedUpOnTouch(0); Sound_PlayEffect(1500); return 1; @@ -1912,7 +1911,7 @@ static int ov97_022356E8(OverlayManager *param0, int *param1) } break; case 7: - if (gCoreSys.touchPressed || gCoreSys.pressedKeys) { + if (gSystem.touchPressed || gSystem.pressedKeys) { ov97_02234CC4(v3, 0, 12, param1); } break; @@ -2104,7 +2103,7 @@ static int ov97_022356E8(OverlayManager *param0, int *param1) } break; case 22: - if (gCoreSys.touchPressed || gCoreSys.pressedKeys) { + if (gSystem.touchPressed || gSystem.pressedKeys) { ov97_02234CF4(v3, 0, 24, param1); Sound_PlayEffect(1500); } diff --git a/src/overlay097/ov97_02236380.c b/src/overlay097/ov97_02236380.c index 625a4ba22b..681943439f 100644 --- a/src/overlay097/ov97_02236380.c +++ b/src/overlay097/ov97_02236380.c @@ -10,9 +10,9 @@ #include "overlay097/box_pokemon_gba.h" #include "overlay097/ov97_022392E4.h" -#include "core_sys.h" #include "item.h" #include "pokemon.h" +#include "system.h" typedef struct { u16 unk_00; @@ -1566,7 +1566,7 @@ void BoxMonGBAToBoxMon(BoxPokemonGBA *param0, BoxPokemon *param1) } if (BoxPokemon_GetValue(param1, MON_DATA_SPECIES, NULL) == SPECIES_DEOXYS) { - switch (gCoreSys.gbaCartridgeVersion) { + switch (gSystem.gbaCartridgeVersion) { default: case RUBY: case SAPPHIRE: diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 445b4d9dce..8238fe54bc 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -38,11 +38,11 @@ #include "sprite_util.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200F174.h" #include "unk_020131EC.h" -#include "unk_02017728.h" #include "unk_02033200.h" #include "vram_transfer.h" diff --git a/src/overlay097/ov97_02238D74.c b/src/overlay097/ov97_02238D74.c index 56e10e7709..fba3d4382d 100644 --- a/src/overlay097/ov97_02238D74.c +++ b/src/overlay097/ov97_02238D74.c @@ -6,9 +6,9 @@ #include "overlay097/ov97_0222D30C.h" #include "overlay097/struct_ov97_0222D04C.h" -#include "core_sys.h" #include "heap.h" #include "overlay_manager.h" +#include "system.h" #include "unk_02033200.h" #include "unk_020366A0.h" #include "unk_020393C8.h" @@ -234,7 +234,7 @@ int ov97_02238EAC(OverlayManager *param0, int *param1) } } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { v2->unk_26D8 = 1; } break; @@ -259,7 +259,7 @@ int ov97_02238EAC(OverlayManager *param0, int *param1) *param1 = 4109; } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { DWC_NASLoginAbort(); } break; @@ -315,7 +315,7 @@ int ov97_02238EAC(OverlayManager *param0, int *param1) break; case 4107: if (Unk_ov97_02240400 == 0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { ov97_02238E44(v2, 3, param1, 4108, 4108); } else { if (DWC_NdGetProgress(&v2->unk_26BC, &v2->unk_26C0) == 1) { @@ -366,7 +366,7 @@ int ov97_02238EAC(OverlayManager *param0, int *param1) *param1 = 4112; break; case 4112: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { v2->unk_26DC = NULL; DWC_ClearError(); ov97_02238E94(); @@ -383,7 +383,7 @@ int ov97_02238EAC(OverlayManager *param0, int *param1) } else { *param1 = v2->unk_16B0; } - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { v2->unk_26D8 = 1; } break; @@ -391,7 +391,7 @@ int ov97_02238EAC(OverlayManager *param0, int *param1) if (Unk_ov97_02240404 == 1) { Unk_ov97_02240404 = 0; *param1 = v2->unk_16B0; - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { v2->unk_26D8 = 1; } diff --git a/src/overlay098/ov98_02246C20.c b/src/overlay098/ov98_02246C20.c index 49e596947f..188210eff5 100644 --- a/src/overlay098/ov98_02246C20.c +++ b/src/overlay098/ov98_02246C20.c @@ -21,9 +21,9 @@ #include "overlay_manager.h" #include "save_player.h" #include "strbuf.h" +#include "system.h" #include "system_flags.h" #include "unk_020041CC.h" -#include "unk_02017728.h" #include "unk_02030CE8.h" #include "unk_02033200.h" #include "unk_02038FFC.h" diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index faad58968d..de4183c9c9 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -16,7 +16,7 @@ #include "bg_window.h" #include "colored_arrow.h" -#include "core_sys.h" +#include "system.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -40,7 +40,7 @@ #include "unk_02005474.h" #include "render_oam.h" #include "unk_0200F174.h" -#include "unk_02017728.h" +#include "system.h" #include "vram_transfer.h" #include "unk_0201E3D8.h" #include "unk_0202ACE0.h" @@ -351,7 +351,7 @@ int ov98_022471C8 (OverlayManager * param0, int * param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); RenderControlFlags_SetCanABSpeedUpPrint(1); @@ -1143,7 +1143,7 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) str r1, [r0, #0] b _02248670 _022484B8: - ldr r1, = gCoreSys + ldr r1, = gSystem add r0, #0xac ldr r2, [r1, #0x4c] ldr r4, [r0, #0] @@ -1230,7 +1230,7 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) bl ov98_022482CC b _02248670 _02248566: - ldr r1, = gCoreSys + ldr r1, = gSystem mov r2, #0x10 ldr r1, [r1, #0x48] tst r2, r1 @@ -2192,7 +2192,7 @@ static int ov98_02249414 (UnkStruct_ov98_02247704 * param0) static int ov98_02249438 (UnkStruct_ov98_02247704 * param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A || gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_A || gSystem.pressedKeys & PAD_BUTTON_B) { Window_EraseStandardFrame(¶m0->unk_68, 0); param0->unk_08 = 0; } diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index dbeebeb4e4..f4b5b1ffc5 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -17,7 +17,6 @@ #include "bg_window.h" #include "camera.h" -#include "core_sys.h" #include "easy3d_object.h" #include "enums.h" #include "gx_layers.h" @@ -29,11 +28,11 @@ #include "sprite_util.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "unk_020041CC.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" #include "unk_02024220.h" @@ -159,7 +158,7 @@ int ov99_021D0D80(OverlayManager *param0, int *param1) GX_SetVisibleWnd(GX_WNDMASK_W0); GXS_SetVisibleWnd(GX_WNDMASK_W0); - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); GXLayers_TurnBothDispOn(); @@ -190,7 +189,7 @@ int ov99_021D1028(OverlayManager *param0, int *param1) v0->unk_1110 = ov99_021D3F6C(v0->unk_110C, 1); } - if (v0->unk_00->unk_04 && (gCoreSys.pressedKeys & PAD_BUTTON_START)) { + if (v0->unk_00->unk_04 && (gSystem.pressedKeys & PAD_BUTTON_START)) { if ((v0->unk_1100 == 0) && (v0->unk_1101 < 6)) { StartScreenTransition(0, 0, 0, 0x0, 6, 1, 75); v0->unk_1100 = 1; diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index 3ab7356962..32ccbe2bce 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -20,7 +20,6 @@ #include "overlay099/struct_ov99_021D3A40.h" #include "bg_window.h" -#include "core_sys.h" #include "easy3d_object.h" #include "font.h" #include "graphics.h" @@ -29,6 +28,7 @@ #include "message.h" #include "palette.h" #include "strbuf.h" +#include "system.h" #include "text.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" @@ -1061,7 +1061,7 @@ static void ov99_021D2AAC(UnkStruct_ov99_021D2CB0 *param0) { BgConfig *v0 = param0->unk_08; - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); PaletteData_FillBufferRange(param0->unk_0C, 0, 2, 0x0, 0, 1); diff --git a/src/overlay099/ov99_021D3DE0.c b/src/overlay099/ov99_021D3DE0.c index 388e82f12d..49b110640f 100644 --- a/src/overlay099/ov99_021D3DE0.c +++ b/src/overlay099/ov99_021D3DE0.c @@ -7,7 +7,7 @@ #include "overlay099/struct_ov99_021D3A40.h" #include "overlay099/struct_ov99_021D3DE0.h" -#include "core_sys.h" +#include "system.h" #include "unk_0200F174.h" BOOL ov99_021D3DE0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1) @@ -21,7 +21,7 @@ BOOL ov99_021D3DE0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *par break; case 1: if (IsScreenTransitionDone() == 1) { - if ((param0->unk_10FC > 10080) || (gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.pressedKeys & PAD_BUTTON_START)) { + if ((param0->unk_10FC > 10080) || (gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.pressedKeys & PAD_BUTTON_START)) { StartScreenTransition(0, 0, 0, 0x0, 45, 1, 75); param1->unk_00++; } diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index 84ccf3e245..170e9e0ea1 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -17,7 +17,6 @@ #include "bg_window.h" #include "camera.h" -#include "core_sys.h" #include "game_options.h" #include "gx_layers.h" #include "heap.h" @@ -26,10 +25,10 @@ #include "overlay_manager.h" #include "palette.h" #include "render_window.h" +#include "system.h" #include "unk_020041CC.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_02024220.h" #include "vram_transfer.h" @@ -149,7 +148,7 @@ int ov100_021D0F44(OverlayManager *param0, int *param1) Window_Remove(&v0->unk_0C.unk_30); ov100_021D111C(&v0->unk_0C); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); OverlayManager_FreeData(param0); diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 218f8035f7..20de4b69b9 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -14,7 +14,6 @@ #include "bg_window.h" #include "camera.h" -#include "core_sys.h" #include "easy3d_object.h" #include "game_options.h" #include "gx_layers.h" @@ -24,6 +23,7 @@ #include "render_window.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "trainer_info.h" @@ -336,7 +336,7 @@ void ov100_021D4C94(UnkStruct_ov100_021D46C8 *param0, int param1) void ov100_021D4DC8(int param0) { - gCoreSys.unk_65 = param0; + gSystem.unk_65 = param0; GXLayers_SwapDisplay(); } diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 650167a6cc..e4a6fb2d90 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -32,11 +32,11 @@ #include "string_template.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_0200F174.h" -#include "unk_02017728.h" #include "unk_020711EC.h" #include "vram_transfer.h" diff --git a/src/overlay101/ov101_021D1A28.c b/src/overlay101/ov101_021D1A28.c index 4d77e7ffe3..4286b46f4e 100644 --- a/src/overlay101/ov101_021D1A28.c +++ b/src/overlay101/ov101_021D1A28.c @@ -33,12 +33,12 @@ #include "overlay101/struct_ov101_021D9AE4.h" #include "bg_window.h" -#include "core_sys.h" #include "enums.h" #include "heap.h" #include "math.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "unk_02005474.h" #include "unk_020711EC.h" @@ -377,7 +377,7 @@ static int ov101_021D1C9C(UnkStruct_ov101_021D13C8 *param0) static int ov101_021D1CBC(UnkStruct_ov101_021D13C8 *param0) { - u32 v0 = gCoreSys.pressedKeys; + u32 v0 = gSystem.pressedKeys; if ((param0->unk_7C[0] == 1) && (v0 & PAD_BUTTON_Y)) { param0->unk_7C[0] = 2; @@ -814,7 +814,7 @@ static int ov101_021D22D0(UnkStruct_ov101_021D13C8 *param0) static int ov101_021D22F0(UnkStruct_ov101_021D13C8 *param0) { - u32 v0 = gCoreSys.pressedKeys; + u32 v0 = gSystem.pressedKeys; if ((param0->unk_7C[0] == 1) && (v0 & PAD_BUTTON_Y)) { param0->unk_7C[0] = 2; @@ -1181,7 +1181,7 @@ static int ov101_021D2828(UnkStruct_ov101_021D13C8 *param0) static int ov101_021D2850(UnkStruct_ov101_021D13C8 *param0) { - u32 v0 = gCoreSys.pressedKeys; + u32 v0 = gSystem.pressedKeys; if ((param0->unk_7C[0] == 1) && (v0 & PAD_BUTTON_Y)) { param0->unk_7C[0] = 2; @@ -3144,7 +3144,7 @@ static void ov101_021D4614(SysTask *param0, void *param1) v0 = 0x3; - if (gCoreSys.heldKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y)) { + if (gSystem.heldKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y)) { v0 = 0x1; } @@ -4383,7 +4383,7 @@ UnkEnum_ov101_021D9688 ov101_021D55D4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ static int ov101_021D55F8(u32 param0) { - u32 v0 = gCoreSys.pressedKeys & param0; + u32 v0 = gSystem.pressedKeys & param0; if (v0 == param0) { return 2; diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index e096e311e1..cbae7c7f7f 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -7,7 +7,6 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "graphics.h" #include "gx_layers.h" @@ -18,10 +17,10 @@ #include "savedata.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "trainer_info.h" #include "unk_0200F174.h" -#include "unk_02017728.h" typedef struct { int unk_00; @@ -141,7 +140,7 @@ int ov102_021D0E2C(OverlayManager *param0, int *param1) } break; case 4: - if (((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gCoreSys.pressedKeys & PAD_BUTTON_B) == PAD_BUTTON_B) || (gCoreSys.touchPressed)) { + if (((gSystem.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gSystem.pressedKeys & PAD_BUTTON_B) == PAD_BUTTON_B) || (gSystem.touchPressed)) { StartScreenTransition(0, 0, 0, 0x0, 6, 1, v0->unk_00); *param1 = 5; } diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index cdc128e7b5..0457a23f81 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -60,7 +60,6 @@ #include "bg_window.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "enums.h" #include "field_battle_data_transfer.h" #include "field_comm_manager.h" @@ -80,6 +79,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" @@ -87,7 +87,6 @@ #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02014000.h" -#include "unk_02017728.h" #include "unk_0202ACE0.h" #include "unk_0202D05C.h" #include "unk_0202F1D4.h" @@ -2009,7 +2008,7 @@ static BOOL ov104_02231068(UnkStruct_ov104_0222E930 *param0) static BOOL ov104_02231078(UnkStruct_ov104_0222E930 *param0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; } @@ -2025,7 +2024,7 @@ static BOOL ov104_02231090(UnkStruct_ov104_0222E930 *param0) static BOOL ov104_022310B0(UnkStruct_ov104_0222E930 *param0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; } diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index 4c18024474..a43808d044 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -30,7 +30,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "heap.h" @@ -50,6 +49,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_0200C6E4.h" @@ -407,7 +407,7 @@ static void ov104_022324C8(SysTask *param0, void *param1) v0 = Menu_ProcessInput(v1->unk_B0); - 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)) { ov104_022325D8(v1); } @@ -640,7 +640,7 @@ static void ov104_0223296C(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)) { ov104_02232B2C(v2); } diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index b67c070367..2a4eea7c8a 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -50,10 +50,10 @@ #include "sprite_util.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "trainer_info.h" #include "unk_020041CC.h" #include "unk_0200C6E4.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" #include "unk_02024220.h" diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 9ddf626886..60432a7d8c 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -28,7 +28,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 "game_overlay.h" @@ -50,12 +49,12 @@ #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" #include "unk_0200762C.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_02024220.h" #include "unk_020363E8.h" #include "unk_020393C8.h" @@ -894,19 +893,19 @@ static BOOL ov105_022426E0(UnkStruct_ov105_02241FF4 *param0) case 1: ov105_02246080(param0->unk_30C); - if (gCoreSys.pressedKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT)) { + if (gSystem.pressedKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT)) { Sound_PlayEffect(1500); ov105_022453F8(param0, param0->unk_11, ov105_022461A0(param0->unk_30C), 0, param0->unk_31C); } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); ov105_022461A4(param0->unk_30C, 1); ov105_02244DF0(param0); param0->unk_310 = ov105_02245FB8(¶m0->unk_144, (NELEMS(Unk_ov105_02246308)), (NELEMS(Unk_ov105_02246308)), 1, 0, Unk_ov105_02246308, NULL); param0->unk_08++; - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { if (param0->unk_11 > 0) { Sound_PlayEffect(1500); ov105_0224296C(param0); @@ -1425,12 +1424,12 @@ static BOOL ov105_022434BC(UnkStruct_ov105_02241FF4 *param0) case 1: ov105_02246080(param0->unk_30C); - if (gCoreSys.pressedKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT | PAD_KEY_UP | PAD_KEY_DOWN)) { + if (gSystem.pressedKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT | PAD_KEY_UP | PAD_KEY_DOWN)) { Sound_PlayEffect(1500); ov105_022453F8(param0, param0->unk_11, ov105_022461A0(param0->unk_30C), 1, param0->unk_31C); } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); if (ov105_022461A0(param0->unk_30C) == (param0->unk_1A - 1)) { @@ -1443,7 +1442,7 @@ static BOOL ov105_022434BC(UnkStruct_ov105_02241FF4 *param0) param0->unk_310 = ov105_02245FB8(¶m0->unk_144, (NELEMS(Unk_ov105_02246308)), (NELEMS(Unk_ov105_02246308)), 1, 0, Unk_ov105_02246308, NULL); param0->unk_08++; } - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); ov105_02245528(param0, 1); return 1; @@ -1641,17 +1640,17 @@ static BOOL ov105_02243A3C(UnkStruct_ov105_02241FF4 *param0) case 1: ov105_02246080(param0->unk_30C); - if (gCoreSys.pressedKeys & (PAD_KEY_UP | PAD_KEY_DOWN)) { + if (gSystem.pressedKeys & (PAD_KEY_UP | PAD_KEY_DOWN)) { Sound_PlayEffect(1500); ov105_022453F8(param0, 0, ov105_022461A0(param0->unk_30C), 0, param0->unk_320); } - if (gCoreSys.pressedKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT)) { + if (gSystem.pressedKeys & (PAD_KEY_LEFT | PAD_KEY_RIGHT)) { Sound_PlayEffect(1500); ov105_022453F8(param0, 0, ov105_022461A0(param0->unk_30C), 0, param0->unk_320); } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); if (ov105_022461A0(param0->unk_30C) == (param0->unk_1B - 1)) { @@ -1668,7 +1667,7 @@ static BOOL ov105_02243A3C(UnkStruct_ov105_02241FF4 *param0) param0->unk_10 = ov105_02244D14(param0, 14); param0->unk_08++; } - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); ov105_02245528(param0, 1); return 1; diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c index 7249bd9398..fe0b6d0f24 100644 --- a/src/overlay105/ov105_02245FB8.c +++ b/src/overlay105/ov105_02245FB8.c @@ -9,8 +9,8 @@ #include "overlay105/struct_ov105_02246394.h" #include "cell_actor.h" -#include "core_sys.h" #include "heap.h" +#include "system.h" struct UnkStruct_ov105_02246060_t { u8 unk_00; @@ -86,24 +86,24 @@ void ov105_02246080(UnkStruct_ov105_02246060 *param0) return; } - if (gCoreSys.pressedKeys == 0) { + if (gSystem.pressedKeys == 0) { return; } if (param0->unk_01 == 2) { - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { if (param0->unk_02 == 0) { param0->unk_02 = (param0->unk_00 - 1); } else { param0->unk_02--; } - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { if (param0->unk_02 == (param0->unk_00 - 1)) { param0->unk_02 = 0; } else { param0->unk_02++; } - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { if (param0->unk_02 < (param0->unk_10)) { param0->unk_02 = param0->unk_10; } else if (param0->unk_02 == (param0->unk_00 - 1)) { @@ -111,7 +111,7 @@ void ov105_02246080(UnkStruct_ov105_02246060 *param0) } else { param0->unk_02++; } - } else if (gCoreSys.pressedKeys & PAD_KEY_UP) { + } else if (gSystem.pressedKeys & PAD_KEY_UP) { if (param0->unk_02 < (param0->unk_10)) { param0->unk_02 = (param0->unk_00 - 1); } else { @@ -127,13 +127,13 @@ void ov105_02246080(UnkStruct_ov105_02246060 *param0) v2 = PAD_KEY_UP; } - if (gCoreSys.pressedKeys & v1) { + if (gSystem.pressedKeys & v1) { param0->unk_02++; if (param0->unk_02 >= param0->unk_00) { param0->unk_02 = 0; } - } else if (gCoreSys.pressedKeys & v2) { + } else if (gSystem.pressedKeys & v2) { if (param0->unk_02 == 0) { param0->unk_02 = param0->unk_00; } diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index ff4bd66897..8cfc4e83fa 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -20,7 +20,6 @@ #include "bg_window.h" #include "cell_actor.h" #include "communication_system.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "game_overlay.h" @@ -42,12 +41,12 @@ #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" #include "unk_0200C440.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_02030108.h" #include "unk_020363E8.h" #include "unk_020393C8.h" @@ -404,9 +403,9 @@ static BOOL ov106_02241E5C(UnkStruct_ov106_02243118 *param0) param0->unk_08 = 1; break; case 1: - ov106_02242D64(param0, gCoreSys.pressedKeys); + ov106_02242D64(param0, gSystem.pressedKeys); - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (ov104_0223B5A4(param0->unk_0D) == 0xfe) { Sound_PlayEffect(1501); StartScreenTransition(0, 0, 0, 0x0, 6, 1, 98); @@ -1239,7 +1238,7 @@ static void ov106_02242D64(UnkStruct_ov106_02243118 *param0, int param1) v0 = 0; - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { if (ov104_0223B5A4(param0->unk_0D) != 0xfe) { param0->unk_0C = param0->unk_0D; } else { @@ -1257,7 +1256,7 @@ static void ov106_02242D64(UnkStruct_ov106_02243118 *param0, int param1) v0 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + if (gSystem.pressedKeys & PAD_KEY_RIGHT) { if (ov104_0223B5A4(param0->unk_0D) != 0xfe) { param0->unk_0C = param0->unk_0D; } else { @@ -1275,7 +1274,7 @@ static void ov106_02242D64(UnkStruct_ov106_02243118 *param0, int param1) v0 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { if (ov104_0223B5A4(param0->unk_0D) != 0xfe) { param0->unk_0C = param0->unk_0D; } else { @@ -1301,7 +1300,7 @@ static void ov106_02242D64(UnkStruct_ov106_02243118 *param0, int param1) v0 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + if (gSystem.pressedKeys & PAD_KEY_DOWN) { if (ov104_0223B5A4(param0->unk_0D) != 0xfe) { param0->unk_0C = param0->unk_0D; } else { diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index b423cf81d0..3a71bc2791 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -25,7 +25,7 @@ #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" +#include "system.h" #include "font.h" #include "game_options.h" #include "game_overlay.h" @@ -53,7 +53,7 @@ #include "render_oam.h" #include "unk_0200C440.h" #include "unk_0200F174.h" -#include "unk_02017728.h" +#include "system.h" #include "vram_transfer.h" #include "unk_020302D0.h" #include "unk_0203061C.h" @@ -692,9 +692,9 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) return 0; } - ov107_02244BD8(param0, gCoreSys.pressedKeys); + ov107_02244BD8(param0, gSystem.pressedKeys); - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); if (param0->unk_0D >= param0->unk_15) { @@ -705,7 +705,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) param0->unk_08 = 1; break; } - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { if (param0->unk_0D != param0->unk_15) { Sound_PlayEffect(1500); param0->unk_0D = param0->unk_15; @@ -756,7 +756,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) case 2: ListMenu_CalcTrueCursorPos(param0->unk_198, ¶m0->unk_16); - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { if (param0->unk_16 == 0) { ListMenu_TestInput(param0->unk_198, (ListMenuTemplate *)¶m0->unk_1A0, 0, ((NELEMS(Unk_ov107_02249FF0)) - 1), 1, PAD_KEY_DOWN, NULL, NULL); ListMenu_Draw(param0->unk_198); @@ -764,7 +764,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) ov107_0224379C(param0, ¶m0->unk_50[6], 28, 1, 1, TEXT_SPEED_NO_TRANSFER, 1, 2, 15, FONT_MESSAGE); return 0; } - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { if (param0->unk_16 == ((NELEMS(Unk_ov107_02249FF0)) - 1)) { ListMenu_TestInput(param0->unk_198, (ListMenuTemplate *)¶m0->unk_1A0, 0, 0, 1, PAD_KEY_UP, NULL, NULL); ListMenu_Draw(param0->unk_198); @@ -937,7 +937,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } break; case 6: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02245618(param0); ov107_02244064(param0); @@ -946,7 +946,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } break; case 7: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02245288(¶m0->unk_50[6]); ov107_02244064(param0); @@ -1132,7 +1132,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } break; case 13: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02245618(param0); ov107_0224409C(param0); @@ -1141,7 +1141,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } break; case 14: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02245288(¶m0->unk_50[6]); ov107_0224409C(param0); @@ -1149,14 +1149,14 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } break; case 15: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_022456E4(param0); param0->unk_08 = 9; } break; case 16: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); param0->unk_0A = ov107_02243918(param0, 61, FONT_MESSAGE); ov107_022441DC(param0); @@ -1203,7 +1203,7 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } break; case 19: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02245288(¶m0->unk_50[6]); ov107_02243FA4(param0); @@ -1211,11 +1211,11 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } break; case 20: - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { ov107_02245140(param0, -1); - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { ov107_02245140(param0, 1); - } else if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + } else if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02245BE0(param0); ov107_02244018(param0); @@ -1223,11 +1223,11 @@ static BOOL ov107_02241EC8 (UnkStruct_ov107_02241D6C * param0) } break; case 21: - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { ov107_0224518C(param0, -1); - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { ov107_0224518C(param0, 1); - } else if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + } else if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02245BE0(param0); ov107_02244018(param0); @@ -2929,7 +2929,7 @@ static void ov107_02244BD8 (UnkStruct_ov107_02241D6C * param0, int param1) v1 = 0; v0 = ov107_02249C98(param0->unk_14, param0->unk_0D); - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { if (param0->unk_0D == param0->unk_15) { return; } @@ -2943,7 +2943,7 @@ static void ov107_02244BD8 (UnkStruct_ov107_02241D6C * param0, int param1) v1 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + if (gSystem.pressedKeys & PAD_KEY_RIGHT) { if (param0->unk_0D == param0->unk_15) { return; } @@ -2957,7 +2957,7 @@ static void ov107_02244BD8 (UnkStruct_ov107_02241D6C * param0, int param1) v1 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { if (param0->unk_0D < param0->unk_14) { return; } @@ -2966,7 +2966,7 @@ static void ov107_02244BD8 (UnkStruct_ov107_02241D6C * param0, int param1) v1 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + if (gSystem.pressedKeys & PAD_KEY_DOWN) { if (param0->unk_0D >= param0->unk_15) { return; } diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index 4a42b9f2cb..add26fa156 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -25,7 +25,7 @@ #include "cell_actor.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" +#include "system.h" #include "font.h" #include "game_options.h" #include "game_overlay.h" @@ -53,7 +53,7 @@ #include "render_oam.h" #include "unk_0200C440.h" #include "unk_0200F174.h" -#include "unk_02017728.h" +#include "system.h" #include "vram_transfer.h" #include "unk_020302D0.h" #include "unk_0203061C.h" @@ -492,9 +492,9 @@ static BOOL ov107_022462CC (UnkStruct_ov107_02246170 * param0) param0->unk_0F_3 = 0; break; case 1: - ov107_02248358(param0, gCoreSys.pressedKeys); + ov107_02248358(param0, gSystem.pressedKeys); - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); if (param0->unk_0D >= param0->unk_15) { @@ -505,7 +505,7 @@ static BOOL ov107_022462CC (UnkStruct_ov107_02246170 * param0) param0->unk_08 = 2; break; } - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { if (param0->unk_0D != param0->unk_15) { Sound_PlayEffect(1500); param0->unk_0D = param0->unk_15; @@ -850,7 +850,7 @@ static BOOL ov107_022462CC (UnkStruct_ov107_02246170 * param0) } break; case 10: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { ov107_02248BB4(param0); ov107_022482FC(param0); ov107_02249C60(param0->unk_3C4, 211, 105); @@ -875,14 +875,14 @@ static BOOL ov107_022462CC (UnkStruct_ov107_02246170 * param0) } break; case 14: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_022482FC(param0); param0->unk_08 = 6; } break; case 15: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02248860(¶m0->unk_50[7]); ov107_02248240(param0); @@ -890,11 +890,11 @@ static BOOL ov107_022462CC (UnkStruct_ov107_02246170 * param0) } break; case 16: - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { ov107_0224877C(param0, -1); - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { ov107_0224877C(param0, 1); - } else if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + } else if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02249238(param0); ov107_022482B0(param0); @@ -902,11 +902,11 @@ static BOOL ov107_022462CC (UnkStruct_ov107_02246170 * param0) } break; case 17: - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { ov107_022487DC(param0, -1); - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { ov107_022487DC(param0, 1); - } else if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + } else if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02249238(param0); ov107_022482B0(param0); @@ -2257,7 +2257,7 @@ static void ov107_02248358 (UnkStruct_ov107_02246170 * param0, int param1) v1 = 0; v0 = ov107_02249C98(param0->unk_14, param0->unk_0D); - if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + if (gSystem.pressedKeys & PAD_KEY_LEFT) { if (param0->unk_0D == param0->unk_15) { return; } @@ -2271,7 +2271,7 @@ static void ov107_02248358 (UnkStruct_ov107_02246170 * param0, int param1) v1 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + if (gSystem.pressedKeys & PAD_KEY_RIGHT) { if (param0->unk_0D == param0->unk_15) { return; } @@ -2285,7 +2285,7 @@ static void ov107_02248358 (UnkStruct_ov107_02246170 * param0, int param1) v1 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { if (param0->unk_0D < param0->unk_14) { return; } @@ -2294,7 +2294,7 @@ static void ov107_02248358 (UnkStruct_ov107_02246170 * param0, int param1) v1 = 1; } - if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + if (gSystem.pressedKeys & PAD_KEY_DOWN) { if (param0->unk_0D >= param0->unk_15) { return; } @@ -2437,7 +2437,7 @@ static BOOL ov107_0224850C (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par break; case 3: if (ov104_0223BA14(param0->unk_09) == 0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02248A2C(param0, param1); param0->unk_0F_0 = 0; @@ -2450,7 +2450,7 @@ static BOOL ov107_0224850C (UnkStruct_ov107_02246170 * param0, u8 param1, u8 par break; case 4: if (ov104_0223BA14(param0->unk_09) == 0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); ov107_02248AF0(param0, param1); param0->unk_0F_0 = 0; diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index edd85e09ba..a9cf0dcff1 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -20,7 +20,6 @@ #include "bg_window.h" #include "cell_actor.h" #include "communication_system.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "game_overlay.h" @@ -42,11 +41,11 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "touch_screen.h" #include "trainer_info.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_02030494.h" #include "unk_0203061C.h" #include "unk_020363E8.h" @@ -592,7 +591,7 @@ static BOOL ov108_02241F28(UnkStruct_ov108_02241DB0 *param0) param0->unk_08 = 6; break; case 6: - ov108_02242964(param0, gCoreSys.pressedKeys); + ov108_02242964(param0, gSystem.pressedKeys); if (CommSys_CurNetId() == 0) { if (param0->unk_18 > 0) { diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index 145070e73c..104302abd5 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -33,7 +33,6 @@ #include "camera.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "font.h" #include "game_records.h" #include "gx_layers.h" @@ -52,13 +51,13 @@ #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_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" #include "unk_020363E8.h" @@ -1360,7 +1359,7 @@ static int ov109_021D1A14(UnkStruct_ov109_021D0F70 *param0) ov109_021D2634(param0, 11); CommTiming_StartSync(202); - gCoreSys.inhibitReset = 1; + gSystem.inhibitReset = 1; param0->unk_00 = 44; return 0; @@ -1384,7 +1383,7 @@ static int ov109_021D1AA8(UnkStruct_ov109_021D0F70 *param0) param0->unk_CC->unk_14.unk_08, 2, ¶m0->unk_04); if (v0) { - gCoreSys.inhibitReset = 0; + gSystem.inhibitReset = 0; DestroyWaitDial(param0->unk_DC8); param0->unk_00 = 48; } diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index e10184a568..02e40dd746 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -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" @@ -44,12 +43,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" @@ -738,7 +737,7 @@ static int ov109_021D478C(UnkStruct_ov109_021D5140 *param0, int param1) static void ov109_021D47B8(UnkStruct_ov109_021D5140 *param0) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (CommSys_CurNetId() == 0) { if ((ov109_021D548C() == param0->unk_10->unk_2C) && (param0->unk_10->unk_30 == 0)) { u8 v0 = 1; @@ -751,7 +750,7 @@ static void ov109_021D47B8(UnkStruct_ov109_021D5140 *param0) Sound_PlayEffect(1522); } } - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { if (CommSys_CurNetId()) { if (param0->unk_10->unk_28 == 0) { ov109_021D55A8(param0, 4, 0); @@ -852,7 +851,7 @@ static int ov109_021D4980(UnkStruct_ov109_021D5140 *param0, int param1) if (CommSys_CurNetId()) { if (param0->unk_10->unk_28) { - 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); } @@ -861,7 +860,7 @@ static int ov109_021D4980(UnkStruct_ov109_021D5140 *param0, int param1) } } else { if (param0->unk_10->unk_30 != 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); } @@ -976,7 +975,7 @@ static int ov109_021D4B94(UnkStruct_ov109_021D5140 *param0, int param1) u32 v1; if ((ov109_021D548C() != param0->unk_10->unk_2C) || (param0->unk_10->unk_30 != 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); } @@ -1052,7 +1051,7 @@ static int ov109_021D4CC8(UnkStruct_ov109_021D5140 *param0, int param1) { void *journalEntryOnlineEvent; - gCoreSys.inhibitReset = 1; + gSystem.inhibitReset = 1; journalEntryOnlineEvent = JournalEntry_CreateEventMixedRecords(95); JournalEntry_SaveData(param0->unk_0C->unk_14.unk_18, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT); @@ -1079,7 +1078,7 @@ static int ov109_021D4D20(UnkStruct_ov109_021D5140 *param0, int param1) param0->unk_1C.unk_00 = 0; param0->unk_3C4 = 0; - gCoreSys.inhibitReset = 0; + gSystem.inhibitReset = 0; param0->unk_10->unk_24 = 0; } @@ -1134,7 +1133,7 @@ static int ov109_021D4E28(UnkStruct_ov109_021D5140 *param0, int param1) int v0; if ((param0->unk_10->unk_2C != ov109_021D548C()) || (param0->unk_10->unk_30 != 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); } diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index a04d7d3446..008d3e51fd 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -12,7 +12,7 @@ #include "overlay110/ov110_021D2124.h" #include "bg_window.h" -#include "core_sys.h" +#include "system.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -28,7 +28,7 @@ #include "string_template.h" #include "text.h" #include "unk_0200F174.h" -#include "unk_02017728.h" +#include "system.h" #include "unk_0202D05C.h" #include "unk_0202FF4C.h" #include "unk_020302D0.h" @@ -218,7 +218,7 @@ static BOOL ov110_021D0FD0 (UnkStruct_ov110_021D0F78 * param0) break; case 1: - if ((gCoreSys.heldKeys & PAD_BUTTON_A) || (gCoreSys.heldKeys & PAD_BUTTON_B)) { + if ((gSystem.heldKeys & PAD_BUTTON_A) || (gSystem.heldKeys & PAD_BUTTON_B)) { return 1; } break; diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 737ea62174..b0f48451bf 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -36,6 +36,7 @@ #include "savedata.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "touch_screen.h" #include "unk_020041CC.h" @@ -44,7 +45,6 @@ #include "unk_0200F174.h" #include "unk_0201567C.h" #include "unk_02015920.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "vram_transfer.h" diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 906c0fdf4f..5160ef8247 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -17,7 +17,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" @@ -32,10 +31,10 @@ #include "sprite_resource.h" #include "sprite_util.h" #include "strbuf.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_020393C8.h" #include "vram_transfer.h" @@ -370,7 +369,7 @@ int ov112_0225C7C4(OverlayManager *param0, int *param1) } break; case 2: - if ((gCoreSys.pressedKeys & PAD_BUTTON_B) || (ov66_0222E12C(v1->unk_08) == 1) || (ov66_02231760() == 1)) { + if ((gSystem.pressedKeys & PAD_BUTTON_B) || (ov66_0222E12C(v1->unk_08) == 1) || (ov66_02231760() == 1)) { if (ov66_0222E12C(v1->unk_08) == 1) { ov66_0222E2A4(v1->unk_08); } @@ -490,7 +489,7 @@ static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1) SetAllGraphicsModes(&Unk_ov112_0225D834); param0->unk_00 = BgConfig_New(param1); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); @@ -530,7 +529,7 @@ static void ov112_0225CB60(UnkStruct_ov112_0225C9BC *param0) } Heap_FreeToHeap(param0->unk_00); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); } diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 622879070b..f98d152d11 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -40,7 +40,6 @@ #include "camera.h" #include "cell_actor.h" #include "char_transfer.h" -#include "core_sys.h" #include "easy3d_object.h" #include "font.h" #include "fx_util.h" @@ -63,13 +62,13 @@ #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_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02015920.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" #include "unk_02024220.h" @@ -434,7 +433,7 @@ int ov113_0225C700(OverlayManager *param0, int *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1); - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); GXLayers_TurnBothDispOn(); @@ -475,10 +474,10 @@ int ov113_0225CA04(OverlayManager *param0, int *param1) } break; case 2: - if (gCoreSys.touchPressed && (gCoreSys.touchY < 160)) { + if (gSystem.touchPressed && (gSystem.touchY < 160)) { if (ov113_0225E318(v0, ((32 << 8) / 6)) == 1) { - v0->unk_8D8[v0->unk_920].unk_09 = gCoreSys.touchX; - v0->unk_8D8[v0->unk_920].unk_0A = gCoreSys.touchY; + v0->unk_8D8[v0->unk_920].unk_09 = gSystem.touchX; + v0->unk_8D8[v0->unk_920].unk_0A = gSystem.touchY; ov113_0225DDC0(v0, &v0->unk_8D8[v0->unk_920], v0->unk_168.unk_04); ov113_02260818(&v0->unk_8D8[v0->unk_920]); diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index 9e828a62aa..f2c802de09 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -21,7 +21,6 @@ #include "char_transfer.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "enums.h" #include "font.h" #include "game_options.h" @@ -43,13 +42,13 @@ #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_02015920.h" -#include "unk_02017728.h" #include "unk_0202ACE0.h" #include "unk_020363E8.h" #include "unk_020366A0.h" @@ -1330,7 +1329,7 @@ static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes param0->unk_04 = param2; param0->unk_08 = param3; - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); { diff --git a/src/overlay115/ov115_02260440.c b/src/overlay115/ov115_02260440.c index 199f117665..e86f235f7c 100644 --- a/src/overlay115/ov115_02260440.c +++ b/src/overlay115/ov115_02260440.c @@ -23,13 +23,12 @@ #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "graphics.h" #include "heap.h" #include "narc.h" #include "overlay_manager.h" +#include "system.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" @@ -131,7 +130,7 @@ int ov115_0226048C(OverlayManager *param0, int *param1) } break; case 2: - if (gCoreSys.heldKeys & PAD_BUTTON_A) { + if (gSystem.heldKeys & PAD_BUTTON_A) { break; } diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index d57f38ff43..a545808972 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -26,7 +26,6 @@ #include "camera.h" #include "cell_actor.h" #include "char_transfer.h" -#include "core_sys.h" #include "easy3d_object.h" #include "font.h" #include "graphics.h" @@ -43,6 +42,7 @@ #include "sprite_util.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "trainer_info.h" #include "unk_020041CC.h" @@ -2322,7 +2322,7 @@ static void ov115_0226294C(UnkStruct_ov115_022622F8 *param0, const VecFx32 *para static void ov115_02262974(UnkStruct_ov115_02260D78 *param0) { - if (gCoreSys.touchHeld == 0) { + if (gSystem.touchHeld == 0) { ov115_02262990(param0); } else { ov115_02262B70(param0); @@ -2438,8 +2438,8 @@ static void ov115_02262B70(UnkStruct_ov115_02260D78 *param0) v0.y = param0->unk_8690.unk_02[param0->unk_8690.unk_00 - 1].y; ov115_02262CBC(¶m0->unk_20, v0); } else { - v0.x = gCoreSys.touchX; - v0.y = gCoreSys.touchY; + v0.x = gSystem.touchX; + v0.y = gSystem.touchY; ov115_02262CBC(¶m0->unk_20, v0); } } @@ -2455,8 +2455,8 @@ static BOOL ov115_02262C60(UnkStruct_ov115_02260D78 *param0) return 0; } - v0 = 128 - gCoreSys.touchX; - v1 = -96 - gCoreSys.touchY; + v0 = 128 - gSystem.touchX; + v1 = -96 - gSystem.touchY; v2 = FX_Sqrt(((v0 * v0) + (v1 * v1)) << FX32_SHIFT) >> FX32_SHIFT; if (v2 <= (190 - -96)) { @@ -3961,7 +3961,7 @@ static void ov115_02264BC0(UnkStruct_ov115_02264BA0 *param0) return; } - ov115_02264BD8(param0, gCoreSys.touchX, gCoreSys.touchY); + ov115_02264BD8(param0, gSystem.touchX, gSystem.touchY); } static void ov115_02264BD8(UnkStruct_ov115_02264BA0 *param0, s32 param1, s32 param2) diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index ca01572f12..fe077273dd 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -27,7 +27,6 @@ #include "camera.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "easy3d_object.h" #include "gx_layers.h" #include "heap.h" @@ -36,10 +35,10 @@ #include "overlay_manager.h" #include "palette.h" #include "sprite_util.h" +#include "system.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_02024220.h" #include "unk_020363E8.h" @@ -830,7 +829,7 @@ void ov116_0226139C(UnkStruct_ov116_0226139C *param0) sub_0200D0B0(param0->unk_48.unk_08, param0->unk_48.unk_0C); sub_0200C8D4(param0->unk_48.unk_08); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); G3X_AlphaBlend(0); @@ -1036,7 +1035,7 @@ static void ov116_02261494(BgConfig *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); G2_SetBlendAlpha(0, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ, 7, 10); diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index 87a7169988..0d51078894 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -26,7 +26,6 @@ #include "bg_window.h" #include "camera.h" #include "communication_system.h" -#include "core_sys.h" #include "easy3d_object.h" #include "enums.h" #include "font.h" @@ -44,6 +43,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" @@ -51,7 +51,6 @@ #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02014000.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_0202419C.h" #include "unk_02024220.h" @@ -261,7 +260,7 @@ int ov117_02260668(OverlayManager *param0, int *param1) StartScreenTransition(0, 27, 27, 0x0, 6, 1, 110); v0->unk_94 = SysTask_Start(ov117_02260F7C, v0, 60000); - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); GXLayers_TurnBothDispOn(); diff --git a/src/overlay117/ov117_022626B0.c b/src/overlay117/ov117_022626B0.c index 0cac071727..0455c61db8 100644 --- a/src/overlay117/ov117_022626B0.c +++ b/src/overlay117/ov117_022626B0.c @@ -11,12 +11,12 @@ #include "overlay117/struct_ov117_02261280.h" #include "overlay117/struct_ov117_02264E84.h" -#include "core_sys.h" #include "easy3d.h" #include "heap.h" #include "inlines.h" #include "narc.h" #include "palette.h" +#include "system.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" @@ -224,10 +224,10 @@ void ov117_02262798(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022626B0 * param1->unk_214 = 0; param1->unk_218 = 0; } else { - param1->unk_20C = gCoreSys.touchX; - param1->unk_210 = gCoreSys.touchY; - param1->unk_214 = gCoreSys.touchHeld; - param1->unk_218 = gCoreSys.touchPressed; + param1->unk_20C = gSystem.touchX; + param1->unk_210 = gSystem.touchY; + param1->unk_214 = gSystem.touchHeld; + param1->unk_218 = gSystem.touchPressed; } ov117_02263270(param1); diff --git a/src/render_text.c b/src/render_text.c index abefee6591..a8815bc9ae 100644 --- a/src/render_text.c +++ b/src/render_text.c @@ -8,14 +8,14 @@ #include "bg_window.h" #include "charcode.h" -#include "core_sys.h" #include "font.h" #include "render_text.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" -#define SPEED_UP_ON_TOUCH_PRESS (gCoreSys.touchPressed && sRenderControlFlags.speedUpOnTouch) -#define SPEED_UP_ON_TOUCH_HOLD (gCoreSys.touchHeld && sRenderControlFlags.speedUpOnTouch) +#define SPEED_UP_ON_TOUCH_PRESS (gSystem.touchPressed && sRenderControlFlags.speedUpOnTouch) +#define SPEED_UP_ON_TOUCH_HOLD (gSystem.touchHeld && sRenderControlFlags.speedUpOnTouch) typedef struct RenderControlFlags { u8 canABSpeedUpPrint : 1; @@ -381,7 +381,7 @@ void TextPrinter_ClearScrollArrow(TextPrinter *printer) static BOOL TextPrinter_Continue(TextPrinter *printer) { if (JOY_NEW(PAD_BUTTON_A | PAD_BUTTON_B) - || (gCoreSys.touchPressed && sRenderControlFlags.speedUpOnTouch)) { + || (gSystem.touchPressed && sRenderControlFlags.speedUpOnTouch)) { Sound_PlayEffect(SEQ_SE_CONFIRM); sRenderControlFlags.waitBattle = TRUE; return TRUE; diff --git a/src/resource_collection.c b/src/resource_collection.c index 7556520e20..f3dffc631a 100644 --- a/src/resource_collection.c +++ b/src/resource_collection.c @@ -6,7 +6,7 @@ #include "constants/heap.h" #include "heap.h" -#include "unk_02017728.h" +#include "system.h" #define RESOURCE_ID_INVALID (-1) diff --git a/src/savedata.c b/src/savedata.c index b9cb7378ec..93391d33e3 100644 --- a/src/savedata.c +++ b/src/savedata.c @@ -11,7 +11,7 @@ #include "inlines.h" #include "math.h" #include "savedata_misc.h" -#include "unk_02017728.h" +#include "system.h" #include "unk_0209A74C.h" #include "unk_0209AA74.h" diff --git a/src/scrcmd.c b/src/scrcmd.c index 089723a857..17ff95477d 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -94,7 +94,6 @@ #include "camera.h" #include "comm_player_manager.h" #include "communication_system.h" -#include "core_sys.h" #include "encounter.h" #include "field_comm_manager.h" #include "field_map_change.h" @@ -136,6 +135,7 @@ #include "string_template.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "system_data.h" #include "system_flags.h" #include "text.h" @@ -2280,7 +2280,7 @@ static BOOL ScrCmd_WaitABPress(ScriptContext *ctx) static BOOL ScriptContext_CheckABPress(ScriptContext *ctx) { // this doesn't match using == TRUE or leaving off a comparison entirely - return (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) != FALSE; + return (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) != FALSE; } static BOOL ScrCmd_WaitABPressTime(ScriptContext *ctx) @@ -2292,7 +2292,7 @@ static BOOL ScrCmd_WaitABPressTime(ScriptContext *ctx) static BOOL ScriptContext_DecrementABPressTimer(ScriptContext *ctx) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return TRUE; } @@ -2309,19 +2309,19 @@ static BOOL ScrCmd_WaitABXPadPress(ScriptContext *ctx) static BOOL ScriptContext_CheckABXPadPress(ScriptContext *ctx) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return TRUE; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { Player_SetDir(ctx->fieldSystem->playerAvatar, DIR_NORTH); - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { Player_SetDir(ctx->fieldSystem->playerAvatar, DIR_SOUTH); - } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeys & PAD_KEY_LEFT) { Player_SetDir(ctx->fieldSystem->playerAvatar, DIR_WEST); - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { Player_SetDir(ctx->fieldSystem->playerAvatar, DIR_EAST); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_X) { + } else if (gSystem.pressedKeys & PAD_BUTTON_X) { sub_0203F0C0(ctx->fieldSystem); } else { return FALSE; @@ -2339,10 +2339,10 @@ static BOOL ScrCmd_WaitABPadPress(ScriptContext *ctx) static BOOL ScriptContext_CheckABPadPress(ScriptContext *ctx) { // this function doesn't match simplified further, using == TRUE, or leaving off a comparison entirely - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return TRUE; } - return (gCoreSys.pressedKeys & PAD_KEY) != FALSE; + return (gSystem.pressedKeys & PAD_KEY) != FALSE; } static BOOL ScrCmd_OpenMessage(ScriptContext *ctx) @@ -2569,13 +2569,13 @@ static BOOL sub_02040670(ScriptContext *ctx) return 1; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { v4 = 0; - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { v4 = 1; - } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeys & PAD_KEY_LEFT) { v4 = 2; - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { v4 = 3; } @@ -2586,7 +2586,7 @@ static BOOL sub_02040670(ScriptContext *ctx) return 1; } - if (gCoreSys.pressedKeys & PAD_BUTTON_X) { + if (gSystem.pressedKeys & PAD_BUTTON_X) { Text_RemovePrinter(*v1); *v2 = 1; return 1; @@ -2611,18 +2611,18 @@ static BOOL sub_02040730(ScriptContext *ctx) u16 *v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); int v2 = 0xffff; - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { *v1 = 0; return 1; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { v2 = 0; - } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeys & PAD_KEY_DOWN) { v2 = 1; - } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeys & PAD_KEY_LEFT) { v2 = 2; - } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeys & PAD_KEY_RIGHT) { v2 = 3; } @@ -2632,7 +2632,7 @@ static BOOL sub_02040730(ScriptContext *ctx) return 1; } - if (gCoreSys.pressedKeys & PAD_BUTTON_X) { + if (gSystem.pressedKeys & PAD_BUTTON_X) { *v1 = 1; return 1; } @@ -5460,7 +5460,7 @@ static BOOL sub_02043A4C(ScriptContext *ctx) u16 *v0 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); u32 v1 = sub_0205B91C(ctx->fieldSystem->unk_7C); - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { v1 = sub_0205B9EC(ctx->fieldSystem->unk_7C, 8); if (v1) { @@ -7062,7 +7062,7 @@ static BOOL ScrCmd_GetGBACartridgeVersion(ScriptContext *ctx) { u16 *destVar = ScriptContext_GetVarPointer(ctx); - *destVar = gCoreSys.gbaCartridgeVersion; + *destVar = gSystem.gbaCartridgeVersion; return TRUE; } @@ -8090,11 +8090,11 @@ static BOOL ScrCmd_2FC(ScriptContext *ctx) *v0 = 0; - if (gCoreSys.heldKeys & PAD_BUTTON_A) { + if (gSystem.heldKeys & PAD_BUTTON_A) { *v0 = 1; } - if (gCoreSys.heldKeys & PAD_BUTTON_B) { + if (gSystem.heldKeys & PAD_BUTTON_B) { *v0 = 1; } diff --git a/src/sys_task.c b/src/sys_task.c index 26a74cbc2d..11a487d23d 100644 --- a/src/sys_task.c +++ b/src/sys_task.c @@ -3,27 +3,27 @@ #include #include -#include "core_sys.h" #include "sys_task_manager.h" +#include "system.h" SysTask *SysTask_Start(SysTaskFunc callback, void *param, u32 priority) { - return SysTaskManager_AddTask(gCoreSys.mainTaskMgr, callback, param, priority); + return SysTaskManager_AddTask(gSystem.mainTaskMgr, callback, param, priority); } SysTask *SysTask_ExecuteOnVBlank(SysTaskFunc callback, void *param, u32 priority) { - return SysTaskManager_AddTask(gCoreSys.vBlankTaskMgr, callback, param, priority); + return SysTaskManager_AddTask(gSystem.vBlankTaskMgr, callback, param, priority); } SysTask *SysTask_CreateOnPrintQueue(SysTaskFunc callback, void *param, u32 priority) { - return SysTaskManager_AddTask(gCoreSys.printTaskMgr, callback, param, priority); + return SysTaskManager_AddTask(gSystem.printTaskMgr, callback, param, priority); } SysTask *SysTask_ExecuteAfterVBlank(SysTaskFunc callback, void *param, u32 priority) { - return SysTaskManager_AddTask(gCoreSys.postVBlankTaskMgr, callback, param, priority); + return SysTaskManager_AddTask(gSystem.postVBlankTaskMgr, callback, param, priority); } void SysTask_Done(SysTask *task) diff --git a/src/unk_02017728.c b/src/system.c similarity index 56% rename from src/unk_02017728.c rename to src/system.c index e7da972452..b616629c4b 100644 --- a/src/unk_02017728.c +++ b/src/system.c @@ -1,11 +1,10 @@ -#include "unk_02017728.h" +#include "system.h" #include #include "constants/heap.h" #include "boot.h" -#include "core_sys.h" #include "heap.h" #include "math.h" #include "sys_task_manager.h" @@ -19,14 +18,14 @@ static void SetHBlankEnabled(BOOL param0); void sub_0201777C(void); static void ApplyButtonModeToInput(void); -CoreSys gCoreSys; +System gSystem; void sub_02017728(void) { OS_SetIrqCheckFlag(OS_IE_V_BLANK); MI_WaitDma(GX_DEFAULT_DMAID); - SysTaskManager_ExecuteTasks(gCoreSys.vBlankTaskMgr); - gCoreSys.frameCounter++; + SysTaskManager_ExecuteTasks(gSystem.vBlankTaskMgr); + gSystem.frameCounter++; } static void sub_0201775C(void) @@ -44,28 +43,28 @@ void sub_0201777C(void) void SetMainCallback(Callback cb, void *data) { - gCoreSys.mainCallback = cb; - gCoreSys.mainCallbackData = data; + gSystem.mainCallback = cb; + gSystem.mainCallbackData = data; } void DisableHBlank(void) { SetHBlankEnabled(0); - gCoreSys.hblankCallback = NULL; - gCoreSys.hblankCallbackData = NULL; + gSystem.hblankCallback = NULL; + gSystem.hblankCallbackData = NULL; } BOOL SetHBlankCallback(Callback cb, void *data) { if (cb == NULL) { SetHBlankEnabled(0); - gCoreSys.hblankCallback = NULL; - gCoreSys.hblankCallbackData = NULL; + gSystem.hblankCallback = NULL; + gSystem.hblankCallbackData = NULL; return 1; } else { - if (gCoreSys.hblankCallback == NULL) { - gCoreSys.hblankCallbackData = data; - gCoreSys.hblankCallback = cb; + if (gSystem.hblankCallback == NULL) { + gSystem.hblankCallbackData = data; + gSystem.hblankCallback = cb; SetHBlankEnabled(1); return 1; } else { @@ -76,8 +75,8 @@ BOOL SetHBlankCallback(Callback cb, void *data) static void HBlankIntr(void) { - if (gCoreSys.hblankCallback) { - gCoreSys.hblankCallback(gCoreSys.hblankCallbackData); + if (gSystem.hblankCallback) { + gSystem.hblankCallback(gSystem.hblankCallbackData); } } @@ -143,10 +142,10 @@ void sub_0201789C(void) OS_InitTick(); sub_02017850(); - gCoreSys.mainTaskMgr = SysTaskManager_Init(160, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(160), 4)); - gCoreSys.vBlankTaskMgr = SysTaskManager_Init(32, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(32), 4)); - gCoreSys.postVBlankTaskMgr = SysTaskManager_Init(32, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(32), 4)); - gCoreSys.printTaskMgr = SysTaskManager_Init(4, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(4), 4)); + gSystem.mainTaskMgr = SysTaskManager_Init(160, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(160), 4)); + gSystem.vBlankTaskMgr = SysTaskManager_Init(32, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(32), 4)); + gSystem.postVBlankTaskMgr = SysTaskManager_Init(32, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(32), 4)); + gSystem.printTaskMgr = SysTaskManager_Init(4, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(4), 4)); GX_DispOff(); GXS_DispOff(); @@ -170,13 +169,13 @@ void sub_0201789C(void) FS_LoadTable(v1, v0); } - gCoreSys.mainCallback = NULL; - gCoreSys.hblankCallback = NULL; - gCoreSys.unk_10 = NULL; - gCoreSys.unk_14 = NULL; - gCoreSys.heapCanary = NULL; - gCoreSys.vblankCounter = 0; - gCoreSys.unk_65 = 0; + gSystem.mainCallback = NULL; + gSystem.hblankCallback = NULL; + gSystem.dummyCallback_10 = NULL; + gSystem.dummyCallback_14 = NULL; + gSystem.heapCanary = NULL; + gSystem.vblankCounter = 0; + gSystem.unk_65 = 0; CARD_SetCacheFlushThreshold(0x500, 0x2400); @@ -263,21 +262,21 @@ void InitKeypadAndTouchpad(void) { TPCalibrateParam v0; - gCoreSys.buttonMode = 0; - gCoreSys.heldKeysRaw = 0; - gCoreSys.pressedKeysRaw = 0; - gCoreSys.pressedKeysRepeatableRaw = 0; - gCoreSys.heldKeys = 0; - gCoreSys.pressedKeys = 0; - gCoreSys.pressedKeysRepeatable = 0; - gCoreSys.autorepeatTimer = 0; - gCoreSys.autorepeatRate = 4; - gCoreSys.autorepeatDelay = 8; - gCoreSys.touchX = 0; - gCoreSys.touchY = 0; - gCoreSys.touchPressed = 0; - gCoreSys.touchHeld = 0; - gCoreSys.unk_64 = 0; + gSystem.buttonMode = 0; + gSystem.heldKeysRaw = 0; + gSystem.pressedKeysRaw = 0; + gSystem.pressedKeysRepeatableRaw = 0; + gSystem.heldKeys = 0; + gSystem.pressedKeys = 0; + gSystem.pressedKeysRepeatable = 0; + gSystem.autorepeatTimer = 0; + gSystem.autorepeatRate = 4; + gSystem.autorepeatDelay = 8; + gSystem.touchX = 0; + gSystem.touchY = 0; + gSystem.touchPressed = 0; + gSystem.touchHeld = 0; + gSystem.unk_64 = 0; TP_Init(); @@ -295,17 +294,17 @@ void InitKeypadAndTouchpad(void) void SetGBACartridgeVersion(int version) { - gCoreSys.gbaCartridgeVersion = version; + gSystem.gbaCartridgeVersion = version; } void SleepLock(u8 param0) { - gCoreSys.inhibitSleep |= param0; + gSystem.inhibitSleep |= param0; } void SleepUnlock(u8 param0) { - gCoreSys.inhibitSleep &= ~(param0); + gSystem.inhibitSleep &= ~(param0); } void ReadKeypadAndTouchpad(void) @@ -316,37 +315,37 @@ void ReadKeypadAndTouchpad(void) if (PAD_DetectFold()) { // Can't press any buttons while the lid is closed. - gCoreSys.pressedKeys = 0; - gCoreSys.heldKeys = 0; - gCoreSys.pressedKeysRepeatable = 0; - gCoreSys.touchPressed = 0; - gCoreSys.touchHeld = 0; + gSystem.pressedKeys = 0; + gSystem.heldKeys = 0; + gSystem.pressedKeysRepeatable = 0; + gSystem.touchPressed = 0; + gSystem.touchHeld = 0; return; } padRead = PAD_Read(); - gCoreSys.pressedKeysRaw = padRead & (padRead ^ gCoreSys.heldKeysRaw); - gCoreSys.pressedKeysRepeatableRaw = gCoreSys.pressedKeysRaw; + gSystem.pressedKeysRaw = padRead & (padRead ^ gSystem.heldKeysRaw); + gSystem.pressedKeysRepeatableRaw = gSystem.pressedKeysRaw; - if ((padRead != 0) && (gCoreSys.heldKeysRaw == padRead)) { - if (--gCoreSys.autorepeatTimer == 0) { - gCoreSys.pressedKeysRepeatableRaw = padRead; - gCoreSys.autorepeatTimer = gCoreSys.autorepeatRate; + if ((padRead != 0) && (gSystem.heldKeysRaw == padRead)) { + if (--gSystem.autorepeatTimer == 0) { + gSystem.pressedKeysRepeatableRaw = padRead; + gSystem.autorepeatTimer = gSystem.autorepeatRate; } } else { - gCoreSys.autorepeatTimer = gCoreSys.autorepeatDelay; + gSystem.autorepeatTimer = gSystem.autorepeatDelay; } - gCoreSys.heldKeysRaw = padRead; + gSystem.heldKeysRaw = padRead; - gCoreSys.pressedKeys = gCoreSys.pressedKeysRaw; - gCoreSys.heldKeys = gCoreSys.heldKeysRaw; - gCoreSys.pressedKeysRepeatable = gCoreSys.pressedKeysRepeatableRaw; + gSystem.pressedKeys = gSystem.pressedKeysRaw; + gSystem.heldKeys = gSystem.heldKeysRaw; + gSystem.pressedKeysRepeatable = gSystem.pressedKeysRepeatableRaw; ApplyButtonModeToInput(); - if (gCoreSys.unk_64 == 0) { + if (gSystem.unk_64 == 0) { while (TP_RequestRawSampling(&tpRaw) != 0) ; } else { @@ -356,16 +355,16 @@ void ReadKeypadAndTouchpad(void) TP_GetCalibratedPoint(&tp, &tpRaw); if (tp.validity == TP_VALIDITY_VALID) { - gCoreSys.touchX = tp.x; - gCoreSys.touchY = tp.y; + gSystem.touchX = tp.x; + gSystem.touchY = tp.y; } else { - if (gCoreSys.touchHeld) { + if (gSystem.touchHeld) { switch (tp.validity) { case TP_VALIDITY_INVALID_X: - gCoreSys.touchY = tp.y; + gSystem.touchY = tp.y; break; case TP_VALIDITY_INVALID_Y: - gCoreSys.touchX = tp.x; + gSystem.touchX = tp.x; break; case TP_VALIDITY_INVALID_XY: break; @@ -377,130 +376,130 @@ void ReadKeypadAndTouchpad(void) } } - gCoreSys.touchPressed = (u16)(tp.touch & (tp.touch ^ gCoreSys.touchHeld)); - gCoreSys.touchHeld = tp.touch; + gSystem.touchPressed = (u16)(tp.touch & (tp.touch ^ gSystem.touchHeld)); + gSystem.touchHeld = tp.touch; } static void ApplyButtonModeToInput(void) { - switch (gCoreSys.buttonMode) { + switch (gSystem.buttonMode) { default: case BUTTON_MODE_NORMAL: break; case BUTTON_MODE_START_IS_X: - if (gCoreSys.pressedKeys & PAD_BUTTON_START) { - gCoreSys.pressedKeys |= PAD_BUTTON_X; + if (gSystem.pressedKeys & PAD_BUTTON_START) { + gSystem.pressedKeys |= PAD_BUTTON_X; } - if (gCoreSys.heldKeys & PAD_BUTTON_START) { - gCoreSys.heldKeys |= PAD_BUTTON_X; + if (gSystem.heldKeys & PAD_BUTTON_START) { + gSystem.heldKeys |= PAD_BUTTON_X; } - if (gCoreSys.pressedKeysRepeatable & PAD_BUTTON_START) { - gCoreSys.pressedKeysRepeatable |= PAD_BUTTON_X; + if (gSystem.pressedKeysRepeatable & PAD_BUTTON_START) { + gSystem.pressedKeysRepeatable |= PAD_BUTTON_X; } break; case BUTTON_MODE_SWAP_XY: { u32 tmp = 0; - if (gCoreSys.pressedKeys & PAD_BUTTON_X) { + if (gSystem.pressedKeys & PAD_BUTTON_X) { tmp |= PAD_BUTTON_Y; } - if (gCoreSys.pressedKeys & PAD_BUTTON_Y) { + if (gSystem.pressedKeys & PAD_BUTTON_Y) { tmp |= PAD_BUTTON_X; } - gCoreSys.pressedKeys &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); - gCoreSys.pressedKeys |= tmp; + gSystem.pressedKeys &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); + gSystem.pressedKeys |= tmp; } { u32 tmp = 0; - if (gCoreSys.heldKeys & PAD_BUTTON_X) { + if (gSystem.heldKeys & PAD_BUTTON_X) { tmp |= PAD_BUTTON_Y; } - if (gCoreSys.heldKeys & PAD_BUTTON_Y) { + if (gSystem.heldKeys & PAD_BUTTON_Y) { tmp |= PAD_BUTTON_X; } - gCoreSys.heldKeys &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); - gCoreSys.heldKeys |= tmp; + gSystem.heldKeys &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); + gSystem.heldKeys |= tmp; } { u32 tmp = 0; - if (gCoreSys.pressedKeysRepeatable & PAD_BUTTON_X) { + if (gSystem.pressedKeysRepeatable & PAD_BUTTON_X) { tmp |= PAD_BUTTON_Y; } - if (gCoreSys.pressedKeysRepeatable & PAD_BUTTON_Y) { + if (gSystem.pressedKeysRepeatable & PAD_BUTTON_Y) { tmp |= PAD_BUTTON_X; } - gCoreSys.pressedKeysRepeatable &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); - gCoreSys.pressedKeysRepeatable |= tmp; + gSystem.pressedKeysRepeatable &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); + gSystem.pressedKeysRepeatable |= tmp; } break; case BUTTON_MODE_L_IS_A: - if (gCoreSys.pressedKeys & PAD_BUTTON_L) { - gCoreSys.pressedKeys |= PAD_BUTTON_A; + if (gSystem.pressedKeys & PAD_BUTTON_L) { + gSystem.pressedKeys |= PAD_BUTTON_A; } - if (gCoreSys.heldKeys & PAD_BUTTON_L) { - gCoreSys.heldKeys |= PAD_BUTTON_A; + if (gSystem.heldKeys & PAD_BUTTON_L) { + gSystem.heldKeys |= PAD_BUTTON_A; } - if (gCoreSys.pressedKeysRepeatable & PAD_BUTTON_L) { - gCoreSys.pressedKeysRepeatable |= PAD_BUTTON_A; + if (gSystem.pressedKeysRepeatable & PAD_BUTTON_L) { + gSystem.pressedKeysRepeatable |= PAD_BUTTON_A; } - gCoreSys.pressedKeys &= ((PAD_BUTTON_L | PAD_BUTTON_R) ^ 0xffff); - gCoreSys.heldKeys &= ((PAD_BUTTON_L | PAD_BUTTON_R) ^ 0xffff); - gCoreSys.pressedKeysRepeatable &= ((PAD_BUTTON_L | PAD_BUTTON_R) ^ 0xffff); + gSystem.pressedKeys &= ((PAD_BUTTON_L | PAD_BUTTON_R) ^ 0xffff); + gSystem.heldKeys &= ((PAD_BUTTON_L | PAD_BUTTON_R) ^ 0xffff); + gSystem.pressedKeysRepeatable &= ((PAD_BUTTON_L | PAD_BUTTON_R) ^ 0xffff); break; } } void SetAutorepeat(int rate, int delay) { - gCoreSys.autorepeatRate = rate; - gCoreSys.autorepeatDelay = delay; + gSystem.autorepeatRate = rate; + gSystem.autorepeatDelay = delay; } void ResetLock(u8 param0) { - gCoreSys.inhibitReset |= param0; + gSystem.inhibitReset |= param0; } void ResetUnlock(u8 param0) { - gCoreSys.inhibitReset &= ~(param0); + gSystem.inhibitReset &= ~(param0); } #define HEAP_CANARY 0x2f93a1bc void InitHeapCanary(int heapID) { - GF_ASSERT(gCoreSys.heapCanary == NULL); + GF_ASSERT(gSystem.heapCanary == NULL); - gCoreSys.heapCanary = Heap_AllocFromHeapAtEnd(heapID, sizeof(u32)); - *(gCoreSys.heapCanary) = HEAP_CANARY; + gSystem.heapCanary = Heap_AllocFromHeapAtEnd(heapID, sizeof(u32)); + *(gSystem.heapCanary) = HEAP_CANARY; } void FreeHeapCanary(void) { - GF_ASSERT(gCoreSys.heapCanary != NULL); + GF_ASSERT(gSystem.heapCanary != NULL); - *(gCoreSys.heapCanary) = 0; - Heap_FreeToHeap(gCoreSys.heapCanary); - gCoreSys.heapCanary = NULL; + *(gSystem.heapCanary) = 0; + Heap_FreeToHeap(gSystem.heapCanary); + gSystem.heapCanary = NULL; } BOOL HeapCanaryOK(void) { - if (gCoreSys.heapCanary && *gCoreSys.heapCanary == HEAP_CANARY) { + if (gSystem.heapCanary && *gSystem.heapCanary == HEAP_CANARY) { return 1; } diff --git a/src/touch_screen.c b/src/touch_screen.c index c180a6bc02..2cb9956648 100644 --- a/src/touch_screen.c +++ b/src/touch_screen.c @@ -3,7 +3,7 @@ #include #include -#include "core_sys.h" +#include "system.h" static int sub_02022594(const TouchScreenRect *rect, u32 param1, u32 param2); static BOOL sub_020225E0(const TouchScreenHitTable *hitTable, u32 param1, u32 param2); @@ -45,8 +45,8 @@ static BOOL sub_0202260C(const TouchScreenHitTable *hitTable, u32 param1, u32 pa int sub_02022644(const TouchScreenRect *rect) { - if (gCoreSys.touchHeld) { - return sub_02022594(rect, gCoreSys.touchX, gCoreSys.touchY); + if (gSystem.touchHeld) { + return sub_02022594(rect, gSystem.touchX, gSystem.touchY); } return TOUCHSCREEN_INPUT_NONE; @@ -54,8 +54,8 @@ int sub_02022644(const TouchScreenRect *rect) int sub_02022664(const TouchScreenRect *rect) { - if (gCoreSys.touchPressed) { - return sub_02022594(rect, gCoreSys.touchX, gCoreSys.touchY); + if (gSystem.touchPressed) { + return sub_02022594(rect, gSystem.touchX, gSystem.touchY); } return TOUCHSCREEN_INPUT_NONE; @@ -63,16 +63,16 @@ int sub_02022664(const TouchScreenRect *rect) int sub_02022684(const TouchScreenHitTable *hitTable) { - if (gCoreSys.touchHeld) { + if (gSystem.touchHeld) { int v0; for (v0 = 0; hitTable[v0].circle.code != 0xff; v0++) { if (hitTable[v0].circle.code == TOUCHSCREEN_USE_CIRCLE) { - if (sub_020225E0(&hitTable[v0], gCoreSys.touchX, gCoreSys.touchY)) { + if (sub_020225E0(&hitTable[v0], gSystem.touchX, gSystem.touchY)) { return v0; } } else { - if (sub_0202260C(&hitTable[v0], gCoreSys.touchX, gCoreSys.touchY)) { + if (sub_0202260C(&hitTable[v0], gSystem.touchX, gSystem.touchY)) { return v0; } } @@ -84,16 +84,16 @@ int sub_02022684(const TouchScreenHitTable *hitTable) int sub_020226DC(const TouchScreenHitTable *hitTable) { - if (gCoreSys.touchPressed) { + if (gSystem.touchPressed) { int v0; for (v0 = 0; hitTable[v0].circle.code != 0xff; v0++) { if (hitTable[v0].circle.code == TOUCHSCREEN_USE_CIRCLE) { - if (sub_020225E0(&hitTable[v0], gCoreSys.touchX, gCoreSys.touchY)) { + if (sub_020225E0(&hitTable[v0], gSystem.touchX, gSystem.touchY)) { return v0; } } else { - if (sub_0202260C(&hitTable[v0], gCoreSys.touchX, gCoreSys.touchY)) { + if (sub_0202260C(&hitTable[v0], gSystem.touchX, gSystem.touchY)) { return v0; } } @@ -105,11 +105,11 @@ int sub_020226DC(const TouchScreenHitTable *hitTable) BOOL TouchScreen_LocationHeld(const TouchScreenHitTable *hitTable) { - if (gCoreSys.touchHeld) { + if (gSystem.touchHeld) { if (hitTable->circle.code == TOUCHSCREEN_USE_CIRCLE) { - return sub_020225E0(hitTable, gCoreSys.touchX, gCoreSys.touchY); + return sub_020225E0(hitTable, gSystem.touchX, gSystem.touchY); } else { - return sub_0202260C(hitTable, gCoreSys.touchX, gCoreSys.touchY); + return sub_0202260C(hitTable, gSystem.touchX, gSystem.touchY); } } @@ -118,11 +118,11 @@ BOOL TouchScreen_LocationHeld(const TouchScreenHitTable *hitTable) BOOL TouchScreen_LocationPressed(const TouchScreenHitTable *hitTable) { - if (gCoreSys.touchPressed) { + if (gSystem.touchPressed) { if (hitTable->circle.code == TOUCHSCREEN_USE_CIRCLE) { - return sub_020225E0(hitTable, gCoreSys.touchX, gCoreSys.touchY); + return sub_020225E0(hitTable, gSystem.touchX, gSystem.touchY); } else { - return sub_0202260C(hitTable, gCoreSys.touchX, gCoreSys.touchY); + return sub_0202260C(hitTable, gSystem.touchX, gSystem.touchY); } } @@ -131,19 +131,19 @@ BOOL TouchScreen_LocationPressed(const TouchScreenHitTable *hitTable) BOOL TouchScreen_Touched(void) { - return gCoreSys.touchHeld; + return gSystem.touchHeld; } BOOL TouchScreen_Tapped(void) { - return gCoreSys.touchPressed; + return gSystem.touchPressed; } BOOL TouchScreen_GetHoldState(u32 *x, u32 *y) { - if (gCoreSys.touchHeld) { - *x = gCoreSys.touchX; - *y = gCoreSys.touchY; + if (gSystem.touchHeld) { + *x = gSystem.touchX; + *y = gSystem.touchY; return TRUE; } @@ -152,9 +152,9 @@ BOOL TouchScreen_GetHoldState(u32 *x, u32 *y) BOOL TouchScreen_GetTapState(u32 *x, u32 *y) { - if (gCoreSys.touchPressed) { - *x = gCoreSys.touchX; - *y = gCoreSys.touchY; + if (gSystem.touchPressed) { + *x = gSystem.touchX; + *y = gSystem.touchY; return TRUE; } diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c index 78c2047d6e..730449862e 100644 --- a/src/unk_0200C6E4.c +++ b/src/unk_0200C6E4.c @@ -23,7 +23,7 @@ #include "sprite_resource.h" #include "sprite_transfer.h" #include "sprite_util.h" -#include "unk_02017728.h" +#include "system.h" typedef struct CellTransferStateData_t { int unk_00; diff --git a/src/unk_0200F174.c b/src/unk_0200F174.c index d44dd68d15..65ad133235 100644 --- a/src/unk_0200F174.c +++ b/src/unk_0200F174.c @@ -14,9 +14,9 @@ #include "heap.h" #include "sys_task.h" #include "sys_task_manager.h" +#include "system.h" #include "unk_0200F85C.h" #include "unk_02012480.h" -#include "unk_02017728.h" typedef struct { UnkStruct_0200F600 *unk_00; diff --git a/src/unk_02017498.c b/src/unk_02017498.c index 9fe9814085..8d35ad626d 100644 --- a/src/unk_02017498.c +++ b/src/unk_02017498.c @@ -11,8 +11,8 @@ #include "gx_layers.h" #include "heap.h" #include "overlay_manager.h" +#include "system.h" #include "unk_020041CC.h" -#include "unk_02017728.h" #include "unk_02033200.h" #include "unk_020393C8.h" #include "unk_0208BA78.h" diff --git a/src/unk_0201E3D8.c b/src/unk_0201E3D8.c index 5134744d29..1812975c48 100644 --- a/src/unk_0201E3D8.c +++ b/src/unk_0201E3D8.c @@ -5,8 +5,8 @@ #include "overlay072/struct_ov72_0223E2A8.h" -#include "core_sys.h" #include "inlines.h" +#include "system.h" static u32 sub_0201E658(u32 param0); static u32 sub_0201E4EC(void); @@ -93,7 +93,7 @@ u32 sub_0201E450(u32 param0) static void sub_0201E4A4(u32 param0, u32 param1, void *param2, u32 param3, u32 param4, u32 param5) { Unk_021C0704.unk_58 = param0; - gCoreSys.unk_64 = param1; + gSystem.unk_64 = param1; Unk_021C0704.unk_00 = param2; Unk_021C0704.unk_04 = param3; Unk_021C0704.unk_08 = param5; diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c index b8c915720c..5a416900a5 100644 --- a/src/unk_0202854C.c +++ b/src/unk_0202854C.c @@ -9,11 +9,11 @@ #include "struct_defs/struct_02029894_sub2.h" #include "struct_defs/struct_020298B0.h" -#include "core_sys.h" #include "heap.h" #include "math.h" #include "rtc.h" #include "savedata.h" +#include "system.h" #include "trainer_info.h" static void sub_02028B48(UndergroundData *param0, int param1, int param2); @@ -101,7 +101,7 @@ void Underground_Init(UndergroundData *param0) RTCTime v2; GetCurrentDateTime(&v1, &v2); - v0 = (((((((u32)v1.year * 32ULL + v1.month) * 32ULL) + v1.day) * 32ULL + v2.hour) * 32ULL + v2.minute) * 32ULL + (v2.second + gCoreSys.vblankCounter)); + v0 = (((((((u32)v1.year * 32ULL + v1.month) * 32ULL) + v1.day) * 32ULL + v2.hour) * 32ULL + v2.minute) * 32ULL + (v2.second + gSystem.vblankCounter)); MI_CpuFill8(param0, 0, sizeof(UndergroundData)); diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 36e4cd686d..489144c5aa 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -27,9 +27,9 @@ #include "pokemon.h" #include "save_player.h" #include "savedata.h" +#include "system.h" #include "trainer_info.h" #include "unk_02006224.h" -#include "unk_02017728.h" #include "unk_02026150.h" BattleRecording *Unk_021C07A4 = NULL; diff --git a/src/unk_02033200.c b/src/unk_02033200.c index 40d60fb955..4a64c8747e 100644 --- a/src/unk_02033200.c +++ b/src/unk_02033200.c @@ -12,9 +12,9 @@ #include "communication_information.h" #include "communication_system.h" #include "heap.h" +#include "system.h" #include "trainer_info.h" #include "unk_02014A84.h" -#include "unk_02017728.h" #include "unk_0202602C.h" #include "unk_02030EE0.h" #include "unk_0203266C.h" diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c index 0f59e5d449..94006a95ae 100644 --- a/src/unk_020366A0.c +++ b/src/unk_020366A0.c @@ -13,13 +13,12 @@ #include "bg_window.h" #include "communication_information.h" #include "communication_system.h" -#include "core_sys.h" #include "heap.h" #include "save_player.h" #include "savedata.h" +#include "system.h" #include "trainer_info.h" #include "unk_02005474.h" -#include "unk_02017728.h" #include "unk_02030EE0.h" #include "unk_0203266C.h" #include "unk_02032798.h" @@ -2464,7 +2463,7 @@ void sub_02038A20(int param0) if (!sub_020389D8()) { sub_0200569C(); SaveData_SaveStateCancel(Unk_021C07D4->unk_28); - gCoreSys.unk_64 = 1; + gSystem.unk_64 = 1; if (Unk_021C07D4->unk_59 == 3) { sub_020389C4(3); diff --git a/src/unk_020393C8.c b/src/unk_020393C8.c index aa7d9f4c6e..706d3303d6 100644 --- a/src/unk_020393C8.c +++ b/src/unk_020393C8.c @@ -10,7 +10,7 @@ #include "inlines.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "unk_02017728.h" +#include "system.h" #include "unk_02033200.h" #include "unk_020366A0.h" diff --git a/src/unk_02039814.c b/src/unk_02039814.c index 4bc43c07fc..202ee180d0 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -6,7 +6,6 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -14,10 +13,10 @@ #include "render_window.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_0200A9DC.h" #include "unk_0200F174.h" -#include "unk_02017728.h" void sub_02039834(int param0, int param1, int param2); @@ -124,7 +123,7 @@ void sub_02039834(int param0, int param1, int param2) GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); G2_BlendNone(); diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index b442c9e2d6..a0cc27875b 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -4,7 +4,6 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -12,10 +11,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" void sub_0201777C(void); @@ -87,7 +86,7 @@ void sub_02039A64(int param0, int param1) GX_SetVisiblePlane(0); GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); G2_BlendNone(); diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c index 8c7ac51eee..f377d08d28 100644 --- a/src/unk_020482D4.c +++ b/src/unk_020482D4.c @@ -3,9 +3,9 @@ #include "field/field_system.h" -#include "core_sys.h" #include "field_script_context.h" #include "inlines.h" +#include "system.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006224.h" @@ -242,7 +242,7 @@ BOOL ScrCmd_283(ScriptContext *param0) BOOL ScrCmd_2F8(ScriptContext *param0) { - if (gCoreSys.heldKeys & PAD_KEY_UP) { + if (gSystem.heldKeys & PAD_KEY_UP) { sub_02004550(22, 1218, 1); } else { sub_02004550(22, 1218, 1); diff --git a/src/unk_02050568.c b/src/unk_02050568.c index 4dfee24443..48edcda6ea 100644 --- a/src/unk_02050568.c +++ b/src/unk_02050568.c @@ -12,7 +12,6 @@ #include "overlay115/camera_angle.h" #include "camera.h" -#include "core_sys.h" #include "field_map_change.h" #include "field_task.h" #include "field_transition.h" @@ -21,6 +20,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" @@ -88,7 +88,7 @@ static BOOL sub_020505A0(FieldTask *taskMan) v1->unk_08++; break; case 5: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { v1->unk_08++; } break; diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index ef8b236703..47fc33ee85 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -9,7 +9,6 @@ #include "field/field_system.h" #include "bg_window.h" -#include "core_sys.h" #include "field_map_change.h" #include "field_overworld_state.h" #include "field_system.h" @@ -28,6 +27,7 @@ #include "script_manager.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200A9DC.h" @@ -150,7 +150,7 @@ static BOOL sub_020529C4(FieldTask *task) } break; case 2: - if ((gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.pressedKeys & PAD_BUTTON_B)) { + if ((gSystem.pressedKeys & PAD_BUTTON_A) || (gSystem.pressedKeys & PAD_BUTTON_B)) { StartScreenTransition(0, 0, 0, 0x0, 8, 1, 32); v0->unk_00++; } diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c index 8c714fa892..832b9891ea 100644 --- a/src/unk_02055C50.c +++ b/src/unk_02055C50.c @@ -15,7 +15,6 @@ #include "bag.h" #include "berry_patches.h" -#include "core_sys.h" #include "easy3d.h" #include "field_task.h" #include "heap.h" @@ -23,6 +22,7 @@ #include "player_avatar.h" #include "savedata_misc.h" #include "sys_task_manager.h" +#include "system.h" #include "unk_0201CED8.h" #include "unk_02054D00.h" #include "unk_020655F4.h" @@ -398,7 +398,7 @@ static BOOL sub_02056124(FieldTask *taskMan) v1->unk_08 = 0; v1->unk_00 = 2; case 2: - if (gCoreSys.heldKeys & PAD_KEY_LEFT) { + if (gSystem.heldKeys & PAD_KEY_LEFT) { MapObject *v2 = sub_02056074(v0, 2); if ((v2 == NULL) || !sub_020560E4(v2)) { @@ -409,7 +409,7 @@ static BOOL sub_02056124(FieldTask *taskMan) v1->unk_00 = 3; break; } - } else if (gCoreSys.heldKeys & PAD_KEY_RIGHT) { + } else if (gSystem.heldKeys & PAD_KEY_RIGHT) { MapObject *v2 = sub_02056074(v0, 3); if ((v2 == NULL) || !sub_020560E4(v2)) { @@ -420,11 +420,11 @@ static BOOL sub_02056124(FieldTask *taskMan) v1->unk_00 = 3; break; } - } else if ((gCoreSys.heldKeys & PAD_KEY_UP) && (v1->unk_04 == 1)) { + } else if ((gSystem.heldKeys & PAD_KEY_UP) && (v1->unk_04 == 1)) { Player_SetDir(v0->playerAvatar, 0); v1->unk_00 = 4; break; - } else if ((gCoreSys.heldKeys & PAD_KEY_DOWN) && (v1->unk_04 == 0)) { + } else if ((gSystem.heldKeys & PAD_KEY_DOWN) && (v1->unk_04 == 0)) { v1->unk_00 = 4; break; } diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 8716cb1b1a..693aa306b7 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -17,7 +17,6 @@ #include "comm_player_manager.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" @@ -33,6 +32,7 @@ #include "savedata.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "trainer_info.h" #include "unk_02005474.h" @@ -279,7 +279,7 @@ static BOOL sub_0205A324(FieldTask *param0) v0->unk_34 = 7; MapObjectMan_StopAllMovement(v0->fieldSystem->mapObjMan); v0->unk_08(1, v0->unk_50); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { v0->unk_34 = 4; CommTiming_StartSync(92); v0->unk_43 = 5; @@ -925,17 +925,17 @@ static void sub_0205AF18(UnkStruct_0205A0D8 *param0, int param1) static int sub_0205AFE4(UnkStruct_0205A0D8 *param0) { do { - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { param0->unk_81 = ((param0->unk_81 == 0) ? (param0->unk_80 - 1) : (param0->unk_81 - 1)); break; } - if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + if (gSystem.pressedKeys & PAD_KEY_DOWN) { param0->unk_81 = (param0->unk_81 == (param0->unk_80 - 1)) ? 0 : (param0->unk_81 + 1); break; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); if (param0->unk_81 < (param0->unk_80 - 1)) { @@ -945,7 +945,7 @@ static int sub_0205AFE4(UnkStruct_0205A0D8 *param0) } } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); return 2; } @@ -1025,7 +1025,7 @@ static BOOL sub_0205B140(FieldTask *param0) break; case 1: if (FieldMessage_FinishedPrinting(v1->unk_20)) { - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { MessageLoader_Free(v1->unk_1C); StringTemplate_Free(v1->unk_18); Strbuf_Free(v1->unk_00); diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index c4aae3c9f2..857fd59060 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -27,7 +27,6 @@ #include "bag.h" #include "bg_window.h" -#include "core_sys.h" #include "field_map_change.h" #include "field_menu.h" #include "field_message.h" @@ -49,6 +48,7 @@ #include "save_player.h" #include "script_manager.h" #include "strbuf.h" +#include "system.h" #include "system_flags.h" #include "unk_0200F174.h" #include "unk_02028124.h" @@ -957,7 +957,7 @@ static BOOL sub_02068F48(FieldTask *task) break; case 1: if (FieldMessage_FinishedPrinting(v1->unk_14) == 1) { - if (gCoreSys.pressedKeys & (PAD_KEY | PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_KEY | PAD_BUTTON_A | PAD_BUTTON_B)) { Window_EraseMessageBox(&v1->unk_00, 0); v1->unk_16++; } diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index 6334e66a6a..f138df468f 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -16,7 +16,6 @@ #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "field_task.h" #include "font.h" #include "game_options.h" @@ -31,6 +30,7 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" @@ -271,13 +271,13 @@ static int sub_0206F498(UnkStruct_0206F7F8 *param0) v0 = ListMenu_ProcessInput(param0->unk_C0); - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); sub_0206FF10(param0); return 10; } - if (!(gCoreSys.pressedKeys & PAD_BUTTON_A)) { + if (!(gSystem.pressedKeys & PAD_BUTTON_A)) { return 3; } @@ -307,13 +307,13 @@ static int sub_0206F508(UnkStruct_0206F7F8 *param0) static int sub_0206F514(UnkStruct_0206F7F8 *param0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { Sound_PlayEffect(1500); sub_02070288(param0); return 2; } - if (gCoreSys.pressedKeys & PAD_BUTTON_SELECT) { + if (gSystem.pressedKeys & PAD_BUTTON_SELECT) { Sound_PlayEffect(1500); sub_0206FFE4(param0); return 6; @@ -326,13 +326,13 @@ static int sub_0206F554(UnkStruct_0206F7F8 *param0) { UnkStruct_0206F3A0 *v0; - if (gCoreSys.pressedKeys & (PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_B)) { Sound_PlayEffect(1500); sub_02070010(param0); return 5; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); param0->unk_0C = 0; param0->unk_328 = &(param0->unk_324[param0->unk_1F].unk_04[param0->unk_32C[param0->unk_28]]); @@ -344,7 +344,7 @@ static int sub_0206F554(UnkStruct_0206F7F8 *param0) return 7; } - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { if (param0->unk_28 > 0) { Sound_PlayEffect(1500); --param0->unk_28; @@ -352,7 +352,7 @@ static int sub_0206F554(UnkStruct_0206F7F8 *param0) } } - if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + if (gSystem.pressedKeys & PAD_KEY_DOWN) { if (param0->unk_28 < (param0->unk_21 - 1)) { Sound_PlayEffect(1500); ++param0->unk_28; @@ -443,7 +443,7 @@ static int sub_0206F748(UnkStruct_0206F7F8 *param0) param0->unk_0C++; break; case 2: - if (!(gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { + if (!(gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { break; } @@ -882,7 +882,7 @@ static BOOL sub_020702D0(FieldTask *param0) CellActorCollection_Update(v1->unk_08->unk_134.unk_00); break; case 9: - if (!(gCoreSys.pressedKeys & PAD_BUTTON_A)) { + if (!(gSystem.pressedKeys & PAD_BUTTON_A)) { return 0; } diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 99824e3faf..a6869f0142 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -14,7 +14,6 @@ #include "bag.h" #include "bg_window.h" -#include "core_sys.h" #include "field_system.h" #include "field_task.h" #include "font.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_0200F174.h" @@ -253,13 +253,13 @@ static void sub_02072390(SysTask *param0, void *param1) sub_0206A870(v0->unk_1A4); } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { sub_02072EA4(v0, sub_02072518, sub_02072364); Sound_PlayEffect(1500); return; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); switch (v1) { @@ -309,13 +309,13 @@ static void sub_02072470(SysTask *param0, void *param1) v1 = ListMenu_ProcessInput(v0->unk_160); - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { sub_02072EA4(v0, sub_02072534, sub_02072370); Sound_PlayEffect(1500); return; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); switch (v1) { @@ -487,7 +487,7 @@ static void sub_020726B4(SysTask *param0, void *param1) } break; case 2: - if (!(gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { + if (!(gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { return; } @@ -567,7 +567,7 @@ static void sub_020727F8(SysTask *param0, void *param1) } break; case 2: - if (!(gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { + if (!(gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { return; } diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index b9722f2fe4..cf94a74c82 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -22,7 +22,6 @@ #include "bag.h" #include "bg_window.h" -#include "core_sys.h" #include "game_options.h" #include "game_records.h" #include "graphics.h" @@ -44,13 +43,13 @@ #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_0200762C.h" #include "unk_0200F174.h" #include "unk_0201567C.h" #include "unk_02015F84.h" -#include "unk_02017728.h" #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_02028124.h" @@ -242,7 +241,7 @@ static void sub_0207B180(UnkStruct_0207AE68 *param0) } } - if ((param0->unk_7C & 0x1) && (param0->unk_64 == 8) && (gCoreSys.pressedKeys & PAD_BUTTON_B)) { + if ((param0->unk_7C & 0x1) && (param0->unk_64 == 8) && (gSystem.pressedKeys & PAD_BUTTON_B)) { PaletteData_StartFade(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), (0xc00 ^ 0xffff), 0, 0, 16, 0x7fff); param0->unk_64 = 41; } diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 1abc2721be..c468146e1c 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -18,7 +18,6 @@ #include "bag.h" #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "game_overlay.h" @@ -37,6 +36,7 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "touch_screen.h" #include "unk_020041CC.h" @@ -44,7 +44,6 @@ #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" -#include "unk_02017728.h" #include "unk_0201E010.h" #include "unk_0201E3D8.h" #include "unk_02024220.h" @@ -589,7 +588,7 @@ static int sub_0207E6C0(GameWindowLayout *param0) static int sub_0207E6E4(GameWindowLayout *param0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); return 32; } @@ -1423,13 +1422,13 @@ static u8 sub_0207FA24(GameWindowLayout *param0) v1 = 4; - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { v1 = 0; - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { v1 = 1; - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) { v1 = 2; - } else if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { + } else if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) { v1 = 3; } @@ -1624,7 +1623,7 @@ static u8 sub_0207FE98(GameWindowLayout *param0) { u8 v0; - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (param0->unk_B11 == 6) { return 4; } else if (param0->unk_B11 == 7) { @@ -1664,7 +1663,7 @@ static u8 sub_0207FE98(GameWindowLayout *param0) } } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { if (param0->unk_B0F_7 == 0) { Sound_PlayEffect(1500); param0->unk_B11 = 7; @@ -2033,7 +2032,7 @@ static u8 sub_020805E4(GameWindowLayout *param0) { u8 v0; - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); if ((param0->unk_B11 >= 6) || (param0->unk_B11 == param0->unk_B0F_0)) { @@ -2045,7 +2044,7 @@ static u8 sub_020805E4(GameWindowLayout *param0) } } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); sub_02083B88(param0); return 3; @@ -2308,7 +2307,7 @@ static int GetValidWindowLayout(GameWindowLayout *param0) if (v0 != 0xffffffff) { u16 v1 = 0xfffe; - if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gCoreSys.touchX, gCoreSys.touchY, &v1) == 0) { + if (Bg_DoesPixelAtXYMatchVal(param0->unk_00, 4, gSystem.touchX, gSystem.touchY, &v1) == 0) { return 0xffffffff; } } @@ -2363,7 +2362,7 @@ static int ProcessWindowInput(GameWindowLayout *param0) { switch (param0->unk_B14[1]) { case 0: - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (param0->unk_B11 >= 6) { Sound_PlayEffect(1500); sub_02083B88(param0); @@ -2392,7 +2391,7 @@ static int ProcessWindowInput(GameWindowLayout *param0) } } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); sub_02083B88(param0); return 1; @@ -2426,7 +2425,7 @@ static int ProcessWindowInput(GameWindowLayout *param0) } break; case 1: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); Window_EraseMessageBox(¶m0->unk_04[34], 1); sub_0200D414(param0->unk_5B0[6], 0); @@ -2466,7 +2465,7 @@ static int ProcessWindowInput(GameWindowLayout *param0) } break; case 4: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); Window_EraseMessageBox(¶m0->unk_04[34], 1); sub_0200D414(param0->unk_5B0[6], 0); @@ -2525,7 +2524,7 @@ static u8 HandleSpecialInput(GameWindowLayout *param0) { u8 v0; - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { if (param0->unk_B11 == 7) { if (param0->unk_B0F_7 == 0) { Sound_PlayEffect(1500); @@ -2543,7 +2542,7 @@ static u8 HandleSpecialInput(GameWindowLayout *param0) return 5; } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { if (param0->unk_B0F_7 == 0) { Sound_PlayEffect(1500); param0->unk_B11 = 7; @@ -2733,7 +2732,7 @@ static void SwapPokemonItem(GameWindowLayout *param0, Pokemon *param1, u32 param static int HandleMessageCompletion(GameWindowLayout *param0) { if (Text_IsPrinterActive(param0->unk_B10) == 0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return ResetWindowOnInput(param0); } } @@ -2744,7 +2743,7 @@ static int HandleMessageCompletion(GameWindowLayout *param0) static int ProcessMessageResult(GameWindowLayout *param0) { if (Text_IsPrinterActive(param0->unk_B10) == 0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Window_EraseMessageBox(¶m0->unk_04[34], 1); LoadOverlay118(param0); return 13; diff --git a/src/unk_02083370.c b/src/unk_02083370.c index 75986adedd..79d94a53bd 100644 --- a/src/unk_02083370.c +++ b/src/unk_02083370.c @@ -17,7 +17,6 @@ #include "bag.h" #include "bg_window.h" #include "cell_actor.h" -#include "core_sys.h" #include "font.h" #include "heap.h" #include "menu.h" @@ -27,6 +26,7 @@ #include "render_window.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" @@ -219,7 +219,7 @@ static void sub_020834B0(GameWindowLayout *param0, int *param1) int sub_02083658(GameWindowLayout *param0) { if (Text_IsPrinterActive(param0->unk_B10) == 0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Window_EraseMessageBox(¶m0->unk_04[34], 1); sub_020826E0(param0, 29, 1); sub_0200D414(param0->unk_5B0[6], 0); @@ -233,7 +233,7 @@ int sub_02083658(GameWindowLayout *param0) int sub_020836A8(GameWindowLayout *param0) { if (Text_IsPrinterActive(param0->unk_B10) == 0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Window_EraseMessageBox(¶m0->unk_04[34], 1); LoadOverlay118(param0); return 19; @@ -378,7 +378,7 @@ static int sub_02083990(void *param0) int sub_020839BC(GameWindowLayout *param0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Window_EraseMessageBox(¶m0->unk_04[34], 1); sub_020826E0(param0, 29, 1); sub_0200D414(param0->unk_5B0[6], 0); @@ -762,7 +762,7 @@ static void sub_020844B0(GameWindowLayout *param0, int *param1) int sub_020845A8(GameWindowLayout *param0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Window_EraseMessageBox(¶m0->unk_04[34], 1); sub_020826E0(param0, 34, 1); sub_0200D414(param0->unk_5B0[6], 0); @@ -1033,7 +1033,7 @@ static int sub_02084A18(GameWindowLayout *param0) int sub_02084B34(GameWindowLayout *param0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Window_EraseMessageBox(¶m0->unk_04[34], 1); sub_020826E0(param0, 29, 1); sub_0200D414(param0->unk_5B0[6], 0); diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index 508dabe7fa..cb6f79094e 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -10,7 +10,6 @@ #include "bag.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "heap.h" #include "item.h" @@ -24,6 +23,7 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0207E0B8.h" @@ -405,7 +405,7 @@ int sub_02085348(void *param0) return 5; } - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { v0->unk_5A4->unk_23 = 0; return 32; } @@ -632,7 +632,7 @@ int sub_02085804(GameWindowLayout *param0) break; } - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); v3 = param0->unk_B11; param0->unk_B11 = sub_020857C0(param0, param0->unk_B11 + 1); @@ -718,7 +718,7 @@ static int sub_02085C50(void *param0) switch (v0->unk_B13) { case 0: if (Text_IsPrinterActive(v0->unk_B10) == 0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); sub_020829DC(v0); v0->unk_B13 = 1; @@ -726,14 +726,14 @@ static int sub_02085C50(void *param0) } break; case 1: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); sub_02082B58(v0); v0->unk_B13 = 2; } break; case 2: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); sub_02082C10(v0); v0->unk_B13 = 3; @@ -779,14 +779,14 @@ static int sub_02085C50(void *param0) break; case 4: if (Text_IsPrinterActive(v0->unk_B10) == 0) { - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); v0->unk_B13 = 3; } } break; case 5: - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); sub_02086590(v0, v1, v0->unk_5A4->unk_28); v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 61); @@ -1036,7 +1036,7 @@ int sub_020863A0(GameWindowLayout *param0) Pokemon *v0; Strbuf *v1; - if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { + if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); sub_02086590(param0, v0, param0->unk_5A4->unk_28); diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index f35c08db3b..768d42537f 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -11,7 +11,6 @@ #include "cell_actor.h" #include "char_transfer.h" #include "charcode_util.h" -#include "core_sys.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -33,6 +32,7 @@ #include "strbuf.h" #include "string_template.h" #include "sys_task_manager.h" +#include "system.h" #include "text.h" #include "unk_020041CC.h" #include "unk_02005474.h" @@ -40,7 +40,6 @@ #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_0201567C.h" -#include "unk_02017728.h" #include "unk_020797C8.h" #include "vram_transfer.h" @@ -913,7 +912,7 @@ static int sub_0208694C(OverlayManager *param0, int *param1) sub_0208732C(1); { - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); } @@ -1021,7 +1020,7 @@ static int sub_02086D38(UnkStruct_02087A10 *param0, int param1) { sub_02088350(param0); - if (gCoreSys.pressedKeys & PAD_BUTTON_SELECT) { + if (gSystem.pressedKeys & PAD_BUTTON_SELECT) { if (CellActor_GetDrawFlag(param0->unk_390[8]) == 0) { CellActor_SetDrawFlag(param0->unk_390[8], 1); return param1; @@ -1047,15 +1046,15 @@ static int sub_02086D38(UnkStruct_02087A10 *param0, int param1) sub_02088844(param0->unk_3A, param0->unk_4C4); Sound_PlayEffect(1694); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + } else if (gSystem.pressedKeys & PAD_BUTTON_A) { param1 = sub_02088898(param0, param0->unk_3A[param0->unk_1C.unk_04][param0->unk_1C.unk_00], 1); param0->unk_1C.unk_14 = 1; } else if (param0->unk_62C == 1) { param1 = sub_02088898(param0, param0->unk_3A[param0->unk_1C.unk_04][param0->unk_1C.unk_00], 0); param0->unk_1C.unk_14 = 0; - } else if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + } else if (gSystem.pressedKeys & PAD_BUTTON_B) { param1 = sub_02088898(param0, (0xe001 + 6), 1); - } else if (gCoreSys.pressedKeys & PAD_BUTTON_R) { + } else if (gSystem.pressedKeys & PAD_BUTTON_R) { param1 = sub_02088898(param0, (0xe001 + 5), 1); } @@ -1181,7 +1180,7 @@ static int sub_02086F3C(OverlayManager *param0, int *param1) Heap_Destroy(18); { - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); } @@ -1952,35 +1951,35 @@ static void sub_02088350(UnkStruct_02087A10 *param0) v2 = 1; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { Sound_PlayEffect(1500); CellActor_SetDrawFlag(param0->unk_390[8], 1); v1 = 1; v0++; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { Sound_PlayEffect(1500); CellActor_SetDrawFlag(param0->unk_390[8], 1); v1 = 2; v0++; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) { Sound_PlayEffect(1500); CellActor_SetDrawFlag(param0->unk_390[8], 1); v1 = 3; v0++; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) { Sound_PlayEffect(1500); CellActor_SetDrawFlag(param0->unk_390[8], 1); v1 = 4; v0++; } - if (gCoreSys.pressedKeys & PAD_BUTTON_START) { + if (gSystem.pressedKeys & PAD_BUTTON_START) { Sound_PlayEffect(1500); CellActor_SetDrawFlag(param0->unk_390[8], 1); param0->unk_1C.unk_00 = 12; @@ -2223,7 +2222,7 @@ static int sub_02088898(UnkStruct_02087A10 *param0, u16 param1, int param2) } } - if ((CellActor_GetDrawFlag(param0->unk_390[8]) == 0) && (gCoreSys.touchPressed == 0)) { + if ((CellActor_GetDrawFlag(param0->unk_390[8]) == 0) && (gSystem.touchPressed == 0)) { CellActor_SetDrawFlag(param0->unk_390[8], 1); return 2; } @@ -2596,9 +2595,9 @@ static BOOL sub_0208903C(UnkStruct_02087A10 *param0) v1 = 4; } - if (gCoreSys.touchPressed) { - v2 = gCoreSys.touchX; - v3 = gCoreSys.touchY; + if (gSystem.touchPressed) { + v2 = gSystem.touchX; + v3 = gSystem.touchY; for (v0 = v1; v0 < (NELEMS(Unk_020F2A14)); v0++) { v4 = Unk_020F2A14[v0].unk_00; diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index 806f9095e0..827b6750be 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -9,7 +9,6 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" #include "game_options.h" #include "gx_layers.h" #include "heap.h" @@ -17,8 +16,8 @@ #include "overlay_manager.h" #include "palette.h" #include "strbuf.h" +#include "system.h" #include "unk_0200C6E4.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_02023FCC.h" #include "unk_020393C8.h" @@ -340,7 +339,7 @@ static void sub_0208945C(BgConfig *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); } - gCoreSys.unk_65 = 1; + gSystem.unk_65 = 1; GXLayers_SwapDisplay(); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); diff --git a/src/unk_02089604.c b/src/unk_02089604.c index f1a7826cd8..af6410af69 100644 --- a/src/unk_02089604.c +++ b/src/unk_02089604.c @@ -5,10 +5,10 @@ #include "struct_defs/struct_02089688.h" -#include "core_sys.h" #include "heap.h" #include "palette.h" #include "strbuf.h" +#include "system.h" #include "touch_screen.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" @@ -347,7 +347,7 @@ asm void sub_02089C20 (UnkStruct_02089688 * param0) ldr r0, [r4, r0] cmp r0, #1 bne _02089CBC - ldr r0, = gCoreSys + ldr r0, = gSystem ldr r0, [r0, #0x48] cmp r0, #0 beq _02089C80 @@ -387,7 +387,7 @@ asm void sub_02089C20 (UnkStruct_02089688 * param0) str r1, [r4, r0] pop {r3, r4, r5, r6, r7, pc} _02089CBC: - ldr r0, = gCoreSys + ldr r0, = gSystem mov r1, #0x40 ldr r0, [r0, #0x4c] tst r1, r0 @@ -475,7 +475,7 @@ asm void sub_02089C20 (UnkStruct_02089688 * param0) mov r6, #1 b _02089F2A _02089D56: - ldr r1, = gCoreSys + ldr r1, = gSystem ldr r7, [r1, #0x48] mov r1, #1 tst r1, r7 diff --git a/src/unk_0208BEBC.c b/src/unk_0208BEBC.c index 26f9079bac..d862ae055c 100644 --- a/src/unk_0208BEBC.c +++ b/src/unk_0208BEBC.c @@ -7,11 +7,11 @@ #include "overlay062/ov62_022300D8.h" #include "overlay062/ov62_02231690.h" -#include "core_sys.h" #include "game_overlay.h" #include "gx_layers.h" #include "heap.h" #include "savedata_misc.h" +#include "system.h" #include "unk_020041CC.h" #include "unk_0208B284.h" #include "unk_0208BA78.h" @@ -125,7 +125,7 @@ static int sub_0208BF6C(OverlayManager *param0, int *param1) ov62_0222F514(v0); Heap_Destroy(102); Overlay_UnloadByID(FS_OVERLAY_ID(overlay62)); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); return 1; diff --git a/src/unk_0208C098.c b/src/unk_0208C098.c index 42c0bbb079..a2dfa77091 100644 --- a/src/unk_0208C098.c +++ b/src/unk_0208C098.c @@ -4,9 +4,9 @@ #include #include "bg_window.h" -#include "core_sys.h" #include "heap.h" #include "narc.h" +#include "system.h" #include "unk_0200F174.h" __attribute__((aligned(4))) static const u16 Unk_020F4030[] = { @@ -94,7 +94,7 @@ u8 sub_0208C15C(s16 *param0, u16 param1) v0 = *param0; - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) { *param0 += 1; if (*param0 > param1) { @@ -108,7 +108,7 @@ u8 sub_0208C15C(s16 *param0, u16 param1) return 1; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) { *param0 -= 1; if (*param0 <= 0) { @@ -122,7 +122,7 @@ u8 sub_0208C15C(s16 *param0, u16 param1) return 2; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) { *param0 -= 10; if (*param0 <= 0) { @@ -136,7 +136,7 @@ u8 sub_0208C15C(s16 *param0, u16 param1) return 2; } - if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { + if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) { *param0 += 10; if (*param0 > param1) { diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 1832eda5f8..6fb4c0501d 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -31,11 +31,11 @@ #include "pokemon.h" #include "save_player.h" #include "savedata.h" +#include "system.h" #include "unk_020041CC.h" #include "unk_0200762C.h" #include "unk_0200F174.h" #include "unk_02015F84.h" -#include "unk_02017728.h" #include "unk_0201E3D8.h" #include "unk_02023FCC.h" #include "unk_02024220.h" diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 1efb2bdab6..84d8fd55ee 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -29,12 +29,12 @@ #include "palette.h" #include "pokemon.h" #include "save_player.h" +#include "system.h" #include "trainer_info.h" #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_0200F174.h" #include "unk_02015F84.h" -#include "unk_02017728.h" #include "unk_02024220.h" #include "unk_0202F180.h" #include "unk_0208694C.h" diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index 4d62cbf792..cd54216990 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -4,7 +4,6 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -15,11 +14,11 @@ #include "render_window.h" #include "savedata.h" #include "strbuf.h" +#include "system.h" #include "text.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "unk_02017728.h" FS_EXTERN_OVERLAY(overlay77); @@ -339,7 +338,7 @@ static BOOL sub_0209A200(UnkStruct_02099DFC *param0, u32 param1, int param2, int } break; case 2: - if ((param2 != 0) || (gCoreSys.pressedKeys & 1)) { + if ((param2 != 0) || (gSystem.pressedKeys & 1)) { param0->unk_08 = 0; v0 = 1; } diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index d667c84f9e..f2aff172d4 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -4,7 +4,6 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -15,9 +14,9 @@ #include "render_window.h" #include "savedata.h" #include "strbuf.h" +#include "system.h" #include "text.h" #include "unk_0200F174.h" -#include "unk_02017728.h" FS_EXTERN_OVERLAY(overlay97); @@ -316,7 +315,7 @@ static BOOL sub_0209A688(UnkStruct_0209A3D0 *param0, u32 param1, int param2, int } break; case 2: - if ((param2 != 0) || (gCoreSys.pressedKeys & PAD_BUTTON_A)) { + if ((param2 != 0) || (gSystem.pressedKeys & PAD_BUTTON_A)) { param0->unk_0C = 0; v0 = 1; } diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index 24c72cb6c7..4d2502b723 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -6,7 +6,6 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -14,10 +13,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" static const UnkStruct_02099F80 Unk_020F8AF8 = { GX_VRAM_BG_256_AB, @@ -84,7 +83,7 @@ void sub_0209A74C(int param0) GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); G2_BlendNone(); @@ -157,7 +156,7 @@ void sub_0209A8E0(int param0) GX_SetVisiblePlane(0); GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); G2_BlendNone(); diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index bd248b2fcf..6164afcdd7 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -6,7 +6,6 @@ #include "struct_defs/struct_02099F80.h" #include "bg_window.h" -#include "core_sys.h" #include "font.h" #include "gx_layers.h" #include "heap.h" @@ -14,10 +13,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" void sub_0201777C(void); @@ -93,7 +92,7 @@ void sub_0209AA74(int param0, int param1) GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gCoreSys.unk_65 = 0; + gSystem.unk_65 = 0; GXLayers_SwapDisplay(); G2_BlendNone(); diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index c68097022e..c68e3f26e0 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -11,7 +11,6 @@ #include "bg_window.h" #include "colored_arrow.h" -#include "core_sys.h" #include "field_message.h" #include "field_task.h" #include "heap.h" @@ -20,6 +19,7 @@ #include "save_player.h" #include "strbuf.h" #include "string_template.h" +#include "system.h" #include "text.h" #include "unk_02005474.h" #include "unk_0200F174.h" @@ -239,7 +239,7 @@ static BOOL sub_0209AE14(FieldTask *param0) break; case 12: if (sub_0209B100(v0)) { - 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)) { sub_0209B110(v0); v0->unk_54 = 13; } @@ -356,7 +356,7 @@ static void sub_0209B27C(UnkStruct_0209AD84 *param0) static int sub_0209B288(UnkStruct_0209AD84 *param0) { do { - if (gCoreSys.pressedKeys & PAD_KEY_UP) { + if (gSystem.pressedKeys & PAD_KEY_UP) { param0->unk_5C--; if (param0->unk_5C < 0) { @@ -369,7 +369,7 @@ static int sub_0209B288(UnkStruct_0209AD84 *param0) break; } - if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { + if (gSystem.pressedKeys & PAD_KEY_DOWN) { param0->unk_5C++; if (param0->unk_5C >= param0->unk_60) { @@ -382,12 +382,12 @@ static int sub_0209B288(UnkStruct_0209AD84 *param0) break; } - if (gCoreSys.pressedKeys & PAD_BUTTON_A) { + if (gSystem.pressedKeys & PAD_BUTTON_A) { Sound_PlayEffect(1500); return param0->unk_5C; } - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); return param0->unk_60 - 1; } diff --git a/src/unk_0209B6F8.c b/src/unk_0209B6F8.c index f9d5365a7d..de3931a9aa 100644 --- a/src/unk_0209B6F8.c +++ b/src/unk_0209B6F8.c @@ -17,10 +17,10 @@ #include "overlay104/struct_ov104_0223D3B0_sub1.h" #include "overlay104/struct_ov104_0223D8F0.h" -#include "core_sys.h" #include "game_overlay.h" #include "heap.h" #include "overlay_manager.h" +#include "system.h" #include "constdata/const_020F8BE0.h" @@ -112,7 +112,7 @@ int sub_0209B75C(OverlayManager *param0, int *param1) } if (ov104_0222E6A8(v0->unk_14) == 1) { - if (gCoreSys.pressedKeys & PAD_BUTTON_B) { + if (gSystem.pressedKeys & PAD_BUTTON_B) { *param1 = 2; } } From c1d0ee500001ccda565bd035011135a37f0078c3 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 7 Feb 2025 22:54:11 -0800 Subject: [PATCH 4/5] Document system.c --- include/constants/heap.h | 7 + include/system.h | 36 +- .../journal_display/journal_controller.c | 6 +- src/applications/options_menu.c | 6 +- .../pokemon_summary_screen/main.c | 6 +- src/battle/ov16_0223B140.c | 10 +- src/choose_starter/choose_starter_app.c | 4 +- src/dw_warp/dw_warp.c | 9 +- src/error_message_reset.c | 6 +- src/field_map_change.c | 2 +- src/gx_layers.c | 2 +- src/library_tv/library_tv.c | 6 +- src/main.c | 12 +- src/overlay005/fieldmap.c | 6 +- src/overlay005/ov5_021E779C.c | 2 +- src/overlay010/ov10_0221F800.c | 10 +- src/overlay017/ov17_0223B140.c | 6 +- src/overlay017/ov17_0223CB1C.c | 6 +- src/overlay017/ov17_0223DAD0.c | 6 +- src/overlay017/ov17_0224F4D4.c | 6 +- src/overlay019/ov19_021D61B0.c | 4 +- src/overlay020/ov20_021D2098.c | 4 +- src/overlay021/ov21_021D0D80.c | 4 +- src/overlay022/ov22_02255094.c | 6 +- src/overlay022/ov22_02255D44.c | 8 +- src/overlay022/ov22_0225B660.c | 8 +- src/overlay023/ov23_0223E140.c | 4 +- src/overlay058/ov58_021D0D80.c | 8 +- src/overlay059/ov59_021D0D80.c | 6 +- src/overlay061/ov61_0222BF44.c | 10 +- src/overlay062/ov62_0222F2C0.c | 8 +- src/overlay062/ov62_02231690.c | 2 +- src/overlay062/ov62_02237D24.c | 10 +- src/overlay064/ov64_0222DCE0.c | 18 +- src/overlay065/ov65_0222DCE0.c | 6 +- src/overlay065/ov65_0223648C.c | 4 +- src/overlay066/ov66_0222DCE0.c | 4 +- src/overlay067/ov67_0225C700.c | 8 +- src/overlay068/ov68_0225C700.c | 8 +- src/overlay069/ov69_0225C700.c | 10 +- src/overlay070/ov70_0225D9A4.c | 8 +- src/overlay071/ov71_0223B140.c | 6 +- src/overlay072/ov72_0223D7A0.c | 8 +- src/overlay073/ov73_021D0D80.c | 8 +- src/overlay073/ov73_021D3250.c | 6 +- src/overlay075/ov75_021D0D80.c | 6 +- src/overlay076/ov76_0223D338.c | 4 +- src/overlay077/ov77_021D0D80.c | 12 +- src/overlay077/ov77_021D25B0.c | 28 +- src/overlay077/ov77_021D54B0.c | 4 +- src/overlay079/ov79_021D0D80.c | 6 +- src/overlay079/ov79_021D2268.c | 6 +- src/overlay080/ov80_021D0D80.c | 6 +- src/overlay083/ov83_0223B5A0.c | 4 +- src/overlay083/ov83_0223C958.c | 6 +- src/overlay084/ov84_0223B5A0.c | 6 +- src/overlay085/ov85_02241440.c | 6 +- src/overlay086/ov86_0223B140.c | 2 +- src/overlay087/ov87_021D106C.c | 4 +- src/overlay088/ov88_0223B140.c | 8 +- src/overlay090/ov90_021D0D80.c | 6 +- src/overlay091/ov91_021D0D80.c | 8 +- src/overlay092/ov92_021D0D80.c | 10 +- src/overlay093/ov93_021D0D80.c | 2 +- src/overlay093/ov93_021D111C.c | 2 +- src/overlay094/ov94_0223BCB0.c | 6 +- src/overlay095/ov95_02246C20.c | 2 +- src/overlay095/ov95_02249740.c | 2 +- src/overlay095/ov95_0224A390.c | 4 +- src/overlay096/ov96_0223B6A0.c | 6 +- src/overlay097/ov97_0222AE60.c | 4 +- src/overlay097/ov97_02233B18.c | 21 +- src/overlay097/ov97_02237694.c | 4 +- src/overlay098/ov98_022471C8.c | 407 +++++++++--------- src/overlay099/ov99_021D0D80.c | 10 +- src/overlay099/ov99_021D1A54.c | 4 +- src/overlay100/ov100_021D0D80.c | 10 +- src/overlay100/ov100_021D46C8.c | 2 +- src/overlay101/ov101_021D0D80.c | 6 +- src/overlay102/ov102_021D0D80.c | 6 +- src/overlay104/ov104_0223C2D4.c | 6 +- src/overlay105/ov105_02241AE0.c | 6 +- src/overlay106/ov106_02241AE0.c | 6 +- src/overlay107/ov107_02241AE0.c | 6 +- src/overlay107/ov107_02245EB0.c | 6 +- src/overlay108/ov108_02241AE0.c | 6 +- src/overlay109/ov109_021D0D80.c | 6 +- src/overlay109/ov109_021D3D50.c | 6 +- src/overlay110/ov110_021D0D80.c | 6 +- src/overlay111/ov111_021D0D80.c | 6 +- src/overlay112/ov112_0225C700.c | 10 +- src/overlay113/ov113_0225C700.c | 9 +- src/overlay114/ov114_0225C700.c | 4 +- src/overlay115/ov115_02260440.c | 6 +- src/overlay116/ov116_022604C4.c | 10 +- src/overlay117/ov117_02260668.c | 10 +- src/savedata.c | 26 +- src/system.c | 328 ++++++-------- src/unk_02017498.c | 2 +- src/unk_0201E3D8.c | 2 +- src/unk_020366A0.c | 2 +- src/unk_02039814.c | 6 +- src/unk_02039A64.c | 8 +- src/unk_0207AE68.c | 4 +- src/unk_0207E0B8.c | 6 +- src/unk_0208694C.c | 12 +- src/unk_020890F4.c | 8 +- src/unk_0208BEBC.c | 4 +- src/unk_02097B18.c | 2 +- src/unk_02098218.c | 6 +- src/unk_02099DFC.c | 6 +- src/unk_0209A2C4.c | 4 +- src/unk_0209A74C.c | 10 +- src/unk_0209AA74.c | 10 +- 114 files changed, 757 insertions(+), 758 deletions(-) diff --git a/include/constants/heap.h b/include/constants/heap.h index 84f6e54153..927c512510 100644 --- a/include/constants/heap.h +++ b/include/constants/heap.h @@ -31,9 +31,16 @@ enum HeapId { HEAP_ID_GAME_START = 77, HEAP_ID_LIBRARY_TV = 120, + + HEAP_ID_MAX = 123, }; enum HeapSize { + HEAP_SIZE_SYSTEM = 0xD200, + HEAP_SIZE_SAVE = 0x20E00, + HEAP_SIZE_DEBUG = 0x10, + HEAP_SIZE_APPLICATION = 0x10D800, + HEAP_SIZE_POKETCH_MAIN = 0xC000, HEAP_SIZE_POKETCH_APP = 0xC000, diff --git a/include/system.h b/include/system.h index e9e781cc5d..d03d6393db 100644 --- a/include/system.h +++ b/include/system.h @@ -1,6 +1,8 @@ #ifndef POKEPLATINUM_SYSTEM_H #define POKEPLATINUM_SYSTEM_H +#include "constants/heap.h" + #include "sys_task_manager.h" typedef void (*Callback)(void *); @@ -13,14 +15,18 @@ enum ButtonMode { BUTTON_MODE_L_IS_A = 3, }; +enum SleepType { + SLEEP_TYPE_SAVE_DATA = 1, +}; + #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 vblankCallback; + void *vblankCallbackData; Callback hblankCallback; void *hblankCallbackData; UnkCallback dummyCallback_10; @@ -29,7 +35,7 @@ typedef struct System { SysTaskManager *vBlankTaskMgr; SysTaskManager *postVBlankTaskMgr; SysTaskManager *printTaskMgr; - u32 *unk_28; + u32 *unused_28; u32 vblankCounter; u32 frameCounter; enum ButtonMode buttonMode; @@ -46,8 +52,8 @@ typedef struct System { u16 touchY; u16 touchPressed; u16 touchHeld; - u8 unk_64; - u8 unk_65; + u8 touchAutoSampling; + u8 whichScreenIs3D; u8 gbaCartridgeVersion; u8 inhibitSleep; u8 inhibitReset; @@ -58,24 +64,24 @@ typedef struct System { extern System gSystem; -void sub_02017728(void); -void SetMainCallback(Callback cb, void *data); +void SetDummyVBlankIntr(void); +void SetVBlankCallback(Callback cb, void *data); void DisableHBlank(void); BOOL SetHBlankCallback(Callback cb, void *data); -void sub_0201789C(void); -void InitGraphics(void); +void InitSystem(void); +void InitVRAM(void); void *ReadFileToHeap(int heapID, const char *filename); void ReadFileToBuffer(const char *filename, void **buf); -void sub_02017ACC(void); +void ClearUnusedSystemCache(void); void InitKeypadAndTouchpad(void); void SetGBACartridgeVersion(int version); -void SleepLock(u8 param0); -void SleepUnlock(u8 param0); +void SleepLock(u8 mask); +void SleepUnlock(u8 mask); void ReadKeypadAndTouchpad(void); void SetAutorepeat(int rate, int delay); -void ResetLock(u8 param0); -void ResetUnlock(u8 param0); -void InitHeapCanary(int param0); +void ResetLock(u8 mask); +void ResetUnlock(u8 mask); +void InitHeapCanary(enum HeapId param0); void FreeHeapCanary(void); BOOL HeapCanaryOK(void); diff --git a/src/applications/journal_display/journal_controller.c b/src/applications/journal_display/journal_controller.c index b614137025..61509a3b66 100644 --- a/src/applications/journal_display/journal_controller.c +++ b/src/applications/journal_display/journal_controller.c @@ -69,7 +69,7 @@ int JournalController_Init(OverlayManager *ovyManager, int *state) JournalManager *journalManager; SaveData *saveData; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -102,7 +102,7 @@ int JournalController_Init(OverlayManager *ovyManager, int *state) JournalPrinter_PrintEntry(journalManager, 0); ov81_021D1434(journalManager); - SetMainCallback(JournalController_MainCallback, journalManager); + SetVBlankCallback(JournalController_MainCallback, journalManager); GXLayers_TurnBothDispOn(); sub_02039734(); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -141,7 +141,7 @@ int JournalController_Exit(OverlayManager *ovyManager, int *state) { JournalManager *journalManager = OverlayManager_Data(ovyManager); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); JournalPrinter_RemoveWindows(journalManager); JournalController_TeardownBgs(journalManager->bgConfig); diff --git a/src/applications/options_menu.c b/src/applications/options_menu.c index 3009047674..12583fc47c 100644 --- a/src/applications/options_menu.c +++ b/src/applications/options_menu.c @@ -351,7 +351,7 @@ static int SetupMenuVisuals(OptionsMenuData *menuData) { switch (menuData->subState) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -380,7 +380,7 @@ static int SetupMenuVisuals(OptionsMenuData *menuData) VramTransfer_New(32, menuData->heapID); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, TRUE); DrawWifiConnectionIcon(); - SetMainCallback(OptionsMenuVBlank, menuData); + SetVBlankCallback(OptionsMenuVBlank, menuData); menuData->subState = 0; return TRUE; } @@ -410,7 +410,7 @@ static int TeardownMenuData(OptionsMenuData *menuData) break; case 1: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c index 7277b3e00a..6bb82b55eb 100644 --- a/src/applications/pokemon_summary_screen/main.c +++ b/src/applications/pokemon_summary_screen/main.c @@ -201,7 +201,7 @@ BOOL PokemonSummaryScreen_ShowContestData(SaveData *saveData) static int PokemonSummaryScreen_Init(OverlayManager *ovyManager, int *state) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -246,7 +246,7 @@ static int PokemonSummaryScreen_Init(OverlayManager *ovyManager, int *state) SetupInitialPageGfx(summaryScreen); PokemonSummaryScreen_SetSubscreenType(summaryScreen); PokemonSummaryScreen_SetupCamera(summaryScreen); - SetMainCallback(PokemonSummaryScreenVBlank, summaryScreen); + SetVBlankCallback(PokemonSummaryScreenVBlank, summaryScreen); GXLayers_TurnBothDispOn(); sub_02004550(61, 0, 0); DrawWifiConnectionIcon(); @@ -338,7 +338,7 @@ static int PokemonSummaryScreen_Exit(OverlayManager *ovyManager, int *state) { PokemonSummaryScreen *summaryScreen = OverlayManager_Data(ovyManager); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); PokemonSummaryScreen_FreeCameraAndMonSprite(summaryScreen); PokemonSummaryScreen_FreeSpriteResources(summaryScreen); PokemonSummaryScreen_RemoveWindows(summaryScreen); diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index edfa6f66f1..e8c472f268 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -313,7 +313,7 @@ void ov16_0223B384(BattleSystem *param0) void ov16_0223B3E4(BattleSystem *param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); ov16_02268A14(param0->unk_198); Window_Remove(¶m0->windows[0]); @@ -466,7 +466,7 @@ void ov16_0223B578(BattleSystem *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - SetMainCallback(ov16_0223CE68, param0); + SetVBlankCallback(ov16_0223CE68, param0); param0->unk_23FB_1 = 1; @@ -949,7 +949,7 @@ static void ov16_0223C004(BattleSystem *param0, BgConfig *param1) GXLayers_TurnBothDispOn(); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - SetMainCallback(ov16_0223CE68, param0); + SetVBlankCallback(ov16_0223CE68, param0); } static void ov16_0223C210(BattleSystem *param0) @@ -1749,7 +1749,7 @@ static void ov16_0223D10C(OverlayManager *param0, FieldBattleDTO *param1) MessageLoader_Free(v5); } - SetMainCallback(ov16_0223CF1C, v0); + SetVBlankCallback(ov16_0223CF1C, v0); PaletteData_StartFade(v0->unk_0C, (0x1 | 0x4), 0xffff, 0, 16, 0, 0x0); v0->unk_1024 = Window_AddWaitDial(v0->unk_08, 1); @@ -1988,7 +1988,7 @@ static void ov16_0223D7B4(OverlayManager *param0) { UnkStruct_0207A778 *v0 = OverlayManager_Data(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); sub_0200F344(0, 0x0); PaletteData_FreeBuffer(v0->unk_0C, 0); PaletteData_Free(v0->unk_0C); diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index 48171e8276..0e75a6ef4c 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -331,7 +331,7 @@ BOOL ChooseStarter_Init(OverlayManager *param0, int *param1) app->unk_704 = Options_TextFrameDelay(data->options); VramTransfer_New(8, HEAP_ID_CHOOSE_STARTER_APP); - SetMainCallback(ChooseStarterAppMainCallback, app); + SetVBlankCallback(ChooseStarterAppMainCallback, app); DisableHBlank(); sub_0201E3D8(); @@ -439,7 +439,7 @@ BOOL ChooseStarter_Exit(OverlayManager *param0, int *param1) ChooseStarterData *v1 = OverlayManager_Args(param0); BOOL v2; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); v1->species = GetSelectedSpecies(v0->cursorPosition); diff --git a/src/dw_warp/dw_warp.c b/src/dw_warp/dw_warp.c index 8f321f907e..07dc5c1827 100644 --- a/src/dw_warp/dw_warp.c +++ b/src/dw_warp/dw_warp.c @@ -3,6 +3,7 @@ #include #include +#include "constants/screen.h" #include "generated/sdat.h" #include "struct_defs/struct_0207C690.h" @@ -62,7 +63,7 @@ static void DWWarp_CameraMove(DistortionWorldWarp *warp); BOOL DWWarp_Init(OverlayManager *ovy, int *state) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -89,7 +90,7 @@ BOOL DWWarp_Init(OverlayManager *ovy, int *state) DWWarp_InitCamera(dww); StartScreenTransition(0, 1, 1, 0x0, 16, 1, HEAP_ID_DISTORTION_WORLD_WARP); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); GXLayers_TurnBothDispOn(); @@ -98,7 +99,7 @@ BOOL DWWarp_Init(OverlayManager *ovy, int *state) RenderControlFlags_SetSpeedUpOnTouch(0); dww->task = SysTask_Start(DWWarp_Update, dww, 60000); - SetMainCallback(DWWarp_VBlankIntr, dww); + SetVBlankCallback(DWWarp_VBlankIntr, dww); return TRUE; } @@ -158,7 +159,7 @@ BOOL DWWarp_Exit(OverlayManager *ovy, int *state) DWWarp_DeleteCamera(warp); DWWarp_Exit3D(warp->p3DCallback); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); sub_0201E530(); RenderControlFlags_SetCanABSpeedUpPrint(0); diff --git a/src/error_message_reset.c b/src/error_message_reset.c index d4fe03fae3..19e16e7521 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "bg_window.h" @@ -106,7 +108,7 @@ void ErrorMessageReset_PrintErrorAndReset(void) OS_SetIrqFunction(OS_IE_V_BLANK, VBlankIntr); OS_EnableIrqMask(OS_IE_V_BLANK); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -116,7 +118,7 @@ void ErrorMessageReset_PrintErrorAndReset(void) GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); G2_BlendNone(); diff --git a/src/field_map_change.c b/src/field_map_change.c index 8d6eb07283..1e9b38b364 100644 --- a/src/field_map_change.c +++ b/src/field_map_change.c @@ -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); - gSystem.unk_65 = fieldSystem->mapLoadMode->unk_00_12; + gSystem.whichScreenIs3D = fieldSystem->mapLoadMode->unk_00_12; } void FieldMapChange_UpdateGameData(FieldSystem *fieldSystem, BOOL noWarp) diff --git a/src/gx_layers.c b/src/gx_layers.c index 38e40dd649..3534997ec0 100644 --- a/src/gx_layers.c +++ b/src/gx_layers.c @@ -98,7 +98,7 @@ void GXLayers_TurnBothDispOn(void) void GXLayers_SwapDisplay(void) { - if (gSystem.unk_65 == 0) { + if (gSystem.whichScreenIs3D == 0) { GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); } else { GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index 1c0f60deaa..4364cc034a 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -72,7 +72,7 @@ BOOL LibraryTV_Main(OverlayManager *ovy, int *state) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -86,7 +86,7 @@ BOOL LibraryTV_Main(OverlayManager *ovy, int *state) LibraryTV_SetVramBank(ltv); LibraryTV_SetMsgLdr(ltv); - SetMainCallback(LibraryTV_VBlank, (void *)ltv); + SetVBlankCallback(LibraryTV_VBlank, (void *)ltv); GXLayers_TurnBothDispOn(); ltv->waitTiming = 0; @@ -136,7 +136,7 @@ BOOL LibraryTV_Main(OverlayManager *ovy, int *state) if (IsScreenTransitionDone() == 1) { LibraryTV_ReleaseMsgLdr(ltv); LibraryTV_ReleaseVramBank(ltv); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); result = TRUE; } break; diff --git a/src/main.c b/src/main.c index 68d4e0dfd2..020ddfda08 100644 --- a/src/main.c +++ b/src/main.c @@ -67,8 +67,8 @@ extern const OverlayManagerTemplate gOpeningCutsceneOverlayTemplate; void NitroMain(void) { - sub_0201789C(); - InitGraphics(); + InitSystem(); + InitVRAM(); InitKeypadAndTouchpad(); SetGBACartridgeVersion(NULL); @@ -156,8 +156,8 @@ void NitroMain(void) sub_0200ABF0(); sub_0200F27C(); - if (gSystem.mainCallback != NULL) { - gSystem.mainCallback(gSystem.mainCallbackData); + if (gSystem.vblankCallback != NULL) { + gSystem.vblankCallback(gSystem.vblankCallbackData); } UpdateSound(); @@ -217,8 +217,8 @@ static void WaitFrame(void) gSystem.vblankCounter++; gSystem.frameCounter = 0; - if (gSystem.mainCallback != NULL) { - gSystem.mainCallback(gSystem.mainCallbackData); + if (gSystem.vblankCallback != NULL) { + gSystem.vblankCallback(gSystem.vblankCallbackData); } } diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index 7342f61806..4478ea8a2d 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -153,7 +153,7 @@ static BOOL FieldMap_Init(OverlayManager *overlayMan, int *param1) switch (*param1) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); G2_BlendNone(); @@ -334,7 +334,7 @@ static BOOL FieldMap_Exit(OverlayManager *overlayMan, int *param1) VramTransfer_Free(); Easy3D_Shutdown(); ov5_021D1AE4(fieldSystem->unk_04->unk_04); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_FreeToHeap(fieldSystem->bgConfig); Heap_FreeToHeap(fieldSystem->unk_04); @@ -915,7 +915,7 @@ static void ov5_021D1968(FieldSystem *fieldSystem) ov5_021D5CE4(fieldSystem->unk_04->unk_10, ov5_021EFA8C(fieldSystem->unk_30)); sub_02068344(fieldSystem); ov5_021EE7C0(fieldSystem); - SetMainCallback(fieldmap, fieldSystem); + SetVBlankCallback(fieldmap, fieldSystem); } static UnkStruct_ov5_021D1A68 *ov5_021D1A14(int fieldSystem, int param1) diff --git a/src/overlay005/ov5_021E779C.c b/src/overlay005/ov5_021E779C.c index 73b9d858e9..cfe7987b00 100644 --- a/src/overlay005/ov5_021E779C.c +++ b/src/overlay005/ov5_021E779C.c @@ -1616,7 +1616,7 @@ void ov5_021E924C(UnkStruct_ov5_021E8F60 *param0) { u8 v0; - sub_02017ACC(); + ClearUnusedSystemCache(); NNS_GfdResetLnkTexVramState(); NNS_GfdResetLnkPlttVramState(); diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index bf74512bc8..e9838ee3e3 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -542,7 +542,7 @@ static u8 ov10_0221FB28(UnkStruct_ov10_0221FB28 *param0) { G2_BlendNone(); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -605,7 +605,7 @@ static u8 ov10_0221FBFC(UnkStruct_ov10_0221FB28 *param0) ov10_02221C14(param0); sub_02039734(); sub_0208C120(0, param0->unk_00->unk_24); - SetMainCallback(ov10_02220C64, param0); + SetVBlankCallback(ov10_02220C64, param0); return 1; } @@ -629,7 +629,7 @@ static u8 ov10_0221FC78(UnkStruct_ov10_0221FB28 *param0) break; case 2: sub_0208C120(0, param0->unk_00->unk_24); - SetMainCallback(ov10_02220C64, param0); + SetVBlankCallback(ov10_02220C64, param0); param0->unk_B76 = 0; param0->unk_B70 = 8; param0->unk_B71 = 4; @@ -681,7 +681,7 @@ static u8 ov10_0221FD00(UnkStruct_ov10_0221FB28 *param0) break; case 2: sub_0208C120(0, param0->unk_00->unk_24); - SetMainCallback(ov10_02220C64, param0); + SetVBlankCallback(ov10_02220C64, param0); param0->unk_B76 = 0; param0->unk_B70 = 4; param0->unk_B71 = 2; @@ -1145,7 +1145,7 @@ static u8 ov10_02220A50(SysTask *param0, UnkStruct_ov10_0221FB28 *param1) return 0; } - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); ov10_02222A48(param1); if (param1->unk_00->unk_28 != 0) { diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 59affa8ad5..dff65676c1 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -143,7 +143,7 @@ int ov17_0223B140(OverlayManager *param0, int *param1) { UnkStruct_ov17_02246F24 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -257,7 +257,7 @@ int ov17_0223B140(OverlayManager *param0, int *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); sub_02004550(6, 1135, 1); sub_020959F4(v0->unk_00->unk_155); - SetMainCallback(ov17_0223B6BC, v0); + SetVBlankCallback(ov17_0223B6BC, v0); return 1; } @@ -372,7 +372,7 @@ int ov17_0223B580(OverlayManager *param0, int *param1) sub_0201E530(); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); Heap_Destroy(21); sub_02095A24(); diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 41ba1040f5..cd8e62f1b4 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -124,7 +124,7 @@ int ov17_0223CB1C(OverlayManager *param0, int *param1) { UnkStruct_ov17_02247A48 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -219,7 +219,7 @@ int ov17_0223CB1C(OverlayManager *param0, int *param1) sub_02004234(0); sub_02004550(6, 1135, 1); sub_020959F4(v0->unk_00->unk_155); - SetMainCallback(ov17_0223D0C8, v0); + SetVBlankCallback(ov17_0223D0C8, v0); Sound_PlayEffect(1541); return 1; @@ -337,7 +337,7 @@ int ov17_0223CF8C(OverlayManager *param0, int *param1) sub_0201E530(); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); Heap_Destroy(22); sub_02095A24(); diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index 7114819228..e971be3216 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -223,7 +223,7 @@ int ov17_0223DAD0(OverlayManager *param0, int *param1) { UnkStruct_ov17_0224DF54 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -328,7 +328,7 @@ int ov17_0223DAD0(OverlayManager *param0, int *param1) G2_SetBlendBrightness((GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ), -6); Sound_PlayEffect(1765); - SetMainCallback(ov17_0223E09C, v0); + SetVBlankCallback(ov17_0223E09C, v0); return 1; } @@ -444,7 +444,7 @@ int ov17_0223DF0C(OverlayManager *param0, int *param1) sub_0201E530(); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); Heap_Destroy(23); sub_02095A24(); diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index d52c13c888..182e4caa0a 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -134,7 +134,7 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1) { UnkStruct_ov17_0224FCA0 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -215,7 +215,7 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); sub_02004550(6, 1135, 1); sub_020959F4(v0->unk_00->unk_155); - SetMainCallback(ov17_0224FA24, v0); + SetVBlankCallback(ov17_0224FA24, v0); v0->unk_08 = SysTask_ExecuteOnVBlank(ov17_0224FAE4, v0, 10); Sound_PlayEffect(1765); @@ -330,7 +330,7 @@ int ov17_0224F86C(OverlayManager *param0, int *param1) GX_SetVisibleWnd(GX_WNDMASK_NONE); GXS_SetVisibleWnd(GX_WNDMASK_NONE); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); Heap_Destroy(24); sub_02095A24(); diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index a1a6f11e38..f24526c1c5 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -163,7 +163,7 @@ BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 **param0, const UnkStruct_ov19_021D4D v3 = NARC_ctor(NARC_INDEX_GRAPHIC__BOX, 10); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -234,7 +234,7 @@ static void ov19_021D6474(SysTask *param0, void *param1) void ov19_021D64A0(UnkStruct_ov19_021D61B0 *param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SysTask_Done(param0->unk_00); SysTask_Done(param0->unk_04); diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c index 3eb72086da..daa87b09ac 100644 --- a/src/overlay020/ov20_021D2098.c +++ b/src/overlay020/ov20_021D2098.c @@ -105,7 +105,7 @@ UnkStruct_ov20_021D2128 *ov20_021D2098(const UnkStruct_ov20_021D16E8 *param0, co if (v0) { int v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); v0->unk_18 = param0; @@ -132,7 +132,7 @@ void ov20_021D2128(UnkStruct_ov20_021D2128 *param0) if (param0) { int v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); for (v0 = 0; v0 < 4; v0++) { if (param0->unk_08[v0]) { diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 1d7f48bb0a..c2d48d77b3 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -138,7 +138,7 @@ int ov21_021D0D80(OverlayManager *param0, int *param1) u32 form = Pokedex_GetDisplayForm(v1->pokedex, 487, 0); Pokedex_SetupGiratina(form); - SetMainCallback(ov21_021D0F04, v0); + SetVBlankCallback(ov21_021D0F04, v0); DisableHBlank(); sub_0201E3D8(); @@ -205,7 +205,7 @@ int ov21_021D0EC8(OverlayManager *param0, int *param1) UnkStruct_ov21_021D0F18 *v0 = OverlayManager_Data(param0); BOOL v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); v1 = sub_0201E530(); GF_ASSERT(v1 == 1); diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index 4844dd962e..28ba96b276 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_defs/struct_02099F80.h" @@ -63,14 +65,14 @@ void ov22_02255094(void) ov22_02255654(); ov22_022556DC(); - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); } void ov22_022550B4(void) { - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); ov22_02255738(); diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 6bfdf30fd5..0f0962d8f4 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -201,7 +201,7 @@ int ov22_02255D44(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov22_02255D44), 13); memset(v0, 0, sizeof(UnkStruct_ov22_02255D44)); - SetMainCallback(ov22_02256940, v0); + SetVBlankCallback(ov22_02256940, v0); DisableHBlank(); v2 = OverlayManager_Args(param0); @@ -393,7 +393,7 @@ int ov22_02256098(OverlayManager *param0, int *param1) ov22_022594AC(&v0->unk_3C0); ov22_022566F4(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); v1 = sub_0201E530(); @@ -418,7 +418,7 @@ int ov22_02256174(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov22_02255D44), 13); memset(v0, 0, sizeof(UnkStruct_ov22_02255D44)); - SetMainCallback(ov22_02256940, v0); + SetVBlankCallback(ov22_02256940, v0); DisableHBlank(); v2 = OverlayManager_Args(param0); @@ -654,7 +654,7 @@ int ov22_02256600(OverlayManager *param0, int *param1) ov22_022594AC(&v0->unk_3C0); ov22_022566F4(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); v1 = sub_0201E530(); diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index e0aafe6e7e..fbe4342877 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" #include "struct_defs/struct_02041DC8.h" @@ -64,7 +66,7 @@ int ov22_0225B660(OverlayManager *param0, int *param1) v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov22_0225B85C), 13); memset(v0, 0, sizeof(UnkStruct_ov22_0225B85C)); - SetMainCallback(ov22_0225B848, v0); + SetVBlankCallback(ov22_0225B848, v0); DisableHBlank(); v1 = OverlayManager_Args(param0); @@ -79,7 +81,7 @@ int ov22_0225B660(OverlayManager *param0, int *param1) v0->unk_0C = v1->unk_08; ov22_02255094(); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); ov22_022555D4(&v0->unk_14, 14); @@ -163,7 +165,7 @@ int ov22_0225B7FC(OverlayManager *param0, int *param1) ov22_022555FC(&v0->unk_14); ov22_022550B4(); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); OverlayManager_FreeData(param0); Heap_Destroy(13); diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index 714e5217f5..60c507fa15 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -1306,7 +1306,7 @@ static void ov23_0223EE80(UnkStruct_ov23_0223EE80 *param0) v1 = BgConfig_New(29); Unk_ov23_02257740->unk_04 = v1; - SetMainCallback(ov23_022411E8, v1); + SetVBlankCallback(ov23_022411E8, v1); ov23_02253E2C(ov23_0224219C(), v1, (512 - (18 + 12)), (((512 - (18 + 12)) - 73) - (27 * 4))); ov23_0223EC34(v1); @@ -1389,7 +1389,7 @@ static void ov23_0223F020(UnkStruct_ov23_0223EE80 *param0) CharTransfer_Free(); PlttTransfer_Free(); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_FreeToHeap(Unk_ov23_02257740->unk_04); Unk_ov23_02257740->unk_04 = NULL; diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 37a3f33e15..3cd651c854 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -158,7 +158,7 @@ int ov58_021D0D80(OverlayManager *param0, int *param1) switch (*param1) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -195,7 +195,7 @@ int ov58_021D0D80(OverlayManager *param0, int *param1) sub_0201E3D8(); sub_0201E450(2); - SetMainCallback(ov58_021D115C, v0->unk_00); + SetVBlankCallback(ov58_021D115C, v0->unk_00); ov58_021D12C4(v0); ov58_021D1524(); @@ -306,7 +306,7 @@ int ov58_021D1018(OverlayManager *param0, int *param1) journalEntryOnlineEvent = JournalEntry_CreateEventDrewPictures(39); JournalEntry_SaveData(v1->unk_04, journalEntryOnlineEvent, JOURNAL_ONLINE_EVENT); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SpriteTransfer_ResetCharTransfer(v0->unk_1D4[0][0]); SpriteTransfer_ResetCharTransfer(v0->unk_1D4[1][0]); SpriteTransfer_ResetPlttTransfer(v0->unk_1D4[0][1]); @@ -356,7 +356,7 @@ int ov58_021D1018(OverlayManager *param0, int *param1) Heap_FreeToHeap(v0->unk_08); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(39); sub_02037B58(2); diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index a8f78efb73..4f6543c235 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -165,7 +165,7 @@ int ov59_021D0D80(OverlayManager *param0, int *param1) switch (*param1) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -196,7 +196,7 @@ int ov59_021D0D80(OverlayManager *param0, int *param1) StartScreenTransition(0, 17, 17, 0x0, 16, 1, 51); ov59_021D1388(v0, v1); - SetMainCallback(ov59_021D1100, v0); + SetVBlankCallback(ov59_021D1100, v0); ov59_021D1250(v0, v1); ov59_021D1474(); @@ -320,7 +320,7 @@ int ov59_021D0FF4(OverlayManager *param0, int *param1) GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); sub_0205BEA8(0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(51); return 1; diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 511775911d..474937350c 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -4,6 +4,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_0202B370_decl.h" #include "struct_defs/struct_02017498.h" #include "struct_defs/struct_02099F80.h" @@ -139,7 +141,7 @@ int ov61_0222BF44(OverlayManager *param0, int *param1) { UnkStruct_ov61_0222C664 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -182,13 +184,13 @@ int ov61_0222BF44(OverlayManager *param0, int *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); RenderControlFlags_SetCanABSpeedUpPrint(1); RenderControlFlags_SetAutoScrollFlags(0); RenderControlFlags_SetSpeedUpOnTouch(0); - SetMainCallback(ov61_0222C1FC, v0); + SetVBlankCallback(ov61_0222C1FC, v0); if (v0->unk_00->unk_10) { sub_02039734(); @@ -257,7 +259,7 @@ int ov61_0222C160(OverlayManager *param0, int *param1) ov61_0222C70C(v0); Heap_FreeToHeap(v0->unk_04); ov61_0222C38C(v0->unk_04); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); VramTransfer_Free(); sub_0201E530(); diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index 1797428075..307632c2d6 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -47,7 +47,7 @@ static void ov62_0222F848(UnkStruct_0208C06C *param0); void ov62_0222F2C0(UnkStruct_0208C06C *param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -81,7 +81,7 @@ void ov62_0222F2C0(UnkStruct_0208C06C *param0) RenderControlFlags_SetSpeedUpOnTouch(1); } - SetMainCallback(ov62_0222F8E4, param0); + SetVBlankCallback(ov62_0222F8E4, param0); if (param0->unk_00 != 0) { ov62_02241130(param0); @@ -207,7 +207,7 @@ void ov62_0222F514(UnkStruct_0208C06C *param0) ov62_022411EC(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); VramTransfer_Free(); } @@ -303,7 +303,7 @@ static void ov62_0222F670(BgConfig *param0) void ov62_0222F824(int param0) { - gSystem.unk_65 = param0; + gSystem.whichScreenIs3D = param0; GXLayers_SwapDisplay(); } diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index f3af314d4e..6d619b19c3 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -2747,7 +2747,7 @@ static void ov62_02234440(UnkStruct_0208C06C *param0) param0->unk_41D8.unk_0C = NULL; } - if (gSystem.unk_65 == 0) { + if (gSystem.whichScreenIs3D == 0) { param0->unk_41D8.unk_08 = param0->unk_6F4; } else { param0->unk_41D8.unk_08 = param0->unk_6F0; diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 9f02f2e874..ec24963716 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -306,7 +306,7 @@ static BOOL ov62_02237F08(UnkStruct_0208C06C *param0) ov62_02234540(param0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); - SetMainCallback(ov62_022394D8, param0); + SetVBlankCallback(ov62_022394D8, param0); param0->unk_08++; break; case 1: @@ -478,7 +478,7 @@ static BOOL ov62_022380B0(UnkStruct_0208C06C *param0) Heap_FreeToHeap(v0); Overlay_UnloadByID(FS_OVERLAY_ID(overlay22)); - SetMainCallback(ov62_0222F8E4, param0); + SetVBlankCallback(ov62_0222F8E4, param0); } else { PaletteData_BlendMulti(param0->unk_14.unk_14, 1, 0x2, v0->unk_08, param0->unk_14.unk_44); PaletteData_BlendMulti(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44); @@ -567,7 +567,7 @@ static BOOL ov62_022383E4(UnkStruct_0208C06C *param0) Heap_FreeToHeap(v0); Overlay_UnloadByID(FS_OVERLAY_ID(overlay22)); - SetMainCallback(ov62_0222F8E4, param0); + SetVBlankCallback(ov62_0222F8E4, param0); } else { PaletteData_BlendMulti(param0->unk_14.unk_14, 1, 0x2, v0->unk_08, param0->unk_14.unk_44); PaletteData_BlendMulti(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44); @@ -817,7 +817,7 @@ static BOOL ov62_0223896C(UnkStruct_0208C06C *param0) Heap_FreeToHeap(v0); Overlay_UnloadByID(FS_OVERLAY_ID(overlay22)); - SetMainCallback(ov62_0222F8E4, param0); + SetVBlankCallback(ov62_0222F8E4, param0); } else { PaletteData_BlendMulti(param0->unk_14.unk_14, 1, 0x2, v0->unk_08, param0->unk_14.unk_44); PaletteData_BlendMulti(param0->unk_14.unk_14, 3, 0xC, v0->unk_08, param0->unk_14.unk_44); @@ -920,7 +920,7 @@ static BOOL ov62_02238D04(UnkStruct_0208C06C *param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); - SetMainCallback(ov62_022394D8, param0); + SetVBlankCallback(ov62_022394D8, param0); param0->unk_08++; break; case 1: diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 5ad227fc27..982a62c4d5 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -5,6 +5,7 @@ #include #include "constants/savedata/vars_flags.h" +#include "constants/screen.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0203068C_decl.h" @@ -22,7 +23,6 @@ #include "bg_window.h" #include "cell_actor.h" #include "char_transfer.h" -#include "system.h" #include "enums.h" #include "font.h" #include "game_options.h" @@ -39,7 +39,9 @@ #include "overlay_manager.h" #include "pltt_transfer.h" #include "pokemon.h" +#include "render_oam.h" #include "render_text.h" +#include "render_view.h" #include "render_window.h" #include "save_player.h" #include "savedata.h" @@ -49,15 +51,13 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "system_flags.h" #include "text.h" #include "trainer_info.h" #include "unk_02005474.h" -#include "render_oam.h" #include "unk_0200F174.h" #include "unk_020131EC.h" -#include "system.h" -#include "render_view.h" #include "unk_0202ACE0.h" #include "unk_0203061C.h" #include "unk_0203909C.h" @@ -607,7 +607,7 @@ int ov64_0222DCE0(OverlayManager *param0, int *param1) ov64_02230620(&v0->unk_41C, &v0->unk_28C, &v0->unk_04, 52); ov64_022308DC(&v0->unk_444, &v0->unk_28C, &v0->unk_04, 52); - SetMainCallback(ov64_0222DF3C, v0); + SetVBlankCallback(ov64_0222DF3C, v0); DisableHBlank(); return 1; @@ -666,7 +666,7 @@ int ov64_0222DEA4(OverlayManager *param0, int *param1) { UnkStruct_ov64_0222DFD0 *v0 = OverlayManager_Data(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); ov64_0222EC8C(&v0->unk_2C8, &v0->unk_28C, &v0->unk_04); @@ -701,13 +701,13 @@ static void ov64_0222DF48(UnkStruct_ov64_0222DFD0 *param0, u32 param1) ov64_02230680(¶m0->unk_41C, ¶m0->unk_28C, ¶m0->unk_04, param1); ov64_02230B1C(¶m0->unk_444, ¶m0->unk_28C, ¶m0->unk_04, param1); - SetMainCallback(ov64_0222DF3C, param0); + SetVBlankCallback(ov64_0222DF3C, param0); DisableHBlank(); } static void ov64_0222DFD0(UnkStruct_ov64_0222DFD0 *param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); ov64_0222EE00(¶m0->unk_2C8, ¶m0->unk_28C, ¶m0->unk_04); @@ -832,7 +832,7 @@ static void ov64_0222E164(UnkStruct_ov64_0222E060 *param0) static void ov64_0222E1A4(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_0222E060 *param1, u32 param2) { - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); param0->unk_21C = NARC_ctor(NARC_INDEX_GRAPHIC__PL_WIFINOTE, param2); diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 15fd809853..2f5fb608de 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -688,7 +688,7 @@ static void ov65_0222E01C(UnkStruct_ov65_0222EBE0 *param0) { NARC *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -711,7 +711,7 @@ static void ov65_0222E01C(UnkStruct_ov65_0222EBE0 *param0) inline_ov61_0222C3B0(¶m0->unk_E2C, v0, 4, 54); - SetMainCallback(ov65_0222E5E0, param0); + SetVBlankCallback(ov65_0222E5E0, param0); ov65_0222EDD0(); ov65_0222EE18(param0, v0); @@ -846,7 +846,7 @@ static void ov65_0222E47C(UnkStruct_ov65_0222EBE0 *param0) { int v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); inline_ov61_0222C160(¶m0->unk_E2C); diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index d281252d4e..f11504ef89 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -417,7 +417,7 @@ int ov65_0223648C(OverlayManager *param0, int *param1) ov65_0223760C(v0); ov65_022367A8(v0, v1, 96); - SetMainCallback(ov65_02236780, v0); + SetVBlankCallback(ov65_02236780, v0); sub_02039734(); v0->unk_00.unk_27 = 1; @@ -497,7 +497,7 @@ int ov65_0223668C(OverlayManager *param0, int *param1) UnkStruct_ov65_022367A8 *v0 = OverlayManager_Data(param0); UnkStruct_0207DE04 *v1 = OverlayManager_Args(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); ov65_0223761C(v0); ov65_022377E8(v0); diff --git a/src/overlay066/ov66_0222DCE0.c b/src/overlay066/ov66_0222DCE0.c index 0b1aec23b0..9f65b489a5 100644 --- a/src/overlay066/ov66_0222DCE0.c +++ b/src/overlay066/ov66_0222DCE0.c @@ -53,7 +53,7 @@ int ov66_0222DCE0(OverlayManager *param0, int *param1) v0->unk_04 = ov66_0222DDF0(v0->unk_00, 104); v0->unk_08 = ov66_02230C44(v1->unk_08, v1->unk_04, v1->unk_00, v0->unk_04, 104); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); v0->unk_0C = SysTask_ExecuteAfterVBlank(ov66_0222DDDC, v0, 0); @@ -87,7 +87,7 @@ int ov66_0222DD90(OverlayManager *param0, int *param1) v0 = OverlayManager_Data(param0); SysTask_Done(v0->unk_0C); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); ov66_02230C90(v0->unk_08); diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 9f799bd52f..a8223565b6 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -185,7 +185,7 @@ int ov67_0225C700(OverlayManager *param0, int *param1) ov67_0225D188(&v0->unk_10, v0->unk_0C, 1, 674, 5, 1, 22, 2, (((((1 + (18 + 12)) + 9) + (27 * 4)) + (23 * 16)) + (6 * 4)), v0->unk_00, 112); ov67_0225D37C(&v0->unk_10, 21); - SetMainCallback(ov67_0225CE28, v0); + SetVBlankCallback(ov67_0225CE28, v0); DisableHBlank(); return 1; @@ -384,7 +384,7 @@ int ov67_0225CB1C(OverlayManager *param0, int *param1) v0 = OverlayManager_Data(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); inline_ov61_0222C160(&v0->unk_D4); @@ -423,7 +423,7 @@ int ov67_0225CB8C(OverlayManager *param0, int *param1) ov67_0225D37C(&v0->unk_10, 21); sub_02039734(); - SetMainCallback(ov67_0225CE28, v0); + SetVBlankCallback(ov67_0225CE28, v0); DisableHBlank(); return 1; @@ -521,7 +521,7 @@ int ov67_0225CDC0(OverlayManager *param0, int *param1) v0 = OverlayManager_Data(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); inline_ov61_0222C160(&v0->unk_D4); diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 786e70bbaa..e529e40653 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -5,6 +5,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_02030EC4_decl.h" #include "struct_defs/struct_02099F80.h" @@ -333,7 +335,7 @@ int ov68_0225C700(OverlayManager *param0, int *param1) GF_ASSERT(v1->unk_08 < 2); Unk_ov68_0225DEB0[v1->unk_08](&v0->unk_1DC, &v0->unk_1A8, &v0->unk_00, v1, 122); - SetMainCallback(ov68_0225C914, v0); + SetVBlankCallback(ov68_0225C914, v0); DisableHBlank(); return 1; @@ -407,7 +409,7 @@ int ov68_0225C8A8(OverlayManager *param0, int *param1) v0 = OverlayManager_Data(param0); v1 = OverlayManager_Args(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); Unk_ov68_0225DEA0[v1->unk_08](&v0->unk_1DC, &v0->unk_1A8, &v0->unk_00); @@ -468,7 +470,7 @@ static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 SetAllGraphicsModes(&Unk_ov68_0225DD48); param0->unk_00 = BgConfig_New(param2); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index b4f212f698..4813500ba9 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/struct_02015958.h" @@ -702,7 +704,7 @@ int ov69_0225C700(OverlayManager *param0, int *param1) ov69_0225DEC0(&v0->unk_BC70, &v0->unk_20, &v0->unk_1CC, 105); ov69_0225D030(v0, v1); - SetMainCallback(ov69_0225CF90, v0); + SetVBlankCallback(ov69_0225CF90, v0); DisableHBlank(); return 1; @@ -773,7 +775,7 @@ int ov69_0225C8FC(OverlayManager *param0, int *param1) v0 = OverlayManager_Data(param0); v1 = OverlayManager_Args(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); ov69_0225DFBC(&v0->unk_BC70, &v0->unk_20); @@ -1406,7 +1408,7 @@ static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 SetAllGraphicsModes(&Unk_ov69_0225F040); param0->unk_00 = BgConfig_New(param2); - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); @@ -1458,7 +1460,7 @@ static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0) } Heap_FreeToHeap(param0->unk_00); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); } diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 2054d59e71..d404568b8a 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -4,6 +4,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -646,7 +648,7 @@ int ov70_0225D9A4(OverlayManager *param0, int *param1) v0->unk_438 = ov70_02269190(v0->unk_34, v0->unk_44C, v0->unk_450, v0->unk_444, 112, 113); v0->unk_440 = ov70_0226C60C(112, v0); - SetMainCallback(ov70_0225E4C8, v0); + SetVBlankCallback(ov70_0225E4C8, v0); DisableHBlank(); return 1; @@ -784,7 +786,7 @@ int ov70_0225DDF8(OverlayManager *param0, int *param1) v1->unk_18 = v0->unk_01; } - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); ov70_0226C6F8(v0->unk_440); @@ -1262,7 +1264,7 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 VramTransfer_New(32, param2); GXLayers_SetBanks(&Unk_ov70_0226D664); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); { diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index db17e8b58e..a6668ff1f3 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -141,7 +141,7 @@ int ov71_0223B140(OverlayManager *param0, int *param1) UnkStruct_ov71_0223B620 *v0; NARC *v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -242,7 +242,7 @@ int ov71_0223B140(OverlayManager *param0, int *param1) ov71_0223C288(); - SetMainCallback(ov71_0223C18C, NULL); + SetVBlankCallback(ov71_0223C18C, NULL); DrawWifiConnectionIcon(); sub_0200544C(1, (127 / 3)); StartScreenTransition(2, 3, 3, 0x0, 6, 1, 25); @@ -391,7 +391,7 @@ int ov71_0223B5B8(OverlayManager *param0, int *param1) sub_0201E530(); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(25); sub_0200544C(1, 127); diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index ffa3423c0b..47e5d86c8e 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -113,7 +113,7 @@ int ov72_0223D7A0(OverlayManager *param0, int *param1) case 0: sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -147,7 +147,7 @@ int ov72_0223D7A0(OverlayManager *param0, int *param1) sub_0201E3D8(); sub_0201E450(1); - SetMainCallback(ov72_0223DA48, v0->unk_00); + SetVBlankCallback(ov72_0223DA48, v0->unk_00); Font_InitManager(FONT_SUBSCREEN, 39); ov72_0223DB98(v0); @@ -208,7 +208,7 @@ int ov72_0223D984(OverlayManager *param0, int *param1) ov72_0223E9B4(v0->unk_5BFC, v0->unk_328.pixels); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SpriteTransfer_ResetCharTransfer(v0->unk_1DC[0][0]); SpriteTransfer_ResetCharTransfer(v0->unk_1DC[1][0]); SpriteTransfer_ResetPlttTransfer(v0->unk_1DC[0][1]); @@ -234,7 +234,7 @@ int ov72_0223D984(OverlayManager *param0, int *param1) GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(39); return 1; diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 11d47e3352..baf06e3cc4 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -162,7 +162,7 @@ int ov73_021D0E20(OverlayManager *param0, int *param1) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -176,7 +176,7 @@ int ov73_021D0E20(OverlayManager *param0, int *param1) ov73_021D12C4(v0); ov73_021D1318(v0); - SetMainCallback(ov73_021D0FF0, (void *)v0); + SetVBlankCallback(ov73_021D0FF0, (void *)v0); GXLayers_TurnBothDispOn(); *param1 = 1; @@ -197,7 +197,7 @@ int ov73_021D0E20(OverlayManager *param0, int *param1) ov73_021D1300(v0); ov73_021D1238(v0); ov73_021D1328(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); v1 = 1; } @@ -207,7 +207,7 @@ int ov73_021D0E20(OverlayManager *param0, int *param1) ov73_021D1300(v0); ov73_021D1238(v0); ov73_021D1328(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); *param1 = 4; } break; diff --git a/src/overlay073/ov73_021D3250.c b/src/overlay073/ov73_021D3250.c index bc40834fd3..bc616ed58d 100644 --- a/src/overlay073/ov73_021D3250.c +++ b/src/overlay073/ov73_021D3250.c @@ -67,7 +67,7 @@ int ov73_021D3280 (OverlayManager * param0, int * param1) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -79,7 +79,7 @@ int ov73_021D3280 (OverlayManager * param0, int * param1) ov73_021D342C(v0); ov73_021D366C(v0); - SetMainCallback(ov73_021D3420, (void *)v0); + SetVBlankCallback(ov73_021D3420, (void *)v0); GXLayers_TurnBothDispOn(); { @@ -133,7 +133,7 @@ int ov73_021D3280 (OverlayManager * param0, int * param1) if (IsScreenTransitionDone() == 1) { ov73_021D368C(v0); ov73_021D35F4(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); v1 = 1; } diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index f68d6207aa..b24e0e996e 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -372,7 +372,7 @@ static int ov75_021D1184(UnkStruct_ov75_021D1184 *param0) { switch (param0->unk_04) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -390,7 +390,7 @@ static int ov75_021D1184(UnkStruct_ov75_021D1184 *param0) return 0; } - SetMainCallback(ov75_021D131C, param0); + SetVBlankCallback(ov75_021D131C, param0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); sub_0200F338(0); @@ -436,7 +436,7 @@ static int ov75_021D1184(UnkStruct_ov75_021D1184 *param0) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index d68bfc6284..8f139a24bd 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -1308,7 +1308,7 @@ static BOOL ov76_0223EB1C(UnkStruct_ov76_0223DE00 *param0) void ov76_0223EB20(int param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -1319,7 +1319,7 @@ void ov76_0223EB20(int param0) void ov76_0223EB54(int param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); } diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index 95c73aa71b..111e0fea98 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -1,6 +1,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -165,7 +167,7 @@ static int ov77_021D0D80(OverlayManager *param0, int *param1) G2S_BlendNone(); G2_BlendNone(); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -188,7 +190,7 @@ static int ov77_021D0D80(OverlayManager *param0, int *param1) ov77_021D17B4(v0); ov77_021D11CC(v0); - SetMainCallback(ov77_021D1178, (void *)v0); + SetVBlankCallback(ov77_021D1178, (void *)v0); GXLayers_TurnBothDispOn(); return 1; @@ -319,7 +321,7 @@ static int ov77_021D10FC(OverlayManager *param0, int *param1) int v1 = v0->unk_00; int v2 = v0->unk_4E8; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); ov77_021D11FC(v0); ov77_021D1908(v0); @@ -892,7 +894,7 @@ static BOOL ov77_021D1A60(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int G3X_AntiAlias(1); } - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); param0->unk_04.unk_00 = 2; @@ -1204,7 +1206,7 @@ static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 *param0, BgConfig *param1, int G2_BlendNone(); G3X_EdgeMarking(0); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); return 1; diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index 14a0b32335..01bd4b3c14 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -1,6 +1,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -858,7 +860,7 @@ static void ov77_021D2B38(void *param0) UnkStruct_ov77_021D37C0 *v2 = &v1->unk_34; if (v2->unk_25B == 1) { - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); @@ -933,7 +935,7 @@ static int ov77_021D2D08(OverlayManager *param0, int *param1) sub_0200AB84(); sub_0200F344(0, 0x7fff); sub_0200F344(1, 0x7fff); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -947,7 +949,7 @@ static int ov77_021D2D08(OverlayManager *param0, int *param1) v0->unk_08 = 0; v0->unk_2A8 = 0; - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); v0->unk_14 = LCRNG_GetSeed(); @@ -1059,7 +1061,7 @@ static void ov77_021D2F0C(UnkStruct_ov77_021D2E9C *param0) param0->unk_18.unk_0C = param0->unk_0C; param0->unk_18.unk_14 = ov77_021D670C(); - SetMainCallback(ov77_021D2B30, (void *)param0); + SetVBlankCallback(ov77_021D2B30, (void *)param0); param0->unk_18.unk_02 = 1; } @@ -1167,7 +1169,7 @@ static BOOL ov77_021D30D0(UnkStruct_ov77_021D2F38 *param0, const int param1) static void ov77_021D3234(UnkStruct_ov77_021D2E9C *param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); if (param0->unk_18.unk_02) { ov77_021D67B0(param0->unk_18.unk_14); @@ -1343,7 +1345,7 @@ static void ov77_021D34A8(UnkStruct_ov77_021D2E9C *param0) ov77_021D6CFC(param0->unk_34.unk_1C); param0->unk_34.unk_10 = param0->unk_0C; - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); for (v0 = 0; v0 < 4; v0++) { @@ -1355,7 +1357,7 @@ static void ov77_021D34A8(UnkStruct_ov77_021D2E9C *param0) NNS_G3dGlbMaterialColorSpecEmi(GX_RGB(18, 18, 18), GX_RGB(14, 14, 14), 0); NNS_G3dGlbPolygonAttr(13, GX_POLYGONMODE_MODULATE, GX_CULL_BACK, 0, 31, GX_POLYGON_ATTR_MISC_FOG); - SetMainCallback(ov77_021D2B38, (void *)param0); + SetVBlankCallback(ov77_021D2B38, (void *)param0); sub_0200AB4C(-16, GX_BLEND_PLANEMASK_BG3, 1); param0->unk_34.unk_02 = 1; @@ -1465,7 +1467,7 @@ static void ov77_021D36F8(UnkStruct_ov77_021D2E9C *param0) GX_SetVisibleWnd(0); GXS_SetVisibleWnd(0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); } static void ov77_021D37C0(UnkStruct_ov77_021D37C0 *param0) @@ -1629,7 +1631,7 @@ static void ov77_021D3D4C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 static void ov77_021D3DC4(UnkStruct_ov77_021D37C0 *param0) { - if (gSystem.unk_65 == 0) { + if (gSystem.whichScreenIs3D == 0) { Bg_SetOffset(param0->unk_10, 1, 3, 0); Bg_SetOffset(param0->unk_10, 2, 3, 0); Bg_SetOffset(param0->unk_10, 3, 3, 0); @@ -2055,7 +2057,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 ov77_021D603C(param1->unk_14, 16, 1); ov77_021D636C(param1->unk_14, 0); ov77_021D3B5C(param0, param1); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); ov77_021D3DC4(param1); param1->unk_246 = 1; @@ -2101,7 +2103,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 if (IsScreenTransitionDone()) { if (1) { - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); ov77_021D3DC4(param1); @@ -2129,7 +2131,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 if (IsScreenTransitionDone()) { MI_CpuCopy16(param1->unk_240, (void *)HW_BG_PLTT, 0x200); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); ov77_021D3D4C(param0, param1); @@ -2175,7 +2177,7 @@ static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 ov77_021D6290(param1->unk_14, (16 << FX32_SHIFT)); if (IsScreenTransitionDone()) { - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); (*v0)++; } diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c index 99981022db..09b52e1b57 100644 --- a/src/overlay077/ov77_021D54B0.c +++ b/src/overlay077/ov77_021D54B0.c @@ -521,7 +521,7 @@ void ov77_021D6290(UnkStruct_ov77_021D5564 *param0, fx32 param1) VecFx32 v1; int v2, v3; - if (gSystem.unk_65 == 0) { + if (gSystem.whichScreenIs3D == 0) { v2 = 13; v3 = 15; } else { @@ -560,7 +560,7 @@ void ov77_021D636C(UnkStruct_ov77_021D5564 *param0, int param1) VecFx32 v1; if (param1 == 0) { - if (gSystem.unk_65 == 0) { + if (gSystem.whichScreenIs3D == 0) { CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 0); CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 0); CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 1); diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index c115185858..5111765895 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -122,7 +122,7 @@ static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0) switch (param0->unk_04) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -178,7 +178,7 @@ static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0) sub_0201E530(); sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); GX_SetVisiblePlane(0); @@ -416,7 +416,7 @@ static int ov79_021D122C(UnkStruct_ov79_021D0E1C *param0) case 5: ov79_021D196C(param0); ov79_021D1B24(param0, param0->unk_1B, 4); - SetMainCallback(ov79_021D0F7C, param0); + SetVBlankCallback(ov79_021D0F7C, param0); param0->unk_08 = 0; return 1; } diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 02d06255e2..a56adf3422 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -195,7 +195,7 @@ int ov79_021D22E4(OverlayManager *param0, int *param1) switch (*param1) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -213,7 +213,7 @@ int ov79_021D22E4(OverlayManager *param0, int *param1) return 0; } - SetMainCallback(ov79_021D252C, v0); + SetVBlankCallback(ov79_021D252C, v0); break; case 2: if (v0->unk_04++ < 4) { @@ -251,7 +251,7 @@ int ov79_021D22E4(OverlayManager *param0, int *param1) case 7: sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/overlay080/ov80_021D0D80.c b/src/overlay080/ov80_021D0D80.c index c771a1ed6d..e0465784d2 100644 --- a/src/overlay080/ov80_021D0D80.c +++ b/src/overlay080/ov80_021D0D80.c @@ -200,7 +200,7 @@ static int ov80_021D0EC8(UnkStruct_ov80_021D2A08 *param0) { switch (param0->unk_0C) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -234,7 +234,7 @@ static int ov80_021D0EC8(UnkStruct_ov80_021D2A08 *param0) ov80_021D2A08(param0); break; case 2: - SetMainCallback(ov80_021D0E68, param0); + SetVBlankCallback(ov80_021D0E68, param0); param0->unk_38 = Unk_ov80_021D2E94[param0->unk_00].unk_10; param0->unk_0C = 0; return 1; @@ -251,7 +251,7 @@ static void ov80_021D0FF4(UnkStruct_ov80_021D2A08 *param0) sub_0201E530(); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); ov80_021D2AC0(param0); diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c index 5789d4a156..b47cdde32a 100644 --- a/src/overlay083/ov83_0223B5A0.c +++ b/src/overlay083/ov83_0223B5A0.c @@ -132,7 +132,7 @@ int ov83_0223B5B0(OverlayManager *param0, int *param1) v1->unk_28 = Options_TextFrameDelay(v0->unk_10->unk_18); v1->unk_31C = 1; - SetMainCallback(ov83_0223B5A0, v0); + SetVBlankCallback(ov83_0223B5A0, v0); DisableHBlank(); sub_02004550(12, 1183, 1); @@ -220,7 +220,7 @@ int ov83_0223B710(OverlayManager *param0, int *param1) ov83_0223D1EC(v2); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); VramTransfer_Free(); MI_CpuClear8(v2, sizeof(UnkStruct_ov83_0223B784)); diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index 3ecce8016f..9a9e2d815e 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "overlay022/struct_ov22_022550D4.h" @@ -68,7 +70,7 @@ void ov83_0223C958(UnkStruct_ov83_0223B784 *param0) NARC_dtor(v0); - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); } @@ -93,7 +95,7 @@ void ov83_0223CAA4(UnkStruct_ov83_0223B784 *param0) ov83_0223CF20(param0); ov83_0223D068(param0); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); } diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index d1cfc3ac7d..0895a70699 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -386,7 +386,7 @@ int ov84_0223B5A0(OverlayManager *param0, int *param1) { UnkStruct_ov84_0223B5A0 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -441,7 +441,7 @@ int ov84_0223B5A0(OverlayManager *param0, int *param1) ov84_02240328(v0); } - SetMainCallback(ov84_0223BA14, v0); + SetVBlankCallback(ov84_0223BA14, v0); sub_02004550(51, 0, 0); DrawWifiConnectionIcon(); @@ -587,7 +587,7 @@ int ov84_0223B900(OverlayManager *param0, int *param1) StringTemplate_Free(v0->unk_118); NARC_dtor(v0->unk_D4); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(6); SetAutorepeat(4, 8); diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 3af159d980..cd925f7300 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -205,7 +205,7 @@ int ov85_02241440(OverlayManager *param0, int *param1) UnkStruct_ov85_022417E4 *v0; NARC *v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -243,7 +243,7 @@ int ov85_02241440(OverlayManager *param0, int *param1) ov85_02242038(v0); ov85_02242218(v0); - SetMainCallback(ov85_022415F4, v0); + SetVBlankCallback(ov85_022415F4, v0); DrawWifiConnectionIcon(); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); NARC_dtor(v1); @@ -291,7 +291,7 @@ int ov85_022415A0(OverlayManager *param0, int *param1) Heap_FreeToHeap(v0->unk_1FC); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(36); G2_BlendNone(); diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 9c4bed79b7..3efe99a642 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -289,7 +289,7 @@ int ov86_0223B140(OverlayManager *param0, int *param1) { UnkStruct_ov86_0223B3C8 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Create(3, 63, 196608); v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov86_0223B3C8), 63); diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index 42286821f6..e1b9103783 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -103,7 +103,7 @@ UnkStruct_ov87_021D106C *ov87_021D106C(UnkStruct_ov87_021D0D80 *param0, const Un v0->unk_1F8 = Strbuf_Init(256, 61); v0->unk_1FC = Pokemon_New(61); - SetMainCallback(ov87_021D11AC, v0); + SetVBlankCallback(ov87_021D11AC, v0); } return v0; @@ -112,7 +112,7 @@ UnkStruct_ov87_021D106C *ov87_021D106C(UnkStruct_ov87_021D0D80 *param0, const Un void ov87_021D1140(UnkStruct_ov87_021D106C *param0) { if (param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_FreeToHeap(param0->unk_1FC); Strbuf_Free(param0->unk_1F8); Strbuf_Free(param0->unk_1F4); diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index af245907dc..bf2c269ee9 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -275,7 +275,7 @@ int ov88_0223B140(OverlayManager *param0, int *param1) UnkStruct_02095E80 *v0; NARC *v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -303,7 +303,7 @@ int ov88_0223B140(OverlayManager *param0, int *param1) ov88_0223C17C(v0->unk_174); StartScreenTransition(0, 1, 1, 0x0, 16, 1, 26); ov88_0223C504(v0, v1); - SetMainCallback(ov88_0223C0E0, v0); + SetVBlankCallback(ov88_0223C0E0, v0); ov88_0223C63C(); ov88_0223C66C(v0, v1); ov88_0223CBA0(v0); @@ -396,7 +396,7 @@ static void ov88_0223B3C0(UnkStruct_02095E80 *param0) CellActor_SetDrawFlag(param0->unk_39C[0], 1); CellActor_SetDrawFlag(param0->unk_39C[1], 1); - SetMainCallback(ov88_0223C0E0, param0); + SetVBlankCallback(ov88_0223C0E0, param0); NARC_dtor(v0); } @@ -888,7 +888,7 @@ int ov88_0223C03C(OverlayManager *param0, int *param1) StringTemplate_Free(v0->unk_178); Strbuf_Free(v0->unk_18C); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(26); return 1; diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 31c5121443..f52cece39d 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -216,7 +216,7 @@ static int ov90_021D0ECC(UnkStruct_ov90_021D0ECC *param0) { switch (param0->unk_04) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -250,7 +250,7 @@ static int ov90_021D0ECC(UnkStruct_ov90_021D0ECC *param0) ov90_021D1984(param0); break; case 4: - SetMainCallback(ov90_021D1034, param0); + SetVBlankCallback(ov90_021D1034, param0); param0->unk_04 = 0; return 1; } @@ -274,7 +274,7 @@ static int ov90_021D0F98(UnkStruct_ov90_021D0ECC *param0) ov90_021D1280(param0); break; case 1: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 4a56b19d9f..b000e181a5 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -365,7 +365,7 @@ int ov91_021D0D80(OverlayManager *param0, int *param1) Window_ScheduleCopyToVRAM(&v0->unk_08[12]); ov91_021D2594(v0); - SetMainCallback(ov91_021D0F9C, v0); + SetVBlankCallback(ov91_021D0F9C, v0); return 1; } @@ -437,7 +437,7 @@ static void ov91_021D0ED8(UnkStruct_ov91_021D0ED8 *param0) { NARC *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); @@ -461,7 +461,7 @@ static void ov91_021D0ED8(UnkStruct_ov91_021D0ED8 *param0) ov91_021D1784(param0); ov91_021D1498(param0); - SetMainCallback(ov91_021D0F9C, param0); + SetVBlankCallback(ov91_021D0F9C, param0); NARC_dtor(v0); } @@ -474,7 +474,7 @@ static void ov91_021D0F6C(UnkStruct_ov91_021D0ED8 *param0) ov91_021D20B4(param0); VramTransfer_Free(); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); } static void ov91_021D0F9C(void *param0) diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 53a4657b99..7073bc7aac 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_0202C878_decl.h" #include "struct_defs/struct_02099F80.h" @@ -302,7 +304,7 @@ int ov92_021D0D80(OverlayManager *param0, int *param1) UnkStruct_ov92_021D1B24 *v0; int v1 = 50; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -345,7 +347,7 @@ int ov92_021D0D80(OverlayManager *param0, int *param1) v0->camera = Camera_Alloc(v0->unk_00); v0->unk_BAE8 = 0; - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); SetAutorepeat(4, 8); @@ -678,11 +680,11 @@ int ov92_021D1478(OverlayManager *param0, int *param1) StringTemplate_Free(v0->unk_B870); Easy3D_Shutdown(); Heap_FreeToHeap(v0->unk_B810); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); OverlayManager_FreeData(param0); Heap_Destroy(v1); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; return 1; } diff --git a/src/overlay093/ov93_021D0D80.c b/src/overlay093/ov93_021D0D80.c index 4730316f6c..6fff145acc 100644 --- a/src/overlay093/ov93_021D0D80.c +++ b/src/overlay093/ov93_021D0D80.c @@ -200,7 +200,7 @@ int ov93_021D0F58(OverlayManager *param0, int *param1) static void ov93_021D0FA8(void) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/overlay093/ov93_021D111C.c b/src/overlay093/ov93_021D111C.c index a4a2aab5ca..0df23ec2be 100644 --- a/src/overlay093/ov93_021D111C.c +++ b/src/overlay093/ov93_021D111C.c @@ -200,7 +200,7 @@ int ov93_021D12F0(OverlayManager *param0, int *param1) static void ov93_021D133C(void) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 3f3586cdbc..e556004acb 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -87,7 +87,7 @@ int ov94_0223BCB0(OverlayManager *param0, int *param1) switch (*param1) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -224,7 +224,7 @@ int ov94_0223BF54(OverlayManager *param0, int *param1) Heap_FreeToHeap(v0->unk_04); Heap_FreeToHeap(v0->unk_00); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(62); return 1; @@ -495,7 +495,7 @@ static void ov94_0223C4E0(UnkStruct_ov94_0223FD4C *param0) ov94_0223C0D4(param0); ov94_0223C32C(param0); - SetMainCallback(ov94_0223BFE4, param0); + SetVBlankCallback(ov94_0223BFE4, param0); } static void ov94_0223C508(UnkStruct_ov94_0223FD4C *param0) diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index d4b48929fc..f6d85366a0 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -172,7 +172,7 @@ int ov95_02246C20(OverlayManager *param0, int *param1) v0->unk_1B6 = BoxPokemon_GetValue((BoxPokemon *)(v0->unk_00->unk_04), MON_DATA_FORM, NULL); v0->unk_1B8 = NULL; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c index 9585e9199d..a1bf678e6b 100644 --- a/src/overlay095/ov95_02249740.c +++ b/src/overlay095/ov95_02249740.c @@ -140,7 +140,7 @@ void ov95_02249770(void *param0) if (v0) { int v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); ov95_02249A68(v0); ov95_02249B80(v0); diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c index f422c458cf..c67198d2b4 100644 --- a/src/overlay095/ov95_0224A390.c +++ b/src/overlay095/ov95_0224A390.c @@ -126,7 +126,7 @@ void *ov95_0224A390(UnkStruct_ov95_02247628 *param0) v0->unk_0C = 0; ov95_0224A848(&(v0->unk_34)); - SetMainCallback(ov95_0224AB50, v0); + SetVBlankCallback(ov95_0224AB50, v0); } return v0; @@ -139,7 +139,7 @@ void ov95_0224A3CC(void *param0) if (v0) { int v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); ov95_0224A678(v0); ov95_0224A7A0(v0); diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c index 5c2f928fff..40076ffd44 100644 --- a/src/overlay096/ov96_0223B6A0.c +++ b/src/overlay096/ov96_0223B6A0.c @@ -62,7 +62,7 @@ int ov96_0223B6A0(OverlayManager *param0, int *param1) switch (*param1) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -183,7 +183,7 @@ int ov96_0223B8CC(OverlayManager *param0, int *param1) sub_020334CC(); Heap_FreeToHeap(v0->unk_04); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(68); return 1; @@ -397,7 +397,7 @@ static void ov96_0223BC64(UnkStruct_ov96_0223BF40 *param0) ov96_0223B9D0(param0); ov96_0223BB0C(param0); - SetMainCallback(ov96_0223B940, param0); + SetVBlankCallback(ov96_0223B940, param0); } static void ov96_0223BC8C(UnkStruct_ov96_0223BF40 *param0) diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 4a2a4066f4..950135e01e 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -911,7 +911,7 @@ static void ov97_0222BC9C(OverlayManager *param0) Bg_FreeTilemapBuffer(v1->unk_00, 1); Bg_FreeTilemapBuffer(v1->unk_00, 2); Heap_FreeToHeap(v1->unk_00); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); } u16 Unk_ov97_0223DF70[] = { @@ -1053,7 +1053,7 @@ static int ov97_0222BE24(OverlayManager *param0, int *param1) ov97_0222B404(v1); ov97_0222B46C(v1); - SetMainCallback(ov97_0222BD48, v1->unk_00); + SetVBlankCallback(ov97_0222BD48, v1->unk_00); ov97_0222B9BC(v1); ov97_0222BAD8(v1, v1->unk_54); diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index f5f7fa3ea6..6b4fb66e8f 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -2,6 +2,7 @@ #include #include "constants/gba/species.h" +#include "constants/screen.h" #include "constants/species.h" #include "struct_decls/struct_02015920_decl.h" @@ -294,7 +295,7 @@ static int ov97_02233B8C(UnkStruct_ov97_02234A2C *param0) v0 = ov97_02236280(); if (v0 == 0) { - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); return 12; } @@ -311,7 +312,7 @@ static int ov97_02233B8C(UnkStruct_ov97_02234A2C *param0) v0 = ov97_022362C8(); if (v0 == 8) { - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); return 12; } } @@ -326,19 +327,19 @@ static int ov97_02233B8C(UnkStruct_ov97_02234A2C *param0) } while (v2 != 2); ov97_022362C8(); - SleepLock(1); + SleepLock(SLEEP_TYPE_SAVE_DATA); v4->unk_00++; break; case 9: v0 = ov97_022362C8(); if (v0 == 8) { - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); return 12; } if (v0 == 0) { - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); return 11; } break; @@ -1393,7 +1394,7 @@ static void ov97_02234DFC(UnkStruct_ov97_02234A2C *param0) GXLayers_SetBanks(&v0); ov97_02234D28(param0->unk_20); - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); Text_ResetAllPrinters(); @@ -1522,7 +1523,7 @@ static void ov97_022351F0(UnkStruct_ov97_02234A2C *param0) { int v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); for (v0 = 0; v0 < 30; v0++) { if (param0->unk_20C[v0].unk_00) { @@ -1572,7 +1573,7 @@ static void ov97_022351F0(UnkStruct_ov97_02234A2C *param0) PlttTransfer_Free(); sub_02015938(param0->unk_E8EC); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); Bg_FreeTilemapBuffer(param0->unk_20, 0); @@ -1845,7 +1846,7 @@ static int ov97_022356E8(OverlayManager *param0, int *param1) ov97_022340B0(v3); ov97_0223468C(v3); - SetMainCallback(ov97_022353CC, v3); + SetVBlankCallback(ov97_022353CC, v3); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 0); if (v3->unk_04 == 1) { @@ -1955,7 +1956,7 @@ static int ov97_022356E8(OverlayManager *param0, int *param1) ov97_02234508(v3); ov97_022343A8(v3); - SetMainCallback(ov97_022353CC, v3); + SetVBlankCallback(ov97_022353CC, v3); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); ov97_02234B0C(v3, NULL); diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 8238fe54bc..e99c244b1c 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -389,7 +389,7 @@ void ov97_02237B0C(int param0, int param1, int param2, int param3, int param4, i GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } - SetMainCallback(ov97_02237E58, NULL); + SetVBlankCallback(ov97_02237E58, NULL); } void ov97_02237C80(fx32 param0, fx32 param1) @@ -506,7 +506,7 @@ void ov97_02237DA0(void) CharTransfer_Free(); PlttTransfer_Free(); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); } u32 ov97_02237E4C(int param0) diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index de4183c9c9..33005a4348 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -4,6 +4,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_0202B370_decl.h" #include "struct_defs/struct_02099F80.h" @@ -16,7 +18,6 @@ #include "bg_window.h" #include "colored_arrow.h" -#include "system.h" #include "font.h" #include "game_options.h" #include "graphics.h" @@ -28,6 +29,7 @@ #include "message.h" #include "narc.h" #include "overlay_manager.h" +#include "render_oam.h" #include "render_text.h" #include "render_window.h" #include "save_player.h" @@ -35,22 +37,21 @@ #include "strbuf.h" #include "string_list.h" #include "string_template.h" +#include "system.h" #include "system_data.h" #include "text.h" #include "unk_02005474.h" -#include "render_oam.h" #include "unk_0200F174.h" -#include "system.h" -#include "vram_transfer.h" #include "unk_0201E3D8.h" #include "unk_0202ACE0.h" #include "unk_02030CE8.h" #include "unk_020366A0.h" #include "unk_02038FFC.h" #include "unk_020393C8.h" +#include "vram_transfer.h" typedef struct { - UnkStruct_ov98_02246E88 * unk_00; + UnkStruct_ov98_02246E88 *unk_00; BgConfig *unk_04; int unk_08; int unk_0C; @@ -58,22 +59,22 @@ typedef struct { int unk_14; int unk_18; int unk_1C; - StringTemplate * unk_20; - MessageLoader * unk_24; - MessageLoader * unk_28; - MessageLoader * unk_2C; - MessageLoader * unk_30; - MessageLoader * unk_34; - Strbuf* unk_38; - Strbuf* unk_3C; - Strbuf* unk_40; + StringTemplate *unk_20; + MessageLoader *unk_24; + MessageLoader *unk_28; + MessageLoader *unk_2C; + MessageLoader *unk_30; + MessageLoader *unk_34; + Strbuf *unk_38; + Strbuf *unk_3C; + Strbuf *unk_40; int unk_44; Window unk_48; Window unk_58; Window unk_68; Window unk_78; Menu *unk_88; - void * unk_8C; + void *unk_8C; int unk_90; int unk_94; int unk_98; @@ -99,67 +100,67 @@ typedef struct { u32 unk_04; } UnkStruct_ov98_02249BDC; -int ov98_022471C8(OverlayManager * param0, int * param1); -int ov98_022473D8(OverlayManager * param0, int * param1); -int ov98_02247440(OverlayManager * param0, int * param1); -static void ov98_022474E8(void * param0); +int ov98_022471C8(OverlayManager *param0, int *param1); +int ov98_022473D8(OverlayManager *param0, int *param1); +int ov98_02247440(OverlayManager *param0, int *param1); +static void ov98_022474E8(void *param0); static void ov98_02247510(BgConfig *param0); static void ov98_022476D0(BgConfig *param0); -static void ov98_02247704(UnkStruct_ov98_02247704 * param0); -static void ov98_02247A24(UnkStruct_ov98_02247704 * param0); -static void ov98_02247ACC(UnkStruct_ov98_02247704 * param0); -static void ov98_02247AE8(UnkStruct_ov98_02247704 * param0, int param1, int param2); -static void ov98_02247AF0(UnkStruct_ov98_02247704 * param0); -static void ov98_02247B0C(UnkStruct_ov98_02247704 * param0); +static void ov98_02247704(UnkStruct_ov98_02247704 *param0); +static void ov98_02247A24(UnkStruct_ov98_02247704 *param0); +static void ov98_02247ACC(UnkStruct_ov98_02247704 *param0); +static void ov98_02247AE8(UnkStruct_ov98_02247704 *param0, int param1, int param2); +static void ov98_02247AF0(UnkStruct_ov98_02247704 *param0); +static void ov98_02247B0C(UnkStruct_ov98_02247704 *param0); static Menu *ov98_02247B24(BgConfig *param0, int param1, int param2); -static int ov98_02247B98(UnkStruct_ov98_02247704 * param0); -static int ov98_02247D30(UnkStruct_ov98_02247704 * param0); -static int ov98_02247D50(UnkStruct_ov98_02247704 * param0); -static int ov98_02247E38(UnkStruct_ov98_02247704 * param0); -static int ov98_02248684(UnkStruct_ov98_02247704 * param0); -static int ov98_022487AC(UnkStruct_ov98_02247704 * param0); -static int ov98_022487CC(UnkStruct_ov98_02247704 * param0); -static int ov98_02248804(UnkStruct_ov98_02247704 * param0); -static int ov98_022488F8(UnkStruct_ov98_02247704 * param0); -static int ov98_02248954(UnkStruct_ov98_02247704 * param0); -static int ov98_0224897C(UnkStruct_ov98_02247704 * param0); -static int ov98_022489B4(UnkStruct_ov98_02247704 * param0); -static int ov98_022489DC(UnkStruct_ov98_02247704 * param0); -static int ov98_02248A68(UnkStruct_ov98_02247704 * param0); -static int ov98_02248B14(UnkStruct_ov98_02247704 * param0); -static int ov98_02248B24(UnkStruct_ov98_02247704 * param0); -static int ov98_02248BFC(UnkStruct_ov98_02247704 * param0); -static int ov98_02248C60(UnkStruct_ov98_02247704 * param0); -static int ov98_02248C88(UnkStruct_ov98_02247704 * param0); -static int ov98_02248DF4(UnkStruct_ov98_02247704 * param0); -static int ov98_02248EC0(UnkStruct_ov98_02247704 * param0); -static int ov98_02248EE0(UnkStruct_ov98_02247704 * param0); -static int ov98_02248F7C(UnkStruct_ov98_02247704 * param0); -static int ov98_02249168(UnkStruct_ov98_02247704 * param0); -static int ov98_022491CC(UnkStruct_ov98_02247704 * param0); -static int ov98_02249238(UnkStruct_ov98_02247704 * param0); -static int ov98_02249320(UnkStruct_ov98_02247704 * param0); -static int ov98_02249414(UnkStruct_ov98_02247704 * param0); -static int ov98_02249438(UnkStruct_ov98_02247704 * param0); -static int ov98_02249464(UnkStruct_ov98_02247704 * param0); -static int ov98_022494A0(UnkStruct_ov98_02247704 * param0); -static int ov98_022494C0(UnkStruct_ov98_02247704 * param0); -static int ov98_022495C4(UnkStruct_ov98_02247704 * param0); -static int ov98_022496A8(UnkStruct_ov98_02247704 * param0); -static int ov98_022496C0(UnkStruct_ov98_02247704 * param0); -static int ov98_022496EC(UnkStruct_ov98_02247704 * param0); -static int ov98_02249798(UnkStruct_ov98_02247704 * param0); -static int ov98_022497F8(UnkStruct_ov98_02247704 * param0); -static void ov98_02249714(UnkStruct_ov98_02247704 * param0, MessageLoader * param1, int param2, int param3, u16 param4); +static int ov98_02247B98(UnkStruct_ov98_02247704 *param0); +static int ov98_02247D30(UnkStruct_ov98_02247704 *param0); +static int ov98_02247D50(UnkStruct_ov98_02247704 *param0); +static int ov98_02247E38(UnkStruct_ov98_02247704 *param0); +static int ov98_02248684(UnkStruct_ov98_02247704 *param0); +static int ov98_022487AC(UnkStruct_ov98_02247704 *param0); +static int ov98_022487CC(UnkStruct_ov98_02247704 *param0); +static int ov98_02248804(UnkStruct_ov98_02247704 *param0); +static int ov98_022488F8(UnkStruct_ov98_02247704 *param0); +static int ov98_02248954(UnkStruct_ov98_02247704 *param0); +static int ov98_0224897C(UnkStruct_ov98_02247704 *param0); +static int ov98_022489B4(UnkStruct_ov98_02247704 *param0); +static int ov98_022489DC(UnkStruct_ov98_02247704 *param0); +static int ov98_02248A68(UnkStruct_ov98_02247704 *param0); +static int ov98_02248B14(UnkStruct_ov98_02247704 *param0); +static int ov98_02248B24(UnkStruct_ov98_02247704 *param0); +static int ov98_02248BFC(UnkStruct_ov98_02247704 *param0); +static int ov98_02248C60(UnkStruct_ov98_02247704 *param0); +static int ov98_02248C88(UnkStruct_ov98_02247704 *param0); +static int ov98_02248DF4(UnkStruct_ov98_02247704 *param0); +static int ov98_02248EC0(UnkStruct_ov98_02247704 *param0); +static int ov98_02248EE0(UnkStruct_ov98_02247704 *param0); +static int ov98_02248F7C(UnkStruct_ov98_02247704 *param0); +static int ov98_02249168(UnkStruct_ov98_02247704 *param0); +static int ov98_022491CC(UnkStruct_ov98_02247704 *param0); +static int ov98_02249238(UnkStruct_ov98_02247704 *param0); +static int ov98_02249320(UnkStruct_ov98_02247704 *param0); +static int ov98_02249414(UnkStruct_ov98_02247704 *param0); +static int ov98_02249438(UnkStruct_ov98_02247704 *param0); +static int ov98_02249464(UnkStruct_ov98_02247704 *param0); +static int ov98_022494A0(UnkStruct_ov98_02247704 *param0); +static int ov98_022494C0(UnkStruct_ov98_02247704 *param0); +static int ov98_022495C4(UnkStruct_ov98_02247704 *param0); +static int ov98_022496A8(UnkStruct_ov98_02247704 *param0); +static int ov98_022496C0(UnkStruct_ov98_02247704 *param0); +static int ov98_022496EC(UnkStruct_ov98_02247704 *param0); +static int ov98_02249798(UnkStruct_ov98_02247704 *param0); +static int ov98_022497F8(UnkStruct_ov98_02247704 *param0); +static void ov98_02249714(UnkStruct_ov98_02247704 *param0, MessageLoader *param1, int param2, int param3, u16 param4); static int ov98_0224977C(int param0); -static int ov98_02249894(Window * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); +static int ov98_02249894(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); void ov98_022498CC(Window *param0, Strbuf *param1, int param2, int param3, int param4, TextColor param5); -static void ov98_02249900(UnkStruct_ov98_02247704 * param0, int param1); -static void ov98_02249964(UnkStruct_ov98_02247704 * param0, int param1, int param2); +static void ov98_02249900(UnkStruct_ov98_02247704 *param0, int param1); +static void ov98_02249964(UnkStruct_ov98_02247704 *param0, int param1, int param2); static void ov98_022499A0(ListMenu *param0, u32 param1, u8 param2); static void ov98_022499B4(ListMenu *param0, u32 param1, u8 param2); -static int (* Unk_ov98_02249D70[])(UnkStruct_ov98_02247704 *) = { +static int (*Unk_ov98_02249D70[])(UnkStruct_ov98_02247704 *) = { ov98_02247B98, ov98_02247D30, ov98_02247D50, @@ -202,10 +203,10 @@ static int (* Unk_ov98_02249D70[])(UnkStruct_ov98_02247704 *) = { }; static const UnkStruct_ov98_02249BDC Unk_ov98_02249BEC[] = { - {0x0, 0x1}, - {0x2, 0x2}, - {0x3, 0x3}, - {0x4, 0x1D} + { 0x0, 0x1 }, + { 0x2, 0x2 }, + { 0x3, 0x3 }, + { 0x4, 0x1D } }; static const ListMenuTemplate Unk_ov98_02249C0C = { @@ -237,8 +238,8 @@ static const u8 Unk_ov98_02249BC0[4] = { }; static const UnkStruct_ov98_02249BDC Unk_ov98_02249BDC[] = { - {0x1, 0x4}, - {0x4, 0x1D} + { 0x1, 0x4 }, + { 0x4, 0x1D } }; static const ListMenuTemplate Unk_ov98_02249C2C = { @@ -279,11 +280,11 @@ static const WindowTemplate Unk_ov98_02249BC4 = { 0x0 }; -int ov98_022471C8 (OverlayManager * param0, int * param1) +int ov98_022471C8(OverlayManager *param0, int *param1) { - UnkStruct_ov98_02247704 * v0; + UnkStruct_ov98_02247704 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -351,20 +352,20 @@ int ov98_022471C8 (OverlayManager * param0, int * param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); RenderControlFlags_SetCanABSpeedUpPrint(1); RenderControlFlags_SetAutoScrollFlags(0); RenderControlFlags_SetSpeedUpOnTouch(0); - SetMainCallback(ov98_022474E8, v0); + SetVBlankCallback(ov98_022474E8, v0); return 1; } -int ov98_022473D8 (OverlayManager * param0, int * param1) +int ov98_022473D8(OverlayManager *param0, int *param1) { - UnkStruct_ov98_02247704 * v0 = OverlayManager_Data(param0); + UnkStruct_ov98_02247704 *v0 = OverlayManager_Data(param0); int v1, v2; switch (*param1) { @@ -399,9 +400,9 @@ int ov98_022473D8 (OverlayManager * param0, int * param1) return 0; } -int ov98_02247440 (OverlayManager * param0, int * param1) +int ov98_02247440(OverlayManager *param0, int *param1) { - UnkStruct_ov98_02247704 * v0 = OverlayManager_Data(param0); + UnkStruct_ov98_02247704 *v0 = OverlayManager_Data(param0); inline_ov61_0222C160(&v0->unk_EC); @@ -417,7 +418,7 @@ int ov98_02247440 (OverlayManager * param0, int * param1) ov98_02247ACC(v0); Heap_FreeToHeap(v0->unk_04); ov98_022476D0(v0->unk_04); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); VramTransfer_Free(); sub_0201E530(); @@ -431,9 +432,9 @@ int ov98_02247440 (OverlayManager * param0, int * param1) return 1; } -static void ov98_022474E8 (void * param0) +static void ov98_022474E8(void *param0) { - UnkStruct_ov98_02247704 * v0 = param0; + UnkStruct_ov98_02247704 *v0 = param0; VramTransfer_Process(); RenderOam_Transfer(); @@ -614,10 +615,10 @@ static void ov98_022476D0(BgConfig *param0) Bg_FreeTilemapBuffer(param0, 0); } -static void ov98_02247704 (UnkStruct_ov98_02247704 * param0) +static void ov98_02247704(UnkStruct_ov98_02247704 *param0) { BgConfig *v0 = param0->unk_04; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 109); @@ -652,7 +653,7 @@ static void ov98_02247704 (UnkStruct_ov98_02247704 * param0) } } -static void ov98_02247A24 (UnkStruct_ov98_02247704 * param0) +static void ov98_02247A24(UnkStruct_ov98_02247704 *param0) { Window_Add(param0->unk_04, ¶m0->unk_68, 0, 4, 4, 23, 16, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); Window_FillTilemap(¶m0->unk_68, 0x0); @@ -665,27 +666,27 @@ static void ov98_02247A24 (UnkStruct_ov98_02247704 * param0) Window_FillTilemap(¶m0->unk_48, 0x0); } -static void ov98_02247ACC (UnkStruct_ov98_02247704 * param0) +static void ov98_02247ACC(UnkStruct_ov98_02247704 *param0) { Window_Remove(¶m0->unk_48); Window_Remove(¶m0->unk_58); Window_Remove(¶m0->unk_68); } -static void ov98_02247AE8 (UnkStruct_ov98_02247704 * param0, int param1, int param2) +static void ov98_02247AE8(UnkStruct_ov98_02247704 *param0, int param1, int param2) { param0->unk_08 = param1; param0->unk_0C = param2; } -static void ov98_02247AF0 (UnkStruct_ov98_02247704 * param0) +static void ov98_02247AF0(UnkStruct_ov98_02247704 *param0) { if (param0->unk_8C == NULL) { param0->unk_8C = Window_AddWaitDial(¶m0->unk_48, 1); } } -static void ov98_02247B0C (UnkStruct_ov98_02247704 * param0) +static void ov98_02247B0C(UnkStruct_ov98_02247704 *param0) { if (param0->unk_8C != NULL) { DestroyWaitDial(param0->unk_8C); @@ -715,17 +716,16 @@ static Menu *ov98_02247B58(BgConfig *param0, int param1, int param2, int param3) return Menu_MakeYesNoChoiceWithCursorAt(param0, &v0, (1 + (18 + 12)), 11, param3, 109); } -static int ov98_02247B98 (UnkStruct_ov98_02247704 * param0) +static int ov98_02247B98(UnkStruct_ov98_02247704 *param0) { u32 v0; switch (param0->unk_94) { - case 0: - { + case 0: { int v1; ListMenuTemplate v2; - const u8 * v3; - const UnkStruct_ov98_02249BDC * v4; + const u8 *v3; + const UnkStruct_ov98_02249BDC *v4; int v5; if (sub_02030D20(param0->unk_00->unk_04) == 1) { @@ -791,7 +791,7 @@ static int ov98_02247B98 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02247D30 (UnkStruct_ov98_02247704 * param0) +static int ov98_02247D30(UnkStruct_ov98_02247704 *param0) { ov98_02246E88(param0->unk_00, 4, 3); ov98_02246E9C(param0->unk_00, 38); @@ -800,7 +800,7 @@ static int ov98_02247D30 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02247D50 (UnkStruct_ov98_02247704 * param0) +static int ov98_02247D50(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 1) { return 0; @@ -815,8 +815,7 @@ static int ov98_02247D50 (UnkStruct_ov98_02247704 * param0) param0->unk_88 = ov98_02247B24(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2)); param0->unk_94++; break; - case 2: - { + case 2: { int v0 = Menu_ProcessInputAndHandleExit(param0->unk_88, 109); if (v0 != 0xffffffff) { @@ -830,8 +829,7 @@ static int ov98_02247D50 (UnkStruct_ov98_02247704 * param0) param0->unk_94++; } - } - break; + } break; case 3: ov98_02247AE8(param0, 25, 0); break; @@ -840,7 +838,7 @@ static int ov98_02247D50 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02247E38 (UnkStruct_ov98_02247704 * param0) +static int ov98_02247E38(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 1) { return 0; @@ -855,8 +853,7 @@ static int ov98_02247E38 (UnkStruct_ov98_02247704 * param0) param0->unk_88 = ov98_02247B58(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2), 1); param0->unk_94++; break; - case 2: - { + case 2: { int v0 = Menu_ProcessInputAndHandleExit(param0->unk_88, 109); if (v0 != 0xffffffff) { @@ -868,8 +865,7 @@ static int ov98_02247E38 (UnkStruct_ov98_02247704 * param0) param0->unk_94++; } } - } - break; + } break; case 3: ov98_02247AE8(param0, 25, 0); break; @@ -893,13 +889,13 @@ static const int Unk_ov98_022482CC[] = { }; static u32 Unk_ov98_02249D60[][2] = { - {0x4, 0x8}, - {0x80, 0x8} + { 0x4, 0x8 }, + { 0x80, 0x8 } }; -static void ov98_02247F08 (UnkStruct_ov98_02247704 * param0) +static void ov98_02247F08(UnkStruct_ov98_02247704 *param0) { - Strbuf* v0; + Strbuf *v0; Window_FillTilemap(¶m0->unk_D4, 0xf0f); @@ -914,13 +910,13 @@ static void ov98_02247F08 (UnkStruct_ov98_02247704 * param0) Window_CopyToVRAM(¶m0->unk_D4); } -static void ov98_02247FA4 (UnkStruct_ov98_02247704 * param0) +static void ov98_02247FA4(UnkStruct_ov98_02247704 *param0) { Window_FillTilemap(¶m0->unk_D4, 0xf0f); Window_CopyToVRAM(¶m0->unk_D4); } -static void ov98_02247FBC (UnkStruct_ov98_02247704 * param0) +static void ov98_02247FBC(UnkStruct_ov98_02247704 *param0) { if ((++param0->unk_BC) == 8) { param0->unk_C0 ^= 1; @@ -956,12 +952,12 @@ static void ov98_02247FBC (UnkStruct_ov98_02247704 * param0) } } -static void ov98_022482CC (UnkStruct_ov98_02247704 * param0) +static void ov98_022482CC(UnkStruct_ov98_02247704 *param0) { int v0; int v1 = 0; - Strbuf* v2; - Strbuf* v3; + Strbuf *v2; + Strbuf *v3; Window_FillTilemap(¶m0->unk_C4, 0x0f0f); v2 = MessageLoader_GetNewStrbuf(param0->unk_34, 44); @@ -1361,7 +1357,7 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) } // clang-format on -static int ov98_02248684 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248684(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 1) { return 0; @@ -1374,8 +1370,7 @@ static int ov98_02248684 (UnkStruct_ov98_02247704 * param0) case 1: param0->unk_94++; break; - case 2: - { + case 2: { int v0 = Menu_ProcessInputAndHandleExit(param0->unk_88, 109); if (v0 != 0xffffffff) { @@ -1386,10 +1381,8 @@ static int ov98_02248684 (UnkStruct_ov98_02247704 * param0) param0->unk_94 = 4; } } - } - break; - case 3: - { + } break; + case 3: { int v1 = ov98_02248350(param0); if (v1 == 1) { @@ -1398,14 +1391,12 @@ static int ov98_02248684 (UnkStruct_ov98_02247704 * param0) } else if (v1 == 2) { ov98_02247AE8(param0, 34, 0); } - } - break; + } break; case 4: param0->unk_88 = ov98_02247B24(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2)); param0->unk_94++; break; - default: - { + default: { int v2 = Menu_ProcessInputAndHandleExit(param0->unk_88, 109); if (v2 != 0xffffffff) { @@ -1416,14 +1407,13 @@ static int ov98_02248684 (UnkStruct_ov98_02247704 * param0) param0->unk_08 = 5; } } - } - break; + } break; } return 0; } -static int ov98_022487AC (UnkStruct_ov98_02247704 * param0) +static int ov98_022487AC(UnkStruct_ov98_02247704 *param0) { ov98_02246E88(param0->unk_00, 1, 0); ov98_02246E9C(param0->unk_00, 6); @@ -1431,9 +1421,9 @@ static int ov98_022487AC (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022487CC (UnkStruct_ov98_02247704 * param0) +static int ov98_022487CC(UnkStruct_ov98_02247704 *param0) { - charcode_t * v0; + charcode_t *v0; switch (ov98_02246FB4(param0->unk_00)) { case 1: param0->unk_08 = 0; @@ -1443,14 +1433,15 @@ static int ov98_022487CC (UnkStruct_ov98_02247704 * param0) param0->unk_08 = 37; return 0; } - - if (param0->unk_94 == 0) + + if (param0->unk_94 == 0) { param0->unk_08 = 7; - + } + return 0; } -static int ov98_02248804 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248804(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 1) { return 0; @@ -1468,8 +1459,7 @@ static int ov98_02248804 (UnkStruct_ov98_02247704 * param0) param0->unk_88 = ov98_02247B24(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2)); param0->unk_94++; break; - case 3: - { + case 3: { int v0 = Menu_ProcessInputAndHandleExit(param0->unk_88, 109); if (v0 != 0xffffffff) { @@ -1479,8 +1469,7 @@ static int ov98_02248804 (UnkStruct_ov98_02247704 * param0) param0->unk_94++; } } - } - break; + } break; case 4: if (sub_02039074(param0->unk_00->unk_04) == 0) { ov98_02246E88(param0->unk_00, 5, 0); @@ -1496,7 +1485,7 @@ static int ov98_02248804 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022488F8 (UnkStruct_ov98_02247704 * param0) +static int ov98_022488F8(UnkStruct_ov98_02247704 *param0) { int v0 = Menu_ProcessInputAndHandleExit(param0->unk_88, 109); @@ -1515,7 +1504,7 @@ static int ov98_022488F8 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248954 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248954(UnkStruct_ov98_02247704 *param0) { ov98_02249714(param0, param0->unk_30, 26, TEXT_SPEED_FAST, 0xf0f); ov98_02247AE8(param0, 34, 10); @@ -1523,7 +1512,7 @@ static int ov98_02248954 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_0224897C (UnkStruct_ov98_02247704 * param0) +static int ov98_0224897C(UnkStruct_ov98_02247704 *param0) { sub_0203859C(); @@ -1542,7 +1531,7 @@ static int ov98_0224897C (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022489B4 (UnkStruct_ov98_02247704 * param0) +static int ov98_022489B4(UnkStruct_ov98_02247704 *param0) { ov98_02249714(param0, param0->unk_30, 27, TEXT_SPEED_FAST, 0xf0f); ov98_02247AE8(param0, 35, 29); @@ -1550,7 +1539,7 @@ static int ov98_022489B4 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022489DC (UnkStruct_ov98_02247704 * param0) +static int ov98_022489DC(UnkStruct_ov98_02247704 *param0) { switch (param0->unk_94) { case 0: @@ -1569,7 +1558,7 @@ static int ov98_022489DC (UnkStruct_ov98_02247704 * param0) SleepLock(4); DWC_InitInetEx(¶m0->unk_00->unk_14, 2, 1, 20); - DWC_SetAuthServer((DWC_CONNECTINET_AUTH_RELEASE)); + DWC_SetAuthServer(DWC_CONNECTINET_AUTH_RELEASE); DWC_ConnectInetAsync(); param0->unk_08 = 13; break; @@ -1578,14 +1567,13 @@ static int ov98_022489DC (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248A68 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248A68(UnkStruct_ov98_02247704 *param0) { DWC_ProcessInet(); if (DWC_CheckInet()) { switch (DWC_GetInetStatus()) { - case DWC_CONNECTINET_STATE_ERROR: - { + case DWC_CONNECTINET_STATE_ERROR: { DWCError v0; int v1; DWCErrorType v2; @@ -1617,8 +1605,7 @@ static int ov98_02248A68 (UnkStruct_ov98_02247704 * param0) case DWC_CONNECTINET_STATE_DISCONNECTING: case DWC_CONNECTINET_STATE_DISCONNECTED: default: - case DWC_CONNECTINET_STATE_FATAL_ERROR: - { + case DWC_CONNECTINET_STATE_FATAL_ERROR: { DWCError v3; int v4; @@ -1627,10 +1614,8 @@ static int ov98_02248A68 (UnkStruct_ov98_02247704 * param0) ov98_02247B0C(param0); param0->unk_08 = 32; param0->unk_10 = -2; - } - break; - case DWC_CONNECTINET_STATE_CONNECTED: - { + } break; + case DWC_CONNECTINET_STATE_CONNECTED: { DWCApInfo v5; DWC_GetApInfo(&v5); @@ -1647,7 +1632,7 @@ static int ov98_02248A68 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248B14 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248B14(UnkStruct_ov98_02247704 *param0) { DWC_NASLoginAsync(); @@ -1655,11 +1640,10 @@ static int ov98_02248B14 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248B24 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248B24(UnkStruct_ov98_02247704 *param0) { switch (DWC_NASLoginProcess()) { - case DWC_NASLOGIN_STATE_SUCCESS: - ; + case DWC_NASLOGIN_STATE_SUCCESS:; param0->unk_08 = 16; break; case DWC_NASLOGIN_STATE_ERROR: @@ -1721,12 +1705,12 @@ static int ov98_02248B24 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248BFC (UnkStruct_ov98_02247704 * param0) +static int ov98_02248BFC(UnkStruct_ov98_02247704 *param0) { - DWCUserData * v0; + DWCUserData *v0; s32 v1; SystemData *v2; - UnkStruct_0202B370 * v3; + UnkStruct_0202B370 *v3; v3 = sub_0202B370(param0->unk_00->unk_04); v2 = SaveData_GetSystemData(param0->unk_00->unk_04); @@ -1747,7 +1731,7 @@ static int ov98_02248BFC (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248C60 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248C60(UnkStruct_ov98_02247704 *param0) { ov98_02246F5C(param0->unk_00); ov98_02246F74(param0->unk_00); @@ -1759,7 +1743,7 @@ static int ov98_02248C60 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248C88 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248C88(UnkStruct_ov98_02247704 *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -1853,7 +1837,7 @@ static int ov98_02248C88 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248DF4 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248DF4(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 1) { return 0; @@ -1869,8 +1853,7 @@ static int ov98_02248DF4 (UnkStruct_ov98_02247704 * param0) param0->unk_88 = ov98_02247B24(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2)); param0->unk_94++; break; - case 2: - { + case 2: { int v0 = Menu_ProcessInputAndHandleExit(param0->unk_88, 109); if (v0 != 0xffffffff) { @@ -1880,8 +1863,7 @@ static int ov98_02248DF4 (UnkStruct_ov98_02247704 * param0) param0->unk_94++; } } - } - break; + } break; case 3: ov98_02249714(param0, param0->unk_34, 17, TEXT_SPEED_FAST, 0xf0f); @@ -1892,7 +1874,7 @@ static int ov98_02248DF4 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248EC0 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248EC0(UnkStruct_ov98_02247704 *param0) { ov98_02246E88(param0->unk_00, 2, 1); ov98_02246E9C(param0->unk_00, 22); @@ -1900,7 +1882,7 @@ static int ov98_02248EC0 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02248EE0 (UnkStruct_ov98_02247704 * param0) +static int ov98_02248EE0(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 1) { return 0; @@ -1915,8 +1897,7 @@ static int ov98_02248EE0 (UnkStruct_ov98_02247704 * param0) param0->unk_88 = ov98_02247B24(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2)); param0->unk_94++; break; - case 2: - { + case 2: { int v0 = Menu_ProcessInputAndHandleExit(param0->unk_88, 109); if (v0 != 0xffffffff) { @@ -1926,14 +1907,13 @@ static int ov98_02248EE0 (UnkStruct_ov98_02247704 * param0) ov98_02247AE8(param0, 26, 0); } } - } - break; + } break; } return 0; } -static int ov98_02248F7C (UnkStruct_ov98_02247704 * param0) +static int ov98_02248F7C(UnkStruct_ov98_02247704 *param0) { if (ov98_02246F9C(param0->unk_00) == 0xffffffff) { param0->unk_08 = 21; @@ -2041,7 +2021,7 @@ static int ov98_02248F7C (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02249168 (UnkStruct_ov98_02247704 * param0) +static int ov98_02249168(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 1) { return 0; @@ -2062,7 +2042,7 @@ static int ov98_02249168 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022491CC (UnkStruct_ov98_02247704 * param0) +static int ov98_022491CC(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 1) { return 0; @@ -2084,7 +2064,7 @@ static int ov98_022491CC (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02249238 (UnkStruct_ov98_02247704 * param0) +static int ov98_02249238(UnkStruct_ov98_02247704 *param0) { switch (param0->unk_94) { case 0: @@ -2092,8 +2072,7 @@ static int ov98_02249238 (UnkStruct_ov98_02247704 * param0) ov98_02247AF0(param0); param0->unk_94++; break; - case 1: - { + case 1: { int v0; v0 = SaveData_Save(param0->unk_00->unk_04); @@ -2108,8 +2087,7 @@ static int ov98_02249238 (UnkStruct_ov98_02247704 * param0) ov98_02247B0C(param0); param0->unk_94++; - } - break; + } break; case 2: if (ov98_0224977C(param0->unk_44) == 0) { param0->unk_94++; @@ -2128,7 +2106,7 @@ static int ov98_02249238 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02249320 (UnkStruct_ov98_02247704 * param0) +static int ov98_02249320(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 1) { return 0; @@ -2177,7 +2155,7 @@ static int ov98_02249320 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02249414 (UnkStruct_ov98_02247704 * param0) +static int ov98_02249414(UnkStruct_ov98_02247704 *param0) { int v0; @@ -2190,7 +2168,7 @@ static int ov98_02249414 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02249438 (UnkStruct_ov98_02247704 * param0) +static int ov98_02249438(UnkStruct_ov98_02247704 *param0) { if (gSystem.pressedKeys & PAD_BUTTON_A || gSystem.pressedKeys & PAD_BUTTON_B) { Window_EraseStandardFrame(¶m0->unk_68, 0); @@ -2200,7 +2178,7 @@ static int ov98_02249438 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_02249464 (UnkStruct_ov98_02247704 * param0) +static int ov98_02249464(UnkStruct_ov98_02247704 *param0) { if (param0->unk_08 != 30) { sub_0203859C(); @@ -2215,7 +2193,7 @@ static int ov98_02249464 (UnkStruct_ov98_02247704 * param0) return 1; } -static int ov98_022494A0 (UnkStruct_ov98_02247704 * param0) +static int ov98_022494A0(UnkStruct_ov98_02247704 *param0) { param0->unk_88 = ov98_02247B24(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2)); param0->unk_08 = param0->unk_0C; @@ -2223,7 +2201,7 @@ static int ov98_022494A0 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022494C0 (UnkStruct_ov98_02247704 * param0) +static int ov98_022494C0(UnkStruct_ov98_02247704 *param0) { int v0 = 0; int v1 = 0; @@ -2296,7 +2274,7 @@ static int ov98_022494C0 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022495C4 (UnkStruct_ov98_02247704 * param0) +static int ov98_022495C4(UnkStruct_ov98_02247704 *param0) { switch (param0->unk_94) { case 0: @@ -2342,7 +2320,7 @@ static int ov98_022495C4 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022496A8 (UnkStruct_ov98_02247704 * param0) +static int ov98_022496A8(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 0) { param0->unk_08 = param0->unk_0C; @@ -2351,7 +2329,7 @@ static int ov98_022496A8 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022496C0 (UnkStruct_ov98_02247704 * param0) +static int ov98_022496C0(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 0) { if (param0->unk_90 > 30) { @@ -2364,7 +2342,7 @@ static int ov98_022496C0 (UnkStruct_ov98_02247704 * param0) return 0; } -static int ov98_022496EC (UnkStruct_ov98_02247704 * param0) +static int ov98_022496EC(UnkStruct_ov98_02247704 *param0) { if (ov98_0224977C(param0->unk_44) == 0) { param0->unk_88 = ov98_02247B24(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2)); @@ -2374,9 +2352,9 @@ static int ov98_022496EC (UnkStruct_ov98_02247704 * param0) return 0; } -static void ov98_02249714 (UnkStruct_ov98_02247704 * param0, MessageLoader * param1, int param2, int param3, u16 param4) +static void ov98_02249714(UnkStruct_ov98_02247704 *param0, MessageLoader *param1, int param2, int param3, u16 param4) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param1, param2); @@ -2393,7 +2371,7 @@ static void ov98_02249714 (UnkStruct_ov98_02247704 * param0, MessageLoader * par } } -static int ov98_0224977C (int param0) +static int ov98_0224977C(int param0) { if ((param0 == 0xff) || (Text_IsPrinterActive(param0) == 0)) { return 0; @@ -2402,11 +2380,12 @@ static int ov98_0224977C (int param0) return 1; } -static int ov98_02249798 (UnkStruct_ov98_02247704 * param0) +static int ov98_02249798(UnkStruct_ov98_02247704 *param0) { - if (ov98_0224977C(param0->unk_44) == 1) + if (ov98_0224977C(param0->unk_44) == 1) { return 0; - + } + switch (param0->unk_94) { case 0: ov98_02249714(param0, param0->unk_34, ov98_02246FB4(param0->unk_00) == 2 ? 0x26 : 0x27, TEXT_SPEED_FAST, 0x0F0F); @@ -2416,26 +2395,28 @@ static int ov98_02249798 (UnkStruct_ov98_02247704 * param0) param0->unk_08 = 5; break; } - + return 0; } -static int ov98_022497F8 (UnkStruct_ov98_02247704 * param0) +static int ov98_022497F8(UnkStruct_ov98_02247704 *param0) { - UnkStruct_ov98_02246E88 * v0 = param0->unk_00; + UnkStruct_ov98_02246E88 *v0 = param0->unk_00; int v1; u32 v2[4]; u32 v3; - - if (ov98_0224977C(param0->unk_44) == 1) + + if (ov98_0224977C(param0->unk_44) == 1) { return 0; - + } + switch (param0->unk_94) { case 0: if (ov98_02246FA4(v0) == sub_02030D98(v0->unk_04, 3)) { ov98_02249ACC(sub_02030D50(v0->unk_04), v2, 108); - for (v3 = 0; v3 < 4; v3++) + for (v3 = 0; v3 < 4; v3++) { StringTemplate_SetNumber(param0->unk_20, v3, v2[v3], 4, 2, 1); + } v1 = 41; } else { v1 = 40; @@ -2447,11 +2428,11 @@ static int ov98_022497F8 (UnkStruct_ov98_02247704 * param0) param0->unk_08 = 0; break; } - + return 0; } -static int ov98_02249894 (Window * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) +static int ov98_02249894(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) { int v0 = 0, v1; @@ -2476,9 +2457,9 @@ void ov98_022498CC(Window *param0, Strbuf *param1, int param2, int param3, int p Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, param1, param2, param3, TEXT_SPEED_INSTANT, param5, NULL); } -static void ov98_02249900 (UnkStruct_ov98_02247704 * param0, int param1) +static void ov98_02249900(UnkStruct_ov98_02247704 *param0, int param1) { - Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 109); + Strbuf *v0 = Strbuf_Init((16 * 8 * 2), 109); MessageLoader_GetStrbuf(param0->unk_30, param1, v0); StringTemplate_Format(param0->unk_20, param0->unk_40, v0); @@ -2492,7 +2473,7 @@ static void ov98_02249900 (UnkStruct_ov98_02247704 * param0, int param1) Strbuf_Free(v0); } -static void ov98_02249964 (UnkStruct_ov98_02247704 * param0, int param1, int param2) +static void ov98_02249964(UnkStruct_ov98_02247704 *param0, int param1, int param2) { int v0; diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index f4b5b1ffc5..09641f0e88 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -90,7 +92,7 @@ int ov99_021D0D80(OverlayManager *param0, int *param1) { UnkStruct_ov99_021D2CB0 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -158,7 +160,7 @@ int ov99_021D0D80(OverlayManager *param0, int *param1) GX_SetVisibleWnd(GX_WNDMASK_W0); GXS_SetVisibleWnd(GX_WNDMASK_W0); - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); GXLayers_TurnBothDispOn(); @@ -167,7 +169,7 @@ int ov99_021D0D80(OverlayManager *param0, int *param1) v0->unk_14 = SysTask_Start(ov99_021D1244, v0, 60000); - SetMainCallback(ov99_021D1350, v0); + SetVBlankCallback(ov99_021D1350, v0); sub_02004550(14, 1186, 1); sub_0200AB4C(-16, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), 3); @@ -279,7 +281,7 @@ int ov99_021D11A8(OverlayManager *param0, int *param1) ov99_021D19A0(v0); NARC_dtor(v0->unk_10F8); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); VramTransfer_Free(); sub_0201E530(); diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index 32ccbe2bce..38eb2b4efa 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" @@ -1061,7 +1063,7 @@ static void ov99_021D2AAC(UnkStruct_ov99_021D2CB0 *param0) { BgConfig *v0 = param0->unk_08; - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); PaletteData_FillBufferRange(param0->unk_0C, 0, 2, 0x0, 0, 1); diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index 170e9e0ea1..fedb323c07 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "overlay100/ov100_021D13E4.h" @@ -56,7 +58,7 @@ int ov100_021D0D80(OverlayManager *param0, int *param1) ov100_021D1034(&v0->unk_0C); StartScreenTransition(0, 1, 1, 0x0, 6 * 2, 1, 111); - SetMainCallback(ov100_021D13B4, v0); + SetVBlankCallback(ov100_021D13B4, v0); v0->unk_0C.unk_50.unk_00 = 31; v0->unk_0C.unk_50.unk_01 = 31; @@ -141,14 +143,14 @@ int ov100_021D0F44(OverlayManager *param0, int *param1) v0 = OverlayManager_Data(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); Window_EraseMessageBox(&v0->unk_0C.unk_30, 1); Window_ClearAndCopyToVRAM(&v0->unk_0C.unk_30); Window_Remove(&v0->unk_0C.unk_30); ov100_021D111C(&v0->unk_0C); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); OverlayManager_FreeData(param0); @@ -208,7 +210,7 @@ static void ov100_021D0FA0(UnkStruct_ov100_021D46C8 *param0) static void ov100_021D1034(UnkStruct_ov100_021D46C8 *param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 20de4b69b9..51e21d1101 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -336,7 +336,7 @@ void ov100_021D4C94(UnkStruct_ov100_021D46C8 *param0, int param1) void ov100_021D4DC8(int param0) { - gSystem.unk_65 = param0; + gSystem.whichScreenIs3D = param0; GXLayers_SwapDisplay(); } diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index e4a6fb2d90..a5cc44d1c8 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -79,7 +79,7 @@ int ov101_021D0D80(OverlayManager *param0, int *param1) UnkStruct_ov101_021D13C8 *v1; UnkStruct_0203E348 *v2; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -150,7 +150,7 @@ int ov101_021D0EE4(OverlayManager *param0, int *param1) UnkStruct_ov101_021D0F3C *v0 = OverlayManager_Data(param0); UnkStruct_ov101_021D13C8 *v1 = v0->unk_04; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); ov101_021D0F3C(v0, v1); @@ -231,7 +231,7 @@ static void ov101_021D0F9C(UnkStruct_ov101_021D13C8 *param0) G2S_SetBG3Priority(3); G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_OBJ, 8, 9); - SetMainCallback(ov101_021D197C, param0); + SetVBlankCallback(ov101_021D197C, param0); } static void ov101_021D107C(UnkStruct_ov101_021D13C8 *param0) diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index cbae7c7f7f..4c4dd44e1e 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -71,7 +71,7 @@ int ov102_021D0D80(OverlayManager *param0, int *param1) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -84,7 +84,7 @@ int ov102_021D0D80(OverlayManager *param0, int *param1) ov102_021D0F8C(v0); ov102_021D1174(v0); - SetMainCallback(ov102_021D0F80, (void *)v0); + SetVBlankCallback(ov102_021D0F80, (void *)v0); GXLayers_TurnBothDispOn(); return 1; @@ -163,7 +163,7 @@ int ov102_021D0F50(OverlayManager *param0, int *param1) ov102_021D1204(v0); ov102_021D10F8(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); OverlayManager_FreeData(param0); Heap_Destroy(v1); diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index 2a4eea7c8a..14cf8dd96b 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -128,7 +128,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0) v4 = SaveData_GetTrainerInfo(v3->unk_08); v2 = v3->unk_24; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -192,7 +192,7 @@ UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0) RenderControlFlags_SetCanABSpeedUpPrint(0); RenderControlFlags_SetSpeedUpOnTouch(0); - SetMainCallback(ov104_0223C6EC, v0); + SetVBlankCallback(ov104_0223C6EC, v0); v0->unk_A0 = SysTask_ExecuteOnVBlank(ov104_0223C71C, v0, 10); ov104_0222EB8C(v0, &v0->unk_90, v0->unk_C1); sub_02039734(); @@ -244,7 +244,7 @@ void ov104_0223C4CC(UnkStruct_ov104_0223C4CC *param0) GX_SetVisibleWnd(GX_WNDMASK_NONE); GXS_SetVisibleWnd(GX_WNDMASK_NONE); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); Heap_Destroy(94); diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 60432a7d8c..6c1ee75deb 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -600,7 +600,7 @@ int ov105_02241F54(OverlayManager *param0, int *param1) ov105_022451B4(v1); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(93); Overlay_UnloadByID(FS_OVERLAY_ID(overlay104)); @@ -2818,7 +2818,7 @@ static void ov105_022452A0(UnkStruct_ov105_02241FF4 *param0) static void ov105_022452E4(void) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -2868,7 +2868,7 @@ static void ov105_0224531C(UnkStruct_ov105_02241FF4 *param0) } GXLayers_TurnBothDispOn(); - SetMainCallback(ov105_0224451C, (void *)param0); + SetVBlankCallback(ov105_0224451C, (void *)param0); return; } diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index 8cfc4e83fa..935daf7e15 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -313,7 +313,7 @@ int ov106_02241CF0(OverlayManager *param0, int *param1) ov106_022423E8(v1); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(98); Overlay_UnloadByID(FS_OVERLAY_ID(overlay104)); @@ -781,7 +781,7 @@ static void ov106_0224248C(UnkStruct_ov106_02243118 *param0) static void ov106_022424C8(void) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -832,7 +832,7 @@ static void ov106_02242500(UnkStruct_ov106_02243118 *param0) sub_02039734(); } - SetMainCallback(ov106_022426E0, (void *)param0); + SetVBlankCallback(ov106_022426E0, (void *)param0); return; } diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index 3a71bc2791..7d366f4dfe 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -586,7 +586,7 @@ int ov107_02241D2C (OverlayManager * param0, int * param1) ov107_02242E14(v1); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(100); Overlay_UnloadByID(FS_OVERLAY_ID(overlay104)); @@ -1414,7 +1414,7 @@ static void ov107_02242E14 (UnkStruct_ov107_02241D6C * param0) static void ov107_02242F24 (void) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -1520,7 +1520,7 @@ static void ov107_02242F5C (UnkStruct_ov107_02241D6C * param0) sub_02039734(); } - SetMainCallback(ov107_022433EC, (void *)param0); + SetVBlankCallback(ov107_022433EC, (void *)param0); return; } diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index add26fa156..bc658c2779 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -380,7 +380,7 @@ int ov107_02246130 (OverlayManager * param0, int * param1) ov107_02246D84(v1); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(100); Overlay_UnloadByID(FS_OVERLAY_ID(overlay104)); @@ -1090,7 +1090,7 @@ static void ov107_02246D84 (UnkStruct_ov107_02246170 * param0) static void ov107_02246EAC (void) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -1187,7 +1187,7 @@ static void ov107_02246EE4 (UnkStruct_ov107_02246170 * param0) sub_02039734(); } - SetMainCallback(ov107_022472E8, (void *)param0); + SetVBlankCallback(ov107_022472E8, (void *)param0); return; } diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index a9cf0dcff1..3be46e085a 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -409,7 +409,7 @@ int ov108_02241D70(OverlayManager *param0, int *param1) VramTransfer_Free(); ov108_02242238(v1); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(103); Overlay_UnloadByID(FS_OVERLAY_ID(overlay104)); @@ -784,7 +784,7 @@ static void ov108_02242238(UnkStruct_ov108_02241DB0 *param0) static void ov108_02242344(void) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -862,7 +862,7 @@ static void ov108_0224237C(UnkStruct_ov108_02241DB0 *param0) sub_02039734(); } - SetMainCallback(ov108_02242708, (void *)param0); + SetVBlankCallback(ov108_02242708, (void *)param0); return; } diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index 104302abd5..8df79e8214 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -439,7 +439,7 @@ int ov109_021D0D80(OverlayManager *param0, int *param1) UnkStruct_0209C194 *v1 = OverlayManager_Args(param0); CommMan_SetErrorHandling(1, 1); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); ResetLock(2); Heap_Create(3, 95, 0x80000); @@ -457,7 +457,7 @@ int ov109_021D0D80(OverlayManager *param0, int *param1) sub_0201E3D8(); sub_0201E450(4); ov109_021D1C28(v0); - SetMainCallback(ov109_021D1C00, v0); + SetVBlankCallback(ov109_021D1C00, v0); ov109_021D29CC(v0); ov109_021D2AF0(v0); @@ -512,7 +512,7 @@ int ov109_021D0EB4(OverlayManager *param0, int *param1) ov109_021D2AF8(v0); ov109_021D1C68(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); VramTransfer_Free(); NARC_dtor(v0->unk_D80); OverlayManager_FreeData(param0); diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 02e40dd746..d61a817557 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -170,7 +170,7 @@ int ov109_021D3D50(OverlayManager *param0, int *param1) switch (*param1) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -198,7 +198,7 @@ int ov109_021D3D50(OverlayManager *param0, int *param1) ov109_021D40F0(v0->unk_14); StartScreenTransition(0, 17, 17, 0x0, 16, 1, 95); ov109_021D4300(v0, v1); - SetMainCallback(ov109_021D40A8, v0); + SetVBlankCallback(ov109_021D40A8, v0); ov109_021D41F8(v0, v1); ov109_021D43EC(); ov109_021D441C(v0, v1); @@ -313,7 +313,7 @@ int ov109_021D3F9C(OverlayManager *param0, int *param1) GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); v1->unk_0C->unk_10 = v1->unk_08; v1->unk_0C->unk_08 = ov109_021D548C(); diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 008d3e51fd..8180cba16f 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -96,7 +96,7 @@ int ov110_021D0D80 (OverlayManager * param0, int * param1) UnkStruct_ov110_021D0F78 * v1; UnkStruct_0203E564 * v2; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); @@ -131,7 +131,7 @@ int ov110_021D0D80 (OverlayManager * param0, int * param1) Font_LoadTextPalette(0, 13 * 32, 114); Font_LoadScreenIndicatorsPalette(0, 12 * 32, 114); ov110_021D2124(v1->unk_0C, v1->unk_10, ov110_021D1208(v1->unk_06)); - SetMainCallback(ov110_021D1048, (void *)v1); + SetVBlankCallback(ov110_021D1048, (void *)v1); (*param1) = 0; return 1; @@ -181,7 +181,7 @@ int ov110_021D0EF0 (OverlayManager * param0, int * param1) ov110_021D11CC(v1->unk_0C); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(114); return 1; diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index b0f48451bf..6565cb3803 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -433,7 +433,7 @@ int ov111_021D0F40(OverlayManager *param0, int *param1) ov111_021D1C0C(v1); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(115); return 1; @@ -1128,7 +1128,7 @@ static void ov111_021D1C0C(UnkStruct_ov111_021D0F7C *param0) static void ov111_021D1D30(void) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -1195,7 +1195,7 @@ static void ov111_021D1D68(UnkStruct_ov111_021D0F7C *param0) sub_0201E3D8(); sub_0201E450(1); - SetMainCallback(ov111_021D2090, (void *)param0); + SetVBlankCallback(ov111_021D2090, (void *)param0); return; } diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index 5160ef8247..aefceb0b72 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "overlay066/ov66_0222DDF0.h" @@ -340,7 +342,7 @@ int ov112_0225C700(OverlayManager *param0, int *param1) ov112_0225D1EC(&v0->unk_1C8, &v0->unk_08, 107); ov112_0225D57C(&v0->unk_264, &v0->unk_08, 107); - SetMainCallback(ov112_0225C964, v0); + SetVBlankCallback(ov112_0225C964, v0); DisableHBlank(); return 1; @@ -426,7 +428,7 @@ int ov112_0225C8FC(OverlayManager *param0, int *param1) ov112_0225D2D0(&v0->unk_1C8); ov112_0225CC84(&v0->unk_1B0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); ov112_0225C9F4(&v0->unk_08); @@ -489,7 +491,7 @@ static void ov112_0225CA34(UnkStruct_ov112_0225C9BC *param0, u32 param1) SetAllGraphicsModes(&Unk_ov112_0225D834); param0->unk_00 = BgConfig_New(param1); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); @@ -529,7 +531,7 @@ static void ov112_0225CB60(UnkStruct_ov112_0225C9BC *param0) } Heap_FreeToHeap(param0->unk_00); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); } diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index f98d152d11..c34ffefc41 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -4,6 +4,7 @@ #include #include +#include "constants/screen.h" #include "constants/species.h" #include "struct_decls/font_oam.h" @@ -339,7 +340,7 @@ int ov113_0225C700(OverlayManager *param0, int *param1) { UnkStruct_ov113_0225DBCC *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -433,7 +434,7 @@ int ov113_0225C700(OverlayManager *param0, int *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1); - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); GXLayers_TurnBothDispOn(); @@ -445,7 +446,7 @@ int ov113_0225C700(OverlayManager *param0, int *param1) v0->unk_18 = SysTask_Start(ov113_0225CEF0, v0, 60000); - SetMainCallback(ov113_0225CF18, v0); + SetVBlankCallback(ov113_0225CF18, v0); return 1; } @@ -656,7 +657,7 @@ int ov113_0225CDFC(OverlayManager *param0, int *param1) NARC_dtor(v0->unk_160); NARC_dtor(v0->unk_164); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); VramTransfer_Free(); sub_0201E530(); diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index f2c802de09..525a10cc8f 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_defs/struct_02015958.h" @@ -1329,7 +1331,7 @@ static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const GraphicsModes param0->unk_04 = param2; param0->unk_08 = param3; - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); { diff --git a/src/overlay115/ov115_02260440.c b/src/overlay115/ov115_02260440.c index e86f235f7c..c32eb1ad3c 100644 --- a/src/overlay115/ov115_02260440.c +++ b/src/overlay115/ov115_02260440.c @@ -134,7 +134,7 @@ int ov115_0226048C(OverlayManager *param0, int *param1) break; } - SetMainCallback(ov115_02260A50, v0); + SetVBlankCallback(ov115_02260A50, v0); DisableHBlank(); v0->unk_38 = 0; @@ -330,7 +330,7 @@ int ov115_0226048C(OverlayManager *param0, int *param1) ov115_02260D78(v0->unk_34); v0->unk_34 = NULL; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); VramTransfer_Free(); (*param1)++; @@ -546,7 +546,7 @@ static void ov115_02260B30(UnkStruct_ov115_0226095C *param0) static void ov115_02260B44(UnkStruct_ov115_0226095C *param0, UnkStruct_ov115_02260440 *param1) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); if (param0->unk_00 != NULL) { diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index fe077273dd..c47c915726 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "overlay004/ov4_021D0D80.h" @@ -61,7 +63,7 @@ static void ov116_022604C4(UnkStruct_ov116_0226139C *param0) param0->unk_78 = LCRNG_GetSeed(); ov116_022612CC(param0); - SetMainCallback(ov116_02261794, param0); + SetVBlankCallback(ov116_02261794, param0); DisableHBlank(); VramTransfer_New(32, 106); ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_128K); @@ -666,7 +668,7 @@ int ov116_02260CF4(OverlayManager *param0, int *param1) static void ov116_022610FC(UnkStruct_ov116_0226139C *param0) { - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); VramTransfer_Free(); @@ -829,7 +831,7 @@ void ov116_0226139C(UnkStruct_ov116_0226139C *param0) sub_0200D0B0(param0->unk_48.unk_08, param0->unk_48.unk_0C); sub_0200C8D4(param0->unk_48.unk_08); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); G3X_AlphaBlend(0); @@ -1035,7 +1037,7 @@ static void ov116_02261494(BgConfig *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); G2_SetBlendAlpha(0, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ, 7, 10); diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index 0d51078894..ec635fcfd0 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -4,6 +4,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" @@ -182,7 +184,7 @@ int ov117_02260668(OverlayManager *param0, int *param1) { UnkStruct_ov117_02261280 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); GX_SetVisiblePlane(0); @@ -260,7 +262,7 @@ int ov117_02260668(OverlayManager *param0, int *param1) StartScreenTransition(0, 27, 27, 0x0, 6, 1, 110); v0->unk_94 = SysTask_Start(ov117_02260F7C, v0, 60000); - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); GXLayers_TurnBothDispOn(); @@ -282,7 +284,7 @@ int ov117_02260668(OverlayManager *param0, int *param1) PaletteData_LoadBufferFromHardware(v0->unk_8C, 2, v2 * 16, 3 * 0x20); } - SetMainCallback(ov117_02260DA0, v0); + SetVBlankCallback(ov117_02260DA0, v0); if (v0->unk_00->unk_3C) { ov4_021D1E74(110); @@ -435,7 +437,7 @@ int ov117_02260C10(OverlayManager *param0, int *param1) ov117_022641E4(v0); ov117_02264508(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); ov117_022615E0(v0); ov117_022618E8(v0); diff --git a/src/savedata.c b/src/savedata.c index 93391d33e3..33e431c12d 100644 --- a/src/savedata.c +++ b/src/savedata.c @@ -119,7 +119,7 @@ BOOL SaveData_Erase(SaveData *saveData) { u8 *saveBuffer = Heap_AllocFromHeapAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE); - SleepLock(1); + SleepLock(SLEEP_TYPE_SAVE_DATA); SaveBlockFooter_Erase(saveData, SAVE_BLOCK_ID_NORMAL, !saveData->blockOffsets[SAVE_BLOCK_ID_NORMAL]); SaveBlockFooter_Erase(saveData, SAVE_BLOCK_ID_BOXES, !saveData->blockOffsets[SAVE_BLOCK_ID_BOXES]); @@ -137,7 +137,7 @@ BOOL SaveData_Erase(SaveData *saveData) SaveData_Clear(saveData); saveData->dataExists = FALSE; - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); return TRUE; } @@ -169,14 +169,14 @@ int SaveData_Save(SaveData *saveData) } if (saveData->isNewGameData) { - SleepLock(1); + SleepLock(SLEEP_TYPE_SAVE_DATA); SaveBlockFooter_Erase(saveData, SAVE_BLOCK_ID_NORMAL, !saveData->blockOffsets[SAVE_BLOCK_ID_NORMAL]); SaveBlockFooter_Erase(saveData, SAVE_BLOCK_ID_BOXES, !saveData->blockOffsets[SAVE_BLOCK_ID_BOXES]); SaveBlockFooter_Erase(saveData, SAVE_BLOCK_ID_NORMAL, saveData->blockOffsets[SAVE_BLOCK_ID_NORMAL]); SaveBlockFooter_Erase(saveData, SAVE_BLOCK_ID_BOXES, saveData->blockOffsets[SAVE_BLOCK_ID_BOXES]); - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); } int saveResult = SaveDataState_Save(saveData); @@ -662,7 +662,7 @@ static void SaveDataState_Init(SaveData *saveData, SaveDataState *state, int blo state->endBlock = blockID + 1; } - SleepLock(1); + SleepLock(SLEEP_TYPE_SAVE_DATA); } static int SaveDataState_Main(SaveData *saveData, SaveDataState *state) @@ -756,7 +756,7 @@ static void SaveDataState_End(SaveData *saveData, SaveDataState *state, int save saveData->fullSaveRequired = FALSE; } - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); } static void SaveDataState_Cancel(SaveData *saveData, SaveDataState *state) @@ -781,7 +781,7 @@ static void SaveDataState_Cancel(SaveData *saveData, SaveDataState *state) state->locked = FALSE; } - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); } BOOL SaveDataState_Save(SaveData *saveData) @@ -964,7 +964,7 @@ static u32 SaveCheckFooter_SaveCounter(void *saveBody, u32 size) int SaveDataExtra_Save(const SaveData *saveData, int extraSaveID, void *data) { - SleepLock(1); + SleepLock(SLEEP_TYPE_SAVE_DATA); GF_ASSERT(extraSaveID < gExtraSaveTableSize); const SaveTableEntry *saveTable = &gExtraSaveTable[extraSaveID]; @@ -994,17 +994,17 @@ int SaveDataExtra_Save(const SaveData *saveData, int extraSaveID, void *data) } if (saveResult == TRUE) { - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); return SAVE_RESULT_OK; } else { - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); return SAVE_RESULT_CORRUPT; } } int SaveDataExtra_SaveMirror(SaveData *saveData, int extraSaveID, void *data) { - SleepLock(1); + SleepLock(SLEEP_TYPE_SAVE_DATA); GF_ASSERT(extraSaveID < gExtraSaveTableSize); const SaveTableEntry *saveTable = &gExtraSaveTable[extraSaveID]; @@ -1037,10 +1037,10 @@ int SaveDataExtra_SaveMirror(SaveData *saveData, int extraSaveID, void *data) } if (saveResult == TRUE) { - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); return SAVE_RESULT_OK; } else { - SleepUnlock(1); + SleepUnlock(SLEEP_TYPE_SAVE_DATA); return SAVE_RESULT_CORRUPT; } } diff --git a/src/system.c b/src/system.c index b616629c4b..89111b6476 100644 --- a/src/system.c +++ b/src/system.c @@ -1,26 +1,38 @@ #include "system.h" +#include "nitro/pad/common/pad.h" #include #include "constants/heap.h" +#include "constants/screen.h" #include "boot.h" #include "heap.h" #include "math.h" #include "sys_task_manager.h" -typedef struct { - void *unk_00; - u32 unk_04; -} UnkStruct_021BF6F0; +#define MAIN_TASK_MAX 160 +#define VBLANK_TASK_MAX 32 +#define POST_VBLANK_TASK_MAX 32 +#define PRINT_TASK_MAX 4 +#define CACHE_ENTRY_MAX 128 + +typedef struct CacheEntry { + void *data; + u32 hash; +} CacheEntry; + +static void VBlankIntr(void); +static void DummyVBlankIntr(void); +static void HBlankIntr(void); static void SetHBlankEnabled(BOOL param0); -void sub_0201777C(void); +static void InitHeapSystem(void); static void ApplyButtonModeToInput(void); System gSystem; -void sub_02017728(void) +static void VBlankIntr(void) { OS_SetIrqCheckFlag(OS_IE_V_BLANK); MI_WaitDma(GX_DEFAULT_DMAID); @@ -28,28 +40,28 @@ void sub_02017728(void) gSystem.frameCounter++; } -static void sub_0201775C(void) +static void DummyVBlankIntr(void) { OS_SetIrqCheckFlag(OS_IE_V_BLANK); MI_WaitDma(GX_DEFAULT_DMAID); } -void sub_0201777C(void) +void SetDummyVBlankIntr(void) { - (void)OS_DisableIrqMask(OS_IE_V_BLANK); - OS_SetIrqFunction(OS_IE_V_BLANK, sub_0201775C); - (void)OS_EnableIrqMask(OS_IE_V_BLANK); + OS_DisableIrqMask(OS_IE_V_BLANK); + OS_SetIrqFunction(OS_IE_V_BLANK, DummyVBlankIntr); + OS_EnableIrqMask(OS_IE_V_BLANK); } -void SetMainCallback(Callback cb, void *data) +void SetVBlankCallback(Callback cb, void *data) { - gSystem.mainCallback = cb; - gSystem.mainCallbackData = data; + gSystem.vblankCallback = cb; + gSystem.vblankCallbackData = data; } void DisableHBlank(void) { - SetHBlankEnabled(0); + SetHBlankEnabled(FALSE); gSystem.hblankCallback = NULL; gSystem.hblankCallbackData = NULL; } @@ -57,18 +69,18 @@ void DisableHBlank(void) BOOL SetHBlankCallback(Callback cb, void *data) { if (cb == NULL) { - SetHBlankEnabled(0); + SetHBlankEnabled(FALSE); gSystem.hblankCallback = NULL; gSystem.hblankCallbackData = NULL; - return 1; + return TRUE; } else { if (gSystem.hblankCallback == NULL) { gSystem.hblankCallbackData = data; gSystem.hblankCallback = cb; - SetHBlankEnabled(1); - return 1; + SetHBlankEnabled(TRUE); + return TRUE; } else { - return 0; + return FALSE; } } } @@ -82,116 +94,99 @@ static void HBlankIntr(void) static void SetHBlankEnabled(BOOL enabled) { - OSIrqMask savedMask; - OS_DisableIrq(); - if (!enabled) { - savedMask = OS_GetIrqMask(); + OSIrqMask savedMask = OS_GetIrqMask(); OS_DisableIrqMask(OS_IE_H_BLANK); - GX_HBlankIntr(0); + GX_HBlankIntr(FALSE); } else { - savedMask = OS_GetIrqMask(); + OSIrqMask savedMask = OS_GetIrqMask(); OS_SetIrqFunction(OS_IE_H_BLANK, HBlankIntr); OS_EnableIrqMask(OS_IE_H_BLANK); - GX_HBlankIntr(1); + GX_HBlankIntr(TRUE); } - OS_EnableIrq(); } -static const HeapParam Unk_020E5674[] = { - { 0xD200, OS_ARENA_MAIN }, - { 0x20E00, OS_ARENA_MAIN }, - { 0x10, OS_ARENA_MAIN }, - { 0x10D800, OS_ARENA_MAIN } +static const HeapParam sHeapInitParams[] = { + { HEAP_SIZE_SYSTEM, OS_ARENA_MAIN }, + { HEAP_SIZE_SAVE, OS_ARENA_MAIN }, + { HEAP_SIZE_DEBUG, OS_ARENA_MAIN }, + { HEAP_SIZE_APPLICATION, OS_ARENA_MAIN } }; -static void sub_02017850(void) +static void InitHeapSystem(void) { - u32 v0[8]; - u8 v1[MATH_MD5_DIGEST_SIZE]; - u32 v2, v3; - - OS_GetLowEntropyData(v0); - MATH_CalcMD5(v1, v0, sizeof(v0)); + u32 lowEntropyData[8]; + u8 md5[MATH_MD5_DIGEST_SIZE]; - v2 = 0; + OS_GetLowEntropyData(lowEntropyData); + MATH_CalcMD5(md5, lowEntropyData, sizeof(lowEntropyData)); - for (v3 = 0; v3 < MATH_MD5_DIGEST_SIZE; v3++) { - v2 += v1[v3]; + u32 offset = 0; + for (u32 i = 0; i < MATH_MD5_DIGEST_SIZE; i++) { + offset += md5[i]; } - v2 %= 256; - - while (v2 % 4) { - v2++; + offset %= 256; + while (offset % 4) { + offset++; } - Heap_InitSystem(Unk_020E5674, NELEMS(Unk_020E5674), 123, v2); + Heap_InitSystem(sHeapInitParams, NELEMS(sHeapInitParams), HEAP_ID_MAX, offset); } -void sub_0201789C(void) +void InitSystem(void) { OS_Init(); FX_Init(); - GX_SetPower(GX_POWER_ALL); GX_Init(); - OS_InitTick(); - sub_02017850(); + InitHeapSystem(); - gSystem.mainTaskMgr = SysTaskManager_Init(160, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(160), 4)); - gSystem.vBlankTaskMgr = SysTaskManager_Init(32, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(32), 4)); - gSystem.postVBlankTaskMgr = SysTaskManager_Init(32, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(32), 4)); - gSystem.printTaskMgr = SysTaskManager_Init(4, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(4), 4)); + gSystem.mainTaskMgr = SysTaskManager_Init(MAIN_TASK_MAX, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(MAIN_TASK_MAX), 4)); + gSystem.vBlankTaskMgr = SysTaskManager_Init(VBLANK_TASK_MAX, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(VBLANK_TASK_MAX), 4)); + gSystem.postVBlankTaskMgr = SysTaskManager_Init(POST_VBLANK_TASK_MAX, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(POST_VBLANK_TASK_MAX), 4)); + gSystem.printTaskMgr = SysTaskManager_Init(PRINT_TASK_MAX, OS_AllocFromMainArenaLo(SysTaskManager_GetRequiredSize(PRINT_TASK_MAX), 4)); GX_DispOff(); GXS_DispOff(); - GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); - OS_SetIrqFunction(OS_IE_V_BLANK, sub_02017728); - - (void)OS_EnableIrqMask(OS_IE_V_BLANK); - (void)OS_EnableIrqMask(OS_IE_FIFO_RECV); - (void)OS_EnableIrq(); - (void)GX_VBlankIntr(1); + OS_SetIrqFunction(OS_IE_V_BLANK, VBlankIntr); + OS_EnableIrqMask(OS_IE_V_BLANK); + OS_EnableIrqMask(OS_IE_FIFO_RECV); + OS_EnableIrq(); + GX_VBlankIntr(TRUE); FS_Init(1); CheckForMemoryTampering(); - { - u32 v0 = FS_GetTableSize(); - void *v1 = OS_AllocFromMainArenaLo(v0, 4); + u32 fsTableSize = FS_GetTableSize(); + void *fsTable = OS_AllocFromMainArenaLo(fsTableSize, 4); - GF_ASSERT(v1 != NULL); - FS_LoadTable(v1, v0); - } + GF_ASSERT(fsTable != NULL); + FS_LoadTable(fsTable, fsTableSize); - gSystem.mainCallback = NULL; + gSystem.vblankCallback = NULL; gSystem.hblankCallback = NULL; gSystem.dummyCallback_10 = NULL; gSystem.dummyCallback_14 = NULL; gSystem.heapCanary = NULL; gSystem.vblankCounter = 0; - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; CARD_SetCacheFlushThreshold(0x500, 0x2400); - InitCRC16Table(HEAP_ID_SYSTEM); } -void InitGraphics(void) +void InitVRAM(void) { GX_SetBankForLCDC(GX_VRAM_LCDC_ALL); - MI_CpuClearFast((void *)HW_LCDC_VRAM, HW_LCDC_VRAM_SIZE); GX_DisableBankForLCDC(); - MI_CpuFillFast((void *)HW_OAM, 192, HW_OAM_SIZE); MI_CpuFillFast((void *)HW_DB_OAM, 192, HW_DB_OAM_SIZE); - MI_CpuClearFast((void *)HW_PLTT, HW_PLTT_SIZE); MI_CpuClearFast((void *)HW_DB_PLTT, HW_DB_PLTT_SIZE); } @@ -199,15 +194,12 @@ void InitGraphics(void) void *ReadFileToHeap(int heapID, const char *filename) { FSFile file; - void *buf; - FS_InitFile(&file); + void *buf; if (FS_OpenFile(&file, filename)) { u32 length = FS_GetLength(&file); - buf = Heap_AllocFromHeap(heapID, length); - if (buf != NULL) { if (FS_ReadFile(&file, buf, length) != length) { Heap_FreeToHeapExplicit(heapID, buf); @@ -226,12 +218,10 @@ void *ReadFileToHeap(int heapID, const char *filename) void ReadFileToBuffer(const char *filename, void **buf) { FSFile file; - FS_InitFile(&file); if (FS_OpenFile(&file, filename)) { u32 length = FS_GetLength(&file); - if (*buf != NULL) { if (FS_ReadFile(&file, *buf, length) != length) { /* error not handled */ @@ -242,26 +232,21 @@ void ReadFileToBuffer(const char *filename, void **buf) } } -UnkStruct_021BF6F0 Unk_021BF6F0[128]; +CacheEntry sCache[CACHE_ENTRY_MAX]; -void sub_02017ACC(void) +void ClearUnusedSystemCache(void) { - int v0; - - for (v0 = 128 - 1; v0 > -1; v0--) { - if (Unk_021BF6F0[v0].unk_00 != NULL) { - Heap_FreeToHeap(Unk_021BF6F0[v0].unk_00); - - Unk_021BF6F0[v0].unk_00 = NULL; - Unk_021BF6F0[v0].unk_04 = 0; + for (int i = CACHE_ENTRY_MAX - 1; i > -1; i--) { + if (sCache[i].data != NULL) { + Heap_FreeToHeap(sCache[i].data); + sCache[i].data = NULL; + sCache[i].hash = 0; } } } void InitKeypadAndTouchpad(void) { - TPCalibrateParam v0; - gSystem.buttonMode = 0; gSystem.heldKeysRaw = 0; gSystem.pressedKeysRaw = 0; @@ -276,19 +261,19 @@ void InitKeypadAndTouchpad(void) gSystem.touchY = 0; gSystem.touchPressed = 0; gSystem.touchHeld = 0; - gSystem.unk_64 = 0; + gSystem.touchAutoSampling = FALSE; TP_Init(); - if (TP_GetUserInfo(&v0) == 1) { - TP_SetCalibrateParam(&v0); + TPCalibrateParam touchCalibration; + if (TP_GetUserInfo(&touchCalibration) == TRUE) { + TP_SetCalibrateParam(&touchCalibration); } else { - v0.x0 = 0x2ae; - v0.y0 = 0x58c; - v0.xDotSize = 0xe25; - v0.yDotSize = 0x1208; - - TP_SetCalibrateParam(&v0); + touchCalibration.x0 = 0x02AE; + touchCalibration.y0 = 0x058C; + touchCalibration.xDotSize = 0x0E25; + touchCalibration.yDotSize = 0x1208; + TP_SetCalibrateParam(&touchCalibration); } } @@ -297,14 +282,14 @@ void SetGBACartridgeVersion(int version) gSystem.gbaCartridgeVersion = version; } -void SleepLock(u8 param0) +void SleepLock(u8 mask) { - gSystem.inhibitSleep |= param0; + gSystem.inhibitSleep |= mask; } -void SleepUnlock(u8 param0) +void SleepUnlock(u8 mask) { - gSystem.inhibitSleep &= ~(param0); + gSystem.inhibitSleep &= ~(mask); } void ReadKeypadAndTouchpad(void) @@ -328,7 +313,7 @@ void ReadKeypadAndTouchpad(void) gSystem.pressedKeysRaw = padRead & (padRead ^ gSystem.heldKeysRaw); gSystem.pressedKeysRepeatableRaw = gSystem.pressedKeysRaw; - if ((padRead != 0) && (gSystem.heldKeysRaw == padRead)) { + if (padRead != 0 && gSystem.heldKeysRaw == padRead) { if (--gSystem.autorepeatTimer == 0) { gSystem.pressedKeysRepeatableRaw = padRead; gSystem.autorepeatTimer = gSystem.autorepeatRate; @@ -345,8 +330,8 @@ void ReadKeypadAndTouchpad(void) ApplyButtonModeToInput(); - if (gSystem.unk_64 == 0) { - while (TP_RequestRawSampling(&tpRaw) != 0) + if (gSystem.touchAutoSampling == FALSE) { + while (TP_RequestRawSampling(&tpRaw) != FALSE) ; } else { TP_GetLatestRawPointInAuto(&tpRaw); @@ -380,84 +365,55 @@ void ReadKeypadAndTouchpad(void) gSystem.touchHeld = tp.touch; } +#define CONVERT_KEY(member, convertFrom, convertTo) \ + { \ + if (member & convertFrom) { \ + member |= convertTo; \ + } \ + } +#define SWAP_KEY(member, swapA, swapB) \ + { \ + u32 tmp = 0; \ + if (member & swapA) { \ + tmp |= swapB; \ + } \ + if (member & swapB) { \ + tmp |= swapA; \ + } \ + member &= ((swapA | swapB) ^ 0xFFFF); \ + member |= tmp; \ + } +#define CLEAR_KEY(member, key) \ + { \ + member &= (key ^ 0xFFFF); \ + } + static void ApplyButtonModeToInput(void) { switch (gSystem.buttonMode) { default: case BUTTON_MODE_NORMAL: break; - case BUTTON_MODE_START_IS_X: - if (gSystem.pressedKeys & PAD_BUTTON_START) { - gSystem.pressedKeys |= PAD_BUTTON_X; - } - - if (gSystem.heldKeys & PAD_BUTTON_START) { - gSystem.heldKeys |= PAD_BUTTON_X; - } - if (gSystem.pressedKeysRepeatable & PAD_BUTTON_START) { - gSystem.pressedKeysRepeatable |= PAD_BUTTON_X; - } + case BUTTON_MODE_START_IS_X: + CONVERT_KEY(gSystem.pressedKeys, PAD_BUTTON_START, PAD_BUTTON_X); + CONVERT_KEY(gSystem.heldKeys, PAD_BUTTON_START, PAD_BUTTON_X); + CONVERT_KEY(gSystem.pressedKeysRepeatable, PAD_BUTTON_START, PAD_BUTTON_X); break; - case BUTTON_MODE_SWAP_XY: { - u32 tmp = 0; - - if (gSystem.pressedKeys & PAD_BUTTON_X) { - tmp |= PAD_BUTTON_Y; - } - - if (gSystem.pressedKeys & PAD_BUTTON_Y) { - tmp |= PAD_BUTTON_X; - } - - gSystem.pressedKeys &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); - gSystem.pressedKeys |= tmp; - } - { - u32 tmp = 0; - - if (gSystem.heldKeys & PAD_BUTTON_X) { - tmp |= PAD_BUTTON_Y; - } - - if (gSystem.heldKeys & PAD_BUTTON_Y) { - tmp |= PAD_BUTTON_X; - } - gSystem.heldKeys &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); - gSystem.heldKeys |= tmp; - } - { - u32 tmp = 0; - - if (gSystem.pressedKeysRepeatable & PAD_BUTTON_X) { - tmp |= PAD_BUTTON_Y; - } - - if (gSystem.pressedKeysRepeatable & PAD_BUTTON_Y) { - tmp |= PAD_BUTTON_X; - } - - gSystem.pressedKeysRepeatable &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); - gSystem.pressedKeysRepeatable |= tmp; - } + case BUTTON_MODE_SWAP_XY: + SWAP_KEY(gSystem.pressedKeys, PAD_BUTTON_X, PAD_BUTTON_Y); + SWAP_KEY(gSystem.heldKeys, PAD_BUTTON_X, PAD_BUTTON_Y); + SWAP_KEY(gSystem.pressedKeysRepeatable, PAD_BUTTON_X, PAD_BUTTON_Y); break; - case BUTTON_MODE_L_IS_A: - if (gSystem.pressedKeys & PAD_BUTTON_L) { - gSystem.pressedKeys |= PAD_BUTTON_A; - } - - if (gSystem.heldKeys & PAD_BUTTON_L) { - gSystem.heldKeys |= PAD_BUTTON_A; - } - if (gSystem.pressedKeysRepeatable & PAD_BUTTON_L) { - gSystem.pressedKeysRepeatable |= PAD_BUTTON_A; - } - - gSystem.pressedKeys &= ((PAD_BUTTON_L | PAD_BUTTON_R) ^ 0xffff); - gSystem.heldKeys &= ((PAD_BUTTON_L | PAD_BUTTON_R) ^ 0xffff); - gSystem.pressedKeysRepeatable &= ((PAD_BUTTON_L | PAD_BUTTON_R) ^ 0xffff); + case BUTTON_MODE_L_IS_A: + CONVERT_KEY(gSystem.pressedKeys, PAD_BUTTON_L, PAD_BUTTON_A); + CONVERT_KEY(gSystem.heldKeys, PAD_BUTTON_L, PAD_BUTTON_A); + CONVERT_KEY(gSystem.pressedKeysRepeatable, PAD_BUTTON_L, PAD_BUTTON_A); + CLEAR_KEY(gSystem.pressedKeys, (PAD_BUTTON_L | PAD_BUTTON_R)); + CLEAR_KEY(gSystem.heldKeys, (PAD_BUTTON_L | PAD_BUTTON_R)); + CLEAR_KEY(gSystem.pressedKeysRepeatable, (PAD_BUTTON_L | PAD_BUTTON_R)); break; } } @@ -468,19 +424,19 @@ void SetAutorepeat(int rate, int delay) gSystem.autorepeatDelay = delay; } -void ResetLock(u8 param0) +void ResetLock(u8 mask) { - gSystem.inhibitReset |= param0; + gSystem.inhibitReset |= mask; } -void ResetUnlock(u8 param0) +void ResetUnlock(u8 mask) { - gSystem.inhibitReset &= ~(param0); + gSystem.inhibitReset &= ~(mask); } -#define HEAP_CANARY 0x2f93a1bc +#define HEAP_CANARY 0x2F93A1BC -void InitHeapCanary(int heapID) +void InitHeapCanary(enum HeapId heapID) { GF_ASSERT(gSystem.heapCanary == NULL); @@ -499,9 +455,9 @@ void FreeHeapCanary(void) BOOL HeapCanaryOK(void) { + // Explicit if required to match. if (gSystem.heapCanary && *gSystem.heapCanary == HEAP_CANARY) { - return 1; + return TRUE; } - - return 0; + return FALSE; } diff --git a/src/unk_02017498.c b/src/unk_02017498.c index 8d35ad626d..0b09e4b3a2 100644 --- a/src/unk_02017498.c +++ b/src/unk_02017498.c @@ -36,7 +36,7 @@ int sub_02017498(OverlayManager *param0, int *param1) { UnkStruct_02017498 *v0; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); diff --git a/src/unk_0201E3D8.c b/src/unk_0201E3D8.c index 1812975c48..3813305fea 100644 --- a/src/unk_0201E3D8.c +++ b/src/unk_0201E3D8.c @@ -93,7 +93,7 @@ u32 sub_0201E450(u32 param0) static void sub_0201E4A4(u32 param0, u32 param1, void *param2, u32 param3, u32 param4, u32 param5) { Unk_021C0704.unk_58 = param0; - gSystem.unk_64 = param1; + gSystem.touchAutoSampling = param1; Unk_021C0704.unk_00 = param2; Unk_021C0704.unk_04 = param3; Unk_021C0704.unk_08 = param5; diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c index 94006a95ae..93bcd7d591 100644 --- a/src/unk_020366A0.c +++ b/src/unk_020366A0.c @@ -2463,7 +2463,7 @@ void sub_02038A20(int param0) if (!sub_020389D8()) { sub_0200569C(); SaveData_SaveStateCancel(Unk_021C07D4->unk_28); - gSystem.unk_64 = 1; + gSystem.touchAutoSampling = TRUE; if (Unk_021C07D4->unk_59 == 3) { sub_020389C4(3); diff --git a/src/unk_02039814.c b/src/unk_02039814.c index 202ee180d0..7a8a16671f 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "bg_window.h" @@ -114,7 +116,7 @@ void sub_02039834(int param0, int param1, int param2) OS_SetIrqFunction(OS_IE_V_BLANK, sub_02039814); (void)OS_EnableIrqMask(OS_IE_V_BLANK); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -123,7 +125,7 @@ void sub_02039834(int param0, int param1, int param2) GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); G2_BlendNone(); diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index a0cc27875b..023ea1bb47 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -1,6 +1,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "bg_window.h" @@ -16,8 +18,6 @@ #include "unk_0200A9DC.h" #include "unk_0200F174.h" -void sub_0201777C(void); - void sub_02039A64(int param0, int param1); static const UnkStruct_02099F80 Unk_020E5F7C = { @@ -78,7 +78,7 @@ void sub_02039A64(int param0, int param1) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -86,7 +86,7 @@ void sub_02039A64(int param0, int param1) GX_SetVisiblePlane(0); GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); G2_BlendNone(); diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index cf94a74c82..9ed087a52b 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -191,7 +191,7 @@ void sub_0207B0E0(UnkStruct_0207AE68 *param0) sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Windows_Delete(param0->unk_04, 1); PaletteData_FreeBuffer(param0->unk_14, 0); PaletteData_FreeBuffer(param0->unk_14, 1); @@ -920,7 +920,7 @@ static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BgConfig *param1) GXLayers_TurnBothDispOn(); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); - SetMainCallback(sub_0207C520, param0); + SetVBlankCallback(sub_0207C520, param0); } static void sub_0207C460(BgConfig *param0) diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index c468146e1c..c250f709c9 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -246,7 +246,7 @@ static int sub_0207E0B8(OverlayManager *param0, int *param1) GameWindowLayout *v0; NARC *v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -310,7 +310,7 @@ static int sub_0207E0B8(OverlayManager *param0, int *param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); } - SetMainCallback(sub_0207E898, v0); + SetVBlankCallback(sub_0207E898, v0); DrawWifiConnectionIcon(); NARC_dtor(v1); @@ -643,7 +643,7 @@ static int sub_0207E7E0(OverlayManager *param0, int *param1) GameWindowLayout *v0 = OverlayManager_Data(param0); u32 v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); sub_02082FF4(v0); sub_02081B90(v0); sub_0207EA24(v0->unk_00); diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 768d42537f..4d430eb04b 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_02087A10_decl.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/struct_02099F80.h" @@ -873,7 +875,7 @@ static int sub_0208694C(OverlayManager *param0, int *param1) switch (*param1) { case 0: - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -899,7 +901,7 @@ static int sub_0208694C(OverlayManager *param0, int *param1) sub_020871B0(v0, (UnkStruct_0208737C *)OverlayManager_Args(param0)); sub_0208769C(v0, v1); Font_InitManager(FONT_SUBSCREEN, 18); - SetMainCallback(sub_02087190, NULL); + SetVBlankCallback(sub_02087190, NULL); sub_0208737C(v0, param0); Font_UseImmediateGlyphAccess(FONT_SYSTEM, 18); sub_020877C4(); @@ -912,7 +914,7 @@ static int sub_0208694C(OverlayManager *param0, int *param1) sub_0208732C(1); { - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); } @@ -1176,11 +1178,11 @@ static int sub_02086F3C(OverlayManager *param0, int *param1) MessageLoader_Free(v0->unk_16C); StringTemplate_Free(v0->unk_168); OverlayManager_FreeData(param0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); Heap_Destroy(18); { - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); } diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index 827b6750be..73fbe90e72 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -4,6 +4,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02089438.h" #include "struct_defs/struct_02089688.h" #include "struct_defs/struct_02099F80.h" @@ -50,7 +52,7 @@ static int sub_020890F4(OverlayManager *param0, int *param1) memset(v0, 0, sizeof(UnkStruct_02089688)); v0->unk_38C = *((UnkStruct_02089438 *)OverlayManager_Args(param0)); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -85,7 +87,7 @@ static int sub_020890F4(OverlayManager *param0, int *param1) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2, 15, 7); G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8); - SetMainCallback(sub_020895CC, v0); + SetVBlankCallback(sub_020895CC, v0); return 1; } @@ -339,7 +341,7 @@ static void sub_0208945C(BgConfig *param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG3, 0); } - gSystem.unk_65 = 1; + gSystem.whichScreenIs3D = DS_SCREEN_SUB; GXLayers_SwapDisplay(); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); diff --git a/src/unk_0208BEBC.c b/src/unk_0208BEBC.c index d862ae055c..20548021fb 100644 --- a/src/unk_0208BEBC.c +++ b/src/unk_0208BEBC.c @@ -1,6 +1,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_0208C06C.h" #include "overlay062/ov62_0222F2C0.h" @@ -125,7 +127,7 @@ static int sub_0208BF6C(OverlayManager *param0, int *param1) ov62_0222F514(v0); Heap_Destroy(102); Overlay_UnloadByID(FS_OVERLAY_ID(overlay62)); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); return 1; diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index 6fb4c0501d..ae2e0f9f8e 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -178,7 +178,7 @@ static int sub_02097B18(OverlayManager *param0, int *param1) } ov76_0223DCC0(v0); - SetMainCallback(ov76_0223ECB0, v0); + SetVBlankCallback(ov76_0223ECB0, v0); ov76_0223B8A8(v0); sub_02004550(59, 0, 0); diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 84d8fd55ee..35132880ad 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -62,7 +62,7 @@ static int sub_02098218(OverlayManager *param0, int *param1) UnkStruct_0209843C *v0; UnkStruct_ov119_021D0FD0 *v1; - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); Heap_Create(3, 71, 0x40000); @@ -98,7 +98,7 @@ static int sub_02098218(OverlayManager *param0, int *param1) ov119_021D17B8(&v1->unk_04); sub_0200569C(); - SetMainCallback(ov119_021D0FD0, v1); + SetVBlankCallback(ov119_021D0FD0, v1); return 1; } @@ -188,7 +188,7 @@ static int sub_02098388(OverlayManager *param0, int *param1) OverlayManager_FreeData(param0); Heap_Destroy(71); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); DisableHBlank(); return 1; diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index cd54216990..0520eb3ab2 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -106,7 +106,7 @@ int sub_02099E38(OverlayManager *param0, int *param1) sub_02004234(0); sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -117,7 +117,7 @@ int sub_02099E38(OverlayManager *param0, int *param1) SetAutorepeat(4, 8); sub_02099F80(v0); sub_0209A098(v0); - SetMainCallback(sub_02099F74, (void *)v0); + SetVBlankCallback(sub_02099F74, (void *)v0); GXLayers_TurnBothDispOn(); StartScreenTransition(0, 1, 1, 0, 6, 1, v0->unk_00); *param1 = 1; @@ -137,7 +137,7 @@ int sub_02099E38(OverlayManager *param0, int *param1) if (IsScreenTransitionDone() == TRUE) { sub_0209A0E0(v0); sub_0209A044(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); v1 = 1; } break; diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index f2aff172d4..20d1328027 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -91,7 +91,7 @@ int sub_0209A300(OverlayManager *param0, int *param1) case 0: sub_0200F344(0, 0); sub_0200F344(1, 0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -111,7 +111,7 @@ int sub_0209A300(OverlayManager *param0, int *param1) case 2: sub_0209A530(v0); sub_0209A490(v0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); v1 = 1; break; } diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index 4d2502b723..18c458cabd 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "bg_window.h" @@ -74,7 +76,7 @@ void sub_0209A74C(int param0) sub_0200F344(0, 0); sub_0200F344(1, 0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -83,7 +85,7 @@ void sub_0209A74C(int param0) GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); G2_BlendNone(); @@ -149,14 +151,14 @@ void sub_0209A8E0(int param0) sub_0200F344(0, 0); sub_0200F344(1, 0); - SetMainCallback(NULL, NULL); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); GX_SetVisiblePlane(0); GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); G2_BlendNone(); diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index 6164afcdd7..110a3fc506 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "bg_window.h" @@ -18,8 +20,6 @@ #include "unk_0200A9DC.h" #include "unk_0200F174.h" -void sub_0201777C(void); - static const UnkStruct_02099F80 Unk_020F8B54 = { GX_VRAM_BG_256_AB, GX_VRAM_BGEXTPLTT_NONE, @@ -82,8 +82,8 @@ void sub_0209AA74(int param0, int param1) sub_0200F344(0, 0); sub_0200F344(1, 0); - sub_0201777C(); - SetMainCallback(NULL, NULL); + SetDummyVBlankIntr(); + SetVBlankCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -92,7 +92,7 @@ void sub_0209AA74(int param0, int param1) GXS_SetVisiblePlane(0); SetAutorepeat(4, 8); - gSystem.unk_65 = 0; + gSystem.whichScreenIs3D = DS_SCREEN_MAIN; GXLayers_SwapDisplay(); G2_BlendNone(); From a6fc5c91f3d5731c74b14f26d47a20723f5ec35f Mon Sep 17 00:00:00 2001 From: Rachel Date: Sat, 8 Feb 2025 12:25:10 -0800 Subject: [PATCH 5/5] Decorate whichScreenIs3D value checks with DSScreen constants --- src/gx_layers.c | 4 +++- src/overlay062/ov62_02231690.c | 4 +++- src/overlay077/ov77_021D25B0.c | 2 +- src/overlay077/ov77_021D54B0.c | 6 ++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/gx_layers.c b/src/gx_layers.c index 3534997ec0..76777e77eb 100644 --- a/src/gx_layers.c +++ b/src/gx_layers.c @@ -4,6 +4,8 @@ #include #include +#include "constants/screen.h" + #include "struct_defs/struct_02099F80.h" #include "system.h" @@ -98,7 +100,7 @@ void GXLayers_TurnBothDispOn(void) void GXLayers_SwapDisplay(void) { - if (gSystem.whichScreenIs3D == 0) { + if (gSystem.whichScreenIs3D == DS_SCREEN_MAIN) { GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); } else { GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index 6d619b19c3..ae18ce161c 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_0202F298_decl.h" @@ -2747,7 +2749,7 @@ static void ov62_02234440(UnkStruct_0208C06C *param0) param0->unk_41D8.unk_0C = NULL; } - if (gSystem.whichScreenIs3D == 0) { + if (gSystem.whichScreenIs3D == DS_SCREEN_MAIN) { param0->unk_41D8.unk_08 = param0->unk_6F4; } else { param0->unk_41D8.unk_08 = param0->unk_6F0; diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index 01bd4b3c14..a8717111df 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -1631,7 +1631,7 @@ static void ov77_021D3D4C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37 static void ov77_021D3DC4(UnkStruct_ov77_021D37C0 *param0) { - if (gSystem.whichScreenIs3D == 0) { + if (gSystem.whichScreenIs3D == DS_SCREEN_MAIN) { Bg_SetOffset(param0->unk_10, 1, 3, 0); Bg_SetOffset(param0->unk_10, 2, 3, 0); Bg_SetOffset(param0->unk_10, 3, 3, 0); diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c index 09b52e1b57..6eb021ab4e 100644 --- a/src/overlay077/ov77_021D54B0.c +++ b/src/overlay077/ov77_021D54B0.c @@ -3,6 +3,8 @@ #include #include +#include "constants/screen.h" + #include "overlay077/ov77_021D6670.h" #include "overlay077/struct_ov77_021D6734_decl.h" @@ -521,7 +523,7 @@ void ov77_021D6290(UnkStruct_ov77_021D5564 *param0, fx32 param1) VecFx32 v1; int v2, v3; - if (gSystem.whichScreenIs3D == 0) { + if (gSystem.whichScreenIs3D == DS_SCREEN_MAIN) { v2 = 13; v3 = 15; } else { @@ -560,7 +562,7 @@ void ov77_021D636C(UnkStruct_ov77_021D5564 *param0, int param1) VecFx32 v1; if (param1 == 0) { - if (gSystem.whichScreenIs3D == 0) { + if (gSystem.whichScreenIs3D == DS_SCREEN_MAIN) { CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 0); CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 0); CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 1);