From cc36ccc0b1dbf746a2e87fced1a9a8c1499fbd49 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Sun, 10 Sep 2023 00:55:03 -0400 Subject: [PATCH 01/14] Add time stamp for tossed fighter sword item --- inventory.asm | 3 +-- itemdatatables.asm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/inventory.asm b/inventory.asm index d32baef..259cfcb 100644 --- a/inventory.asm +++ b/inventory.asm @@ -245,10 +245,9 @@ StampItem: LDA.b [Scrap0B] : BNE .skip INC.b Scrap0B : INC.b Scrap0B LDA.b [Scrap0B] : BNE .skip + LDA.l NMIFrames+2 : STA.b [Scrap0B] DEC.b Scrap0B : DEC.b Scrap0B LDA.l NMIFrames : STA.b [Scrap0B] - INC.b Scrap0B : INC.b Scrap0B - LDA.l NMIFrames+2 : STA.b [Scrap0B] .skip SEP #$20 RTS diff --git a/itemdatatables.asm b/itemdatatables.asm index a9f7b45..f296922 100644 --- a/itemdatatables.asm +++ b/itemdatatables.asm @@ -764,7 +764,7 @@ endmacro %InventoryItem($46, $0001, $0000, $0000) ; 46 - 300 rupees %InventoryItem($47, $0001, $0000, $0000) ; 47 - 20 rupees green %InventoryItem($48, $0085, $0000, $0000) ; 48 - Full bottle (good bee) -%InventoryItem($49, $0081, $0000, $0000) ; 49 - Tossed fighter sword +%InventoryItem($49, $0081, SwordTime, $0000) ; 49 - Tossed fighter sword %InventoryItem($4A, $0085, FluteTime, $0000) ; 4A - Active Flute %InventoryItem($4B, $0089, BootsTime, $0000) ; 4B - Boots %InventoryItem($4C, $0015, $0000, CapacityUpgrades) ; 4C - Bomb capacity (50) From 334f721a292f3c38cdee97c3ca05875d752d0161 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Sun, 17 Sep 2023 12:02:54 -0400 Subject: [PATCH 02/14] Don't increment highest mail on final stats prep --- newitems.asm | 2 +- stats.asm | 52 +++++++++++++++++++++------------------------------- 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/newitems.asm b/newitems.asm index a173e04..ad68b13 100644 --- a/newitems.asm +++ b/newitems.asm @@ -869,7 +869,7 @@ HandleBowTracking: ; at this point. LDA.w ItemReceiptMethod : CMP.b #$01 : BEQ + LDX.w CurrentSpriteSlot - LDA.w SpriteMetaData,X : BEQ + + LDA.w SpriteMetaData,X : BEQ .done BRA .done + LDA.b #$00 diff --git a/stats.asm b/stats.asm index a45fdf1..3311707 100644 --- a/stats.asm +++ b/stats.asm @@ -339,40 +339,30 @@ IndoorSubtileTransitionCounter: JMP StatTransitionCounter ;-------------------------------------------------------------------------------- StatsFinalPrep: - PHA : PHX : PHP - SEP #$30 ; set 8-bit accumulator and index registers - - LDA.l StatsLocked : BNE .ramPostOnly - INC : STA.l StatsLocked - - JSL.l IncrementFinalSword - - LDA.l HighestMail : INC : STA.l HighestMail ; add green mail to mail count - - LDA.l ScreenTransitions : DEC : STA.l ScreenTransitions ; remove extra transition from exiting gtower via duck - - .ramPostOnly - LDA.l SwordBossKills : LSR #4 : !ADD SwordBossKills : STA.l BossKills - LDA.l SwordBossKills+1 : LSR #4 : !ADD SwordBossKills+1 : !ADD BossKills : AND.b #$0F : STA.l BossKills - - LDA.l NMIFrames : !SUB LoopFrames : STA.l LagTime - LDA.l NMIFrames+1 : SBC LoopFrames+1 : STA.l LagTime+1 - LDA.l NMIFrames+2 : SBC LoopFrames+2 : STA.l LagTime+2 - LDA.l NMIFrames+3 : SBC LoopFrames+3 : STA.l LagTime+3 + PHA : PHX : PHP + SEP #$30 + LDA.l StatsLocked : BNE .ramPostOnly + INC : STA.l StatsLocked + JSL.l IncrementFinalSword + LDA.l Aga2Duck : BEQ .ramPostOnly + LDA.l ScreenTransitions : DEC : STA.l ScreenTransitions ; remove extra transition from exiting gtower via duck + .ramPostOnly + LDA.l SwordBossKills : LSR #4 : !ADD SwordBossKills : STA.l BossKills + LDA.l SwordBossKills+1 : LSR #4 : !ADD SwordBossKills+1 : !ADD BossKills : AND.b #$0F : STA.l BossKills - LDA.l RupeesSpent : !ADD DisplayRupees : STA.l RupeesCollected - LDA.l RupeesSpent+1 : ADC DisplayRupees+1 : STA.l RupeesCollected+1 + LDA.l NMIFrames : !SUB LoopFrames : STA.l LagTime + LDA.l NMIFrames+1 : SBC LoopFrames+1 : STA.l LagTime+1 + LDA.l NMIFrames+2 : SBC LoopFrames+2 : STA.l LagTime+2 + LDA.l NMIFrames+3 : SBC LoopFrames+3 : STA.l LagTime+3 - REP #$20 - LDA.l TotalItemCounter : !SUB ChestsOpened : STA.l NonChestCounter + LDA.l RupeesSpent : !ADD DisplayRupees : STA.l RupeesCollected + LDA.l RupeesSpent+1 : ADC DisplayRupees+1 : STA.l RupeesCollected+1 - .done - PLP : PLX : PLA - LDA.b #$19 : STA.b GameMode ; thing we wrote over, load triforce room + REP #$20 + LDA.l TotalItemCounter : !SUB ChestsOpened : STA.l NonChestCounter + .done + PLP : PLX : PLA + LDA.b #$19 : STA.b GameMode ; thing we wrote over, load triforce room STZ.b GameSubMode STZ.b SubSubModule RTL -;-------------------------------------------------------------------------------- -; Notes: -; s&q counter -;================================================================================ From f71759754e9d48af6b2284512cf97cd4742598d9 Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Fri, 22 Sep 2023 21:49:50 -0500 Subject: [PATCH 03/14] patreon fields --- build_linux.sh | 2 +- stats/credits.asm | 80 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 70 insertions(+), 12 deletions(-) diff --git a/build_linux.sh b/build_linux.sh index 7c3af51..2e195ea 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -2,4 +2,4 @@ rm ../working.sfc cp ../alttp.sfc ../working.sfc -./bin/linux/asar LTTP_RND_GeneralBugfixes.asm ../working.sfc +./bin/linux/asar -DFEATURE_PATREON_SUPPORTERS=1 LTTP_RND_GeneralBugfixes.asm ../working.sfc diff --git a/stats/credits.asm b/stats/credits.asm index 8466385..bec02c4 100644 --- a/stats/credits.asm +++ b/stats/credits.asm @@ -13,6 +13,44 @@ db 2 db 55 db " " ; $238020 +!FEATURE_PATREON_SUPPORTERS ?= 0 + +table "data/creditscharmapbighi.txt" +PatronCredit1Hi: +db 2 +db 55 +db " " ; $238002 + +table "data/creditscharmapbiglo.txt" +PatronCredit1Lo: +db 2 +db 55 +db " " ; $238020 + +table "data/creditscharmapbighi.txt" +PatronCredit2Hi: +db 2 +db 55 +db " " ; $238038 + +table "data/creditscharmapbiglo.txt" +PatronCredit2Lo: +db 2 +db 55 +db " " ; $238056 + +table "data/creditscharmapbighi.txt" +PatronCredit3Hi: +db 2 +db 55 +db " " ; $238074 + +table "data/creditscharmapbiglo.txt" +PatronCredit3Lo: +db 2 +db 55 +db " " ; $238092 + ;=================================================================================================== CreditsLineTable: @@ -498,6 +536,23 @@ CreditsLineBlank: %blankline() %blankline() +if !FEATURE_PATREON_SUPPORTERS + %smallcredits("PATREON SUPPORTERS", "yellow") + + %addarbline(PatronCredit1Hi) + %addarbline(PatronCredit1Lo) + + %blankline() + %addarbline(PatronCredit2Hi) + %addarbline(PatronCredit2Lo) + + %blankline() + %addarbline(PatronCredit3Hi) + %addarbline(PatronCredit3Lo) + + %blankline() +endif + %smallcredits("SPECIAL THANKS", "red") %blankline() @@ -530,7 +585,7 @@ CreditsLineBlank: %blankline() -%bigcredits("AND&") +%bigcredits("AND") %blankline() @@ -556,16 +611,19 @@ CreditsLineBlank: %emptyline() %emptyline() %emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() + +if !FEATURE_PATREON_SUPPORTERS == 0 + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() + %emptyline() +endif ;=================================================================================================== From c5d8c69396f3eb2f4e619ee6b390a98d9825961c Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Fri, 22 Sep 2023 22:49:57 -0500 Subject: [PATCH 04/14] fix PC addresses for patrons --- stats/credits.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stats/credits.asm b/stats/credits.asm index bec02c4..4fb1298 100644 --- a/stats/credits.asm +++ b/stats/credits.asm @@ -19,37 +19,37 @@ table "data/creditscharmapbighi.txt" PatronCredit1Hi: db 2 db 55 -db " " ; $238002 +db " " ; $23803E table "data/creditscharmapbiglo.txt" PatronCredit1Lo: db 2 db 55 -db " " ; $238020 +db " " ; $23805C table "data/creditscharmapbighi.txt" PatronCredit2Hi: db 2 db 55 -db " " ; $238038 +db " " ; $23807A table "data/creditscharmapbiglo.txt" PatronCredit2Lo: db 2 db 55 -db " " ; $238056 +db " " ; $238098 table "data/creditscharmapbighi.txt" PatronCredit3Hi: db 2 db 55 -db " " ; $238074 +db " " ; $2380B6 table "data/creditscharmapbiglo.txt" PatronCredit3Lo: db 2 db 55 -db " " ; $238092 +db " " ; $2380D4 ;=================================================================================================== From f133ce7159e54fc5232c78f7e953c2b8515cc49c Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Fri, 22 Sep 2023 23:09:35 -0500 Subject: [PATCH 05/14] add some extra space --- stats/credits.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stats/credits.asm b/stats/credits.asm index 4fb1298..0b04c55 100644 --- a/stats/credits.asm +++ b/stats/credits.asm @@ -551,6 +551,7 @@ if !FEATURE_PATREON_SUPPORTERS %addarbline(PatronCredit3Lo) %blankline() + %blankline() endif %smallcredits("SPECIAL THANKS", "red") @@ -610,7 +611,6 @@ endif %emptyline() %emptyline() %emptyline() -%emptyline() if !FEATURE_PATREON_SUPPORTERS == 0 %emptyline() @@ -623,6 +623,7 @@ if !FEATURE_PATREON_SUPPORTERS == 0 %emptyline() %emptyline() %emptyline() + %emptyline() endif ;=================================================================================================== From 85e338ad6795cd54f09d7f215857835c7442a084 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Thu, 30 Nov 2023 00:41:16 -0500 Subject: [PATCH 06/14] Fix bonk key double count --- bookofmudora.asm | 2 -- stats.asm | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/bookofmudora.asm b/bookofmudora.asm index 9dd0c4f..9a6bcc8 100644 --- a/bookofmudora.asm +++ b/bookofmudora.asm @@ -65,11 +65,9 @@ GiveBonkItem: PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys LDA.b #$2F : JSL.l Sound_SetSfx3PanLong - JSL CountBonkItem RTL .notKey PHY : TAY : JSL.l Link_ReceiveItem : PLY - JSL CountBonkItem RTL ;-------------------------------------------------------------------------------- LoadBonkItem: diff --git a/stats.asm b/stats.asm index 3311707..7322ab0 100644 --- a/stats.asm +++ b/stats.asm @@ -146,25 +146,6 @@ CountChestKey: PLX : PLA RTS ;-------------------------------------------------------------------------------- -CountBonkItem: ; called from GetBonkItem in bookofmudora.asm - LDA.b RoomIndex - CMP.b #115 : BNE + - LDA.l BonkKey_Desert - BRA ++ - + - CMP.b #140 : BNE + - LDA.l BonkKey_GTower : BRA ++ - + - LDA.b #$24 - ++ - CMP.b #$24 : BNE + - PHY - TAY - JSR CountChestKey - PLY - + -RTL -;-------------------------------------------------------------------------------- IncrementAgahnim2Sword: PHA JSL.l IncrementBossSword From 7001767c9b8f9ae3bbedbfbd670f9726ab225a57 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Wed, 27 Dec 2023 11:37:40 -0500 Subject: [PATCH 07/14] Fix dungeon prize ancilla spawn regression --- dungeondrops.asm | 4 ++++ hooks.asm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dungeondrops.asm b/dungeondrops.asm index 765aad8..20b7aa7 100644 --- a/dungeondrops.asm +++ b/dungeondrops.asm @@ -3,6 +3,9 @@ ;-------------------------------------------------------------------------------- SpawnDungeonPrize: PHX : PHB + TAX + LDA.b $06,S : STA.b ScrapBuffer72 ; Store current RoomTag index + TXA JSL.l AttemptItemSubstitution JSL.l ResolveLootIDLong STA.w ItemReceiptID @@ -14,6 +17,7 @@ SpawnDungeonPrize: LDA.w ItemReceiptID STA.w AncillaGet,X : STA.w SpriteID,X JSR.w AddDungeonPrizeAncilla + LDX.b ScrapBuffer72 : STZ.b RoomTag,X .failed_spawn PLB : PLX RTL diff --git a/hooks.asm b/hooks.asm index 0a4ad48..d5de77b 100644 --- a/hooks.asm +++ b/hooks.asm @@ -1000,7 +1000,7 @@ org $81C517 : JSL.l CheckDungeonCompletion org $81C523 : JSL.l CheckDungeonCompletion org $81C710 : JSL.l CheckSpawnPrize BCS RoomTag_GetHeartForPrize_spawn_prize : BRA RoomTag_GetHeartForPrize_delete_tag -org $81C742 : JSL.l SpawnDungeonPrize +org $81C742 : JSL.l SpawnDungeonPrize : PLA : RTS org $8799EA : JML.l SetItemPose org $88C415 : JSL.l PendantMusicCheck BCS Ancilla22_ItemReceipt_is_pendant : BRA Ancilla22_ItemReceipt_wait_for_music From d81a19c367b8d50c7ddb01e9f88cc432ec9305a1 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Mon, 1 Jan 2024 22:28:17 -0500 Subject: [PATCH 08/14] Update HUD when picking up bonk key --- bookofmudora.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/bookofmudora.asm b/bookofmudora.asm index 9a6bcc8..60c476f 100644 --- a/bookofmudora.asm +++ b/bookofmudora.asm @@ -65,6 +65,7 @@ GiveBonkItem: PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys LDA.b #$2F : JSL.l Sound_SetSfx3PanLong + INC.w UpdateHUDFlag RTL .notKey PHY : TAY : JSL.l Link_ReceiveItem : PLY From cec4e0430b8839e128ddeb22ba2bce69293a65f7 Mon Sep 17 00:00:00 2001 From: cassidoxa Date: Tue, 2 Jan 2024 00:26:12 -0500 Subject: [PATCH 09/14] Fix narrow heart piece sprite shadow flickering --- heartpieces.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/heartpieces.asm b/heartpieces.asm index c54f10c..f86894d 100644 --- a/heartpieces.asm +++ b/heartpieces.asm @@ -45,9 +45,11 @@ DrawHeartPieceGFX: LDA.w SpriteControl, X : ORA.b #$20 : STA.w SpriteControl, X PLA JSL.l DrawDynamicTile + REP #$21 LDA.b Scrap00 - CLC : ADC.b #$04 + ADC.w #$0004 STA.b Scrap00 + SEP #$20 JSL.l Sprite_DrawShadowLong BRA .done + From 014b3a719a91bc7933e98272058ae5a24885dcfb Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Thu, 4 Jan 2024 06:45:57 -0500 Subject: [PATCH 10/14] fix things --- bookofmudora.asm | 2 +- data/customitems.4bpp | Bin 5120 -> 5120 bytes data/customitems.png | Bin 3862 -> 4191 bytes dialog.asm | 50 +++++++++++------------ entrances.asm | 2 +- events.asm | 6 +-- hooks.asm | 2 +- inventory.asm | 4 +- msu.asm | 90 +++++++++++++++++++++--------------------- newhud.asm | 10 ++--- newitems.asm | 36 ++++++++--------- pendantcrystalhud.asm | 4 +- quickswap.asm | 2 +- ram.asm | 82 +++++++++++++++++++++----------------- retro.asm | 2 +- stats.asm | 6 +-- timer.asm | 45 +++++++++++---------- toast.asm | 5 ++- 18 files changed, 179 insertions(+), 169 deletions(-) diff --git a/bookofmudora.asm b/bookofmudora.asm index 60c476f..349f8cd 100644 --- a/bookofmudora.asm +++ b/bookofmudora.asm @@ -65,7 +65,7 @@ GiveBonkItem: PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys LDA.b #$2F : JSL.l Sound_SetSfx3PanLong - INC.w UpdateHUDFlag + LDA.b #$01 : STA.l UpdateHUDFlag RTL .notKey PHY : TAY : JSL.l Link_ReceiveItem : PLY diff --git a/data/customitems.4bpp b/data/customitems.4bpp index f7584f128cf0619308ba618342e01c44772c9424..1ef9107f636d917169f4a7968bc4c981dfa94283 100644 GIT binary patch delta 421 zcmYjNF-`+95M1LBJIV>)ktPMi*O7(@M3G3KT%h6^_k9P-?h{O~408%I@x1gY) z;0Z2xfQu9^u3-1BVMbobmd3L)IK}DP!(gdEfdO|s8Qx4TPXQFe80WmN7yt-_0b{xO zdEUG~@*Rmnh%u#xvBv?a)odhMndkk!)*#9b-W#L!)7Lj^Wq#B(5s0!wN+A&KafrRG zmOa3?te^s|d&aul3(Kmk2m(Y%Ef4l!iOP^in}k`DHLNz?IW-?#pUmGR(5X2b%ffRL{jPMUY*qXZl delta 44 xcmZqBXwcZ;#5s}KZW0&E<`&L9j1w6hHaBoLuxxhbX<(e(AlR_k5zG*7002ba4xIo1 diff --git a/data/customitems.png b/data/customitems.png index 93adf4ccc85ecc48e31a34cc0616f61ce093c721..558dcde45453027d46d5fc24ba6bcb2b0dd6e94c 100644 GIT binary patch literal 4191 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 z Date: Sat, 27 Jan 2024 10:09:18 -0500 Subject: [PATCH 11/14] some register issues --- events.asm | 4 ++-- newhud.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/events.asm b/events.asm index bb8cd1d..b98cd50 100644 --- a/events.asm +++ b/events.asm @@ -22,7 +22,7 @@ JML.l ReturnFromOnDrawHud OnDungeonEntrance: STA.l PegColor ; thing we wrote over JSL MaybeFlagDungeonTotalsEntrance - LDA.b #$01 : STA.l UpdateHUDFlag + LDA.w #$0001 : STA.l UpdateHUDFlag RTL ;-------------------------------------------------------------------------------- OnDungeonBossExit: @@ -46,7 +46,7 @@ OnDungeonExit: STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over PHA : PHP - LDA.b #$01 : STA.l UpdateHUDFlag + LDA.w #$0001 : STA.l UpdateHUDFlag JSL.l HUD_RebuildLong JSL.l FloodGateResetInner JSL.l SetSilverBowMode diff --git a/newhud.asm b/newhud.asm index 18a3955..a1812b3 100644 --- a/newhud.asm +++ b/newhud.asm @@ -263,7 +263,7 @@ NewHUD_DrawMagicMeter: ;================================================================================ NewHUD_DoneDrawing: - LDA.b #$00 : STA.l UpdateHUDFlag + LDA.w #$0000 : STA.l UpdateHUDFlag PLB RTL From de8703e13fd051e6818e51d68e61feed236dbcc1 Mon Sep 17 00:00:00 2001 From: crossedstaves <69093960+crossedstaves@users.noreply.github.com> Date: Sat, 17 Feb 2024 16:27:42 -0600 Subject: [PATCH 12/14] Update retro.asm Fix to erroneous infinite bomb count --- retro.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/retro.asm b/retro.asm index 4dbb574..c145e87 100644 --- a/retro.asm +++ b/retro.asm @@ -11,8 +11,9 @@ LoadBombCount16: .infinite RTL StoreBombCount: + PHA LDA.b #$01 : STA.l UpdateHUDFlag - PHA : LDA.l InfiniteBombs : BEQ .finite + LDA.l InfiniteBombs : BEQ .finite .infinite PLA : LDA.b #$01 : RTL .finite From 29d241bcbed555a9d0722edb7907bc2a1e70a987 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Tue, 20 Feb 2024 23:02:17 -0600 Subject: [PATCH 13/14] Replace long strings of dbs with using a text table --- data/textbytecharmap.txt | 61 ++++++++++++++++++ data/textwordcharmap.txt | 61 ++++++++++++++++++ itemtext.asm | 132 ++++++++++++++++++++------------------- 3 files changed, 189 insertions(+), 65 deletions(-) create mode 100644 data/textbytecharmap.txt create mode 100644 data/textwordcharmap.txt diff --git a/data/textbytecharmap.txt b/data/textbytecharmap.txt new file mode 100644 index 0000000..bf4cfe0 --- /dev/null +++ b/data/textbytecharmap.txt @@ -0,0 +1,61 @@ +'=9D +A=AA +B=AB +C=AC +D=AD +E=AE +F=AF +G=B0 +H=B1 +I=B2 +J=B3 +K=B4 +L=B5 +M=B6 +N=B7 +O=B8 +P=B9 +Q=BA +R=BB +S=BC +T=BD +U=BE +V=BF +W=C0 +X=C1 +Y=C2 +Z=C3 +?=C6 +!=C7 +,=C8 +-=C9 +.=CD +~=CE +a=D0 +b=D1 +c=D2 +d=D3 +e=D4 +f=D5 +g=D6 +h=D7 +i=D8 +j=D9 +k=DA +l=DB +m=DC +n=DD +o=DE +p=DF +q=E0 +r=E1 +s=E2 +t=E3 +u=E4 +v=E5 +w=E6 +x=E7 +y=E8 +z=E9 +:=EA + =FF diff --git a/data/textwordcharmap.txt b/data/textwordcharmap.txt new file mode 100644 index 0000000..a3b8c64 --- /dev/null +++ b/data/textwordcharmap.txt @@ -0,0 +1,61 @@ +'=9D00 +A=AA00 +B=AB00 +C=AC00 +D=AD00 +E=AE00 +F=AF00 +G=B000 +H=B100 +I=B200 +J=B300 +K=B400 +L=B500 +M=B600 +N=B700 +O=B800 +P=B900 +Q=BA00 +R=BB00 +S=BC00 +T=BD00 +U=BE00 +V=BF00 +W=C000 +X=C100 +Y=C200 +Z=C300 +?=C600 +!=C700 +,=C800 +-=C900 +.=CD00 +~=CE00 +a=D000 +b=D100 +c=D200 +d=D300 +e=D400 +f=D500 +g=D600 +h=D700 +i=D800 +j=D900 +k=DA00 +l=DB00 +m=DC00 +n=DD00 +o=DE00 +p=DF00 +q=E000 +r=E100 +s=E200 +t=E300 +u=E400 +v=E500 +w=E600 +x=E700 +y=E800 +z=E900 +:=EA00 + =FF00 diff --git a/itemtext.asm b/itemtext.asm index d4061f7..dfe9530 100644 --- a/itemtext.asm +++ b/itemtext.asm @@ -1,147 +1,149 @@ +table "data/textwordcharmap.txt" + org $B28000 ; You have found ; the map of Notice_MapOf: - db $74, $00, $C2, $00, $DE, $00, $E4, $00, $FF, $00, $D7, $00, $D0, $00, $E5, $00, $D4, $00, $FF, $00, $D5, $00, $DE, $00, $E4, $00, $DD, $00, $D3 - db $75, $00, $E3, $00, $D7, $00, $D4, $00, $FF, $00, $DC, $00, $D0, $00, $DF, $00, $FF, $00, $DE, $00, $D5 - dw #$7F7F +db $74 : dw "You have found" +db $75 : dw "the map of" +dw $7F7F ; You have found ; the compass of Notice_CompassOf: - db $74, $00, $C2, $00, $DE, $00, $E4, $00, $FF, $00, $D7, $00, $D0, $00, $E5, $00, $D4, $00, $FF, $00, $D5, $00, $DE, $00, $E4, $00, $DD, $00, $D3 - db $75, $00, $E3, $00, $D7, $00, $D4, $00, $FF, $00, $D2, $00, $DE, $00, $DC, $00, $DF, $00, $D0, $00, $E2, $00, $E2, $00, $FF, $00, $DE, $00, $D5 - dw #$7F7F +db $74 : dw "You have found" +db $75 : dw "the compass of" +dw $7F7F ; Oh look! it's ; the big key of Notice_BigKeyOf: - db $74, $00, $B8, $00, $D7, $00, $FF, $00, $DB, $00, $DE, $00, $DE, $00, $DA, $00, $C7, $00, $FF, $00, $D8, $00, $E3, $00, $9D, $00, $E2 - db $75, $00, $E3, $00, $D7, $00, $D4, $00, $FF, $00, $D1, $00, $D8, $00, $D6, $00, $FF, $00, $DA, $00, $D4, $00, $E8, $00, $FF, $00, $DE, $00, $D5 - dw #$7F7F +db $74 : dw "Oh look! it's" +db $75 : dw "the big key of" +dw $7F7F -; this is a +; This is a ; small key to Notice_SmallKeyOf: - db $74, $00, $BD, $00, $D7, $00, $D8, $00, $E2, $00, $FF, $00, $D8, $00, $E2, $00, $FF, $00, $D0 - db $75, $00, $E2, $00, $DC, $00, $D0, $00, $DB, $00, $DB, $00, $FF, $00, $DA, $00, $D4, $00, $E8, $00, $FF, $00, $E3, $00, $DE - dw #$7F7F +db $74 : dw "This is a" +db $75 : dw "small key to" +dw $7F7F ; You picked up Notice_Crystal: - db $74, $00, $C2, $00, $DE, $00, $E4, $00, $FF, $00, $DF, $00, $D8, $00, $D2, $00, $DA, $00, $D4, $00, $D3, $00, $FF, $00, $E4, $00, $DF - dw $7F7F +db $74 : dw "You picked up" +dw $7F7F -; light world +; Light World Notice_LightWorld: - db $76, $00, $B5, $00, $D8, $00, $D6, $00, $D7, $00, $E3, $00, $FF, $00, $C0, $00, $DE, $00, $E1, $00, $DB, $00, $D3 - dw #$7F7F +db $76 : dw "Light World" +dw $7F7F -; dark world +; Dark World Notice_DarkWorld: - db $76, $00, $AD, $00, $D0, $00, $E1, $00, $DA, $00, $FF, $00, $C0, $00, $DE, $00, $E1, $00, $DB, $00, $D3 - dw #$7F7F +db $76 : dw "Dark World" +dw $7F7F ; Ganons Tower Notice_GTower: - db $76, $00, $B0, $00, $D0, $00, $DD, $00, $DE, $00, $DD, $00, $E2, $00, $FF, $00, $BD, $00, $DE, $00, $E6, $00, $D4, $00, $E1 - dw #$7F7F +db $76 : dw "Ganons Tower" +dw $7F7F ; Turtle Rock Notice_TRock: - db $76, $00, $BD, $00, $E4, $00, $E1, $00, $E3, $00, $DB, $00, $D4, $00, $FF, $00, $BB, $00, $DE, $00, $D2, $00, $DA - dw #$7F7F +db $76 : dw "Turtle Rock" +dw $7F7F ; Thieves Town Notice_Thieves: - db $76, $00, $BD, $00, $D7, $00, $D8, $00, $D4, $00, $E5, $00, $D4, $00, $E2, $00, $FF, $00, $BD, $00, $DE, $00, $E6, $00, $DD - dw #$7F7F +db $76 : dw "Thieves Town" +dw $7F7F ; Tower of Hera Notice_Hera: - db $76, $00, $BD, $00, $DE, $00, $E6, $00, $D4, $00, $E1, $00, $FF, $00, $DE, $00, $D5, $00, $FF, $00, $B1, $00, $D4, $00, $E1, $00, $D0 - dw #$7F7F +db $76 : dw "Tower of Hera" +dw $7F7F ; Ice Palace Notice_Ice: - db $76, $00, $B2, $00, $D2, $00, $D4, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4 - dw #$7F7F +db $76 : dw "Ice Palace" +dw $7F7F ; Skull Woods Notice_Skull: - db $76, $00, $BC, $00, $DA, $00, $E4, $00, $DB, $00, $DB, $00, $FF, $00, $C0, $00, $DE, $00, $DE, $00, $D3, $00, $E2 - dw #$7F7F +db $76 : dw "Skull Woods" +dw $7F7F ; Misery Mire Notice_Mire: - db $76, $00, $B6, $00, $D8, $00, $E2, $00, $D4, $00, $E1, $00, $E8, $00, $FF, $00, $B6, $00, $D8, $00, $E1, $00, $D4 - dw #$7F7F +db $76 : dw "Misery Mire" +dw $7F7F ; Dark Palace Notice_PoD: - db $76, $00, $AD, $00, $D0, $00, $E1, $00, $DA, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4 - dw #$7F7F +db $76 : dw "Dark Palace" +dw $7F7F ; Swamp Palace Notice_Swamp: - db $76, $00, $BC, $00, $E6, $00, $D0, $00, $DC, $00, $DF, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4 - dw #$7F7F +db $76 : dw "Swamp Palace" +dw $7F7F ; Castle Tower Notice_AgaTower: - db $76, $00, $AC, $00, $D0, $00, $E2, $00, $E3, $00, $DB, $00, $D4, $00, $FF, $00, $BD, $00, $DE, $00, $E6, $00, $D4, $00, $E1 - dw #$7F7F +db $76 : dw "Castle Tower" +dw $7F7F ; Desert Palace Notice_Desert: - db $76, $00, $AD, $00, $D4, $00, $E2, $00, $D4, $00, $E1, $00, $E3, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4 - dw #$7F7F +db $76 : dw "Desert Palace" +dw $7F7F ; Eastern Palace Notice_Eastern: - db $76, $00, $AE, $00, $D0, $00, $E2, $00, $E3, $00, $D4, $00, $E1, $00, $DD, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4 - dw #$7F7F +db $76 : dw "Eastern Palace" +dw $7F7F ; Hyrule Castle Notice_Castle: - db $76, $00, $B1, $00, $E8, $00, $E1, $00, $E4, $00, $DB, $00, $D4, $00, $FF, $00, $AC, $00, $D0, $00, $E2, $00, $E3, $00, $DB, $00, $D4 - dw #$7F7F +db $76 : dw "Hyrule Castle" +dw $7F7F ; Hyrule Castle Notice_Sewers: - db $76, $00, $B1, $00, $E8, $00, $E1, $00, $E4, $00, $DB, $00, $D4, $00, $FF, $00, $AC, $00, $D0, $00, $E2, $00, $E3, $00, $DB, $00, $D4 - dw #$7F7F +db $76 : dw "Hyrule Castle" +dw $7F7F ; This Dungeon Notice_Self: - db $76, $00, $E3, $00, $D7, $00, $D8, $00, $E2, $00, $FF, $00, $D3, $00, $E4, $00, $DD, $00, $D6, $00, $D4, $00, $DE, $00, $Dd - dw #$7F7F +db $76 : dw "this dungeon" +dw $7F7F ; Crystal numbers Notice_One: - db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $DE, $00, $DD, $00, $D4 - dw #$7F7F +db $75 : dw "crystal one" +dw $7F7F Notice_Two: - db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $E3, $00, $E6, $00, $DE - dw #$7F7F +db $75 : dw "crystal two" +dw $7F7F Notice_Three: - db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $E3, $00, $D7, $00, $E1, $00, $D4, $00, $D4 - dw #$7F7F +db $75 : dw "crystal three" +dw $7F7F Notice_Four: - db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $D5, $00, $DE, $00, $E4, $00, $E1 - dw #$7F7F +db $75 : dw "crystal four" +dw $7F7F Notice_Five: - db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $D5, $00, $D8, $00, $E5, $00, $D4 - dw #$7F7F +db $75 : dw "crystal five" +dw $7F7F Notice_Six: - db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $E2, $00, $D8, $00, $E7 - dw #$7F7F +db $75 : dw "crystal six" +dw $7F7F Notice_Seven: - db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $E2, $00, $D4, $00, $E5, $00, $D4, $00, $DD - dw #$7F7F +db $75 : dw "crystal seven" +dw $7F7F From 474cfba250eed3cd1167827826a4171ac8e007ac Mon Sep 17 00:00:00 2001 From: hiimcody1 Date: Sat, 8 Jun 2024 21:29:20 -0400 Subject: [PATCH 14/14] Add indicator for pseudoboots to File Select screen --- fileselect.asm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fileselect.asm b/fileselect.asm index b67f37b..01e3f3f 100644 --- a/fileselect.asm +++ b/fileselect.asm @@ -390,7 +390,13 @@ DrawPlayerFileShared: LDA.l HexToDecDigit5 : AND.w #$00FF : ORA.w #!FS_COLOR_BW|$02E0 : %fs_draw8x8(11,27) ; Boots - %fs_drawItemBasic(EquipmentSRAM+$15,3,28,FileSelectItems_boots) + LDA.l EquipmentSRAM+$15 : AND.w #$00FF : BNE + + LDA.l FakeBoots : AND.w #$00FF : BEQ + + %fs_drawItem(3,28,FileSelectItems_fakeBoots) + BRA ++ + + + %fs_drawItemBasic(EquipmentSRAM+$15,3,28,FileSelectItems_boots) + ++ ; Gloves LDA.l EquipmentSRAM+$14 : AND.w #$00FF : BNE + @@ -543,6 +549,8 @@ FileSelectItems: .boots dw #$028C|!FS_COLOR_BOOTS, #$028D|!FS_COLOR_BOOTS, #$029C|!FS_COLOR_BOOTS, #$029D|!FS_COLOR_BOOTS + .fakeBoots + dw #$028C|!FS_COLOR_BLUE, #$028D|!FS_COLOR_BLUE, #$029C|!FS_COLOR_BLUE, #$029D|!FS_COLOR_BLUE .pearl dw #$02A4|!FS_COLOR_RED, #$02A5|!FS_COLOR_RED, #$02B4|!FS_COLOR_RED, #$02B5|!FS_COLOR_RED