alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comment updates

Browse Source
This commit is contained in:
Karkat
2017-08-08 21:35:18 -04:00
parent 3fef7c61b4
commit 4e0992934e
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
LTTP_RND_GeneralBugfixes.asm
View File

@@ -50,7 +50,7 @@ dl #$20170726
!SRAM_SINK = "$7EF41E" ; <- change this !SRAM_SINK = "$7EF41E" ; <- change this
!FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file !FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file
;$7EF41A[w] - Programmable Item #1 ;$7EF41A[w] - Programmable Item #1
;$7EF41C[w] - Programmable Item #3 ;$7EF41C[w] - Programmable Item #2
;$7EF41E[w] - Programmable Item #3 ;$7EF41E[w] - Programmable Item #3
;$7EF420 - $7EF44F - Stat Tracking Bank 1 ;$7EF420 - $7EF44F - Stat Tracking Bank 1
;$7EF450 - $7EF45F - RNG Item (Single) Flags ;$7EF450 - $7EF45F - RNG Item (Single) Flags
@@ -217,18 +217,18 @@ warnpc $AF8401
;bank $3F reserved for internal debugging ;bank $3F reserved for internal debugging
;$7F5700 - $7F57FF reserved for downstream use ;$7F5700 - $7F57FF reserved for downstream use
;================================================================================ ;================================================================================
org $0080DC ; <- 0xDC - Bank00.asm:179 - Kill Music ;org $0080DC ; <- 0xDC - Bank00.asm:179 - Kill Music
;db #$A9, #$00, #$EA ;db #$A9, #$00, #$EA
;LDA.b #$00 : NOP ;LDA.b #$00 : NOP
;================================================================================ ;================================================================================
org $0AC53E ; <- 5453E - Bank0A.asm:1103 - (LDA $0AC51F, X) - i have no idea what this is for anymore ;org $0AC53E ; <- 5453E - Bank0A.asm:1103 - (LDA $0AC51F, X) - i have no idea what this is for anymore
;LDA.b #$7F ;LDA.b #$7F
;NOP #2 ;NOP #2
;================================================================================ ;================================================================================
;org $05DF8B ; <- 2DF8B - Bank05.asm : 2483 ;org $05DF8B ; <- 2DF8B - Bank05.asm : 2483
;AND.w #$0100 ; allow Sprite_DrawMultiple to access lower half of sprite tiles ;AND.w #$0100 ; allow Sprite_DrawMultiple to access lower half of sprite tiles
;================================================================================ ;================================================================================
;org $0DF8F1 ; this is required for the X-indicator in the HUD ;org $0DF8F1 ; this is required for the X-indicator in the HUD except not anymore obviously
; ;
;;red pendant ;;red pendant
;db $2B, $31, $2C, $31, $3D, $31, $2E, $31 ;db $2B, $31, $2C, $31, $3D, $31, $2E, $31

13
inventory.asm
View File

@@ -242,7 +242,7 @@ AddInventory:
CMP.w #271 : BNE + : BRL .shop : + ; villiage of outcasts shop, lumberjack shop, lake hylia shop, dark world magic shop CMP.w #271 : BNE + : BRL .shop : + ; villiage of outcasts shop, lumberjack shop, lake hylia shop, dark world magic shop
CMP.w #272 : BNE + : BRL .shop : + ; red shield shop CMP.w #272 : BNE + : BRL .shop : + ; red shield shop
CMP.w #284 : BNE + : BRL .shop : + ; bomb shop CMP.w #284 : BNE + : BRL .shop : + ; bomb shop
;CMP.w #265 : BNE + : BRL .shop : + ; potion shop - commented this out because it's easier to just block potion refills ;CMP.w #265 : BNE + : BRL .shop : + ; potion shop - commented this out because it's easier to just block potion refills because this one interferes with the powder item being counted
;CMP.w #271 : BNE + : BRL .shop : + ; lake hylia shop ;CMP.w #271 : BNE + : BRL .shop : + ; lake hylia shop
CMP.w #287 : BNE + : BRL .shop : + ; kakariko shop CMP.w #287 : BNE + : BRL .shop : + ; kakariko shop
CMP.w #255 : BNE + : BRL .shop : + ; light world death mountain shop CMP.w #255 : BNE + : BRL .shop : + ; light world death mountain shop
@@ -257,12 +257,12 @@ AddInventory:
LDA $1B : BNE + : BRL .fullItemCounts : + LDA $1B : BNE + : BRL .fullItemCounts : +
; ==BEGIN INDOOR-ONLY SECTION ; ==BEGIN INDOOR-ONLY SECTION
REP #$20 ; Set 16-bit Accumulator ;REP #$20 ; Set 16-bit Accumulator
LDA $A0 ; load room ID ;LDA $A0 ; load room ID
CMP.w #$0010 : BNE + ; Ganon Fall Room ;CMP.w #$0010 : BNE + ; Ganon Fall Room - I think this got taken out
;!SHAME_CHEST = "$7EF416" ; ---s ---- ;!SHAME_CHEST = "$7EF416" ; ---s ----
LDA !SHAME_CHEST : ORA.w #$0010 : STA !SHAME_CHEST ;LDA !SHAME_CHEST : ORA.w #$0010 : STA !SHAME_CHEST
+ ;+
SEP #$20 ; Set 8-bit Accumulator SEP #$20 ; Set 8-bit Accumulator
LDA $040C ; get dungeon id LDA $040C ; get dungeon id
@@ -738,6 +738,7 @@ RTL
; GetWitchLootOAMTableIndex ; GetWitchLootOAMTableIndex
; in: A - Loot ID ; in: A - Loot ID
; out: A - Loot OAM Table Index ; out: A - Loot OAM Table Index
; check if this is even still referenced anywhere
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
GetWitchLootOAMTableIndex: GetWitchLootOAMTableIndex:
PHX PHX

2
utilities.asm
View File

@@ -282,7 +282,7 @@ RTS
; in: A - Loot ID ; in: A - Loot ID
; out: A - OAM Slots Taken ; out: A - OAM Slots Taken
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; This wastes two OAM slots if you don't want a shadow - fix later ; This wastes two OAM slots if you don't want a shadow - fix later - I wrote "fix later" over a year ago and it's still not fixed (Aug 6, 2017)
;-------------------------------------------------------------------------------- 2084B8 ;-------------------------------------------------------------------------------- 2084B8
!SPRITE_OAM = "$7EC025" !SPRITE_OAM = "$7EC025"
!SKIP_EOR = "$7F5008" !SKIP_EOR = "$7F5008"