pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix last of style issues

Browse Source
This commit is contained in:
Rainchus 2020-08-12 17:18:27 -05:00
parent 33bd86e026
commit c5783e2abf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
papermario/src/code_dc470_len_14c0.c
View File

@ -38,7 +38,7 @@ u16 read_background_size(bg_header *bg) {
gameStatus->unk_14C = bg->startY; gameStatus->unk_14C = bg->startY;
gameStatus->unk_154 = bg->palette; gameStatus->unk_154 = bg->palette;
gameStatus->unk_158 = bg->raster; gameStatus->unk_158 = bg->raster;
gameStatus->unk_148 = gameStatus->unk_148 | 1; gameStatus->unk_148 |= 1;
return; return;
} }
@ -59,8 +59,8 @@ u16 func_80145E98(s32 arg0, s32 arg1, s32 arg2) {
if (temp_lo < 0) { if (temp_lo < 0) {
temp_lo = temp_lo + 0xFF; temp_lo = temp_lo + 0xFF;
} }
temp_lo = arg0 + (temp_lo >> 0x08); temp_lo = arg0 + (temp_lo >> 8);
return temp_lo & 0xFFFF; return temp_lo;
} }
INCLUDE_ASM(code_dc470_len_14c0, func_80145EC0); INCLUDE_ASM(code_dc470_len_14c0, func_80145EC0);

2
papermario/src/code_ebd0_len_6a0.c
View File

@ -17,7 +17,7 @@ s16 func_800337F8(subtract_val) {
game_status* gameStatus = *gGameStatusPtr; game_status* gameStatus = *gGameStatusPtr;
if (gameStatus->boot_alpha != 0) { if (gameStatus->boot_alpha != 0) {
gameStatus->boot_alpha -= subtract_val; gameStatus->boot_alpha -= subtract_val;
if (gameStatus->boot_alpha << 0x10 < 0) { if (gameStatus->boot_alpha << 16 < 0) {
gameStatus->boot_alpha = 0; gameStatus->boot_alpha = 0;
} }
} else { } else {