falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix a lot of warning in code (#598) 

* Fix warnings
* Fix building
This commit is contained in:
coco875 2024-04-16 18:00:08 +02:00 committed by GitHub
parent d9c1ebb626
commit 9ac20c80b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
58 changed files with 893 additions and 901 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -607,7 +607,7 @@ $(BUILD_DIR)/%.o: %.c
$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c
$(call print,Compiling:,$<,$@)
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(BUILD_DIR)/%.o: %.s $(MIO0_FILES) $(RAW_TEXTURE_FILES)

1
courses/banshee_boardwalk/course_offsets.c
View File

@ -2,6 +2,7 @@
#include "PR/gbi.h"
#include "course_offsets.h"
#include "courses/banshee_boardwalk/course_data.h"
#include <PR/gbi.h>
extern u8 gTexture6447C4[];
extern u8 gTexture676FB0[];

2
courses/big_donut/course_displaylists.inc.c
View File

@ -614,4 +614,4 @@ Gfx d_course_big_donut_packed_dl_1070[] =
{
gsSPDisplayList(d_course_big_donut_packed_dl_1040),
gsSPEndDisplayList(),
};
};

2
courses/bowsers_castle/course_offsets.c
View File

@ -63,7 +63,7 @@ const course_texture bowsers_castle_textures[] = {
{0x00000000, 0x0000, 0x0000, 0x0},
};
const u8 *bowsers_castle_dls[] = {
const Gfx *bowsers_castle_dls[] = {
d_course_bowsers_castle_dl_0,
d_course_bowsers_castle_dl_230,
d_course_bowsers_castle_dl_110,

40
courses/courseTable.c
View File

@ -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, d_course_mario_raceway_packed_end,
d_course_mario_raceway_packed, (Gfx*) 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, d_course_choco_mountain_packed_end,
d_course_choco_mountain_packed, (Gfx*) 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, d_course_bowsers_castle_packed_end,
d_course_bowsers_castle_packed, (Gfx*) 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, d_course_banshee_boardwalk_packed_end,
d_course_banshee_boardwalk_packed, (Gfx*) 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, d_course_yoshi_valley_packed_end,
d_course_yoshi_valley_packed, (Gfx*) 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, d_course_frappe_snowland_packed_end,
d_course_frappe_snowland_packed, (Gfx*) 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, d_course_koopa_troopa_beach_packed_end,
d_course_koopa_troopa_beach_packed, (Gfx*) 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, d_course_royal_raceway_packed_end,
d_course_royal_raceway_packed, (Gfx*) 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, d_course_luigi_raceway_packed_end,
d_course_luigi_raceway_packed, (Gfx*) 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, d_course_moo_moo_farm_packed_end,
d_course_moo_moo_farm_packed, (Gfx*) 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, d_course_toads_turnpike_packed_end,
d_course_toads_turnpike_packed, (Gfx*) 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, d_course_kalimari_desert_packed_end,
d_course_kalimari_desert_packed, (Gfx*) 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, d_course_sherbet_land_packed_end,
d_course_sherbet_land_packed, (Gfx*) 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, d_course_rainbow_road_packed_end,
d_course_rainbow_road_packed, (Gfx*) 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, d_course_wario_stadium_packed_end,
d_course_wario_stadium_packed, (Gfx*) 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, d_course_block_fort_packed_end,
d_course_block_fort_packed, (Gfx*) 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, d_course_skyscraper_packed_end,
d_course_skyscraper_packed, (Gfx*) 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, d_course_double_deck_packed_end,
d_course_double_deck_packed, (Gfx*) 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, d_course_dks_jungle_parkway_packed_end,
d_course_dks_jungle_parkway_packed, (Gfx*) 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, d_course_big_donut_packed_end,
d_course_big_donut_packed, (Gfx*) d_course_big_donut_packed_end,
big_donut_textures, 0, 0x0000,
}};

2
courses/courseTable.h
View File

@ -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
uintptr_t finalDisplaylistOffset; // 0x24
Gfx *finalDisplaylistOffset; // 0x24
u32 *textures; // 0x20 segmented address of textures table
u16 unknown1; // 0x2C
u16 padding; // 0x2E

2
courses/kalimari_desert/course_offsets.c
View File

@ -57,7 +57,7 @@ const course_texture kalimari_desert_textures[] = {
{0x00000000, 0x0000, 0x0000, 0x0},
};
const u8 *kalimari_desert_dls[] = {
const Gfx *kalimari_desert_dls[] = {
d_course_kalimari_desert_dl_0,
d_course_kalimari_desert_dl_258,
d_course_kalimari_desert_dl_100,

14
courses/koopa_troopa_beach/course_data.c
View File

@ -8557,7 +8557,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_koopa_troopa_beach_dl_16630,
(u32) d_course_koopa_troopa_beach_dl_16630,
0x00000000,
0x00000000,
0x00000000,
@ -8579,7 +8579,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_koopa_troopa_beach_dl_16850,
(u32) d_course_koopa_troopa_beach_dl_16850,
0x00000000,
0x00000000,
0x00000000,
@ -8590,7 +8590,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_koopa_troopa_beach_dl_168F0,
(u32) d_course_koopa_troopa_beach_dl_168F0,
0x00000024,
0x00000000,
0x00000000,
@ -8601,7 +8601,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_koopa_troopa_beach_dl_16990,
(u32) d_course_koopa_troopa_beach_dl_16990,
0x00000019,
0x00000000,
0x00000000,
@ -8629,7 +8629,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_koopa_troopa_beach_dl_16850,
(u32) d_course_koopa_troopa_beach_dl_16850,
0x00000000,
0x00000000,
0x00000000,
@ -8640,7 +8640,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_koopa_troopa_beach_dl_168F0,
(u32) d_course_koopa_troopa_beach_dl_168F0,
0x00000024,
0x00000000,
0x00000000,
@ -8651,7 +8651,7 @@ u32 d_course_koopa_troopa_beach_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_koopa_troopa_beach_dl_16990,
(u32) d_course_koopa_troopa_beach_dl_16990,
0x00000019,
0x00000000,
0x00000000,

2
courses/luigi_raceway/course_offsets.c
View File

@ -87,7 +87,7 @@ const course_texture luigi_raceway_textures[] = {
{0x00000000, 0x0000, 0x0000, 0x0},
};
const u8 *luigi_raceway_dls[] = {
const Gfx *luigi_raceway_dls[] = {
d_course_luigi_raceway_dl_0,
d_course_luigi_raceway_dl_328,
d_course_luigi_raceway_dl_1A8,

2
courses/mario_raceway/course_offsets.c
View File

@ -67,7 +67,7 @@ const course_texture mario_raceway_textures[] = {
{0x00000000, 0x0000, 0x0000, 0x0},
};
const u8 *mario_raceway_dls[] = {
const Gfx *mario_raceway_dls[] = {
d_course_mario_raceway_dl_0,
d_course_mario_raceway_dl_1D0,
d_course_mario_raceway_dl_E8,

2
courses/moo_moo_farm/course_offsets.c
View File

@ -63,7 +63,7 @@ const course_texture moo_moo_farm_textures[] = {
{0x00000000, 0x0000, 0x0000, 0x0},
};
const u8 *moo_moo_farm_dls[] = {
const Gfx *moo_moo_farm_dls[] = {
d_course_moo_moo_farm_dl_88,
d_course_moo_moo_farm_dl_598,
d_course_moo_moo_farm_dl_338,

10
courses/rainbow_road/course_data.c
View File

@ -3547,7 +3547,7 @@ u32 d_rainbow_road_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_rainbow_road_dl_15550,
(u32) d_course_rainbow_road_dl_15550,
0x00000000,
0x00000000,
0x00000000,
@ -3555,7 +3555,7 @@ u32 d_rainbow_road_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_rainbow_road_dl_151A8,
(u32) d_course_rainbow_road_dl_151A8,
0x00000000,
0x00000000,
0x00000000,
@ -3577,7 +3577,7 @@ u32 d_rainbow_road_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_rainbow_road_dl_15C68,
(u32) d_course_rainbow_road_dl_15C68,
0x00000000,
0x00000000,
0x00000000,
@ -3585,7 +3585,7 @@ u32 d_rainbow_road_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_rainbow_road_dl_158C0,
(u32) d_course_rainbow_road_dl_158C0,
0x00000000,
0x00000000,
0x00000000,
@ -3593,7 +3593,7 @@ u32 d_rainbow_road_unk4[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_rainbow_road_dl_15F18,
(u32) d_course_rainbow_road_dl_15F18,
0x00000000,
0x00000000,
0x00000000,

14
courses/yoshi_valley/course_data.c
View File

@ -10886,7 +10886,7 @@ u32 d_course_yoshi_valley_unk5[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_yoshi_valley_dl_142C0,
(u32) d_course_yoshi_valley_dl_142C0,
0x00000000,
0x00000000,
0x00000000,
@ -10908,7 +10908,7 @@ u32 d_course_yoshi_valley_unk5[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_yoshi_valley_dl_143C8,
(u32) d_course_yoshi_valley_dl_143C8,
0x00000000,
0x00000000,
0x00000000,
@ -10919,7 +10919,7 @@ u32 d_course_yoshi_valley_unk5[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_yoshi_valley_dl_144A8,
(u32) d_course_yoshi_valley_dl_144A8,
0x000001cc,
0x00000000,
0x00000000,
@ -10930,7 +10930,7 @@ u32 d_course_yoshi_valley_unk5[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_yoshi_valley_dl_14500,
(u32) d_course_yoshi_valley_dl_14500,
0x000001cc,
0x00000000,
0x00000000,
@ -10941,7 +10941,7 @@ u32 d_course_yoshi_valley_unk5[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_yoshi_valley_dl_14558,
(u32) d_course_yoshi_valley_dl_14558,
0x00000158,
0x00000000,
0x00000000,
@ -10952,7 +10952,7 @@ u32 d_course_yoshi_valley_unk5[] = {
0x00000000,
0x00000007,
0x00000000,
d_course_yoshi_valley_dl_145D0,
(u32) d_course_yoshi_valley_dl_145D0,
0x00000120,
0x00000000,
0x00000000,
@ -11439,7 +11439,7 @@ Gfx *d_course_yoshi_valley_dl_list[] = {
d_course_yoshi_valley_dl_40, d_course_yoshi_valley_dl_3F0,
d_course_yoshi_valley_dl_290, d_course_yoshi_valley_dl_4E8,
d_course_yoshi_valley_dl_7A0, d_course_yoshi_valley_dl_BC0,
d_course_yoshi_valley_dl_9C8, 0x06000CC0, // <- No idea what this is supposed to be a pointer to
d_course_yoshi_valley_dl_9C8, (Gfx *)0x06000CC0, // <- No idea what this is supposed to be a pointer to
d_course_yoshi_valley_dl_FA0, d_course_yoshi_valley_dl_13F8,
d_course_yoshi_valley_dl_1178, d_course_yoshi_valley_dl_14D0,
d_course_yoshi_valley_dl_17A8, d_course_yoshi_valley_dl_1C38,

1
include/PR/gu.h
View File

@ -3,6 +3,7 @@
#include <PR/mbi.h>
#include <PR/ultratypes.h>
#include "common_structs.h"
#define GU_PI 3.1415926
/* Functions */

4
include/defines.h
View File

@ -296,7 +296,7 @@
/**
* @brief Item IDs
*/
typedef enum ITEMS {
enum ITEMS {
/* 0x00 */ ITEM_NONE = 0,
/* 0x01 */ ITEM_BANANA,
/* 0x02 */ ITEM_BANANA_BUNCH,
@ -315,7 +315,7 @@ typedef enum ITEMS {
/* 0x0F */ ITEM_SUPER_MUSHROOM
};
typedef enum KART_AI_BEHAVIOURS {
enum KART_AI_BEHAVIOURS {
BEHAVIOUR_NONE = 0,
BEHAVIOUR_1,
BEHAVIOUR_HOP,

2
include/save_data.h
View File

@ -65,4 +65,4 @@ typedef struct {
extern SaveData gSaveData;
#endif
#endif

47
include/spline.h
View File

@ -33,7 +33,7 @@ typedef struct {
// The control point arrays have more control points in them than this number indicates. Not sure why though.
s16 numControlPoints;
// This has to be an array for this to work, so just make it size 1
SplineControlPoint controlPoints[1];
SplineControlPoint controlPoints[];
} SplineData;
// All other SplineDataXX types are for use as data only. The size of the array in them matters a lot.
@ -42,60 +42,33 @@ typedef struct {
// Ghosts in BansheeBoardwalk x 2
// Seagulls in KoopaTroopaBeach x 2
// Penguins in Sherbet Land x 1
typedef struct {
s16 numControlPoints;
SplineControlPoint controlPoints[23];
} SplineData23;
// length of 23
// Ghosts in BansheeBoardwalk x 2
// Seagulls in KoopaTroopaBeach x 1
typedef struct {
s16 numControlPoints;
SplineControlPoint controlPoints[24];
} SplineData24;
// length of 24
// Ghosts in BansheeBoardwalk x 1
// Seagulls in KoopaTroopaBeach x 1
// Penguins in Sherbet Land x 1
typedef struct {
s16 numControlPoints;
SplineControlPoint controlPoints[25];
} SplineData25;
// length of 25
// Data of this type is unreferenced or only referenced in an unused function
typedef struct {
s16 numControlPoints;
SplineControlPoint controlPoints[4];
} SplineDataUnused4;
// lenght of 4
// Lakitu Countdown
typedef struct {
s16 numControlPoints;
SplineControlPoint controlPoints[15];
} SplineData15;
// length of 15
// Lakitu Checkered Flag
typedef struct {
s16 numControlPoints;
SplineControlPoint controlPoints[21];
} SplineData21;
// length of 21
typedef struct {
s16 numControlPoints;
SplineControlPoint controlPoints[13];
} SplineDataUnused13;
// length of 13
// Lakitu Second/Final Lap
typedef struct {
s16 numControlPoints;
SplineControlPoint controlPoints[12];
} SplineData12;
// length of 12
// Lakitu Reverse
typedef struct {
s16 numControlPoints;
SplineControlPoint controlPoints[8];
} SplineData8;
// length of 8
#endif

2
src/actors/banana/update.inc.c
View File

@ -183,4 +183,4 @@ void update_actor_banana(struct BananaActor *banana) {
default:
break;
}
}
}

2
src/actors/blue_and_red_shells/update.inc.c
View File

@ -464,4 +464,4 @@ void update_actor_red_blue_shell(struct ShellActor *shell) {
default:
break;
}
}
}

2
src/actors/fake_item_box/render.inc.c
View File

@ -145,4 +145,4 @@ void render_actor_fake_item_box(Camera *camera, struct FakeItemBox *fakeItemBox)
gSPDisplayList(gDisplayListHead++, D_0D0030F8);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
}
}
}

2
src/actors/fake_item_box/update.inc.c
View File

@ -89,4 +89,4 @@ void update_actor_fake_item_box(struct FakeItemBox *fake_item_box) {
destroy_actor((struct Actor *) fake_item_box);
break;
}
}
}

3
src/actors/green_shell/update.inc.c
View File

@ -3,6 +3,7 @@
#include <types.h>
#include <code_800029B0.h>
#include <defines.h>
#include "collision.h"
/**
* @brief Updates the green shell actor.
@ -190,4 +191,4 @@ void update_actor_green_shell(struct ShellActor *shell) {
default:
break;
}
}
}

2
src/actors/item_box/render.inc.c
View File

@ -155,4 +155,4 @@ void render_actor_item_box(Camera *camera, struct ItemBox *item_box) {
}
gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
}
}
}

2
src/actors/item_box/update.inc.c
View File

@ -65,4 +65,4 @@ void update_actor_item_box(struct ItemBox *itemBox) {
}
break;
}
}
}

2
src/actors/palm_tree/render.inc.c
View File

@ -57,4 +57,4 @@ void render_actor_palm_tree(Camera *arg0, UNUSED Mat4 arg1, struct PalmTree *arg
}
}
}
}
}

32
src/audio/external.c
View File

@ -952,7 +952,7 @@ void func_800C3448(u32 arg0) {
}
void func_800C3478(void) {
for(D_800EA1E8; D_800EA1E4 != D_800EA1E8;) {
for (D_800EA1E8; D_800EA1E4 != D_800EA1E8;) {
func_800C2A2C(D_80192CD0[D_800EA1E8++]);
}
}
@ -1896,7 +1896,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C4FE4.s")
// Seems somewhat similar to certain parts of `select_current_sounds` from SM64
void func_800C5278(u8 bankId) {
s32 stackPadding0;
UNUSED s32 stackPadding0;
u8 soundId;
struct SoundCharacteristics sp60;
@ -1962,7 +1962,7 @@ void func_800C550C(Vec3f *arg0) {
}
void func_800C5578(Vec3f *arg0, u32 soundBits) {
s32 stackPadding0;
UNUSED s32 stackPadding0;
u8 bankId;
u8 next;
u8 curr;
@ -1993,7 +1993,7 @@ void func_800C5578(Vec3f *arg0, u32 soundBits) {
}
void func_800C56F0(u32 soundBits) {
s32 stackPadding0;
UNUSED s32 stackPadding0;
u8 bankId;
u8 next;
u8 curr;
@ -2336,7 +2336,7 @@ void func_800C6758(u8 playerId) {
void func_800C683C(u8 cameraId) {
if ((D_800EA108 == 0) && (D_800EA0EC[cameraId] == 0)) {
if (D_800E9E74[cameraId] != D_800E9E84[cameraId]) {
func_800C5578(D_800E9F7C[cameraId].pos, D_800E9E94[cameraId]);
func_800C5578(&D_800E9F7C[cameraId].pos, D_800E9E94[cameraId]);
switch (D_800E9E74[cameraId]) {
case 3:
play_sound(SOUND_ACTION_TYRE_SQUEAL, &D_800E9F7C[cameraId].pos, cameraId, &D_800E9F14[cameraId], &D_800E9EF4[cameraId], (u8 *) &D_800E9F7C[cameraId].unk_14);
@ -2453,7 +2453,7 @@ void func_800C683C(u8 cameraId) {
D_800E9E94[cameraId] = SOUND_ARG_LOAD(0x01, 0x00, 0xF0, 0x2B);
break;
default:
func_800C5578(D_800E9F7C[cameraId].pos, D_800E9E94[cameraId]);
func_800C5578(&D_800E9F7C[cameraId].pos, D_800E9E94[cameraId]);
break;
}
}
@ -2672,7 +2672,7 @@ void func_800C76C0(u8 playerId) {
func_800C9018(playerId, SOUND_ARG_LOAD(0x01, 0x00, 0xFA, 0x28));
func_800C9018(playerId, SOUND_ARG_LOAD(0x01, 0x00, 0xFF, 0x2C));
func_800C9018(playerId, SOUND_ARG_LOAD(0x01, 0x00, 0xFA, 0x4C));
func_800C5578(D_800E9F7C[playerId].pos, D_800E9E94[playerId]);
func_800C5578(&D_800E9F7C[playerId].pos, D_800E9E94[playerId]);
D_800E9E74[playerId] = 0;
switch (gModeSelection) { /* irregular */
case GRAND_PRIX:
@ -3161,7 +3161,7 @@ void func_800C8F80(u8 arg0, u32 soundBits) {
}
void func_800C9018(u8 arg0, u32 soundBits) {
func_800C5578(D_800E9F7C[arg0].pos, soundBits);
func_800C5578(&D_800E9F7C[arg0].pos, soundBits);
}
void func_800C9060(u8 playerId, u32 soundBits) {
@ -3312,11 +3312,11 @@ void func_800C94A4(u8 playerId) {
}
void func_800C97C4(u8 arg0) {
func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x00));
func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x14));
func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x2E));
func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x36));
func_800C5578(D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x3E));
func_800C5578(&D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x00));
func_800C5578(&D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x14));
func_800C5578(&D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x2E));
func_800C5578(&D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x36));
func_800C5578(&D_800E9F7C[arg0].pos, gPlayers[arg0].characterId + SOUND_ARG_LOAD(0x01, 0x04, 0xFF, 0x3E));
}
void func_800C98B8(Vec3f position, Vec3f velocity, u32 soundBits) {
@ -3342,7 +3342,7 @@ void func_800C99E0(Vec3f arg0, s32 soundBits) {
for(temp_t9 = 0; temp_t9 < D_800EA1C0 + 1; temp_t9++) {
temp_v0 = func_800C21E8(arg0, soundBits);
if (temp_v0 != NULL) {
func_800C5578(*temp_v0, soundBits);
func_800C5578(temp_v0, soundBits);
}
}
}
@ -3431,7 +3431,7 @@ void func_800C9EF4(Vec3f arg0, u32 soundBits) {
for (i = 0; i < D_800EA1C0 + 1; i++) {
temp = func_800C21E8(arg0, soundBits);
if (temp != NULL) {
func_800C5578(*temp, soundBits);
func_800C5578(temp, soundBits);
}
}
}
@ -3659,7 +3659,7 @@ void func_800CA984(u8 arg0) {
void func_800CAACC(u8 playerId) {
if ((u8) D_800EA108 == 0) {
func_800C5578(*func_800C21E8(gPlayers[playerId].pos, SOUND_ITEM_STAR), SOUND_ITEM_STAR);
func_800C5578(func_800C21E8(gPlayers[playerId].pos, SOUND_ITEM_STAR), SOUND_ITEM_STAR);
}
}

6
src/audio/load.c
View File

@ -109,7 +109,7 @@ char loadAudioString38[] = "---------------------------------------\n";
void audio_dma_copy_immediate(u8 *devAddr, void *vAddr, size_t nbytes) {
// eu_stubbed_printf_3("Romcopy %x -> %x ,size %x\n", devAddr, vAddr, nbytes);
osInvalDCache(vAddr, nbytes);
osPiStartDma(&D_803B6740, OS_MESG_PRI_HIGH, OS_READ, devAddr, vAddr, nbytes, &D_803B6720);
osPiStartDma(&D_803B6740, OS_MESG_PRI_HIGH, OS_READ, (uintptr_t)devAddr, vAddr, nbytes, &D_803B6720);
osRecvMesg(&D_803B6720, NULL, OS_MESG_BLOCK);
// eu_stubbed_printf_0("Romcopyend\n");
}
@ -384,9 +384,9 @@ void patch_sound(struct AudioBankSound *sound, u8 *memBase, u8 *offsetBase) {
#define PATCH(x, base) (patched = (void *)((uintptr_t) (x) + (uintptr_t) base))
if (sound->sample != NULL) {
sample = sound->sample = (struct AdpcmLoop *) PATCH(sound->sample, memBase);
sample = sound->sample = (struct AudioBankSample *) PATCH(sound->sample, memBase);
if (sample->loaded == 0) {
sample->sampleAddr = (struct u8 *) PATCH(sample->sampleAddr, offsetBase);
sample->sampleAddr = (u8 *) PATCH(sample->sampleAddr, offsetBase);
sample->loop = (struct AdpcmLoop *) PATCH(sample->loop, memBase);
sample->book = (struct AdpcmBook *) PATCH(sample->book, memBase);
sample->loaded = 1;

2
src/code_80004740.c
View File

@ -175,4 +175,4 @@ s16 func_80004EAC(void *addr, s16 offset) {
struct stru_80004EAC *temp = (struct stru_80004EAC *) segmented_to_virtual((void *) item[offset]);
return temp->unk8 - 1;
}
}

350
src/code_80005FD0.c
View File

@ -841,7 +841,7 @@ void func_800074D4(void) {
Player *var_a0_2;
f32 temp_a0;
s32 sp68[8];
s32 temp_s0;
UNUSED s32 temp_s0;
s32 temp_t1;
s32 var_a3;
s32 var_a3_2;
@ -1058,7 +1058,7 @@ void func_80007FA4(s32 arg0, Player *player, f32 arg2) {
void func_80008424(s32 playerId, f32 arg1, Player *player) {
f32 var_f2;
f32 var_f0;
s32 thing;
UNUSED s32 thing;
s32 var_a1;
var_f2 = player->unk_094;
@ -1459,9 +1459,9 @@ void func_8000929C(s32 playerId, Player *player) {
s32 var_v0;
s32 var_v1;
f32 someTemp0;
s16 stackPadding0;
UNUSED s16 stackPadding0;
s16 var_t0;
s32 stackPadding1;
UNUSED s32 stackPadding1;
tempPos0 = player->pos[0];
tempPos1 = player->pos[1];
@ -1609,7 +1609,7 @@ void func_800098FC(s32 arg0, Player *player) {
}
}
void func_800099EC(s32 playerId, Player *unused) {
void func_800099EC(s32 playerId, UNUSED Player *unused) {
s32 var_s0;
if (D_801633C8[playerId] >= 0x65) {
@ -1644,33 +1644,33 @@ void func_800099EC(s32 playerId, Player *unused) {
// FAKEMATCH1 is the best improvement I've seen yet, MISMATCH2/3 become the only issues.
void func_80009B60(s32 playerId) {
s32 stackPadding00;
s32 stackPadding01;
s32 stackPadding02;
s32 stackPadding03;
s32 stackPadding04;
s32 stackPadding05;
s32 stackPadding06;
s32 stackPadding07;
s32 stackPadding08;
s32 stackPadding09;
s32 stackPadding0A;
s32 stackPadding0B;
s32 stackPadding0C;
s32 stackPadding0D;
UNUSED s32 stackPadding00;
UNUSED s32 stackPadding01;
UNUSED s32 stackPadding02;
UNUSED s32 stackPadding03;
UNUSED s32 stackPadding04;
UNUSED s32 stackPadding05;
UNUSED s32 stackPadding06;
UNUSED s32 stackPadding07;
UNUSED s32 stackPadding08;
UNUSED s32 stackPadding09;
UNUSED s32 stackPadding0A;
UNUSED s32 stackPadding0B;
UNUSED s32 stackPadding0C;
UNUSED s32 stackPadding0D;
s16 var_a0_2;
s16 var_a1;
s32 stackPadding0E;
s32 stackPadding0F;
s32 stackPadding10;
s32 stackPadding11;
s32 stackPadding12;
s32 stackPadding13;
s32 stackPadding14;
s32 stackPadding15;
s32 stackPadding16;
s32 stackPadding17;
s32 stackPadding18;
UNUSED s32 stackPadding0E;
UNUSED s32 stackPadding0F;
UNUSED s32 stackPadding10;
UNUSED s32 stackPadding11;
UNUSED s32 stackPadding12;
UNUSED s32 stackPadding13;
UNUSED s32 stackPadding14;
UNUSED s32 stackPadding15;
UNUSED s32 stackPadding16;
UNUSED s32 stackPadding17;
UNUSED s32 stackPadding18;
u16 stackPadding19;
u16 stackPadding1A;
f32 temp_f0;
@ -2029,14 +2029,14 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80009B60.s")
#ifdef NON_MATCHING
// Lots of work left to do, might be funtionally accurate?
void func_8000B140(s32 playerId) {
f32 stackPadding0;
f32 stackPadding1;
f32 stackPadding2;
f32 stackPadding3;
f32 stackPadding4;
f32 stackPadding5;
f32 stackPadding6;
f32 stackPadding7;
UNUSED f32 stackPadding0;
UNUSED f32 stackPadding1;
UNUSED f32 stackPadding2;
UNUSED f32 stackPadding3;
UNUSED f32 stackPadding4;
UNUSED f32 stackPadding5;
UNUSED f32 stackPadding6;
UNUSED f32 stackPadding7;
f32 temp_f0_2;
f32 temp_f12;
f32 temp_f14;
@ -2046,9 +2046,9 @@ void func_8000B140(s32 playerId) {
f32 var_f18;
f32 var_f20;
s16 spB0[8];
f32 stackPadding8;
UNUSED f32 stackPadding8;
s16 sp9C[8];
f32 stackPadding9;
UNUSED f32 stackPadding9;
f32 sp74[8];
s32 temp_a1_2;
s16 temp_v1_2;
@ -2211,9 +2211,9 @@ void func_8000BA14(u16 waypointIndex, f32 arg1, f32 arg2, s16 pathIndex) {
f32 xdiff;
f32 zdiff;
f32 distance;
f32 temp_f12;
f32 temp_f2_2;
TrackWaypoint *path;
UNUSED f32 temp_f12;
UNUSED f32 temp_f2_2;
UNUSED TrackWaypoint *path;
TrackWaypoint *waypointTwo;
TrackWaypoint *waypointOne;
@ -2497,7 +2497,7 @@ s16 func_8000C9DC(f32 posX, f32 posY, f32 posZ, s16 waypointIndex, s32 pathIndex
return nearestWaypointIndex;
}
void func_8000CBA4(UNUSED f32 posX, f32 posY, UNUSED f32 posZ, s16 *waypointIndex, s32 arg4) {
void func_8000CBA4(UNUSED f32 posX, f32 posY, UNUSED f32 posZ, s16 *waypointIndex, UNUSED s32 arg4) {
s16 var_v0;
var_v0 = *waypointIndex;
@ -2536,9 +2536,9 @@ s16 func_8000CC88(f32 posX, f32 posY, f32 posZ, Player *player, s32 playerId, s3
s16 func_8000CD24(f32 posX, f32 posY, f32 posZ, s16 waypointIndex, Player *player, s32 playerId, s32 pathIndex) {
s16 sp5E;
s16 stackPadding0;
s32 stackPadding1;
s32 stackPadding2;
UNUSED s16 stackPadding0;
UNUSED s32 stackPadding1;
UNUSED s32 stackPadding2;
TrackWaypoint *temp_v1;
if ((player->type & 0x4000) && !(player->type & 0x1000)) {
@ -2597,7 +2597,7 @@ s16 func_8000CD24(f32 posX, f32 posY, f32 posZ, s16 waypointIndex, Player *playe
return sp5E;
}
s16 func_8000D100(f32 xPos, f32 yPos, f32 zPos, s16 arg3) {
s16 func_8000D100(f32 xPos, UNUSED f32 yPos, f32 zPos, s16 arg3) {
f32 xdiff;
f32 zdiff;
f32 minimumDistance;
@ -2683,12 +2683,12 @@ f32 func_8000D3B8(s32 playerId) {
}
void func_8000D438(s32 arg0, u16 arg1) {
s32 stackPadding0;
UNUSED s32 stackPadding0;
f32 sp48;
f32 sp44;
s32 stackPadding1;
s32 stackPadding2;
s32 stackPadding3;
UNUSED s32 stackPadding1;
UNUSED s32 stackPadding2;
UNUSED s32 stackPadding3;
f32 stackPadding4;
f32 stackPadding5;
f32 sp2C;
@ -2751,7 +2751,7 @@ s16 func_8000D6D0(Vec3f arg0, s16 *waypointIndex, f32 arg2, f32 arg3, s16 pathIn
f32 temp1;
f32 temp2;
f32 midX;
s16 stackPadding1;
UNUSED s16 stackPadding1;
s16 waypoint1;
s16 waypoint2;
f32 pad3;
@ -2813,14 +2813,14 @@ s16 func_8000D6D0(Vec3f arg0, s16 *waypointIndex, f32 arg2, f32 arg3, s16 pathIn
return func_80005FD0(sp50, arg0);
}
s16 func_8000D940(f32 *arg0, s16 *waypointIndex, f32 arg2, f32 arg3, s16 pathIndex) {
f32 pad;
s16 func_8000D940(Vec3f arg0, s16 *waypointIndex, f32 arg2, f32 arg3, s16 pathIndex) {
UNUSED f32 pad;
f32 thing1;
f32 thing2;
s16 stackPadding1;
UNUSED s16 stackPadding1;
s16 waypoint1;
s16 waypoint2;
s16 stackPadding2;
UNUSED s16 stackPadding2;
f32 pad2;
f32 midX;
f32 pad3;
@ -2883,15 +2883,15 @@ s16 func_8000DBAC(Vec3f pos, s16 *waypointIndex, f32 speed) {
f32 origXPos;
f32 origYPos;
f32 origZPos;
s32 stackPadding0;
s32 stackPadding1;
s32 stackPadding2;
s32 stackPadding3;
s32 stackPadding4;
s32 stackPadding5;
s32 stackPadding6;
s32 stackPadding7;
s32 stackPadding8;
UNUSED s32 stackPadding0;
UNUSED s32 stackPadding1;
UNUSED s32 stackPadding2;
UNUSED s32 stackPadding3;
UNUSED s32 stackPadding4;
UNUSED s32 stackPadding5;
UNUSED s32 stackPadding6;
UNUSED s32 stackPadding7;
UNUSED s32 stackPadding8;
f32 midX;
f32 midZ;
f32 x_dist;
@ -2937,13 +2937,13 @@ s16 func_8000DBAC(Vec3f pos, s16 *waypointIndex, f32 speed) {
}
void set_bomb_kart_spawn_positions(void) {
Collision *var_s2;
UNUSED Collision *var_s2;
f32 startingXPos;
f32 startingZPos;
f32 startingYPos;
s32 var_s3;
TrackWaypoint *temp_v0;
BombKart *var_s0;
UNUSED BombKart *var_s0;
BombKartSpawn *temp_s1;
for (var_s3 = 0; var_s3 < NUM_BOMB_KARTS_VERSUS; var_s3++) {
@ -2995,25 +2995,25 @@ void set_bomb_kart_spawn_positions(void) {
}
void func_8000DF8C(s32 bombKartId) {
s32 stackPadding0;
UNUSED s32 stackPadding0;
f32 sp118;
f32 var_f18;
TrackWaypoint *temp_v0_2;
f32 temp_f0_3;
f32 sp108;
s32 stackPadding1;
s32 stackPadding2;
s32 stackPadding3;
UNUSED s32 stackPadding1;
UNUSED s32 stackPadding2;
UNUSED s32 stackPadding3;
f32 temp_f14;
s32 stackPadding4;
UNUSED s32 stackPadding4;
f32 temp_f16;
s32 stackPadding5;
s32 stackPadding6;
s32 stackPadding7;
s32 stackPadding8;
s32 stackPadding9;
s32 stackPaddingA;
s32 stackPaddingB;
UNUSED s32 stackPadding5;
UNUSED s32 stackPadding6;
UNUSED s32 stackPadding7;
UNUSED s32 stackPadding8;
UNUSED s32 stackPadding9;
UNUSED s32 stackPaddingA;
UNUSED s32 stackPaddingB;
f32 temp_f0;
f32 temp_f0_4;
u16 spCA;
@ -3024,25 +3024,25 @@ void func_8000DF8C(s32 bombKartId) {
f32 temp_f12_4;
f32 temp_f14_2;
f32 spAC;
s32 stackPaddingC;
UNUSED s32 stackPaddingC;
f32 temp_f16_2;
f32 spA0;
f32 temp_f2;
f32 temp_f2_4;
f32 sp94;
s32 stackPaddingD;
UNUSED s32 stackPaddingD;
f32 var_f20;
f32 sp88;
f32 var_f22;
f32 var_f24;
u16 sp7E;
u16 sp7C;
u16 sp4C;
UNUSED u16 sp4C;
u16 temp_t6;
u16 temp_t7;
u16 var_s1;
s32 var_a0;
s32 stackPaddingE;
UNUSED s32 stackPaddingE;
TrackWaypoint *temp_v0_4;
BombKart *bombKart;
BombKart *bombKart2;
@ -3505,11 +3505,11 @@ void func_8000F2DC(void) {
void func_8000F628(void) {
Camera *camera;
UNUSED Camera *camera;
s32 temp_v0_3;
s32 i;
Test *var_s5;
s32 temp_v1;
UNUSED s32 temp_v1;
UNUSED s32 pad;
for (i = 0; i < NUM_PLAYERS; i++) {
@ -3532,7 +3532,7 @@ void func_8000F628(void) {
gCourseCompletionPercentByPlayerId[i] = 0.0f;
gTimePlayerLastTouchedFinishLine[i] = 0.0f;
if (gModeSelection == GRAND_PRIX) {
if(1); if(1); // Maybe some debug code?
if(1) {}; if(1) {}; // Maybe some debug code?
gGPCurrentRaceRankByPlayerId[i] = (s32) D_80165270[i];
D_801643E0[i] = (s32) D_80165270[i];
} else {
@ -3616,7 +3616,7 @@ void func_8000F628(void) {
}
for (i = 0; i < NUM_PLAYERS; i++) {
if (1);
if (1) {};
gPathIndexByPlayerId[i] = 0;
gNearestWaypointByPlayerId[i] = gWaypointCountByPathIndex[gPathIndexByPlayerId[i]] - gGPCurrentRaceRankByPlayerId[i] - 4;
}
@ -3890,7 +3890,7 @@ void func_80010DBC(s32 pathIndex) {
u16 *angle;
if ((s32) gKartAICourseMaximumSeparation[gCurrentCourseId] >= 0) {
for (angle = &D_80164590[pathIndex][0], waypointIndex = 0; waypointIndex < gWaypointCountByPathIndex[pathIndex]; waypointIndex++, angle++) {
for (angle = (u16*) &D_80164590[pathIndex][0], waypointIndex = 0; waypointIndex < gWaypointCountByPathIndex[pathIndex]; waypointIndex++, angle++) {
*angle = func_80010CB0(pathIndex, waypointIndex);
}
}
@ -3941,7 +3941,7 @@ f32 func_80010FA0(f32 arg0, f32 arg1, f32 arg2, UNUSED s32 arg3, UNUSED s32 arg4
/**
* @return's the number of items processed.
*/
s32 func_80011014(TrackWaypoint *pathDest, TrackWaypoint *path, s32 numPathPoints, s32 pathIndex) {
s32 func_80011014(TrackWaypoint *pathDest, TrackWaypoint *path, s32 numPathPoints, UNUSED s32 pathIndex) {
f32 temp_f24_2;
f32 temp_f2_3;
f32 var_f20_2;
@ -3967,7 +3967,7 @@ s32 func_80011014(TrackWaypoint *pathDest, TrackWaypoint *path, s32 numPathPoint
TrackWaypoint *point2;
TrackWaypoint *point3;
f32 temp;
TrackWaypoint *dest;
UNUSED TrackWaypoint *dest;
var_f30 = 0.0f;
var_s0 = 0;
temp_f20 = (f32) path[0].posX;
@ -4095,7 +4095,7 @@ s32 process_path_data(TrackWaypoint *dest, TrackWaypoint *src) {
s32 func_8001168C(PathNoY *pathDest, TrackWaypoint *pathSrc, s32 numWaypoints) {
f32 temp_f14_3;
f32 temp_f16_2;
s32 pad;
UNUSED s32 pad;
f32 x1;
f32 z1;
@ -4105,7 +4105,7 @@ s32 func_8001168C(PathNoY *pathDest, TrackWaypoint *pathSrc, s32 numWaypoints) {
f32 z3;
s32 pad2;
UNUSED s32 pad2;
f32 temp_f24;
f32 spA8;
@ -4190,7 +4190,7 @@ void kart_ai_behaviour_start(s32 playerId, Player *player) {
s16 waypointStart;
s16 waypointEnd;
s32 behaviourType;
s32 test;
UNUSED s32 test;
sCurrentKartAIBehaviour = &gCoursesKartAIBehaviour[gCurrentCourseId][gCurrentKartAIBehaviourId[playerId]];
@ -4205,7 +4205,7 @@ void kart_ai_behaviour_start(s32 playerId, Player *player) {
reset_kart_ai_behaviour_none(playerId);
return;
}
if ((u32)playerWaypoint == waypointStart) {
if ((u32)playerWaypoint == (u32)waypointStart) {
gKartAIBehaviourState[playerId] = KART_AI_BEHAVIOUR_STATE_RUNNING;
gPreviousKartAIBehaviourId[playerId] = gCurrentKartAIBehaviourId[playerId];
gCurrentKartAIBehaviourId[playerId]++;
@ -4303,7 +4303,7 @@ void kart_ai_behaviour(s32 playerIndex) {
}
}
void func_80011EC0(s32 arg0, Player *player, s32 arg2, u16 arg3) {
void func_80011EC0(s32 arg0, Player *player, s32 arg2, UNUSED u16 arg3) {
if ((((player->unk_094 / 18.0f) * 216.0f) >= 45.0f) && (D_801630E8[arg0] == 0)) {
switch (D_801631D8[D_80162FCE]) {
case 0:
@ -4377,12 +4377,12 @@ void func_80012220(VehicleStuff *vehicle) {
origXPos = vehicle->position[0];
origZPos = vehicle->position[2];
if (D_8016347A == 0) {
func_8000D6D0(vehicle->position, &vehicle->waypointIndex, vehicle->someMultiplier, vehicle->someMultiplierTheSequel, 0, 3);
func_8000D6D0(vehicle->position, (s16*)&vehicle->waypointIndex, vehicle->someMultiplier, vehicle->someMultiplierTheSequel, 0, 3);
vehicle->rotation[0] = 0;
vehicle->rotation[1] = -0x8000;
vehicle->rotation[2] = 0;
} else {
func_8000D940(vehicle->position, &vehicle->waypointIndex, vehicle->someMultiplier, vehicle->someMultiplierTheSequel, 0);
func_8000D940(vehicle->position, (s16*)&vehicle->waypointIndex, vehicle->someMultiplier, vehicle->someMultiplierTheSequel, 0);
vehicle->rotation[0] = 0;
vehicle->rotation[1] = 0;
vehicle->rotation[2] = 0;
@ -4415,7 +4415,7 @@ void init_course_vehicles(void) {
tempLocomotive = &gTrainList[loopIndex].locomotive;
origXPos = tempLocomotive->position[0];
origZPos = tempLocomotive->position[2];
trainCarYRot = func_8000DBAC(tempLocomotive->position, &tempLocomotive->waypointIndex, gTrainList[loopIndex].someMultiplier);
trainCarYRot = func_8000DBAC(tempLocomotive->position, (s16*)&tempLocomotive->waypointIndex, gTrainList[loopIndex].someMultiplier);
tempLocomotive->velocity[0] = tempLocomotive->position[0] - origXPos;
tempLocomotive->velocity[2] = tempLocomotive->position[2] - origZPos;
vec3s_set(trainCarRot, 0, trainCarYRot, 0);
@ -4425,7 +4425,7 @@ void init_course_vehicles(void) {
if (tempTender->isActive == 1) {
origXPos = tempTender->position[0];
origZPos = tempTender->position[2];
trainCarYRot = func_8000DBAC(tempTender->position, &tempTender->waypointIndex, gTrainList[loopIndex].someMultiplier);
trainCarYRot = func_8000DBAC(tempTender->position, (s16*)&tempTender->waypointIndex, gTrainList[loopIndex].someMultiplier);
tempTender->velocity[0] = tempTender->position[0] - origXPos;
tempTender->velocity[2] = tempTender->position[2] - origZPos;
vec3s_set(trainCarRot, 0, trainCarYRot, 0);
@ -4437,7 +4437,7 @@ void init_course_vehicles(void) {
if (tempPassengerCar->isActive == 1) {
origXPos = tempPassengerCar->position[0];
origZPos = tempPassengerCar->position[2];
trainCarYRot = func_8000DBAC(tempPassengerCar->position, &tempPassengerCar->waypointIndex, gTrainList[loopIndex].someMultiplier);
trainCarYRot = func_8000DBAC(tempPassengerCar->position, (s16*)&tempPassengerCar->waypointIndex, gTrainList[loopIndex].someMultiplier);
tempPassengerCar->velocity[0] = tempPassengerCar->position[0] - origXPos;
tempPassengerCar->velocity[2] = tempPassengerCar->position[2] - origZPos;
vec3s_set(trainCarRot, 0, trainCarYRot, 0);
@ -4452,7 +4452,7 @@ void init_course_vehicles(void) {
if(tempPaddleWheelBoat->isActive == 1) {
origXPos = tempPaddleWheelBoat->position[0];
origZPos = tempPaddleWheelBoat->position[2];
tempPaddleWheelBoat->rotY = func_8000DBAC(tempPaddleWheelBoat->position, &tempPaddleWheelBoat->waypointIndex, tempPaddleWheelBoat->someMultiplier);
tempPaddleWheelBoat->rotY = func_8000DBAC(tempPaddleWheelBoat->position, (s16*)&tempPaddleWheelBoat->waypointIndex, tempPaddleWheelBoat->someMultiplier);
tempPaddleWheelBoat->velocity[0] = tempPaddleWheelBoat->position[0] - origXPos;
tempPaddleWheelBoat->velocity[2] = tempPaddleWheelBoat->position[2] - origZPos;
vec3s_set(paddleWheelBoatRot, 0, tempPaddleWheelBoat->rotY, 0);
@ -4485,10 +4485,10 @@ void init_course_vehicles(void) {
}
}
void func_80012780(TrainCarStuff *trainCar, s16 *arg1, u16 arg2) {
trainCar->position[0] = (f32) arg1[0];
void func_80012780(TrainCarStuff *trainCar, PathNoY *arg1, u16 arg2) {
trainCar->position[0] = (f32) arg1->x;
trainCar->position[1] = (f32) D_80162EB0;
trainCar->position[2] = (f32) arg1[1];
trainCar->position[2] = (f32) arg1->z;
trainCar->actorIndex = -1;
trainCar->waypointIndex = arg2;
trainCar->isActive = 0;
@ -4601,7 +4601,7 @@ void update_vehicle_trains(void) {
temp_f20 = gTrainList[i].locomotive.position[0];
temp_f22 = gTrainList[i].locomotive.position[2];
temp_v0 = func_8000DBAC(gTrainList[i].locomotive.position, &gTrainList[i].locomotive.waypointIndex, gTrainList[i].someMultiplier);
temp_v0 = func_8000DBAC(gTrainList[i].locomotive.position, (s16*)&gTrainList[i].locomotive.waypointIndex, gTrainList[i].someMultiplier);
gTrainList[i].locomotive.velocity[0] = gTrainList[i].locomotive.position[0] - temp_f20;
gTrainList[i].locomotive.velocity[2] = gTrainList[i].locomotive.position[2] - temp_f22;
@ -4630,7 +4630,7 @@ void update_vehicle_trains(void) {
if (car->isActive == 1) {
temp_f20 = car->position[0];
temp_f22 = car->position[2];
temp_v0 = func_8000DBAC(car->position, &car->waypointIndex, gTrainList[i].someMultiplier);
temp_v0 = func_8000DBAC(car->position, (s16*)&car->waypointIndex, gTrainList[i].someMultiplier);
car->velocity[0] = car->position[0] - temp_f20;
car->velocity[2] = car->position[2] - temp_f22;
func_80012A48(car, temp_v0);
@ -4642,7 +4642,7 @@ void update_vehicle_trains(void) {
temp_f20 = car->position[0];
temp_f22 = car->position[2];
temp_v0 = func_8000DBAC(car->position, &car->waypointIndex, gTrainList[i].someMultiplier);
temp_v0 = func_8000DBAC(car->position, (s16*)&car->waypointIndex, gTrainList[i].someMultiplier);
car->velocity[0] = car->position[0] - temp_f20;
car->velocity[2] = car->position[2] - temp_f22;
func_80012A48(car, temp_v0);
@ -4805,7 +4805,7 @@ void update_vehicle_paddle_boats(void) {
Vec3f sp88;
UNUSED s32 pad;
Vec3f sp78;
s32 pad2;
UNUSED s32 pad2;
D_801630FC += 1;
for (i = 0; i < NUM_ACTIVE_PADDLE_BOATS; i++) {
paddleBoat = &gPaddleBoats[i];
@ -4813,7 +4813,7 @@ void update_vehicle_paddle_boats(void) {
temp_f26 = paddleBoat->position[0];
temp_f28 = paddleBoat->position[1];
temp_f30 = paddleBoat->position[2];
func_8000DBAC(paddleBoat->position, &paddleBoat->waypointIndex, paddleBoat->someMultiplier);
func_8000DBAC(paddleBoat->position, (s16*)&paddleBoat->waypointIndex, paddleBoat->someMultiplier);
paddleBoat->someFlags = func_800061DC(paddleBoat->position, 2000.0f, paddleBoat->someFlags);
if ((((s16) D_801630FC % 10) == 0) && (paddleBoat->someFlags != 0)) {
sp78[0] = (f32) ((f64) paddleBoat->position[0] - 30.0);
@ -4957,9 +4957,9 @@ void func_800139E4(f32 arg0, f32 arg1, s32 arg2, s32 arg3, VehicleStuff *vehicle
veh->rotation[0] = 0;
veh->rotation[2] = 0;
if (D_8016347A == 0) {
veh->rotation[1] = func_8000D6D0(veh->position, &veh->waypointIndex, veh->someMultiplier, veh->someMultiplierTheSequel, 0, 3);
veh->rotation[1] = func_8000D6D0(veh->position, (s16*)&veh->waypointIndex, veh->someMultiplier, veh->someMultiplierTheSequel, 0, 3);
} else {
veh->rotation[1] = func_8000D940(veh->position, &veh->waypointIndex, veh->someMultiplier, veh->someMultiplierTheSequel, 0);
veh->rotation[1] = func_8000D940(veh->position, (s16*)&veh->waypointIndex, veh->someMultiplier, veh->someMultiplierTheSequel, 0);
}
}
D_801631C8 = 10;
@ -5031,9 +5031,9 @@ void func_80013D20(VehicleStuff *vehicle) {
}
}
if (D_8016347A == 0) {
var_a1 = func_8000D6D0(vehicle->position, &vehicle->waypointIndex, vehicle->someMultiplier, vehicle->someMultiplierTheSequel, 0, 3);
var_a1 = func_8000D6D0(vehicle->position, (s16*)&vehicle->waypointIndex, vehicle->someMultiplier, vehicle->someMultiplierTheSequel, 0, 3);
} else {
var_a1 = func_8000D940(vehicle->position, &vehicle->waypointIndex, vehicle->someMultiplier, vehicle->someMultiplierTheSequel, 0);
var_a1 = func_8000D940(vehicle->position, (s16*)&vehicle->waypointIndex, vehicle->someMultiplier, vehicle->someMultiplierTheSequel, 0);
}
adjust_angle(&vehicle->rotation[1], var_a1, 100);
temp_f0_3 = vehicle->position[0] - sp5C;
@ -5237,12 +5237,12 @@ f32 func_800145A8(s16 arg0, f32 arg1, s16 arg2) {
}
void func_800146B8(s32 playerId, s32 arg1, VehicleStuff *vehicle) {
s32 var_v1;
UNUSED s32 var_v1;
s32 var_v0;
s32 var_s2;
s32 waypointCount;
u16 temp_a1;
VehicleStuff *tempVehicle;
UNUSED VehicleStuff *tempVehicle;
waypointCount = gWaypointCountByPathIndex[0];
if (!(gPlayers[playerId].unk_094 < 1.6666666666666667)) {
@ -5265,7 +5265,7 @@ void func_800147E0(void) {
if (gModeSelection == TIME_TRIALS) {
numTrucks = NUM_TIME_TRIAL_BOX_TRUCKS;
}
func_800139E4(a, b, numTrucks, 0, &gBoxTruckList, &D_80164550[0][0]);
func_800139E4(a, b, numTrucks, 0, gBoxTruckList, &D_80164550[0][0]);
}
void func_8001487C(void) {
@ -5292,7 +5292,7 @@ void func_80014934(void) {
if (gModeSelection == TIME_TRIALS) {
numBusses = NUM_TIME_TRIAL_SCHOOL_BUSES;
}
func_800139E4(a, b, numBusses, 0x4B, &gSchoolBusList, &D_80164550[0][0]);
func_800139E4(a, b, numBusses, 0x4B, gSchoolBusList, &D_80164550[0][0]);
}
void func_800149D0(void) {
@ -5319,7 +5319,7 @@ void func_80014A88(void) {
if (gModeSelection == TIME_TRIALS) {
numTrucks = NUM_TIME_TRIAL_TANKER_TRUCKS;
}
func_800139E4(a, b, numTrucks, 50, &gTankerTruckList, &D_80164550[0][0]);
func_800139E4(a, b, numTrucks, 50, gTankerTruckList, &D_80164550[0][0]);
}
void func_80014B24(void) {
@ -5346,7 +5346,7 @@ void func_80014BDC(void) {
if (gModeSelection == TIME_TRIALS) {
numCars = NUM_TIME_TRIAL_CARS;
}
func_800139E4(a, b, numCars, 25, &gCarList, &D_80164550[0][0]);
func_800139E4(a, b, numCars, 25, gCarList, &D_80164550[0][0]);
}
void func_80014C78(void) {
@ -5603,7 +5603,7 @@ void func_80015544(s32 playerId, f32 arg1, s32 cameraId, s32 pathIndex) {
camera->pos[2] = D_80164638[cameraId];
}
void func_8001577C(Camera *camera, UNUSED Player *playerArg, s32 arg2, s32 cameraId) {
void func_8001577C(Camera *camera, UNUSED Player *playerArg, UNUSED s32 arg2, s32 cameraId) {
s16 cameraWaypoint;
s16 playerWaypoint;
UNUSED s32 pad;
@ -5612,7 +5612,7 @@ void func_8001577C(Camera *camera, UNUSED Player *playerArg, s32 arg2, s32 camer
f32 zdiff;
UNUSED s32 pad2;
s32 playerId;
s32 pad3[9];
UNUSED s32 pad3[9];
Player *player;
s32 waypointDiff;
s32 pathIndex;
@ -5679,10 +5679,10 @@ void func_80015A9C(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
camera->pos[2] = D_80164638[cameraId];
}
void func_80015C94(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
void func_80015C94(Camera *camera, UNUSED Player *unusedPlayer, UNUSED s32 arg2, s32 cameraId) {
s16 playerWaypoint;
s16 cameraWaypoint;
s32 stackPadding0;
UNUSED s32 stackPadding0;
f32 xdiff2;
f32 ydiff2;
f32 zdiff2;
@ -5695,11 +5695,11 @@ void func_80015C94(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
f32 ydiff;
f32 zdiff;
f32 distance;
s32 stackPadding1;
UNUSED s32 stackPadding1;
s16 waypoint1;
s16 waypoint2;
f32 var_f18;
f32 var_f20;
UNUSED f32 var_f18;
UNUSED f32 var_f20;
f32 temp_f2_2;
s32 pathIndex;
@ -5784,10 +5784,10 @@ void func_800162CC(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
camera->pos[2] = D_80164638[cameraId];
}
void func_80016494(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
void func_80016494(Camera *camera, UNUSED Player *unusedPlayer, UNUSED s32 arg2, s32 cameraId) {
s16 cameraWaypoint;
s16 playerWaypoint;
s32 stackPadding0;
UNUSED s32 stackPadding0;
f32 xdiff2;
f32 ydiff2;
f32 zdiff2;
@ -5800,12 +5800,12 @@ void func_80016494(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
f32 ydiff;
f32 zdiff;
f32 distance;
f32 sp98;
UNUSED f32 sp98;
s16 waypoint1;
s16 waypoint2;
f32 sp94;
f32 sp90;
s32 stackPadding1;
UNUSED f32 sp94;
UNUSED f32 sp90;
UNUSED s32 stackPadding1;
s32 pathIndex;
f32 temp_f2_5;
@ -5889,11 +5889,11 @@ void func_80016494(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
camera->rot[2] = 0;
}
void func_80016C3C(s32 playerId, f32 arg1, s32 cameraId) {
s32 stackPadding0;
s32 stackPadding1;
void func_80016C3C(UNUSED s32 playerId, UNUSED f32 arg1, s32 cameraId) {
UNUSED s32 stackPadding0;
UNUSED s32 stackPadding1;
f32 temp_f2;
s32 stackPadding2;
UNUSED s32 stackPadding2;
f32 temp_f12;
TrackWaypoint **path;
f32 sp54;
@ -5946,14 +5946,14 @@ void func_80016C3C(s32 playerId, f32 arg1, s32 cameraId) {
// https://decomp.me/scratch/Ck7hV
// Really crazy diff, permuter only able to find fakematches for improvements (and they're big improvements)
// There's something really, really wrong with the empty `if` statement
void func_80017054(Camera *camera, Player *player, s32 index, s32 cameraId) {
s32 stackPadding0;
s32 stackPadding1;
void func_80017054(Camera *camera, UNUSED Player *player, UNUSED s32 index, s32 cameraId) {
UNUSED s32 stackPadding0;
UNUSED s32 stackPadding1;
f32 spAC;
f32 spA8;
f32 spA4;
s32 stackPadding2;
s32 stackPadding3;
UNUSED s32 stackPadding2;
UNUSED s32 stackPadding3;
f32 sp98;
f32 sp94;
f32 sp90;
@ -5963,15 +5963,15 @@ void func_80017054(Camera *camera, Player *player, s32 index, s32 cameraId) {
f32 stackPadding4;
f32 stackPadding5;
f32 stackPadding6;
s32 stackPadding7;
s32 stackPadding8;
UNUSED s32 stackPadding7;
UNUSED s32 stackPadding8;
s16 sp6E;
s16 sp6C;
s32 stackPadding9;
s32 stackPaddingA;
s32 stackPaddingB;
UNUSED s32 stackPadding9;
UNUSED s32 stackPaddingA;
UNUSED s32 stackPaddingB;
s32 pathIndex;
s32 stackPaddingC;
UNUSED s32 stackPaddingC;
s32 sp58;
s16 sp56;
s32 playerId;
@ -6049,7 +6049,7 @@ void func_80017054(Camera *camera, Player *player, s32 index, s32 cameraId) {
GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80017054.s")
#endif
void func_80017720(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
void func_80017720(s32 playerId, UNUSED f32 arg1, s32 cameraId, s16 pathIndex) {
Camera* camera = cameras + cameraId;
UNUSED s32 pad;
@ -6071,10 +6071,10 @@ void func_80017720(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
camera->pos[2] = D_80164638[cameraId];
}
void func_800178F4(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
void func_800178F4(Camera *camera, UNUSED Player *unusedPlayer, UNUSED s32 arg2, s32 cameraId) {
s16 cameraWaypoint;
s16 playerWaypoint;
f32 stackPadding0;
UNUSED f32 stackPadding0;
f32 xdiff2;
f32 ydiff2;
f32 zdiff2;
@ -6086,12 +6086,12 @@ void func_800178F4(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
f32 xdiff;
f32 ydiff;
f32 zdiff;
f32 var_f2;
f32 var_f18;
UNUSED f32 var_f2;
UNUSED f32 var_f18;
s16 waypoint1;
s16 waypoint2;
f32 stackPadding1;
f32 var_f14;
UNUSED f32 stackPadding1;
UNUSED f32 var_f14;
s32 playerId;
s32 pathIndex;
s32 waypointCount;
@ -6163,7 +6163,7 @@ void func_800178F4(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
camera->rot[2] = 0;
}
void func_80017F10(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
void func_80017F10(s32 playerId, UNUSED f32 arg1, s32 cameraId, s16 pathIndex) {
Camera* camera = cameras + cameraId;
s32 test = gWaypointCountByPathIndex[pathIndex];
@ -6185,14 +6185,14 @@ void func_80017F10(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
camera->pos[2] = D_80164638[cameraId];
}
void func_800180F0(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
void func_800180F0(Camera *camera, UNUSED Player *unusedPlayer, UNUSED s32 arg2, s32 cameraId) {
s16 cameraWaypoint;
s16 playerWaypoint;
s32 stackPadding3;
UNUSED s32 stackPadding3;
f32 sp94;
f32 sp90;
f32 sp8C;
s32 stackPadding4;
UNUSED s32 stackPadding4;
f32 distance;
f32 midX;
f32 midY;
@ -6204,9 +6204,9 @@ void func_800180F0(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
s32 playerId;
s16 waypoint1;
s16 waypoint2;
f32 var_f2;
f32 var_f18;
f32 var_f14;
UNUSED f32 var_f2;
UNUSED f32 var_f18;
UNUSED f32 var_f14;
s32 pathIndex;
s32 waypointCount;
@ -6277,7 +6277,7 @@ void func_800180F0(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
camera->rot[2] = 0;
}
void func_80018718(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
void func_80018718(s32 playerId, UNUSED f32 arg1, s32 cameraId, s16 pathIndex) {
Camera* camera = cameras + cameraId;
s32 test = gWaypointCountByPathIndex[pathIndex];
@ -6298,10 +6298,10 @@ void func_80018718(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
camera->pos[2] = D_80164638[cameraId];
}
void func_800188F4(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
void func_800188F4(Camera *camera, UNUSED Player *unusePlayer, UNUSED s32 arg2, s32 cameraId) {
s16 cameraWaypoint;
s16 playerWaypoint;
s32 stackPadding0;
UNUSED s32 stackPadding0;
f32 spAC;
f32 spA8;
f32 spA4;
@ -6313,11 +6313,11 @@ void func_800188F4(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
f32 xdiff;
f32 ydiff;
f32 zdiff;
f32 sp64;
f32 sp60;
UNUSED f32 sp64;
UNUSED f32 sp60;
s16 waypoint1;
s16 waypoint2;
f32 sp5C;
UNUSED f32 sp5C;
f32 temp_f2_4;
s32 playerId;
s32 pathIndex;
@ -6410,7 +6410,7 @@ void func_800188F4(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) {
camera->rot[2] = 0;
}
void func_80019118(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
void func_80019118(s32 playerId, f32 arg1, s32 cameraId, UNUSED s16 pathIndex) {
Camera* camera = cameras + cameraId;
s32 test = gWaypointCountByPathIndex[0];
f32 temp_f12;
@ -6439,7 +6439,7 @@ void func_80019118(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
camera->pos[2] = D_80164638[cameraId];
}
void func_8001933C(Camera *camera, UNUSED Player *playerArg, s32 arg2, s32 cameraId) {
void func_8001933C(Camera *camera, UNUSED Player *playerArg, UNUSED s32 arg2, s32 cameraId) {
s16 cameraWaypoint;
s16 playerWaypoint;
UNUSED s32 pad;
@ -6491,7 +6491,7 @@ void func_8001968C(void) {
D_80164678[0] = 3;
}
void func_8001969C(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
void func_8001969C(UNUSED s32 playerId, UNUSED f32 arg1, s32 cameraId, UNUSED s16 pathIndex) {
TrackWaypoint *waypoint;
gNearestWaypointByCameraId[cameraId] = gWaypointCountByPathIndex[0] - 18;
@ -6506,7 +6506,7 @@ void func_8001969C(s32 playerId, f32 arg1, s32 cameraId, s16 pathIndex) {
D_80164678[cameraId] = 0;
}
void func_80019760(Camera *camera, UNUSED Player *player, s32 arg2, s32 cameraId) {
void func_80019760(Camera *camera, UNUSED Player *player, UNUSED s32 arg2, s32 cameraId) {
UNUSED s32 pad[2];
f32 xdiff;
f32 ydiff;
@ -6767,7 +6767,7 @@ void func_8001A124(s32 arg0, s32 arg1) {
}
}
void func_8001A220(s32 arg0, s32 cameraId) {
void func_8001A220(UNUSED s32 arg0, s32 cameraId) {
switch (random_int(6)) {
case 0:
D_80164680[cameraId] = 4;
@ -6853,7 +6853,7 @@ void func_8001A518(s32 arg0, s32 arg1, s32 arg2) {
}
}
void func_8001A588(u16 *localD_80152300, Camera *camera, Player *player, s8 index, s32 cameraIndex) {
void func_8001A588(UNUSED u16 *localD_80152300, Camera *camera, Player *player, s8 index, s32 cameraIndex) {
s32 var_v1;
UnkStruct_46D0 *temp_v0_4;
s32 sp44;
@ -6999,7 +6999,7 @@ void func_8001AB00(void) {
}
}
void kart_ai_decisions_branch_item(s32 arg0, s16 *arg1, s32 arg2) {
void kart_ai_decisions_branch_item(UNUSED s32 arg0, s16 *arg1, s32 arg2) {
s32 value = -1;
switch (arg2) {
case ITEM_FAKE_ITEM_BOX:

14
src/code_80005FD0.h
View File

@ -156,7 +156,7 @@ void func_800120C8(void);
void func_80012190(void);
void func_80012220(VehicleStuff*);
void init_course_vehicles(void);
void func_80012780(TrainCarStuff*, s16*, u16);
void func_80012780(TrainCarStuff*, PathNoY *, u16);
void func_800127E0(void);
void func_80012A48(TrainCarStuff*, s16);
void update_vehicle_trains(void);
@ -201,19 +201,19 @@ void func_80015390(Camera*, Player*, s32);
void func_80015544(s32, f32, s32, s32);
void func_8001577C(Camera*, UNUSED Player*, s32, s32);
void func_80015A9C(s32, f32, s32, s16);
void func_80015C94(Camera*, s32, s32, s32);
void func_80015C94(Camera*, Player *, s32, s32);
void func_800162CC(s32, f32, s32, s16);
void func_80016494(Camera*, s32, s32, s32);
void func_80016494(Camera*, Player *, s32, s32);
void func_80016C3C(s32, f32, s32);
void func_80017720(s32, f32, s32, s16);
void func_800178F4(Camera*, s32, s32, s32);
void func_800178F4(Camera*, Player *, s32, s32);
void func_80017F10(s32, f32, s32, s16);
void func_800180F0(Camera*, s32, s32, s32);
void func_800180F0(Camera*, Player *, s32, s32);
void func_80018718(s32, f32, s32, s16);
void func_800188F4(Camera*, s32, s32, s32);
void func_800188F4(Camera*, Player *, s32, s32);
void func_80019118(s32, f32, s32, s16);
void func_8001933C(Camera*, UNUSED Player*, s32, s32);
@ -306,7 +306,7 @@ extern u16 gKartAIBehaviourState[];
enum {
KART_AI_BEHAVIOUR_STATE_NONE,
KART_AI_BEHAVIOUR_STATE_START,
KART_AI_BEHAVIOUR_STATE_RUNNING,
KART_AI_BEHAVIOUR_STATE_RUNNING
};
extern s16 D_80163300[];

6
src/code_80057C60.c
View File

@ -1082,7 +1082,7 @@ void render_hud_2p_horizontal_player_two_horizontal_player_one(void) {
if (gHUDDisable == 0) {
render_hud_timer(PLAYER_ONE);
if (playerHUD[PLAYER_ONE].lapCount != 3) {
draw_hud_2d_texture_32x8(playerHUD[PLAYER_ONE].lapX, playerHUD[PLAYER_ONE].lapY, common_texture_hud_lap); // draw the lap word
draw_hud_2d_texture_32x8(playerHUD[PLAYER_ONE].lapX, playerHUD[PLAYER_ONE].lapY, (u8*) common_texture_hud_lap); // draw the lap word
draw_lap_count(playerHUD[PLAYER_ONE].lapX + 0xC, playerHUD[PLAYER_ONE].lapY - 4, playerHUD[PLAYER_ONE].alsoLapCount);
draw_item_window(PLAYER_ONE);
}
@ -1097,7 +1097,7 @@ void render_hud_2p_horizontal_player_two(void) {
if (gHUDDisable == 0) {
render_hud_timer(PLAYER_TWO);
if (playerHUD[PLAYER_TWO].lapCount != 3) {
draw_hud_2d_texture_32x8(playerHUD[PLAYER_TWO].lapX, playerHUD[PLAYER_TWO].lapY, common_texture_hud_lap);
draw_hud_2d_texture_32x8(playerHUD[PLAYER_TWO].lapX, playerHUD[PLAYER_TWO].lapY, (u8*) common_texture_hud_lap);
draw_lap_count(playerHUD[PLAYER_TWO].lapX + 0xC, playerHUD[PLAYER_TWO].lapY - 4, playerHUD[PLAYER_TWO].alsoLapCount);
draw_item_window(PLAYER_TWO);
}
@ -3493,7 +3493,7 @@ void func_8005F90C(Player *player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005F90C.s")
#endif
void func_80060504(Player *player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) {
void func_80060504(Player *player, s16 arg1, s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4) {
UNUSED s32 thing1;
s16 thing2;
UNUSED s32 thing3;

35
src/code_8006E9C0.c
View File

@ -23,6 +23,7 @@
#include "render_objects.h"
#include "code_80091750.h"
#include "src/data/some_data.h"
#include "effects.h"
void init_hud(void) {
@ -129,11 +130,11 @@ void func_8006EE44(void) {
void init_item_window(s32 objectIndex) {
ItemWindowObjects *temp_v0;
temp_v0 = &gObjectList[objectIndex];
temp_v0 = (ItemWindowObjects *)&gObjectList[objectIndex];
temp_v0->currentItem = ITEM_NONE;
temp_v0->itemDisplay = temp_v0->currentItem;
temp_v0->tlutList = (s32 *) common_tlut_item_window_none;
temp_v0->activeTLUT = (s32 *) common_tlut_item_window_none;
temp_v0->tlutList = (u8 *) common_tlut_item_window_none;
temp_v0->activeTLUT = (u8 *) common_tlut_item_window_none;
temp_v0->textureList = common_texture_item_window_none;
temp_v0->activeTexture = common_texture_item_window_none;
temp_v0->unk_04C = -1;
@ -143,7 +144,7 @@ void init_item_window(s32 objectIndex) {
}
void func_8006EEE8(s32 courseId) {
D_8018D240 = dma_textures(gCourseOutlineTextures[courseId], D_800E5520[courseId], D_800E5520[courseId]);
D_8018D240 = (s32)dma_textures(gCourseOutlineTextures[courseId], D_800E5520[courseId], D_800E5520[courseId]);
// This is incredibly dumb. D_800E5548 ought to be something more like
// `u16 D_800E5548[][2]` but that doesn't match for some insane reason
D_8018D2B0 = D_800E5548[courseId * 2];
@ -178,7 +179,7 @@ void func_8006F008(void) {
}
switch (gCurrentCourseId) {
case COURSE_MARIO_RACEWAY:
D_8018D220 = dma_textures(gTextureExhaust5, 0x443, 0x1000);
D_8018D220 = (void *)dma_textures(gTextureExhaust5, 0x443, 0x1000);
D_8018D2A0 = 0.022f;
D_8018D2E0 = 6;
D_8018D2E8 = 28;
@ -201,14 +202,14 @@ void func_8006F008(void) {
D_8018D2E8 = 48;
break;
case COURSE_BANSHEE_BOARDWALK:
D_80165880 = dma_textures(gTextureGhosts, 0x4CC2, 0xD980);
D_80165880 = (void *)dma_textures(gTextureGhosts, 0x4CC2, 0xD980);
D_8018D2A0 = 0.016f;
D_8018D2C0[0] = 0x0106;
D_8018D2E0 = 55;
D_8018D2E8 = 39;
break;
case COURSE_YOSHI_VALLEY:
D_8018D220 = dma_textures(gTextureExhaust0, 0x479, 0xC00);
D_8018D220 = (void *)dma_textures(gTextureExhaust0, 0x479, 0xC00);
D_8018D2A0 = 0.018f;
D_8018D2E0 = 61;
D_8018D2E8 = 38;
@ -223,14 +224,14 @@ void func_8006F008(void) {
D_8018D310 = 255;
break;
case COURSE_KOOPA_BEACH:
D_8018D220 = dma_textures(gTextureExhaust3, 0x3C8U, 0x1000);
D_8018D220 = (void *)dma_textures(gTextureExhaust3, 0x3C8U, 0x1000);
D_8018D2A0 = 0.014f;
D_8018D2C0[0] = 268;
D_8018D2E0 = 40;
D_8018D2E8 = 21;
break;
case COURSE_ROYAL_RACEWAY:
D_8018D220 = dma_textures(gTextureExhaust4, 0x3F8, 0x1000);
D_8018D220 = (void *)dma_textures(gTextureExhaust4, 0x3F8, 0x1000);
D_8018D2C0[0] = 262;
D_8018D2A0 = 0.014f;
D_8018D2E0 = 37;
@ -240,7 +241,7 @@ void func_8006F008(void) {
D_80165728 = -330;
break;
case COURSE_LUIGI_RACEWAY:
D_8018D220 = dma_textures(gTextureExhaust2, 0x4F4U, 0xC00);
D_8018D220 = (void *)dma_textures(gTextureExhaust2, 0x4F4U, 0xC00);
D_8018D2A0 = 0.0155f;
D_8018D2C0[0] = 271;
D_8018D2E0 = 45;
@ -250,7 +251,7 @@ void func_8006F008(void) {
D_80165728 = -215;
break;
case COURSE_MOO_MOO_FARM:
D_8018D220 = dma_textures(gTextureExhaust0, 0x479, 0xC00);
D_8018D220 = (void *)dma_textures(gTextureExhaust0, 0x479, 0xC00);
D_8018D2A0 = 0.0155f;
D_8018D2C0[0] = 271;
D_8018D2E0 = 18;
@ -265,13 +266,13 @@ void func_8006F008(void) {
case COURSE_KALAMARI_DESERT:
D_8018D2C0[0] = 263;
D_8018D2D8[0] = 165;
D_8018D220 = dma_textures(gTextureExhaust5, 0x443, 0x1000);
D_8018D220 = (void *)dma_textures(gTextureExhaust5, 0x443, 0x1000);
D_8018D2A0 = 0.015f;
D_8018D2E0 = 55;
D_8018D2E8 = 27;
break;
case COURSE_SHERBET_LAND:
D_8018D220 = dma_textures(gTextureExhaust1, 0x485, 0xC00);
D_8018D220 = (void *)dma_textures(gTextureExhaust1, 0x485, 0xC00);
D_8018D2A0 = 0.015f;
D_8018D2C0[0] = 262;
D_8018D2E0 = 52;
@ -609,14 +610,14 @@ void init_cloud_object(s32 objectIndex, s32 arg1, CloudData *arg2) {
ItemWindowObjects *temp_v0;
init_object(objectIndex, arg1);
temp_v0 = &gObjectList[objectIndex];
temp_v0 = (ItemWindowObjects *)&gObjectList[objectIndex];
temp_v0->unk_0D5 = arg2->subType;
temp_v0->currentItem = ITEM_NONE;
temp_v0->direction_angle[1] = arg2->rotY;
temp_v0->unk_09E = arg2->posY;
temp_v0->sizeScaling = (f32) arg2->scalePercent / 100.0;
temp_v0->activeTexture = &D_8018D220[arg2->subType];
func_80073404(objectIndex, 0x40U, 0x20U, &D_0D005FB0[0]);
temp_v0->activeTexture = (u8 *)&D_8018D220[arg2->subType];
func_80073404(objectIndex, 0x40U, 0x20U, D_0D005FB0);
temp_v0->primAlpha = 0x00FF;
}
@ -652,7 +653,7 @@ void init_star_object(s32 objectIndex, s32 arg1, StarData *arg2) {
ItemWindowObjects *temp_v0;
init_object(objectIndex, arg1);
temp_v0 = &gObjectList[objectIndex];
temp_v0 = (ItemWindowObjects *)&gObjectList[objectIndex];
temp_v0->unk_0D5 = arg2->subType;
temp_v0->currentItem = ITEM_BANANA;
temp_v0->direction_angle[1] = arg2->rotY;

2
src/code_80086E70.c
View File

@ -1684,7 +1684,7 @@ void func_8008B284(s32 objectIndex) {
void func_8008B3E4(s32 objectIndex) {
Objects *temp_v0;
SplineData *spline;
UNUSED SplineData *spline;
if (is_obj_index_flag_status_inactive(objectIndex, 8) != 0) {
temp_v0 = &gObjectList[objectIndex];

412
src/code_80091750.c
View File

File diff suppressed because it is too large Load Diff

12
src/code_80091750.h
View File

@ -116,7 +116,7 @@ void func_8009265C(void);
void func_80092688(void);
void func_80092C80(void);
s32 char_to_glyph_index(char*);
s32 func_80092DF8(s8*);
s32 func_80092DF8(char*);
s32 func_80092E1C(char*);
s32 func_80092EE4(char*);
s32 get_string_width(char*);
@ -157,15 +157,15 @@ Gfx *draw_flash_select_case_fast(Gfx*, s32, s32, s32, s32);
Gfx *func_800959F8(Gfx*, Vtx*);
void func_80095AE0(Mtx*, f32, f32, f32, f32);
Gfx *func_80095BD0(Gfx*, u8*, f32, f32, u32, u32, f32, f32);
Gfx *func_80095E10(Gfx*, s8, s32, s32, s32, s32, s32, s32, s32, s32, s32, u32, u32);
Gfx *func_800963F0(Gfx*, s8, s32, s32, f32, f32, s32, s32, s32, s32, s32, s32, s32, u32, u32);
Gfx *func_80095E10(Gfx*, s8, s32, s32, s32, s32, s32, s32, s32, s32, u8 *, u32, u32);
Gfx *func_800963F0(Gfx*, s8, s32, s32, f32, f32, s32, s32, s32, s32, s32, s32, u8 *, u32, u32);
Gfx *func_80096CD8(Gfx*, s32, s32, u32, u32);
Gfx *func_80097274(Gfx*, s8, s32, s32, s32, s32, s32, s32, s32, s32, s32, u32, u32, u32);
Gfx *func_80097A14(Gfx*, s8, s32, s32, s32, s32, s32, s32, s32, u32, u32);
Gfx *func_80097274(Gfx*, s8, s32, s32, s32, s32, s32, s32, s32, s32, u8 *, u32, u32, u32);
Gfx *func_80097A14(Gfx*, s8, s32, s32, s32, s32, s32, s32, u8*, u32, u32);
Gfx *func_80097AE4(Gfx*, s8, s32, s32, u8*, s32);
Gfx *func_80097E58(Gfx*, s8, s32, s32, s32, s32, s32, s32, u8*, u32, s32, u32);
Gfx *func_80098558(Gfx*, u32, u32, u32, u32, u32, u32, s32, s32);
Gfx *func_800987D0(Gfx*, u32, u32, u32, u32, s32, s32, s32, u32, s32);
Gfx *func_800987D0(Gfx*, u32, u32, u32, u32, s32, s32, u8*, u32, s32);
Gfx *draw_box_fill(Gfx*, s32, s32, s32, s32, s32, s32, s32, s32);
Gfx *draw_box(Gfx*, s32, s32, s32, s32, s32, s32, s32, s32);
Gfx *func_80098FC8(Gfx*, s32, s32, s32, s32);

53
src/data/some_data.c
View File

@ -354,7 +354,7 @@ f32 D_800E594C[][2] = {
s16 D_800E597C[] = { 0x0000, 0x0000, 0x4000, 0x8000, 0x8000, 0xc000 };
// Seems to be related to the Boos in Banshee Boardwalk
SplineData23 D_800E5988 = {
SplineData D_800E5988 = {
0x0016,
{
{{ 0x0005, 0x0011, 0x0032 }, 0x0028 },
@ -384,7 +384,7 @@ SplineData23 D_800E5988 = {
};
// Seems to be related to the Boos in Banshee Boardwalk
SplineData24 D_800E5A44 = {
SplineData D_800E5A44 = {
0x0017,
{
{{ 0x0000, 0x0011, 0xffce }, 0x0028 },
@ -415,7 +415,7 @@ SplineData24 D_800E5A44 = {
};
// Seems to be related to the Boos in Banshee Boardwalk
SplineData25 D_800E5B08 = {
SplineData D_800E5B08 = {
0x0018,
{
{{ 0xfff1, 0x000a, 0x0000 }, 0x0014 },
@ -447,7 +447,7 @@ SplineData25 D_800E5B08 = {
};
// Seems to be related to the Boos in Banshee Boardwalk
SplineData23 D_800E5BD4 = {
SplineData D_800E5BD4 = {
0x0016,
{
{{ 0x0005, 0x0011, 0x0032 }, 0x001e },
@ -477,7 +477,7 @@ SplineData23 D_800E5BD4 = {
};
// Seems to be related to the Boos in Banshee Boardwalk
SplineData24 D_800E5C90 = {
SplineData D_800E5C90 = {
0x0017,
{
{{ 0x0000, 0x0011, 0xffce }, 0x0019 },
@ -508,7 +508,7 @@ SplineData24 D_800E5C90 = {
};
// Only referenced in func_8007D070, which itself is unused
SplineDataUnused4 D_800E5D54 = {
SplineData D_800E5D54 = {
0x0004,
{
{{ 0x0000, 0x0010, 0x0000 }, 0x0032 },
@ -519,7 +519,7 @@ SplineDataUnused4 D_800E5D54 = {
};
// Unused?
SplineDataUnused4 D_800E5D78 = {
SplineData D_800E5D78 = {
0x0004,
{
{{ 0x0000, 0x0000, 0x0000 }, 0x000a },
@ -531,7 +531,11 @@ SplineDataUnused4 D_800E5D78 = {
// Note the use of the plain SplineData type here. Since these are pointers, we don't care
// about their internal array size
SplineData *D_800E5D9C[] = { &D_800E5988, &D_800E5A44, &D_800E5B08, &D_800E5BD4, &D_800E5C90 };
SplineData *D_800E5D9C[] = {
&D_800E5988, &D_800E5A44,
&D_800E5B08, &D_800E5BD4,
&D_800E5C90
};
// Unused
SplineData *D_800E5DB0 = &D_800E5988;
@ -633,7 +637,7 @@ s16 D_800E5FD0[] = {
};
// Something related to seagulls in Koopa Troopa Beach, not sure of its exact nature
SplineData23 D_800E6034 = {
SplineData D_800E6034 = {
0x0016,
{
{{ 0x0032, 0x00aa, 0x01f4 }, 0x0028 },
@ -663,7 +667,7 @@ SplineData23 D_800E6034 = {
};
// Something related to seagulls in Koopa Troopa Beach, not sure of its exact nature
SplineData24 D_800E60F0 = {
SplineData D_800E60F0 = {
0x0017,
{
{{ 0x0000, 0x00aa, 0xfe0c }, 0x0028 },
@ -694,7 +698,7 @@ SplineData24 D_800E60F0 = {
};
// Something related to seagulls in Koopa Troopa Beach, not sure of its exact nature
SplineData25 D_800E61B4 = {
SplineData D_800E61B4 = {
0x0018,
{
{{ 0xff6a, 0x0064, 0x0000 }, 0x0014 },
@ -726,7 +730,7 @@ SplineData25 D_800E61B4 = {
};
// Something related to seagulls in Koopa Troopa Beach, not sure of its exact nature
SplineData23 D_800E6280 = {
SplineData D_800E6280 = {
0x0016,
{
{{ 0xffce, 0x00aa, 0xfe0c }, 0x0028 },
@ -757,7 +761,10 @@ SplineData23 D_800E6280 = {
// Note the use of the plain SplineData type here. Since these are pointers, we don't care
// about their internal array size
SplineData *D_800E633C[] = { &D_800E6034, &D_800E60F0, &D_800E61B4, &D_800E6280 };
SplineData *D_800E633C[] = {
&D_800E6034, &D_800E60F0,
&D_800E61B4, &D_800E6280
};
// Might be Cheep Cheep related?
Vec3s D_800E634C[] = {
@ -803,7 +810,7 @@ MoleSpawnUnion gMoleSpawns = {
};
// Referenced by D_800E6724, which is unused
SplineData23 D_800E641C = {
SplineData D_800E641C = {
0x0016,
{
{{ 0x0014, 0x0000, 0x00c8 }, 0x0050 },
@ -833,7 +840,7 @@ SplineData23 D_800E641C = {
};
// Referenced by D_800E6724, which is unused
SplineData24 D_800E64D8 = {
SplineData D_800E64D8 = {
0x0017,
{
{{ 0x0000, 0x0000, 0xffce }, 0x0050 },
@ -864,7 +871,7 @@ SplineData24 D_800E64D8 = {
};
// Something related to the penguins in Sherbet Land, not sure of its exact nature
SplineData25 D_800E659C = {
SplineData D_800E659C = {
0x0018,
{
{{ 0xffec, 0x0000, 0x0000 }, 0x0050 },
@ -896,7 +903,7 @@ SplineData25 D_800E659C = {
};
// Something related to the penguins in Sherbet Land, not sure of its exact nature
SplineData23 D_800E6668 = {
SplineData D_800E6668 = {
0x0016,
{
{{ 0x0005, 0x0000, 0x0032 }, 0x0050 },
@ -955,7 +962,7 @@ s16 gTorchSpawns[] = {
0xffca, 0xfff8, 0x0270,
};
SplineData15 D_800E67B8 = {
SplineData D_800E67B8 = {
0x000d,
{
{{ 0x0096, 0x00cc, 0xfe0c }, 0x0014 },
@ -977,7 +984,7 @@ SplineData15 D_800E67B8 = {
};
// Appears to be related to Lakitu waving the checkered flag
SplineData21 D_800E6834 = {
SplineData D_800E6834 = {
0x0014,
{
{{ 0x0014, 0x0012, 0x001e }, 0x0028 },
@ -1005,7 +1012,7 @@ SplineData21 D_800E6834 = {
};
// Unused struct?
SplineDataUnused13 D_800E68E0 = {
SplineData D_800E68E0 = {
0x000c,
{
{{ 0x001e, 0x0018, 0x0078 }, 0x000a },
@ -1025,7 +1032,7 @@ SplineDataUnused13 D_800E68E0 = {
};
// Appears to be related to Lakitu Second Lap animation
SplineData12 D_800E694C = {
SplineData D_800E694C = {
0x000b,
{
{{ 0x0032, 0x0014, 0x0050 }, 0x000a },
@ -1044,7 +1051,7 @@ SplineData12 D_800E694C = {
};
// Appears to be related to Lakitu Reverse animation
SplineData8 D_800E69B0 = {
SplineData D_800E69B0 = {
0x0007,
{
{{ 0x001e, 0x000e, 0x0032 }, 0x0028 },
@ -1059,7 +1066,7 @@ SplineData8 D_800E69B0 = {
};
// Might be related to Lakitu doing the countdown?
SplineData8 D_800E69F4 = {
SplineData D_800E69F4 = {
0x0007,
{
{{ 0x0000, 0x0012, 0xfffb }, 0x0014 },

42
src/data/some_data.h
View File

@ -38,13 +38,13 @@ extern ThwompSpawn gThomwpSpawns150CC[];
extern f32 D_800E594C[][2];
extern u64 D_800E5974;
extern s16 D_800E597C[];
extern SplineData23 D_800E5988;
extern SplineData24 D_800E5A44;
extern SplineData25 D_800E5B08;
extern SplineData23 D_800E5BD4;
extern SplineData24 D_800E5C90;
extern SplineDataUnused4 D_800E5D54;
extern SplineDataUnused4 D_800E5D78;
extern SplineData D_800E5988;
extern SplineData D_800E5A44;
extern SplineData D_800E5B08;
extern SplineData D_800E5BD4;
extern SplineData D_800E5C90;
extern SplineData D_800E5D54;
extern SplineData D_800E5D78;
extern SplineData *D_800E5D9C[];
extern SplineData *D_800E5DB0;
extern s8 D_800E5DB4[];
@ -54,28 +54,28 @@ extern Vec3s gHedgehogPatrolPoints[];
extern SnowmanSpawn gSnowmanSpawns[];
extern CrabSpawn gCrabSpawns[];
extern s16 D_800E5FD0[];
extern SplineData23 D_800E6034;
extern SplineData24 D_800E60F0;
extern SplineData25 D_800E61B4;
extern SplineData23 D_800E6280;
extern SplineData D_800E6034;
extern SplineData D_800E60F0;
extern SplineData D_800E61B4;
extern SplineData D_800E6280;
extern SplineData *D_800E633C[];
extern Vec3s D_800E634C[];
extern MoleSpawnUnion gMoleSpawns;
extern SplineData23 D_800E641C;
extern SplineData24 D_800E64D8;
extern SplineData25 D_800E659C;
extern SplineData23 D_800E6668;
extern SplineData D_800E641C;
extern SplineData D_800E64D8;
extern SplineData D_800E659C;
extern SplineData D_800E6668;
extern SplineData *D_800E6724[];
extern SplineData *D_800E672C[];
extern Vec3f D_800E6734[];
// This should really be `extern Vec3s gTorchSpawns[];`
extern s16 gTorchSpawns[];
extern SplineData15 D_800E67B8;
extern SplineData21 D_800E6834;
extern SplineDataUnused13 D_800E68E0;
extern SplineData12 D_800E694C;
extern SplineData8 D_800E69B0;
extern SplineData8 D_800E69F4;
extern SplineData D_800E67B8;
extern SplineData D_800E6834;
extern SplineData D_800E68E0;
extern SplineData D_800E694C;
extern SplineData D_800E69B0;
extern SplineData D_800E69F4;
extern CloudData gLuigiRacewayClouds[];
extern CloudData gYoshiValleyMooMooFarmClouds[];
extern CloudData gKoopaTroopaBeachClouds[];

11
src/effects.c
View File

@ -16,6 +16,7 @@
#include "effects.h"
#include "audio/external.h"
#include "spawn_players.h"
#include "code_80091750.h"
s32 D_8018D900[8];
s16 D_8018D920[8];
@ -1839,13 +1840,13 @@ void func_80090868(Player* player) {
}
void func_80090970(Player *player, s8 playerId, s8 arg2) {
s32 stackPadding0;
s32 stackPadding1;
UNUSED s32 stackPadding0;
UNUSED s32 stackPadding1;
Vec3f sp44;
Vec3f sp38;
TrackWaypoint *waypoint;
s32 stackPadding2;
s32 stackPadding3;
UNUSED s32 stackPadding2;
UNUSED s32 stackPadding3;
player->unk_0C2 = 0x000C;
player->unk_078 = 0;
@ -2077,7 +2078,7 @@ void func_800911B4(Player* player, s8 arg1) {
void func_80091298(Player *player, s8 arg1) {
s16 var_v1;
s32 stackPadding1;
UNUSED s32 stackPadding1;
Vec3f spC = { 27.167f, 25.167f, 23.167f };
player->unk_044 |= 0x2000;

2
src/ending/ceremony_and_credits.c
View File

@ -96,7 +96,7 @@ UNUSED void func_80282050(Vec3f dest, Vec3f src, s16 angle) {
dest[2] = (sp2C[2] * coss(angle)) - (sp2C[0] * sins(angle));
}
UNUSED void func_802820F8(f32 *dest, f32 *src, s16 angle) {
UNUSED void func_802820F8(Vec3f dest, Vec3f src, s16 angle) {
Vec3f sp2C;
vec3f_copy_return_dupe(sp2C, src);

2
src/ending/ceremony_and_credits.h
View File

@ -121,7 +121,7 @@ void func_80282048(void);
void func_80282050(Vec3f, Vec3f, s16);
void func_802820F8(Vec3f, Vec3f, s16);
s32 f32_lerp(f32*, f32, f32);
s32 func_80282200(s16*, s16, s16);
s32 func_80282200(Vec3s, s16, s16);
s32 set_transition_colour_fade_alpha_ending(f32*, f32, f32);
s32 func_80282364(s16*, s16, s16);
void reset_spline(void);

20
src/ending/code_80281780.c
View File

@ -134,25 +134,25 @@ void load_ceremony_cutscene(void) {
gSurfaceMap = (mk64_surface_map_ram *) gNextFreeMemoryAddress;
//! @bug these segmented addresses need to be symbols for mobility
// d_course_royal_raceway_packed_dl_67E8
set_vertex_data_with_default_section_id(0x070067E8, -1);
set_vertex_data_with_default_section_id((Gfx *)0x070067E8, -1);
// d_course_royal_raceway_packed_dl_AEF8
set_vertex_data_with_default_section_id(0x0700AEF8, -1);
set_vertex_data_with_default_section_id((Gfx *)0x0700AEF8, -1);
// d_course_royal_raceway_packed_dl_A970
set_vertex_data_with_default_section_id(0x0700A970, 8);
set_vertex_data_with_default_section_id((Gfx *)0x0700A970, 8);
// d_course_royal_raceway_packed_dl_AC30
set_vertex_data_with_default_section_id(0x0700AC30, 8);
set_vertex_data_with_default_section_id((Gfx *)0x0700AC30, 8);
// d_course_royal_raceway_packed_dl_CE0
set_vertex_data_with_default_section_id(0x07000CE0, 0x10);
set_vertex_data_with_default_section_id((Gfx *)0x07000CE0, 0x10);
// d_course_royal_raceway_packed_dl_E88
set_vertex_data_with_default_section_id(0x07000E88, 0x10);
set_vertex_data_with_default_section_id((Gfx *)0x07000E88, 0x10);
// d_course_royal_raceway_packed_dl_A618
set_vertex_data_with_default_section_id(0x0700A618, -1);
set_vertex_data_with_default_section_id((Gfx *)0x0700A618, -1);
// d_course_royal_raceway_packed_dl_A618
set_vertex_data_with_default_section_id(0x0700A618, -1);
set_vertex_data_with_default_section_id((Gfx *)0x0700A618, -1);
// d_course_royal_raceway_packed_dl_23F8
set_vertex_data_with_default_section_id(0x070023F8, 1);
set_vertex_data_with_default_section_id((Gfx *)0x070023F8, 1);
// d_course_royal_raceway_packed_dl_2478
set_vertex_data_with_default_section_id(0x07002478, 1);
set_vertex_data_with_default_section_id((Gfx *)0x07002478, 1);
func_80295C6C();
debug_switch_character_ceremony_cutscene();
func_802818BC();

2
src/ending/code_80281C40.c
View File

@ -32,7 +32,7 @@ void func_80281C40(void) {
s32 i;
for (i = 0; i < D_802874FC; i++) {
func_800579F8(D_80287560[i].unk0, D_80287560[i].unk2, (s8 *) D_80287560[i].unk8, D_80287560[i].unk4);
func_800579F8(D_80287560[i].unk0, D_80287560[i].unk2, (char *) D_80287560[i].unk8, D_80287560[i].unk4);
}
}

2
src/kart_dma.c
View File

@ -1834,7 +1834,7 @@ void load_kart_palette(Player *player, s8 playerId, s8 arg2, s8 arg3) {
#ifdef AVOID_UB
struct_D_802F1F80 *temp_s0 = &D_802F1F80[arg3][arg2][playerId];
#else
struct_D_802F1F80 *temp_s0 = &D_802F1F80[arg3][arg2][playerId * 0x100];
struct_D_802F1F80 *temp_s0 = (struct_D_802F1F80 *) &D_802F1F80[arg3][arg2][playerId * 0x100];
#endif
switch(gActiveScreenMode) {
case SCREEN_MODE_1P:

2
src/math_util_2.c
View File

@ -469,7 +469,7 @@ void func_800419F8(void) {
pos[0] = 0.0f;
pos[1] = 0.0f;
pos[2] = 120.0f;
vec3f_rotate_x_y(vec, pos, D_80165834);
vec3f_rotate_x_y(vec, pos, (s16*) D_80165834);
D_80165840[0] = vec[0];
D_80165840[1] = vec[1];
D_80165840[2] = vec[2];

4
src/menus.c
View File

@ -232,7 +232,7 @@ void options_menu_act(struct Controller *controller, u16 arg1) {
if (!func_800B4520()) {
sp38 = find_8018D9E0_entry_dupe(0xF0);
sp30 = D_8018D9C0;
sp30 = (struct_8018EE10_entry *) D_8018D9C0;
switch (D_8018EDEC) {
case 0x15:
case 0x16:
@ -1996,7 +1996,7 @@ bool func_800B4520(void) {
UNUSED void func_800B4560(s32 arg0, s32 arg1) {
struct_8018EE10_entry *pak1 = D_8018EE10;
struct_8018EE10_entry *pak2 = D_8018D9C0;
struct_8018EE10_entry *pak2 = (struct_8018EE10_entry *) D_8018D9C0;
rmonPrintf("ghost_kart=%d,", D_80162DE0);
rmonPrintf("pak1_ghost_kart=%d,", (pak1 + arg0)->characterId);

24
src/racing/collision.c
View File

@ -635,18 +635,18 @@ void func_802AC114(Vec3f pos1, f32 boundingBoxSize, Vec3f pos2, UNUSED f32 unk)
s32 func_802AC22C(KartBoundingBoxCorner *arg0) {
Collision spD0;
s32 stackPadding0;
s32 stackPadding1;
s32 stackPadding2;
s32 stackPadding3;
s32 stackPadding4;
s32 stackPadding5;
s32 stackPadding6;
s32 stackPadding7;
s32 stackPadding8;
s32 stackPadding9;
s32 stackPaddingA;
s32 stackPaddingB;
UNUSED s32 stackPadding0;
UNUSED s32 stackPadding1;
UNUSED s32 stackPadding2;
UNUSED s32 stackPadding3;
UNUSED s32 stackPadding4;
UNUSED s32 stackPadding5;
UNUSED s32 stackPadding6;
UNUSED s32 stackPadding7;
UNUSED s32 stackPadding8;
UNUSED s32 stackPadding9;
UNUSED s32 stackPaddingA;
UNUSED s32 stackPaddingB;
s32 temp1;
s32 temp2;
f32 temp_f22;

1
src/racing/collision.h
View File

@ -19,6 +19,7 @@ s16 func_802ABDB8(u16);
s16 func_802ABDF4(u16);
f32 func_802ABE30(f32, f32, f32, u16);
f32 func_802ABEAC(Collision*, Vec3f);
void shell_collision(Collision *, Vec3f);
void process_shell_collision(Vec3f, f32, Vec3f, f32);
u16 process_collision(Player*, KartBoundingBoxCorner*, f32, f32, f32);
void func_802AC114(Vec3f, f32, Vec3f, f32);

4
src/racing/math_util.c
View File

@ -25,10 +25,10 @@ UNUSED s32 func_802B4F60(UNUSED s32 arg0, Vec3f arg1, UNUSED s32 arg2, UNUSED f3
sp28 = sp1C[0];
sp2C = sp1C[1];
// wut?
if (sp2C && sp2C);
if (sp2C && sp2C) {};
sp2C = ((sp30[0][3] * sp28) + (sp30[1][3] * sp2C) + (sp30[2][3] * sp1C[2])) + sp30[3][3];
// double wut?
if (sp28 && sp28);
if (sp28 && sp28) {};
mtxf_translate_vec3f_mat4(sp1C, sp30);
if (0.0f >= sp2C)
{

1
src/racing/math_util.h
View File

@ -35,6 +35,7 @@ void add_translate_mat4_vec3f(Mat4, Mat4, Vec3f);
void add_translate_mat4_vec3f_lite(Mat4, Mat4, Vec3f);
void mtxf_translate(Mat4, Vec3f);
void func_802B5564(Mat4, u16*, f32, f32, f32, f32, f32);
void func_802B5794(Mat4, Vec3f, Vec3f);
void mtxf_rotate_x(Mat4, s16);
void mtxf_rotate_y(Mat4, s16);
void mtxf_s16_rotate_z(Mat4, s16);

4
src/racing/memory.c
View File

@ -1335,7 +1335,7 @@ u8 *load_course(s32 courseId) {
CourseVtx *vertexStart; // mio0 compressed
u8 *packedStart;
u32 vertexCount;
uintptr_t 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, finalDisplaylistOffset, unknown1);
displaylist_unpack((uintptr_t *) packedStart, (uintptr_t) finalDisplaylistOffset, unknown1);
decompress_textures(textures);
gNextFreeMemoryAddress = prevLoadedAddress_saved;
return vtxCompressed;

26
src/racing/render_courses.c
View File

@ -1424,13 +1424,13 @@ void func_80295D88(void) {
switch (gCurrentCourseId) {
case COURSE_MARIO_RACEWAY:
// d_course_mario_raceway_packed_dl_1140
set_vertex_data_with_defaults((uintptr_t)0x07001140);
set_vertex_data_with_defaults((Gfx *)0x07001140);
if (gScreenModeSelection == SCREEN_MODE_1P) {
// d_course_mario_raceway_packed_dl_8E8
set_vertex_data_with_defaults((uintptr_t)0x070008E8);
set_vertex_data_with_defaults((Gfx *)0x070008E8);
} else {
// d_course_mario_raceway_packed_dl_2D68
set_vertex_data_with_defaults((uintptr_t)0x07002D68);
set_vertex_data_with_defaults((Gfx *)0x07002D68);
}
parse_course_displaylists((uintptr_t) d_course_mario_raceway_addr);
func_80295C6C();
@ -1485,7 +1485,7 @@ void func_80295D88(void) {
D_8015F8E4 = -80.0f;
break;
case COURSE_YOSHI_VALLEY:
func_802B5D64(&d_course_yoshi_valley_lights4, -0x38F0, 0x1C70, 1);
func_802B5D64((uintptr_t) &d_course_yoshi_valley_lights4, -0x38F0, 0x1C70, 1);
parse_course_displaylists((uintptr_t) d_course_yoshi_valley_addr);
func_80295C6C();
D_8015F8E4 = gCourseMinY - 10.0f;
@ -1585,22 +1585,22 @@ void func_80295D88(void) {
break;
case COURSE_BLOCK_FORT:
// d_course_block_fort_packed_dl_15C0
set_vertex_data_with_default_section_id((uintptr_t)0x070015C0, 1);
set_vertex_data_with_default_section_id((Gfx *)0x070015C0, 1);
func_80295C6C();
D_8015F8E4 = gCourseMinY - 10.0f;
break;
case COURSE_SKYSCRAPER:
// d_course_skyscraper_packed_dl_1110
set_vertex_data_with_default_section_id((uintptr_t)0x07001110, 1);
set_vertex_data_with_default_section_id((Gfx *)0x07001110, 1);
// d_course_skyscraper_packed_dl_258
set_vertex_data_with_default_section_id((uintptr_t)0x07000258, 1);
set_vertex_data_with_default_section_id((Gfx *)0x07000258, 1);
func_80295C6C();
D_8015F8E4 = -480.0f;
break;
case COURSE_DOUBLE_DECK:
// d_course_double_deck_packed_dl_738
set_vertex_data_with_default_section_id((uintptr_t)0x07000738, 1);
set_vertex_data_with_default_section_id((Gfx *)0x07000738, 1);
func_80295C6C();
D_8015F8E4 = gCourseMinY - 10.0f;
break;
@ -1613,15 +1613,15 @@ void func_80295D88(void) {
break;
case COURSE_BIG_DONUT:
// d_course_big_donut_packed_dl_1018
set_vertex_data_with_default_section_id((uintptr_t)0x07001018, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07001018, 6);
// d_course_big_donut_packed_dl_450
set_vertex_data_with_default_section_id((uintptr_t)0x07000450, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07000450, 6);
// d_course_big_donut_packed_dl_AC0
set_vertex_data_with_default_section_id((uintptr_t)0x07000AC0, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07000AC0, 6);
// d_course_big_donut_packed_dl_B58
set_vertex_data_with_default_section_id((uintptr_t)0x07000B58, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07000B58, 6);
// d_course_big_donut_packed_dl_230
set_vertex_data_with_default_section_id((uintptr_t)0x07000230, 6);
set_vertex_data_with_default_section_id((Gfx *)0x07000230, 6);
func_80295C6C();
D_8015F8E4 = 100.0f;
break;

56
src/render_objects.c
View File

@ -1888,7 +1888,7 @@ void func_8004D4E8(s32 arg0, s32 arg1, u8 *texture, s32 arg3, s32 arg4, s32 arg5
}
}
void func_8004D654(s32 arg0, s32 arg1, u8 *texture, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 width, s32 arg9, s32 argA, s32 height) {
void func_8004D654(s32 arg0, s32 arg1, u8 *texture, f32 arg3, s32 arg4, s32 arg5, s32 arg6, UNUSED s32 arg7, s32 width, s32 arg9, UNUSED s32 argA, s32 height) {
s32 i;
s32 var_s3;
u8 *textureCopy;
@ -2217,8 +2217,8 @@ void func_8004E6C4(s32 playerId) {
}
void draw_simplified_lap_count(s32 playerId) {
draw_hud_2d_texture_32x8((s32) playerHUD[playerId].lapX, playerHUD[playerId].lapY + 3, common_texture_hud_lap);
draw_hud_2d_texture_32x16(playerHUD[playerId].lapX + 0x1C, (s32) playerHUD[playerId].lapY, gHudLapTextures[playerHUD[playerId].alsoLapCount]);
draw_hud_2d_texture_32x8((s32) playerHUD[playerId].lapX, playerHUD[playerId].lapY + 3, (u8*) common_texture_hud_lap);
draw_hud_2d_texture_32x16(playerHUD[playerId].lapX + 0x1C, (s32) playerHUD[playerId].lapY, (u8*) gHudLapTextures[playerHUD[playerId].alsoLapCount]);
}
void func_8004E800(s32 playerId) {
@ -2258,26 +2258,26 @@ void func_8004EB38(s32 playerId) {
temp_s0 = &playerHUD[playerId];
if ((u8) temp_s0->unk_7B != 0) {
func_8004C9D8(temp_s0->lap1CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000080, common_texture_hud_time, 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004C9D8(temp_s0->lap1CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000080, (u8*) common_texture_hud_time, 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004F950((s32) temp_s0->lap1CompletionTimeX, (s32) temp_s0->timerY, 0x00000080, (s32) temp_s0->someTimer);
}
if ((u8) temp_s0->unk_7C != 0) {
func_8004C9D8(temp_s0->lap2CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000050, common_texture_hud_time, 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004C9D8(temp_s0->lap2CompletionTimeX - 0x13, temp_s0->timerY + 8, 0x00000050, (u8*) common_texture_hud_time, 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004F950((s32) temp_s0->lap2CompletionTimeX, (s32) temp_s0->timerY, 0x00000050, (s32) temp_s0->someTimer);
}
if ((u8) temp_s0->unk_7E != 0) {
func_8004C9D8((s32) temp_s0->lapAfterImage1X, temp_s0->lapY + 3, 0x00000080, common_texture_hud_lap, 0x00000020, 8, 0x00000020, 8);
func_8004C9D8(temp_s0->lapAfterImage1X + 0x1C, (s32) temp_s0->lapY, 0x00000080, gHudLapTextures[temp_s0->alsoLapCount], 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004C9D8((s32) temp_s0->lapAfterImage1X, temp_s0->lapY + 3, 0x00000080, (u8*) common_texture_hud_lap, 0x00000020, 8, 0x00000020, 8);
func_8004C9D8(temp_s0->lapAfterImage1X + 0x1C, (s32) temp_s0->lapY, 0x00000080, (u8*) gHudLapTextures[temp_s0->alsoLapCount], 0x00000020, 0x00000010, 0x00000020, 0x00000010);
}
if ((u8) temp_s0->unk_7F != 0) {
func_8004C9D8((s32) temp_s0->lapAfterImage2X, temp_s0->lapY + 3, 0x00000050, common_texture_hud_lap, 0x00000020, 8, 0x00000020, 8);
func_8004C9D8(temp_s0->lapAfterImage2X + 0x1C, (s32) temp_s0->lapY, 0x00000050, gHudLapTextures[temp_s0->alsoLapCount], 0x00000020, 0x00000010, 0x00000020, 0x00000010);
func_8004C9D8((s32) temp_s0->lapAfterImage2X, temp_s0->lapY + 3, 0x00000050, (u8*) common_texture_hud_lap, 0x00000020, 8, 0x00000020, 8);
func_8004C9D8(temp_s0->lapAfterImage2X + 0x1C, (s32) temp_s0->lapY, 0x00000050, (u8*) gHudLapTextures[temp_s0->alsoLapCount], 0x00000020, 0x00000010, 0x00000020, 0x00000010);
}
}
void func_8004ED40(s32 arg0) {
func_8004A2F4(playerHUD[arg0].speedometerX, playerHUD[arg0].speedometerY, 0U, 1.0f, D_8018D300, D_8018D308, D_8018D310, 0xFF, common_texture_speedometer, D_0D0064B0, 0x40, 0x60, 0x40, 0x30);
func_8004A258(D_8018CFEC, D_8018CFF4, D_8016579E, 1.0f, common_texture_speedometer_needle, &D_0D005FF0, 0x40, 0x20, 0x40, 0x20);
func_8004A258(D_8018CFEC, D_8018CFF4, D_8016579E, 1.0f, common_texture_speedometer_needle, D_0D005FF0, 0x40, 0x20, 0x40, 0x20);
}
void func_8004EE54(s32 arg0) {
@ -2314,7 +2314,7 @@ void func_8004F020(s32 arg0) {
var_f0 = var_f0 + 4.0;
break;
}
draw_hud_2d_texture_8x8(var_f2, var_f0, common_texture_minimap_finish_line);
draw_hud_2d_texture_8x8(var_f2, var_f0, (u8*) common_texture_minimap_finish_line);
}
#ifdef NON_MATCHING
@ -2338,22 +2338,22 @@ void func_8004F168(s32 arg0, s32 playerId, s32 characterId) {
if (characterId != 8) {
if ((gGPCurrentRaceRankByPlayerId[playerId] == 0) && (gModeSelection != 3) && (gModeSelection != 1)) {
#if EXPLICIT_AND == 1
func_80046424(temp_a0, temp_a1, (player->rotation[1] + 0x8000) & 0xFFFF, 1.0f, common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
func_80046424(temp_a0, temp_a1, (player->rotation[1] + 0x8000) & 0xFFFF, 1.0f, (u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
#else
func_80046424(temp_a0, temp_a1, player->rotation[1] + 0x8000, 1.0f, common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
func_80046424(temp_a0, temp_a1, player->rotation[1] + 0x8000, 1.0f, (u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
#endif
} else {
#if EXPLICIT_AND == 1
func_800463B0(temp_a0, temp_a1, (player->rotation[1] + 0x8000) & 0xFFFF, 1.0f, common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
func_800463B0(temp_a0, temp_a1, (player->rotation[1] + 0x8000) & 0xFFFF, 1.0f, (u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
#else
func_800463B0(temp_a0, temp_a1, player->rotation[1] + 0x8000, 1.0f, common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
func_800463B0(temp_a0, temp_a1, player->rotation[1] + 0x8000, 1.0f, (u8*) common_texture_minimap_kart_character[characterId], common_vtx_player_minimap_icon, 8, 8, 8, 8);
#endif
}
} else {
if (gGPCurrentRaceRankByPlayerId[playerId] == 0) {
func_8004C450(temp_a0, temp_a1, 8, 8, (u8 *) common_texture_minimap_progress_dot);
} else {
func_8004C364(temp_a0, temp_a1, 8, 8, (u8 *) common_texture_minimap_progress_dot);
draw_hud_2d_texture(temp_a0, temp_a1, 8, 8, (u8 *) common_texture_minimap_progress_dot);
}
}
}
@ -2456,7 +2456,7 @@ void print_timer(s32 arg0, s32 arg1, s32 arg2) {
gSPDisplayList(gDisplayListHead++, D_0D008108);
gSPDisplayList(gDisplayListHead++, D_0D007EF8);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD);
load_texture_block_rgba16_mirror(common_texture_hud_normal_digit, 104, 16);
load_texture_block_rgba16_mirror((u8*) common_texture_hud_normal_digit, 104, 16);
func_8004F6D0(arg2);
func_8004F774(arg0, arg1);
gSPDisplayList(gDisplayListHead++, D_0D007EB8);
@ -2475,7 +2475,7 @@ void func_8004F8CC(s32 arg0, s32 arg1) {
void func_8004F950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
gSPDisplayList(gDisplayListHead++, D_0D007F38);
set_transparency(arg2);
load_texture_block_rgba16_mirror(common_texture_hud_normal_digit, 104, 16);
load_texture_block_rgba16_mirror((u8*) common_texture_hud_normal_digit, 104, 16);
func_8004F6D0(arg3);
func_8004F8CC(arg0, arg1);
}
@ -2483,7 +2483,7 @@ void func_8004F950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
void print_timer_rainbow(s32 arg0, s32 arg1, s32 arg2) {
gSPDisplayList(gDisplayListHead++, D_0D007F38);
func_8004B614(D_801656C0, D_801656D0, D_801656E0, 128, 128, 128, 255);
load_texture_block_rgba16_mirror(common_texture_hud_normal_digit, 104, 16);
load_texture_block_rgba16_mirror((u8*) common_texture_hud_normal_digit, 104, 16);
func_8004F6D0(arg2);
func_8004F8CC(arg0, arg1);
}
@ -2501,7 +2501,7 @@ void render_hud_timer(s32 playerId) {
print_timer_rainbow(playerHUD[playerId].lapCompletionTimeXs[var_s0], playerHUD[playerId].timerY + (var_s0*0x10), playerHUD[playerId].lapDurations[var_s0]);
}
}
draw_hud_2d_texture_32x16(playerHUD[playerId].totalTimeX - 0x13, playerHUD[playerId].timerY + 0x38, common_texture_hud_total_time);
draw_hud_2d_texture_32x16(playerHUD[playerId].totalTimeX - 0x13, playerHUD[playerId].timerY + 0x38, (u8*) common_texture_hud_total_time);
if (D_801657E5 != 0) {
print_timer_rainbow(playerHUD[playerId].totalTimeX, playerHUD[playerId].timerY + 0x30, playerHUD[playerId].someTimer);
} else {
@ -2510,10 +2510,10 @@ void render_hud_timer(s32 playerId) {
}
} else {
if (playerHUD[playerId].blinkTimer == 0) {
draw_hud_2d_texture_32x16(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, common_texture_hud_time);
draw_hud_2d_texture_32x16(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, (u8*) common_texture_hud_time);
print_timer(playerHUD[playerId].timerX, playerHUD[playerId].timerY, playerHUD[playerId].someTimer);
} else {
draw_hud_2d_texture_32x16(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, common_texture_hud_lap_time);
draw_hud_2d_texture_32x16(playerHUD[playerId].timerX - 0x13, playerHUD[playerId].timerY + 8, (u8*) common_texture_hud_lap_time);
if (D_801657E3 != 0) {
print_timer_rainbow(playerHUD[playerId].timerX, playerHUD[playerId].timerY, playerHUD[playerId].someTimer1);
} else if (playerHUD[playerId].blinkState == 0) {
@ -2528,7 +2528,7 @@ void draw_lap_count(s16 lapX, s16 lapY, s8 lap) {
gSPDisplayList(gDisplayListHead++, D_0D008108);
gSPDisplayList(gDisplayListHead++, D_0D007EF8);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD);
load_texture_block_rgba16_mirror(common_texture_hud_123, 32, 8);
load_texture_block_rgba16_mirror((u8*) common_texture_hud_123, 32, 8);
// Display current lap. Ex. 1/3
func_8004BA98(lapX , lapY, 8, 8, lap * 8, 0, 0); // display the digit
func_8004BA98(lapX + 8 , lapY, 8, 8, 24, 0, 0); // display the /
@ -2914,7 +2914,7 @@ void render_object_leaf_particle(UNUSED s32 cameraId) {
gSPDisplayList(gDisplayListHead++, D_0D0079C8);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH);
load_texture_block_rgba16_mirror(common_texture_particle_leaf, 0x00000020, 0x00000010);
load_texture_block_rgba16_mirror((u8*) common_texture_particle_leaf, 0x00000020, 0x00000010);
for(someIndex = 0; someIndex < gLeafParticle_SIZE; someIndex++) {
leafIndex = gLeafParticle[someIndex];
if (leafIndex != -1) {
@ -4197,7 +4197,7 @@ void func_800563DC(s32 objectIndex, s32 cameraId, s32 arg2) {
rsp_set_matrix_transformation(D_80183E40, D_80183E80, 0.2f);
gSPDisplayList(gDisplayListHead++, D_0D007E98);
func_8004B310(arg2);
draw_rectangle_texture_overlap(common_tlut_bomb, common_texture_bomb[residue], D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020);
draw_rectangle_texture_overlap((u8*) common_tlut_bomb, common_texture_bomb[residue], D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020);
temp_s0 = D_8018D400;
gSPDisplayList(gDisplayListHead++, D_0D007B00);
func_8004B414(0, 0, 0, arg2);
@ -4216,7 +4216,7 @@ void func_800563DC(s32 objectIndex, s32 cameraId, s32 arg2) {
void func_8005669C(s32 objectIndex, UNUSED s32 arg1, s32 arg2) {
gSPDisplayList(gDisplayListHead++, D_0D0079E8);
func_8004B310(arg2);
load_texture_block_rgba16_mirror(D_0D02AA58, 0x00000010, 0x00000010);
load_texture_block_rgba16_mirror((u8*) D_0D02AA58, 0x00000010, 0x00000010);
D_80183E40[1] = gObjectList[objectIndex].pos[1] - 2.0;
D_80183E40[0] = gObjectList[objectIndex].pos[0] + 2.0;
D_80183E40[2] = gObjectList[objectIndex].pos[2] + 2.0;
@ -4305,7 +4305,7 @@ void func_80056BF0(s32 bombIndex) {
D_80183E40[0] = sp40.bombPos[0];
D_80183E40[1] = sp40.bombPos[1] + 1.0;
D_80183E40[2] = sp40.bombPos[2];
draw_2d_texture_at(D_80183E40, D_80183E80, 0.25f, common_tlut_bomb, bombFrame, D_0D005AE0, 0x20, 0x20, 0x20, 0x20);
draw_2d_texture_at(D_80183E40, D_80183E80, 0.25f, (u8*) common_tlut_bomb, bombFrame, D_0D005AE0, 0x20, 0x20, 0x20, 0x20);
temp_s0 = D_8018D400;
gSPDisplayList(gDisplayListHead++, D_0D007B00);
func_8004B414(0, 0, 0, 0xFF);
@ -4327,7 +4327,7 @@ void func_80056E24(s32 bombIndex, Vec3f arg1) {
D_80183E80[0] = 0;
D_80183E80[2] = 0x8000;
gSPDisplayList(gDisplayListHead++, D_0D0079C8);
load_texture_block_rgba16_mirror(D_0D02AA58, 0x00000010, 0x00000010);
load_texture_block_rgba16_mirror((u8*) D_0D02AA58, 0x00000010, 0x00000010);
D_80183E80[1] = func_800418AC(sp2C.wheel1Pos[0], sp2C.wheel1Pos[2], arg1);
func_800431B0(sp2C.wheel1Pos, D_80183E80, 0.15f, common_vtx_rectangle);
D_80183E80[1] = func_800418AC(sp2C.wheel2Pos[0], sp2C.wheel2Pos[2], arg1);

2
src/render_objects.h
View File

@ -447,8 +447,6 @@ extern s16 D_8018D2E8;
extern u8* D_8018D4BC;
extern u8* D_8018D4C0;
// Probably aren't really part of this file, but don't have a better place to put them
extern u8 *gPortraitTLUTs[];
extern u8 *gPortraitTextures[];
extern Lights1 D_800E4638;

62
src/render_player.c
View File

@ -170,10 +170,10 @@ u16 func_8001FD78(Player *player, f32 posX, UNUSED f32 arg2, f32 posZ) {
}
void init_render_player(Player *player, Camera *camera, s8 playerId, s8 playerRenderId) {
s32 pad[4];
UNUSED s32 pad[4];
s32 sp4C;
s32 sp48;
s32 pad2;
UNUSED s32 pad2;
s32 temp_v0;
s32 temp_v0_2;
@ -264,12 +264,12 @@ void func_80020524(void) {
func_80027560(D_80164AD0[i], D_80164AB0[i], D_80164AC0[i], D_80164AC0[i], D_801651D0[D_80164AC0[i]][D_80164AB0[i]]);
mio0decode(D_802DFB80[D_801651D0[D_80164AC0[i - 1]][D_80164AB0[i - 1]]][D_80164AC0[i - 1]][D_80164AB0[i - 1]].unk_00,
mio0decode((u8*) D_802DFB80[D_801651D0[D_80164AC0[i - 1]][D_80164AB0[i - 1]]][D_80164AC0[i - 1]][D_80164AB0[i - 1]].unk_00,
D_802BFB80.arraySize8[D_801651D0[D_80164AC0[i - 1]][D_80164AB0[i - 1]]][D_80164AC0[i - 1]][D_80164AB0[i - 1]].pixel_index_array);
osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
}
mio0decode(D_802DFB80[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]].unk_00,
mio0decode((u8*) D_802DFB80[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]].unk_00,
D_802BFB80.arraySize8[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]].pixel_index_array);
}
@ -290,11 +290,11 @@ void func_8002088C(void) {
osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
for (var_s0 = 1; var_s0 < gPlayersToRenderCount; var_s0++) {
func_80027560(D_80164AD0[var_s0], D_80164AB0[var_s0], D_80164AC0[var_s0], D_80164AC0[var_s0], D_801651D0[D_80164AC0[var_s0]][D_80164AB0[var_s0]]);
mio0decode(D_802DFB80[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]].unk_00,
mio0decode((u8*) D_802DFB80[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]].unk_00,
D_802BFB80.arraySize8[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]].pixel_index_array);
osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
}
mio0decode(D_802DFB80[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]].unk_00,
mio0decode((u8*) D_802DFB80[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]].unk_00,
D_802BFB80.arraySize8[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]].pixel_index_array);
}
@ -309,11 +309,11 @@ void func_80020BF4(void) {
osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
for (var_s0 = 1; var_s0 < gPlayersToRenderCount; var_s0++) {
func_80027560(D_80164AD0[var_s0], D_80164AB0[var_s0] + 4, D_80164AC0[var_s0], D_80164AC0[var_s0] - 2, D_801651D0[D_80164AC0[var_s0]][D_80164AB0[var_s0]]);
mio0decode(D_802DFB80[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1] - 2][D_80164AB0[var_s0 - 1] + 4].unk_00,
mio0decode((u8*) D_802DFB80[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1] - 2][D_80164AB0[var_s0 - 1] + 4].unk_00,
D_802BFB80.arraySize8[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1] - 2][D_80164AB0[var_s0 - 1] + 4].pixel_index_array);
osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
}
mio0decode(D_802DFB80[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].unk_00,
mio0decode((u8*) D_802DFB80[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].unk_00,
D_802BFB80.arraySize8[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].pixel_index_array);
}
@ -328,11 +328,11 @@ void func_80020F1C(void) {
osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
for (var_s0 = 1; var_s0 < gPlayersToRenderCount; var_s0++) {
func_80027560(D_80164AD0[var_s0], D_80164AB0[var_s0] + 4, D_80164AC0[var_s0], D_80164AC0[var_s0] - 2, D_801651D0[D_80164AC0[var_s0]][D_80164AB0[var_s0]]);
mio0decode(D_802DFB80[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1] - 2][D_80164AB0[var_s0 - 1] + 4].unk_00,
mio0decode((u8*) D_802DFB80[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1] - 2][D_80164AB0[var_s0 - 1] + 4].unk_00,
D_802BFB80.arraySize8[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1] - 2][D_80164AB0[var_s0 - 1] + 4].pixel_index_array);
osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
}
mio0decode(D_802DFB80[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].unk_00,
mio0decode((u8*) D_802DFB80[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].unk_00,
D_802BFB80.arraySize8[D_801651D0[D_80164AC0[gPlayersToRenderCount-1]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164AC0[gPlayersToRenderCount-1] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].pixel_index_array);
}
@ -508,13 +508,13 @@ u8 **gKartWarioWheels1[] = {
};
u16 **D_800DDE34[] = {
gKartMarioWheels0, gKartLuigiWheels0, gKartYoshiWheels0, gKartToadWheels0,
gKartDKWheels0, gKartWarioWheels0, gKartPeachWheels0, gKartBowserWheels0
(u16 **)gKartMarioWheels0, (u16 **)gKartLuigiWheels0, (u16 **)gKartYoshiWheels0, (u16 **)gKartToadWheels0,
(u16 **)gKartDKWheels0, (u16 **)gKartWarioWheels0, (u16 **)gKartPeachWheels0, (u16 **)gKartBowserWheels0
};
u16 **D_800DDE54[] = {
gKartMarioWheels1, gKartLuigiWheels1, gKartYoshiWheels1, gKartToadWheels1,
gKartDKWheels1, gKartWarioWheels1, gKartPeachWheels1, gKartBowserWheels1
(u16 **)gKartMarioWheels1, (u16 **)gKartLuigiWheels1, (u16 **)gKartYoshiWheels1, (u16 **)gKartToadWheels1,
(u16 **)gKartDKWheels1, (u16 **)gKartWarioWheels1, (u16 **)gKartPeachWheels1, (u16 **)gKartBowserWheels1
};
s32 D_800DDE74[] = {
@ -1368,9 +1368,9 @@ void render_player_shadow_credits(Player *player, s8 playerId, s8 arg2) {
}
void kart_render(Player *player, s8 playerId, s8 arg2, s8 arg3) {
s32 pad;
UNUSED s32 pad;
Mat4 sp1A4;
s32 pad2[17];
UNUSED s32 pad2[17];
Vec3f sp154;
Vec3s sp14C;
f32 sp148;
@ -1412,7 +1412,7 @@ void kart_render(Player *player, s8 playerId, s8 arg2, s8 arg3) {
#ifdef AVOID_UB
gPlayerPalette = &D_802F1F80[D_801651D0[arg2][playerId]][arg2][playerId];
#else
gPlayerPalette = &D_802F1F80[D_801651D0[arg2][playerId]][arg2][playerId * 0x100];
gPlayerPalette = (struct_D_802F1F80 *) &D_802F1F80[D_801651D0[arg2][playerId]][arg2][playerId * 0x100];
#endif
if ((arg2 == 0) || (arg2 == 1)) {
D_80164B08 = &D_802BFB80.arraySize8[D_801651D0[arg2][playerId]][arg2][playerId].pixel_index_array[0];
@ -1501,15 +1501,15 @@ void kart_render(Player *player, s8 playerId, s8 arg2, s8 arg3) {
}
void ghost_render(Player *player, s8 playerId, s8 arg2, s8 arg3) {
s32 pad;
UNUSED s32 pad;
Mat4 sp12C;
s32 pad2[17];
UNUSED s32 pad2[17];
Vec3f spDC;
Vec3s spD4;
f32 spD0;
f32 spCC;
f32 spC8;
s32 pad3;
UNUSED s32 pad3;
s16 spC2;
s16 thing;
@ -1530,7 +1530,7 @@ void ghost_render(Player *player, s8 playerId, s8 arg2, s8 arg3) {
#ifdef AVOID_UB
gPlayerPalette = &D_802F1F80[D_801651D0[arg2][playerId]][arg2][playerId];
#else
gPlayerPalette = &D_802F1F80[D_801651D0[arg2][playerId]][arg2][playerId * 0x100];
gPlayerPalette = (struct_D_802F1F80 *) &D_802F1F80[D_801651D0[arg2][playerId]][arg2][playerId * 0x100];
#endif
if ((arg2 == 0) || (arg2 == 1)) {
D_80164B08 = &D_802BFB80.arraySize8[D_801651D0[arg2][playerId]][arg2][playerId].pixel_index_array[0];
@ -1656,7 +1656,7 @@ void player_ice_reflection_render(Player *player, s8 playerId, s8 arg2, s8 arg3)
}
void player_render(Player *player, s8 playerId, s8 arg2) {
s32 pad[2];
UNUSED s32 pad[2];
s32 temp_t1;
s32 var_v1;
OSMesg *sp34;
@ -1683,7 +1683,7 @@ void player_render(Player *player, s8 playerId, s8 arg2) {
} else {
ghost_render(player, playerId, arg2, var_v1);
}
osRecvMesg(&gDmaMesgQueue, &sp34, OS_MESG_BLOCK);
osRecvMesg(&gDmaMesgQueue, (OSMesg *) &sp34, OS_MESG_BLOCK);
if ((temp_t1 == (player->unk_002 & temp_t1)) && (player->surfaceType == ICE) && ((player->unk_0CA & 1) != 1) && (player->unk_110.unk3C[2] <= 30.0f)) {
player_ice_reflection_render(player, playerId, arg2, var_v1);
}
@ -1733,15 +1733,15 @@ void func_80026B4C(Player *player, s8 playerId, s8 arg2, s8 arg3) {
&& ((player->effects & 0x800000) != 0x800000) && ((player->unk_044 & 0x800) == 0)) {
if (temp_t0 <= 20) {
func_80027C74(player, D_800DDE34[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
func_80027C74(player, (s32) (D_800DDE34[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40)), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
} else {
func_80027C74(player, D_800DDE54[player->characterId][temp_t1] + (temp_t0 - 21) * (temp_num * 4) + ((temp_t2 >> 8) * 0x40) + 0x600, D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
func_80027C74(player, (s32) (D_800DDE54[player->characterId][temp_t1] + (temp_t0 - 21) * (temp_num * 4) + ((temp_t2 >> 8) * 0x40) + 0x600), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
}
} else {
if (temp_t0 == 0) {
func_80027C74(player, D_800DDE34[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
func_80027C74(player, (s32) (D_800DDE34[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40)), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
} else {
func_80027C74(player, D_800DDE54[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
func_80027C74(player, (s32) (D_800DDE54[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40)), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
}
}
} else {
@ -1750,15 +1750,15 @@ void func_80026B4C(Player *player, s8 playerId, s8 arg2, s8 arg3) {
&& ((player->effects & 0x20000) != 0x20000) && ((player->unk_044 & 0x800) == 0)) {
if (temp_t0 <= 20) {
func_80027C74(player, D_800DDE34[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
func_80027C74(player, (s32) (D_800DDE34[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40)), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
} else {
func_80027C74(player, D_800DDE54[player->characterId][temp_t1] + (temp_t0 - 21) * (temp_num * 4) + ((temp_t2 >> 8) * 0x40) + 0x600, D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
func_80027C74(player, (s32) (D_800DDE54[player->characterId][temp_t1] + (temp_t0 - 21) * (temp_num * 4) + ((temp_t2 >> 8) * 0x40) + 0x600), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
}
} else {
if (temp_t0 == 0) {
func_80027C74(player, D_800DDE34[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
func_80027C74(player, (s32) (D_800DDE34[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40)), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
} else {
func_80027C74(player, D_800DDE54[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
func_80027C74(player, (s32) (D_800DDE54[player->characterId][temp_t1] + (temp_t0 * temp_num * 4) + ((temp_t2 >> 8) * 0x40)), D_802F1F80_WHEEL(arg3, arg2, playerId), 0x80);
}
}
}

9
src/spawn_players.c
View File

@ -22,6 +22,7 @@
#include "render_player.h"
#include "code_80091750.h"
#include "effects.h"
#include "decode.h"
f32 D_80165210[8];
f32 D_80165230[8];
@ -913,7 +914,7 @@ void func_8003C0F0(void) {
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
temp = 5;
if (1);
if (1) {};
D_80165210[0] = 0;
D_80165210[1] = 0;
D_80165230[1] = -200.0f;
@ -945,7 +946,7 @@ void func_8003C0F0(void) {
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
temp = 0x1E0;
if (1);
if (1) {};
D_80165210[0] = 0.0f;
D_80165210[1] = 0.0f;
D_80165230[1] = -400.0f;
@ -977,7 +978,7 @@ void func_8003C0F0(void) {
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
temp = 0x37;
if (1);
if (1) {};
D_80165210[0] = 0.0f;
D_80165210[1] = 0.0f;
D_80165230[1] = -160.0f;
@ -1009,7 +1010,7 @@ void func_8003C0F0(void) {
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
temp = 0xC8;
if (1);
if (1) {};
D_80165210[0] = 0.0f;
D_80165210[1] = 0.0f;
D_80165230[1] = -575.0f;

55
src/update_objects.c
View File

@ -33,6 +33,7 @@
#include "menus.h"
#include "data/other_textures.h"
#include "data/some_data.h"
#include "memory.h"
//! @todo unused?
f32 D_800E43B0[] = {
@ -67,7 +68,7 @@ Vtx D_800E44B0[] = {
{{{ -24, 20, 0}, 0, { 3008, 2496}, { 0xFF, 0xFF, 0xFF, 0xFF}}},
};
u8 *gItemWindowTLUTs[] = {
u16 *gItemWindowTLUTs[] = {
common_tlut_item_window_none, common_tlut_item_window_banana, common_tlut_item_window_banana_bunch, common_tlut_item_window_green_shell,
common_tlut_item_window_triple_green_shell, common_tlut_item_window_red_shell, common_tlut_item_window_triple_red_shell, common_tlut_item_window_blue_shell,
common_tlut_item_window_thunder_bolt, common_tlut_item_window_fake_item_box, common_tlut_item_window_star, common_tlut_item_window_boo,
@ -81,11 +82,11 @@ u8 *gItemWindowTextures[] = {
common_texture_item_window_mushroom, common_texture_item_window_double_mushroom, common_texture_item_window_triple_mushroom, common_texture_item_window_super_mushroom
};
u8 *gHudLapTextures[] = {
u16 *gHudLapTextures[] = {
common_texture_hud_lap_1_on_3, common_texture_hud_lap_2_on_3, common_texture_hud_lap_3_on_3
};
u8 *gPortraitTLUTs[] = {
u16 *gPortraitTLUTs[] = {
common_tlut_portrait_mario, common_tlut_portrait_luigi, common_tlut_portrait_yoshi, common_tlut_portrait_toad,
common_tlut_portrait_donkey_kong, common_tlut_portrait_wario, common_tlut_portrait_peach, common_tlut_portrait_bowser
};
@ -753,7 +754,7 @@ UNUSED void func_800734D4() {
void update_neon_texture(s32 objectIndex) {
// I have no idea why this typecast works
gObjectList[objectIndex].activeTLUT = (u32*)gObjectList[objectIndex].tlutList + (gObjectList[objectIndex].itemDisplay * 128);
gObjectList[objectIndex].activeTLUT = (u8*)((u32*)gObjectList[objectIndex].tlutList + (gObjectList[objectIndex].itemDisplay * 128));
gObjectList[objectIndex].activeTexture = gObjectList[objectIndex].textureList;
}
@ -1233,7 +1234,7 @@ void func_8007466C(s32 objectIndex, s32 arg1) {
if ((gObjectList[objectIndex].status & 1) != 0) {
// I have no idea why this typecase works
gObjectList[objectIndex].activeTLUT = (u32*)gObjectList[objectIndex].tlutList + (gObjectList[objectIndex].unk_0D3 << 7) ;
gObjectList[objectIndex].activeTLUT = (u8*) ((u32*)gObjectList[objectIndex].tlutList + (gObjectList[objectIndex].unk_0D3 << 7)) ;
gObjectList[objectIndex].status ^= 2;
phi_a1 = 0;
if ((gObjectList[objectIndex].status & 2) != 0) {
@ -1584,7 +1585,7 @@ void func_80075714(s32 objectIndex) {
}
void update_train_smoke(void) {
s32 pad[2];
UNUSED s32 pad[2];
s32 count;
s32 i;
s32 temp_a0;
@ -1705,7 +1706,7 @@ void func_80075B84(s32 objectIndex) {
}
void update_ferries_smoke_particle(void) {
s32 pad[2];
UNUSED s32 pad[2];
s32 count;
s32 i;
s32 temp_a0;
@ -1882,8 +1883,8 @@ void func_8007634C(s32 objectIndex) {
Objects *temp_v0;
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = common_texture_particle_smoke;
temp_v0->textureList = common_texture_particle_smoke;
temp_v0->activeTexture = common_texture_particle_smoke[0];
temp_v0->textureList = common_texture_particle_smoke[0];
temp_v0->primAlpha = 0x00FF;
set_obj_orientation(objectIndex, 0U, 0U, 0U);
set_obj_origin_offset(objectIndex, 0.0f, 0.0f, 0.0f);
@ -2018,7 +2019,7 @@ s32 func_80076828(Vec3s arg0, s32 arg1) {
}
void func_80076884(s32 arg0) {
s32 stackPadding0;
UNUSED s32 stackPadding0;
s32 i;
s32 temp_v0;
s16 *var_s2;
@ -2052,8 +2053,8 @@ void func_80076958(s32 objectIndex) {
Objects *temp_v0;
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = common_texture_particle_smoke;
temp_v0->textureList = common_texture_particle_smoke;
temp_v0->activeTexture = common_texture_particle_smoke[0];
temp_v0->textureList = common_texture_particle_smoke[0];
temp_v0->primAlpha = 0x00FF;
set_obj_orientation(objectIndex, 0U, 0U, 0U);
set_obj_origin_offset(objectIndex, 0.0f, 0.0f, 0.0f);
@ -2145,8 +2146,8 @@ void init_object_smoke_paticle(s32 objectIndex, Vec3f arg1, s16 arg2) {
init_object(objectIndex, (s32) arg2);
temp_v0 = &gObjectList[objectIndex];
temp_v0->unk_0D5 = 0x0A;
temp_v0->activeTexture = common_texture_particle_smoke;
temp_v0->textureList = common_texture_particle_smoke;
temp_v0->activeTexture = common_texture_particle_smoke[0];
temp_v0->textureList = common_texture_particle_smoke[0];
temp_v0->sizeScaling = 0.3f;
set_obj_origin_pos(objectIndex, arg1[0], arg1[1], arg1[2]);
temp_v0->type = 0x00FF;
@ -2221,8 +2222,8 @@ void init_object_smoke_particle(s32 objectIndex, s32 flameIndex) {
init_object(objectIndex, 3);
gObjectList[objectIndex].unk_0D5 = 0xB;
gObjectList[objectIndex].activeTexture = common_texture_particle_smoke;
gObjectList[objectIndex].textureList = common_texture_particle_smoke;
gObjectList[objectIndex].activeTexture = common_texture_particle_smoke[0];
gObjectList[objectIndex].textureList = common_texture_particle_smoke[0];
gObjectList[objectIndex].sizeScaling = 0.8f;
gObjectList[objectIndex].origin_pos[0] = (f32)*(gTorchSpawns + (flameIndex * 3) + 0) * xOrientation;
@ -2381,8 +2382,8 @@ void init_object_leaf_particle(s32 objectIndex, Vec3f arg1, s32 num) {
init_object(objectIndex, 0);
gObjectList[objectIndex].unk_0D5 = 7;
gObjectList[objectIndex].activeTLUT = (u32 *) common_texture_particle_leaf;
gObjectList[objectIndex].tlutList = (u32 *) common_texture_particle_leaf;
gObjectList[objectIndex].activeTLUT = (u8*) common_texture_particle_leaf;
gObjectList[objectIndex].tlutList = (u8*) common_texture_particle_leaf;
gObjectList[objectIndex].sizeScaling = 0.1f;
gObjectList[objectIndex].unk_044 = arg1[1];
switch (gCurrentCourseId) {
@ -3045,7 +3046,7 @@ void init_obj_lakitu_red_flag(s32 objectIndex, s32 playerIndex) {
Objects *temp_v0;
func_800791F0(objectIndex, playerIndex);
init_texture_object(objectIndex, common_tlut_lakitu_checkered_flag, gTextureLakituCheckeredFlag01, 0x48U, (u16) 0x00000038);
init_texture_object(objectIndex, (u8*) common_tlut_lakitu_checkered_flag, gTextureLakituCheckeredFlag01, 0x48U, (u16) 0x00000038);
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_8018C028;
temp_v0->vertex = common_vtx_also_lakitu;
@ -3122,7 +3123,7 @@ void func_8007993C(s32 objectIndex, Player *player) {
void init_obj_lakitu_red_flag_fishing(s32 objectIndex, s32 arg1) {
func_800791F0(objectIndex, arg1);
init_texture_object(objectIndex, common_tlut_lakitu_fishing, gTextureLakituFishing1, 0x38U, (u16) 0x00000048);
init_texture_object(objectIndex, (u8*) common_tlut_lakitu_fishing, gTextureLakituFishing1, 0x38U, (u16) 0x00000048);
gObjectList[objectIndex].vertex = D_0D005F30;
gObjectList[objectIndex].sizeScaling = 0.15f;
func_80086E70(objectIndex);
@ -3295,7 +3296,7 @@ void func_8007A060(s32 objectIndex, s32 playerIndex) {
Objects *temp_v0;
func_800791F0(objectIndex, playerIndex);
init_texture_object(objectIndex, common_tlut_lakitu_second_lap, gTextureLakituSecondLap01, 0x48U, (u16) 0x00000038);
init_texture_object(objectIndex, (u8*) common_tlut_lakitu_second_lap, gTextureLakituSecondLap01, 0x48U, (u16) 0x00000038);
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_8018C028;
temp_v0->vertex = common_vtx_also_lakitu;
@ -3343,7 +3344,7 @@ void func_8007A228(s32 objectIndex, s32 playerIndex) {
Objects *temp_v0;
func_800791F0(objectIndex, playerIndex);
init_texture_object(objectIndex, common_tlut_lakitu_final_lap, gTextureLakituFinalLap01, 0x48U, (u16) 0x00000038);
init_texture_object(objectIndex, (u8*) common_tlut_lakitu_final_lap, gTextureLakituFinalLap01, 0x48U, (u16) 0x00000038);
temp_v0 = &gObjectList[objectIndex];
temp_v0->activeTexture = D_8018C028;
temp_v0->vertex = common_vtx_also_lakitu;
@ -3390,7 +3391,7 @@ void update_object_lakitu_final_lap(s32 objectIndex, s32 playerIndex) {
void func_8007A3F0(s32 objectIndex, s32 arg1) {
f32 var = 5000.0f;
func_800791F0(objectIndex, arg1);
init_texture_object(objectIndex, common_tlut_lakitu_reverse, gTextureLakituReverse01, 0x48U, (u16) 0x00000038);
init_texture_object(objectIndex, (u8*) common_tlut_lakitu_reverse, gTextureLakituReverse01, 0x48U, (u16) 0x00000038);
gObjectList[objectIndex].activeTexture = D_8018C028;
gObjectList[objectIndex].vertex = common_vtx_also_lakitu;
gObjectList[objectIndex].pos[2] = var;
@ -3585,7 +3586,7 @@ void consume_item(s32 playerId) {
player = &gPlayerOne[playerId];
objectIndex = gItemWindowObjectByPlayerId[playerId];
itemWindow = &gObjectList[objectIndex];
itemWindow = (ItemWindowObjects *) &gObjectList[objectIndex];
if (itemWindow->currentItem == ITEM_SUPER_MUSHROOM) {
if (func_80072354(objectIndex, 2) != 0) {
func_800722A4(objectIndex, 2);
@ -3670,7 +3671,7 @@ s16 func_8007AFB0(s32 objectIndex, s32 arg1) {
}
s32 func_8007B040(s32 objectIndex, s32 playerId) {
s16 stackPadding;
UNUSED s16 stackPadding;
s32 temp_v1;
s32 var_a3;
s32 var_t3;
@ -3942,7 +3943,7 @@ void func_8007B34C(s32 playerId) {
}
}
}
temp_t0->activeTLUT = gItemWindowTLUTs[temp_t0->itemDisplay];
temp_t0->activeTLUT = (u8*) gItemWindowTLUTs[temp_t0->itemDisplay];
temp_t0->activeTexture = gItemWindowTextures[temp_t0->itemDisplay];
sp38->currentItemCopy = temp_t0->type;
}
@ -6487,7 +6488,7 @@ void func_8008275C(s32 objectIndex) {
case 2:
func_8008B78C(objectIndex);
vec3f_copy(gObjectList[objectIndex].unk_01C, gObjectList[objectIndex].pos);
func_8000D940(gObjectList[objectIndex].origin_pos, &gObjectList[objectIndex].unk_0C6, gObjectList[objectIndex].unk_034, 0.0f, 0);
func_8000D940(gObjectList[objectIndex].origin_pos, (s16 *) &gObjectList[objectIndex].unk_0C6, gObjectList[objectIndex].unk_034, 0.0f, 0);
gObjectList[objectIndex].offset[0] *= 2.0;
gObjectList[objectIndex].offset[1] *= 2.5;
gObjectList[objectIndex].offset[2] *= 2.0;

9
src/update_objects.h
View File

@ -124,11 +124,13 @@ void func_80075574(s32, Vec3f, f32);
s32 func_800755FC(s32, Vec3f, f32);
void func_80075698(s32);
void func_80075714(s32);
void update_train_smoke(void);
void func_80075838(void);
void func_800759EC(s32, Vec3f, f32);
s32 func_80075A6C(s32, Vec3f, f32);
void func_80075B08(s32);
void func_80075B84(s32);
void update_ferries_smoke_particle(void);
void func_80075E5C(s32, Vec3f, u16, f32, s32);
s32 func_80075F28(Vec3f, u16, f32, s32);
void func_80075F98(Vec3f, u16, f32);
@ -340,6 +342,7 @@ void func_80085024(void);
void func_8008502C(s32, s32);
void func_80085080(s32);
void func_800850B0(s32, s32);
void update_penguins(void);
void init_hot_air_balloon(s32);
void func_80085534(s32);
void func_80085768(s32);
@ -375,10 +378,10 @@ extern f32 D_800E43B0[];
extern Vtx D_800E43F0[];
extern Vtx D_800E4470[];
extern Vtx D_800E44B0[];
extern u8 *gItemWindowTLUTs[];
extern u16 *gItemWindowTLUTs[];
extern u8 *gItemWindowTextures[];
extern u8 *gHudLapTextures[];
extern u8 *gPortraitTLUTs[];
extern u16 *gHudLapTextures[];
extern u16 *gPortraitTLUTs[];
extern u8 *gPortraitTextures[];
extern s32 D_80162DF8;

364
yamls/us/data_segment2.yml
View File

@ -12,160 +12,160 @@
- '#include <assets/startup_logo.h>'
header:
- '#include <PR/gbi.h>'
D_02007650:
symbol: D_02007650
type: gfx
offset: 0x7650
D_020076B0:
symbol: D_020076B0
type: Gfx
offset: 0x76B0
D_020076E0:
symbol: D_020076E0
type: Gfx
offset: 0x76E0
D_02007708:
symbol: D_02007708
type: Gfx
offset: 0x7708
D_02007728:
symbol: D_02007728
type: Gfx
offset: 0x7728
D_02007748:
symbol: D_02007748
type: Gfx
offset: 0x7748
D_02007768:
symbol: D_02007768
type: Gfx
offset: 0x7768
D_02007788:
symbol: D_02007788
type: Gfx
offset: 0x7788
D_020077A8:
symbol: D_020077A8
type: Gfx
offset: 0x77A8
D_020077D8:
symbol: D_020077D8
type: Gfx
offset: 0x77D8
D_020077F8:
symbol: D_020077F8
type: Gfx
offset: 0x77F8
D_02007818:
symbol: D_02007818
type: Gfx
offset: 0x7818
D_02007838:
symbol: D_02007838
type: Gfx
offset: 0x7838
D_02007858:
symbol: D_02007858
type: Gfx
offset: 0x7858
D_02007878:
symbol: D_02007878
type: Gfx
offset: 0x7878
D_02007898:
symbol: D_02007898
type: Gfx
offset: 0x7898
D_020078B8:
symbol: D_020078B8
type: Gfx
offset: 0x78B8
D_020078D8:
symbol: D_020078D8
type: Gfx
offset: 0x78D8
D_020078F8:
symbol: D_020078F8
type: Gfx
offset: 0x78F8
D_02007918:
symbol: D_02007918
type: Gfx
offset: 0x7918
D_02007938:
symbol: D_02007938
type: Gfx
offset: 0x7938
D_02007958:
symbol: D_02007958
type: Gfx
offset: 0x7958
D_02007978:
symbol: D_02007978
type: Gfx
offset: 0x7978
D_02007998:
symbol: D_02007998
type: Gfx
offset: 0x7998
D_020079B8:
symbol: D_020079B8
type: Gfx
offset: 0x79B8
D_020079D8:
symbol: D_020079D8
type: Gfx
offset: 0x79D8
D_020079F8:
symbol: D_020079F8
type: Gfx
offset: 0x79F8
D_02007A18:
symbol: D_02007A18
type: Gfx
offset: 0x7A18
D_02007A38:
symbol: D_02007A38
type: Gfx
offset: 0x7A38
D_02007A58:
symbol: D_02007A58
type: Gfx
offset: 0x7A58
D_02007A78:
symbol: D_02007A78
type: Gfx
offset: 0x7A78
D_02007A98:
symbol: D_02007A98
type: Gfx
offset: 0x7A98
D_02007AB8:
symbol: D_02007AB8
type: Gfx
offset: 0x7AB8
D_02007AD8:
symbol: D_02007AD8
type: Gfx
offset: 0x7AD8
D_02007AF8:
symbol: D_02007AF8
type: Gfx
offset: 0x7AF8
D_02007B18:
symbol: D_02007B18
type: Gfx
offset: 0x7B18
D_02007B38: # unused
symbol: D_02007B38
type: vtx
offset: 0x7B38
count: 8
D_02007BB8:
symbol: D_02007BB8
type: vtx
offset: 0x7BB8
count: 54
# D_02007650:
# symbol: D_02007650
# type: gfx
# offset: 0x7650
# D_020076B0:
# symbol: D_020076B0
# type: Gfx
# offset: 0x76B0
# D_020076E0:
# symbol: D_020076E0
# type: Gfx
# offset: 0x76E0
# D_02007708:
# symbol: D_02007708
# type: Gfx
# offset: 0x7708
# D_02007728:
# symbol: D_02007728
# type: Gfx
# offset: 0x7728
# D_02007748:
# symbol: D_02007748
# type: Gfx
# offset: 0x7748
# D_02007768:
# symbol: D_02007768
# type: Gfx
# offset: 0x7768
# D_02007788:
# symbol: D_02007788
# type: Gfx
# offset: 0x7788
# D_020077A8:
# symbol: D_020077A8
# type: Gfx
# offset: 0x77A8
# D_020077D8:
# symbol: D_020077D8
# type: Gfx
# offset: 0x77D8
# D_020077F8:
# symbol: D_020077F8
# type: Gfx
# offset: 0x77F8
# D_02007818:
# symbol: D_02007818
# type: Gfx
# offset: 0x7818
# D_02007838:
# symbol: D_02007838
# type: Gfx
# offset: 0x7838
# D_02007858:
# symbol: D_02007858
# type: Gfx
# offset: 0x7858
# D_02007878:
# symbol: D_02007878
# type: Gfx
# offset: 0x7878
# D_02007898:
# symbol: D_02007898
# type: Gfx
# offset: 0x7898
# D_020078B8:
# symbol: D_020078B8
# type: Gfx
# offset: 0x78B8
# D_020078D8:
# symbol: D_020078D8
# type: Gfx
# offset: 0x78D8
# D_020078F8:
# symbol: D_020078F8
# type: Gfx
# offset: 0x78F8
# D_02007918:
# symbol: D_02007918
# type: Gfx
# offset: 0x7918
# D_02007938:
# symbol: D_02007938
# type: Gfx
# offset: 0x7938
# D_02007958:
# symbol: D_02007958
# type: Gfx
# offset: 0x7958
# D_02007978:
# symbol: D_02007978
# type: Gfx
# offset: 0x7978
# D_02007998:
# symbol: D_02007998
# type: Gfx
# offset: 0x7998
# D_020079B8:
# symbol: D_020079B8
# type: Gfx
# offset: 0x79B8
# D_020079D8:
# symbol: D_020079D8
# type: Gfx
# offset: 0x79D8
# D_020079F8:
# symbol: D_020079F8
# type: Gfx
# offset: 0x79F8
# D_02007A18:
# symbol: D_02007A18
# type: Gfx
# offset: 0x7A18
# D_02007A38:
# symbol: D_02007A38
# type: Gfx
# offset: 0x7A38
# D_02007A58:
# symbol: D_02007A58
# type: Gfx
# offset: 0x7A58
# D_02007A78:
# symbol: D_02007A78
# type: Gfx
# offset: 0x7A78
# D_02007A98:
# symbol: D_02007A98
# type: Gfx
# offset: 0x7A98
# D_02007AB8:
# symbol: D_02007AB8
# type: Gfx
# offset: 0x7AB8
# D_02007AD8:
# symbol: D_02007AD8
# type: Gfx
# offset: 0x7AD8
# D_02007AF8:
# symbol: D_02007AF8
# type: Gfx
# offset: 0x7AF8
# D_02007B18:
# symbol: D_02007B18
# type: Gfx
# offset: 0x7B18
# D_02007B38: # unused
# symbol: D_02007B38
# type: vtx
# offset: 0x7B38
# count: 8
# D_02007BB8:
# symbol: D_02007BB8
# type: vtx
# offset: 0x7BB8
# count: 54
# D_02007BD8:
# symbol: D_02007BD8
# type: vtx
@ -296,31 +296,31 @@ D_02007BB8:
# type: vtx
# offset: 0x7EF8
# count: 2
D_02007F18:
symbol: D_02007F18
type: gfx
offset: 0x7F18
D_02007F48:
symbol: D_02007F48
type: gfx
offset: 0x7F48
D_02007F60:
symbol: D_02007F60
type: gfx
offset: 0x7F60
D_02007FC8:
symbol: D_02007FC8
type: gfx
offset: 0x7FC8
D_02008008:
symbol: D_02008008
type: gfx
offset: 0x8008
D_02008030:
symbol: D_02008030
type: gfx
offset: 0x8030
D_02008058:
symbol: D_02008058
type: gfx
offset: 0x8058
# D_02007F18:
# symbol: D_02007F18
# type: gfx
# offset: 0x7F18
# D_02007F48:
# symbol: D_02007F48
# type: gfx
# offset: 0x7F48
# D_02007F60:
# symbol: D_02007F60
# type: gfx
# offset: 0x7F60
# D_02007FC8:
# symbol: D_02007FC8
# type: gfx
# offset: 0x7FC8
# D_02008008:
# symbol: D_02008008
# type: gfx
# offset: 0x8008
# D_02008030:
# symbol: D_02008030
# type: gfx
# offset: 0x8030
# D_02008058:
# symbol: D_02008058
# type: gfx
# offset: 0x8058