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

Merged DR v1.0.0.3

Browse Source
This commit is contained in:
codemann8
2022-04-15 10:34:10 -05:00
parent ed03692bef 4239e7204e
commit 436ecbb17d
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LTTP_RND_GeneralBugfixes.asm
View File

@@ -353,7 +353,7 @@ if !FEATURE_NEW_TEXT
incsrc itemtext_lower.asm incsrc itemtext_lower.asm
else else
incsrc itemtext.asm incsrc itemtext.asm
endif endif
warnpc $32E000 warnpc $32E000
org $32DFD0 ; PC 0x195FD0 org $32DFD0 ; PC 0x195FD0

2
hooks.asm
View File

@@ -2845,6 +2845,8 @@ JSL FixTerrorpin ; 4 bytes
NOP ; 1 byte NOP ; 1 byte
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;================================================================================
; Text Renderer ; Text Renderer
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
if !FEATURE_NEW_TEXT if !FEATURE_NEW_TEXT

22
menu/overworldmap.asm
View File

@@ -239,7 +239,7 @@ PHX
CLC : BRA .done CLC : BRA .done
.checkAga2 .checkAga2
LDA $7EF01B : AND #$08 : BNE .fail LDA $7EF01B : AND #$80 : BNE .fail
CLC : BRA .done CLC : BRA .done
.fail .fail
@@ -252,16 +252,16 @@ RTS
; CLC - should not move indicator ; CLC - should not move indicator
; SEC - yep indicator can move ; SEC - yep indicator can move
OverworldMap_CheckForCompass: OverworldMap_CheckForCompass:
LDA.l CompassMode : AND #$80 : BEQ .unset ; should I check for compass logic 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 CompassMode : AND #$40 : BEQ .set ; compasses aren't shuffled
LDA.l CompassMode : AND #$20 : BNE + LDA.l CompassMode : AND #$20 : BNE +
JSR OverworldMap_CheckForMap : BCC .unset : BRA .set JSR OverworldMap_CheckForMap : BCC .unset : BRA .set
+ LDA.l CompassExists, X : BEQ .set ; compass doesn't exits + LDA.l CompassExists, X : BEQ .set ; compass doesn't exits
PHX PHX
LDA.l MC_SRAM_Offsets, X : TAX ; put compass offset into X LDA.l MC_SRAM_Offsets, X : TAX ; put compass offset into X
LDA !INVENTORY_COMPASS, X : ORA !MAP_OVERLAY, X LDA !INVENTORY_COMPASS, X : ORA !MAP_OVERLAY, X
PLX PLX
AND.l MC_Masks, X : BNE .set ; is the compass obtained AND.l MC_Masks, X : BNE .set ; is the compass obtained
.unset .unset
CLC CLC
RTS RTS

2
music.asm
View File

@@ -190,7 +190,7 @@ Overworld_MosaicDarkWorldChecks:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; This is the where the music can change due to an UW transition ; This is the where the music can change due to an UW transition
; ;
; On entry, A=16bit XY=8bit, A & X safe to mod, Y unknown ; On entry, A=16bit XY=8bit, A & X safe to mod, Y unknown
Underworld_DoorDown_Entry: Underworld_DoorDown_Entry:
LDX #$FF ; some junk value to be used later to determine if the below lines will change the track LDX #$FF ; some junk value to be used later to determine if the below lines will change the track

3
tables.asm
View File

@@ -140,7 +140,8 @@ db #$00 ; #$00 = Always On (default) - #$01 = Require Map Item
CompassMode: CompassMode:
db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count w/Compass - #$02 = Display Dungeon Count Always 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 ; #$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 org $30803D ; PC 0x18003D
PersistentFloodgate: PersistentFloodgate: