diff --git a/Dungeons/enemy_damage.asm b/Dungeons/enemy_damage.asm index e0ced3e..3b583ad 100644 --- a/Dungeons/enemy_damage.asm +++ b/Dungeons/enemy_damage.asm @@ -1,4 +1,4 @@ -; Change Enemy Damage +; Change Enemy Damage ; tzpd bbbb ; t - TODO ; z - High priority target for bees to give hints @@ -38,10 +38,10 @@ org $0DB330 org $0DB266+$53 db $13 -org $0DB1C6 ; 0x53 - ARMOS KNIGHT health +org $0DB1C6 ; 0x53 - ARMOS KNIGHT health db 64 -; Firebar +; Firebar org $0DB44C+$7F db $64 ; persist, same damage @@ -49,12 +49,12 @@ org $0DB44C+$7F org $0DB266+$55 db $03, $03 -; Arrghus -org $0DB266+$8C +; Arrghus +org $0DB266+$8C db $14 org $0DB266+$8D ; Arrgi db $14 -org $0DB266+$5D ; Roller vertical +org $0DB266+$5D ; Roller vertical db $05, $05, $05, $05 diff --git a/Dungeons/house_walls.asm b/Dungeons/house_walls.asm index 2a9440a..e2d2888 100644 --- a/Dungeons/house_walls.asm +++ b/Dungeons/house_walls.asm @@ -1,7 +1,6 @@ - ; ; Editor View -; 1 2 -> 1 3 +; 1 2 -> 1 3 ; 3 4 -> 2 4 ; Top Left Corner Layer 1 @@ -26,14 +25,14 @@ org $00A6B8 dw $C89E, $489E, $48B6, $4899 dw $889E, $089E, $4894, $4892 -; Bottom Right Corner Layer 1 +; Bottom Right Corner Layer 1 #obj0BC6: dw $CCAE, $C8B3, $8896, $8890 dw $C8B7, $C8A6, $C8B5, $8893 dw $4898, $C8B6, $C89E, $489E dw $4892, $C894, $889E, $089E -; Top Wall Layer 1 +; Top Wall Layer 1 #obj02E8: org $009E3A dw $0890, $0896, $08A2, $0CAC @@ -43,7 +42,7 @@ org $009E3A dw $8CAC, $88A2, $8896, $C890 dw $CCAC, $88A3, $8897, $8890 -; Left Wall Layer 1 +; Left Wall Layer 1 #obj02C8: org $009E1A @@ -52,4 +51,4 @@ org $009E1A #obj02D8: dw $4CAD, $48A4, $4898, $4892 - dw $CCAD, $48A5, $4899, $4892 \ No newline at end of file + dw $CCAD, $48A5, $4899, $4892 diff --git a/Meadow_main.asm b/Meadow_main.asm index 180833e..c2b9846 100644 --- a/Meadow_main.asm +++ b/Meadow_main.asm @@ -12,7 +12,7 @@ org $05DF12 NOP org $04ECA0 - STZ $0DD0,x + STZ.w SprState,x STZ $02E4 ; repeat native code overwritten by hook LDA #$02 STA $7EF3C5 ; store "part 2" diff --git a/Sprites/NPCs/zora.asm b/Sprites/NPCs/zora.asm index 7293f65..3be86d8 100644 --- a/Sprites/NPCs/zora.asm +++ b/Sprites/NPCs/zora.asm @@ -9,7 +9,7 @@ Sprite_Zora_Long: LDA.w ROOM : CMP.w #$0105 : BNE .not_princess SEP #$30 JSR Sprite_ZoraPrincess_Draw - LDA.b #$01 : STA.w SprMiscG, X + LDA.b #$01 : STA.w SprMiscG, X JMP + .not_princess LDA.w WORLDFLAG : AND.w #$00FF : BEQ .eon_draw @@ -192,4 +192,3 @@ Sprite_Zora_Draw: db $02, $02 db $02, $02 } -