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

Wallmaster fix

Browse Source
This commit is contained in:
Myramong
2019-02-12 17:17:32 -04:00
parent cba62e4655
commit 49e2d54155
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bugfixes.asm
View File

@@ -137,4 +137,14 @@ TryToSpawnCrystalUntilSuccess:
.spawned .spawned
STZ $AE ; the "trying to spawn crystal" flag STZ $AE ; the "trying to spawn crystal" flag
STZ $AF ; the "trying to spawn pendant" flag STZ $AF ; the "trying to spawn pendant" flag
RTL RTL
;--------------------------------------------------------------------------------
; Fix crystal not spawning when using somaria vs boss
WallmasterCameraFix:
STZ $A7 ; disable vertical camera scrolling for current room
REP #$20
STZ $0618 ; something about scrolling, setting these to 0 tricks the game
STZ $061A ; into thinking we're at the edge of the room so it doesn't scroll.
SEP #$20
JML Sound_SetSfx3PanLong ; what we wrote over, also this will RTL

14
hooks.asm
View File

@@ -530,6 +530,12 @@ JSL.l AssignKiki
NOP #2 NOP #2
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;================================================================================
; Wallmaster camera fix
;--------------------------------------------------------------------------------
org $1EAF77 ; <- F2F77 sprite_wallmaster.asm : 141 (LDA.b #$2A : JSL Sound_SetSfx3PanLong)
JSL.l WallmasterCameraFix
;================================================================================ ;================================================================================
; Hard & Masochist Mode Fixes ; Hard & Masochist Mode Fixes
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -1773,14 +1779,6 @@ dw $05AC, $04FC, $0001, $0027, $00F0 ; Zelda in the water room
; org $01CA66 ; <- CA66 Bank01.asm : 10864 - (LDA.w #$2200 : ADD $041C : STA $041C) ; org $01CA66 ; <- CA66 Bank01.asm : 10864 - (LDA.w #$2200 : ADD $041C : STA $041C)
; LDA.w #$4400 ; #$2200 is the normal speed, $#FF00 is max. ; LDA.w #$4400 ; #$2200 is the normal speed, $#FF00 is max.
;---------------------------------------------------------- ;----------------------------------------------------------
;-- Hobo gives item faster
; org $06BE3A ; <- 33E3A sprite_hobo.asm : 90 - (db 6, 2, 6, 6, 2, 100, 30)
; db 6, 2, 6, 6, 2, 6, 30
;----------------------------------------------------------
;-- Sick kid gives item faster
; org $06B9A1 ; <- 339A1 sprite_bug_net_kid : 62 - (db 8, 12, 8, 12, 8, 96, 16)
; db 8, 12, 8, 12, 8, 32, 16
;----------------------------------------------------------
;================================================================================ ;================================================================================
; Ganon Fixes ; Ganon Fixes