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

let's dev 12/22/17

Browse Source 
fixed magic drain issue
fixed dashing through transitions & getting stuck item dashing in ice mode
fixed pot key pickups corrupting room state
fixed bunny mirror in ice mode (by making bunny not subject to ice mode)
This commit is contained in:
Karkat
2017-12-22 00:14:50 -05:00
parent d6195f4e4a
commit 3cc2ccf500
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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, #$19 ; year/month/day db #$20, #$17, #$12, #$22 ; year/month/day
;================================================================================ ;================================================================================
@@ -385,6 +385,9 @@ Sprite_CheckDamageToPlayerSameLayerLong:
org $06F86A org $06F86A
OAM_AllocateDeferToPlayerLong: OAM_AllocateDeferToPlayerLong:
org $0791B3
Player_HaltDashAttackLong:
org $07999D org $07999D
Link_ReceiveItem: Link_ReceiveItem:

4
hooks.asm
View File

@@ -389,10 +389,10 @@ org $07B08B
LinkItem_MagicCostBaseIndices: LinkItem_MagicCostBaseIndices:
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $07B096 ; <- 3B096 - Bank07.asm : 7731 (LDA LinkItem_MagicCostBaseIndices, X : CLC : ADC $7EF37B : TAX) org $07B096 ; <- 3B096 - Bank07.asm : 7731 (LDA LinkItem_MagicCostBaseIndices, X : CLC : ADC $7EF37B : TAX)
JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices, X
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $07B0D5 ; <- 3B0D5 - Bank07.asm : 7783 (LDA LinkItem_MagicCostBaseIndices, X : CLC : ADC $7EF37B : TAX) org $07B0D5 ; <- 3B0D5 - Bank07.asm : 7783 (LDA LinkItem_MagicCostBaseIndices, X : CLC : ADC $7EF37B : TAX)
JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices, X
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================

19
stats.asm
View File

@@ -173,7 +173,9 @@ DungeonStairsTransition:
JSL Dungeon_SaveRoomQuadrantData JSL Dungeon_SaveRoomQuadrantData
BRA StatTransitionCounter BRA StatTransitionCounter
DungeonExitTransition: DungeonExitTransition:
LDA.b #$0F : STA $10 JSL Player_HaltDashAttackLong
LDA.b #$00 : STA $0301 ; stop item dashing
LDA.b #$0F : STA $10 ; stop running through the transition
StatTransitionCounter: StatTransitionCounter:
PHA : PHP PHA : PHP
LDA !LOCK_STATS : BNE + LDA !LOCK_STATS : BNE +
@@ -195,12 +197,15 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
IncrementSmallKeys: IncrementSmallKeys:
STA $7EF36F ; thing we wrote over, write small key count STA $7EF36F ; thing we wrote over, write small key count
LDA !LOCK_STATS : BNE +
JSL AddInventory_incrementKeyLong PHX
+ LDA !LOCK_STATS : BNE +
JSL.l UpdateKeys JSL AddInventory_incrementKeyLong
PHY : LDY.b #24 : JSL.l FullInventoryExternal : PLY +
JSL.l HUD_RebuildLong JSL.l UpdateKeys
PHY : LDY.b #24 : JSL.l FullInventoryExternal : PLY
JSL.l HUD_RebuildLong
PLX
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DecrementSmallKeys: DecrementSmallKeys:

10
swordswap.asm
View File

@@ -68,23 +68,23 @@ RTL
LoadModifiedMagicLevel: LoadModifiedMagicLevel:
LDA $7F50C3 : BEQ + LDA $7F50C3 : BEQ +
!ADD $7EF37B ; add normal magic value to modifier !ADD $7EF37B ; add normal magic value to modifier
CMP.b #$FF : BNE + : LDA.b #$00 : + CMP.b #$FF : BNE ++ : LDA.b #$00 : RTL : ++
CMP.b #$03 : !BLT ++ : LDA.b #$02 : RTS : ++ CMP.b #$03 : !BLT ++ : LDA.b #$02 : ++
RTL RTL
+ +
LDA $7F50C3 ; load normal magic value LDA $7EF37B ; load normal magic value
RTL RTL
;================================================================================ ;================================================================================
; $7E0348 - Ice Value ; $7E0348 - Ice Value
; $7F50C7 - Ice Modifier ; $7F50C7 - Ice Modifier
LoadModifiedIceFloorValue_a11: LoadModifiedIceFloorValue_a11:
LDA $5D : CMP #$01 : BEQ + LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
LDA $5B : BNE + LDA $5B : BNE +
LDA.w $0348 : ORA $7F50C7 : AND.b #$11 : RTL LDA.w $0348 : ORA $7F50C7 : AND.b #$11 : RTL
+ : LDA.w $0348 : AND.b #$11 + : LDA.w $0348 : AND.b #$11
RTL RTL
LoadModifiedIceFloorValue_a01: LoadModifiedIceFloorValue_a01:
LDA $5D : CMP #$01 : BEQ + LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
LDA $5B : BNE + LDA $5B : BNE +
LDA.w $0348 : ORA $7F50C7 : AND.b #$01 : RTL LDA.w $0348 : ORA $7F50C7 : AND.b #$01 : RTL
+ : LDA.w $0348 : AND.b #$01 + : LDA.w $0348 : AND.b #$01