alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

free item text more configuration

Browse Source
This commit is contained in:
sporchia
2019-08-16 21:44:47 -04:00
parent c2d5f9d846
commit 7121992881
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dialog.asm
View File

@@ -140,29 +140,32 @@ FreeDungeonItemNotice:
LDA.l FreeItemText : BNE + : BRL .skip : + LDA.l FreeItemText : BNE + : BRL .skip : +
LDA #$00 : STA $7F5010 ; initialize scratch LDA #$00 : STA $7F5010 ; initialize scratch
LDA !ITEM_TEMPORARY LDA.l FreeItemText : AND.b #$01 : CMP.b #$01 : BNE + ; show message for general small key
CMP.b #$24 : BNE + ; general small key LDA !ITEM_TEMPORARY : CMP.b #$24 : BNE + ; general small key
%CopyDialog(Notice_SmallKeyOf) %CopyDialog(Notice_SmallKeyOf)
LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
%CopyDialog(Notice_Self) %CopyDialog(Notice_Self)
BRL .done BRL .done
+ : CMP.b #$25 : BNE + ; general compass + : LDA.l FreeItemText : AND.b #$02 : CMP.b #$02 : BNE + ; show message for general compass
LDA !ITEM_TEMPORARY : CMP.b #$25 : BNE + ; general compass
%CopyDialog(Notice_CompassOf) %CopyDialog(Notice_CompassOf)
LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
%CopyDialog(Notice_Self) %CopyDialog(Notice_Self)
BRL .done BRL .done
+ : CMP.b #$33 : BNE + ; general map + : LDA.l FreeItemText : AND.b #$04 : CMP.b #$04 : BNE + ; show message for general map
LDA !ITEM_TEMPORARY : CMP.b #$33 : BNE + ; general map
%CopyDialog(Notice_MapOf) %CopyDialog(Notice_MapOf)
LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
%CopyDialog(Notice_Self) %CopyDialog(Notice_Self)
BRL .done BRL .done
+ : CMP.b #$32 : BNE + ; general big key + : LDA.l FreeItemText : AND.b #$08 : CMP.b #$08 : BNE + ; show message for general big key
LDA !ITEM_TEMPORARY : CMP.b #$32 : BNE + ; general big key
%CopyDialog(Notice_BigKeyOf) %CopyDialog(Notice_BigKeyOf)
LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
%CopyDialog(Notice_Self) %CopyDialog(Notice_Self)
BRL .done BRL .done
+ +
AND.b #$F0 ; looking at high bits only LDA !ITEM_TEMPORARY : AND.b #$F0 ; looking at high bits only
CMP.b #$70 : BNE + ; map of... CMP.b #$70 : BNE + ; map of...
%CopyDialog(Notice_MapOf) %CopyDialog(Notice_MapOf)
BRL .dungeon BRL .dungeon

8
tables.asm
View File

@@ -788,7 +788,13 @@ db #$02 ; #00 = Never Locked - #$01 = Locked During Escape (default) - #$02 = Lo
;================================================================================ ;================================================================================
org $30816A ; PC 0x18016A org $30816A ; PC 0x18016A
FreeItemText: FreeItemText:
db #$00 ; #00 = Off (default) - #$01 = On db #$00 ; #00 = Off (default)
;---o bmcs
;o - enabled for outside dungeon items
;b - enabled for inside big key items
;m - enabled for inside map items
;c - enabled for inside compass items
;s - enabled for inside small key items
;================================================================================ ;================================================================================
org $30816B ; PC 0x18016B - 0x18016D org $30816B ; PC 0x18016B - 0x18016D
HardModeExclusionCaneOfByrnaUsage: HardModeExclusionCaneOfByrnaUsage: