Matched a few functions, and updated some names / types of variables and other functions (#236)

* Identify the controller pak menu, and get give it a bit more details

* Remove argument for two functions that don't use it. This still matches.

* Match render_controller_pak_ui and do some renaming of some other funcs

* Use more of the enum values for menu text

* Match func_8008832C

* Do some more documenting

* Match menu_controller_pak_loop

* Do some minor documentation for fun

* Match s32_to_string

* Match unload_font

* Match load_font

* Match func_800C4318 and nearly match render_dialogue_text

* Update src/font.c

Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>

* Update src/game_text.c

Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>

* Update src/menu.c

Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>

* Update src/menu.c

Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>

* Update src/menu.c

Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>

* Made some suggested changes

Co-authored-by: Ryan Myers <foldor@gmail.com>
Co-authored-by: AntonioCastelli <aatcastelli@gmail.com>
This commit is contained in:
Ryan Myers
2022-07-26 13:55:30 -04:00
committed by GitHub
co-authored by Ryan Myers AntonioCastelli
parent 9c8456cfee
commit 911fd3daac
19 changed files with 856 additions and 1844 deletions
-30
View File
@@ -1,30 +0,0 @@
glabel func_800C4318
/* 0C4F18 800C4318 3C0F8013 */ lui $t7, %hi(gNumberOfFonts) # $t7, 0x8013
/* 0C4F1C 800C431C 8DEFA7E0 */ lw $t7, %lo(gNumberOfFonts)($t7)
/* 0C4F20 800C4320 AFA50004 */ sw $a1, 4($sp)
/* 0C4F24 800C4324 008F082A */ slt $at, $a0, $t7
/* 0C4F28 800C4328 10200014 */ beqz $at, .L800C437C
/* 0C4F2C 800C432C 30AE00FF */ andi $t6, $a1, 0xff
/* 0C4F30 800C4330 3C198013 */ lui $t9, %hi(gFonts) # $t9, 0x8013
/* 0C4F34 800C4334 8F39A7E4 */ lw $t9, %lo(gFonts)($t9)
/* 0C4F38 800C4338 0004C280 */ sll $t8, $a0, 0xa
/* 0C4F3C 800C433C 03191821 */ addu $v1, $t8, $t9
/* 0C4F40 800C4340 90680028 */ lbu $t0, 0x28($v1)
/* 0C4F44 800C4344 25C5FFE0 */ addiu $a1, $t6, -0x20
/* 0C4F48 800C4348 1100000C */ beqz $t0, .L800C437C
/* 0C4F4C 800C434C 30A900FF */ andi $t1, $a1, 0xff
/* 0C4F50 800C4350 000950C0 */ sll $t2, $t1, 3
/* 0C4F54 800C4354 006A5821 */ addu $t3, $v1, $t2
/* 0C4F58 800C4358 91640100 */ lbu $a0, 0x100($t3)
/* 0C4F5C 800C435C 240100FF */ li $at, 255
/* 0C4F60 800C4360 10810006 */ beq $a0, $at, .L800C437C
/* 0C4F64 800C4364 00001025 */ move $v0, $zero
/* 0C4F68 800C4368 00046080 */ sll $t4, $a0, 2
/* 0C4F6C 800C436C 006C6821 */ addu $t5, $v1, $t4
/* 0C4F70 800C4370 8DA20080 */ lw $v0, 0x80($t5)
/* 0C4F74 800C4374 03E00008 */ jr $ra
/* 0C4F78 800C4378 00000000 */ nop
.L800C437C:
/* 0C4F7C 800C437C 03E00008 */ jr $ra
/* 0C4F80 800C4380 00000000 */ nop
-51
View File
@@ -1,51 +0,0 @@
glabel load_font
/* 0C4D70 800C4170 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 0C4D74 800C4174 3C0E8013 */ lui $t6, %hi(gNumberOfFonts) # $t6, 0x8013
/* 0C4D78 800C4178 8DCEA7E0 */ lw $t6, %lo(gNumberOfFonts)($t6)
/* 0C4D7C 800C417C AFBF0024 */ sw $ra, 0x24($sp)
/* 0C4D80 800C4180 008E082A */ slt $at, $a0, $t6
/* 0C4D84 800C4184 AFB30020 */ sw $s3, 0x20($sp)
/* 0C4D88 800C4188 AFB2001C */ sw $s2, 0x1c($sp)
/* 0C4D8C 800C418C AFB10018 */ sw $s1, 0x18($sp)
/* 0C4D90 800C4190 1020001F */ beqz $at, .L800C4210
/* 0C4D94 800C4194 AFB00014 */ sw $s0, 0x14($sp)
/* 0C4D98 800C4198 3C188013 */ lui $t8, %hi(gFonts) # $t8, 0x8013
/* 0C4D9C 800C419C 8F18A7E4 */ lw $t8, %lo(gFonts)($t8)
/* 0C4DA0 800C41A0 00047A80 */ sll $t7, $a0, 0xa
/* 0C4DA4 800C41A4 01F81021 */ addu $v0, $t7, $t8
/* 0C4DA8 800C41A8 90590028 */ lbu $t9, 0x28($v0)
/* 0C4DAC 800C41AC 24010001 */ li $at, 1
/* 0C4DB0 800C41B0 27280001 */ addiu $t0, $t9, 1
/* 0C4DB4 800C41B4 310900FF */ andi $t1, $t0, 0xff
/* 0C4DB8 800C41B8 15210015 */ bne $t1, $at, .L800C4210
/* 0C4DBC 800C41BC A0480028 */ sb $t0, 0x28($v0)
/* 0C4DC0 800C41C0 844A0040 */ lh $t2, 0x40($v0)
/* 0C4DC4 800C41C4 2413FFFF */ li $s3, -1
/* 0C4DC8 800C41C8 126A0011 */ beq $s3, $t2, .L800C4210
/* 0C4DCC 800C41CC 00008040 */ sll $s0, $zero, 1
/* 0C4DD0 800C41D0 00508821 */ addu $s1, $v0, $s0
/* 0C4DD4 800C41D4 00005880 */ sll $t3, $zero, 2
/* 0C4DD8 800C41D8 86240040 */ lh $a0, 0x40($s1)
/* 0C4DDC 800C41DC 004B9021 */ addu $s2, $v0, $t3
.L800C41E0:
/* 0C4DE0 800C41E0 0C01EB9D */ jal load_texture
/* 0C4DE4 800C41E4 00000000 */ nop
/* 0C4DE8 800C41E8 26100002 */ addiu $s0, $s0, 2
/* 0C4DEC 800C41EC 2A010040 */ slti $at, $s0, 0x40
/* 0C4DF0 800C41F0 AE420080 */ sw $v0, 0x80($s2)
/* 0C4DF4 800C41F4 26310002 */ addiu $s1, $s1, 2
/* 0C4DF8 800C41F8 10200005 */ beqz $at, .L800C4210
/* 0C4DFC 800C41FC 26520004 */ addiu $s2, $s2, 4
/* 0C4E00 800C4200 86240040 */ lh $a0, 0x40($s1)
/* 0C4E04 800C4204 00000000 */ nop
/* 0C4E08 800C4208 1664FFF5 */ bne $s3, $a0, .L800C41E0
/* 0C4E0C 800C420C 00000000 */ nop
.L800C4210:
/* 0C4E10 800C4210 8FBF0024 */ lw $ra, 0x24($sp)
/* 0C4E14 800C4214 8FB00014 */ lw $s0, 0x14($sp)
/* 0C4E18 800C4218 8FB10018 */ lw $s1, 0x18($sp)
/* 0C4E1C 800C421C 8FB2001C */ lw $s2, 0x1c($sp)
/* 0C4E20 800C4220 8FB30020 */ lw $s3, 0x20($sp)
/* 0C4E24 800C4224 03E00008 */ jr $ra
/* 0C4E28 800C4228 27BD0028 */ addiu $sp, $sp, 0x28
-189
View File
@@ -1,189 +0,0 @@
glabel s32_to_string
/* 0C640C 800C580C 8C820000 */ lw $v0, ($a0)
/* 0C6410 800C5810 04A10005 */ bgez $a1, .L800C5828
/* 0C6414 800C5814 00001825 */ move $v1, $zero
/* 0C6418 800C5818 240E002D */ li $t6, 45
/* 0C641C 800C581C A04E0000 */ sb $t6, ($v0)
/* 0C6420 800C5820 24420001 */ addiu $v0, $v0, 1
/* 0C6424 800C5824 00052823 */ negu $a1, $a1
.L800C5828:
/* 0C6428 800C5828 3C07800E */ lui $a3, %hi(gDescPowsOf10) # $a3, 0x800e
/* 0C642C 800C582C 8CE736EC */ lw $a3, %lo(gDescPowsOf10)($a3)
/* 0C6430 800C5830 24060001 */ li $a2, 1
/* 0C6434 800C5834 00A7082A */ slt $at, $a1, $a3
/* 0C6438 800C5838 14200015 */ bnez $at, .L800C5890
/* 0C643C 800C583C 24090030 */ li $t1, 48
/* 0C6440 800C5840 00A7001A */ div $zero, $a1, $a3
/* 0C6444 800C5844 24030001 */ li $v1, 1
/* 0C6448 800C5848 14E00002 */ bnez $a3, .L800C5854
/* 0C644C 800C584C 00000000 */ nop
/* 0C6450 800C5850 0007000D */ break 7
.L800C5854:
/* 0C6454 800C5854 2401FFFF */ li $at, -1
/* 0C6458 800C5858 14E10004 */ bne $a3, $at, .L800C586C
/* 0C645C 800C585C 3C018000 */ lui $at, 0x8000
/* 0C6460 800C5860 14A10002 */ bne $a1, $at, .L800C586C
/* 0C6464 800C5864 00000000 */ nop
/* 0C6468 800C5868 0006000D */ break 6
.L800C586C:
/* 0C646C 800C586C 00005812 */ mflo $t3
/* 0C6470 800C5870 25690030 */ addiu $t1, $t3, 0x30
/* 0C6474 800C5874 313800FF */ andi $t8, $t1, 0xff
/* 0C6478 800C5878 01670019 */ multu $t3, $a3
/* 0C647C 800C587C 03004825 */ move $t1, $t8
/* 0C6480 800C5880 01605025 */ move $t2, $t3
/* 0C6484 800C5884 00007812 */ mflo $t7
/* 0C6488 800C5888 00AF2823 */ subu $a1, $a1, $t7
/* 0C648C 800C588C 00000000 */ nop
.L800C5890:
/* 0C6490 800C5890 10600003 */ beqz $v1, .L800C58A0
/* 0C6494 800C5894 0006C880 */ sll $t9, $a2, 2
/* 0C6498 800C5898 A0490000 */ sb $t1, ($v0)
/* 0C649C 800C589C 24420001 */ addiu $v0, $v0, 1
.L800C58A0:
/* 0C64A0 800C58A0 3C0D800E */ lui $t5, %hi(gDescPowsOf10) # $t5, 0x800e
/* 0C64A4 800C58A4 25AD36EC */ addiu $t5, %lo(gDescPowsOf10) # addiu $t5, $t5, 0x36ec
/* 0C64A8 800C58A8 3C0C800E */ lui $t4, %hi(sDialogueBoxDimensions) # $t4, 0x800e
/* 0C64AC 800C58AC 258C3710 */ addiu $t4, %lo(sDialogueBoxDimensions) # addiu $t4, $t4, 0x3710
/* 0C64B0 800C58B0 032D4021 */ addu $t0, $t9, $t5
.L800C58B4:
/* 0C64B4 800C58B4 8D060000 */ lw $a2, ($t0)
/* 0C64B8 800C58B8 24090030 */ li $t1, 48
/* 0C64BC 800C58BC 00A6082A */ slt $at, $a1, $a2
/* 0C64C0 800C58C0 14200015 */ bnez $at, .L800C5918
/* 0C64C4 800C58C4 00C03825 */ move $a3, $a2
/* 0C64C8 800C58C8 00A6001A */ div $zero, $a1, $a2
/* 0C64CC 800C58CC 24030001 */ li $v1, 1
/* 0C64D0 800C58D0 14C00002 */ bnez $a2, .L800C58DC
/* 0C64D4 800C58D4 00000000 */ nop
/* 0C64D8 800C58D8 0007000D */ break 7
.L800C58DC:
/* 0C64DC 800C58DC 2401FFFF */ li $at, -1
/* 0C64E0 800C58E0 14C10004 */ bne $a2, $at, .L800C58F4
/* 0C64E4 800C58E4 3C018000 */ lui $at, 0x8000
/* 0C64E8 800C58E8 14A10002 */ bne $a1, $at, .L800C58F4
/* 0C64EC 800C58EC 00000000 */ nop
/* 0C64F0 800C58F0 0006000D */ break 6
.L800C58F4:
/* 0C64F4 800C58F4 00003812 */ mflo $a3
/* 0C64F8 800C58F8 24E90030 */ addiu $t1, $a3, 0x30
/* 0C64FC 800C58FC 312F00FF */ andi $t7, $t1, 0xff
/* 0C6500 800C5900 00E60019 */ multu $a3, $a2
/* 0C6504 800C5904 00E05025 */ move $t2, $a3
/* 0C6508 800C5908 01E04825 */ move $t1, $t7
/* 0C650C 800C590C 00007012 */ mflo $t6
/* 0C6510 800C5910 00AE2823 */ subu $a1, $a1, $t6
/* 0C6514 800C5914 00000000 */ nop
.L800C5918:
/* 0C6518 800C5918 10600003 */ beqz $v1, .L800C5928
/* 0C651C 800C591C 00000000 */ nop
/* 0C6520 800C5920 A0490000 */ sb $t1, ($v0)
/* 0C6524 800C5924 24420001 */ addiu $v0, $v0, 1
.L800C5928:
/* 0C6528 800C5928 8D070004 */ lw $a3, 4($t0)
/* 0C652C 800C592C 24090030 */ li $t1, 48
/* 0C6530 800C5930 00A7082A */ slt $at, $a1, $a3
/* 0C6534 800C5934 14200015 */ bnez $at, .L800C598C
/* 0C6538 800C5938 00000000 */ nop
/* 0C653C 800C593C 00A7001A */ div $zero, $a1, $a3
/* 0C6540 800C5940 24030001 */ li $v1, 1
/* 0C6544 800C5944 14E00002 */ bnez $a3, .L800C5950
/* 0C6548 800C5948 00000000 */ nop
/* 0C654C 800C594C 0007000D */ break 7
.L800C5950:
/* 0C6550 800C5950 2401FFFF */ li $at, -1
/* 0C6554 800C5954 14E10004 */ bne $a3, $at, .L800C5968
/* 0C6558 800C5958 3C018000 */ lui $at, 0x8000
/* 0C655C 800C595C 14A10002 */ bne $a1, $at, .L800C5968
/* 0C6560 800C5960 00000000 */ nop
/* 0C6564 800C5964 0006000D */ break 6
.L800C5968:
/* 0C6568 800C5968 00005812 */ mflo $t3
/* 0C656C 800C596C 25690030 */ addiu $t1, $t3, 0x30
/* 0C6570 800C5970 313900FF */ andi $t9, $t1, 0xff
/* 0C6574 800C5974 01670019 */ multu $t3, $a3
/* 0C6578 800C5978 03204825 */ move $t1, $t9
/* 0C657C 800C597C 01605025 */ move $t2, $t3
/* 0C6580 800C5980 0000C012 */ mflo $t8
/* 0C6584 800C5984 00B82823 */ subu $a1, $a1, $t8
/* 0C6588 800C5988 00000000 */ nop
.L800C598C:
/* 0C658C 800C598C 10600003 */ beqz $v1, .L800C599C
/* 0C6590 800C5990 00000000 */ nop
/* 0C6594 800C5994 A0490000 */ sb $t1, ($v0)
/* 0C6598 800C5998 24420001 */ addiu $v0, $v0, 1
.L800C599C:
/* 0C659C 800C599C 8D070008 */ lw $a3, 8($t0)
/* 0C65A0 800C59A0 24090030 */ li $t1, 48
/* 0C65A4 800C59A4 00A7082A */ slt $at, $a1, $a3
/* 0C65A8 800C59A8 14200015 */ bnez $at, .L800C5A00
/* 0C65AC 800C59AC 00000000 */ nop
/* 0C65B0 800C59B0 00A7001A */ div $zero, $a1, $a3
/* 0C65B4 800C59B4 24030001 */ li $v1, 1
/* 0C65B8 800C59B8 14E00002 */ bnez $a3, .L800C59C4
/* 0C65BC 800C59BC 00000000 */ nop
/* 0C65C0 800C59C0 0007000D */ break 7
.L800C59C4:
/* 0C65C4 800C59C4 2401FFFF */ li $at, -1
/* 0C65C8 800C59C8 14E10004 */ bne $a3, $at, .L800C59DC
/* 0C65CC 800C59CC 3C018000 */ lui $at, 0x8000
/* 0C65D0 800C59D0 14A10002 */ bne $a1, $at, .L800C59DC
/* 0C65D4 800C59D4 00000000 */ nop
/* 0C65D8 800C59D8 0006000D */ break 6
.L800C59DC:
/* 0C65DC 800C59DC 00005812 */ mflo $t3
/* 0C65E0 800C59E0 25690030 */ addiu $t1, $t3, 0x30
/* 0C65E4 800C59E4 312E00FF */ andi $t6, $t1, 0xff
/* 0C65E8 800C59E8 01670019 */ multu $t3, $a3
/* 0C65EC 800C59EC 01C04825 */ move $t1, $t6
/* 0C65F0 800C59F0 01605025 */ move $t2, $t3
/* 0C65F4 800C59F4 00006812 */ mflo $t5
/* 0C65F8 800C59F8 00AD2823 */ subu $a1, $a1, $t5
/* 0C65FC 800C59FC 00000000 */ nop
.L800C5A00:
/* 0C6600 800C5A00 10600003 */ beqz $v1, .L800C5A10
/* 0C6604 800C5A04 00000000 */ nop
/* 0C6608 800C5A08 A0490000 */ sb $t1, ($v0)
/* 0C660C 800C5A0C 24420001 */ addiu $v0, $v0, 1
.L800C5A10:
/* 0C6610 800C5A10 8D07000C */ lw $a3, 0xc($t0)
/* 0C6614 800C5A14 25080010 */ addiu $t0, $t0, 0x10
/* 0C6618 800C5A18 00A7082A */ slt $at, $a1, $a3
/* 0C661C 800C5A1C 14200015 */ bnez $at, .L800C5A74
/* 0C6620 800C5A20 24090030 */ li $t1, 48
/* 0C6624 800C5A24 00A7001A */ div $zero, $a1, $a3
/* 0C6628 800C5A28 24030001 */ li $v1, 1
/* 0C662C 800C5A2C 14E00002 */ bnez $a3, .L800C5A38
/* 0C6630 800C5A30 00000000 */ nop
/* 0C6634 800C5A34 0007000D */ break 7
.L800C5A38:
/* 0C6638 800C5A38 2401FFFF */ li $at, -1
/* 0C663C 800C5A3C 14E10004 */ bne $a3, $at, .L800C5A50
/* 0C6640 800C5A40 3C018000 */ lui $at, 0x8000
/* 0C6644 800C5A44 14A10002 */ bne $a1, $at, .L800C5A50
/* 0C6648 800C5A48 00000000 */ nop
/* 0C664C 800C5A4C 0006000D */ break 6
.L800C5A50:
/* 0C6650 800C5A50 00005812 */ mflo $t3
/* 0C6654 800C5A54 25690030 */ addiu $t1, $t3, 0x30
/* 0C6658 800C5A58 313800FF */ andi $t8, $t1, 0xff
/* 0C665C 800C5A5C 01670019 */ multu $t3, $a3
/* 0C6660 800C5A60 03004825 */ move $t1, $t8
/* 0C6664 800C5A64 01605025 */ move $t2, $t3
/* 0C6668 800C5A68 00007812 */ mflo $t7
/* 0C666C 800C5A6C 00AF2823 */ subu $a1, $a1, $t7
/* 0C6670 800C5A70 00000000 */ nop
.L800C5A74:
/* 0C6674 800C5A74 10600003 */ beqz $v1, .L800C5A84
/* 0C6678 800C5A78 00000000 */ nop
/* 0C667C 800C5A7C A0490000 */ sb $t1, ($v0)
/* 0C6680 800C5A80 24420001 */ addiu $v0, $v0, 1
.L800C5A84:
/* 0C6684 800C5A84 150CFF8B */ bne $t0, $t4, .L800C58B4
/* 0C6688 800C5A88 00000000 */ nop
/* 0C668C 800C5A8C 24B90030 */ addiu $t9, $a1, 0x30
/* 0C6690 800C5A90 A0590000 */ sb $t9, ($v0)
/* 0C6694 800C5A94 24420001 */ addiu $v0, $v0, 1
/* 0C6698 800C5A98 03E00008 */ jr $ra
/* 0C669C 800C5A9C AC820000 */ sw $v0, ($a0)
-52
View File
@@ -1,52 +0,0 @@
glabel unload_font
/* 0C4E2C 800C422C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 0C4E30 800C4230 3C0E8013 */ lui $t6, %hi(gNumberOfFonts) # $t6, 0x8013
/* 0C4E34 800C4234 8DCEA7E0 */ lw $t6, %lo(gNumberOfFonts)($t6)
/* 0C4E38 800C4238 AFBF0024 */ sw $ra, 0x24($sp)
/* 0C4E3C 800C423C 008E082A */ slt $at, $a0, $t6
/* 0C4E40 800C4240 AFB30020 */ sw $s3, 0x20($sp)
/* 0C4E44 800C4244 AFB2001C */ sw $s2, 0x1c($sp)
/* 0C4E48 800C4248 AFB10018 */ sw $s1, 0x18($sp)
/* 0C4E4C 800C424C 10200020 */ beqz $at, .L800C42D0
/* 0C4E50 800C4250 AFB00014 */ sw $s0, 0x14($sp)
/* 0C4E54 800C4254 3C188013 */ lui $t8, %hi(gFonts) # $t8, 0x8013
/* 0C4E58 800C4258 8F18A7E4 */ lw $t8, %lo(gFonts)($t8)
/* 0C4E5C 800C425C 00047A80 */ sll $t7, $a0, 0xa
/* 0C4E60 800C4260 01F89021 */ addu $s2, $t7, $t8
/* 0C4E64 800C4264 92420028 */ lbu $v0, 0x28($s2)
/* 0C4E68 800C4268 00000000 */ nop
/* 0C4E6C 800C426C 18400018 */ blez $v0, .L800C42D0
/* 0C4E70 800C4270 2459FFFF */ addiu $t9, $v0, -1
/* 0C4E74 800C4274 332800FF */ andi $t0, $t9, 0xff
/* 0C4E78 800C4278 15000015 */ bnez $t0, .L800C42D0
/* 0C4E7C 800C427C A2590028 */ sb $t9, 0x28($s2)
/* 0C4E80 800C4280 86490040 */ lh $t1, 0x40($s2)
/* 0C4E84 800C4284 2413FFFF */ li $s3, -1
/* 0C4E88 800C4288 12690011 */ beq $s3, $t1, .L800C42D0
/* 0C4E8C 800C428C 00008825 */ move $s1, $zero
/* 0C4E90 800C4290 00005080 */ sll $t2, $zero, 2
/* 0C4E94 800C4294 024A8021 */ addu $s0, $s2, $t2
.L800C4298:
/* 0C4E98 800C4298 8E040080 */ lw $a0, 0x80($s0)
/* 0C4E9C 800C429C 0C01ECAF */ jal free_texture
/* 0C4EA0 800C42A0 00000000 */ nop
/* 0C4EA4 800C42A4 26310001 */ addiu $s1, $s1, 1
/* 0C4EA8 800C42A8 2A210020 */ slti $at, $s1, 0x20
/* 0C4EAC 800C42AC AE000080 */ sw $zero, 0x80($s0)
/* 0C4EB0 800C42B0 10200007 */ beqz $at, .L800C42D0
/* 0C4EB4 800C42B4 26100004 */ addiu $s0, $s0, 4
/* 0C4EB8 800C42B8 00115840 */ sll $t3, $s1, 1
/* 0C4EBC 800C42BC 024B6021 */ addu $t4, $s2, $t3
/* 0C4EC0 800C42C0 858D0040 */ lh $t5, 0x40($t4)
/* 0C4EC4 800C42C4 00000000 */ nop
/* 0C4EC8 800C42C8 166DFFF3 */ bne $s3, $t5, .L800C4298
/* 0C4ECC 800C42CC 00000000 */ nop
.L800C42D0:
/* 0C4ED0 800C42D0 8FBF0024 */ lw $ra, 0x24($sp)
/* 0C4ED4 800C42D4 8FB00014 */ lw $s0, 0x14($sp)
/* 0C4ED8 800C42D8 8FB10018 */ lw $s1, 0x18($sp)
/* 0C4EDC 800C42DC 8FB2001C */ lw $s2, 0x1c($sp)
/* 0C4EE0 800C42E0 8FB30020 */ lw $s3, 0x20($sp)
/* 0C4EE4 800C42E4 03E00008 */ jr $ra
/* 0C4EE8 800C42E8 27BD0028 */ addiu $sp, $sp, 0x28
+10 -10
View File
@@ -12,23 +12,23 @@ glabel func_800C2B00
/* 0C3728 800C2B28 AFB00020 */ sw $s0, 0x20($sp)
/* 0C372C 800C2B2C 0C031525 */ jal assign_dialogue_box_id
/* 0C3730 800C2B30 24040006 */ li $a0, 6
/* 0C3734 800C2B34 3C118013 */ lui $s1, %hi(D_8012A7B4) # $s1, 0x8013
/* 0C3738 800C2B38 2631A7B4 */ addiu $s1, %lo(D_8012A7B4) # addiu $s1, $s1, -0x584c
/* 0C373C 800C2B3C 3C108013 */ lui $s0, %hi(D_8012A7B0) # $s0, 0x8013
/* 0C3740 800C2B40 3C158013 */ lui $s5, %hi(D_8012A7AE) # $s5, 0x8013
/* 0C3744 800C2B44 3C168013 */ lui $s6, %hi(D_8012A7B2) # $s6, 0x8013
/* 0C3734 800C2B34 3C118013 */ lui $s1, %hi(sDialogueYPos2) # $s1, 0x8013
/* 0C3738 800C2B38 2631A7B4 */ addiu $s1, %lo(sDialogueYPos2) # addiu $s1, $s1, -0x584c
/* 0C373C 800C2B3C 3C108013 */ lui $s0, %hi(sDialogueYPos1) # $s0, 0x8013
/* 0C3740 800C2B40 3C158013 */ lui $s5, %hi(sDialogueXPos1) # $s5, 0x8013
/* 0C3744 800C2B44 3C168013 */ lui $s6, %hi(sDialogueXPos2) # $s6, 0x8013
/* 0C3748 800C2B48 862E0000 */ lh $t6, ($s1)
/* 0C374C 800C2B4C 26D6A7B2 */ addiu $s6, %lo(D_8012A7B2) # addiu $s6, $s6, -0x584e
/* 0C3750 800C2B50 26B5A7AE */ addiu $s5, %lo(D_8012A7AE) # addiu $s5, $s5, -0x5852
/* 0C3754 800C2B54 2610A7B0 */ addiu $s0, %lo(D_8012A7B0) # addiu $s0, $s0, -0x5850
/* 0C374C 800C2B4C 26D6A7B2 */ addiu $s6, %lo(sDialogueXPos2) # addiu $s6, $s6, -0x584e
/* 0C3750 800C2B50 26B5A7AE */ addiu $s5, %lo(sDialogueXPos1) # addiu $s5, $s5, -0x5852
/* 0C3754 800C2B54 2610A7B0 */ addiu $s0, %lo(sDialogueYPos1) # addiu $s0, $s0, -0x5850
/* 0C3758 800C2B58 86060000 */ lh $a2, ($s0)
/* 0C375C 800C2B5C 86A50000 */ lh $a1, ($s5)
/* 0C3760 800C2B60 86C70000 */ lh $a3, ($s6)
/* 0C3764 800C2B64 24040006 */ li $a0, 6
/* 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
/* 0C3770 800C2B70 3C178013 */ lui $s7, %hi(sDialogueAlpha) # $s7, 0x8013
/* 0C3774 800C2B74 26F7A7A8 */ addiu $s7, %lo(sDialogueAlpha) # addiu $s7, $s7, -0x5858
/* 0C3778 800C2B78 86EF0000 */ lh $t7, ($s7)
/* 0C377C 800C2B7C 24040006 */ li $a0, 6
/* 0C3780 800C2B80 000FC080 */ sll $t8, $t7, 2
-121
View File
@@ -1,121 +0,0 @@
glabel func_8008832C
/* 088F2C 8008832C 27BDFFF0 */ addiu $sp, $sp, -0x10
/* 088F30 80088330 AFB10008 */ sw $s1, 8($sp)
/* 088F34 80088334 3C078012 */ lui $a3, %hi(D_80126BC8) # $a3, 0x8012
/* 088F38 80088338 3C0E8012 */ lui $t6, %hi(sControllerPakFatalErrorFound) # $t6, 0x8012
/* 088F3C 8008833C 24E76BC8 */ addiu $a3, %lo(D_80126BC8) # addiu $a3, $a3, 0x6bc8
/* 088F40 80088340 AFB2000C */ sw $s2, 0xc($sp)
/* 088F44 80088344 AFB00004 */ sw $s0, 4($sp)
/* 088F48 80088348 25CE6A34 */ addiu $t6, %lo(sControllerPakFatalErrorFound) # addiu $t6, $t6, 0x6a34
/* 088F4C 8008834C 3C118012 */ lui $s1, %hi(sControllerPakBadData) # $s1, 0x8012
/* 088F50 80088350 3C0C8012 */ lui $t4, %hi(sControllerPakDataPresent) # $t4, 0x8012
/* 088F54 80088354 3C0B8012 */ lui $t3, %hi(sControllerPakNoFreeSpace) # $t3, 0x8012
/* 088F58 80088358 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e
/* 088F5C 8008835C 3C08800E */ lui $t0, %hi(D_800DFCB4) # $t0, 0x800e
/* 088F60 80088360 00001025 */ move $v0, $zero
/* 088F64 80088364 ACE00000 */ sw $zero, ($a3)
/* 088F68 80088368 2508FCB4 */ addiu $t0, %lo(D_800DFCB4) # addiu $t0, $t0, -0x34c
/* 088F6C 8008836C 2529F4A0 */ addiu $t1, %lo(gMenuText) # addiu $t1, $t1, -0xb60
/* 088F70 80088370 256B6A38 */ addiu $t3, %lo(sControllerPakNoFreeSpace) # addiu $t3, $t3, 0x6a38
/* 088F74 80088374 258C6A60 */ addiu $t4, %lo(sControllerPakDataPresent) # addiu $t4, $t4, 0x6a60
/* 088F78 80088378 26316A3C */ addiu $s1, %lo(sControllerPakBadData) # addiu $s1, $s1, 0x6a3c
/* 088F7C 8008837C 000E2021 */ addu $a0, $zero, $t6
/* 088F80 80088380 24100002 */ li $s0, 2
/* 088F84 80088384 24120003 */ li $s2, 3
/* 088F88 80088388 00001825 */ move $v1, $zero
/* 088F8C 8008838C 240D0001 */ li $t5, 1
/* 088F90 80088390 240A0001 */ li $t2, 1
.L80088394:
/* 088F94 80088394 908F0000 */ lbu $t7, ($a0)
/* 088F98 80088398 00000000 */ nop
/* 088F9C 8008839C 11E00017 */ beqz $t7, .L800883FC
/* 088FA0 800883A0 0163C021 */ addu $t8, $t3, $v1
/* 088FA4 800883A4 8D250000 */ lw $a1, ($t1)
/* 088FA8 800883A8 00037080 */ sll $t6, $v1, 2
/* 088FAC 800883AC 8CB80100 */ lw $t8, 0x100($a1)
/* 088FB0 800883B0 00AE7821 */ addu $t7, $a1, $t6
/* 088FB4 800883B4 AD180014 */ sw $t8, 0x14($t0)
/* 088FB8 800883B8 8CB90100 */ lw $t9, 0x100($a1)
/* 088FBC 800883BC 01401025 */ move $v0, $t2
/* 088FC0 800883C0 AD190034 */ sw $t9, 0x34($t0)
/* 088FC4 800883C4 8DF80158 */ lw $t8, 0x158($t7)
/* 088FC8 800883C8 00000000 */ nop
/* 088FCC 800883CC AD180054 */ sw $t8, 0x54($t0)
/* 088FD0 800883D0 8CB9017C */ lw $t9, 0x17c($a1)
/* 088FD4 800883D4 00000000 */ nop
/* 088FD8 800883D8 AD190074 */ sw $t9, 0x74($t0)
/* 088FDC 800883DC 8CAE028C */ lw $t6, 0x28c($a1)
/* 088FE0 800883E0 00000000 */ nop
/* 088FE4 800883E4 AD0E0094 */ sw $t6, 0x94($t0)
/* 088FE8 800883E8 8CAF0290 */ lw $t7, 0x290($a1)
/* 088FEC 800883EC ACEA0000 */ sw $t2, ($a3)
/* 088FF0 800883F0 10000035 */ b .L800884C8
/* 088FF4 800883F4 AD0F00B4 */ sw $t7, 0xb4($t0)
/* 088FF8 800883F8 0163C021 */ addu $t8, $t3, $v1
.L800883FC:
/* 088FFC 800883FC 93190000 */ lbu $t9, ($t8)
/* 089000 80088400 01833021 */ addu $a2, $t4, $v1
/* 089004 80088404 1320001A */ beqz $t9, .L80088470
/* 089008 80088408 02237021 */ addu $t6, $s1, $v1
/* 08900C 8008840C 90CE0000 */ lbu $t6, ($a2)
/* 089010 80088410 00000000 */ nop
/* 089014 80088414 15C00016 */ bnez $t6, .L80088470
/* 089018 80088418 02237021 */ addu $t6, $s1, $v1
/* 08901C 8008841C 8D250000 */ lw $a1, ($t1)
/* 089020 80088420 0003C880 */ sll $t9, $v1, 2
/* 089024 80088424 8CAF0260 */ lw $t7, 0x260($a1)
/* 089028 80088428 00B97021 */ addu $t6, $a1, $t9
/* 08902C 8008842C AD0F0014 */ sw $t7, 0x14($t0)
/* 089030 80088430 8CB80260 */ lw $t8, 0x260($a1)
/* 089034 80088434 01401025 */ move $v0, $t2
/* 089038 80088438 AD180034 */ sw $t8, 0x34($t0)
/* 08903C 8008843C 8DCF0158 */ lw $t7, 0x158($t6)
/* 089040 80088440 00000000 */ nop
/* 089044 80088444 AD0F0054 */ sw $t7, 0x54($t0)
/* 089048 80088448 8CB80110 */ lw $t8, 0x110($a1)
/* 08904C 8008844C 00000000 */ nop
/* 089050 80088450 AD180074 */ sw $t8, 0x74($t0)
/* 089054 80088454 8CB90188 */ lw $t9, 0x188($a1)
/* 089058 80088458 AD0000B4 */ sw $zero, 0xb4($t0)
/* 08905C 8008845C A0CD0000 */ sb $t5, ($a2)
/* 089060 80088460 ACF00000 */ sw $s0, ($a3)
/* 089064 80088464 10000018 */ b .L800884C8
/* 089068 80088468 AD190094 */ sw $t9, 0x94($t0)
/* 08906C 8008846C 02237021 */ addu $t6, $s1, $v1
.L80088470:
/* 089070 80088470 91CF0000 */ lbu $t7, ($t6)
/* 089074 80088474 00000000 */ nop
/* 089078 80088478 11E00013 */ beqz $t7, .L800884C8
/* 08907C 8008847C 00000000 */ nop
/* 089080 80088480 8D250000 */ lw $a1, ($t1)
/* 089084 80088484 00037080 */ sll $t6, $v1, 2
/* 089088 80088488 8CB80260 */ lw $t8, 0x260($a1)
/* 08908C 8008848C 00AE7821 */ addu $t7, $a1, $t6
/* 089090 80088490 AD180014 */ sw $t8, 0x14($t0)
/* 089094 80088494 8CB90260 */ lw $t9, 0x260($a1)
/* 089098 80088498 01401025 */ move $v0, $t2
/* 08909C 8008849C AD190034 */ sw $t9, 0x34($t0)
/* 0890A0 800884A0 8DF80158 */ lw $t8, 0x158($t7)
/* 0890A4 800884A4 00000000 */ nop
/* 0890A8 800884A8 AD180054 */ sw $t8, 0x54($t0)
/* 0890AC 800884AC 8CB902E0 */ lw $t9, 0x2e0($a1)
/* 0890B0 800884B0 00000000 */ nop
/* 0890B4 800884B4 AD190074 */ sw $t9, 0x74($t0)
/* 0890B8 800884B8 8CAE02E4 */ lw $t6, 0x2e4($a1)
/* 0890BC 800884BC AD0000B4 */ sw $zero, 0xb4($t0)
/* 0890C0 800884C0 ACF20000 */ sw $s2, ($a3)
/* 0890C4 800884C4 AD0E0094 */ sw $t6, 0x94($t0)
.L800884C8:
/* 0890C8 800884C8 24630001 */ addiu $v1, $v1, 1
/* 0890CC 800884CC 1C600003 */ bgtz $v1, .L800884DC
/* 0890D0 800884D0 24840001 */ addiu $a0, $a0, 1
/* 0890D4 800884D4 1040FFAF */ beqz $v0, .L80088394
/* 0890D8 800884D8 00000000 */ nop
.L800884DC:
/* 0890DC 800884DC 8CE20000 */ lw $v0, ($a3)
/* 0890E0 800884E0 8FB00004 */ lw $s0, 4($sp)
/* 0890E4 800884E4 8FB10008 */ lw $s1, 8($sp)
/* 0890E8 800884E8 8FB2000C */ lw $s2, 0xc($sp)
/* 0890EC 800884EC 03E00008 */ jr $ra
/* 0890F0 800884F0 27BD0010 */ addiu $sp, $sp, 0x10
File diff suppressed because it is too large Load Diff
-353
View File
@@ -1,353 +0,0 @@
glabel func_800890AC
/* 089CAC 800890AC 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012
/* 089CB0 800890B0 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc
/* 089CB4 800890B4 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e
/* 089CB8 800890B8 8C6E0000 */ lw $t6, ($v1)
/* 089CBC 800890BC 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84
/* 089CC0 800890C0 8D220000 */ lw $v0, ($t1)
/* 089CC4 800890C4 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 089CC8 800890C8 01C47821 */ addu $t7, $t6, $a0
/* 089CCC 800890CC 31F8003F */ andi $t8, $t7, 0x3f
/* 089CD0 800890D0 28410014 */ slti $at, $v0, 0x14
/* 089CD4 800890D4 AFBF0014 */ sw $ra, 0x14($sp)
/* 089CD8 800890D8 AFA00034 */ sw $zero, 0x34($sp)
/* 089CDC 800890DC AFA00030 */ sw $zero, 0x30($sp)
/* 089CE0 800890E0 AFA0002C */ sw $zero, 0x2c($sp)
/* 089CE4 800890E4 10200008 */ beqz $at, .L80089108
/* 089CE8 800890E8 AC780000 */ sw $t8, ($v1)
/* 089CEC 800890EC 0C02224E */ jal func_80088938
/* 089CF0 800890F0 AFA40048 */ sw $a0, 0x48($sp)
/* 089CF4 800890F4 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e
/* 089CF8 800890F8 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e
/* 089CFC 800890FC 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0)
/* 089D00 80089100 8FA40048 */ lw $a0, 0x48($sp)
/* 089D04 80089104 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84
.L80089108:
/* 089D08 80089108 14400117 */ bnez $v0, .L80089568
/* 089D0C 8008910C 00446021 */ addu $t4, $v0, $a0
/* 089D10 80089110 3C038012 */ lui $v1, %hi(gControllersXAxisDirection) # $v1, 0x8012
/* 089D14 80089114 3C058012 */ lui $a1, %hi(gControllersYAxisDirection) # $a1, 0x8012
/* 089D18 80089118 00003025 */ move $a2, $zero
/* 089D1C 8008911C 00003825 */ move $a3, $zero
/* 089D20 80089120 00004025 */ move $t0, $zero
/* 089D24 80089124 24A56464 */ addiu $a1, %lo(gControllersYAxisDirection) # addiu $a1, $a1, 0x6464
/* 089D28 80089128 2463645C */ addiu $v1, %lo(gControllersXAxisDirection) # addiu $v1, $v1, 0x645c
/* 089D2C 8008912C 00002025 */ move $a0, $zero
.L80089130:
/* 089D30 80089130 AFA3001C */ sw $v1, 0x1c($sp)
/* 089D34 80089134 AFA40044 */ sw $a0, 0x44($sp)
/* 089D38 80089138 AFA50018 */ sw $a1, 0x18($sp)
/* 089D3C 8008913C AFA60040 */ sw $a2, 0x40($sp)
/* 089D40 80089140 AFA7003C */ sw $a3, 0x3c($sp)
/* 089D44 80089144 0C01A955 */ jal get_buttons_pressed_from_player
/* 089D48 80089148 AFA80038 */ sw $t0, 0x38($sp)
/* 089D4C 8008914C 8FA3001C */ lw $v1, 0x1c($sp)
/* 089D50 80089150 8FA50018 */ lw $a1, 0x18($sp)
/* 089D54 80089154 8FA40044 */ lw $a0, 0x44($sp)
/* 089D58 80089158 8FA60040 */ lw $a2, 0x40($sp)
/* 089D5C 8008915C 8FA7003C */ lw $a3, 0x3c($sp)
/* 089D60 80089160 8FA80038 */ lw $t0, 0x38($sp)
/* 089D64 80089164 80790000 */ lb $t9, ($v1)
/* 089D68 80089168 80AC0000 */ lb $t4, ($a1)
/* 089D6C 8008916C 24010004 */ li $at, 4
/* 089D70 80089170 24840001 */ addiu $a0, $a0, 1
/* 089D74 80089174 24630001 */ addiu $v1, $v1, 1
/* 089D78 80089178 24A50001 */ addiu $a1, $a1, 1
/* 089D7C 8008917C 00C23025 */ or $a2, $a2, $v0
/* 089D80 80089180 00F93821 */ addu $a3, $a3, $t9
/* 089D84 80089184 1481FFEA */ bne $a0, $at, .L80089130
/* 089D88 80089188 010C4021 */ addu $t0, $t0, $t4
/* 089D8C 8008918C 3C028012 */ lui $v0, %hi(D_80126BC8) # $v0, 0x8012
/* 089D90 80089190 8C426BC8 */ lw $v0, %lo(D_80126BC8)($v0)
/* 089D94 80089194 3C0A8012 */ lui $t2, %hi(D_801263E0) # $t2, 0x8012
/* 089D98 80089198 10400026 */ beqz $v0, .L80089234
/* 089D9C 8008919C 254A63E0 */ addiu $t2, %lo(D_801263E0) # addiu $t2, $t2, 0x63e0
/* 089DA0 800891A0 24010001 */ li $at, 1
/* 089DA4 800891A4 104100DA */ beq $v0, $at, .L80089510
/* 089DA8 800891A8 30CD9000 */ andi $t5, $a2, 0x9000
/* 089DAC 800891AC 11A000D8 */ beqz $t5, .L80089510
/* 089DB0 800891B0 240400EF */ li $a0, 239
/* 089DB4 800891B4 0C000741 */ jal play_sound_global
/* 089DB8 800891B8 00002825 */ move $a1, $zero
/* 089DBC 800891BC 3C048012 */ lui $a0, %hi(D_80126A68) # $a0, 0x8012
/* 089DC0 800891C0 24846A68 */ addiu $a0, %lo(D_80126A68) # addiu $a0, $a0, 0x6a68
/* 089DC4 800891C4 0C021FC5 */ jal func_80087F14
/* 089DC8 800891C8 00002825 */ move $a1, $zero
/* 089DCC 800891CC 14400003 */ bnez $v0, .L800891DC
/* 089DD0 800891D0 3C018012 */ lui $at, %hi(D_80126BC8) # $at, 0x8012
/* 089DD4 800891D4 10000006 */ b .L800891F0
/* 089DD8 800891D8 AC206BC8 */ sw $zero, %lo(D_80126BC8)($at)
.L800891DC:
/* 089DDC 800891DC 0C0220CB */ jal func_8008832C
/* 089DE0 800891E0 00000000 */ nop
/* 089DE4 800891E4 14400002 */ bnez $v0, .L800891F0
/* 089DE8 800891E8 3C01800E */ lui $at, %hi(gShowControllerPakMenu) # $at, 0x800e
/* 089DEC 800891EC AC20FD94 */ sw $zero, %lo(gShowControllerPakMenu)($at)
.L800891F0:
/* 089DF0 800891F0 3C0E8012 */ lui $t6, %hi(D_80126BC8) # $t6, 0x8012
/* 089DF4 800891F4 8DCE6BC8 */ lw $t6, %lo(D_80126BC8)($t6)
/* 089DF8 800891F8 3C0F800E */ lui $t7, %hi(gShowControllerPakMenu) # $t7, 0x800e
/* 089DFC 800891FC 15C000C4 */ bnez $t6, .L80089510
/* 089E00 80089200 00000000 */ nop
/* 089E04 80089204 8DEFFD94 */ lw $t7, %lo(gShowControllerPakMenu)($t7)
/* 089E08 80089208 24180001 */ li $t8, 1
/* 089E0C 8008920C 15E000C0 */ bnez $t7, .L80089510
/* 089E10 80089210 24190001 */ li $t9, 1
/* 089E14 80089214 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e
/* 089E18 80089218 3C04800E */ lui $a0, %hi(sMenuTransitionFadeIn) # $a0, 0x800e
/* 089E1C 8008921C AFB80030 */ sw $t8, 0x30($sp)
/* 089E20 80089220 AC39F47C */ sw $t9, %lo(gMenuDelay)($at)
/* 089E24 80089224 0C030076 */ jal func_800C01D8
/* 089E28 80089228 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c
/* 089E2C 8008922C 100000B9 */ b .L80089514
/* 089E30 80089230 8FAF0030 */ lw $t7, 0x30($sp)
.L80089234:
/* 089E34 80089234 8D420000 */ lw $v0, ($t2)
/* 089E38 80089238 3C048012 */ lui $a0, %hi(D_80126C10) # $a0, 0x8012
/* 089E3C 8008923C 10400051 */ beqz $v0, .L80089384
/* 089E40 80089240 30D84000 */ andi $t8, $a2, 0x4000
/* 089E44 80089244 24846C10 */ addiu $a0, %lo(D_80126C10) # addiu $a0, $a0, 0x6c10
/* 089E48 80089248 8C830000 */ lw $v1, ($a0)
/* 089E4C 8008924C 30CD4000 */ andi $t5, $a2, 0x4000
/* 089E50 80089250 1060002C */ beqz $v1, .L80089304
/* 089E54 80089254 246CFFFF */ addiu $t4, $v1, -1
/* 089E58 80089258 158000AD */ bnez $t4, .L80089510
/* 089E5C 8008925C AC8C0000 */ sw $t4, ($a0)
/* 089E60 80089260 3C09800E */ lui $t1, %hi(D_800DF460) # $t1, 0x800e
/* 089E64 80089264 2529F460 */ addiu $t1, %lo(D_800DF460) # addiu $t1, $t1, -0xba0
/* 089E68 80089268 3C048012 */ lui $a0, %hi(D_80126A68) # $a0, 0x8012
/* 089E6C 8008926C 8C846A68 */ lw $a0, %lo(D_80126A68)($a0)
/* 089E70 80089270 8D250000 */ lw $a1, ($t1)
/* 089E74 80089274 0C01D8B2 */ jal delete_file
/* 089E78 80089278 AFA7003C */ sw $a3, 0x3c($sp)
/* 089E7C 8008927C 8FA7003C */ lw $a3, 0x3c($sp)
/* 089E80 80089280 1040000C */ beqz $v0, .L800892B4
/* 089E84 80089284 24180001 */ li $t8, 1
/* 089E88 80089288 240E0001 */ li $t6, 1
/* 089E8C 8008928C 240F0001 */ li $t7, 1
/* 089E90 80089290 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e
/* 089E94 80089294 3C04800E */ lui $a0, %hi(sMenuTransitionFadeIn) # $a0, 0x800e
/* 089E98 80089298 AFAE0030 */ sw $t6, 0x30($sp)
/* 089E9C 8008929C AC2FF47C */ sw $t7, %lo(gMenuDelay)($at)
/* 089EA0 800892A0 0C030076 */ jal func_800C01D8
/* 089EA4 800892A4 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c
/* 089EA8 800892A8 3C0A8012 */ lui $t2, %hi(D_801263E0) # $t2, 0x8012
/* 089EAC 800892AC 10000013 */ b .L800892FC
/* 089EB0 800892B0 254A63E0 */ addiu $t2, %lo(D_801263E0) # addiu $t2, $t2, 0x63e0
.L800892B4:
/* 089EB4 800892B4 3C048012 */ lui $a0, %hi(D_80126A68) # $a0, 0x8012
/* 089EB8 800892B8 AFB8002C */ sw $t8, 0x2c($sp)
/* 089EBC 800892BC 24846A68 */ addiu $a0, %lo(D_80126A68) # addiu $a0, $a0, 0x6a68
/* 089EC0 800892C0 0C021FC5 */ jal func_80087F14
/* 089EC4 800892C4 00E02825 */ move $a1, $a3
/* 089EC8 800892C8 3C0A8012 */ lui $t2, %hi(D_801263E0) # $t2, 0x8012
/* 089ECC 800892CC 1040000B */ beqz $v0, .L800892FC
/* 089ED0 800892D0 254A63E0 */ addiu $t2, %lo(D_801263E0) # addiu $t2, $t2, 0x63e0
/* 089ED4 800892D4 24190001 */ li $t9, 1
/* 089ED8 800892D8 240C0001 */ li $t4, 1
/* 089EDC 800892DC 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e
/* 089EE0 800892E0 3C04800E */ lui $a0, %hi(sMenuTransitionFadeIn) # $a0, 0x800e
/* 089EE4 800892E4 AFB90030 */ sw $t9, 0x30($sp)
/* 089EE8 800892E8 AC2CF47C */ sw $t4, %lo(gMenuDelay)($at)
/* 089EEC 800892EC 0C030076 */ jal func_800C01D8
/* 089EF0 800892F0 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c
/* 089EF4 800892F4 3C0A8012 */ lui $t2, %hi(D_801263E0) # $t2, 0x8012
/* 089EF8 800892F8 254A63E0 */ addiu $t2, %lo(D_801263E0) # addiu $t2, $t2, 0x63e0
.L800892FC:
/* 089EFC 800892FC 10000084 */ b .L80089510
/* 089F00 80089300 AD400000 */ sw $zero, ($t2)
.L80089304:
/* 089F04 80089304 11A00005 */ beqz $t5, .L8008931C
/* 089F08 80089308 30CF9000 */ andi $t7, $a2, 0x9000
/* 089F0C 8008930C 240E0001 */ li $t6, 1
/* 089F10 80089310 AFAE0030 */ sw $t6, 0x30($sp)
/* 089F14 80089314 1000007E */ b .L80089510
/* 089F18 80089318 AD400000 */ sw $zero, ($t2)
.L8008931C:
/* 089F1C 8008931C 11E00009 */ beqz $t7, .L80089344
/* 089F20 80089320 24010001 */ li $at, 1
/* 089F24 80089324 14410003 */ bne $v0, $at, .L80089334
/* 089F28 80089328 24180003 */ li $t8, 3
/* 089F2C 8008932C 10000078 */ b .L80089510
/* 089F30 80089330 AC980000 */ sw $t8, ($a0)
.L80089334:
/* 089F34 80089334 24190001 */ li $t9, 1
/* 089F38 80089338 AFB90030 */ sw $t9, 0x30($sp)
/* 089F3C 8008933C 10000074 */ b .L80089510
/* 089F40 80089340 AD400000 */ sw $zero, ($t2)
.L80089344:
/* 089F44 80089344 19000007 */ blez $t0, .L80089364
/* 089F48 80089348 28410002 */ slti $at, $v0, 2
/* 089F4C 8008934C 14200005 */ bnez $at, .L80089364
/* 089F50 80089350 240C0001 */ li $t4, 1
/* 089F54 80089354 240D0001 */ li $t5, 1
/* 089F58 80089358 AD4C0000 */ sw $t4, ($t2)
/* 089F5C 8008935C 1000006C */ b .L80089510
/* 089F60 80089360 AFAD0034 */ sw $t5, 0x34($sp)
.L80089364:
/* 089F64 80089364 0501006A */ bgez $t0, .L80089510
/* 089F68 80089368 28410002 */ slti $at, $v0, 2
/* 089F6C 8008936C 10200068 */ beqz $at, .L80089510
/* 089F70 80089370 240E0002 */ li $t6, 2
/* 089F74 80089374 240F0001 */ li $t7, 1
/* 089F78 80089378 AD4E0000 */ sw $t6, ($t2)
/* 089F7C 8008937C 10000064 */ b .L80089510
/* 089F80 80089380 AFAF0034 */ sw $t7, 0x34($sp)
.L80089384:
/* 089F84 80089384 17000007 */ bnez $t8, .L800893A4
/* 089F88 80089388 3C09800E */ lui $t1, %hi(D_800DF460) # $t1, 0x800e
/* 089F8C 8008938C 2529F460 */ addiu $t1, %lo(D_800DF460) # addiu $t1, $t1, -0xba0
/* 089F90 80089390 8D230000 */ lw $v1, ($t1)
/* 089F94 80089394 240B0010 */ li $t3, 16
/* 089F98 80089398 1563000C */ bne $t3, $v1, .L800893CC
/* 089F9C 8008939C 30D99000 */ andi $t9, $a2, 0x9000
/* 089FA0 800893A0 1320000A */ beqz $t9, .L800893CC
.L800893A4:
/* 089FA4 800893A4 240C0001 */ li $t4, 1
/* 089FA8 800893A8 240D0001 */ li $t5, 1
/* 089FAC 800893AC 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e
/* 089FB0 800893B0 3C04800E */ lui $a0, %hi(sMenuTransitionFadeIn) # $a0, 0x800e
/* 089FB4 800893B4 AFAC0030 */ sw $t4, 0x30($sp)
/* 089FB8 800893B8 AC2DF47C */ sw $t5, %lo(gMenuDelay)($at)
/* 089FBC 800893BC 0C030076 */ jal func_800C01D8
/* 089FC0 800893C0 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c
/* 089FC4 800893C4 10000053 */ b .L80089514
/* 089FC8 800893C8 8FAF0030 */ lw $t7, 0x30($sp)
.L800893CC:
/* 089FCC 800893CC 2401FFFF */ li $at, -1
/* 089FD0 800893D0 10610005 */ beq $v1, $at, .L800893E8
/* 089FD4 800893D4 00000000 */ nop
/* 089FD8 800893D8 106B0008 */ beq $v1, $t3, .L800893FC
/* 089FDC 800893DC 00000000 */ nop
/* 089FE0 800893E0 1000000C */ b .L80089414
/* 089FE4 800893E4 30C29000 */ andi $v0, $a2, 0x9000
.L800893E8:
/* 089FE8 800893E8 05010049 */ bgez $t0, .L80089510
/* 089FEC 800893EC 240E0001 */ li $t6, 1
/* 089FF0 800893F0 AD200000 */ sw $zero, ($t1)
/* 089FF4 800893F4 10000046 */ b .L80089510
/* 089FF8 800893F8 AFAE0034 */ sw $t6, 0x34($sp)
.L800893FC:
/* 089FFC 800893FC 19000044 */ blez $t0, .L80089510
/* 08A000 80089400 240F000F */ li $t7, 15
/* 08A004 80089404 24180001 */ li $t8, 1
/* 08A008 80089408 AD2F0000 */ sw $t7, ($t1)
/* 08A00C 8008940C 10000040 */ b .L80089510
/* 08A010 80089410 AFB80034 */ sw $t8, 0x34($sp)
.L80089414:
/* 08A014 80089414 10400013 */ beqz $v0, .L80089464
/* 08A018 80089418 3C028012 */ lui $v0, %hi(sCurrentControllerPakAllFileTypes) # $v0, 0x8012
/* 08A01C 8008941C 00431021 */ addu $v0, $v0, $v1
/* 08A020 80089420 90426B60 */ lbu $v0, %lo(sCurrentControllerPakAllFileTypes)($v0)
/* 08A024 80089424 00000000 */ nop
/* 08A028 80089428 28410003 */ slti $at, $v0, 3
/* 08A02C 8008942C 1420000A */ bnez $at, .L80089458
/* 08A030 80089430 28410007 */ slti $at, $v0, 7
/* 08A034 80089434 10200008 */ beqz $at, .L80089458
/* 08A038 80089438 3C048012 */ lui $a0, %hi(D_80126C10) # $a0, 0x8012
/* 08A03C 8008943C 24846C10 */ addiu $a0, %lo(D_80126C10) # addiu $a0, $a0, 0x6c10
/* 08A040 80089440 24190002 */ li $t9, 2
/* 08A044 80089444 240C0001 */ li $t4, 1
/* 08A048 80089448 AC800000 */ sw $zero, ($a0)
/* 08A04C 8008944C AD590000 */ sw $t9, ($t2)
/* 08A050 80089450 10000015 */ b .L800894A8
/* 08A054 80089454 AFAC002C */ sw $t4, 0x2c($sp)
.L80089458:
/* 08A058 80089458 240D0001 */ li $t5, 1
/* 08A05C 8008945C 10000012 */ b .L800894A8
/* 08A060 80089460 AFAD0030 */ sw $t5, 0x30($sp)
.L80089464:
/* 08A064 80089464 1900000A */ blez $t0, .L80089490
/* 08A068 80089468 246EFFFF */ addiu $t6, $v1, -1
/* 08A06C 8008946C AD2E0000 */ sw $t6, ($t1)
/* 08A070 80089470 05C10004 */ bgez $t6, .L80089484
/* 08A074 80089474 01C01825 */ move $v1, $t6
/* 08A078 80089478 AD200000 */ sw $zero, ($t1)
/* 08A07C 8008947C 1000000A */ b .L800894A8
/* 08A080 80089480 00001825 */ move $v1, $zero
.L80089484:
/* 08A084 80089484 240F0001 */ li $t7, 1
/* 08A088 80089488 10000007 */ b .L800894A8
/* 08A08C 8008948C AFAF0034 */ sw $t7, 0x34($sp)
.L80089490:
/* 08A090 80089490 05010005 */ bgez $t0, .L800894A8
/* 08A094 80089494 24780001 */ addiu $t8, $v1, 1
/* 08A098 80089498 24190001 */ li $t9, 1
/* 08A09C 8008949C AD380000 */ sw $t8, ($t1)
/* 08A0A0 800894A0 AFB90034 */ sw $t9, 0x34($sp)
/* 08A0A4 800894A4 03001825 */ move $v1, $t8
.L800894A8:
/* 08A0A8 800894A8 3C058012 */ lui $a1, %hi(D_801263D8) # $a1, 0x8012
/* 08A0AC 800894AC 24A563D8 */ addiu $a1, %lo(D_801263D8) # addiu $a1, $a1, 0x63d8
/* 08A0B0 800894B0 3C048012 */ lui $a0, %hi(D_80126BB4) # $a0, 0x8012
/* 08A0B4 800894B4 8C846BB4 */ lw $a0, %lo(D_80126BB4)($a0)
/* 08A0B8 800894B8 8CA20000 */ lw $v0, ($a1)
/* 08A0BC 800894BC 00646823 */ subu $t5, $v1, $a0
/* 08A0C0 800894C0 00446021 */ addu $t4, $v0, $a0
/* 08A0C4 800894C4 006C082A */ slt $at, $v1, $t4
/* 08A0C8 800894C8 14200004 */ bnez $at, .L800894DC
/* 08A0CC 800894CC 0062082A */ slt $at, $v1, $v0
/* 08A0D0 800894D0 25A20001 */ addiu $v0, $t5, 1
/* 08A0D4 800894D4 ACA20000 */ sw $v0, ($a1)
/* 08A0D8 800894D8 0062082A */ slt $at, $v1, $v0
.L800894DC:
/* 08A0DC 800894DC 10200003 */ beqz $at, .L800894EC
/* 08A0E0 800894E0 00000000 */ nop
/* 08A0E4 800894E4 ACA30000 */ sw $v1, ($a1)
/* 08A0E8 800894E8 00601025 */ move $v0, $v1
.L800894EC:
/* 08A0EC 800894EC 01641823 */ subu $v1, $t3, $a0
/* 08A0F0 800894F0 0062082A */ slt $at, $v1, $v0
/* 08A0F4 800894F4 10200003 */ beqz $at, .L80089504
/* 08A0F8 800894F8 00000000 */ nop
/* 08A0FC 800894FC ACA30000 */ sw $v1, ($a1)
/* 08A100 80089500 00601025 */ move $v0, $v1
.L80089504:
/* 08A104 80089504 04410003 */ bgez $v0, .L80089514
/* 08A108 80089508 8FAF0030 */ lw $t7, 0x30($sp)
/* 08A10C 8008950C ACA00000 */ sw $zero, ($a1)
.L80089510:
/* 08A110 80089510 8FAF0030 */ lw $t7, 0x30($sp)
.L80089514:
/* 08A114 80089514 8FB8002C */ lw $t8, 0x2c($sp)
/* 08A118 80089518 11E00005 */ beqz $t7, .L80089530
/* 08A11C 8008951C 24040241 */ li $a0, 577
/* 08A120 80089520 0C000741 */ jal play_sound_global
/* 08A124 80089524 00002825 */ move $a1, $zero
/* 08A128 80089528 1000001B */ b .L80089598
/* 08A12C 8008952C 8FBF0014 */ lw $ra, 0x14($sp)
.L80089530:
/* 08A130 80089530 13000005 */ beqz $t8, .L80089548
/* 08A134 80089534 240400EF */ li $a0, 239
/* 08A138 80089538 0C000741 */ jal play_sound_global
/* 08A13C 8008953C 00002825 */ move $a1, $zero
/* 08A140 80089540 10000015 */ b .L80089598
/* 08A144 80089544 8FBF0014 */ lw $ra, 0x14($sp)
.L80089548:
/* 08A148 80089548 8FB90034 */ lw $t9, 0x34($sp)
/* 08A14C 8008954C 240400EB */ li $a0, 235
/* 08A150 80089550 13200011 */ beqz $t9, .L80089598
/* 08A154 80089554 8FBF0014 */ lw $ra, 0x14($sp)
/* 08A158 80089558 0C000741 */ jal play_sound_global
/* 08A15C 8008955C 00002825 */ move $a1, $zero
/* 08A160 80089560 1000000D */ b .L80089598
/* 08A164 80089564 8FBF0014 */ lw $ra, 0x14($sp)
.L80089568:
/* 08A168 80089568 29810024 */ slti $at, $t4, 0x24
/* 08A16C 8008956C 14200009 */ bnez $at, .L80089594
/* 08A170 80089570 AD2C0000 */ sw $t4, ($t1)
/* 08A174 80089574 0C022569 */ jal func_800895A4
/* 08A178 80089578 00000000 */ nop
/* 08A17C 8008957C 0C0204F4 */ jal menu_init
/* 08A180 80089580 24040001 */ li $a0, 1
/* 08A184 80089584 24040015 */ li $a0, 21
/* 08A188 80089588 2405FFFF */ li $a1, -1
/* 08A18C 8008958C 0C01B8BA */ jal load_level_for_menu
/* 08A190 80089590 00003025 */ move $a2, $zero
.L80089594:
/* 08A194 80089594 8FBF0014 */ lw $ra, 0x14($sp)
.L80089598:
/* 08A198 80089598 27BD0048 */ addiu $sp, $sp, 0x48
/* 08A19C 8008959C 03E00008 */ jr $ra
/* 08A1A0 800895A0 00001025 */ move $v0, $zero
@@ -147,7 +147,7 @@ glabel menu_file_select_loop
/* 08EC8C 8008E08C 25CE64A0 */ addiu $t6, %lo(gSavefileInfo) # addiu $t6, $t6, 0x64a0
/* 08EC90 8008E090 000D6880 */ sll $t5, $t5, 2
/* 08EC94 8008E094 01AE1021 */ addu $v0, $t5, $t6
/* 08EC98 8008E098 0C02607A */ jal func_800981E8
/* 08EC98 8008E098 0C02607A */ jal unload_big_font_4
/* 08EC9C 8008E09C AFA20030 */ sw $v0, 0x30($sp)
/* 08ECA0 8008E0A0 8FA20030 */ lw $v0, 0x30($sp)
/* 08ECA4 8008E0A4 3C018012 */ lui $at, %hi(D_80126CC0) # $at, 0x8012
@@ -166,7 +166,7 @@ glabel menu_file_select_loop
/* 08ECD4 8008E0D4 00000000 */ nop
/* 08ECD8 8008E0D8 1040006C */ beqz $v0, .L8008E28C
/* 08ECDC 8008E0DC 00000000 */ nop
/* 08ECE0 8008E0E0 0C02607A */ jal func_800981E8
/* 08ECE0 8008E0E0 0C02607A */ jal unload_big_font_4
/* 08ECE4 8008E0E4 00000000 */ nop
/* 08ECE8 8008E0E8 3C0C800E */ lui $t4, %hi(gSaveFileIndex) # $t4, 0x800e
/* 08ECEC 8008E0EC 8D8CF4CC */ lw $t4, %lo(gSaveFileIndex)($t4)
@@ -527,7 +527,7 @@ glabel menu_magic_codes_loop
/* 08B030 8008A430 14200022 */ bnez $at, .L8008A4BC
/* 08B034 8008A434 8FBF0014 */ lw $ra, 0x14($sp)
.L8008A438:
/* 08B038 8008A438 0C022932 */ jal func_8008A4C8
/* 08B038 8008A438 0C022932 */ jal unload_big_font_2
/* 08B03C 8008A43C 00000000 */ nop
/* 08B040 8008A440 3C19800E */ lui $t9, %hi(gMenuDelay) # $t9, 0x800e
/* 08B044 8008A444 8F39F47C */ lw $t9, %lo(gMenuDelay)($t9)
+5 -5
View File
@@ -26,7 +26,7 @@ glabel menu_options_loop
/* 084FB4 800843B4 28410023 */ slti $at, $v0, 0x23
/* 084FB8 800843B8 10200005 */ beqz $at, .L800843D0
/* 084FBC 800843BC 00000000 */ nop
/* 084FC0 800843C0 0C02106E */ jal func_800841B8
/* 084FC0 800843C0 0C02106E */ jal render_options_menu_ui
/* 084FC4 800843C4 00000000 */ nop
/* 084FC8 800843C8 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e
/* 084FCC 800843CC 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84
@@ -224,7 +224,7 @@ glabel menu_options_loop
/* 085290 80084690 24010002 */ li $at, 2
/* 085294 80084694 14410008 */ bne $v0, $at, .L800846B8
/* 085298 80084698 24010003 */ li $at, 3
/* 08529C 8008469C 0C0211CD */ jal func_80084734
/* 08529C 8008469C 0C0211CD */ jal unload_big_font_1
/* 0852A0 800846A0 00000000 */ nop
/* 0852A4 800846A4 0C0204F4 */ jal menu_init
/* 0852A8 800846A8 2404000D */ li $a0, 13
@@ -234,14 +234,14 @@ glabel menu_options_loop
.L800846B8:
/* 0852B8 800846B8 14410007 */ bne $v0, $at, .L800846D8
/* 0852BC 800846BC 00000000 */ nop
/* 0852C0 800846C0 0C0211CD */ jal func_80084734
/* 0852C0 800846C0 0C0211CD */ jal unload_big_font_1
/* 0852C4 800846C4 00000000 */ nop
/* 0852C8 800846C8 0C0204F4 */ jal menu_init
/* 0852CC 800846CC 2404000E */ li $a0, 14
/* 0852D0 800846D0 10000014 */ b .L80084724
/* 0852D4 800846D4 00001025 */ move $v0, $zero
.L800846D8:
/* 0852D8 800846D8 0C0211CD */ jal func_80084734
/* 0852D8 800846D8 0C0211CD */ jal unload_big_font_1
/* 0852DC 800846DC 00000000 */ nop
/* 0852E0 800846E0 0C0204F4 */ jal menu_init
/* 0852E4 800846E4 2404000A */ li $a0, 10
@@ -253,7 +253,7 @@ glabel menu_options_loop
/* 0852F8 800846F8 00001025 */ move $v0, $zero
/* 0852FC 800846FC 0C0002CA */ jal func_80000B28
/* 085300 80084700 00000000 */ nop
/* 085304 80084704 0C0211CD */ jal func_80084734
/* 085304 80084704 0C0211CD */ jal unload_big_font_1
/* 085308 80084708 00000000 */ nop
/* 08530C 8008470C 0C0204F4 */ jal menu_init
/* 085310 80084710 00002025 */ move $a0, $zero
+6 -6
View File
@@ -26,12 +26,12 @@ enum TransitionStatus {
/* Size: 8 bytes */
typedef struct FadeTransition {
u8 type; // top 2 bits also act as flags
u8 red;
u8 green;
u8 blue;
u16 duration;
u16 unk6;
/* 0x00 */ u8 type; // top 2 bits also act as flags
/* 0x01 */ u8 red;
/* 0x02 */ u8 green;
/* 0x03 */ u8 blue;
/* 0x04 */ u16 duration;
/* 0x06 */ u16 unk6;
} FadeTransition;
extern u32 osTvType;
+183 -127
View File
File diff suppressed because it is too large Load Diff
+48 -43
View File
@@ -34,27 +34,6 @@ enum DialogueFlags {
DIALOGUE_BOX_UNUSED_02 = 0xFFFE
};
/* Size: 0x20 bytes */
typedef struct unk8012A7EC {
u8 unk0;
u8 unk1;
u8 unk2;
u8 unk3;
s32 unk4;
s32 unk8;
s32 unkC;
u8 textColourR;
u8 textColourG;
u8 textColourB;
u8 textColourA;
u8 textBGColourR;
u8 textBGColourG;
u8 textBGColourB;
u8 textBGColourA;
s32 unk18;
s32 unk1C;
} unk8012A7EC;
typedef struct unk800C54E8 {
u8 pad0[0xC];
s16 unkC;
@@ -89,28 +68,55 @@ typedef struct FontData {
/* 0x100 */ FontCharData unk100[96];
} FontData;
/* Size: 0x20 bytes */
//Dialogue Box text linked list (Including background struct)
typedef struct DialogueBox {
u8 unk00; // Unused
u8 textNum; // A number that is drawn with the text, like a balloon door telling you how many more you need.
unsigned char *text; // Pointer to the text array
s16 x1; // Left position of the text
s16 y1; // Top portion of the text
s16 x2; // Right portion of the text
s16 y2; // Bottom portion of the text
u8 textColourR;
u8 textColourG;
u8 textColourB;
u8 textColourA;
u8 textBGColourR;
u8 textBGColourG;
u8 textBGColourB;
u8 textBGColourA;
u8 opacity;
u8 font;
struct DialogueBox *nextBox;
/* 0x00 */ u8 unk00; // Unused
/* 0x01 */ u8 textNum; // A number that is drawn with the text, like a balloon door telling you how many more you need.
/* 0x02 */ unsigned char *text; // Pointer to the text array
/* 0x06 */ s16 x1; // Left position of the text
/* 0x08 */ s16 y1; // Top portion of the text
/* 0x0A */ s16 x2; // Right portion of the text
/* 0x0C */ s16 y2; // Bottom portion of the text
/* 0x0E */ u8 textColourR;
/* 0x0F */ u8 textColourG;
/* 0x10 */ u8 textColourB;
/* 0x11 */ u8 textColourA;
/* 0x12 */ u8 textBGColourR;
/* 0x13 */ u8 textBGColourG;
/* 0x14 */ u8 textBGColourB;
/* 0x15 */ u8 textBGColourA;
/* 0x16 */ u8 opacity;
/* 0x17 */ u8 font;
/* 0x18 */ struct DialogueBox *nextBox;
} DialogueBox;
/* Size: 0x20 bytes */
typedef struct unk8012A7EC {
/* 0x00 */ u8 unk0;
/* 0x01 */ u8 unk1;
/* 0x02 */ u8 unk2;
/* 0x03 */ u8 unk3;
/* 0x04 */ unsigned char *text; // Pointer to the text array
/* 0x08 */ s16 posX;
/* 0x0A */ s16 posY;
/* 0x0C */ s16 unkC;
/* 0x0E */ s16 unkE;
/* 0x10 */ u8 textColourR;
/* 0x11 */ u8 textColourG;
/* 0x12 */ u8 textColourB;
/* 0x13 */ u8 textColourA;
/* 0x14 */ u8 textBGColourR;
/* 0x15 */ u8 textBGColourG;
/* 0x16 */ u8 textBGColourB;
/* 0x17 */ u8 textBGColourA;
/* 0x18 */ u8 opacity;
/* 0x19 */ u8 font;
/* 0x1A */ u16 flags;
/* 0x1C */ DialogueBox *nextBox;
} unk8012A7EC;
typedef struct {
u8 r;
u8 b;
@@ -186,12 +192,11 @@ void render_fill_rectangle(Gfx **dlist, s32 ulx, s32 uly, s32 lrx, s32 lry);
void render_dialogue_box(Gfx **dlist, Mtx **mat, VertexList **verts, s32 dialogueBoxID);
void parse_string_with_number(unsigned char *input, char *output, s32 number);
void s32_to_string(char** outString, s32 number); //Non Matching
TextureHeader *func_800C4318(s32 font, u8 arg1); //Non Matching
void s32_to_string(char **outString, s32 number); //Non Matching
void load_font(s32 fontID); //Non Matching
void unload_font(s32 arg0); //Non Matching
void func_800C45A4(Gfx **dlist, DialogueBoxBackground *arg1, char *text, AlignmentFlags alignmentFlags, f32 arg4); //Non Matching
s32 func_800C4DA0(u8 *text, s32 x, s32 font); //Non Matching
void *render_dialogue_text(s32 arg0, s32 posX, s32 posY, char *text, s32 arg4, s32 arg5); //Non Matching
s32 func_800C4DA0(unsigned char *text, s32 x, s32 font); //Non Matching
void *render_dialogue_text(s32 dialogueBoxID, s32 posX, s32 posY, char *text, s32 arg4, s32 arg5); //Non Matching
#endif
+22 -22
View File
@@ -34,14 +34,14 @@ s16 D_8012A792;
unk8012A798 D_8012A798;
s32 D_8012A7A0;
s32 D_8012A7A4;
s16 D_8012A7A8;
s16 sDialogueAlpha;
s16 D_8012A7AA;
s16 D_8012A7AC;
s16 D_8012A7AE;
s16 D_8012A7B0;
s16 D_8012A7B2;
s16 D_8012A7B4;
s16 D_8012A7B6;
s16 sDialogueXPos1; // The Upper Left X Coord of the Dialogue Box.
s16 sDialogueYPos1; // The Upper Left Y Coord of the Dialogue Box. Changes for PAL / NTSC
s16 sDialogueXPos2; // The Lower Right X Coord of the Dialogue Box.
s16 sDialogueYPos2; // The Lower Right Y Coord of the Dialogue Box. Changes for PAL / NTSC
s16 D_8012A7B6; // A Boolean value
s16 D_8012A7B8;
s16 D_8012A7BA;
s16 D_8012A7BE;
@@ -59,17 +59,17 @@ void func_800C29F0(void) {
D_8012A7C8.unk4 = D_8012A7C8.unk0 + 0x3C0;
D_8012A7D4 = 0;
D_8012A7B6 = 0;
D_8012A7A8 = 0;
D_8012A7AA = 0x20;
sDialogueAlpha = 0;
D_8012A7AA = 32;
D_8012A7BA = 0;
D_8012A7AE = 0x20;
D_8012A7B2 = 0x120;
sDialogueXPos1 = 32;
sDialogueXPos2 = 288;
if (osTvType == TV_TYPE_PAL) {
D_8012A7B0 = 0xE0;
D_8012A7B4 = 0xF8;
sDialogueYPos1 = 224;
sDialogueYPos2 = 248;
} else {
D_8012A7B0 = 0xCA;
D_8012A7B4 = 0xDE;
sDialogueYPos1 = 202;
sDialogueYPos2 = 222;
}
func_800C56D0(6);
}
@@ -94,26 +94,26 @@ void func_800C2F1C(s32 arg0) {
}
if (D_8012A7B6 != 0) {
if (D_8012A7AC <= 0) {
D_8012A7A8 -= arg0 * D_8012A7AA;
if ((s32)D_8012A7A8 < 0) {
D_8012A7A8 = 0;
sDialogueAlpha -= arg0 * D_8012A7AA;
if ((s32)sDialogueAlpha < 0) {
sDialogueAlpha = 0;
D_8012A7B6 = 0;
close_dialogue_box(6);
assign_dialogue_box_id(6);
}
} else {
D_8012A7A8 += arg0 * D_8012A7AA;
if (D_8012A7A8 >= 0x101) {
D_8012A7A8 = 0x100;
sDialogueAlpha += arg0 * D_8012A7AA;
if (sDialogueAlpha > 256) {
sDialogueAlpha = 256;
}
D_8012A7AC -= arg0;
if (D_8012A7AC <= 0) {
func_800C2D6C(D_8012A7B6);
func_800C2D6C();
}
}
}
if (D_8012A7B6 != 0) {
func_800C2B00(D_8012A7B6);
func_800C2B00();
}
}
+2
View File
@@ -35,5 +35,7 @@ void func_800C3440(s32 arg0);
void func_800C31EC(s32); //Non Matching
s32 func_800C3564(void); //Non Matching
void func_800C2D6C(void); //Non Matching
void func_800C2B00(void); //Non Matching
#endif
+534 -308
View File
File diff suppressed because it is too large Load Diff
+41 -21
View File
@@ -94,6 +94,13 @@ typedef enum MENU_ID {
MENU_CAUTION
} MENU_ID;
typedef enum PakError {
PAK_ERROR_NONE,
PAK_ERROR_FATAL,
PAK_ERROR_FULL,
PAK_ERROR_CORRUPT
} PakError;
/* Size: 0x20 bytes */
// So this is looking to be a struct for menu images.
typedef struct unk800DF510 {
@@ -327,20 +334,20 @@ extern s32 D_800DFAE0;
// Unsure about typing with these arrays.
extern s32 D_800DFAE4[6];
extern s32 D_800DFAFC[6];
extern s32 D_800DFB14[6];
extern s32 D_800DFB2C[5];
extern s32 D_800DFB40[7];
extern s32 D_800DFB5C[6];
extern s32 D_800DFB74[6];
extern s32 D_800DFB8C[6];
extern s32 D_800DFBA4[6];
extern s32 D_800DFBBC[8];
extern char *D_800DFAE4[6];
extern char *D_800DFAFC[6];
extern char *D_800DFB14[6];
extern char *D_800DFB2C[5];
extern char *D_800DFB40[7];
extern char *D_800DFB5C[6];
extern char *D_800DFB74[6];
extern char *D_800DFB8C[6];
extern char *D_800DFBA4[6];
extern char *D_800DFBBC[8];
extern s32 D_800DFBDC;
// Unused?
extern s32* D_800DFBE0[10];
extern char *D_800DFBE0[10];
extern s32 D_800DFC08;
extern s32 D_800DFC0C;
@@ -350,7 +357,7 @@ extern u8 D_800DFC70[8];
extern s16 D_800DFC78[26];
extern MenuElement D_800DFCB4[7];
extern MenuElement gControllerPakMenuElement[7];
extern s32 gShowControllerPakMenu;
@@ -631,6 +638,18 @@ extern s16 D_800E1E2C[10];
extern s16 D_800E1E40[10];
extern char *D_800E09F8[3];
extern char *gAudioOutputStrings[3];
extern char *gFilenames[3];
extern char *gMusicTestString;
extern char *sBadControllerPakMenuText[5];
extern char *sControllerPakFullMenuText[5];
extern char *sCorruptDataMenuText[3];
extern u64 sEepromSettings;
extern char *sInsertControllerPakMenuText[3];
extern char *sNoControllerPakMenuText[5];
extern char *sInsertRumblePakMenuText[4];
s32 get_random_number_from_range(s32, s32); // No file to pull from yet.
void func_8007FF88(void);
@@ -648,8 +667,8 @@ void init_title_screen_variables(void);
void menu_title_screen_init(void);
void func_80084118(void);
void menu_options_init(void);
void func_800841B8(s32 arg0);
void func_80084734(void);
void render_options_menu_ui(s32 updateRate);
void unload_big_font_1(void);
void menu_audio_options_init(void);
void func_800851FC(void);
void menu_save_options_init(void);
@@ -663,7 +682,7 @@ void menu_boot_init(void);
void func_800887C4(void);
void func_800887E8(void);
void func_800895A4(void);
void func_8008A4C8(void);
void unload_big_font_2(void);
void menu_magic_codes_list_init(void);
void func_8008A8F8(s32 arg0, s32 arg1, s32 arg2);
void func_8008AD1C(void);
@@ -674,7 +693,7 @@ void draw_character_select_text(s32 arg0);
void func_8008BFE8(s32 arg0, s8 *arg1, s32 arg2, u16 arg3, u16 arg4);
void func_8008C128(void);
void menu_caution_init(void);
void unload_large_font(void);
void unload_big_font_3(void);
void func_8008CACC(void);
void menu_file_select_init(void);
void render_menu_image(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6);
@@ -696,10 +715,10 @@ void func_800976CC(void);
void decompress_filename_string(u32 compressedFilename, char *output, s32 length);
s32 compress_filename_string(unsigned char *filename, s32 length);
void func_80097874(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 *arg4, s32 arg5, s32 arg6);
void func_800981E8(void);
void unload_big_font_4(void);
void func_80098208(void);
void draw_trophy_race_text(UNUSED s32 updateRate);
void func_80098754(void);
void unload_big_font_5(void);
void func_80099600(void);
s32 get_trophy_race_world_id(void);
void func_8009ABAC(void);
@@ -772,13 +791,15 @@ void menu_magic_codes_init(void);
s32 menu_game_select_loop(s32 arg0);
s32 menu_ghost_data_loop(s32 updateRate);
s32 menu_trophy_race_round_loop(s32 updateRate);
void render_controller_pak_ui(UNUSED s32 updateRate);
PakError check_for_controller_pak_errors(void);
// Non Matching functions below here
void load_menu_text(s32 language); // Non Matching
void draw_menu_elements(s32 arg0, MenuElement *elem, f32 arg2);
s32 menu_audio_options_loop(s32 arg0);
s32 menu_options_loop(s32 arg0);
s32 func_800890AC(s32);
s32 menu_options_loop(s32 updateRate);
s32 menu_controller_pak_loop(s32 updateRate);
void render_magic_codes_list_menu_text(s32 arg0);
s32 menu_magic_codes_list_loop(s32 arg0);
void calculate_and_display_rom_checksum(void);
@@ -814,7 +835,6 @@ void func_8009CA60(s32 imageID);
void func_8007FFEC(s32 arg0);
void func_800871D8(s32 arg0);
SIDeviceStatus func_80087F14(s32 *controllerIndex, s32 arg1);
s32 func_8008832C(void);
void func_8009C6D4(s32 arg0);
void func_8008B358(void);
void func_8008B4C8(void);
+2
View File
@@ -1,3 +1,5 @@
compiler_type = "ido"
[preserve_macros]
"g[DS]P.*" = "void"
"gDma.*" = "void"