Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Label menus.c and small documentation #690

Merged
merged 4 commits into from
Oct 5, 2024
Merged

Label menus.c and small documentation #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57533d7
Label menus.c and small documentation
AloXado320 Oct 5, 2024
a399ad8
remove test
AloXado320 Oct 5, 2024
0dbb7e3
save.h
AloXado320 Oct 5, 2024
af9af61
BACK_OUT -> GO_BACK
AloXado320 Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions asm/non_matchings/code_80091750/add_8018D9E0_entry.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,63 +176,63 @@ glabel L8009E774
/* 09F390 8009E790 3C01800F */ lui $at, %hi(D_800E8534) # $at, 0x800f
/* 09F394 8009E794 44800000 */ mtc1 $zero, $f0
/* 09F398 8009E798 E4268534 */ swc1 $f6, %lo(D_800E8534)($at)
/* 09F39C 8009E79C 3C018019 */ lui $at, %hi(D_8018EDC0) # $at, 0x8019
/* 09F39C 8009E79C 3C018019 */ lui $at, %hi(gIntroModelZEye) # $at, 0x8019
/* 09F3A0 8009E7A0 241909C4 */ li $t9, 2500
/* 09F3A4 8009E7A4 AC39EDC0 */ sw $t9, %lo(D_8018EDC0)($at)
/* 09F3A8 8009E7A8 3C018019 */ lui $at, %hi(D_8018EDC8) # $at, 0x8019
/* 09F3AC 8009E7AC E420EDC8 */ swc1 $f0, %lo(D_8018EDC8)($at)
/* 09F3A4 8009E7A4 AC39EDC0 */ sw $t9, %lo(gIntroModelZEye)($at)
/* 09F3A8 8009E7A8 3C018019 */ lui $at, %hi(gIntroModelRotX) # $at, 0x8019
/* 09F3AC 8009E7AC E420EDC8 */ swc1 $f0, %lo(gIntroModelRotX)($at)
/* 09F3B0 8009E7B0 3C01C387 */ li $at, 0xC3870000 # -270.000000
/* 09F3B4 8009E7B4 44814000 */ mtc1 $at, $f8
/* 09F3B8 8009E7B8 3C018019 */ lui $at, %hi(D_8018EDCC) # $at, 0x8019
/* 09F3B8 8009E7B8 3C018019 */ lui $at, %hi(gIntroModelRotY) # $at, 0x8019
/* 09F3BC 8009E7BC 240EFFFF */ li $t6, -1
/* 09F3C0 8009E7C0 E428EDCC */ swc1 $f8, %lo(D_8018EDCC)($at)
/* 09F3C4 8009E7C4 3C018019 */ lui $at, %hi(D_8018EDD0) # $at, 0x8019
/* 09F3C8 8009E7C8 E420EDD0 */ swc1 $f0, %lo(D_8018EDD0)($at)
/* 09F3CC 8009E7CC 3C018019 */ lui $at, %hi(D_8018EDD4) # $at, 0x8019
/* 09F3D0 8009E7D0 E420EDD4 */ swc1 $f0, %lo(D_8018EDD4)($at)
/* 09F3D4 8009E7D4 3C018019 */ lui $at, %hi(D_8018EDD8) # $at, 0x8019
/* 09F3D8 8009E7D8 E420EDD8 */ swc1 $f0, %lo(D_8018EDD8)($at)
/* 09F3DC 8009E7DC 3C018019 */ lui $at, %hi(D_8018EDDC) # $at, 0x8019
/* 09F3E0 8009E7E0 E420EDDC */ swc1 $f0, %lo(D_8018EDDC)($at)
/* 09F3C0 8009E7C0 E428EDCC */ swc1 $f8, %lo(gIntroModelRotY)($at)
/* 09F3C4 8009E7C4 3C018019 */ lui $at, %hi(gIntroModelRotZ) # $at, 0x8019
/* 09F3C8 8009E7C8 E420EDD0 */ swc1 $f0, %lo(gIntroModelRotZ)($at)
/* 09F3CC 8009E7CC 3C018019 */ lui $at, %hi(gIntroModelPosX) # $at, 0x8019
/* 09F3D0 8009E7D0 E420EDD4 */ swc1 $f0, %lo(gIntroModelPosX)($at)
/* 09F3D4 8009E7D4 3C018019 */ lui $at, %hi(gIntroModelPosY) # $at, 0x8019
/* 09F3D8 8009E7D8 E420EDD8 */ swc1 $f0, %lo(gIntroModelPosY)($at)
/* 09F3DC 8009E7DC 3C018019 */ lui $at, %hi(gIntroModelPosZ) # $at, 0x8019
/* 09F3E0 8009E7E0 E420EDDC */ swc1 $f0, %lo(gIntroModelPosZ)($at)
/* 09F3E4 8009E7E4 3C014040 */ li $at, 0x40400000 # 3.000000
/* 09F3E8 8009E7E8 44815000 */ mtc1 $at, $f10
/* 09F3EC 8009E7EC 3C018019 */ lui $at, %hi(D_8018EDC4) # $at, 0x8019
/* 09F3F0 8009E7F0 E42AEDC4 */ swc1 $f10, %lo(D_8018EDC4)($at)
/* 09F3EC 8009E7EC 3C018019 */ lui $at, %hi(gIntroModelScale) # $at, 0x8019
/* 09F3F0 8009E7F0 E42AEDC4 */ swc1 $f10, %lo(gIntroModelScale)($at)
/* 09F3F4 8009E7F4 AFEE001C */ sw $t6, 0x1c($ra)
/* 09F3F8 8009E7F8 10000375 */ b .L8009F5D0
/* 09F3FC 8009E7FC AFE30020 */ sw $v1, 0x20($ra)
glabel L8009E800
/* 09F400 8009E800 240F0708 */ li $t7, 1800
/* 09F404 8009E804 3C018019 */ lui $at, %hi(D_8018EDC0) # $at, 0x8019
/* 09F408 8009E808 AC2FEDC0 */ sw $t7, %lo(D_8018EDC0)($at)
/* 09F404 8009E804 3C018019 */ lui $at, %hi(gIntroModelZEye) # $at, 0x8019
/* 09F408 8009E808 AC2FEDC0 */ sw $t7, %lo(gIntroModelZEye)($at)
/* 09F40C 8009E80C 3C01C24C */ li $at, 0xC24C0000 # -51.000000
/* 09F410 8009E810 44818000 */ mtc1 $at, $f16
/* 09F414 8009E814 3C018019 */ lui $at, %hi(D_8018EDC8) # $at, 0x8019
/* 09F414 8009E814 3C018019 */ lui $at, %hi(gIntroModelRotX) # $at, 0x8019
/* 09F418 8009E818 44800000 */ mtc1 $zero, $f0
/* 09F41C 8009E81C E430EDC8 */ swc1 $f16, %lo(D_8018EDC8)($at)
/* 09F41C 8009E81C E430EDC8 */ swc1 $f16, %lo(gIntroModelRotX)($at)
/* 09F420 8009E820 3C01C140 */ li $at, 0xC1400000 # -12.000000
/* 09F424 8009E824 44819000 */ mtc1 $at, $f18
/* 09F428 8009E828 3C018019 */ lui $at, %hi(D_8018EDCC) # $at, 0x8019
/* 09F428 8009E828 3C018019 */ lui $at, %hi(gIntroModelRotY) # $at, 0x8019
/* 09F42C 8009E82C 2418FFFF */ li $t8, -1
/* 09F430 8009E830 E432EDCC */ swc1 $f18, %lo(D_8018EDCC)($at)
/* 09F430 8009E830 E432EDCC */ swc1 $f18, %lo(gIntroModelRotY)($at)
/* 09F434 8009E834 3C01C190 */ li $at, 0xC1900000 # -18.000000
/* 09F438 8009E838 44812000 */ mtc1 $at, $f4
/* 09F43C 8009E83C 3C018019 */ lui $at, %hi(D_8018EDD0) # $at, 0x8019
/* 09F440 8009E840 E424EDD0 */ swc1 $f4, %lo(D_8018EDD0)($at)
/* 09F43C 8009E83C 3C018019 */ lui $at, %hi(gIntroModelRotZ) # $at, 0x8019
/* 09F440 8009E840 E424EDD0 */ swc1 $f4, %lo(gIntroModelRotZ)($at)
/* 09F444 8009E844 3C01C387 */ li $at, 0xC3870000 # -270.000000
/* 09F448 8009E848 44813000 */ mtc1 $at, $f6
/* 09F44C 8009E84C 3C018019 */ lui $at, %hi(D_8018EDD4) # $at, 0x8019
/* 09F450 8009E850 E426EDD4 */ swc1 $f6, %lo(D_8018EDD4)($at)
/* 09F44C 8009E84C 3C018019 */ lui $at, %hi(gIntroModelPosX) # $at, 0x8019
/* 09F450 8009E850 E426EDD4 */ swc1 $f6, %lo(gIntroModelPosX)($at)
/* 09F454 8009E854 3C01800F */ lui $at, %hi(D_800F15E0) # $at, 0x800f
/* 09F458 8009E858 C42815E0 */ lwc1 $f8, %lo(D_800F15E0)($at)
/* 09F45C 8009E85C 3C018019 */ lui $at, %hi(D_8018EDD8) # $at, 0x8019
/* 09F460 8009E860 E428EDD8 */ swc1 $f8, %lo(D_8018EDD8)($at)
/* 09F464 8009E864 3C018019 */ lui $at, %hi(D_8018EDDC) # $at, 0x8019
/* 09F468 8009E868 E420EDDC */ swc1 $f0, %lo(D_8018EDDC)($at)
/* 09F45C 8009E85C 3C018019 */ lui $at, %hi(gIntroModelPosY) # $at, 0x8019
/* 09F460 8009E860 E428EDD8 */ swc1 $f8, %lo(gIntroModelPosY)($at)
/* 09F464 8009E864 3C018019 */ lui $at, %hi(gIntroModelPosZ) # $at, 0x8019
/* 09F468 8009E868 E420EDDC */ swc1 $f0, %lo(gIntroModelPosZ)($at)
/* 09F46C 8009E86C 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 09F470 8009E870 44815000 */ mtc1 $at, $f10
/* 09F474 8009E874 3C018019 */ lui $at, %hi(D_8018EDC4) # $at, 0x8019
/* 09F478 8009E878 E42AEDC4 */ swc1 $f10, %lo(D_8018EDC4)($at)
/* 09F474 8009E874 3C018019 */ lui $at, %hi(gIntroModelScale) # $at, 0x8019
/* 09F478 8009E878 E42AEDC4 */ swc1 $f10, %lo(gIntroModelScale)($at)
/* 09F47C 8009E87C AFF8001C */ sw $t8, 0x1c($ra)
/* 09F480 8009E880 10000353 */ b .L8009F5D0
/* 09F484 8009E884 AFE30020 */ sw $v1, 0x20($ra)
Expand Down
24 changes: 12 additions & 12 deletions asm/non_matchings/code_80091750/func_8009F5E0.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ glabel L8009FD58
glabel L8009FD90
/* 0A0990 8009FD90 8E23001C */ lw $v1, 0x1c($s1)
/* 0A0994 8009FD94 2506FFF1 */ addiu $a2, $t0, -0xf
/* 0A0998 8009FD98 3C098019 */ lui $t1, %hi(gMainMenuSelectionDepth) # $t1, 0x8019
/* 0A0998 8009FD98 3C098019 */ lui $t1, %hi(gMainMenuSelection) # $t1, 0x8019
/* 0A099C 8009FD9C 28610020 */ slti $at, $v1, 0x20
/* 0A09A0 8009FDA0 50200030 */ beql $at, $zero, .L8009FE64
/* 0A09A4 8009FDA4 2518FFF6 */ addiu $t8, $t0, -0xa
Expand All @@ -658,7 +658,7 @@ glabel L8009FD90
/* 0A09B0 8009FDB0 00084080 */ sll $t0, $t0, 2
/* 0A09B4 8009FDB4 01034021 */ addu $t0, $t0, $v1
/* 0A09B8 8009FDB8 00084040 */ sll $t0, $t0, 1
/* 0A09BC 8009FDBC 8129EDED */ lb $t1, %lo(gMainMenuSelectionDepth)($t1)
/* 0A09BC 8009FDBC 8129EDED */ lb $t1, %lo(gMainMenuSelection)($t1)
/* 0A09C0 8009FDC0 05010003 */ bgez $t0, .L8009FDD0
/* 0A09C4 8009FDC4 0008C983 */ sra $t9, $t0, 6
/* 0A09C8 8009FDC8 2501003F */ addiu $at, $t0, 0x3f
Expand Down Expand Up @@ -721,10 +721,10 @@ glabel L8009FD90
glabel L8009FE9C
/* 0A0A9C 8009FE9C 3C028019 */ lui $v0, %hi(gPlayerCount) # $v0, 0x8019
/* 0A0AA0 8009FEA0 8042EDF3 */ lb $v0, %lo(gPlayerCount)($v0)
/* 0A0AA4 8009FEA4 3C03800F */ lui $v1, %hi((D_800E86AC - 1)) # 0x800f
/* 0A0AA8 8009FEA8 3C06800F */ lui $a2, %hi((D_800E86B0 - 3)) # 0x800f
/* 0A0AA4 8009FEA4 3C03800F */ lui $v1, %hi((gGameModeMenuColumn - 1)) # 0x800f
/* 0A0AA8 8009FEA8 3C06800F */ lui $a2, %hi((gGameModeSubMenuColumn - 3)) # 0x800f
/* 0A0AAC 8009FEAC 00621821 */ addu $v1, $v1, $v0
/* 0A0AB0 8009FEB0 806386AB */ lb $v1, %lo((D_800E86AC - 1))($v1) # -0x7955($v1)
/* 0A0AB0 8009FEB0 806386AB */ lb $v1, %lo((gGameModeMenuColumn - 1))($v1) # -0x7955($v1)
/* 0A0AB4 8009FEB4 00026880 */ sll $t5, $v0, 2
/* 0A0AB8 8009FEB8 00025880 */ sll $t3, $v0, 2
/* 0A0ABC 8009FEBC 01A26823 */ subu $t5, $t5, $v0
Expand All @@ -738,7 +738,7 @@ glabel L8009FE9C
/* 0A0ADC 8009FEDC 00CC3021 */ addu $a2, $a2, $t4
/* 0A0AE0 8009FEE0 00AF2821 */ addu $a1, $a1, $t7
/* 0A0AE4 8009FEE4 2F010008 */ sltiu $at, $t8, 8
/* 0A0AE8 8009FEE8 80C686AD */ lb $a2, %lo((D_800E86B0 - 3))($a2) # -0x7953($a2)
/* 0A0AE8 8009FEE8 80C686AD */ lb $a2, %lo((gGameModeSubMenuColumn - 3))($a2) # -0x7953($a2)
/* 0A0AEC 8009FEEC 10200037 */ beqz $at, .L8009FFCC
/* 0A0AF0 8009FEF0 8CA52B70 */ lw $a1, %lo((gGameModePlayerSelection - 0xC))($a1) # 0x2b70($a1)
/* 0A0AF4 8009FEF4 0018C080 */ sll $t8, $t8, 2
Expand Down Expand Up @@ -805,8 +805,8 @@ glabel L8009FF90
.L8009FFCC:
/* 0A0BCC 8009FFCC 2401FFFF */ li $at, -1
/* 0A0BD0 8009FFD0 10C1023C */ beq $a2, $at, .L800A08C4
/* 0A0BD4 8009FFD4 3C028019 */ lui $v0, %hi(gMainMenuSelectionDepth) # $v0, 0x8019
/* 0A0BD8 8009FFD8 8042EDED */ lb $v0, %lo(gMainMenuSelectionDepth)($v0)
/* 0A0BD4 8009FFD4 3C028019 */ lui $v0, %hi(gMainMenuSelection) # $v0, 0x8019
/* 0A0BD8 8009FFD8 8042EDED */ lb $v0, %lo(gMainMenuSelection)($v0)
/* 0A0BDC 8009FFDC 240E0001 */ li $t6, 1
/* 0A0BE0 8009FFE0 240F00FF */ li $t7, 255
/* 0A0BE4 8009FFE4 28410005 */ slti $at, $v0, 5
Expand Down Expand Up @@ -889,11 +889,11 @@ glabel L800A00FC
/* 0A0D00 800A0100 3C188019 */ lui $t8, %hi(gCharacterGridSelections) # 0x8019
/* 0A0D04 800A0104 0305C021 */ addu $t8, $t8, $a1
/* 0A0D08 800A0108 8318EDE4 */ lb $t8, %lo(gCharacterGridSelections)($t8) # -0x121c($t8)
/* 0A0D0C 800A010C 3C198019 */ lui $t9, %hi(D_8018EDE8) # 0x8019
/* 0A0D0C 800A010C 3C198019 */ lui $t9, %hi(gCharacterGridIsSelected) # 0x8019
/* 0A0D10 800A0110 0325C821 */ addu $t9, $t9, $a1
/* 0A0D14 800A0114 530001EC */ beql $t8, $zero, .L800A08C8
/* 0A0D18 800A0118 8FBF0034 */ lw $ra, 0x34($sp)
/* 0A0D1C 800A011C 8339EDE8 */ lb $t9, %lo(D_8018EDE8)($t9) # -0x1218($t9)
/* 0A0D1C 800A011C 8339EDE8 */ lb $t9, %lo(gCharacterGridIsSelected)($t9) # -0x1218($t9)
/* 0A0D20 800A0120 3C06800E */ lui $a2, %hi(gGlobalTimer) # $a2, 0x800e
/* 0A0D24 800A0124 17200003 */ bnez $t9, .L800A0134
/* 0A0D28 800A0128 00000000 */ nop
Expand Down Expand Up @@ -1110,8 +1110,8 @@ glabel L800A0404
/* 0A1020 800A0420 10000129 */ b .L800A08C8
/* 0A1024 800A0424 8FBF0034 */ lw $ra, 0x34($sp)
glabel L800A0428
/* 0A1028 800A0428 3C028019 */ lui $v0, %hi(gMainMenuSelectionDepth) # $v0, 0x8019
/* 0A102C 800A042C 8042EDED */ lb $v0, %lo(gMainMenuSelectionDepth)($v0)
/* 0A1028 800A0428 3C028019 */ lui $v0, %hi(gMainMenuSelection) # $v0, 0x8019
/* 0A102C 800A042C 8042EDED */ lb $v0, %lo(gMainMenuSelection)($v0)
/* 0A1030 800A0430 8FAB00A8 */ lw $t3, 0xa8($sp)
/* 0A1034 800A0434 240D0001 */ li $t5, 1
/* 0A1038 800A0438 28410005 */ slti $at, $v0, 5
Expand Down
4 changes: 2 additions & 2 deletions asm/non_matchings/code_80091750/func_800A09E0.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ glabel func_800A09E0
/* 0A161C 800A0A1C 3C18004F */ lui $t8, (0x004FC308 >> 16) # lui $t8, 0x4f
/* 0A1620 800A0A20 3718C308 */ ori $t8, (0x004FC308 & 0xFFFF) # ori $t8, $t8, 0xc308
/* 0A1624 800A0A24 3C0FED00 */ lui $t7, 0xed00
/* 0A1628 800A0A28 3C13800F */ lui $s3, %hi(D_800E86D0) # $s3, 0x800f
/* 0A1628 800A0A28 3C13800F */ lui $s3, %hi(gControllerPakScrollDirection) # $s3, 0x800f
/* 0A162C 800A0A2C 3C160200 */ lui $s6, %hi(D_0200157C) # $s6, 0x200
/* 0A1630 800A0A30 00809025 */ move $s2, $a0
/* 0A1634 800A0A34 26D6157C */ addiu $s6, %lo(D_0200157C) # addiu $s6, $s6, 0x157c
/* 0A1638 800A0A38 267386D0 */ addiu $s3, %lo(D_800E86D0) # addiu $s3, $s3, -0x7930
/* 0A1638 800A0A38 267386D0 */ addiu $s3, %lo(gControllerPakScrollDirection) # addiu $s3, $s3, -0x7930
/* 0A163C 800A0A3C 00008025 */ move $s0, $zero
/* 0A1640 800A0A40 24140008 */ li $s4, 8
/* 0A1644 800A0A44 24150009 */ li $s5, 9
Expand Down
Loading
Loading