From fda6d13724ea81d489f2f5233669861d40a4a7fc Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Sat, 29 May 2021 15:47:49 -0700 Subject: [PATCH] Added glabels whose upper/lower sections are used long distances apart. Also fixed some incorrect labels as well. --- .../unknown_005740/func_80005D08.s | 3 ++- .../unknown_005740/func_800063EC.s | 3 ++- .../unknown_005740/func_80006BFC.s | 3 ++- .../unknown_00BC20/func_8000B750.s | 4 ++-- .../unknown_00BC20/func_8000CC7C.s | 6 +++--- .../unknown_00BC20/func_80011C94.s | 8 +++---- .../unknown_00BC20/func_80013DCC.s | 4 ++-- .../unknown_00BC20/func_800159C8.s | 6 ++++-- .../unknown_0255E0/func_800249F0.s | 4 ++-- .../unknown_0255E0/func_8002A5F8.s | 2 +- .../unknown_043920/func_80043ECC.s | 10 ++++----- .../unknown_043920/func_8004447C.s | 2 +- .../unknown_043920/func_80045C48.s | 4 ++-- .../unknown_043920/func_8004C2B0.s | 5 +++-- .../unknown_043920/func_8004F7F4.s | 6 ++++-- .../unknown_043920/func_80054110.s | 6 ++++-- .../unknown_043920/func_8005A6F0.s | 6 +++--- .../unknown_066AA0/func_80066CDC.s | 4 ++-- .../unknown_066AA0/func_80067A3C.s | 4 ++-- .../unknown_066AA0/func_80068514.s | 4 ++-- .../unknown_066AA0/func_80068BF4.s | 4 ++-- .../unknown_066AA0/func_8006C60C.s | 8 +++---- .../unknown_066AA0/func_8006CCF0.s | 6 +++--- .../unknown_07AF10/func_8007A98C.s | 4 ++-- asm/non_matchings/unknown_080500/D_8008F618.s | 8 +++---- .../unknown_080500/MenuBootLoop.s | 4 ++-- .../unknown_080500/MenuFileSelectLoop.s | 2 +- .../unknown_080500/MenuGameSelectLoop.s | 2 +- .../unknown_080500/MenuLoadNewAreaLoop.s | 6 +++--- .../unknown_080500/MenuTitleScreenLoop.s | 10 ++++----- .../MenuTrophyRaceRankingsInit.s | 4 ++-- .../unknown_080500/func_80080580.s | 4 ++-- .../unknown_080500/func_80081F4C.s | 4 ++-- .../unknown_080500/func_80084854.s | 4 ++-- .../unknown_080500/func_800853D0.s | 4 ++-- .../unknown_080500/func_80086AFC.s | 4 ++-- .../unknown_080500/func_80087734.s | 8 +++---- .../unknown_080500/func_80088938.s | 4 ++-- .../unknown_080500/func_800896A4.s | 4 ++-- .../unknown_080500/func_8008C168.s | 8 +++---- .../unknown_080500/func_8008D8BC.s | 4 ++-- .../unknown_080500/func_8008DC7C.s | 4 ++-- .../unknown_080500/func_80090918.s | 4 ++-- .../unknown_080500/func_80090F30.s | 4 ++-- .../unknown_080500/func_80093A40.s | 4 ++-- .../unknown_080500/func_80094170.s | 4 ++-- .../unknown_080500/func_80094D28.s | 4 ++-- .../unknown_080500/func_80095728.s | 4 ++-- .../unknown_080500/func_80097D10.s | 4 ++-- .../unknown_080500/func_8009D360.s | 4 ++-- .../unknown_09F8F0/func_8009F034.s | 8 +++---- .../unknown_09F8F0/func_800A3CE4.s | 4 ++-- .../unknown_09F8F0/func_800A5F18.s | 4 ++-- .../unknown_09F8F0/func_800A8474.s | 8 +++---- .../unknown_09F8F0/func_800AA600.s | 10 ++++----- .../unknown_09F8F0/func_800AC8A8.s | 2 +- .../unknown_09F8F0/func_800AD4B8.s | 4 ++-- .../unknown_0AEE70/func_800B1CB8.s | 12 +++++------ .../unknown_0AEE70/func_800B26E0.s | 8 +++---- .../unknown_0AEE70/func_800B653C.s | 4 ++-- .../unknown_0B8920/func_800B8134.s | 4 ++-- .../unknown_0B8920/func_800BA4B8.s | 4 ++-- .../unknown_0B8920/func_800BBE08.s | 2 +- .../unknown_0B8920/func_800BCC70.s | 4 ++-- .../unknown_0B8920/func_800BF634.s | 21 +++++++++++-------- .../unknown_0B8920/func_800C05C8.s | 4 ++-- .../unknown_0B8920/func_800C0780.s | 4 ++-- data/unknown_043920.rodata.s | 2 ++ data/unknown_080500.rodata.s | 3 +++ data/unknown_0B8920.rodata.s | 8 +++++++ src/unknown_00BC20.c | 7 +++---- tools/python/find_glabels.py | 5 ++--- undefined_syms.txt | 12 ++++++----- 73 files changed, 203 insertions(+), 177 deletions(-) diff --git a/asm/non_matchings/unknown_005740/func_80005D08.s b/asm/non_matchings/unknown_005740/func_80005D08.s index 65338fc4..05f957f2 100644 --- a/asm/non_matchings/unknown_005740/func_80005D08.s +++ b/asm/non_matchings/unknown_005740/func_80005D08.s @@ -180,7 +180,8 @@ glabel func_80005D08 /* 006B98 80005F98 44805000 */ mtc1 $zero, $f10 /* 006B9C 80005F9C 46008221 */ cvt.d.s $f8, $f16 /* 006BA0 80005FA0 46285032 */ c.eq.d $f10, $f8 -/* 006BA4 80005FA4 3C01800E */ lui $at, 0x800e +# Used to access D_800E4C58 and D_800E4C5C. +/* 006BA4 80005FA4 3C01800E */ lui $at, %hi(D_800E4C58) # $at, 0x800e /* 006BA8 80005FA8 45010034 */ bc1t .L8000607C /* 006BAC 80005FAC 00000000 */ nop /* 006BB0 80005FB0 8C849C3C */ lw $a0, %lo(D_80119C3C)($a0) diff --git a/asm/non_matchings/unknown_005740/func_800063EC.s b/asm/non_matchings/unknown_005740/func_800063EC.s index bb854574..218a95b5 100644 --- a/asm/non_matchings/unknown_005740/func_800063EC.s +++ b/asm/non_matchings/unknown_005740/func_800063EC.s @@ -330,7 +330,8 @@ glabel func_800063EC /* 0074A4 800068A4 46049182 */ mul.s $f6, $f18, $f4 /* 0074A8 800068A8 46009221 */ cvt.d.s $f8, $f18 /* 0074AC 800068AC 46285032 */ c.eq.d $f10, $f8 -/* 0074B0 800068B0 3C01800E */ lui $at, 0x800e +# Used to access D_800E4C88 and D_800E4C8C. +/* 0074B0 800068B0 3C01800E */ lui $at, %hi(D_800E4C88) # $at, 0x800e /* 0074B4 800068B4 45010032 */ bc1t .L80006980 /* 0074B8 800068B8 46067380 */ add.s $f14, $f14, $f6 /* 0074BC 800068BC 8DAD9C3C */ lw $t5, %lo(D_80119C3C)($t5) diff --git a/asm/non_matchings/unknown_005740/func_80006BFC.s b/asm/non_matchings/unknown_005740/func_80006BFC.s index 955e0cfe..f2584eaa 100644 --- a/asm/non_matchings/unknown_005740/func_80006BFC.s +++ b/asm/non_matchings/unknown_005740/func_80006BFC.s @@ -219,7 +219,8 @@ glabel func_80006BFC /* 007B38 80006F38 C42B4CA8 */ lwc1 $f11, %lo(D_800E4CA8)($at) /* 007B3C 80006F3C 46004321 */ cvt.d.s $f12, $f8 /* 007B40 80006F40 462C503C */ c.lt.d $f10, $f12 -/* 007B44 80006F44 3C01800E */ lui $at, 0x800e +# Used to access D_800E4CB8 and D_800E4CBC. +/* 007B44 80006F44 3C01800E */ lui $at, %hi(D_800E4CB8) # $at, 0x800e /* 007B48 80006F48 45000009 */ bc1f .L80006F70 /* 007B4C 80006F4C 00000000 */ nop /* 007B50 80006F50 3C01800E */ lui $at, %hi(D_800E4CBC) # $at, 0x800e diff --git a/asm/non_matchings/unknown_00BC20/func_8000B750.s b/asm/non_matchings/unknown_00BC20/func_8000B750.s index 9bac7364..4a52d8d4 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B750.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B750.s @@ -142,7 +142,7 @@ glabel func_8000B750 /* 00C560 8000B960 000D6840 */ sll $t5, $t5, 1 /* 00C564 8000B964 A7A00052 */ sh $zero, 0x52($sp) /* 00C568 8000B968 A7A00054 */ sh $zero, 0x54($sp) -/* 00C56C 8000B96C 3C0E800E */ lui $t6, 0x800e +/* 00C56C 8000B96C 3C0E800E */ lui $t6, %hi(D_800DC754) # $t6, 0x800e /* 00C570 8000B970 E7AE0010 */ swc1 $f14, 0x10($sp) /* 00C574 8000B974 E7B20064 */ swc1 $f18, 0x64($sp) /* 00C578 8000B978 E7B00058 */ swc1 $f16, 0x58($sp) @@ -155,7 +155,7 @@ glabel func_8000B750 /* 00C594 8000B994 AFAD0014 */ sw $t5, 0x14($sp) /* 00C598 8000B998 000FC900 */ sll $t9, $t7, 4 /* 00C59C 8000B99C 8D8F007C */ lw $t7, 0x7c($t4) -/* 00C5A0 8000B9A0 8DCEC754 */ lw $t6, -0x38ac($t6) +/* 00C5A0 8000B9A0 8DCEC754 */ lw $t6, %lo(D_800DC754)($t6) /* 00C5A4 8000B9A4 44071000 */ mfc1 $a3, $f2 /* 00C5A8 8000B9A8 AFAA0038 */ sw $t2, 0x38($sp) /* 00C5AC 8000B9AC AFA20044 */ sw $v0, 0x44($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 2b12149c..7d3023f0 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -832,7 +832,7 @@ glabel func_8000CC7C .L8000D834: /* 00E434 8000D834 A27E01CB */ sb $fp, 0x1cb($s3) /* 00E438 8000D838 826201CB */ lb $v0, 0x1cb($s3) -/* 00E43C 8000D83C 3C19800E */ lui $t9, 0x800e +/* 00E43C 8000D83C 3C19800E */ lui $t9, %hi(D_800DC840) # $t9, 0x800e /* 00E440 8000D840 04400003 */ bltz $v0, .L8000D850 /* 00E444 8000D844 28410003 */ slti $at, $v0, 3 /* 00E448 8000D848 14200002 */ bnez $at, .L8000D854 @@ -848,7 +848,7 @@ glabel func_8000CC7C /* 00E468 8000D868 24010002 */ li $at, 2 /* 00E46C 8000D86C 15C10004 */ bne $t6, $at, .L8000D880 /* 00E470 8000D870 0330C821 */ addu $t9, $t9, $s0 -/* 00E474 8000D874 8339C840 */ lb $t9, -0x37c0($t9) +/* 00E474 8000D874 8339C840 */ lb $t9, %lo(D_800DC840)($t9) /* 00E478 8000D878 10000004 */ b .L8000D88C /* 00E47C 8000D87C A2790003 */ sb $t9, 3($s3) .L8000D880: @@ -1264,7 +1264,7 @@ glabel func_8000CC7C /* 00EA64 8000DE64 17200005 */ bnez $t9, .L8000DE7C /* 00EA68 8000DE68 00000000 */ nop /* 00EA6C 8000DE6C 81EFAD3C */ lb $t7, %lo(D_8011AD3C)($t7) -/* 00EA70 8000DE70 3C018012 */ lui $at, 0x8012 +/* 00EA70 8000DE70 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012 /* 00EA74 8000DE74 11E00004 */ beqz $t7, .L8000DE88 /* 00EA78 8000DE78 00000000 */ nop .L8000DE7C: diff --git a/asm/non_matchings/unknown_00BC20/func_80011C94.s b/asm/non_matchings/unknown_00BC20/func_80011C94.s index 041db092..66a332a0 100644 --- a/asm/non_matchings/unknown_00BC20/func_80011C94.s +++ b/asm/non_matchings/unknown_00BC20/func_80011C94.s @@ -115,7 +115,7 @@ glabel func_80011C94 /* 012A38 80011E38 15000003 */ bnez $t0, .L80011E48 /* 012A3C 80011E3C 28A100FF */ slti $at, $a1, 0xff /* 012A40 80011E40 10200012 */ beqz $at, .L80011E8C -/* 012A44 80011E44 3C108012 */ lui $s0, 0x8012 +/* 012A44 80011E44 3C108012 */ lui $s0, %hi(D_8011AE8C) # $s0, 0x8012 .L80011E48: /* 012A48 80011E48 3C108012 */ lui $s0, %hi(D_8011AE8C) # $s0, 0x8012 /* 012A4C 80011E4C 2610AE8C */ addiu $s0, %lo(D_8011AE8C) # addiu $s0, $s0, -0x5174 @@ -135,7 +135,7 @@ glabel func_80011C94 /* 012A84 80011E84 10000009 */ b .L80011EAC /* 012A88 80011E88 AC590004 */ sw $t9, 4($v0) .L80011E8C: -/* 012A8C 80011E8C 2610AE8C */ addiu $s0, $s0, -0x5174 +/* 012A8C 80011E8C 2610AE8C */ addiu $s0, %lo(D_8011AE8C) # addiu $s0, $s0, -0x5174 /* 012A90 80011E90 8E020000 */ lw $v0, ($s0) /* 012A94 80011E94 3C0DFA00 */ lui $t5, 0xfa00 /* 012A98 80011E98 244F0008 */ addiu $t7, $v0, 8 @@ -208,7 +208,7 @@ glabel func_80011C94 /* 012B90 80011F90 14800009 */ bnez $a0, .L80011FB8 /* 012B94 80011F94 00000000 */ nop /* 012B98 80011F98 15620028 */ bne $t3, $v0, .L8001203C -/* 012B9C 80011F9C 3C058012 */ lui $a1, 0x8012 +/* 012B9C 80011F9C 3C058012 */ lui $a1, %hi(D_8011AE90) # $a1, 0x8012 /* 012BA0 80011FA0 8CF80064 */ lw $t8, 0x64($a3) /* 012BA4 80011FA4 2401000A */ li $at, 10 /* 012BA8 80011FA8 930E0018 */ lbu $t6, 0x18($t8) @@ -257,7 +257,7 @@ glabel func_80011C94 /* 012C40 80012040 3C068012 */ lui $a2, %hi(D_8011AE94) # $a2, 0x8012 /* 012C44 80012044 24C6AE94 */ addiu $a2, %lo(D_8011AE94) # addiu $a2, $a2, -0x516c /* 012C48 80012048 02002025 */ move $a0, $s0 -/* 012C4C 8001204C 24A5AE90 */ addiu $a1, $a1, -0x5170 +/* 012C4C 8001204C 24A5AE90 */ addiu $a1, %lo(D_8011AE90) # addiu $a1, $a1, -0x5170 /* 012C50 80012050 AFAA0014 */ sw $t2, 0x14($sp) /* 012C54 80012054 AFA80080 */ sw $t0, 0x80($sp) /* 012C58 80012058 AFA9007C */ sw $t1, 0x7c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80013DCC.s b/asm/non_matchings/unknown_00BC20/func_80013DCC.s index 5831bdd9..1becf18d 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013DCC.s +++ b/asm/non_matchings/unknown_00BC20/func_80013DCC.s @@ -85,7 +85,7 @@ glabel func_80013DCC /* 014B0C 80013F0C 46022182 */ mul.s $f6, $f4, $f2 /* 014B10 80013F10 8FA90028 */ lw $t1, 0x28($sp) /* 014B14 80013F14 8FAB0054 */ lw $t3, 0x54($sp) -/* 014B18 80013F18 3C07800E */ lui $a3, 0x800e +/* 014B18 80013F18 3C07800E */ lui $a3, %hi(D_800DC84C) # $a3, 0x800e /* 014B1C 80013F1C E7060008 */ swc1 $f6, 8($t8) /* 014B20 80013F20 C4680004 */ lwc1 $f8, 4($v1) /* 014B24 80013F24 91390002 */ lbu $t9, 2($t1) @@ -124,7 +124,7 @@ glabel func_80013DCC /* 014BA8 80013FA8 3319007F */ andi $t9, $t8, 0x7f /* 014BAC 80013FAC 00ED3821 */ addu $a3, $a3, $t5 /* 014BB0 80013FB0 272A0080 */ addiu $t2, $t9, 0x80 -/* 014BB4 80013FB4 8CE7C84C */ lw $a3, -0x37b4($a3) +/* 014BB4 80013FB4 8CE7C84C */ lw $a3, %lo(D_800DC84C)($a3) /* 014BB8 80013FB8 0C01FD65 */ jal func_8007F594 /* 014BBC 80013FBC 01413025 */ or $a2, $t2, $at /* 014BC0 80013FC0 C7B00038 */ lwc1 $f16, 0x38($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_800159C8.s b/asm/non_matchings/unknown_00BC20/func_800159C8.s index 1e067148..e2742644 100644 --- a/asm/non_matchings/unknown_00BC20/func_800159C8.s +++ b/asm/non_matchings/unknown_00BC20/func_800159C8.s @@ -391,7 +391,8 @@ glabel func_800159C8 /* 016BA4 80015FA4 8C850064 */ lw $a1, 0x64($a0) /* 016BA8 80015FA8 00001025 */ move $v0, $zero /* 016BAC 80015FAC 80AF01D6 */ lb $t7, 0x1d6($a1) -/* 016BB0 80015FB0 3C01800E */ lui $at, 0x800e +# Used to access D_800E55E0 and D_800E55E4 +/* 016BB0 80015FB0 3C01800E */ lui $at, %hi(D_800E55E0) # $at, 0x800e /* 016BB4 80015FB4 152F0059 */ bne $t1, $t7, .L8001611C /* 016BB8 80015FB8 00000000 */ nop /* 016BBC 80015FBC 3C01800E */ lui $at, %hi(D_800E55C4) # $at, 0x800e @@ -439,7 +440,8 @@ glabel func_800159C8 /* 016C5C 8001605C 460C2202 */ mul.s $f8, $f4, $f12 /* 016C60 80016060 C480001C */ lwc1 $f0, 0x1c($a0) /* 016C64 80016064 C4E4000C */ lwc1 $f4, 0xc($a3) -/* 016C68 80016068 3C01800E */ lui $at, 0x800e +# Used to access D_800E55D8 and D_800E55DC. +/* 016C68 80016068 3C01800E */ lui $at, %hi(D_800E55D8) # $at, 0x800e /* 016C6C 8001606C 46003282 */ mul.s $f10, $f6, $f0 /* 016C70 80016070 460A4081 */ sub.s $f2, $f8, $f10 /* 016C74 80016074 C4E80014 */ lwc1 $f8, 0x14($a3) diff --git a/asm/non_matchings/unknown_0255E0/func_800249F0.s b/asm/non_matchings/unknown_0255E0/func_800249F0.s index c43b4390..52aa24b8 100644 --- a/asm/non_matchings/unknown_0255E0/func_800249F0.s +++ b/asm/non_matchings/unknown_0255E0/func_800249F0.s @@ -136,7 +136,7 @@ glabel func_800249F0 /* 0257E0 80024BE0 0C002C08 */ jal func_8000B020 /* 0257E4 80024BE4 24050040 */ li $a1, 64 /* 0257E8 80024BE8 16200008 */ bnez $s1, .L80024C0C -/* 0257EC 80024BEC 3C04800E */ lui $a0, 0x800e +/* 0257EC 80024BEC 3C04800E */ lui $a0, %hi(D_800DC874) # $a0, 0x800e /* 0257F0 80024BF0 16000006 */ bnez $s0, .L80024C0C /* 0257F4 80024BF4 00000000 */ nop /* 0257F8 80024BF8 3C04800E */ lui $a0, %hi(D_800DC87C) # $a0, 0x800e @@ -146,7 +146,7 @@ glabel func_800249F0 /* 025808 80024C08 8E640000 */ lw $a0, ($s3) .L80024C0C: /* 02580C 80024C0C 0C030076 */ jal func_800C01D8 -/* 025810 80024C10 2484C874 */ addiu $a0, $a0, -0x378c +/* 025810 80024C10 2484C874 */ addiu $a0, %lo(D_800DC874) # addiu $a0, $a0, -0x378c /* 025814 80024C14 8E640000 */ lw $a0, ($s3) .L80024C18: /* 025818 80024C18 0C01994B */ jal func_8006652C diff --git a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s index fb94c005..da903827 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s @@ -182,7 +182,7 @@ glabel func_8002A5F8 /* 02B498 8002A898 C42A5EAC */ lwc1 $f10, %lo(D_800E5EAC)($at) /* 02B49C 8002A89C 46003221 */ cvt.d.s $f8, $f6 /* 02B4A0 8002A8A0 462A403C */ c.lt.d $f8, $f10 -/* 02B4A4 8002A8A4 3C018012 */ lui $at, 0x8012 +/* 02B4A4 8002A8A4 3C018012 */ lui $at, %hi(D_8011B0BC) # $at, 0x8012 /* 02B4A8 8002A8A8 45000005 */ bc1f .L8002A8C0 /* 02B4AC 8002A8AC 24020001 */ li $v0, 1 /* 02B4B0 8002A8B0 24080001 */ li $t0, 1 diff --git a/asm/non_matchings/unknown_043920/func_80043ECC.s b/asm/non_matchings/unknown_043920/func_80043ECC.s index 2d1c4ba7..bc15728a 100644 --- a/asm/non_matchings/unknown_043920/func_80043ECC.s +++ b/asm/non_matchings/unknown_043920/func_80043ECC.s @@ -16,7 +16,7 @@ glabel func_80043ECC /* 044B00 80043F00 8FA50024 */ lw $a1, 0x24($sp) /* 044B04 80043F04 00403025 */ move $a2, $v0 /* 044B08 80043F08 80AE01D3 */ lb $t6, 0x1d3($a1) -/* 044B0C 80043F0C 3C018012 */ lui $at, 0x8012 +/* 044B0C 80043F0C 3C018012 */ lui $at, %hi(D_8011D5BB) # $at, 0x8012 /* 044B10 80043F10 11C0001A */ beqz $t6, .L80043F7C /* 044B14 80043F14 2404000C */ li $a0, 12 /* 044B18 80043F18 3C0F8012 */ lui $t7, %hi(D_8011D5BB) # $t7, 0x8012 @@ -41,7 +41,7 @@ glabel func_80043ECC /* 044B60 80043F60 15C00016 */ bnez $t6, .L80043FBC /* 044B64 80043F64 3C0F8012 */ lui $t7, %hi(D_8011D5BA) # $t7, 0x8012 /* 044B68 80043F68 81EFD5BA */ lb $t7, %lo(D_8011D5BA)($t7) -/* 044B6C 80043F6C 3C018012 */ lui $at, %hi(D_8011D5BB) # $at, 0x8012 +/* 044B6C 80043F6C 3C018012 */ lui $at, %hi(D_8011D5BA) # $at, 0x8012 /* 044B70 80043F70 01F8C821 */ addu $t9, $t7, $t8 /* 044B74 80043F74 10000011 */ b .L80043FBC /* 044B78 80043F78 A039D5BA */ sb $t9, %lo(D_8011D5BA)($at) @@ -67,7 +67,7 @@ glabel func_80043ECC /* 044BBC 80043FBC 80AF0173 */ lb $t7, 0x173($a1) /* 044BC0 80043FC0 3C188012 */ lui $t8, %hi(D_8011D5BC) # $t8, 0x8012 /* 044BC4 80043FC4 11E00014 */ beqz $t7, .L80044018 -/* 044BC8 80043FC8 3C018012 */ lui $at, 0x8012 +/* 044BC8 80043FC8 3C018012 */ lui $at, %hi(D_8011D5BC) # $at, 0x8012 /* 044BCC 80043FCC 80A30174 */ lb $v1, 0x174($a1) /* 044BD0 80043FD0 8318D5BC */ lb $t8, %lo(D_8011D5BC)($t8) /* 044BD4 80043FD4 00000000 */ nop @@ -102,7 +102,7 @@ glabel func_80043ECC /* 044C3C 8004403C 11C00022 */ beqz $t6, .L800440C8 /* 044C40 80044040 00000000 */ nop /* 044C44 80044044 80AF0173 */ lb $t7, 0x173($a1) -/* 044C48 80044048 3C0A800E */ lui $t2, 0x800e +/* 044C48 80044048 3C0A800E */ lui $t2, %hi(D_800DCD90) # $t2, 0x800e /* 044C4C 8004404C 11E0001E */ beqz $t7, .L800440C8 /* 044C50 80044050 00000000 */ nop /* 044C54 80044054 80A30174 */ lb $v1, 0x174($a1) @@ -124,7 +124,7 @@ glabel func_80043ECC /* 044C90 80044090 00000000 */ nop /* 044C94 80044094 01445021 */ addu $t2, $t2, $a0 .L80044098: -/* 044C98 80044098 814ACD90 */ lb $t2, -0x3270($t2) +/* 044C98 80044098 814ACD90 */ lb $t2, %lo(D_800DCD90)($t2) /* 044C9C 8004409C 24010001 */ li $at, 1 /* 044CA0 800440A0 1541000A */ bne $t2, $at, .L800440CC /* 044CA4 800440A4 00C01025 */ move $v0, $a2 diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index e207f5f9..4b2fc4fd 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -586,7 +586,7 @@ glabel func_8004447C /* 0458F8 80044CF8 44803000 */ mtc1 $zero, $f6 /* 0458FC 80044CFC 460042A1 */ cvt.d.s $f10, $f8 /* 045900 80044D00 462A303C */ c.lt.d $f6, $f10 -/* 045904 80044D04 3C018012 */ lui $at, 0x8012 +/* 045904 80044D04 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 /* 045908 80044D08 45000005 */ bc1f .L80044D20 /* 04590C 80044D0C 240D4000 */ li $t5, 16384 /* 045910 80044D10 340CC000 */ li $t4, 49152 diff --git a/asm/non_matchings/unknown_043920/func_80045C48.s b/asm/non_matchings/unknown_043920/func_80045C48.s index 6e5b31dc..c34edc4f 100644 --- a/asm/non_matchings/unknown_043920/func_80045C48.s +++ b/asm/non_matchings/unknown_043920/func_80045C48.s @@ -538,7 +538,7 @@ glabel func_80045C48 /* 047028 80046428 10C10013 */ beq $a2, $at, .L80046478 /* 04702C 8004642C 24010005 */ li $at, 5 /* 047030 80046430 10C1001B */ beq $a2, $at, .L800464A0 -/* 047034 80046434 3C0D8012 */ lui $t5, 0x8012 +/* 047034 80046434 3C0D8012 */ lui $t5, %hi(D_8011D534) # $t5, 0x8012 /* 047038 80046438 24010007 */ li $at, 7 /* 04703C 8004643C 10C10021 */ beq $a2, $at, .L800464C4 /* 047040 80046440 3C0F8012 */ lui $t7, %hi(D_8011D534) # $t7, 0x8012 @@ -568,7 +568,7 @@ glabel func_80045C48 /* 047098 80046498 10000016 */ b .L800464F4 /* 04709C 8004649C AC2CD534 */ sw $t4, %lo(D_8011D534)($at) .L800464A0: -/* 0470A0 800464A0 8DADD534 */ lw $t5, -0x2acc($t5) +/* 0470A0 800464A0 8DADD534 */ lw $t5, %lo(D_8011D534)($t5) /* 0470A4 800464A4 244E001F */ addiu $t6, $v0, 0x1f /* 0470A8 800464A8 01C4C007 */ srav $t8, $a0, $t6 /* 0470AC 800464AC 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_043920/func_8004C2B0.s b/asm/non_matchings/unknown_043920/func_8004C2B0.s index f6ff5a5c..d926beaa 100644 --- a/asm/non_matchings/unknown_043920/func_8004C2B0.s +++ b/asm/non_matchings/unknown_043920/func_8004C2B0.s @@ -94,10 +94,11 @@ glabel func_8004C2B0 /* 04D004 8004C404 C42A655C */ lwc1 $f10, %lo(D_800E655C)($at) /* 04D008 8004C408 46004021 */ cvt.d.s $f0, $f8 /* 04D00C 8004C40C 462A003C */ c.lt.d $f0, $f10 -/* 04D010 8004C410 3C01800E */ lui $at, 0x800e +/* 04D010 8004C410 3C01800E */ lui $at, %hi(D_800E6568) # $at, 0x800e /* 04D014 8004C414 45000009 */ bc1f .L8004C43C /* 04D018 8004C418 00000000 */ nop -/* 04D01C 8004C41C 3C01800E */ lui $at, %hi(D_800E6568) # $at, 0x800e +# Used to access D_800E6560 and D_800E6564. +/* 04D01C 8004C41C 3C01800E */ lui $at, %hi(D_800E6560) # $at, 0x800e /* 04D020 8004C420 C4256560 */ lwc1 $f5, %lo(D_800E6560)($at) /* 04D024 8004C424 C4246564 */ lwc1 $f4, %lo(D_800E6564)($at) /* 04D028 8004C428 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index 62008818..22c9006d 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -366,10 +366,12 @@ glabel func_8004F7F4 /* 05092C 8004FD2C 0C016420 */ jal func_80059080 /* 050930 8004FD30 27A700B0 */ addiu $a3, $sp, 0xb0 /* 050934 8004FD34 920C01F0 */ lbu $t4, 0x1f0($s0) -/* 050938 8004FD38 3C01800E */ lui $at, 0x800e +# Used to access D_800E6620 and D_800E6624. +/* 050938 8004FD38 3C01800E */ lui $at, %hi(D_800E6620) # $at, 0x800e /* 05093C 8004FD3C 1180000A */ beqz $t4, .L8004FD68 /* 050940 8004FD40 00000000 */ nop -/* 050944 8004FD44 3C01800E */ lui $at, %hi(D_800E6624) # $at, 0x800e +# Used to access D_800E6618 and D_800E661C. +/* 050944 8004FD44 3C01800E */ lui $at, %hi(D_800E6618) # $at, 0x800e /* 050948 8004FD48 C60600A8 */ lwc1 $f6, 0xa8($s0) /* 05094C 8004FD4C C4296618 */ lwc1 $f9, %lo(D_800E6618)($at) /* 050950 8004FD50 C428661C */ lwc1 $f8, %lo(D_800E661C)($at) diff --git a/asm/non_matchings/unknown_043920/func_80054110.s b/asm/non_matchings/unknown_043920/func_80054110.s index 9baab364..c96a31ce 100644 --- a/asm/non_matchings/unknown_043920/func_80054110.s +++ b/asm/non_matchings/unknown_043920/func_80054110.s @@ -117,10 +117,12 @@ glabel func_80054110 /* 054EC0 800542C0 0C016420 */ jal func_80059080 /* 054EC4 800542C4 27A700A0 */ addiu $a3, $sp, 0xa0 /* 054EC8 800542C8 920A01F0 */ lbu $t2, 0x1f0($s0) -/* 054ECC 800542CC 3C01800E */ lui $at, 0x800e +# Used to access D_800E67E0 and D_800E67E4. +/* 054ECC 800542CC 3C01800E */ lui $at, %hi(D_800E67E0) # $at, 0x800e /* 054ED0 800542D0 1140000A */ beqz $t2, .L800542FC /* 054ED4 800542D4 00000000 */ nop -/* 054ED8 800542D8 3C01800E */ lui $at, %hi(D_800E67E4) # $at, 0x800e +# Used to access D_800E67D8 and D_800E67DC. +/* 054ED8 800542D8 3C01800E */ lui $at, %hi(D_800E67D8) # $at, 0x800e /* 054EDC 800542DC C60A00A8 */ lwc1 $f10, 0xa8($s0) /* 054EE0 800542E0 C42567D8 */ lwc1 $f5, %lo(D_800E67D8)($at) /* 054EE4 800542E4 C42467DC */ lwc1 $f4, %lo(D_800E67DC)($at) diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index 47ebf5de..3b0c6d2d 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -966,15 +966,15 @@ glabel func_8005A6F0 /* 05C108 8005B508 C600008C */ lwc1 $f0, 0x8c($s0) /* 05C10C 8005B50C 44808000 */ mtc1 $zero, $f16 /* 05C110 8005B510 460E003E */ c.le.s $f0, $f14 -/* 05C114 8005B514 3C01800E */ lui $at, 0x800e +/* 05C114 8005B514 3C01800E */ lui $at, %hi(D_800E69AC) # $at, 0x800e /* 05C118 8005B518 45000005 */ bc1f .L8005B530 /* 05C11C 8005B51C 46007281 */ sub.s $f10, $f14, $f0 /* 05C120 8005B520 3C01800E */ lui $at, %hi(D_800E69A8) # $at, 0x800e /* 05C124 8005B524 C42269A8 */ lwc1 $f2, %lo(D_800E69A8)($at) /* 05C128 8005B528 10000004 */ b .L8005B53C -/* 05C12C 8005B52C 3C013FC0 */ lui $at, %hi(D_3FC069AC) # $at, 0x3fc0 +/* 05C12C 8005B52C 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 .L8005B530: -/* 05C130 8005B530 C42269AC */ lwc1 $f2, %lo(D_3FC069AC)($at) +/* 05C130 8005B530 C42269AC */ lwc1 $f2, %lo(D_800E69AC)($at) /* 05C134 8005B534 00000000 */ nop /* 05C138 8005B538 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 .L8005B53C: diff --git a/asm/non_matchings/unknown_066AA0/func_80066CDC.s b/asm/non_matchings/unknown_066AA0/func_80066CDC.s index 352b7d17..6912cd3e 100644 --- a/asm/non_matchings/unknown_066AA0/func_80066CDC.s +++ b/asm/non_matchings/unknown_066AA0/func_80066CDC.s @@ -32,7 +32,7 @@ glabel func_80066CDC /* 067950 80066D50 3C1F8012 */ lui $ra, %hi(D_80120CE4) # $ra, 0x8012 /* 067954 80066D54 00024402 */ srl $t0, $v0, 0x10 /* 067958 80066D58 27FF0CE4 */ addiu $ra, %lo(D_80120CE4) # addiu $ra, $ra, 0xce4 -/* 06795C 80066D5C 3C038012 */ lui $v1, 0x8012 +/* 06795C 80066D5C 3C038012 */ lui $v1, %hi(D_80120CE0) # $v1, 0x8012 /* 067960 80066D60 00083842 */ srl $a3, $t0, 1 /* 067964 80066D64 0000C012 */ mflo $t8 /* 067968 80066D68 0158C821 */ addu $t9, $t2, $t8 @@ -142,7 +142,7 @@ glabel func_80066CDC /* 067B04 80066F04 100002C9 */ b .L80067A2C /* 067B08 80066F08 AFF80000 */ sw $t8, ($ra) .L80066F0C: -/* 067B0C 80066F0C 8C630CE0 */ lw $v1, 0xce0($v1) +/* 067B0C 80066F0C 8C630CE0 */ lw $v1, %lo(D_80120CE0)($v1) /* 067B10 80066F10 24040002 */ li $a0, 2 /* 067B14 80066F14 14640002 */ bne $v1, $a0, .L80066F20 /* 067B18 80066F18 3049FFFF */ andi $t1, $v0, 0xffff diff --git a/asm/non_matchings/unknown_066AA0/func_80067A3C.s b/asm/non_matchings/unknown_066AA0/func_80067A3C.s index 1a68b14f..659b8ed2 100644 --- a/asm/non_matchings/unknown_066AA0/func_80067A3C.s +++ b/asm/non_matchings/unknown_066AA0/func_80067A3C.s @@ -22,7 +22,7 @@ glabel func_80067A3C /* 068688 80067A88 106B0008 */ beq $v1, $t3, .L80067AAC /* 06868C 80067A8C 00E02025 */ move $a0, $a3 /* 068690 80067A90 106A0012 */ beq $v1, $t2, .L80067ADC -/* 068694 80067A94 3C0F8012 */ lui $t7, 0x8012 +/* 068694 80067A94 3C0F8012 */ lui $t7, %hi(D_80120CE4) # $t7, 0x8012 /* 068698 80067A98 240C0003 */ li $t4, 3 /* 06869C 80067A9C 106C001A */ beq $v1, $t4, .L80067B08 /* 0686A0 80067AA0 3C028012 */ lui $v0, %hi(D_80120CE4) # $v0, 0x8012 @@ -43,7 +43,7 @@ glabel func_80067A3C /* 0686D4 80067AD4 10000032 */ b .L80067BA0 /* 0686D8 80067AD8 00823823 */ subu $a3, $a0, $v0 .L80067ADC: -/* 0686DC 80067ADC 8DEF0CE4 */ lw $t7, 0xce4($t7) +/* 0686DC 80067ADC 8DEF0CE4 */ lw $t7, %lo(D_80120CE4)($t7) /* 0686E0 80067AE0 00051A03 */ sra $v1, $a1, 8 /* 0686E4 80067AE4 15E00005 */ bnez $t7, .L80067AFC /* 0686E8 80067AE8 00057043 */ sra $t6, $a1, 1 diff --git a/asm/non_matchings/unknown_066AA0/func_80068514.s b/asm/non_matchings/unknown_066AA0/func_80068514.s index 1cbedfec..61c02a15 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068514.s +++ b/asm/non_matchings/unknown_066AA0/func_80068514.s @@ -251,7 +251,7 @@ glabel func_80068514 /* 0694E8 800688E8 25080D1C */ addiu $t0, %lo(D_80120D1C) # addiu $t0, $t0, 0xd1c /* 0694EC 800688EC 44CFF800 */ ctc1 $t7, $31 /* 0694F0 800688F0 44194000 */ mfc1 $t9, $f8 -/* 0694F4 800688F4 3C048012 */ lui $a0, 0x8012 +/* 0694F4 800688F4 3C048012 */ lui $a0, %hi(D_80120D70) # $a0, 0x8012 /* 0694F8 800688F8 444AF800 */ cfc1 $t2, $31 /* 0694FC 800688FC A4590002 */ sh $t9, 2($v0) /* 069500 80068900 35410003 */ ori $at, $t2, 3 @@ -321,7 +321,7 @@ glabel func_80068514 /* 0695F8 800689F8 AD0C0000 */ sw $t4, ($t0) /* 0695FC 800689FC 000C7080 */ sll $t6, $t4, 2 /* 069600 80068A00 008E2021 */ addu $a0, $a0, $t6 -/* 069604 80068A04 8C840D70 */ lw $a0, 0xd70($a0) +/* 069604 80068A04 8C840D70 */ lw $a0, %lo(D_80120D70)($a0) /* 069608 80068A08 8CE76174 */ lw $a3, %lo(D_80126174)($a3) /* 06960C 80068A0C 8E060008 */ lw $a2, 8($s0) /* 069610 80068A10 8FA50034 */ lw $a1, 0x34($sp) diff --git a/asm/non_matchings/unknown_066AA0/func_80068BF4.s b/asm/non_matchings/unknown_066AA0/func_80068BF4.s index 98482c30..14147a80 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068BF4.s +++ b/asm/non_matchings/unknown_066AA0/func_80068BF4.s @@ -93,7 +93,7 @@ glabel func_80068BF4 /* 069960 80068D60 E6400010 */ swc1 $f0, 0x10($s2) /* 069964 80068D64 E6400014 */ swc1 $f0, 0x14($s2) /* 069968 80068D68 83390D15 */ lb $t9, %lo(D_80120D15)($t9) -/* 06996C 80068D6C 3C048012 */ lui $a0, 0x8012 +/* 06996C 80068D6C 3C048012 */ lui $a0, %hi(D_80121060) # $a0, 0x8012 /* 069970 80068D70 13200015 */ beqz $t9, .L80068DC8 /* 069974 80068D74 00000000 */ nop /* 069978 80068D78 C4E00008 */ lwc1 $f0, 8($a3) @@ -118,7 +118,7 @@ glabel func_80068BF4 /* 0699C4 80068DC4 02002025 */ move $a0, $s0 .L80068DC8: /* 0699C8 80068DC8 C6000008 */ lwc1 $f0, 8($s0) -/* 0699CC 80068DCC 24841060 */ addiu $a0, $a0, 0x1060 +/* 0699CC 80068DCC 24841060 */ addiu $a0, %lo(D_80121060) # addiu $a0, $a0, 0x1060 /* 0699D0 80068DD0 44050000 */ mfc1 $a1, $f0 /* 0699D4 80068DD4 44060000 */ mfc1 $a2, $f0 /* 0699D8 80068DD8 0C01C18E */ jal func_80070638 diff --git a/asm/non_matchings/unknown_066AA0/func_8006C60C.s b/asm/non_matchings/unknown_066AA0/func_8006C60C.s index 87bfa2d8..b64f9a41 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C60C.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C60C.s @@ -171,10 +171,10 @@ glabel func_8006C60C /* 06D498 8006C898 1041000B */ beq $v0, $at, .L8006C8C8 /* 06D49C 8006C89C 00000000 */ nop /* 06D4A0 8006C8A0 10400012 */ beqz $v0, .L8006C8EC -/* 06D4A4 8006C8A4 3C04800E */ lui $a0, 0x800e +/* 06D4A4 8006C8A4 3C04800E */ lui $a0, %hi(D_800DD404) # $a0, 0x800e /* 06D4A8 8006C8A8 24010001 */ li $at, 1 /* 06D4AC 8006C8AC 1041000A */ beq $v0, $at, .L8006C8D8 -/* 06D4B0 8006C8B0 3C04800E */ lui $a0, 0x800e +/* 06D4B0 8006C8B0 3C04800E */ lui $a0, %hi(D_800DD404) # $a0, 0x800e /* 06D4B4 8006C8B4 24010005 */ li $at, 5 /* 06D4B8 8006C8B8 10410011 */ beq $v0, $at, .L8006C900 /* 06D4BC 8006C8BC 3C04800E */ lui $a0, %hi(D_800DD404) # $a0, 0x800e @@ -192,13 +192,13 @@ glabel func_8006C60C /* 06D4E4 8006C8E4 10000009 */ b .L8006C90C /* 06D4E8 8006C8E8 00000000 */ nop .L8006C8EC: -/* 06D4EC 8006C8EC 8C84D404 */ lw $a0, -0x2bfc($a0) +/* 06D4EC 8006C8EC 8C84D404 */ lw $a0, %lo(D_800DD404)($a0) /* 06D4F0 8006C8F0 0C01B33C */ jal func_8006CCF0 /* 06D4F4 8006C8F4 00000000 */ nop /* 06D4F8 8006C8F8 10000004 */ b .L8006C90C /* 06D4FC 8006C8FC 00000000 */ nop .L8006C900: -/* 06D500 8006C900 8C84D404 */ lw $a0, -0x2bfc($a0) +/* 06D500 8006C900 8C84D404 */ lw $a0, %lo(D_800DD404)($a0) /* 06D504 8006C904 0C02DDF5 */ jal func_800B77D4 /* 06D508 8006C908 00000000 */ nop .L8006C90C: diff --git a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s index 80705520..58553169 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s @@ -461,7 +461,7 @@ glabel func_8006CCF0 /* 06DFB8 8006D3B8 00000000 */ nop /* 06DFBC 8006D3BC 3C028012 */ lui $v0, %hi(D_801234F4) # $v0, 0x8012 /* 06DFC0 8006D3C0 8C4234F4 */ lw $v0, %lo(D_801234F4)($v0) -/* 06DFC4 8006D3C4 3C018012 */ lui $at, 0x8012 +/* 06DFC4 8006D3C4 3C018012 */ lui $at, %hi(D_801234FC) # $at, 0x8012 /* 06DFC8 8006D3C8 0441001B */ bgez $v0, .L8006D438 /* 06DFCC 8006D3CC 240C0001 */ li $t4, 1 /* 06DFD0 8006D3D0 2401FFFF */ li $at, -1 @@ -543,7 +543,7 @@ glabel func_8006CCF0 /* 06E0E4 8006D4E4 8C4234F4 */ lw $v0, %lo(D_801234F4)($v0) /* 06E0E8 8006D4E8 240B0001 */ li $t3, 1 /* 06E0EC 8006D4EC 0441001B */ bgez $v0, .L8006D55C -/* 06E0F0 8006D4F0 3C018012 */ lui $at, 0x8012 +/* 06E0F0 8006D4F0 3C018012 */ lui $at, %hi(D_801234F8) # $at, 0x8012 /* 06E0F4 8006D4F4 2401FFFF */ li $at, -1 /* 06E0F8 8006D4F8 10410003 */ beq $v0, $at, .L8006D508 /* 06E0FC 8006D4FC 2401FFF6 */ li $at, -10 @@ -567,7 +567,7 @@ glabel func_8006CCF0 /* 06E13C 8006D53C 10000008 */ b .L8006D560 /* 06E140 8006D540 AC3934FC */ sw $t9, %lo(D_801234FC)($at) .L8006D544: -/* 06E144 8006D544 3C018012 */ lui $at, %hi(D_801234F8) # $at, 0x8012 +/* 06E144 8006D544 3C018012 */ lui $at, %hi(D_801234FC) # $at, 0x8012 /* 06E148 8006D548 240A0008 */ li $t2, 8 /* 06E14C 8006D54C 00008025 */ move $s0, $zero /* 06E150 8006D550 AC2934FC */ sw $t1, %lo(D_801234FC)($at) diff --git a/asm/non_matchings/unknown_07AF10/func_8007A98C.s b/asm/non_matchings/unknown_07AF10/func_8007A98C.s index 76eefa3c..f75eec43 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007A98C.s +++ b/asm/non_matchings/unknown_07AF10/func_8007A98C.s @@ -48,7 +48,7 @@ glabel func_8007A98C /* 07B634 8007AA34 02001825 */ move $v1, $s0 /* 07B638 8007AA38 0204082A */ slt $at, $s0, $a0 /* 07B63C 8007AA3C 10200012 */ beqz $at, .L8007AA88 -/* 07B640 8007AA40 3C068012 */ lui $a2, 0x8012 +/* 07B640 8007AA40 3C068012 */ lui $a2, %hi(0x80126308) # $a2, 0x8012 /* 07B644 8007AA44 3C068012 */ lui $a2, %hi(D_80126308) # $a2, 0x8012 /* 07B648 8007AA48 24C66308 */ addiu $a2, %lo(D_80126308) # addiu $a2, $a2, 0x6308 /* 07B64C 8007AA4C 90C50000 */ lbu $a1, ($a2) @@ -68,7 +68,7 @@ glabel func_8007A98C /* 07B680 8007AA80 1000000D */ b .L8007AAB8 /* 07B684 8007AA84 320400FF */ andi $a0, $s0, 0xff .L8007AA88: -/* 07B688 8007AA88 24C66308 */ addiu $a2, $a2, 0x6308 +/* 07B688 8007AA88 24C66308 */ addiu $a2, %lo(0x80126308) # addiu $a2, $a2, 0x6308 /* 07B68C 8007AA8C 0083082A */ slt $at, $a0, $v1 /* 07B690 8007AA90 10200009 */ beqz $at, .L8007AAB8 /* 07B694 8007AA94 A0C00000 */ sb $zero, ($a2) diff --git a/asm/non_matchings/unknown_080500/D_8008F618.s b/asm/non_matchings/unknown_080500/D_8008F618.s index f0dc28c6..0ec206cf 100644 --- a/asm/non_matchings/unknown_080500/D_8008F618.s +++ b/asm/non_matchings/unknown_080500/D_8008F618.s @@ -89,8 +89,8 @@ glabel D_8008F618 /* 090368 8008F768 240EFF00 */ li $t6, -256 /* 09036C 8008F76C 3C19FB00 */ lui $t9, 0xfb00 /* 090370 8008F770 3C068012 */ lui $a2, %hi(D_80126924) # $a2, 0x8012 -/* 090374 8008F774 3C11800E */ lui $s1, 0x800e -/* 090378 8008F778 3C12800E */ lui $s2, 0x800e +/* 090374 8008F774 3C11800E */ lui $s1, %hi(D_800E0968) # $s1, 0x800e +/* 090378 8008F778 3C12800E */ lui $s2, %hi(D_800E0970) # $s2, 0x800e /* 09037C 8008F77C 00007812 */ mflo $t7 /* 090380 8008F780 00EF3823 */ subu $a3, $a3, $t7 /* 090384 8008F784 240FFFFF */ li $t7, -1 @@ -106,8 +106,8 @@ glabel D_8008F618 /* 0903AC 8008F7AC 00067880 */ sll $t7, $a2, 2 /* 0903B0 8008F7B0 022F8821 */ addu $s1, $s1, $t7 /* 0903B4 8008F7B4 024F9021 */ addu $s2, $s2, $t7 -/* 0903B8 8008F7B8 8E310968 */ lw $s1, 0x968($s1) -/* 0903BC 8008F7BC 8E520970 */ lw $s2, 0x970($s2) +/* 0903B8 8008F7B8 8E310968 */ lw $s1, %lo(D_800E0968)($s1) +/* 0903BC 8008F7BC 8E520970 */ lw $s2, %lo(D_800E0970)($s2) /* 0903C0 8008F7C0 0317082A */ slt $at, $t8, $s7 /* 0903C4 8008F7C4 10200008 */ beqz $at, .L8008F7E8 /* 0903C8 8008F7C8 00001825 */ move $v1, $zero diff --git a/asm/non_matchings/unknown_080500/MenuBootLoop.s b/asm/non_matchings/unknown_080500/MenuBootLoop.s index a4dfaed1..01220f59 100644 --- a/asm/non_matchings/unknown_080500/MenuBootLoop.s +++ b/asm/non_matchings/unknown_080500/MenuBootLoop.s @@ -13,7 +13,7 @@ glabel menu_boot_loop /* 089234 80088634 8C426C20 */ lw $v0, %lo(D_80126C20)($v0) /* 089238 80088638 00603825 */ move $a3, $v1 /* 08923C 8008863C 10400009 */ beqz $v0, .L80088664 -/* 089240 80088640 3C038012 */ lui $v1, 0x8012 +/* 089240 80088640 3C038012 */ lui $v1, %hi(D_80126C18) # $v1, 0x8012 /* 089244 80088644 24010001 */ li $at, 1 /* 089248 80088648 10410019 */ beq $v0, $at, .L800886B0 /* 08924C 8008864C 3C038012 */ lui $v1, %hi(D_80126C18) # $v1, 0x8012 @@ -44,7 +44,7 @@ glabel menu_boot_loop /* 0892A8 800886A8 1000002F */ b .L80088768 /* 0892AC 800886AC AC286C20 */ sw $t0, %lo(D_80126C20)($at) .L800886B0: -/* 0892B0 800886B0 24636C18 */ addiu $v1, $v1, 0x6c18 +/* 0892B0 800886B0 24636C18 */ addiu $v1, $v1, %lo(D_80126C18) /* 0892B4 800886B4 8C620000 */ lw $v0, ($v1) /* 0892B8 800886B8 00000000 */ nop /* 0892BC 800886BC 2841008C */ slti $at, $v0, 0x8c diff --git a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s index fe2c3088..54146090 100644 --- a/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuFileSelectLoop.s @@ -51,7 +51,7 @@ glabel MenuFileSelectLoop /* 08D470 8008C870 3C0B8012 */ lui $t3, %hi(D_801263E0) # $t3, 0x8012 /* 08D474 8008C874 8D6B63E0 */ lw $t3, %lo(D_801263E0)($t3) /* 08D478 8008C878 8C42F460 */ lw $v0, %lo(D_800DF460)($v0) -/* 08D47C 8008C87C 3C01800E */ lui $at, 0x800e +/* 08D47C 8008C87C 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08D480 8008C880 1562000F */ bne $t3, $v0, .L8008C8C0 /* 08D484 8008C884 00002025 */ move $a0, $zero /* 08D488 8008C888 0C0002CA */ jal func_80000B28 diff --git a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s index 3f7e0080..d76e05d6 100644 --- a/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s +++ b/asm/non_matchings/unknown_080500/MenuGameSelectLoop.s @@ -362,7 +362,7 @@ glabel MenuGameSelectLoop /* 08EFBC 8008E3BC 00001025 */ move $v0, $zero .L8008E3C0: /* 08EFC0 8008E3C0 8C580010 */ lw $t8, 0x10($v0) -/* 08EFC4 8008E3C4 3C01800E */ lui $at, 0x800e +/* 08EFC4 8008E3C4 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08EFC8 8008E3C8 33190004 */ andi $t9, $t8, 4 /* 08EFCC 8008E3CC 13200005 */ beqz $t9, .L8008E3E4 /* 08EFD0 8008E3D0 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e diff --git a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s index 87c790ad..09750dd8 100644 --- a/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLoadNewAreaLoop.s @@ -148,7 +148,7 @@ glabel MenuLoadNewAreaLoop /* 094420 80093820 15A00004 */ bnez $t5, .L80093834 /* 094424 80093824 8FAF0028 */ lw $t7, 0x28($sp) /* 094428 80093828 11C0000E */ beqz $t6, .L80093864 -/* 09442C 8009382C 3C018012 */ lui $at, 0x8012 +/* 09442C 8009382C 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 094430 80093830 8FAF0028 */ lw $t7, 0x28($sp) .L80093834: /* 094434 80093834 00000000 */ nop @@ -161,12 +161,12 @@ glabel MenuLoadNewAreaLoop /* 09444C 8009384C 0C030076 */ jal func_800C01D8 /* 094450 80093850 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 094454 80093854 2418FFFF */ li $t8, -1 -/* 094458 80093858 3C01800E */ lui $at, %hi(D_800E63E0) # $at, 0x800e +/* 094458 80093858 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e /* 09445C 8009385C 10000064 */ b .L800939F0 /* 094460 80093860 AC38F47C */ sw $t8, %lo(D_800DF47C)($at) .L80093864: /* 094464 80093864 10000062 */ b .L800939F0 -/* 094468 80093868 AC2063E0 */ sw $zero, %lo(D_800E63E0)($at) +/* 094468 80093868 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) .L8009386C: /* 09446C 8009386C 3C028012 */ lui $v0, %hi(D_801267D8) # $v0, 0x8012 /* 094470 80093870 8C4267D8 */ lw $v0, %lo(D_801267D8)($v0) diff --git a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s index 5d0fff27..45cb9352 100644 --- a/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s +++ b/asm/non_matchings/unknown_080500/MenuTitleScreenLoop.s @@ -74,7 +74,7 @@ glabel MenuTitleScreenLoop /* 0846F0 80083AF0 84E30000 */ lh $v1, ($a3) /* 0846F4 80083AF4 00003025 */ move $a2, $zero /* 0846F8 80083AF8 1860001D */ blez $v1, .L80083B70 -/* 0846FC 80083AFC 3C02800E */ lui $v0, 0x800e +/* 0846FC 80083AFC 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e /* 084700 80083B00 8FAC0030 */ lw $t4, 0x30($sp) /* 084704 80083B04 00000000 */ nop /* 084708 80083B08 006C6823 */ subu $t5, $v1, $t4 @@ -106,7 +106,7 @@ glabel MenuTitleScreenLoop /* 08476C 80083B6C 24060001 */ li $a2, 1 .L80083B70: /* 084770 80083B70 A4E00000 */ sh $zero, ($a3) -/* 084774 80083B74 8C42F47C */ lw $v0, -0xb84($v0) +/* 084774 80083B74 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) /* 084778 80083B78 00000000 */ nop .L80083B7C: /* 08477C 80083B7C 1440003F */ bnez $v0, .L80083C7C @@ -230,7 +230,7 @@ glabel MenuTitleScreenLoop /* 084938 80083D38 C4400000 */ lwc1 $f0, ($v0) /* 08493C 80083D3C 3C0F8012 */ lui $t7, %hi(D_801263E0) # $t7, 0x8012 /* 084940 80083D40 4600303C */ c.lt.s $f6, $f0 -/* 084944 80083D44 3C01800F */ lui $at, 0x800f +/* 084944 80083D44 3C01800F */ lui $at, %hi(D_800E83B4) # $at, 0x800f /* 084948 80083D48 4500000D */ bc1f .L80083D80 /* 08494C 80083D4C 00000000 */ nop /* 084950 80083D50 8DEF63E0 */ lw $t7, %lo(D_801263E0)($t7) @@ -240,13 +240,13 @@ glabel MenuTitleScreenLoop /* 084960 80083D60 0C000741 */ jal func_80001D04 /* 084964 80083D64 00002825 */ move $a1, $zero /* 084968 80083D68 24180001 */ li $t8, 1 -/* 08496C 80083D6C 3C018012 */ lui $at, %hi(D_801183B4) # $at, 0x8012 +/* 08496C 80083D6C 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 084970 80083D70 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 /* 084974 80083D74 2463686C */ addiu $v1, %lo(D_8012686C) # addiu $v1, $v1, 0x686c /* 084978 80083D78 10000012 */ b .L80083DC4 /* 08497C 80083D7C AC3863E0 */ sw $t8, %lo(D_801263E0)($at) .L80083D80: -/* 084980 80083D80 C42883B4 */ lwc1 $f8, %lo(D_801183B4)($at) +/* 084980 80083D80 C42883B4 */ lwc1 $f8, %lo(D_800E83B4)($at) /* 084984 80083D84 3C198012 */ lui $t9, %hi(D_801263E0) # $t9, 0x8012 /* 084988 80083D88 4600403C */ c.lt.s $f8, $f0 /* 08498C 80083D8C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s index c8cfe689..3fc0a441 100644 --- a/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s +++ b/asm/non_matchings/unknown_080500/MenuTrophyRaceRankingsInit.s @@ -52,7 +52,7 @@ glabel MenuTrophyRaceRankingsInit .L80098AE8: /* 0996E8 80098AE8 28410004 */ slti $at, $v0, 4 /* 0996EC 80098AEC 1020000D */ beqz $at, .L80098B24 -/* 0996F0 80098AF0 3C038012 */ lui $v1, 0x8012 +/* 0996F0 80098AF0 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 /* 0996F4 80098AF4 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e /* 0996F8 80098AF8 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) /* 0996FC 80098AFC 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 @@ -68,7 +68,7 @@ glabel MenuTrophyRaceRankingsInit .L80098B24: /* 099724 80098B24 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e /* 099728 80098B28 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) -/* 09972C 80098B2C 24636BF0 */ addiu $v1, $v1, 0x6bf0 +/* 09972C 80098B2C 24636BF0 */ addiu $v1, %lo(D_80126BF0) # addiu $v1, $v1, 0x6bf0 /* 099730 80098B30 8DAE0244 */ lw $t6, 0x244($t5) /* 099734 80098B34 240F0001 */ li $t7, 1 /* 099738 80098B38 3C018012 */ lui $at, %hi(D_80126C14) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_080500/func_80080580.s b/asm/non_matchings/unknown_080500/func_80080580.s index 9b0712be..8dd1e4dd 100644 --- a/asm/non_matchings/unknown_080500/func_80080580.s +++ b/asm/non_matchings/unknown_080500/func_80080580.s @@ -258,7 +258,7 @@ glabel func_80080580 /* 081570 80080970 1420FFC3 */ bnez $at, .L80080880 /* 081574 80080974 00000000 */ nop /* 081578 80080978 12E0007B */ beqz $s7, .L80080B68 -/* 08157C 8008097C 3C0E8012 */ lui $t6, 0x8012 +/* 08157C 8008097C 3C0E8012 */ lui $t6, %hi(D_80126C2C) # $t6, 0x8012 /* 081580 80080980 3C088012 */ lui $t0, %hi(D_80126C2C) # $t0, 0x8012 /* 081584 80080984 8FCE0000 */ lw $t6, ($fp) /* 081588 80080988 25086C2C */ addiu $t0, %lo(D_80126C2C) # addiu $t0, $t0, 0x6c2c @@ -385,7 +385,7 @@ glabel func_80080580 /* 081764 80080B64 8FD80000 */ lw $t8, ($fp) .L80080B68: /* 081768 80080B68 8FD80000 */ lw $t8, ($fp) -/* 08176C 80080B6C 8DCE6C2C */ lw $t6, 0x6c2c($t6) +/* 08176C 80080B6C 8DCE6C2C */ lw $t6, %lo(D_80126C2C)($t6) /* 081770 80080B70 00187940 */ sll $t7, $t8, 5 /* 081774 80080B74 3C18800E */ lui $t8, %hi(D_800E1DB4) # $t8, 0x800e /* 081778 80080B78 8F181DB4 */ lw $t8, %lo(D_800E1DB4)($t8) diff --git a/asm/non_matchings/unknown_080500/func_80081F4C.s b/asm/non_matchings/unknown_080500/func_80081F4C.s index 792b186a..d0ab7e35 100644 --- a/asm/non_matchings/unknown_080500/func_80081F4C.s +++ b/asm/non_matchings/unknown_080500/func_80081F4C.s @@ -55,7 +55,7 @@ glabel func_80081F4C /* 082C14 80082014 10E00007 */ beqz $a3, .L80082034 /* 082C18 80082018 00E01025 */ move $v0, $a3 /* 082C1C 8008201C 1053001D */ beq $v0, $s3, .L80082094 -/* 082C20 80082020 3C038012 */ lui $v1, 0x8012 +/* 082C20 80082020 3C038012 */ lui $v1, %hi(D_8012685C) # $v1, 0x8012 /* 082C24 80082024 10540044 */ beq $v0, $s4, .L80082138 /* 082C28 80082028 32399000 */ andi $t9, $s1, 0x9000 /* 082C2C 8008202C 10000054 */ b .L80082180 @@ -88,7 +88,7 @@ glabel func_80081F4C /* 082C8C 8008208C 1000003B */ b .L8008217C /* 082C90 80082090 460A3503 */ div.s $f20, $f6, $f10 .L80082094: -/* 082C94 80082094 8C63685C */ lw $v1, 0x685c($v1) +/* 082C94 80082094 8C63685C */ lw $v1, %lo(D_8012685C)($v1) /* 082C98 80082098 32229000 */ andi $v0, $s1, 0x9000 /* 082C9C 8008209C 04610002 */ bgez $v1, .L800820A8 /* 082CA0 800820A0 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80084854.s b/asm/non_matchings/unknown_080500/func_80084854.s index 420c9bc9..89f6f5a9 100644 --- a/asm/non_matchings/unknown_080500/func_80084854.s +++ b/asm/non_matchings/unknown_080500/func_80084854.s @@ -57,7 +57,7 @@ glabel func_80084854 /* 085520 80084920 8CAB0000 */ lw $t3, ($a1) /* 085524 80084924 3C058012 */ lui $a1, %hi(D_801263A8) # $a1, 0x8012 /* 085528 80084928 01716021 */ addu $t4, $t3, $s1 -/* 08552C 8008492C 3C198012 */ lui $t9, 0x8012 +/* 08552C 8008492C 3C198012 */ lui $t9, %hi(D_801269D0) # $t9, 0x8012 /* 085530 80084930 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8 /* 085534 80084934 02402025 */ move $a0, $s2 /* 085538 80084938 00004812 */ mflo $t1 @@ -78,7 +78,7 @@ glabel func_80084854 /* 085570 80084970 3C01800E */ lui $at, %hi(D_800DFA48) # $at, 0x800e /* 085574 80084974 000FC080 */ sll $t8, $t7, 2 /* 085578 80084978 0338C821 */ addu $t9, $t9, $t8 -/* 08557C 8008497C 8F3969D0 */ lw $t9, 0x69d0($t9) +/* 08557C 8008497C 8F3969D0 */ lw $t9, %lo(D_801269D0)($t9) /* 085580 80084980 0C019FCB */ jal func_80067F2C /* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA48)($at) /* 085588 80084988 3C088000 */ lui $t0, %hi(osTvType) # $t0, 0x8000 diff --git a/asm/non_matchings/unknown_080500/func_800853D0.s b/asm/non_matchings/unknown_080500/func_800853D0.s index 80180396..e898dae4 100644 --- a/asm/non_matchings/unknown_080500/func_800853D0.s +++ b/asm/non_matchings/unknown_080500/func_800853D0.s @@ -82,9 +82,9 @@ glabel func_800853D0 /* 086108 80085508 10000006 */ b .L80085524 /* 08610C 8008550C AFAE0070 */ sw $t6, 0x70($sp) .L80085510: -/* 086110 80085510 3C0F800E */ lui $t7, 0x800e +/* 086110 80085510 3C0F800E */ lui $t7, %hi(D_800E03B0) # $t7, 0x800e /* 086114 80085514 01E37821 */ addu $t7, $t7, $v1 -/* 086118 80085518 8DEF03B0 */ lw $t7, 0x3b0($t7) +/* 086118 80085518 8DEF03B0 */ lw $t7, %lo(D_800E03B0)($t7) /* 08611C 8008551C 00000000 */ nop /* 086120 80085520 AFAF0064 */ sw $t7, 0x64($sp) .L80085524: diff --git a/asm/non_matchings/unknown_080500/func_80086AFC.s b/asm/non_matchings/unknown_080500/func_80086AFC.s index 98f72cee..c2663ac0 100644 --- a/asm/non_matchings/unknown_080500/func_80086AFC.s +++ b/asm/non_matchings/unknown_080500/func_80086AFC.s @@ -168,7 +168,7 @@ glabel func_80086AFC /* 087984 80086D84 10410075 */ beq $v0, $at, .L80086F5C /* 087988 80086D88 24010008 */ li $at, 8 /* 08798C 80086D8C 1041005B */ beq $v0, $at, .L80086EFC -/* 087990 80086D90 3C038012 */ lui $v1, 0x8012 +/* 087990 80086D90 3C038012 */ lui $v1, %hi(D_80126530) # $v1, 0x8012 /* 087994 80086D94 1000010D */ b .L800871CC /* 087998 80086D98 8FBF0014 */ lw $ra, 0x14($sp) .L80086D9C: @@ -262,7 +262,7 @@ glabel func_80086AFC /* 087AF4 80086EF4 100000B4 */ b .L800871C8 /* 087AF8 80086EF8 AF2F0050 */ sw $t7, 0x50($t9) .L80086EFC: -/* 087AFC 80086EFC 24636530 */ addiu $v1, $v1, 0x6530 +/* 087AFC 80086EFC 24636530 */ addiu $v1, %lo(D_80126530) # addiu $v1, $v1, 0x6530 /* 087B00 80086F00 8C66000C */ lw $a2, 0xc($v1) /* 087B04 80086F04 90E40006 */ lbu $a0, 6($a3) /* 087B08 80086F08 8CE50008 */ lw $a1, 8($a3) diff --git a/asm/non_matchings/unknown_080500/func_80087734.s b/asm/non_matchings/unknown_080500/func_80087734.s index 4b96be67..8ad8c89d 100644 --- a/asm/non_matchings/unknown_080500/func_80087734.s +++ b/asm/non_matchings/unknown_080500/func_80087734.s @@ -79,7 +79,7 @@ glabel func_80087734 /* 088450 80087850 3C0D800E */ lui $t5, %hi(D_800DFADC) # $t5, 0x800e /* 088454 80087854 24010007 */ li $at, 7 /* 088458 80087858 11010046 */ beq $t0, $at, .L80087974 -/* 08845C 8008785C 3C0A800E */ lui $t2, 0x800e +/* 08845C 8008785C 3C0A800E */ lui $t2, %hi(D_800DFADC) # $t2, 0x800e /* 088460 80087860 100000BC */ b .L80087B54 /* 088464 80087864 8FBF0014 */ lw $ra, 0x14($sp) .L80087868: @@ -155,7 +155,7 @@ glabel func_80087734 /* 08856C 8008796C 10000078 */ b .L80087B50 /* 088570 80087970 AC396A1C */ sw $t9, %lo(D_80126A1C)($at) .L80087974: -/* 088574 80087974 8D4AFADC */ lw $t2, -0x524($t2) +/* 088574 80087974 8D4AFADC */ lw $t2, %lo(D_800DFADC)($t2) /* 088578 80087978 00000000 */ nop /* 08857C 8008797C 254BFFFF */ addiu $t3, $t2, -1 /* 088580 80087980 2D61000A */ sltiu $at, $t3, 0xa @@ -192,7 +192,7 @@ glabel func_80087734 /* 0885F8 800879F8 8FA8001C */ lw $t0, 0x1c($sp) /* 0885FC 800879FC 24010002 */ li $at, 2 /* 088600 80087A00 10410019 */ beq $v0, $at, .L80087A68 -/* 088604 80087A04 3C04800E */ lui $a0, 0x800e +/* 088604 80087A04 3C04800E */ lui $a0, %hi(D_800DFAE0) # $a0, 0x800e /* 088608 80087A08 24010003 */ li $at, 3 /* 08860C 80087A0C 10410007 */ beq $v0, $at, .L80087A2C /* 088610 80087A10 24010007 */ li $at, 7 @@ -220,7 +220,7 @@ glabel func_80087734 /* 088660 80087A60 1000003B */ b .L80087B50 /* 088664 80087A64 AC206A18 */ sw $zero, %lo(D_80126A18)($at) .L80087A68: -/* 088668 80087A68 8C84FAE0 */ lw $a0, -0x520($a0) +/* 088668 80087A68 8C84FAE0 */ lw $a0, %lo(D_800DFAE0)($a0) /* 08866C 80087A6C 0C01D74E */ jal func_80075D38 /* 088670 80087A70 AFA8001C */ sw $t0, 0x1c($sp) /* 088674 80087A74 8FA8001C */ lw $t0, 0x1c($sp) diff --git a/asm/non_matchings/unknown_080500/func_80088938.s b/asm/non_matchings/unknown_080500/func_80088938.s index 5f3aa3c6..94602b05 100644 --- a/asm/non_matchings/unknown_080500/func_80088938.s +++ b/asm/non_matchings/unknown_080500/func_80088938.s @@ -183,7 +183,7 @@ glabel func_80088938 /* 0897F8 80088BF8 0C0313B7 */ jal func_800C4EDC /* 0897FC 80088BFC 24070124 */ li $a3, 292 /* 089800 80088C00 0621001A */ bgez $s1, .L80088C6C -/* 089804 80088C04 3C0E800F */ lui $t6, 0x800f +/* 089804 80088C04 3C0E800F */ lui $t6, %hi(D_800E820C) # $t6, 0x800f /* 089808 80088C08 240B00E0 */ li $t3, 224 /* 08980C 80088C0C AFAB0010 */ sw $t3, 0x10($sp) /* 089810 80088C10 24040006 */ li $a0, 6 @@ -214,7 +214,7 @@ glabel func_80088938 /* 089870 80088C70 8F1863D8 */ lw $t8, %lo(D_801263D8)($t8) /* 089874 80088C74 3C0F800E */ lui $t7, %hi(D_800DF460) # $t7, 0x800e /* 089878 80088C78 8DEFF460 */ lw $t7, %lo(D_800DF460)($t7) -/* 08987C 80088C7C 25D4820C */ addiu $s4, $t6, -0x7df4 +/* 08987C 80088C7C 25D4820C */ addiu $s4, $t6, %lo(D_800E820C) /* 089880 80088C80 0238C821 */ addu $t9, $s1, $t8 /* 089884 80088C84 15F9000B */ bne $t7, $t9, .L80088CB4 /* 089888 80088C88 02809025 */ move $s2, $s4 diff --git a/asm/non_matchings/unknown_080500/func_800896A4.s b/asm/non_matchings/unknown_080500/func_800896A4.s index d8ea2072..f1665db4 100644 --- a/asm/non_matchings/unknown_080500/func_800896A4.s +++ b/asm/non_matchings/unknown_080500/func_800896A4.s @@ -125,7 +125,7 @@ glabel func_800896A4 /* 08A47C 8008987C 00000000 */ nop .L80089880: /* 08A480 80089880 1617000C */ bne $s0, $s7, .L800898B4 -/* 08A484 80089884 3C048012 */ lui $a0, 0x8012 +/* 08A484 80089884 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A488 80089888 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A48C 8008988C 3C07800F */ lui $a3, %hi(D_800E8210) # $a3, 0x800f /* 08A490 80089890 240B000C */ li $t3, 12 @@ -142,7 +142,7 @@ glabel func_800896A4 /* 08A4B8 800898B8 240C000C */ li $t4, 12 /* 08A4BC 800898BC AFAC0010 */ sw $t4, 0x10($sp) /* 08A4C0 800898C0 24E78214 */ addiu $a3, %lo(D_800E8214) # addiu $a3, $a3, -0x7dec -/* 08A4C4 800898C4 248463A0 */ addiu $a0, $a0, 0x63a0 +/* 08A4C4 800898C4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A4C8 800898C8 02202825 */ move $a1, $s1 /* 08A4CC 800898CC 0C031110 */ jal func_800C4440 /* 08A4D0 800898D0 02803025 */ move $a2, $s4 diff --git a/asm/non_matchings/unknown_080500/func_8008C168.s b/asm/non_matchings/unknown_080500/func_8008C168.s index 6903c8b8..d6cfb2fa 100644 --- a/asm/non_matchings/unknown_080500/func_8008C168.s +++ b/asm/non_matchings/unknown_080500/func_8008C168.s @@ -34,7 +34,7 @@ glabel func_8008C168 /* 08CDE4 8008C1E4 3C038012 */ lui $v1, %hi(D_801263B4) # $v1, 0x8012 /* 08CDE8 8008C1E8 246363B4 */ addiu $v1, %lo(D_801263B4) # addiu $v1, $v1, 0x63b4 /* 08CDEC 8008C1EC 80620000 */ lb $v0, ($v1) -/* 08CDF0 8008C1F0 3C04800E */ lui $a0, 0x800e +/* 08CDF0 8008C1F0 3C04800E */ lui $a0, %hi(D_800DFDB4) # $a0, 0x800e /* 08CDF4 8008C1F4 04400004 */ bltz $v0, .L8008C208 /* 08CDF8 8008C1F8 A2020000 */ sb $v0, ($s0) /* 08CDFC 8008C1FC 846A0002 */ lh $t2, 2($v1) @@ -51,7 +51,7 @@ glabel func_8008C168 /* 08CE24 8008C224 84AC0002 */ lh $t4, 2($a1) /* 08CE28 8008C228 008D2021 */ addu $a0, $a0, $t5 /* 08CE2C 8008C22C A46C0002 */ sh $t4, 2($v1) -/* 08CE30 8008C230 9084FDB4 */ lbu $a0, -0x24c($a0) +/* 08CE30 8008C230 9084FDB4 */ lbu $a0, %lo(D_800DFDB4)($a0) /* 08CE34 8008C234 0C00045C */ jal func_80001170 /* 08CE38 8008C238 00000000 */ nop /* 08CE3C 8008C23C 3C038012 */ lui $v1, %hi(D_801263B4) # $v1, 0x8012 @@ -114,7 +114,7 @@ glabel func_8008C168 /* 08CF14 8008C314 86030002 */ lh $v1, 2($s0) /* 08CF18 8008C318 00026040 */ sll $t4, $v0, 1 /* 08CF1C 8008C31C 04610010 */ bgez $v1, .L8008C360 -/* 08CF20 8008C320 3C04800E */ lui $a0, 0x800e +/* 08CF20 8008C320 3C04800E */ lui $a0, %hi(D_800DFDB4) # $a0, 0x800e /* 08CF24 8008C324 00024840 */ sll $t1, $v0, 1 /* 08CF28 8008C328 3C04800E */ lui $a0, 0x800e /* 08CF2C 8008C32C 00892021 */ addu $a0, $a0, $t1 @@ -132,7 +132,7 @@ glabel func_8008C168 /* 08CF5C 8008C35C 860E0002 */ lh $t6, 2($s0) .L8008C360: /* 08CF60 8008C360 008C2021 */ addu $a0, $a0, $t4 -/* 08CF64 8008C364 9084FDB4 */ lbu $a0, -0x24c($a0) +/* 08CF64 8008C364 9084FDB4 */ lbu $a0, %lo(D_800DFDB4)($a0) /* 08CF68 8008C368 0C00049A */ jal func_80001268 /* 08CF6C 8008C36C 306500FF */ andi $a1, $v1, 0xff /* 08CF70 8008C370 820D0000 */ lb $t5, ($s0) diff --git a/asm/non_matchings/unknown_080500/func_8008D8BC.s b/asm/non_matchings/unknown_080500/func_8008D8BC.s index 6a05d6c5..e54cef79 100644 --- a/asm/non_matchings/unknown_080500/func_8008D8BC.s +++ b/asm/non_matchings/unknown_080500/func_8008D8BC.s @@ -39,7 +39,7 @@ glabel func_8008D8BC /* 08E54C 8008D94C AC206484 */ sw $zero, %lo(D_80126484)($at) .L8008D950: /* 08E550 8008D950 13200025 */ beqz $t9, .L8008D9E8 -/* 08E554 8008D954 3C028012 */ lui $v0, 0x8012 +/* 08E554 8008D954 3C028012 */ lui $v0, %hi(D_8012648C) # $v0, 0x8012 /* 08E558 8008D958 3C028012 */ lui $v0, %hi(D_8012648C) # $v0, 0x8012 /* 08E55C 8008D95C 2442648C */ addiu $v0, %lo(D_8012648C) # addiu $v0, $v0, 0x648c /* 08E560 8008D960 8C490000 */ lw $t1, ($v0) @@ -78,7 +78,7 @@ glabel func_8008D8BC /* 08E5E0 8008D9E0 100000A3 */ b .L8008DC70 /* 08E5E4 8008D9E4 8FBF0014 */ lw $ra, 0x14($sp) .L8008D9E8: -/* 08E5E8 8008D9E8 2442648C */ addiu $v0, $v0, 0x648c +/* 08E5E8 8008D9E8 2442648C */ addiu $v0, %lo(D_8012648C) # addiu $v0, $v0, 0x648c /* 08E5EC 8008D9EC 8C460000 */ lw $a2, ($v0) /* 08E5F0 8008D9F0 04A10005 */ bgez $a1, .L8008DA08 /* 08E5F4 8008D9F4 00C01825 */ move $v1, $a2 diff --git a/asm/non_matchings/unknown_080500/func_8008DC7C.s b/asm/non_matchings/unknown_080500/func_8008DC7C.s index 91283e66..16aa02c3 100644 --- a/asm/non_matchings/unknown_080500/func_8008DC7C.s +++ b/asm/non_matchings/unknown_080500/func_8008DC7C.s @@ -37,7 +37,7 @@ glabel func_8008DC7C /* 08E904 8008DD04 AC206488 */ sw $zero, %lo(D_80126488)($at) .L8008DD08: /* 08E908 8008DD08 11000017 */ beqz $t0, .L8008DD68 -/* 08E90C 8008DD0C 3C068012 */ lui $a2, 0x8012 +/* 08E90C 8008DD0C 3C068012 */ lui $a2, %hi(0x8012648C) # $a2, 0x8012 /* 08E910 8008DD10 3C068012 */ lui $a2, %hi(D_8012648C) # $a2, 0x8012 /* 08E914 8008DD14 24C6648C */ addiu $a2, %lo(D_8012648C) # addiu $a2, $a2, 0x648c /* 08E918 8008DD18 8CC90000 */ lw $t1, ($a2) @@ -63,7 +63,7 @@ glabel func_8008DC7C /* 08E960 8008DD60 10000040 */ b .L8008DE64 /* 08E964 8008DD64 8FBF0014 */ lw $ra, 0x14($sp) .L8008DD68: -/* 08E968 8008DD68 24C6648C */ addiu $a2, $a2, 0x648c +/* 08E968 8008DD68 24C6648C */ addiu $a2, %lo(0x8012648C) # addiu $a2, $a2, 0x648c /* 08E96C 8008DD6C 8CC30000 */ lw $v1, ($a2) /* 08E970 8008DD70 04A10005 */ bgez $a1, .L8008DD88 /* 08E974 8008DD74 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/unknown_080500/func_80090918.s b/asm/non_matchings/unknown_080500/func_80090918.s index 926a2103..cb7e8c62 100644 --- a/asm/non_matchings/unknown_080500/func_80090918.s +++ b/asm/non_matchings/unknown_080500/func_80090918.s @@ -284,7 +284,7 @@ glabel func_80090918 /* 091934 80090D34 8FBF001C */ lw $ra, 0x1c($sp) .L80090D38: /* 091938 80090D38 11A0000C */ beqz $t5, .L80090D6C -/* 09193C 80090D3C 3C048012 */ lui $a0, 0x8012 +/* 09193C 80090D3C 3C048012 */ lui $a0, %hi(D_80126820) # $a0, 0x8012 /* 091940 80090D40 0C030060 */ jal func_800C0180 /* 091944 80090D44 00000000 */ nop /* 091948 80090D48 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e @@ -299,7 +299,7 @@ glabel func_80090918 .L80090D6C: /* 09196C 80090D6C 8D420000 */ lw $v0, ($t2) /* 091970 80090D70 8CE30000 */ lw $v1, ($a3) -/* 091974 80090D74 84846820 */ lh $a0, 0x6820($a0) +/* 091974 80090D74 84846820 */ lh $a0, %lo(D_80126820)($a0) /* 091978 80090D78 00404025 */ move $t0, $v0 /* 09197C 80090D7C 04810005 */ bgez $a0, .L80090D94 /* 091980 80090D80 00604825 */ move $t1, $v1 diff --git a/asm/non_matchings/unknown_080500/func_80090F30.s b/asm/non_matchings/unknown_080500/func_80090F30.s index 762ecaa1..d4024dae 100644 --- a/asm/non_matchings/unknown_080500/func_80090F30.s +++ b/asm/non_matchings/unknown_080500/func_80090F30.s @@ -788,7 +788,7 @@ glabel func_80090F30 .L80091AC8: /* 0926C8 80091AC8 3C0C800E */ lui $t4, %hi(D_800E0414) # $t4, 0x800e /* 0926CC 80091ACC 8D8C0414 */ lw $t4, %lo(D_800E0414)($t4) -/* 0926D0 80091AD0 3C05800E */ lui $a1, 0x800e +/* 0926D0 80091AD0 3C05800E */ lui $a1, %hi(0x800E0648) # $a1, 0x800e /* 0926D4 80091AD4 01960019 */ multu $t4, $s6 /* 0926D8 80091AD8 8FC90000 */ lw $t1, ($fp) /* 0926DC 80091ADC 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -804,7 +804,7 @@ glabel func_80090F30 /* 092704 80091B04 00006812 */ mflo $t5 /* 092708 80091B08 000DC080 */ sll $t8, $t5, 2 /* 09270C 80091B0C 00B82821 */ addu $a1, $a1, $t8 -/* 092710 80091B10 8CA50648 */ lw $a1, 0x648($a1) +/* 092710 80091B10 8CA50648 */ lw $a1, %lo(0x800E0648)($a1) /* 092714 80091B14 0C01E2AE */ jal func_80078AB8 /* 092718 80091B18 AFA9001C */ sw $t1, 0x1c($sp) /* 09271C 80091B1C 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80093A40.s b/asm/non_matchings/unknown_080500/func_80093A40.s index d5102ce6..4edd49d2 100644 --- a/asm/non_matchings/unknown_080500/func_80093A40.s +++ b/asm/non_matchings/unknown_080500/func_80093A40.s @@ -91,7 +91,7 @@ glabel func_80093A40 /* 094790 80093B90 8FB90024 */ lw $t9, 0x24($sp) /* 094794 80093B94 24010008 */ li $at, 8 /* 094798 80093B98 93280048 */ lbu $t0, 0x48($t9) -/* 09479C 80093B9C 3C02800E */ lui $v0, 0x800e +/* 09479C 80093B9C 3C02800E */ lui $v0, %hi(D_800DF4B8) # $v0, 0x800e /* 0947A0 80093BA0 1900002B */ blez $t0, .L80093C50 /* 0947A4 80093BA4 00000000 */ nop /* 0947A8 80093BA8 12010029 */ beq $s0, $at, .L80093C50 @@ -143,7 +143,7 @@ glabel func_80093A40 /* 094848 80093C48 1000000F */ b .L80093C88 /* 09484C 80093C4C 00000000 */ nop .L80093C50: -/* 094850 80093C50 8C42F4B8 */ lw $v0, -0xb48($v0) +/* 094850 80093C50 8C42F4B8 */ lw $v0, %lo(D_800DF4B8)($v0) /* 094854 80093C54 24010008 */ li $at, 8 /* 094858 80093C58 1440000B */ bnez $v0, .L80093C88 /* 09485C 80093C5C 00000000 */ nop diff --git a/asm/non_matchings/unknown_080500/func_80094170.s b/asm/non_matchings/unknown_080500/func_80094170.s index a100edf4..d0964226 100644 --- a/asm/non_matchings/unknown_080500/func_80094170.s +++ b/asm/non_matchings/unknown_080500/func_80094170.s @@ -92,7 +92,7 @@ glabel func_80094170 /* 094EC0 800942C0 8FA4001C */ lw $a0, 0x1c($sp) .L800942C4: /* 094EC4 800942C4 11200022 */ beqz $t1, .L80094350 -/* 094EC8 800942C8 3C078012 */ lui $a3, 0x8012 +/* 094EC8 800942C8 3C078012 */ lui $a3, %hi(D_80126A68) # $a3, 0x8012 /* 094ECC 800942CC 240400EF */ li $a0, 239 /* 094ED0 800942D0 0C000741 */ jal func_80001D04 /* 094ED4 800942D4 00002825 */ move $a1, $zero @@ -131,7 +131,7 @@ glabel func_80094170 .L80094350: /* 094F50 80094350 3C04800E */ lui $a0, %hi(D_800E098C) # $a0, 0x800e /* 094F54 80094354 8C84098C */ lw $a0, %lo(D_800E098C)($a0) -/* 094F58 80094358 24E76A68 */ addiu $a3, $a3, 0x6a68 +/* 094F58 80094358 24E76A68 */ addiu $a3, %lo(D_80126A68) # addiu $a3, $a3, 0x6a68 /* 094F5C 8009435C 8CE20000 */ lw $v0, ($a3) /* 094F60 80094360 3C038012 */ lui $v1, %hi(D_80126464) # $v1, 0x8012 /* 094F64 80094364 00641821 */ addu $v1, $v1, $a0 diff --git a/asm/non_matchings/unknown_080500/func_80094D28.s b/asm/non_matchings/unknown_080500/func_80094D28.s index 0214dbf9..8b065120 100644 --- a/asm/non_matchings/unknown_080500/func_80094D28.s +++ b/asm/non_matchings/unknown_080500/func_80094D28.s @@ -461,7 +461,7 @@ glabel func_80094D28 /* 095FCC 800953CC 8E2C0000 */ lw $t4, ($s1) /* 095FD0 800953D0 2652FFE8 */ addiu $s2, $s2, -0x18 /* 095FD4 800953D4 1180003E */ beqz $t4, .L800954D0 -/* 095FD8 800953D8 3C0F8012 */ lui $t7, 0x8012 +/* 095FD8 800953D8 3C0F8012 */ lui $t7, %hi(D_80126C14) # $t7, 0x8012 /* 095FDC 800953DC 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e /* 095FE0 800953E0 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) /* 095FE4 800953E4 240E0001 */ li $t6, 1 @@ -526,7 +526,7 @@ glabel func_80094D28 /* 0960C8 800954C8 1000002D */ b .L80095580 /* 0960CC 800954CC 00000000 */ nop .L800954D0: -/* 0960D0 800954D0 8DEF6C14 */ lw $t7, 0x6c14($t7) +/* 0960D0 800954D0 8DEF6C14 */ lw $t7, %lo(D_80126C14)($t7) /* 0960D4 800954D4 2412000C */ li $s2, 12 /* 0960D8 800954D8 19E00029 */ blez $t7, .L80095580 /* 0960DC 800954DC 00008025 */ move $s0, $zero diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index 54937b76..55d9eb52 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -746,7 +746,7 @@ glabel func_80095728 /* 096E04 80096204 AFAD004C */ sw $t5, 0x4c($sp) .L80096208: /* 096E08 80096208 13200021 */ beqz $t9, .L80096290 -/* 096E0C 8009620C 3C068012 */ lui $a2, 0x8012 +/* 096E0C 8009620C 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 096E10 80096210 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 096E14 80096214 24C66A68 */ addiu $a2, %lo(D_80126A68) # addiu $a2, $a2, 0x6a68 /* 096E18 80096218 8CCE0000 */ lw $t6, ($a2) @@ -782,7 +782,7 @@ glabel func_80095728 /* 096E88 80096288 10000072 */ b .L80096454 /* 096E8C 8009628C AC3963E0 */ sw $t9, %lo(D_801263E0)($at) .L80096290: -/* 096E90 80096290 24C66A68 */ addiu $a2, $a2, 0x6a68 +/* 096E90 80096290 24C66A68 */ addiu $a2, %lo(D_80126A68) # addiu $a2, $a2, 0x6a68 /* 096E94 80096294 8CC20000 */ lw $v0, ($a2) /* 096E98 80096298 00002025 */ move $a0, $zero /* 096E9C 8009629C 1940006A */ blez $t2, .L80096448 diff --git a/asm/non_matchings/unknown_080500/func_80097D10.s b/asm/non_matchings/unknown_080500/func_80097D10.s index d2a0b6fc..c1fd113e 100644 --- a/asm/non_matchings/unknown_080500/func_80097D10.s +++ b/asm/non_matchings/unknown_080500/func_80097D10.s @@ -49,7 +49,7 @@ glabel func_80097D10 /* 0989C0 80097DC0 AC6C0000 */ sw $t4, ($v1) .L80097DC4: /* 0989C4 80097DC4 1880001A */ blez $a0, .L80097E30 -/* 0989C8 80097DC8 3C028012 */ lui $v0, 0x8012 +/* 0989C8 80097DC8 3C028012 */ lui $v0, %hi(D_80126C3C) # $v0, 0x8012 /* 0989CC 80097DCC 3C028012 */ lui $v0, %hi(D_80126C3C) # $v0, 0x8012 /* 0989D0 80097DD0 24426C3C */ addiu $v0, %lo(D_80126C3C) # addiu $v0, $v0, 0x6c3c /* 0989D4 80097DD4 8C4D0000 */ lw $t5, ($v0) @@ -80,7 +80,7 @@ glabel func_80097D10 .L80097E30: /* 098A30 80097E30 3C038012 */ lui $v1, %hi(D_80126C34) # $v1, 0x8012 /* 098A34 80097E34 24636C34 */ addiu $v1, %lo(D_80126C34) # addiu $v1, $v1, 0x6c34 -/* 098A38 80097E38 24426C3C */ addiu $v0, $v0, 0x6c3c +/* 098A38 80097E38 24426C3C */ addiu $v0, %lo(D_80126C3C) # addiu $v0, $v0, 0x6c3c /* 098A3C 80097E3C AC600000 */ sw $zero, ($v1) /* 098A40 80097E40 AC400000 */ sw $zero, ($v0) .L80097E44: diff --git a/asm/non_matchings/unknown_080500/func_8009D360.s b/asm/non_matchings/unknown_080500/func_8009D360.s index 4cabb56b..208308ff 100644 --- a/asm/non_matchings/unknown_080500/func_8009D360.s +++ b/asm/non_matchings/unknown_080500/func_8009D360.s @@ -254,7 +254,7 @@ glabel func_8009D360 /* 09E324 8009D724 80636516 */ lb $v1, %lo(D_80126516)($v1) /* 09E328 8009D728 240B0002 */ li $t3, 2 /* 09E32C 8009D72C 10600014 */ beqz $v1, .L8009D780 -/* 09E330 8009D730 3C018012 */ lui $at, 0x8012 +/* 09E330 8009D730 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012 /* 09E334 8009D734 24010001 */ li $at, 1 /* 09E338 8009D738 10610006 */ beq $v1, $at, .L8009D754 /* 09E33C 8009D73C 24090003 */ li $t1, 3 @@ -266,7 +266,7 @@ glabel func_8009D360 .L8009D754: /* 09E354 8009D754 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012 /* 09E358 8009D758 A02964E2 */ sb $t1, %lo(D_801264E2)($at) -/* 09E35C 8009D75C 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012 +/* 09E35C 8009D75C 3C018012 */ lui $at, %hi(D_801264D8) # $at, 0x8012 /* 09E360 8009D760 A02064D8 */ sb $zero, %lo(D_801264D8)($at) /* 09E364 8009D764 24040239 */ li $a0, 569 /* 09E368 8009D768 0C00EB0F */ jal func_8003AC3C diff --git a/asm/non_matchings/unknown_09F8F0/func_8009F034.s b/asm/non_matchings/unknown_09F8F0/func_8009F034.s index d8585950..51b04c20 100644 --- a/asm/non_matchings/unknown_09F8F0/func_8009F034.s +++ b/asm/non_matchings/unknown_09F8F0/func_8009F034.s @@ -251,8 +251,8 @@ glabel func_8009F034 /* 09FFE0 8009F3E0 3C014188 */ li $at, 0x41880000 # 17.000000 /* 09FFE4 8009F3E4 15830084 */ bne $t4, $v1, .L8009F5F8 /* 09FFE8 8009F3E8 00000000 */ nop -/* 09FFEC 8009F3EC 3C03800E */ lui $v1, 0x800e -/* 09FFF0 8009F3F0 246225C4 */ addiu $v0, $v1, 0x25c4 +/* 09FFEC 8009F3EC 3C03800E */ lui $v1, %hi(D_800E25C4) # $v1, 0x800e +/* 09FFF0 8009F3F0 246225C4 */ addiu $v0, $v1, %lo(D_800E25C4) /* 09FFF4 8009F3F4 84590000 */ lh $t9, ($v0) /* 09FFF8 8009F3F8 44810000 */ mtc1 $at, $f0 /* 09FFFC 8009F3FC 1159003F */ beq $t2, $t9, .L8009F4FC @@ -393,8 +393,8 @@ glabel func_8009F034 /* 0A01FC 8009F5FC 24010003 */ li $at, 3 /* 0A0200 8009F600 1461006E */ bne $v1, $at, .L8009F7BC .L8009F604: -/* 0A0204 8009F604 3C04800E */ lui $a0, 0x800e -/* 0A0208 8009F608 24822684 */ addiu $v0, $a0, 0x2684 +/* 0A0204 8009F604 3C04800E */ lui $a0, %hi(D_800E2684) # $a0, 0x800e +/* 0A0208 8009F608 24822684 */ addiu $v0, $a0, %lo(D_800E2684) /* 0A020C 8009F60C 844F0000 */ lh $t7, ($v0) /* 0A0210 8009F610 3C19800E */ lui $t9, %hi(D_800E2684) # $t9, 0x800e /* 0A0214 8009F614 114F0069 */ beq $t2, $t7, .L8009F7BC diff --git a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s index 3a99b020..1719d7b1 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s @@ -27,7 +27,7 @@ glabel func_800A3CE4 /* 0A4944 800A3D44 00000000 */ nop .L800A3D48: /* 0A4948 800A3D48 19200083 */ blez $t1, .L800A3F58 -/* 0A494C 800A3D4C 3C088012 */ lui $t0, 0x8012 +/* 0A494C 800A3D4C 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012 /* 0A4950 800A3D50 3C188012 */ lui $t8, %hi(D_80126D34) # $t8, 0x8012 /* 0A4954 800A3D54 93186D34 */ lbu $t8, %lo(D_80126D34)($t8) /* 0A4958 800A3D58 00095A00 */ sll $t3, $t1, 8 @@ -160,7 +160,7 @@ glabel func_800A3CE4 /* 0A4B50 800A3F50 1000007A */ b .L800A413C /* 0A4B54 800A3F54 00000000 */ nop .L800A3F58: -/* 0A4B58 800A3F58 25086CDC */ addiu $t0, $t0, 0x6cdc +/* 0A4B58 800A3F58 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc /* 0A4B5C 800A3F5C 8D0F0000 */ lw $t7, ($t0) /* 0A4B60 800A3F60 3C01C348 */ li $at, 0xC3480000 # -200.000000 /* 0A4B64 800A3F64 44819000 */ mtc1 $at, $f18 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s index b697b9ec..077d0ac4 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s @@ -53,7 +53,7 @@ glabel func_800A5F18 /* 0A6BE0 800A5FE0 8FB90028 */ lw $t9, 0x28($sp) /* 0A6BE4 800A5FE4 8FB80024 */ lw $t8, 0x24($sp) /* 0A6BE8 800A5FE8 872801AC */ lh $t0, 0x1ac($t9) -/* 0A6BEC 800A5FEC 3C028012 */ lui $v0, 0x8012 +/* 0A6BEC 800A5FEC 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012 /* 0A6BF0 800A5FF0 13080078 */ beq $t8, $t0, .L800A61D4 /* 0A6BF4 800A5FF4 3C01420C */ li $at, 0x420C0000 # 35.000000 /* 0A6BF8 800A5FF8 240900FF */ li $t1, 255 @@ -176,7 +176,7 @@ glabel func_800A5F18 /* 0A6DCC 800A61CC 1000001E */ b .L800A6248 /* 0A6DD0 800A61D0 8FBF001C */ lw $ra, 0x1c($sp) .L800A61D4: -/* 0A6DD4 800A61D4 8C426CDC */ lw $v0, 0x6cdc($v0) +/* 0A6DD4 800A61D4 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0) /* 0A6DD8 800A61D8 44815000 */ mtc1 $at, $f10 /* 0A6DDC 800A61DC C448016C */ lwc1 $f8, 0x16c($v0) /* 0A6DE0 800A61E0 C4440170 */ lwc1 $f4, 0x170($v0) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index c1646dd2..4f407e1b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -1432,7 +1432,7 @@ glabel func_800A8474 /* 0AA5AC 800A99AC 10410019 */ beq $v0, $at, .L800A9A14 /* 0AA5B0 800A99B0 24010003 */ li $at, 3 /* 0AA5B4 800A99B4 1041004E */ beq $v0, $at, .L800A9AF0 -/* 0AA5B8 800A99B8 3C108012 */ lui $s0, 0x8012 +/* 0AA5B8 800A99B8 3C108012 */ lui $s0, %hi(D_80126D5C) # $s0, 0x8012 /* 0AA5BC 800A99BC 3C108012 */ lui $s0, %hi(D_80126D5C) # $s0, 0x8012 /* 0AA5C0 800A99C0 240E0087 */ li $t6, 135 /* 0AA5C4 800A99C4 3C018012 */ lui $at, %hi(D_80126D58) # $at, 0x8012 @@ -1472,7 +1472,7 @@ glabel func_800A8474 /* 0AA640 800A9A40 00000000 */ nop /* 0AA644 800A9A44 24010041 */ li $at, 65 /* 0AA648 800A9A48 14410015 */ bne $v0, $at, .L800A9AA0 -/* 0AA64C 800A9A4C 3C108012 */ lui $s0, 0x8012 +/* 0AA64C 800A9A4C 3C108012 */ lui $s0, %hi(D_80126D5C) # $s0, 0x8012 .L800A9A50: /* 0AA650 800A9A50 3C0C8012 */ lui $t4, %hi(D_80126D1C) # $t4, 0x8012 /* 0AA654 800A9A54 8D8C6D1C */ lw $t4, %lo(D_80126D1C)($t4) @@ -1502,7 +1502,7 @@ glabel func_800A8474 /* 0AA6A8 800A9AA8 3C0D8012 */ lui $t5, %hi(D_80126D20) # $t5, 0x8012 /* 0AA6AC 800A9AAC 8DAD6D20 */ lw $t5, %lo(D_80126D20)($t5) /* 0AA6B0 800A9AB0 240FFFC4 */ li $t7, -60 -/* 0AA6B4 800A9AB4 26106D5C */ addiu $s0, $s0, 0x6d5c +/* 0AA6B4 800A9AB4 26106D5C */ addiu $s0, %lo(D_80126D5C) # addiu $s0, $s0, 0x6d5c /* 0AA6B8 800A9AB8 05410003 */ bgez $t2, .L800A9AC8 /* 0AA6BC 800A9ABC 000A5843 */ sra $t3, $t2, 1 /* 0AA6C0 800A9AC0 25410001 */ addiu $at, $t2, 1 @@ -1524,7 +1524,7 @@ glabel func_800A8474 /* 0AA6F4 800A9AF4 8F396D1C */ lw $t9, %lo(D_80126D1C)($t9) /* 0AA6F8 800A9AF8 3C0C8012 */ lui $t4, %hi(D_80126D20) # $t4, 0x8012 /* 0AA6FC 800A9AFC 8D8C6D20 */ lw $t4, %lo(D_80126D20)($t4) -/* 0AA700 800A9B00 26106D5C */ addiu $s0, $s0, 0x6d5c +/* 0AA700 800A9B00 26106D5C */ addiu $s0, %lo(D_80126D5C) # addiu $s0, $s0, 0x6d5c /* 0AA704 800A9B04 07210003 */ bgez $t9, .L800A9B14 /* 0AA708 800A9B08 00195043 */ sra $t2, $t9, 1 /* 0AA70C 800A9B0C 27210001 */ addiu $at, $t9, 1 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA600.s b/asm/non_matchings/unknown_09F8F0/func_800AA600.s index b6969b86..f9b36469 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AA600.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AA600.s @@ -180,7 +180,7 @@ glabel func_800AA600 /* 0AB4A0 800AA8A0 154D0140 */ bne $t2, $t5, .L800AADA4 /* 0AB4A4 800AA8A4 30598000 */ andi $t9, $v0, 0x8000 /* 0AB4A8 800AA8A8 14200095 */ bnez $at, .L800AAB00 -/* 0AB4AC 800AA8AC 3C198012 */ lui $t9, 0x8012 +/* 0AB4AC 800AA8AC 3C198012 */ lui $t9, %hi(D_80126CD5) # $t9, 0x8012 /* 0AB4B0 800AA8B0 29010036 */ slti $at, $t0, 0x36 /* 0AB4B4 800AA8B4 10200092 */ beqz $at, .L800AAB00 /* 0AB4B8 800AA8B8 3C048000 */ lui $a0, %hi(osTvType) # $a0, 0x8000 @@ -273,7 +273,7 @@ glabel func_800AA600 /* 0AB604 800AAA04 860E0006 */ lh $t6, 6($s0) /* 0AB608 800AAA08 24010035 */ li $at, 53 /* 0AB60C 800AAA0C 15C1001A */ bne $t6, $at, .L800AAA78 -/* 0AB610 800AAA10 3C048012 */ lui $a0, 0x8012 +/* 0AB610 800AAA10 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012 /* 0AB614 800AAA14 240100FF */ li $at, 255 /* 0AB618 800AAA18 14610003 */ bne $v1, $at, .L800AAA28 /* 0AB61C 800AAA1C 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012 @@ -308,7 +308,7 @@ glabel func_800AA600 /* 0AB684 800AAA84 AFAB0018 */ sw $t3, 0x18($sp) /* 0AB688 800AAA88 AFB80014 */ sw $t8, 0x14($sp) /* 0AB68C 800AAA8C AFB90010 */ sw $t9, 0x10($sp) -/* 0AB690 800AAA90 24846CFC */ addiu $a0, $a0, 0x6cfc +/* 0AB690 800AAA90 24846CFC */ addiu $a0, %lo(D_80126CFC) # addiu $a0, $a0, 0x6cfc /* 0AB694 800AAA94 27A50088 */ addiu $a1, $sp, 0x88 /* 0AB698 800AAA98 00003025 */ move $a2, $zero /* 0AB69C 800AAA9C 00003825 */ move $a3, $zero @@ -547,7 +547,7 @@ glabel func_800AA600 /* 0ABA24 800AAE24 A60C0004 */ sh $t4, 4($s0) .L800AAE28: /* 0ABA28 800AAE28 11C0001F */ beqz $t6, .L800AAEA8 -/* 0ABA2C 800AAE2C 3C048012 */ lui $a0, 0x8012 +/* 0ABA2C 800AAE2C 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012 /* 0ABA30 800AAE30 8D2F0000 */ lw $t7, ($t1) /* 0ABA34 800AAE34 0008C880 */ sll $t9, $t0, 2 /* 0ABA38 800AAE38 01F9C021 */ addu $t8, $t7, $t9 @@ -582,7 +582,7 @@ glabel func_800AA600 /* 0ABAA8 800AAEA8 44809000 */ mtc1 $zero, $f18 /* 0ABAAC 800AAEAC 3C058012 */ lui $a1, %hi(D_80126D00) # $a1, 0x8012 /* 0ABAB0 800AAEB0 24A56D00 */ addiu $a1, %lo(D_80126D00) # addiu $a1, $a1, 0x6d00 -/* 0ABAB4 800AAEB4 24846CFC */ addiu $a0, $a0, 0x6cfc +/* 0ABAB4 800AAEB4 24846CFC */ addiu $a0, %lo(D_80126CFC) # addiu $a0, $a0, 0x6cfc /* 0ABAB8 800AAEB8 02003025 */ move $a2, $s0 /* 0ABABC 800AAEBC 3C073F80 */ lui $a3, 0x3f80 /* 0ABAC0 800AAEC0 0C01A521 */ jal func_80069484 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AC8A8.s b/asm/non_matchings/unknown_09F8F0/func_800AC8A8.s index b84877c6..992618ad 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AC8A8.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AC8A8.s @@ -70,7 +70,7 @@ glabel func_800AC8A8 /* 0AD598 800AC998 906B000E */ lbu $t3, 0xe($v1) /* 0AD59C 800AC99C 3C0C800E */ lui $t4, %hi(D_800E2980) # $t4, 0x800e /* 0AD5A0 800AC9A0 14CB0005 */ bne $a2, $t3, .L800AC9B8 -/* 0AD5A4 800AC9A4 3C018012 */ lui $at, 0x8012 +/* 0AD5A4 800AC9A4 3C018012 */ lui $at, %hi(D_80127C2C) # $at, 0x8012 /* 0AD5A8 800AC9A8 258C2980 */ addiu $t4, %lo(D_800E2980) # addiu $t4, $t4, 0x2980 /* 0AD5AC 800AC9AC 3C018012 */ lui $at, %hi(D_80127C2C) # $at, 0x8012 /* 0AD5B0 800AC9B0 10000002 */ b .L800AC9BC diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD4B8.s b/asm/non_matchings/unknown_09F8F0/func_800AD4B8.s index ac70995a..e1f97c3b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AD4B8.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AD4B8.s @@ -18,7 +18,7 @@ glabel func_800AD4B8 /* 0AE0F8 800AD4F8 18400023 */ blez $v0, .L800AD588 /* 0AE0FC 800AD4FC 0242082A */ slt $at, $s2, $v0 /* 0AE100 800AD500 10200017 */ beqz $at, .L800AD560 -/* 0AE104 800AD504 3C04800E */ lui $a0, 0x800e +/* 0AE104 800AD504 3C04800E */ lui $a0, %hi(D_800E2C6C) # $a0, 0x800e /* 0AE108 800AD508 00527823 */ subu $t7, $v0, $s2 /* 0AE10C 800AD50C AC6F0000 */ sw $t7, ($v1) /* 0AE110 800AD510 3C19800E */ lui $t9, %hi(D_800E2C64) # $t9, 0x800e @@ -50,7 +50,7 @@ glabel func_800AD4B8 /* 0AE174 800AD574 3C0F800E */ lui $t7, %hi(D_800E2C74) # $t7, 0x800e /* 0AE178 800AD578 AE0E0000 */ sw $t6, ($s0) /* 0AE17C 800AD57C 8DEF2C74 */ lw $t7, %lo(D_800E2C74)($t7) -/* 0AE180 800AD580 24842C6C */ addiu $a0, $a0, 0x2c6c +/* 0AE180 800AD580 24842C6C */ addiu $a0, $a0, %lo(D_800E2C6C) /* 0AE184 800AD584 AC8F0000 */ sw $t7, ($a0) .L800AD588: /* 0AE188 800AD588 3C10800E */ lui $s0, %hi(D_800E2C60) # $s0, 0x800e diff --git a/asm/non_matchings/unknown_0AEE70/func_800B1CB8.s b/asm/non_matchings/unknown_0AEE70/func_800B1CB8.s index 898ee3d6..9d887f31 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B1CB8.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B1CB8.s @@ -5,13 +5,13 @@ glabel func_800B1CB8 /* 0B28C4 800B1CC4 00001025 */ move $v0, $zero /* 0B28C8 800B1CC8 24070002 */ li $a3, 2 /* 0B28CC 800B1CCC 1087005D */ beq $a0, $a3, .L800B1E44 -/* 0B28D0 800B1CD0 3C08800E */ lui $t0, 0x800e +/* 0B28D0 800B1CD0 3C08800E */ lui $t0, %hi(D_800E2CB4) # $t0, 0x800e /* 0B28D4 800B1CD4 24070003 */ li $a3, 3 /* 0B28D8 800B1CD8 10870083 */ beq $a0, $a3, .L800B1EE8 -/* 0B28DC 800B1CDC 3C08800E */ lui $t0, 0x800e +/* 0B28DC 800B1CDC 3C08800E */ lui $t0, %hi(D_800E2CCC) # $t0, 0x800e /* 0B28E0 800B1CE0 24060004 */ li $a2, 4 /* 0B28E4 800B1CE4 108600A9 */ beq $a0, $a2, .L800B1F8C -/* 0B28E8 800B1CE8 3C07800E */ lui $a3, 0x800e +/* 0B28E8 800B1CE8 3C07800E */ lui $a3, %hi(D_800E2CD8) # $a3, 0x800e /* 0B28EC 800B1CEC 24070080 */ li $a3, 128 /* 0B28F0 800B1CF0 148700CE */ bne $a0, $a3, .L800B202C /* 0B28F4 800B1CF4 3C08800E */ lui $t0, %hi(D_800E2CC0) # $t0, 0x800e @@ -106,7 +106,7 @@ glabel func_800B1CB8 /* 0B2A3C 800B1E3C 1000007B */ b .L800B202C /* 0B2A40 800B1E40 00CB1821 */ addu $v1, $a2, $t3 .L800B1E44: -/* 0B2A44 800B1E44 25082CB4 */ addiu $t0, $t0, 0x2cb4 +/* 0B2A44 800B1E44 25082CB4 */ addiu $t0, %lo(D_800E2CB4) # addiu $t0, $t0, 0xE2cb4 /* 0B2A48 800B1E48 8D040000 */ lw $a0, ($t0) /* 0B2A4C 800B1E4C 3C09800E */ lui $t1, %hi(D_800E2CAC) # $t1, 0x800e /* 0B2A50 800B1E50 10800076 */ beqz $a0, .L800B202C @@ -151,7 +151,7 @@ glabel func_800B1CB8 /* 0B2AE0 800B1EE0 10000052 */ b .L800B202C /* 0B2AE4 800B1EE4 00CF1821 */ addu $v1, $a2, $t7 .L800B1EE8: -/* 0B2AE8 800B1EE8 25082CCC */ addiu $t0, $t0, 0x2ccc +/* 0B2AE8 800B1EE8 25082CCC */ addiu $t0, %lo(D_800E2CCC) # addiu $t0, $t0, 0x2ccc /* 0B2AEC 800B1EEC 8D040000 */ lw $a0, ($t0) /* 0B2AF0 800B1EF0 3C09800E */ lui $t1, %hi(D_800E2CC4) # $t1, 0x800e /* 0B2AF4 800B1EF4 1080004D */ beqz $a0, .L800B202C @@ -196,7 +196,7 @@ glabel func_800B1CB8 /* 0B2B84 800B1F84 10000029 */ b .L800B202C /* 0B2B88 800B1F88 00CA1821 */ addu $v1, $a2, $t2 .L800B1F8C: -/* 0B2B8C 800B1F8C 24E72CD8 */ addiu $a3, $a3, 0x2cd8 +/* 0B2B8C 800B1F8C 24E72CD8 */ addiu $a3, %lo(D_800E2CD8) # $a3, $a3, 0x2cd8 /* 0B2B90 800B1F90 8CE40000 */ lw $a0, ($a3) /* 0B2B94 800B1F94 3C08800E */ lui $t0, %hi(D_800E2CD0) # $t0, 0x800e /* 0B2B98 800B1F98 10800024 */ beqz $a0, .L800B202C diff --git a/asm/non_matchings/unknown_0AEE70/func_800B26E0.s b/asm/non_matchings/unknown_0AEE70/func_800B26E0.s index d579b90c..6a4798b0 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B26E0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B26E0.s @@ -20,7 +20,7 @@ glabel func_800B26E0 /* 0B3324 800B2724 8FA70030 */ lw $a3, 0x30($sp) /* 0B3328 800B2728 29010002 */ slti $at, $t0, 2 /* 0B332C 800B272C 102001CE */ beqz $at, .L800B2E68 -/* 0B3330 800B2730 3C058012 */ lui $a1, 0x8012 +/* 0B3330 800B2730 3C058012 */ lui $a1, %hi(D_80127C80) # $a1, 0x8012 /* 0B3334 800B2734 8FA90034 */ lw $t1, 0x34($sp) /* 0B3338 800B2738 00000000 */ nop /* 0B333C 800B273C 112001CA */ beqz $t1, .L800B2E68 @@ -159,7 +159,7 @@ glabel func_800B26E0 /* 0B3528 800B2928 E7AC004C */ swc1 $f12, 0x4c($sp) .L800B292C: /* 0B352C 800B292C 106000CE */ beqz $v1, .L800B2C68 -/* 0B3530 800B2930 3C058012 */ lui $a1, 0x8012 +/* 0B3530 800B2930 3C058012 */ lui $a1, %hi(D_80127C80) # $a1, 0x8012 /* 0B3534 800B2934 90D80068 */ lbu $t8, 0x68($a2) /* 0B3538 800B2938 C7A40044 */ lwc1 $f4, 0x44($sp) /* 0B353C 800B293C 170000CA */ bnez $t8, .L800B2C68 @@ -496,9 +496,9 @@ glabel func_800B26E0 /* 0B3A5C 800B2E5C A0CB0068 */ sb $t3, 0x68($a2) .L800B2E60: /* 0B3A60 800B2E60 10000041 */ b .L800B2F68 -/* 0B3A64 800B2E64 24A57C80 */ addiu $a1, $a1, 0x7c80 +/* 0B3A64 800B2E64 24A57C80 */ addiu $a1, %lo(D_80127C80) # addiu $a1, $a1, 0x7c80 .L800B2E68: -/* 0B3A68 800B2E68 24A57C80 */ addiu $a1, $a1, 0x7c80 +/* 0B3A68 800B2E68 24A57C80 */ addiu $a1, %lo(D_80127C80) # addiu $a1, $a1, 0x7c80 /* 0B3A6C 800B2E6C 8CA90000 */ lw $t1, ($a1) /* 0B3A70 800B2E70 84CD003A */ lh $t5, 0x3a($a2) /* 0B3A74 800B2E74 00C02025 */ move $a0, $a2 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B653C.s b/asm/non_matchings/unknown_0AEE70/func_800B653C.s index f4f4dc0f..5e6c866e 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B653C.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B653C.s @@ -50,7 +50,7 @@ glabel func_800B653C .L800B65F4: /* 0B71F4 800B65F4 24010009 */ li $at, 9 /* 0B71F8 800B65F8 12210090 */ beq $s1, $at, .L800B683C -/* 0B71FC 800B65FC 3C038012 */ lui $v1, 0x8012 +/* 0B71FC 800B65FC 3C038012 */ lui $v1, %hi(D_80127CB4) # $v1, 0x8012 /* 0B7200 800B6600 2401000A */ li $at, 10 /* 0B7204 800B6604 12210076 */ beq $s1, $at, .L800B67E0 /* 0B7208 800B6608 00000000 */ nop @@ -204,7 +204,7 @@ glabel func_800B653C /* 0B743C 800B683C 96440000 */ lhu $a0, ($s2) /* 0B7440 800B6840 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 /* 0B7444 800B6844 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) -/* 0B7448 800B6848 8C637CB4 */ lw $v1, 0x7cb4($v1) +/* 0B7448 800B6848 8C637CB4 */ lw $v1, %lo(D_80127CB4)($v1) /* 0B744C 800B684C 04810004 */ bgez $a0, .L800B6860 /* 0B7450 800B6850 3082001F */ andi $v0, $a0, 0x1f /* 0B7454 800B6854 10400002 */ beqz $v0, .L800B6860 diff --git a/asm/non_matchings/unknown_0B8920/func_800B8134.s b/asm/non_matchings/unknown_0B8920/func_800B8134.s index b1c15f88..48e6173f 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B8134.s +++ b/asm/non_matchings/unknown_0B8920/func_800B8134.s @@ -3,14 +3,14 @@ glabel func_800B8134 /* 0B8D38 800B8138 8C42A078 */ lw $v0, %lo(D_8012A078)($v0) /* 0B8D3C 800B813C 24030002 */ li $v1, 2 /* 0B8D40 800B8140 10620006 */ beq $v1, $v0, .L800B815C -/* 0B8D44 800B8144 3C058013 */ lui $a1, 0x8013 +/* 0B8D44 800B8144 3C058013 */ lui $a1, %hi(D_80129FC8) # $a1, 0x8013 /* 0B8D48 800B8148 908E0056 */ lbu $t6, 0x56($a0) /* 0B8D4C 800B814C 3C058013 */ lui $a1, %hi(D_80129FC8) # $a1, 0x8013 /* 0B8D50 800B8150 24A59FC8 */ addiu $a1, %lo(D_80129FC8) # addiu $a1, $a1, -0x6038 /* 0B8D54 800B8154 10000004 */ b .L800B8168 /* 0B8D58 800B8158 ACAE0000 */ sw $t6, ($a1) .L800B815C: -/* 0B8D5C 800B815C 24A59FC8 */ addiu $a1, $a1, -0x6038 +/* 0B8D5C 800B815C 24A59FC8 */ addiu $a1, %lo(D_80129FC8) # addiu $a1, $a1, -0x6038 /* 0B8D60 800B8160 240F0004 */ li $t7, 4 /* 0B8D64 800B8164 ACAF0000 */ sw $t7, ($a1) .L800B8168: diff --git a/asm/non_matchings/unknown_0B8920/func_800BA4B8.s b/asm/non_matchings/unknown_0B8920/func_800BA4B8.s index 9c560bf2..27883dd9 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BA4B8.s +++ b/asm/non_matchings/unknown_0B8920/func_800BA4B8.s @@ -35,7 +35,7 @@ glabel func_800BA4B8 /* 0BB128 800BA528 8FAC005C */ lw $t4, 0x5c($sp) /* 0BB12C 800BA52C 332E000F */ andi $t6, $t9, 0xf /* 0BB130 800BA530 15C00073 */ bnez $t6, .L800BA700 -/* 0BB134 800BA534 3C038013 */ lui $v1, 0x8013 +/* 0BB134 800BA534 3C038013 */ lui $v1, %hi(D_80129FC0) # $v1, 0x8013 /* 0BB138 800BA538 3C038013 */ lui $v1, %hi(D_80129FC0) # $v1, 0x8013 /* 0BB13C 800BA53C 24639FC0 */ addiu $v1, %lo(D_80129FC0) # addiu $v1, $v1, -0x6040 /* 0BB140 800BA540 8C620000 */ lw $v0, ($v1) @@ -158,7 +158,7 @@ glabel func_800BA4B8 /* 0BB2F8 800BA6F8 10000078 */ b .L800BA8DC /* 0BB2FC 800BA6FC 00407825 */ move $t7, $v0 .L800BA700: -/* 0BB300 800BA700 24639FC0 */ addiu $v1, $v1, -0x6040 +/* 0BB300 800BA700 24639FC0 */ addiu $v1, %lo(D_80129FC0) # addiu $v1, $v1, -0x6040 /* 0BB304 800BA704 8C620000 */ lw $v0, ($v1) /* 0BB308 800BA708 3C018000 */ lui $at, (0x80000020 >> 16) # lui $at, 0x8000 /* 0BB30C 800BA70C 244E0008 */ addiu $t6, $v0, 8 diff --git a/asm/non_matchings/unknown_0B8920/func_800BBE08.s b/asm/non_matchings/unknown_0B8920/func_800BBE08.s index c204778a..d25bc24e 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BBE08.s +++ b/asm/non_matchings/unknown_0B8920/func_800BBE08.s @@ -85,7 +85,7 @@ glabel func_800BBE08 /* 0BCB3C 800BBF3C 00E1C024 */ and $t8, $a3, $at /* 0BCB40 800BBF40 00187702 */ srl $t6, $t8, 0x1c /* 0BCB44 800BBF44 19C00007 */ blez $t6, .L800BBF64 -/* 0BCB48 800BBF48 3C01800E */ lui $at, 0x800e +/* 0BCB48 800BBF48 3C01800E */ lui $at, %hi(D_800E3180) # $at, 0x800e /* 0BCB4C 800BBF4C 000E7880 */ sll $t7, $t6, 2 /* 0BCB50 800BBF50 00AFC821 */ addu $t9, $a1, $t7 /* 0BCB54 800BBF54 8F380070 */ lw $t8, 0x70($t9) diff --git a/asm/non_matchings/unknown_0B8920/func_800BCC70.s b/asm/non_matchings/unknown_0B8920/func_800BCC70.s index ad586d2c..5d648808 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BCC70.s +++ b/asm/non_matchings/unknown_0B8920/func_800BCC70.s @@ -222,7 +222,7 @@ glabel func_800BCC70 /* 0BDBB8 800BCFB8 006FC004 */ sllv $t8, $t7, $v1 /* 0BDBBC 800BCFBC 030E7824 */ and $t7, $t8, $t6 /* 0BDBC0 800BCFC0 11E00091 */ beqz $t7, .L800BD208 -/* 0BDBC4 800BCFC4 3C0E800E */ lui $t6, 0x800e +/* 0BDBC4 800BCFC4 3C0E800E */ lui $t6, %hi(D_800E317C) # $t6, 0x800e /* 0BDBC8 800BCFC8 3C0E8013 */ lui $t6, %hi(D_8012A0D8) # $t6, 0x8013 /* 0BDBCC 800BCFCC 8DCEA0D8 */ lw $t6, %lo(D_8012A0D8)($t6) /* 0BDBD0 800BCFD0 8FB800A4 */ lw $t8, 0xa4($sp) @@ -380,7 +380,7 @@ glabel func_800BCC70 /* 0BDE00 800BD200 10000014 */ b .L800BD254 /* 0BDE04 800BD204 8FB9018C */ lw $t9, 0x18c($sp) .L800BD208: -/* 0BDE08 800BD208 8DCE317C */ lw $t6, 0x317c($t6) +/* 0BDE08 800BD208 8DCE317C */ lw $t6, %lo(D_800E317C)($t6) /* 0BDE0C 800BD20C 00005025 */ move $t2, $zero /* 0BDE10 800BD210 19C00010 */ blez $t6, .L800BD254 /* 0BDE14 800BD214 8FB9018C */ lw $t9, 0x18c($sp) diff --git a/asm/non_matchings/unknown_0B8920/func_800BF634.s b/asm/non_matchings/unknown_0B8920/func_800BF634.s index f64be6ea..b5319fca 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BF634.s +++ b/asm/non_matchings/unknown_0B8920/func_800BF634.s @@ -150,7 +150,8 @@ glabel func_800BF634 /* 0C0448 800BF848 E4AA0014 */ swc1 $f10, 0x14($a1) /* 0C044C 800BF84C E4A8000C */ swc1 $f8, 0xc($a1) /* 0C0450 800BF850 8FAE0010 */ lw $t6, 0x10($sp) -/* 0C0454 800BF854 3C01800F */ lui $at, 0x800f +# Used to access D_800E92B0 and D_800E92B4. +/* 0C0454 800BF854 3C01800F */ lui $at, %hi(D_800E92B0) # $at, 0x800f /* 0C0458 800BF858 A4AE001A */ sh $t6, 0x1a($a1) /* 0C045C 800BF85C 8DEF0300 */ lw $t7, %lo(osTvType)($t7) /* 0C0460 800BF860 C7A00014 */ lwc1 $f0, 0x14($sp) @@ -177,7 +178,7 @@ glabel func_800BF634 /* 0C04B4 800BF8B4 44803000 */ mtc1 $zero, $f6 /* 0C04B8 800BF8B8 24190001 */ li $t9, 1 /* 0C04BC 800BF8BC 46262181 */ sub.d $f6, $f4, $f6 -/* 0C04C0 800BF8C0 3C018000 */ lui $at, %hi(D_7FFF92B4) # $at, 0x8000 +/* 0C04C0 800BF8C0 3C018000 */ lui $at, 0x8000 /* 0C04C4 800BF8C4 44D9F800 */ ctc1 $t9, $31 /* 0C04C8 800BF8C8 00000000 */ nop /* 0C04CC 800BF8CC 462031A4 */ cvt.w.d $f6, $f6 @@ -202,8 +203,8 @@ glabel func_800BF634 /* 0C050C 800BF90C 10000029 */ b .L800BF9B4 /* 0C0510 800BF910 ACB9001C */ sw $t9, 0x1c($a1) .L800BF914: -/* 0C0514 800BF914 C42B92B0 */ lwc1 $f11, %lo(D_7FFF92B0)($at) -/* 0C0518 800BF918 C42A92B4 */ lwc1 $f10, %lo(D_7FFF92B4)($at) +/* 0C0514 800BF914 C42B92B0 */ lwc1 $f11, %lo(D_800E92B0)($at) +/* 0C0518 800BF918 C42A92B4 */ lwc1 $f10, %lo(D_800E92B4)($at) /* 0C051C 800BF91C 46000221 */ cvt.d.s $f8, $f0 /* 0C0520 800BF920 462A4402 */ mul.d $f16, $f8, $f10 /* 0C0524 800BF924 240C0001 */ li $t4, 1 @@ -467,10 +468,12 @@ glabel func_800BF634 /* 0C08C4 800BFCC4 E4840004 */ swc1 $f4, 4($a0) /* 0C08C8 800BFCC8 E4880028 */ swc1 $f8, 0x28($a0) /* 0C08CC 800BFCCC 8DCE0300 */ lw $t6, %lo(osTvType)($t6) -/* 0C08D0 800BFCD0 3C01800F */ lui $at, 0x800f +# Used to access D_800E92C0 and D_800E92C4. +/* 0C08D0 800BFCD0 3C01800F */ lui $at, %hi(D_800E92C0) # $at, 0x800f /* 0C08D4 800BFCD4 15C0002B */ bnez $t6, .L800BFD84 /* 0C08D8 800BFCD8 00000000 */ nop -/* 0C08DC 800BFCDC 3C01800F */ lui $at, %hi(D_800E92BC) # $at, 0x800f +# Used to access D_800E92B8 and D_800E92BC. +/* 0C08DC 800BFCDC 3C01800F */ lui $at, %hi(D_800E92B8) # $at, 0x800f /* 0C08E0 800BFCE0 C48A0028 */ lwc1 $f10, 0x28($a0) /* 0C08E4 800BFCE4 C42592B8 */ lwc1 $f5, %lo(D_800E92B8)($at) /* 0C08E8 800BFCE8 C42492BC */ lwc1 $f4, %lo(D_800E92BC)($at) @@ -491,7 +494,7 @@ glabel func_800BF634 /* 0C0924 800BFD24 44804000 */ mtc1 $zero, $f8 /* 0C0928 800BFD28 24180001 */ li $t8, 1 /* 0C092C 800BFD2C 46283201 */ sub.d $f8, $f6, $f8 -/* 0C0930 800BFD30 3C018000 */ lui $at, %hi(D_7FFF92C4) # $at, 0x8000 +/* 0C0930 800BFD30 3C018000 */ lui $at, 0x8000 /* 0C0934 800BFD34 44D8F800 */ ctc1 $t8, $31 /* 0C0938 800BFD38 00000000 */ nop /* 0C093C 800BFD3C 46204224 */ cvt.w.d $f8, $f8 @@ -517,8 +520,8 @@ glabel func_800BF634 /* 0C0980 800BFD80 AC98001C */ sw $t8, 0x1c($a0) .L800BFD84: /* 0C0984 800BFD84 C48A0028 */ lwc1 $f10, 0x28($a0) -/* 0C0988 800BFD88 C42592C0 */ lwc1 $f5, %lo(D_7FFF92C0)($at) -/* 0C098C 800BFD8C C42492C4 */ lwc1 $f4, %lo(D_7FFF92C4)($at) +/* 0C0988 800BFD88 C42592C0 */ lwc1 $f5, %lo(D_800E92C0)($at) +/* 0C098C 800BFD8C C42492C4 */ lwc1 $f4, %lo(D_800E92C4)($at) /* 0C0990 800BFD90 460054A1 */ cvt.d.s $f18, $f10 /* 0C0994 800BFD94 46249182 */ mul.d $f6, $f18, $f4 /* 0C0998 800BFD98 24080001 */ li $t0, 1 diff --git a/asm/non_matchings/unknown_0B8920/func_800C05C8.s b/asm/non_matchings/unknown_0B8920/func_800C05C8.s index c83d1c74..ea38afa7 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C05C8.s +++ b/asm/non_matchings/unknown_0B8920/func_800C05C8.s @@ -10,10 +10,10 @@ glabel func_800C05C8 /* 0C11E8 800C05E8 AFBF001C */ sw $ra, 0x1c($sp) /* 0C11EC 800C05EC 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 /* 0C11F0 800C05F0 8DEF0300 */ lw $t7, %lo(osTvType)($t7) -/* 0C11F4 800C05F4 3C01800F */ lui $at, 0x800f +/* 0C11F4 800C05F4 3C01800F */ lui $at, %hi(D_800E930C) # $at, 0x800f /* 0C11F8 800C05F8 15E00008 */ bnez $t7, .L800C061C /* 0C11FC 800C05FC 00000000 */ nop -/* 0C1200 800C0600 3C01800F */ lui $at, %hi(D_800E930C) # $at, 0x800f +/* 0C1200 800C0600 3C01800F */ lui $at, %hi(D_800E9308) # $at, 0x800f /* 0C1204 800C0604 C42C9308 */ lwc1 $f12, %lo(D_800E9308)($at) /* 0C1208 800C0608 0C019FC8 */ jal func_80067F20 /* 0C120C 800C060C AFA60028 */ sw $a2, 0x28($sp) diff --git a/asm/non_matchings/unknown_0B8920/func_800C0780.s b/asm/non_matchings/unknown_0B8920/func_800C0780.s index 3bd86706..cdaf0cd9 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C0780.s +++ b/asm/non_matchings/unknown_0B8920/func_800C0780.s @@ -1,6 +1,6 @@ glabel func_800C0780 /* 0C1380 800C0780 908E0000 */ lbu $t6, ($a0) -/* 0C1384 800C0784 3C018013 */ lui $at, 0x8013 +/* 0C1384 800C0784 3C018013 */ lui $at, %hi(D_8012A750) # $at, 0x8013 /* 0C1388 800C0788 31CF0080 */ andi $t7, $t6, 0x80 /* 0C138C 800C078C 11E00015 */ beqz $t7, .L800C07E4 /* 0C1390 800C0790 24080001 */ li $t0, 1 @@ -22,7 +22,7 @@ glabel func_800C0780 .L800C07D0: /* 0C13D0 800C07D0 00000000 */ nop /* 0C13D4 800C07D4 460A3483 */ div.s $f18, $f6, $f10 -/* 0C13D8 800C07D8 3C018013 */ lui $at, %hi(D_8012A750) # $at, 0x8013 +/* 0C13D8 800C07D8 3C018013 */ lui $at, %hi(D_8012A754) # $at, 0x8013 /* 0C13DC 800C07DC 10000012 */ b .L800C0828 /* 0C13E0 800C07E0 E432A754 */ swc1 $f18, %lo(D_8012A754)($at) .L800C07E4: diff --git a/data/unknown_043920.rodata.s b/data/unknown_043920.rodata.s index 311560b3..7623e2fb 100644 --- a/data/unknown_043920.rodata.s +++ b/data/unknown_043920.rodata.s @@ -1118,6 +1118,8 @@ glabel D_800E69A4 glabel D_800E69A8 .word 0x3CA3D70A + +glabel D_800E69AC .word 0xBCA3D70A glabel D_800E69B0 diff --git a/data/unknown_080500.rodata.s b/data/unknown_080500.rodata.s index 20a633da..9f729915 100644 --- a/data/unknown_080500.rodata.s +++ b/data/unknown_080500.rodata.s @@ -165,6 +165,7 @@ glabel D_800E8208 .aligned_text "OK?" +glabel D_800E820C .aligned_text "~" glabel D_800E8210 @@ -302,6 +303,8 @@ glabel D_800E83AC glabel D_800E83B0 .word 0x3F2B851F + +glabel D_800E83B4 .word 0x40351EB8 glabel D_800E83B8 diff --git a/data/unknown_0B8920.rodata.s b/data/unknown_0B8920.rodata.s index 42b113a4..bfa884c6 100644 --- a/data/unknown_0B8920.rodata.s +++ b/data/unknown_0B8920.rodata.s @@ -24,7 +24,11 @@ glabel D_800E92A8 glabel D_800E92AC .word 0x47AE147B + +glabel D_800E92B0 .word 0x40D11111 + +glabel D_800E92B4 .word 0x47AE147B glabel D_800E92B8 @@ -32,7 +36,11 @@ glabel D_800E92B8 glabel D_800E92BC .word 0x47AE147B + +glabel D_800E92C0 .word 0x40D11111 + +glabel D_800E92C4 .word 0x47AE147B .word 0x00000000 .word 0x00000000 diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 946725fb..71c775ed 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -88,10 +88,9 @@ s16 D_800DC820[16] = { s8 D_800DC840[8] = { 9, 1, 2, 3, 4, 5, 7, 0 }; s8 D_800DC848 = 0; -s32 D_800DC84C = 0xFF401000; // Currently unknown, might be a different type. - -s32 D_800DC850 = 0x1040FF00; // Currently unknown, might be a different type. -s32 D_800DC854 = 0x10FF4000; // Currently unknown, might be a different type. +s32 D_800DC84C[3] = { // Currently unknown, might be a different type. + 0xFF401000, 0x1040FF00, 0x10FF4000 +}; s32 D_800DC858 = 0; // Currently unknown, might be a different type. s32 D_800DC85C = 0x0028FFFF; // Currently unknown, might be a different type. diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py index be23e102..9f4459ec 100644 --- a/tools/python/find_glabels.py +++ b/tools/python/find_glabels.py @@ -16,7 +16,7 @@ IGNORE_GLABELS = ['D_800E389E', 'D_801264A1', 'D_800E1B84'] def _find_glabels(asm): glabels = [] for file in FileUtil.get_filenames_from_directory_recursive('.', '.s'): - #''' + ''' contents = FileUtil.get_text_from_file(file) matches = re.findall(GLABEL_REGEX, contents) for match in matches: @@ -24,8 +24,7 @@ def _find_glabels(asm): 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[15], 16) # lower immediate of the glabel - if glabel_lower < 0: - glabel_lower = (-glabel_lower ^ 0xFFFF) + 1 + glabel_lower &= 0xFFFF) if glabel_lower & 0x8000: glabel_upper -= 1 glabel = 'D_%08X' % (glabel_upper << 16 | glabel_lower) diff --git a/undefined_syms.txt b/undefined_syms.txt index efb17f94..f18c5e90 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -12,10 +12,6 @@ D_3B9A0001 = 0x3B9A0001; D_3FC069AC = 0x3FC069AC; D_46FF9630 = 0x46FF9630; D_57410001 = 0x57410001; -D_7FFF92B0 = 0x7FFF92B0; -D_7FFF92B4 = 0x7FFF92B4; -D_7FFF92C0 = 0x7FFF92C0; -D_7FFF92C4 = 0x7FFF92C4; D_80000004 = 0x80000004; D_80000008 = 0x80000008; D_8000000C = 0x8000000C; @@ -1447,6 +1443,7 @@ D_800E6968 = 0x800E6968; D_800E69A0 = 0x800E69A0; D_800E69A4 = 0x800E69A4; D_800E69A8 = 0x800E69A8; +D_800E69AC = 0x800E69AC; D_800E69B0 = 0x800E69B0; D_800E69B8 = 0x800E69B8; D_800E69BC = 0x800E69BC; @@ -1592,6 +1589,7 @@ D_800E7B08 = 0x800E7B08; D_800E7B0C = 0x800E7B0C; D_800E7C90 = 0x800E7C90; D_800E8208 = 0x800E8208; +D_800E820C = 0x800E820C; D_800E8210 = 0x800E8210; D_800E8214 = 0x800E8214; D_800E8218 = 0x800E8218; @@ -1615,6 +1613,7 @@ D_800E83A4 = 0x800E83A4; D_800E83A8 = 0x800E83A8; D_800E83AC = 0x800E83AC; D_800E83B0 = 0x800E83B0; +D_800E83B4 = 0x800E83B4; D_800E83B8 = 0x800E83B8; D_800E83E0 = 0x800E83E0; D_800E8400 = 0x800E8400; @@ -1773,8 +1772,12 @@ D_800E92A0 = 0x800E92A0; D_800E92A4 = 0x800E92A4; D_800E92A8 = 0x800E92A8; D_800E92AC = 0x800E92AC; +D_800E92B0 = 0x800E92B0; +D_800E92B4 = 0x800E92B4; D_800E92B8 = 0x800E92B8; D_800E92BC = 0x800E92BC; +D_800E92C0 = 0x800E92C0; +D_800E92C4 = 0x800E92C4; D_800E92D0 = 0x800E92D0; D_800E92EC = 0x800E92EC; D_800E9308 = 0x800E9308; @@ -3001,7 +3004,6 @@ D_A4800018 = 0xA4800018; D_A5000508 = 0xA5000508; D_B0000574 = 0xB0000574; D_B0000578 = 0xB0000578; -D_FAFFA07C = 0xFAFFA07C; D_FF7F0001 = 0xFF7F0001; D_FFFDFFFB = 0xFFFDFFFB; D_FFFF0028 = 0xFFFF0028;