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

move inventory swap next to rest of inv in sram

Browse Source
This commit is contained in:
sporchia
2018-01-03 00:53:55 -05:00
parent 0097425e1e
commit c03229f13e
5 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LTTP_RND_GeneralBugfixes.asm
View File

@@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF
db #$00 ; expand file to 2mb db #$00 ; expand file to 2mb
org $1FFFF8 ; <- FFFF8 timestamp rom org $1FFFF8 ; <- FFFF8 timestamp rom
db #$20, #$17, #$12, #$22 ; year/month/day db #$20, #$18, #$01, #$02 ; year/month/day
;================================================================================ ;================================================================================
@@ -35,10 +35,10 @@ db #$20, #$17, #$12, #$22 ; year/month/day
!BLT = "BCC" !BLT = "BCC"
!BGE = "BCS" !BGE = "BCS"
!INVENTORY_SWAP = "$7EF38C"
!INVENTORY_SWAP_2 = "$7EF38E"
!NPC_FLAGS = "$7EF410" !NPC_FLAGS = "$7EF410"
!NPC_FLAGS_2 = "$7EF411" !NPC_FLAGS_2 = "$7EF411"
!INVENTORY_SWAP = "$7EF412"
!INVENTORY_SWAP_2 = "$7EF414"
!MAP_ZOOM = "$7EF415" !MAP_ZOOM = "$7EF415"
!PROGRESSIVE_SHIELD = "$7EF416" ; ss-- ---- !PROGRESSIVE_SHIELD = "$7EF416" ; ss-- ----
!HUD_FLAG = "$7EF416" ; --h- ---- !HUD_FLAG = "$7EF416" ; --h- ----

2
events.asm
View File

@@ -63,7 +63,7 @@ OnNewFile:
LDX.w #$00 : - ; copy over starting equipment LDX.w #$00 : - ; copy over starting equipment
LDA StartingEquipment, X : STA $7EF340, X LDA StartingEquipment, X : STA $7EF340, X
INX : INX INX : INX
CPX.w #$004B : !BLT - CPX.w #$004F : !BLT -
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
;LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in ;LDA #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in

4
inventory.asm
View File

@@ -1,7 +1,7 @@
;================================================================================ ;================================================================================
; Inventory Updates ; Inventory Updates
;================================================================================ ;================================================================================
!INVENTORY_SWAP = "$7EF412" !INVENTORY_SWAP = "$7EF38C"
; Item Tracking Slot ; Item Tracking Slot
; brmp-skf ; brmp-skf
; b = blue boomerang ; b = blue boomerang
@@ -13,7 +13,7 @@
; k = fake flute ; k = fake flute
; f = working flute ; f = working flute
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!INVENTORY_SWAP_2 = "$7EF414" !INVENTORY_SWAP_2 = "$7EF38E"
; Item Tracking Slot #2 ; Item Tracking Slot #2
; bs------ ; bs------
; b = bow ; b = bow

7
newitems.asm
View File

@@ -130,6 +130,7 @@ endmacro
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!CHALLENGE_TIMER = "$7EF454" !CHALLENGE_TIMER = "$7EF454"
!GOAL_COUNTER = "$7EF460" !GOAL_COUNTER = "$7EF460"
!INVENTORY_SWAP_2 = "$7EF38E"
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;carry clear if pass ;carry clear if pass
;carry set if caught ;carry set if caught
@@ -176,7 +177,7 @@ AddReceivedItemExpandedGetItem:
LDA $02D8 ; check inventory LDA $02D8 ; check inventory
JSL.l FreeDungeonItemNotice JSL.l FreeDungeonItemNotice
CMP.b #$0B : BNE + ; Bow CMP.b #$0B : BNE + ; Bow
LDA $7EF414 : AND.b #$40 : BEQ ++ LDA !INVENTORY_SWAP_2 : AND.b #$40 : BEQ ++
LDA.b #03 : STA $7EF340 ; set bow silver LDA.b #03 : STA $7EF340 ; set bow silver
++ ++
BRL .done BRL .done
@@ -806,7 +807,7 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;DrawHUDSilverArrows: ;DrawHUDSilverArrows:
; LDA $7EF340 : AND.w #$00FF : BNE + ; LDA $7EF340 : AND.w #$00FF : BNE +
; LDA $7EF414 : AND.w #$0040 : BEQ + ; LDA !INVENTORY_SWAP_2 : AND.w #$0040 : BEQ +
; LDA.w #$2810 : STA $11C8 ; LDA.w #$2810 : STA $11C8
; LDA.w #$2811 : STA $11CA ; LDA.w #$2811 : STA $11CA
; LDA.w #$2820 : STA $1208 ; LDA.w #$2820 : STA $1208
@@ -818,7 +819,7 @@ RTL
;Return $7EF340 but also draw silver arrows if you have the upgrade even if you don't have the bow ;Return $7EF340 but also draw silver arrows if you have the upgrade even if you don't have the bow
CheckHUDSilverArrows: CheckHUDSilverArrows:
LDA $7EF340 : BNE + LDA $7EF340 : BNE +
LDA $7EF414 : AND.b #$40 : BEQ ++ LDA !INVENTORY_SWAP_2 : AND.b #$40 : BEQ ++
JSL.l DrawHUDSilverArrows JSL.l DrawHUDSilverArrows
++ ++
LDA $7EF340 LDA $7EF340

5
tables.asm
View File

@@ -1322,7 +1322,7 @@ db $83, $21, $EB, $6E, $0A, $71, $B0, $11, $85, $C7, $A1, $FD, $E5, $16, $48, $F
db $F2, $23, $2F, $28, $9B, $AA, $AB, $D0, $6A, $9D, $C6, $2D, $00, $FE, $E1, $3F db $F2, $23, $2F, $28, $9B, $AA, $AB, $D0, $6A, $9D, $C6, $2D, $00, $FE, $E1, $3F
db $A0, $4A, $B8, $4E, $74, $1F, $8E, $A9, $F5, $CD, $60, $91, $DB, $D8, $52, $E2 db $A0, $4A, $B8, $4E, $74, $1F, $8E, $A9, $F5, $CD, $60, $91, $DB, $D8, $52, $E2
;================================================================================ ;================================================================================
org $30A100 ; PC 0x182100 org $30A100 ; PC 0x182100 - 0x18218C
EntranceDoorFrameTable: EntranceDoorFrameTable:
dw $0000, $0000, $0DE8, $0B98, $14CE, $0000, $1C50, $FFFF dw $0000, $0000, $0DE8, $0B98, $14CE, $0000, $1C50, $FFFF
dw $1466, $0000, $1AB6, $0B98, $1AB6, $040E, $9C0C, $1530 dw $1466, $0000, $1AB6, $0B98, $1AB6, $040E, $9C0C, $1530
@@ -1334,11 +1334,12 @@ dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
dw $0000, $0AA8, $07AA, $0000, $0000, $0000, $0000, $0000 dw $0000, $0AA8, $07AA, $0000, $0000, $0000, $0000, $0000
dw $0000, $0000, $0000, $0000, $0000, $0000 dw $0000, $0000, $0000, $0000, $0000, $0000
;=============================================================================== ;===============================================================================
org $30B000 ; PC 0x183000 org $30B000 ; PC 0x183000 - 0x183054
StartingEquipment: StartingEquipment:
dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
dw $0000, $0000, $0000, $0000, $0000, $0000, $1818, $FF00 dw $0000, $0000, $0000, $0000, $0000, $0000, $1818, $FF00
dw $0000, $0000, $0000, $0000, $F800, $0000, $0000, $0000 dw $0000, $0000, $0000, $0000, $F800, $0000, $0000, $0000
dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
dw $0000, $0000
;=============================================================================== ;===============================================================================