From 6b87f66106e0ce23de23e4b30799184ab2d2b62e Mon Sep 17 00:00:00 2001 From: Mateon1 Date: Fri, 1 Nov 2024 15:36:25 +0100 Subject: [PATCH] Clean up void casts --- asm/code_803D110.s | 2 +- asm/code_8040094.s | 2 +- asm/code_8085B80.s | 2 +- src/code_802DB28.c | 2 +- src/code_803E46C.c | 20 ++++++++++---------- src/code_803E724.c | 28 ++++++++++++++-------------- src/code_8041AD0.c | 12 ++++++------ src/code_8042B34.c | 14 +++++++------- src/code_80869E4.c | 8 ++++---- src/dungeon_cutscenes.c | 12 ++++++------ src/dungeon_message.c | 12 ++++++------ src/felicity_bank.c | 2 +- src/gulpin_shop.c | 2 +- src/gulpin_shop_801FB50.c | 2 +- src/kangaskhan_storage1.c | 2 +- src/kecleon_bros1.c | 2 +- src/makuhita_dojo1.c | 2 +- src/mission_reward.c | 2 +- src/post_office_guide1.c | 2 +- src/save_write.c | 2 +- src/thank_you_wonder_mail.c | 2 +- src/wigglytuff_shop3.c | 2 +- src/wonder_mail.c | 2 +- src/wonder_mail_2.c | 2 +- src/wonder_mail_6.c | 2 +- sym_ewram.txt | 2 +- 26 files changed, 72 insertions(+), 72 deletions(-) diff --git a/asm/code_803D110.s b/asm/code_803D110.s index e7f0bdf5d..e081c6be1 100644 --- a/asm/code_803D110.s +++ b/asm/code_803D110.s @@ -249,6 +249,6 @@ _0803E454: .4byte gUnknown_80F61EC _0803E458: .4byte gDungeon _0803E45C: .4byte 0x00018217 _0803E460: .4byte 0x00018218 -_0803E464: .4byte gUnknown_202EDC8 +_0803E464: .4byte gDungeonBrightness _0803E468: .4byte gUnknown_202D058 thumb_func_end sub_803E250 diff --git a/asm/code_8040094.s b/asm/code_8040094.s index 901f1929a..50633499f 100644 --- a/asm/code_8040094.s +++ b/asm/code_8040094.s @@ -1566,7 +1566,7 @@ _08040D48: _08040D58: .4byte gUnknown_203B40D _08040D5C: .4byte gUnknown_2026E4E _08040D60: .4byte 0x00000101 -_08040D64: .4byte gUnknown_202EDC8 +_08040D64: .4byte gDungeonBrightness _08040D68: movs r0, 0 str r0, [r1] diff --git a/asm/code_8085B80.s b/asm/code_8085B80.s index b79af6f97..f9f27fd90 100644 --- a/asm/code_8085B80.s +++ b/asm/code_8085B80.s @@ -411,7 +411,7 @@ _08085E70: .4byte gDungeonPaletteFile _08085E74: .4byte 0xffffff00 _08085E78: .4byte 0xffff00ff _08085E7C: .4byte 0xff00ffff -_08085E80: .4byte gUnknown_202EDC8 +_08085E80: .4byte gDungeonBrightness _08085E84: .4byte gDungeon _08085E88: .4byte 0xffff0000 _08085E8C: .4byte gUnknown_202EE8C diff --git a/src/code_802DB28.c b/src/code_802DB28.c index 0197d58ca..d50cf01ed 100644 --- a/src/code_802DB28.c +++ b/src/code_802DB28.c @@ -52,7 +52,7 @@ bool8 sub_802DB28(u8 jobSlotIndex, u8 dungeon) sUnknown_203B2FC->monPortrait.pos.y = 8; if (sUnknown_203B2FC->monPortrait.faceFile != NULL) - sUnknown_203B2FC->monPortrait.faceData = (void *) sUnknown_203B2FC->monPortrait.faceFile->data; + sUnknown_203B2FC->monPortrait.faceData = (struct PortraitGfx *) sUnknown_203B2FC->monPortrait.faceFile->data; sub_802DC28(0); return TRUE; diff --git a/src/code_803E46C.c b/src/code_803E46C.c index e65ab6b13..cf05240e0 100644 --- a/src/code_803E46C.c +++ b/src/code_803E46C.c @@ -18,7 +18,7 @@ extern u8 gUnknown_203B40C; extern u8 gUnknown_203B40D; -extern s32 gUnknown_202EDC8; +extern s32 gDungeonBrightness; extern s32 gUnknown_202EDCC; extern u32 gUnknown_202EDD0; extern s32 gUnknown_202EDD4; @@ -87,7 +87,7 @@ void sub_803E490(u32 unused) if(gDungeon->unk181e8.unk18215 != 0 && gDungeon->unk1BDD4.unk1C06C != 3) - sub_8004AF0(gUnknown_203B40D, gUnknown_202EE8C, 0xA0, 0x20, gUnknown_202EDC8, gDungeon->colorRamp); + sub_8004AF0(gUnknown_203B40D, gUnknown_202EE8C, 0xA0, 0x20, gDungeonBrightness, gDungeon->colorRamp); nullsub_8(gGameOptionsRef->unkA); sub_8005180(); @@ -169,7 +169,7 @@ void sub_803E748(void) { index2 = 0x1F; gUnknown_203B40D = 1; - gUnknown_202EDC8 = 0; + gDungeonBrightness = 0; sub_803E874(1, 0x1F); @@ -186,13 +186,13 @@ void sub_803E748(void) { } } if(index1 > 0xB) - if(gUnknown_202EDC8 <= 0x1E) - gUnknown_202EDC8++; + if(gDungeonBrightness <= 0x1E) + gDungeonBrightness++; sub_803E874(1, index2); sub_803E46C(5); } gUnknown_203B40D = 0; - gUnknown_202EDC8 = 0x1F; + gDungeonBrightness = 0x1F; } void sub_803E7C8(void) @@ -203,7 +203,7 @@ void sub_803E7C8(void) index2 = 0x1F; gUnknown_203B40D = 1; - gUnknown_202EDC8 = 0; + gDungeonBrightness = 0; sub_803E46C(5); @@ -234,9 +234,9 @@ void sub_803E830(void) { sub_803E874(0, 0); sub_803E46C(5); - if(gUnknown_202EDC8 > 0) - gUnknown_202EDC8--; + if(gDungeonBrightness > 0) + gDungeonBrightness--; } - gUnknown_202EDC8 = 0; + gDungeonBrightness = 0; gUnknown_203B40D = 0; } diff --git a/src/code_803E724.c b/src/code_803E724.c index c48260830..0a5f9dfab 100644 --- a/src/code_803E724.c +++ b/src/code_803E724.c @@ -23,7 +23,7 @@ #include "constants/item.h" #include "constants/status.h" -extern s32 gUnknown_202EDC8; +extern s32 gDungeonBrightness; extern u32 gUnknown_202EDD0; extern s32 gUnknown_202EDD8; extern u32 gUnknown_202EDFC; @@ -88,25 +88,25 @@ void sub_803E874(bool8 r10, s32 r9) const RGB *color; color = gDungeonPaletteFile->unk4; - SetBGPaletteBufferColorRGB(0, &gUnknown_80F62AC, gUnknown_202EDC8, gDungeon->colorRamp); + SetBGPaletteBufferColorRGB(0, &gUnknown_80F62AC, gDungeonBrightness, gDungeon->colorRamp); color++; index = 1; count = 159; for (i = 0; i < count; i++) { - SetBGPaletteBufferColorRGB(index, color, gUnknown_202EDC8, gDungeon->colorRamp); + SetBGPaletteBufferColorRGB(index, color, gDungeonBrightness, gDungeon->colorRamp); color++; index++; } if (gDungeon->unk181e8.unk18215 == 0 || gDungeon->unk1BDD4.unk1C06C == 3) { - sub_8004AF0(TRUE, gUnknown_202EE8C, 0xA0, 0x20, gUnknown_202EDC8, gDungeon->colorRamp); + sub_8004AF0(TRUE, gUnknown_202EE8C, 0xA0, 0x20, gDungeonBrightness, gDungeon->colorRamp); } index += 32; color = gUnknown_202ECA4; count = 32; for (i = 0; i < count; i++) { - SetBGPaletteBufferColorRGB(index, color, gUnknown_202EDC8, gDungeon->colorRamp); + SetBGPaletteBufferColorRGB(index, color, gDungeonBrightness, gDungeon->colorRamp); color++; index++; } @@ -122,14 +122,14 @@ void sub_803E874(bool8 r10, s32 r9) } } - SetBGPaletteBufferColorRGB(248, &gUnknown_202D058, gUnknown_202EDC8, NULL); + SetBGPaletteBufferColorRGB(248, &gUnknown_202D058, gDungeonBrightness, NULL); color = ((struct DungeonPalFile*) gDungeon->paletFile)->unk4; index = 256; count = 208; for (i = 0; i < count; i++) { - SetBGPaletteBufferColorRGB(index, color, gUnknown_202EDC8, gDungeon->colorRamp); - nullsub_4(index, color, gUnknown_202EDC8, NULL); + SetBGPaletteBufferColorRGB(index, color, gDungeonBrightness, gDungeon->colorRamp); + nullsub_4(index, color, gDungeonBrightness, NULL); color++; index++; } @@ -144,7 +144,7 @@ void BgColorCallNullsub4(void) index = 256; count = 208; for (i = 0; i < count; i++) { - nullsub_4(index, color, gUnknown_202EDC8, NULL); + nullsub_4(index, color, gDungeonBrightness, NULL); color++; index++; } @@ -156,30 +156,30 @@ void sub_803EA10(void) const RGB *color; color= gDungeonPaletteFile->unk4; - SetBGPaletteBufferColorRGB(0, &gUnknown_80F62AC, gUnknown_202EDC8, gDungeon->colorRamp); + SetBGPaletteBufferColorRGB(0, &gUnknown_80F62AC, gDungeonBrightness, gDungeon->colorRamp); color++; index = 1; count = 159; for (i = 0; i < count; i++) { - SetBGPaletteBufferColorRGB(index, color, gUnknown_202EDC8, gDungeon->colorRamp); + SetBGPaletteBufferColorRGB(index, color, gDungeonBrightness, gDungeon->colorRamp); color++; index++; } if (gDungeon->unk181e8.unk18215 == 0 || gDungeon->unk1BDD4.unk1C06C == 3) { - sub_8004AF0(TRUE, gUnknown_202EE8C, 0xA0, 0x20, gUnknown_202EDC8, gDungeon->colorRamp); + sub_8004AF0(TRUE, gUnknown_202EE8C, 0xA0, 0x20, gDungeonBrightness, gDungeon->colorRamp); } index += 32; color = gUnknown_202ECA4; count = 32; for (i = 0; i < count; i++) { - SetBGPaletteBufferColorRGB(index, color, gUnknown_202EDC8, gDungeon->colorRamp); + SetBGPaletteBufferColorRGB(index, color, gDungeonBrightness, gDungeon->colorRamp); color++; index++; } - SetBGPaletteBufferColorRGB(248, &gUnknown_202D058, gUnknown_202EDC8, NULL); + SetBGPaletteBufferColorRGB(248, &gUnknown_202D058, gDungeonBrightness, NULL); } void sub_803EAF0(u32 a0, u8 *a1) diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c index 1166e99a9..ad6964532 100644 --- a/src/code_8041AD0.c +++ b/src/code_8041AD0.c @@ -40,7 +40,7 @@ extern void sub_8041550(Entity *pokemon, u32, u32, u32, u32, u32); void sub_80421C0(Entity *pokemon, u16 r1); void EntityUpdateStatusSprites(Entity *entity); -extern s32 gUnknown_202EDC8; +extern s32 gDungeonBrightness; extern u8 gUnknown_203B40D; extern s16 gUnknown_2026E4E; @@ -119,23 +119,23 @@ void sub_804178C(u8 param_1) if ((counter == 1000) || (param_1 != 0)) { sub_800DBBC(); } - if (gUnknown_202EDC8 < 0x1f) { + if (gDungeonBrightness < 0x1f) { temp = gUnknown_203B40D; gUnknown_203B40D = 1; for(counter = 0; counter < 1000; counter++) { - if (gUnknown_202EDC8 < 0x1f) { - gUnknown_202EDC8 += 4; + if (gDungeonBrightness < 0x1f) { + gDungeonBrightness += 4; if (gUnknown_2026E4E != 0x808) { gUnknown_2026E4E -= 0x101; } } else { - gUnknown_202EDC8 = 0x1f; + gDungeonBrightness = 0x1f; } sub_803EA10(); sub_803E46C(0x4a); - if(gUnknown_202EDC8 == 0x1f) break; + if(gDungeonBrightness == 0x1f) break; }; gUnknown_2026E4E = 0x808; gUnknown_203B40D = temp; diff --git a/src/code_8042B34.c b/src/code_8042B34.c index e2fe1701c..5fdc960d7 100644 --- a/src/code_8042B34.c +++ b/src/code_8042B34.c @@ -384,7 +384,7 @@ extern void sub_8042B0C(Entity *); extern s16 gUnknown_2026E4E; extern u8 gUnknown_202F32C; extern u8 gUnknown_202F1A8; -extern s32 gUnknown_202EDC8; +extern s32 gDungeonBrightness; extern Entity *gLeaderPointer; void sub_8044124(void); @@ -416,7 +416,7 @@ void xxx_dungeon_8042F6C(struct UnkStruct_xxx_dungeon_8042F6C *r8) bool8 r9; bool8 r10; u8 sp; - RGB colorArray; + RGB color; gUnknown_203B40C = 0; r6 = r8->unk8; @@ -631,7 +631,7 @@ void xxx_dungeon_8042F6C(struct UnkStruct_xxx_dungeon_8042F6C *r8) } sub_8049840(); sub_803E178(); - gUnknown_202EDC8 = 0; + gDungeonBrightness = 0; sub_8040124(); sub_803EAF0(4, 0); sub_8052210(0); @@ -806,10 +806,10 @@ void xxx_dungeon_8042F6C(struct UnkStruct_xxx_dungeon_8042F6C *r8) } SetBGOBJEnableFlags(0); - colorArray.r = 0x60; - colorArray.g = 0x80; - colorArray.b = 0xF8; - SetBGPaletteBufferColorRGB(253, (void*) &colorArray, gUnknown_202EDC8, 0); // Todo: Fix SetBGPaletteBufferColorRGB to take RGB* + color.r = 0x60; + color.g = 0x80; + color.b = 0xF8; + SetBGPaletteBufferColorRGB(253, &color, gDungeonBrightness, NULL); sub_8040094(1); gDungeon->unk181e8.unk18218 = 1; if ((gDungeon->unk10 == 2 || gDungeon->unk10 == 3) && gDungeon->unk6 != 0) { diff --git a/src/code_80869E4.c b/src/code_80869E4.c index b7fcf7c7e..b11838214 100644 --- a/src/code_80869E4.c +++ b/src/code_80869E4.c @@ -12,7 +12,7 @@ // This file may originally be merged with code_8086A3C.c and code_8057824_1.c // ??? -extern u32 gUnknown_202EDC8; +extern u32 gDungeonBrightness; EWRAM_DATA unkStruct_202F3D0 gUnknown_202F3D0 = {0}; @@ -342,7 +342,7 @@ void sub_8086794(void) { s32 i; - gUnknown_202EDC8 = 0; + gDungeonBrightness = 0; for (i = 0; i < 200; i++) { SetDungeonBGColorRGB(0, 0, 0, 1, 0); @@ -350,8 +350,8 @@ void sub_8086794(void) sub_803E46C(70); if ((i & 3) == 0) { - gUnknown_202EDC8++; - if (gUnknown_202EDC8 == 31) + gDungeonBrightness++; + if (gDungeonBrightness == 31) break; } } diff --git a/src/dungeon_cutscenes.c b/src/dungeon_cutscenes.c index 66fa03047..84e3eb41a 100644 --- a/src/dungeon_cutscenes.c +++ b/src/dungeon_cutscenes.c @@ -30,7 +30,7 @@ #include "exclusive_pokemon.h" #include "trap.h" -extern u32 gUnknown_202EDC8; +extern u32 gDungeonBrightness; extern const s16 gUnknown_80F57CA; extern const s16 gUnknown_80F57CC; @@ -3554,7 +3554,7 @@ void LatiosScreenFlash(void) s32 iVar1; PlaySoundEffect(0x1ee); - gUnknown_202EDC8 = 0x1f; + gDungeonBrightness = 0x1f; for(iVar1 = 250; iVar1 > 149; iVar1 -= 10) { SetDungeonBGColorRGB(iVar1,iVar1,iVar1,1,1); @@ -4195,7 +4195,7 @@ void JirachiWishGrantFlash(void) s32 iVar1; PlaySoundEffect(0x2c1); - gUnknown_202EDC8 = 0x1f; + gDungeonBrightness = 0x1f; for(iVar1 = 0xFA; iVar1 > 0x95; iVar1 -= 10) { @@ -4493,7 +4493,7 @@ void LugiaScreenFlash2(void) void sub_808C0CC(void) { - gUnknown_202EDC8 = 0x1f; + gDungeonBrightness = 0x1f; SetDungeonBGColorRGB(0,0,0,1,1); BgColorCallNullsub4(); sub_803E46C(0x46); @@ -4614,7 +4614,7 @@ void KyogreScreenFlash(void) void sub_808C360(void) { - gUnknown_202EDC8 = 0x1f; + gDungeonBrightness = 0x1f; SetDungeonBGColorRGB(0,0,0,1,1); BgColorCallNullsub4(); sub_803E46C(0x46); @@ -4701,7 +4701,7 @@ void DeoxysScreenFlash(void) void sub_808C550(void) { - gUnknown_202EDC8 = 0x1f; + gDungeonBrightness = 0x1f; SetDungeonBGColorRGB(0,0,0,1,1); BgColorCallNullsub4(); sub_803E46C(0x46); diff --git a/src/dungeon_message.c b/src/dungeon_message.c index a8eb7a6b2..3d331311b 100644 --- a/src/dungeon_message.c +++ b/src/dungeon_message.c @@ -376,7 +376,7 @@ void DisplayDungeonMessage(struct MonDialogueSpriteInfo *monSpriteInfo, const u8 && IsPokemonDialogueSpriteAvail(monSpriteInfo->species, monSpriteInfo->spriteId)) { monPortrait.faceFile = GetDialogueSpriteDataPtr(monSpriteInfo->species); - monPortrait.faceData = (void *) monPortrait.faceFile->data; + monPortrait.faceData = (struct PortraitGfx *) monPortrait.faceFile->data; monPortrait.pos.x = 2; monPortrait.pos.y = 9; monPortrait.spriteId = monSpriteInfo->spriteId; @@ -501,7 +501,7 @@ void DisplayDungeonDialogue(const struct DungeonDialogueStruct *dialogueInfo) monPortraitPtr = &monPortrait; monPortraitPtr->faceFile = GetDialogueSpriteDataPtr(dialogueMonId); if (monPortraitPtr->faceFile != NULL) { - monPortraitPtr->faceData = (void *) monPortraitPtr->faceFile->data; + monPortraitPtr->faceData = (struct PortraitGfx *) monPortraitPtr->faceFile->data; monPortraitPtr->unkE = 0; monPortraitPtr->spriteId = dialogueInfo->unk2; monPortraitPtr->flip = strPtr->flip; @@ -551,7 +551,7 @@ bool32 DisplayDungeonYesNoMessage(struct MonDialogueSpriteInfo *monSpriteInfo, c && IsPokemonDialogueSpriteAvail(monSpriteInfo->species, monSpriteInfo->spriteId)) { monPortrait.faceFile = GetDialogueSpriteDataPtr(monSpriteInfo->species); - monPortrait.faceData = (void *) monPortrait.faceFile->data; + monPortrait.faceData = (struct PortraitGfx *) monPortrait.faceFile->data; monPortrait.pos.x = 2; monPortrait.pos.y = 9; monPortrait.spriteId = monSpriteInfo->spriteId; @@ -600,7 +600,7 @@ s32 DisplayDungeonMenuMessage(struct MonDialogueSpriteInfo *monSpriteInfo, const && IsPokemonDialogueSpriteAvail(monSpriteInfo->species, monSpriteInfo->spriteId)) { monPortrait.faceFile = GetDialogueSpriteDataPtr(monSpriteInfo->species); - monPortrait.faceData = (void *) monPortrait.faceFile->data; + monPortrait.faceData = (struct PortraitGfx *) monPortrait.faceFile->data; monPortrait.pos.x = 2; monPortrait.pos.y = 9; monPortrait.spriteId = monSpriteInfo->spriteId; @@ -763,7 +763,7 @@ void sub_8052FB8(const u8 *str) if (r8 < 62) { r8++; for (j = 0; j < 8; j++) { - SetBGPaletteBufferColorRGB(240 + j, (void*) &gFontPalette[0].pal[j], r8 / 2, NULL); + SetBGPaletteBufferColorRGB(240 + j, &gFontPalette[0].pal[j], r8 / 2, NULL); } } else { @@ -816,7 +816,7 @@ void sub_8052FB8(const u8 *str) while (r8 >= 0) { for (j = 0; j < 8; j++) { - SetBGPaletteBufferColorRGB(240 + j, (void*) &gFontPalette[0].pal[j], r8 / 2, NULL); + SetBGPaletteBufferColorRGB(240 + j, &gFontPalette[0].pal[j], r8 / 2, NULL); } DrawDialogueBoxString(); sub_803E46C(9); diff --git a/src/felicity_bank.c b/src/felicity_bank.c index cbefb67d0..fcfbbe66b 100644 --- a/src/felicity_bank.c +++ b/src/felicity_bank.c @@ -71,7 +71,7 @@ bool8 CreateFelicityBank(s32 mode) faceFile = GetDialogueSpriteDataPtr(MONSTER_PERSIAN); sFelicityBankWork->monPortrait.faceFile = faceFile; - sFelicityBankWork->monPortrait.faceData = (void *) faceFile->data; + sFelicityBankWork->monPortrait.faceData = (struct PortraitGfx *) faceFile->data; sFelicityBankWork->monPortrait.spriteId = 0; sFelicityBankWork->monPortrait.flip = FALSE; sFelicityBankWork->monPortrait.unkE = 0; diff --git a/src/gulpin_shop.c b/src/gulpin_shop.c index 5153212a4..8c036ee9d 100644 --- a/src/gulpin_shop.c +++ b/src/gulpin_shop.c @@ -49,7 +49,7 @@ bool8 CreateGulpinShop(u32 mode, s16 pokeSpecies, Move *moves) faceFile = GetDialogueSpriteDataPtr(MONSTER_GULPIN); sGulpinShopWork->monPortrait.faceFile = faceFile; - sGulpinShopWork->monPortrait.faceData = (void *) faceFile->data; + sGulpinShopWork->monPortrait.faceData = (struct PortraitGfx *) faceFile->data; sGulpinShopWork->monPortrait.spriteId = 0; sGulpinShopWork->monPortrait.flip = FALSE; diff --git a/src/gulpin_shop_801FB50.c b/src/gulpin_shop_801FB50.c index a565bdeda..88fa01c0a 100644 --- a/src/gulpin_shop_801FB50.c +++ b/src/gulpin_shop_801FB50.c @@ -101,7 +101,7 @@ bool8 sub_801FB50(u32 mode) faceFile = GetDialogueSpriteDataPtr(MONSTER_GULPIN); gUnknown_203B27C->monPortrait.faceFile = faceFile; - gUnknown_203B27C->monPortrait.faceData = (void *) faceFile->data; + gUnknown_203B27C->monPortrait.faceData = (struct PortraitGfx *) faceFile->data; gUnknown_203B27C->monPortrait.spriteId = 0; gUnknown_203B27C->monPortrait.flip = FALSE; gUnknown_203B27C->monPortrait.unkE = 0; diff --git a/src/kangaskhan_storage1.c b/src/kangaskhan_storage1.c index 092b348a1..9bd044f20 100644 --- a/src/kangaskhan_storage1.c +++ b/src/kangaskhan_storage1.c @@ -67,7 +67,7 @@ bool8 CreateKangaskhanStorage(u32 mode) faceFile = GetDialogueSpriteDataPtr(MONSTER_KANGASKHAN); gKangaskhanStorageWork->monPortrait.faceFile = faceFile; - gKangaskhanStorageWork->monPortrait.faceData = (void *) faceFile->data; + gKangaskhanStorageWork->monPortrait.faceData = (struct PortraitGfx *) faceFile->data; gKangaskhanStorageWork->monPortrait.spriteId = FALSE; gKangaskhanStorageWork->monPortrait.flip = FALSE; gKangaskhanStorageWork->monPortrait.unkE = 0; diff --git a/src/kecleon_bros1.c b/src/kecleon_bros1.c index 261a120ea..093f976b0 100644 --- a/src/kecleon_bros1.c +++ b/src/kecleon_bros1.c @@ -107,7 +107,7 @@ bool8 CreateKecleonBros(u32 mode) faceFile = GetDialogueSpriteDataPtr(MONSTER_KECLEON); sKecleonBrosWork1->monPortrait.faceFile = faceFile; - sKecleonBrosWork1->monPortrait.faceData = (void *) faceFile->data; + sKecleonBrosWork1->monPortrait.faceData = (struct PortraitGfx *) faceFile->data; sKecleonBrosWork1->monPortrait.spriteId = 0; sKecleonBrosWork1->monPortrait.flip = FALSE; sKecleonBrosWork1->monPortrait.unkE = 0; diff --git a/src/makuhita_dojo1.c b/src/makuhita_dojo1.c index bf193124f..906e80ea7 100644 --- a/src/makuhita_dojo1.c +++ b/src/makuhita_dojo1.c @@ -98,7 +98,7 @@ bool8 MakuhitaDojo_New(u32 mode) faceFile = GetDialogueSpriteDataPtr(MONSTER_MAKUHITA); sMakuhitaDojoWork1->monPortrait.faceFile = faceFile; - sMakuhitaDojoWork1->monPortrait.faceData = (void *) faceFile->data; + sMakuhitaDojoWork1->monPortrait.faceData = (struct PortraitGfx *) faceFile->data; sMakuhitaDojoWork1->monPortrait.spriteId = 0; sMakuhitaDojoWork1->monPortrait.flip = FALSE; sMakuhitaDojoWork1->monPortrait.unkE = 0; diff --git a/src/mission_reward.c b/src/mission_reward.c index 684e156aa..381fac5e6 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -139,7 +139,7 @@ u32 sub_802F204(unkStruct_802F204 *r0, bool8 displayClientSprite) if(gUnknown_203B310->monPortrait.faceFile != NULL) { - gUnknown_203B310->monPortrait.faceData = (void *) gUnknown_203B310->monPortrait.faceFile->data; + gUnknown_203B310->monPortrait.faceData = (struct PortraitGfx *) gUnknown_203B310->monPortrait.faceFile->data; } SetRewardSceneState(PREP_MONEY_REWARD); diff --git a/src/post_office_guide1.c b/src/post_office_guide1.c index 41d4ea0cd..e998ed33e 100644 --- a/src/post_office_guide1.c +++ b/src/post_office_guide1.c @@ -65,7 +65,7 @@ bool8 CreateHelperPelipperMenu(s16 speciesID) sPostOfficeHelper->monPortrait.pos.y = 8; if (sPostOfficeHelper->monPortrait.faceFile != NULL) - sPostOfficeHelper->monPortrait.faceData = (void *) sPostOfficeHelper->monPortrait.faceFile->data; + sPostOfficeHelper->monPortrait.faceData = (struct PortraitGfx *) sPostOfficeHelper->monPortrait.faceFile->data; } sPostOfficeHelper->currMenuChoice = 0; diff --git a/src/save_write.c b/src/save_write.c index 156d8f3cd..b295510cb 100644 --- a/src/save_write.c +++ b/src/save_write.c @@ -26,7 +26,7 @@ void PrepareSavePakWrite(s16 pokemonID) if (pokemonID != MONSTER_NONE) { file = GetDialogueSpriteDataPtr(pokemonID); sSavePakWrite->monPortrait.faceFile = file; - sSavePakWrite->monPortrait.faceData = (void *) file->data; + sSavePakWrite->monPortrait.faceData = (struct PortraitGfx *) file->data; sSavePakWrite->monPortrait.spriteId = 0; sSavePakWrite->monPortrait.flip = FALSE; sSavePakWrite->monPortrait.unkE = 0; diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 610df0dea..8d32621aa 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -249,7 +249,7 @@ u32 CreateThankYouMailPelipper(void) faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); sUnknown_203B2C4->monPortrait.faceFile = faceFile; - sUnknown_203B2C4->monPortrait.faceData = (void *) faceFile->data; + sUnknown_203B2C4->monPortrait.faceData = (struct PortraitGfx *) faceFile->data; sUnknown_203B2C4->monPortrait.spriteId = 0; sUnknown_203B2C4->monPortrait.flip = FALSE; sUnknown_203B2C4->monPortrait.unkE = 0; diff --git a/src/wigglytuff_shop3.c b/src/wigglytuff_shop3.c index f8a107f0a..81dffd8ad 100644 --- a/src/wigglytuff_shop3.c +++ b/src/wigglytuff_shop3.c @@ -75,7 +75,7 @@ bool8 CreateWigglytuffShop(u32 mode) file = GetDialogueSpriteDataPtr(MONSTER_WIGGLYTUFF); sWigglytuffShop3Work->monPortrait.faceFile = file; - sWigglytuffShop3Work->monPortrait.faceData = (void *) file->data; + sWigglytuffShop3Work->monPortrait.faceData = (struct PortraitGfx *) file->data; sWigglytuffShop3Work->monPortrait.spriteId = 0; sWigglytuffShop3Work->monPortrait.flip = FALSE; sWigglytuffShop3Work->monPortrait.unkE = 0; diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 106dcb875..760e60656 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -200,7 +200,7 @@ u32 sub_8027F88(void) strcpy(gFormatBuffer_Monsters[0], monName); faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); sUnknown_203B2C0->monPortrait.faceFile = faceFile; - sUnknown_203B2C0->monPortrait.faceData = (void *) faceFile->data; + sUnknown_203B2C0->monPortrait.faceData = (struct PortraitGfx *) faceFile->data; sUnknown_203B2C0->monPortrait.spriteId = 0; sUnknown_203B2C0->monPortrait.flip = FALSE; sUnknown_203B2C0->monPortrait.unkE = 0; diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index 0697ac6da..7cf6654df 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -86,7 +86,7 @@ s32 sub_802B2D4(void) CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); sUnknown_203B2C8->monPortrait.faceFile = faceFile; - sUnknown_203B2C8->monPortrait.faceData = (void *) faceFile->data; + sUnknown_203B2C8->monPortrait.faceData = (struct PortraitGfx *) faceFile->data; sUnknown_203B2C8->monPortrait.spriteId = 0; sUnknown_203B2C8->monPortrait.flip = FALSE; sUnknown_203B2C8->monPortrait.unkE = 0; diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index 0111b82ae..beaa90e3c 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -110,7 +110,7 @@ bool8 sub_8030F58(u32 wonderMailType) gUnknown_203B328->wonderMailType = wonderMailType; file = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); gUnknown_203B328->monPortrait.faceFile = file; - gUnknown_203B328->monPortrait.faceData = (void *) file->data; + gUnknown_203B328->monPortrait.faceData = (struct PortraitGfx *) file->data; gUnknown_203B328->monPortrait.spriteId = 0; gUnknown_203B328->monPortrait.flip = FALSE; gUnknown_203B328->monPortrait.unkE = 0; diff --git a/sym_ewram.txt b/sym_ewram.txt index 348af6354..f4a5c0262 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -221,7 +221,7 @@ gUnknown_202EDB8: /* 202EDB8 (sub_803E250) */ .space 0x8 gUnknown_202EDC0: /* 202EDC0 (sub_803E250 - sub_80462AC) */ .space 0x8 -gUnknown_202EDC8: /* 202EDC8 (sub_803E250 - sub_8086794) */ +gDungeonBrightness: /* 202EDC8 (sub_803E250 - sub_8086794) */ .space 0x4 gUnknown_202EDCC: /* 202EDCC (sub_803E490 - sub_807D148) */ .space 0x4