alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge branch 'main' into kara

Browse Source
This commit is contained in:
karafruit
2023-03-19 15:36:48 -05:00
parent 2a9b098dac 23ecf41b33
commit e1643698f0
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compasses.asm
View File

@@ -13,7 +13,7 @@ RTL
DrawCompassCounts: DrawCompassCounts:
PHX PHX
LDA.l CompassMode : BEQ .done LDA.l CompassMode : AND.w #$00FF : BEQ .done
BIT.w #$0002 : BNE + ; if CompassMode==2, we don't check for the compass BIT.w #$0002 : BNE + ; if CompassMode==2, we don't check for the compass
LDA.l CompassField : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks LDA.l CompassField : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks
BEQ .done ; skip if we don't have compass BEQ .done ; skip if we don't have compass
@@ -40,7 +40,7 @@ RTS
DrawMapCounts: DrawMapCounts:
PHX PHX
LDA.l MapHUDMode : BEQ .done LDA.l MapHUDMode : AND.w #$00FF : BEQ .done
BIT.w #$0002 : BNE + ; if MapHUDMode==2, we don't check for map BIT.w #$0002 : BNE + ; if MapHUDMode==2, we don't check for map
LDA.l MapField : AND.l DungeonItemMasks, X ; Load map values to A, mask with dungeon item masks LDA.l MapField : AND.l DungeonItemMasks, X ; Load map values to A, mask with dungeon item masks
BEQ .done ; skip if we don't have map BEQ .done ; skip if we don't have map

8
fileselect.asm
View File

@@ -234,7 +234,7 @@ DrawPlayerFileShared:
; %fs_drawItemBasic(EquipmentSRAM+$03,3,18,FileSelectItems_bombs) ; %fs_drawItemBasic(EquipmentSRAM+$03,3,18,FileSelectItems_bombs)
; Powder ; Powder
LDA.l InventoryTrackingSRAM : AND.w #$1000 : BEQ + LDA.l InventoryTrackingSRAM : AND.w #$0010 : BEQ +
%fs_drawItem(3,20,FileSelectItems_powder) %fs_drawItem(3,20,FileSelectItems_powder)
BRA ++ BRA ++
+ +
@@ -242,7 +242,7 @@ DrawPlayerFileShared:
++ ++
; Mushroom ; Mushroom
LDA.l InventoryTrackingSRAM : AND.w #$2800 : BEQ + LDA.l InventoryTrackingSRAM : AND.w #$0028 : BEQ +
%fs_drawItem(3,18,FileSelectItems_mushroom) %fs_drawItem(3,18,FileSelectItems_mushroom)
BRA ++ BRA ++
+ +
@@ -250,7 +250,7 @@ DrawPlayerFileShared:
++ ++
; Flute ; Flute
LDA.l InventoryTrackingSRAM : AND.w #$0300 : BEQ + LDA.l InventoryTrackingSRAM : AND.w #$0003 : BEQ +
%fs_drawItem(7,16,FileSelectItems_flute) %fs_drawItem(7,16,FileSelectItems_flute)
BRA ++ BRA ++
+ +
@@ -258,7 +258,7 @@ DrawPlayerFileShared:
++ ++
; Shovel ; Shovel
LDA.l InventoryTrackingSRAM : AND.w #$0400 : BEQ + LDA.l InventoryTrackingSRAM : AND.w #$0004 : BEQ +
%fs_drawItem(9,12,FileSelectItems_shovel) %fs_drawItem(9,12,FileSelectItems_shovel)
BRA ++ BRA ++
+ +

2
inventory.asm
View File

@@ -2,7 +2,7 @@
; Inventory Updates ; Inventory Updates
;================================================================================ ;================================================================================
; InventoryTracking ; InventoryTracking
; brmpnskf ------oq ; ------oq brmpnskf
; b = blue boomerang | - ; b = blue boomerang | -
; r = red boomerang | - ; r = red boomerang | -
; m = mushroom current | - ; m = mushroom current | -

2
sram.asm
View File

@@ -172,7 +172,7 @@ CurrentGenericKeys: skip 1 ; Generic small keys
;================================================================================ ;================================================================================
; Tracking & Indicators ($7EF38C - $7EF3F0) ; Tracking & Indicators ($7EF38C - $7EF3F0)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
InventoryTracking: skip 2 ; b r m p n s k f - - - - - - o q (bitfield) InventoryTracking: skip 2 ; - - - - - - o q b r m p n s k f (bitfield)
; b = Blue Boomerang | r = Red Boomerang | m = Mushroom Current ; b = Blue Boomerang | r = Red Boomerang | m = Mushroom Current
; p = Magic Powder | n = Mushroom Past | s = Shovel ; p = Magic Powder | n = Mushroom Past | s = Shovel
; k = Inactive Flute | f = Active Flute | o = Any bomb acquired ; k = Inactive Flute | f = Active Flute | o = Any bomb acquired

2
tables.asm
View File

@@ -146,7 +146,7 @@ db #$01 ; #$00 = Off - #$01 = On (default)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; 0x180039 (Unused) ; 0x180039 (Unused)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $30803A ; PC 0x18003B - PC 0x18003C org $30803A ; PC 0x18003A-0x18003C
MapHUDMode: MapHUDMode:
db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count w/Map - #$02 = Display Dungeon Count Always db #$00 ; #$00 = Off (default) - #$01 = Display Dungeon Count w/Map - #$02 = Display Dungeon Count Always
MapMode: MapMode: