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

Merge pull request #21 from KevinCathcart/entrance_fixes

Browse Source 
Entrance fixes
This commit is contained in:
Salvatore
2018-02-07 19:58:29 -05:00
committed by GitHub
parent b62aea3a2b 0c72ca9e0e
commit 8cc84dc35a
5 changed files with 67 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LTTP_RND_GeneralBugfixes.asm
View File

@@ -351,6 +351,9 @@ Dungeon_SaveRoomData_justKeys:
org $02B861
Dungeon_SaveRoomQuadrantData:
org $02FD8A ; 17D8A - Bank07.asm: 3732 Note: Different bank
LoadGearPalettes_bunny:
org $05A51D
Sprite_SpawnFallingItem:

39
bugfixes.asm
View File

@@ -24,7 +24,7 @@ RTL
;1 = Don't Reset Music
MSMusicReset:
LDA $8A : CMP.b #$80 : BNE +
LDA $23
LDA $23
+
RTL
;--------------------------------------------------------------------------------
@@ -42,4 +42,39 @@ RTL
; CPX.b #$1B : BNE + : LDA.b #$01 : RTL : +
; LDA $7EF340, X
;RTL
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
FixBunnyOnExitToLightWorld:
JSL.l FakeWorldFix
LDA.w $02E0 : BEQ +
JMP.w DecideIfBunny
+
LDA $7EF357; thing we overwrote
RTL
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
; fix issue where if a player beats aga1 without moon pearl, they don't turn into
; bunny on the pyramid
FixAga2Bunny:
LDA.l FixFakeWorld : BEQ + ; Only use this fix is fakeworld fix is in use
JSL DecideIfBunny : BNE +
JSR MakeBunny
LDA.b #$04 : STA.w $012C ; play bunny music
BRA .done
+
LDA.b #$09 : STA.w $012C ; what we wrote over
.done
RTL
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
MakeBunny:
PHX : PHY
LDA.b #$17 : STA $5D ; set player mode to permabunny
LDA.b #$01 : STA $02E0 : STA $56 ; make player look like bunny
JSL LoadGearPalettes_bunny
PLY : PLX
RTS
;--------------------------------------------------------------------------------

13
hooks.asm
View File

@@ -1094,7 +1094,17 @@ JSL.l LoadModifiedTileBufferAddress : NOP #2
; Permabunny Fix
;--------------------------------------------------------------------------------
org $078F32 ; <- 38F32 - Bank07.asm:2420 - (LDA $7EF357)
JSL.l DecideIfBunny
JSL.l DecideIfBunny ; for bunny beams
;--------------------------------------------------------------------------------
org $028468 ; <- 10468 Bank02.asm:911 - (LDA $7EF357)
JSL.l FixBunnyOnExitToLightWorld ; for cross-world connections
;--------------------------------------------------------------------------------
;================================================================================
; Other bunny Fixes
;--------------------------------------------------------------------------------
org $029E7C; <- 11E7C - module_ganon_emerges.asm:127 - (LDA.b #$09 : STA $012C)
JSL.l FixAga2Bunny : NOP
;--------------------------------------------------------------------------------
;================================================================================
@@ -2021,4 +2031,3 @@ org $00DF62 ; <- Bank00.asm:4672 (LDX.w #$0000 : LDY.w #$0040)
org $00DF6E ; <- A few instructions later, right after JSR Do3To4High16Bit
ReloadingFloorsCancel:
;================================================================================

1
inventory.asm
View File

@@ -830,7 +830,6 @@ RTL
;--------------------------------------------------------------------------------
ClearOWKeys:
PHA
JSL.l FakeWorldFix
LDA.l GenericKeys : BEQ +
PLA : LDA $7EF38B : STA $7EF36F
RTL

32
tables.asm
View File

@@ -1373,22 +1373,22 @@ dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
dw $0000, $0AA8, $07AA, $0000, $0000, $0000, $0000, $0000
dw $0000, $0000, $0000, $0000, $0000, $0000
EntranceAltDoorFrameTable:
dw $0000, $01aa, $8124, $87be, $8158, $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, $82be, $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, $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, $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, $01aa, $8124, $87be, $8158, $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, $82be, $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, $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, $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
;===============================================================================
org $30B000 ; PC 0x183000 - 0x183054