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

Initial support of tracking progress per code/boot/overlay, and outputs the stats to csv.

Browse Source
This commit is contained in:
Kenix3
2021-03-10 22:28:06 -05:00
parent fb1ed529ad
commit 037ba9a22e
569 changed files with 15372 additions and 15198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+38
View File
@@ -0,0 +1,38 @@
pipeline {
agent any
stages {
stage('Copy ROM') {
steps {
echo 'Setting up ROM...'
sh 'cp /usr/local/etc/roms/baserom_mm.z64 baserom.z64'
}
}
stage('Build') {
when {
not {
branch 'master'
}
}
steps {
sh 'make -j init'
}
}
stage('Report Progress') {
when {
branch 'master'
}
steps {
sh 'python3 progress.py csv >> /var/www/html/reports/progress_mm.csv'
sh 'python3 progress.py csv -m >> /var/www/html/reports/progress_mm_matching.csv'
sh 'python3 progress.py shield-json > /var/www/html/reports/progress_mm_shield.json'
}
}
}
post {
always {
cleanWs()
}
}
}
Makefile
+3 -1
View File
@@ -97,7 +97,7 @@ ROM_FILES := $(shell cat ./tables/makerom_files.txt)
UNCOMPRESSED_ROM_FILES := $(shell cat ./tables/makerom_uncompressed_files.txt)
# create build directories
$(shell mkdir -p build/asm build/baserom build/comp build/decomp $(foreach dir,$(SRC_DIRS),$(shell mkdir -p build/$(dir))))
$(shell mkdir -p build/asm build/asm/boot build/asm/code build/asm/overlays build/baserom build/comp build/decomp $(foreach dir,$(SRC_DIRS),$(shell mkdir -p build/$(dir))))
build/src/libultra/os/%: OPTFLAGS := -O1
build/src/libultra/io/%: OPTFLAGS := -O2
@@ -167,6 +167,7 @@ $(S_FILES): disasm
disasm: tables/files.txt tables/functions.txt tables/objects.txt tables/variables.txt tables/vrom_variables.txt tables/pre_boot_variables.txt tables/files_with_nonmatching.txt
./tools/disasm.py -d ./asm -u . -l ./tables/files.txt -f ./tables/functions.txt -o ./tables/objects.txt -v ./tables/variables.txt -v ./tables/vrom_variables.txt -v ./tables/pre_boot_variables.txt
@while read -r file; do \
#echo "$$file" \
./tools/split_asm.py ./asm/$$file.asm ./asm/non_matchings/$$file; \
done < ./tables/files_with_nonmatching.txt
@@ -187,6 +188,7 @@ diff-init: all
cp $(ROM) expected/$(ROM)
init:
$(MAKE) clean
$(MAKE) setup
$(MAKE) all
$(MAKE) diff-init
linker_scripts/code_script.txt
+1590 -1590
View File
File diff suppressed because it is too large Load Diff
src/boot_O2/loadfragment2.c
+2 -2
View File
@@ -56,7 +56,7 @@ void Load2_Relocate(u32 allocatedVRamAddr, OverlayBlockSizes* overlayInfo, u32 v
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/loadfragment2/Load2_Relocate.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/loadfragment2/Load2_Relocate.asm")
#endif
#ifdef NON_MATCHING
@@ -92,7 +92,7 @@ s32 Load2_LoadOverlay(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u3
return nbytes;
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/loadfragment2/Load2_LoadOverlay.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/loadfragment2/Load2_LoadOverlay.asm")
#endif
void* Load2_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd) {
src/boot_O2/stackcheck.c
+1 -1
View File
@@ -97,7 +97,7 @@ s32 StackCheck_GetState(StackEntry* entry) {
return 0;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/stackcheck/StackCheck_GetState.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/stackcheck/StackCheck_GetState.asm")
#endif
u32 StackCheck_CheckAll() {
src/boot_O2_g3/idle.c
+2 -2
View File
@@ -23,7 +23,7 @@ void Idle_InitFramebuffer(u32* ptr, u32 numBytes, u32 value) {
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/idle/Idle_InitFramebuffer.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/idle/Idle_InitFramebuffer.asm")
#endif
void Idle_InitScreen(void) {
@@ -65,7 +65,7 @@ void Idle_InitCodeAndMemory(void) {
Idle_ClearMemory(&code_bss_start, &code_bss_end);
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/idle/Idle_InitCodeAndMemory.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/idle/Idle_InitCodeAndMemory.asm")
#endif
void Main_ThreadEntry(void* arg) {
src/boot_O2_g3/viconfig.c
+1 -1
View File
@@ -49,7 +49,7 @@ void ViConfig_UpdateVi(u32 arg0) {
gViConfigUseDefault = arg0;
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/viconfig/ViConfig_UpdateVi.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/viconfig/ViConfig_UpdateVi.asm")
#endif
void ViConfig_UpdateBlack(void) {
src/boot_O2_g3/z_std_dma.c
+2 -2
View File
@@ -141,7 +141,7 @@ void DmaMgr_ProcessMsg(DmaRequest* a0) {
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/z_std_dma/DmaMgr_ProcessMsg.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/z_std_dma/DmaMgr_ProcessMsg.asm")
#endif
void Dmamgr_ThreadEntry(void* a0) {
@@ -215,7 +215,7 @@ void Dmamgr_Start() {
osStartThread(&dmamgrOSThread);
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/z_std_dma/Dmamgr_Start.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/z_std_dma/Dmamgr_Start.asm")
#endif
void Dmamgr_Stop() {
src/boot_O2_g3_trapuv/fault.c
+8 -8
View File
@@ -45,7 +45,7 @@ end:
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_AddClient.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_AddClient.asm")
#endif
void Fault_RemoveClient(FaultClient* client) {
@@ -119,7 +119,7 @@ end:
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_AddAddrConvClient.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_AddAddrConvClient.asm")
#endif
void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) {
@@ -233,7 +233,7 @@ s32 Fault_WaitForInputImpl() {
return 0;
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_WaitForInputImpl.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_WaitForInputImpl.asm")
#endif
void Fault_WaitForInput() {
@@ -289,7 +289,7 @@ void Fault_LogFReg(s32 idx, f32* value) {
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_LogFReg.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_LogFReg.asm")
#endif
void Fault_PrintFPCR(u32 value) {
@@ -574,7 +574,7 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) {
faultCtxt->faultActive = 1;
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_DrawMemDump.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_DrawMemDump.asm")
#endif
#ifdef NON_MATCHING
@@ -635,7 +635,7 @@ void Fault_FindNextStackCall(u32** sp, u32** pc, u32** ra) {
*ra = currentRa;
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_FindNextStackCall.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_FindNextStackCall.asm")
#endif
void Fault_DrawStackTrace(OSThread* t, u32 flags) {
@@ -733,7 +733,7 @@ void Fault_CommitFB() {
FaultDrawer_SetDrawerFB(fb, 0x140, 0xF0);
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_CommitFB.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_CommitFB.asm")
#endif
void Fault_ProcessClients(void) {
@@ -788,7 +788,7 @@ void Fault_SetOptionsFromController3(void) {
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/fault/Fault_SetOptionsFromController3.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault/Fault_SetOptionsFromController3.asm")
#endif
void Fault_SetOptions(void) {
src/boot_O2_g3_trapuv/fault_drawer.c
+5 -5
View File
@@ -44,10 +44,10 @@ void FaultDrawer_DrawRecImpl(s32 xstart, s32 ystart, s32 xend, s32 yend, u16 col
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawRecImpl.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawRecImpl.asm")
#endif
#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawChar.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawChar.asm")
s32 FaultDrawer_ColorToPrintColor(u16 color) {
s32 i;
@@ -110,15 +110,15 @@ void FaultDrawer_FillScreen() {
FaultDrawer_SetCursor(sFaultDrawContext->xStart, sFaultDrawContext->yStart);
}
#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_FormatStringFunc.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_FormatStringFunc.asm")
void FaultDrawer_VPrintf(char* str, char* args) { //va_list
_Printf((printf_func)FaultDrawer_FormatStringFunc, sFaultDrawContext, str, args);
}
#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_Printf.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_Printf.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/fault_drawer/FaultDrawer_DrawText.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/boot/fault_drawer/FaultDrawer_DrawText.asm")
void FaultDrawer_SetDrawerFB(void* fb, u16 w, u16 h) {
sFaultDrawContext->fb = (u16*)fb;
src/code/code_0x800AF710.c
+2 -2
View File
@@ -214,7 +214,7 @@ void Effect_DrawAll(GraphicsContext* gCtxt) {
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_DrawAll.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/code_0x800AF710/Effect_DrawAll.asm")
#endif
#ifdef NON_MATCHING
@@ -255,7 +255,7 @@ void Effect_UpdateAll(GlobalContext* ctxt) {
}
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/code_0x800AF710/Effect_UpdateAll.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_FindFreeSpace.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/EffectSS_LoadParticle.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_effect_soft_sprite/func_800B096C.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_MemSet.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_StepTowardsCheck_f.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF0D0.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF0D0.asm")
#endif
#ifdef NON_MATCHING
@@ -176,7 +176,7 @@ void func_800FF138() {
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF138.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF138.asm")
#endif
#ifdef NON_MATCHING
@@ -184,7 +184,7 @@ void func_800FF1FC(void) {
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF1FC.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF1FC.asm")
#endif
#ifdef NON_MATCHING
@@ -192,7 +192,7 @@ void func_800FF2A8(void) {
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2A8.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF2A8.asm")
#endif
#ifdef NON_MATCHING
@@ -201,7 +201,7 @@ void func_800FF2F8(void) {
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF2F8.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lib/func_800FF2F8.asm")
#endif
#ifdef NON_MATCHING
@@ -209,7 +209,7 @@ void func_800FF3A0(void) {
}
#else
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/func_800FF3A0.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Math_Vec3f_PushAwayXZ.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Math_SmoothScaleMaxMinS.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_lib/Lib_LerpRGB.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_UploadLights.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/Lights_UploadLights.asm")
#endif
Light* Lights_MapperGetNextFreeSlot(LightMapper* mapper) {
@@ -126,7 +126,7 @@ void Lights_MapPositionalWithReference(LightMapper* mapper, LightInfoPositionalP
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositionalWithReference.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/Lights_MapPositional.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/func_80102880.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_lights/func_80102880.asm")
#endif
// XXX regalloc
@@ -440,5 +440,5 @@ void func_80102A64(GlobalContext* ctxt) {
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/z_lights/func_80102A64.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("asm/non_matchings/z_prenmi/PreNMI_Draw.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("asm/non_matchings/z_rcp/func_8012CF0C.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_DrawType2Mesh.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/Room_DrawType2Mesh.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012DEE8.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/func_8012DEE8.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012E254.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_room/func_8012E254.asm")
#pragma GLOBAL_ASM("asm/non_matchings/z_room/func_8012E32C.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_AllocateAndLoad.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("asm/non_matchings/z_room/Room_StartRoomTransition.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawFlashingTexture.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType3Texture.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawType3Texture.asm")
#endif
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_Interpolate.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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;
}
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawType4Texture.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/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
#pragma GLOBAL_ASM("./asm/non_matchings/z_scene_proc/SceneProc_DrawSceneConfig3.asm")
#pragma GLOBAL_ASM("./asm/non_matchings/code/z_scene_proc/SceneProc_DrawSceneConfig3.asm")
#endif
void SceneProc_DrawSceneConfig4(GlobalContext* ctxt) {

Some files were not shown because too many files have changed in this diff Show More