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

Label menu.c and font.c

Browse Source 
d
This commit is contained in:
Fazana
2021-12-01 20:32:55 +00:00
parent 6799c345b7
commit b05c987373
23 changed files with 374 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/font/func_800C45A4.s
+4 -4
View File
@@ -32,10 +32,10 @@ glabel func_800C45A4
/* 0C5208 800C4608 3C18800E */ lui $t8, %hi(D_800E3690) # $t8, 0x800e
/* 0C520C 800C460C 27183690 */ addiu $t8, %lo(D_800E3690) # addiu $t8, $t8, 0x3690
/* 0C5210 800C4610 3C0F0600 */ lui $t7, 0x600
/* 0C5214 800C4614 3C198013 */ lui $t9, %hi(D_8012A7E8) # $t9, 0x8013
/* 0C5214 800C4614 3C198013 */ lui $t9, %hi(gDialogueBoxBackground) # $t9, 0x8013
/* 0C5218 800C4618 AC6F0000 */ sw $t7, ($v1)
/* 0C521C 800C461C AC780004 */ sw $t8, 4($v1)
/* 0C5220 800C4620 8F39A7E8 */ lw $t9, %lo(D_8012A7E8)($t9)
/* 0C5220 800C4620 8F39A7E8 */ lw $t9, %lo(gDialogueBoxBackground)($t9)
/* 0C5224 800C4624 3C014080 */ li $at, 0x40800000 # 4.000000
/* 0C5228 800C4628 10B9005B */ beq $a1, $t9, .L800C4798
/* 0C522C 800C462C 326E0005 */ andi $t6, $s3, 5
@@ -518,10 +518,10 @@ glabel L800C4AE8
/* 0C592C 800C4D2C 3C18E700 */ lui $t8, 0xe700
/* 0C5930 800C4D30 246F0008 */ addiu $t7, $v1, 8
/* 0C5934 800C4D34 AE2F0000 */ sw $t7, ($s1)
/* 0C5938 800C4D38 3C0E8013 */ lui $t6, %hi(D_8012A7E8) # $t6, 0x8013
/* 0C5938 800C4D38 3C0E8013 */ lui $t6, %hi(gDialogueBoxBackground) # $t6, 0x8013
/* 0C593C 800C4D3C AC600004 */ sw $zero, 4($v1)
/* 0C5940 800C4D40 AC780000 */ sw $t8, ($v1)
/* 0C5944 800C4D44 8DCEA7E8 */ lw $t6, %lo(D_8012A7E8)($t6)
/* 0C5944 800C4D44 8DCEA7E8 */ lw $t6, %lo(gDialogueBoxBackground)($t6)
/* 0C5948 800C4D48 00000000 */ nop
/* 0C594C 800C4D4C 124E0003 */ beq $s2, $t6, .L800C4D5C
/* 0C5950 800C4D50 00000000 */ nop
asm/non_matchings/font/func_800C4DA0.s
+2 -2
View File
@@ -7,8 +7,8 @@ glabel func_800C4DA0
.L800C4DB0:
/* 0C59B0 800C4DB0 04C10006 */ bgez $a2, .L800C4DCC
/* 0C59B4 800C4DB4 00A01825 */ move $v1, $a1
/* 0C59B8 800C4DB8 3C0E8013 */ lui $t6, %hi(D_8012A7E8) # $t6, 0x8013
/* 0C59BC 800C4DBC 8DCEA7E8 */ lw $t6, %lo(D_8012A7E8)($t6)
/* 0C59B8 800C4DB8 3C0E8013 */ lui $t6, %hi(gDialogueBoxBackground) # $t6, 0x8013
/* 0C59BC 800C4DBC 8DCEA7E8 */ lw $t6, %lo(gDialogueBoxBackground)($t6)
/* 0C59C0 800C4DC0 00000000 */ nop
/* 0C59C4 800C4DC4 91C6001D */ lbu $a2, 0x1d($t6)
/* 0C59C8 800C4DC8 00000000 */ nop
asm/non_matchings/font/func_800C5168.s → asm/non_matchings/font/render_dialogue_text.s
+3 -3
View File
@@ -1,4 +1,4 @@
glabel func_800C5168
glabel render_dialogue_text
/* 0C5D68 800C5168 27BDFEB8 */ addiu $sp, $sp, -0x148
/* 0C5D6C 800C516C AFB00018 */ sw $s0, 0x18($sp)
/* 0C5D70 800C5170 00808025 */ move $s0, $a0
@@ -34,8 +34,8 @@ glabel func_800C5168
/* 0C5DD8 800C51D8 10E0008E */ beqz $a3, .L800C5414
/* 0C5DDC 800C51DC 240500FF */ li $a1, 255
/* 0C5DE0 800C51E0 00105080 */ sll $t2, $s0, 2
/* 0C5DE4 800C51E4 3C0B8013 */ lui $t3, %hi(D_8012A7E8) # $t3, 0x8013
/* 0C5DE8 800C51E8 8D6BA7E8 */ lw $t3, %lo(D_8012A7E8)($t3)
/* 0C5DE4 800C51E4 3C0B8013 */ lui $t3, %hi(gDialogueBoxBackground) # $t3, 0x8013
/* 0C5DE8 800C51E8 8D6BA7E8 */ lw $t3, %lo(gDialogueBoxBackground)($t3)
/* 0C5DEC 800C51EC 8FAC014C */ lw $t4, 0x14c($sp)
/* 0C5DF0 800C51F0 01505021 */ addu $t2, $t2, $s0
/* 0C5DF4 800C51F4 24028000 */ li $v0, -32768
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 func_800C4EDC
/* 0C3768 800C2B68 0C0313B7 */ jal set_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
@@ -69,7 +69,7 @@ glabel func_800C2B00
/* 0C3808 800C2C08 8E4F0000 */ lw $t7, ($s2)
/* 0C380C 800C2C0C 24040006 */ li $a0, 6
/* 0C3810 800C2C10 91E50005 */ lbu $a1, 5($t7)
/* 0C3814 800C2C14 0C0313DF */ jal func_800C4F7C
/* 0C3814 800C2C14 0C0313DF */ jal set_dialogue_font
/* 0C3818 800C2C18 00000000 */ nop
/* 0C381C 800C2C1C 8E420000 */ lw $v0, ($s2)
/* 0C3820 800C2C20 24010004 */ li $at, 4
@@ -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 func_800C5000
/* 0C389C 800C2C9C 0C031400 */ jal set_text_colour
/* 0C38A0 800C2CA0 AFAF0014 */ sw $t7, 0x14($sp)
/* 0C38A4 800C2CA4 8E470000 */ lw $a3, ($s2)
/* 0C38A8 800C2CA8 24180001 */ li $t8, 1
@@ -114,7 +114,7 @@ glabel func_800C2B00
/* 0C38B4 800C2CB4 02202825 */ move $a1, $s1
/* 0C38B8 800C2CB8 02603025 */ move $a2, $s3
/* 0C38BC 800C2CBC AFB00014 */ sw $s0, 0x14($sp)
/* 0C38C0 800C2CC0 0C03145A */ jal func_800C5168
/* 0C38C0 800C2CC0 0C03145A */ jal render_dialogue_text
/* 0C38C4 800C2CC4 24E70008 */ addiu $a3, $a3, 8
/* 0C38C8 800C2CC8 86E80000 */ lh $t0, ($s7)
/* 0C38CC 800C2CCC 241900FF */ li $t9, 255
@@ -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 func_800C5000
/* 0C38F0 800C2CF0 0C031400 */ jal set_text_colour
/* 0C38F4 800C2CF4 00003825 */ move $a3, $zero
/* 0C38F8 800C2CF8 8E470000 */ lw $a3, ($s2)
/* 0C38FC 800C2CFC 240B0001 */ li $t3, 1
@@ -135,7 +135,7 @@ glabel func_800C2B00
/* 0C3908 800C2D08 26250001 */ addiu $a1, $s1, 1
/* 0C390C 800C2D0C 26660001 */ addiu $a2, $s3, 1
/* 0C3910 800C2D10 AFB00014 */ sw $s0, 0x14($sp)
/* 0C3914 800C2D14 0C03145A */ jal func_800C5168
/* 0C3914 800C2D14 0C03145A */ jal render_dialogue_text
/* 0C3918 800C2D18 24E70008 */ addiu $a3, $a3, 8
/* 0C391C 800C2D1C 87CC0000 */ lh $t4, ($fp)
/* 0C3920 800C2D20 26940001 */ addiu $s4, $s4, 1
asm/non_matchings/game_text/func_800C3564.s
+4 -4
View File
@@ -31,10 +31,10 @@ 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 func_800C4EDC
/* 0C41E4 800C35E4 0C0313B7 */ jal set_dialogue_box_coords
/* 0C41E8 800C35E8 240700B4 */ li $a3, 180
/* 0C41EC 800C35EC 8FA50040 */ lw $a1, 0x40($sp)
/* 0C41F0 800C35F0 0C0313DF */ jal func_800C4F7C
/* 0C41F0 800C35F0 0C0313DF */ jal set_dialogue_font
/* 0C41F4 800C35F4 24040001 */ li $a0, 1
/* 0C41F8 800C35F8 240D0080 */ li $t5, 128
/* 0C41FC 800C35FC AFAD0010 */ sw $t5, 0x10($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 func_800C5000
/* 0C4230 800C3630 0C031400 */ jal set_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)
@@ -135,7 +135,7 @@ glabel func_800C3564
/* 0C4358 800C3758 8FA6006C */ lw $a2, 0x6c($sp)
/* 0C435C 800C375C 02003825 */ move $a3, $s0
/* 0C4360 800C3760 AFAF0010 */ sw $t7, 0x10($sp)
/* 0C4364 800C3764 0C03145A */ jal func_800C5168
/* 0C4364 800C3764 0C03145A */ jal render_dialogue_text
/* 0C4368 800C3768 AFB80014 */ sw $t8, 0x14($sp)
/* 0C436C 800C376C 8FB9006C */ lw $t9, 0x6c($sp)
/* 0C4370 800C3770 8FA80070 */ lw $t0, 0x70($sp)
asm/non_matchings/game_text/func_800C38B4.s
+3 -3
View File
@@ -50,7 +50,7 @@ glabel L800C3958
/* 0C4558 800C3958 92050001 */ lbu $a1, 1($s0)
/* 0C455C 800C395C 26310002 */ addiu $s1, $s1, 2
/* 0C4560 800C3960 24040001 */ li $a0, 1
/* 0C4564 800C3964 0C0313DF */ jal func_800C4F7C
/* 0C4564 800C3964 0C0313DF */ jal set_dialogue_font
/* 0C4568 800C3968 AE450000 */ sw $a1, ($s2)
/* 0C456C 800C396C 8E790000 */ lw $t9, ($s3)
/* 0C4570 800C3970 00000000 */ nop
@@ -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 func_800C4EDC
/* 0C4610 800C3A10 0C0313B7 */ jal set_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 func_800C5000
/* 0C4688 800C3A88 0C031400 */ jal set_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
+2 -2
View File
@@ -139,7 +139,7 @@ glabel func_80084854
/* 08565C 80084A5C 24040007 */ li $a0, 7
/* 085660 80084A60 2405005E */ li $a1, 94
/* 085664 80084A64 24060075 */ li $a2, 117
/* 085668 80084A68 0C0313B7 */ jal func_800C4EDC
/* 085668 80084A68 0C0313B7 */ jal set_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 func_800C4EDC
/* 085698 80084A98 0C0313B7 */ jal set_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
+7 -7
View File
@@ -71,7 +71,7 @@ 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 func_800C4EDC
/* 087EE8 800872E8 0C0313B7 */ jal set_dialogue_box_coords
/* 087EEC 800872EC 24070118 */ li $a3, 280
/* 087EF0 800872F0 240B00A0 */ li $t3, 160
/* 087EF4 800872F4 AFAB0010 */ sw $t3, 0x10($sp)
@@ -87,7 +87,7 @@ glabel func_800871D8
/* 087F1C 8008731C 0C031414 */ jal func_800C5050
/* 087F20 80087320 AFA00010 */ sw $zero, 0x10($sp)
/* 087F24 80087324 24040007 */ li $a0, 7
/* 087F28 80087328 0C0313DF */ jal func_800C4F7C
/* 087F28 80087328 0C0313DF */ jal set_dialogue_font
/* 087F2C 8008732C 24050002 */ li $a1, 2
/* 087F30 80087330 240C00FF */ li $t4, 255
/* 087F34 80087334 AFAC0014 */ sw $t4, 0x14($sp)
@@ -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 func_800C5000
/* 087F48 80087348 0C031400 */ jal set_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)
@@ -125,12 +125,12 @@ glabel func_800871D8
/* 087FA8 800873A8 AFB90014 */ sw $t9, 0x14($sp)
/* 087FAC 800873AC AFB80010 */ sw $t8, 0x10($sp)
/* 087FB0 800873B0 24058000 */ li $a1, -32768
/* 087FB4 800873B4 0C03145A */ jal func_800C5168
/* 087FB4 800873B4 0C03145A */ jal render_dialogue_text
/* 087FB8 800873B8 24060014 */ li $a2, 20
/* 087FBC 800873BC 24120034 */ li $s2, 52
/* 087FC0 800873C0 00009825 */ move $s3, $zero
/* 087FC4 800873C4 24040007 */ li $a0, 7
/* 087FC8 800873C8 0C0313DF */ jal func_800C4F7C
/* 087FC8 800873C8 0C0313DF */ jal set_dialogue_font
/* 087FCC 800873CC 00002825 */ move $a1, $zero
/* 087FD0 800873D0 8E830000 */ lw $v1, ($s4)
/* 087FD4 800873D4 00138080 */ sll $s0, $s3, 2
@@ -149,7 +149,7 @@ glabel func_800871D8
/* 088004 80087404 24040007 */ li $a0, 7
/* 088008 80087408 24058000 */ li $a1, -32768
/* 08800C 8008740C 02403025 */ move $a2, $s2
/* 088010 80087410 0C03145A */ jal func_800C5168
/* 088010 80087410 0C03145A */ jal render_dialogue_text
/* 088014 80087414 02203825 */ move $a3, $s1
/* 088018 80087418 8E830000 */ lw $v1, ($s4)
/* 08801C 8008741C 26100004 */ addiu $s0, $s0, 4
@@ -175,7 +175,7 @@ glabel func_800871D8
/* 088064 80087464 24040007 */ li $a0, 7
/* 088068 80087468 24058000 */ li $a1, -32768
/* 08806C 8008746C 02403025 */ move $a2, $s2
/* 088070 80087470 0C03145A */ jal func_800C5168
/* 088070 80087470 0C03145A */ jal render_dialogue_text
/* 088074 80087474 02203825 */ move $a3, $s1
/* 088078 80087478 8E990000 */ lw $t9, ($s4)
/* 08807C 8008747C 26100004 */ addiu $s0, $s0, 4
asm/non_matchings/menu/func_80088938.s
+18 -18
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 func_800C4EDC
/* 089684 80088A84 0C0313B7 */ jal set_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)
@@ -110,7 +110,7 @@ glabel func_80088938
/* 0896DC 80088ADC 2407005C */ li $a3, 92
/* 0896E0 80088AE0 24040006 */ li $a0, 6
.L80088AE4:
/* 0896E4 80088AE4 0C0313DF */ jal func_800C4F7C
/* 0896E4 80088AE4 0C0313DF */ jal set_dialogue_font
/* 0896E8 80088AE8 00002825 */ move $a1, $zero
/* 0896EC 80088AEC 240900FF */ li $t1, 255
/* 0896F0 80088AF0 AFA90014 */ sw $t1, 0x14($sp)
@@ -118,7 +118,7 @@ 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 func_800C5000
/* 089704 80088B04 0C031400 */ jal set_text_colour
/* 089708 80088B08 AFA00010 */ sw $zero, 0x10($sp)
/* 08970C 80088B0C 24040006 */ li $a0, 6
/* 089710 80088B10 00002825 */ move $a1, $zero
@@ -138,7 +138,7 @@ glabel func_80088938
/* 089748 80088B48 AFAE0010 */ sw $t6, 0x10($sp)
/* 08974C 80088B4C 24040006 */ li $a0, 6
/* 089750 80088B50 24058000 */ li $a1, -32768
/* 089754 80088B54 0C03145A */ jal func_800C5168
/* 089754 80088B54 0C03145A */ jal render_dialogue_text
/* 089758 80088B58 24060002 */ li $a2, 2
/* 08975C 80088B5C 8EF80000 */ lw $t8, ($s7)
/* 089760 80088B60 3C198012 */ lui $t9, %hi(D_80126BB0) # $t9, 0x8012
@@ -149,7 +149,7 @@ glabel func_80088938
/* 089774 80088B74 24040006 */ li $a0, 6
/* 089778 80088B78 24058000 */ li $a1, -32768
/* 08977C 80088B7C 24060010 */ li $a2, 16
/* 089780 80088B80 0C03145A */ jal func_800C5168
/* 089780 80088B80 0C03145A */ jal render_dialogue_text
/* 089784 80088B84 AFB90010 */ sw $t9, 0x10($sp)
/* 089788 80088B88 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 08978C 80088B8C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
@@ -159,7 +159,7 @@ glabel func_80088938
/* 08979C 80088B9C 24070006 */ li $a3, 6
/* 0897A0 80088BA0 26B50022 */ addiu $s5, $s5, 0x22
/* 0897A4 80088BA4 24040006 */ li $a0, 6
/* 0897A8 80088BA8 0C0313DF */ jal func_800C4F7C
/* 0897A8 80088BA8 0C0313DF */ jal set_dialogue_font
/* 0897AC 80088BAC 24050001 */ li $a1, 1
/* 0897B0 80088BB0 24040006 */ li $a0, 6
/* 0897B4 80088BB4 00002825 */ move $a1, $zero
@@ -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 func_800C4EDC
/* 0897F8 80088BF8 0C0313B7 */ jal set_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
@@ -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 func_800C5000
/* 089844 80088C44 0C031400 */ jal set_text_colour
/* 089848 80088C48 24070030 */ li $a3, 48
/* 08984C 80088C4C 8EE20000 */ lw $v0, ($s7)
/* 089850 80088C50 3C0D8012 */ lui $t5, %hi(D_801263D8) # $t5, 0x8012
@@ -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 func_800C5000
/* 0898EC 80088CEC 0C031400 */ jal set_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)
@@ -265,7 +265,7 @@ glabel func_80088938
/* 089930 80088D30 24040006 */ li $a0, 6
/* 089934 80088D34 2405001A */ li $a1, 26
/* 089938 80088D38 24060002 */ li $a2, 2
/* 08993C 80088D3C 0C03145A */ jal func_800C5168
/* 08993C 80088D3C 0C03145A */ jal render_dialogue_text
/* 089940 80088D40 02403825 */ move $a3, $s2
/* 089944 80088D44 240F0001 */ li $t7, 1
/* 089948 80088D48 AFAF0010 */ sw $t7, 0x10($sp)
@@ -273,7 +273,7 @@ glabel func_80088938
/* 089950 80088D50 24050038 */ li $a1, 56
/* 089954 80088D54 24060002 */ li $a2, 2
/* 089958 80088D58 02003825 */ move $a3, $s0
/* 08995C 80088D5C 0C03145A */ jal func_800C5168
/* 08995C 80088D5C 0C03145A */ jal render_dialogue_text
/* 089960 80088D60 AFA00014 */ sw $zero, 0x14($sp)
/* 089964 80088D64 24190004 */ li $t9, 4
/* 089968 80088D68 AFB90014 */ sw $t9, 0x14($sp)
@@ -281,7 +281,7 @@ glabel func_80088938
/* 089970 80088D70 240500F0 */ li $a1, 240
/* 089974 80088D74 24060002 */ li $a2, 2
/* 089978 80088D78 02803825 */ move $a3, $s4
/* 08997C 80088D7C 0C03145A */ jal func_800C5168
/* 08997C 80088D7C 0C03145A */ jal render_dialogue_text
/* 089980 80088D80 AFB30010 */ sw $s3, 0x10($sp)
/* 089984 80088D84 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 089988 80088D88 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
@@ -380,14 +380,14 @@ glabel func_80088938
/* 089AE4 80088EE4 0C031525 */ jal func_800C5494
/* 089AE8 80088EE8 24040006 */ li $a0, 6
/* 089AEC 80088EEC 24040006 */ li $a0, 6
/* 089AF0 80088EF0 0C0313DF */ jal func_800C4F7C
/* 089AF0 80088EF0 0C0313DF */ jal set_dialogue_font
/* 089AF4 80088EF4 00002825 */ move $a1, $zero
/* 089AF8 80088EF8 26AE001C */ addiu $t6, $s5, 0x1c
/* 089AFC 80088EFC AFAE0010 */ sw $t6, 0x10($sp)
/* 089B00 80088F00 24040006 */ li $a0, 6
/* 089B04 80088F04 2405004C */ li $a1, 76
/* 089B08 80088F08 26A6FFE4 */ addiu $a2, $s5, -0x1c
/* 089B0C 80088F0C 0C0313B7 */ jal func_800C4EDC
/* 089B0C 80088F0C 0C0313B7 */ jal set_dialogue_box_coords
/* 089B10 80088F10 240700F4 */ li $a3, 244
/* 089B14 80088F14 241800A0 */ li $t8, 160
/* 089B18 80088F18 AFB80010 */ sw $t8, 0x10($sp)
@@ -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 func_800C5000
/* 089B60 80088F60 0C031400 */ jal set_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 func_800C5000
/* 089B98 80088F98 0C031400 */ jal set_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 func_800C5000
/* 089BB8 80088FB8 0C031400 */ jal set_text_colour
/* 089BBC 80088FBC AFA00010 */ sw $zero, 0x10($sp)
/* 089BC0 80088FC0 8EEA0000 */ lw $t2, ($s7)
.L80088FC4:
@@ -447,7 +447,7 @@ glabel func_80088938
/* 089BE0 80088FE0 AFB80014 */ sw $t8, 0x14($sp)
/* 089BE4 80088FE4 24040006 */ li $a0, 6
/* 089BE8 80088FE8 24058000 */ li $a1, -32768
/* 089BEC 80088FEC 0C03145A */ jal func_800C5168
/* 089BEC 80088FEC 0C03145A */ jal render_dialogue_text
/* 089BF0 80088FF0 02A03025 */ move $a2, $s5
/* 089BF4 80088FF4 12200003 */ beqz $s1, .L80089004
/* 089BF8 80088FF8 00000000 */ nop
asm/non_matchings/menu/func_80092E94.s
+1 -1
View File
@@ -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 func_800C4EDC
/* 093EB4 800932B4 0C0313B7 */ jal set_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
+15 -15
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 func_800C4EDC
/* 094A18 80093E18 0C0313B7 */ jal set_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
@@ -77,7 +77,7 @@ glabel func_80093D40
/* 094A58 80093E58 0C0313EF */ jal func_800C4FBC
/* 094A5C 80093E5C AFAA0010 */ sw $t2, 0x10($sp)
/* 094A60 80093E60 24040007 */ li $a0, 7
/* 094A64 80093E64 0C0313DF */ jal func_800C4F7C
/* 094A64 80093E64 0C0313DF */ jal set_dialogue_font
/* 094A68 80093E68 00002825 */ move $a1, $zero
/* 094A6C 80093E6C 24040007 */ li $a0, 7
/* 094A70 80093E70 24050080 */ li $a1, 128
@@ -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 func_800C5000
/* 094ABC 80093EBC 0C031400 */ jal set_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)
@@ -131,7 +131,7 @@ glabel func_80093D40
/* 094B2C 80093F2C AFAB0010 */ sw $t3, 0x10($sp)
/* 094B30 80093F30 26260008 */ addiu $a2, $s1, 8
/* 094B34 80093F34 24040007 */ li $a0, 7
/* 094B38 80093F38 0C03145A */ jal func_800C5168
/* 094B38 80093F38 0C03145A */ jal render_dialogue_text
/* 094B3C 80093F3C 24058000 */ li $a1, -32768
/* 094B40 80093F40 1000000C */ b .L80093F74
/* 094B44 80093F44 8E580000 */ lw $t8, ($s2)
@@ -144,7 +144,7 @@ glabel func_80093D40
/* 094B5C 80093F5C 240F000C */ li $t7, 12
/* 094B60 80093F60 AFAF0014 */ sw $t7, 0x14($sp)
/* 094B64 80093F64 AFAE0010 */ sw $t6, 0x10($sp)
/* 094B68 80093F68 0C03145A */ jal func_800C5168
/* 094B68 80093F68 0C03145A */ jal render_dialogue_text
/* 094B6C 80093F6C 26260008 */ addiu $a2, $s1, 8
/* 094B70 80093F70 8E580000 */ lw $t8, ($s2)
.L80093F74:
@@ -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 func_800C5000
/* 094B98 80093F98 0C031400 */ jal set_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 func_800C5000
/* 094BBC 80093FBC 0C031400 */ jal set_text_colour
/* 094BC0 80093FC0 AFA00010 */ sw $zero, 0x10($sp)
.L80093FC4:
/* 094BC4 80093FC4 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e
@@ -179,7 +179,7 @@ glabel func_80093D40
/* 094BDC 80093FDC AFAB0010 */ sw $t3, 0x10($sp)
/* 094BE0 80093FE0 24040007 */ li $a0, 7
/* 094BE4 80093FE4 24058000 */ li $a1, -32768
/* 094BE8 80093FE8 0C03145A */ jal func_800C5168
/* 094BE8 80093FE8 0C03145A */ jal render_dialogue_text
/* 094BEC 80093FEC 2626001C */ addiu $a2, $s1, 0x1c
/* 094BF0 80093FF0 8E4D0000 */ lw $t5, ($s2)
/* 094BF4 80093FF4 24010002 */ li $at, 2
@@ -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 func_800C5000
/* 094C18 80094018 0C031400 */ jal set_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 func_800C5000
/* 094C3C 8009403C 0C031400 */ jal set_text_colour
/* 094C40 80094040 AFA00010 */ sw $zero, 0x10($sp)
.L80094044:
/* 094C44 80094044 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e
@@ -213,7 +213,7 @@ glabel func_80093D40
/* 094C5C 8009405C AFB90010 */ sw $t9, 0x10($sp)
/* 094C60 80094060 24040007 */ li $a0, 7
/* 094C64 80094064 24058000 */ li $a1, -32768
/* 094C68 80094068 0C03145A */ jal func_800C5168
/* 094C68 80094068 0C03145A */ jal render_dialogue_text
/* 094C6C 8009406C 2626002C */ addiu $a2, $s1, 0x2c
/* 094C70 80094070 10000035 */ b .L80094148
/* 094C74 80094074 00000000 */ nop
@@ -226,7 +226,7 @@ glabel func_80093D40
/* 094C8C 8009408C 256C0001 */ addiu $t4, $t3, 1
/* 094C90 80094090 AFAC0010 */ sw $t4, 0x10($sp)
/* 094C94 80094094 AFAD0014 */ sw $t5, 0x14($sp)
/* 094C98 80094098 0C03145A */ jal func_800C5168
/* 094C98 80094098 0C03145A */ jal render_dialogue_text
/* 094C9C 8009409C 2406000C */ li $a2, 12
/* 094CA0 800940A0 8E6E0000 */ lw $t6, ($s3)
/* 094CA4 800940A4 00008825 */ move $s1, $zero
@@ -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 func_800C5000
/* 094CE4 800940E4 0C031400 */ jal set_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 func_800C5000
/* 094D04 80094104 0C031400 */ jal set_text_colour
/* 094D08 80094108 AFA00010 */ sw $zero, 0x10($sp)
/* 094D0C 8009410C 8E070000 */ lw $a3, ($s0)
.L80094110:
@@ -265,7 +265,7 @@ glabel func_80093D40
/* 094D1C 8009411C AFA90010 */ sw $t1, 0x10($sp)
/* 094D20 80094120 24040007 */ li $a0, 7
/* 094D24 80094124 24058000 */ li $a1, -32768
/* 094D28 80094128 0C03145A */ jal func_800C5168
/* 094D28 80094128 0C03145A */ jal render_dialogue_text
/* 094D2C 8009412C 02403025 */ move $a2, $s2
/* 094D30 80094130 8E6B0000 */ lw $t3, ($s3)
/* 094D34 80094134 26310001 */ addiu $s1, $s1, 1
asm/non_matchings/menu/func_80094D28.s
+13 -13
View File
@@ -337,7 +337,7 @@ glabel L800951CC
/* 095DD4 800951D4 0C031525 */ jal func_800C5494
/* 095DD8 800951D8 24040007 */ li $a0, 7
/* 095DDC 800951DC 24040007 */ li $a0, 7
/* 095DE0 800951E0 0C0313DF */ jal func_800C4F7C
/* 095DE0 800951E0 0C0313DF */ jal set_dialogue_font
/* 095DE4 800951E4 00002825 */ move $a1, $zero
/* 095DE8 800951E8 24040007 */ li $a0, 7
/* 095DEC 800951EC 00002825 */ move $a1, $zero
@@ -398,7 +398,7 @@ 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 func_800C4EDC
/* 095EB8 800952B8 0C0313B7 */ jal set_dialogue_box_coords
/* 095EBC 800952BC 24C6FFFC */ addiu $a2, $a2, -4
/* 095EC0 800952C0 24040007 */ li $a0, 7
/* 095EC4 800952C4 24050040 */ li $a1, 64
@@ -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 func_800C5000
/* 095EF4 800952F4 0C031400 */ jal set_text_colour
/* 095EF8 800952F8 240700FF */ li $a3, 255
/* 095EFC 800952FC 8E380000 */ lw $t8, ($s1)
/* 095F00 80095300 3C028012 */ lui $v0, %hi(D_80126C1C) # $v0, 0x8012
@@ -428,7 +428,7 @@ glabel L800951CC
/* 095F24 80095324 AFAB0010 */ sw $t3, 0x10($sp)
/* 095F28 80095328 24040007 */ li $a0, 7
/* 095F2C 8009532C 24058000 */ li $a1, -32768
/* 095F30 80095330 0C03145A */ jal func_800C5168
/* 095F30 80095330 0C03145A */ jal render_dialogue_text
/* 095F34 80095334 2406000C */ li $a2, 12
/* 095F38 80095338 10000091 */ b .L80095580
/* 095F3C 8009533C 00000000 */ nop
@@ -457,7 +457,7 @@ glabel L800951CC
/* 095F90 80095390 AFB80010 */ sw $t8, 0x10($sp)
/* 095F94 80095394 24040007 */ li $a0, 7
/* 095F98 80095398 24058000 */ li $a1, -32768
/* 095F9C 8009539C 0C03145A */ jal func_800C5168
/* 095F9C 8009539C 0C03145A */ jal render_dialogue_text
/* 095FA0 800953A0 02403025 */ move $a2, $s2
/* 095FA4 800953A4 3C0B8012 */ lui $t3, %hi(D_80126C24) # $t3, 0x8012
/* 095FA8 800953A8 8D6B6C24 */ lw $t3, %lo(D_80126C24)($t3)
@@ -483,7 +483,7 @@ glabel L800951CC
/* 095FF4 800953F4 AFAE0010 */ sw $t6, 0x10($sp)
/* 095FF8 800953F8 24040007 */ li $a0, 7
/* 095FFC 800953FC 24058000 */ li $a1, -32768
/* 096000 80095400 0C03145A */ jal func_800C5168
/* 096000 80095400 0C03145A */ jal render_dialogue_text
/* 096004 80095404 26460008 */ addiu $a2, $s2, 8
/* 096008 80095408 8E390000 */ lw $t9, ($s1)
/* 09600C 8009540C 24010001 */ li $at, 1
@@ -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 func_800C5000
/* 096038 80095438 0C031400 */ jal set_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)
@@ -509,7 +509,7 @@ glabel L800951CC
/* 096058 80095458 AFAB0010 */ sw $t3, 0x10($sp)
/* 09605C 8009545C 24040007 */ li $a0, 7
/* 096060 80095460 24058000 */ li $a1, -32768
/* 096064 80095464 0C03145A */ jal func_800C5168
/* 096064 80095464 0C03145A */ jal render_dialogue_text
/* 096068 80095468 2646001A */ addiu $a2, $s2, 0x1a
/* 09606C 8009546C 8E2D0000 */ lw $t5, ($s1)
/* 096070 80095470 24010002 */ li $at, 2
@@ -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 func_800C5000
/* 096094 80095494 0C031400 */ jal set_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)
@@ -533,7 +533,7 @@ glabel L800951CC
/* 0960B4 800954B4 AFB90010 */ sw $t9, 0x10($sp)
/* 0960B8 800954B8 24040007 */ li $a0, 7
/* 0960BC 800954BC 24058000 */ li $a1, -32768
/* 0960C0 800954C0 0C03145A */ jal func_800C5168
/* 0960C0 800954C0 0C03145A */ jal render_dialogue_text
/* 0960C4 800954C4 2646002A */ addiu $a2, $s2, 0x2a
/* 0960C8 800954C8 1000002D */ b .L80095580
/* 0960CC 800954CC 00000000 */ nop
@@ -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 func_800C5000
/* 096114 80095514 0C031400 */ jal set_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 func_800C5000
/* 096134 80095534 0C031400 */ jal set_text_colour
/* 096138 80095538 AFA00010 */ sw $zero, 0x10($sp)
/* 09613C 8009553C 8E270000 */ lw $a3, ($s1)
.L80095540:
@@ -575,7 +575,7 @@ glabel L800951CC
/* 09614C 8009554C AFAE0010 */ sw $t6, 0x10($sp)
/* 096150 80095550 24040007 */ li $a0, 7
/* 096154 80095554 240500A0 */ li $a1, 160
/* 096158 80095558 0C03145A */ jal func_800C5168
/* 096158 80095558 0C03145A */ jal render_dialogue_text
/* 09615C 8009555C 02403025 */ move $a2, $s2
/* 096160 80095560 3C188012 */ lui $t8, %hi(D_80126C14) # $t8, 0x8012
/* 096164 80095564 8F186C14 */ lw $t8, %lo(D_80126C14)($t8)
asm/non_matchings/menu/func_80096978.s
+12 -12
View File
@@ -424,7 +424,7 @@ 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 func_800C4EDC
/* 097BD0 80096FD0 0C0313B7 */ jal set_dialogue_box_coords
/* 097BD4 80096FD4 240700F0 */ li $a3, 240
/* 097BD8 80096FD8 24040007 */ li $a0, 7
/* 097BDC 80096FDC 24050040 */ li $a1, 64
@@ -433,7 +433,7 @@ glabel func_80096978
/* 097BE8 80096FE8 0C0313EF */ jal func_800C4FBC
/* 097BEC 80096FEC AFA00010 */ sw $zero, 0x10($sp)
/* 097BF0 80096FF0 24040007 */ li $a0, 7
/* 097BF4 80096FF4 0C0313DF */ jal func_800C4F7C
/* 097BF4 80096FF4 0C0313DF */ jal set_dialogue_font
/* 097BF8 80096FF8 00002825 */ move $a1, $zero
/* 097BFC 80096FFC 24040007 */ li $a0, 7
/* 097C00 80097000 00002825 */ move $a1, $zero
@@ -468,7 +468,7 @@ glabel func_80096978
/* 097C70 80097070 AFA200A0 */ sw $v0, 0xa0($sp)
/* 097C74 80097074 25A60008 */ addiu $a2, $t5, 8
/* 097C78 80097078 24040007 */ li $a0, 7
/* 097C7C 8009707C 0C03145A */ jal func_800C5168
/* 097C7C 8009707C 0C03145A */ jal render_dialogue_text
/* 097C80 80097080 24058000 */ li $a1, -32768
/* 097C84 80097084 8E0F0000 */ lw $t7, ($s0)
/* 097C88 80097088 24010001 */ li $at, 1
@@ -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 func_800C5000
/* 097CB0 800970B0 0C031400 */ jal set_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 func_800C5000
/* 097CD4 800970D4 0C031400 */ jal set_text_colour
/* 097CD8 800970D8 AFA00010 */ sw $zero, 0x10($sp)
.L800970DC:
/* 097CDC 800970DC 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e
@@ -504,7 +504,7 @@ glabel func_80096978
/* 097CF8 800970F8 AFB90010 */ sw $t9, 0x10($sp)
/* 097CFC 800970FC 24040007 */ li $a0, 7
/* 097D00 80097100 24058000 */ li $a1, -32768
/* 097D04 80097104 0C03145A */ jal func_800C5168
/* 097D04 80097104 0C03145A */ jal render_dialogue_text
/* 097D08 80097108 24C6001A */ addiu $a2, $a2, 0x1a
/* 097D0C 8009710C 8E0B0000 */ lw $t3, ($s0)
/* 097D10 80097110 24010002 */ li $at, 2
@@ -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 func_800C5000
/* 097D38 80097138 0C031400 */ jal set_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 func_800C5000
/* 097D5C 8009715C 0C031400 */ jal set_text_colour
/* 097D60 80097160 AFA00010 */ sw $zero, 0x10($sp)
.L80097164:
/* 097D64 80097164 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e
@@ -540,7 +540,7 @@ glabel func_80096978
/* 097D80 80097180 AFA90010 */ sw $t1, 0x10($sp)
/* 097D84 80097184 24040007 */ li $a0, 7
/* 097D88 80097188 24058000 */ li $a1, -32768
/* 097D8C 8009718C 0C03145A */ jal func_800C5168
/* 097D8C 8009718C 0C03145A */ jal render_dialogue_text
/* 097D90 80097190 24C6002A */ addiu $a2, $a2, 0x2a
/* 097D94 80097194 10000032 */ b .L80097260
/* 097D98 80097198 00000000 */ nop
@@ -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 func_800C5000
/* 097DEC 800971EC 0C031400 */ jal set_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 func_800C5000
/* 097E14 80097214 0C031400 */ jal set_text_colour
/* 097E18 80097218 AFA200A0 */ sw $v0, 0xa0($sp)
/* 097E1C 8009721C 8FA600A8 */ lw $a2, 0xa8($sp)
.L80097220:
@@ -587,7 +587,7 @@ glabel func_80096978
/* 097E2C 8009722C AFAF0014 */ sw $t7, 0x14($sp)
/* 097E30 80097230 AFAE0010 */ sw $t6, 0x10($sp)
/* 097E34 80097234 24040007 */ li $a0, 7
/* 097E38 80097238 0C03145A */ jal func_800C5168
/* 097E38 80097238 0C03145A */ jal render_dialogue_text
/* 097E3C 8009723C 24050050 */ li $a1, 80
/* 097E40 80097240 8E280000 */ lw $t0, ($s1)
/* 097E44 80097244 8FB800A8 */ lw $t8, 0xa8($sp)
asm/non_matchings/menu/func_80099E8C.s
+8 -8
View File
@@ -446,7 +446,7 @@ 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 func_800C4EDC
/* 09B134 8009A534 0C0313B7 */ jal set_dialogue_box_coords
/* 09B138 8009A538 240700D8 */ li $a3, 216
/* 09B13C 8009A53C 240C00C0 */ li $t4, 192
/* 09B140 8009A540 AFAC0010 */ sw $t4, 0x10($sp)
@@ -456,7 +456,7 @@ glabel func_80099E8C
/* 09B150 8009A550 0C0313EF */ jal func_800C4FBC
/* 09B154 8009A554 00003825 */ move $a3, $zero
/* 09B158 8009A558 24040007 */ li $a0, 7
/* 09B15C 8009A55C 0C0313DF */ jal func_800C4F7C
/* 09B15C 8009A55C 0C0313DF */ jal set_dialogue_font
/* 09B160 8009A560 00002825 */ move $a1, $zero
/* 09B164 8009A564 24040007 */ li $a0, 7
/* 09B168 8009A568 00002825 */ move $a1, $zero
@@ -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 func_800C5000
/* 09B1A8 8009A5A8 0C031400 */ jal set_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 func_800C5000
/* 09B1CC 8009A5CC 0C031400 */ jal set_text_colour
/* 09B1D0 8009A5D0 AFA00010 */ sw $zero, 0x10($sp)
.L8009A5D4:
/* 09B1D4 8009A5D4 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e
@@ -497,7 +497,7 @@ glabel func_80099E8C
/* 09B1EC 8009A5EC AFA90010 */ sw $t1, 0x10($sp)
/* 09B1F0 8009A5F0 24040007 */ li $a0, 7
/* 09B1F4 8009A5F4 24058000 */ li $a1, -32768
/* 09B1F8 8009A5F8 0C03145A */ jal func_800C5168
/* 09B1F8 8009A5F8 0C03145A */ jal render_dialogue_text
/* 09B1FC 8009A5FC 2406000C */ li $a2, 12
/* 09B200 8009A600 8E0B0000 */ lw $t3, ($s0)
/* 09B204 8009A604 24010002 */ li $at, 2
@@ -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 func_800C5000
/* 09B22C 8009A62C 0C031400 */ jal set_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 func_800C5000
/* 09B250 8009A650 0C031400 */ jal set_text_colour
/* 09B254 8009A654 AFA00010 */ sw $zero, 0x10($sp)
.L8009A658:
/* 09B258 8009A658 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e
@@ -532,7 +532,7 @@ glabel func_80099E8C
/* 09B270 8009A670 AFAE0010 */ sw $t6, 0x10($sp)
/* 09B274 8009A674 24040007 */ li $a0, 7
/* 09B278 8009A678 24058000 */ li $a1, -32768
/* 09B27C 8009A67C 0C03145A */ jal func_800C5168
/* 09B27C 8009A67C 0C03145A */ jal render_dialogue_text
/* 09B280 8009A680 2406001C */ li $a2, 28
/* 09B284 8009A684 02E02025 */ move $a0, $s7
/* 09B288 8009A688 00002825 */ move $a1, $zero
asm/non_matchings/menu/render_magic_codes_ui.s
+4 -4
View File
@@ -335,14 +335,14 @@ glabel render_magic_codes_ui
/* 08A784 80089B84 0C031525 */ jal func_800C5494
/* 08A788 80089B88 24040006 */ li $a0, 6
/* 08A78C 80089B8C 24040006 */ li $a0, 6
/* 08A790 80089B90 0C0313DF */ jal func_800C4F7C
/* 08A790 80089B90 0C0313DF */ jal set_dialogue_font
/* 08A794 80089B94 00002825 */ move $a1, $zero
/* 08A798 80089B98 266E001C */ addiu $t6, $s3, 0x1c
/* 08A79C 80089B9C AFAE0010 */ sw $t6, 0x10($sp)
/* 08A7A0 80089BA0 24040006 */ li $a0, 6
/* 08A7A4 80089BA4 2405004C */ li $a1, 76
/* 08A7A8 80089BA8 2666FFE4 */ addiu $a2, $s3, -0x1c
/* 08A7AC 80089BAC 0C0313B7 */ jal func_800C4EDC
/* 08A7AC 80089BAC 0C0313B7 */ jal set_dialogue_box_coords
/* 08A7B0 80089BB0 240700F4 */ li $a3, 244
/* 08A7B4 80089BB4 240F00A0 */ li $t7, 160
/* 08A7B8 80089BB8 AFAF0010 */ sw $t7, 0x10($sp)
@@ -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 func_800C5000
/* 08A81C 80089C1C 0C031400 */ jal set_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)
@@ -386,7 +386,7 @@ glabel render_magic_codes_ui
/* 08A840 80089C40 AFAB0010 */ sw $t3, 0x10($sp)
/* 08A844 80089C44 24040006 */ li $a0, 6
/* 08A848 80089C48 24058000 */ li $a1, -32768
/* 08A84C 80089C4C 0C03145A */ jal func_800C5168
/* 08A84C 80089C4C 0C03145A */ jal render_dialogue_text
/* 08A850 80089C50 02603025 */ move $a2, $s3
/* 08A854 80089C54 13C00003 */ beqz $fp, .L80089C64
/* 08A858 80089C58 00000000 */ nop
asm/non_matchings/menu/render_track_select_setup_ui.s
+2 -2
View File
@@ -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 func_800C4EDC
/* 0921D8 800915D8 0C0313B7 */ jal set_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 func_800C4EDC
/* 0923EC 800917EC 0C0313B7 */ jal set_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
+21 -21
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 func_800C4EDC
/* 09E7D8 8009DBD8 0C0313B7 */ jal set_dialogue_box_coords
/* 09E7DC 8009DBDC AFAC0010 */ sw $t4, 0x10($sp)
/* 09E7E0 8009DBE0 10000007 */ b .L8009DC00
/* 09E7E4 8009DBE4 24040001 */ li $a0, 1
@@ -56,11 +56,11 @@ 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 func_800C4EDC
/* 09E7F4 8009DBF4 0C0313B7 */ jal set_dialogue_box_coords
/* 09E7F8 8009DBF8 240700B8 */ li $a3, 184
/* 09E7FC 8009DBFC 24040001 */ li $a0, 1
.L8009DC00:
/* 09E800 8009DC00 0C0313DF */ jal func_800C4F7C
/* 09E800 8009DC00 0C0313DF */ jal set_dialogue_font
/* 09E804 8009DC04 00002825 */ move $a1, $zero
/* 09E808 8009DC08 AFA00044 */ sw $zero, 0x44($sp)
/* 09E80C 8009DC0C 0C01A955 */ jal get_buttons_pressed_from_player
@@ -68,10 +68,10 @@ glabel tt_menu_loop
/* 09E814 8009DC14 3C018012 */ lui $at, %hi(sDialogueOptionMax) # $at, 0x8012
/* 09E818 8009DC18 A0206504 */ sb $zero, %lo(sDialogueOptionMax)($at)
/* 09E81C 8009DC1C 3C088012 */ lui $t0, %hi(sCurrentMenuID) # $t0, 0x8012
/* 09E820 8009DC20 3C018012 */ lui $at, %hi(D_8012650E) # $at, 0x8012
/* 09E820 8009DC20 3C018012 */ lui $at, %hi(gDialogOptionYOffset) # $at, 0x8012
/* 09E824 8009DC24 240E0020 */ li $t6, 32
/* 09E828 8009DC28 250864E2 */ addiu $t0, %lo(sCurrentMenuID) # addiu $t0, $t0, 0x64e2
/* 09E82C 8009DC2C A02E650E */ sb $t6, %lo(D_8012650E)($at)
/* 09E82C 8009DC2C A02E650E */ sb $t6, %lo(gDialogOptionYOffset)($at)
/* 09E830 8009DC30 81030000 */ lb $v1, ($t0)
/* 09E834 8009DC34 00402025 */ move $a0, $v0
/* 09E838 8009DC38 2C61000B */ sltiu $at, $v1, 0xb
@@ -94,13 +94,13 @@ glabel L8009DC60
/* 09E878 8009DC78 AFB90010 */ sw $t9, 0x10($sp)
/* 09E87C 8009DC7C 24040001 */ li $a0, 1
/* 09E880 8009DC80 24058000 */ li $a1, -32768
/* 09E884 8009DC84 0C03145A */ jal func_800C5168
/* 09E884 8009DC84 0C03145A */ jal render_dialogue_text
/* 09E888 8009DC88 24060006 */ li $a2, 6
/* 09E88C 8009DC8C 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e
/* 09E890 8009DC90 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2)
/* 09E894 8009DC94 24050014 */ li $a1, 20
/* 09E898 8009DC98 8D44011C */ lw $a0, 0x11c($t2)
/* 09E89C 8009DC9C 0C02746E */ jal func_8009D1B8
/* 09E89C 8009DC9C 0C02746E */ jal render_dialogue_option
/* 09E8A0 8009DCA0 24060003 */ li $a2, 3
/* 09E8A4 8009DCA4 0C027B20 */ jal is_in_two_player_adventure
/* 09E8A8 8009DCA8 00000000 */ nop
@@ -114,7 +114,7 @@ glabel L8009DC60
/* 09E8C8 8009DCC8 8D6BF4A0 */ lw $t3, %lo(gMenuText)($t3)
/* 09E8CC 8009DCCC 24050014 */ li $a1, 20
/* 09E8D0 8009DCD0 8D640104 */ lw $a0, 0x104($t3)
/* 09E8D4 8009DCD4 0C02746E */ jal func_8009D1B8
/* 09E8D4 8009DCD4 0C02746E */ jal render_dialogue_option
/* 09E8D8 8009DCD8 00003025 */ move $a2, $zero
/* 09E8DC 8009DCDC 10000006 */ b .L8009DCF8
/* 09E8E0 8009DCE0 00000000 */ nop
@@ -122,7 +122,7 @@ glabel L8009DC60
/* 09E8E4 8009DCE4 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4)
/* 09E8E8 8009DCE8 24050014 */ li $a1, 20
/* 09E8EC 8009DCEC 8D840108 */ lw $a0, 0x108($t4)
/* 09E8F0 8009DCF0 0C02746E */ jal func_8009D1B8
/* 09E8F0 8009DCF0 0C02746E */ jal render_dialogue_option
/* 09E8F4 8009DCF4 00003025 */ move $a2, $zero
.L8009DCF8:
/* 09E8F8 8009DCF8 0C006DE0 */ jal func_8001B780
@@ -132,14 +132,14 @@ glabel L8009DC60
/* 09E908 8009DD08 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5)
/* 09E90C 8009DD0C 24050014 */ li $a1, 20
/* 09E910 8009DD10 8DA4006C */ lw $a0, 0x6c($t5)
/* 09E914 8009DD14 0C02746E */ jal func_8009D1B8
/* 09E914 8009DD14 0C02746E */ jal render_dialogue_option
/* 09E918 8009DD18 24060001 */ li $a2, 1
.L8009DD1C:
/* 09E91C 8009DD1C 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e
/* 09E920 8009DD20 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6)
/* 09E924 8009DD24 24050014 */ li $a1, 20
/* 09E928 8009DD28 8DC40014 */ lw $a0, 0x14($t6)
/* 09E92C 8009DD2C 0C02746E */ jal func_8009D1B8
/* 09E92C 8009DD2C 0C02746E */ jal render_dialogue_option
/* 09E930 8009DD30 24060002 */ li $a2, 2
/* 09E934 8009DD34 0C02749B */ jal func_8009D26C
/* 09E938 8009DD38 00000000 */ nop
@@ -293,7 +293,7 @@ glabel L8009DEF0
/* 09EB48 8009DF48 24040001 */ li $a0, 1
/* 09EB4C 8009DF4C 24058000 */ li $a1, -32768
/* 09EB50 8009DF50 AFA30024 */ sw $v1, 0x24($sp)
/* 09EB54 8009DF54 0C03145A */ jal func_800C5168
/* 09EB54 8009DF54 0C03145A */ jal render_dialogue_text
/* 09EB58 8009DF58 AFA60038 */ sw $a2, 0x38($sp)
/* 09EB5C 8009DF5C 8FA30024 */ lw $v1, 0x24($sp)
/* 09EB60 8009DF60 3C198012 */ lui $t9, %hi(D_801263A4) # $t9, 0x8012
@@ -352,7 +352,7 @@ glabel L8009DFEC
/* 09EC20 8009E020 24040001 */ li $a0, 1
/* 09EC24 8009E024 24058000 */ li $a1, -32768
/* 09EC28 8009E028 AFA30024 */ sw $v1, 0x24($sp)
/* 09EC2C 8009E02C 0C03145A */ jal func_800C5168
/* 09EC2C 8009E02C 0C03145A */ jal render_dialogue_text
/* 09EC30 8009E030 AFA60020 */ sw $a2, 0x20($sp)
/* 09EC34 8009E034 8FA30024 */ lw $v1, 0x24($sp)
/* 09EC38 8009E038 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e
@@ -391,7 +391,7 @@ glabel L8009E098
/* 09ECB0 8009E0B0 AFAF0010 */ sw $t7, 0x10($sp)
/* 09ECB4 8009E0B4 24040001 */ li $a0, 1
/* 09ECB8 8009E0B8 24058000 */ li $a1, -32768
/* 09ECBC 8009E0BC 0C03145A */ jal func_800C5168
/* 09ECBC 8009E0BC 0C03145A */ jal render_dialogue_text
/* 09ECC0 8009E0C0 24060022 */ li $a2, 34
/* 09ECC4 8009E0C4 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e
/* 09ECC8 8009E0C8 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9)
@@ -402,7 +402,7 @@ glabel L8009E098
/* 09ECDC 8009E0DC AFA90010 */ sw $t1, 0x10($sp)
/* 09ECE0 8009E0E0 24040001 */ li $a0, 1
/* 09ECE4 8009E0E4 24058000 */ li $a1, -32768
/* 09ECE8 8009E0E8 0C03145A */ jal func_800C5168
/* 09ECE8 8009E0E8 0C03145A */ jal render_dialogue_text
/* 09ECEC 8009E0EC 24060032 */ li $a2, 50
/* 09ECF0 8009E0F0 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e
/* 09ECF4 8009E0F4 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4)
@@ -413,7 +413,7 @@ glabel L8009E098
/* 09ED08 8009E108 AFAE0010 */ sw $t6, 0x10($sp)
/* 09ED0C 8009E10C 24040001 */ li $a0, 1
/* 09ED10 8009E110 24058000 */ li $a1, -32768
/* 09ED14 8009E114 0C03145A */ jal func_800C5168
/* 09ED14 8009E114 0C03145A */ jal render_dialogue_text
/* 09ED18 8009E118 24060042 */ li $a2, 66
/* 09ED1C 8009E11C 8FAD0040 */ lw $t5, 0x40($sp)
/* 09ED20 8009E120 240400EF */ li $a0, 239
@@ -457,7 +457,7 @@ glabel L8009E194
/* 09EDAC 8009E1AC AFAE0010 */ sw $t6, 0x10($sp)
/* 09EDB0 8009E1B0 24040001 */ li $a0, 1
/* 09EDB4 8009E1B4 24058000 */ li $a1, -32768
/* 09EDB8 8009E1B8 0C03145A */ jal func_800C5168
/* 09EDB8 8009E1B8 0C03145A */ jal render_dialogue_text
/* 09EDBC 8009E1BC 24060022 */ li $a2, 34
/* 09EDC0 8009E1C0 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e
/* 09EDC4 8009E1C4 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5)
@@ -468,7 +468,7 @@ glabel L8009E194
/* 09EDD8 8009E1D8 AFAF0010 */ sw $t7, 0x10($sp)
/* 09EDDC 8009E1DC 24040001 */ li $a0, 1
/* 09EDE0 8009E1E0 24058000 */ li $a1, -32768
/* 09EDE4 8009E1E4 0C03145A */ jal func_800C5168
/* 09EDE4 8009E1E4 0C03145A */ jal render_dialogue_text
/* 09EDE8 8009E1E8 24060032 */ li $a2, 50
/* 09EDEC 8009E1EC 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e
/* 09EDF0 8009E1F0 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9)
@@ -479,7 +479,7 @@ glabel L8009E194
/* 09EE04 8009E204 AFA90010 */ sw $t1, 0x10($sp)
/* 09EE08 8009E208 24040001 */ li $a0, 1
/* 09EE0C 8009E20C 24058000 */ li $a1, -32768
/* 09EE10 8009E210 0C03145A */ jal func_800C5168
/* 09EE10 8009E210 0C03145A */ jal render_dialogue_text
/* 09EE14 8009E214 24060042 */ li $a2, 66
/* 09EE18 8009E218 8FAC0040 */ lw $t4, 0x40($sp)
/* 09EE1C 8009E21C 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
@@ -501,7 +501,7 @@ glabel L8009E23C
/* 09EE54 8009E254 AFAD0010 */ sw $t5, 0x10($sp)
/* 09EE58 8009E258 24040001 */ li $a0, 1
/* 09EE5C 8009E25C 24058000 */ li $a1, -32768
/* 09EE60 8009E260 0C03145A */ jal func_800C5168
/* 09EE60 8009E260 0C03145A */ jal render_dialogue_text
/* 09EE64 8009E264 24060032 */ li $a2, 50
/* 09EE68 8009E268 3C048012 */ lui $a0, %hi(D_80126398) # $a0, 0x8012
/* 09EE6C 8009E26C 24846398 */ addiu $a0, %lo(D_80126398) # addiu $a0, $a0, 0x6398
@@ -600,7 +600,7 @@ glabel L8009E37C
/* 09EFAC 8009E3AC AFAD0014 */ sw $t5, 0x14($sp)
/* 09EFB0 8009E3B0 AFAB0010 */ sw $t3, 0x10($sp)
/* 09EFB4 8009E3B4 24058000 */ li $a1, -32768
/* 09EFB8 8009E3B8 0C03145A */ jal func_800C5168
/* 09EFB8 8009E3B8 0C03145A */ jal render_dialogue_text
/* 09EFBC 8009E3BC 24060006 */ li $a2, 6
.L8009E3C0:
/* 09EFC0 8009E3C0 8FBF001C */ lw $ra, 0x1c($sp)
asm/non_matchings/unknown_032760/func_80042A90.s
+4 -4
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 func_800C4EDC
/* 0437F0 80042BF0 0C0313B7 */ jal set_dialogue_box_coords
/* 0437F4 80042BF4 AFAA0010 */ sw $t2, 0x10($sp)
/* 0437F8 80042BF8 860B0006 */ lh $t3, 6($s0)
/* 0437FC 80042BFC 24040004 */ li $a0, 4
@@ -111,7 +111,7 @@ glabel func_80042A90
/* 043834 80042C34 0C031414 */ jal func_800C5050
/* 043838 80042C38 AFA00010 */ sw $zero, 0x10($sp)
/* 04383C 80042C3C 24040004 */ li $a0, 4
/* 043840 80042C40 0C0313DF */ jal func_800C4F7C
/* 043840 80042C40 0C0313DF */ jal set_dialogue_font
/* 043844 80042C44 00002825 */ move $a1, $zero
/* 043848 80042C48 AFA00010 */ sw $zero, 0x10($sp)
/* 04384C 80042C4C 860E0006 */ lh $t6, 6($s0)
@@ -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 func_800C5000
/* 04386C 80042C6C 0C031400 */ jal set_text_colour
/* 043870 80042C70 240700FF */ li $a3, 255
/* 043874 80042C74 8FB90048 */ lw $t9, 0x48($sp)
/* 043878 80042C78 8FA80050 */ lw $t0, 0x50($sp)
@@ -139,7 +139,7 @@ glabel func_80042A90
/* 0438A4 80042CA4 AFAD0010 */ sw $t5, 0x10($sp)
/* 0438A8 80042CA8 01202825 */ move $a1, $t1
/* 0438AC 80042CAC 25860002 */ addiu $a2, $t4, 2
/* 0438B0 80042CB0 0C03145A */ jal func_800C5168
/* 0438B0 80042CB0 0C03145A */ jal render_dialogue_text
/* 0438B4 80042CB4 24040004 */ li $a0, 4
/* 0438B8 80042CB8 0C03157D */ jal func_800C55F4
/* 0438BC 80042CBC 24040004 */ li $a0, 4
include/structs.h
+19 -17
View File
@@ -55,8 +55,8 @@ typedef struct TextureHeader {
/* 0x00 */ u8 width;
/* 0x01 */ u8 height;
/* 0x02 */ u8 format; // Lower 4 bits determines image format.
// 0 = RGBA32
// 1 = RGBA16
// 0 = RGBA32
// 1 = RGBA16
// 2 = I8
// 3 = I4
// 4 = IA16
@@ -78,7 +78,7 @@ typedef struct TextureHeader {
/* 0x11 */ u8 unk11;
/* 0x12 */ u16 numOfTextures; // For animated textures, static textures are just 0x01. Each texture has it's own header.
/* 0x14 */ u16 frameAdvanceDelay; // How many frames to delay before moving to the next texture.
/* 0x16 */ s16 textureSize; // Size in number of bytes, including the header
/* 0x16 */ s16 textureSize; // Size in number of bytes, including the header
/* 0x18 */ u8 unk18;
/* 0x19 */ u8 unk19;
/* 0x1A */ u8 unk1A;
@@ -629,14 +629,14 @@ typedef struct Object_68 {
u8 pad00[0x20];
s8 unk20;
} Object_68;
/* Size: 0x20 bytes */
typedef struct Object_6C {
u8 pad0[0x4];
s16 unk4;
u8 pad6[0x1A];
} Object_6C;
/* Size: 0x0630 bytes */
typedef struct Object {
/* 0x0000 */ s16 y_rotation;
@@ -984,7 +984,8 @@ typedef struct unk80042178 {
u8 pad0[0x20];
} unk80042178;
typedef struct unk8012A7E8_24 {
//Dialogue Box text (Including background struct)
typedef struct DialogueBox {
u8 unk00;
u8 unk01;
char *unk4;
@@ -1002,19 +1003,20 @@ typedef struct unk8012A7E8_24 {
u8 unk17;
u8 unk18;
u8 unk19;
struct unk8012A7E8_24 *unk1C;
} unk8012A7E8_24;
struct DialogueBox *unk1C;
} DialogueBox;
/* Size: 0x28 bytes */
typedef struct unk8012A7E8 {
// Dialogue Box background
typedef struct DialogueBoxBackground {
s16 xpos;
s16 ypos;
s16 unk4;
s16 unk6;
s16 unk8;
s16 unkA;
s16 unkC;
s16 unkE;
s16 x1;
s16 y1;
s16 x2;
s16 y2;
s16 width;
s16 height;
u8 unk10;
u8 unk11;
u8 unk12;
@@ -1032,7 +1034,7 @@ typedef struct unk8012A7E8 {
u16 unk1E;
s16 unk20;
s16 unk22;
unk8012A7E8_24 *unk24;
} unk8012A7E8;
DialogueBox *unk24;
} DialogueBoxBackground;
#endif
src/font.c
+110 -110
View File
@@ -64,7 +64,7 @@ OSDevMgr __osPiDevMgr = { 0, NULL, NULL, NULL, NULL, NULL, NULL, };
s32 gNumberOfFonts;
FontData *gFonts;
unk8012A7E8 (*D_8012A7E8)[1];
DialogueBoxBackground (*gDialogueBoxBackground)[1];
unk8012A7EC (*D_8012A7EC)[1];
s32 D_8012A7F0;
s8 D_8012A7F4;
@@ -87,40 +87,40 @@ void load_fonts(void) {
gFonts[i].unk28[0] = 0;
}
D_8012A7E8 = allocate_from_main_pool_safe(unk8012A7E8_TOTAL_SIZE + unk8012A7EC_TOTAL_SIZE, COLOR_TAG_YELLOW);
D_8012A7EC = (unk8012A7EC *)((u8 *)D_8012A7E8 + unk8012A7E8_TOTAL_SIZE);
gDialogueBoxBackground = allocate_from_main_pool_safe(DIALOGUEBOXBACKGROUND_TOTAL_SIZE + unk8012A7EC_TOTAL_SIZE, COLOR_TAG_YELLOW);
D_8012A7EC = (unk8012A7EC *)((u8 *)gDialogueBoxBackground + DIALOGUEBOXBACKGROUND_TOTAL_SIZE);
for (i = 0; i < unk8012A7E8_COUNT; i++) {
(*D_8012A7E8)[i].xpos = 0;
(*D_8012A7E8)[i].ypos = 0;
(*D_8012A7E8)[i].unk4 = 0;
(*D_8012A7E8)[i].unk6 = 0;
(*D_8012A7E8)[i].unk8 = SCREEN_WIDTH - 1;
(*D_8012A7E8)[i].unkA = SCREEN_HEIGHT - 1;
(*D_8012A7E8)[i].unkC = SCREEN_WIDTH;
(*D_8012A7E8)[i].unkE = SCREEN_HEIGHT;
(*D_8012A7E8)[i].unk10 = 0xFF;
(*D_8012A7E8)[i].unk11 = 0xFF;
(*D_8012A7E8)[i].unk12 = 0xFF;
(*D_8012A7E8)[i].unk13 = 0;
(*D_8012A7E8)[i].colorRed = 0xFF;
(*D_8012A7E8)[i].colorGreen = 0xFF;
(*D_8012A7E8)[i].colorBlue = 0xFF;
(*D_8012A7E8)[i].colorAlpha = 0;
(*D_8012A7E8)[i].bgRed = 0xFF;
(*D_8012A7E8)[i].bgGreen = 0xFF;
(*D_8012A7E8)[i].bgBlue = 0xFF;
(*D_8012A7E8)[i].bgAlpha = 0;
(*D_8012A7E8)[i].opacity = 0xFF;
(*D_8012A7E8)[i].font = 0xFF;
for (i = 0; i < DIALOGUEBOXBACKGROUND_COUNT; i++) {
(*gDialogueBoxBackground)[i].xpos = 0;
(*gDialogueBoxBackground)[i].ypos = 0;
(*gDialogueBoxBackground)[i].x1 = 0;
(*gDialogueBoxBackground)[i].y1 = 0;
(*gDialogueBoxBackground)[i].x2 = SCREEN_WIDTH - 1;
(*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].opacity = 0xFF;
(*gDialogueBoxBackground)[i].font = 0xFF;
if (i != 0) {
(*D_8012A7E8)[i].unk1E = 0x4000;
(*gDialogueBoxBackground)[i].unk1E = 0x4000;
} else {
(*D_8012A7E8)[i].unk1E = 0;
(*gDialogueBoxBackground)[i].unk1E = 0;
}
(*D_8012A7E8)[i].unk20 = 0;
(*D_8012A7E8)[i].unk22 = 0;
(*D_8012A7E8)[i].unk24 = 0;
(*gDialogueBoxBackground)[i].unk20 = 0;
(*gDialogueBoxBackground)[i].unk22 = 0;
(*gDialogueBoxBackground)[i].unk24 = 0;
}
for (i = 0; i < unk8012A7EC_COUNT; i++) {
(*D_8012A7EC)[i].unk1 = 0xFF;
@@ -195,7 +195,7 @@ GLOBAL_ASM("asm/non_matchings/font/func_800C422C.s")
void set_text_font(s32 arg0) {
if (arg0 < gNumberOfFonts) {
(*D_8012A7E8)[0].font = arg0;
(*gDialogueBoxBackground)[0].font = arg0;
}
}
@@ -222,36 +222,36 @@ GLOBAL_ASM("asm/non_matchings/font/func_800C4318.s")
#endif
void set_text_color(s32 red, s32 green, s32 blue, s32 alpha, s32 opacity) {
(*D_8012A7E8)[0].colorRed = red;
(*D_8012A7E8)[0].colorGreen = green;
(*D_8012A7E8)[0].colorBlue = blue;
(*D_8012A7E8)[0].colorAlpha = alpha;
(*D_8012A7E8)[0].opacity = opacity;
(*gDialogueBoxBackground)[0].colorRed = red;
(*gDialogueBoxBackground)[0].colorGreen = green;
(*gDialogueBoxBackground)[0].colorBlue = blue;
(*gDialogueBoxBackground)[0].colorAlpha = alpha;
(*gDialogueBoxBackground)[0].opacity = opacity;
}
void set_text_background_color(s32 red, s32 green, s32 blue, s32 alpha) {
(*D_8012A7E8)[0].bgRed = red;
(*D_8012A7E8)[0].bgGreen = green;
(*D_8012A7E8)[0].bgBlue = blue;
(*D_8012A7E8)[0].bgAlpha = alpha;
(*gDialogueBoxBackground)[0].bgRed = red;
(*gDialogueBoxBackground)[0].bgGreen = green;
(*gDialogueBoxBackground)[0].bgBlue = blue;
(*gDialogueBoxBackground)[0].bgAlpha = alpha;
}
// Unused?
void func_800C4404(Gfx **displayList, char *text, s32 alignmentFlags) {
func_800C45A4(displayList, &(*D_8012A7E8)[0], text, alignmentFlags, 1.0f);
func_800C45A4(displayList, &(*gDialogueBoxBackground)[0], text, alignmentFlags, 1.0f);
}
void draw_text(Gfx **displayList, s32 xpos, s32 ypos, char *text, s32 alignmentFlags) {
unk8012A7E8 *temp = &(*D_8012A7E8)[0];
temp->xpos = (xpos == -0x8000) ? temp->unkC >> 1 : xpos;
temp->ypos = (ypos == -0x8000) ? temp->unkE >> 1 : ypos;
DialogueBoxBackground *temp = &(*gDialogueBoxBackground)[0];
temp->xpos = (xpos == POS_X_CENTRED) ? temp->width >> 1 : xpos;
temp->ypos = (ypos == POS_X_CENTRED) ? temp->height >> 1 : ypos;
func_800C45A4(displayList, temp, text, alignmentFlags, 1.0f);
}
// Unused?
void func_800C44C0(Gfx **displayList, s32 arg1, char *text, s32 alignmentFlags) {
if (arg1 >= 0 && arg1 < 8) {
unk8012A7E8 *temp = &D_8012A7E8[arg1];
DialogueBoxBackground *temp = &gDialogueBoxBackground[arg1];
func_800C45A4(displayList, temp, text, alignmentFlags, 1.0f);
}
}
@@ -259,9 +259,9 @@ void func_800C44C0(Gfx **displayList, s32 arg1, char *text, s32 alignmentFlags)
// Unused?
void func_800C4510(Gfx **displayList, s32 arg1, s32 xpos, s32 ypos, char *text, s32 alignmentFlags) {
if (arg1 >= 0 && arg1 < 8) {
unk8012A7E8 *temp = &D_8012A7E8[arg1];
temp->xpos = (xpos == -0x8000) ? temp->unkC >> 1 : xpos;
temp->ypos = (ypos == -0x8000) ? temp->unkE >> 1 : ypos;
DialogueBoxBackground *temp = &gDialogueBoxBackground[arg1];
temp->xpos = (xpos == POS_X_CENTRED) ? temp->width >> 1 : xpos;
temp->ypos = (ypos == POS_X_CENTRED) ? temp->height >> 1 : ypos;
func_800C45A4(displayList, temp, text, alignmentFlags, 1.0f);
}
}
@@ -280,7 +280,7 @@ s32 func_800C4DA0(u8 *text, s32 x, s32 font) {
}
diffX = x;
if (font < 0) {
font = (*D_8012A7E8)[0].font;
font = (*gDialogueBoxBackground)[0].font;
}
fontData = &gFonts[font];
while (*text != '\0') {
@@ -313,33 +313,33 @@ s32 func_800C4DA0(u8 *text, s32 x, s32 font) {
GLOBAL_ASM("asm/non_matchings/font/func_800C4DA0.s")
#endif
void func_800C4EDC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
void set_dialogue_box_coords(s32 arg0, s32 x1, s32 y1, s32 x2, s32 y2) {
if (arg0 > 0 && arg0 < 8) {
unk8012A7E8 *temp = &D_8012A7E8[arg0];
DialogueBoxBackground *temp = &gDialogueBoxBackground[arg0];
temp->xpos = 0;
temp->ypos = 0;
if (arg1 < arg3) {
temp->unk4 = (s16)arg1;
temp->unk8 = (s16)arg3;
if (x1 < x2) {
temp->x1 = (s16)x1;
temp->x2 = (s16)x2;
} else {
temp->unk8 = (s16)arg1;
temp->unk4 = (s16)arg3;
temp->x2 = (s16)x1;
temp->x1 = (s16)x2;
}
if (arg2 < arg4) {
temp->unk6 = (s16)arg2;
temp->unkA = (s16)arg4;
if (y1 < y2) {
temp->y1 = (s16)y1;
temp->y2 = (s16)y2;
} else {
temp->unkA = (s16)arg2;
temp->unk6 = (s16)arg4;
temp->y2 = (s16)y1;
temp->y1 = (s16)y2;
}
temp->unkC = (temp->unk8 - temp->unk4) + 1;
temp->unkE = (temp->unkA - temp->unk6) + 1;
temp->width = (temp->x2 - temp->x1) + 1;
temp->height = (temp->y2 - temp->y1) + 1;
}
}
void func_800C4F7C(s32 arg0, s32 font) {
void set_dialogue_font(s32 arg0, s32 font) {
if (arg0 >= 0 && arg0 < 8) {
unk8012A7E8 *temp = &D_8012A7E8[arg0];
DialogueBoxBackground *temp = &gDialogueBoxBackground[arg0];
if (font < gNumberOfFonts) {
temp->font = font;
}
@@ -348,7 +348,7 @@ void func_800C4F7C(s32 arg0, s32 font) {
void func_800C4FBC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
if (arg0 > 0 && arg0 < 8) {
unk8012A7E8 *temp = &D_8012A7E8[arg0];
DialogueBoxBackground *temp = &gDialogueBoxBackground[arg0];
temp->unk10 = arg1;
temp->unk11 = arg2;
temp->unk12 = arg3;
@@ -356,12 +356,12 @@ void func_800C4FBC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
}
}
void func_800C5000(s32 arg0, s32 red, s32 green, s32 blue, s32 alpha, s32 opacity) {
unk8012A7E8 *temp;
void set_text_colour(s32 arg0, s32 red, s32 green, s32 blue, s32 alpha, s32 opacity) {
DialogueBoxBackground *temp;
if (arg0 <= 0 || arg0 >= 8) {
return;
}
temp = &D_8012A7E8[arg0];
temp = &gDialogueBoxBackground[arg0];
temp->colorRed = red;
temp->colorGreen = green;
temp->colorBlue = blue;
@@ -370,11 +370,11 @@ void func_800C5000(s32 arg0, s32 red, s32 green, s32 blue, s32 alpha, s32 opacit
}
void func_800C5050(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
unk8012A7E8 *temp;
DialogueBoxBackground *temp;
if (arg0 <= 0 || arg0 >= 8) {
return;
}
temp = &D_8012A7E8[arg0];
temp = &gDialogueBoxBackground[arg0];
temp->bgRed = arg1;
temp->bgGreen = arg2;
temp->bgBlue = arg3;
@@ -383,40 +383,40 @@ void func_800C5050(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
// Unused?
void func_800C5094(s32 arg0, s32 arg1, s32 arg2) {
unk8012A7E8 *temp;
DialogueBoxBackground *temp;
if (arg0 <= 0 || arg0 >= 8) {
return;
}
temp = &D_8012A7E8[arg0];
temp = &gDialogueBoxBackground[arg0];
temp->unk20 += arg1;
temp->unk22 += arg2;
}
// Unused?
void func_800C50D8(s32 arg0) {
unk8012A7E8 *temp;
DialogueBoxBackground *temp;
if (arg0 <= 0 || arg0 >= 8) {
return;
}
temp = &D_8012A7E8[arg0];
temp = &gDialogueBoxBackground[arg0];
temp->unk20 = 0;
temp->unk22 = 0;
}
// Unused?
void func_800C510C(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
func_800C5168(arg0, (*D_8012A7E8)[arg0].xpos, (*D_8012A7E8)[arg0].ypos, arg1, arg2, arg3);
render_dialogue_text(arg0, (*gDialogueBoxBackground)[arg0].xpos, (*gDialogueBoxBackground)[arg0].ypos, arg1, arg2, arg3);
}
GLOBAL_ASM("asm/non_matchings/font/func_800C5168.s")
GLOBAL_ASM("asm/non_matchings/font/render_dialogue_text.s")
// Unused
void func_800C5428(s32 arg0, unk8012A7E8_24 *arg1) {
unk8012A7E8 *temp;
unk8012A7E8_24 *temp_24;
unk8012A7E8_24 **temp_24_ptr;
void func_800C5428(s32 arg0, DialogueBox *arg1) {
DialogueBoxBackground *temp;
DialogueBox *temp_24;
DialogueBox **temp_24_ptr;
temp = &D_8012A7E8[arg0];
temp = &gDialogueBoxBackground[arg0];
temp_24_ptr = &temp->unk24;
temp_24 = temp->unk24;
while ((temp_24 != NULL) && (temp_24 != arg1)) {
@@ -430,10 +430,10 @@ void func_800C5428(s32 arg0, unk8012A7E8_24 *arg1) {
}
void func_800C5494(s32 arg0) {
unk8012A7E8 *temp;
unk8012A7E8_24 *temp_24, *temp_24_2;
DialogueBoxBackground *temp;
DialogueBox *temp_24, *temp_24_2;
temp = &D_8012A7E8[arg0];
temp = &gDialogueBoxBackground[arg0];
temp_24 = temp->unk24;
if (temp_24 != NULL) {
temp_24_2 = temp_24; // This seems redundant.
@@ -448,9 +448,9 @@ void func_800C5494(s32 arg0) {
// Unused
void func_800C54E8(s32 arg0, unk800C54E8 *arg1, s32 arg2, s32 arg3, s32 arg4) {
FontData *fontData;
unk8012A7E8 *temp;
DialogueBoxBackground *temp;
temp = &D_8012A7E8[arg0];
temp = &gDialogueBoxBackground[arg0];
if (arg1 != NULL) {
if (arg1->unk19 != 0xFF) {
@@ -461,7 +461,7 @@ void func_800C54E8(s32 arg0, unk800C54E8 *arg1, s32 arg2, s32 arg3, s32 arg4) {
arg3 *= fontData->unk22;
break;
case 2:
arg3 *= (temp->unkE / fontData->unk22) * fontData->unk22;
arg3 *= (temp->height / fontData->unk22) * fontData->unk22;
break;
}
arg1->unkC += arg2;
@@ -476,30 +476,30 @@ void func_800C54E8(s32 arg0, unk800C54E8 *arg1, s32 arg2, s32 arg3, s32 arg4) {
}
void func_800C55F4(s32 arg0) {
(*D_8012A7E8)[arg0].unk1E |= 0x8000;
(*gDialogueBoxBackground)[arg0].unk1E |= 0x8000;
}
void func_800C5620(s32 arg0) {
(*D_8012A7E8)[arg0].unk1E &= 0x7FFF;
(*gDialogueBoxBackground)[arg0].unk1E &= 0x7FFF;
}
// Unused?
void func_800C564C(s32 arg0) {
(*D_8012A7E8)[arg0].unk1E |= 0x0001;
(*gDialogueBoxBackground)[arg0].unk1E |= 0x0001;
}
// Unused?
void func_800C5678(s32 arg0) {
(*D_8012A7E8)[arg0].unk1E &= 0xFFFE;
(*gDialogueBoxBackground)[arg0].unk1E &= 0xFFFE;
}
// Unused?
void func_800C56A4(s32 arg0) {
(*D_8012A7E8)[arg0].unk1E |= 0x4000;
(*gDialogueBoxBackground)[arg0].unk1E |= 0x4000;
}
void func_800C56D0(s32 arg0) {
(*D_8012A7E8)[arg0].unk1E &= 0xBFFF;
(*gDialogueBoxBackground)[arg0].unk1E &= 0xBFFF;
}
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 ((*D_8012A7E8)[i].unk1E & 0x8000) {
if ((*D_8012A7E8)[i].unk1E & 0x4000) {
if ((*gDialogueBoxBackground)[i].unk1E & 0x8000) {
if ((*gDialogueBoxBackground)[i].unk1E & 0x4000) {
func_800C5B58(arg0, arg1, arg2, i);
} else {
func_800C5B58(arg0, 0, 0, i);
@@ -581,34 +581,34 @@ void render_fill_rectangle(Gfx **dlist, s32 ulx, s32 uly, s32 lrx, s32 lry) {
}
void func_800C5B58(Gfx **dlist, s32 *arg1, s32 *arg2, s32 arg3) {
unk8012A7E8 *temp;
unk8012A7E8_24 *temp_24;
DialogueBoxBackground *temp;
DialogueBox *temp_24;
s32 i;
s32 x0, x1;
char sp6C[256];
s32 y0, y1;
temp = &D_8012A7E8[arg3];
temp = &gDialogueBoxBackground[arg3];
if (temp->unk13 != 0) {
gSPDisplayList((*dlist)++, &D_800E3690);
gDkrDmaDisplayList((*dlist)++, ((u8 *)&D_800E36C8[1]) + 0x80000000, 2);
gDPSetEnvColor((*dlist)++, 0, 0, 0, 0);
if ((temp->unk8 - temp->unk4) < 10 || (temp->unkA - temp->unk6) < 10) {
render_fill_rectangle(dlist, temp->unk4 - 2, temp->unk6 - 2, temp->unk8 + 2, temp->unkA + 2);
if ((temp->x2 - temp->x1) < 10 || (temp->y2 - temp->y1) < 10) {
render_fill_rectangle(dlist, temp->x1 - 2, temp->y1 - 2, temp->x2 + 2, temp->y2 + 2);
} else {
render_fill_rectangle(dlist, temp->unk4 - 2, temp->unk6 + 2, temp->unk4 + 2, temp->unkA - 2);
render_fill_rectangle(dlist, temp->unk4 - 2, temp->unk6 - 2, temp->unk8 + 2, temp->unk6 + 2);
render_fill_rectangle(dlist, temp->unk8 - 2, temp->unk6 + 2, temp->unk8 + 2, temp->unkA - 2);
render_fill_rectangle(dlist, temp->unk4 - 2, temp->unkA - 2, temp->unk8 + 2, temp->unkA + 2);
render_fill_rectangle(dlist, temp->x1 - 2, temp->y1 + 2, temp->x1 + 2, temp->y2 - 2);
render_fill_rectangle(dlist, temp->x1 - 2, temp->y1 - 2, temp->x2 + 2, temp->y1 + 2);
render_fill_rectangle(dlist, temp->x2 - 2, temp->y1 + 2, temp->x2 + 2, temp->y2 - 2);
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);
for (i = 0; D_800E3710[i] >= 0; i += 5) {
x0 = D_800E3710[i] + temp->unk4;
y0 = (D_800E3710[i + 1]) ? D_800E3710[i + 2] + temp->unkA : D_800E3710[i + 2] + temp->unk6;
x1 = temp->unk8 - D_800E3710[i];
y1 = (D_800E3710[i + 3]) ? D_800E3710[i + 4] + temp->unkA : D_800E3710[i + 4] + temp->unk6;
x0 = D_800E3710[i] + temp->x1;
y0 = (D_800E3710[i + 1]) ? D_800E3710[i + 2] + temp->y2 : D_800E3710[i + 2] + temp->y1;
x1 = temp->x2 - D_800E3710[i];
y1 = (D_800E3710[i + 3]) ? D_800E3710[i + 4] + temp->y2 : D_800E3710[i + 4] + temp->y1;
render_fill_rectangle(dlist, x0, y0, x1, y1);
}
gDPPipeSync((*dlist)++);

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