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

removed entrance randomizer support due to bad commit

Browse Source
This commit is contained in:
Karkat
2018-01-23 22:29:14 -05:00
parent 85b5a97a53
commit 88babf9ed0
2 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LTTP_RND_GeneralBugfixes.asm
View File

@@ -127,8 +127,7 @@ incsrc hardmode.asm
incsrc goalitem.asm incsrc goalitem.asm
incsrc compasses.asm incsrc compasses.asm
incsrc doorframefixes.asm incsrc doorframefixes.asm
incsrc music.asm ;incsrc music.asm
;incsrc shopkeeper.asm
incsrc cuccostorm.asm incsrc cuccostorm.asm
incsrc roomloading.asm incsrc roomloading.asm
incsrc icepalacegraphics.asm incsrc icepalacegraphics.asm

46
hooks.asm
View File

@@ -1061,14 +1061,14 @@ JSL.l GetMagicBatItem
;================================================================================ ;================================================================================
; Replacement Shopkeeper ; Replacement Shopkeeper
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;org $068BEB ; <- 30BEB - Bank07.asm:1125 - (INC $0BA0, X) org $068BEB ; <- 30BEB - Bank07.asm:1125 - (INC $0BA0, X)
;JSL.l SpritePrep_ShopKeeper : RTS JSL.l SpritePrep_ShopKeeper : RTS
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;org $1EEEE3 ; <- F6EE3 - sprite_shopkeeper.asm:7 - (LDA $0E80, X) org $1EEEE3 ; <- F6EE3 - sprite_shopkeeper.asm:7 - (LDA $0E80, X)
;JSL.l Sprite_ShopKeeper : RTS JSL.l Sprite_ShopKeeper : RTS
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;org $00D55E ; <- 555E - Bank00.asm:3491 (LDX.w #$2D40) org $00D55E ; <- 555E - Bank00.asm:3491 (LDX.w #$2D40)
;JSL.l LoadModifiedTileBufferAddress : NOP #2 JSL.l LoadModifiedTileBufferAddress : NOP #2
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
@@ -1934,34 +1934,21 @@ JSL.l SetOverlayIfLamp
; Overworld Door Frame Overlay Fix ; Overworld Door Frame Overlay Fix
; ;
; When entering an overworld entrance, if it is an entrance to a simple cave, we ; When entering an overworld entrance, if it is an entrance to a simple cave, we
; store the overworld door id, then use that (instead of the cave id) to determine the ; store the entrance id, then use that (instead of the cave id) to determine the
; overlay to draw when leaving the cave again. We also use this value to ; overlay to draw when leaving the cave again. We also use this value to
; identify the tavern entrance to determine whether link should walk up or down. ; identify the tavern entrance to determine whether link should walk up or down.
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $1BBD5F ; <- Bank1b.asm:296 (LDA $1BBB73, X : STA $010E) ;org $1BBD5F ; <- Bank1b.asm:296 (LDA $1BBB73, X : STA $010E)
JSL.l StoreLastOverworldDoorID ;JSL.l StoreLastEntranceID
NOP #3 ;NOP #3
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $02D754 ; <- Bank02.asm:10847 (LDA $D724, X : STA $0696 : STZ $0698) ;org $02D754 ; <- Bank02.asm:10847 (LDA $D724, X : STA $0696 : STZ $0698)
JSL.l CacheDoorFrameData ;JSL.l CacheDoorFrameData
NOP #5 ;NOP #5
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $0298AD ; <- Bank02.asm:4495 (LDA $010E : CMP.b #$43) ;org $0298AD ; <- Bank02.asm:4495 (LDA $010E : CMP.b #$43)
JSL.l WalkDownIntoTavern ;JSL.l WalkDownIntoTavern
NOP #1 ;NOP #1
;================================================================================
;================================================================================
; Music fixes
;--------------------------------------------------------------------------------
org $0282F4 ; <- Bank02.asm:654 (LDY.b #$58 ...)
JML.l PreOverworld_LoadProperties_ChooseMusic
org $028389 ; <- Bank02.asm:763
PreOverworld_LoadProperties_SetSong:
;--------------------------------------------------------------------------------
org $05CC58 ; <- Bank05.asm:1307 (LDA $040A : CMP.b #$18)
JSL PsychoSolder_MusicCheck
NOP #1
;================================================================================ ;================================================================================
;================================================================================ ;================================================================================
@@ -2000,3 +1987,4 @@ org $00DF62 ; <- Bank00.asm:4672 (LDX.w #$0000 : LDY.w #$0040)
org $00DF6E ; <- A few instructions later, right after JSR Do3To4High16Bit org $00DF6E ; <- A few instructions later, right after JSR Do3To4High16Bit
ReloadingFloorsCancel: ReloadingFloorsCancel:
;================================================================================ ;================================================================================