From 4f0ea08367b2944121c6c281dcbde077d1e7bad3 Mon Sep 17 00:00:00 2001 From: sporchia Date: Thu, 25 Jan 2018 18:14:20 -0500 Subject: [PATCH] native dungeon items will now have a text box if mode is enabled --- LTTP_RND_GeneralBugfixes.asm | 2 +- dialog.asm | 21 +++++++++++++++++++++ itemtext.asm | 9 +++++++-- tables.asm | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 166753a..55df77a 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF db #$00 ; expand file to 2mb org $1FFFF8 ; <- FFFF8 timestamp rom -db #$20, #$18, #$01, #$23 ; year/month/day +db #$20, #$18, #$01, #$24 ; year/month/day ;================================================================================ diff --git a/dialog.asm b/dialog.asm index 68e7155..ca255a2 100644 --- a/dialog.asm +++ b/dialog.asm @@ -140,6 +140,27 @@ FreeDungeonItemNotice: LDA #$00 : STA $7F5010 ; initialize scratch LDA !ITEM_TEMPORARY + CMP.b #$24 : BNE + ; general small key + %CopyDialog(Notice_SmallKeyOf) + LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER + %CopyDialog(Notice_Self) + BRL .done + + : CMP.b #$25 : BNE + ; general compass + %CopyDialog(Notice_CompassOf) + LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER + %CopyDialog(Notice_Self) + BRL .done + + : CMP.b #$33 : BNE + ; general map + %CopyDialog(Notice_MapOf) + LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER + %CopyDialog(Notice_Self) + BRL .done + + : CMP.b #$32 : BNE + ; general big key + %CopyDialog(Notice_BigKeyOf) + LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER + %CopyDialog(Notice_Self) + BRL .done + + AND.b #$F0 ; looking at high bits only CMP.b #$70 : BNE + ; map of... %CopyDialog(Notice_MapOf) diff --git a/itemtext.asm b/itemtext.asm index d7539e4..f4d32c1 100644 --- a/itemtext.asm +++ b/itemtext.asm @@ -52,7 +52,7 @@ Notice_Thieves: db $76, $00, $BD, $00, $B1, $00, $B2, $00, $AE, $00, $BF, $00, $AE, $00, $BC, $00, $FF, $00, $BD, $00, $B8, $00, $C0, $00, $B7 dw #$7F7F -; Tower of Hera +; Tower of Hera Notice_Hera: db $76, $00, $BD, $00, $B8, $00, $C0, $00, $AE, $00, $BB, $00, $FF, $00, $B8, $00, $AF, $00, $FF, $00, $B1, $00, $AE, $00, $BB, $00, $AA dw #$7F7F @@ -105,4 +105,9 @@ Notice_Castle: ; Hyrule Castle Notice_Sewers: db $76, $00, $B1, $00, $C2, $00, $BB, $00, $BE, $00, $B5, $00, $AE, $00, $FF, $00, $AC, $00, $AA, $00, $BC, $00, $BD, $00, $B5, $00, $AE - dw #$7F7F ; terminate \ No newline at end of file + dw #$7F7F + +; This Dungeon +Notice_Self: + db $76, $00, $BD, $00, $B1, $00, $B2, $00, $BC, $00, $FF, $00, $AD, $00, $BE, $00, $B7, $00, $B0, $00, $AE, $00, $B8, $00, $B7 + dw #$7F7F diff --git a/tables.asm b/tables.asm index 4af2cf9..f3a420c 100644 --- a/tables.asm +++ b/tables.asm @@ -707,7 +707,7 @@ db #$00 ; #00 = Never Locked - #$01 = Locked During Escape (default) ;================================================================================ org $30816A ; PC 0x18016A FreeItemText: -db #$00 ; #00 = Off - #$01 = On (default) +db #$00 ; #00 = Off (default) - #$01 = On ;================================================================================ org $30816B ; PC 0x18016B HardModeExclusionCaneOfByrnaUsage: