Merge branch 'master' of https://github.com/ZetaNull/jep-hack

2026-02-06 16:15:24 +13:00 · 2024-07-19 21:30:43 -04:00 · 2024-07-19 21:30:43 -04:00 · cdbaf2fe2a
commit cdbaf2fe2a
parent 28f2bcdcd9 30e57c9e38
94 changed files with 1909 additions and 354 deletions
--- a/gfx/pokemon/caretorker/anim.asm
+++ b/gfx/pokemon/caretorker/anim.asm
@ -1 +1,15 @@
-	endanim
+	frame  0, 08
+	frame  1, 06
+	frame  2, 10
+	frame  0, 06
+	frame  2, 10
+	frame  0, 04
+	frame  3, 08
+	frame  4, 08
+	frame  3, 08
+	frame  4, 08
+	frame  3, 08
+	frame  4, 08
+	frame  3, 06
+	frame  5, 18
+	endanim
--- a/gfx/pokemon/caretorker/anim_idle.asm
+++ b/gfx/pokemon/caretorker/anim_idle.asm
@ -1 +1,4 @@
+	frame 3, 08
+	frame 0, 08
+	frame 3, 08
 	endanim
--- a/gfx/pokemon/caretorker/back.png
+++ b/gfx/pokemon/caretorker/back.png
--- a/gfx/pokemon/caretorker/front.png
+++ b/gfx/pokemon/caretorker/front.png
--- a/gfx/pokemon/caretorker/shiny.pal
+++ b/gfx/pokemon/caretorker/shiny.pal
@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 31, 22, 31
+	RGB 04, 17, 28
--- a/gfx/pokemon/electivire/anim.asm
+++ b/gfx/pokemon/electivire/anim.asm
@ -1 +1,11 @@
-	endanim
+	frame 1, 08
+	frame 2, 24
+	setrepeat 4
+	frame 3, 03
+	frame 2, 03
+	dorepeat 3
+	setrepeat 2
+	frame 3, 06
+	frame 2, 06
+	dorepeat 7
+	endanim
--- a/gfx/pokemon/electivire/anim_idle.asm
+++ b/gfx/pokemon/electivire/anim_idle.asm
@ -1 +1,6 @@
+	setrepeat 2
+	frame 4, 06
+	frame 0, 06
+	dorepeat 1
+	frame 5, 08
 	endanim
--- a/gfx/pokemon/electivire/back.png
+++ b/gfx/pokemon/electivire/back.png
--- a/gfx/pokemon/electivire/front.png
+++ b/gfx/pokemon/electivire/front.png
--- a/gfx/pokemon/electivire/shiny.pal
+++ b/gfx/pokemon/electivire/shiny.pal
@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 31, 25, 00
+	RGB 18, 20, 00
+
--- a/gfx/pokemon/honchkrow/anim.asm
+++ b/gfx/pokemon/honchkrow/anim.asm
@ -1 +1,7 @@
-	endanim
+	frame 0, 04
+	frame 1, 52
+	setrepeat 2
+	frame 2, 08
+	frame 3, 08
+	dorepeat 3
+	endanim
--- a/gfx/pokemon/honchkrow/anim_idle.asm
+++ b/gfx/pokemon/honchkrow/anim_idle.asm
@ -1 +1,2 @@
+	frame 4, 16
 	endanim
--- a/gfx/pokemon/honchkrow/back.png
+++ b/gfx/pokemon/honchkrow/back.png
--- a/gfx/pokemon/honchkrow/front.png
+++ b/gfx/pokemon/honchkrow/front.png
--- a/gfx/pokemon/honchkrow/shiny.pal
+++ b/gfx/pokemon/honchkrow/shiny.pal
@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 29, 30, 03
+	RGB 21, 05, 19
+
--- a/gfx/pokemon/magmortar/anim.asm
+++ b/gfx/pokemon/magmortar/anim.asm
@ -1 +1,7 @@
-	endanim
+	frame 0, 04
+	frame 1, 08
+	setrepeat 4
+	frame 2, 06
+	frame 3, 06
+	dorepeat 3
+	endanim
--- a/gfx/pokemon/magmortar/anim_idle.asm
+++ b/gfx/pokemon/magmortar/anim_idle.asm
@ -1 +1,6 @@
+	setrepeat 2
+	frame 4, 06
+	frame 0, 06
+	dorepeat 1
+	frame 5, 08
 	endanim
--- a/gfx/pokemon/magmortar/back.png
+++ b/gfx/pokemon/magmortar/back.png
--- a/gfx/pokemon/magmortar/front.png
+++ b/gfx/pokemon/magmortar/front.png
--- a/gfx/pokemon/magmortar/shiny.pal
+++ b/gfx/pokemon/magmortar/shiny.pal
@ -1,2 +1,4 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 31, 14, 30
+	RGB 24, 04, 14
+
--- a/gfx/pokemon/porygon_z/anim.asm
+++ b/gfx/pokemon/porygon_z/anim.asm
@ -1 +1,12 @@
-	endanim
+	frame 1, 16
+	frame 2, 06
+	frame 0, 06
+	frame 2, 06
+	setrepeat 3
+	frame 3, 04
+	frame 0, 04
+	dorepeat 5
+	frame 3, 06
+	frame 0, 06
+	frame 3, 06
+	endanim
--- a/gfx/pokemon/porygon_z/anim_idle.asm
+++ b/gfx/pokemon/porygon_z/anim_idle.asm
@ -1 +1,2 @@
+	frame 3, 08
 	endanim
--- a/gfx/pokemon/porygon_z/back.png
+++ b/gfx/pokemon/porygon_z/back.png
--- a/gfx/pokemon/porygon_z/front.png
+++ b/gfx/pokemon/porygon_z/front.png
--- a/gfx/pokemon/porygon_z/shiny.pal
+++ b/gfx/pokemon/porygon_z/shiny.pal
@ -1,2 +1,5 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+
+	RGB 08, 11, 23
+	RGB 20, 19, 24
+
+
--- a/gfx/pokemon/wyrdeer/anim.asm
+++ b/gfx/pokemon/wyrdeer/anim.asm
@ -1 +1,11 @@
+	frame 0, 04
+	frame 1, 20
+	frame 2, 04
+	frame 1, 06
+	frame 2, 06
+	setrepeat 2
+	frame 0, 06
+	frame 3, 06
+	frame 4, 06
+	dorepeat 6
 	endanim
--- a/gfx/pokemon/wyrdeer/anim_idle.asm
+++ b/gfx/pokemon/wyrdeer/anim_idle.asm
@ -1 +1,6 @@
-	endanim
+	frame 5, 08
+	setrepeat 2
+	frame 0, 06
+	frame 6, 06
+	dorepeat 2
+	endanim
--- a/gfx/pokemon/wyrdeer/back.png
+++ b/gfx/pokemon/wyrdeer/back.png
--- a/gfx/pokemon/wyrdeer/front.png
+++ b/gfx/pokemon/wyrdeer/front.png
--- a/gfx/pokemon/wyrdeer/shiny.pal
+++ b/gfx/pokemon/wyrdeer/shiny.pal
@ -1,2 +1,5 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+		
+	RGB 13, 22, 07
+	RGB 12, 01, 04
+
+
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@ -588,3 +588,15 @@ INCBIN "data/tilesets/lavendercrypt_metatiles.bin"

 TilesetLavenderCryptColl::
 INCLUDE "data/tilesets/lavendercrypt_collision.asm"
+
+TilesetBlueLabAttr::
+INCBIN "data/tilesets/bluelab_attributes.bin"
+
+TilesetBlueLabGFX::
+INCBIN "gfx/tilesets/bluelab.2bpp.lz"
+
+TilesetBlueLabMeta::
+INCBIN "data/tilesets/bluelab_metatiles.bin"
+
+TilesetBlueLabColl::
+INCLUDE "data/tilesets/bluelab_collision.asm"
--- a/gfx/tilesets/bluelab.png
+++ b/gfx/tilesets/bluelab.png
--- a/gfx/tilesets/cave.png
+++ b/gfx/tilesets/cave.png