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

Mostly misc labelling, but also weather too (#232)

Browse Source 
* bit more labelling

* identify some weather stuff

* Update sound_ids.h

* yum

* more random identification

* last weather stuff for now

* Update README.md

* Update README.md

* Fix non equivalent
This commit is contained in:
Fazana
2022-05-23 23:11:46 +01:00
committed by GitHub
parent c67da4c011
commit 3ab4716110
39 changed files with 387 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+7 -7
View File
@@ -113,15 +113,15 @@ s32 is_drumstick_unlocked(void) {
}
```
As of April 29th, 2022, this is our current score:
As of May 23rd, 2022, this is our current score:
```
=======================================================
ADVENTURE ONE (ASM -> C Decompilation)
------------------- 24.58% Complete -------------------
# Decompiled functions: 1137
# Decompiled functions: 1136
# GLOBAL_ASM remaining: 642
# NON_MATCHING functions: 8
# NON_EQUIVALENT WIP functions: 106
# NON_MATCHING functions: 9
# NON_EQUIVALENT WIP functions: 105
--------------------- Game Status ---------------------
Balloons: 12/47, Keys: 1/4, Trophies: 1/5
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
@@ -129,9 +129,9 @@ As of April 29th, 2022, this is our current score:
We are racing Taj in the Car Challenge. (Lap 1/3)
=======================================================
ADVENTURE TWO (Cleanup & Documentation)
------------------- 3.43% Complete -------------------
# Documented functions: 152
# Undocumented remaining: 1627
------------------- 3.89% Complete -------------------
# Documented functions: 169
# Undocumented remaining: 1609
--------------------- Game Status ---------------------
Balloons: 2/47, Keys: 0/4, Trophies: 0/5
T.T. Amulets: 0/4, Wizpig Amulets: 0/4
asm/non_matchings/game_ui/func_8009ECF0.s
+1 -1
View File
@@ -15,7 +15,7 @@ glabel func_8009ECF0
/* 09F924 8009ED24 0C01BAA4 */ jal get_settings
/* 09F928 8009ED28 A0226D37 */ sb $v0, %lo(D_80126D37)($at)
/* 09F92C 8009ED2C 3C018012 */ lui $at, %hi(D_80127184) # $at, 0x8012
/* 09F930 8009ED30 0C003877 */ jal func_8000E1DC
/* 09F930 8009ED30 0C003877 */ jal check_if_silver_coin_race
/* 09F934 8009ED34 AC227184 */ sw $v0, %lo(D_80127184)($at)
/* 09F938 8009ED38 3C018012 */ lui $at, %hi(D_80127188) # $at, 0x8012
/* 09F93C 8009ED3C A0227188 */ sb $v0, %lo(D_80127188)($at)
asm/non_matchings/game_ui/func_800AB4A8.s
+1 -1
View File
@@ -11,7 +11,7 @@ glabel func_800AB4A8
/* 0AC0CC 800AB4CC 00A0A025 */ move $s4, $a1
/* 0AC0D0 800AB4D0 AFB60030 */ sw $s6, 0x30($sp)
/* 0AC0D4 800AB4D4 AFB5002C */ sw $s5, 0x2c($sp)
/* 0AC0D8 800AB4D8 0C02ACD7 */ jal func_800AB35C
/* 0AC0D8 800AB4D8 0C02ACD7 */ jal free_weather_memory
/* 0AC0DC 800AB4DC AFB30024 */ sw $s3, 0x24($sp)
/* 0AC0E0 800AB4E0 3C028012 */ lui $v0, %hi(D_80127BB8) # $v0, 0x8012
/* 0AC0E4 800AB4E4 24427BB8 */ addiu $v0, %lo(D_80127BB8) # addiu $v0, $v0, 0x7bb8
asm/non_matchings/game_ui/func_800AC5A4.s
+2 -2
View File
@@ -26,8 +26,8 @@ glabel func_800AC5A4
/* 0AD204 800AC604 AEB80000 */ sw $t8, ($s5)
/* 0AD208 800AC608 0C01A76C */ jal func_80069DB0
/* 0AD20C 800AC60C AFA00034 */ sw $zero, 0x34($sp)
/* 0AD210 800AC610 3C108012 */ lui $s0, %hi(D_80127C0C) # $s0, 0x8012
/* 0AD214 800AC614 26107C0C */ addiu $s0, %lo(D_80127C0C) # addiu $s0, $s0, 0x7c0c
/* 0AD210 800AC610 3C108012 */ lui $s0, %hi(gWeatherDisplayListHead) # $s0, 0x8012
/* 0AD214 800AC614 26107C0C */ addiu $s0, %lo(gWeatherDisplayListHead) # addiu $s0, $s0, 0x7c0c
/* 0AD218 800AC618 8E030000 */ lw $v1, ($s0)
/* 0AD21C 800AC61C 3C0B8000 */ lui $t3, 0x8000
/* 0AD220 800AC620 246E0008 */ addiu $t6, $v1, 8
asm/non_matchings/game_ui/func_800ADCBC.s → asm/non_matchings/game_ui/render_rain_overlay.s
+7 -7
View File
@@ -1,4 +1,4 @@
glabel func_800ADCBC
glabel render_rain_overlay
/* 0AE8BC 800ADCBC 27BDFF60 */ addiu $sp, $sp, -0xa0
/* 0AE8C0 800ADCC0 AFBF0044 */ sw $ra, 0x44($sp)
/* 0AE8C4 800ADCC4 AFB30040 */ sw $s3, 0x40($sp)
@@ -65,8 +65,8 @@ glabel func_800ADCBC
/* 0AE9B8 800ADDB8 00117A03 */ sra $t7, $s1, 8
/* 0AE9BC 800ADDBC 01E08825 */ move $s1, $t7
/* 0AE9C0 800ADDC0 03120019 */ multu $t8, $s2
/* 0AE9C4 800ADDC4 3C0F800E */ lui $t7, %hi(D_800E2C60) # $t7, 0x800e
/* 0AE9C8 800ADDC8 8DEF2C60 */ lw $t7, %lo(D_800E2C60)($t7)
/* 0AE9C4 800ADDC4 3C0F800E */ lui $t7, %hi(gLightningFrequency) # $t7, 0x800e
/* 0AE9C8 800ADDC8 8DEF2C60 */ lw $t7, %lo(gLightningFrequency)($t7)
/* 0AE9CC 800ADDCC 00009012 */ mflo $s2
/* 0AE9D0 800ADDD0 0012CA03 */ sra $t9, $s2, 8
/* 0AE9D4 800ADDD4 03209025 */ move $s2, $t9
@@ -209,7 +209,7 @@ glabel func_800ADCBC
/* 0AEBF8 800ADFF8 440F5000 */ mfc1 $t7, $f10
/* 0AEBFC 800ADFFC 4600C102 */ mul.s $f4, $f24, $f0
/* 0AEC00 800AE000 A44F0016 */ sh $t7, 0x16($v0)
/* 0AEC04 800AE004 3C0F8012 */ lui $t7, %hi(D_80127C0C) # $t7, 0x8012
/* 0AEC04 800AE004 3C0F8012 */ lui $t7, %hi(gWeatherDisplayListHead) # $t7, 0x8012
/* 0AEC08 800AE008 4602D182 */ mul.s $f6, $f26, $f2
/* 0AEC0C 800AE00C 46062201 */ sub.s $f8, $f4, $f6
/* 0AEC10 800AE010 4458F800 */ cfc1 $t8, $31
@@ -239,7 +239,7 @@ glabel func_800ADCBC
/* 0AEC70 800AE070 440E5000 */ mfc1 $t6, $f10
/* 0AEC74 800AE074 44D9F800 */ ctc1 $t9, $31
/* 0AEC78 800AE078 A44E0020 */ sh $t6, 0x20($v0)
/* 0AEC7C 800AE07C 8DEF7C0C */ lw $t7, %lo(D_80127C0C)($t7)
/* 0AEC7C 800AE07C 8DEF7C0C */ lw $t7, %lo(gWeatherDisplayListHead)($t7)
/* 0AEC80 800AE080 8D820000 */ lw $v0, ($t4)
/* 0AEC84 800AE084 AFAF0068 */ sw $t7, 0x68($sp)
/* 0AEC88 800AE088 AC580000 */ sw $t8, ($v0)
@@ -317,7 +317,7 @@ glabel func_800ADCBC
/* 0AEDA8 800AE1A8 35AF0050 */ ori $t7, $t5, 0x50
/* 0AEDAC 800AE1AC ACAF0000 */ sw $t7, ($a1)
/* 0AEDB0 800AE1B0 8D380000 */ lw $t8, ($t1)
/* 0AEDB4 800AE1B4 3C018012 */ lui $at, %hi(D_80127C0C) # $at, 0x8012
/* 0AEDB4 800AE1B4 3C018012 */ lui $at, %hi(gWeatherDisplayListHead) # $at, 0x8012
/* 0AEDB8 800AE1B8 030A0019 */ multu $t8, $t2
/* 0AEDBC 800AE1BC 00007012 */ mflo $t6
/* 0AEDC0 800AE1C0 016EC821 */ addu $t9, $t3, $t6
@@ -344,7 +344,7 @@ glabel func_800ADCBC
/* 0AEE14 800AE214 272D0004 */ addiu $t5, $t9, 4
/* 0AEE18 800AE218 31AF000F */ andi $t7, $t5, 0xf
/* 0AEE1C 800AE21C AD2F0000 */ sw $t7, ($t1)
/* 0AEE20 800AE220 AC387C0C */ sw $t8, %lo(D_80127C0C)($at)
/* 0AEE20 800AE220 AC387C0C */ sw $t8, %lo(gWeatherDisplayListHead)($at)
/* 0AEE24 800AE224 AD820000 */ sw $v0, ($t4)
.L800AE228:
/* 0AEE28 800AE228 8FBF0044 */ lw $ra, 0x44($sp)
asm/non_matchings/game_ui/func_800AD658.s → asm/non_matchings/game_ui/render_rain_splashes.s
+11 -11
View File
@@ -1,7 +1,7 @@
glabel func_800AD658
glabel render_rain_splashes
/* 0AE258 800AD658 27BDFF80 */ addiu $sp, $sp, -0x80
/* 0AE25C 800AD65C 3C0E800E */ lui $t6, %hi(D_800E2C8C) # $t6, 0x800e
/* 0AE260 800AD660 8DCE2C8C */ lw $t6, %lo(D_800E2C8C)($t6)
/* 0AE25C 800AD65C 3C0E800E */ lui $t6, %hi(gRainSplashGfx) # $t6, 0x800e
/* 0AE260 800AD660 8DCE2C8C */ lw $t6, %lo(gRainSplashGfx)($t6)
/* 0AE264 800AD664 AFB20028 */ sw $s2, 0x28($sp)
/* 0AE268 800AD668 AFBF002C */ sw $ra, 0x2c($sp)
/* 0AE26C 800AD66C AFB10024 */ sw $s1, 0x24($sp)
@@ -11,8 +11,8 @@ glabel func_800AD658
/* 0AE27C 800AD67C 24120001 */ li $s2, 1
/* 0AE280 800AD680 3C0F800E */ lui $t7, %hi(D_800E2C6C) # $t7, 0x800e
/* 0AE284 800AD684 8DEF2C6C */ lw $t7, %lo(D_800E2C6C)($t7)
/* 0AE288 800AD688 3C19800E */ lui $t9, %hi(D_800E2C60) # $t9, 0x800e
/* 0AE28C 800AD68C 8F392C60 */ lw $t9, %lo(D_800E2C60)($t9)
/* 0AE288 800AD688 3C19800E */ lui $t9, %hi(gLightningFrequency) # $t9, 0x800e
/* 0AE28C 800AD68C 8F392C60 */ lw $t9, %lo(gLightningFrequency)($t9)
/* 0AE290 800AD690 000FC083 */ sra $t8, $t7, 2
/* 0AE294 800AD694 03190019 */ multu $t8, $t9
/* 0AE298 800AD698 00002025 */ move $a0, $zero
@@ -223,8 +223,8 @@ glabel func_800AD658
/* 0AE5A8 800AD9A8 AC800000 */ sw $zero, ($a0)
.L800AD9AC:
/* 0AE5AC 800AD9AC 3C10800E */ lui $s0, %hi(D_800E2B4C) # $s0, 0x800e
/* 0AE5B0 800AD9B0 3C118012 */ lui $s1, %hi(D_80127C0C) # $s1, 0x8012
/* 0AE5B4 800AD9B4 26317C0C */ addiu $s1, %lo(D_80127C0C) # addiu $s1, $s1, 0x7c0c
/* 0AE5B0 800AD9B0 3C118012 */ lui $s1, %hi(gWeatherDisplayListHead) # $s1, 0x8012
/* 0AE5B4 800AD9B4 26317C0C */ addiu $s1, %lo(gWeatherDisplayListHead) # addiu $s1, $s1, 0x7c0c
/* 0AE5B8 800AD9B8 26102B4C */ addiu $s0, %lo(D_800E2B4C) # addiu $s0, $s0, 0x2b4c
.L800AD9BC:
/* 0AE5BC 800AD9BC 86080006 */ lh $t0, 6($s0)
@@ -260,11 +260,11 @@ glabel func_800AD658
/* 0AE62C 800ADA2C AE390000 */ sw $t9, ($s1)
/* 0AE630 800ADA30 AC480000 */ sw $t0, ($v0)
/* 0AE634 800ADA34 860A001A */ lh $t2, 0x1a($s0)
/* 0AE638 800ADA38 3C0C800E */ lui $t4, %hi(D_800E2C8C) # $t4, 0x800e
/* 0AE638 800ADA38 3C0C800E */ lui $t4, %hi(gRainSplashGfx) # $t4, 0x800e
/* 0AE63C 800ADA3C 314900FF */ andi $t1, $t2, 0xff
/* 0AE640 800ADA40 01215825 */ or $t3, $t1, $at
/* 0AE644 800ADA44 AC4B0004 */ sw $t3, 4($v0)
/* 0AE648 800ADA48 8D8C2C8C */ lw $t4, %lo(D_800E2C8C)($t4)
/* 0AE648 800ADA48 8D8C2C8C */ lw $t4, %lo(gRainSplashGfx)($t4)
/* 0AE64C 800ADA4C 3C058012 */ lui $a1, %hi(D_80127C10) # $a1, 0x8012
/* 0AE650 800ADA50 3C068012 */ lui $a2, %hi(D_80127C14) # $a2, 0x8012
/* 0AE654 800ADA54 240D010E */ li $t5, 270
@@ -275,8 +275,8 @@ glabel func_800AD658
/* 0AE668 800ADA68 0C01A145 */ jal func_80068514
/* 0AE66C 800ADA6C AFAC0010 */ sw $t4, 0x10($sp)
.L800ADA70:
/* 0AE670 800ADA70 3C0E800E */ lui $t6, %hi(D_800E2C2C) # $t6, 0x800e
/* 0AE674 800ADA74 25CE2C2C */ addiu $t6, %lo(D_800E2C2C) # addiu $t6, $t6, 0x2c2c
/* 0AE670 800ADA70 3C0E800E */ lui $t6, %hi(gRainGfx) # $t6, 0x800e
/* 0AE674 800ADA74 25CE2C2C */ addiu $t6, %lo(gRainGfx) # addiu $t6, $t6, 0x2c2c
/* 0AE678 800ADA78 2610001C */ addiu $s0, $s0, 0x1c
/* 0AE67C 800ADA7C 160EFFCF */ bne $s0, $t6, .L800AD9BC
/* 0AE680 800ADA80 00000000 */ nop
asm/non_matchings/menu/tt_menu_loop.s
+4 -4
View File
@@ -156,7 +156,7 @@ glabel L8009DC60
/* 09E964 8009DD64 00000000 */ nop
/* 09E968 8009DD68 14400003 */ bnez $v0, .L8009DD78
/* 09E96C 8009DD6C 24040231 */ li $a0, 561
/* 09E970 8009DD70 0C00DAF3 */ jal func_80036BCC
/* 09E970 8009DD70 0C00DAF3 */ jal play_tt_voice_clip
/* 09E974 8009DD74 24050001 */ li $a1, 1
.L8009DD78:
/* 09E978 8009DD78 0C00392F */ jal set_time_trial_enabled
@@ -171,7 +171,7 @@ glabel L8009DC60
/* 09E998 8009DD98 24010001 */ li $at, 1
/* 09E99C 8009DD9C 14410003 */ bne $v0, $at, .L8009DDAC
/* 09E9A0 8009DDA0 24040230 */ li $a0, 560
/* 09E9A4 8009DDA4 0C00DAF3 */ jal func_80036BCC
/* 09E9A4 8009DDA4 0C00DAF3 */ jal play_tt_voice_clip
/* 09E9A8 8009DDA8 24050001 */ li $a1, 1
.L8009DDAC:
/* 09E9AC 8009DDAC 0C00392F */ jal set_time_trial_enabled
@@ -214,7 +214,7 @@ glabel L8009DC60
/* 09EA34 8009DE34 0C000741 */ jal play_sound_global
/* 09EA38 8009DE38 00002825 */ move $a1, $zero
/* 09EA3C 8009DE3C 2404022E */ li $a0, 558
/* 09EA40 8009DE40 0C00DAF3 */ jal func_80036BCC
/* 09EA40 8009DE40 0C00DAF3 */ jal play_tt_voice_clip
/* 09EA44 8009DE44 24050001 */ li $a1, 1
/* 09EA48 8009DE48 3C04800E */ lui $a0, %hi(D_800E1E2C) # $a0, 0x800e
/* 09EA4C 8009DE4C 0C02719D */ jal func_8009C674
@@ -328,7 +328,7 @@ glabel L8009DFB0
/* 09EBC8 8009DFC8 0C02712A */ jal func_8009C4A8
/* 09EBCC 8009DFCC 24841E2C */ addiu $a0, %lo(D_800E1E2C) # addiu $a0, $a0, 0x1e2c
/* 09EBD0 8009DFD0 2404022F */ li $a0, 559
/* 09EBD4 8009DFD4 0C00DAF3 */ jal func_80036BCC
/* 09EBD4 8009DFD4 0C00DAF3 */ jal play_tt_voice_clip
/* 09EBD8 8009DFD8 24050001 */ li $a1, 1
/* 09EBDC 8009DFDC 3C038012 */ lui $v1, %hi(sCurrentMenuID) # $v1, 0x8012
/* 09EBE0 8009DFE0 806364E2 */ lb $v1, %lo(sCurrentMenuID)($v1)
asm/non_matchings/objects/func_8000CC7C.s
+6 -6
View File
@@ -545,13 +545,13 @@ glabel func_8000CC7C
/* 00DFF8 8000D3F8 2419FFFF */ li $t9, -1
/* 00DFFC 8000D3FC 15C00004 */ bnez $t6, .L8000D410
/* 00E000 8000D400 3C038012 */ lui $v1, %hi(gObjectCount) # $v1, 0x8012
/* 00E004 8000D404 3C018012 */ lui $at, %hi(D_8011AE02) # $at, 0x8012
/* 00E004 8000D404 3C018012 */ lui $at, %hi(gIsNonCarRacers) # $at, 0x8012
/* 00E008 8000D408 10000004 */ b .L8000D41C
/* 00E00C 8000D40C A020AE02 */ sb $zero, %lo(D_8011AE02)($at)
/* 00E00C 8000D40C A020AE02 */ sb $zero, %lo(gIsNonCarRacers)($at)
.L8000D410:
/* 00E010 8000D410 240F0001 */ li $t7, 1
/* 00E014 8000D414 3C018012 */ lui $at, %hi(D_8011AE02) # $at, 0x8012
/* 00E018 8000D418 A02FAE02 */ sb $t7, %lo(D_8011AE02)($at)
/* 00E014 8000D414 3C018012 */ lui $at, %hi(gIsNonCarRacers) # $at, 0x8012
/* 00E018 8000D418 A02FAE02 */ sb $t7, %lo(gIsNonCarRacers)($at)
.L8000D41C:
/* 00E01C 8000D41C 8FB80078 */ lw $t8, 0x78($sp)
/* 00E020 8000D420 8C63AEF0 */ lw $v1, %lo(gObjectCount)($v1)
@@ -840,8 +840,8 @@ glabel func_8000CC7C
/* 00E424 8000D824 24010008 */ li $at, 8
/* 00E428 8000D828 14410002 */ bne $v0, $at, .L8000D834
.L8000D82C:
/* 00E42C 8000D82C 3C018012 */ lui $at, %hi(D_8011AE02) # $at, 0x8012
/* 00E430 8000D830 A02FAE02 */ sb $t7, %lo(D_8011AE02)($at)
/* 00E42C 8000D82C 3C018012 */ lui $at, %hi(gIsNonCarRacers) # $at, 0x8012
/* 00E430 8000D830 A02FAE02 */ sb $t7, %lo(gIsNonCarRacers)($at)
.L8000D834:
/* 00E434 8000D834 A27E01CB */ sb $fp, 0x1cb($s3)
/* 00E438 8000D838 826201CB */ lb $v0, 0x1cb($s3)
asm/non_matchings/objects/func_80016500.s
+1 -1
View File
@@ -114,7 +114,7 @@ glabel func_80016500
/* 0172A4 800166A4 240501C2 */ li $a1, 450
/* 0172A8 800166A8 8FA40040 */ lw $a0, 0x40($sp)
/* 0172AC 800166AC 24060008 */ li $a2, 8
/* 0172B0 800166B0 0C015C2E */ jal func_800570B8
/* 0172B0 800166B0 0C015C2E */ jal play_random_character_voice
/* 0172B4 800166B4 24070001 */ li $a3, 1
.L800166B8:
/* 0172B8 800166B8 C7A40030 */ lwc1 $f4, 0x30($sp)
asm/non_matchings/racer/func_80042D20.s
+4 -4
View File
@@ -178,7 +178,7 @@ glabel func_80042D20
/* 043B40 80042F40 AFAA0060 */ sw $t2, 0x60($sp)
/* 043B44 80042F44 AFAB0024 */ sw $t3, 0x24($sp)
/* 043B48 80042F48 A7AC0034 */ sh $t4, 0x34($sp)
/* 043B4C 80042F4C 0C015C2E */ jal func_800570B8
/* 043B4C 80042F4C 0C015C2E */ jal play_random_character_voice
/* 043B50 80042F50 A7AD0078 */ sh $t5, 0x78($sp)
/* 043B54 80042F54 87A80076 */ lh $t0, 0x76($sp)
/* 043B58 80042F58 8FAA0060 */ lw $t2, 0x60($sp)
@@ -213,7 +213,7 @@ glabel func_80042D20
/* 043BC4 80042FC4 A7A80076 */ sh $t0, 0x76($sp)
/* 043BC8 80042FC8 24050162 */ li $a1, 354
/* 043BCC 80042FCC 24060008 */ li $a2, 8
/* 043BD0 80042FD0 0C015C2E */ jal func_800570B8
/* 043BD0 80042FD0 0C015C2E */ jal play_random_character_voice
/* 043BD4 80042FD4 24070002 */ li $a3, 2
/* 043BD8 80042FD8 87A80076 */ lh $t0, 0x76($sp)
/* 043BDC 80042FDC 8FAA0060 */ lw $t2, 0x60($sp)
@@ -249,7 +249,7 @@ glabel func_80042D20
/* 043C4C 8004304C A7AD0078 */ sh $t5, 0x78($sp)
/* 043C50 80043050 A7AC0034 */ sh $t4, 0x34($sp)
/* 043C54 80043054 A7A80076 */ sh $t0, 0x76($sp)
/* 043C58 80043058 0C015C2E */ jal func_800570B8
/* 043C58 80043058 0C015C2E */ jal play_random_character_voice
/* 043C5C 8004305C 24070002 */ li $a3, 2
/* 043C60 80043060 87AF0070 */ lh $t7, 0x70($sp)
/* 043C64 80043064 87A80076 */ lh $t0, 0x76($sp)
@@ -262,7 +262,7 @@ glabel func_80042D20
/* 043C80 80043080 24070003 */ li $a3, 3
/* 043C84 80043084 A7A80076 */ sh $t0, 0x76($sp)
/* 043C88 80043088 A7AC0034 */ sh $t4, 0x34($sp)
/* 043C8C 8004308C 0C015C2E */ jal func_800570B8
/* 043C8C 8004308C 0C015C2E */ jal play_random_character_voice
/* 043C90 80043090 A7AD0078 */ sh $t5, 0x78($sp)
/* 043C94 80043094 87A80076 */ lh $t0, 0x76($sp)
/* 043C98 80043098 87AC0034 */ lh $t4, 0x34($sp)
asm/non_matchings/racer/func_80046524.s
+2 -2
View File
@@ -469,7 +469,7 @@ glabel func_80046524
/* 047728 80046B28 02202025 */ move $a0, $s1
/* 04772C 80046B2C 24050162 */ li $a1, 354
/* 047730 80046B30 24060008 */ li $a2, 8
/* 047734 80046B34 0C015C2E */ jal func_800570B8
/* 047734 80046B34 0C015C2E */ jal play_random_character_voice
/* 047738 80046B38 24070082 */ li $a3, 130
.L80046B3C:
/* 04773C 80046B3C 0C00322D */ jal normalise_time
@@ -1280,7 +1280,7 @@ glabel func_80046524
/* 048304 80047704 02202025 */ move $a0, $s1
/* 048308 80047708 24050162 */ li $a1, 354
/* 04830C 8004770C 24060008 */ li $a2, 8
/* 048310 80047710 0C015C2E */ jal func_800570B8
/* 048310 80047710 0C015C2E */ jal play_random_character_voice
/* 048314 80047714 24070082 */ li $a3, 130
/* 048318 80047718 86040000 */ lh $a0, ($s0)
/* 04831C 8004771C 0C01C8D2 */ jal func_80072348
asm/non_matchings/racer/func_80048C7C.s
+1 -1
View File
@@ -48,7 +48,7 @@ glabel func_80048C7C
/* 0498F8 80048CF8 24060008 */ li $a2, 8
/* 0498FC 80048CFC 24070081 */ li $a3, 129
/* 049900 80048D00 A3A30027 */ sb $v1, 0x27($sp)
/* 049904 80048D04 0C015C2E */ jal func_800570B8
/* 049904 80048D04 0C015C2E */ jal play_random_character_voice
/* 049908 80048D08 AFA40028 */ sw $a0, 0x28($sp)
/* 04990C 80048D0C 82180187 */ lb $t8, 0x187($s0)
/* 049910 80048D10 83A30027 */ lb $v1, 0x27($sp)
asm/non_matchings/racer/func_80049794.s
+2 -2
View File
@@ -891,7 +891,7 @@ glabel func_80049794
/* 04AFD0 8004A3D0 02202025 */ move $a0, $s1
/* 04AFD4 8004A3D4 24050162 */ li $a1, 354
/* 04AFD8 8004A3D8 24060008 */ li $a2, 8
/* 04AFDC 8004A3DC 0C015C2E */ jal func_800570B8
/* 04AFDC 8004A3DC 0C015C2E */ jal play_random_character_voice
/* 04AFE0 8004A3E0 24070082 */ li $a3, 130
/* 04AFE4 8004A3E4 86040000 */ lh $a0, ($s0)
/* 04AFE8 8004A3E8 0C01C8D2 */ jal func_80072348
@@ -1152,7 +1152,7 @@ glabel func_80049794
/* 04B398 8004A798 02202025 */ move $a0, $s1
/* 04B39C 8004A79C 24050162 */ li $a1, 354
/* 04B3A0 8004A7A0 24060008 */ li $a2, 8
/* 04B3A4 8004A7A4 0C015C2E */ jal func_800570B8
/* 04B3A4 8004A7A4 0C015C2E */ jal play_random_character_voice
/* 04B3A8 8004A7A8 24070082 */ li $a3, 130
/* 04B3AC 8004A7AC C7AE00DC */ lwc1 $f14, 0xdc($sp)
/* 04B3B0 8004A7B0 00000000 */ nop
asm/non_matchings/racer/func_80050A28.s
+1 -1
View File
@@ -1073,7 +1073,7 @@ glabel func_80050A28
/* 052508 80051908 8FA40078 */ lw $a0, 0x78($sp)
/* 05250C 8005190C 24050162 */ li $a1, 354
/* 052510 80051910 24060008 */ li $a2, 8
/* 052514 80051914 0C015C2E */ jal func_800570B8
/* 052514 80051914 0C015C2E */ jal play_random_character_voice
/* 052518 80051918 24070082 */ li $a3, 130
/* 05251C 8005191C 821801D8 */ lb $t8, 0x1d8($s0)
/* 052520 80051920 8FA90064 */ lw $t1, 0x64($sp)
asm/non_matchings/racer/func_80053E9C.s
+1 -1
View File
@@ -90,7 +90,7 @@ glabel func_80053E9C
/* 054BAC 80053FAC 10200054 */ beqz $at, .L80054100
/* 054BB0 80053FB0 24060008 */ li $a2, 8
/* 054BB4 80053FB4 24070081 */ li $a3, 129
/* 054BB8 80053FB8 0C015C2E */ jal func_800570B8
/* 054BB8 80053FB8 0C015C2E */ jal play_random_character_voice
/* 054BBC 80053FBC AFA40028 */ sw $a0, 0x28($sp)
/* 054BC0 80053FC0 820E0187 */ lb $t6, 0x187($s0)
/* 054BC4 80053FC4 8FA40028 */ lw $a0, 0x28($sp)
asm/non_matchings/racer/func_80054FD0.s
+1 -1
View File
@@ -343,7 +343,7 @@ glabel func_80054FD0
/* 0560DC 800554DC 240501C2 */ li $a1, 450
/* 0560E0 800554E0 24060008 */ li $a2, 8
/* 0560E4 800554E4 24070082 */ li $a3, 130
/* 0560E8 800554E8 0C015C2E */ jal func_800570B8
/* 0560E8 800554E8 0C015C2E */ jal play_random_character_voice
/* 0560EC 800554EC AFA9018C */ sw $t1, 0x18c($sp)
/* 0560F0 800554F0 02202025 */ move $a0, $s1
/* 0560F4 800554F4 0C015C12 */ jal racer_play_sound
asm/non_matchings/racer/func_80055EC0.s
+1 -1
View File
@@ -536,7 +536,7 @@ glabel L80056620
/* 05723C 8005663C AFA20074 */ sw $v0, 0x74($sp)
/* 057240 80056640 AFA8007C */ sw $t0, 0x7c($sp)
/* 057244 80056644 AFAA006C */ sw $t2, 0x6c($sp)
/* 057248 80056648 0C015C2E */ jal func_800570B8
/* 057248 80056648 0C015C2E */ jal play_random_character_voice
/* 05724C 8005664C E7A00058 */ swc1 $f0, 0x58($sp)
/* 057250 80056650 C60A0038 */ lwc1 $f10, 0x38($s0)
/* 057254 80056654 C7B20064 */ lwc1 $f18, 0x64($sp)
asm/non_matchings/unknown_0255E0/func_80024D54.s
+1 -1
View File
@@ -330,7 +330,7 @@ glabel func_80024D54
/* 025E24 80025224 24E7B0AC */ addiu $a3, %lo(D_8011B0AC) # addiu $a3, $a3, -0x4f54
/* 025E28 80025228 24C6B0A8 */ addiu $a2, %lo(D_8011B0A8) # addiu $a2, $a2, -0x4f58
/* 025E2C 8002522C 02402825 */ move $a1, $s2
/* 025E30 80025230 0C02AF9A */ jal func_800ABE68
/* 025E30 80025230 0C02AF9A */ jal process_weather
/* 025E34 80025234 AFAF0010 */ sw $t7, 0x10($sp)
.L80025238:
/* 025E38 80025238 0C01A748 */ jal func_80069D20
asm/non_matchings/unknown_032760/obj_loop_parkwarden.s
+5 -5
View File
@@ -517,7 +517,7 @@ glabel L80039978
/* 03A648 80039A48 AE070078 */ sw $a3, 0x78($s0)
/* 03A64C 80039A4C E62A0004 */ swc1 $f10, 4($s1)
/* 03A650 80039A50 9484D4E2 */ lhu $a0, %lo(D_8011D4E2)($a0)
/* 03A654 80039A54 0C00EB0F */ jal func_8003AC3C
/* 03A654 80039A54 0C00EB0F */ jal play_taj_voice_clip
/* 03A658 80039A58 24050001 */ li $a1, 1
/* 03A65C 80039A5C 2418010F */ li $t8, 271
/* 03A660 80039A60 3C018012 */ lui $at, %hi(D_8011D4E2) # $at, 0x8012
@@ -645,7 +645,7 @@ glabel L80039BB8
/* 03A81C 80039C1C E62A0004 */ swc1 $f10, 4($s1)
/* 03A820 80039C20 A20F003B */ sb $t7, 0x3b($s0)
/* 03A824 80039C24 A620001C */ sh $zero, 0x1c($s1)
/* 03A828 80039C28 0C00EB0F */ jal func_8003AC3C
/* 03A828 80039C28 0C00EB0F */ jal play_taj_voice_clip
/* 03A82C 80039C2C 24050001 */ li $a1, 1
/* 03A830 80039C30 86380020 */ lh $t8, 0x20($s1)
/* 03A834 80039C34 92250011 */ lbu $a1, 0x11($s1)
@@ -699,7 +699,7 @@ glabel L80039BB8
/* 03A8F0 80039CF0 00000000 */ nop
/* 03A8F4 80039CF4 24840235 */ addiu $a0, $a0, 0x235
/* 03A8F8 80039CF8 3089FFFF */ andi $t1, $a0, 0xffff
/* 03A8FC 80039CFC 0C00EB0F */ jal func_8003AC3C
/* 03A8FC 80039CFC 0C00EB0F */ jal play_taj_voice_clip
/* 03A900 80039D00 01202025 */ move $a0, $t1
/* 03A904 80039D04 8FA6007C */ lw $a2, 0x7c($sp)
/* 03A908 80039D08 10000005 */ b .L80039D20
@@ -734,7 +734,7 @@ glabel L80039BB8
/* 03A974 80039D74 00000000 */ nop
/* 03A978 80039D78 24840235 */ addiu $a0, %lo(gGameSelectTextElemsNoAdv2+157) # addiu $a0, $a0, 0x235
/* 03A97C 80039D7C 3099FFFF */ andi $t9, $a0, 0xffff
/* 03A980 80039D80 0C00EB0F */ jal func_8003AC3C
/* 03A980 80039D80 0C00EB0F */ jal play_taj_voice_clip
/* 03A984 80039D84 03202025 */ move $a0, $t9
/* 03A988 80039D88 1000035E */ b .L8003AB04
/* 03A98C 80039D8C C7B00098 */ lwc1 $f16, 0x98($sp)
@@ -745,7 +745,7 @@ glabel L80039BB8
/* 03A99C 80039D9C 0C030076 */ jal func_800C01D8
/* 03A9A0 80039DA0 2484C978 */ addiu $a0, $a0, -0x3688
/* 03A9A4 80039DA4 24040110 */ li $a0, 272
/* 03A9A8 80039DA8 0C00EB0F */ jal func_8003AC3C
/* 03A9A8 80039DA8 0C00EB0F */ jal play_taj_voice_clip
/* 03A9AC 80039DAC 24050001 */ li $a1, 1
/* 03A9B0 80039DB0 44803000 */ mtc1 $zero, $f6
/* 03A9B4 80039DB4 00000000 */ nop
asm/non_matchings/unknown_032760/obj_loop_stopwatchman.s
+3 -3
View File
@@ -431,7 +431,7 @@ glabel obj_loop_stopwatchman
/* 037400 80036800 24090003 */ li $t1, 3
/* 037404 80036804 AE090078 */ sw $t1, 0x78($s0)
/* 037408 80036808 24040141 */ li $a0, 321
/* 03740C 8003680C 0C00DAF3 */ jal func_80036BCC
/* 03740C 8003680C 0C00DAF3 */ jal play_tt_voice_clip
/* 037410 80036810 24050001 */ li $a1, 1
/* 037414 80036814 C7A2007C */ lwc1 $f2, 0x7c($sp)
/* 037418 80036818 00000000 */ nop
@@ -484,12 +484,12 @@ glabel obj_loop_stopwatchman
/* 0374CC 800368CC 10400006 */ beqz $v0, .L800368E8
/* 0374D0 800368D0 24040143 */ li $a0, 323
/* 0374D4 800368D4 24040142 */ li $a0, 322
/* 0374D8 800368D8 0C00DAF3 */ jal func_80036BCC
/* 0374D8 800368D8 0C00DAF3 */ jal play_tt_voice_clip
/* 0374DC 800368DC 24050001 */ li $a1, 1
/* 0374E0 800368E0 10000004 */ b .L800368F4
/* 0374E4 800368E4 862C0020 */ lh $t4, 0x20($s1)
.L800368E8:
/* 0374E8 800368E8 0C00DAF3 */ jal func_80036BCC
/* 0374E8 800368E8 0C00DAF3 */ jal play_tt_voice_clip
/* 0374EC 800368EC 24050001 */ li $a1, 1
/* 0374F0 800368F0 862C0020 */ lh $t4, 0x20($s1)
.L800368F4:

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