let's dev sep 10 2017

fix for tablet text when opening with hammer
fixed progression graphics for 1/2 magic
fixed mothula damage for enemizer (works regardless of room now)
This commit is contained in:
Karkat
2017-09-10 22:04:21 -04:00
parent 144375c140
commit 58e646756e
5 changed files with 40 additions and 14 deletions

View File

@@ -19,15 +19,24 @@ JMP.l PyramidFairy_BRANCH_GAMMA
; ;JSL ItemSet_SmithSword - too early
;JMP.l Smithy_DoesntHaveSword
;================================================================================
;LoadSwordForDamage:
; LDA $7EF359 : CMP #$04 : BNE .done ; skip if not gold sword
; LDA $1B : BEQ + ; skip if outdoors
; LDA $A0 : CMP #41 : BNE + ; decimal 41 ; skip if not in the mothula room
; LDA #$03 ; pretend we're using tempered
; BRA .done
; +
; LDA #$04 ; nvm gold sword is fine
; .done
;RTL
;================================================================================
LoadSwordForDamage:
LDA $7EF359 : CMP #$04 : BNE .done ; skip if not gold sword
LDA $1B : BEQ + ; skip if outdoors
LDA $A0 : CMP #41 : BNE + ; decimal 41 ; skip if not in the mothula room
LDA #$03 ; pretend we're using tempered
BRA .done
+
LDA #$04 ; nvm gold sword is fine
.done
LDA $0E20, X : CMP.b #$88 : BNE .notMoth
LDA $7EF359 ; load normal sword value
CMP.b #$04 : !BLT + : DEC : +
RTL
.notMoth
LDA $7EF359 ; load normal sword value
RTL
;================================================================================
CheckTabletSword: