scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename HouseTag to CustomTag, move fixed color fade-in effect

Browse Source
This commit is contained in:
scawful
2024-10-01 17:50:19 -04:00
parent 3c33b015c4
commit d28a6f38af
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Dungeons/dungeons.asm
View File

@@ -9,6 +9,26 @@ org $098823
org $028BE7 org $028BE7
NOP #2 NOP #2
; Fixed color fade-in effect
; TODO: Investigate if this is the best way to fix this.
; Module06_UnderworldLoad
org $028364
{
#_028364: LDA.b #$00 ; Fixed color RGB: #808000
#_028366: STA.b $9C
#_028368: LDA.b #$00
#_02836A: STA.b $9D
#_02836C: LDA.b #$00
#_02836E: STA.b $9E
#_028370: LDA.b #$00
#_028372: STA.l $7EC005
#_028376: STA.l $7EC006
#_02837A: JSL $079A2C ; Link_TuckIntoBed
}
incsrc "Dungeons/enemy_damage.asm" incsrc "Dungeons/enemy_damage.asm"
print "End of enemy_damage.asm ", pc print "End of enemy_damage.asm ", pc
@@ -66,7 +86,7 @@ db $92, $A1, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 24, 28 } | Size: 09
db $A2, $A1, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 24, 28 } | Size: 09 db $A2, $A1, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 24, 28 } | Size: 09
db $C1, $A1, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 28, 0C } | Size: 07 db $C1, $A1, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 28, 0C } | Size: 07
; Vertical ; Vertical
db $A1, $33, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 28, 0C } | Size: 07 db $A1, $33, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 28, 0C } | Size: 07
db $A1, $72, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 28, 1C } | Size: 06 db $A1, $72, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 28, 1C } | Size: 06
db $FF, $FF ; End db $FF, $FF ; End

35
Dungeons/house_tag.asm
View File

@@ -1,26 +1,29 @@
; ========================================================= ; =========================================================
; Room tag to initialize the game without the Uncle sprite. ; Custom Tag
; Provide custom room behavior based on room ID
StoryState = $7C StoryState = $7C
org $01CC18 ; override routine 0x39 "Holes(7)" org $01CC18 ; override routine 0x39 "Holes(7)"
JML HouseTag JML CustomTag
org $01CC5A org $01CC5A
HouseTag_Return: CustomTag_Return:
pullpc pullpc
HouseTag: CustomTag:
{ {
PHX PHX
LDA $7EF3C6 : BNE .game_has_begun LDA $7EF3C6 : BNE .game_has_begun
JSR HouseTag_Main JSR HouseTag_Main
.game_has_begun .game_has_begun
PLX PLX
JML HouseTag_Return JML CustomTag_Return
} }
; ========================================================= ; =========================================================
; Room tag to initialize the game without the Uncle sprite.
HouseTag_Main: HouseTag_Main:
{ {
@@ -106,25 +109,3 @@ print "End of house_tag.asm ", pc
pushpc pushpc
; =========================================================
; Fixed color fade-in effect
; TODO: Investigate if this is the best way to fix this.
; Module06_UnderworldLoad
org $028364
{
#_028364: LDA.b #$00 ; Fixed color RGB: #808000
#_028366: STA.b $9C
#_028368: LDA.b #$00
#_02836A: STA.b $9D
#_02836C: LDA.b #$00
#_02836E: STA.b $9E
#_028370: LDA.b #$00
#_028372: STA.l $7EC005
#_028376: STA.l $7EC006
#_02837A: JSL $079A2C ; Link_TuckIntoBed
}