izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Document racer getter functions.

Browse Source
This commit is contained in:
Antonio Castelli
2022-11-06 11:55:13 -08:00
parent ea01b5b246
commit 10537750e1
11 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/game_ui/func_800A8474.s
+1 -1
View File
@@ -186,7 +186,7 @@ glabel func_800A8474
/* 0A92DC 800A86DC 00000000 */ nop
/* 0A92E0 800A86E0 3C018012 */ lui $at, %hi(D_80126D60) # $at, 0x8012
/* 0A92E4 800A86E4 AC226D60 */ sw $v0, %lo(D_80126D60)($at)
/* 0A92E8 800A86E8 0C006EA4 */ jal func_8001BA90
/* 0A92E8 800A86E8 0C006EA4 */ jal get_racer_objects_by_port
/* 0A92EC 800A86EC 27A40140 */ addiu $a0, $sp, 0x140
/* 0A92F0 800A86F0 8FAC0160 */ lw $t4, 0x160($sp)
/* 0A92F4 800A86F4 AFA20150 */ sw $v0, 0x150($sp)
asm/non_matchings/game_ui/render_rain_splashes.s
+1 -1
View File
@@ -21,7 +21,7 @@ glabel render_rain_splashes
/* 0AE2A4 800AD6A4 29014001 */ slti $at, $t0, 0x4001
/* 0AE2A8 800AD6A8 142000C0 */ bnez $at, .L800AD9AC
/* 0AE2AC 800AD6AC 00000000 */ nop
/* 0AE2B0 800AD6B0 0C006EC6 */ jal func_8001BB18
/* 0AE2B0 800AD6B0 0C006EC6 */ jal get_racer_object_by_port
/* 0AE2B4 800AD6B4 AFA8007C */ sw $t0, 0x7c($sp)
/* 0AE2B8 800AD6B8 3C06800E */ lui $a2, %hi(D_800E2C84) # $a2, 0x800e
/* 0AE2BC 800AD6BC 24C62C84 */ addiu $a2, %lo(D_800E2C84) # addiu $a2, $a2, 0x2c84
asm/non_matchings/racer/func_80042D20.s
+1 -1
View File
@@ -46,7 +46,7 @@ glabel func_80042D20
/* 043954 80042D54 0C01AF6C */ jal get_current_level_header
/* 043958 80042D58 AFA20044 */ sw $v0, 0x44($sp)
/* 04395C 80042D5C AFA20050 */ sw $v0, 0x50($sp)
/* 043960 80042D60 0C006EAB */ jal func_8001BAAC
/* 043960 80042D60 0C006EAB */ jal get_racer_objects_by_position
/* 043964 80042D64 27A40068 */ addiu $a0, $sp, 0x68
/* 043968 80042D68 0C01B063 */ jal func_8006C18C
/* 04396C 80042D6C AFA20060 */ sw $v0, 0x60($sp)
asm/non_matchings/unknown_0255E0/render_scene.s
+1 -1
View File
@@ -346,7 +346,7 @@ glabel render_scene
/* 025E60 80025260 0C02B288 */ jal func_800ACA20
/* 025E64 80025264 00403825 */ move $a3, $v0
/* 025E68 80025268 8E040000 */ lw $a0, ($s0)
/* 025E6C 8002526C 0C006EC6 */ jal func_8001BB18
/* 025E6C 8002526C 0C006EC6 */ jal get_racer_object_by_port
/* 025E70 80025270 00000000 */ nop
/* 025E74 80025274 8FAD00A0 */ lw $t5, 0xa0($sp)
/* 025E78 80025278 3C068012 */ lui $a2, %hi(gSceneCurrVertexList) # $a2, 0x8012
asm/non_matchings/unknown_032760/func_8003F0F8.s
+1 -1
View File
@@ -15,7 +15,7 @@ glabel func_8003F0F8
/* 03FD2C 8003F12C E7B40024 */ swc1 $f20, 0x24($sp)
/* 03FD30 8003F130 AFA60078 */ sw $a2, 0x78($sp)
/* 03FD34 8003F134 0000A025 */ move $s4, $zero
/* 03FD38 8003F138 0C006EA4 */ jal func_8001BA90
/* 03FD38 8003F138 0C006EA4 */ jal get_racer_objects_by_port
/* 03FD3C 8003F13C 27A40060 */ addiu $a0, $sp, 0x60
/* 03FD40 8003F140 8FAE0060 */ lw $t6, 0x60($sp)
/* 03FD44 8003F144 00008025 */ move $s0, $zero
asm/non_matchings/unknown_032760/obj_loop_levelname.s
+1 -1
View File
@@ -5,7 +5,7 @@ glabel obj_loop_levelname
/* 04369C 80042A9C AFB00020 */ sw $s0, 0x20($sp)
/* 0436A0 80042AA0 AFA5005C */ sw $a1, 0x5c($sp)
/* 0436A4 80042AA4 AFA60058 */ sw $a2, 0x58($sp)
/* 0436A8 80042AA8 0C006EC6 */ jal func_8001BB18
/* 0436A8 80042AA8 0C006EC6 */ jal get_racer_object_by_port
/* 0436AC 80042AAC 00002025 */ move $a0, $zero
/* 0436B0 80042AB0 8FA3005C */ lw $v1, 0x5c($sp)
/* 0436B4 80042AB4 8FA60058 */ lw $a2, 0x58($sp)
src/game_ui.c
+3 -3
View File
@@ -304,12 +304,12 @@ void render_hud(Gfx **dList, Matrix **mtx, TriangleList **tris, Object *arg3, s3
D_80126D08 = get_object_render_stack_pos();
if (D_8012718A) {
arg3 = func_8001BB18(1 - D_80126D08);
arg3 = get_racer_object_by_port(1 - D_80126D08);
}
D_80126D60 = get_current_level_header();
if (arg3 == NULL) {
if (func_8001E440() == 10) {
arg3 = func_8001BB18(0);
arg3 = get_racer_object_by_port(0);
}
}
if (arg3 != NULL && !(D_80126D60->unkBC & 2)) {
@@ -1589,7 +1589,7 @@ s32 func_800A8474(Gfx **dList, Matrix **mtx, TriangleList **triList, s32 updateR
}
}
D_80126D60 = get_current_level_header();
sp150 = func_8001BA90(&sp140);
sp150 = get_racer_objects_by_port(&sp140);
gHUDCurrDisplayList = *dList;
gHUDCurrMatrix = *mtx;
gHUDCurrTriList = *triList;
src/object_functions.c
+1 -1
View File
@@ -997,7 +997,7 @@ void obj_loop_posarrow(Object *obj, UNUSED s32 speed) {
s32 numberOfObjects;
obj->segment.trans.unk6 |= 0x4000;
someObjList = func_8001BAAC(&numberOfObjects);
someObjList = get_racer_objects_by_position(&numberOfObjects);
if (obj->unk78 < numberOfObjects) {
someObj = someObjList[obj->unk78];
someObj64 = &someObj->unk64->pos_arrow;
src/objects.c
+15 -16
View File
@@ -1530,40 +1530,39 @@ s32 func_8001BA64() {
return D_8011AED0;
}
Object **get_racer_objects(s32 *cnt) {
*cnt = gNumRacers;
Object **get_racer_objects(s32 *numRacers) {
*numRacers = gNumRacers;
return *gRacers;
}
s32 *func_8001BA90(s32 *arg0) {
*arg0 = gNumRacers;
Object **get_racer_objects_by_port(s32 *numRacers) {
*numRacers = gNumRacers;
return gRacersByPort;
}
Object **func_8001BAAC(s32 *numberOfObjects) {
*numberOfObjects = gNumRacers;
Object **get_racer_objects_by_position(s32 *numRacers) {
*numRacers = gNumRacers;
return gRacersByPosition;
}
Object *get_racer_object(s32 indx) {
Object *get_racer_object(s32 index) {
if (gNumRacers == 0) {
return NULL;
}
if (indx < 0 || indx >= gNumRacers) {
if (index < 0 || index >= gNumRacers) {
return NULL;
}
return (*gRacers)[indx];
return (*gRacers)[index];
}
s32 func_8001BB18(s32 arg0) {
s32 temp_v0 = gNumRacers;
if (temp_v0 == 0) {
return 0;
Object *get_racer_object_by_port(s32 index) {
if (gNumRacers == 0) {
return NULL;
}
if ((arg0 < 0) || (arg0 >= temp_v0)) {
return 0;
if (index < 0 || index >= gNumRacers) {
return NULL;
}
return gRacersByPort[arg0];
return gRacersByPort[index];
}
GLOBAL_ASM("asm/non_matchings/objects/func_8001BB68.s")
src/objects.h
+5 -5
View File
@@ -331,10 +331,10 @@ f32 func_8001B834(Object *arg0, s32);
unknown8011AECC *func_8001BA00(s32 arg0);
unknown8011AECC *func_8001BA1C(s32 arg0, s32 arg1);
s32 func_8001BA64();
Object **get_racer_objects(s32 *cnt);
s32 *func_8001BA90(s32 *arg0);
Object **func_8001BAAC(s32 *numberOfObjects);
Object *get_racer_object(s32 indx);
Object **get_racer_objects(s32 *numRacers);
Object **get_racer_objects_by_port(s32 *numRacers);
Object **get_racer_objects_by_position(s32 *numRacers);
Object *get_racer_object(s32 index);
void func_8001BC40(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
u32 func_8001BD94(s32 arg0);
void func_8001D1AC(void);
@@ -378,7 +378,7 @@ s16 func_8001C418(f32 yPos);
void func_80021400(s32 arg0);
s32 func_8001B668(s32 arg0);
s32 func_80011570(Object *obj, f32 xPos, f32 yPos, f32 zPos);
s32 func_8001BB18(s32 arg0);
Object *get_racer_object_by_port(s32 index);
void render_racer_shield(Gfx **dList, Mtx **mtx, VertexList **vtxList, Object *obj);
void render_racer_magnet(Gfx **dList, Mtx **mtx, VertexList **vtxList, Object *obj);
void set_and_normalize_D_8011AFE8(f32 arg0, f32 arg1, f32 arg2);
src/unknown_0255E0.c
+1 -1
View File
@@ -365,7 +365,7 @@ void render_scene(Gfx** dList, Mtx** mtx, s16** vtx, s8** tris, s32 updateRate)
}
func_800AD030(func_80069D20());
func_800ACA20(&gSceneCurrDisplayList, &gSceneCurrMatrix, &gSceneCurrVertexList, func_80069D20());
render_hud(&gSceneCurrDisplayList, &gSceneCurrMatrix, &gSceneCurrVertexList, func_8001BB18(D_8011B0B4), updateRate);
render_hud(&gSceneCurrDisplayList, &gSceneCurrMatrix, &gSceneCurrVertexList, get_racer_object_by_port(D_8011B0B4), updateRate);
}
if ((numViewports == 3) &&
(get_current_level_race_type() != RACETYPE_CHALLENGE_EGGS) &&