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

remove the code related to pyramid fairy sword handling

Browse Source
This commit is contained in:
sporchia
2018-03-12 00:44:46 -04:00
parent 8773c3c57a
commit 7428f1e581
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hooks.asm
View File

@@ -390,9 +390,9 @@ dl $080116, $070116; <- E97E
;--------------------------------------------------------------------------------
;org $06C9BC ; <- 349BC - sprite_ponds.asm : 1066
;org $06C9C0 ; <- 349C0 - sprite_ponds.asm : 1068
org $06C926 ; <- 34926 - sprite_ponds.asm : 945
JMP.l GetFairySword
NOP #12
;org $06C926 ; <- 34926 - sprite_ponds.asm : 945
;JMP.l GetFairySword
;NOP #12
org $06C936 ; <- 34936 - sprite_ponds.asm : 952
PyramidFairy_BRANCH_IOTA:
org $06C948 ; <- 34948 - sprite_ponds.asm : 961

22
swordswap.asm
View File

@@ -3,16 +3,16 @@
;================================================================================
;$03348E: smith sword check (to see if uprade-able)
;================================================================================
GetFairySword:
CMP.b #$49 : BNE + : LDA.b #$00 : + ; convert single fighter sword to low id one
CMP.b #$50 : BNE + : LDA.b #$01 : + ; convert safe master sword to normal one
CMP #$04 : !BLT + : JMP.l PyramidFairy_BRANCH_IOTA : + ; for any sword, incl newer
JSL ItemCheck_FairySword : BEQ + : JMP.l PyramidFairy_BRANCH_IOTA : + ; skip if we already flagged getting this
JSL ItemSet_FairySword ; mark as got
LDA FairySword : STA $0DC0, X ; whichever sword
LDA.b #$05 : STA $0EB0, X ; something we overwrote, documentation unclear on purpose
JMP.l PyramidFairy_BRANCH_GAMMA
;GetFairySword:
; CMP.b #$49 : BNE + : LDA.b #$00 : + ; convert single fighter sword to low id one
; CMP.b #$50 : BNE + : LDA.b #$01 : + ; convert safe master sword to normal one
; CMP #$04 : !BLT + : JMP.l PyramidFairy_BRANCH_IOTA : + ; for any sword, incl newer
; JSL ItemCheck_FairySword : BEQ + : JMP.l PyramidFairy_BRANCH_IOTA : + ; skip if we already flagged getting this
; JSL ItemSet_FairySword ; mark as got
; LDA FairySword : STA $0DC0, X ; whichever sword
; LDA.b #$05 : STA $0EB0, X ; something we overwrote, documentation unclear on purpose
;
;JMP.l PyramidFairy_BRANCH_GAMMA
;================================================================================
;GetSmithSword:
; JSL ItemCheck_SmithSword : BEQ + : JMP.l Smithy_AlreadyGotSword : + ; check if we're not already done
@@ -167,4 +167,4 @@ RTL
RTL
.medallion_type
db #$0F, #$10, #$11
;================================================================================
;================================================================================