From 5a14e2f17f9ab42c2249e981ae3085e8d72f9e5b Mon Sep 17 00:00:00 2001
From: tA <s@p7.co.nz>
Date: Fri, 29 May 2020 14:09:57 +1200
Subject: [PATCH] added second animation

---
 ass/villager.ass |  32 ++++++++++++++++++++++++
 ass/villager.gbr | Bin 0 -> 10069 bytes
 src/actor.asm    |  75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/entry.asm    |  21 ++++++++--------
 src/main.asm     |   1 +
 src/misc.asm     |  15 ++++++++---
 6 files changed, 130 insertions(+), 14 deletions(-)
 create mode 100644 ass/villager.ass
 create mode 100644 ass/villager.gbr

diff --git a/ass/villager.ass b/ass/villager.ass
new file mode 100644
index 0000000..d088351
--- /dev/null
+++ b/ass/villager.ass
@@ -0,0 +1,32 @@
+SECTION "VillagerWaving", ROM0
+
+VillagerTiles::
+DB $1F,$18,$3F,$20,$7F,$48,$74,$57
+DB $26,$25,$0E,$09,$0E,$0A,$1E,$12
+DB $F8,$18,$FC,$04,$FE,$12,$2E,$EA
+DB $64,$A4,$70,$90,$70,$50,$78,$48
+DB $0F,$08,$1F,$12,$1D,$14,$1F,$10
+DB $0F,$09,$07,$04,$03,$02,$07,$04
+DB $F0,$10,$F8,$48,$B8,$28,$F8,$08
+DB $F0,$90,$E0,$20,$C0,$40,$E0,$20
+DB $00,$00,$00,$00,$00,$00,$00,$00
+DB $01,$01,$03,$02,$03,$02,$07,$04
+DB $00,$00,$00,$00,$00,$00,$00,$00
+DB $80,$80,$C0,$40,$C0,$40,$E0,$20
+DB $0F,$08,$1F,$10,$1F,$12,$1D,$14
+DB $0F,$08,$07,$05,$03,$02,$07,$04
+DB $F0,$10,$F8,$08,$F8,$48,$B8,$28
+DB $F0,$10,$E0,$A0,$C0,$40,$E0,$20
+DB $07,$04,$1F,$18,$3F,$20,$7C,$4F
+DB $76,$55,$2E,$29,$0E,$0A,$1E,$12
+DB $E0,$20,$F8,$18,$FC,$04,$3E,$F2
+DB $6E,$AA,$74,$94,$70,$50,$78,$48
+DB $0F,$08,$1F,$12,$1D,$14,$1F,$10
+DB $0F,$09,$07,$04,$03,$02,$1F,$1C
+DB $F0,$10,$F8,$48,$B8,$28,$F8,$08
+DB $F0,$90,$E0,$20,$C0,$40,$F8,$38
+DB $3F,$20,$7F,$48,$77,$54,$24,$27
+DB $06,$05,$0E,$09,$0E,$0A,$1E,$12
+DB $FC,$04,$FE,$12,$EE,$2A,$24,$E4
+DB $60,$A0,$70,$90,$70,$50,$78,$48
+VillagerTilesEnd::
diff --git a/ass/villager.gbr b/ass/villager.gbr
new file mode 100644
index 0000000000000000000000000000000000000000..3f600ce5efb7d00ba6db7a72f64d0838512939b2
GIT binary patch
literal 10069
zcmeHN&2G~`5FXoU>7~8!0+zVYizz+Po~jB|4oF;jLcTa)C6Qt~iW8-9fW86G!<iRp
zpMXbz@0;C?Oo^I<QKd@b*gL!P^Uch+o0ENU{{AQukt;kGMO6-)&*|l4TBfhdb~38V
zIrQ#2&W`0wZl9gW+omc{)75H~eJt9tDzds<y!bkvRm<t8PCy9UDr1S{dAiMQPxj<m
zB#IMwCP@^bY>to+x=x}*k~oH*CP?-0l40s82uZloU`)8iEis@85#u35Or?to(km2*
zv}tCQ37T+fN|(q_D5&v*X%)|9MSjid>Y+i4feh(G(y&&X?Srd1<P8$w+d_Sytn+$B
zH$Pyy{odt)J%oP$u7ifqzn^U2L1VZVyw-Ju36;R%=<+yF>Jsk1o&)Yb_cNRW4+)IW
z2h&r_f(VWMCxY(3I|o?MArzuktW_2I*L|f&mk%u^II4t(VOp>+U_;+5V;$?=y8Uat
z>VcBg(MfF-dfYt!3Uc51S7>(42_Nm3e=Xd4{sD2{`PUpa7z4(DF<=ZB1IB<cU<?=o
z#(*(k3>X8(fH7bU7z4(DF<=ZB1IB<cU<?=o#(*)<lL5S;m8ZbK3st-X<xk|dUNXS@
z%b#lcaGH<tokHG@i)Ee9=FKP{4fCR&RK;S_)Opdi`J1a*Ghbw1ULEzUXj3@9qG<0J
zsC!oo%V}57@@2oP(fJOV`Hq>I|FJ%};+xO7FFUeJ=J7ek&96f_`Ef4k@})dE$sT+?
k=$)}IjR&$T2LrNk-51K@A2|bd0v`DW{)h5!fDuK10F<e4)c^nh

literal 0
HcmV?d00001

diff --git a/src/actor.asm b/src/actor.asm
index 4d71f1d..7d2f125 100644
--- a/src/actor.asm
+++ b/src/actor.asm
@@ -7,6 +7,7 @@ SECTION "Actor", ROM0
 ActorROM::
 .structs:
    dw ActorIdle
+   dw VillagerWaving
 ActorIdle::
    db 60
    db 15
@@ -48,3 +49,77 @@ ActorIdle::
    db  0, -8, 15, 0
    db  0,  0, 16, 0
 .frameVoEnd
+
+VillagerWaving::
+   db 90
+   db 15
+   dw .vwFrame01
+   db 15
+   dw .vwFrame02
+   db 15
+   dw .vwFrame03
+   db 15
+   dw .vwFrame04
+   db 15
+   dw .vwFrame05
+   db 15
+   dw .vwFrame06
+.vwFrame01
+   db (.vwFrame01End - @) / 4
+   db  8, -16,  17, 0
+   db  8,  -8,  18, 0
+   db  0, -16,  19, 0
+   db  0,  -8,  20, 0
+   db -8, -16,  21, 0
+   db -8,  -8,  22, 0
+.vwFrame01End
+
+.vwFrame02
+   db (.vwFrame02End - @) / 4
+   db  8, -16,  17, 0
+   db  8,  -8,  18, 0
+   db  0, -16,  23, 0
+   db  0,  -8,  24, 0
+   db -8, -16,  21, 0
+   db -8,  -8,  22, 0
+.vwFrame02End
+
+.vwFrame03
+   db (.vwFrame03End - @) / 4
+   db  8, -16,  25, 0
+   db  8,  -8,  26, 0
+   db  0, -16,  23, 0
+   db  0,  -8,  24, 0
+   db -8, -16,  21, 0
+   db -8,  -8,  22, 0
+.vwFrame03End
+
+.vwFrame04
+   db (.vwFrame04End - @) / 4
+   db  8, -16,  17, 0
+   db  8,  -8,  18, 0
+   db  0, -16,  23, 0
+   db  0,  -8,  24, 0
+   db -8, -16,  21, 0
+   db -8,  -8,  22, 0
+.vwFrame04End
+
+.vwFrame05
+   db (.vwFrame05End - @) / 4
+   db  8, -16,  17, 0
+   db  8,  -8,  18, 0
+   db  0, -16,  19, 0
+   db  0,  -8,  20, 0
+   db -8, -16,  21, 0
+   db -8,  -8,  22, 0
+.vwFrame05End
+
+.vwFrame06
+   db (.vwFrame06End - @) / 4
+   db  8, -16,  29, 0
+   db  8,  -8,  30, 0
+   db  0, -16,  27, 0
+   db  0,  -8,  28, 0
+   db -8, -16,  21, 0
+   db -8,  -8,  22, 0
+.vwFrame06End
diff --git a/src/entry.asm b/src/entry.asm
index 4093e88..05e4c28 100644
--- a/src/entry.asm
+++ b/src/entry.asm
@@ -29,9 +29,9 @@ Start:
 
    call CopyDMARoutine 
 
-   ld a, 72
+   ld a, 100
    ld [Player_YPos], a
-   ld a, 80
+   ld a, 40
    ld [Player_XPos], a
    ld a, $FF
    ld [Player_GFXCounter], a
@@ -49,15 +49,16 @@ Start:
    ld [NPC01_XPos], a
    ld a, 20
    ld [NPC01_GFXCounter], a
-   xor a
+   ld a, 1
    ld [NPC01_GFXState], a
+   xor a
    ld [NPC01_TileData], a
    ld a, HIGH(ActorROM)
    ld [NPC01_GFXData+1], a
    ld a, LOW(ActorROM)
    ld [NPC01_GFXData], a
 
-   ld a, 24
+   ld a, 48
    ld [NPC02_YPos], a
    ld a, 48
    ld [NPC02_XPos], a
@@ -71,9 +72,9 @@ Start:
    ld a, LOW(ActorROM)
    ld [NPC02_GFXData], a
 
-   ld a, 48
+   ld a, 72
    ld [NPC03_YPos], a
-   ld a, 48
+   ld a, 72
    ld [NPC03_XPos], a
    ld a, 40
    ld [NPC03_GFXCounter], a
@@ -85,9 +86,9 @@ Start:
    ld a, LOW(ActorROM)
    ld [NPC03_GFXData], a
 
-   ld a, 48
+   ld a, 96
    ld [NPC04_YPos], a
-   ld a, 24
+   ld a, 96
    ld [NPC04_XPos], a
    ld a, 50
    ld [NPC04_GFXCounter], a
@@ -99,9 +100,9 @@ Start:
    ld a, LOW(ActorROM)
    ld [NPC04_GFXData], a
 
-   ld a, 64
+   ld a, 130
    ld [NPC05_YPos], a
-   ld a, 64
+   ld a, 130
    ld [NPC05_XPos], a
    ld a, 10
    ld [NPC05_GFXCounter], a
diff --git a/src/main.asm b/src/main.asm
index ed34230..7254797 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -2,6 +2,7 @@ INCLUDE "inc/hardware.inc"
 INCLUDE "inc/structs.asm"
 INCLUDE "ass/parecivo.ass"
 INCLUDE "ass/tiles.ass"
+INCLUDE "ass/villager.ass"
 INCLUDE "ass/map.ass"
 INCLUDE "src/animation.asm"
 INCLUDE "src/entry.asm"
diff --git a/src/misc.asm b/src/misc.asm
index 0911276..128bd65 100644
--- a/src/misc.asm
+++ b/src/misc.asm
@@ -31,6 +31,14 @@ PC_Update:
    ld a, [Player_YPos]
    add b
    ld [Player_YPos], a
+.a:
+   ld a, [hNewKeys]
+   and %00000001   ; a pressed
+   cp %00000001
+   jr nz, .end
+   ld a, [Player_GFXState]
+   xor %00000001
+   ld [Player_GFXState], a
 .end:
    ret
 
@@ -74,14 +82,13 @@ Clear_Map:
    ret
 
 Load_Tiles:
-   ld hl, _BGTILES
-   ld de, parecivo_tile_data
-   ld bc, parecivo_tile_data_size
-   call MemCpy
    ld hl, _VRAM
    ld de, parecivo_tile_data
    ld bc, parecivo_tile_data_size
    call MemCpy
+   ld de, VillagerTiles
+   ld bc, VillagerTilesEnd - VillagerTiles
+   call MemCpy
    ret
 
 Load_Map: