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

move storage of BOMB_LEVEL to make it play nicely with starting equipment

Browse Source
This commit is contained in:
Kara Alexandra
2021-07-13 11:02:59 -07:00
parent e81905a517
commit bdd665db24
9 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LTTP_RND_GeneralBugfixes.asm
View File

@@ -36,8 +36,9 @@ db #$20, #$19, #$08, #$31 ; year/month/day
; Rando Specific SRAM assignments ; Rando Specific SRAM assignments
!SHOP_PURCHASE_COUNTS = "$7EF302" ;$7EF302 - $7EF33F (temporary home) !SHOP_PURCHASE_COUNTS = "$7EF302" ;$7EF302 - $7EF33F (temporary home)
!INVENTORY_SWAP = "$7EF38C" ; [w] !INVENTORY_SWAP = "$7EF38C"
!INVENTORY_SWAP_2 = "$7EF38E" ; [w] !INVENTORY_SWAP_2 = "$7EF38E"
!BOMB_LEVEL = "$7EF38F"
!ITEM_LIMIT_COUNTS = "$7EF390" ; $7EF390 - ???? !ITEM_LIMIT_COUNTS = "$7EF390" ; $7EF390 - ????
!NPC_FLAGS = "$7EF410" !NPC_FLAGS = "$7EF410"
!NPC_FLAGS_2 = "$7EF411" !NPC_FLAGS_2 = "$7EF411"
@@ -58,7 +59,6 @@ db #$20, #$19, #$08, #$31 ; year/month/day
;$7EF420 - $7EF46F - Stat Tracking Bank 1 (overlaps with RNG Item Flags) ;$7EF420 - $7EF46F - Stat Tracking Bank 1 (overlaps with RNG Item Flags)
;$7EF450 - $7EF45F - RNG Item (Single) Flags ;$7EF450 - $7EF45F - RNG Item (Single) Flags
;$7EF4A0 - $7EF4A7 - Service Request Block ;$7EF4A0 - $7EF4A7 - Service Request Block
!PROGRESSIVE_BOMBS = "$7EF4A8"
;$7EF4AA - $7EF4AD = Stat Tracking Bank 2 ;$7EF4AA - $7EF4AD = Stat Tracking Bank 2
!FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file !FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file
;$700500 - $70050F - Extended File Name ;$700500 - $70050F - Extended File Name

2
darkworldspawn.asm
View File

@@ -149,7 +149,7 @@ SetEscapeAssist:
++ ++
LDA.l SpecialBombs : BEQ + LDA.l SpecialBombs : BEQ +
LDA.l $7EF4A8 : BEQ + LDA.l !BOMB_LEVEL : BEQ +
LDA #$01 : STA !INFINITE_BOMBS LDA #$01 : STA !INFINITE_BOMBS
+ +
RTL RTL

2
inventory.asm
View File

@@ -718,7 +718,7 @@ RTL
.incrementBossSword .incrementBossSword
LDA SpecialBombs : BEQ + LDA SpecialBombs : BEQ +
LDA $7EF4A8 : BRA ++ LDA !BOMB_LEVEL : BRA ++
+ : LDA $7EF359 + : LDA $7EF359
++ ++
BNE + : - BNE + : -

6
itemdowngrade.asm
View File

@@ -76,9 +76,9 @@ JMP .done
PHA PHA
TYA ; load bomb upgrade item TYA ; load bomb upgrade item
!SUB #$B0 ; convert to bomb level !SUB #$B0 ; convert to bomb level
CMP.l $7EF4A8 : !BGE + ; skip if highest is lower (this is an upgrade) CMP.l !BOMB_LEVEL : !BGE + ; skip if highest is lower (this is an upgrade)
LDA.l $7EF4A8 : !ADD #$B0 ; convert to item id LDA.l !BOMB_LEVEL : !ADD #$B0 ; convert to item id
TAY : PLA : LDA.l $7EF4A8 ; put bomb level into the thing to write TAY : PLA : LDA.l !BOMB_LEVEL ; put bomb level into the thing to write
JMP .done JMP .done
+ +
PLA PLA

4
newitems.asm
View File

@@ -565,7 +565,7 @@ AddReceivedItemExpanded:
LDA.b #$0E : STA $02D8 : BRA .done ; Bee in a bottle LDA.b #$0E : STA $02D8 : BRA .done ; Bee in a bottle
+++ +++
++ : CMP.b #$B6 : BNE ++ ; Progressive Bombs ++ : CMP.b #$B6 : BNE ++ ; Progressive Bombs
LDA $7EF4A8 LDA !BOMB_LEVEL
CMP.b #$00 : BNE + ; have no Bombs CMP.b #$00 : BNE + ; have no Bombs
LDA.b #$B1 : STA $02D8 : JMP .done LDA.b #$B1 : STA $02D8 : JMP .done
+ : CMP.b #$01 : BNE + ; have L-1 Bombs + : CMP.b #$01 : BNE + ; have L-1 Bombs
@@ -836,7 +836,7 @@ AddReceivedItemExpanded:
dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Free Big Key dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Free Big Key
dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Free Small Key dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Free Small Key
dw $F36A ; Bee Trap dw $F36A ; Bee Trap
dw $F4A8, $F4A8, $F4A8, $F4A8, $F4A8, $F4A8 ; Bomb Upgrades dw $F38F, $F38F, $F38F, $F38F, $F38F, $F38F ; Bomb Upgrades
dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused
dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused
dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Unused

3
special_bombs.asm
View File

@@ -1,6 +1,5 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!ANCILLA_DAMAGE = "$06EC84" !ANCILLA_DAMAGE = "$06EC84"
!BOMB_LEVEL = "$7EF4A8"
; start with X = sprite index, A = ancilla type index ; start with X = sprite index, A = ancilla type index
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DamageClassCalc: DamageClassCalc:
@@ -262,7 +261,7 @@ DrawSwordInMenu:
LDA.w #$F859 : STA $04 LDA.w #$F859 : STA $04
RTL RTL
.bombSword .bombSword
LDA $7EF4A8 : AND.w #$00FF : STA $02 LDA !BOMB_LEVEL : AND.w #$00FF : STA $02
LDA.w #$FC51 : STA $04 LDA.w #$FC51 : STA $04
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

2
swordswap.asm
View File

@@ -135,7 +135,7 @@ CheckTabletSword:
LDA.b #$02 : RTL LDA.b #$02 : RTL
+ +
LDA.l SpecialBombs : BEQ + LDA.l SpecialBombs : BEQ +
LDA $7EF4A8 : CMP #$02 : !BLT + ; check for master bombs LDA !BOMB_LEVEL : CMP #$02 : !BLT + ; check for master bombs
LDA.b #$02 : RTL LDA.b #$02 : RTL
+ +
LDA $7EF359 ; get actual sword value LDA $7EF359 ; get actual sword value

2
tables.asm
View File

@@ -1632,7 +1632,7 @@ 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 dw $0000, $0000
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; 0x182355 - 183FFF (unused) ; 0x183055 - 183FFF (unused)
;================================================================================ ;================================================================================
org $30C000 ; PC 0x184000 - 0x184007 org $30C000 ; PC 0x184000 - 0x184007
ItemSubstitutionRules: ItemSubstitutionRules:

2
zelda.asm
View File

@@ -21,7 +21,7 @@ EndRainState:
CMP #$10 : BNE + : STA !INFINITE_ARROWS : + CMP #$10 : BNE + : STA !INFINITE_ARROWS : +
LDA.l SpecialBombs : BEQ + LDA.l SpecialBombs : BEQ +
LDA.l $7EF4A8 : BEQ + LDA.l !BOMB_LEVEL : BEQ +
LDA #$01 : STA !INFINITE_BOMBS LDA #$01 : STA !INFINITE_BOMBS
+ +
LDA.b #$02 : STA $7EF3C5 ; end rain state LDA.b #$02 : STA $7EF3C5 ; end rain state