diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | courses/courseTable.c | 40 | ||||
| -rw-r--r-- | courses/courseTable.h | 2 | ||||
| -rw-r--r-- | include/macros.h | 2 | ||||
| -rw-r--r-- | src/code_80005FD0.c | 1 | ||||
| -rw-r--r-- | src/crash_screen.c | 1 | ||||
| -rw-r--r-- | src/os/__osDevMgrMain.c | 2 | ||||
| -rwxr-xr-x | src/os/guMtxCatL.c | 3 | ||||
| -rw-r--r-- | src/os/is_debug.c | 13 | ||||
| -rw-r--r-- | src/os/osPfsAllocateFile.c | 2 | ||||
| -rw-r--r-- | src/os/osPfsDeleteFile.c | 2 | ||||
| -rwxr-xr-x | src/os/osPfsFreeBlocks.c | 3 | ||||
| -rw-r--r-- | src/os/osPfsInit.c | 2 | ||||
| -rw-r--r-- | src/os/osPfsReadWriteFile.c | 2 | ||||
| -rw-r--r-- | src/os/osSyncPrintf.c | 5 | ||||
| -rw-r--r-- | src/racing/memory.c | 4 | ||||
| m--------- | tools/torch | 0 |
17 files changed, 46 insertions, 40 deletions
@@ -336,7 +336,7 @@ CFLAGS = -G 0 $(OPT_FLAGS) $(TARGET_CFLAGS) $(MIPSISET) $(DEF_INC_CFLAGS) ifeq ($(COMPILER),gcc) CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra else - CFLAGS += $(HIDE_WARNINGS) -non_shared -Wab,-r4300_mul -Xcpluscomm -Xfullwarn -signed -32 + CFLAGS += $(HIDE_WARNINGS) -non_shared -Wab,-r4300_mul -Xcpluscomm -fullwarn -signed -32 endif ASFLAGS = -march=vr4300 -mabi=32 -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS) $(foreach d,$(DEFINES),--defsym $(d)) diff --git a/courses/courseTable.c b/courses/courseTable.c index df7361797..b4b59a453 100644 --- a/courses/courseTable.c +++ b/courses/courseTable.c @@ -10,140 +10,140 @@ struct CourseTable gCourseTable[] = {{ _mario_raceway_vertexSegmentRomStart, _mario_raceway_vertexSegmentRomEnd, _course_mario_raceway_offsetsSegmentRomStart, _course_mario_raceway_offsetsSegmentRomEnd, d_course_mario_raceway_vertex, d_course_mario_raceway_vertex_count, - d_course_mario_raceway_packed, (Gfx*) d_course_mario_raceway_packed_end, + d_course_mario_raceway_packed, d_course_mario_raceway_packed_end, mario_raceway_textures, 0, 0x0000, }, { _course_choco_mountain_dl_mio0SegmentRomStart, _course_choco_mountain_dl_mio0SegmentRomEnd, _choco_mountain_vertexSegmentRomStart, _choco_mountain_vertexSegmentRomEnd, _course_choco_mountain_offsetsSegmentRomStart, _course_choco_mountain_offsetsSegmentRomEnd, d_course_choco_mountain_vertex, d_course_choco_mountain_vertex_count, - d_course_choco_mountain_packed, (Gfx*) d_course_choco_mountain_packed_end, + d_course_choco_mountain_packed, d_course_choco_mountain_packed_end, choco_mountain_textures, 1, 0x0000, }, { _course_bowsers_castle_dl_mio0SegmentRomStart, _course_bowsers_castle_dl_mio0SegmentRomEnd, _bowsers_castle_vertexSegmentRomStart, _bowsers_castle_vertexSegmentRomEnd, _course_bowsers_castle_offsetsSegmentRomStart, _course_bowsers_castle_offsetsSegmentRomEnd, d_course_bowsers_castle_vertex, d_course_bowsers_castle_vertex_count, - d_course_bowsers_castle_packed, (Gfx*) d_course_bowsers_castle_packed_end, + d_course_bowsers_castle_packed, d_course_bowsers_castle_packed_end, bowsers_castle_textures, 0, 0x0000, }, { _course_banshee_boardwalk_dl_mio0SegmentRomStart, _course_banshee_boardwalk_dl_mio0SegmentRomEnd, _banshee_boardwalk_vertexSegmentRomStart, _banshee_boardwalk_vertexSegmentRomEnd, _course_banshee_boardwalk_offsetsSegmentRomStart, _course_banshee_boardwalk_offsetsSegmentRomEnd, d_course_banshee_boardwalk_vertex, d_course_banshee_boardwalk_vertex_count, - d_course_banshee_boardwalk_packed, (Gfx*) d_course_banshee_boardwalk_packed_end, + d_course_banshee_boardwalk_packed, d_course_banshee_boardwalk_packed_end, banshee_boardwalk_textures, 1, 0x0000, }, { _course_yoshi_valley_dl_mio0SegmentRomStart, _course_yoshi_valley_dl_mio0SegmentRomEnd, _yoshi_valley_vertexSegmentRomStart, _yoshi_valley_vertexSegmentRomEnd, _course_yoshi_valley_offsetsSegmentRomStart, _course_yoshi_valley_offsetsSegmentRomEnd, d_course_yoshi_valley_vertex, d_course_yoshi_valley_vertex_count, - d_course_yoshi_valley_packed, (Gfx*) d_course_yoshi_valley_packed_end, + d_course_yoshi_valley_packed, d_course_yoshi_valley_packed_end, yoshi_valley_textures, 0, 0x0000, }, { _course_frappe_snowland_dl_mio0SegmentRomStart, _course_frappe_snowland_dl_mio0SegmentRomEnd, _frappe_snowland_vertexSegmentRomStart, _frappe_snowland_vertexSegmentRomEnd, _course_frappe_snowland_offsetsSegmentRomStart, _course_frappe_snowland_offsetsSegmentRomEnd, d_course_frappe_snowland_vertex, d_course_frappe_snowland_vertex_count, - d_course_frappe_snowland_packed, (Gfx*) d_course_frappe_snowland_packed_end, + d_course_frappe_snowland_packed, d_course_frappe_snowland_packed_end, frappe_snowland_textures, 0, 0x0000, }, { _course_koopa_troopa_beach_dl_mio0SegmentRomStart, _course_koopa_troopa_beach_dl_mio0SegmentRomEnd, _koopa_troopa_beach_vertexSegmentRomStart, _koopa_troopa_beach_vertexSegmentRomEnd, _course_koopa_troopa_beach_offsetsSegmentRomStart, _course_koopa_troopa_beach_offsetsSegmentRomEnd, d_course_koopa_troopa_beach_vertex, d_course_koopa_troopa_beach_vertex_count, - d_course_koopa_troopa_beach_packed, (Gfx*) d_course_koopa_troopa_beach_packed_end, + d_course_koopa_troopa_beach_packed, d_course_koopa_troopa_beach_packed_end, koopa_troopa_beach_textures, 0, 0x0000, }, { _course_royal_raceway_dl_mio0SegmentRomStart, _course_royal_raceway_dl_mio0SegmentRomEnd, _royal_raceway_vertexSegmentRomStart, _royal_raceway_vertexSegmentRomEnd, _course_royal_raceway_offsetsSegmentRomStart, _course_royal_raceway_offsetsSegmentRomEnd, d_course_royal_raceway_vertex, d_course_royal_raceway_vertex_count, - d_course_royal_raceway_packed, (Gfx*) d_course_royal_raceway_packed_end, + d_course_royal_raceway_packed, d_course_royal_raceway_packed_end, royal_raceway_textures, 0, 0x0000, }, { _course_luigi_raceway_dl_mio0SegmentRomStart, _course_luigi_raceway_dl_mio0SegmentRomEnd, _luigi_raceway_vertexSegmentRomStart, _luigi_raceway_vertexSegmentRomEnd, _course_luigi_raceway_offsetsSegmentRomStart, _course_luigi_raceway_offsetsSegmentRomEnd, d_course_luigi_raceway_vertex, d_course_luigi_raceway_vertex_count, - d_course_luigi_raceway_packed, (Gfx*) d_course_luigi_raceway_packed_end, + d_course_luigi_raceway_packed, d_course_luigi_raceway_packed_end, luigi_raceway_textures, 0, 0x0000, }, { _course_moo_moo_farm_dl_mio0SegmentRomStart, _course_moo_moo_farm_dl_mio0SegmentRomEnd, _moo_moo_farm_vertexSegmentRomStart, _moo_moo_farm_vertexSegmentRomEnd, _course_moo_moo_farm_offsetsSegmentRomStart, _course_moo_moo_farm_offsetsSegmentRomEnd, d_course_moo_moo_farm_vertex, d_course_moo_moo_farm_vertex_count, - d_course_moo_moo_farm_packed, (Gfx*) d_course_moo_moo_farm_packed_end, + d_course_moo_moo_farm_packed, d_course_moo_moo_farm_packed_end, moo_moo_farm_textures, 0, 0x0000, }, { _course_toads_turnpike_dl_mio0SegmentRomStart, _course_toads_turnpike_dl_mio0SegmentRomEnd, _toads_turnpike_vertexSegmentRomStart, _toads_turnpike_vertexSegmentRomEnd, _course_toads_turnpike_offsetsSegmentRomStart, _course_toads_turnpike_offsetsSegmentRomEnd, d_course_toads_turnpike_vertex, d_course_toads_turnpike_vertex_count, - d_course_toads_turnpike_packed, (Gfx*) d_course_toads_turnpike_packed_end, + d_course_toads_turnpike_packed, d_course_toads_turnpike_packed_end, toads_turnpike_textures, 0, 0x0000, }, { _course_kalimari_desert_dl_mio0SegmentRomStart, _course_kalimari_desert_dl_mio0SegmentRomEnd, _kalimari_desert_vertexSegmentRomStart, _kalimari_desert_vertexSegmentRomEnd, _course_kalimari_desert_offsetsSegmentRomStart, _course_kalimari_desert_offsetsSegmentRomEnd, d_course_kalimari_desert_vertex, d_course_kalimari_desert_vertex_count, - d_course_kalimari_desert_packed, (Gfx*) d_course_kalimari_desert_packed_end, + d_course_kalimari_desert_packed, d_course_kalimari_desert_packed_end, kalimari_desert_textures, 0, 0x0000, }, { _course_sherbet_land_dl_mio0SegmentRomStart, _course_sherbet_land_dl_mio0SegmentRomEnd, _sherbet_land_vertexSegmentRomStart, _sherbet_land_vertexSegmentRomEnd, _course_sherbet_land_offsetsSegmentRomStart, _course_sherbet_land_offsetsSegmentRomEnd, d_course_sherbet_land_vertex, d_course_sherbet_land_vertex_count, - d_course_sherbet_land_packed, (Gfx*) d_course_sherbet_land_packed_end, + d_course_sherbet_land_packed, d_course_sherbet_land_packed_end, sherbet_land_textures, 0, 0x0000, }, { _course_rainbow_road_dl_mio0SegmentRomStart, _course_rainbow_road_dl_mio0SegmentRomEnd, _rainbow_road_vertexSegmentRomStart, _rainbow_road_vertexSegmentRomEnd, _course_rainbow_road_offsetsSegmentRomStart, _course_rainbow_road_offsetsSegmentRomEnd, d_course_rainbow_road_vertex, d_course_rainbow_road_vertex_count, - d_course_rainbow_road_packed, (Gfx*) d_course_rainbow_road_packed_end, + d_course_rainbow_road_packed, d_course_rainbow_road_packed_end, rainbow_road_textures, 0, 0x0000, }, { _course_wario_stadium_dl_mio0SegmentRomStart, _course_wario_stadium_dl_mio0SegmentRomEnd, _wario_stadium_vertexSegmentRomStart, _wario_stadium_vertexSegmentRomEnd, _course_wario_stadium_offsetsSegmentRomStart, _course_wario_stadium_offsetsSegmentRomEnd, d_course_wario_stadium_vertex, d_course_wario_stadium_vertex_count, - d_course_wario_stadium_packed, (Gfx*) d_course_wario_stadium_packed_end, + d_course_wario_stadium_packed, d_course_wario_stadium_packed_end, wario_stadium_textures, 0, 0x0000, }, { _course_block_fort_dl_mio0SegmentRomStart, _course_block_fort_dl_mio0SegmentRomEnd, _block_fort_vertexSegmentRomStart, _block_fort_vertexSegmentRomEnd, _course_block_fort_offsetsSegmentRomStart, _course_block_fort_offsetsSegmentRomEnd, d_course_block_fort_vertex, d_course_block_fort_vertex_count, - d_course_block_fort_packed, (Gfx*) d_course_block_fort_packed_end, + d_course_block_fort_packed, d_course_block_fort_packed_end, block_fort_textures, 0, 0x0000, }, { _course_skyscraper_dl_mio0SegmentRomStart, _course_skyscraper_dl_mio0SegmentRomEnd, _skyscraper_vertexSegmentRomStart, _skyscraper_vertexSegmentRomEnd, _course_skyscraper_offsetsSegmentRomStart, _course_skyscraper_offsetsSegmentRomEnd, d_course_skyscraper_vertex, d_course_skyscraper_vertex_count, - d_course_skyscraper_packed, (Gfx*) d_course_skyscraper_packed_end, + d_course_skyscraper_packed, d_course_skyscraper_packed_end, skyscraper_textures, 0, 0x0000, }, { _course_double_deck_dl_mio0SegmentRomStart, _course_double_deck_dl_mio0SegmentRomEnd, _double_deck_vertexSegmentRomStart, _double_deck_vertexSegmentRomEnd, _course_double_deck_offsetsSegmentRomStart, _course_double_deck_offsetsSegmentRomEnd, d_course_double_deck_vertex, d_course_double_deck_vertex_count, - d_course_double_deck_packed, (Gfx*) d_course_double_deck_packed_end, + d_course_double_deck_packed, d_course_double_deck_packed_end, double_deck_textures, 0, 0x0000, }, { _course_dks_jungle_parkway_dl_mio0SegmentRomStart, _course_dks_jungle_parkway_dl_mio0SegmentRomEnd, _dks_jungle_parkway_vertexSegmentRomStart, _dks_jungle_parkway_vertexSegmentRomEnd, _course_dks_jungle_parkway_offsetsSegmentRomStart, _course_dks_jungle_parkway_offsetsSegmentRomEnd, d_course_dks_jungle_parkway_vertex, d_course_dks_jungle_parkway_vertex_count, - d_course_dks_jungle_parkway_packed, (Gfx*) d_course_dks_jungle_parkway_packed_end, + d_course_dks_jungle_parkway_packed, d_course_dks_jungle_parkway_packed_end, dks_jungle_parkway_textures, 0, 0x0000, }, { _course_big_donut_dl_mio0SegmentRomStart, _course_big_donut_dl_mio0SegmentRomEnd, _big_donut_vertexSegmentRomStart, _big_donut_vertexSegmentRomEnd, _course_big_donut_offsetsSegmentRomStart, _course_big_donut_offsetsSegmentRomEnd, d_course_big_donut_vertex, d_course_big_donut_vertex_count, - d_course_big_donut_packed, (Gfx*) d_course_big_donut_packed_end, + d_course_big_donut_packed, d_course_big_donut_packed_end, big_donut_textures, 0, 0x0000, }}; diff --git a/courses/courseTable.h b/courses/courseTable.h index 6fe2011a2..a1fded475 100644 --- a/courses/courseTable.h +++ b/courses/courseTable.h @@ -16,7 +16,7 @@ struct CourseTable { CourseVtx *vertexStart; // 0x18 segmented address of vertex data u32 vertexCount; // 0x1C number of vertices in vertex data u8 *packedStart; // 0x20 packed display list start address - Gfx *finalDisplaylistOffset; // 0x24 + u8 *finalDisplaylistOffset; // 0x24 u32 *textures; // 0x20 segmented address of textures table u16 unknown1; // 0x2C u16 padding; // 0x2E diff --git a/include/macros.h b/include/macros.h index 853b79f7e..9e15613f4 100644 --- a/include/macros.h +++ b/include/macros.h @@ -87,6 +87,6 @@ * - sizeof(dl[0]) : walk back 1 Gfx macro * - 0x07000000 : get just the offset **/ -#define GET_PACKED_END(dl) (((u8*) dl) + sizeof(dl) - sizeof(dl[0]) - 0x07000000) +#define GET_PACKED_END(dl) (((u8 *) dl) + sizeof(dl) - sizeof(dl[0]) - 0x07000000) #endif diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index c2c4c4fe4..dbc19c94e 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -5942,6 +5942,7 @@ void func_80016C3C(UNUSED s32 playerId, UNUSED f32 arg1, s32 cameraId) { camera->pos[2] = D_80164638[cameraId]; } +void func_80017054(Camera *camera, UNUSED Player *player, UNUSED s32 index, s32 cameraId); #ifdef NON_MATCHING // https://decomp.me/scratch/Ck7hV // Really crazy diff, permuter only able to find fakematches for improvements (and they're big improvements) diff --git a/src/crash_screen.c b/src/crash_screen.c index 54f77037a..2753cc3ad 100644 --- a/src/crash_screen.c +++ b/src/crash_screen.c @@ -56,6 +56,7 @@ void crash_screen_draw_glyph(u16 *framebuffer, s32 x, s32 y, s32 glyph) { } } +void crash_screen_draw_square(u16 *framebuffer); // Functionally Equivallent. #ifdef NON_MATCHING diff --git a/src/os/__osDevMgrMain.c b/src/os/__osDevMgrMain.c index 06fe91e3b..62f2c6ffd 100644 --- a/src/os/__osDevMgrMain.c +++ b/src/os/__osDevMgrMain.c @@ -5,6 +5,8 @@ #include "new_func.h" +void osYieldThread(void); + void __osDevMgrMain(void *args) { OSIoMesg *mb; OSMesg em; diff --git a/src/os/guMtxCatL.c b/src/os/guMtxCatL.c index 7903b18b1..82fd4c597 100755 --- a/src/os/guMtxCatL.c +++ b/src/os/guMtxCatL.c @@ -34,6 +34,7 @@ #include <PR/gu.h> void guMtxXFMF(Mtx *, float, float, float, float *, float *, float *); +void guMtxCatF(float mf[4][4], float nf[4][4], float res[4][4]); void guMtxCatL(Mtx *m, Mtx *n, Mtx *res) { float mf[4][4], nf[4][4], resf[4][4]; @@ -51,5 +52,5 @@ void guMtxXFML(Mtx *m, float x, float y, float z, float *ox, float *oy, float *o guMtxL2F(mf, m); - guMtxXFMF(mf, x, y, z, ox, oy, oz); + guMtxXFMF((Mtx *)mf, x, y, z, ox, oy, oz); } diff --git a/src/os/is_debug.c b/src/os/is_debug.c index 0e4fcddda..1663a6c28 100644 --- a/src/os/is_debug.c +++ b/src/os/is_debug.c @@ -5,6 +5,7 @@ #include <PR/os.h> #include "hardware.h" + // Note: This file was very quickly strewn together from oot. // Not great but it works. @@ -23,6 +24,8 @@ typedef struct { #define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0))) void* is_proutSyncPrintf(void* arg, const char* str, u32 count); +s32 __osEPiRawWriteIo(OSPiHandle *a0, u32 a1, u32 a2); +void __osPiRelAccess(void); s32 __osEPiRawReadIo(OSPiHandle *arg0, u32 devAddr, u32 *data) { register s32 stat; @@ -65,7 +68,7 @@ void osSyncPrintfUnused(const char* fmt, ...) { va_list args; va_start(args, fmt); - _Printf(is_proutSyncPrintf, NULL, fmt, args); + _Printf((char *(*)(char *, const char *, size_t))is_proutSyncPrintf, NULL, fmt, args); va_end(args); } @@ -74,7 +77,7 @@ void osSyncPrintf(const char* fmt, ...) { va_list args; va_start(args, fmt); - _Printf(is_proutSyncPrintf, NULL, fmt, args); + _Printf((char *(*)(char *, const char *, size_t))is_proutSyncPrintf, NULL, fmt, args); va_end(args); } @@ -83,7 +86,7 @@ void print(const char* fmt, ...) { va_list args; va_start(args, fmt); - _Printf(is_proutSyncPrintf, NULL, fmt, args); + _Printf((char *(*)(char *, const char *, size_t))is_proutSyncPrintf, NULL, fmt, args); va_end(args); } @@ -93,12 +96,12 @@ void rmonPrintf(const char* fmt, ...) { va_list args; va_start(args, fmt); - _Printf(is_proutSyncPrintf, NULL, fmt, args); + _Printf((char *(*)(char *, const char *, size_t))is_proutSyncPrintf, NULL, fmt, args); va_end(args); } -void* is_proutSyncPrintf(void* arg, const char* str, u32 count) { +void* is_proutSyncPrintf(UNUSED void* arg, const char* str, u32 count) { u32 data; s32 pos; s32 start; diff --git a/src/os/osPfsAllocateFile.c b/src/os/osPfsAllocateFile.c index 874cfecd3..655c57cd0 100644 --- a/src/os/osPfsAllocateFile.c +++ b/src/os/osPfsAllocateFile.c @@ -178,4 +178,4 @@ static s32 __osClearPage(OSPfs *pfs, int page_no, u8 *data, u8 bank) pfs->activebank = 0; ret = __osPfsSelectBank(pfs); return ret; -}
\ No newline at end of file +} diff --git a/src/os/osPfsDeleteFile.c b/src/os/osPfsDeleteFile.c index c0e628ad0..7ea124f8b 100644 --- a/src/os/osPfsDeleteFile.c +++ b/src/os/osPfsDeleteFile.c @@ -129,4 +129,4 @@ s32 __osBlockSum(OSPfs *pfs, u8 page_no, u16 *sum, u8 bank) pfs->activebank = 0; ret = __osPfsSelectBank(pfs); return ret; -}
\ No newline at end of file +} diff --git a/src/os/osPfsFreeBlocks.c b/src/os/osPfsFreeBlocks.c index f63c7b745..1ee3c026e 100755 --- a/src/os/osPfsFreeBlocks.c +++ b/src/os/osPfsFreeBlocks.c @@ -29,6 +29,3 @@ s32 osPfsFreeBlocks(OSPfs *pfs, s32 *bytes_not_used) *bytes_not_used = pages * PFS_ONE_PAGE * BLOCKSIZE; return 0; } - -/* -*/
\ No newline at end of file diff --git a/src/os/osPfsInit.c b/src/os/osPfsInit.c index 9a91ba456..e5449af06 100644 --- a/src/os/osPfsInit.c +++ b/src/os/osPfsInit.c @@ -37,7 +37,7 @@ s32 __osPfsGetStatus(OSMesgQueue *queue, int channel) osRecvMesg(queue, &dummy, OS_MESG_BLOCK); ret = __osSiRawStartDma(OS_READ, &__osPfsPifRam); osRecvMesg(queue, &dummy, OS_MESG_BLOCK); - __osPfsGetInitData(&pattern, &data); + __osPfsGetInitData(&pattern, &data[0]); if (((data[channel].status & CONT_CARD_ON) != 0) && ((data[channel].status & CONT_CARD_PULL) != 0)) return PFS_ERR_NEW_PACK; diff --git a/src/os/osPfsReadWriteFile.c b/src/os/osPfsReadWriteFile.c index 697a726f4..b972147a2 100644 --- a/src/os/osPfsReadWriteFile.c +++ b/src/os/osPfsReadWriteFile.c @@ -98,4 +98,4 @@ s32 osPfsReadWriteFile(OSPfs *pfs, s32 file_no, u8 flag, int offset, int size_in } return 0; -}
\ No newline at end of file +} diff --git a/src/os/osSyncPrintf.c b/src/os/osSyncPrintf.c index 26bfc999d..34ac89c2f 100644 --- a/src/os/osSyncPrintf.c +++ b/src/os/osSyncPrintf.c @@ -1,12 +1,13 @@ #include "libultra_internal.h" #include "libc/stdarg.h" +#include "printf.h" // These funcs defined in is_debug.c #ifndef DEBUG -char *osSyncPrintf(char *arg0, const char *arg1, size_t size) { +char *osSyncPrintf(UNUSED char *arg0, UNUSED const char *arg1, UNUSED size_t size) { // ifdef'd formatting code? - return (1); + return (char *) (1); } void rmonPrintf(const char *fmt, ...) { diff --git a/src/racing/memory.c b/src/racing/memory.c index 78cdd7589..c2f24012f 100644 --- a/src/racing/memory.c +++ b/src/racing/memory.c @@ -1335,7 +1335,7 @@ u8 *load_course(s32 courseId) { CourseVtx *vertexStart; // mio0 compressed u8 *packedStart; u32 vertexCount; - u8* finalDisplaylistOffset; + u8 *finalDisplaylistOffset; u32 unknown1; s32 prevLoadedAddress_saved; u8 *offsetRomStart; @@ -1371,7 +1371,7 @@ u8 *load_course(s32 courseId) { set_segment_base_addr(0xF, (void *) vtxCompressed); decompress_vtx(vertexStart, vertexCount); - displaylist_unpack((uintptr_t *) packedStart, (uintptr_t) finalDisplaylistOffset, unknown1); + displaylist_unpack((uintptr_t *) packedStart, finalDisplaylistOffset, unknown1); decompress_textures(textures); gNextFreeMemoryAddress = prevLoadedAddress_saved; return vtxCompressed; diff --git a/tools/torch b/tools/torch -Subproject c82b4a8423eb41202dc61378aa50f0052140c13 +Subproject f6b786106b9936bdb075130cd98fd860ce6a631 |