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

Parkwarden loop complete! + extra (#325)

Browse Source 
* Minor cleanup and warning fixes

* WIP on func_80073588

* Update score for func

* Increase score to what seems to be NON_MATCHING

* Update func

* WIP on func_800756D4

* func_800756D4 update

* Update func

* Match func_800756D4 with some cleanup still neeeded

* Revert some changes that looked messier than what was therE

* Update some colur tags

* Updats some more colour tags

* WIP obj_loop_parkwarden

* Update park warden func, and do some fade transition stuff randomly

* Update park warden func again

* Update parkwarden to over 97% complete, and start truly integrating it

* Add more lines to the livediff for large funcs, and add a missing function signature for parkwarden

* Warning fixes, and over 99% on parkwarden

* Match parkwarden loop

* Apply suggestions, and fix some minor cleanup in parkwarden func

Co-authored-by: Ryan Myers <foldor@gmail.com>
This commit is contained in:
Ryan Myers
2022-12-07 08:22:16 -05:00
committed by GitHub
co-authored by Ryan Myers
parent ff86532d6f
commit c9d6050773
30 changed files with 918 additions and 2306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/menu/func_8008F618.s
+4 -4
View File
@@ -56,9 +56,9 @@ glabel func_8008F618
/* 0902F0 8008F6F0 00EE001A */ div $zero, $a3, $t6
/* 0902F4 8008F6F4 440D3000 */ mfc1 $t5, $f6
/* 0902F8 8008F6F8 3C09800E */ lui $t1, %hi(D_800E0840) # $t1, 0x800e
/* 0902FC 8008F6FC 3C1F8012 */ lui $ra, %hi(D_80126478) # $ra, 0x8012
/* 0902FC 8008F6FC 3C1F8012 */ lui $ra, %hi(gTrackSelectViewPortHalfY) # $ra, 0x8012
/* 090300 8008F700 44D9F800 */ ctc1 $t9, $31
/* 090304 8008F704 27FF6478 */ addiu $ra, %lo(D_80126478) # addiu $ra, $ra, 0x6478
/* 090304 8008F704 27FF6478 */ addiu $ra, %lo(gTrackSelectViewPortHalfY) # addiu $ra, $ra, 0x6478
/* 090308 8008F708 25290840 */ addiu $t1, %lo(D_800E0840) # addiu $t1, $t1, 0x840
/* 09030C 8008F70C 00401825 */ move $v1, $v0
/* 090310 8008F710 15000002 */ bnez $t0, .L8008F71C
@@ -245,8 +245,8 @@ glabel func_8008F618
/* 0905B8 8008F9B8 AC4F0000 */ sw $t7, ($v0)
/* 0905BC 8008F9BC 92070000 */ lbu $a3, ($s0)
/* 0905C0 8008F9C0 3C0A8012 */ lui $t2, %hi(gTrackSelectViewportY) # $t2, 0x8012
/* 0905C4 8008F9C4 3C1F8012 */ lui $ra, %hi(D_80126478) # $ra, 0x8012
/* 0905C8 8008F9C8 27FF6478 */ addiu $ra, %lo(D_80126478) # addiu $ra, $ra, 0x6478
/* 0905C4 8008F9C4 3C1F8012 */ lui $ra, %hi(gTrackSelectViewPortHalfY) # $ra, 0x8012
/* 0905C8 8008F9C8 27FF6478 */ addiu $ra, %lo(gTrackSelectViewPortHalfY) # addiu $ra, $ra, 0x6478
/* 0905CC 8008F9CC 12E70005 */ beq $s7, $a3, .L8008F9E4
/* 0905D0 8008F9D0 254A6480 */ addiu $t2, %lo(gTrackSelectViewportY) # addiu $t2, $t2, 0x6480
/* 0905D4 8008F9D4 8D590000 */ lw $t9, ($t2)
asm/non_matchings/menu/func_800904E8.s
+2 -2
View File
@@ -227,9 +227,9 @@ glabel func_800904E8
/* 091434 80090834 3C0142A0 */ li $at, 0x42A00000 # 80.000000
/* 091438 80090838 44813000 */ mtc1 $at, $f6
/* 09143C 8009083C 46125100 */ add.s $f4, $f10, $f18
/* 091440 80090840 3C028012 */ lui $v0, %hi(D_80126478) # $v0, 0x8012
/* 091440 80090840 3C028012 */ lui $v0, %hi(gTrackSelectViewPortHalfY) # $v0, 0x8012
/* 091444 80090844 46062201 */ sub.s $f8, $f4, $f6
/* 091448 80090848 8C426478 */ lw $v0, %lo(D_80126478)($v0)
/* 091448 80090848 8C426478 */ lw $v0, %lo(gTrackSelectViewPortHalfY)($v0)
/* 09144C 8009084C 444EF800 */ cfc1 $t6, $31
/* 091450 80090850 C5060000 */ lwc1 $f6, ($t0)
/* 091454 80090854 35C10003 */ ori $at, $t6, 3
asm/non_matchings/menu/func_80092188.s
+4 -4
View File
@@ -82,14 +82,14 @@ glabel func_80092188
/* 092EA4 800922A4 24490019 */ addiu $t1, $v0, 0x19
/* 092EA8 800922A8 29210015 */ slti $at, $t1, 0x15
/* 092EAC 800922AC 14200002 */ bnez $at, .L800922B8
/* 092EB0 800922B0 3C028012 */ lui $v0, %hi(D_80126478) # $v0, 0x8012
/* 092EB0 800922B0 3C028012 */ lui $v0, %hi(gTrackSelectViewPortHalfY) # $v0, 0x8012
/* 092EB4 800922B4 24090014 */ li $t1, 20
.L800922B8:
/* 092EB8 800922B8 05210002 */ bgez $t1, .L800922C4
/* 092EBC 800922BC 00000000 */ nop
/* 092EC0 800922C0 00004825 */ move $t1, $zero
.L800922C4:
/* 092EC4 800922C4 8C426478 */ lw $v0, %lo(D_80126478)($v0)
/* 092EC4 800922C4 8C426478 */ lw $v0, %lo(gTrackSelectViewPortHalfY)($v0)
/* 092EC8 800922C8 252F0014 */ addiu $t7, $t1, 0x14
/* 092ECC 800922CC 01E20019 */ multu $t7, $v0
/* 092ED0 800922D0 24010028 */ li $at, 40
@@ -160,8 +160,8 @@ glabel func_80092188
/* 092FC8 800923C8 3C018012 */ lui $at, %hi(gOpacityDecayTimer) # $at, 0x8012
/* 092FCC 800923CC 0C023C03 */ jal func_8008F00C
/* 092FD0 800923D0 AC2063D8 */ sw $zero, %lo(gOpacityDecayTimer)($at)
/* 092FD4 800923D4 3C028012 */ lui $v0, %hi(D_80126478) # $v0, 0x8012
/* 092FD8 800923D8 8C426478 */ lw $v0, %lo(D_80126478)($v0)
/* 092FD4 800923D4 3C028012 */ lui $v0, %hi(gTrackSelectViewPortHalfY) # $v0, 0x8012
/* 092FD8 800923D8 8C426478 */ lw $v0, %lo(gTrackSelectViewPortHalfY)($v0)
/* 092FDC 800923DC 00002025 */ move $a0, $zero
/* 092FE0 800923E0 00021843 */ sra $v1, $v0, 1
/* 092FE4 800923E4 00627021 */ addu $t6, $v1, $v0
asm/non_matchings/menu/func_80094688.s
-264
View File
@@ -1,264 +0,0 @@
glabel func_80094688
/* 095288 80094688 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 09528C 8009468C AFBF001C */ sw $ra, 0x1c($sp)
/* 095290 80094690 AFA40030 */ sw $a0, 0x30($sp)
/* 095294 80094694 AFA50034 */ sw $a1, 0x34($sp)
/* 095298 80094698 0C01C8A6 */ jal func_80072298
/* 09529C 8009469C 00002025 */ move $a0, $zero
/* 0952A0 800946A0 0C01AF6C */ jal get_current_level_header
/* 0952A4 800946A4 00000000 */ nop
/* 0952A8 800946A8 8FAE0030 */ lw $t6, 0x30($sp)
/* 0952AC 800946AC 3C018012 */ lui $at, %hi(D_80126C28) # $at, 0x8012
/* 0952B0 800946B0 AFA20028 */ sw $v0, 0x28($sp)
/* 0952B4 800946B4 0C027B20 */ jal is_in_two_player_adventure
/* 0952B8 800946B8 A02E6C28 */ sb $t6, %lo(D_80126C28)($at)
/* 0952BC 800946BC 10400003 */ beqz $v0, .L800946CC
/* 0952C0 800946C0 00000000 */ nop
/* 0952C4 800946C4 0C009278 */ jal func_800249E0
/* 0952C8 800946C8 00002025 */ move $a0, $zero
.L800946CC:
/* 0952CC 800946CC 3C018012 */ lui $at, %hi(D_80126A90) # $at, 0x8012
/* 0952D0 800946D0 3C0F800E */ lui $t7, %hi(gNumberOfActivePlayers) # $t7, 0x800e
/* 0952D4 800946D4 8DEFF4BC */ lw $t7, %lo(gNumberOfActivePlayers)($t7)
/* 0952D8 800946D8 AC206A90 */ sw $zero, %lo(D_80126A90)($at)
/* 0952DC 800946DC 24010001 */ li $at, 1
/* 0952E0 800946E0 15E1003F */ bne $t7, $at, .L800947E0
/* 0952E4 800946E4 3C18800E */ lui $t8, %hi(gTrophyRaceWorldId) # $t8, 0x800e
/* 0952E8 800946E8 8F180FE8 */ lw $t8, %lo(gTrophyRaceWorldId)($t8)
/* 0952EC 800946EC 00000000 */ nop
/* 0952F0 800946F0 1700003C */ bnez $t8, .L800947E4
/* 0952F4 800946F4 240B0007 */ li $t3, 7
/* 0952F8 800946F8 0C0270B4 */ jal is_in_tracks_mode
/* 0952FC 800946FC 00000000 */ nop
/* 095300 80094700 24060001 */ li $a2, 1
/* 095304 80094704 14460011 */ bne $v0, $a2, .L8009474C
/* 095308 80094708 3C048012 */ lui $a0, %hi(D_80126C14) # $a0, 0x8012
/* 09530C 8009470C 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e
/* 095310 80094710 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0)
/* 095314 80094714 3C058012 */ lui $a1, %hi(D_80126BF0) # $a1, 0x8012
/* 095318 80094718 8C59005C */ lw $t9, 0x5c($v0)
/* 09531C 8009471C 24A56BF0 */ addiu $a1, %lo(D_80126BF0) # addiu $a1, $a1, 0x6bf0
/* 095320 80094720 ACB90000 */ sw $t9, ($a1)
/* 095324 80094724 8C480060 */ lw $t0, 0x60($v0)
/* 095328 80094728 24846C14 */ addiu $a0, %lo(D_80126C14) # addiu $a0, $a0, 0x6c14
/* 09532C 8009472C ACA80004 */ sw $t0, 4($a1)
/* 095330 80094730 8C490068 */ lw $t1, 0x68($v0)
/* 095334 80094734 240A0003 */ li $t2, 3
/* 095338 80094738 AC8A0000 */ sw $t2, ($a0)
/* 09533C 8009473C 3C018012 */ lui $at, %hi(D_80126A90) # $at, 0x8012
/* 095340 80094740 ACA90008 */ sw $t1, 8($a1)
/* 095344 80094744 1000001C */ b .L800947B8
/* 095348 80094748 AC266A90 */ sw $a2, %lo(D_80126A90)($at)
.L8009474C:
/* 09534C 8009474C 8FAB0030 */ lw $t3, 0x30($sp)
/* 095350 80094750 00000000 */ nop
/* 095354 80094754 1560000A */ bnez $t3, .L80094780
/* 095358 80094758 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e
/* 09535C 8009475C 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0)
/* 095360 80094760 3C048012 */ lui $a0, %hi(D_80126C14) # $a0, 0x8012
/* 095364 80094764 8C4C005C */ lw $t4, 0x5c($v0)
/* 095368 80094768 3C058012 */ lui $a1, %hi(D_80126BF0) # $a1, 0x8012
/* 09536C 8009476C 24A56BF0 */ addiu $a1, %lo(D_80126BF0) # addiu $a1, $a1, 0x6bf0
/* 095370 80094770 24846C14 */ addiu $a0, %lo(D_80126C14) # addiu $a0, $a0, 0x6c14
/* 095374 80094774 AC860000 */ sw $a2, ($a0)
/* 095378 80094778 10000008 */ b .L8009479C
/* 09537C 8009477C ACAC0000 */ sw $t4, ($a1)
.L80094780:
/* 095380 80094780 3C048012 */ lui $a0, %hi(D_80126C14) # $a0, 0x8012
/* 095384 80094784 24846C14 */ addiu $a0, %lo(D_80126C14) # addiu $a0, $a0, 0x6c14
/* 095388 80094788 AC800000 */ sw $zero, ($a0)
/* 09538C 8009478C 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e
/* 095390 80094790 3C058012 */ lui $a1, %hi(D_80126BF0) # $a1, 0x8012
/* 095394 80094794 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0)
/* 095398 80094798 24A56BF0 */ addiu $a1, %lo(D_80126BF0) # addiu $a1, $a1, 0x6bf0
.L8009479C:
/* 09539C 8009479C 8C830000 */ lw $v1, ($a0)
/* 0953A0 800947A0 8C4D0064 */ lw $t5, 0x64($v0)
/* 0953A4 800947A4 00037080 */ sll $t6, $v1, 2
/* 0953A8 800947A8 00AE7821 */ addu $t7, $a1, $t6
/* 0953AC 800947AC 24780001 */ addiu $t8, $v1, 1
/* 0953B0 800947B0 ADED0000 */ sw $t5, ($t7)
/* 0953B4 800947B4 AC980000 */ sw $t8, ($a0)
.L800947B8:
/* 0953B8 800947B8 8C830000 */ lw $v1, ($a0)
/* 0953BC 800947BC 8C590070 */ lw $t9, 0x70($v0)
/* 0953C0 800947C0 00034080 */ sll $t0, $v1, 2
/* 0953C4 800947C4 00A84821 */ addu $t1, $a1, $t0
/* 0953C8 800947C8 246A0001 */ addiu $t2, $v1, 1
/* 0953CC 800947CC AD390000 */ sw $t9, ($t1)
/* 0953D0 800947D0 AC8A0000 */ sw $t2, ($a0)
/* 0953D4 800947D4 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 0953D8 800947D8 10000004 */ b .L800947EC
/* 0953DC 800947DC AC2063E0 */ sw $zero, %lo(D_801263E0)($at)
.L800947E0:
/* 0953E0 800947E0 240B0007 */ li $t3, 7
.L800947E4:
/* 0953E4 800947E4 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 0953E8 800947E8 AC2B63E0 */ sw $t3, %lo(D_801263E0)($at)
.L800947EC:
/* 0953EC 800947EC 3C018012 */ lui $at, %hi(D_80126CC0) # $at, 0x8012
/* 0953F0 800947F0 AC206CC0 */ sw $zero, %lo(D_80126CC0)($at)
/* 0953F4 800947F4 3C018012 */ lui $at, %hi(gOptionBlinkTimer) # $at, 0x8012
/* 0953F8 800947F8 AC2063BC */ sw $zero, %lo(gOptionBlinkTimer)($at)
/* 0953FC 800947FC 3C018012 */ lui $at, %hi(gOpacityDecayTimer) # $at, 0x8012
/* 095400 80094800 AC2063D8 */ sw $zero, %lo(gOpacityDecayTimer)($at)
/* 095404 80094804 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e
/* 095408 80094808 AC20F47C */ sw $zero, %lo(gMenuDelay)($at)
/* 09540C 8009480C 3C01800E */ lui $at, %hi(D_800DF460) # $at, 0x800e
/* 095410 80094810 AC20F460 */ sw $zero, %lo(D_800DF460)($at)
/* 095414 80094814 3C018012 */ lui $at, %hi(gMenuOption) # $at, 0x8012
/* 095418 80094818 AC206A68 */ sw $zero, %lo(gMenuOption)($at)
/* 09541C 8009481C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012
/* 095420 80094820 240C0001 */ li $t4, 1
/* 095424 80094824 AC2C63C4 */ sw $t4, %lo(gIgnorePlayerInput)($at)
/* 095428 80094828 3C018012 */ lui $at, %hi(D_80126C54) # $at, 0x8012
/* 09542C 8009482C 240EFFFF */ li $t6, -1
/* 095430 80094830 AC2E6C54 */ sw $t6, %lo(D_80126C54)($at)
/* 095434 80094834 3C01800E */ lui $at, %hi(gMenuSubOption) # $at, 0x800e
/* 095438 80094838 AC200988 */ sw $zero, %lo(gMenuSubOption)($at)
/* 09543C 8009483C 3C018012 */ lui $at, %hi(D_80126C1C) # $at, 0x8012
/* 095440 80094840 AC206C1C */ sw $zero, %lo(D_80126C1C)($at)
/* 095444 80094844 8FAD0028 */ lw $t5, 0x28($sp)
/* 095448 80094848 3C018012 */ lui $at, %hi(D_80126A98) # $at, 0x8012
/* 09544C 8009484C AC206A98 */ sw $zero, %lo(D_80126A98)($at)
/* 095450 80094850 81AF004C */ lb $t7, 0x4c($t5)
/* 095454 80094854 00000000 */ nop
/* 095458 80094858 31F80040 */ andi $t8, $t7, 0x40
/* 09545C 8009485C 13000005 */ beqz $t8, .L80094874
/* 095460 80094860 00000000 */ nop
/* 095464 80094864 0C00322D */ jal normalise_time
/* 095468 80094868 240400F0 */ li $a0, 240
/* 09546C 8009486C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012
/* 095470 80094870 AC2263C4 */ sw $v0, %lo(gIgnorePlayerInput)($at)
.L80094874:
/* 095474 80094874 3C088012 */ lui $t0, %hi(D_80126C28) # $t0, 0x8012
/* 095478 80094878 81086C28 */ lb $t0, %lo(D_80126C28)($t0)
/* 09547C 8009487C 24190008 */ li $t9, 8
/* 095480 80094880 11000005 */ beqz $t0, .L80094898
/* 095484 80094884 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 095488 80094888 AC3963E0 */ sw $t9, %lo(D_801263E0)($at)
/* 09548C 8009488C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e
/* 095490 80094890 24090064 */ li $t1, 100
/* 095494 80094894 AC29F47C */ sw $t1, %lo(gMenuDelay)($at)
.L80094898:
/* 095498 80094898 0C01B683 */ jal get_render_context
/* 09549C 8009489C 00000000 */ nop
/* 0954A0 800948A0 10400003 */ beqz $v0, .L800948B0
/* 0954A4 800948A4 240A0007 */ li $t2, 7
/* 0954A8 800948A8 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 0954AC 800948AC AC2A63E0 */ sw $t2, %lo(D_801263E0)($at)
.L800948B0:
/* 0954B0 800948B0 0C026F97 */ jal reset_controller_sticks
/* 0954B4 800948B4 00000000 */ nop
/* 0954B8 800948B8 8FA40030 */ lw $a0, 0x30($sp)
/* 0954BC 800948BC 0C01B638 */ jal func_8006D8E0
/* 0954C0 800948C0 00000000 */ nop
/* 0954C4 800948C4 0C01E948 */ jal get_video_width_and_height_as_s32
/* 0954C8 800948C8 00000000 */ nop
/* 0954CC 800948CC 3C058012 */ lui $a1, %hi(D_8012647C) # $a1, 0x8012
/* 0954D0 800948D0 24A5647C */ addiu $a1, %lo(D_8012647C) # addiu $a1, $a1, 0x647c
/* 0954D4 800948D4 00025C03 */ sra $t3, $v0, 0x10
/* 0954D8 800948D8 ACA20000 */ sw $v0, ($a1)
/* 0954DC 800948DC 316CFFFF */ andi $t4, $t3, 0xffff
/* 0954E0 800948E0 3C018012 */ lui $at, %hi(gTrackSelectViewportY) # $at, 0x8012
/* 0954E4 800948E4 AC2C6480 */ sw $t4, %lo(gTrackSelectViewportY)($at)
/* 0954E8 800948E8 304EFFFF */ andi $t6, $v0, 0xffff
/* 0954EC 800948EC ACAE0000 */ sw $t6, ($a1)
/* 0954F0 800948F0 3C188012 */ lui $t8, %hi(gTrackSelectViewportY) # $t8, 0x8012
/* 0954F4 800948F4 8F186480 */ lw $t8, %lo(gTrackSelectViewportY)($t8)
/* 0954F8 800948F8 000E7843 */ sra $t7, $t6, 1
/* 0954FC 800948FC 3C018012 */ lui $at, %hi(D_80126474) # $at, 0x8012
/* 095500 80094900 AC2F6474 */ sw $t7, %lo(D_80126474)($at)
/* 095504 80094904 3C018012 */ lui $at, %hi(D_80126478) # $at, 0x8012
/* 095508 80094908 3C19800E */ lui $t9, %hi(gNumberOfActivePlayers) # $t9, 0x800e
/* 09550C 8009490C 00184043 */ sra $t0, $t8, 1
/* 095510 80094910 8F39F4BC */ lw $t9, %lo(gNumberOfActivePlayers)($t9)
/* 095514 80094914 AC286478 */ sw $t0, %lo(D_80126478)($at)
/* 095518 80094918 24010001 */ li $at, 1
/* 09551C 8009491C 17210049 */ bne $t9, $at, .L80094A44
/* 095520 80094920 3C09800E */ lui $t1, %hi(gTrophyRaceWorldId) # $t1, 0x800e
/* 095524 80094924 8D290FE8 */ lw $t1, %lo(gTrophyRaceWorldId)($t1)
/* 095528 80094928 3C018012 */ lui $at, %hi(D_80126C54) # $at, 0x8012
/* 09552C 8009492C 15200045 */ bnez $t1, .L80094A44
/* 095530 80094930 3C0E800E */ lui $t6, %hi(D_800E0710) # $t6, 0x800e
/* 095534 80094934 8FAA0028 */ lw $t2, 0x28($sp)
/* 095538 80094938 AC206C54 */ sw $zero, %lo(D_80126C54)($at)
/* 09553C 8009493C 81420000 */ lb $v0, ($t2)
/* 095540 80094940 25CE0710 */ addiu $t6, %lo(D_800E0710) # addiu $t6, $t6, 0x710
/* 095544 80094944 2442FFFF */ addiu $v0, $v0, -1
/* 095548 80094948 00025880 */ sll $t3, $v0, 2
/* 09554C 8009494C 01625823 */ subu $t3, $t3, $v0
/* 095550 80094950 000B6040 */ sll $t4, $t3, 1
/* 095554 80094954 018E1821 */ addu $v1, $t4, $t6
/* 095558 80094958 84640000 */ lh $a0, ($v1)
/* 09555C 8009495C 2401FFFF */ li $at, -1
/* 095560 80094960 1081000C */ beq $a0, $at, .L80094994
/* 095564 80094964 00000000 */ nop
/* 095568 80094968 0C0271B5 */ jal func_8009C6D4
/* 09556C 8009496C AFA30024 */ sw $v1, 0x24($sp)
/* 095570 80094970 8FA30024 */ lw $v1, 0x24($sp)
/* 095574 80094974 3C188012 */ lui $t8, %hi(D_80126550) # $t8, 0x8012
/* 095578 80094978 846D0000 */ lh $t5, ($v1)
/* 09557C 8009497C 3C018012 */ lui $at, %hi(D_80126BB8) # $at, 0x8012
/* 095580 80094980 000D7880 */ sll $t7, $t5, 2
/* 095584 80094984 030FC021 */ addu $t8, $t8, $t7
/* 095588 80094988 8F186550 */ lw $t8, %lo(D_80126550)($t8)
/* 09558C 8009498C 10000003 */ b .L8009499C
/* 095590 80094990 AC386BB8 */ sw $t8, %lo(D_80126BB8)($at)
.L80094994:
/* 095594 80094994 3C018012 */ lui $at, %hi(D_80126BB8) # $at, 0x8012
/* 095598 80094998 AC206BB8 */ sw $zero, %lo(D_80126BB8)($at)
.L8009499C:
/* 09559C 8009499C 84640002 */ lh $a0, 2($v1)
/* 0955A0 800949A0 2401FFFF */ li $at, -1
/* 0955A4 800949A4 1081000C */ beq $a0, $at, .L800949D8
/* 0955A8 800949A8 00000000 */ nop
/* 0955AC 800949AC 0C0271B5 */ jal func_8009C6D4
/* 0955B0 800949B0 AFA30024 */ sw $v1, 0x24($sp)
/* 0955B4 800949B4 8FA30024 */ lw $v1, 0x24($sp)
/* 0955B8 800949B8 3C098012 */ lui $t1, %hi(D_80126550) # $t1, 0x8012
/* 0955BC 800949BC 84680002 */ lh $t0, 2($v1)
/* 0955C0 800949C0 3C018012 */ lui $at, %hi(D_80126BBC) # $at, 0x8012
/* 0955C4 800949C4 0008C880 */ sll $t9, $t0, 2
/* 0955C8 800949C8 01394821 */ addu $t1, $t1, $t9
/* 0955CC 800949CC 8D296550 */ lw $t1, %lo(D_80126550)($t1)
/* 0955D0 800949D0 10000003 */ b .L800949E0
/* 0955D4 800949D4 AC296BBC */ sw $t1, %lo(D_80126BBC)($at)
.L800949D8:
/* 0955D8 800949D8 3C018012 */ lui $at, %hi(D_80126BBC) # $at, 0x8012
/* 0955DC 800949DC AC206BBC */ sw $zero, %lo(D_80126BBC)($at)
.L800949E0:
/* 0955E0 800949E0 846A0004 */ lh $t2, 4($v1)
/* 0955E4 800949E4 3C018012 */ lui $at, %hi(D_80126BC0) # $at, 0x8012
/* 0955E8 800949E8 0C01B683 */ jal get_render_context
/* 0955EC 800949EC AC2A6BC0 */ sw $t2, %lo(D_80126BC0)($at)
/* 0955F0 800949F0 14400008 */ bnez $v0, .L80094A14
/* 0955F4 800949F4 3C048012 */ lui $a0, %hi(D_80126BB8) # $a0, 0x8012
/* 0955F8 800949F8 3C058012 */ lui $a1, %hi(D_80126BBC) # $a1, 0x8012
/* 0955FC 800949FC 3C068012 */ lui $a2, %hi(D_80126BC0) # $a2, 0x8012
/* 095600 80094A00 8CC66BC0 */ lw $a2, %lo(D_80126BC0)($a2)
/* 095604 80094A04 8CA56BBC */ lw $a1, %lo(D_80126BBC)($a1)
/* 095608 80094A08 8C846BB8 */ lw $a0, %lo(D_80126BB8)($a0)
/* 09560C 80094A0C 0C01E05C */ jal func_80078170
/* 095610 80094A10 00000000 */ nop
.L80094A14:
/* 095614 80094A14 00002025 */ move $a0, $zero
/* 095618 80094A18 0C019A06 */ jal func_80066818
/* 09561C 80094A1C 24050001 */ li $a1, 1
/* 095620 80094A20 3C0B8012 */ lui $t3, %hi(gTrackSelectViewportY) # $t3, 0x8012
/* 095624 80094A24 8D6B6480 */ lw $t3, %lo(gTrackSelectViewportY)($t3)
/* 095628 80094A28 3C078012 */ lui $a3, %hi(D_8012647C) # $a3, 0x8012
/* 09562C 80094A2C 8CE7647C */ lw $a3, %lo(D_8012647C)($a3)
/* 095630 80094A30 00002025 */ move $a0, $zero
/* 095634 80094A34 00002825 */ move $a1, $zero
/* 095638 80094A38 00003025 */ move $a2, $zero
/* 09563C 80094A3C 0C019A50 */ jal func_80066940
/* 095640 80094A40 AFAB0010 */ sw $t3, 0x10($sp)
.L80094A44:
/* 095644 80094A44 0C00025A */ jal func_80000968
/* 095648 80094A48 24040002 */ li $a0, 2
/* 09564C 80094A4C 8FBF001C */ lw $ra, 0x1c($sp)
/* 095650 80094A50 27BD0030 */ addiu $sp, $sp, 0x30
/* 095654 80094A54 03E00008 */ jr $ra
/* 095658 80094A58 00000000 */ nop
asm/non_matchings/menu/func_80094D28.s
+2 -2
View File
@@ -53,10 +53,10 @@ glabel func_80094D28
glabel L80094DD0
/* 0959D0 80094DD0 3C108012 */ lui $s0, %hi(D_80126A94) # $s0, 0x8012
/* 0959D4 80094DD4 8E106A94 */ lw $s0, %lo(D_80126A94)($s0)
/* 0959D8 80094DD8 3C118012 */ lui $s1, %hi(D_80126478) # $s1, 0x8012
/* 0959D8 80094DD8 3C118012 */ lui $s1, %hi(gTrackSelectViewPortHalfY) # $s1, 0x8012
/* 0959DC 80094DDC 2A01003D */ slti $at, $s0, 0x3d
/* 0959E0 80094DE0 14200002 */ bnez $at, .L80094DEC
/* 0959E4 80094DE4 26316478 */ addiu $s1, %lo(D_80126478) # addiu $s1, $s1, 0x6478
/* 0959E4 80094DE4 26316478 */ addiu $s1, %lo(gTrackSelectViewPortHalfY) # addiu $s1, $s1, 0x6478
/* 0959E8 80094DE8 2410003C */ li $s0, 60
.L80094DEC:
/* 0959EC 80094DEC 8E220000 */ lw $v0, ($s1)
asm/non_matchings/menu/func_80095728.s
+2 -2
View File
@@ -161,7 +161,7 @@ glabel L80095948
glabel L80095964
/* 096564 80095964 3C0C8012 */ lui $t4, %hi(D_80126A94) # $t4, 0x8012
/* 096568 80095968 8D8C6A94 */ lw $t4, %lo(D_80126A94)($t4)
/* 09656C 8009596C 3C028012 */ lui $v0, %hi(D_80126478) # $v0, 0x8012
/* 09656C 8009596C 3C028012 */ lui $v0, %hi(gTrackSelectViewPortHalfY) # $v0, 0x8012
/* 096570 80095970 2981003D */ slti $at, $t4, 0x3d
/* 096574 80095974 10200004 */ beqz $at, .L80095988
/* 096578 80095978 00000000 */ nop
@@ -169,7 +169,7 @@ glabel L80095964
/* 096580 80095980 11A00364 */ beqz $t5, .L80096714
/* 096584 80095984 00000000 */ nop
.L80095988:
/* 096588 80095988 8C426478 */ lw $v0, %lo(D_80126478)($v0)
/* 096588 80095988 8C426478 */ lw $v0, %lo(gTrackSelectViewPortHalfY)($v0)
/* 09658C 8009598C 24030005 */ li $v1, 5
/* 096590 80095990 00027080 */ sll $t6, $v0, 2
/* 096594 80095994 01C3001A */ div $zero, $t6, $v1
asm/non_matchings/menu/menu_magic_codes_loop.s
+2 -2
View File
@@ -286,11 +286,11 @@ glabel menu_magic_codes_loop
.L8008A0E8:
/* 08ACE8 8008A0E8 01997021 */ addu $t6, $t4, $t9
/* 08ACEC 8008A0EC 95CF0000 */ lhu $t7, ($t6)
/* 08ACF0 8008A0F0 3C058012 */ lui $a1, %hi(D_80126C57) # $a1, 0x8012
/* 08ACF0 8008A0F0 3C058012 */ lui $a1, %hi(D_80126C54 + 3) # $a1, 0x8012
/* 08ACF4 8008A0F4 01E91021 */ addu $v0, $t7, $t1
/* 08ACF8 8008A0F8 24070001 */ li $a3, 1
/* 08ACFC 8008A0FC 2444FFFF */ addiu $a0, $v0, -1
/* 08AD00 8008A100 24A56C57 */ addiu $a1, %lo(D_80126C57) # addiu $a1, $a1, 0x6c57
/* 08AD00 8008A100 24A56C57 */ addiu $a1, %lo(D_80126C54 + 3) # addiu $a1, $a1, 0x6c57
.L8008A104:
/* 08AD04 8008A104 90820001 */ lbu $v0, 1($a0)
/* 08AD08 8008A108 90A30001 */ lbu $v1, 1($a1)
asm/non_matchings/menu/menu_track_select_init.s
+6 -6
View File
@@ -37,8 +37,8 @@ glabel menu_track_select_init
.L8008E82C:
/* 08F42C 8008E82C 0C01E948 */ jal get_video_width_and_height_as_s32
/* 08F430 8008E830 00000000 */ nop
/* 08F434 8008E834 3C068012 */ lui $a2, %hi(D_8012647C) # $a2, 0x8012
/* 08F438 8008E838 24C6647C */ addiu $a2, %lo(D_8012647C) # addiu $a2, $a2, 0x647c
/* 08F434 8008E834 3C068012 */ lui $a2, %hi(gTrackSelectViewPortX) # $a2, 0x8012
/* 08F438 8008E838 24C6647C */ addiu $a2, %lo(gTrackSelectViewPortX) # addiu $a2, $a2, 0x647c
/* 08F43C 8008E83C 3C078012 */ lui $a3, %hi(gTrackSelectViewportY) # $a3, 0x8012
/* 08F440 8008E840 00027C03 */ sra $t7, $v0, 0x10
/* 08F444 8008E844 3059FFFF */ andi $t9, $v0, 0xffff
@@ -48,11 +48,11 @@ glabel menu_track_select_init
/* 08F454 8008E854 ACF80000 */ sw $t8, ($a3)
/* 08F458 8008E858 ACD90000 */ sw $t9, ($a2)
/* 08F45C 8008E85C 00195043 */ sra $t2, $t9, 1
/* 08F460 8008E860 3C018012 */ lui $at, %hi(D_80126474) # $at, 0x8012
/* 08F464 8008E864 AC2A6474 */ sw $t2, %lo(D_80126474)($at)
/* 08F460 8008E860 3C018012 */ lui $at, %hi(gTrackSelectViewPortHalfX) # $at, 0x8012
/* 08F464 8008E864 AC2A6474 */ sw $t2, %lo(gTrackSelectViewPortHalfX)($at)
/* 08F468 8008E868 8CE50000 */ lw $a1, ($a3)
/* 08F46C 8008E86C 3C1E8012 */ lui $fp, %hi(D_80126478) # $fp, 0x8012
/* 08F470 8008E870 27DE6478 */ addiu $fp, %lo(D_80126478) # addiu $fp, $fp, 0x6478
/* 08F46C 8008E86C 3C1E8012 */ lui $fp, %hi(gTrackSelectViewPortHalfY) # $fp, 0x8012
/* 08F470 8008E870 27DE6478 */ addiu $fp, %lo(gTrackSelectViewPortHalfY) # addiu $fp, $fp, 0x6478
/* 08F474 8008E874 00055843 */ sra $t3, $a1, 1
/* 08F478 8008E878 AFCB0000 */ sw $t3, ($fp)
/* 08F47C 8008E87C 3C0C8012 */ lui $t4, %hi(D_801269C8) # $t4, 0x8012
asm/non_matchings/menu/renderTrackSelect.s
+2 -2
View File
@@ -7,9 +7,9 @@ glabel D_800E84D8
.text
glabel renderTrackSelect
/* 090654 8008FA54 27BDFF80 */ addiu $sp, $sp, -0x80
/* 090658 8008FA58 3C0E8012 */ lui $t6, %hi(D_80126478) # $t6, 0x8012
/* 090658 8008FA58 3C0E8012 */ lui $t6, %hi(gTrackSelectViewPortHalfY) # $t6, 0x8012
/* 09065C 8008FA5C 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000
/* 090660 8008FA60 8DCE6478 */ lw $t6, %lo(D_80126478)($t6)
/* 090660 8008FA60 8DCE6478 */ lw $t6, %lo(gTrackSelectViewPortHalfY)($t6)
/* 090664 8008FA64 8F180300 */ lw $t8, %lo(osTvType)($t8)
/* 090668 8008FA68 AFB50038 */ sw $s5, 0x38($sp)
/* 09066C 8008FA6C AFB40034 */ sw $s4, 0x34($sp)
asm/non_matchings/save_data/func_800756D4.s
-147
View File
@@ -1,147 +0,0 @@
.rdata
glabel D_800E77CC
.asciz "DKRACING-GHOSTS"
glabel D_800E77DC
.word 0
.text
glabel func_800756D4
/* 0762D4 800756D4 27BDFF90 */ addiu $sp, $sp, -0x70
/* 0762D8 800756D8 AFBF003C */ sw $ra, 0x3c($sp)
/* 0762DC 800756DC AFBE0038 */ sw $fp, 0x38($sp)
/* 0762E0 800756E0 AFB70034 */ sw $s7, 0x34($sp)
/* 0762E4 800756E4 AFB60030 */ sw $s6, 0x30($sp)
/* 0762E8 800756E8 00A0B025 */ move $s6, $a1
/* 0762EC 800756EC 00E0B825 */ move $s7, $a3
/* 0762F0 800756F0 00C0F025 */ move $fp, $a2
/* 0762F4 800756F4 AFB5002C */ sw $s5, 0x2c($sp)
/* 0762F8 800756F8 AFB40028 */ sw $s4, 0x28($sp)
/* 0762FC 800756FC AFB30024 */ sw $s3, 0x24($sp)
/* 076300 80075700 AFB20020 */ sw $s2, 0x20($sp)
/* 076304 80075704 AFB1001C */ sw $s1, 0x1c($sp)
/* 076308 80075708 AFB00018 */ sw $s0, 0x18($sp)
/* 07630C 8007570C 0C01D637 */ jal get_si_device_status
/* 076310 80075710 AFA40070 */ sw $a0, 0x70($sp)
/* 076314 80075714 10400007 */ beqz $v0, .L80075734
/* 076318 80075718 AFA20064 */ sw $v0, 0x64($sp)
/* 07631C 8007571C 8FA40070 */ lw $a0, 0x70($sp)
/* 076320 80075720 0C01D6BB */ jal start_reading_controller_data
/* 076324 80075724 00000000 */ nop
/* 076328 80075728 8FA20064 */ lw $v0, 0x64($sp)
/* 07632C 8007572C 10000060 */ b .L800758B0
/* 076330 80075730 8FBF003C */ lw $ra, 0x3c($sp)
.L80075734:
/* 076334 80075734 8FB50080 */ lw $s5, 0x80($sp)
/* 076338 80075738 00008025 */ move $s0, $zero
/* 07633C 8007573C 02C02025 */ move $a0, $s6
/* 076340 80075740 02E02825 */ move $a1, $s7
/* 076344 80075744 03C03025 */ move $a2, $fp
/* 076348 80075748 240700FF */ li $a3, 255
/* 07634C 8007574C 02A01825 */ move $v1, $s5
.L80075750:
/* 076350 80075750 A0870000 */ sb $a3, ($a0)
/* 076354 80075754 A4600000 */ sh $zero, ($v1)
/* 076358 80075758 90620001 */ lbu $v0, 1($v1)
/* 07635C 8007575C 26100001 */ addiu $s0, $s0, 1
/* 076360 80075760 2A010006 */ slti $at, $s0, 6
/* 076364 80075764 A0A20000 */ sb $v0, ($a1)
/* 076368 80075768 24840001 */ addiu $a0, $a0, 1
/* 07636C 8007576C 24630002 */ addiu $v1, $v1, 2
/* 076370 80075770 24A50001 */ addiu $a1, $a1, 1
/* 076374 80075774 24C60001 */ addiu $a2, $a2, 1
/* 076378 80075778 1420FFF5 */ bnez $at, .L80075750
/* 07637C 8007577C A0C2FFFF */ sb $v0, -1($a2)
/* 076380 80075780 8FA40070 */ lw $a0, 0x70($sp)
/* 076384 80075784 3C05800E */ lui $a1, %hi(D_800E77CC) # $a1, 0x800e
/* 076388 80075788 3C06800E */ lui $a2, %hi(D_800E77DC) # $a2, 0x800e
/* 07638C 8007578C 24C677DC */ addiu $a2, %lo(D_800E77DC) # addiu $a2, $a2, 0x77dc
/* 076390 80075790 24A577CC */ addiu $a1, %lo(D_800E77CC) # addiu $a1, $a1, 0x77cc
/* 076394 80075794 0C01D93A */ jal get_file_number
/* 076398 80075798 27A7005C */ addiu $a3, $sp, 0x5c
/* 07639C 8007579C 1440003E */ bnez $v0, .L80075898
/* 0763A0 800757A0 AFA20064 */ sw $v0, 0x64($sp)
/* 0763A4 800757A4 8FA40070 */ lw $a0, 0x70($sp)
/* 0763A8 800757A8 8FA5005C */ lw $a1, 0x5c($sp)
/* 0763AC 800757AC 0C01DA49 */ jal get_file_size
/* 0763B0 800757B0 27A60058 */ addiu $a2, $sp, 0x58
/* 0763B4 800757B4 14400038 */ bnez $v0, .L80075898
/* 0763B8 800757B8 AFA20064 */ sw $v0, 0x64($sp)
/* 0763BC 800757BC 8FA40058 */ lw $a0, 0x58($sp)
/* 0763C0 800757C0 240500FF */ li $a1, 255
/* 0763C4 800757C4 0C01C327 */ jal allocate_from_main_pool_safe
/* 0763C8 800757C8 24840100 */ addiu $a0, $a0, 0x100
/* 0763CC 800757CC 8FA40070 */ lw $a0, 0x70($sp)
/* 0763D0 800757D0 8FA5005C */ lw $a1, 0x5c($sp)
/* 0763D4 800757D4 8FA70058 */ lw $a3, 0x58($sp)
/* 0763D8 800757D8 00409025 */ move $s2, $v0
/* 0763DC 800757DC 0C01D984 */ jal read_data_from_controller_pak
/* 0763E0 800757E0 00403025 */ move $a2, $v0
/* 0763E4 800757E4 1440002A */ bnez $v0, .L80075890
/* 0763E8 800757E8 AFA20064 */ sw $v0, 0x64($sp)
/* 0763EC 800757EC 00008025 */ move $s0, $zero
/* 0763F0 800757F0 26510004 */ addiu $s1, $s2, 4
/* 0763F4 800757F4 24140006 */ li $s4, 6
/* 0763F8 800757F8 241300FF */ li $s3, 255
.L800757FC:
/* 0763FC 800757FC 922E0000 */ lbu $t6, ($s1)
/* 076400 80075800 00000000 */ nop
/* 076404 80075804 126E001F */ beq $s3, $t6, .L80075884
/* 076408 80075808 00000000 */ nop
/* 07640C 8007580C 862F0002 */ lh $t7, 2($s1)
/* 076410 80075810 0C01D293 */ jal calculate_ghost_header_checksum
/* 076414 80075814 01F22021 */ addu $a0, $t7, $s2
/* 076418 80075818 86380002 */ lh $t8, 2($s1)
/* 07641C 8007581C 00000000 */ nop
/* 076420 80075820 0312C821 */ addu $t9, $t8, $s2
/* 076424 80075824 87280000 */ lh $t0, ($t9)
/* 076428 80075828 00000000 */ nop
/* 07642C 8007582C 10480003 */ beq $v0, $t0, .L8007583C
/* 076430 80075830 24090009 */ li $t1, 9
/* 076434 80075834 10000016 */ b .L80075890
/* 076438 80075838 AFA90064 */ sw $t1, 0x64($sp)
.L8007583C:
/* 07643C 8007583C 922A0000 */ lbu $t2, ($s1)
/* 076440 80075840 02D05821 */ addu $t3, $s6, $s0
/* 076444 80075844 A16A0000 */ sb $t2, ($t3)
/* 076448 80075848 922C0001 */ lbu $t4, 1($s1)
/* 07644C 8007584C 03D06821 */ addu $t5, $fp, $s0
/* 076450 80075850 A1AC0000 */ sb $t4, ($t5)
/* 076454 80075854 862E0002 */ lh $t6, 2($s1)
/* 076458 80075858 02F0C821 */ addu $t9, $s7, $s0
/* 07645C 8007585C 01D27821 */ addu $t7, $t6, $s2
/* 076460 80075860 91F80002 */ lbu $t8, 2($t7)
/* 076464 80075864 00105840 */ sll $t3, $s0, 1
/* 076468 80075868 A3380000 */ sb $t8, ($t9)
/* 07646C 8007586C 86280002 */ lh $t0, 2($s1)
/* 076470 80075870 02AB6021 */ addu $t4, $s5, $t3
/* 076474 80075874 01124821 */ addu $t1, $t0, $s2
/* 076478 80075878 852A0004 */ lh $t2, 4($t1)
/* 07647C 8007587C 00000000 */ nop
/* 076480 80075880 A58A0000 */ sh $t2, ($t4)
.L80075884:
/* 076484 80075884 26100001 */ addiu $s0, $s0, 1
/* 076488 80075888 1614FFDC */ bne $s0, $s4, .L800757FC
/* 07648C 8007588C 26310004 */ addiu $s1, $s1, 4
.L80075890:
/* 076490 80075890 0C01C450 */ jal free_from_memory_pool
/* 076494 80075894 02402025 */ move $a0, $s2
.L80075898:
/* 076498 80075898 8FA40070 */ lw $a0, 0x70($sp)
/* 07649C 8007589C 0C01D6BB */ jal start_reading_controller_data
/* 0764A0 800758A0 00000000 */ nop
/* 0764A4 800758A4 8FA20064 */ lw $v0, 0x64($sp)
/* 0764A8 800758A8 00000000 */ nop
/* 0764AC 800758AC 8FBF003C */ lw $ra, 0x3c($sp)
.L800758B0:
/* 0764B0 800758B0 8FB00018 */ lw $s0, 0x18($sp)
/* 0764B4 800758B4 8FB1001C */ lw $s1, 0x1c($sp)
/* 0764B8 800758B8 8FB20020 */ lw $s2, 0x20($sp)
/* 0764BC 800758BC 8FB30024 */ lw $s3, 0x24($sp)
/* 0764C0 800758C0 8FB40028 */ lw $s4, 0x28($sp)
/* 0764C4 800758C4 8FB5002C */ lw $s5, 0x2c($sp)
/* 0764C8 800758C8 8FB60030 */ lw $s6, 0x30($sp)
/* 0764CC 800758CC 8FB70034 */ lw $s7, 0x34($sp)
/* 0764D0 800758D0 8FBE0038 */ lw $fp, 0x38($sp)
/* 0764D4 800758D4 03E00008 */ jr $ra
/* 0764D8 800758D8 27BD0070 */ addiu $sp, $sp, 0x70
asm/non_matchings/unknown_032760/obj_loop_parkwarden.s
-1746
View File
File diff suppressed because it is too large Load Diff
include/structs.h
+39 -18
View File
@@ -1265,16 +1265,30 @@ typedef struct Object_FogChanger {
} Object_FogChanger;
typedef struct Object_Taj {
/* 0x00 */ f32 unk0;
/* 0x04 */ u8 pad4[0x9];
/* 0x0D */ u8 unkD;
/* 0x0E */ u8 padE[0x1A];
/* 0x28 */ s16 unk28;
/* 0x2A */ u8 pad2A[0x2];
/* 0x2C */ s32 unk2C;
/* 0x30 */ u8 pad30[0x4];
/* 0x34 */ s16 unk34;
/* 0x36 */ s8 unk36;
/* 0x00 */ f32 unk0;
/* 0x04 */ f32 unk4;
/* 0x08 */ s32 unk8;
/* 0x0C */ s8 unkC;
/* 0x0D */ u8 unkD;
/* 0x0E */ u8 unkE;
/* 0x0F */ u8 unkF;
/* 0x10 */ u8 unk10;
/* 0x11 */ u8 unk11;
/* 0x12 */ u8 unk12;
/* 0x13 */ u8 unk13;
/* 0x14 */ f32 unk14;
/* 0x18 */ f32 unk18;
/* 0x1C */ s16 unk1C;
/* 0x1E */ s16 unk1E;
/* 0x20 */ s16 unk20;
/* 0x22 */ s16 unk22;
/* 0x24 */ u8 pad24[0x4];
/* 0x28 */ s16 unk28;
/* 0x2A */ u8 pad2A[0x2];
/* 0x2C */ s32 unk2C;
/* 0x30 */ s32 unk30;
/* 0x34 */ u16 unk34;
/* 0x36 */ s8 unk36;
} Object_Taj;
typedef struct Object_TT {
@@ -1561,17 +1575,24 @@ typedef struct Object {
} Object;
// Unused
typedef struct GhostHeaderChecksum {
u8 levelID;
u8 vehicleID; // 0 = Car, 1 = Hovercraft, 2 = Plane
} GhostHeaderChecksum;
typedef struct GhostHeaderUnk0 {
u8 levelID;
u8 vehicleID; // 0 = Car, 1 = Hovercraft, 2 = Plane
} GhostHeaderUnk0;
/* Size: 8 bytes */
typedef struct GhostHeader {
//GhostHeaderChecksum checksum;
s16 checksum;
u8 characterID; // 9 = T.T.
u8 unk3; // Might just be padding?
union {
GhostHeaderUnk0 unk0;
s16 checksum;
};
union {
struct {
u8 characterID; // 9 = T.T.
u8 unk3;
};
s16 unk2;
};
s16 time; // In frames, where 60 frames = 1 second.
s16 nodeCount;
} GhostHeader;
livediff.sh
+1 -1
View File
@@ -1 +1 @@
python3 tools/python/diff.py -smwo3 --line-numbers "$@"
python3 tools/python/diff.py -smwo3 --line-numbers --max-lines 2048 "$@"
src/memory.h
+2
View File
@@ -25,6 +25,8 @@
// ???
#define COLOUR_TAG_GREY 0x7F7F7FFF
// ???
#define COLOUR_TAG_SEMITRANS_GREY 0x80808080
// ???
#define COLOUR_TAG_ORANGE 0xFF7F7FFF
// ???
#define COLOUR_TAG_BLACK 0x000000FF
src/menu.c
+53 -60
View File
@@ -96,9 +96,9 @@ s8 gControllersYAxisDirection[4]; // Y axis (-1 = down, 1 = up) for controller
s8 gControllersXAxis[4];
s8 gControllersYAxis[4];
s32 sUnused_80126470; // Set to 0 in the magic codes menu and 0xD000 elsewhere, otherwise unused.
s32 D_80126474;
s32 D_80126478;
s32 D_8012647C;
s32 gTrackSelectViewPortHalfX;
s32 gTrackSelectViewPortHalfY;
s32 gTrackSelectViewPortX;
s32 gTrackSelectViewportY;
s32 D_80126484;
s32 D_80126488;
@@ -113,17 +113,16 @@ SavefileInfo gSavefileInfo[4];
s32 D_801264D0;
s32 D_801264D4;
s8 gDialogueSubmenu;
s32 D_801264DC;
u8 *D_801264DC; //gGhostLevelIDs?
s8 D_801264E0;
s8 D_801264E1;
s8 sCurrentMenuID;
s32 D_801264E4;
u8 *D_801264E4; //gGhostSomethings?
s32 D_801264E8;
s32 D_801264EC;
u8 *D_801264EC; //gGhostVehicleIds?
s32 D_801264F0[2];
s32 D_801264F8[2];
s32 D_80126500;
s16 *D_801264F8[3]; //gGhostChecksums?
s8 sDialogueOptionMax;
s32 D_80126508;
s16 D_8012650C;
@@ -253,7 +252,7 @@ s32 D_80126BE0;
s32 D_80126BE4;
s32 D_80126BE8;
f32 D_80126BEC;
s32 D_80126BF0[8];
char *D_80126BF0[8];
s32 D_80126C10;
s32 D_80126C14;
s32 D_80126C18;
@@ -273,10 +272,7 @@ s16 gOptionsMenuItemIndex;
s32 D_80126C48;
s16 D_80126C4C;
f32 D_80126C50;
s8 D_80126C54;
s8 D_80126C55;
s8 D_80126C56;
s8 D_80126C57;
unk80126C54 D_80126C54;
u8 D_80126C58[20];
s32 *D_80126C6C;
s32 D_80126C70;
@@ -803,6 +799,7 @@ ButtonElement D_800E0700 = {
80, 152, 160, 40, 4, 4, 80, 14
};
// Often access like D_800E0710[i * 3 + 1]. Maybe it's s16[4][3]?
s16 D_800E0710[16] = {
0x0E, 0x0F, 0x00, 0x10,
0x11, 0x20, 0x12, 0x13,
@@ -1488,11 +1485,7 @@ FadeTransition D_800E1DE8 = FADE_TRANSITION(0, FADE_COLOR_BLACK, 120, -1);
char gRareCopyrightString[24] = "(C) COPYRIGHT RARE 1997";
//Probably a FadeTransition, but that won't be certain
//FadeTransition D_800E1E08 = FADE_TRANSITION(0, FADE_COLOR_BLACK, 52, -1);
s16 D_800E1E08[4] = {
0, 0, 0x34, -1
};
FadeTransition D_800E1E08 = FADE_TRANSITION(0, FADE_COLOR_BLACK, 52, -1);
char *D_800E1E10 = " (ADV.";
@@ -2534,7 +2527,7 @@ s32 menu_title_screen_loop(s32 updateRate) {
if ((gTitleDemoTimer < 60) && ((gTitleDemoTimer + updateRate) >= 60)) {
set_music_fade_timer(-0x300);
sp28 = 0;
func_800C01D8((FadeTransition* ) D_800E1E08);
func_800C01D8(&D_800E1E08);
}
if (gTitleDemoTimer <= 0) {
sp28 = 1;
@@ -5536,10 +5529,10 @@ void menu_track_select_init(void) {
D_800DF488 = 0;
}
videoWidthAndHeight = get_video_width_and_height_as_s32();
D_8012647C = GET_VIDEO_WIDTH(videoWidthAndHeight);
gTrackSelectViewPortX = GET_VIDEO_WIDTH(videoWidthAndHeight);
gTrackSelectViewportY = GET_VIDEO_HEIGHT(videoWidthAndHeight);
D_80126474 = D_8012647C >> 1;
D_80126478 = gTrackSelectViewportY >> 1;
gTrackSelectViewPortHalfX = gTrackSelectViewPortX >> 1;
gTrackSelectViewPortHalfY = gTrackSelectViewportY >> 1;
gTrackSelectX = (f32) D_801269C8 * 320.0f;
gTrackSelectY = (f32) D_801269CC * (f32) -gTrackSelectViewportY;
gSelectedTrackX = -1;
@@ -5591,7 +5584,7 @@ void menu_track_select_init(void) {
}
D_80126924 = 0;
func_80078AAC(func_8008F618);
func_80066940(0, 80, D_80126478 - (D_80126478 >> 1), 240, (D_80126478 >> 1) + D_80126478);
func_80066940(0, 80, gTrackSelectViewPortHalfY - (gTrackSelectViewPortHalfY >> 1), 240, (gTrackSelectViewPortHalfY >> 1) + gTrackSelectViewPortHalfY);
func_80066610();
func_80066818(0, 0);
D_800E097C = 1;
@@ -5984,13 +5977,13 @@ void func_80090918(s32 updateRate) {
var_t1 = 20;
}
var_t2 = 160;
var_t0 = D_80126478;
var_t0 = gTrackSelectViewPortHalfY;
if (var_t1 < 20) {
var_t2 += (D_801269E8 - gTrackSelectX);
var_t0 -= (D_801269EC - gTrackSelectY);
}
var_t3 = (((var_t1 + 20) * D_80126478) / 40) + var_t0;
var_a2 = var_t0 - (((var_t1 + 20) * D_80126478) / 40);
var_t3 = (((var_t1 + 20) * gTrackSelectViewPortHalfY) / 40) + var_t0;
var_a2 = var_t0 - (((var_t1 + 20) * gTrackSelectViewPortHalfY) / 40);
func_80066940(0, (var_t2 - (var_t1 * 4)) - 80, var_a2, (var_t1 * 4) + var_t2 + 80, var_t3);
gMenuImageStack[4].unk8 = (f32) (sMenuImageProperties[4].unk8 * (1.0f + ((f32) var_t1 / 20.0f)));
gMenuImageStack[6].unk8 = (f32) (sMenuImageProperties[6].unk8 * (1.0f + ((f32) var_t1 / 20.0f)));
@@ -6485,7 +6478,7 @@ void render_adventure_track_setup(s32 arg0, s32 arg1, s32 arg2) {
s32 sp58;
char *filename;
Settings* settings;
char* levelName;
char *levelName;
filename = NULL;
settings = get_settings();
@@ -6992,23 +6985,23 @@ void func_80094688(s32 arg0, s32 arg1) {
D_80126A90 = 0;
if (gNumberOfActivePlayers == 1 && gTrophyRaceWorldId == 0) {
if (is_in_tracks_mode() == 1) {
D_80126BF0[0] = gMenuText[23];
D_80126BF0[1] = gMenuText[24];
D_80126BF0[2] = gMenuText[26];
D_80126BF0[0] = gMenuText[ASSET_MENU_TEXT_TRYAGAIN];
D_80126BF0[1] = gMenuText[ASSET_MENU_TEXT_SELECTTRACK];
D_80126BF0[2] = gMenuText[ASSET_MENU_TEXT_SELECTCHARACTER];
D_80126C14 = 3;
D_80126A90 = 1;
} else {
if (arg0 == 0) {
D_80126BF0[0] = gMenuText[23];
D_80126BF0[0] = gMenuText[ASSET_MENU_TEXT_TRYAGAIN];
D_80126C14 = 1;
} else {
D_80126C14 = 0;
}
D_80126BF0[D_80126C14] = gMenuText[25];
D_80126C14 = D_80126C14 + 1;
D_80126BF0[D_80126C14] = gMenuText[ASSET_MENU_TEXT_RETURNTOLOBBY];
D_80126C14++;
}
D_80126BF0[D_80126C14] = gMenuText[28];
D_80126C14 = D_80126C14 + 1;
D_80126BF0[D_80126C14] = gMenuText[ASSET_MENU_TEXT_QUIT];
D_80126C14++;
D_801263E0 = 0;
} else {
D_801263E0 = 7;
@@ -7020,7 +7013,7 @@ void func_80094688(s32 arg0, s32 arg1) {
D_800DF460 = 0;
gMenuOption = 0;
gIgnorePlayerInput = 1;
*((s32*)(&D_80126C54)) = -1;
D_80126C54.unk0_s32 = -1;
gMenuSubOption = 0;
D_80126C1C = NULL;
D_80126A98 = 0;
@@ -7029,40 +7022,40 @@ void func_80094688(s32 arg0, s32 arg1) {
}
if (D_80126C28) {
D_801263E0 = 8;
gMenuDelay = 0x64;
gMenuDelay = 100;
}
if (get_render_context()) {
D_801263E0 = 7;
}
reset_controller_sticks();
func_8006D8E0(arg0);
D_8012647C = get_video_width_and_height_as_s32();
gTrackSelectViewportY = (D_8012647C >> 0x10) & 0xFFFF;
D_8012647C = D_8012647C & 0xFFFF;
D_80126474 = D_8012647C >> 1;
D_80126478 = gTrackSelectViewportY >> 1;
gTrackSelectViewPortX = get_video_width_and_height_as_s32();
gTrackSelectViewportY = GET_VIDEO_HEIGHT(gTrackSelectViewPortX) & 0xFFFF;
gTrackSelectViewPortX = GET_VIDEO_WIDTH(gTrackSelectViewPortX);
gTrackSelectViewPortHalfX = gTrackSelectViewPortX >> 1;
gTrackSelectViewPortHalfY = gTrackSelectViewportY >> 1;
if ((gNumberOfActivePlayers == 1) && (gTrophyRaceWorldId == 0)) {
*((s32*)(&D_80126C54)) = 0;
D_80126C54.unk0_s32 = 0;
arg1 = (s8) header->world - 1;
var_v1 = &D_800E0710[3*arg1];
var_v1 = &D_800E0710[arg1 * 3];
if (var_v1[0] != -1) {
func_8009C6D4((s32) var_v1[0]);
D_80126BB8 = (s32) D_80126550[var_v1[0]];
func_8009C6D4(var_v1[0]);
D_80126BB8 = D_80126550[var_v1[0]];
} else {
D_80126BB8 = 0;
}
if (var_v1[1] != -1) {
func_8009C6D4((s32) var_v1[1]);
D_80126BBC = (s32) D_80126550[var_v1[1]];
func_8009C6D4(var_v1[1]);
D_80126BBC = D_80126550[var_v1[1]];
} else {
D_80126BBC = 0;
}
D_80126BC0 = (s32) var_v1[2];
D_80126BC0 = var_v1[2];
if (get_render_context() == 0) {
func_80078170((u32) D_80126BB8, (u32) D_80126BBC, (u32) D_80126BC0);
func_80078170(D_80126BB8, D_80126BBC, D_80126BC0);
}
func_80066818(0, 1);
func_80066940(0, 0, 0, D_8012647C, gTrackSelectViewportY);
func_80066940(0, 0, 0, gTrackSelectViewPortX, gTrackSelectViewportY);
}
func_80000968(2);
}
@@ -7160,9 +7153,9 @@ void menu_11_init(void) {
s8 temp_a2;
settings = get_settings();
D_80126BF0[0] = (s32)gMenuText[ASSET_MENU_TEXT_SELECTTRACK];
D_80126BF0[1] = (s32)gMenuText[ASSET_MENU_TEXT_TRYAGAIN];
D_80126BF0[2] = (s32)gMenuText[ASSET_MENU_TEXT_QUIT];
D_80126BF0[0] = gMenuText[ASSET_MENU_TEXT_SELECTTRACK];
D_80126BF0[1] = gMenuText[ASSET_MENU_TEXT_TRYAGAIN];
D_80126BF0[2] = gMenuText[ASSET_MENU_TEXT_QUIT];
D_80126C14 = 3;
for (i = 0; i < gNumberOfActivePlayers; i++) {
@@ -7713,10 +7706,10 @@ GLOBAL_ASM("asm/non_matchings/menu/func_800998E0.s")
// Should be functionally equivalent
void menu_ghost_data_init(void) {
s32 i;
s32 sp70;
SIDeviceStatus pakStatus;
sp70 = func_800756D4(D_801264D0, &D_801264DC, &D_801264EC, &D_801264E4, &D_801264F8);
if (sp70 == 0) {
pakStatus = func_800756D4(D_801264D0, &D_801264DC, &D_801264EC, &D_801264E4, &D_801264F8);
if (pakStatus == CONTROLLER_PAK_GOOD) {
func_8009963C();
}
func_8009C674(&D_800E1708);
@@ -7762,7 +7755,7 @@ void menu_ghost_data_init(void) {
gOpacityDecayTimer = 0;
gMenuDelay = 0;
D_80126498 = 0;
if (sp70 == 0) {
if (pakStatus == CONTROLLER_PAK_GOOD) {
func_800C01D8(&sMenuTransitionFadeOut);
return;
}
@@ -8411,9 +8404,9 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8009CA60.s")
* Comes in wood, iron and gold colours.
*/
void render_track_selection_viewport_border(ObjectModel *objMdl) {
s32 pad1[4];
UNUSED s32 pad1[4];
s32 sp5C;
s32 pad2[4];
UNUSED s32 pad2[4];
TextureHeader *tex;
Triangle *tris;
s32 triOffset;
src/menu.h
+12 -4
View File
@@ -137,6 +137,18 @@ typedef struct unk801263C0 {
};
} unk801263C0;
typedef struct unk80126C54 {
union {
struct {
u8 unk0;
u8 unk1;
u8 unk2;
u8 unk3;
};
s32 unk0_s32;
};
} unk80126C54;
/* Size: 0x30 bytes */
typedef struct unk800DF83C {
char *unk0; // Pointer to ascii text.
@@ -641,10 +653,6 @@ extern s16 D_800E1DC8[16];
extern char gRareCopyrightString[24];
//Probably a FadeTransition
//extern FadeTransition D_800E1E08;
extern s16 D_800E1E08[4];
extern char *D_800E1E10;
extern s32 D_800E1E14;
src/object_functions.c
+614 -16
View File
File diff suppressed because it is too large Load Diff
src/object_functions.h
+2 -4
View File
@@ -200,8 +200,6 @@ typedef struct unk80041A90_MidiFade {
} unk80041A90_MidiFade;
// Unsure about the signed/unsigned with these arrays.
extern u16 D_800DC970[4];
extern u16 D_800DC978[4];
extern u16 D_800DC980[20];
extern u16 D_800DC9A8[20];
extern u16 D_800DC9D0[64];
@@ -283,7 +281,7 @@ void obj_loop_setuppoint(Object *obj, s32 speed);
void obj_init_dino_whale(Object *obj, LevelObjectEntry_Dino_Whale *entry);
void obj_loop_dino_whale(Object *obj, s32 speed);
void obj_init_parkwarden(Object *obj, LevelObjectEntry_Parkwarden *entry);
void func_80039320(s16 arg0);
void func_80039320(s16 voiceClip);
void play_taj_voice_clip(u16 soundID, s32 interrupt);
void obj_loop_gbparkwarden(Object *obj, s32 speed);
f32 func_8003ACAC(void);
@@ -353,7 +351,7 @@ void obj_loop_goldenballoon(Object *obj, s32 speed);
s32 func_8001C524(f32 x, f32 y, f32 z, s32 arg3);
s32 func_8001CC48(s32, s32, s32);
void func_8001C6C4(Object_GoldenBalloon *obj64, Object *obj, f32, f32, s32);
f32 func_8001C6C4(Object_64 *, Object *, f32, f32, s32);
void func_8000CBF0(Object*, s32);
src/object_models.h
+1
View File
@@ -20,5 +20,6 @@ void func_80061C0C(Object* obj);
void free_object_model(ObjectModel *model); //Non Matching
void func_8005FF40(ObjectModel **modelPtr); //Non Matching
void func_80061C0C(Object*); //Non Matching
#endif
src/objects.c
+1 -1
View File
@@ -799,7 +799,7 @@ s32 func_8000FBCC(Object *arg0, Object_60 *arg1) {
arg1->unk4 = NULL;
objHeader = ((ObjectSegment*) arg0)->header;
if (objHeader->unk32) {
arg1->unk4 = load_texture((s32) ((Object_Taj*)objHeader)->unk34);
arg1->unk4 = load_texture((s32) ((ObjectHeader *) objHeader)->unk34);
objHeader = ((ObjectSegment*)arg0)->header;
}
((Object_50*) arg1)->unk0 = (f32) objHeader->unk4;

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