gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename `__dma_load_loop` to `nuGfxRetraceWait`

This commit is contained in:
gijs 2023-10-20 12:14:16 +02:00
parent 0d4532eda3
commit 901ff5dc63
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linker_scripts/symbols/addr.txt
View File

@ -16,6 +16,7 @@ nuScGetGfxMQ = 0x80088EFC;
nuScAddClient = 0x80089054; nuScAddClient = 0x80089054;
nuScRemoveClient = 0x80089124; nuScRemoveClient = 0x80089124;
nuScSetFrameBufferNum = 0x80089528; nuScSetFrameBufferNum = 0x80089528;
nuGfxRetraceWait = 0x80089A30;
obCurrentTime = 0x800C47D0; obCurrentTime = 0x800C47D0;
obSetCurrentTime = 0x8009C7C0; // rom:0x2CBC0 obSetCurrentTime = 0x8009C7C0; // rom:0x2CBC0
@ -861,9 +862,6 @@ __start_thread_800B9C88 = 0x80089660;
magnitude = 0x8009C780; magnitude = 0x8009C780;
__dma_load_loop = 0x80089A30;
__MUS_MEM_800B18A4 = 0x800B18A4; // size:0x58 __MUS_MEM_800B18A4 = 0x800B18A4; // size:0x58
__MUS_MEM_800B186C = 0x800B186C; __MUS_MEM_800B186C = 0x800B186C;
__MUS_MEM_800B1870 = 0x800B1870; __MUS_MEM_800B1870 = 0x800B1870;

2
splat.yaml
View File

@ -115,7 +115,7 @@ segments:
- [0x19050, c, "_ob_past_brick"] - [0x19050, c, "_ob_past_brick"]
- [0x19DD0, c, "_ob_questionable_glass"] - [0x19DD0, c, "_ob_questionable_glass"]
- [0x19E10, asm] - [0x19E10, asm]
- [0x19E30, c, "_ob_yielding_ice"] - [0x19E30, c, "nu/nugfxretracewait"]
- [0x19EB0, asm] - [0x19EB0, asm]
- [0x19FC0, c, "black"] - [0x19FC0, c, "black"]
- [0x1A050, c, "_ob_icy_coast"] - [0x1A050, c, "_ob_icy_coast"]

1
src/main.c
View File

@ -17,7 +17,6 @@ typedef struct {
void __calls_copy_controller_data(); /* extern */ void __calls_copy_controller_data(); /* extern */
void __calls_loads_overlay_array(); /* extern */ void __calls_loads_overlay_array(); /* extern */
void __calls_osViSwapBuffer_8007307C(void**); /* extern */ void __calls_osViSwapBuffer_8007307C(void**); /* extern */
void __dma_load_loop(s32); /* extern */
void __initialize_song_mem(); /* extern */ void __initialize_song_mem(); /* extern */
void __set_fp_8008A660(void(*)(u16)); /* extern */ void __set_fp_8008A660(void(*)(u16)); /* extern */
void __set_obPtrPtrDisplayList(Gfx**); /* extern */ void __set_obPtrPtrDisplayList(Gfx**); /* extern */

10
src/_ob_yielding_ice.c → src/nu/nugfxretracewait.c
View File

@ -3,16 +3,16 @@
#include "nu/nusys.h" #include "nu/nusys.h"
/* 19E30 80089A30 */ /* 19E30 80089A30 */
void __dma_load_loop(s32 count) { void nuGfxRetraceWait(u32 retraceNum) {
NUScClient sp10; NUScClient client;
OSMesgQueue mq; OSMesgQueue mq;
OSMesg buf; OSMesg buf;
osCreateMesgQueue(&mq, &buf, 1); osCreateMesgQueue(&mq, &buf, 1);
nuScAddClient(&sp10, &mq, 1); nuScAddClient(&client, &mq, 1);
for(; count != 0; count--) for(; retraceNum > 0; retraceNum--)
osRecvMesg(&mq, NULL, OS_MESG_BLOCK); osRecvMesg(&mq, NULL, OS_MESG_BLOCK);
nuScRemoveClient(&sp10); nuScRemoveClient(&client);
} }