From 13c32f2bf32b5527f6c519722323ca96e7a3024a Mon Sep 17 00:00:00 2001 From: Rainchus Date: Wed, 12 Aug 2020 16:13:09 -0500 Subject: [PATCH] fix style issues --- papermario/include/common_structs.h | 12 ++++----- papermario/include/functions.h | 2 ++ papermario/src/code_cd180_len_38f0.c | 4 +-- papermario/src/code_dc470_len_14c0.c | 4 +-- papermario/src/code_ebd0_len_6a0.c | 38 +++++++++++++--------------- 5 files changed, 29 insertions(+), 31 deletions(-) diff --git a/papermario/include/common_structs.h b/papermario/include/common_structs.h index 7f448ee906..5cfad8f94f 100644 --- a/papermario/include/common_structs.h +++ b/papermario/include/common_structs.h @@ -17,7 +17,8 @@ typedef struct { /* 0x06C */ char unk_6C[0x4]; /* 0x070 */ s8 unk_70; /* 0x071 */ s8 demoState; - /* 0x072 */ char unk_72[3]; + /* 0x072 */ s8 unk_72; + /* 0x073 */ char unk_73[2]; /* 0x075 */ s8 unk_75; /* 0x076 */ char unk_76[3]; /* 0x079 */ s8 unk_79; @@ -40,11 +41,10 @@ typedef struct { /* 0x0AB */ char unk_AB[1]; /* 0x0AC */ s8 unk_AC; /* 0x0AD */ char unk_AD[0x09]; - - /* 0x0B6 */ s16 fade_status; - /* 0x0B8 */ s16 boot_logos_unk1; - /* 0x0BA */ s16 boot_logos_unk2; - /* 0x0BC */ s16 boot_logos_unk3; + /* 0x0B6 */ s16 boot_alpha; + /* 0x0B8 */ s16 boot_blue; + /* 0x0BA */ s16 boot_green; + /* 0x0BC */ s16 boot_red; /* 0x0BE */ char unk_BE[0x76]; /* 0x134 */ u16 unk_134; /* 0x136 */ char unk_136[0x6]; diff --git a/papermario/include/functions.h b/papermario/include/functions.h index 47b91a0b6b..c533f9d6fd 100644 --- a/papermario/include/functions.h +++ b/papermario/include/functions.h @@ -17,6 +17,8 @@ s32 func_80055464(s32, s32); s32 func_800554A4(s32, s32); s32 func_800554E8(s32, s32); s32 func_800555E4(s32); +void func_80137D88(s32, f32); +void func_80137E10(s32, u8, u8, u8); s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); s32 set_music_track(s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume); diff --git a/papermario/src/code_cd180_len_38f0.c b/papermario/src/code_cd180_len_38f0.c index b520f210a0..28d3f7fa30 100644 --- a/papermario/src/code_cd180_len_38f0.c +++ b/papermario/src/code_cd180_len_38f0.c @@ -2,13 +2,13 @@ INCLUDE_ASM(code_cd180_len_38f0, func_80136A80); -INCLUDE_ASM(code_cd180_len_38f0, func_80137D88); +void INCLUDE_ASM(code_cd180_len_38f0, func_80137D88, s32 arg0, f32 arg1); INCLUDE_ASM(code_cd180_len_38f0, func_80137DA4); INCLUDE_ASM(code_cd180_len_38f0, func_80137DC0); -INCLUDE_ASM(code_cd180_len_38f0, func_80137E10); +void INCLUDE_ASM(code_cd180_len_38f0, func_80137E10, s32 arg0, u8 arg1, u8 arg2, u8 arg3); INCLUDE_ASM(code_cd180_len_38f0, func_80137E4C); diff --git a/papermario/src/code_dc470_len_14c0.c b/papermario/src/code_dc470_len_14c0.c index d1f4927ae5..be00c32828 100644 --- a/papermario/src/code_dc470_len_14c0.c +++ b/papermario/src/code_dc470_len_14c0.c @@ -49,7 +49,7 @@ u16 read_background_size(bg_header *bg) { u16 set_background_size(s16 startX, s16 startY, s16 sizeX, s16 sizeY) { game_status* gameStatus = *gGameStatusPtr; - gameStatus->unk_148 = gameStatus->unk_148 & 0xFFFE; + gameStatus->unk_148 &= ~1; gameStatus->unk_14E = startX; gameStatus->unk_150 = startY; gameStatus->unk_14A = sizeX; @@ -60,7 +60,7 @@ u16 set_background_size(s16 startX, s16 startY, s16 sizeX, s16 sizeY) { s32 func_80145E98(s32 arg0, s32 arg1, s32 arg2) { s32 temp_lo; - temp_lo = (arg1 - (arg0 & 0xFFFF)) * arg2; + temp_lo = (arg1 - (u16)(arg0)) * arg2; if (temp_lo < 0) { temp_lo = temp_lo + 0xFF; } diff --git a/papermario/src/code_ebd0_len_6a0.c b/papermario/src/code_ebd0_len_6a0.c index 5f738ac852..bde38a856c 100644 --- a/papermario/src/code_ebd0_len_6a0.c +++ b/papermario/src/code_ebd0_len_6a0.c @@ -1,27 +1,26 @@ #include "common.h" -void func_800337D0(s16 new_fade_status) { +void func_800337D0(s16 new_alpha) { game_status* gameStatus = *gGameStatusPtr; - gameStatus->fade_status = new_fade_status; + gameStatus->boot_alpha = new_alpha; return; } void func_800337E0(s16 arg0) { game_status* gameStatus = *gGameStatusPtr; - gameStatus->boot_logos_unk3 = arg0; - gameStatus->boot_logos_unk2 = arg0; - gameStatus->boot_logos_unk1 = arg0; + gameStatus->boot_red = arg0; + gameStatus->boot_green = arg0; + gameStatus->boot_blue = arg0; } s16 func_800337F8(subtract_val) { game_status* gameStatus = *gGameStatusPtr; - if (gameStatus->fade_status != 0){ - gameStatus->fade_status -= subtract_val; - if (gameStatus->fade_status << 0x10 < 0){ - gameStatus->fade_status = 0; + if (gameStatus->boot_alpha != 0) { + gameStatus->boot_alpha -= subtract_val; + if (gameStatus->boot_alpha << 0x10 < 0){ + gameStatus->boot_alpha = 0; } - } - else { + } else { return 1; } return 0; @@ -29,25 +28,22 @@ s16 func_800337F8(subtract_val) { s16 func_80033830(add_val) { game_status* gameStatus = *gGameStatusPtr; - if (gameStatus->fade_status != 0xFF){ - gameStatus->fade_status += add_val; - if ((gameStatus->fade_status >= 0x100)){ - gameStatus->fade_status = 0xFF; + if (gameStatus->boot_alpha != 0xFF) { + gameStatus->boot_alpha += add_val; + if ((gameStatus->boot_alpha >= 0x100)) { + gameStatus->boot_alpha = 0xFF; } - } - else { + } else { return 1; } return 0; } -void func_80137D88(s32, f32); -void func_80137E10(s32, u8, u8, u8); void func_80033874(void) { - func_80137D88(0, (f32) (*gGameStatusPtr)->fade_status); - func_80137E10(0, (*gGameStatusPtr)->boot_logos_unk1, (*gGameStatusPtr)->boot_logos_unk2, (*gGameStatusPtr)->boot_logos_unk3); + func_80137D88(0, (*gGameStatusPtr)->boot_alpha); + func_80137E10(0, (*gGameStatusPtr)->boot_blue, (*gGameStatusPtr)->boot_green, (*gGameStatusPtr)->boot_red); return 0; }