From e8b6d07d9d130116c089ceacd2681c3afb2ca664 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 10 Jun 2020 18:00:08 +1000 Subject: [PATCH] Fix incorrect pointers which caused a crash when equipping the Falcon 2 scope on a shifted ROM --- src/game/game_0dcdb0.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 82ca6dece..94c6b8a91 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -561,8 +561,8 @@ glabel func0f0dd2ac /* f0dd550: 27a40084 */ addiu $a0,$sp,0x84 /* f0dd554: 3c0f8008 */ lui $t7,%hi(var8007fafc) /* f0dd558: 8deffafc */ lw $t7,%lo(var8007fafc)($t7) -/* f0dd55c: 3c078008 */ lui $a3,%hi(var8007dea8) -/* f0dd560: 8ce7fb00 */ lw $a3,%lo(var7f1afb00)($a3) +/* f0dd55c: 3c078008 */ lui $a3,%hi(var8007fb00) +/* f0dd560: 8ce7fb00 */ lw $a3,%lo(var8007fb00)($a3) /* f0dd564: 27a4006c */ addiu $a0,$sp,0x6c /* f0dd568: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd56c: 27a60084 */ addiu $a2,$sp,0x84 @@ -684,9 +684,9 @@ glabel func0f0dd2ac /* f0dd73c: 3c057f1b */ lui $a1,%hi(var7f1ade98) /* f0dd740: 3c067f1b */ lui $a2,%hi(var7f1adea4) /* f0dd744: 460054a1 */ cvt.d.s $f18,$f10 -/* f0dd748: 3c077f1b */ lui $a3,%hi(var7f1afb00) +/* f0dd748: 3c077f1b */ lui $a3,%hi(var7f1adea8) /* f0dd74c: afa200c0 */ sw $v0,0xc0($sp) -/* f0dd750: 24e7dea8 */ addiu $a3,$a3,%lo(var8007dea8) +/* f0dd750: 24e7dea8 */ addiu $a3,$a3,%lo(var7f1adea8) /* f0dd754: f7b20010 */ sdc1 $f18,0x10($sp) /* f0dd758: 24c6dea4 */ addiu $a2,$a2,%lo(var7f1adea4) /* f0dd75c: 24a5de98 */ addiu $a1,$a1,%lo(var7f1ade98) @@ -694,8 +694,8 @@ glabel func0f0dd2ac /* f0dd764: 27a40084 */ addiu $a0,$sp,0x84 /* f0dd768: 3c0e8008 */ lui $t6,%hi(var8007fafc) /* f0dd76c: 8dcefafc */ lw $t6,%lo(var8007fafc)($t6) -/* f0dd770: 3c078008 */ lui $a3,0x8008 -/* f0dd774: 8ce7fb00 */ lw $a3,%lo(var7f1afb00)($a3) +/* f0dd770: 3c078008 */ lui $a3,%hi(var8007fb00) +/* f0dd774: 8ce7fb00 */ lw $a3,%lo(var8007fb00)($a3) /* f0dd778: 27a4006c */ addiu $a0,$sp,0x6c /* f0dd77c: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd780: 27a60084 */ addiu $a2,$sp,0x84