From e8b85e481518d5e1e3106224791355a81540437c Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 9 Feb 2022 10:06:16 -0700 Subject: [PATCH 1/2] Lowercase item text --- LTTP_RND_GeneralBugfixes.asm | 6 +- itemtext_lower.asm | 113 +++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 itemtext_lower.asm diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 246e736..1f69a2d 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -345,7 +345,11 @@ endif org $328000 Extra_Text_Table: -incsrc itemtext.asm +if !FEATURE_NEW_TEXT + incsrc itemtext_lower.asm +else + incsrc itemtext.asm +endif warnpc $32E000 org $32DFD0 ; PC 0x195FD0 diff --git a/itemtext_lower.asm b/itemtext_lower.asm new file mode 100644 index 0000000..ade3255 --- /dev/null +++ b/itemtext_lower.asm @@ -0,0 +1,113 @@ +org $328000 +; You have found +; the map of +Notice_MapOf: + db $74, $00, $C2, $00, $3E, $00, $44, $00, $FF, $00, $37, $00, $30, $00, $45, $00, $34, $00, $FF, $00, $35, $00, $3E, $00, $44, $00, $3D, $00, $33 + db $75, $00, $43, $00, $37, $00, $34, $00, $FF, $00, $3C, $00, $30, $00, $3F, $00, $FF, $00, $3E, $00, $35 + dw #$7F7F + +; You have found +; the compass of +Notice_CompassOf: + db $74, $00, $C2, $00, $3E, $00, $44, $00, $FF, $00, $37, $00, $30, $00, $45, $00, $34, $00, $FF, $00, $35, $00, $3E, $00, $44, $00, $3D, $00, $33 + db $75, $00, $43, $00, $37, $00, $34, $00, $FF, $00, $32, $00, $3E, $00, $3C, $00, $3F, $00, $30, $00, $42, $00, $42, $00, $FF, $00, $3E, $00, $35 + dw #$7F7F + +; Oh look! it's +; the big key of +Notice_BigKeyOf: + db $74, $00, $B8, $00, $37, $00, $FF, $00, $3B, $00, $3E, $00, $3E, $00, $3A, $00, $C7, $00, $FF, $00, $38, $00, $43, $00, $D8, $00, $42 + db $75, $00, $43, $00, $37, $00, $34, $00, $FF, $00, $31, $00, $38, $00, $36, $00, $FF, $00, $3A, $00, $34, $00, $48, $00, $FF, $00, $3E, $00, $35 + dw #$7F7F + +; this is a +; small key to +Notice_SmallKeyOf: + db $74, $00, $BD, $00, $37, $00, $38, $00, $42, $00, $FF, $00, $38, $00, $42, $00, $FF, $00, $30 + db $75, $00, $42, $00, $3C, $00, $30, $00, $3B, $00, $3B, $00, $FF, $00, $3A, $00, $34, $00, $48, $00, $FF, $00, $43, $00, $3e + dw #$7F7F + +; light world +Notice_LightWorld: + db $76, $00, $B5, $00, $38, $00, $36, $00, $37, $00, $43, $00, $FF, $00, $C0, $00, $3E, $00, $41, $00, $3B, $00, $33 + dw #$7F7F + +; dark world +Notice_DarkWorld: + db $76, $00, $AD, $00, $30, $00, $41, $00, $3A, $00, $FF, $00, $C0, $00, $3E, $00, $41, $00, $3B, $00, $33 + dw #$7F7F + +; Ganons Tower +Notice_GTower: + db $76, $00, $B0, $00, $30, $00, $3D, $00, $3E, $00, $3D, $00, $42, $00, $FF, $00, $BD, $00, $3E, $00, $46, $00, $34, $00, $41 + dw #$7F7F + +; Turtle Rock +Notice_TRock: + db $76, $00, $BD, $00, $44, $00, $41, $00, $43, $00, $3B, $00, $34, $00, $FF, $00, $BB, $00, $3E, $00, $32, $00, $3a + dw #$7F7F + +; Thieves Town +Notice_Thieves: + db $76, $00, $BD, $00, $37, $00, $38, $00, $34, $00, $45, $00, $34, $00, $42, $00, $FF, $00, $BD, $00, $3E, $00, $46, $00, $3d + dw #$7F7F + +; Tower of Hera +Notice_Hera: + db $76, $00, $BD, $00, $3E, $00, $46, $00, $34, $00, $41, $00, $FF, $00, $3E, $00, $35, $00, $FF, $00, $B1, $00, $34, $00, $41, $00, $30 + dw #$7F7F + +; Ice Palace +Notice_Ice: + db $76, $00, $B2, $00, $32, $00, $34, $00, $FF, $00, $B9, $00, $30, $00, $3B, $00, $30, $00, $32, $00, $34 + dw #$7F7F + +; Skull Woods +Notice_Skull: + db $76, $00, $BC, $00, $3A, $00, $44, $00, $3B, $00, $3B, $00, $FF, $00, $C0, $00, $3E, $00, $3E, $00, $33, $00, $42 + dw #$7F7F + +; Misery Mire +Notice_Mire: + db $76, $00, $B6, $00, $38, $00, $42, $00, $34, $00, $41, $00, $48, $00, $FF, $00, $B6, $00, $38, $00, $41, $00, $34 + dw #$7F7F + +; Dark Palace +Notice_PoD: + db $76, $00, $AD, $00, $30, $00, $41, $00, $3A, $00, $FF, $00, $B9, $00, $30, $00, $3B, $00, $30, $00, $32, $00, $34 + dw #$7F7F + +; Swamp Palace +Notice_Swamp: + db $76, $00, $BC, $00, $46, $00, $30, $00, $3C, $00, $3F, $00, $FF, $00, $B9, $00, $30, $00, $3B, $00, $30, $00, $32, $00, $34 + dw #$7F7F + +; Castle Tower +Notice_AgaTower: + db $76, $00, $AC, $00, $30, $00, $42, $00, $43, $00, $3B, $00, $34, $00, $FF, $00, $BD, $00, $3E, $00, $46, $00, $34, $00, $41 + dw #$7F7F + +; Desert Palace +Notice_Desert: + db $76, $00, $AD, $00, $34, $00, $42, $00, $34, $00, $41, $00, $43, $00, $FF, $00, $B9, $00, $30, $00, $3B, $00, $30, $00, $32, $00, $34 + dw #$7F7F + +; Eastern Palace +Notice_Eastern: + db $76, $00, $AE, $00, $30, $00, $42, $00, $43, $00, $34, $00, $41, $00, $3D, $00, $FF, $00, $B9, $00, $30, $00, $3B, $00, $30, $00, $32, $00, $34 + dw #$7F7F + +; Hyrule Castle +Notice_Castle: + db $76, $00, $B1, $00, $48, $00, $41, $00, $44, $00, $3B, $00, $34, $00, $FF, $00, $AC, $00, $30, $00, $42, $00, $43, $00, $3B, $00, $34 + dw #$7F7F + +; Hyrule Castle +Notice_Sewers: + db $76, $00, $B1, $00, $48, $00, $41, $00, $44, $00, $3B, $00, $34, $00, $FF, $00, $AC, $00, $30, $00, $42, $00, $43, $00, $3B, $00, $34 + dw #$7F7F + +; This Dungeon +Notice_Self: + db $76, $00, $43, $00, $37, $00, $38, $00, $42, $00, $FF, $00, $33, $00, $44, $00, $3D, $00, $36, $00, $34, $00, $3E, $00, $3d + dw #$7F7F \ No newline at end of file From 4239e7204e06aca7396e66e75ee9f85052abc515 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 13 Apr 2022 13:30:15 -0600 Subject: [PATCH 2/2] Check Aga2's boss defeat flag instead of pyramid hole New flag on compass mode to indicate maps should be used instead for showing the location --- menu/overworldmap.asm | 6 ++++-- tables.asm | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/menu/overworldmap.asm b/menu/overworldmap.asm index 9bd111a..b937655 100644 --- a/menu/overworldmap.asm +++ b/menu/overworldmap.asm @@ -239,7 +239,7 @@ PHX CLC : BRA .done .checkAga2 - LDA $7EF2DB : AND #$20 : BNE .fail + LDA $7EF01B : AND #$80 : BNE .fail CLC : BRA .done .fail @@ -254,7 +254,9 @@ RTS OverworldMap_CheckForCompass: LDA.l CompassMode : AND #$80 : BEQ .unset ; should I check for compass logic LDA.l CompassMode : AND #$40 : BEQ .set ; compasses aren't shuffled - LDA.l CompassExists, X : BEQ .set ; compass doesn't exits + LDA.l CompassMode : AND #$20 : BNE + + JSR OverworldMap_CheckForMap : BCC .unset : BRA .set + + LDA.l CompassExists, X : BEQ .set ; compass doesn't exits PHX LDA.l MC_SRAM_Offsets, X : TAX ; put compass offset into X LDA !INVENTORY_COMPASS, X : ORA !MAP_OVERLAY, X diff --git a/tables.asm b/tables.asm index 2b70345..b159a60 100644 --- a/tables.asm +++ b/tables.asm @@ -140,7 +140,8 @@ db #$00 ; #$00 = Always On (default) - #$01 = Require Map Item CompassMode: db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count w/Compass - #$02 = Display Dungeon Count Always ; #$8x = Moves prize indicator to a special position if bit on - ; #$4x = Compasses are shuffled and must be obtained to show position if bit on + ; #$4x = Compasses or Maps are shuffled and must be obtained to show position if bit on + ; #$2x = Use Compass for position if bit on, otherwise use Map ;-------------------------------------------------------------------------------- org $30803D ; PC 0x18003D PersistentFloodgate: