From 5b8cc80e2a38a90d38834f9b8f5ed60d0c17bcec Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 29 Nov 2020 01:42:43 -0500 Subject: [PATCH] More symbol insns --- asm/nonmatchings/code_6e40_len_500/render_curtains.s | 8 ++++---- asm/nonmatchings/code_7bb60_len_41b0/func_800E4AD8.s | 4 ++-- asm/nonmatchings/code_7bb60_len_41b0/func_800E4B40.s | 4 ++-- asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s | 4 ++-- asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s | 4 ++-- asm/nonmatchings/code_e79b0_len_1920/start_child_script.s | 4 ++-- tools/n64splat | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/asm/nonmatchings/code_6e40_len_500/render_curtains.s b/asm/nonmatchings/code_6e40_len_500/render_curtains.s index d3c59fb917..e2bee17875 100644 --- a/asm/nonmatchings/code_6e40_len_500/render_curtains.s +++ b/asm/nonmatchings/code_6e40_len_500/render_curtains.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel render_curtains -/* 6E80 8002BA80 3C01800A */ lui $at, 0x800a -/* 6E84 8002BA84 C420BA94 */ lwc1 $f0, -0x456c($at) +/* 6E80 8002BA80 3C01800A */ lui $at, %hi(gCurtainScaleGoal) +/* 6E84 8002BA84 C420BA94 */ lwc1 $f0, %lo(gCurtainScaleGoal)($at) /* 6E88 8002BA88 27BDFF78 */ addiu $sp, $sp, -0x88 /* 6E8C 8002BA8C AFB20068 */ sw $s2, 0x68($sp) /* 6E90 8002BA90 3C12800A */ lui $s2, %hi(gCurtainScale) @@ -33,8 +33,8 @@ glabel render_curtains .L8002BAF0: /* 6EF0 8002BAF0 3C13800A */ lui $s3, %hi(gCurtainFade) /* 6EF4 8002BAF4 2673BA98 */ addiu $s3, $s3, %lo(gCurtainFade) -/* 6EF8 8002BAF8 3C01800A */ lui $at, 0x800a -/* 6EFC 8002BAFC C420BA9C */ lwc1 $f0, -0x4564($at) +/* 6EF8 8002BAF8 3C01800A */ lui $at, %hi(gCurtainFadeGoal) +/* 6EFC 8002BAFC C420BA9C */ lwc1 $f0, %lo(gCurtainFadeGoal)($at) /* 6F00 8002BB00 C6640000 */ lwc1 $f4, ($s3) /* 6F04 8002BB04 46040032 */ c.eq.s $f0, $f4 /* 6F08 8002BB08 00000000 */ nop diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4AD8.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4AD8.s index 3564524a0a..3aa4406928 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4AD8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4AD8.s @@ -4,8 +4,8 @@ glabel func_800E4AD8 /* 7DF88 800E4AD8 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 7DF8C 800E4ADC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 7DF90 800E4AE0 3C018011 */ lui $at, 0x8011 -/* 7DF94 800E4AE4 C422F070 */ lwc1 $f2, -0xf90($at) +/* 7DF90 800E4AE0 3C018011 */ lui $at, %hi(gPlayerStatus+0xA8) +/* 7DF94 800E4AE4 C422F070 */ lwc1 $f2, %lo(gPlayerStatus+0xA8)($at) /* 7DF98 800E4AE8 3C0142B4 */ lui $at, 0x42b4 /* 7DF9C 800E4AEC 44810000 */ mtc1 $at, $f0 /* 7DFA0 800E4AF0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4B40.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4B40.s index 9b0fb269cc..6dc0ec0237 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4B40.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4B40.s @@ -4,8 +4,8 @@ glabel func_800E4B40 /* 7DFF0 800E4B40 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 7DFF4 800E4B44 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 7DFF8 800E4B48 3C018011 */ lui $at, 0x8011 -/* 7DFFC 800E4B4C C420F070 */ lwc1 $f0, -0xf90($at) +/* 7DFF8 800E4B48 3C018011 */ lui $at, %hi(gPlayerStatus+0xA8) +/* 7DFFC 800E4B4C C420F070 */ lwc1 $f0, %lo(gPlayerStatus+0xA8)($at) /* 7E000 800E4B50 3C0142B4 */ lui $at, 0x42b4 /* 7E004 800E4B54 44811000 */ mtc1 $at, $f2 /* 7E008 800E4B58 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s index af32c0232e..7e7871fd7e 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s @@ -4,8 +4,8 @@ glabel func_800E5348 /* 7E7F8 800E5348 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 7E7FC 800E534C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 7E800 800E5350 3C018011 */ lui $at, 0x8011 -/* 7E804 800E5354 C42EF04C */ lwc1 $f14, -0xfb4($at) +/* 7E800 800E5350 3C018011 */ lui $at, %hi(gPlayerStatus+0x84) +/* 7E804 800E5354 C42EF04C */ lwc1 $f14, %lo(gPlayerStatus+0x84)($at) /* 7E808 800E5358 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7E80C 800E535C AFBF0010 */ sw $ra, 0x10($sp) /* 7E810 800E5360 00031080 */ sll $v0, $v1, 2 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s index a59544f132..1583bbac4d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_800E546C -/* 7E91C 800E546C 3C018011 */ lui $at, 0x8011 -/* 7E920 800E5470 C424F070 */ lwc1 $f4, -0xf90($at) +/* 7E91C 800E546C 3C018011 */ lui $at, %hi(gPlayerStatus+0xA8) +/* 7E920 800E5470 C424F070 */ lwc1 $f4, %lo(gPlayerStatus+0xA8)($at) /* 7E924 800E5474 3C0142B4 */ lui $at, 0x42b4 /* 7E928 800E5478 44810000 */ mtc1 $at, $f0 /* 7E92C 800E547C 44801000 */ mtc1 $zero, $f2 diff --git a/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s b/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s index f698e69eb0..fcad2f73b6 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s @@ -84,8 +84,8 @@ glabel start_child_script /* E829C 802C38EC AE000160 */ sw $zero, 0x160($s0) /* E82A0 802C38F0 A2020004 */ sb $v0, 4($s0) /* E82A4 802C38F4 8E22013C */ lw $v0, 0x13c($s1) -/* E82A8 802C38F8 3C01802E */ lui $at, 0x802e -/* E82AC 802C38FC C4209CA8 */ lwc1 $f0, -0x6358($at) +/* E82A8 802C38F8 3C01802E */ lui $at, %hi(gGlobalTimeSpace) +/* E82AC 802C38FC C4209CA8 */ lwc1 $f0, %lo(gGlobalTimeSpace)($at) /* E82B0 802C3900 0200202D */ daddu $a0, $s0, $zero /* E82B4 802C3904 AE02013C */ sw $v0, 0x13c($s0) /* E82B8 802C3908 8E220140 */ lw $v0, 0x140($s1) diff --git a/tools/n64splat b/tools/n64splat index 3d0b7fc88d..5988a7e337 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 3d0b7fc88dbd26ffb45aa5a73640d5e8e3d8ed4b +Subproject commit 5988a7e337a7838774d88787f6316b61c8023d31