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

match printf/func_800B452C

Browse Source 
https://decomp.me/scratch/KVfrT

Update src/printf.c

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>
This commit is contained in:
Mike Grimes
2022-10-22 11:25:19 -06:00
co-authored by Fazana
parent db6a2b6556
commit 40279dc927
5 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/printf/func_800B452C.s
-23
View File
@@ -1,23 +0,0 @@
glabel func_800B452C
/* 0B512C 800B452C 8C8E0000 */ lw $t6, ($a0)
/* 0B5130 800B4530 3C08800E */ lui $t0, %hi(gParticlesAssetTable) # $t0, 0x800e
/* 0B5134 800B4534 25C3FFFF */ addiu $v1, $t6, -1
/* 0B5138 800B4538 04610009 */ bgez $v1, .L800B4560
/* 0B513C 800B453C AC830000 */ sw $v1, ($a0)
/* 0B5140 800B4540 3C02800E */ lui $v0, %hi(gParticlesAssetTableCount) # $v0, 0x800e
/* 0B5144 800B4544 24422CE8 */ addiu $v0, %lo(gParticlesAssetTableCount) # addiu $v0, $v0, 0x2ce8
.L800B4548:
/* 0B5148 800B4548 8C580000 */ lw $t8, ($v0)
/* 0B514C 800B454C 00000000 */ nop
/* 0B5150 800B4550 0078C821 */ addu $t9, $v1, $t8
/* 0B5154 800B4554 AC990000 */ sw $t9, ($a0)
/* 0B5158 800B4558 0720FFFB */ bltz $t9, .L800B4548
/* 0B515C 800B455C 03201825 */ move $v1, $t9
.L800B4560:
/* 0B5160 800B4560 8D082CF0 */ lw $t0, %lo(gParticlesAssetTable)($t0)
/* 0B5164 800B4564 00034880 */ sll $t1, $v1, 2
/* 0B5168 800B4568 01095021 */ addu $t2, $t0, $t1
/* 0B516C 800B456C 8D420000 */ lw $v0, ($t2)
/* 0B5170 800B4570 03E00008 */ jr $ra
/* 0B5174 800B4574 00000000 */ nop
src/audio.h
+2
View File
@@ -130,6 +130,8 @@ void func_800022BC(u8 arg0, ALSeqPlayer *arg1);
void func_80002570(ALSeqPlayer *seqp);
void func_80002608(u8 arg0);
u8 func_80002630(void);
void alSeqFileNew(ALSeqFile *file, u8 *base);
void func_80063A90(ALSeqPlayer *seqp, u8 chan);
void play_sound_global(u16 soundID, s32* soundMask); //Non matching.
void func_8000232C(ALSeqPlayer *seqp, void *ptr, u8 *arg2, ALCSeq *seq); //Non Matching
src/particles.h
+3
View File
@@ -113,6 +113,9 @@ typedef struct XYStruct {
s16 x, y;
} XYStruct;
extern unk800E2CF0 **gParticlesAssetTable;
extern s32 gParticlesAssetTableCount;
void func_800AE270(void);
void func_800AE2A0(void);
void func_800AE2D8(void);
src/printf.c
+7 -1
View File
@@ -10,6 +10,7 @@
#include "textures_sprites.h"
#include "stdio.h"
#include "objects.h"
#include "particles.h"
/************ .data ************/
@@ -97,7 +98,12 @@ GLOBAL_ASM("asm/non_matchings/printf/func_800B3740.s")
GLOBAL_ASM("asm/non_matchings/printf/func_800B3E64.s")
GLOBAL_ASM("asm/non_matchings/printf/func_800B4488.s")
GLOBAL_ASM("asm/non_matchings/printf/func_800B44D4.s")
GLOBAL_ASM("asm/non_matchings/printf/func_800B452C.s")
UNUSED unk800E2CF0 *func_800B452C(s32 *arg0) {
for (*arg0 = *arg0 - 1; *arg0 < 0; *arg0 += gParticlesAssetTableCount);
return gParticlesAssetTable[*arg0];
}
GLOBAL_ASM("asm/non_matchings/printf/func_800B4578.s")
GLOBAL_ASM("asm/non_matchings/printf/func_800B45C4.s")
GLOBAL_ASM("asm/non_matchings/printf/func_800B461C.s")
src/printf.h
+3
View File
@@ -3,6 +3,8 @@
#include "types.h"
#include "structs.h"
#include "particles.h"
#include "macros.h"
#include <PR/gu.h>
@@ -35,6 +37,7 @@
void func_800B4A08(s32 arg0);
UNUSED unk800E2CF0 *func_800B452C(s32 *arg0);
void func_800B5E88(void);
void set_render_printf_colour(u8 red, u8 green, u8 blue, u8 alpha);
void set_render_printf_background_colour(u8 red, u8 green, u8 blue, u8 alpha);