Rename house_tag.asm to custom_tag.asm, move MinishTag
This commit is contained in:
@@ -39,8 +39,9 @@ print "End of object_handler.asm ", pc
|
||||
; Tag: Holes8
|
||||
incsrc "Dungeons/together_warp_tag.asm"
|
||||
|
||||
; Tag: Holes7
|
||||
incsrc "Dungeons/house_tag.asm"
|
||||
; Custom Tag: Holes7
|
||||
; Minish Tag: Holes5
|
||||
incsrc "Dungeons/custom_tag.asm"
|
||||
|
||||
; Tag: Holes0
|
||||
incsrc "Dungeons/floor_puzzle.asm"
|
||||
@@ -56,26 +57,6 @@ incsrc "Collision/GlobalCollisionTables.asm"
|
||||
|
||||
pullpc ; Bank 0x33
|
||||
|
||||
RoomTag_MinishShutterDoor:
|
||||
{
|
||||
LDA.w $02B2 : CMP.b #$05 : BNE .no_minish
|
||||
REP #$30
|
||||
|
||||
LDX.w #$0000 : CPX.w $0468 : BEQ .exit
|
||||
STZ.w $0468
|
||||
STZ.w $068E : STZ.w $0690
|
||||
|
||||
SEP #$30
|
||||
|
||||
LDA.b #$1B : STA.w $012F
|
||||
LDA.b #$05 : STA.b $11
|
||||
|
||||
.exit
|
||||
SEP #$30
|
||||
.no_minish
|
||||
JML $01CC5A ; RoomTag_TriggerHoles return
|
||||
}
|
||||
|
||||
NewWaterOverlayData:
|
||||
; Horizontal
|
||||
db $1B, $A1, $C9 ; 0x0C9: Flood water (medium) ⇲ | { 06, 28 } | Size: 0D
|
||||
@@ -94,10 +75,6 @@ print "End of dungeons.asm ", pc
|
||||
|
||||
pushpc
|
||||
|
||||
org $01CC10
|
||||
RoomTag_Holes5:
|
||||
JML RoomTag_MinishShutterDoor
|
||||
|
||||
; RoomTag_GetHeartForPrize
|
||||
; Swap LW/DW check on spawn falling prize
|
||||
org $01C71B
|
||||
|
||||
Reference in New Issue
Block a user