diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-02-24 04:15:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-23 23:15:58 -0500 |
| commit | c55e9eeee5f6ed8e2f7cd9912a0b347761ea7126 (patch) | |
| tree | 926f81b788021d29ce3604c8617b0064295e7713 /src/code/z_scene_proc.c | |
| parent | e0164dba144220fb67b2385ec760fa85535faf6a (diff) | |
pragma variant for GLOBAL_ASM (#49)
* pragma GLOBAL_ASM
* Revert split_asm.py arg description change
Diffstat (limited to 'src/code/z_scene_proc.c')
| -rw-r--r-- | src/code/z_scene_proc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_scene_proc.c b/src/code/z_scene_proc.c index 7d054ff4b..6d2d5bd67 100644 --- a/src/code/z_scene_proc.c +++ b/src/code/z_scene_proc.c @@ -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) { |