mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-09-03 01:43:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some more bin2c calls from the Makefile (#286)

Browse Source 
* Remove some bin2c calls from the Makefile

* Found a way to make n64graphics use shared tluts

* Added an option that makes n64graphics operate in a mode where it
 takes an image and tlut (as pngs) and spits out the appropriate
 CI8 indices inc.c form

* Turns out all the TLUTs for Lakitu are kept in one place, far away
 from the textures that use them

* Names some textures and tluts

* Pretty helpful actually, helped identify where a few different
 objects types are initialized. Should be a little useful to
 whoever dives into the object stuff more deeply

* Minor cleanup in n64graphics

* Added some comments, gave more appropriate names to some
 variables.

* Leaving the new mode argument as `-Z` for now

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

* Textures compile using makefile rules

* Patched n64 graphics memory leak and ci output

* Added memset16safe to initialize ci palettes to magic numbers (transparent pixels).

---------

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
Tyler McGavran
2023-02-07 00:52:34 -05:00
committed by GitHub
parent 533d035875
commit 3a99685c2f
39 changed files with 1442 additions and 1564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/code_800431B0/func_8004FDB4.s
+2 -2
View File
@@ -42,8 +42,8 @@ glabel func_8004FDB4
/* 050A54 8004FE54 0C012CD7 */ jal func_8004B35C
/* 050A58 8004FE58 240600FF */ li $a2, 255
/* 050A5C 8004FE5C 8E300000 */ lw $s0, ($s1)
/* 050A60 8004FE60 3C0C0D02 */ lui $t4, %hi(gTLUTPortraitMiniBombKart) # $t4, 0xd02
/* 050A64 8004FE64 258CB4D8 */ addiu $t4, %lo(gTLUTPortraitMiniBombKart) # addiu $t4, $t4, -0x4b28
/* 050A60 8004FE60 3C0C0D02 */ lui $t4, %hi(gTLUTPortraitBombKartAndQuestionMark) # $t4, 0xd02
/* 050A64 8004FE64 258CB4D8 */ addiu $t4, %lo(gTLUTPortraitBombKartAndQuestionMark) # addiu $t4, $t4, -0x4b28
/* 050A68 8004FE68 26180008 */ addiu $t8, $s0, 8
/* 050A6C 8004FE6C AE380000 */ sw $t8, ($s1)
/* 050A70 8004FE70 3C19FD10 */ lui $t9, 0xfd10
asm/non_matchings/code_800431B0/func_80050C68.s
+4 -4
View File
@@ -28,10 +28,10 @@ glabel func_80050C68
/* 0518CC 80050CCC 10400048 */ beqz $v0, .L80050DF0
/* 0518D0 80050CD0 3224FFFF */ andi $a0, $s1, 0xffff
/* 0518D4 80050CD4 3C130D00 */ lui $s3, %hi(D_0D007DB8) # $s3, 0xd00
/* 0518D8 80050CD8 3C140D02 */ lui $s4, %hi(gTLUTPortraitMiniBombKart) # $s4, 0xd02
/* 0518D8 80050CD8 3C140D02 */ lui $s4, %hi(gTLUTPortraitBombKartAndQuestionMark) # $s4, 0xd02
/* 0518DC 80050CDC 3C150D00 */ lui $s5, %hi(D_0D0069E0) # $s5, 0xd00
/* 0518E0 80050CE0 26B569E0 */ addiu $s5, %lo(D_0D0069E0) # addiu $s5, $s5, 0x69e0
/* 0518E4 80050CE4 2694B4D8 */ addiu $s4, %lo(gTLUTPortraitMiniBombKart) # addiu $s4, $s4, -0x4b28
/* 0518E4 80050CE4 2694B4D8 */ addiu $s4, %lo(gTLUTPortraitBombKartAndQuestionMark) # addiu $s4, $s4, -0x4b28
/* 0518E8 80050CE8 26737DB8 */ addiu $s3, %lo(D_0D007DB8) # addiu $s3, $s3, 0x7db8
/* 0518EC 80050CEC 03C02825 */ move $a1, $fp
/* 0518F0 80050CF0 0C0141F6 */ jal func_800507D8
@@ -44,8 +44,8 @@ glabel func_80050C68
/* 05190C 80050D0C AC530004 */ sw $s3, 4($v0)
/* 051910 80050D10 AC560000 */ sw $s6, ($v0)
/* 051914 80050D14 8E020000 */ lw $v0, ($s0)
/* 051918 80050D18 3C040D02 */ lui $a0, %hi(gTexturePortraitMiniBombKart) # $a0, 0xd02
/* 05191C 80050D1C 2484D6D8 */ addiu $a0, %lo(gTexturePortraitMiniBombKart) # addiu $a0, $a0, -0x2928
/* 051918 80050D18 3C040D02 */ lui $a0, %hi(gTexturePortraitBombKartAndQuestionMark) # $a0, 0xd02
/* 05191C 80050D1C 2484D6D8 */ addiu $a0, %lo(gTexturePortraitBombKartAndQuestionMark) # addiu $a0, $a0, -0x2928
/* 051920 80050D20 244F0008 */ addiu $t7, $v0, 8
/* 051924 80050D24 AE0F0000 */ sw $t7, ($s0)
/* 051928 80050D28 AC540004 */ sw $s4, 4($v0)
asm/non_matchings/code_800431B0/func_80050E34.s
+2 -2
View File
@@ -72,8 +72,8 @@ glabel func_80050E34
/* 051B38 80050F38 AC580000 */ sw $t8, ($v0)
/* 051B3C 80050F3C AC590004 */ sw $t9, 4($v0)
/* 051B40 80050F40 8E020000 */ lw $v0, ($s0)
/* 051B44 80050F44 3C180D02 */ lui $t8, %hi(gTLUTPortraitMiniBombKart) # $t8, 0xd02
/* 051B48 80050F48 2718B4D8 */ addiu $t8, %lo(gTLUTPortraitMiniBombKart) # addiu $t8, $t8, -0x4b28
/* 051B44 80050F44 3C180D02 */ lui $t8, %hi(gTLUTPortraitBombKartAndQuestionMark) # $t8, 0xd02
/* 051B48 80050F48 2718B4D8 */ addiu $t8, %lo(gTLUTPortraitBombKartAndQuestionMark) # addiu $t8, $t8, -0x4b28
/* 051B4C 80050F4C 244E0008 */ addiu $t6, $v0, 8
/* 051B50 80050F50 AE0E0000 */ sw $t6, ($s0)
/* 051B54 80050F54 3C0FFD10 */ lui $t7, 0xfd10
asm/non_matchings/code_80057C60/func_80059560.s
+4 -4
View File
@@ -56,12 +56,12 @@ glabel func_80059560
/* 05A234 80059634 00003025 */ move $a2, $zero
/* 05A238 80059638 3C073F80 */ lui $a3, 0x3f80
/* 05A23C 8005963C 11200014 */ beqz $t1, .L80059690
/* 05A240 80059640 3C0A0D02 */ lui $t2, %hi(gTLUTPortraitMiniBombKart) # $t2, 0xd02
/* 05A244 80059644 3C0B0D02 */ lui $t3, %hi(gTexturePortraitMiniBombKart) # $t3, 0xd02
/* 05A240 80059640 3C0A0D02 */ lui $t2, %hi(gTLUTPortraitBombKartAndQuestionMark) # $t2, 0xd02
/* 05A244 80059644 3C0B0D02 */ lui $t3, %hi(gTexturePortraitBombKartAndQuestionMark) # $t3, 0xd02
/* 05A248 80059648 3C0C0D00 */ lui $t4, %hi(D_0D005AE0) # $t4, 0xd00
/* 05A24C 8005964C 258C5AE0 */ addiu $t4, %lo(D_0D005AE0) # addiu $t4, $t4, 0x5ae0
/* 05A250 80059650 256BD6D8 */ addiu $t3, %lo(gTexturePortraitMiniBombKart) # addiu $t3, $t3, -0x2928
/* 05A254 80059654 254AB4D8 */ addiu $t2, %lo(gTLUTPortraitMiniBombKart) # addiu $t2, $t2, -0x4b28
/* 05A250 80059650 256BD6D8 */ addiu $t3, %lo(gTexturePortraitBombKartAndQuestionMark) # addiu $t3, $t3, -0x2928
/* 05A254 80059654 254AB4D8 */ addiu $t2, %lo(gTLUTPortraitBombKartAndQuestionMark) # addiu $t2, $t2, -0x4b28
/* 05A258 80059658 240D0020 */ li $t5, 32
/* 05A25C 8005965C 240E0020 */ li $t6, 32
/* 05A260 80059660 240F0020 */ li $t7, 32
asm/non_matchings/code_8006E9C0/func_80070780.s
+2 -2
View File
@@ -222,12 +222,12 @@ glabel L80070AA8
/* 0716B8 80070AB8 11410251 */ beq $t2, $at, .L80071400
/* 0716BC 80070ABC 26313EA0 */ addiu $s1, %lo(D_80183EA0) # addiu $s1, $s1, 0x3ea0
/* 0716C0 80070AC0 8E300000 */ lw $s0, ($s1)
/* 0716C4 80070AC4 3C050600 */ lui $a1, %hi(D_06007BB8) # $a1, 0x600
/* 0716C4 80070AC4 3C050600 */ lui $a1, %hi(gTLUTBat) # $a1, 0x600
/* 0716C8 80070AC8 3C060600 */ lui $a2, %hi(D_06007DB8) # $a2, 0x600
/* 0716CC 80070ACC 240B0040 */ li $t3, 64
/* 0716D0 80070AD0 AFAB0010 */ sw $t3, 0x10($sp)
/* 0716D4 80070AD4 24C67DB8 */ addiu $a2, %lo(D_06007DB8) # addiu $a2, $a2, 0x7db8
/* 0716D8 80070AD8 24A57BB8 */ addiu $a1, %lo(D_06007BB8) # addiu $a1, $a1, 0x7bb8
/* 0716D8 80070AD8 24A57BB8 */ addiu $a1, %lo(gTLUTBat) # addiu $a1, $a1, 0x7bb8
/* 0716DC 80070ADC 24070020 */ li $a3, 32
/* 0716E0 80070AE0 0C01CD11 */ jal func_80073444
/* 0716E4 80070AE4 02002025 */ move $a0, $s0
asm/non_matchings/code_80071F00/func_800792D8.s
+2 -2
View File
@@ -8,12 +8,12 @@ glabel func_800792D8
/* 079EF0 800792F0 3C018019 */ lui $at, %hi(D_8018D168) # $at, 0x8019
/* 079EF4 800792F4 AC20D168 */ sw $zero, %lo(D_8018D168)($at)
.L800792F8:
/* 079EF8 800792F8 3C050D02 */ lui $a1, %hi(D_0D024ED8) # $a1, 0xd02
/* 079EF8 800792F8 3C050D02 */ lui $a1, %hi(gTLUTLakituCountdown) # $a1, 0xd02
/* 079EFC 800792FC 3C060F06 */ lui $a2, %hi(D_0F05EB50) # $a2, 0xf06
/* 079F00 80079300 240E0048 */ li $t6, 72
/* 079F04 80079304 AFAE0010 */ sw $t6, 0x10($sp)
/* 079F08 80079308 24C6EB50 */ addiu $a2, %lo(D_0F05EB50) # addiu $a2, $a2, -0x14b0
/* 079F0C 8007930C 24A54ED8 */ addiu $a1, %lo(D_0D024ED8) # addiu $a1, $a1, 0x4ed8
/* 079F0C 8007930C 24A54ED8 */ addiu $a1, %lo(gTLUTLakituCountdown) # addiu $a1, $a1, 0x4ed8
/* 079F10 80079310 8FA40028 */ lw $a0, 0x28($sp)
/* 079F14 80079314 0C01CD11 */ jal func_80073444
/* 079F18 80079318 24070038 */ li $a3, 56
asm/non_matchings/code_80071F00/func_8007963C.s
+2 -2
View File
@@ -4,12 +4,12 @@ glabel func_8007963C
/* 07A244 80079644 AFB00020 */ sw $s0, 0x20($sp)
/* 07A248 80079648 0C01E47C */ jal func_800791F0
/* 07A24C 8007964C 00808025 */ move $s0, $a0
/* 07A250 80079650 3C050D02 */ lui $a1, %hi(D_0D0254D8) # $a1, 0xd02
/* 07A250 80079650 3C050D02 */ lui $a1, %hi(gTLUTLakituCheckeredFlag) # $a1, 0xd02
/* 07A254 80079654 3C060F08 */ lui $a2, %hi(D_0F07E350) # $a2, 0xf08
/* 07A258 80079658 240E0038 */ li $t6, 56
/* 07A25C 8007965C AFAE0010 */ sw $t6, 0x10($sp)
/* 07A260 80079660 24C6E350 */ addiu $a2, %lo(D_0F07E350) # addiu $a2, $a2, -0x1cb0
/* 07A264 80079664 24A554D8 */ addiu $a1, %lo(D_0D0254D8) # addiu $a1, $a1, 0x54d8
/* 07A264 80079664 24A554D8 */ addiu $a1, %lo(gTLUTLakituCheckeredFlag) # addiu $a1, $a1, 0x54d8
/* 07A268 80079668 02002025 */ move $a0, $s0
/* 07A26C 8007966C 0C01CD11 */ jal func_80073444
/* 07A270 80079670 24070048 */ li $a3, 72
asm/non_matchings/code_80071F00/func_800799A8.s
+2 -2
View File
@@ -5,12 +5,12 @@ glabel func_800799A8
/* 07A5B4 800799B4 00808025 */ move $s0, $a0
/* 07A5B8 800799B8 0C01E47C */ jal func_800791F0
/* 07A5BC 800799BC AFA5002C */ sw $a1, 0x2c($sp)
/* 07A5C0 800799C0 3C050D02 */ lui $a1, %hi(D_0D025CD8) # $a1, 0xd02
/* 07A5C0 800799C0 3C050D02 */ lui $a1, %hi(gTLUTLakituFishing) # $a1, 0xd02
/* 07A5C4 800799C4 3C060F0D */ lui $a2, %hi(D_0F0CCF50) # $a2, 0xf0d
/* 07A5C8 800799C8 240E0048 */ li $t6, 72
/* 07A5CC 800799CC AFAE0010 */ sw $t6, 0x10($sp)
/* 07A5D0 800799D0 24C6CF50 */ addiu $a2, %lo(D_0F0CCF50) # addiu $a2, $a2, -0x30b0
/* 07A5D4 800799D4 24A55CD8 */ addiu $a1, %lo(D_0D025CD8) # addiu $a1, $a1, 0x5cd8
/* 07A5D4 800799D4 24A55CD8 */ addiu $a1, %lo(gTLUTLakituFishing) # addiu $a1, $a1, 0x5cd8
/* 07A5D8 800799D8 02002025 */ move $a0, $s0
/* 07A5DC 800799DC 0C01CD11 */ jal func_80073444
/* 07A5E0 800799E0 24070038 */ li $a3, 56
asm/non_matchings/code_80071F00/func_8007A060.s
+2 -2
View File
@@ -4,12 +4,12 @@ glabel func_8007A060
/* 07AC68 8007A068 AFB00020 */ sw $s0, 0x20($sp)
/* 07AC6C 8007A06C 0C01E47C */ jal func_800791F0
/* 07AC70 8007A070 00808025 */ move $s0, $a0
/* 07AC74 8007A074 3C050D02 */ lui $a1, %hi(D_0D0256D8) # $a1, 0xd02
/* 07AC74 8007A074 3C050D02 */ lui $a1, %hi(gTLUTLakituSecondLap) # $a1, 0xd02
/* 07AC78 8007A078 3C060F0A */ lui $a2, %hi(D_0F09DB50) # $a2, 0xf0a
/* 07AC7C 8007A07C 240E0038 */ li $t6, 56
/* 07AC80 8007A080 AFAE0010 */ sw $t6, 0x10($sp)
/* 07AC84 8007A084 24C6DB50 */ addiu $a2, %lo(D_0F09DB50) # addiu $a2, $a2, -0x24b0
/* 07AC88 8007A088 24A556D8 */ addiu $a1, %lo(D_0D0256D8) # addiu $a1, $a1, 0x56d8
/* 07AC88 8007A088 24A556D8 */ addiu $a1, %lo(gTLUTLakituSecondLap) # addiu $a1, $a1, 0x56d8
/* 07AC8C 8007A08C 02002025 */ move $a0, $s0
/* 07AC90 8007A090 0C01CD11 */ jal func_80073444
/* 07AC94 8007A094 24070048 */ li $a3, 72
asm/non_matchings/code_80071F00/func_8007A228.s
+2 -2
View File
@@ -4,12 +4,12 @@ glabel func_8007A228
/* 07AE30 8007A230 AFB00020 */ sw $s0, 0x20($sp)
/* 07AE34 8007A234 0C01E47C */ jal func_800791F0
/* 07AE38 8007A238 00808025 */ move $s0, $a0
/* 07AE3C 8007A23C 3C050D02 */ lui $a1, %hi(D_0D0258D8) # $a1, 0xd02
/* 07AE3C 8007A23C 3C050D02 */ lui $a1, %hi(gTLUTLakituFinalLap) # $a1, 0xd02
/* 07AE40 8007A240 3C060F0B */ lui $a2, %hi(D_0F0AD750) # $a2, 0xf0b
/* 07AE44 8007A244 240E0038 */ li $t6, 56
/* 07AE48 8007A248 AFAE0010 */ sw $t6, 0x10($sp)
/* 07AE4C 8007A24C 24C6D750 */ addiu $a2, %lo(D_0F0AD750) # addiu $a2, $a2, -0x28b0
/* 07AE50 8007A250 24A558D8 */ addiu $a1, %lo(D_0D0258D8) # addiu $a1, $a1, 0x58d8
/* 07AE50 8007A250 24A558D8 */ addiu $a1, %lo(gTLUTLakituFinalLap) # addiu $a1, $a1, 0x58d8
/* 07AE54 8007A254 02002025 */ move $a0, $s0
/* 07AE58 8007A258 0C01CD11 */ jal func_80073444
/* 07AE5C 8007A25C 24070048 */ li $a3, 72
asm/non_matchings/code_80071F00/func_8007A3F0.s
+2 -2
View File
@@ -5,12 +5,12 @@ glabel func_8007A3F0
/* 07AFFC 8007A3FC 00808025 */ move $s0, $a0
/* 07B000 8007A400 0C01E47C */ jal func_800791F0
/* 07B004 8007A404 AFA50034 */ sw $a1, 0x34($sp)
/* 07B008 8007A408 3C050D02 */ lui $a1, %hi(D_0D025AD8) # $a1, 0xd02
/* 07B008 8007A408 3C050D02 */ lui $a1, %hi(gTLUTLakituReverse) # $a1, 0xd02
/* 07B00C 8007A40C 3C060F0C */ lui $a2, %hi(D_0F0BD350) # $a2, 0xf0c
/* 07B010 8007A410 240E0038 */ li $t6, 56
/* 07B014 8007A414 AFAE0010 */ sw $t6, 0x10($sp)
/* 07B018 8007A418 24C6D350 */ addiu $a2, %lo(D_0F0BD350) # addiu $a2, $a2, -0x2cb0
/* 07B01C 8007A41C 24A55AD8 */ addiu $a1, %lo(D_0D025AD8) # addiu $a1, $a1, 0x5ad8
/* 07B01C 8007A41C 24A55AD8 */ addiu $a1, %lo(gTLUTLakituReverse) # addiu $a1, $a1, 0x5ad8
/* 07B020 8007A420 02002025 */ move $a0, $s0
/* 07B024 8007A424 0C01CD11 */ jal func_80073444
/* 07B028 8007A428 24070048 */ li $a3, 72
asm/non_matchings/code_80071F00/func_8007C5B4.s
+2 -2
View File
@@ -2,14 +2,14 @@ glabel func_8007C5B4
/* 07D1B4 8007C5B4 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 07D1B8 8007C5B8 AFBF0024 */ sw $ra, 0x24($sp)
/* 07D1BC 8007C5BC AFB10020 */ sw $s1, 0x20($sp)
/* 07D1C0 8007C5C0 3C050600 */ lui $a1, %hi(D_06005C80) # $a1, 0x600
/* 07D1C0 8007C5C0 3C050600 */ lui $a1, %hi(gTLUTBoo) # $a1, 0x600
/* 07D1C4 8007C5C4 3C068016 */ lui $a2, %hi(D_80165880) # $a2, 0x8016
/* 07D1C8 8007C5C8 240E0028 */ li $t6, 40
/* 07D1CC 8007C5CC 00808825 */ move $s1, $a0
/* 07D1D0 8007C5D0 AFB0001C */ sw $s0, 0x1c($sp)
/* 07D1D4 8007C5D4 AFAE0010 */ sw $t6, 0x10($sp)
/* 07D1D8 8007C5D8 8CC65880 */ lw $a2, %lo(D_80165880)($a2)
/* 07D1DC 8007C5DC 24A55C80 */ addiu $a1, %lo(D_06005C80) # addiu $a1, $a1, 0x5c80
/* 07D1DC 8007C5DC 24A55C80 */ addiu $a1, %lo(gTLUTBoo) # addiu $a1, $a1, 0x5c80
/* 07D1E0 8007C5E0 0C01CD11 */ jal func_80073444
/* 07D1E4 8007C5E4 24070030 */ li $a3, 48
/* 07D1E8 8007C5E8 001178C0 */ sll $t7, $s1, 3
asm/non_matchings/code_80071F00/func_8007CE0C.s
+2 -2
View File
@@ -2,14 +2,14 @@ glabel func_8007CE0C
/* 07DA0C 8007CE0C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 07DA10 8007CE10 AFBF0024 */ sw $ra, 0x24($sp)
/* 07DA14 8007CE14 AFB10020 */ sw $s1, 0x20($sp)
/* 07DA18 8007CE18 3C050600 */ lui $a1, %hi(D_06005C80) # $a1, 0x600
/* 07DA18 8007CE18 3C050600 */ lui $a1, %hi(gTLUTBoo) # $a1, 0x600
/* 07DA1C 8007CE1C 3C060F0D */ lui $a2, %hi(D_0F0D0E50) # $a2, 0xf0d
/* 07DA20 8007CE20 240E0028 */ li $t6, 40
/* 07DA24 8007CE24 00808825 */ move $s1, $a0
/* 07DA28 8007CE28 AFB0001C */ sw $s0, 0x1c($sp)
/* 07DA2C 8007CE2C AFAE0010 */ sw $t6, 0x10($sp)
/* 07DA30 8007CE30 24C60E50 */ addiu $a2, %lo(D_0F0D0E50) # addiu $a2, $a2, 0xe50
/* 07DA34 8007CE34 24A55C80 */ addiu $a1, %lo(D_06005C80) # addiu $a1, $a1, 0x5c80
/* 07DA34 8007CE34 24A55C80 */ addiu $a1, %lo(gTLUTBoo) # addiu $a1, $a1, 0x5c80
/* 07DA38 8007CE38 0C01CD11 */ jal func_80073444
/* 07DA3C 8007CE3C 24070030 */ li $a3, 48
/* 07DA40 8007CE40 001178C0 */ sll $t7, $s1, 3
asm/non_matchings/code_80071F00/func_8007EC30.s
+2 -2
View File
@@ -44,12 +44,12 @@ glabel func_8007EC30
/* 07F8D4 8007ECD4 0C022E2F */ jal func_8008B8BC
/* 07F8D8 8007ECD8 00003825 */ move $a3, $zero
.L8007ECDC:
/* 07F8DC 8007ECDC 3C050600 */ lui $a1, %hi(D_06006F38) # $a1, 0x600
/* 07F8DC 8007ECDC 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600
/* 07F8E0 8007ECE0 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600
/* 07F8E4 8007ECE4 24190040 */ li $t9, 64
/* 07F8E8 8007ECE8 AFB90010 */ sw $t9, 0x10($sp)
/* 07F8EC 8007ECEC 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138
/* 07F8F0 8007ECF0 24A56F38 */ addiu $a1, %lo(D_06006F38) # addiu $a1, $a1, 0x6f38
/* 07F8F0 8007ECF0 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38
/* 07F8F4 8007ECF4 02002025 */ move $a0, $s0
/* 07F8F8 8007ECF8 0C01CD11 */ jal func_80073444
/* 07F8FC 8007ECFC 24070010 */ li $a3, 16
asm/non_matchings/code_80071F00/func_8007EE5C.s
+2 -2
View File
@@ -2,14 +2,14 @@ glabel func_8007EE5C
/* 07FA5C 8007EE5C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 07FA60 8007EE60 AFBF0024 */ sw $ra, 0x24($sp)
/* 07FA64 8007EE64 AFB10020 */ sw $s1, 0x20($sp)
/* 07FA68 8007EE68 3C050600 */ lui $a1, %hi(D_06006F38) # $a1, 0x600
/* 07FA68 8007EE68 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600
/* 07FA6C 8007EE6C 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600
/* 07FA70 8007EE70 240E0040 */ li $t6, 64
/* 07FA74 8007EE74 00808825 */ move $s1, $a0
/* 07FA78 8007EE78 AFB0001C */ sw $s0, 0x1c($sp)
/* 07FA7C 8007EE7C AFAE0010 */ sw $t6, 0x10($sp)
/* 07FA80 8007EE80 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138
/* 07FA84 8007EE84 24A56F38 */ addiu $a1, %lo(D_06006F38) # addiu $a1, $a1, 0x6f38
/* 07FA84 8007EE84 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38
/* 07FA88 8007EE88 0C01CD11 */ jal func_80073444
/* 07FA8C 8007EE8C 24070010 */ li $a3, 16
/* 07FA90 8007EE90 001178C0 */ sll $t7, $s1, 3
asm/non_matchings/code_80071F00/func_8007FA08.s
+2 -2
View File
@@ -2,7 +2,7 @@ glabel func_8007FA08
/* 080608 8007FA08 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 08060C 8007FA0C AFBF002C */ sw $ra, 0x2c($sp)
/* 080610 8007FA10 AFB10028 */ sw $s1, 0x28($sp)
/* 080614 8007FA14 3C050600 */ lui $a1, %hi(D_06006F38) # $a1, 0x600
/* 080614 8007FA14 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600
/* 080618 8007FA18 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600
/* 08061C 8007FA1C 240E0040 */ li $t6, 64
/* 080620 8007FA20 00808825 */ move $s1, $a0
@@ -10,7 +10,7 @@ glabel func_8007FA08
/* 080628 8007FA28 F7B40018 */ sdc1 $f20, 0x18($sp)
/* 08062C 8007FA2C AFAE0010 */ sw $t6, 0x10($sp)
/* 080630 8007FA30 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138
/* 080634 8007FA34 24A56F38 */ addiu $a1, %lo(D_06006F38) # addiu $a1, $a1, 0x6f38
/* 080634 8007FA34 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38
/* 080638 8007FA38 0C01CD11 */ jal func_80073444
/* 08063C 8007FA3C 24070010 */ li $a3, 16
/* 080640 8007FA40 001178C0 */ sll $t7, $s1, 3
asm/non_matchings/code_80071F00/func_80080078.s
+2 -2
View File
@@ -2,14 +2,14 @@ glabel func_80080078
/* 080C78 80080078 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 080C7C 8008007C AFBF0024 */ sw $ra, 0x24($sp)
/* 080C80 80080080 AFB10020 */ sw $s1, 0x20($sp)
/* 080C84 80080084 3C050600 */ lui $a1, %hi(D_06006F38) # $a1, 0x600
/* 080C84 80080084 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600
/* 080C88 80080088 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600
/* 080C8C 8008008C 240E0040 */ li $t6, 64
/* 080C90 80080090 00808825 */ move $s1, $a0
/* 080C94 80080094 AFB0001C */ sw $s0, 0x1c($sp)
/* 080C98 80080098 AFAE0010 */ sw $t6, 0x10($sp)
/* 080C9C 8008009C 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138
/* 080CA0 800800A0 24A56F38 */ addiu $a1, %lo(D_06006F38) # addiu $a1, $a1, 0x6f38
/* 080CA0 800800A0 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38
/* 080CA4 800800A4 0C01CD11 */ jal func_80073444
/* 080CA8 800800A8 24070010 */ li $a3, 16
/* 080CAC 800800AC 001178C0 */ sll $t7, $s1, 3
asm/non_matchings/code_80071F00/func_800802C0.s
+2 -2
View File
@@ -9,7 +9,7 @@ glabel func_800802C0
/* 080EDC 800802DC AFBF002C */ sw $ra, 0x2c($sp)
/* 080EE0 800802E0 AFB10028 */ sw $s1, 0x28($sp)
/* 080EE4 800802E4 01CF8021 */ addu $s0, $t6, $t7
/* 080EE8 800802E8 3C050600 */ lui $a1, %hi(D_06006F38) # $a1, 0x600
/* 080EE8 800802E8 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600
/* 080EEC 800802EC 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600
/* 080EF0 800802F0 24180040 */ li $t8, 64
/* 080EF4 800802F4 00808825 */ move $s1, $a0
@@ -17,7 +17,7 @@ glabel func_800802C0
/* 080EFC 800802FC A20000D8 */ sb $zero, 0xd8($s0)
/* 080F00 80080300 AFB80010 */ sw $t8, 0x10($sp)
/* 080F04 80080304 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138
/* 080F08 80080308 24A56F38 */ addiu $a1, %lo(D_06006F38) # addiu $a1, $a1, 0x6f38
/* 080F08 80080308 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38
/* 080F0C 8008030C 0C01CD11 */ jal func_80073444
/* 080F10 80080310 24070010 */ li $a3, 16
/* 080F14 80080314 3C013FC0 */ li $at, 0x3FC00000 # 1.500000
asm/non_matchings/code_80071F00/func_80080524.s
+2 -2
View File
@@ -2,14 +2,14 @@ glabel func_80080524
/* 081124 80080524 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 081128 80080528 AFBF0024 */ sw $ra, 0x24($sp)
/* 08112C 8008052C AFB10020 */ sw $s1, 0x20($sp)
/* 081130 80080530 3C050600 */ lui $a1, %hi(D_06006F38) # $a1, 0x600
/* 081130 80080530 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600
/* 081134 80080534 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600
/* 081138 80080538 240E0040 */ li $t6, 64
/* 08113C 8008053C 00808825 */ move $s1, $a0
/* 081140 80080540 AFB0001C */ sw $s0, 0x1c($sp)
/* 081144 80080544 AFAE0010 */ sw $t6, 0x10($sp)
/* 081148 80080548 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138
/* 08114C 8008054C 24A56F38 */ addiu $a1, %lo(D_06006F38) # addiu $a1, $a1, 0x6f38
/* 08114C 8008054C 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38
/* 081150 80080550 0C01CD11 */ jal func_80073444
/* 081154 80080554 24070010 */ li $a3, 16
/* 081158 80080558 001178C0 */ sll $t7, $s1, 3
asm/non_matchings/code_80071F00/func_80082A4C.s
+2 -2
View File
@@ -2,14 +2,14 @@ glabel func_80082A4C
/* 08364C 80082A4C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 083650 80082A50 AFBF0024 */ sw $ra, 0x24($sp)
/* 083654 80082A54 AFB0001C */ sw $s0, 0x1c($sp)
/* 083658 80082A58 3C050601 */ lui $a1, %hi(D_0600D628) # $a1, 0x601
/* 083658 80082A58 3C050601 */ lui $a1, %hi(gTLUTCrab) # $a1, 0x601
/* 08365C 80082A5C 3C060601 */ lui $a2, %hi(D_0600D828) # $a2, 0x601
/* 083660 80082A60 240E0040 */ li $t6, 64
/* 083664 80082A64 00808025 */ move $s0, $a0
/* 083668 80082A68 AFB10020 */ sw $s1, 0x20($sp)
/* 08366C 80082A6C AFAE0010 */ sw $t6, 0x10($sp)
/* 083670 80082A70 24C6D828 */ addiu $a2, %lo(D_0600D828) # addiu $a2, $a2, -0x27d8
/* 083674 80082A74 24A5D628 */ addiu $a1, %lo(D_0600D628) # addiu $a1, $a1, -0x29d8
/* 083674 80082A74 24A5D628 */ addiu $a1, %lo(gTLUTCrab) # addiu $a1, $a1, -0x29d8
/* 083678 80082A78 0C01CD11 */ jal func_80073444
/* 08367C 80082A7C 24070040 */ li $a3, 64
/* 083680 80082A80 001078C0 */ sll $t7, $s0, 3
asm/non_matchings/code_80071F00/func_8008311C.s
+8 -8
View File
@@ -3,14 +3,14 @@ glabel func_8008311C
/* 083D20 80083120 AFA5002C */ sw $a1, 0x2c($sp)
/* 083D24 80083124 AFBF0024 */ sw $ra, 0x24($sp)
/* 083D28 80083128 AFB10020 */ sw $s1, 0x20($sp)
/* 083D2C 8008312C 3C050601 */ lui $a1, %hi(D_06014908) # $a1, 0x601
/* 083D30 80083130 3C060601 */ lui $a2, %hi(D_06014B08) # $a2, 0x601
/* 083D2C 8008312C 3C050601 */ lui $a1, %hi(gTLUTHedgehog) # $a1, 0x601
/* 083D30 80083130 3C060601 */ lui $a2, %hi(gTextureHedgehog) # $a2, 0x601
/* 083D34 80083134 240E0040 */ li $t6, 64
/* 083D38 80083138 00808825 */ move $s1, $a0
/* 083D3C 8008313C AFB0001C */ sw $s0, 0x1c($sp)
/* 083D40 80083140 AFAE0010 */ sw $t6, 0x10($sp)
/* 083D44 80083144 24C64B08 */ addiu $a2, %lo(D_06014B08) # addiu $a2, $a2, 0x4b08
/* 083D48 80083148 24A54908 */ addiu $a1, %lo(D_06014908) # addiu $a1, $a1, 0x4908
/* 083D44 80083144 24C64B08 */ addiu $a2, %lo(gTextureHedgehog) # addiu $a2, $a2, 0x4b08
/* 083D48 80083148 24A54908 */ addiu $a1, %lo(gTLUTHedgehog) # addiu $a1, $a1, 0x4908
/* 083D4C 8008314C 0C01CD11 */ jal func_80073444
/* 083D50 80083150 24070040 */ li $a3, 64
/* 083D54 80083154 001178C0 */ sll $t7, $s1, 3
@@ -19,11 +19,11 @@ glabel func_8008311C
/* 083D60 80083160 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18
/* 083D64 80083164 000F7940 */ sll $t7, $t7, 5
/* 083D68 80083168 01F88021 */ addu $s0, $t7, $t8
/* 083D6C 8008316C 3C190601 */ lui $t9, %hi(D_06014908) # $t9, 0x601
/* 083D70 80083170 3C080601 */ lui $t0, %hi(D_06014B08) # $t0, 0x601
/* 083D6C 8008316C 3C190601 */ lui $t9, %hi(gTLUTHedgehog) # $t9, 0x601
/* 083D70 80083170 3C080601 */ lui $t0, %hi(gTextureHedgehog) # $t0, 0x601
/* 083D74 80083174 3C090D00 */ lui $t1, %hi(D_0D0060B0) # $t1, 0xd00
/* 083D78 80083178 27394908 */ addiu $t9, %lo(D_06014908) # addiu $t9, $t9, 0x4908
/* 083D7C 8008317C 25084B08 */ addiu $t0, %lo(D_06014B08) # addiu $t0, $t0, 0x4b08
/* 083D78 80083178 27394908 */ addiu $t9, %lo(gTLUTHedgehog) # addiu $t9, $t9, 0x4908
/* 083D7C 8008317C 25084B08 */ addiu $t0, %lo(gTextureHedgehog) # addiu $t0, $t0, 0x4b08
/* 083D80 80083180 252960B0 */ addiu $t1, %lo(D_0D0060B0) # addiu $t1, $t1, 0x60b0
/* 083D84 80083184 AE190060 */ sw $t9, 0x60($s0)
/* 083D88 80083188 AE080064 */ sw $t0, 0x64($s0)
asm/non_matchings/code_80071F00/func_80083868.s
+4 -4
View File
@@ -2,14 +2,14 @@ glabel func_80083868
/* 084468 80083868 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 08446C 8008386C AFBF0024 */ sw $ra, 0x24($sp)
/* 084470 80083870 AFB10020 */ sw $s1, 0x20($sp)
/* 084474 80083874 3C050600 */ lui $a1, %hi(D_06004B20) # $a1, 0x600
/* 084478 80083878 3C060600 */ lui $a2, %hi(D_06004D20) # $a2, 0x600
/* 084474 80083874 3C050600 */ lui $a1, %hi(gTLUTSnowman) # $a1, 0x600
/* 084478 80083878 3C060600 */ lui $a2, %hi(gTextureSnowmanHead) # $a2, 0x600
/* 08447C 8008387C 240E0040 */ li $t6, 64
/* 084480 80083880 00808825 */ move $s1, $a0
/* 084484 80083884 AFB0001C */ sw $s0, 0x1c($sp)
/* 084488 80083888 AFAE0010 */ sw $t6, 0x10($sp)
/* 08448C 8008388C 24C64D20 */ addiu $a2, %lo(D_06004D20) # addiu $a2, $a2, 0x4d20
/* 084490 80083890 24A54B20 */ addiu $a1, %lo(D_06004B20) # addiu $a1, $a1, 0x4b20
/* 08448C 8008388C 24C64D20 */ addiu $a2, %lo(gTextureSnowmanHead) # addiu $a2, $a2, 0x4d20
/* 084490 80083890 24A54B20 */ addiu $a1, %lo(gTLUTSnowman) # addiu $a1, $a1, 0x4b20
/* 084494 80083894 0C01CD11 */ jal func_80073444
/* 084498 80083898 24070040 */ li $a3, 64
/* 08449C 8008389C 001178C0 */ sll $t7, $s1, 3
asm/non_matchings/code_80071F00/func_80083B0C.s
+4 -4
View File
@@ -2,13 +2,13 @@ glabel func_80083B0C
/* 08470C 80083B0C 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 084710 80083B10 AFBF0024 */ sw $ra, 0x24($sp)
/* 084714 80083B14 AFB00020 */ sw $s0, 0x20($sp)
/* 084718 80083B18 3C050600 */ lui $a1, %hi(D_06004B20) # $a1, 0x600
/* 08471C 80083B1C 3C060600 */ lui $a2, %hi(D_06005D20) # $a2, 0x600
/* 084718 80083B18 3C050600 */ lui $a1, %hi(gTLUTSnowman) # $a1, 0x600
/* 08471C 80083B1C 3C060600 */ lui $a2, %hi(gTextureSnowmanBody) # $a2, 0x600
/* 084720 80083B20 240E0040 */ li $t6, 64
/* 084724 80083B24 00808025 */ move $s0, $a0
/* 084728 80083B28 AFAE0010 */ sw $t6, 0x10($sp)
/* 08472C 80083B2C 24C65D20 */ addiu $a2, %lo(D_06005D20) # addiu $a2, $a2, 0x5d20
/* 084730 80083B30 24A54B20 */ addiu $a1, %lo(D_06004B20) # addiu $a1, $a1, 0x4b20
/* 08472C 80083B2C 24C65D20 */ addiu $a2, %lo(gTextureSnowmanBody) # addiu $a2, $a2, 0x5d20
/* 084730 80083B30 24A54B20 */ addiu $a1, %lo(gTLUTSnowman) # addiu $a1, $a1, 0x4b20
/* 084734 80083B34 0C01CD11 */ jal func_80073444
/* 084738 80083B38 24070040 */ li $a3, 64
/* 08473C 80083B3C 001078C0 */ sll $t7, $s0, 3