pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Ethan Roseman 2020-09-19 11:17:53 -04:00
parent 4e6a401484
commit b3d87e9347
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/functions.h
View File

@ -17,7 +17,8 @@ s32 get_area_flag(s32 index);
void clone_model(u16 srcModelID, u16 newModelID);
Model* get_model_from_list_index(s32 listIndex);
void get_model_center_and_size(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ);
void get_model_center_and_size(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY,
f32* sizeZ);
void update_collider_transform(s16 colliderID);
void get_collider_center(s32 colliderID, f32* x, f32* y, f32* z);

3
src/code_a5dd0_len_114e0.c
View File

@ -191,7 +191,8 @@ INCLUDE_ASM("code_a5dd0_len_114e0", get_model_list_index_from_tree_index);
INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B090);
void INCLUDE_ASM("code_a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ);
void INCLUDE_ASM("code_a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY,
f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ);
INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B1C0);

4
src/code_dba20_len_350.c
View File

@ -34,7 +34,7 @@ s32 INCLUDE_ASM("code_dba20_len_350", get_global_flag, s32 index);
if (index <= -120000000) {
index += 130000000;
}
}
wordIdx = index / 32;
bitIdx = index % 32;
bit = gCurrentSaveFile->globalFlags[wordIdx] & (1 << bitIdx);
@ -42,7 +42,7 @@ s32 INCLUDE_ASM("code_dba20_len_350", get_global_flag, s32 index);
if (bit != 0) {
bit = 1;
}
return bit;
return bit;
//return (bit != 0) ? 1 : bit; // ??? surely this is `bit != 0`
}*/

3
src/code_e92d0_len_5da0.c
View File

@ -908,7 +908,8 @@ ApiStatus GetModelCenter(ScriptInstance* script, s32 isInitialCall) {
f32 sizeY;
f32 sizeZ;
get_model_center_and_size(get_variable(script, *thisPos++) & 0xFFFF, &centerX, &centerY, &centerZ, &sizeX, &sizeY, &sizeZ);
get_model_center_and_size(get_variable(script, *thisPos++) & 0xFFFF, &centerX, &centerY, &centerZ, &sizeX, &sizeY,
&sizeZ);
script->varTable[0] = centerX;
script->varTable[1] = centerY;
script->varTable[2] = centerZ;