mirror of
https://github.com/pmret/papermario.git
synced 2024-11-18 08:52:40 +01:00
formatting
This commit is contained in:
parent
210e65c3bf
commit
9878841eb8
@ -6,11 +6,11 @@ void init_demo_data(void) {
|
|||||||
GAME_STATUS->nextDemoScene = 0;
|
GAME_STATUS->nextDemoScene = 0;
|
||||||
GAME_STATUS->demoState = 1;
|
GAME_STATUS->demoState = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
GAME_STATUS->demoStickX = 0;
|
GAME_STATUS->demoStickX = 0;
|
||||||
GAME_STATUS->demoButtonInput = 0;
|
GAME_STATUS->demoButtonInput = 0;
|
||||||
GAME_STATUS->demoStickY = 0;
|
GAME_STATUS->demoStickY = 0;
|
||||||
|
|
||||||
func_80056228();
|
func_80056228();
|
||||||
set_map_transition_effect(2);
|
set_map_transition_effect(2);
|
||||||
func_80137D88(0, 255.0f);
|
func_80137D88(0, 255.0f);
|
||||||
|
@ -11,7 +11,7 @@ INCLUDE_ASM(s32, "code_13870_len_6980", init_npc_list);
|
|||||||
|
|
||||||
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003857C);
|
INCLUDE_ASM(s32, "code_13870_len_6980", func_8003857C);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_13870_len_6980", _create_npc, );
|
INCLUDE_ASM(s32, "code_13870_len_6980", _create_npc);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_13870_len_6980", create_basic_npc);
|
INCLUDE_ASM(s32, "code_13870_len_6980", create_basic_npc);
|
||||||
|
|
||||||
|
@ -219,7 +219,7 @@ INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_model_list_index_from_tree_index, s
|
|||||||
INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B090);
|
INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B090);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "code_a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY,
|
INCLUDE_ASM(void, "code_a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY,
|
||||||
f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ);
|
f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B1C0);
|
INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B1C0);
|
||||||
|
|
||||||
|
@ -203,8 +203,8 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", make_item_entity);
|
|||||||
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", make_item_entity_nodelay);
|
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", make_item_entity_nodelay);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "code_b72b0_len_15ed0", make_item_entity_delayed, s32 itemID, f32 x, f32 y, f32 z, s32 unk1,
|
INCLUDE_ASM(void, "code_b72b0_len_15ed0", make_item_entity_delayed, s32 itemID, f32 x, f32 y, f32 z, s32 unk1,
|
||||||
s32 unk2,
|
s32 unk2,
|
||||||
s32 unk3);
|
s32 unk3);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_got_item);
|
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_got_item);
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ void play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_de740_len_23f0", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY,
|
INCLUDE_ASM(s32, "code_de740_len_23f0", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY,
|
||||||
f32 posZ);
|
f32 posZ);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149E04);
|
INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149E04);
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548);
|
|||||||
INCLUDE_ASM(s32, "code_e0b30_len_b80", _set_music_track);
|
INCLUDE_ASM(s32, "code_e0b30_len_b80", _set_music_track);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_e0b30_len_b80", set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk,
|
INCLUDE_ASM(s32, "code_e0b30_len_b80", set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk,
|
||||||
s32 volume);
|
s32 volume);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A964);
|
INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A964);
|
||||||
|
|
||||||
|
@ -969,7 +969,7 @@ ApiStatus SetModelFlag10(ScriptInstance* script, s32 isInitialCall) {
|
|||||||
Bytecode treeIndex = get_variable(script, *thisPos++);
|
Bytecode treeIndex = get_variable(script, *thisPos++);
|
||||||
Bytecode var2 = get_variable(script, *thisPos++);
|
Bytecode var2 = get_variable(script, *thisPos++);
|
||||||
Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex));
|
Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex));
|
||||||
|
|
||||||
if (var2 != 0) {
|
if (var2 != 0) {
|
||||||
model->flags |= 0x10;
|
model->flags |= 0x10;
|
||||||
} else {
|
} else {
|
||||||
@ -985,7 +985,7 @@ ApiStatus func_802C90FC(ScriptInstance* script, s32 isInitialCall) {
|
|||||||
s32 var2 = get_variable(script, *thisPos++);
|
s32 var2 = get_variable(script, *thisPos++);
|
||||||
s32 var3 = get_variable(script, *thisPos++);
|
s32 var3 = get_variable(script, *thisPos++);
|
||||||
Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex));
|
Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex));
|
||||||
|
|
||||||
func_8011BC7C(model, var2, var3);
|
func_8011BC7C(model, var2, var3);
|
||||||
if (var2 != -1) {
|
if (var2 != -1) {
|
||||||
model->flags |= 0x10;
|
model->flags |= 0x10;
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3d330_len_990", guFrustumF, float mf[4][4], float l, float r, float b, float t, float n,
|
INCLUDE_ASM(void, "os/code_3d330_len_990", guFrustumF, float mf[4][4], float l, float r, float b, float t, float n,
|
||||||
float f, float scale);
|
float f, float scale);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3d330_len_990", guFrustum, Mtx* m, float l, float r, float b, float t, float n, float f,
|
INCLUDE_ASM(void, "os/code_3d330_len_990", guFrustum, Mtx* m, float l, float r, float b, float t, float n, float f,
|
||||||
float scale);
|
float scale);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3d330_len_990", guLookAtF, float mf[4][4], float xEye, float yEye, float zEye, float xAt,
|
INCLUDE_ASM(void, "os/code_3d330_len_990", guLookAtF, float mf[4][4], float xEye, float yEye, float zEye, float xAt,
|
||||||
float yAt, float zAt, float xUp, float yUp, float zUp);
|
float yAt, float zAt, float xUp, float yUp, float zUp);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3d330_len_990", guLookAt, Mtx* m, float xEye, float yEye, float zEye, float xAt, float yAt,
|
INCLUDE_ASM(void, "os/code_3d330_len_990", guLookAt, Mtx* m, float xEye, float yEye, float zEye, float xAt, float yAt,
|
||||||
float zAt, float xUp, float yUp, float zUp);
|
float zAt, float xUp, float yUp, float zUp);
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3dcc0_len_a60", guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye,
|
INCLUDE_ASM(void, "os/code_3dcc0_len_a60", guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye,
|
||||||
float yEye,
|
float yEye,
|
||||||
float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1,
|
float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1,
|
||||||
float zl1, float xl2, float yl2, float zl2, int twidth, int theight);
|
float zl1, float xl2, float yl2, float zl2, int twidth, int theight);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3dcc0_len_a60", guLookAtHilite, Mtx* m, LookAt* l, Hilite* h, float xEye, float yEye,
|
INCLUDE_ASM(void, "os/code_3dcc0_len_a60", guLookAtHilite, Mtx* m, LookAt* l, Hilite* h, float xEye, float yEye,
|
||||||
float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1,
|
float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1,
|
||||||
float zl1, float xl2, float yl2, float zl2, int twidth, int theight);
|
float zl1, float xl2, float yl2, float zl2, int twidth, int theight);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3e720_len_5f0", guLookAtReflectF, float mf[4][4], LookAt* l, float xEye, float yEye,
|
INCLUDE_ASM(void, "os/code_3e720_len_5f0", guLookAtReflectF, float mf[4][4], LookAt* l, float xEye, float yEye,
|
||||||
float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp);
|
float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3e720_len_5f0", guLookAtReflect, Mtx* m, LookAt* l, float xEye, float yEye, float zEye,
|
INCLUDE_ASM(void, "os/code_3e720_len_5f0", guLookAtReflect, Mtx* m, LookAt* l, float xEye, float yEye, float zEye,
|
||||||
float xAt, float yAt, float zAt, float xUp, float yUp, float zUp);
|
float xAt, float yAt, float zAt, float xUp, float yUp, float zUp);
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3ef90_len_600", guPerspectiveF, float mf[4][4], u16* perspNorm, float fovy, float aspect,
|
INCLUDE_ASM(void, "os/code_3ef90_len_600", guPerspectiveF, float mf[4][4], u16* perspNorm, float fovy, float aspect,
|
||||||
float near, float far, float scale);
|
float near, float far, float scale);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3ef90_len_600", guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect,
|
INCLUDE_ASM(void, "os/code_3ef90_len_600", guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect,
|
||||||
float near,
|
float near,
|
||||||
float far, float scale);
|
float far, float scale);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3f310_len_3c0", guPositionF, float mf[4][4], float r, float p, float h, float s, float x,
|
INCLUDE_ASM(void, "os/code_3f310_len_3c0", guPositionF, float mf[4][4], float r, float p, float h, float s, float x,
|
||||||
float y, float z);
|
float y, float z);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_3f310_len_3c0", guPosition, Mtx* m, float r, float p, float h, float s, float x, float y,
|
INCLUDE_ASM(void, "os/code_3f310_len_3c0", guPosition, Mtx* m, float r, float p, float h, float s, float x, float y,
|
||||||
float z);
|
float z);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(int, "os/code_41750_len_450", osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue,
|
INCLUDE_ASM(int, "os/code_41750_len_450", osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue,
|
||||||
OSMesg mesg);
|
OSMesg mesg);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "os/code_41750_len_450", osTimerServicesInit);
|
INCLUDE_ASM(s32, "os/code_41750_len_450", osTimerServicesInit);
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_41ba0_len_c0", osMapTLB, s32 unk, OSPageMask pageMask, void* buf, u32 unk1, u32 unk2,
|
INCLUDE_ASM(void, "os/code_41ba0_len_c0", osMapTLB, s32 unk, OSPageMask pageMask, void* buf, u32 unk1, u32 unk2,
|
||||||
s32 unk3);
|
s32 unk3);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_42de0_len_90", guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy,
|
INCLUDE_ASM(void, "os/code_42de0_len_90", guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy,
|
||||||
float* oz);
|
float* oz);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_42e70_len_390", guMtxXFMF, float mf[4][4], float x, float y, float z, float* ox, float* oy,
|
INCLUDE_ASM(void, "os/code_42e70_len_390", guMtxXFMF, float mf[4][4], float x, float y, float z, float* ox, float* oy,
|
||||||
float* oz);
|
float* oz);
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/code_42e70_len_390", guRotateF, float mf[4][4], float a, float x, float y, float z);
|
INCLUDE_ASM(void, "os/code_42e70_len_390", guRotateF, float mf[4][4], float a, float x, float y, float z);
|
||||||
|
|
||||||
|
@ -5,6 +5,6 @@ INCLUDE_ASM(s32, "os/code_43200_len_7c0", osMotorAccess);
|
|||||||
INCLUDE_ASM(s32, "os/code_43200_len_7c0", osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk);
|
INCLUDE_ASM(s32, "os/code_43200_len_7c0", osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "os/code_43200_len_7c0", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4,
|
INCLUDE_ASM(s32, "os/code_43200_len_7c0", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4,
|
||||||
int unk5, s32* unk6);
|
int unk5, s32* unk6);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "os/code_43200_len_7c0", osPfsDeclearPage);
|
INCLUDE_ASM(s32, "os/code_43200_len_7c0", osPfsDeclearPage);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "os/code_43be0_len_5e0", osPfsReadWriteFile, OSPfs* pfs, s32 unk1, u8 unk2, int unk3, int unk4,
|
INCLUDE_ASM(s32, "os/code_43be0_len_5e0", osPfsReadWriteFile, OSPfs* pfs, s32 unk1, u8 unk2, int unk3, int unk4,
|
||||||
u8* unk5);
|
u8* unk5);
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "os/code_43be0_len_5e0", osPfsFileState, OSPfs* pfs, s32 unk, OSPfsState* state);
|
INCLUDE_ASM(s32, "os/code_43be0_len_5e0", osPfsFileState, OSPfs* pfs, s32 unk, OSPfsState* state);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "os/code_441c0_len_1c0", osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4,
|
INCLUDE_ASM(s32, "os/code_441c0_len_1c0", osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4,
|
||||||
s32* unk5);
|
s32* unk5);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
INCLUDE_ASM(void, "os/osCreateThread", osCreateThread, OSThread* thread, OSId id, void (*entrypoint)(void*),
|
INCLUDE_ASM(void, "os/osCreateThread", osCreateThread, OSThread* thread, OSId id, void (*entrypoint)(void*),
|
||||||
void* unk1,
|
void* unk1,
|
||||||
void* unk2, OSPri pri);
|
void* unk2, OSPri pri);
|
||||||
|
Loading…
Reference in New Issue
Block a user