From 2455eb42b829b04f342d233864cb8c5a03205e6a Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 12:08:54 -0700 Subject: [PATCH] Added glabels that are written to. --- asm/non_matchings/unknown_066AA0/func_8006EFDC.s | 4 ++-- asm/non_matchings/unknown_07AF10/func_8007AB24.s | 4 ++-- asm/non_matchings/unknown_07AF10/func_8007AB9C.s | 4 ++-- .../unknown_080500/MenuMagicCodesLoop.s | 4 ++-- asm/non_matchings/unknown_080500/func_8007FFEC.s | 4 ++-- asm/non_matchings/unknown_080500/func_8008BB3C.s | 4 ++-- asm/non_matchings/unknown_080500/func_80095728.s | 4 ++-- asm/non_matchings/unknown_080500/func_800998E0.s | 4 ++-- asm/non_matchings/unknown_080500/func_8009C6D4.s | 16 ++++++++-------- asm/non_matchings/unknown_09F8F0/func_800AB1D4.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800AC5A4.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800ACF60.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800AD40C.s | 4 ++-- asm/non_matchings/unknown_0AEE70/func_800B4A08.s | 4 ++-- asm/non_matchings/unknown_0AEE70/func_800B6E50.s | 4 ++-- asm/non_matchings/unknown_0AEE70/func_800B6EE0.s | 4 ++-- asm/non_matchings/unknown_0B8920/func_800C0780.s | 4 ++-- asm/non_matchings/unknown_0B8920/func_800C2640.s | 4 ++-- asm/non_matchings/unknown_0B8920/func_800C3158.s | 4 ++-- .../non_matchings/unknown_0D5390/func_800D47F0.s | 4 ++-- tools/python/find_glabels.py | 4 ++-- undefined_syms.txt | 1 + 22 files changed, 49 insertions(+), 48 deletions(-) diff --git a/asm/non_matchings/unknown_066AA0/func_8006EFDC.s b/asm/non_matchings/unknown_066AA0/func_8006EFDC.s index 004ba782..b76fb2bb 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006EFDC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006EFDC.s @@ -84,8 +84,8 @@ glabel func_8006EFDC /* 06FD24 8006F124 3C018012 */ lui $at, %hi(D_80123530) # $at, 0x8012 /* 06FD28 8006F128 8FBF0014 */ lw $ra, 0x14($sp) /* 06FD2C 8006F12C AC2C3530 */ sw $t4, %lo(D_80123530)($at) -/* 06FD30 8006F130 3C018012 */ lui $at, 0x8012 +/* 06FD30 8006F130 3C018012 */ lui $at, %hi(D_80123534) # $at, 0x8012 /* 06FD34 8006F134 27BD0020 */ addiu $sp, $sp, 0x20 /* 06FD38 8006F138 03E00008 */ jr $ra -/* 06FD3C 8006F13C AC263534 */ sw $a2, 0x3534($at) +/* 06FD3C 8006F13C AC263534 */ sw $a2, %lo(D_80123534)($at) diff --git a/asm/non_matchings/unknown_07AF10/func_8007AB24.s b/asm/non_matchings/unknown_07AF10/func_8007AB24.s index a50f064b..958e9755 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007AB24.s +++ b/asm/non_matchings/unknown_07AF10/func_8007AB24.s @@ -1,8 +1,8 @@ glabel func_8007AB24 -/* 07B724 8007AB24 3C018012 */ lui $at, 0x8012 +/* 07B724 8007AB24 3C018012 */ lui $at, %hi(D_801262E4) # $at, 0x8012 /* 07B728 8007AB28 AFA40000 */ sw $a0, ($sp) /* 07B72C 8007AB2C 03E00008 */ jr $ra -/* 07B730 8007AB30 A02462E4 */ sb $a0, 0x62e4($at) +/* 07B730 8007AB30 A02462E4 */ sb $a0, %lo(D_801262E4)($at) /* 07B734 8007AB34 3C0E8012 */ lui $t6, %hi(D_80126170) # $t6, 0x8012 /* 07B738 8007AB38 8DCE6170 */ lw $t6, %lo(D_80126170)($t6) diff --git a/asm/non_matchings/unknown_07AF10/func_8007AB9C.s b/asm/non_matchings/unknown_07AF10/func_8007AB9C.s index 653952e3..c3a8e562 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007AB9C.s +++ b/asm/non_matchings/unknown_07AF10/func_8007AB9C.s @@ -20,7 +20,7 @@ glabel func_8007AB9C /* 07B7E4 8007ABE4 ACB90000 */ sw $t9, ($a1) /* 07B7E8 8007ABE8 3C018012 */ lui $at, %hi(D_801262D4) # $at, 0x8012 /* 07B7EC 8007ABEC AC2B62D4 */ sw $t3, %lo(D_801262D4)($at) -/* 07B7F0 8007ABF0 3C018012 */ lui $at, 0x8012 +/* 07B7F0 8007ABF0 3C018012 */ lui $at, %hi(D_801262DC) # $at, 0x8012 /* 07B7F4 8007ABF4 03E00008 */ jr $ra -/* 07B7F8 8007ABF8 AC2362DC */ sw $v1, 0x62dc($at) +/* 07B7F8 8007ABF8 AC2362DC */ sw $v1, %lo(D_801262DC)($at) diff --git a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s index cf2ab64c..a7423760 100644 --- a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s +++ b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s @@ -207,11 +207,11 @@ glabel MenuMagicCodesLoop /* 08ABC8 80089FC8 0004C0C0 */ sll $t8, $a0, 3 /* 08ABCC 80089FCC 0304C023 */ subu $t8, $t8, $a0 /* 08ABD0 80089FD0 0303C821 */ addu $t9, $t8, $v1 -/* 08ABD4 80089FD4 3C018012 */ lui $at, 0x8012 +/* 08ABD4 80089FD4 3C018012 */ lui $at, %hi(D_80126C58) # $at, 0x8012 /* 08ABD8 80089FD8 AFAF0038 */ sw $t7, 0x38($sp) /* 08ABDC 80089FDC 00220821 */ addu $at, $at, $v0 /* 08ABE0 80089FE0 272E0041 */ addiu $t6, $t9, 0x41 -/* 08ABE4 80089FE4 A02E6C58 */ sb $t6, 0x6c58($at) +/* 08ABE4 80089FE4 A02E6C58 */ sb $t6, %lo(D_80126C58)($at) /* 08ABE8 80089FE8 244F0001 */ addiu $t7, $v0, 1 /* 08ABEC 80089FEC A4CF0000 */ sh $t7, ($a2) /* 08ABF0 80089FF0 84D80000 */ lh $t8, ($a2) diff --git a/asm/non_matchings/unknown_080500/func_8007FFEC.s b/asm/non_matchings/unknown_080500/func_8007FFEC.s index edae6e8b..1236f4d8 100644 --- a/asm/non_matchings/unknown_080500/func_8007FFEC.s +++ b/asm/non_matchings/unknown_080500/func_8007FFEC.s @@ -361,10 +361,10 @@ glabel func_8007FFEC /* 08115C 8008055C 37010003 */ ori $at, $t8, 3 /* 081160 80080560 38210002 */ xori $at, $at, 2 /* 081164 80080564 44C1F800 */ ctc1 $at, $31 -/* 081168 80080568 3C01800E */ lui $at, 0x800e +/* 081168 80080568 3C01800E */ lui $at, %hi(D_800E1DC4) # $at, 0x800e /* 08116C 8008056C 460042A4 */ cvt.w.s $f10, $f8 /* 081170 80080570 44195000 */ mfc1 $t9, $f10 /* 081174 80080574 44D8F800 */ ctc1 $t8, $31 /* 081178 80080578 03E00008 */ jr $ra -/* 08117C 8008057C AC391DC4 */ sw $t9, 0x1dc4($at) +/* 08117C 8008057C AC391DC4 */ sw $t9, %lo(D_800E1DC4)($at) diff --git a/asm/non_matchings/unknown_080500/func_8008BB3C.s b/asm/non_matchings/unknown_080500/func_8008BB3C.s index 86155ed8..07d178cc 100644 --- a/asm/non_matchings/unknown_080500/func_8008BB3C.s +++ b/asm/non_matchings/unknown_080500/func_8008BB3C.s @@ -44,9 +44,9 @@ glabel func_8008BB3C .L8008BBD4: /* 08C7D4 8008BBD4 16200005 */ bnez $s1, .L8008BBEC /* 08C7D8 8008BBD8 24030009 */ li $v1, 9 -/* 08C7DC 8008BBDC 3C018012 */ lui $at, 0x8012 +/* 08C7DC 8008BBDC 3C018012 */ lui $at, %hi(D_801263F0) # $at, 0x8012 /* 08C7E0 8008BBE0 00300821 */ addu $at, $at, $s0 -/* 08C7E4 8008BBE4 A02363F0 */ sb $v1, 0x63f0($at) +/* 08C7E4 8008BBE4 A02363F0 */ sb $v1, %lo(D_801263F0)($at) /* 08C7E8 8008BBE8 26100001 */ addiu $s0, $s0, 1 .L8008BBEC: /* 08C7EC 8008BBEC 2A010008 */ slti $at, $s0, 8 diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index e57f5a8f..0b343c60 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -565,10 +565,10 @@ glabel func_80095728 /* 096B88 80095F88 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) /* 096B8C 80095F8C 8CCD0000 */ lw $t5, ($a2) /* 096B90 80095F90 8F190070 */ lw $t9, 0x70($t8) -/* 096B94 80095F94 3C018012 */ lui $at, 0x8012 +/* 096B94 80095F94 3C018012 */ lui $at, %hi(D_80126BF0) # $at, 0x8012 /* 096B98 80095F98 000D6080 */ sll $t4, $t5, 2 /* 096B9C 80095F9C 002C0821 */ addu $at, $at, $t4 -/* 096BA0 80095FA0 AC396BF0 */ sw $t9, 0x6bf0($at) +/* 096BA0 80095FA0 AC396BF0 */ sw $t9, %lo(D_80126BF0)($at) /* 096BA4 80095FA4 8D2E0000 */ lw $t6, ($t1) /* 096BA8 80095FA8 ACC00000 */ sw $zero, ($a2) /* 096BAC 80095FAC 25CFFFFF */ addiu $t7, $t6, -1 diff --git a/asm/non_matchings/unknown_080500/func_800998E0.s b/asm/non_matchings/unknown_080500/func_800998E0.s index 42706c1f..61bd59d5 100644 --- a/asm/non_matchings/unknown_080500/func_800998E0.s +++ b/asm/non_matchings/unknown_080500/func_800998E0.s @@ -27,10 +27,10 @@ glabel func_800998E0 /* 09A544 80099944 246364D4 */ addiu $v1, %lo(D_801264D4) # addiu $v1, $v1, 0x64d4 /* 09A548 80099948 1440003F */ bnez $v0, .L80099A48 /* 09A54C 8009994C 00405025 */ move $t2, $v0 -/* 09A550 80099950 3C018012 */ lui $at, 0x8012 +/* 09A550 80099950 3C018012 */ lui $at, %hi(D_801264DC) # $at, 0x8012 /* 09A554 80099954 00300821 */ addu $at, $at, $s0 /* 09A558 80099958 240F00FF */ li $t7, 255 -/* 09A55C 8009995C A02F64DC */ sb $t7, 0x64dc($at) +/* 09A55C 8009995C A02F64DC */ sb $t7, %lo(D_801264DC)($at) /* 09A560 80099960 8C780000 */ lw $t8, ($v1) /* 09A564 80099964 00C04025 */ move $t0, $a2 /* 09A568 80099968 2719FFFF */ addiu $t9, $t8, -1 diff --git a/asm/non_matchings/unknown_080500/func_8009C6D4.s b/asm/non_matchings/unknown_080500/func_8009C6D4.s index 72da2116..0dd55927 100644 --- a/asm/non_matchings/unknown_080500/func_8009C6D4.s +++ b/asm/non_matchings/unknown_080500/func_8009C6D4.s @@ -64,11 +64,11 @@ glabel func_8009C6D4 /* 09D3BC 8009C7BC 0C01EB9D */ jal func_8007AE74 /* 09D3C0 8009C7C0 AFA70038 */ sw $a3, 0x38($sp) /* 09D3C4 8009C7C4 8FA70038 */ lw $a3, 0x38($sp) -/* 09D3C8 8009C7C8 3C018012 */ lui $at, 0x8012 +/* 09D3C8 8009C7C8 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012 /* 09D3CC 8009C7CC 00075880 */ sll $t3, $a3, 2 /* 09D3D0 8009C7D0 002B0821 */ addu $at, $at, $t3 /* 09D3D4 8009C7D4 10000027 */ b .L8009C874 -/* 09D3D8 8009C7D8 AC226550 */ sw $v0, 0x6550($at) +/* 09D3D8 8009C7D8 AC226550 */ sw $v0, %lo(D_80126550)($at) .L8009C7DC: /* 09D3DC 8009C7DC 1180000B */ beqz $t4, .L8009C80C /* 09D3E0 8009C7E0 304E4000 */ andi $t6, $v0, 0x4000 @@ -77,11 +77,11 @@ glabel func_8009C6D4 /* 09D3EC 8009C7EC 0C01F04B */ jal func_8007C12C /* 09D3F0 8009C7F0 AFA70038 */ sw $a3, 0x38($sp) /* 09D3F4 8009C7F4 8FA70038 */ lw $a3, 0x38($sp) -/* 09D3F8 8009C7F8 3C018012 */ lui $at, 0x8012 +/* 09D3F8 8009C7F8 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012 /* 09D3FC 8009C7FC 00076880 */ sll $t5, $a3, 2 /* 09D400 8009C800 002D0821 */ addu $at, $at, $t5 /* 09D404 8009C804 1000001B */ b .L8009C874 -/* 09D408 8009C808 AC226550 */ sw $v0, 0x6550($at) +/* 09D408 8009C808 AC226550 */ sw $v0, %lo(D_80126550)($at) .L8009C80C: /* 09D40C 8009C80C 11C00011 */ beqz $t6, .L8009C854 /* 09D410 8009C810 30443FFF */ andi $a0, $v0, 0x3fff @@ -96,20 +96,20 @@ glabel func_8009C6D4 /* 09D434 8009C834 0C003A95 */ jal func_8000EA54 /* 09D438 8009C838 AFA70038 */ sw $a3, 0x38($sp) /* 09D43C 8009C83C 8FA70038 */ lw $a3, 0x38($sp) -/* 09D440 8009C840 3C018012 */ lui $at, 0x8012 +/* 09D440 8009C840 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012 /* 09D444 8009C844 0007C880 */ sll $t9, $a3, 2 /* 09D448 8009C848 00390821 */ addu $at, $at, $t9 /* 09D44C 8009C84C 10000009 */ b .L8009C874 -/* 09D450 8009C850 AC226550 */ sw $v0, 0x6550($at) +/* 09D450 8009C850 AC226550 */ sw $v0, %lo(D_80126550)($at) .L8009C854: /* 09D454 8009C854 00002825 */ move $a1, $zero /* 09D458 8009C858 0C017E67 */ jal func_8005F99C /* 09D45C 8009C85C AFA70038 */ sw $a3, 0x38($sp) /* 09D460 8009C860 8FA70038 */ lw $a3, 0x38($sp) -/* 09D464 8009C864 3C018012 */ lui $at, 0x8012 +/* 09D464 8009C864 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012 /* 09D468 8009C868 00074880 */ sll $t1, $a3, 2 /* 09D46C 8009C86C 00290821 */ addu $at, $at, $t1 -/* 09D470 8009C870 AC226550 */ sw $v0, 0x6550($at) +/* 09D470 8009C870 AC226550 */ sw $v0, %lo(D_80126550)($at) .L8009C874: /* 09D474 8009C874 8FAB0024 */ lw $t3, 0x24($sp) /* 09D478 8009C878 240A0001 */ li $t2, 1 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AB1D4.s b/asm/non_matchings/unknown_09F8F0/func_800AB1D4.s index c6cfc01f..9c9d0471 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AB1D4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AB1D4.s @@ -1,9 +1,9 @@ glabel func_800AB1D4 /* 0ABDD4 800AB1D4 240F0001 */ li $t7, 1 /* 0ABDD8 800AB1D8 01E4C023 */ subu $t8, $t7, $a0 -/* 0ABDDC 800AB1DC 3C018012 */ lui $at, 0x8012 +/* 0ABDDC 800AB1DC 3C018012 */ lui $at, %hi(D_80126CD2) # $at, 0x8012 /* 0ABDE0 800AB1E0 AFA40000 */ sw $a0, ($sp) /* 0ABDE4 800AB1E4 03E00008 */ jr $ra -/* 0ABDE8 800AB1E8 A0386CD2 */ sb $t8, 0x6cd2($at) +/* 0ABDE8 800AB1E8 A0386CD2 */ sb $t8, %lo(D_80126CD2)($at) /* 0ABDEC 800AB1EC 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800AC5A4.s b/asm/non_matchings/unknown_09F8F0/func_800AC5A4.s index 511b622c..7672e89a 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AC5A4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AC5A4.s @@ -175,9 +175,9 @@ glabel func_800AC5A4 /* 0AD44C 800AC84C 27BD0038 */ addiu $sp, $sp, 0x38 /* 0AD450 800AC850 240E0001 */ li $t6, 1 -/* 0AD454 800AC854 3C01800E */ lui $at, 0x800e +/* 0AD454 800AC854 3C01800E */ lui $at, %hi(D_800E2A84) # $at, 0x800e /* 0AD458 800AC858 03E00008 */ jr $ra -/* 0AD45C 800AC85C AC2E2A84 */ sw $t6, 0x2a84($at) +/* 0AD45C 800AC85C AC2E2A84 */ sw $t6, %lo(D_800E2A84)($at) /* 0AD460 800AC860 3C0E800E */ lui $t6, %hi(D_800E2A80) # $t6, 0x800e /* 0AD464 800AC864 8DCE2A80 */ lw $t6, %lo(D_800E2A80)($t6) diff --git a/asm/non_matchings/unknown_09F8F0/func_800ACF60.s b/asm/non_matchings/unknown_09F8F0/func_800ACF60.s index 06fadc1d..6947b020 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800ACF60.s +++ b/asm/non_matchings/unknown_09F8F0/func_800ACF60.s @@ -6,9 +6,9 @@ glabel func_800ACF60 /* 0ADB70 800ACF70 28410010 */ slti $at, $v0, 0x10 /* 0ADB74 800ACF74 10200006 */ beqz $at, .L800ACF90 /* 0ADB78 800ACF78 00027080 */ sll $t6, $v0, 2 -/* 0ADB7C 800ACF7C 3C018012 */ lui $at, 0x8012 +/* 0ADB7C 800ACF7C 3C018012 */ lui $at, %hi(D_80127C40) # $at, 0x8012 /* 0ADB80 800ACF80 002E0821 */ addu $at, $at, $t6 -/* 0ADB84 800ACF84 AC247C40 */ sw $a0, 0x7c40($at) +/* 0ADB84 800ACF84 AC247C40 */ sw $a0, %lo(D_80127C40)($at) /* 0ADB88 800ACF88 244F0001 */ addiu $t7, $v0, 1 /* 0ADB8C 800ACF8C AC6F0000 */ sw $t7, ($v1) .L800ACF90: diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD40C.s b/asm/non_matchings/unknown_09F8F0/func_800AD40C.s index b207f51f..52dbc821 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AD40C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AD40C.s @@ -41,7 +41,7 @@ glabel func_800AD40C /* 0AE0A4 800AD4A4 03E00008 */ jr $ra /* 0AE0A8 800AD4A8 00000000 */ nop -/* 0AE0AC 800AD4AC 3C01800E */ lui $at, 0x800e +/* 0AE0AC 800AD4AC 3C01800E */ lui $at, %hi(D_800E2C6C) # $at, 0x800e /* 0AE0B0 800AD4B0 03E00008 */ jr $ra -/* 0AE0B4 800AD4B4 AC242C6C */ sw $a0, 0x2c6c($at) +/* 0AE0B4 800AD4B4 AC242C6C */ sw $a0, %lo(D_800E2C6C)($at) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B4A08.s b/asm/non_matchings/unknown_0AEE70/func_800B4A08.s index 34c36496..271bdc26 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B4A08.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B4A08.s @@ -1,7 +1,7 @@ glabel func_800B4A08 -/* 0B5608 800B4A08 3C01800E */ lui $at, 0x800e +/* 0B5608 800B4A08 3C01800E */ lui $at, %hi(D_800E2EF0) # $at, 0x800e /* 0B560C 800B4A0C 03E00008 */ jr $ra -/* 0B5610 800B4A10 AC242EF0 */ sw $a0, 0x2ef0($at) +/* 0B5610 800B4A10 AC242EF0 */ sw $a0, %lo(D_800E2EF0)($at) /* 0B5614 800B4A14 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0B5618 800B4A18 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B6E50.s b/asm/non_matchings/unknown_0AEE70/func_800B6E50.s index d860bfaf..5a61778b 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B6E50.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B6E50.s @@ -27,10 +27,10 @@ glabel func_800B6E50 /* 0B7AAC 800B6EAC 24080010 */ li $t0, 16 /* 0B7AB0 800B6EB0 3C018012 */ lui $at, %hi(D_80127CC4) # $at, 0x8012 /* 0B7AB4 800B6EB4 AC287CC4 */ sw $t0, %lo(D_80127CC4)($at) -/* 0B7AB8 800B6EB8 3C018012 */ lui $at, 0x8012 +/* 0B7AB8 800B6EB8 3C018012 */ lui $at, %hi(D_80127CC8) # $at, 0x8012 /* 0B7ABC 800B6EBC 2449FFF0 */ addiu $t1, $v0, -0x10 /* 0B7AC0 800B6EC0 03E00008 */ jr $ra -/* 0B7AC4 800B6EC4 AC297CC8 */ sw $t1, 0x7cc8($at) +/* 0B7AC4 800B6EC4 AC297CC8 */ sw $t1, %lo(D_80127CC8)($at) .L800B6EC8: /* 0B7AC8 800B6EC8 3C018012 */ lui $at, %hi(D_80127CC4) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B6EE0.s b/asm/non_matchings/unknown_0AEE70/func_800B6EE0.s index d2460745..bcd5da2b 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B6EE0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B6EE0.s @@ -5,7 +5,7 @@ glabel func_800B6EE0 /* 0B7AEC 800B6EEC 3C0F8012 */ lui $t7, %hi(D_80127CC4) # $t7, 0x8012 /* 0B7AF0 800B6EF0 8DEF7CC4 */ lw $t7, %lo(D_80127CC4)($t7) /* 0B7AF4 800B6EF4 A42E7CAC */ sh $t6, %lo(D_80127CAC)($at) -/* 0B7AF8 800B6EF8 3C018012 */ lui $at, 0x8012 +/* 0B7AF8 800B6EF8 3C018012 */ lui $at, %hi(D_80127CAE) # $at, 0x8012 /* 0B7AFC 800B6EFC 03E00008 */ jr $ra -/* 0B7B00 800B6F00 A42F7CAE */ sh $t7, 0x7cae($at) +/* 0B7B00 800B6F00 A42F7CAE */ sh $t7, %lo(D_80127CAE)($at) diff --git a/asm/non_matchings/unknown_0B8920/func_800C0780.s b/asm/non_matchings/unknown_0B8920/func_800C0780.s index d6d32175..3bd86706 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C0780.s +++ b/asm/non_matchings/unknown_0B8920/func_800C0780.s @@ -45,7 +45,7 @@ glabel func_800C0780 /* 0C1420 800C0820 3C018013 */ lui $at, %hi(D_8012A754) # $at, 0x8013 /* 0C1424 800C0824 E432A754 */ swc1 $f18, %lo(D_8012A754)($at) .L800C0828: -/* 0C1428 800C0828 3C01800E */ lui $at, 0x800e +/* 0C1428 800C0828 3C01800E */ lui $at, %hi(D_800E31AC) # $at, 0x800e /* 0C142C 800C082C 03E00008 */ jr $ra -/* 0C1430 800C0830 AC2831AC */ sw $t0, 0x31ac($at) +/* 0C1430 800C0830 AC2831AC */ sw $t0, %lo(D_800E31AC)($at) diff --git a/asm/non_matchings/unknown_0B8920/func_800C2640.s b/asm/non_matchings/unknown_0B8920/func_800C2640.s index 8dbf6f0f..e650b736 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C2640.s +++ b/asm/non_matchings/unknown_0B8920/func_800C2640.s @@ -90,7 +90,7 @@ glabel func_800C2640 /* 0C3388 800C2788 3C018013 */ lui $at, %hi(D_8012A74C) # $at, 0x8013 /* 0C338C 800C278C 00007812 */ mflo $t7 /* 0C3390 800C2790 AC2FA74C */ sw $t7, %lo(D_8012A74C)($at) -/* 0C3394 800C2794 3C01800E */ lui $at, 0x800e +/* 0C3394 800C2794 3C01800E */ lui $at, %hi(D_800E31AC) # $at, 0x800e /* 0C3398 800C2798 03E00008 */ jr $ra -/* 0C339C 800C279C AC3831AC */ sw $t8, 0x31ac($at) +/* 0C339C 800C279C AC3831AC */ sw $t8, %lo(D_800E31AC)($at) diff --git a/asm/non_matchings/unknown_0B8920/func_800C3158.s b/asm/non_matchings/unknown_0B8920/func_800C3158.s index faabe106..79e32ac6 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C3158.s +++ b/asm/non_matchings/unknown_0B8920/func_800C3158.s @@ -35,7 +35,7 @@ glabel func_800C3158 /* 0C3DD8 800C31D8 E4263678 */ swc1 $f6, %lo(D_800E3678)($at) /* 0C3DDC 800C31DC 00000000 */ nop .L800C31E0: -/* 0C3DE0 800C31E0 3C01800E */ lui $at, 0x800e +/* 0C3DE0 800C31E0 3C01800E */ lui $at, %hi(D_800E367C) # $at, 0x800e /* 0C3DE4 800C31E4 03E00008 */ jr $ra -/* 0C3DE8 800C31E8 AC24367C */ sw $a0, 0x367c($at) +/* 0C3DE8 800C31E8 AC24367C */ sw $a0, %lo(D_800E367C)($at) diff --git a/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s b/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s index d145f233..84cbd10e 100644 --- a/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s +++ b/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s @@ -7,13 +7,13 @@ glabel func_800D47F0 /* 0D5404 800D4804 AFB00018 */ sw $s0, 0x18($sp) /* 0D5408 800D4808 8FAF0028 */ lw $t7, 0x28($sp) /* 0D540C 800D480C 8FAE002C */ lw $t6, 0x2c($sp) -/* 0D5410 800D4810 3C01800E */ lui $at, 0x800e +/* 0D5410 800D4810 3C01800E */ lui $at, %hi(D_800E48A0) # $at, 0x800e /* 0D5414 800D4814 000FC080 */ sll $t8, $t7, 2 /* 0D5418 800D4818 00408025 */ move $s0, $v0 /* 0D541C 800D481C 00380821 */ addu $at, $at, $t8 /* 0D5420 800D4820 02002025 */ move $a0, $s0 /* 0D5424 800D4824 0C034960 */ jal __osRestoreInt -/* 0D5428 800D4828 AC2E48A0 */ sw $t6, 0x48a0($at) +/* 0D5428 800D4828 AC2E48A0 */ sw $t6, %lo(D_800E48A0)($at) /* 0D542C 800D482C 8FBF001C */ lw $ra, 0x1c($sp) /* 0D5430 800D4830 8FB00018 */ lw $s0, 0x18($sp) /* 0D5434 800D4834 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index df02dfc5..cb052e3b 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -5,7 +5,7 @@ from file_util import FileUtil LINE_START_REGEX = r'\n(/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+|\.L80[0-9A-F]{6}:)' REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))' GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))' -GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'l[bhw]\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\4\))' +GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\4\))' GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + GLABEL_LOWER_REGEX def _find_glabels(asm): @@ -13,7 +13,7 @@ def _find_glabels(asm): for file in FileUtil.get_filenames_from_directory_recursive('.', '.s'): matches = re.findall(GLABEL_REGEX, FileUtil.get_text_from_file(file)) for match in matches: - offsets = (match[2], match[11]) # ROM offsets of the lu and lw + offsets = (match[2], match[11]) # ROM offsets of the lui and [sl][bhw] glabel_upper = int(match[5], 16) # upper immediate of glabel glabel_lower = int(match[14], 16) # lower immediate of the glabel if glabel_lower & 0x8000: diff --git a/undefined_syms.txt b/undefined_syms.txt index 677bec0a..c26f892d 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -2329,6 +2329,7 @@ D_801262CC = 0x801262CC; D_801262D0 = 0x801262D0; D_801262D4 = 0x801262D4; D_801262D8 = 0x801262D8; +D_801262DC = 0x801262DC; D_801262E0 = 0x801262E0; D_801262E4 = 0x801262E4; D_80126308 = 0x80126308;