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

fully matched code_e940_len_290.c

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-09 14:26:17 -04:00
parent eb6aaccd73
commit 2eb876fccf
5 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.vscode/settings.json vendored
View File

@ -11,5 +11,4 @@
"-Isrc",
"-D_LANGUAGE_C",
],
"python.pythonPath": "/usr/bin/python3",
}

4
src/code_13870_len_6980.c
View File

@ -65,7 +65,7 @@ INCLUDE_ASM(s32, "code_13870_len_6980", func_8003AC5C);
INCLUDE_ASM(s32, "code_13870_len_6980", enable_npc_blur);
void disable_npc_blur(Npc *npc) {
void disable_npc_blur(Npc* npc) {
if (npc->flags & 0x100000) {
npc->flags &= ~0x100000;
heap_free(npc->blurData);
@ -73,7 +73,7 @@ void disable_npc_blur(Npc *npc) {
}
}
void update_npc_blur(Npc *npc) {
void update_npc_blur(Npc* npc) {
NpcBlurData* blurData = npc->blurData;
s32 index = blurData->unk_01;

2
src/code_ED510.c
View File

@ -178,7 +178,7 @@ ApiStatus SetModelFlags(ScriptInstance* script, s32 isInitialCall) {
} else {
model->flags &= ~a1;
}
return ApiStatus_DONE2;
}
#else

2
src/code_F5750.c
View File

@ -75,7 +75,7 @@ ApiStatus SetPlayerCollisionSize(ScriptInstance* script, s32 isInitialCall) {
player->collisionHeight = height;
player->collisionRadius = radius;
playerStatus->colliderHeight = player->collisionHeight;
playerStatus->colliderDiameter = player->collisionRadius;

32
src/code_e940_len_290.c
View File

@ -5,30 +5,29 @@ void begin_state_init(void) {
GAME_STATUS->loadMenuState = 3;
}
#ifdef NON_MATCHING
void step_init_state(void) {
GameStatus* gameStatus = GAME_STATUS;
GameStatus** gameStatusPtr = gGameStatusPtr;
GameStatus* gameStatus = *gameStatusPtr;
s32 i;
if (gameStatus->loadMenuState != 0) {
gameStatus->loadMenuState--;
if (GAME_STATUS->loadMenuState != 0) {
GAME_STATUS->loadMenuState--;
return;
}
D_8009A650[0] = 0;
gameStatus->areaID = 0;
(*gameStatusPtr)->areaID = 0;
gameStatus->isBattle = 0;
gameStatus->prevArea = -1;
gameStatus->mapID = 0;
gameStatus->entryID = 0;
GAME_STATUS->unk_76 = 0;
GAME_STATUS->disableScripts = 0;
GAME_STATUS->unk_7D = 0;
GAME_STATUS->unk_A8 = -1;
GAME_STATUS->unk_AA = 0;
GAME_STATUS->unk_A9 = -1;
GAME_STATUS->demoState = 0;
(*gameStatusPtr)->unk_76 = 0;
(*gameStatusPtr)->disableScripts = 0;
(*gameStatusPtr)->unk_7D = 0;
(*gameStatusPtr)->unk_A8 = -1;
(*gameStatusPtr)->unk_AA = 0;
(*gameStatusPtr)->unk_A9 = -1;
(*gameStatusPtr)->demoState = 0;
general_heap_create();
func_8011D890();
@ -64,8 +63,8 @@ void step_init_state(void) {
initialize_curtains();
for (i = 0; i < 4; i++) {
gameStatus->unk_50[i] = 4;
gameStatus->unk_48[i] = 0xF;
(*gameStatusPtr)->unk_50[i] = 4;
(*gameStatusPtr)->unk_48[i] = 0xF;
}
fio_has_valid_backup();
@ -81,9 +80,6 @@ void step_init_state(void) {
D_8009A650[0] &= ~0x8;
set_game_mode(1);
}
#else
INCLUDE_ASM(s32, "code_e940_len_290", step_init_state);
#endif
void func_80033788(void) {
func_8002AB5C(0, 0, 0x13F, 0xEF, 0, 0, 0, 0xFF);