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

Even more

Browse Source
This commit is contained in:
Fazana
2021-12-01 21:41:02 +00:00
parent b05c987373
commit e99577f179
24 changed files with 217 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/game_text/func_800C2B00.s
+6 -6
View File
@@ -25,7 +25,7 @@ glabel func_800C2B00
/* 0C375C 800C2B5C 86A50000 */ lh $a1, ($s5)
/* 0C3760 800C2B60 86C70000 */ lh $a3, ($s6)
/* 0C3764 800C2B64 24040006 */ li $a0, 6
/* 0C3768 800C2B68 0C0313B7 */ jal set_dialogue_box_coords
/* 0C3768 800C2B68 0C0313B7 */ jal set_current_dialogue_box_coords
/* 0C376C 800C2B6C AFAE0010 */ sw $t6, 0x10($sp)
/* 0C3770 800C2B70 3C178013 */ lui $s7, %hi(D_8012A7A8) # $s7, 0x8013
/* 0C3774 800C2B74 26F7A7A8 */ addiu $s7, %lo(D_8012A7A8) # addiu $s7, $s7, -0x5858
@@ -38,13 +38,13 @@ glabel func_800C2B00
/* 0C3790 800C2B90 AFB90010 */ sw $t9, 0x10($sp)
/* 0C3794 800C2B94 24050040 */ li $a1, 64
/* 0C3798 800C2B98 24060060 */ li $a2, 96
/* 0C379C 800C2B9C 0C0313EF */ jal func_800C4FBC
/* 0C379C 800C2B9C 0C0313EF */ jal set_current_dialogue_background_colour
/* 0C37A0 800C2BA0 24070060 */ li $a3, 96
/* 0C37A4 800C2BA4 24040006 */ li $a0, 6
/* 0C37A8 800C2BA8 00002825 */ move $a1, $zero
/* 0C37AC 800C2BAC 00003025 */ move $a2, $zero
/* 0C37B0 800C2BB0 00003825 */ move $a3, $zero
/* 0C37B4 800C2BB4 0C031414 */ jal func_800C5050
/* 0C37B4 800C2BB4 0C031414 */ jal set_current_text_background_colour
/* 0C37B8 800C2BB8 AFA00010 */ sw $zero, 0x10($sp)
/* 0C37BC 800C2BBC 3C1E8013 */ lui $fp, %hi(D_8012A7B8) # $fp, 0x8013
/* 0C37C0 800C2BC0 27DEA7B8 */ addiu $fp, %lo(D_8012A7B8) # addiu $fp, $fp, -0x5848
@@ -105,7 +105,7 @@ glabel func_800C2B00
/* 0C3890 800C2C90 018D0019 */ multu $t4, $t5
/* 0C3894 800C2C94 00007012 */ mflo $t6
/* 0C3898 800C2C98 000E7A03 */ sra $t7, $t6, 8
/* 0C389C 800C2C9C 0C031400 */ jal set_text_colour
/* 0C389C 800C2C9C 0C031400 */ jal set_current_text_colour
/* 0C38A0 800C2CA0 AFAF0014 */ sw $t7, 0x14($sp)
/* 0C38A4 800C2CA4 8E470000 */ lw $a3, ($s2)
/* 0C38A8 800C2CA8 24180001 */ li $t8, 1
@@ -126,7 +126,7 @@ glabel func_800C2B00
/* 0C38E4 800C2CE4 24040006 */ li $a0, 6
/* 0C38E8 800C2CE8 00002825 */ move $a1, $zero
/* 0C38EC 800C2CEC 00003025 */ move $a2, $zero
/* 0C38F0 800C2CF0 0C031400 */ jal set_text_colour
/* 0C38F0 800C2CF0 0C031400 */ jal set_current_text_colour
/* 0C38F4 800C2CF4 00003825 */ move $a3, $zero
/* 0C38F8 800C2CF8 8E470000 */ lw $a3, ($s2)
/* 0C38FC 800C2CFC 240B0001 */ li $t3, 1
@@ -144,7 +144,7 @@ glabel func_800C2B00
/* 0C392C 800C2D2C 1420FFB6 */ bnez $at, .L800C2C08
/* 0C3930 800C2D30 2673000E */ addiu $s3, $s3, 0xe
.L800C2D34:
/* 0C3934 800C2D34 0C03157D */ jal func_800C55F4
/* 0C3934 800C2D34 0C03157D */ jal open_dialogue_box
/* 0C3938 800C2D38 24040006 */ li $a0, 6
/* 0C393C 800C2D3C 8FBF0044 */ lw $ra, 0x44($sp)
/* 0C3940 800C2D40 8FB00020 */ lw $s0, 0x20($sp)
asm/non_matchings/game_text/func_800C3564.s
+3 -3
View File
@@ -31,7 +31,7 @@ glabel func_800C3564
/* 0C41D8 800C35D8 24040001 */ li $a0, 1
/* 0C41DC 800C35DC 2405000A */ li $a1, 10
/* 0C41E0 800C35E0 2406000F */ li $a2, 15
/* 0C41E4 800C35E4 0C0313B7 */ jal set_dialogue_box_coords
/* 0C41E4 800C35E4 0C0313B7 */ jal set_current_dialogue_box_coords
/* 0C41E8 800C35E8 240700B4 */ li $a3, 180
/* 0C41EC 800C35EC 8FA50040 */ lw $a1, 0x40($sp)
/* 0C41F0 800C35F0 0C0313DF */ jal set_dialogue_font
@@ -41,7 +41,7 @@ glabel func_800C3564
/* 0C4200 800C3600 24040001 */ li $a0, 1
/* 0C4204 800C3604 00002825 */ move $a1, $zero
/* 0C4208 800C3608 24060010 */ li $a2, 16
/* 0C420C 800C360C 0C0313EF */ jal func_800C4FBC
/* 0C420C 800C360C 0C0313EF */ jal set_current_dialogue_background_colour
/* 0C4210 800C3610 24070010 */ li $a3, 16
/* 0C4214 800C3614 8FAE0060 */ lw $t6, 0x60($sp)
/* 0C4218 800C3618 8FA50054 */ lw $a1, 0x54($sp)
@@ -50,7 +50,7 @@ glabel func_800C3564
/* 0C4224 800C3624 240F00FF */ li $t7, 255
/* 0C4228 800C3628 AFAF0014 */ sw $t7, 0x14($sp)
/* 0C422C 800C362C 24040001 */ li $a0, 1
/* 0C4230 800C3630 0C031400 */ jal set_text_colour
/* 0C4230 800C3630 0C031400 */ jal set_current_text_colour
/* 0C4234 800C3634 AFAE0010 */ sw $t6, 0x10($sp)
/* 0C4238 800C3638 3C048013 */ lui $a0, %hi(D_8012A78E) # $a0, 0x8013
/* 0C423C 800C363C 8484A78E */ lh $a0, %lo(D_8012A78E)($a0)
asm/non_matchings/game_text/func_800C38B4.s
+2 -2
View File
@@ -96,7 +96,7 @@ glabel L800C3984
/* 0C4604 800C3A04 26310005 */ addiu $s1, $s1, 5
/* 0C4608 800C3A08 01E2C021 */ addu $t8, $t7, $v0
/* 0C460C 800C3A0C AE580010 */ sw $t8, 0x10($s2)
/* 0C4610 800C3A10 0C0313B7 */ jal set_dialogue_box_coords
/* 0C4610 800C3A10 0C0313B7 */ jal set_current_dialogue_box_coords
/* 0C4614 800C3A14 AFB80010 */ sw $t8, 0x10($sp)
/* 0C4618 800C3A18 8E680000 */ lw $t0, ($s3)
/* 0C461C 800C3A1C 00000000 */ nop
@@ -127,7 +127,7 @@ glabel L800C3A30
/* 0C467C 800C3A7C 26310005 */ addiu $s1, $s1, 5
/* 0C4680 800C3A80 AE480020 */ sw $t0, 0x20($s2)
/* 0C4684 800C3A84 AFAA0014 */ sw $t2, 0x14($sp)
/* 0C4688 800C3A88 0C031400 */ jal set_text_colour
/* 0C4688 800C3A88 0C031400 */ jal set_current_text_colour
/* 0C468C 800C3A8C AFA80010 */ sw $t0, 0x10($sp)
/* 0C4690 800C3A90 8E6B0000 */ lw $t3, ($s3)
/* 0C4694 800C3A94 00000000 */ nop
asm/non_matchings/menu/func_80084854.s
+3 -3
View File
@@ -132,14 +132,14 @@ glabel func_80084854
/* 085640 80084A40 24040007 */ li $a0, 7
/* 085644 80084A44 00002825 */ move $a1, $zero
/* 085648 80084A48 00003025 */ move $a2, $zero
/* 08564C 80084A4C 0C0313EF */ jal func_800C4FBC
/* 08564C 80084A4C 0C0313EF */ jal set_current_dialogue_background_colour
/* 085650 80084A50 00003825 */ move $a3, $zero
/* 085654 80084A54 240B007B */ li $t3, 123
/* 085658 80084A58 AFAB0010 */ sw $t3, 0x10($sp)
/* 08565C 80084A5C 24040007 */ li $a0, 7
/* 085660 80084A60 2405005E */ li $a1, 94
/* 085664 80084A64 24060075 */ li $a2, 117
/* 085668 80084A68 0C0313B7 */ jal set_dialogue_box_coords
/* 085668 80084A68 0C0313B7 */ jal set_current_dialogue_box_coords
/* 08566C 80084A6C 240700E2 */ li $a3, 226
/* 085670 80084A70 02402025 */ move $a0, $s2
/* 085674 80084A74 00002825 */ move $a1, $zero
@@ -151,7 +151,7 @@ glabel func_80084854
/* 08568C 80084A8C 24040007 */ li $a0, 7
/* 085690 80084A90 2405005E */ li $a1, 94
/* 085694 80084A94 2406009D */ li $a2, 157
/* 085698 80084A98 0C0313B7 */ jal set_dialogue_box_coords
/* 085698 80084A98 0C0313B7 */ jal set_current_dialogue_box_coords
/* 08569C 80084A9C 240700E2 */ li $a3, 226
/* 0856A0 80084AA0 02402025 */ move $a0, $s2
/* 0856A4 80084AA4 00002825 */ move $a1, $zero
asm/non_matchings/menu/func_800871D8.s
+4 -4
View File
@@ -71,20 +71,20 @@ glabel func_800871D8
/* 087EDC 800872DC 01001025 */ move $v0, $t0
/* 087EE0 800872E0 24040007 */ li $a0, 7
/* 087EE4 800872E4 24050028 */ li $a1, 40
/* 087EE8 800872E8 0C0313B7 */ jal set_dialogue_box_coords
/* 087EE8 800872E8 0C0313B7 */ jal set_current_dialogue_box_coords
/* 087EEC 800872EC 24070118 */ li $a3, 280
/* 087EF0 800872F0 240B00A0 */ li $t3, 160
/* 087EF4 800872F4 AFAB0010 */ sw $t3, 0x10($sp)
/* 087EF8 800872F8 24040007 */ li $a0, 7
/* 087EFC 800872FC 00002825 */ move $a1, $zero
/* 087F00 80087300 00003025 */ move $a2, $zero
/* 087F04 80087304 0C0313EF */ jal func_800C4FBC
/* 087F04 80087304 0C0313EF */ jal set_current_dialogue_background_colour
/* 087F08 80087308 00003825 */ move $a3, $zero
/* 087F0C 8008730C 24040007 */ li $a0, 7
/* 087F10 80087310 00002825 */ move $a1, $zero
/* 087F14 80087314 00003025 */ move $a2, $zero
/* 087F18 80087318 00003825 */ move $a3, $zero
/* 087F1C 8008731C 0C031414 */ jal func_800C5050
/* 087F1C 8008731C 0C031414 */ jal set_current_text_background_colour
/* 087F20 80087320 AFA00010 */ sw $zero, 0x10($sp)
/* 087F24 80087324 24040007 */ li $a0, 7
/* 087F28 80087328 0C0313DF */ jal set_dialogue_font
@@ -95,7 +95,7 @@ glabel func_800871D8
/* 087F3C 8008733C 240500FF */ li $a1, 255
/* 087F40 80087340 240600FF */ li $a2, 255
/* 087F44 80087344 240700FF */ li $a3, 255
/* 087F48 80087348 0C031400 */ jal set_text_colour
/* 087F48 80087348 0C031400 */ jal set_current_text_colour
/* 087F4C 8008734C AFA00010 */ sw $zero, 0x10($sp)
/* 087F50 80087350 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e
/* 087F54 80087354 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0)
asm/non_matchings/menu/func_80088938.s
+17 -17
View File
@@ -84,7 +84,7 @@ glabel func_80088938
/* 089678 80088A78 24040006 */ li $a0, 6
/* 08967C 80088A7C 2405003A */ li $a1, 58
/* 089680 80088A80 02A03025 */ move $a2, $s5
/* 089684 80088A84 0C0313B7 */ jal set_dialogue_box_coords
/* 089684 80088A84 0C0313B7 */ jal set_current_dialogue_box_coords
/* 089688 80088A88 24070106 */ li $a3, 262
/* 08968C 80088A8C 3C0F800E */ lui $t7, %hi(D_800DF460) # $t7, 0x800e
/* 089690 80088A90 8DEFF460 */ lw $t7, %lo(D_800DF460)($t7)
@@ -96,7 +96,7 @@ glabel func_80088938
/* 0896A8 80088AA8 24040006 */ li $a0, 6
/* 0896AC 80088AAC 240500FF */ li $a1, 255
/* 0896B0 80088AB0 240600FF */ li $a2, 255
/* 0896B4 80088AB4 0C0313EF */ jal func_800C4FBC
/* 0896B4 80088AB4 0C0313EF */ jal set_current_dialogue_background_colour
/* 0896B8 80088AB8 240700FF */ li $a3, 255
/* 0896BC 80088ABC 10000009 */ b .L80088AE4
/* 0896C0 80088AC0 24040006 */ li $a0, 6
@@ -106,7 +106,7 @@ glabel func_80088938
/* 0896CC 80088ACC 24040006 */ li $a0, 6
/* 0896D0 80088AD0 24050060 */ li $a1, 96
/* 0896D4 80088AD4 240600C0 */ li $a2, 192
/* 0896D8 80088AD8 0C0313EF */ jal func_800C4FBC
/* 0896D8 80088AD8 0C0313EF */ jal set_current_dialogue_background_colour
/* 0896DC 80088ADC 2407005C */ li $a3, 92
/* 0896E0 80088AE0 24040006 */ li $a0, 6
.L80088AE4:
@@ -118,13 +118,13 @@ glabel func_80088938
/* 0896F8 80088AF8 240500FF */ li $a1, 255
/* 0896FC 80088AFC 240600FF */ li $a2, 255
/* 089700 80088B00 240700FF */ li $a3, 255
/* 089704 80088B04 0C031400 */ jal set_text_colour
/* 089704 80088B04 0C031400 */ jal set_current_text_colour
/* 089708 80088B08 AFA00010 */ sw $zero, 0x10($sp)
/* 08970C 80088B0C 24040006 */ li $a0, 6
/* 089710 80088B10 00002825 */ move $a1, $zero
/* 089714 80088B14 00003025 */ move $a2, $zero
/* 089718 80088B18 00003825 */ move $a3, $zero
/* 08971C 80088B1C 0C031414 */ jal func_800C5050
/* 08971C 80088B1C 0C031414 */ jal set_current_text_background_colour
/* 089720 80088B20 AFA00010 */ sw $zero, 0x10($sp)
/* 089724 80088B24 3C0B8012 */ lui $t3, %hi(D_80126A68) # $t3, 0x8012
/* 089728 80088B28 8D6B6A68 */ lw $t3, %lo(D_80126A68)($t3)
@@ -165,7 +165,7 @@ glabel func_80088938
/* 0897B4 80088BB4 00002825 */ move $a1, $zero
/* 0897B8 80088BB8 00003025 */ move $a2, $zero
/* 0897BC 80088BBC 00003825 */ move $a3, $zero
/* 0897C0 80088BC0 0C031414 */ jal func_800C5050
/* 0897C0 80088BC0 0C031414 */ jal set_current_text_background_colour
/* 0897C4 80088BC4 AFA00010 */ sw $zero, 0x10($sp)
/* 0897C8 80088BC8 3C028012 */ lui $v0, %hi(D_80126BB4) # $v0, 0x8012
/* 0897CC 80088BCC 8C426BB4 */ lw $v0, %lo(D_80126BB4)($v0)
@@ -180,7 +180,7 @@ glabel func_80088938
/* 0897EC 80088BEC 24040006 */ li $a0, 6
/* 0897F0 80088BF0 2405001C */ li $a1, 28
/* 0897F4 80088BF4 02A03025 */ move $a2, $s5
/* 0897F8 80088BF8 0C0313B7 */ jal set_dialogue_box_coords
/* 0897F8 80088BF8 0C0313B7 */ jal set_current_dialogue_box_coords
/* 0897FC 80088BFC 24070124 */ li $a3, 292
/* 089800 80088C00 0621001A */ bgez $s1, .L80088C6C
/* 089804 80088C04 3C0E800F */ lui $t6, %hi(D_800E820C) # $t6, 0x800f
@@ -190,7 +190,7 @@ glabel func_80088938
/* 089814 80088C14 240500E0 */ li $a1, 224
/* 089818 80088C18 24060030 */ li $a2, 48
/* 08981C 80088C1C 24070030 */ li $a3, 48
/* 089820 80088C20 0C0313EF */ jal func_800C4FBC
/* 089820 80088C20 0C0313EF */ jal set_current_dialogue_background_colour
/* 089824 80088C24 24130001 */ li $s3, 1
/* 089828 80088C28 240A00FF */ li $t2, 255
/* 08982C 80088C2C 240C00FF */ li $t4, 255
@@ -199,7 +199,7 @@ glabel func_80088938
/* 089838 80088C38 24040006 */ li $a0, 6
/* 08983C 80088C3C 240500E0 */ li $a1, 224
/* 089840 80088C40 240600E0 */ li $a2, 224
/* 089844 80088C44 0C031400 */ jal set_text_colour
/* 089844 80088C44 0C031400 */ jal set_current_text_colour
/* 089848 80088C48 24070030 */ li $a3, 48
/* 08984C 80088C4C 8EE20000 */ lw $v0, ($s7)
/* 089850 80088C50 3C0D8012 */ lui $t5, %hi(D_801263D8) # $t5, 0x8012
@@ -224,7 +224,7 @@ glabel func_80088938
/* 089898 80088C98 24040006 */ li $a0, 6
/* 08989C 80088C9C 240500FF */ li $a1, 255
/* 0898A0 80088CA0 240600FF */ li $a2, 255
/* 0898A4 80088CA4 0C0313EF */ jal func_800C4FBC
/* 0898A4 80088CA4 0C0313EF */ jal set_current_dialogue_background_colour
/* 0898A8 80088CA8 240700FF */ li $a3, 255
/* 0898AC 80088CAC 10000009 */ b .L80088CD4
/* 0898B0 80088CB0 240A00FF */ li $t2, 255
@@ -234,7 +234,7 @@ glabel func_80088938
/* 0898BC 80088CBC 24040006 */ li $a0, 6
/* 0898C0 80088CC0 240500E0 */ li $a1, 224
/* 0898C4 80088CC4 240600E0 */ li $a2, 224
/* 0898C8 80088CC8 0C0313EF */ jal func_800C4FBC
/* 0898C8 80088CC8 0C0313EF */ jal set_current_dialogue_background_colour
/* 0898CC 80088CCC 24070030 */ li $a3, 48
/* 0898D0 80088CD0 240A00FF */ li $t2, 255
.L80088CD4:
@@ -244,7 +244,7 @@ glabel func_80088938
/* 0898E0 80088CE0 24040006 */ li $a0, 6
/* 0898E4 80088CE4 24050010 */ li $a1, 16
/* 0898E8 80088CE8 24060010 */ li $a2, 16
/* 0898EC 80088CEC 0C031400 */ jal set_text_colour
/* 0898EC 80088CEC 0C031400 */ jal set_current_text_colour
/* 0898F0 80088CF0 240700A0 */ li $a3, 160
/* 0898F4 80088CF4 3C0D8012 */ lui $t5, %hi(D_801263D8) # $t5, 0x8012
/* 0898F8 80088CF8 8DAD63D8 */ lw $t5, %lo(D_801263D8)($t5)
@@ -387,14 +387,14 @@ glabel func_80088938
/* 089B00 80088F00 24040006 */ li $a0, 6
/* 089B04 80088F04 2405004C */ li $a1, 76
/* 089B08 80088F08 26A6FFE4 */ addiu $a2, $s5, -0x1c
/* 089B0C 80088F0C 0C0313B7 */ jal set_dialogue_box_coords
/* 089B0C 80088F0C 0C0313B7 */ jal set_current_dialogue_box_coords
/* 089B10 80088F10 240700F4 */ li $a3, 244
/* 089B14 80088F14 241800A0 */ li $t8, 160
/* 089B18 80088F18 AFB80010 */ sw $t8, 0x10($sp)
/* 089B1C 80088F1C 24040006 */ li $a0, 6
/* 089B20 80088F20 00002825 */ move $a1, $zero
/* 089B24 80088F24 00003025 */ move $a2, $zero
/* 089B28 80088F28 0C0313EF */ jal func_800C4FBC
/* 089B28 80088F28 0C0313EF */ jal set_current_dialogue_background_colour
/* 089B2C 80088F2C 00003825 */ move $a3, $zero
/* 089B30 80088F30 24150004 */ li $s5, 4
/* 089B34 80088F34 00008825 */ move $s1, $zero
@@ -409,7 +409,7 @@ glabel func_80088938
/* 089B54 80088F54 AFAF0010 */ sw $t7, 0x10($sp)
/* 089B58 80088F58 240500FF */ li $a1, 255
/* 089B5C 80088F5C 00003025 */ move $a2, $zero
/* 089B60 80088F60 0C031400 */ jal set_text_colour
/* 089B60 80088F60 0C031400 */ jal set_current_text_colour
/* 089B64 80088F64 240700FF */ li $a3, 255
/* 089B68 80088F68 10000016 */ b .L80088FC4
/* 089B6C 80088F6C 8EEA0000 */ lw $t2, ($s7)
@@ -424,7 +424,7 @@ glabel func_80088938
/* 089B8C 80088F8C 240500FF */ li $a1, 255
/* 089B90 80088F90 240600FF */ li $a2, 255
/* 089B94 80088F94 240700FF */ li $a3, 255
/* 089B98 80088F98 0C031400 */ jal set_text_colour
/* 089B98 80088F98 0C031400 */ jal set_current_text_colour
/* 089B9C 80088F9C AFB60010 */ sw $s6, 0x10($sp)
/* 089BA0 80088FA0 10000008 */ b .L80088FC4
/* 089BA4 80088FA4 8EEA0000 */ lw $t2, ($s7)
@@ -433,7 +433,7 @@ glabel func_80088938
/* 089BAC 80088FAC AFAB0014 */ sw $t3, 0x14($sp)
/* 089BB0 80088FB0 240600FF */ li $a2, 255
/* 089BB4 80088FB4 240700FF */ li $a3, 255
/* 089BB8 80088FB8 0C031400 */ jal set_text_colour
/* 089BB8 80088FB8 0C031400 */ jal set_current_text_colour
/* 089BBC 80088FBC AFA00010 */ sw $zero, 0x10($sp)
/* 089BC0 80088FC0 8EEA0000 */ lw $t2, ($s7)
.L80088FC4:
asm/non_matchings/menu/func_80092E94.s
+2 -2
View File
@@ -259,7 +259,7 @@ glabel func_80092E94
/* 093E88 80093288 240F00FF */ li $t7, 255
/* 093E8C 8009328C AFAF0010 */ sw $t7, 0x10($sp)
/* 093E90 80093290 240500FF */ li $a1, 255
/* 093E94 80093294 0C0313EF */ jal func_800C4FBC
/* 093E94 80093294 0C0313EF */ jal set_current_dialogue_background_colour
/* 093E98 80093298 00003825 */ move $a3, $zero
/* 093E9C 8009329C 8FA20060 */ lw $v0, 0x60($sp)
/* 093EA0 800932A0 24040007 */ li $a0, 7
@@ -267,7 +267,7 @@ glabel func_80092E94
/* 093EA8 800932A8 AFAB0010 */ sw $t3, 0x10($sp)
/* 093EAC 800932AC 24050086 */ li $a1, 134
/* 093EB0 800932B0 240700BA */ li $a3, 186
/* 093EB4 800932B4 0C0313B7 */ jal set_dialogue_box_coords
/* 093EB4 800932B4 0C0313B7 */ jal set_current_dialogue_box_coords
/* 093EB8 800932B8 24460070 */ addiu $a2, $v0, 0x70
/* 093EBC 800932BC 02402025 */ move $a0, $s2
/* 093EC0 800932C0 00002825 */ move $a1, $zero
asm/non_matchings/menu/func_80093D40.s
+11 -11
View File
@@ -58,7 +58,7 @@ glabel func_80093D40
/* 094A0C 80093E0C 244700A0 */ addiu $a3, $v0, 0xa0
/* 094A10 80093E10 AFB80010 */ sw $t8, 0x10($sp)
/* 094A14 80093E14 02503023 */ subu $a2, $s2, $s0
/* 094A18 80093E18 0C0313B7 */ jal set_dialogue_box_coords
/* 094A18 80093E18 0C0313B7 */ jal set_current_dialogue_box_coords
/* 094A1C 80093E1C 24040007 */ li $a0, 7
/* 094A20 80093E20 3C11800E */ lui $s1, %hi(D_800E098C) # $s1, 0x800e
/* 094A24 80093E24 2631098C */ addiu $s1, %lo(D_800E098C) # addiu $s1, $s1, 0x98c
@@ -74,7 +74,7 @@ glabel func_80093D40
/* 094A4C 80093E4C 90660001 */ lbu $a2, 1($v1)
/* 094A50 80093E50 90670002 */ lbu $a3, 2($v1)
/* 094A54 80093E54 24040007 */ li $a0, 7
/* 094A58 80093E58 0C0313EF */ jal func_800C4FBC
/* 094A58 80093E58 0C0313EF */ jal set_current_dialogue_background_colour
/* 094A5C 80093E5C AFAA0010 */ sw $t2, 0x10($sp)
/* 094A60 80093E60 24040007 */ li $a0, 7
/* 094A64 80093E64 0C0313DF */ jal set_dialogue_font
@@ -83,7 +83,7 @@ glabel func_80093D40
/* 094A70 80093E70 24050080 */ li $a1, 128
/* 094A74 80093E74 24060080 */ li $a2, 128
/* 094A78 80093E78 240700FF */ li $a3, 255
/* 094A7C 80093E7C 0C031414 */ jal func_800C5050
/* 094A7C 80093E7C 0C031414 */ jal set_current_text_background_colour
/* 094A80 80093E80 AFA00010 */ sw $zero, 0x10($sp)
/* 094A84 80093E84 8E240000 */ lw $a0, ($s1)
/* 094A88 80093E88 0C01A93E */ jal func_8006A4F8
@@ -99,7 +99,7 @@ glabel func_80093D40
/* 094AB0 80093EB0 240E00FF */ li $t6, 255
/* 094AB4 80093EB4 AFAE0014 */ sw $t6, 0x14($sp)
/* 094AB8 80093EB8 24040007 */ li $a0, 7
/* 094ABC 80093EBC 0C031400 */ jal set_text_colour
/* 094ABC 80093EBC 0C031400 */ jal set_current_text_colour
/* 094AC0 80093EC0 AFAD0010 */ sw $t5, 0x10($sp)
/* 094AC4 80093EC4 3C148012 */ lui $s4, %hi(D_801263BC) # $s4, 0x8012
/* 094AC8 80093EC8 8E9463BC */ lw $s4, %lo(D_801263BC)($s4)
@@ -157,7 +157,7 @@ glabel func_80093D40
/* 094B8C 80093F8C 240500FF */ li $a1, 255
/* 094B90 80093F90 240600FF */ li $a2, 255
/* 094B94 80093F94 240700FF */ li $a3, 255
/* 094B98 80093F98 0C031400 */ jal set_text_colour
/* 094B98 80093F98 0C031400 */ jal set_current_text_colour
/* 094B9C 80093F9C AFB40010 */ sw $s4, 0x10($sp)
/* 094BA0 80093FA0 10000008 */ b .L80093FC4
/* 094BA4 80093FA4 00000000 */ nop
@@ -167,7 +167,7 @@ glabel func_80093D40
/* 094BB0 80093FB0 240500FF */ li $a1, 255
/* 094BB4 80093FB4 240600FF */ li $a2, 255
/* 094BB8 80093FB8 240700FF */ li $a3, 255
/* 094BBC 80093FBC 0C031400 */ jal set_text_colour
/* 094BBC 80093FBC 0C031400 */ jal set_current_text_colour
/* 094BC0 80093FC0 AFA00010 */ sw $zero, 0x10($sp)
.L80093FC4:
/* 094BC4 80093FC4 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e
@@ -191,7 +191,7 @@ glabel func_80093D40
/* 094C0C 8009400C 240500FF */ li $a1, 255
/* 094C10 80094010 240600FF */ li $a2, 255
/* 094C14 80094014 240700FF */ li $a3, 255
/* 094C18 80094018 0C031400 */ jal set_text_colour
/* 094C18 80094018 0C031400 */ jal set_current_text_colour
/* 094C1C 8009401C AFB40010 */ sw $s4, 0x10($sp)
/* 094C20 80094020 10000008 */ b .L80094044
/* 094C24 80094024 00000000 */ nop
@@ -201,7 +201,7 @@ glabel func_80093D40
/* 094C30 80094030 240500FF */ li $a1, 255
/* 094C34 80094034 240600FF */ li $a2, 255
/* 094C38 80094038 240700FF */ li $a3, 255
/* 094C3C 8009403C 0C031400 */ jal set_text_colour
/* 094C3C 8009403C 0C031400 */ jal set_current_text_colour
/* 094C40 80094040 AFA00010 */ sw $zero, 0x10($sp)
.L80094044:
/* 094C44 80094044 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e
@@ -246,7 +246,7 @@ glabel func_80093D40
/* 094CD8 800940D8 240500FF */ li $a1, 255
/* 094CDC 800940DC 240600FF */ li $a2, 255
/* 094CE0 800940E0 240700FF */ li $a3, 255
/* 094CE4 800940E4 0C031400 */ jal set_text_colour
/* 094CE4 800940E4 0C031400 */ jal set_current_text_colour
/* 094CE8 800940E8 AFB40010 */ sw $s4, 0x10($sp)
/* 094CEC 800940EC 10000008 */ b .L80094110
/* 094CF0 800940F0 8E070000 */ lw $a3, ($s0)
@@ -255,7 +255,7 @@ glabel func_80093D40
/* 094CF8 800940F8 AFB90014 */ sw $t9, 0x14($sp)
/* 094CFC 800940FC 240600FF */ li $a2, 255
/* 094D00 80094100 240700FF */ li $a3, 255
/* 094D04 80094104 0C031400 */ jal set_text_colour
/* 094D04 80094104 0C031400 */ jal set_current_text_colour
/* 094D08 80094108 AFA00010 */ sw $zero, 0x10($sp)
/* 094D0C 8009410C 8E070000 */ lw $a3, ($s0)
.L80094110:
@@ -274,7 +274,7 @@ glabel func_80093D40
/* 094D40 80094140 1420FFDD */ bnez $at, .L800940B8
/* 094D44 80094144 26520010 */ addiu $s2, $s2, 0x10
.L80094148:
/* 094D48 80094148 0C03157D */ jal func_800C55F4
/* 094D48 80094148 0C03157D */ jal open_dialogue_box
/* 094D4C 8009414C 24040007 */ li $a0, 7
/* 094D50 80094150 8FBF0034 */ lw $ra, 0x34($sp)
/* 094D54 80094154 8FB00020 */ lw $s0, 0x20($sp)
asm/non_matchings/menu/func_80094D28.s
+9 -9
View File
@@ -343,7 +343,7 @@ glabel L800951CC
/* 095DEC 800951EC 00002825 */ move $a1, $zero
/* 095DF0 800951F0 00003025 */ move $a2, $zero
/* 095DF4 800951F4 00003825 */ move $a3, $zero
/* 095DF8 800951F8 0C031414 */ jal func_800C5050
/* 095DF8 800951F8 0C031414 */ jal set_current_text_background_colour
/* 095DFC 800951FC AFA00010 */ sw $zero, 0x10($sp)
/* 095E00 80095200 3C118012 */ lui $s1, %hi(D_80126A98) # $s1, 0x8012
/* 095E04 80095204 26316A98 */ addiu $s1, %lo(D_80126A98) # addiu $s1, $s1, 0x6a98
@@ -398,13 +398,13 @@ glabel L800951CC
/* 095EAC 800952AC 01623023 */ subu $a2, $t3, $v0
/* 095EB0 800952B0 25AE0004 */ addiu $t6, $t5, 4
/* 095EB4 800952B4 AFAE0010 */ sw $t6, 0x10($sp)
/* 095EB8 800952B8 0C0313B7 */ jal set_dialogue_box_coords
/* 095EB8 800952B8 0C0313B7 */ jal set_current_dialogue_box_coords
/* 095EBC 800952BC 24C6FFFC */ addiu $a2, $a2, -4
/* 095EC0 800952C0 24040007 */ li $a0, 7
/* 095EC4 800952C4 24050040 */ li $a1, 64
/* 095EC8 800952C8 24060040 */ li $a2, 64
/* 095ECC 800952CC 240700FF */ li $a3, 255
/* 095ED0 800952D0 0C0313EF */ jal func_800C4FBC
/* 095ED0 800952D0 0C0313EF */ jal set_current_dialogue_background_colour
/* 095ED4 800952D4 AFA00010 */ sw $zero, 0x10($sp)
/* 095ED8 800952D8 240A0040 */ li $t2, 64
/* 095EDC 800952DC 241900FF */ li $t9, 255
@@ -413,7 +413,7 @@ glabel L800951CC
/* 095EE8 800952E8 24040007 */ li $a0, 7
/* 095EEC 800952EC 240500FF */ li $a1, 255
/* 095EF0 800952F0 00003025 */ move $a2, $zero
/* 095EF4 800952F4 0C031400 */ jal set_text_colour
/* 095EF4 800952F4 0C031400 */ jal set_current_text_colour
/* 095EF8 800952F8 240700FF */ li $a3, 255
/* 095EFC 800952FC 8E380000 */ lw $t8, ($s1)
/* 095F00 80095300 3C028012 */ lui $v0, %hi(D_80126C1C) # $v0, 0x8012
@@ -498,7 +498,7 @@ glabel L800951CC
/* 09602C 8009542C 24040007 */ li $a0, 7
/* 096030 80095430 240500FF */ li $a1, 255
/* 096034 80095434 240600FF */ li $a2, 255
/* 096038 80095438 0C031400 */ jal set_text_colour
/* 096038 80095438 0C031400 */ jal set_current_text_colour
/* 09603C 8009543C 240700FF */ li $a3, 255
/* 096040 80095440 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e
/* 096044 80095444 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7)
@@ -522,7 +522,7 @@ glabel L800951CC
/* 096088 80095488 240500FF */ li $a1, 255
/* 09608C 8009548C 240600FF */ li $a2, 255
/* 096090 80095490 240700FF */ li $a3, 255
/* 096094 80095494 0C031400 */ jal set_text_colour
/* 096094 80095494 0C031400 */ jal set_current_text_colour
/* 096098 80095498 AFB00010 */ sw $s0, 0x10($sp)
/* 09609C 8009549C 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e
/* 0960A0 800954A0 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2)
@@ -556,7 +556,7 @@ glabel L800951CC
/* 096108 80095508 240500FF */ li $a1, 255
/* 09610C 8009550C 240600FF */ li $a2, 255
/* 096110 80095510 240700FF */ li $a3, 255
/* 096114 80095514 0C031400 */ jal set_text_colour
/* 096114 80095514 0C031400 */ jal set_current_text_colour
/* 096118 80095518 AFB30010 */ sw $s3, 0x10($sp)
/* 09611C 8009551C 10000008 */ b .L80095540
/* 096120 80095520 8E270000 */ lw $a3, ($s1)
@@ -565,7 +565,7 @@ glabel L800951CC
/* 096128 80095528 AFAD0014 */ sw $t5, 0x14($sp)
/* 09612C 8009552C 240600FF */ li $a2, 255
/* 096130 80095530 240700FF */ li $a3, 255
/* 096134 80095534 0C031400 */ jal set_text_colour
/* 096134 80095534 0C031400 */ jal set_current_text_colour
/* 096138 80095538 AFA00010 */ sw $zero, 0x10($sp)
/* 09613C 8009553C 8E270000 */ lw $a3, ($s1)
.L80095540:
@@ -586,7 +586,7 @@ glabel L800951CC
/* 096178 80095578 1420FFDB */ bnez $at, .L800954E8
/* 09617C 8009557C 02599021 */ addu $s2, $s2, $t9
.L80095580:
/* 096180 80095580 0C03157D */ jal func_800C55F4
/* 096180 80095580 0C03157D */ jal open_dialogue_box
/* 096184 80095584 24040007 */ li $a0, 7
.L80095588:
glabel L80095588
asm/non_matchings/menu/func_80095728.s
+1 -1
View File
@@ -998,7 +998,7 @@ glabel L800964DC
/* 097160 80096560 00002825 */ move $a1, $zero
/* 097164 80096564 0C0259E4 */ jal func_80096790
/* 097168 80096568 00000000 */ nop
/* 09716C 8009656C 0C031588 */ jal func_800C5620
/* 09716C 8009656C 0C031588 */ jal close_dialogue_box
/* 097170 80096570 24040007 */ li $a0, 7
/* 097174 80096574 0C031525 */ jal func_800C5494
/* 097178 80096578 24040007 */ li $a0, 7
asm/non_matchings/menu/func_80096978.s
+10 -10
View File
@@ -424,13 +424,13 @@ glabel func_80096978
/* 097BC4 80096FC4 24C600C4 */ addiu $a2, $a2, 0xc4
/* 097BC8 80096FC8 AFB80010 */ sw $t8, 0x10($sp)
/* 097BCC 80096FCC 24050050 */ li $a1, 80
/* 097BD0 80096FD0 0C0313B7 */ jal set_dialogue_box_coords
/* 097BD0 80096FD0 0C0313B7 */ jal set_current_dialogue_box_coords
/* 097BD4 80096FD4 240700F0 */ li $a3, 240
/* 097BD8 80096FD8 24040007 */ li $a0, 7
/* 097BDC 80096FDC 24050040 */ li $a1, 64
/* 097BE0 80096FE0 24060040 */ li $a2, 64
/* 097BE4 80096FE4 240700FF */ li $a3, 255
/* 097BE8 80096FE8 0C0313EF */ jal func_800C4FBC
/* 097BE8 80096FE8 0C0313EF */ jal set_current_dialogue_background_colour
/* 097BEC 80096FEC AFA00010 */ sw $zero, 0x10($sp)
/* 097BF0 80096FF0 24040007 */ li $a0, 7
/* 097BF4 80096FF4 0C0313DF */ jal set_dialogue_font
@@ -439,7 +439,7 @@ glabel func_80096978
/* 097C00 80097000 00002825 */ move $a1, $zero
/* 097C04 80097004 00003025 */ move $a2, $zero
/* 097C08 80097008 00003825 */ move $a3, $zero
/* 097C0C 8009700C 0C031414 */ jal func_800C5050
/* 097C0C 8009700C 0C031414 */ jal set_current_text_background_colour
/* 097C10 80097010 AFA00010 */ sw $zero, 0x10($sp)
/* 097C14 80097014 3C028012 */ lui $v0, %hi(D_801263BC) # $v0, 0x8012
/* 097C18 80097018 8C4263BC */ lw $v0, %lo(D_801263BC)($v0)
@@ -481,7 +481,7 @@ glabel func_80096978
/* 097CA4 800970A4 240500FF */ li $a1, 255
/* 097CA8 800970A8 240600FF */ li $a2, 255
/* 097CAC 800970AC 240700FF */ li $a3, 255
/* 097CB0 800970B0 0C031400 */ jal set_text_colour
/* 097CB0 800970B0 0C031400 */ jal set_current_text_colour
/* 097CB4 800970B4 AFB80010 */ sw $t8, 0x10($sp)
/* 097CB8 800970B8 10000008 */ b .L800970DC
/* 097CBC 800970BC 00000000 */ nop
@@ -491,7 +491,7 @@ glabel func_80096978
/* 097CC8 800970C8 240500FF */ li $a1, 255
/* 097CCC 800970CC 240600FF */ li $a2, 255
/* 097CD0 800970D0 240700FF */ li $a3, 255
/* 097CD4 800970D4 0C031400 */ jal set_text_colour
/* 097CD4 800970D4 0C031400 */ jal set_current_text_colour
/* 097CD8 800970D8 AFA00010 */ sw $zero, 0x10($sp)
.L800970DC:
/* 097CDC 800970DC 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e
@@ -517,7 +517,7 @@ glabel func_80096978
/* 097D2C 8009712C 240500FF */ li $a1, 255
/* 097D30 80097130 240600FF */ li $a2, 255
/* 097D34 80097134 240700FF */ li $a3, 255
/* 097D38 80097138 0C031400 */ jal set_text_colour
/* 097D38 80097138 0C031400 */ jal set_current_text_colour
/* 097D3C 8009713C AFAC0010 */ sw $t4, 0x10($sp)
/* 097D40 80097140 10000008 */ b .L80097164
/* 097D44 80097144 00000000 */ nop
@@ -527,7 +527,7 @@ glabel func_80096978
/* 097D50 80097150 240500FF */ li $a1, 255
/* 097D54 80097154 240600FF */ li $a2, 255
/* 097D58 80097158 240700FF */ li $a3, 255
/* 097D5C 8009715C 0C031400 */ jal set_text_colour
/* 097D5C 8009715C 0C031400 */ jal set_current_text_colour
/* 097D60 80097160 AFA00010 */ sw $zero, 0x10($sp)
.L80097164:
/* 097D64 80097164 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e
@@ -566,7 +566,7 @@ glabel func_80096978
/* 097DE0 800971E0 240600FF */ li $a2, 255
/* 097DE4 800971E4 240700FF */ li $a3, 255
/* 097DE8 800971E8 AFA20010 */ sw $v0, 0x10($sp)
/* 097DEC 800971EC 0C031400 */ jal set_text_colour
/* 097DEC 800971EC 0C031400 */ jal set_current_text_colour
/* 097DF0 800971F0 AFA200A0 */ sw $v0, 0xa0($sp)
/* 097DF4 800971F4 1000000A */ b .L80097220
/* 097DF8 800971F8 8FA600A8 */ lw $a2, 0xa8($sp)
@@ -577,7 +577,7 @@ glabel func_80096978
/* 097E08 80097208 240600FF */ li $a2, 255
/* 097E0C 8009720C 240700FF */ li $a3, 255
/* 097E10 80097210 AFA00010 */ sw $zero, 0x10($sp)
/* 097E14 80097214 0C031400 */ jal set_text_colour
/* 097E14 80097214 0C031400 */ jal set_current_text_colour
/* 097E18 80097218 AFA200A0 */ sw $v0, 0xa0($sp)
/* 097E1C 8009721C 8FA600A8 */ lw $a2, 0xa8($sp)
.L80097220:
@@ -598,7 +598,7 @@ glabel func_80096978
/* 097E58 80097258 1420FFD9 */ bnez $at, .L800971C0
/* 097E5C 8009725C AFA900A8 */ sw $t1, 0xa8($sp)
.L80097260:
/* 097E60 80097260 0C03157D */ jal func_800C55F4
/* 097E60 80097260 0C03157D */ jal open_dialogue_box
/* 097E64 80097264 24040007 */ li $a0, 7
.L80097268:
/* 097E68 80097268 8FBF005C */ lw $ra, 0x5c($sp)
asm/non_matchings/menu/func_80099E8C.s
+7 -7
View File
@@ -446,14 +446,14 @@ glabel func_80099E8C
/* 09B128 8009A528 24040007 */ li $a0, 7
/* 09B12C 8009A52C 24050068 */ li $a1, 104
/* 09B130 8009A530 24060066 */ li $a2, 102
/* 09B134 8009A534 0C0313B7 */ jal set_dialogue_box_coords
/* 09B134 8009A534 0C0313B7 */ jal set_current_dialogue_box_coords
/* 09B138 8009A538 240700D8 */ li $a3, 216
/* 09B13C 8009A53C 240C00C0 */ li $t4, 192
/* 09B140 8009A540 AFAC0010 */ sw $t4, 0x10($sp)
/* 09B144 8009A544 24040007 */ li $a0, 7
/* 09B148 8009A548 00002825 */ move $a1, $zero
/* 09B14C 8009A54C 00003025 */ move $a2, $zero
/* 09B150 8009A550 0C0313EF */ jal func_800C4FBC
/* 09B150 8009A550 0C0313EF */ jal set_current_dialogue_background_colour
/* 09B154 8009A554 00003825 */ move $a3, $zero
/* 09B158 8009A558 24040007 */ li $a0, 7
/* 09B15C 8009A55C 0C0313DF */ jal set_dialogue_font
@@ -462,7 +462,7 @@ glabel func_80099E8C
/* 09B168 8009A568 00002825 */ move $a1, $zero
/* 09B16C 8009A56C 00003025 */ move $a2, $zero
/* 09B170 8009A570 00003825 */ move $a3, $zero
/* 09B174 8009A574 0C031414 */ jal func_800C5050
/* 09B174 8009A574 0C031414 */ jal set_current_text_background_colour
/* 09B178 8009A578 AFA00010 */ sw $zero, 0x10($sp)
/* 09B17C 8009A57C 8E0D0000 */ lw $t5, ($s0)
/* 09B180 8009A580 24010001 */ li $at, 1
@@ -475,7 +475,7 @@ glabel func_80099E8C
/* 09B19C 8009A59C 240500FF */ li $a1, 255
/* 09B1A0 8009A5A0 240600FF */ li $a2, 255
/* 09B1A4 8009A5A4 240700FF */ li $a3, 255
/* 09B1A8 8009A5A8 0C031400 */ jal set_text_colour
/* 09B1A8 8009A5A8 0C031400 */ jal set_current_text_colour
/* 09B1AC 8009A5AC AFAF0010 */ sw $t7, 0x10($sp)
/* 09B1B0 8009A5B0 10000008 */ b .L8009A5D4
/* 09B1B4 8009A5B4 00000000 */ nop
@@ -485,7 +485,7 @@ glabel func_80099E8C
/* 09B1C0 8009A5C0 240500FF */ li $a1, 255
/* 09B1C4 8009A5C4 240600FF */ li $a2, 255
/* 09B1C8 8009A5C8 240700FF */ li $a3, 255
/* 09B1CC 8009A5CC 0C031400 */ jal set_text_colour
/* 09B1CC 8009A5CC 0C031400 */ jal set_current_text_colour
/* 09B1D0 8009A5D0 AFA00010 */ sw $zero, 0x10($sp)
.L8009A5D4:
/* 09B1D4 8009A5D4 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e
@@ -510,7 +510,7 @@ glabel func_80099E8C
/* 09B220 8009A620 240500FF */ li $a1, 255
/* 09B224 8009A624 240600FF */ li $a2, 255
/* 09B228 8009A628 240700FF */ li $a3, 255
/* 09B22C 8009A62C 0C031400 */ jal set_text_colour
/* 09B22C 8009A62C 0C031400 */ jal set_current_text_colour
/* 09B230 8009A630 AFAC0010 */ sw $t4, 0x10($sp)
/* 09B234 8009A634 10000008 */ b .L8009A658
/* 09B238 8009A638 00000000 */ nop
@@ -520,7 +520,7 @@ glabel func_80099E8C
/* 09B244 8009A644 240500FF */ li $a1, 255
/* 09B248 8009A648 240600FF */ li $a2, 255
/* 09B24C 8009A64C 240700FF */ li $a3, 255
/* 09B250 8009A650 0C031400 */ jal set_text_colour
/* 09B250 8009A650 0C031400 */ jal set_current_text_colour
/* 09B254 8009A654 AFA00010 */ sw $zero, 0x10($sp)
.L8009A658:
/* 09B258 8009A658 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e
asm/non_matchings/menu/menu_results_loop.s
+1 -1
View File
@@ -246,7 +246,7 @@ glabel menu_results_loop
/* 098228 80097628 AD390000 */ sw $t9, ($t1)
/* 09822C 8009762C 0C025DB3 */ jal func_800976CC
/* 098230 80097630 00000000 */ nop
/* 098234 80097634 0C031588 */ jal func_800C5620
/* 098234 80097634 0C031588 */ jal close_dialogue_box
/* 098238 80097638 24040007 */ li $a0, 7
/* 09823C 8009763C 0C031525 */ jal func_800C5494
/* 098240 80097640 24040007 */ li $a0, 7
asm/non_matchings/menu/menu_trophy_race_rankings_loop.s
+1 -1
View File
@@ -236,7 +236,7 @@ glabel menu_trophy_race_rankings_loop
/* 099F38 80099338 ACAE0000 */ sw $t6, ($a1)
/* 099F3C 8009933C 0C026580 */ jal func_80099600
/* 099F40 80099340 AFAB002C */ sw $t3, 0x2c($sp)
/* 099F44 80099344 0C031588 */ jal func_800C5620
/* 099F44 80099344 0C031588 */ jal close_dialogue_box
/* 099F48 80099348 24040007 */ li $a0, 7
/* 099F4C 8009934C 0C031525 */ jal func_800C5494
/* 099F50 80099350 24040007 */ li $a0, 7
asm/non_matchings/menu/render_magic_codes_ui.s
+3 -3
View File
@@ -342,14 +342,14 @@ glabel render_magic_codes_ui
/* 08A7A0 80089BA0 24040006 */ li $a0, 6
/* 08A7A4 80089BA4 2405004C */ li $a1, 76
/* 08A7A8 80089BA8 2666FFE4 */ addiu $a2, $s3, -0x1c
/* 08A7AC 80089BAC 0C0313B7 */ jal set_dialogue_box_coords
/* 08A7AC 80089BAC 0C0313B7 */ jal set_current_dialogue_box_coords
/* 08A7B0 80089BB0 240700F4 */ li $a3, 244
/* 08A7B4 80089BB4 240F00A0 */ li $t7, 160
/* 08A7B8 80089BB8 AFAF0010 */ sw $t7, 0x10($sp)
/* 08A7BC 80089BBC 24040006 */ li $a0, 6
/* 08A7C0 80089BC0 00002825 */ move $a1, $zero
/* 08A7C4 80089BC4 00003025 */ move $a2, $zero
/* 08A7C8 80089BC8 0C0313EF */ jal func_800C4FBC
/* 08A7C8 80089BC8 0C0313EF */ jal set_current_dialogue_background_colour
/* 08A7CC 80089BCC 00003825 */ move $a3, $zero
/* 08A7D0 80089BD0 24130004 */ li $s3, 4
/* 08A7D4 80089BD4 00008825 */ move $s1, $zero
@@ -374,7 +374,7 @@ glabel render_magic_codes_ui
/* 08A810 80089C10 24040006 */ li $a0, 6
/* 08A814 80089C14 240500FF */ li $a1, 255
/* 08A818 80089C18 240700FF */ li $a3, 255
/* 08A81C 80089C1C 0C031400 */ jal set_text_colour
/* 08A81C 80089C1C 0C031400 */ jal set_current_text_colour
/* 08A820 80089C20 AFB00010 */ sw $s0, 0x10($sp)
/* 08A824 80089C24 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e
/* 08A828 80089C28 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1)
asm/non_matchings/menu/render_track_select_setup_ui.s
+3 -3
View File
@@ -173,7 +173,7 @@ glabel render_track_select_setup_ui
/* 091D9C 8009119C 240500FF */ li $a1, 255
/* 091DA0 800911A0 00003825 */ move $a3, $zero
/* 091DA4 800911A4 AFA60084 */ sw $a2, 0x84($sp)
/* 091DA8 800911A8 0C0313EF */ jal func_800C4FBC
/* 091DA8 800911A8 0C0313EF */ jal set_current_dialogue_background_colour
/* 091DAC 800911AC AFAF0010 */ sw $t7, 0x10($sp)
/* 091DB0 800911B0 3C028012 */ lui $v0, %hi(D_801263E0) # $v0, 0x8012
/* 091DB4 800911B4 8C4263E0 */ lw $v0, %lo(D_801263E0)($v0)
@@ -451,7 +451,7 @@ glabel render_track_select_setup_ui
/* 0921CC 800915CC 270E0089 */ addiu $t6, $t8, 0x89
/* 0921D0 800915D0 AFAE0010 */ sw $t6, 0x10($sp)
/* 0921D4 800915D4 240700BA */ li $a3, 186
/* 0921D8 800915D8 0C0313B7 */ jal set_dialogue_box_coords
/* 0921D8 800915D8 0C0313B7 */ jal set_current_dialogue_box_coords
/* 0921DC 800915DC 27060070 */ addiu $a2, $t8, 0x70
/* 0921E0 800915E0 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 0921E4 800915E4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
@@ -593,7 +593,7 @@ glabel render_track_select_setup_ui
/* 0923E0 800917E0 2466FFFE */ addiu $a2, $v1, -2
/* 0923E4 800917E4 24040007 */ li $a0, 7
/* 0923E8 800917E8 2445FFFE */ addiu $a1, $v0, -2
/* 0923EC 800917EC 0C0313B7 */ jal set_dialogue_box_coords
/* 0923EC 800917EC 0C0313B7 */ jal set_current_dialogue_box_coords
/* 0923F0 800917F0 24470032 */ addiu $a3, $v0, 0x32
/* 0923F4 800917F4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 0923F8 800917F8 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
asm/non_matchings/menu/tt_menu_loop.s
+2 -2
View File
@@ -48,7 +48,7 @@ glabel tt_menu_loop
/* 09E7CC 8009DBCC 24050018 */ li $a1, 24
/* 09E7D0 8009DBD0 24060010 */ li $a2, 16
/* 09E7D4 8009DBD4 240700C0 */ li $a3, 192
/* 09E7D8 8009DBD8 0C0313B7 */ jal set_dialogue_box_coords
/* 09E7D8 8009DBD8 0C0313B7 */ jal set_current_dialogue_box_coords
/* 09E7DC 8009DBDC AFAC0010 */ sw $t4, 0x10($sp)
/* 09E7E0 8009DBE0 10000007 */ b .L8009DC00
/* 09E7E4 8009DBE4 24040001 */ li $a0, 1
@@ -56,7 +56,7 @@ glabel tt_menu_loop
/* 09E7E8 8009DBE8 240D00DC */ li $t5, 220
/* 09E7EC 8009DBEC AFAD0010 */ sw $t5, 0x10($sp)
/* 09E7F0 8009DBF0 24060010 */ li $a2, 16
/* 09E7F4 8009DBF4 0C0313B7 */ jal set_dialogue_box_coords
/* 09E7F4 8009DBF4 0C0313B7 */ jal set_current_dialogue_box_coords
/* 09E7F8 8009DBF8 240700B8 */ li $a3, 184
/* 09E7FC 8009DBFC 24040001 */ li $a0, 1
.L8009DC00:
asm/non_matchings/unknown_032760/func_80042A90.s
+5 -5
View File
@@ -91,7 +91,7 @@ glabel func_80042A90
/* 0437E4 80042BE4 8FA6004C */ lw $a2, 0x4c($sp)
/* 0437E8 80042BE8 8FA70048 */ lw $a3, 0x48($sp)
/* 0437EC 80042BEC 24040004 */ li $a0, 4
/* 0437F0 80042BF0 0C0313B7 */ jal set_dialogue_box_coords
/* 0437F0 80042BF0 0C0313B7 */ jal set_current_dialogue_box_coords
/* 0437F4 80042BF4 AFAA0010 */ sw $t2, 0x10($sp)
/* 0437F8 80042BF8 860B0006 */ lh $t3, 6($s0)
/* 0437FC 80042BFC 24040004 */ li $a0, 4
@@ -102,13 +102,13 @@ glabel func_80042A90
/* 043810 80042C10 AFAD0010 */ sw $t5, 0x10($sp)
/* 043814 80042C14 24050080 */ li $a1, 128
/* 043818 80042C18 24060040 */ li $a2, 64
/* 04381C 80042C1C 0C0313EF */ jal func_800C4FBC
/* 04381C 80042C1C 0C0313EF */ jal set_current_dialogue_background_colour
/* 043820 80042C20 24070080 */ li $a3, 128
/* 043824 80042C24 24040004 */ li $a0, 4
/* 043828 80042C28 00002825 */ move $a1, $zero
/* 04382C 80042C2C 00003025 */ move $a2, $zero
/* 043830 80042C30 00003825 */ move $a3, $zero
/* 043834 80042C34 0C031414 */ jal func_800C5050
/* 043834 80042C34 0C031414 */ jal set_current_text_background_colour
/* 043838 80042C38 AFA00010 */ sw $zero, 0x10($sp)
/* 04383C 80042C3C 24040004 */ li $a0, 4
/* 043840 80042C40 0C0313DF */ jal set_dialogue_font
@@ -122,7 +122,7 @@ glabel func_80042A90
/* 043860 80042C60 AFB80014 */ sw $t8, 0x14($sp)
/* 043864 80042C64 240500FF */ li $a1, 255
/* 043868 80042C68 240600FF */ li $a2, 255
/* 04386C 80042C6C 0C031400 */ jal set_text_colour
/* 04386C 80042C6C 0C031400 */ jal set_current_text_colour
/* 043870 80042C70 240700FF */ li $a3, 255
/* 043874 80042C74 8FB90048 */ lw $t9, 0x48($sp)
/* 043878 80042C78 8FA80050 */ lw $t0, 0x50($sp)
@@ -141,7 +141,7 @@ glabel func_80042A90
/* 0438AC 80042CAC 25860002 */ addiu $a2, $t4, 2
/* 0438B0 80042CB0 0C03145A */ jal render_dialogue_text
/* 0438B4 80042CB4 24040004 */ li $a0, 4
/* 0438B8 80042CB8 0C03157D */ jal func_800C55F4
/* 0438B8 80042CB8 0C03157D */ jal open_dialogue_box
/* 0438BC 80042CBC 24040004 */ li $a0, 4
/* 0438C0 80042CC0 8FBF0024 */ lw $ra, 0x24($sp)
.L80042CC4:
include/structs.h
+14 -14
View File
@@ -1017,24 +1017,24 @@ typedef struct DialogueBoxBackground {
s16 y2;
s16 width;
s16 height;
u8 unk10;
u8 unk11;
u8 unk12;
u8 unk13;
u8 colorRed;
u8 colorGreen;
u8 colorBlue;
u8 colorAlpha;
u8 bgRed;
u8 bgGreen;
u8 bgBlue;
u8 bgAlpha;
u8 backgroundColourR;
u8 backgroundColourG;
u8 backgroundColourB;
u8 backgroundColourA;
u8 textColourR;
u8 textColourG;
u8 textColourB;
u8 textColourA;
u8 textBGColourR;
u8 textBGColourG;
u8 textBGColourB;
u8 textBGColourA;
u8 opacity;
u8 font;
u16 unk1E;
u16 flags;
s16 unk20;
s16 unk22;
DialogueBox *unk24;
DialogueBox *text;
} DialogueBoxBackground;
#endif
src/font.c
+72 -72
View File
@@ -45,13 +45,13 @@ s32 gDescPowsOf10[9] = {
};
s8 D_800E3710[48] = {
4, FALSE, 0, FALSE, 1,
2, FALSE, 1, FALSE, 2,
1, FALSE, 2, FALSE, 4,
0, FALSE, 4, TRUE, -4,
1, TRUE, -4, TRUE, -2,
2, TRUE, -2, TRUE, -1,
4, TRUE, -1, TRUE, 0,
4, FALSE, 0, FALSE, 1,
2, FALSE, 1, FALSE, 2,
1, FALSE, 2, FALSE, 4,
0, FALSE, 4, TRUE, -4,
1, TRUE, -4, TRUE, -2,
2, TRUE, -2, TRUE, -1,
4, TRUE, -1, TRUE, 0,
-1, 0, 0, 0, 0, // End of Data
0, 0, 0, 0, 0, 0, 0, 0,
};
@@ -99,28 +99,28 @@ void load_fonts(void) {
(*gDialogueBoxBackground)[i].y2 = SCREEN_HEIGHT - 1;
(*gDialogueBoxBackground)[i].width = SCREEN_WIDTH;
(*gDialogueBoxBackground)[i].height = SCREEN_HEIGHT;
(*gDialogueBoxBackground)[i].unk10 = 0xFF;
(*gDialogueBoxBackground)[i].unk11 = 0xFF;
(*gDialogueBoxBackground)[i].unk12 = 0xFF;
(*gDialogueBoxBackground)[i].unk13 = 0;
(*gDialogueBoxBackground)[i].colorRed = 0xFF;
(*gDialogueBoxBackground)[i].colorGreen = 0xFF;
(*gDialogueBoxBackground)[i].colorBlue = 0xFF;
(*gDialogueBoxBackground)[i].colorAlpha = 0;
(*gDialogueBoxBackground)[i].bgRed = 0xFF;
(*gDialogueBoxBackground)[i].bgGreen = 0xFF;
(*gDialogueBoxBackground)[i].bgBlue = 0xFF;
(*gDialogueBoxBackground)[i].bgAlpha = 0;
(*gDialogueBoxBackground)[i].backgroundColourR = 0xFF;
(*gDialogueBoxBackground)[i].backgroundColourG = 0xFF;
(*gDialogueBoxBackground)[i].backgroundColourB = 0xFF;
(*gDialogueBoxBackground)[i].backgroundColourA = 0;
(*gDialogueBoxBackground)[i].textColourR = 0xFF;
(*gDialogueBoxBackground)[i].textColourG = 0xFF;
(*gDialogueBoxBackground)[i].textColourB = 0xFF;
(*gDialogueBoxBackground)[i].textColourA = 0;
(*gDialogueBoxBackground)[i].textBGColourR = 0xFF;
(*gDialogueBoxBackground)[i].textBGColourG = 0xFF;
(*gDialogueBoxBackground)[i].textBGColourB = 0xFF;
(*gDialogueBoxBackground)[i].textBGColourA = 0;
(*gDialogueBoxBackground)[i].opacity = 0xFF;
(*gDialogueBoxBackground)[i].font = 0xFF;
if (i != 0) {
(*gDialogueBoxBackground)[i].unk1E = 0x4000;
(*gDialogueBoxBackground)[i].flags = DIALOGUE_BOX_UNK_01;
} else {
(*gDialogueBoxBackground)[i].unk1E = 0;
(*gDialogueBoxBackground)[i].flags = 0;
}
(*gDialogueBoxBackground)[i].unk20 = 0;
(*gDialogueBoxBackground)[i].unk22 = 0;
(*gDialogueBoxBackground)[i].unk24 = 0;
(*gDialogueBoxBackground)[i].text = 0;
}
for (i = 0; i < unk8012A7EC_COUNT; i++) {
(*D_8012A7EC)[i].unk1 = 0xFF;
@@ -222,18 +222,18 @@ GLOBAL_ASM("asm/non_matchings/font/func_800C4318.s")
#endif
void set_text_color(s32 red, s32 green, s32 blue, s32 alpha, s32 opacity) {
(*gDialogueBoxBackground)[0].colorRed = red;
(*gDialogueBoxBackground)[0].colorGreen = green;
(*gDialogueBoxBackground)[0].colorBlue = blue;
(*gDialogueBoxBackground)[0].colorAlpha = alpha;
(*gDialogueBoxBackground)[0].textColourR = red;
(*gDialogueBoxBackground)[0].textColourG = green;
(*gDialogueBoxBackground)[0].textColourB = blue;
(*gDialogueBoxBackground)[0].textColourA = alpha;
(*gDialogueBoxBackground)[0].opacity = opacity;
}
void set_text_background_color(s32 red, s32 green, s32 blue, s32 alpha) {
(*gDialogueBoxBackground)[0].bgRed = red;
(*gDialogueBoxBackground)[0].bgGreen = green;
(*gDialogueBoxBackground)[0].bgBlue = blue;
(*gDialogueBoxBackground)[0].bgAlpha = alpha;
(*gDialogueBoxBackground)[0].textBGColourR = red;
(*gDialogueBoxBackground)[0].textBGColourG = green;
(*gDialogueBoxBackground)[0].textBGColourB = blue;
(*gDialogueBoxBackground)[0].textBGColourA = alpha;
}
// Unused?
@@ -313,7 +313,7 @@ s32 func_800C4DA0(u8 *text, s32 x, s32 font) {
GLOBAL_ASM("asm/non_matchings/font/func_800C4DA0.s")
#endif
void set_dialogue_box_coords(s32 arg0, s32 x1, s32 y1, s32 x2, s32 y2) {
void set_current_dialogue_box_coords(s32 arg0, s32 x1, s32 y1, s32 x2, s32 y2) {
if (arg0 > 0 && arg0 < 8) {
DialogueBoxBackground *temp = &gDialogueBoxBackground[arg0];
temp->xpos = 0;
@@ -346,39 +346,39 @@ void set_dialogue_font(s32 arg0, s32 font) {
}
}
void func_800C4FBC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
void set_current_dialogue_background_colour(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
if (arg0 > 0 && arg0 < 8) {
DialogueBoxBackground *temp = &gDialogueBoxBackground[arg0];
temp->unk10 = arg1;
temp->unk11 = arg2;
temp->unk12 = arg3;
temp->unk13 = arg4;
temp->backgroundColourR = arg1;
temp->backgroundColourG = arg2;
temp->backgroundColourB = arg3;
temp->backgroundColourA = arg4;
}
}
void set_text_colour(s32 arg0, s32 red, s32 green, s32 blue, s32 alpha, s32 opacity) {
void set_current_text_colour(s32 arg0, s32 red, s32 green, s32 blue, s32 alpha, s32 opacity) {
DialogueBoxBackground *temp;
if (arg0 <= 0 || arg0 >= 8) {
return;
}
temp = &gDialogueBoxBackground[arg0];
temp->colorRed = red;
temp->colorGreen = green;
temp->colorBlue = blue;
temp->colorAlpha = alpha;
temp->textColourR = red;
temp->textColourG = green;
temp->textColourB = blue;
temp->textColourA = alpha;
temp->opacity = opacity;
}
void func_800C5050(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
void set_current_text_background_colour(s32 arg0, s32 red, s32 green, s32 blue, s32 alpha) {
DialogueBoxBackground *temp;
if (arg0 <= 0 || arg0 >= 8) {
return;
}
temp = &gDialogueBoxBackground[arg0];
temp->bgRed = arg1;
temp->bgGreen = arg2;
temp->bgBlue = arg3;
temp->bgAlpha = arg4;
temp->textBGColourR = red;
temp->textBGColourG = green;
temp->textBGColourB = blue;
temp->textBGColourA = alpha;
}
// Unused?
@@ -417,8 +417,8 @@ void func_800C5428(s32 arg0, DialogueBox *arg1) {
DialogueBox **temp_24_ptr;
temp = &gDialogueBoxBackground[arg0];
temp_24_ptr = &temp->unk24;
temp_24 = temp->unk24;
temp_24_ptr = &temp->text;
temp_24 = temp->text;
while ((temp_24 != NULL) && (temp_24 != arg1)) {
temp_24_ptr = &temp_24->unk1C;
temp_24 = temp_24->unk1C;
@@ -434,14 +434,14 @@ void func_800C5494(s32 arg0) {
DialogueBox *temp_24, *temp_24_2;
temp = &gDialogueBoxBackground[arg0];
temp_24 = temp->unk24;
temp_24 = temp->text;
if (temp_24 != NULL) {
temp_24_2 = temp_24; // This seems redundant.
while (temp_24_2 != NULL) {
temp_24_2->unk01 = 0xFF;
temp_24_2 = temp_24_2->unk1C;
}
temp->unk24 = NULL;
temp->text = NULL;
}
}
@@ -475,31 +475,31 @@ void func_800C54E8(s32 arg0, unk800C54E8 *arg1, s32 arg2, s32 arg3, s32 arg4) {
}
}
void func_800C55F4(s32 arg0) {
(*gDialogueBoxBackground)[arg0].unk1E |= 0x8000;
void open_dialogue_box(s32 arg0) {
(*gDialogueBoxBackground)[arg0].flags |= DIALOGUE_BOX_OPEN;
}
void func_800C5620(s32 arg0) {
(*gDialogueBoxBackground)[arg0].unk1E &= 0x7FFF;
void close_dialogue_box(s32 arg0) {
(*gDialogueBoxBackground)[arg0].flags &= DIALOGUE_BOX_CLOSED;
}
// Unused?
void func_800C564C(s32 arg0) {
(*gDialogueBoxBackground)[arg0].unk1E |= 0x0001;
(*gDialogueBoxBackground)[arg0].flags |= DIALOGUE_BOX_UNUSED_01;
}
// Unused?
void func_800C5678(s32 arg0) {
(*gDialogueBoxBackground)[arg0].unk1E &= 0xFFFE;
(*gDialogueBoxBackground)[arg0].flags &= DIALOGUE_BOX_UNUSED_02;
}
// Unused?
void func_800C56A4(s32 arg0) {
(*gDialogueBoxBackground)[arg0].unk1E |= 0x4000;
(*gDialogueBoxBackground)[arg0].flags |= DIALOGUE_BOX_UNK_01;
}
void func_800C56D0(s32 arg0) {
(*gDialogueBoxBackground)[arg0].unk1E &= 0xBFFF;
(*gDialogueBoxBackground)[arg0].flags &= DIALOGUE_BOX_UNK_02;
}
void func_800C56FC(s32 arg0, s32 arg1, s32 arg2) {
@@ -514,8 +514,8 @@ void func_800C56FC(s32 arg0, s32 arg1, s32 arg2) {
}
for (i = 1; i < 8; i++) {
if ((*gDialogueBoxBackground)[i].unk1E & 0x8000) {
if ((*gDialogueBoxBackground)[i].unk1E & 0x4000) {
if ((*gDialogueBoxBackground)[i].flags & DIALOGUE_BOX_OPEN) {
if ((*gDialogueBoxBackground)[i].flags & DIALOGUE_BOX_UNK_01) {
func_800C5B58(arg0, arg1, arg2, i);
} else {
func_800C5B58(arg0, 0, 0, i);
@@ -590,7 +590,7 @@ void func_800C5B58(Gfx **dlist, s32 *arg1, s32 *arg2, s32 arg3) {
temp = &gDialogueBoxBackground[arg3];
if (temp->unk13 != 0) {
if (temp->backgroundColourA != 0) {
gSPDisplayList((*dlist)++, &D_800E3690);
gDkrDmaDisplayList((*dlist)++, ((u8 *)&D_800E36C8[1]) + 0x80000000, 2);
gDPSetEnvColor((*dlist)++, 0, 0, 0, 0);
@@ -603,7 +603,7 @@ void func_800C5B58(Gfx **dlist, s32 *arg1, s32 *arg2, s32 arg3) {
render_fill_rectangle(dlist, temp->x1 - 2, temp->y2 - 2, temp->x2 + 2, temp->y2 + 2);
}
gDPPipeSync((*dlist)++);
gDPSetEnvColor((*dlist)++, temp->unk10, temp->unk11, temp->unk12, temp->unk13);
gDPSetEnvColor((*dlist)++, temp->backgroundColourR, temp->backgroundColourG, temp->backgroundColourB, temp->backgroundColourA);
for (i = 0; D_800E3710[i] >= 0; i += 5) {
x0 = D_800E3710[i] + temp->x1;
y0 = (D_800E3710[i + 1]) ? D_800E3710[i + 2] + temp->y2 : D_800E3710[i + 2] + temp->y1;
@@ -621,18 +621,18 @@ void func_800C5B58(Gfx **dlist, s32 *arg1, s32 *arg2, s32 arg3) {
D_8012A7F4 = 2;
func_8009E9B0(temp, dlist, arg1, arg2);
}
temp_24 = temp->unk24;
temp_24 = temp->text;
while (temp_24 != NULL) {
temp->xpos = temp_24->unk8 + temp_24->unkC;
temp->ypos = temp_24->unkA + temp_24->unkE;
temp->colorRed = temp_24->unk10;
temp->colorGreen = temp_24->unk11;
temp->colorBlue = temp_24->unk12;
temp->colorAlpha = temp_24->unk13;
temp->bgRed = temp_24->unk14;
temp->bgGreen = temp_24->unk15;
temp->bgBlue = temp_24->unk16;
temp->bgAlpha = temp_24->unk17;
temp->textColourR = temp_24->unk10;
temp->textColourG = temp_24->unk11;
temp->textColourB = temp_24->unk12;
temp->textColourA = temp_24->unk13;
temp->textBGColourR = temp_24->unk14;
temp->textBGColourG = temp_24->unk15;
temp->textBGColourB = temp_24->unk16;
temp->textBGColourA = temp_24->unk17;
temp->opacity = temp_24->unk18;
temp->font = temp_24->unk19;
parse_string_with_number(temp_24->unk4, &sp6C, temp_24->unk01);
@@ -642,7 +642,7 @@ void func_800C5B58(Gfx **dlist, s32 *arg1, s32 *arg2, s32 arg3) {
}
/**
* Takes in a string and a number, and replaces each instance of the
* Takes in a string and a number, and replaces each instance of the
* character '~' with the number.
*/
void parse_string_with_number(unsigned char *input, char *output, s32 number) {

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