mirror of
https://github.com/izzy2lost/Diddy-Kong-Racing.git
synced 2026-06-19 01:16:26 -07:00
Bump score to 51% with 6 new matches (#381)
* Very minor cleanup of init_controllers after consulting JFG * really rough starts to some funcs * some labeling, and match thread0_Main * Some documenting, and better match for a couple of memory funcs * Add more official names for vars and funcs, as well as clean up some matches a little * Force No Shadows on Surfaces Force No Shadows on Surfaces Committer: sixtyfour On branch DKRsixtyfour Changes to be committed: modified: src/unknown_0255E0.h * identify shadows and fix mislabelling from past-me (#380) * Removed outdated comment * split some funcs out of printf that aren't related * Move funcs to particles that should belong there * Some printf documenting * Do some documenting on the debug font details * Get func_800B63F4 in a good place for now * Match func_800B63F4 * Match render_printf and do some more documenting * Move some functions around into different files. * Match func_800AA3EC * Fix some warnings in func_800AA3EC * Rename the thread 0 assert * Migrate BSS from particles to thread0 and printf * Find and split out a function in particles and do more documenting * Rename sprintf and vsprintf stuff to match JFG * Clean up the texAnimateTexture function, and document some more places. * WIP build_tex_display_list and documenting * Missing file check in * Match memset * build_tex_display_list update with macros * MAssive cleanup of build_tex_display_list that brings the score down in a big way. * Removed a massive amount of extra lines in build_tex_display_list * Match texInitTextures * Update README score * Fix comment * Rename some funcs * Commit suggestions from Fazana * Fix for last commit --------- Co-authored-by: Turok64Nukem <Duke64Nukem@gmail.com> Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>
This commit is contained in:
Ryan Myers
co-authored by
Turok64Nukem
Fazana
Turok64Nukem
Fazana
parent
c9fa292c3d
commit
b61e4c3fa4
@@ -5,11 +5,11 @@ This repo contains a work-in-progress decompilation of Diddy Kong Racing for the
|
||||
Currently, only the US 1.0 version of the game is supported. US 1.1, EU 1.0, EU 1.1, and JP are not supported at this time.
|
||||
|
||||
<!-- README_SCORE_SUMMARY_BEGIN -->
|
||||
As of March 3, 2023, this is our current score:
|
||||
As of April 11, 2023, this is our current score:
|
||||
|
||||
    Decomp progress: 50.82%
|
||||
    Decomp progress: 51.01%
|
||||
|
||||
    Documentation progress: 23.36%
|
||||
    Documentation progress: 23.43%
|
||||
<!-- README_SCORE_SUMMARY_END -->
|
||||
|
||||
---
|
||||
@@ -128,25 +128,25 @@ s32 is_drumstick_unlocked(void) {
|
||||
```
|
||||
|
||||
<!-- README_SCORE_BEGIN -->
|
||||
As of March 3, 2023, this is our current score:
|
||||
As of April 11, 2023, this is our current score:
|
||||
```
|
||||
===================================================================
|
||||
ADVENTURE ONE (ASM -> C Decompilation)
|
||||
------------------------- 50.82% Complete -------------------------
|
||||
# Decompiled functions: 1492
|
||||
# GLOBAL_ASM remaining: 339
|
||||
------------------------- 51.01% Complete -------------------------
|
||||
# Decompiled functions: 1498
|
||||
# GLOBAL_ASM remaining: 334
|
||||
# NON_MATCHING functions: 12
|
||||
# NON_EQUIVALENT WIP functions: 63
|
||||
# NON_EQUIVALENT WIP functions: 64
|
||||
--------------------------- Game Status ---------------------------
|
||||
Balloons: 25/47, Keys: 3/4, Trophies: 2/5
|
||||
T.T. Amulets: 2/4, Wizpig Amulets: 2/4
|
||||
-------------------------------------------------------------------
|
||||
We are racing in Treasure Caves. (Lap 2/3)
|
||||
We are racing in Treasure Caves. (Lap 3/3)
|
||||
===================================================================
|
||||
ADVENTURE TWO (Cleanup & Documentation)
|
||||
------------------------- 23.36% Complete -------------------------
|
||||
# Documented functions: 445
|
||||
# Undocumented remaining: 1121
|
||||
------------------------- 23.43% Complete -------------------------
|
||||
# Documented functions: 449
|
||||
# Undocumented remaining: 1118
|
||||
--------------------------- Game Status ---------------------------
|
||||
Balloons: 12/47, Keys: 1/4, Trophies: 0/5
|
||||
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* Official Name: mathRnd */
|
||||
glabel get_random_number_from_range
|
||||
/* 07054C 8006F94C 3C08800E */ lui $t0, %hi(gCurrentRNGSeed) # $t0, 0x800e
|
||||
/* 070550 8006F950 8D08D434 */ lw $t0, %lo(gCurrentRNGSeed)($t0)
|
||||
|
||||
@@ -1044,7 +1044,7 @@ glabel func_800A277C
|
||||
/* 0A4290 800A3690 3C048012 */ lui $a0, %hi(D_80127194) # $a0, 0x8012
|
||||
/* 0A4294 800A3694 8C847194 */ lw $a0, %lo(D_80127194)($a0)
|
||||
/* 0A4298 800A3698 8FA500C8 */ lw $a1, 0xc8($sp)
|
||||
/* 0A429C 800A369C 0C01FC93 */ jal func_8007F24C
|
||||
/* 0A429C 800A369C 0C01FC93 */ jal update_colour_cycle
|
||||
/* 0A42A0 800A36A0 00000000 */ nop
|
||||
/* 0A42A4 800A36A4 0C031059 */ jal set_kerning
|
||||
/* 0A42A8 800A36A8 00002025 */ move $a0, $zero
|
||||
|
||||
@@ -1,137 +0,0 @@
|
||||
glabel func_800AA3EC
|
||||
/* 0AAFEC 800AA3EC 27BDFFD0 */ addiu $sp, $sp, -0x30
|
||||
/* 0AAFF0 800AA3F0 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 0AAFF4 800AA3F4 E7AC0030 */ swc1 $f12, 0x30($sp)
|
||||
/* 0AAFF8 800AA3F8 E7AE0034 */ swc1 $f14, 0x34($sp)
|
||||
/* 0AAFFC 800AA3FC AFA60038 */ sw $a2, 0x38($sp)
|
||||
/* 0AB000 800AA400 0C00B1F1 */ jal get_current_level_model
|
||||
/* 0AB004 800AA404 AFA7003C */ sw $a3, 0x3c($sp)
|
||||
/* 0AB008 800AA408 3C014270 */ li $at, 0x42700000 # 60.000000
|
||||
/* 0AB00C 800AA40C 44812000 */ mtc1 $at, $f4
|
||||
/* 0AB010 800AA410 C7A60040 */ lwc1 $f6, 0x40($sp)
|
||||
/* 0AB014 800AA414 8443003C */ lh $v1, 0x3c($v0)
|
||||
/* 0AB018 800AA418 46062202 */ mul.s $f8, $f4, $f6
|
||||
/* 0AB01C 800AA41C 44832000 */ mtc1 $v1, $f4
|
||||
/* 0AB020 800AA420 C44A0028 */ lwc1 $f10, 0x28($v0)
|
||||
/* 0AB024 800AA424 844E003E */ lh $t6, 0x3e($v0)
|
||||
/* 0AB028 800AA428 468021A0 */ cvt.s.w $f6, $f4
|
||||
/* 0AB02C 800AA42C C7B20030 */ lwc1 $f18, 0x30($sp)
|
||||
/* 0AB030 800AA430 01C33023 */ subu $a2, $t6, $v1
|
||||
/* 0AB034 800AA434 460A4402 */ mul.s $f16, $f8, $f10
|
||||
/* 0AB038 800AA438 46069201 */ sub.s $f8, $f18, $f6
|
||||
/* 0AB03C 800AA43C 44862000 */ mtc1 $a2, $f4
|
||||
/* 0AB040 800AA440 84440044 */ lh $a0, 0x44($v0)
|
||||
/* 0AB044 800AA444 46088282 */ mul.s $f10, $f16, $f8
|
||||
/* 0AB048 800AA448 3C01C270 */ li $at, 0xC2700000 # -60.000000
|
||||
/* 0AB04C 800AA44C 44818000 */ mtc1 $at, $f16
|
||||
/* 0AB050 800AA450 C446002C */ lwc1 $f6, 0x2c($v0)
|
||||
/* 0AB054 800AA454 468024A0 */ cvt.s.w $f18, $f4
|
||||
/* 0AB058 800AA458 844F0046 */ lh $t7, 0x46($v0)
|
||||
/* 0AB05C 800AA45C C7A40034 */ lwc1 $f4, 0x34($sp)
|
||||
/* 0AB060 800AA460 46125003 */ div.s $f0, $f10, $f18
|
||||
/* 0AB064 800AA464 44845000 */ mtc1 $a0, $f10
|
||||
/* 0AB068 800AA468 46103202 */ mul.s $f8, $f6, $f16
|
||||
/* 0AB06C 800AA46C 01E43823 */ subu $a3, $t7, $a0
|
||||
/* 0AB070 800AA470 AFA2002C */ sw $v0, 0x2c($sp)
|
||||
/* 0AB074 800AA474 468054A0 */ cvt.s.w $f18, $f10
|
||||
/* 0AB078 800AA478 44875000 */ mtc1 $a3, $f10
|
||||
/* 0AB07C 800AA47C 46122181 */ sub.s $f6, $f4, $f18
|
||||
/* 0AB080 800AA480 E7A00020 */ swc1 $f0, 0x20($sp)
|
||||
/* 0AB084 800AA484 46064402 */ mul.s $f16, $f8, $f6
|
||||
/* 0AB088 800AA488 46805120 */ cvt.s.w $f4, $f10
|
||||
/* 0AB08C 800AA48C 00000000 */ nop
|
||||
/* 0AB090 800AA490 46048083 */ div.s $f2, $f16, $f4
|
||||
/* 0AB094 800AA494 0C0270C3 */ jal get_filtered_cheats
|
||||
/* 0AB098 800AA498 E7A2001C */ swc1 $f2, 0x1c($sp)
|
||||
/* 0AB09C 800AA49C 8FA5002C */ lw $a1, 0x2c($sp)
|
||||
/* 0AB0A0 800AA4A0 C7A00020 */ lwc1 $f0, 0x20($sp)
|
||||
/* 0AB0A4 800AA4A4 C7A2001C */ lwc1 $f2, 0x1c($sp)
|
||||
/* 0AB0A8 800AA4A8 C7AC003C */ lwc1 $f12, 0x3c($sp)
|
||||
/* 0AB0AC 800AA4AC C7AE0038 */ lwc1 $f14, 0x38($sp)
|
||||
/* 0AB0B0 800AA4B0 30580004 */ andi $t8, $v0, 4
|
||||
/* 0AB0B4 800AA4B4 13000028 */ beqz $t8, .L800AA558
|
||||
/* 0AB0B8 800AA4B8 00000000 */ nop
|
||||
/* 0AB0BC 800AA4BC 460C0482 */ mul.s $f18, $f0, $f12
|
||||
/* 0AB0C0 800AA4C0 3C198012 */ lui $t9, %hi(D_80126D58) # $t9, 0x8012
|
||||
/* 0AB0C4 800AA4C4 8F396D58 */ lw $t9, %lo(D_80126D58)($t9)
|
||||
/* 0AB0C8 800AA4C8 84A80034 */ lh $t0, 0x34($a1)
|
||||
/* 0AB0CC 800AA4CC 460E1202 */ mul.s $f8, $f2, $f14
|
||||
/* 0AB0D0 800AA4D0 44995000 */ mtc1 $t9, $f10
|
||||
/* 0AB0D4 800AA4D4 3C098012 */ lui $t1, %hi(D_80126D1C) # $t1, 0x8012
|
||||
/* 0AB0D8 800AA4D8 8D296D1C */ lw $t1, %lo(D_80126D1C)($t1)
|
||||
/* 0AB0DC 800AA4DC 46805420 */ cvt.s.w $f16, $f10
|
||||
/* 0AB0E0 800AA4E0 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
|
||||
/* 0AB0E4 800AA4E4 24426CDC */ addiu $v0, %lo(D_80126CDC) # addiu $v0, $v0, 0x6cdc
|
||||
/* 0AB0E8 800AA4E8 46089180 */ add.s $f6, $f18, $f8
|
||||
/* 0AB0EC 800AA4EC 44889000 */ mtc1 $t0, $f18
|
||||
/* 0AB0F0 800AA4F0 46068101 */ sub.s $f4, $f16, $f6
|
||||
/* 0AB0F4 800AA4F4 44898000 */ mtc1 $t1, $f16
|
||||
/* 0AB0F8 800AA4F8 46809220 */ cvt.s.w $f8, $f18
|
||||
/* 0AB0FC 800AA4FC 8C4A0000 */ lw $t2, ($v0)
|
||||
/* 0AB100 800AA500 3C0C8012 */ lui $t4, %hi(D_80126D5C) # $t4, 0x8012
|
||||
/* 0AB104 800AA504 468081A0 */ cvt.s.w $f6, $f16
|
||||
/* 0AB108 800AA508 3C0E8012 */ lui $t6, %hi(D_80126D20) # $t6, 0x8012
|
||||
/* 0AB10C 800AA50C 46082280 */ add.s $f10, $f4, $f8
|
||||
/* 0AB110 800AA510 46065481 */ sub.s $f18, $f10, $f6
|
||||
/* 0AB114 800AA514 E55201EC */ swc1 $f18, 0x1ec($t2)
|
||||
/* 0AB118 800AA518 460E0402 */ mul.s $f16, $f0, $f14
|
||||
/* 0AB11C 800AA51C 8D8C6D5C */ lw $t4, %lo(D_80126D5C)($t4)
|
||||
/* 0AB120 800AA520 84AB0036 */ lh $t3, 0x36($a1)
|
||||
/* 0AB124 800AA524 8DCE6D20 */ lw $t6, %lo(D_80126D20)($t6)
|
||||
/* 0AB128 800AA528 460C1282 */ mul.s $f10, $f2, $f12
|
||||
/* 0AB12C 800AA52C 016C6821 */ addu $t5, $t3, $t4
|
||||
/* 0AB130 800AA530 448D2000 */ mtc1 $t5, $f4
|
||||
/* 0AB134 800AA534 8C4F0000 */ lw $t7, ($v0)
|
||||
/* 0AB138 800AA538 46802220 */ cvt.s.w $f8, $f4
|
||||
/* 0AB13C 800AA53C 448E2000 */ mtc1 $t6, $f4
|
||||
/* 0AB140 800AA540 460A8181 */ sub.s $f6, $f16, $f10
|
||||
/* 0AB144 800AA544 46802420 */ cvt.s.w $f16, $f4
|
||||
/* 0AB148 800AA548 46064481 */ sub.s $f18, $f8, $f6
|
||||
/* 0AB14C 800AA54C 46109280 */ add.s $f10, $f18, $f16
|
||||
/* 0AB150 800AA550 10000027 */ b .L800AA5F0
|
||||
/* 0AB154 800AA554 E5EA01F0 */ swc1 $f10, 0x1f0($t7)
|
||||
.L800AA558:
|
||||
/* 0AB158 800AA558 460C0202 */ mul.s $f8, $f0, $f12
|
||||
/* 0AB15C 800AA55C 3C188012 */ lui $t8, %hi(D_80126D58) # $t8, 0x8012
|
||||
/* 0AB160 800AA560 8F186D58 */ lw $t8, %lo(D_80126D58)($t8)
|
||||
/* 0AB164 800AA564 84B90030 */ lh $t9, 0x30($a1)
|
||||
/* 0AB168 800AA568 460E1182 */ mul.s $f6, $f2, $f14
|
||||
/* 0AB16C 800AA56C 44989000 */ mtc1 $t8, $f18
|
||||
/* 0AB170 800AA570 3C088012 */ lui $t0, %hi(D_80126D1C) # $t0, 0x8012
|
||||
/* 0AB174 800AA574 8D086D1C */ lw $t0, %lo(D_80126D1C)($t0)
|
||||
/* 0AB178 800AA578 46809420 */ cvt.s.w $f16, $f18
|
||||
/* 0AB17C 800AA57C 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
|
||||
/* 0AB180 800AA580 24426CDC */ addiu $v0, %lo(D_80126CDC) # addiu $v0, $v0, 0x6cdc
|
||||
/* 0AB184 800AA584 46064100 */ add.s $f4, $f8, $f6
|
||||
/* 0AB188 800AA588 44994000 */ mtc1 $t9, $f8
|
||||
/* 0AB18C 800AA58C 46048280 */ add.s $f10, $f16, $f4
|
||||
/* 0AB190 800AA590 44888000 */ mtc1 $t0, $f16
|
||||
/* 0AB194 800AA594 468041A0 */ cvt.s.w $f6, $f8
|
||||
/* 0AB198 800AA598 8C490000 */ lw $t1, ($v0)
|
||||
/* 0AB19C 800AA59C 3C0B8012 */ lui $t3, %hi(D_80126D5C) # $t3, 0x8012
|
||||
/* 0AB1A0 800AA5A0 46808120 */ cvt.s.w $f4, $f16
|
||||
/* 0AB1A4 800AA5A4 3C0D8012 */ lui $t5, %hi(D_80126D20) # $t5, 0x8012
|
||||
/* 0AB1A8 800AA5A8 46065480 */ add.s $f18, $f10, $f6
|
||||
/* 0AB1AC 800AA5AC 46049201 */ sub.s $f8, $f18, $f4
|
||||
/* 0AB1B0 800AA5B0 E52801EC */ swc1 $f8, 0x1ec($t1)
|
||||
/* 0AB1B4 800AA5B4 460E0402 */ mul.s $f16, $f0, $f14
|
||||
/* 0AB1B8 800AA5B8 8D6B6D5C */ lw $t3, %lo(D_80126D5C)($t3)
|
||||
/* 0AB1BC 800AA5BC 84AA0032 */ lh $t2, 0x32($a1)
|
||||
/* 0AB1C0 800AA5C0 8DAD6D20 */ lw $t5, %lo(D_80126D20)($t5)
|
||||
/* 0AB1C4 800AA5C4 460C1482 */ mul.s $f18, $f2, $f12
|
||||
/* 0AB1C8 800AA5C8 014B6021 */ addu $t4, $t2, $t3
|
||||
/* 0AB1CC 800AA5CC 448C5000 */ mtc1 $t4, $f10
|
||||
/* 0AB1D0 800AA5D0 8C4E0000 */ lw $t6, ($v0)
|
||||
/* 0AB1D4 800AA5D4 468051A0 */ cvt.s.w $f6, $f10
|
||||
/* 0AB1D8 800AA5D8 448D5000 */ mtc1 $t5, $f10
|
||||
/* 0AB1DC 800AA5DC 46128101 */ sub.s $f4, $f16, $f18
|
||||
/* 0AB1E0 800AA5E0 46805420 */ cvt.s.w $f16, $f10
|
||||
/* 0AB1E4 800AA5E4 46043201 */ sub.s $f8, $f6, $f4
|
||||
/* 0AB1E8 800AA5E8 46104480 */ add.s $f18, $f8, $f16
|
||||
/* 0AB1EC 800AA5EC E5D201F0 */ swc1 $f18, 0x1f0($t6)
|
||||
.L800AA5F0:
|
||||
/* 0AB1F0 800AA5F0 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 0AB1F4 800AA5F4 27BD0030 */ addiu $sp, $sp, 0x30
|
||||
/* 0AB1F8 800AA5F8 03E00008 */ jr $ra
|
||||
/* 0AB1FC 800AA5FC 00000000 */ nop
|
||||
|
||||
@@ -49,7 +49,7 @@ glabel func_80011134
|
||||
/* 011DEC 800111EC AFB8005C */ sw $t8, 0x5c($sp)
|
||||
/* 011DF0 800111F0 24A50008 */ addiu $a1, $a1, 8
|
||||
/* 011DF4 800111F4 27A6005C */ addiu $a2, $sp, 0x5c
|
||||
/* 011DF8 800111F8 0C01FBE0 */ jal func_8007EF80
|
||||
/* 011DF8 800111F8 0C01FBE0 */ jal tex_animate_texture
|
||||
/* 011DFC 800111FC 02C03825 */ move $a3, $s6
|
||||
/* 011E00 80011200 8FB9005C */ lw $t9, 0x5c($sp)
|
||||
/* 011E04 80011204 00000000 */ nop
|
||||
|
||||
-17
@@ -178,20 +178,3 @@ glabel func_800B46BC
|
||||
/* 0B5500 800B4900 00001025 */ move $v0, $zero
|
||||
/* 0B5504 800B4904 03E00008 */ jr $ra
|
||||
/* 0B5508 800B4908 00000000 */ nop
|
||||
|
||||
/* 0B550C 800B490C 2CC30001 */ sltiu $v1, $a2, 1
|
||||
/* 0B5510 800B4910 38630001 */ xori $v1, $v1, 1
|
||||
/* 0B5514 800B4914 00801025 */ move $v0, $a0
|
||||
/* 0B5518 800B4918 10600007 */ beqz $v1, .L800B4938
|
||||
/* 0B551C 800B491C 24C6FFFF */ addiu $a2, $a2, -1
|
||||
.L800B4920:
|
||||
/* 0B5520 800B4920 2CC30001 */ sltiu $v1, $a2, 1
|
||||
/* 0B5524 800B4924 38630001 */ xori $v1, $v1, 1
|
||||
/* 0B5528 800B4928 24C6FFFF */ addiu $a2, $a2, -1
|
||||
/* 0B552C 800B492C A0450000 */ sb $a1, ($v0)
|
||||
/* 0B5530 800B4930 1460FFFB */ bnez $v1, .L800B4920
|
||||
/* 0B5534 800B4934 24420001 */ addiu $v0, $v0, 1
|
||||
.L800B4938:
|
||||
/* 0B5538 800B4938 03E00008 */ jr $ra
|
||||
/* 0B553C 800B493C 00801025 */ move $v0, $a0
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
# Unused?
|
||||
glabel func_800B63F4
|
||||
/* 0B6FF4 800B63F4 27BDFEC8 */ addiu $sp, $sp, -0x138
|
||||
/* 0B6FF8 800B63F8 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 0B6FFC 800B63FC AFA40138 */ sw $a0, 0x138($sp)
|
||||
/* 0B7000 800B6400 AFA5013C */ sw $a1, 0x13c($sp)
|
||||
/* 0B7004 800B6404 AFA60140 */ sw $a2, 0x140($sp)
|
||||
/* 0B7008 800B6408 AFA70144 */ sw $a3, 0x144($sp)
|
||||
/* 0B700C 800B640C 24040001 */ li $a0, 1
|
||||
/* 0B7010 800B6410 0C02D282 */ jal func_800B4A08
|
||||
/* 0B7014 800B6414 AFA0012C */ sw $zero, 0x12c($sp)
|
||||
/* 0B7018 800B6418 8FA50138 */ lw $a1, 0x138($sp)
|
||||
/* 0B701C 800B641C 27A4002C */ addiu $a0, $sp, 0x2c
|
||||
/* 0B7020 800B6420 0C02D290 */ jal sprintf
|
||||
/* 0B7024 800B6424 27A6013C */ addiu $a2, $sp, 0x13c
|
||||
/* 0B7028 800B6428 0C02D282 */ jal func_800B4A08
|
||||
/* 0B702C 800B642C 00002025 */ move $a0, $zero
|
||||
/* 0B7030 800B6430 93AF002C */ lbu $t7, 0x2c($sp)
|
||||
/* 0B7034 800B6434 8FA7012C */ lw $a3, 0x12c($sp)
|
||||
/* 0B7038 800B6438 27AE002C */ addiu $t6, $sp, 0x2c
|
||||
/* 0B703C 800B643C 11E0003B */ beqz $t7, .L800B652C
|
||||
/* 0B7040 800B6440 01C01825 */ move $v1, $t6
|
||||
/* 0B7044 800B6444 91C50000 */ lbu $a1, ($t6)
|
||||
/* 0B7048 800B6448 3C0A800E */ lui $t2, %hi(D_800E2EF4) # $t2, 0x800e
|
||||
/* 0B704C 800B644C 3C068012 */ lui $a2, %hi(gDebugFontTexture) # $a2, 0x8012
|
||||
/* 0B7050 800B6450 24C67CCC */ addiu $a2, %lo(gDebugFontTexture) # addiu $a2, $a2, 0x7ccc
|
||||
/* 0B7054 800B6454 254A2EF4 */ addiu $t2, %lo(D_800E2EF4) # addiu $t2, $t2, 0x2ef4
|
||||
/* 0B7058 800B6458 240C0002 */ li $t4, 2
|
||||
/* 0B705C 800B645C 240B0001 */ li $t3, 1
|
||||
/* 0B7060 800B6460 24090020 */ li $t1, 32
|
||||
/* 0B7064 800B6464 2408000A */ li $t0, 10
|
||||
/* 0B7068 800B6468 00A01025 */ move $v0, $a1
|
||||
.L800B646C:
|
||||
/* 0B706C 800B646C 1048002B */ beq $v0, $t0, .L800B651C
|
||||
/* 0B7070 800B6470 00000000 */ nop
|
||||
/* 0B7074 800B6474 14490003 */ bne $v0, $t1, .L800B6484
|
||||
/* 0B7078 800B6478 28410040 */ slti $at, $v0, 0x40
|
||||
/* 0B707C 800B647C 10000027 */ b .L800B651C
|
||||
/* 0B7080 800B6480 24E70006 */ addiu $a3, $a3, 6
|
||||
.L800B6484:
|
||||
/* 0B7084 800B6484 10200009 */ beqz $at, .L800B64AC
|
||||
/* 0B7088 800B6488 28410060 */ slti $at, $v0, 0x60
|
||||
/* 0B708C 800B648C ACC00000 */ sw $zero, ($a2)
|
||||
/* 0B7090 800B6490 90780000 */ lbu $t8, ($v1)
|
||||
/* 0B7094 800B6494 00000000 */ nop
|
||||
/* 0B7098 800B6498 2719FFDF */ addiu $t9, $t8, -0x21
|
||||
/* 0B709C 800B649C A0790000 */ sb $t9, ($v1)
|
||||
/* 0B70A0 800B64A0 10000014 */ b .L800B64F4
|
||||
/* 0B70A4 800B64A4 332500FF */ andi $a1, $t9, 0xff
|
||||
/* 0B70A8 800B64A8 28410060 */ slti $at, $v0, 0x60
|
||||
.L800B64AC:
|
||||
/* 0B70AC 800B64AC 10200009 */ beqz $at, .L800B64D4
|
||||
/* 0B70B0 800B64B0 28410080 */ slti $at, $v0, 0x80
|
||||
/* 0B70B4 800B64B4 ACCB0000 */ sw $t3, ($a2)
|
||||
/* 0B70B8 800B64B8 906D0000 */ lbu $t5, ($v1)
|
||||
/* 0B70BC 800B64BC 00000000 */ nop
|
||||
/* 0B70C0 800B64C0 25AFFFC0 */ addiu $t7, $t5, -0x40
|
||||
/* 0B70C4 800B64C4 A06F0000 */ sb $t7, ($v1)
|
||||
/* 0B70C8 800B64C8 1000000A */ b .L800B64F4
|
||||
/* 0B70CC 800B64CC 31E500FF */ andi $a1, $t7, 0xff
|
||||
/* 0B70D0 800B64D0 28410080 */ slti $at, $v0, 0x80
|
||||
.L800B64D4:
|
||||
/* 0B70D4 800B64D4 10200007 */ beqz $at, .L800B64F4
|
||||
/* 0B70D8 800B64D8 00000000 */ nop
|
||||
/* 0B70DC 800B64DC ACCC0000 */ sw $t4, ($a2)
|
||||
/* 0B70E0 800B64E0 906E0000 */ lbu $t6, ($v1)
|
||||
/* 0B70E4 800B64E4 00000000 */ nop
|
||||
/* 0B70E8 800B64E8 25D8FFA0 */ addiu $t8, $t6, -0x60
|
||||
/* 0B70EC 800B64EC A0780000 */ sb $t8, ($v1)
|
||||
/* 0B70F0 800B64F0 330500FF */ andi $a1, $t8, 0xff
|
||||
.L800B64F4:
|
||||
/* 0B70F4 800B64F4 8CD90000 */ lw $t9, ($a2)
|
||||
/* 0B70F8 800B64F8 00057040 */ sll $t6, $a1, 1
|
||||
/* 0B70FC 800B64FC 00196980 */ sll $t5, $t9, 6
|
||||
/* 0B7100 800B6500 014D7821 */ addu $t7, $t2, $t5
|
||||
/* 0B7104 800B6504 01EE1021 */ addu $v0, $t7, $t6
|
||||
/* 0B7108 800B6508 90580001 */ lbu $t8, 1($v0)
|
||||
/* 0B710C 800B650C 90440000 */ lbu $a0, ($v0)
|
||||
/* 0B7110 800B6510 00F8C821 */ addu $t9, $a3, $t8
|
||||
/* 0B7114 800B6514 03243823 */ subu $a3, $t9, $a0
|
||||
/* 0B7118 800B6518 24E70001 */ addiu $a3, $a3, 1
|
||||
.L800B651C:
|
||||
/* 0B711C 800B651C 90650001 */ lbu $a1, 1($v1)
|
||||
/* 0B7120 800B6520 24630001 */ addiu $v1, $v1, 1
|
||||
/* 0B7124 800B6524 14A0FFD1 */ bnez $a1, .L800B646C
|
||||
/* 0B7128 800B6528 00A01025 */ move $v0, $a1
|
||||
.L800B652C:
|
||||
/* 0B712C 800B652C 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 0B7130 800B6530 27BD0138 */ addiu $sp, $sp, 0x138
|
||||
/* 0B7134 800B6534 03E00008 */ jr $ra
|
||||
/* 0B7138 800B6538 00E01025 */ move $v0, $a3
|
||||
@@ -1,44 +0,0 @@
|
||||
glabel render_printf /* official name: diPrintf */
|
||||
/* 0B6ADC 800B5EDC 3C0E8013 */ lui $t6, %hi(gDebugPrintBufferEnd) # $t6, 0x8013
|
||||
/* 0B6AE0 800B5EE0 8DCE85D8 */ lw $t6, %lo(gDebugPrintBufferEnd)($t6)
|
||||
/* 0B6AE4 800B5EE4 27BDFFE0 */ addiu $sp, $sp, -0x20
|
||||
/* 0B6AE8 800B5EE8 3C0F8012 */ lui $t7, %hi(gDebugPrintBufferStart) # $t7, 0x8012
|
||||
/* 0B6AEC 800B5EEC 25EF7CD8 */ addiu $t7, %lo(gDebugPrintBufferStart) # addiu $t7, $t7, 0x7cd8
|
||||
/* 0B6AF0 800B5EF0 01CFC023 */ subu $t8, $t6, $t7
|
||||
/* 0B6AF4 800B5EF4 2B010801 */ slti $at, $t8, 0x801
|
||||
/* 0B6AF8 800B5EF8 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 0B6AFC 800B5EFC AFA40020 */ sw $a0, 0x20($sp)
|
||||
/* 0B6B00 800B5F00 AFA50024 */ sw $a1, 0x24($sp)
|
||||
/* 0B6B04 800B5F04 AFA60028 */ sw $a2, 0x28($sp)
|
||||
/* 0B6B08 800B5F08 14200003 */ bnez $at, .L800B5F18
|
||||
/* 0B6B0C 800B5F0C AFA7002C */ sw $a3, 0x2c($sp)
|
||||
/* 0B6B10 800B5F10 10000015 */ b .L800B5F68
|
||||
/* 0B6B14 800B5F14 2402FFFF */ li $v0, -1
|
||||
.L800B5F18:
|
||||
/* 0B6B18 800B5F18 0C02D282 */ jal func_800B4A08
|
||||
/* 0B6B1C 800B5F1C 24040001 */ li $a0, 1
|
||||
/* 0B6B20 800B5F20 3C048013 */ lui $a0, %hi(gDebugPrintBufferEnd) # $a0, 0x8013
|
||||
/* 0B6B24 800B5F24 8C8485D8 */ lw $a0, %lo(gDebugPrintBufferEnd)($a0)
|
||||
/* 0B6B28 800B5F28 8FA50020 */ lw $a1, 0x20($sp)
|
||||
/* 0B6B2C 800B5F2C 0C02D290 */ jal sprintf
|
||||
/* 0B6B30 800B5F30 27A60024 */ addiu $a2, $sp, 0x24
|
||||
/* 0B6B34 800B5F34 00002025 */ move $a0, $zero
|
||||
/* 0B6B38 800B5F38 0C02D282 */ jal func_800B4A08
|
||||
/* 0B6B3C 800B5F3C AFA20018 */ sw $v0, 0x18($sp)
|
||||
/* 0B6B40 800B5F40 8FA30018 */ lw $v1, 0x18($sp)
|
||||
/* 0B6B44 800B5F44 3C028013 */ lui $v0, %hi(gDebugPrintBufferEnd) # $v0, 0x8013
|
||||
/* 0B6B48 800B5F48 18600006 */ blez $v1, .L800B5F64
|
||||
/* 0B6B4C 800B5F4C 244285D8 */ addiu $v0, %lo(gDebugPrintBufferEnd) # addiu $v0, $v0, -0x7a28
|
||||
/* 0B6B50 800B5F50 8C590000 */ lw $t9, ($v0)
|
||||
/* 0B6B54 800B5F54 00000000 */ nop
|
||||
/* 0B6B58 800B5F58 03234021 */ addu $t0, $t9, $v1
|
||||
/* 0B6B5C 800B5F5C 25090001 */ addiu $t1, $t0, 1
|
||||
/* 0B6B60 800B5F60 AC490000 */ sw $t1, ($v0)
|
||||
.L800B5F64:
|
||||
/* 0B6B64 800B5F64 00001025 */ move $v0, $zero
|
||||
.L800B5F68:
|
||||
/* 0B6B68 800B5F68 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 0B6B6C 800B5F6C 27BD0020 */ addiu $sp, $sp, 0x20
|
||||
/* 0B6B70 800B5F70 03E00008 */ jr $ra
|
||||
/* 0B6B74 800B5F74 00000000 */ nop
|
||||
|
||||
@@ -7,7 +7,7 @@ glabel jpt_800E8D88
|
||||
.word L800B52C4, amGetSfxCount, L800B5794, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, L800B4F84, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, L800B5AC4, L800B4E38, L800B52C4, L800B57A4, L800B5794, amGetSfxCount, L800B4E38, amGetSfxCount, amGetSfxCount, amGetSfxCount, amGetSfxCount, L800B5D78, L800B4F64, L800B5C8C, amGetSfxCount, amGetSfxCount, L800B5B48, amGetSfxCount, L800B4F44, amGetSfxCount, amGetSfxCount, L800B4FA4
|
||||
|
||||
.text
|
||||
glabel sprintf
|
||||
glabel vsprintf
|
||||
/* 0B5640 800B4A40 27BDFE48 */ addiu $sp, $sp, -0x1b8
|
||||
/* 0B5644 800B4A44 AFBF004C */ sw $ra, 0x4c($sp)
|
||||
/* 0B5648 800B4A48 AFBE0048 */ sw $fp, 0x48($sp)
|
||||
@@ -1,111 +0,0 @@
|
||||
glabel texInitTextures
|
||||
/* 07B870 8007AC70 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 07B874 8007AC74 AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 07B878 8007AC78 3C05FF00 */ lui $a1, (0xFF00FFFF >> 16) # lui $a1, 0xff00
|
||||
/* 07B87C 8007AC7C 34A5FFFF */ ori $a1, (0xFF00FFFF & 0xFFFF) # ori $a1, $a1, 0xffff
|
||||
/* 07B880 8007AC80 0C01C327 */ jal allocate_from_main_pool_safe
|
||||
/* 07B884 8007AC84 240415E0 */ li $a0, 5600
|
||||
/* 07B888 8007AC88 3C018012 */ lui $at, %hi(gTextureCache) # $at, 0x8012
|
||||
/* 07B88C 8007AC8C 3C05FF00 */ lui $a1, (0xFF00FFFF >> 16) # lui $a1, 0xff00
|
||||
/* 07B890 8007AC90 AC226328 */ sw $v0, %lo(gTextureCache)($at)
|
||||
/* 07B894 8007AC94 34A5FFFF */ ori $a1, (0xFF00FFFF & 0xFFFF) # ori $a1, $a1, 0xffff
|
||||
/* 07B898 8007AC98 0C01C327 */ jal allocate_from_main_pool_safe
|
||||
/* 07B89C 8007AC9C 24040280 */ li $a0, 640
|
||||
/* 07B8A0 8007ACA0 3C018012 */ lui $at, %hi(gCiPalettes) # $at, 0x8012
|
||||
/* 07B8A4 8007ACA4 AC22632C */ sw $v0, %lo(gCiPalettes)($at)
|
||||
/* 07B8A8 8007ACA8 3C018012 */ lui $at, %hi(gNumberOfLoadedTextures) # $at, 0x8012
|
||||
/* 07B8AC 8007ACAC AC206330 */ sw $zero, %lo(gNumberOfLoadedTextures)($at)
|
||||
/* 07B8B0 8007ACB0 3C018012 */ lui $at, %hi(gCiPalettesSize) # $at, 0x8012
|
||||
/* 07B8B4 8007ACB4 AC206340 */ sw $zero, %lo(gCiPalettesSize)($at)
|
||||
/* 07B8B8 8007ACB8 0C01DB16 */ jal load_asset_section_from_rom
|
||||
/* 07B8BC 8007ACBC 24040005 */ li $a0, 5
|
||||
/* 07B8C0 8007ACC0 3C058012 */ lui $a1, %hi(D_80126320) # $a1, 0x8012
|
||||
/* 07B8C4 8007ACC4 24A56320 */ addiu $a1, %lo(D_80126320) # addiu $a1, $a1, 0x6320
|
||||
/* 07B8C8 8007ACC8 ACA20000 */ sw $v0, ($a1)
|
||||
/* 07B8CC 8007ACCC 0C01DB16 */ jal load_asset_section_from_rom
|
||||
/* 07B8D0 8007ACD0 24040003 */ li $a0, 3
|
||||
/* 07B8D4 8007ACD4 3C058012 */ lui $a1, %hi(D_80126320) # $a1, 0x8012
|
||||
/* 07B8D8 8007ACD8 24A56320 */ addiu $a1, %lo(D_80126320) # addiu $a1, $a1, 0x6320
|
||||
/* 07B8DC 8007ACDC 8CA40000 */ lw $a0, ($a1)
|
||||
/* 07B8E0 8007ACE0 ACA20004 */ sw $v0, 4($a1)
|
||||
/* 07B8E4 8007ACE4 8C8E0000 */ lw $t6, ($a0)
|
||||
/* 07B8E8 8007ACE8 2407FFFF */ li $a3, -1
|
||||
/* 07B8EC 8007ACEC 10EE0006 */ beq $a3, $t6, .L8007AD08
|
||||
/* 07B8F0 8007ACF0 00001825 */ move $v1, $zero
|
||||
/* 07B8F4 8007ACF4 00801025 */ move $v0, $a0
|
||||
.L8007ACF8:
|
||||
/* 07B8F8 8007ACF8 8C4F0004 */ lw $t7, 4($v0)
|
||||
/* 07B8FC 8007ACFC 24630001 */ addiu $v1, $v1, 1
|
||||
/* 07B900 8007AD00 14EFFFFD */ bne $a3, $t7, .L8007ACF8
|
||||
/* 07B904 8007AD04 24420004 */ addiu $v0, $v0, 4
|
||||
.L8007AD08:
|
||||
/* 07B908 8007AD08 3C068012 */ lui $a2, %hi(D_80126338) # $a2, 0x8012
|
||||
/* 07B90C 8007AD0C 8CA40004 */ lw $a0, 4($a1)
|
||||
/* 07B910 8007AD10 24C66338 */ addiu $a2, %lo(D_80126338) # addiu $a2, $a2, 0x6338
|
||||
/* 07B914 8007AD14 2463FFFF */ addiu $v1, $v1, -1
|
||||
/* 07B918 8007AD18 ACC30000 */ sw $v1, ($a2)
|
||||
/* 07B91C 8007AD1C 8C980000 */ lw $t8, ($a0)
|
||||
/* 07B920 8007AD20 00001825 */ move $v1, $zero
|
||||
/* 07B924 8007AD24 10F80006 */ beq $a3, $t8, .L8007AD40
|
||||
/* 07B928 8007AD28 3C05FF00 */ lui $a1, (0xFF00FFFF >> 16) # lui $a1, 0xff00
|
||||
/* 07B92C 8007AD2C 00801025 */ move $v0, $a0
|
||||
.L8007AD30:
|
||||
/* 07B930 8007AD30 8C590004 */ lw $t9, 4($v0)
|
||||
/* 07B934 8007AD34 24630001 */ addiu $v1, $v1, 1
|
||||
/* 07B938 8007AD38 14F9FFFD */ bne $a3, $t9, .L8007AD30
|
||||
/* 07B93C 8007AD3C 24420004 */ addiu $v0, $v0, 4
|
||||
.L8007AD40:
|
||||
/* 07B940 8007AD40 2463FFFF */ addiu $v1, $v1, -1
|
||||
/* 07B944 8007AD44 ACC30004 */ sw $v1, 4($a2)
|
||||
/* 07B948 8007AD48 24040320 */ li $a0, 800
|
||||
/* 07B94C 8007AD4C 0C01C327 */ jal allocate_from_main_pool_safe
|
||||
/* 07B950 8007AD50 34A5FFFF */ ori $a1, (0xFF00FFFF & 0xFFFF) # ori $a1, $a1, 0xffff
|
||||
/* 07B954 8007AD54 3C018012 */ lui $at, %hi(gSpriteCache) # $at, 0x8012
|
||||
/* 07B958 8007AD58 3C05FF00 */ lui $a1, (0xFF00FFFF >> 16) # lui $a1, 0xff00
|
||||
/* 07B95C 8007AD5C AC22634C */ sw $v0, %lo(gSpriteCache)($at)
|
||||
/* 07B960 8007AD60 34A5FFFF */ ori $a1, (0xFF00FFFF & 0xFFFF) # ori $a1, $a1, 0xffff
|
||||
/* 07B964 8007AD64 0C01C327 */ jal allocate_from_main_pool_safe
|
||||
/* 07B968 8007AD68 24040200 */ li $a0, 512
|
||||
/* 07B96C 8007AD6C 3C018012 */ lui $at, %hi(gCurrentSprite) # $at, 0x8012
|
||||
/* 07B970 8007AD70 AC226350 */ sw $v0, %lo(gCurrentSprite)($at)
|
||||
/* 07B974 8007AD74 3C018012 */ lui $at, %hi(D_80126358) # $at, 0x8012
|
||||
/* 07B978 8007AD78 AC206358 */ sw $zero, %lo(D_80126358)($at)
|
||||
/* 07B97C 8007AD7C 0C01DB16 */ jal load_asset_section_from_rom
|
||||
/* 07B980 8007AD80 2404000D */ li $a0, 13
|
||||
/* 07B984 8007AD84 3C058012 */ lui $a1, %hi(gSpriteOffsetTable) # $a1, 0x8012
|
||||
/* 07B988 8007AD88 3C068012 */ lui $a2, %hi(D_80126354) # $a2, 0x8012
|
||||
/* 07B98C 8007AD8C 24C66354 */ addiu $a2, %lo(D_80126354) # addiu $a2, $a2, 0x6354
|
||||
/* 07B990 8007AD90 24A56348 */ addiu $a1, %lo(gSpriteOffsetTable) # addiu $a1, $a1, 0x6348
|
||||
/* 07B994 8007AD94 00004080 */ sll $t0, $zero, 2
|
||||
/* 07B998 8007AD98 ACA20000 */ sw $v0, ($a1)
|
||||
/* 07B99C 8007AD9C ACC00000 */ sw $zero, ($a2)
|
||||
/* 07B9A0 8007ADA0 00484821 */ addu $t1, $v0, $t0
|
||||
/* 07B9A4 8007ADA4 8D2A0000 */ lw $t2, ($t1)
|
||||
/* 07B9A8 8007ADA8 2407FFFF */ li $a3, -1
|
||||
/* 07B9AC 8007ADAC 00402025 */ move $a0, $v0
|
||||
/* 07B9B0 8007ADB0 10EA0009 */ beq $a3, $t2, .L8007ADD8
|
||||
/* 07B9B4 8007ADB4 00001825 */ move $v1, $zero
|
||||
/* 07B9B8 8007ADB8 246B0001 */ addiu $t3, $v1, 1
|
||||
.L8007ADBC:
|
||||
/* 07B9BC 8007ADBC 000B6080 */ sll $t4, $t3, 2
|
||||
/* 07B9C0 8007ADC0 008C6821 */ addu $t5, $a0, $t4
|
||||
/* 07B9C4 8007ADC4 ACCB0000 */ sw $t3, ($a2)
|
||||
/* 07B9C8 8007ADC8 8DAE0000 */ lw $t6, ($t5)
|
||||
/* 07B9CC 8007ADCC 01601825 */ move $v1, $t3
|
||||
/* 07B9D0 8007ADD0 14EEFFFA */ bne $a3, $t6, .L8007ADBC
|
||||
/* 07B9D4 8007ADD4 246B0001 */ addiu $t3, $v1, 1
|
||||
.L8007ADD8:
|
||||
/* 07B9D8 8007ADD8 246FFFFF */ addiu $t7, $v1, -1
|
||||
/* 07B9DC 8007ADDC 3C05FF00 */ lui $a1, (0xFF00FFFF >> 16) # lui $a1, 0xff00
|
||||
/* 07B9E0 8007ADE0 ACCF0000 */ sw $t7, ($a2)
|
||||
/* 07B9E4 8007ADE4 34A5FFFF */ ori $a1, (0xFF00FFFF & 0xFFFF) # ori $a1, $a1, 0xffff
|
||||
/* 07B9E8 8007ADE8 0C01C327 */ jal allocate_from_main_pool_safe
|
||||
/* 07B9EC 8007ADEC 24040028 */ li $a0, 40
|
||||
/* 07B9F0 8007ADF0 3C018012 */ lui $at, %hi(gTempTextureHeader) # $at, 0x8012
|
||||
/* 07B9F4 8007ADF4 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 07B9F8 8007ADF8 AC22636C */ sw $v0, %lo(gTempTextureHeader)($at)
|
||||
/* 07B9FC 8007ADFC 3C018012 */ lui $at, %hi(D_80126344) # $at, 0x8012
|
||||
/* 07BA00 8007AE00 AC206344 */ sw $zero, %lo(D_80126344)($at)
|
||||
/* 07BA04 8007AE04 03E00008 */ jr $ra
|
||||
/* 07BA08 8007AE08 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user