fix house tag bug, close keyblock namespace

This commit is contained in:
scawful
2022-12-19 19:13:48 -05:00
parent b7321fbd74
commit 0a7e3ebc54
2 changed files with 9 additions and 16 deletions

View File

@@ -2,13 +2,7 @@
; NEW: Custom Room Tag to initialize the game without the Uncle sprite. ; NEW: Custom Room Tag to initialize the game without the Uncle sprite.
; ;
incsrc "Util/ram.asm" StoryState = $7C
org $008781
UseImplicitRegIndexedLocalJumpTable:
org $05E219
Sprite_ShowMessageUnconditional:
org $01CC18 ; override routine 0x39 "Holes(7)" org $01CC18 ; override routine 0x39 "Holes(7)"
JML HouseTag JML HouseTag
@@ -16,7 +10,7 @@ org $01CC18 ; override routine 0x39 "Holes(7)"
org $01CC5A org $01CC5A
HouseTag_Return: HouseTag_Return:
org $228000 org $238000
HouseTag: HouseTag:
{ {
PHX PHX
@@ -35,7 +29,7 @@ HouseTag_Main:
{ {
LDA StoryState LDA StoryState
JSL UseImplicitRegIndexedLocalJumpTable JSL $008781
dw HouseTag_TelepathicPlea dw HouseTag_TelepathicPlea
dw HouseTag_WakeUpPlayer dw HouseTag_WakeUpPlayer
@@ -56,7 +50,7 @@ HouseTag_TelepathicPlea:
; "Accept our quest, Link!" ; "Accept our quest, Link!"
LDA.b #$1F : LDY.b #$00 LDA.b #$1F : LDY.b #$00
JSL Sprite_ShowMessageUnconditional JSL $05E219
INC.b StoryState INC.b StoryState
RTS RTS
@@ -98,11 +92,9 @@ HouseTag_WakeUpPlayer:
LDA $7EF3C6 : ORA.b #$10 : STA $7EF3C6 LDA $7EF3C6 : ORA.b #$10 : STA $7EF3C6
; Set the game mode to part 2 ; Set the game mode to part 2
; LDA #$02 LDA #$02 : STA $7ef3C5 ; store "part 2"
; STA $7ef3C5 ; store "part 2" LDA #$00 : STA $7ef3CC ; disable telepathic message
; LDA #$00 JSL $00FC41 ; fix monsters
; STA $7ef3CC ; disable telepathic message
; JSL $00FC41 ; fix monsters
RTS RTS
} }

View File

@@ -50,3 +50,4 @@ namespace KeyBlock
; 5E- y mirror ; 5E- y mirror
} ; label Main } ; label Main
} ; namespace KeyBlock } ; namespace KeyBlock
namespace off