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

Some renames, and a few new ones. (#459)

Browse Source 
* fix warns

* memory

* hehe

* name

* name

* yes

* Surpress bloaty warnings on matching builds

* Update game_ui.c

* label unused vi offset

* fix doubleword memcpy

* segment momento

* swap prefix since it'll be a bit more prominent

* Update src/save_data.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* rcp.c renamed

* renamed video.c

* some memory enums

* rename memory.c

* revert the interrupts name

* Update video.h

* Update README.md

* b

* clang formatto

* Update memory.c

---------

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
This commit is contained in:
Fazana
2025-02-14 18:40:55 +00:00
committed by GitHub
co-authored by Ryan Myers
parent 6c700e9726
commit 17fbd96b89
64 changed files with 964 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+10 -10
View File
@@ -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 (SHA1 = 0cb115d8716dbbc2922fda38e533b9fe63bb9670) 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 July 4, 2024, this is our current score:
As of February 14, 2025, this is our current score:
&emsp;&emsp;&emsp;&emsp;Decomp progress: 67.74%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 49.32%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 49.72%
<!-- README_SCORE_SUMMARY_END -->
---
@@ -126,15 +126,15 @@ s32 is_drumstick_unlocked(void) {
```
<!-- README_SCORE_BEGIN -->
As of July 4th, 2024, this is our current score:
As of February 14th, 2025, this is our current score:
```
=============================================
ADVENTURE ONE (ASM -> C Decompilation)
--- 67.74% Complete (70.25% NON_MATCHING) ---
--- 67.74% Complete (70.43% NON_MATCHING) ---
# Decompiled functions: 1695
# GLOBAL_ASM remaining: 150
# NON_MATCHING functions: 14
# NON_EQUIVALENT WIP functions: 49
# NON_MATCHING functions: 16
# NON_EQUIVALENT WIP functions: 47
---------------- Game Status ----------------
Balloons: 32/47, Keys: 3/4, Trophies: 3/5
T.T. Amulets: 3/4, Wizpig Amulets: 3/4
@@ -142,14 +142,14 @@ As of July 4th, 2024, this is our current score:
We are racing in Greenwood Village. (Lap 3/3)
=============================================
ADVENTURE TWO (Cleanup & Documentation)
-------------- 49.32% Complete --------------
# Documented functions: 1080
# Undocumented remaining: 488
-------------- 49.72% Complete --------------
# Documented functions: 1091
# Undocumented remaining: 477
---------------- Game Status ----------------
Balloons: 24/47, Keys: 3/4, Trophies: 2/5
T.T. Amulets: 2/4, Wizpig Amulets: 2/4
---------------------------------------------
We are racing in Pirate Lagoon. (Lap 2/3)
We are racing in Pirate Lagoon. (Lap 3/3)
=============================================
```
<!-- README_SCORE_END -->
asm/get_stack_pointer.s
+1 -1
View File
@@ -9,7 +9,7 @@
.set noreorder # dont insert nops after branches
.set gp=64 # 64-bit instructions are used
glabel get_stack_pointer
glabel stack_pointer
jr $ra
move $v0, $sp
asm/math_util/disable_interrupts.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel disable_interrupts /* Official name: disableInterrupts */
glabel interrupts_disable /* Official name: disableInterrupts */
/* 070110 8006F510 3C08800E */ lui $t0, %hi(gIntDisFlag) # $t0, 0x800e
/* 070114 8006F514 8108D430 */ lb $t0, %lo(gIntDisFlag)($t0)
/* 070118 8006F518 11000006 */ beqz $t0, .L8006F534
asm/math_util/enable_interrupts.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel enable_interrupts /* Official name: enableInterrupts */
glabel interrupts_enable /* Official name: enableInterrupts */
/* 07013C 8006F53C 3C08800E */ lui $t0, %hi(gIntDisFlag) # $t0, 0x800e
/* 070140 8006F540 8108D430 */ lb $t0, %lo(gIntDisFlag)($t0)
/* 070144 8006F544 11000005 */ beqz $t0, .L8006F55C # Identical to __osRestoreInt below this line
asm/non_matchings/audio_spatial/func_80008040.s
+3 -3
View File
@@ -8,20 +8,20 @@ glabel func_80008040
/* 008C58 80008058 00003025 */ move $a2, $zero
/* 008C5C 8000805C 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff
/* 008C60 80008060 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff
/* 008C64 80008064 0C01C327 */ jal allocate_from_main_pool_safe
/* 008C64 80008064 0C01C327 */ jal mempool_alloc_safe
/* 008C68 80008068 240405A0 */ li $a0, 1440
/* 008C6C 8000806C 3C068012 */ lui $a2, %hi(gSoundMaskHeap) # $a2, 0x8012
/* 008C70 80008070 24C69C48 */ addiu $a2, %lo(gSoundMaskHeap) # addiu $a2, $a2, -0x63b8
/* 008C74 80008074 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff
/* 008C78 80008078 ACC20000 */ sw $v0, ($a2)
/* 008C7C 8000807C 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff
/* 008C80 80008080 0C01C327 */ jal allocate_from_main_pool_safe
/* 008C80 80008080 0C01C327 */ jal mempool_alloc_safe
/* 008C84 80008084 240400A0 */ li $a0, 160
/* 008C88 80008088 3C018012 */ lui $at, %hi(gSoundMaskHeapFree) # $at, 0x8012
/* 008C8C 8000808C 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff
/* 008C90 80008090 AC229C50 */ sw $v0, %lo(gSoundMaskHeapFree)($at)
/* 008C94 80008094 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff
/* 008C98 80008098 0C01C327 */ jal allocate_from_main_pool_safe
/* 008C98 80008098 0C01C327 */ jal mempool_alloc_safe
/* 008C9C 8000809C 240400A0 */ li $a0, 160
/* 008CA0 800080A0 3C018012 */ lui $at, %hi(gSoundMaskHeapUsed) # $at, 0x8012
/* 008CA4 800080A4 AC229C44 */ sw $v0, %lo(gSoundMaskHeapUsed)($at)
asm/non_matchings/audio_vehicle/func_80004B40.s
+4 -4
View File
@@ -51,7 +51,7 @@ glabel func_80004B40
/* 0057E4 80004BE4 0019C880 */ sll $t9, $t9, 2
/* 0057E8 80004BE8 02402825 */ move $a1, $s2
/* 0057EC 80004BEC 2404004C */ li $a0, 76
/* 0057F0 80004BF0 0C01C327 */ jal allocate_from_main_pool_safe
/* 0057F0 80004BF0 0C01C327 */ jal mempool_alloc_safe
/* 0057F4 80004BF4 01F98821 */ addu $s1, $t7, $t9
/* 0057F8 80004BF8 0040A825 */ move $s5, $v0
/* 0057FC 80004BFC 24040027 */ li $a0, 39
@@ -60,7 +60,7 @@ glabel func_80004B40
/* 005808 80004C08 0C01DB9A */ jal load_asset_to_address
/* 00580C 80004C0C 2407004C */ li $a3, 76
/* 005810 80004C10 240400E0 */ li $a0, 224
/* 005814 80004C14 0C01C327 */ jal allocate_from_main_pool_safe
/* 005814 80004C14 0C01C327 */ jal mempool_alloc_safe
/* 005818 80004C18 02402825 */ move $a1, $s2
/* 00581C 80004C1C AFA20044 */ sw $v0, 0x44($sp)
/* 005820 80004C20 00401825 */ move $v1, $v0
@@ -364,9 +364,9 @@ glabel func_80004B40
/* 005C8C 8000508C E4520054 */ swc1 $f18, 0x54($v0)
.L80005090:
/* 005C90 80005090 8FA4003C */ lw $a0, 0x3c($sp)
/* 005C94 80005094 0C01C450 */ jal free_from_memory_pool
/* 005C94 80005094 0C01C450 */ jal mempool_free
/* 005C98 80005098 00000000 */ nop
/* 005C9C 8000509C 0C01C450 */ jal free_from_memory_pool
/* 005C9C 8000509C 0C01C450 */ jal mempool_free
/* 005CA0 800050A0 02A02025 */ move $a0, $s5
/* 005CA4 800050A4 8FBF0034 */ lw $ra, 0x34($sp)
/* 005CA8 800050A8 8FA20044 */ lw $v0, 0x44($sp)
asm/non_matchings/camera/func_80066CDC.s
+1 -1
View File
@@ -22,7 +22,7 @@ glabel func_80066CDC
/* 06792C 80066D2C AFEF0000 */ sw $t7, ($ra)
/* 067930 80066D30 00004825 */ move $t1, $zero
.L80066D34:
/* 067934 80066D34 0C01E948 */ jal get_video_width_and_height_as_s32
/* 067934 80066D34 0C01E948 */ jal fb_size
/* 067938 80066D38 AFA90030 */ sw $t1, 0x30($sp)
/* 06793C 80066D3C 8FA90030 */ lw $t1, 0x30($sp)
/* 067940 80066D40 240B0034 */ li $t3, 52
asm/non_matchings/fade_transition/func_800C15D4.s
+1 -1
View File
@@ -12,7 +12,7 @@ glabel func_800C15D4
/* 0C21FC 800C15FC E7B50010 */ swc1 $f21, 0x10($sp)
/* 0C2200 800C1600 E7B40014 */ swc1 $f20, 0x14($sp)
/* 0C2204 800C1604 34A500FF */ ori $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff
/* 0C2208 800C1608 0C01C327 */ jal allocate_from_main_pool_safe
/* 0C2208 800C1608 0C01C327 */ jal mempool_alloc_safe
/* 0C220C 800C160C 24040DA0 */ li $a0, 3488
/* 0C2210 800C1610 3C04800E */ lui $a0, %hi(sTransitionVtx) # $a0, 0x800e
/* 0C2214 800C1614 3C05800E */ lui $a1, %hi(sTransitionTris) # $a1, 0x800e
asm/non_matchings/game_ui/func_800AA600.s
+6 -6
View File
@@ -305,7 +305,7 @@ glabel func_800AA600
/* 0AB65C 800AAA5C 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0AB660 800AAA60 27A50088 */ addiu $a1, $sp, 0x88
/* 0AB664 800AAA64 E7B20010 */ swc1 $f18, 0x10($sp)
/* 0AB668 800AAA68 0C01E340 */ jal render_texture_rectangle_scaled
/* 0AB668 800AAA68 0C01E340 */ jal texrect_draw_scaled
/* 0AB66C 800AAA6C E7A80014 */ swc1 $f8, 0x14($sp)
/* 0AB670 800AAA70 10000018 */ b .L800AAAD4
/* 0AB674 800AAA74 00000000 */ nop
@@ -320,7 +320,7 @@ glabel func_800AA600
/* 0AB694 800AAA94 27A50088 */ addiu $a1, $sp, 0x88
/* 0AB698 800AAA98 00003025 */ move $a2, $zero
/* 0AB69C 800AAA9C 00003825 */ move $a3, $zero
/* 0AB6A0 800AAAA0 0C01E2AE */ jal render_textured_rectangle
/* 0AB6A0 800AAAA0 0C01E2AE */ jal texrect_draw
/* 0AB6A4 800AAAA4 AFA3001C */ sw $v1, 0x1c($sp)
/* 0AB6A8 800AAAA8 1000000A */ b .L800AAAD4
/* 0AB6AC 800AAAAC 00000000 */ nop
@@ -332,7 +332,7 @@ glabel func_800AA600
/* 0AB6C0 800AAAC0 AFAD0010 */ sw $t5, 0x10($sp)
/* 0AB6C4 800AAAC4 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0AB6C8 800AAAC8 AFAE0018 */ sw $t6, 0x18($sp)
/* 0AB6CC 800AAACC 0C01E2AE */ jal render_textured_rectangle
/* 0AB6CC 800AAACC 0C01E2AE */ jal texrect_draw
/* 0AB6D0 800AAAD0 AFA3001C */ sw $v1, 0x1c($sp)
.L800AAAD4:
/* 0AB6D4 800AAAD4 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000
@@ -387,7 +387,7 @@ glabel func_800AA600
/* 0AB790 800AAB90 AFB80018 */ sw $t8, 0x18($sp)
/* 0AB794 800AAB94 E7A00010 */ swc1 $f0, 0x10($sp)
/* 0AB798 800AAB98 46204420 */ cvt.s.d $f16, $f8
/* 0AB79C 800AAB9C 0C01E340 */ jal render_texture_rectangle_scaled
/* 0AB79C 800AAB9C 0C01E340 */ jal texrect_draw_scaled
/* 0AB7A0 800AABA0 E7B00014 */ swc1 $f16, 0x14($sp)
/* 0AB7A4 800AABA4 100000D7 */ b .L800AAF04
/* 0AB7A8 800AABA8 86080006 */ lh $t0, 6($s0)
@@ -480,7 +480,7 @@ glabel func_800AA600
/* 0AB8FC 800AACFC AFAB0014 */ sw $t3, 0x14($sp)
/* 0AB900 800AAD00 27A50058 */ addiu $a1, $sp, 0x58
/* 0AB904 800AAD04 00003025 */ move $a2, $zero
/* 0AB908 800AAD08 0C01E2AE */ jal render_textured_rectangle
/* 0AB908 800AAD08 0C01E2AE */ jal texrect_draw
/* 0AB90C 800AAD0C 00003825 */ move $a3, $zero
/* 0AB910 800AAD10 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0AB914 800AAD14 0C01ECF4 */ jal reset_render_settings
@@ -513,7 +513,7 @@ glabel func_800AA600
/* 0AB97C 800AAD7C AFAF001C */ sw $t7, 0x1c($sp)
/* 0AB980 800AAD80 AFAE0018 */ sw $t6, 0x18($sp)
/* 0AB984 800AAD84 E7A00014 */ swc1 $f0, 0x14($sp)
/* 0AB988 800AAD88 0C01E340 */ jal render_texture_rectangle_scaled
/* 0AB988 800AAD88 0C01E340 */ jal texrect_draw_scaled
/* 0AB98C 800AAD8C E7A00010 */ swc1 $f0, 0x10($sp)
/* 0AB990 800AAD90 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0AB994 800AAD94 0C01ECF4 */ jal reset_render_settings
asm/non_matchings/menu/func_8007FFEC.s
+1 -1
View File
@@ -33,7 +33,7 @@ glabel func_8007FFEC
/* 080C64 80080064 AFB80020 */ sw $t8, 0x20($sp)
/* 080C68 80080068 AFAC0028 */ sw $t4, 0x28($sp)
/* 080C6C 8008006C AFAD0024 */ sw $t5, 0x24($sp)
/* 080C70 80080070 0C01C327 */ jal allocate_from_main_pool_safe
/* 080C70 80080070 0C01C327 */ jal mempool_alloc_safe
/* 080C74 80080074 2405FFFF */ li $a1, -1
/* 080C78 80080078 8FA30020 */ lw $v1, 0x20($sp)
/* 080C7C 8008007C 3C07800E */ lui $a3, %hi(gWoodPanelTriangles) # $a3, 0x800e
asm/non_matchings/menu/func_80084854.s
+2 -2
View File
@@ -174,7 +174,7 @@ glabel func_80084854
/* 0856E8 80084AE8 AFAD0010 */ sw $t5, 0x10($sp)
/* 0856EC 80084AEC 02002825 */ move $a1, $s0
/* 0856F0 80084AF0 02402025 */ move $a0, $s2
/* 0856F4 80084AF4 0C01E2AE */ jal render_textured_rectangle
/* 0856F4 80084AF4 0C01E2AE */ jal texrect_draw
/* 0856F8 80084AF8 24070078 */ li $a3, 120
/* 0856FC 80084AFC 3C06800E */ lui $a2, %hi(gMusicVolumeSliderValue) # $a2, 0x800e
/* 085700 80084B00 8CC6FAC4 */ lw $a2, %lo(gMusicVolumeSliderValue)($a2)
@@ -190,7 +190,7 @@ glabel func_80084854
/* 085728 80084B28 AFA80010 */ sw $t0, 0x10($sp)
/* 08572C 80084B2C 02402025 */ move $a0, $s2
/* 085730 80084B30 02002825 */ move $a1, $s0
/* 085734 80084B34 0C01E2AE */ jal render_textured_rectangle
/* 085734 80084B34 0C01E2AE */ jal texrect_draw
/* 085738 80084B38 240700A0 */ li $a3, 160
/* 08573C 80084B3C 0C01ECF4 */ jal reset_render_settings
/* 085740 80084B40 02402025 */ move $a0, $s2
asm/non_matchings/menu/func_80092188.s
+1 -1
View File
@@ -572,7 +572,7 @@ glabel L8009287C
/* 093594 80092994 3C028012 */ lui $v0, %hi(gTrackSelectCursorX) # $v0, 0x8012
/* 093598 80092998 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e
/* 09359C 8009299C AC3FF47C */ sw $ra, %lo(gMenuDelay)($at)
/* 0935A0 800929A0 0C01E2AB */ jal set_background_draw_function
/* 0935A0 800929A0 0C01E2AB */ jal bgdraw_set_func
/* 0935A4 800929A4 00002025 */ move $a0, $zero
/* 0935A8 800929A8 3C01800E */ lui $at, %hi(gIsInTracksMenu) # $at, 0x800e
/* 0935AC 800929AC 0C030060 */ jal disable_new_screen_transitions
asm/non_matchings/menu/menu_credits_loop.s
+2 -2
View File
@@ -85,7 +85,7 @@ glabel menu_credits_loop
/* 09C050 8009B450 0014C080 */ sll $t8, $s4, 2
/* 09C054 8009B454 0314C021 */ addu $t8, $t8, $s4
/* 09C058 8009B458 8C750000 */ lw $s5, ($v1)
/* 09C05C 8009B45C 0C01E948 */ jal get_video_width_and_height_as_s32
/* 09C05C 8009B45C 0C01E948 */ jal fb_size
/* 09C060 8009B460 27140048 */ addiu $s4, $t8, 0x48
/* 09C064 8009B464 00029443 */ sra $s2, $v0, 0x11
/* 09C068 8009B468 32597FFF */ andi $t9, $s2, 0x7fff
@@ -127,7 +127,7 @@ glabel menu_credits_loop
/* 09C0F4 8009B4F4 00006812 */ mflo $t5
/* 09C0F8 8009B4F8 000D7403 */ sra $t6, $t5, 0x10
/* 09C0FC 8009B4FC 01D23821 */ addu $a3, $t6, $s2
/* 09C100 8009B500 0C01E2AE */ jal render_textured_rectangle
/* 09C100 8009B500 0C01E2AE */ jal texrect_draw
/* 09C104 8009B504 24E7FFEC */ addiu $a3, $a3, -0x14
/* 09C108 8009B508 26100004 */ addiu $s0, $s0, 4
/* 09C10C 8009B50C 1616FFDE */ bne $s0, $s6, .L8009B488
asm/non_matchings/menu/menu_track_select_init.s
+4 -4
View File
@@ -35,7 +35,7 @@ glabel menu_track_select_init
/* 08F424 8008E824 AC200418 */ sw $zero, %lo(gTracksMenuAdventureHighlightIndex)($at)
/* 08F428 8008E828 AC600000 */ sw $zero, ($v1)
.L8008E82C:
/* 08F42C 8008E82C 0C01E948 */ jal get_video_width_and_height_as_s32
/* 08F42C 8008E82C 0C01E948 */ jal fb_size
/* 08F430 8008E830 00000000 */ nop
/* 08F434 8008E834 3C068012 */ lui $a2, %hi(gTrackSelectViewPortX) # $a2, 0x8012
/* 08F438 8008E838 24C6647C */ addiu $a2, %lo(gTrackSelectViewPortX) # addiu $a2, $a2, 0x647c
@@ -97,7 +97,7 @@ glabel menu_track_select_init
/* 08F518 8008E918 00000000 */ nop
/* 08F51C 8008E91C 24040032 */ li $a0, 50
/* 08F520 8008E920 24050069 */ li $a1, 105
/* 08F524 8008E924 0C01DED7 */ jal set_background_fill_colour
/* 08F524 8008E924 0C01DED7 */ jal bgdraw_fillcolour
/* 08F528 8008E928 240600DF */ li $a2, 223
/* 08F52C 8008E92C 3C11800E */ lui $s1, %hi(gTracksMenuBgTextureIndices) # $s1, 0x800e
/* 08F530 8008E930 3C168012 */ lui $s6, %hi(gMenuAssets) # $s6, 0x8012
@@ -147,7 +147,7 @@ glabel menu_track_select_init
/* 08F5CC 8008E9CC 26310006 */ addiu $s1, $s1, 6
/* 08F5D0 8008E9D0 3C05FFFF */ lui $a1, (0xFFFF00FF >> 16) # lui $a1, 0xffff
/* 08F5D4 8008E9D4 34A500FF */ ori $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff
/* 08F5D8 8008E9D8 0C01C327 */ jal allocate_from_main_pool_safe
/* 08F5D8 8008E9D8 0C01C327 */ jal mempool_alloc_safe
/* 08F5DC 8008E9DC 24040B40 */ li $a0, 2880
/* 08F5E0 8008E9E0 3C05800E */ lui $a1, %hi(gTrackSelectBgTriangles) # $a1, 0x800e
/* 08F5E4 8008E9E4 24A50970 */ addiu $a1, %lo(gTrackSelectBgTriangles) # addiu $a1, $a1, 0x970
@@ -311,7 +311,7 @@ glabel menu_track_select_init
/* 08F854 8008EC54 3C018012 */ lui $at, %hi(gTrackSelectVertsFlip) # $at, 0x8012
/* 08F858 8008EC58 3C048009 */ lui $a0, %hi(func_8008F618) # $a0, 0x8009
/* 08F85C 8008EC5C AC206924 */ sw $zero, %lo(gTrackSelectVertsFlip)($at)
/* 08F860 8008EC60 0C01E2AB */ jal set_background_draw_function
/* 08F860 8008EC60 0C01E2AB */ jal bgdraw_set_func
/* 08F864 8008EC64 2484F618 */ addiu $a0, %lo(func_8008F618) # addiu $a0, $a0, -0x9e8
/* 08F868 8008EC68 8FC20000 */ lw $v0, ($fp)
/* 08F86C 8008EC6C 00002025 */ move $a0, $zero
asm/non_matchings/object_models/func_8006017C.s
+3 -3
View File
@@ -50,17 +50,17 @@ glabel func_8006017C
/* 060E34 80060234 2442000C */ addiu $v0, $v0, 0xc
.L80060238:
/* 060E38 80060238 001420C0 */ sll $a0, $s4, 3
/* 060E3C 8006023C 0C01C344 */ jal allocate_from_main_pool
/* 060E3C 8006023C 0C01C344 */ jal mempool_alloc
/* 060E40 80060240 02002825 */ move $a1, $s0
/* 060E44 80060244 1040019A */ beqz $v0, .L800608B0
/* 060E48 80060248 AE42000C */ sw $v0, 0xc($s2)
/* 060E4C 8006024C 00142180 */ sll $a0, $s4, 6
/* 060E50 80060250 0C01C344 */ jal allocate_from_main_pool
/* 060E50 80060250 0C01C344 */ jal mempool_alloc
/* 060E54 80060254 02002825 */ move $a1, $s0
/* 060E58 80060258 14400006 */ bnez $v0, .L80060274
/* 060E5C 8006025C AE420010 */ sw $v0, 0x10($s2)
/* 060E60 80060260 8E44000C */ lw $a0, 0xc($s2)
/* 060E64 80060264 0C01C450 */ jal free_from_memory_pool
/* 060E64 80060264 0C01C450 */ jal mempool_free
/* 060E68 80060268 00000000 */ nop
/* 060E6C 8006026C 10000190 */ b .L800608B0
/* 060E70 80060270 AE40000C */ sw $zero, 0xc($s2)
asm/non_matchings/object_models/func_80060EA8.s
+13 -13
View File
@@ -61,7 +61,7 @@ glabel func_80060EA8
/* 061B84 80060F84 0004C080 */ sll $t8, $a0, 2
/* 061B88 80060F88 0304C023 */ subu $t8, $t8, $a0
/* 061B8C 80060F8C 00182080 */ sll $a0, $t8, 2
/* 061B90 80060F90 0C01C344 */ jal allocate_from_main_pool
/* 061B90 80060F90 0C01C344 */ jal mempool_alloc
/* 061B94 80060F94 A7A70098 */ sh $a3, 0x98($sp)
/* 061B98 80060F98 87A70098 */ lh $a3, 0x98($sp)
/* 061B9C 80060F9C 8FBF00A4 */ lw $ra, 0xa4($sp)
@@ -75,14 +75,14 @@ glabel func_80060EA8
/* 061BB8 80060FB8 3C05FF7F */ lui $a1, (0xFF7F7FFF >> 16) # lui $a1, 0xff7f
/* 061BBC 80060FBC AFBF00A4 */ sw $ra, 0xa4($sp)
/* 061BC0 80060FC0 34A57FFF */ ori $a1, (0xFF7F7FFF & 0xFFFF) # ori $a1, $a1, 0x7fff
/* 061BC4 80060FC4 0C01C344 */ jal allocate_from_main_pool
/* 061BC4 80060FC4 0C01C344 */ jal mempool_alloc
/* 061BC8 80060FC8 00042040 */ sll $a0, $a0, 1
/* 061BCC 80060FCC 8FBF00A4 */ lw $ra, 0xa4($sp)
/* 061BD0 80060FD0 240D000C */ li $t5, 12
/* 061BD4 80060FD4 14400006 */ bnez $v0, .L80060FF0
/* 061BD8 80060FD8 AFA200A0 */ sw $v0, 0xa0($sp)
/* 061BDC 80060FDC 8FA400AC */ lw $a0, 0xac($sp)
/* 061BE0 80060FE0 0C01C450 */ jal free_from_memory_pool
/* 061BE0 80060FE0 0C01C450 */ jal mempool_free
/* 061BE4 80060FE4 00000000 */ nop
/* 061BE8 80060FE8 10000274 */ b .L800619BC
/* 061BEC 80060FEC 24020001 */ li $v0, 1
@@ -245,17 +245,17 @@ glabel func_80060EA8
/* 061E44 80061244 0004C840 */ sll $t9, $a0, 1
/* 061E48 80061248 2412000A */ li $s2, 10
/* 061E4C 8006124C 03202025 */ move $a0, $t9
/* 061E50 80061250 0C01C344 */ jal allocate_from_main_pool
/* 061E50 80061250 0C01C344 */ jal mempool_alloc
/* 061E54 80061254 34A57FFF */ ori $a1, (0xFF7F7FFF & 0xFFFF) # ori $a1, $a1, 0x7fff
/* 061E58 80061258 8FBF00A4 */ lw $ra, 0xa4($sp)
/* 061E5C 8006125C 240D000C */ li $t5, 12
/* 061E60 80061260 14400009 */ bnez $v0, .L80061288
/* 061E64 80061264 0040B825 */ move $s7, $v0
/* 061E68 80061268 8FA400AC */ lw $a0, 0xac($sp)
/* 061E6C 8006126C 0C01C450 */ jal free_from_memory_pool
/* 061E6C 8006126C 0C01C450 */ jal mempool_free
/* 061E70 80061270 00000000 */ nop
/* 061E74 80061274 8FA400A0 */ lw $a0, 0xa0($sp)
/* 061E78 80061278 0C01C450 */ jal free_from_memory_pool
/* 061E78 80061278 0C01C450 */ jal mempool_free
/* 061E7C 8006127C 00000000 */ nop
/* 061E80 80061280 100001CE */ b .L800619BC
/* 061E84 80061284 24020001 */ li $v0, 1
@@ -528,19 +528,19 @@ glabel func_80060EA8
/* 06223C 8006163C 3C05FF7F */ lui $a1, (0xFF7F7FFF >> 16) # lui $a1, 0xff7f
/* 062240 80061640 AFBF00A4 */ sw $ra, 0xa4($sp)
/* 062244 80061644 34A57FFF */ ori $a1, (0xFF7F7FFF & 0xFFFF) # ori $a1, $a1, 0x7fff
/* 062248 80061648 0C01C344 */ jal allocate_from_main_pool
/* 062248 80061648 0C01C344 */ jal mempool_alloc
/* 06224C 8006164C 00042080 */ sll $a0, $a0, 2
/* 062250 80061650 8FBF00A4 */ lw $ra, 0xa4($sp)
/* 062254 80061654 240D000C */ li $t5, 12
/* 062258 80061658 1440000B */ bnez $v0, .L80061688
/* 06225C 8006165C 00409025 */ move $s2, $v0
/* 062260 80061660 8FA400AC */ lw $a0, 0xac($sp)
/* 062264 80061664 0C01C450 */ jal free_from_memory_pool
/* 062264 80061664 0C01C450 */ jal mempool_free
/* 062268 80061668 00000000 */ nop
/* 06226C 8006166C 8FA400A0 */ lw $a0, 0xa0($sp)
/* 062270 80061670 0C01C450 */ jal free_from_memory_pool
/* 062270 80061670 0C01C450 */ jal mempool_free
/* 062274 80061674 00000000 */ nop
/* 062278 80061678 0C01C450 */ jal free_from_memory_pool
/* 062278 80061678 0C01C450 */ jal mempool_free
/* 06227C 8006167C 02E02025 */ move $a0, $s7
/* 062280 80061680 100000CE */ b .L800619BC
/* 062284 80061684 24020001 */ li $v0, 1
@@ -757,12 +757,12 @@ glabel func_80060EA8
.L80061994:
/* 062594 80061994 8FA900A0 */ lw $t1, 0xa0($sp)
/* 062598 80061998 02E02025 */ move $a0, $s7
/* 06259C 8006199C 0C01C450 */ jal free_from_memory_pool
/* 06259C 8006199C 0C01C450 */ jal mempool_free
/* 0625A0 800619A0 AD490040 */ sw $t1, 0x40($t2)
/* 0625A4 800619A4 0C01C450 */ jal free_from_memory_pool
/* 0625A4 800619A4 0C01C450 */ jal mempool_free
/* 0625A8 800619A8 02402025 */ move $a0, $s2
/* 0625AC 800619AC 8FA400AC */ lw $a0, 0xac($sp)
/* 0625B0 800619B0 0C01C450 */ jal free_from_memory_pool
/* 0625B0 800619B0 0C01C450 */ jal mempool_free
/* 0625B4 800619B4 00000000 */ nop
.L800619B8:
/* 0625B8 800619B8 00001025 */ move $v0, $zero
asm/non_matchings/objects/func_8000CC7C.s
+4 -4
View File
@@ -534,7 +534,7 @@ glabel func_8000CC7C
/* 00DFCC 8000D3CC 3C05FFFF */ lui $a1, (0xFFFF00FF >> 16) # lui $a1, 0xffff
/* 00DFD0 8000D3D0 24150018 */ li $s5, 24
/* 00DFD4 8000D3D4 34A500FF */ ori $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff
/* 00DFD8 8000D3D8 0C01C327 */ jal allocate_from_main_pool_safe
/* 00DFD8 8000D3D8 0C01C327 */ jal mempool_alloc_safe
/* 00DFDC 8000D3DC 24040010 */ li $a0, 16
/* 00DFE0 8000D3E0 A440000C */ sh $zero, 0xc($v0)
/* 00DFE4 8000D3E4 A440000A */ sh $zero, 0xa($v0)
@@ -1417,11 +1417,11 @@ glabel L8000D98C
/* 00EC60 8000E060 0C01AF44 */ jal start_level_music
/* 00EC64 8000E064 00000000 */ nop
.L8000E068:
/* 00EC68 8000E068 0C01C42C */ jal set_free_queue_state
/* 00EC68 8000E068 0C01C42C */ jal mempool_free_timer
/* 00EC6C 8000E06C 00002025 */ move $a0, $zero
/* 00EC70 8000E070 0C01C450 */ jal free_from_memory_pool
/* 00EC70 8000E070 0C01C450 */ jal mempool_free
/* 00EC74 8000E074 02C02025 */ move $a0, $s6
/* 00EC78 8000E078 0C01C42C */ jal set_free_queue_state
/* 00EC78 8000E078 0C01C42C */ jal mempool_free_timer
/* 00EC7C 8000E07C 24040002 */ li $a0, 2
.L8000E080:
/* 00EC80 8000E080 8FBF003C */ lw $ra, 0x3c($sp)
asm/non_matchings/objects/func_800101AC.s
+3 -3
View File
@@ -82,7 +82,7 @@ glabel func_800101AC
.L800102B8:
/* 010EB8 800102B8 0C003211 */ jal try_free_object_header
/* 010EBC 800102BC 00000000 */ nop
/* 010EC0 800102C0 0C01C450 */ jal free_from_memory_pool
/* 010EC0 800102C0 0C01C450 */ jal mempool_free
/* 010EC4 800102C4 02202025 */ move $a0, $s1
/* 010EC8 800102C8 8EC30060 */ lw $v1, 0x60($s6)
/* 010ECC 800102CC 26B50001 */ addiu $s5, $s5, 1
@@ -295,7 +295,7 @@ glabel L800105A8
/* 0111AC 800105AC 00000000 */ nop
/* 0111B0 800105B0 10800005 */ beqz $a0, .L800105C8
/* 0111B4 800105B4 00000000 */ nop
/* 0111B8 800105B8 0C01C450 */ jal free_from_memory_pool
/* 0111B8 800105B8 0C01C450 */ jal mempool_free
/* 0111BC 800105BC 00000000 */ nop
/* 0111C0 800105C0 86C50048 */ lh $a1, 0x48($s6)
/* 0111C4 800105C4 00000000 */ nop
@@ -566,7 +566,7 @@ glabel L80010664
/* 011558 80010958 86C4002C */ lh $a0, 0x2c($s6)
/* 01155C 8001095C 0C003211 */ jal try_free_object_header
/* 011560 80010960 00000000 */ nop
/* 011564 80010964 0C01C450 */ jal free_from_memory_pool
/* 011564 80010964 0C01C450 */ jal mempool_free
/* 011568 80010968 02C02025 */ move $a0, $s6
.L8001096C:
/* 01156C 8001096C 8FBF0034 */ lw $ra, 0x34($sp)
asm/non_matchings/objects/spawn_object.s
+2 -2
View File
@@ -594,7 +594,7 @@ glabel L8000EDE0
.L8000F2C8:
/* 00FEC8 8000F2C8 8C84AE68 */ lw $a0, %lo(gObjectMemoryPool)($a0)
/* 00FECC 8000F2CC 00A08825 */ move $s1, $a1
/* 00FED0 8000F2D0 0C01C3A4 */ jal allocate_from_pool_containing_slots
/* 00FED0 8000F2D0 0C01C3A4 */ jal mempool_alloc_pool
/* 00FED4 8000F2D4 02408025 */ move $s0, $s2
/* 00FED8 8000F2D8 14400018 */ bnez $v0, .L8000F33C
/* 00FEDC 8000F2DC 00409025 */ move $s2, $v0
@@ -804,7 +804,7 @@ glabel L8000EDE0
/* 0101C0 8000F5C0 87A4004E */ lh $a0, 0x4e($sp)
/* 0101C4 8000F5C4 0C003211 */ jal try_free_object_header
/* 0101C8 8000F5C8 00000000 */ nop
/* 0101CC 8000F5CC 0C01C450 */ jal free_from_memory_pool
/* 0101CC 8000F5CC 0C01C450 */ jal mempool_free
/* 0101D0 8000F5D0 02402025 */ move $a0, $s2
/* 0101D4 8000F5D4 12200005 */ beqz $s1, .L8000F5EC
/* 0101D8 8000F5D8 00000000 */ nop
asm/non_matchings/particles/func_800AE728.s
+9 -9
View File
@@ -72,7 +72,7 @@ glabel func_800AE728
/* 0AF42C 800AE82C 01846021 */ addu $t4, $t4, $a0
/* 0AF430 800AE830 000C2040 */ sll $a0, $t4, 1
/* 0AF434 800AE834 02402825 */ move $a1, $s2
/* 0AF438 800AE838 0C01C327 */ jal allocate_from_main_pool_safe
/* 0AF438 800AE838 0C01C327 */ jal mempool_alloc_safe
/* 0AF43C 800AE83C 00008025 */ move $s0, $zero
/* 0AF440 800AE840 00136840 */ sll $t5, $s3, 1
/* 0AF444 800AE844 022D7021 */ addu $t6, $s1, $t5
@@ -81,7 +81,7 @@ glabel func_800AE728
/* 0AF450 800AE850 00047900 */ sll $t7, $a0, 4
/* 0AF454 800AE854 AC222CE0 */ sw $v0, %lo(D_800E2CE0)($at)
/* 0AF458 800AE858 01E02025 */ move $a0, $t7
/* 0AF45C 800AE85C 0C01C327 */ jal allocate_from_main_pool_safe
/* 0AF45C 800AE85C 0C01C327 */ jal mempool_alloc_safe
/* 0AF460 800AE860 02402825 */ move $a1, $s2
/* 0AF464 800AE864 3C10800E */ lui $s0, %hi(D_800E2CE4) # $s0, 0x800e
/* 0AF468 800AE868 26102CE4 */ addiu $s0, %lo(D_800E2CE4) # addiu $s0, $s0, 0x2ce4
@@ -96,7 +96,7 @@ glabel func_800AE728
/* 0AF48C 800AE88C 3C01800E */ lui $at, %hi(D_800E2CA0) # $at, 0x800e
/* 0AF490 800AE890 AC202CA0 */ sw $zero, %lo(D_800E2CA0)($at)
/* 0AF494 800AE894 001121C0 */ sll $a0, $s1, 7
/* 0AF498 800AE898 0C01C327 */ jal allocate_from_main_pool_safe
/* 0AF498 800AE898 0C01C327 */ jal mempool_alloc_safe
/* 0AF49C 800AE89C 02402825 */ move $a1, $s2
/* 0AF4A0 800AE8A0 3C15800E */ lui $s5, %hi(D_800E2CA8) # $s5, 0x800e
/* 0AF4A4 800AE8A4 26B52CA8 */ addiu $s5, %lo(D_800E2CA8) # addiu $s5, $s5, 0x2ca8
@@ -110,7 +110,7 @@ glabel func_800AE728
/* 0AF4C0 800AE8C0 3C01800E */ lui $at, %hi(D_800E2CAC) # $at, 0x800e
/* 0AF4C4 800AE8C4 AC202CAC */ sw $zero, %lo(D_800E2CAC)($at)
/* 0AF4C8 800AE8C8 001321C0 */ sll $a0, $s3, 7
/* 0AF4CC 800AE8CC 0C01C327 */ jal allocate_from_main_pool_safe
/* 0AF4CC 800AE8CC 0C01C327 */ jal mempool_alloc_safe
/* 0AF4D0 800AE8D0 02402825 */ move $a1, $s2
/* 0AF4D4 800AE8D4 3C16800E */ lui $s6, %hi(D_800E2CB4) # $s6, 0x800e
/* 0AF4D8 800AE8D8 26D62CB4 */ addiu $s6, %lo(D_800E2CB4) # addiu $s6, $s6, 0x2cb4
@@ -126,7 +126,7 @@ glabel func_800AE728
/* 0AF4FC 800AE8FC 00972023 */ subu $a0, $a0, $s7
/* 0AF500 800AE900 AC202CB8 */ sw $zero, %lo(D_800E2CB8)($at)
/* 0AF504 800AE904 00042100 */ sll $a0, $a0, 4
/* 0AF508 800AE908 0C01C327 */ jal allocate_from_main_pool_safe
/* 0AF508 800AE908 0C01C327 */ jal mempool_alloc_safe
/* 0AF50C 800AE90C 02402825 */ move $a1, $s2
/* 0AF510 800AE910 3C01800E */ lui $at, %hi(D_800E2CC0) # $at, 0x800e
/* 0AF514 800AE914 AC222CC0 */ sw $v0, %lo(D_800E2CC0)($at)
@@ -138,7 +138,7 @@ glabel func_800AE728
/* 0AF528 800AE928 3C01800E */ lui $at, %hi(D_800E2CC4) # $at, 0x800e
/* 0AF52C 800AE92C AC202CC4 */ sw $zero, %lo(D_800E2CC4)($at)
/* 0AF530 800AE930 001421C0 */ sll $a0, $s4, 7
/* 0AF534 800AE934 0C01C327 */ jal allocate_from_main_pool_safe
/* 0AF534 800AE934 0C01C327 */ jal mempool_alloc_safe
/* 0AF538 800AE938 02402825 */ move $a1, $s2
/* 0AF53C 800AE93C 3C17800E */ lui $s7, %hi(D_800E2CCC) # $s7, 0x800e
/* 0AF540 800AE940 26F72CCC */ addiu $s7, %lo(D_800E2CCC) # addiu $s7, $s7, 0x2ccc
@@ -154,7 +154,7 @@ glabel func_800AE728
/* 0AF564 800AE964 009E2021 */ addu $a0, $a0, $fp
/* 0AF568 800AE968 AC202CD0 */ sw $zero, %lo(D_800E2CD0)($at)
/* 0AF56C 800AE96C 000420C0 */ sll $a0, $a0, 3
/* 0AF570 800AE970 0C01C327 */ jal allocate_from_main_pool_safe
/* 0AF570 800AE970 0C01C327 */ jal mempool_alloc_safe
/* 0AF574 800AE974 02402825 */ move $a1, $s2
/* 0AF578 800AE978 3C1E800E */ lui $fp, %hi(D_800E2CD8) # $fp, 0x800e
/* 0AF57C 800AE97C 27DE2CD8 */ addiu $fp, %lo(D_800E2CD8) # addiu $fp, $fp, 0x2cd8
@@ -431,7 +431,7 @@ glabel func_800AE728
/* 0AF968 800AED68 24790001 */ addiu $t9, $v1, 1
.L800AED6C:
/* 0AF96C 800AED6C 00032080 */ sll $a0, $v1, 2
/* 0AF970 800AED70 0C01C327 */ jal allocate_from_main_pool_safe
/* 0AF970 800AED70 0C01C327 */ jal mempool_alloc_safe
/* 0AF974 800AED74 3405FFFF */ li $a1, 65535
/* 0AF978 800AED78 3C06800E */ lui $a2, %hi(D_800E2E64) # $a2, 0x800e
/* 0AF97C 800AED7C 24C62E64 */ addiu $a2, %lo(D_800E2E64) # addiu $a2, $a2, 0x2e64
@@ -460,7 +460,7 @@ glabel func_800AE728
/* 0AF9D4 800AEDD4 1420FFEF */ bnez $at, .L800AED94
/* 0AF9D8 800AEDD8 24630004 */ addiu $v1, $v1, 4
.L800AEDDC:
/* 0AF9DC 800AEDDC 0C01C450 */ jal free_from_memory_pool
/* 0AF9DC 800AEDDC 0C01C450 */ jal mempool_free
/* 0AF9E0 800AEDE0 02402025 */ move $a0, $s2
/* 0AF9E4 800AEDE4 8FBF003C */ lw $ra, 0x3c($sp)
.L800AEDE8:

Some files were not shown because too many files have changed in this diff Show More