From 84b9644ecfd0340bae4768cc908db4bf84ba2a34 Mon Sep 17 00:00:00 2001 From: sporchia Date: Wed, 7 Feb 2018 20:11:37 -0500 Subject: [PATCH] set location for ShopContentsTable fixed msu label update --- msu.asm | 6 +++--- tables.asm | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/msu.asm b/msu.asm index d49dada..9430755 100644 --- a/msu.asm +++ b/msu.asm @@ -3,7 +3,7 @@ ; MSU-1 Enhanced Audio Patch ; Zelda no Densetsu - Kamigami no Triforce ; Modified for VT Randomizer -; +; ; Author: qwertymodo ; ; Free space used: 0x77DDD-0x77F8A @@ -123,7 +123,7 @@ spc_fallback: STZ !REG_CURRENT_VOLUME STZ !REG_MSU_VOLUME JML spc_continue - + do_fade: LDA !REG_CURRENT_VOLUME CMP !REG_TARGET_VOLUME @@ -186,7 +186,7 @@ load_track: STX !REG_MSU_TRACK_LO STZ !REG_MSU_TRACK_HI STZ !REG_MSU_CONTROL - LDA.l track_list,x + LDA.l MSUTrackList,x STA !REG_MSU_LOAD_FLAG STX !REG_CURRENT_MSU_TRACK JML spc_continue diff --git a/tables.asm b/tables.asm index 6c75632..a0c8414 100644 --- a/tables.asm +++ b/tables.asm @@ -1409,10 +1409,11 @@ db $FF, $FF, $FF, $FF ;shop_config - t--- --qq ; t - 0=Shop - 1=TakeAny ; qq - # of items for sale -org $30C800 ; PC 0x184800 - 0x184FFF +org $30C800 ; PC 0x184800 - 0x18487F - max 16 shops ShopTable: ;db [id][roomID-low][roomID-high][doorID][zero][shop_config][pad][pad] db $FF, $FF, $FF, $FF, $00, $03, $00, $00 +org $30C880 ; PC 0x184880 - 0x184FFF - max 240 entries ShopContentsTable: ;db [id][item][price-low][price-high][max][repl_id][repl_price-low][repl_price-high] db $FF, $AF, $50, $00, $00, $FF, $00, $00