alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge pull request #174 from cassidoxa/hera_music

Browse Source 
Fix check for Tower of Hera boss defeated
This commit is contained in:
Lexi Rose
2022-10-25 21:47:11 -05:00
committed by GitHub
parent 0e87fb3bc4 6b2e7a5c34
commit 9cf3cb0601
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
music.asm
View File

@@ -287,6 +287,6 @@ Overworld_MosaicDarkWorldChecks:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; Check if the boss in ToH has been defeated (16-bit accumulator) ; Check if the boss in ToH has been defeated (16-bit accumulator)
CheckHeraBossDefeated: CheckHeraBossDefeated:
LDA $7EF00F : AND #$00FF LDA.l RoomDataWRAM[$07].l : AND #$FF00
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

8
sram.asm
View File

@@ -22,8 +22,14 @@ SaveDataWRAM = $7EF000
; 2 (southwest), and 1 (southeast), which is the same as they are laid out on the screen from ; 2 (southwest), and 1 (southeast), which is the same as they are laid out on the screen from
; left to right, top to bottom. ; left to right, top to bottom.
; ;
; The .l sub-label should be used when the accumulator is in 16-bit mode and we want to
; load both bytes or store to both bytes at once. The .high and .low sub-labels should be used
; when in 8-bit mode and we only want to load or store one byte
;
; Example: We can use RoomDataWRAM[$37].high to read or write the pot key in the first ; Example: We can use RoomDataWRAM[$37].high to read or write the pot key in the first
; floodable room in Swamp Palace ($04) ; floodable room in Swamp Palace (bit $04). To check if a boss has been killed we can
; take the room index for a boss room (e.g. $07 for Tower of Hera) and bitmask $FF00
; like this: RoomDataWRAM[$07].l : AND #$FF00
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; .high Byte: d d d d b k u t ; .high Byte: d d d d b k u t
; .low Byte: s e h c q q q q ; .low Byte: s e h c q q q q