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

ice physics eg fix

Browse Source
This commit is contained in:
Karkat
2018-03-03 22:11:12 -05:00
parent c1a4454bf1
commit a24329a2ed
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
LTTP_RND_GeneralBugfixes.asm
View File

@@ -130,11 +130,9 @@ incsrc goalitem.asm
incsrc compasses.asm
incsrc doorframefixes.asm
incsrc music.asm
incsrc cuccostorm.asm
incsrc hashalphabet.asm
incsrc roomloading.asm
incsrc icepalacegraphics.asm
incsrc retro.asm
incsrc hashalphabet.asm
warnpc $A18000
org $1C8000 ; text tables for translation
@@ -160,6 +158,9 @@ org $A48000 ; code bank - PUT NEW CODE HERE
incsrc openmode.asm
incsrc quickswap.asm
incsrc endingsequence.asm
incsrc cuccostorm.asm
incsrc retro.asm
warnpc $A58000
;org $228000 ; contrib area
org $A28000 ; contrib area
@@ -244,13 +245,13 @@ warnpc $AF8401
;$22 Contrib Code
;$23 Stats & Credits
;$24 Code Bank
;$2F reserved for tournament use
;$30 Main Configuration Table
;$31 Graphics Bank
;$32 Text Bank
;$33 Graphics Bank
;$2F reserved for tournament use
;$3A reserved for downstream use (Plandomizer)
;$3B reserved for downstream use (Plandomizer)
;$3A reserved for downstream use
;$3B reserved for downstream use
;$3F reserved for internal debugging
;$7F5700 - $7F57FF reserved for downstream use
;================================================================================

2
swordswap.asm
View File

@@ -79,12 +79,14 @@ RTL
; $7F50C7 - Ice Modifier
LoadModifiedIceFloorValue_a11:
LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
LDA $5E : CMP #$02 : BEQ +
LDA $5B : BNE +
LDA.w $0348 : ORA $7F50C7 : AND.b #$11 : RTL
+ : LDA.w $0348 : AND.b #$11
RTL
LoadModifiedIceFloorValue_a01:
LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
LDA $5E : CMP #$02 : BEQ +
LDA $5B : BNE +
LDA.w $0348 : ORA $7F50C7 : AND.b #$01 : RTL
+ : LDA.w $0348 : AND.b #$01

2
tables.asm
View File

@@ -1478,7 +1478,7 @@ db $FF, $FF, $FF, $FF
org $30C800 ; PC 0x184800 - 0x18487F - max 16 shops
ShopTable:
;db [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][sram_index]
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
;db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
db $01, $FF, $00, $00, $00, $43, $A0, $00
;db $01, $0F, $01, $57, $00, $03, $C1, $00
db $02, $0F, $01, $60, $00, $03, $C1, $03