izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

pragma variant for GLOBAL_ASM (#49)

Browse Source 
* pragma GLOBAL_ASM

* Revert split_asm.py arg description change
This commit is contained in:
Tharo
2021-02-23 23:15:58 -05:00
committed by GitHub
parent e0164dba14
commit c55e9eeee5
564 changed files with 12305 additions and 12305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_0x800AF710.c
+2 -2
View File
@@ -214,7 +214,7 @@ void Effect_DrawAll(GraphicsContext* gCtxt) {
}
}
#else
GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_DrawAll.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_DrawAll.asm")
#endif
#ifdef NON_MATCHING
@@ -255,7 +255,7 @@ void Effect_UpdateAll(GlobalContext* ctxt) {
}
}
#else
GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_UpdateAll.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_UpdateAll.asm")
#endif
void Effect_Destroy(GlobalContext* ctxt, s32 index) {
src/code/z_actor.c
+185 -185
View File
File diff suppressed because it is too large Load Diff
src/code/z_bgcheck.c
+183 -183
View File
File diff suppressed because it is too large Load Diff
src/code/z_effect_soft_sprite.c
+3 -3
View File
@@ -145,7 +145,7 @@ s32 EffectSS_FindFreeSpace(u32 priority, u32* tableEntry) {
return ret;
}
#else
GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm")
#endif
void EffectSS_Copy(GlobalContext* ctxt, LoadedParticleEntry* a1) {
@@ -208,7 +208,7 @@ void EffectSS_LoadParticle(GlobalContext* ctxt, u32 type, u32 priority, void* in
}
}
#else
GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_LoadParticle.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_LoadParticle.asm")
#endif
void EffectSS_UpdateParticle(GlobalContext* ctxt, s32 index) {
@@ -291,7 +291,7 @@ s16 func_800B096C(s16 a0, s16 a1, s32 a2) {
return ret;
}
#else
GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/func_800B096C.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/func_800B096C.asm")
#endif
s16 func_800B09D0(s16 a0, s16 a1, f32 a2) {
src/code/z_lib.c
+11 -11
View File
@@ -25,7 +25,7 @@ void* Lib_MemSet(u8* a0, u32 a1, u32 a2) {
return a0;
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_MemSet.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_MemSet.asm")
#endif
f32 Math_Coss(s16 angle) {
@@ -149,7 +149,7 @@ s32 Lib_StepTowardsCheck_f(f32* start, f32 target, f32 step) {
return 0;
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_StepTowardsCheck_f.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_StepTowardsCheck_f.asm")
#endif
#ifdef NON_MATCHING
@@ -168,7 +168,7 @@ s32 func_800FF0D0(s16* a0, s16 a1, s16 a2) {
return 0;
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF0D0.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF0D0.asm")
#endif
#ifdef NON_MATCHING
@@ -176,7 +176,7 @@ void func_800FF138() {
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF138.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF138.asm")
#endif
#ifdef NON_MATCHING
@@ -184,7 +184,7 @@ void func_800FF1FC(void) {
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF1FC.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF1FC.asm")
#endif
#ifdef NON_MATCHING
@@ -192,7 +192,7 @@ void func_800FF2A8(void) {
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2A8.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2A8.asm")
#endif
#ifdef NON_MATCHING
@@ -201,7 +201,7 @@ void func_800FF2F8(void) {
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2F8.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2F8.asm")
#endif
#ifdef NON_MATCHING
@@ -209,7 +209,7 @@ void func_800FF3A0(void) {
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF3A0.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF3A0.asm")
#endif
s16 Math_Rand_S16Offset(s16 base, s16 range) {
@@ -363,7 +363,7 @@ void Math_Vec3f_PushAwayXZ(Vec3f* start, Vec3f* pusher, f32 distanceToApproach)
start->z = pusher->z + sp20 * f2;
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/Math_Vec3f_PushAwayXZ.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Math_Vec3f_PushAwayXZ.asm")
#endif
f32 Math_Vec3f_DiffY(Vec3f* a, Vec3f* b) {
@@ -518,7 +518,7 @@ s32 Math_SmoothScaleMaxMinS(s16* start, s16 target, s16 scale, s16 maxStep, s16
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/Math_SmoothScaleMaxMinS.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Math_SmoothScaleMaxMinS.asm")
#endif
void Math_SmoothScaleMaxS(s16* start, s16 target, s16 scale, s16 maxStep) {
@@ -576,7 +576,7 @@ void Lib_LerpRGB(RGB* a, RGB* b, f32 t, RGB* dst) {
dst->blue = (f32)a->blue + ((f32)b->blue - (f32)a->blue) * t;
}
#else
GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_LerpRGB.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_LerpRGB.asm")
#endif
f32 Lib_PushAwayVec3f(Vec3f* start, Vec3f* pusher, f32 distanceToApproach) {
src/code/z_lights.c
+5 -5
View File
@@ -70,7 +70,7 @@ void Lights_UploadLights(LightMapper* mapper, GraphicsContext* gCtxt) {
gSPLight(gCtxt->polyXlu.p++, &mapper->lights.a, i);
}
#else
GLOBAL_ASM("asm/non_matchings/z_lights/Lights_UploadLights.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_UploadLights.asm")
#endif
Light* Lights_MapperGetNextFreeSlot(LightMapper* mapper) {
@@ -126,7 +126,7 @@ void Lights_MapPositionalWithReference(LightMapper* mapper, LightInfoPositionalP
}
}
#else
GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositionalWithReference.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositionalWithReference.asm")
#endif
// This function matches, but uses .rodata. We don't have a good way to match partial .rodata for a file yet.
@@ -172,7 +172,7 @@ void Lights_MapPositional(LightMapper* mapper, LightInfoPositionalParams* params
}
}
#else
GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositional.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositional.asm")
#endif
void Lights_MapDirectional(LightMapper* mapper, LightInfoDirectionalParams* params, GlobalContext* ctxt) {
@@ -393,7 +393,7 @@ void func_80102880(GlobalContext* ctxt) {
}
}
#else
GLOBAL_ASM("asm/non_matchings/z_lights/func_80102880.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/func_80102880.asm")
#endif
// XXX regalloc
@@ -440,5 +440,5 @@ void func_80102A64(GlobalContext* ctxt) {
}
}
#else
GLOBAL_ASM("asm/non_matchings/z_lights/func_80102A64.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/func_80102A64.asm")
#endif
src/code/z_prenmi.c
+1 -1
View File
@@ -30,7 +30,7 @@ void PreNMI_Draw(PreNMIContext* prenmiCtx) {
gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, 320 /*SCREEN_WIDTH*/ - 1, prenmiCtx->timer + 100);
}
#else
GLOBAL_ASM("asm/non_matchings/z_prenmi/PreNMI_Draw.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_prenmi/PreNMI_Draw.asm")
#endif
void PreNMI_Main(PreNMIContext* prenmiCtx) {
src/code/z_rcp.c
+1 -1
View File
@@ -1303,7 +1303,7 @@ void func_8012CF0C(GraphicsContext* gCtxt, s32 iParm2, s32 iParm3, u8 r, u8 g, u
}
}
#else
GLOBAL_ASM("asm/non_matchings/z_rcp/func_8012CF0C.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_rcp/func_8012CF0C.asm")
#endif
void func_8012D374(GraphicsContext* gCtxt, u8 r, u8 g, u8 b) {
src/code/z_room.c
+6 -6
View File
@@ -42,13 +42,13 @@ void Room_DrawType0Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
}
}
GLOBAL_ASM("asm/non_matchings/z_room/Room_DrawType2Mesh.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_DrawType2Mesh.asm")
GLOBAL_ASM("asm/non_matchings/z_room/func_8012DEE8.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012DEE8.asm")
GLOBAL_ASM("asm/non_matchings/z_room/func_8012E254.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012E254.asm")
GLOBAL_ASM("asm/non_matchings/z_room/func_8012E32C.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012E32C.asm")
void Room_DrawType1Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
RoomMeshType1* mesh = &room->mesh->type1;
@@ -72,7 +72,7 @@ void Room_Init(GlobalContext* ctxt, RoomContext* roomCtxt) {
}
}
GLOBAL_ASM("asm/non_matchings/z_room/Room_AllocateAndLoad.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_AllocateAndLoad.asm")
#ifdef NON_MATCHING
s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 index) {
@@ -99,7 +99,7 @@ s32 Room_StartRoomTransition(GlobalContext* ctxt, RoomContext* roomCtxt, s32 ind
return 0;
}
#else
GLOBAL_ASM("asm/non_matchings/z_room/Room_StartRoomTransition.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_StartRoomTransition.asm")
#endif
s32 Room_HandleLoadCallbacks(GlobalContext* ctxt, RoomContext* roomCtxt) {
src/code/z_scene_proc.c
+5 -5
View File
@@ -104,7 +104,7 @@ void SceneProc_DrawFlashingTexture(GlobalContext* ctxt, u32 segment, FlashingTex
gSPEndDisplayList(dl++);
}
#else
GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawFlashingTexture.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawFlashingTexture.asm")
#endif
void SceneProc_DrawType2Texture(GlobalContext* ctxt, u32 segment, FlashingTextureParams* params) {
@@ -188,10 +188,10 @@ void SceneProc_DrawType3Texture(GlobalContext* ctxt, u32 segment, FlashingTextur
SceneProc_DrawFlashingTexture(ctxt, segment, &primColorIn, envColorPtrIn);
}
#else
GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType3Texture.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType3Texture.asm")
#endif
GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_Interpolate.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_Interpolate.asm")
u8 SceneProc_InterpolateClamped(u32 numKeyFrames, f32* keyFrames, f32* values, f32 frame) {
s32 ret = SceneProc_Interpolate(numKeyFrames, keyFrames, values, frame);
@@ -201,7 +201,7 @@ u8 SceneProc_InterpolateClamped(u32 numKeyFrames, f32* keyFrames, f32* values, f
ret;
}
GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType4Texture.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType4Texture.asm")
void SceneProc_DrawType5Texture(GlobalContext* ctxt, u32 segment, CyclingTextureParams* params) {
u8* offsets;
@@ -332,7 +332,7 @@ void SceneProc_DrawSceneConfig3(GlobalContext* ctxt) {
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
}
#else
GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawSceneConfig3.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawSceneConfig3.asm")
#endif
void SceneProc_DrawSceneConfig4(GlobalContext* ctxt) {
src/code/z_skelanime.c
+1 -1
View File
@@ -848,7 +848,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* limb
}
//Function is unused.
GLOBAL_ASM("asm/non_matchings/z_skelanime/func_80134FFC.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_skelanime/func_80134FFC.asm")
s16 func_801353D4(GenericAnimationHeader* animationSeg) {
GenericAnimationHeader* animation = Lib_PtrSegToVirt(animationSeg);
src/code/z_view.c
+5 -5
View File
@@ -349,7 +349,7 @@ s32 View_RenderToPerspectiveMatrix(View* view) {
return 1;
}
#else
GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToPerspectiveMatrix.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToPerspectiveMatrix.asm")
#endif
#ifdef NON_MATCHING
@@ -393,12 +393,12 @@ s32 View_RenderToOrthographicMatrix(View* view) {
return 1;
}
#else
GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToOrthographicMatrix.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToOrthographicMatrix.asm")
#endif
GLOBAL_ASM("asm/non_matchings/z_view/func_8013FBC8.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_view/func_8013FBC8.asm")
GLOBAL_ASM("asm/non_matchings/z_view/func_8013FD74.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_view/func_8013FD74.asm")
s32 func_80140024(View* view) {
guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z,
@@ -411,5 +411,5 @@ s32 func_80140024(View* view) {
return 1;
}
GLOBAL_ASM("asm/non_matchings/z_view/func_801400CC.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_view/func_801400CC.asm")