diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-10-11 09:03:17 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-11 09:03:17 -0700 |
commit | 25794a39c3539e66d1c0b2334cb35273cd9d8494 (patch) | |
tree | 43ca3a658e80672844b2906b8cbe151ed70c3621 /src/wonder_mail.c | |
parent | 2d4c802d769f53462a2742a5c6afaad4d7f290fb (diff) |
Finish main menu decomp (#59)
* decomp rest of main_menu
* move some main menu data over
* decomp some more wonder mail
* decomp the dungeon dialogue scene switches
* more wonder mail
* consolidate struct_802F204
* another wonder mail func
* more wonder mail
* slight cleanup
Diffstat (limited to 'src/wonder_mail.c')
-rw-r--r-- | src/wonder_mail.c | 649 |
1 files changed, 632 insertions, 17 deletions
diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 29cd2bc..cae3233 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -34,7 +34,7 @@ extern struct MenuItem gUnknown_80DDA48[]; extern s32 sub_8095190(void); extern u32 sub_8095324(u32); -extern void sub_80141B4(const char *r0, u32, u32 *r1, u32); +extern void sub_80141B4(const char *r0, u32, struct OpenedFile **r1, u32); extern void nullsub_130(void); extern void sub_8028348(void); extern void ResetUnusedInputStruct(); @@ -52,7 +52,7 @@ extern void sub_803092C(void); extern u32 sub_80154F0(); extern u32 sub_8039068(u32, u8 *r1, u8 *r0); -extern void sub_8014248(const char *r0, u32, u32, struct MenuItem *r4, u32, u32, u32, u32 *r5, u32); +extern void sub_8014248(const char *r0, u32, u32, struct MenuItem *r4, u32, u32, u32, void *r5, u32); extern void sub_8095274(u32); extern void sub_80155F0(); extern void sub_80951BC(u8 *r0); @@ -83,6 +83,621 @@ extern void sub_8099690(u32); extern void sub_8031E10(void); extern void sub_803084C(void); extern void sub_8030DE4(); +extern u8 gUnknown_80DDAE4[]; +extern struct MenuItem gUnknown_80DDAA0[]; +extern struct MenuItem gUnknown_80DDA80[]; +extern struct MenuItem gUnknown_80DDAFC[]; +extern struct MenuItem gUnknown_80DDB60[]; +extern struct MenuItem gUnknown_80DDA64[]; +extern struct unkStruct_203B45C *gRecruitedPokemonRef; +extern struct MenuItem gUnknown_80DDB24[]; +extern struct MenuItem gUnknown_80DD9EC[]; +extern u8 gUnknown_80DDACC[]; +extern struct MenuItem gUnknown_80DD970[]; + +extern void nullsub_23(u32); +extern s32 sub_8037D64(u32, void *, void *); +extern s32 sub_80381F4(u32, void *, void *); +extern void sub_8023868(u32, u32, u32, u32); +extern void sub_80306A8(u32, u32, u32, u32); +extern s32 sub_8037B28(u32); +extern void sub_8011830(void); +extern u32 sub_8095350(); +extern void sub_8031D70(u8, u32); +extern void sub_80151C0(u32, u8 *); +extern void xxx_call_start_bg_music(void); +extern u32 sub_8023CE8(void); +extern u32 sub_8030894(void); +extern void sub_8030F58(u32); +extern void sub_8023DA4(void); +extern void SetMenuItems(void *, struct UnkTextStruct2 *, u32, u8 *, struct MenuItem *, u32, u32, u32); +extern void sub_8029B34(void); +extern void sub_8029AD8(void); +extern void sub_8029AF4(void); +extern void sub_8029A88(void); +extern void sub_8029AB0(void); +extern void sub_80297B8(void); +extern void sub_80297D4(void); +extern void sub_8029884(void); +extern void sub_8029944(void); +extern void sub_80299AC(void); +extern void sub_80299D8(void); +extern void sub_8029A6C(void); +extern void sub_8028CE0(void); +extern void sub_8028BF0(void); +extern void sub_8029A18(void); +extern void sub_80295A8(void); +extern void sub_8029668(void); +extern void sub_8029684(void); +extern void sub_8029740(void); +extern void sub_80295D8(void); +extern void sub_802979C(void); +extern void sub_8029358(void); +extern void sub_8029374(void); +extern void sub_802939C(void); +extern void sub_8028F58(void); +extern void sub_8028F30(void); +extern void sub_8028F04(void); +extern void sub_8028ED4(void); +extern void sub_80293D8(void); +extern void sub_80293F4(void); +extern void sub_8028DE8(u32); +extern void sub_8028EAC(void); +extern void sub_802955C(void); +extern void sub_80292A4(void); +extern void sub_80292EC(void); +extern void sub_802933C(void); +extern void sub_802958C(void); +extern void sub_8029208(void); +extern void sub_8028E84(void); +extern void sub_8028F80(void); +extern void sub_8028FC0(void); +extern void sub_8028FDC(void); +extern void sub_8028E54(void); +extern void sub_8028E24(void); +extern void sub_8028E08(void); +extern void sub_80290D4(void); +extern void sub_80290F0(void); +extern void sub_80291AC(void); +extern void sub_8029044(void); +extern void sub_8028CFC(void); +extern void sub_8028D4C(void); +extern void sub_8031E10(void); +extern void sub_8023C60(void); +extern void sub_803084C(void); +extern void sub_80155F0(void); +extern void sub_80310B4(void); +extern void sub_8030DE4(void); +extern void sub_802453C(void); + + + +u32 sub_8027F88(void) +{ + char *monName; + struct OpenedFile *faceFile; + s32 counter; + + ResetUnusedInputStruct(); + sub_800641C(0, 1, 1); + gUnknown_203B2C0 = MemoryAlloc(sizeof(struct WonderMailStruct_203B2C0), 8); + MemoryFill8((u8 *)gUnknown_203B2C0, 0, sizeof(struct WonderMailStruct_203B2C0)); + gUnknown_203B2C0->unk53C = 0; + gUnknown_203B2C0->unk218 = -1; + gUnknown_203B2C0->unk544 = -1; + CopyYellowSpeciesNametoBuffer(gUnknown_202E5D8, SPECIES_PELIPPER); + monName = GetMonSpecies(SPECIES_PELIPPER); + strcpy(gAvailablePokemonNames, monName); + faceFile = GetDialogueSpriteDataPtr(SPECIES_PELIPPER); + gUnknown_203B2C0->faceFile = faceFile; + gUnknown_203B2C0->faceData = faceFile->data; + gUnknown_203B2C0->unk42C = 0; + gUnknown_203B2C0->unk42D = 0; + gUnknown_203B2C0->unk42E = 0; + gUnknown_203B2C0->unk428 = 2; + gUnknown_203B2C0->unk42A = 8; + for(counter = 0; counter < PASSWORD_BUFFER_SIZE; counter++){ + gUnknown_203B2C0->passwordBuffer[counter] = 0; + } + gUnknown_203B2C0->unk0 = 0x3D; + sub_8028B04(0); // Set initial state to 0? + return 1; +} + +u32 sub_8028078(void) +{ + + switch(gUnknown_203B2C0->state) { + case 0x3c: + sub_8029B34(); + break; + case 0x3a: + sub_8029AD8(); + break; + case 0x3b: + sub_8029AF4(); + break; + case 0x38: + sub_8029A88(); + break; + case 0x37: + sub_8029AB0(); + break; + case 0x32: + sub_80297B8(); + break; + case 0x33: + sub_80297D4(); + break; + case 0x34: + sub_8029884(); + break; + case 0x35: + sub_8029944(); + break; + case 0x31: + sub_80299AC(); + break; + case 0x36: + sub_80299D8(); + break; + case 0x30: + sub_8029A6C(); + break; + case 0x2e: + sub_8029A18(); + break; + case 0x2d: + sub_80295A8(); + break; + case 0x29: + sub_8029668(); + break; + case 0x2b: + sub_8029684(); + break; + case 0x2c: + sub_8029740(); + break; + case 0x2a: + sub_80295D8(); + break; + case 0x2f: + sub_802979C(); + break; + case 9: + sub_8029358(); + break; + case 0x23: + sub_8029374(); + break; + case 0x24: + sub_802939C(); + break; + case 0x26: + sub_80293D8(); + break; + case 0x27: + sub_80293F4(); + break; + case 0x28: + sub_802955C(); + break; + case 4: + sub_80292A4(); + break; + case 6: + sub_80292EC(); + break; + case 7: + sub_802933C(); + break; + case 5: + sub_802958C(); + break; + case 8: + sub_8029208(); + break; + case 0x1a: + sub_8028DE8(1); + break; + case 0x1b: + sub_8028F80(); + break; + case 0x1c: + case 0x1d: + sub_8028FC0(); + break; + case 0x22: + sub_8028FDC(); + break; + case 0x1e: + sub_80290D4(); + break; + case 0x20: + sub_80290F0(); + break; + case 0x21: + sub_80291AC(); + break; + case 0x1f: + sub_8029044(); + break; + case 10: + sub_8028CFC(); + break; + case 0xb: + sub_8028D4C(); + break; + case 0xd: + case 0xf: + sub_8028DE8(10); + break; + case 0x11: + sub_8028E08(); + break; + case 0xc: + case 0xe: + case 0x10: + sub_8028DE8(0x19); + break; + case 0x12: + sub_8028E24(); + break; + case 0x13: + sub_8028E54(); + break; + case 0x17: + sub_8028E84(); + break; + case 0x18: + sub_8028EAC(); + break; + case 0x19: + sub_8028ED4(); + break; + case 0x14: + sub_8028F04(); + break; + case 0x15: + sub_8028F30(); + break; + case 0x16: + sub_8028F58(); + break; + case 0: + case 1: + sub_8028BF0(); + break; + case 2: + case 0x25: + case 0x39: + sub_8028CE0(); + break; + case 3: + return 3; + } + return 0; +} + +s32 sub_80282DC(u8 *r0) +{ + *r0 = gUnknown_203B2C0->unk218; + return gUnknown_203B2C0->unk53C; +} + +void sub_80282FC(void) +{ + if (gUnknown_203B2C0 != NULL) { + CloseFile(gUnknown_203B2C0->faceFile); + MemoryFree(gUnknown_203B2C0); + gUnknown_203B2C0 = NULL; + sub_8031E10(); + sub_8023C60(); + sub_803084C(); + sub_80155F0(); + sub_80310B4(); + sub_8030DE4(); + sub_802453C(); + } +} + +void nullsub_130(void) +{ +} + +void sub_8028348(void) +{ + s32 linkError; + switch(gUnknown_203B2C0->state) + { + case 0x3B: + sub_8006518(gUnknown_203B2C0->unk3BC); + ResetUnusedInputStruct(); + sub_800641C(0, 1, 1); + sub_8031D70(gUnknown_203B2C0->unk218, 0); + break; + case 0x3C: + sub_80141B4(gUnknown_80DDBA8, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x3A: + sub_80141B4(gUnknown_80DDBFC, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x38: + sub_80141B4(gUnknown_80DDC30, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x37: + switch(gUnknown_203B2C0->unk534) + { + // 0x0 - 0x9 included here too... + case 0x10: + case 0xF: + case 0xD: + sub_80141B4(gUnknown_80DDC70, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0xE: + break; + } + break; + case 0x39: + sub_80141B4(gUnknown_80DDC30, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x32: + sub_80141B4(gUnknown_80DDCBC, 0, 0,0x101); + break; + case 0x33: + if(sub_8023CE8() != 0) + { + break; + } + else + { + ResetUnusedInputStruct(); + sub_800641C(0, 1, 1); + sub_8023868(3, 0, 0, 9); + } + break; + case 0x34: + sub_8006518(gUnknown_203B2C0->unk35C); + SetMenuItems(&gUnknown_203B2C0->unk21C, gUnknown_203B2C0->unk35C, 3, gUnknown_80DDAE4, gUnknown_80DDAFC, 1, 0, 0); + sub_8023DA4(); + sub_8035CF4(&gUnknown_203B2C0->unk21C, 3, 1); + break; + case 0x31: + sub_8014248(gUnknown_80DDD2C, 0, 0xA, gUnknown_80DDAA0, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 0x36: + sub_8014248(gUnknown_80DDD88, 0, 8, gUnknown_80DDA80, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 0x2D: + sub_8014248(gUnknown_80DDDBC, 0, 8, gUnknown_80DDA64, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 0x29: + sub_80141B4(gUnknown_80DDDD8, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x2A: + if(sub_8030894() != 0) + { + break; + } + else + { + ResetUnusedInputStruct(); + sub_800641C(0, 1, 1); + sub_80306A8(4, 0, 0, 6); + } + break; + case 0x2F: + sub_80141B4(gUnknown_80DDE20, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x30: + sub_80141B4(gUnknown_80DDE58, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x2E: + sub_8014248(gUnknown_80DDEC0, 0, 0x11, gUnknown_80DDB60, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 9: + sub_80141B4(gUnknown_80DDF2C, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 4: + sub_8014248(gUnknown_80DDFB8, 0, 8, gUnknown_80DDA48, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 5: + nullsub_23(0); + sub_80141B4(gUnknown_80DE01C, 0 , 0, 0); + break; + case 6: + gUnknown_203B2C0->linkError = 0; + sub_8011830(); + linkError = sub_8037B28(gUnknown_203B2C0->unk40); + gUnknown_203B2C0->linkError = linkError; + if(linkError == 0) + { + switch(gUnknown_203B2C0->unk40) + { + case 3: + MemoryFill8(gUnknown_203B2C0->unk48, 0, 0x30); + MemoryFill8(gUnknown_203B2C0->unk78, 0, 0x30); + gUnknown_203B2C0->linkError = sub_8037D64(gUnknown_203B2C0->unk40, gUnknown_203B2C0->unk48, gUnknown_203B2C0->unk78); + break; + case 4: + MemoryFill8((u8 *)&gUnknown_203B2C0->unkA8, 0, 0x88); + MemoryFill8(&gUnknown_203B2C0->unk130, 0, 0x88); + gUnknown_203B2C0->unkD8.speciesNum = linkError; + gUnknown_203B2C0->unk168 = linkError; + gUnknown_203B2C0->unkA8 = *sub_8095228(gUnknown_203B2C0->unk218); + if(gUnknown_203B2C0->unk544 != -1) + { + gUnknown_203B2C0->unkD8 = gRecruitedPokemonRef->pokemon[gUnknown_203B2C0->unk544]; + } + gUnknown_203B2C0->linkError = sub_8037D64(gUnknown_203B2C0->unk40, &gUnknown_203B2C0->unkA8, &gUnknown_203B2C0->unk130); + break; + } + if(gUnknown_203B2C0->linkError == 0) + { + switch(gUnknown_203B2C0->unk40) + { + case 3: + gUnknown_203B2C0->linkError = sub_80381F4(3, gUnknown_203B2C0->unk48, gUnknown_203B2C0->unk78); + break; + case 4: + gUnknown_203B2C0->linkError = sub_80381F4(4, &gUnknown_203B2C0->unkA8, &gUnknown_203B2C0->unk130); + break; + } + } + xxx_call_start_bg_music(); + } + else + { + xxx_call_start_bg_music(); + } + break; + case 0x23: + switch(gUnknown_203B2C0->unk534) + { + // 0x0 - 0x9 included here too... + case 0x10: + case 0xF: + case 0xD: + sub_80141B4(gUnknown_80DE06C, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0xE: + break; + } + break; + case 0x25: + sub_80141B4(gUnknown_80DE0C0, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x26: + sub_80141B4(gUnknown_80DE124, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x27: + sub_8006518(gUnknown_203B2C0->unk3BC); + ResetUnusedInputStruct(); + sub_800641C(0, 1, 1); + sub_80151C0(4, gUnknown_203B2C0->passwordBuffer); + break; + case 8: + switch(gUnknown_203B2C0->unk538) + { + case 0: + sub_8014248(gUnknown_80DE178, 0, 0xD, gUnknown_80DDB24, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 2: + sub_8014248(gUnknown_80DE1B4, 0, 0xD, gUnknown_80DDB24, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + } + break; + case 0x1A: + sub_80141B4(gUnknown_80DE1E4, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x1B: + sub_80141B4(gUnknown_80DE280, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x1C: + sub_80141B4(gUnknown_80DE2B0, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x1D: + sub_80141B4(gUnknown_80DE368, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x22: + sub_8014248(gUnknown_80DDDBC, 0, 8, gUnknown_80DDA64, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 0x1E: + sub_80141B4(gUnknown_80DE430, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x1F: + if(sub_8030894() != 0) + { + break; + } + else + { + ResetUnusedInputStruct(); + sub_800641C(0, 1, 1); + sub_80306A8(2, 0, 0, 6); + } + break; + case 0x20: + case 0x2B: + sub_8006518(gUnknown_203B2C0->unk35C); + SetMenuItems(&gUnknown_203B2C0->unk21C, gUnknown_203B2C0->unk35C, 3, gUnknown_80DDACC, gUnknown_80DDAFC, 1, 0, 0); + sub_803092C(); + sub_8035CF4(&gUnknown_203B2C0->unk21C, 3, 1); + break; + case 0xA: + gUnknown_203B2C0->unk540 = sub_8095350(); + switch((u32)gUnknown_203B2C0->unk538) + { + case 5: + sub_8030F58(2); + break; + case 6: + sub_8030F58(4); + break; + default: + case 7: + break; + } + break; + case 0xB: + sub_8014248(gUnknown_80DE48C, 0, 5, gUnknown_80DD9EC, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 0xD: + sub_80141B4(gUnknown_80DE4B8, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0xC: + sub_80141B4(gUnknown_80DE4F0, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0xF: + sub_80141B4(gUnknown_80DE524, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0xE: + sub_80141B4(gUnknown_80DE614, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x11: + sub_80141B4(gUnknown_80DE648, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x10: + sub_80141B4(gUnknown_80DE694, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x12: + sub_8014248(gUnknown_80DE6D4, 0, 8, gUnknown_80DDA48, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 0x13: + sub_8014248(gUnknown_80DE754, 0, 8, gUnknown_80DDA48, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 0x17: + sub_80141B4(gUnknown_80DE7B8, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x18: + sub_80141B4(gUnknown_80DE7E8, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x19: + sub_8014248(gUnknown_80DE808, 0, 8, gUnknown_80DDA64, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 0x14: + sub_80141B4(gUnknown_80DE830, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x15: + sub_80141B4(gUnknown_80DE864, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0x16: + sub_80141B4(gUnknown_80DE7E8, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 0: + sub_8014248(gUnknown_80DE8B4, 0, 0, gUnknown_80DD970, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 1: + sub_8014248(gUnknown_80DE918, 0, 0, gUnknown_80DD970, 0, 4, 0, &gUnknown_203B2C0->faceFile,0xC); + break; + case 2: + sub_80141B4(gUnknown_80DE93C, 0, &gUnknown_203B2C0->faceFile,0x10d); + break; + case 3: + break; + } +} void sub_8028B04(u32 r0) @@ -101,43 +716,43 @@ void sub_8028B1C(u32 r0) break; case 1: case 2: - sub_80141B4(gWonderMailErrorText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailErrorText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 3: - sub_80141B4(gWonderMailNumGBAsText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailNumGBAsText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 4: - sub_80141B4(gWonderMailWrongModeText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailWrongModeText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 5: - sub_80141B4(gWonderMailErrorText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailErrorText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 6: - sub_80141B4(gWonderMailStorageFullText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailStorageFullText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 7: - sub_80141B4(gWonderMailDuplicateText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailDuplicateText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 8: break; case 9: - sub_80141B4(gWonderMailNotEligibleReceiveText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailNotEligibleReceiveText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 10: break; case 11: - sub_80141B4(gWonderMailNotEligibleReceiveText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailNotEligibleReceiveText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 12: break; case 13: - sub_80141B4(gWonderMailNoRoomText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailNoRoomText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 14: - sub_80141B4(gWonderMailErrorText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailErrorText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; case 15: - sub_80141B4(gWonderMailFriendErrorText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailFriendErrorText, 0, &gUnknown_203B2C0->faceFile, 0x10d); break; default: break; @@ -774,22 +1389,22 @@ void sub_80293F4(void) switch(sub_8039068(0x1C, (gUnknown_203B2C0->passwordBuffer), &temp.unk0)) { case 17: - sub_8014248(gWonderMailPasswordIncorrectText, 0, 8, gUnknown_80DDA48, 0, 4, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0xC); + sub_8014248(gWonderMailPasswordIncorrectText, 0, 8, gUnknown_80DDA48, 0, 4, 0, &gUnknown_203B2C0->faceFile, 0xC); sub_8028B04(40); break; case 18: - sub_80141B4(gWonderMailSOSPasswordIncorrectText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailSOSPasswordIncorrectText, 0, &gUnknown_203B2C0->faceFile, 0x10d); sub_8028B04(7); break; case 7: - sub_80141B4(gWonderMailDuplicateText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x10d); + sub_80141B4(gWonderMailDuplicateText, 0, &gUnknown_203B2C0->faceFile, 0x10d); sub_8028B04(7); break; case 22: sub_8095274(temp.unk10); temp.unk0 = 2; // Some sort of Ack? sub_80951BC(&temp.unk0); - sub_80141B4(gWonderMailAOKMailReceivedText, 0, (u32 *)&gUnknown_203B2C0->faceFile, 0x101); + sub_80141B4(gWonderMailAOKMailReceivedText, 0, &gUnknown_203B2C0->faceFile, 0x101); sub_8028B04(35); break; case 23: |