diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/code_2.c | 195 | ||||
| -rw-r--r-- | src/code_800C9CC.c | 2 | ||||
| -rw-r--r-- | src/input.c | 153 | ||||
| -rw-r--r-- | src/main.c | 12 | ||||
| -rw-r--r-- | src/pokemon.c | 4 | ||||
| -rw-r--r-- | src/text.c | 26 | ||||
| -rw-r--r-- | src/wonder_mail.c | 26 |
7 files changed, 306 insertions, 112 deletions
diff --git a/src/code_2.c b/src/code_2.c new file mode 100644 index 0000000..d53ab29 --- /dev/null +++ b/src/code_2.c @@ -0,0 +1,195 @@ +#include "global.h" +#include "file_system.h" +#include "input.h" + +extern void InitHeap(void); +extern void NDS_DebugInit(void); +extern void sub_801180C(void); +extern void NDS_LoadOverlay_GroundMain(void); +extern void sub_8014144(void); +extern void LoadMonsterParameters(void); +extern void sub_8097670(void); +extern void sub_8094F88(void); +extern void sub_8094980(void); +extern void sub_8094C14(void); +extern void sub_8097F5C(void); +extern void sub_80923A0(void); +extern void sub_8090998(void); +extern void sub_809207C(void); +extern void LoadWazaParameters(void); +extern void sub_80950BC(void); +extern void sub_80958E8(void); +extern void sub_800CD64(u32, u32); +extern void sub_8012284(void); +extern void sub_8094998(u32); +extern void SetWindowTitle(char *); +extern void sub_800DAAC(void); +extern void SetSavingIconCoords(u32); +extern u32 sub_8011DAC(u32 *); +extern void sub_800135C(void); +extern void xxx_script_related_8001334(u32); +extern void sub_80015C0(u32, u32); +extern u32 sub_8001658(u32, u32); +extern void sub_800A8F8(u32); +extern void ResetSprites(u32); +extern void xxx_update_some_bg_tiles(u32); +extern void sub_80097B0(void); +extern void sub_800CDA8(u32); +extern void sub_800641C(u32, u32, u32); +extern void LoadTitleScreen(void); +extern void sub_800CCA0(u32, u32); +extern void sub_800CCAC(u32, u32); +extern void SetBGPaletteBufferColorRGB(s32, u8 *, s32, u8 *); +extern void xxx_update_stuff(u32); +extern void sub_800BDFC(u32); +extern void sub_80095CC(u32, u32); +extern void InitMainMenu(void); + +extern void sub_8012468(void); +extern u32 sub_8012484(void); +extern void sub_8012558(void); +extern u8 sub_80363E0(void); +extern void SetBGOBJEnableFlags(u32); +extern void SetUpMenu(void); +extern u32 UpdateMenu(void); +extern void CleanUpMenu(void); +extern void sub_80357D0(void); +extern s32 sub_80953D4(u32); +extern void sub_8095240(u8); +extern void sub_80122A8(void); +extern void nullsub_33(void); +extern u32 sub_80009D0(u32); + +extern u32 gUnknown_203B03C; +extern u16 gUnknown_2026E4E; +extern s32 gUnknown_2000A80; +extern struct OpenedFile *gTitlePaletteFile; +extern struct Inputs gRealInputs; + +extern char gUnknown_80B69BC[]; + +void GameLoop(void) +{ + u32 tmp; + u8 tmp3 = 1; + u32 tmp4; + u32 flag; + + InitHeap(); + NDS_DebugInit(); + sub_801180C(); + NDS_LoadOverlay_GroundMain(); + sub_8014144(); + LoadMonsterParameters(); + sub_8097670(); + sub_8094F88(); + sub_8094980(); + sub_8094C14(); + sub_8097F5C(); + sub_80923A0(); + sub_8090998(); + sub_809207C(); + LoadWazaParameters(); + sub_80950BC(); + sub_80958E8(); + sub_800CD64(0x8000, 0); + sub_8012284(); + sub_8094998(1); + SetWindowTitle(gUnknown_80B69BC); + sub_800DAAC(); + SetSavingIconCoords(0); + tmp = 0; + if (sub_8011DAC(&tmp)) + sub_800135C(); + xxx_script_related_8001334(14); + xxx_script_related_8001334(15); + sub_80015C0(0, 57); + xxx_script_related_8001334(16); + if (sub_8001658(0, 57) == 0) + xxx_script_related_8001334(17); + + while (1) { + gUnknown_203B03C = 0; // ??? + sub_800A8F8(2); + ResetSprites(1); + xxx_update_some_bg_tiles(0); + sub_80097B0(); + sub_800CDA8(2); + sub_800641C(0, 1, 1); + gUnknown_2026E4E = 0x1000; + LoadTitleScreen(); + sub_800CCA0(0, 0); + sub_800CCAC(0, 0); + gUnknown_2000A80 = 0; + while (gUnknown_2000A80 < 32) { + s32 i; + gUnknown_2000A80++; + for (i = 0; i < 240; i++) + SetBGPaletteBufferColorRGB(i, &gTitlePaletteFile->data[i * 4], gUnknown_2000A80, 0); + xxx_update_stuff(0); + } + if (tmp3) { + sub_8012468(); + while ((u8)(tmp3 = sub_8012484())) + xxx_update_stuff(0); + sub_8012558(); + } + tmp3 = 1; + sub_800BDFC(8); + flag = TRUE; + sub_80095CC(0, 20); + InitMainMenu(); + while (1) { + if ((u8)sub_80363E0()) { + if (gRealInputs.pressed & L_BUTTON) { + flag = FALSE; + SetBGOBJEnableFlags(19); + } else if (!flag && (gRealInputs.held & L_BUTTON) == 0) { + flag = TRUE; + SetBGOBJEnableFlags(0); + } + if (!flag) { + xxx_update_stuff(0); + continue; + } + } + SetUpMenu(); + xxx_update_stuff(0); + tmp4 = UpdateMenu(); + CleanUpMenu(); + if (tmp4 == 2) break; + if (tmp4 == 4) break; + if (tmp4 == 3) break; + } + sub_80357D0(); + while (gUnknown_2000A80 > 0) { + s32 i; + gUnknown_2000A80--; + for (i = 0; i < 240; i++) + SetBGPaletteBufferColorRGB(i, &gTitlePaletteFile->data[i * 4], gUnknown_2000A80, 0); + xxx_update_stuff(0); + } + CloseFile(gTitlePaletteFile); + switch (tmp4) { + case 2: { + s32 tmp5 = sub_80953D4(7); + if (tmp5 != -1) { + sub_8095240(tmp5); + tmp3 = sub_80009D0(2); + } else { + tmp3 = sub_80009D0(1); + } + break; + } + case 4: + tmp3 = sub_80009D0(3); + break; + case 3: + sub_80122A8(); + nullsub_33(); + tmp3 = sub_80009D0(0); + break; + } + + } +} diff --git a/src/code_800C9CC.c b/src/code_800C9CC.c index 593728e..ddc49c6 100644 --- a/src/code_800C9CC.c +++ b/src/code_800C9CC.c @@ -19,7 +19,7 @@ extern struct unkStruct_809CC88 gUnknown_202D6A0; extern struct unkStruct_809CC88 gUnknown_202D6A8; extern struct unkStruct_809CC88 gUnknown_202D6B0; -void ReadKeyInput(struct UnkInputStruct1 *r0) +void ReadKeyInput(struct Inputs *r0) { u16 keyInput = REG_KEYINPUT ^ KEYS_MASK; r0->held = 0; diff --git a/src/input.c b/src/input.c index 5951103..e13bb7d 100644 --- a/src/input.c +++ b/src/input.c @@ -1,15 +1,15 @@ #include "global.h" #include "input.h" -EWRAM_DATA struct Input gUnknown_2025600; -EWRAM_DATA struct UnkInputStruct1 gRealInputs; -EWRAM_DATA struct UnkInputStruct1 gBufferedInputs; -EWRAM_DATA struct UnkInputStruct1 gCurrentInputs; -EWRAM_DATA struct UnkInputStruct1 gLastInputs; -EWRAM_DATA struct UnkInputStruct2 gUnknown_2025668; +EWRAM_DATA struct UnusedInputStruct gUnusedInputsRelated; +EWRAM_DATA struct Inputs gRealInputs; +EWRAM_DATA struct Inputs gBufferedInputs; +EWRAM_DATA struct Inputs gCurrentInputs; +EWRAM_DATA struct Inputs gLastInputs; +EWRAM_DATA struct InputTimers gInputTimers; EWRAM_DATA u32 gUnusedScrambledInputJunk; -void ReadKeyInput(struct UnkInputStruct1 *r0); +void ReadKeyInput(struct Inputs *r0); void InitInput(void) { @@ -25,26 +25,26 @@ void InitInput(void) gUnusedScrambledInputJunk = 0x4a14c1; // seems like random keyboard mashing (see UpdateInput) - gUnknown_2025600.unk20 = 0; - gUnknown_2025600.unk0 = 0xffff; // probably a mask - gUnknown_2025600.unk2 = -1; - gUnknown_2025600.unk4 = -1; - gUnknown_2025600.unk6 = -1; - gUnknown_2025600.unk1C = -1; - gUnknown_2025600.unk1E = -1; - gUnknown_2025600.unk8 = -1; - gUnknown_2025600.unkA = -1; - gUnknown_2025600.unkC = -1; - gUnknown_2025600.unkE = -1; - gUnknown_2025600.unk10 = -1; - gUnknown_2025600.unk12 = -1; - gUnknown_2025600.unk14 = -1; - gUnknown_2025600.unk16 = -1; - gUnknown_2025600.unk28 = 0; - gUnknown_2025600.unk29 = 0; - - gUnknown_2025668.holdTimerB = 0; - gUnknown_2025668.holdTimerR = 0; + gUnusedInputsRelated.unk20 = 0; + gUnusedInputsRelated.unk0 = 0xffff; // probably a mask + gUnusedInputsRelated.unk2 = -1; + gUnusedInputsRelated.unk4 = -1; + gUnusedInputsRelated.unk6 = -1; + gUnusedInputsRelated.unk1C = -1; + gUnusedInputsRelated.unk1E = -1; + gUnusedInputsRelated.unk8 = -1; + gUnusedInputsRelated.unkA = -1; + gUnusedInputsRelated.unkC = -1; + gUnusedInputsRelated.unkE = -1; + gUnusedInputsRelated.unk10 = -1; + gUnusedInputsRelated.unk12 = -1; + gUnusedInputsRelated.unk14 = -1; + gUnusedInputsRelated.unk16 = -1; + gUnusedInputsRelated.unk28 = 0; + gUnusedInputsRelated.unk29 = 0; + + gInputTimers.holdTimerB = 0; + gInputTimers.holdTimerR = 0; } void LoadBufferedInputs(void) @@ -56,21 +56,21 @@ void LoadBufferedInputs(void) gBufferedInputs.repeated = 0; gBufferedInputs.shortPress = 0; - gUnknown_2025600.unk0 = 0xffff; - gUnknown_2025600.unk2 = -1; - gUnknown_2025600.unk4 = -1; - gUnknown_2025600.unk6 = -1; - gUnknown_2025600.unk8 = -1; - gUnknown_2025600.unkA = -1; - gUnknown_2025600.unkC = -1; - gUnknown_2025600.unkE = -1; - gUnknown_2025600.unk10 = -1; - gUnknown_2025600.unk12 = -1; - gUnknown_2025600.unk14 = -1; - gUnknown_2025600.unk16 = -1; - - gUnknown_2025600.unk28 = 0; - gUnknown_2025600.unk29 = 0; + gUnusedInputsRelated.unk0 = 0xffff; + gUnusedInputsRelated.unk2 = -1; + gUnusedInputsRelated.unk4 = -1; + gUnusedInputsRelated.unk6 = -1; + gUnusedInputsRelated.unk8 = -1; + gUnusedInputsRelated.unkA = -1; + gUnusedInputsRelated.unkC = -1; + gUnusedInputsRelated.unkE = -1; + gUnusedInputsRelated.unk10 = -1; + gUnusedInputsRelated.unk12 = -1; + gUnusedInputsRelated.unk14 = -1; + gUnusedInputsRelated.unk16 = -1; + + gUnusedInputsRelated.unk28 = 0; + gUnusedInputsRelated.unk29 = 0; } // Unused @@ -112,8 +112,8 @@ void ResetRepeatTimers(void) gRealInputs.repeated = 0; gCurrentInputs.repeatTimerDpad = 0; gCurrentInputs.heldDpad = 0; - gUnknown_2025668.holdTimerB = 999; - gUnknown_2025668.holdTimerR = 999; + gInputTimers.holdTimerB = 999; + gInputTimers.holdTimerR = 999; } @@ -124,25 +124,25 @@ void UnpressButtons(void) gCurrentInputs.pressed = 0; } -void sub_8004914(void) +void ResetUnusedInputStruct(void) { - gUnknown_2025600.unk20 = 0x5; - gUnknown_2025600.unk24 = 0; - gUnknown_2025600.unk0 = 0xffff; - gUnknown_2025600.unk2 = -1; - gUnknown_2025600.unk4 = -1; - gUnknown_2025600.unk6 = -1; - gUnknown_2025600.unk8 = -1; - gUnknown_2025600.unkA = -1; - gUnknown_2025600.unkC = -1; - gUnknown_2025600.unkE = -1; - gUnknown_2025600.unk10 = -1; - gUnknown_2025600.unk12 = -1; - gUnknown_2025600.unk14 = -1; - gUnknown_2025600.unk16 = -1; - - gUnknown_2025600.unk28 = 0; - gUnknown_2025600.unk29 = 0; + gUnusedInputsRelated.unk20 = 0x5; + gUnusedInputsRelated.unk24 = 0; + gUnusedInputsRelated.unk0 = 0xffff; + gUnusedInputsRelated.unk2 = -1; + gUnusedInputsRelated.unk4 = -1; + gUnusedInputsRelated.unk6 = -1; + gUnusedInputsRelated.unk8 = -1; + gUnusedInputsRelated.unkA = -1; + gUnusedInputsRelated.unkC = -1; + gUnusedInputsRelated.unkE = -1; + gUnusedInputsRelated.unk10 = -1; + gUnusedInputsRelated.unk12 = -1; + gUnusedInputsRelated.unk14 = -1; + gUnusedInputsRelated.unk16 = -1; + + gUnusedInputsRelated.unk28 = 0; + gUnusedInputsRelated.unk29 = 0; } @@ -155,12 +155,11 @@ void UpdateInput(void) gCurrentInputs.pressed = (gLastInputs.held ^ gCurrentInputs.held) & gCurrentInputs.held; if (gCurrentInputs.held) { - // 0xF0 -- DPAD buttons - if ((gCurrentInputs.heldDpad & 0xf0) == (gCurrentInputs.held & 0xf0)) { + if ((gCurrentInputs.heldDpad & DPAD_ANY) == (gCurrentInputs.held & DPAD_ANY)) { if (gCurrentInputs.repeatTimerDpad < 50) gCurrentInputs.repeatTimerDpad++; } else { - gCurrentInputs.heldDpad = gCurrentInputs.held & 0xf0; + gCurrentInputs.heldDpad = gCurrentInputs.held & DPAD_ANY; gCurrentInputs.repeatTimerDpad = 1; } } else { @@ -169,33 +168,33 @@ void UpdateInput(void) } if (gCurrentInputs.repeatTimerDpad == 1) { - gCurrentInputs.repeated = (gCurrentInputs.heldDpad & 0xf0) | gCurrentInputs.pressed; + gCurrentInputs.repeated = (gCurrentInputs.heldDpad & DPAD_ANY) | gCurrentInputs.pressed; } else if (gCurrentInputs.repeatTimerDpad == 48) { gCurrentInputs.repeatTimerDpad = 43; - gCurrentInputs.repeated = (gCurrentInputs.heldDpad & 0xf0) | gCurrentInputs.pressed; + gCurrentInputs.repeated = (gCurrentInputs.heldDpad & DPAD_ANY) | gCurrentInputs.pressed; } else { gCurrentInputs.repeated = 0; } gCurrentInputs.shortPress = 0; if (gCurrentInputs.held & B_BUTTON) { - if (gUnknown_2025668.holdTimerB < 100) - gUnknown_2025668.holdTimerB++; - } else if (1 < gUnknown_2025668.holdTimerB && gUnknown_2025668.holdTimerB < 12) { + if (gInputTimers.holdTimerB < 100) + gInputTimers.holdTimerB++; + } else if (1 < gInputTimers.holdTimerB && gInputTimers.holdTimerB < 12) { gCurrentInputs.shortPress = B_BUTTON; - gUnknown_2025668.holdTimerB = 0; + gInputTimers.holdTimerB = 0; } else { - gUnknown_2025668.holdTimerB = 0; + gInputTimers.holdTimerB = 0; } if (gCurrentInputs.held & R_BUTTON) { - if (gUnknown_2025668.holdTimerR < 100) - gUnknown_2025668.holdTimerR++; - } else if (1 < gUnknown_2025668.holdTimerR && gUnknown_2025668.holdTimerR < 12) { + if (gInputTimers.holdTimerR < 100) + gInputTimers.holdTimerR++; + } else if (1 < gInputTimers.holdTimerR && gInputTimers.holdTimerR < 12) { gCurrentInputs.shortPress |= R_BUTTON; - gUnknown_2025668.holdTimerR = 0; + gInputTimers.holdTimerR = 0; } else { - gUnknown_2025668.holdTimerR = 0; + gInputTimers.holdTimerR = 0; } gBufferedInputs.held |= gCurrentInputs.held; @@ -10,7 +10,7 @@ extern u8 gUnknown_202D7FE; extern char alt_203B038[]; -extern char gUnknown_203B038[]; +extern char gTitlePaletteFile[]; extern char gUnknown_203BC04[]; extern char iwram_start[]; @@ -36,7 +36,7 @@ extern void InitBGPaletteBuffer(void); extern void sub_80057E8(void); extern void InitFileSystem(void); extern void sub_80098A0(void); -extern void sub_80096E0(void); +extern void InitGraphics(void); extern void sub_800B6F4(int, void *); extern void GameLoop(void); extern void Hang(void); @@ -54,8 +54,8 @@ void AgbMain(void) DmaStop(2); DmaStop(3); - if (gUnknown_203BC04 - gUnknown_203B038 > 0) - CpuCopy32(gUnknown_8270000, gUnknown_203B038, gUnknown_203BC04 - gUnknown_203B038); + if (gUnknown_203BC04 - gTitlePaletteFile > 0) + CpuCopy32(gUnknown_8270000, gTitlePaletteFile, gUnknown_203BC04 - gTitlePaletteFile); if (alt_203B038 - ewram_start > 0) { @@ -98,9 +98,9 @@ void AgbMain(void) InitBGPaletteBuffer(); sub_80057E8(); InitFileSystem(); - sub_8006218(); + LoadCharmaps(); sub_80098A0(); - sub_80096E0(); + InitGraphics(); sub_800B6F4(1, sub_800CE54); REG_DISPCNT = 32576; GameLoop(); diff --git a/src/pokemon.c b/src/pokemon.c index 454751e..11dc189 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -7,7 +7,7 @@ extern u32 gUnknown_202F400; extern struct FileArchive gUnknown_8300500; extern const char gUnknown_81075F4; extern struct OpenedFile *gMonsterParametersFile; -extern u16 gUnknown_20384E8; +extern u16 gLevelCurrentPokeId; extern struct gPokemon gMonsterParameters; extern u64 gUnknown_8107544[]; @@ -32,7 +32,7 @@ void LoadMonsterParameters(void) gMonsterParametersFile = OpenFileAndGetFileDataPtr(&gUnknown_81075F4, &gUnknown_8300500); // TODO verify this... other parts imply this is an array gMonsterParameters.species = gMonsterParametersFile->data; - gUnknown_20384E8 = 0; + gLevelCurrentPokeId = 0; } u32 *sub_808CE00(void) @@ -23,13 +23,13 @@ struct UnkTextStruct2 { extern char gUnknown_3000E94[]; EWRAM_DATA struct UnkTextStruct1 gUnknown_2027370[4]; -EWRAM_DATA u8 *gKanji[2]; -EWRAM_DATA u16 gUnknown_2027498; +EWRAM_DATA u8 *gCharmaps[2]; +EWRAM_DATA u16 gCharacterSpacing; EWRAM_DATA u8 gUnknown_20274A5; -EWRAM_DATA u32 gUnknown_20274AC; +EWRAM_DATA u32 gCurrentCharmap; EWRAM_DATA vu32 gUnknown_20274B0; EWRAM_DATA u8 gUnknown_20274B4[0x3b00]; -EWRAM_DATA struct OpenedFile *gKanjiFiles[2]; +EWRAM_DATA struct OpenedFile *gCharmapFiles[2]; EWRAM_DATA struct UnkTextStruct2 gUnknown_202AFC0[4]; EWRAM_DATA u32 gUnknown_202B020; EWRAM_DATA u32 gUnknown_202B024; @@ -53,17 +53,17 @@ extern const u32 gUnknown_80B87C4[8]; extern const u32 gUnknown_80B87E4[8]; extern const u32 gUnknown_80B8804[4]; -void sub_8006218(void) +void LoadCharmaps(void) { int i; int j; int k; - gUnknown_20274AC = 0; - gKanjiFiles[0] = OpenFileAndGetFileDataPtr(gUnknown_80B87B4, &gUnknown_8300500); - gKanjiFiles[1] = OpenFileAndGetFileDataPtr(gUnknown_80B87BC, &gUnknown_8300500); - gKanji[0] = gKanjiFiles[0]->data; - gKanji[1] = gKanjiFiles[1]->data; + gCurrentCharmap = 0; + gCharmapFiles[0] = OpenFileAndGetFileDataPtr(gUnknown_80B87B4, &gUnknown_8300500); + gCharmapFiles[1] = OpenFileAndGetFileDataPtr(gUnknown_80B87BC, &gUnknown_8300500); + gCharmaps[0] = gCharmapFiles[0]->data; + gCharmaps[1] = gCharmapFiles[1]->data; gUnknown_202B028[0] = 11; gUnknown_202B028[1] = 12; for (k = 0; k < 4; k++) @@ -72,7 +72,7 @@ void sub_8006218(void) gUnknown_2027370[k].unk08 = 0; gUnknown_2027370[k].unk46 = 0; } - gUnknown_2027498 = 0; + gCharacterSpacing = 0; for (i = 0; i < 20; i++) { gUnknown_202B038[0][i][0] = 0xf279; @@ -132,9 +132,9 @@ u8 sub_80063BC(u8 a0) return retval; } -void sub_80063CC(u32 a0) +void SelectCharmap(u32 a0) { - gUnknown_20274AC = a0; + gCurrentCharmap = a0; } void sub_80063D8(int a0) diff --git a/src/wonder_mail.c b/src/wonder_mail.c index c3fa39b..07c4ff9 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -90,7 +90,7 @@ extern void sub_80141B4(u32 *r0, u32, u32 *r1, u32); extern void nullsub_130(void); extern void sub_8028348(void); extern void sub_800641C(void *r0, u8, u8); -extern void sub_8004914(); +extern void ResetUnusedInputStruct(); extern void sub_803084C(); extern u32 sub_8030768(u32); extern u8 sub_80307EC(); @@ -587,7 +587,7 @@ void sub_8029044(void) gUnknown_203B2C0->unk0 = 0x1F; gUnknown_203B2C0->unk218 = sub_80307EC(); sub_8006518(&(gUnknown_203B2C0->unk3BC)); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(0, 1, 1); sub_8030D40(gUnknown_203B2C0->unk218, 0); sub_8028B04(33); @@ -623,7 +623,7 @@ void sub_80290F0(void) case 12: gUnknown_203B2C0->unk0 = 0x3D; sub_8006518(&(gUnknown_203B2C0->unk3BC)); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(0, 1, 1); sub_8030D40(gUnknown_203B2C0->unk218, 0); sub_8028B04(33); @@ -646,7 +646,7 @@ void sub_80291AC(void) case 2: case 3: sub_8030DE4(); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(&(gUnknown_203B2C0->unk3BC), 1, 1); sub_803092C(); if(gUnknown_203B2C0->unk0 == 0x3D) @@ -892,7 +892,7 @@ void sub_80293F4(void) break; case 2: sub_80155F0(); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(&(gUnknown_203B2C0->unk3BC), 1, 1); sub_8028B04(1); break; @@ -1032,7 +1032,7 @@ void sub_80293F4(void) "_0802952C: .4byte 0x00000101\n" "_08029530:\n" "\tbl sub_80155F0\n" - "\tbl sub_8004914\n" + "\tbl ResetUnusedInputStruct\n" "\tldr r0, _08029558\n" "\tldr r0, [r0]\n" "\tmovs r2, 0xEF\n" @@ -1117,7 +1117,7 @@ void sub_80295D8(void) gUnknown_203B2C0->unk0 = 0x2A; gUnknown_203B2C0->unk218 = sub_80307EC(); sub_8006518(&(gUnknown_203B2C0->unk3BC)); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(0, 1, 1); sub_8030D40(gUnknown_203B2C0->unk218, 0); sub_8028B04(0x2C); @@ -1153,7 +1153,7 @@ void sub_8029684(void) case 0xC: gUnknown_203B2C0->unk0 = 0x3D; sub_8006518(&(gUnknown_203B2C0->unk3BC)); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(0, 1, 1); sub_8030D40(gUnknown_203B2C0->unk218, 0); sub_8028B04(0x2C); @@ -1174,7 +1174,7 @@ void sub_8029740(void) case 2: case 3: sub_8030DE4(); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(&(gUnknown_203B2C0->unk3BC), 1, 1); sub_803092C(); if(gUnknown_203B2C0->unk0 == 0x3D) @@ -1227,7 +1227,7 @@ void sub_80297D4(void) gUnknown_203B2C0->unk0 = 0x33; gUnknown_203B2C0->unk544 = sub_8023B44(); sub_8006518(&(gUnknown_203B2C0->unk3BC)); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(0, 1, 1); sub_8024458(gUnknown_203B2C0->unk544, 0); sub_8028B04(0x35); @@ -1253,7 +1253,7 @@ void sub_8029884(void) case 0xC: gUnknown_203B2C0->unk0 = 0x3D; sub_8006518(&(gUnknown_203B2C0->unk3BC)); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(0, 1, 1); sub_8024458(gUnknown_203B2C0->unk544, 0); sub_8028B04(0x35); @@ -1283,7 +1283,7 @@ void sub_8029944(void) case 2: case 3: sub_802453C(); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(&(gUnknown_203B2C0->unk3BC), 1, 1); sub_8023B7C(1); if(gUnknown_203B2C0->unk0 == 0x3D) @@ -1423,7 +1423,7 @@ void sub_8029AF4(void) case 2: case 3: sub_8031E10(); - sub_8004914(); + ResetUnusedInputStruct(); sub_800641C(&(gUnknown_203B2C0->unk3BC), 1, 1); sub_8028B04(0x3C); break; |