pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

more style updates

Browse Source
This commit is contained in:
Rainchus 2020-08-12 16:30:14 -05:00
parent 13c32f2bf3
commit 33bd86e026
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
papermario/src/code_dc470_len_14c0.c
View File

@ -2,20 +2,15 @@
INCLUDE_ASM(code_dc470_len_14c0, load_map_bg);
/* close match
void load_map_bg (s32 arg0){
void load_map_bg (s32 arg0) {
s32 tempvar0 = arg0;
s32 flowerfields_bg1 = 0x80140EE0;
s32 tempvar3 = get_variable(0, 0xF5DE0180);
if (tempvar0 == 0)
{
if (tempvar0 == 0) {
return;
}
else
{
if (tempvar3 > 0x0034)
{
if (strcmp(tempvar0, 0x8014F120) == 0)
{
}else{
if (tempvar3 > 0x0034) {
if (strcmp(tempvar0, 0x8014F120) == 0) {
tempvar0 = flowerfields_bg1;
}
load_asset_by_name (tempvar0, 0);
@ -31,7 +26,7 @@ void func_80145DF8(void) {
D_801595A0 = 0;
D_8014F12F = 0;
gameStatus->unk_15C = 0xB4;
gameStatus->unk_148 = gameStatus->unk_148 & 0xF0;
gameStatus->unk_148 &= 0xF0;
return;
}
@ -57,7 +52,7 @@ u16 set_background_size(s16 startX, s16 startY, s16 sizeX, s16 sizeY) {
return;
}
s32 func_80145E98(s32 arg0, s32 arg1, s32 arg2) {
u16 func_80145E98(s32 arg0, s32 arg1, s32 arg2) {
s32 temp_lo;
temp_lo = (arg1 - (u16)(arg0)) * arg2;

2
papermario/src/code_ebd0_len_6a0.c
View File

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