projects
/
gbrg
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0b1e7ef
)
Added new broom tiles
author
Lukas Krickl
<lukas@krickl.dev>
Sun, 6 Oct 2024 20:13:18 +0000
(22:13 +0200)
committer
Lukas Krickl
<lukas@krickl.dev>
Sun, 6 Oct 2024 20:13:18 +0000
(22:13 +0200)
src/player.s
patch
|
blob
|
history
tiles/tileset0.inc
patch
|
blob
|
history
diff --git
a/src/player.s
b/src/player.s
index 017bc3e4b27b2964b6ba0e4aa0c13ad6db747bfd..7d1e305f4e3794d306a4abeb019081ede1ff6433 100644
(file)
--- a/
src/player.s
+++ b/
src/player.s
@@
-1,8
+1,8
@@
; player gets 3 sprite slots in a row
.def int PLAYER_SPRITE1 = shadow_oam + 0
-.def int PLAYER_TILE_IDLE1 = 0x0
A
-.def int PLAYER_TILE_IDLE2 = 0x1
A
+.def int PLAYER_TILE_IDLE1 = 0x0
E
+.def int PLAYER_TILE_IDLE2 = 0x1
E
.def int LANTERN_TILE_IDLE1 = 0x0C
.def int BROOM_TILE_IDLE1 = 0x04
diff --git
a/tiles/tileset0.inc
b/tiles/tileset0.inc
index 33e765635db0e0f70fc16553fadbafcebff4ffd0..ad1d71b65b7c2c57eda4128c12a83274bd1701d0 100644
(file)
--- a/
tiles/tileset0.inc
+++ b/
tiles/tileset0.inc
@@
-125,23
+125,23
@@
.chr 00000000
.chr 00000000
; tile 14
-.chr 0000000
0
-.chr 000000
00
-.chr 000000
00
-.chr 000000
00
-.chr 000000
00
-.chr 000000
00
-.chr 000000
00
-.chr 00000
000
+.chr 0000000
3
+.chr 000000
32
+.chr 000000
32
+.chr 000000
32
+.chr 000000
32
+.chr 000000
32
+.chr 000000
32
+.chr 00000
333
; tile 15
-.chr 0000
0
000
-.chr 00000
000
-.chr 000
00000
-.chr 0
0000000
-.chr
00000000
-.chr
00000000
-.chr 0
0000000
-.chr 00
000000
+.chr 0000
3
000
+.chr 00000
333
+.chr 000
32222
+.chr 0
3323222
+.chr
32232232
+.chr
32322322
+.chr 0
3223223
+.chr 00
333333
; tile 16
.chr 00033000
.chr 00011000
@@
-270,22
+270,22
@@
.chr 00000000
; tile 30
.chr 00000000
-.chr
0
0000000
-.chr
0
0000000
-.chr
0
0000000
-.chr
0
0000000
-.chr
0
0000000
-.chr
0
0000000
-.chr
00
000000
+.chr
3
0000000
+.chr
3
0000000
+.chr
3
0000000
+.chr
3
0000000
+.chr
3
0000000
+.chr
3
0000000
+.chr
33
000000
; tile 31
-.chr 00
0
00000
-.chr
00
000000
-.chr
000
00000
-.chr
0000
0000
-.chr
0000
0000
-.chr
0000
0000
-.chr
000
00000
-.chr
00
000000
+.chr 00
3
00000
+.chr
33
000000
+.chr
233
00000
+.chr
2223
0000
+.chr
2223
0000
+.chr
3223
0000
+.chr
223
00000
+.chr
33
000000
; tile 32
.chr 00033000
.chr 00333300