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

gfx/battle_anims/custom.pal

@@ -0,0 +1,256 @@
+	; Custom pallettes from Sour Crystal
+	; first 6 custom pals look like regular ones
+INCLUDE "gfx/battle_anims/battle_anims.pal"
+
+; purple
+	RGB 31, 31, 31
+	RGB 25, 09, 27
+	RGB 13, 02, 15
+	RGB 00, 00, 00
+; ice
+	RGB 31, 31, 31
+	RGB 13, 27, 31
+	RGB 10, 21, 29
+	RGB 00, 00, 00
+; fire
+	RGB 31, 31, 31
+	RGB 31, 24, 02
+	RGB 29, 03, 04
+	RGB 00, 00, 00
+; globe
+	RGB 31, 31, 31
+	RGB 03, 22, 31
+	RGB 04, 19, 08
+	RGB 00, 00, 00
+; water
+	RGB 31, 31, 31
+	RGB 00, 19, 28
+	RGB 08, 09, 28
+	RGB 00, 00, 00
+; bubble
+	RGB 31, 31, 31
+	RGB 19, 28, 28
+	RGB 00, 23, 28
+	RGB 03, 10, 30
+; dragonbreath
+	RGB 31, 31, 31
+	RGB 31, 26, 09
+	RGB 27, 08, 22
+	RGB 00, 00, 00
+; dragonrage
+	RGB 31, 31, 31
+	RGB 31, 29, 09
+	RGB 03, 09, 26
+	RGB 00, 00, 00
+; aurora
+	RGB 28, 22, 31
+	RGB 31, 31, 07
+	RGB 13, 27, 31
+	RGB 31, 20, 24
+; spore
+	RGB 31, 12 ,10
+	RGB 05, 27, 06
+	RGB 31, 31, 08
+	RGB 00, 28, 22
+; peach
+	RGB 31, 31, 31
+	RGB 31, 25, 14
+	RGB 31, 13, 04
+	RGB 00, 00, 00
+; lightscreen
+	RGB 31, 31, 31
+	RGB 16, 31, 28
+	RGB 00, 28, 22
+	RGB 00, 00, 00
+; mirrorcoat
+	RGB 31, 31, 31
+	RGB 31, 22, 25
+	RGB 29, 11, 11
+	RGB 00, 00, 00
+; recycle
+	RGB 31, 31, 31
+	RGB 08, 09, 28
+	RGB 29, 03, 04
+	RGB 00, 00, 00
+; lavarocks
+	RGB 31, 31, 31
+	RGB 31, 13, 01
+	RGB 06, 05, 07
+	RGB 00, 00, 00
+; skillswap
+	RGB 31, 31, 31
+	RGB 01, 22, 25
+	RGB 26, 28, 00
+	RGB 31, 30, 13
+; willowisp
+	RGB 31, 31, 31
+	RGB 00, 22, 29
+	RGB 15, 09, 27
+	RGB 31, 31, 31
+; glowyellow
+	RGB 31, 31, 31
+	RGB 31, 31, 07
+	RGB 31, 24, 02
+	RGB 31, 16, 01
+; glowluster
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 23, 30, 31
+	RGB 29, 25, 31
+; bright
+	RGB 31, 31, 31
+	RGB 28, 28, 28
+	RGB 16, 16, 16
+	RGB 10, 10, 10
+; verybright
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 28, 28, 28
+	RGB 10, 10, 10
+; charred
+	RGB 31, 31, 31
+	RGB 14, 14, 15
+	RGB 12, 12, 13
+	RGB 09, 09, 11
+; cosmic
+	RGB 31, 31, 31
+	RGB 31, 30, 23
+	RGB 13, 27, 31
+	RGB 28, 05, 13
+; signalbeamred
+	RGB 31, 31, 31
+	RGB 31, 20, 22
+	RGB 31, 07, 05
+	RGB 20, 00, 00
+; signalbeamblue
+	RGB 31, 31, 31
+	RGB 18, 30, 31
+	RGB 04, 22, 31
+	RGB 04, 17, 31
+; bulkup
+	RGB 31, 31, 31
+	RGB 29, 03, 04
+	RGB 31, 24, 02
+	RGB 31, 24, 02
+; grasswhistle
+	RGB 31, 31, 31
+	RGB 12, 25, 01
+	RGB 12, 25, 01
+	RGB 12, 25, 01
+; psychoboost1
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 29, 20, 31
+	RGB 30, 00, 13
+; psychoboost2
+	RGB 31, 31, 31
+	RGB 31, 18, 25
+	RGB 31, 00, 27
+	RGB 15, 06, 31
+; gravity
+	RGB 31, 31, 31
+	RGB 26, 10, 29
+	RGB 10, 10, 21
+	RGB 05, 07, 13
+; glowgreen
+	RGB 31, 31, 31
+	RGB 23, 31, 20
+	RGB 16, 28, 09
+	RGB 07, 23, 03
+; heatwave
+	RGB 31, 24, 02
+	RGB 29, 03, 04
+	RGB 29, 03, 04
+	RGB 00, 00, 00
+; payback
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 15, 28
+	RGB 22, 00, 23
+; gastroacid
+	RGB 31, 31, 31
+	RGB 27, 31, 05
+	RGB 15, 31, 01
+	RGB 09, 25, 00
+; darkpulse
+	RGB 31, 31, 31
+	RGB 25, 00, 08
+	RGB 09, 00, 06
+	RGB 19, 00, 06
+; glowlime
+	RGB 31, 31, 31
+	RGB 29, 31, 06
+	RGB 22, 25, 00
+	RGB 15, 20, 00
+; dragonpulse
+	RGB 31, 31, 31
+	RGB 28, 28, 28
+	RGB 19, 14, 28
+	RGB 07, 06, 22
+; snow
+	RGB 31, 31, 31
+	RGB 27, 31, 31
+	RGB 20, 27, 31
+	RGB 18, 16, 24
+; lavaplume
+	RGB 31, 31, 31
+	RGB 10, 13, 17
+	RGB 08, 09, 11
+	RGB 05, 05, 06
+; invertblack
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	RGB 13, 13, 13
+	RGB 25, 25, 25
+; lime
+	RGB 31, 31, 31
+	RGB 20, 30, 05
+	RGB 13, 18, 02
+	RGB 00, 00, 00
+; bee
+	RGB 31, 31, 31
+	RGB 25, 29, 31
+	RGB 31, 26, 01
+	RGB 00, 00, 00
+; roaroftime
+	RGB 31, 31, 31
+	RGB 28, 31, 31
+	RGB 13, 26, 31
+	RGB 10, 14, 31
+; moon
+	RGB 31, 31, 31
+	RGB 29, 31, 31
+	RGB 17, 28, 31
+	RGB 03, 03, 06
+; darkvoid
+	RGB 15, 15, 15
+	RGB 13, 13, 13
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+; refresh
+	RGB 31, 31, 31
+	RGB 17, 31, 10
+	RGB 00, 25, 19
+	RGB 00, 00, 00
+; heatBG
+	RGB 31, 24, 16
+	RGB 31, 24, 02
+	RGB 29, 03, 04
+	RGB 00, 00, 00
+; goldBG
+	RGB 31, 31, 16
+	RGB 31, 31, 07
+	RGB 31, 16, 01
+	RGB 16, 07, 00
+; strugglebug
+	RGB 31, 31, 31
+	RGB 27, 31, 05
+	RGB 15, 31, 01
+	RGB 00, 12, 12
+; pink
+	RGB 31, 31, 31
+	RGB 31, 26, 29
+	RGB 29, 16, 22
+	RGB 00, 00, 00
+rept NUM_CUSTOM_BATTLE_PALETTES - 6
+endr

gfx/footprints_johto.asm

@@ -64,7 +64,7 @@ INCBIN "gfx/footprints/aercrow.1bpp"
 INCBIN "gfx/footprints/foxfire.1bpp"
 INCBIN "gfx/footprints/yanma.1bpp"
 INCBIN "gfx/footprints/yanmega.1bpp"
-INCBIN "gfx/footprints/pending03.1bpp"
+INCBIN "gfx/footprints/oniyanma.1bpp"
 INCBIN "gfx/footprints/wooper.1bpp"
 INCBIN "gfx/footprints/quagsire.1bpp"
 INCBIN "gfx/footprints/espeon.1bpp"
@@ -145,7 +145,7 @@ INCBIN "gfx/footprints/sonegg.1bpp"
 INCBIN "gfx/footprints/cacawphony.1bpp"
 INCBIN "gfx/footprints/trebir.1bpp"
 INCBIN "gfx/footprints/sakuraze.1bpp"
-INCBIN "gfx/footprints/amanobi.1bpp"
+INCBIN "gfx/footprints/tanobi.1bpp"
 INCBIN "gfx/footprints/trustan.1bpp"
 INCBIN "gfx/footprints/kuwaguard.1bpp"
 INCBIN "gfx/footprints/tonquito.1bpp"
@@ -183,7 +183,8 @@ INCBIN "gfx/footprints/pupitar.1bpp"
 INCBIN "gfx/footprints/tyranitar.1bpp"
 INCBIN "gfx/footprints/lugia.1bpp"
 INCBIN "gfx/footprints/ho_oh.1bpp"
-INCBIN "gfx/footprints/shi_shi.1bpp"
+INCBIN "gfx/footprints/hyoshu_yang.1bpp"
+INCBIN "gfx/footprints/hyoshu_yin.1bpp"
 INCBIN "gfx/footprints/celebi.1bpp"
 INCBIN "gfx/footprints/252.1bpp"
 INCBIN "gfx/footprints/253.1bpp"

gfx/pics.asm

@@ -711,18 +711,19 @@ UnownRBackpic:       INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
 
 SECTION "Pics 19", ROMX
 
-; Seems to be an accidental copy of the previous bank
+UnownExclamationFrontpic: INCBIN "gfx/pokemon/unown_exclamation/front.animated.2bpp.lz"
+UnownExclamationBackpic:  INCBIN "gfx/pokemon/unown_exclamation/back.2bpp.lz"
+UnownQuestionFrontpic: INCBIN "gfx/pokemon/unown_question/front.animated.2bpp.lz"
+UnownQuestionBackpic:  INCBIN "gfx/pokemon/unown_question/back.2bpp.lz"
 
-TotartleFrontpic:    INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz"
-TotartleBackpic:     INCBIN "gfx/pokemon/totartle/back.2bpp.lz"
-BlastykeFrontpic:    INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz"
-BlastykeBackpic:     INCBIN "gfx/pokemon/blastyke/back.2bpp.lz"
 BellignanFrontpic:	 INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz"
 BellignanBackpic:	 INCBIN "gfx/pokemon/bellignan/back.2bpp.lz"
 WalkingWakeFrontpic: INCBIN "gfx/pokemon/walking_wake/front.animated.2bpp.lz"
 WalkingWakeBackpic:	 INCBIN "gfx/pokemon/walking_wake/back.2bpp.lz"
-ShiShiFrontpic:	     INCBIN "gfx/pokemon/shi_shi/front.animated.2bpp.lz"
-ShiShiBackpic:	     INCBIN "gfx/pokemon/shi_shi/back.2bpp.lz"
+HyoshuYangFrontpic:	 INCBIN "gfx/pokemon/hyoshu_yang/front.animated.2bpp.lz"
+HyoshuYangBackpic:   INCBIN "gfx/pokemon/hyoshu_yang/back.2bpp.lz"
+HyoshuYinFrontpic:	 INCBIN "gfx/pokemon/hyoshu_yin/front.animated.2bpp.lz"
+HyoshuYinBackpic:    INCBIN "gfx/pokemon/hyoshu_yin/back.2bpp.lz"
 MunchlaxFrontpic:	 INCBIN "gfx/pokemon/munchlax/front.animated.2bpp.lz"
 MunchlaxBackpic:	 INCBIN "gfx/pokemon/munchlax/back.2bpp.lz"
 NidoreignFrontpic:   INCBIN "gfx/pokemon/nidoreign/front.animated.2bpp.lz"
@@ -800,8 +801,8 @@ TrebirFrontpic:	 INCBIN "gfx/pokemon/trebir/front.animated.2bpp.lz"
 TrebirBackpic:	 INCBIN "gfx/pokemon/trebir/back.2bpp.lz"
 SakurazeFrontpic:	 INCBIN "gfx/pokemon/sakuraze/front.animated.2bpp.lz"
 SakurazeBackpic:	 INCBIN "gfx/pokemon/sakuraze/back.2bpp.lz"
-AmanobiFrontpic:	 INCBIN "gfx/pokemon/amanobi/front.animated.2bpp.lz"
-AmanobiBackpic:	 INCBIN "gfx/pokemon/amanobi/back.2bpp.lz"
+TanobiFrontpic:	 INCBIN "gfx/pokemon/tanobi/front.animated.2bpp.lz"
+TanobiBackpic:	 INCBIN "gfx/pokemon/tanobi/back.2bpp.lz"
 TrustanFrontpic:	 INCBIN "gfx/pokemon/trustan/front.animated.2bpp.lz"
 TrustanBackpic:	 INCBIN "gfx/pokemon/trustan/back.2bpp.lz"
 KuwaguardFrontpic:	 INCBIN "gfx/pokemon/kuwaguard/front.animated.2bpp.lz"
@@ -822,6 +823,10 @@ KiwookedFrontpic:	 INCBIN "gfx/pokemon/kiwooked/front.animated.2bpp.lz"
 KiwookedBackpic::	 INCBIN "gfx/pokemon/kiwooked/back.2bpp.lz"
 CyclorpFrontpic:	 INCBIN "gfx/pokemon/cyclorp/front.animated.2bpp.lz"
 CyclorpBackpic:	 INCBIN "gfx/pokemon/cyclorp/back.2bpp.lz"
+TotartleFrontpic:    INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz"
+TotartleBackpic:     INCBIN "gfx/pokemon/totartle/back.2bpp.lz"
+BlastykeFrontpic:    INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz"
+BlastykeBackpic:     INCBIN "gfx/pokemon/blastyke/back.2bpp.lz"
 
 SECTION "Pics 22", ROMX
 CheepFrontpic:	     INCBIN "gfx/pokemon/cheep/front.animated.2bpp.lz"
@@ -850,8 +855,8 @@ FoxfireFrontpic:     INCBIN "gfx/pokemon/foxfire/front.animated.2bpp.lz"
 FoxfireBackpic:      INCBIN "gfx/pokemon/foxfire/back.2bpp.lz"
 YanmegaFrontpic:     INCBIN "gfx/pokemon/yanmega/front.animated.2bpp.lz"
 YanmegaBackpic:      INCBIN "gfx/pokemon/yanmega/back.2bpp.lz"
-Pending03Frontpic:   INCBIN "gfx/pokemon/pending03/front.animated.2bpp.lz"
-Pending03Backpic:    INCBIN "gfx/pokemon/pending03/back.2bpp.lz"
+OniyanmaFrontpic:    INCBIN "gfx/pokemon/oniyanma/front.animated.2bpp.lz"
+OniyanmaBackpic:     INCBIN "gfx/pokemon/oniyanma/back.2bpp.lz"
 KazappelinFrontpic:  INCBIN "gfx/pokemon/kazappelin/front.animated.2bpp.lz"
 KazappelinBackpic:   INCBIN "gfx/pokemon/kazappelin/back.2bpp.lz"
 QwilfatherFrontpic:  INCBIN "gfx/pokemon/qwilfather/front.animated.2bpp.lz"

gfx/pokemon/anim_pointers.asm

@@ -275,7 +275,7 @@ AnimationPointers:
 	dw FoxfireAnimation
 	dw YanmaAnimation
 	dw YanmegaAnimation
-	dw Pending03Animation
+	dw OniyanmaAnimation
 	dw WooperAnimation
 	dw QuagsireAnimation
 	dw EspeonAnimation
@@ -357,7 +357,7 @@ AnimationPointers:
 	dw CacawphonyAnimation
 	dw TrebirAnimation
 	dw SakurazeAnimation
-	dw AmanobiAnimation
+	dw TanobiAnimation
 	dw TrustanAnimation
 	dw KuwaguardAnimation
 	dw TonquitoAnimation
@@ -395,6 +395,7 @@ AnimationPointers:
 	dw TyranitarAnimation
 	dw LugiaAnimation
 	dw HoOhAnimation
-	dw ShiShiAnimation
+	dw HyoshuYangAnimation
+	dw HyoshuYinAnimation
 	dw CelebiAnimation
 	assert_table_length NUM_POKEMON

gfx/pokemon/anims.asm

@@ -273,7 +273,7 @@ AercrowAnimation:    INCLUDE "gfx/pokemon/aercrow/anim.asm"
 FoxfireAnimation:    INCLUDE "gfx/pokemon/magneton/anim.asm"
 YanmaAnimation:      INCLUDE "gfx/pokemon/yanma/anim.asm"
 YanmegaAnimation:    INCLUDE "gfx/pokemon/yanmega/anim.asm"
-Pending03Animation:  INCLUDE "gfx/pokemon/pending03/anim.asm"
+OniyanmaAnimation:   INCLUDE "gfx/pokemon/oniyanma/anim.asm"
 WooperAnimation:     INCLUDE "gfx/pokemon/wooper/anim.asm"
 QuagsireAnimation:   INCLUDE "gfx/pokemon/quagsire/anim.asm"
 EspeonAnimation:     INCLUDE "gfx/pokemon/espeon/anim.asm"
@@ -355,7 +355,7 @@ SoneggAnimation:    INCLUDE "gfx/pokemon/sonegg/anim.asm"
 CacawphonyAnimation:    INCLUDE "gfx/pokemon/cacawphony/anim.asm"
 TrebirAnimation:    INCLUDE "gfx/pokemon/trebir/anim.asm"
 SakurazeAnimation:    INCLUDE "gfx/pokemon/sakuraze/anim.asm"
-AmanobiAnimation:    INCLUDE "gfx/pokemon/amanobi/anim.asm"
+TanobiAnimation:    INCLUDE "gfx/pokemon/tanobi/anim.asm"
 TrustanAnimation:    INCLUDE "gfx/pokemon/trustan/anim.asm"
 KuwaguardAnimation:    INCLUDE "gfx/pokemon/kuwaguard/anim.asm"
 TonquitoAnimation:    INCLUDE "gfx/pokemon/tonquito/anim.asm"
@@ -394,6 +394,7 @@ PupitarAnimation:    INCLUDE "gfx/pokemon/pupitar/anim.asm"
 TyranitarAnimation:  INCLUDE "gfx/pokemon/tyranitar/anim.asm"
 LugiaAnimation:      INCLUDE "gfx/pokemon/lugia/anim.asm"
 HoOhAnimation:       INCLUDE "gfx/pokemon/ho_oh/anim.asm"
-ShiShiAnimation:     INCLUDE "gfx/pokemon/shi_shi/anim.asm"
+HyoshuYangAnimation: INCLUDE "gfx/pokemon/hyoshu_yang/anim.asm"
+HyoshuYinAnimation:  INCLUDE "gfx/pokemon/hyoshu_yin/anim.asm"
 CelebiAnimation:     INCLUDE "gfx/pokemon/celebi/anim.asm"
 EggAnimation:        INCLUDE "gfx/pokemon/egg/anim.asm"

gfx/pokemon/bitmask_pointers.asm

@@ -275,7 +275,7 @@ BitmasksPointers:
 	dw FoxfireBitmasks
 	dw YanmaBitmasks
 	dw YanmegaBitmasks
-	dw Pending03Bitmasks
+	dw OniyanmaBitmasks
 	dw WooperBitmasks
 	dw QuagsireBitmasks
 	dw EspeonBitmasks
@@ -357,7 +357,7 @@ BitmasksPointers:
 	dw CacawphonyBitmasks
 	dw TrebirBitmasks
 	dw SakurazeBitmasks
-	dw AmanobiBitmasks
+	dw TanobiBitmasks
 	dw TrustanBitmasks
 	dw KuwaguardBitmasks
 	dw TonquitoBitmasks
@@ -396,6 +396,7 @@ BitmasksPointers:
 	dw TyranitarBitmasks
 	dw LugiaBitmasks
 	dw HoOhBitmasks
-	dw ShiShiBitmasks
+	dw HyoshuYangBitmasks
+	dw HyoshuYinBitmasks
 	dw CelebiBitmasks
 	assert_table_length NUM_POKEMON

gfx/pokemon/bitmasks.asm

@@ -273,7 +273,7 @@ AercrowBitmasks:    INCLUDE "gfx/pokemon/aercrow/bitmask.asm"
 FoxfireBitmasks:    INCLUDE "gfx/pokemon/foxfire/bitmask.asm"
 YanmaBitmasks:      INCLUDE "gfx/pokemon/yanma/bitmask.asm"
 YanmegaBitmasks:    INCLUDE "gfx/pokemon/yanmega/bitmask.asm"
-Pending03Bitmasks:  INCLUDE "gfx/pokemon/pending03/bitmask.asm"
+OniyanmaBitmasks:   INCLUDE "gfx/pokemon/oniyanma/bitmask.asm"
 WooperBitmasks:     INCLUDE "gfx/pokemon/wooper/bitmask.asm"
 QuagsireBitmasks:   INCLUDE "gfx/pokemon/quagsire/bitmask.asm"
 EspeonBitmasks:     INCLUDE "gfx/pokemon/espeon/bitmask.asm"
@@ -355,7 +355,7 @@ SoneggBitmasks:    INCLUDE "gfx/pokemon/sonegg/bitmask.asm"
 CacawphonyBitmasks:    INCLUDE "gfx/pokemon/cacawphony/bitmask.asm"
 TrebirBitmasks:    INCLUDE "gfx/pokemon/trebir/bitmask.asm"
 SakurazeBitmasks:    INCLUDE "gfx/pokemon/sakuraze/bitmask.asm"
-AmanobiBitmasks:    INCLUDE "gfx/pokemon/amanobi/bitmask.asm"
+TanobiBitmasks:    INCLUDE "gfx/pokemon/tanobi/bitmask.asm"
 TrustanBitmasks:    INCLUDE "gfx/pokemon/trustan/bitmask.asm"
 KuwaguardBitmasks:    INCLUDE "gfx/pokemon/kuwaguard/bitmask.asm"
 TonquitoBitmasks:    INCLUDE "gfx/pokemon/tonquito/bitmask.asm"
@@ -394,6 +394,7 @@ PupitarBitmasks:    INCLUDE "gfx/pokemon/pupitar/bitmask.asm"
 TyranitarBitmasks:  INCLUDE "gfx/pokemon/tyranitar/bitmask.asm"
 LugiaBitmasks:      INCLUDE "gfx/pokemon/lugia/bitmask.asm"
 HoOhBitmasks:       INCLUDE "gfx/pokemon/ho_oh/bitmask.asm"
-ShiShiBitmasks:     INCLUDE "gfx/pokemon/shi_shi/bitmask.asm"
+HyoshuYangBitmasks: INCLUDE "gfx/pokemon/hyoshu_yang/bitmask.asm"
+HyoshuYinBitmasks:  INCLUDE "gfx/pokemon/hyoshu_yin/bitmask.asm"
 CelebiBitmasks:     INCLUDE "gfx/pokemon/celebi/bitmask.asm"
 EggBitmasks:        INCLUDE "gfx/pokemon/egg/bitmask.asm"

gfx/pokemon/flutter_mane/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 22, 12
-	RGB 07, 15, 25
+	RGB 28, 12, 08
+	RGB 14, 20, 06

gfx/pokemon/frame_pointers.asm

@@ -275,7 +275,7 @@ FramesPointers:
 	dba FoxfireFrames
 	dba YanmaFrames
 	dba YanmegaFrames
-	dba Pending03Frames
+	dba OniyanmaFrames
 	dba WooperFrames
 	dba QuagsireFrames
 	dba EspeonFrames
@@ -357,7 +357,7 @@ FramesPointers:
 	dba CacawphonyFrames
 	dba TrebirFrames
 	dba SakurazeFrames
-	dba AmanobiFrames
+	dba TanobiFrames
 	dba TrustanFrames
 	dba KuwaguardFrames
 	dba TonquitoFrames
@@ -396,6 +396,7 @@ FramesPointers:
 	dba TyranitarFrames
 	dba LugiaFrames
 	dba HoOhFrames
-	dba ShiShiFrames
+	dba HyoshuYangFrames
+	dba HyoshuYinFrames
 	dba CelebiFrames
 	assert_table_length NUM_POKEMON

gfx/pokemon/growlithe_hisui/shiny.pal

@@ -0,0 +1,4 @@
+
+	RGB 23, 20, 07
+	RGB 21, 13, 00
+

gfx/pokemon/hirsuswine/shiny.pal

@@ -1,2 +1,2 @@
-	RGB 22, 19, 00
-	RGB 19, 11, 00
+	RGB 16, 18, 28
+	RGB 11, 07, 19

gfx/pokemon/hyoshu_yang/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 28, 26, 10
+	RGB 22, 20, 05

gfx/pokemon/hyoshu_yin/shiny.pal

@@ -0,0 +1,2 @@
+	RGB 25, 23, 07
+	RGB 20, 18, 03

gfx/pokemon/idle_pointers.asm

@@ -275,7 +275,7 @@ AnimationIdlePointers:
 	dw FoxfireAnimationIdle
 	dw YanmaAnimationIdle
 	dw YanmegaAnimationIdle
-	dw Pending03AnimationIdle
+	dw OniyanmaAnimationIdle
 	dw WooperAnimationIdle
 	dw QuagsireAnimationIdle
 	dw EspeonAnimationIdle
@@ -357,7 +357,7 @@ AnimationIdlePointers:
 	dw CacawphonyAnimationIdle
 	dw TrebirAnimationIdle
 	dw SakurazeAnimationIdle
-	dw AmanobiAnimationIdle
+	dw TanobiAnimationIdle
 	dw TrustanAnimationIdle
 	dw KuwaguardAnimationIdle
 	dw TonquitoAnimationIdle
@@ -395,6 +395,7 @@ AnimationIdlePointers:
 	dw TyranitarAnimationIdle
 	dw LugiaAnimationIdle
 	dw HoOhAnimationIdle
-	dw ShiShiAnimationIdle
+	dw HyoshuYangAnimationIdle
+	dw HyoshuYinAnimationIdle
 	dw CelebiAnimationIdle
 	assert_table_length NUM_POKEMON

gfx/pokemon/idles.asm

@@ -273,7 +273,7 @@ AercrowAnimationIdle:    INCLUDE "gfx/pokemon/aercrow/anim_idle.asm"
 FoxfireAnimationIdle:    INCLUDE "gfx/pokemon/foxfire/anim_idle.asm"
 YanmaAnimationIdle:      INCLUDE "gfx/pokemon/yanma/anim_idle.asm"
 YanmegaAnimationIdle:    INCLUDE "gfx/pokemon/yanmega/anim_idle.asm"
-Pending03AnimationIdle:  INCLUDE "gfx/pokemon/pending03/anim_idle.asm"
+OniyanmaAnimationIdle:   INCLUDE "gfx/pokemon/oniyanma/anim_idle.asm"
 WooperAnimationIdle:     INCLUDE "gfx/pokemon/wooper/anim_idle.asm"
 QuagsireAnimationIdle:   INCLUDE "gfx/pokemon/quagsire/anim_idle.asm"
 EspeonAnimationIdle:     INCLUDE "gfx/pokemon/espeon/anim_idle.asm"
@@ -355,7 +355,7 @@ SoneggAnimationIdle:    INCLUDE "gfx/pokemon/sonegg/anim_idle.asm"
 CacawphonyAnimationIdle:    INCLUDE "gfx/pokemon/cacawphony/anim_idle.asm"
 TrebirAnimationIdle:    INCLUDE "gfx/pokemon/trebir/anim_idle.asm"
 SakurazeAnimationIdle:    INCLUDE "gfx/pokemon/sakuraze/anim_idle.asm"
-AmanobiAnimationIdle:    INCLUDE "gfx/pokemon/amanobi/anim_idle.asm"
+TanobiAnimationIdle:    INCLUDE "gfx/pokemon/tanobi/anim_idle.asm"
 TrustanAnimationIdle:    INCLUDE "gfx/pokemon/trustan/anim_idle.asm"
 KuwaguardAnimationIdle:    INCLUDE "gfx/pokemon/kuwaguard/anim_idle.asm"
 TonquitoAnimationIdle:    INCLUDE "gfx/pokemon/tonquito/anim_idle.asm"
@@ -394,6 +394,7 @@ PupitarAnimationIdle:    INCLUDE "gfx/pokemon/pupitar/anim_idle.asm"
 TyranitarAnimationIdle:  INCLUDE "gfx/pokemon/tyranitar/anim_idle.asm"
 LugiaAnimationIdle:      INCLUDE "gfx/pokemon/lugia/anim_idle.asm"
 HoOhAnimationIdle:       INCLUDE "gfx/pokemon/ho_oh/anim_idle.asm"
-ShiShiAnimationIdle:     INCLUDE "gfx/pokemon/shi_shi/anim_idle.asm"
+HyoshuYangAnimationIdle: INCLUDE "gfx/pokemon/hyoshu_yang/anim_idle.asm"
+HyoshuYinAnimationIdle:  INCLUDE "gfx/pokemon/hyoshu_yin/anim_idle.asm"
 CelebiAnimationIdle:     INCLUDE "gfx/pokemon/celebi/anim_idle.asm"
 EggAnimationIdle:        INCLUDE "gfx/pokemon/egg/anim_idle.asm"

gfx/pokemon/johto_frames.asm

@@ -63,7 +63,7 @@ AercrowFrames:    INCLUDE "gfx/pokemon/aercrow/frames.asm"
 FoxfireFrames:    INCLUDE "gfx/pokemon/foxfire/frames.asm"
 YanmaFrames:      INCLUDE "gfx/pokemon/yanma/frames.asm"
 YanmegaFrames:    INCLUDE "gfx/pokemon/yanmega/frames.asm"
-Pending03Frames:  INCLUDE "gfx/pokemon/pending03/frames.asm"
+OniyanmaFrames:   INCLUDE "gfx/pokemon/oniyanma/frames.asm"
 WooperFrames:     INCLUDE "gfx/pokemon/wooper/frames.asm"
 QuagsireFrames:   INCLUDE "gfx/pokemon/quagsire/frames.asm"
 EspeonFrames:     INCLUDE "gfx/pokemon/espeon/frames.asm"
@@ -145,7 +145,7 @@ SoneggFrames:    INCLUDE "gfx/pokemon/sonegg/frames.asm"
 CacawphonyFrames:    INCLUDE "gfx/pokemon/cacawphony/frames.asm"
 TrebirFrames:    INCLUDE "gfx/pokemon/trebir/frames.asm"
 SakurazeFrames:    INCLUDE "gfx/pokemon/sakuraze/frames.asm"
-AmanobiFrames:    INCLUDE "gfx/pokemon/amanobi/frames.asm"
+TanobiFrames:    INCLUDE "gfx/pokemon/tanobi/frames.asm"
 TrustanFrames:    INCLUDE "gfx/pokemon/trustan/frames.asm"
 KuwaguardFrames:    INCLUDE "gfx/pokemon/kuwaguard/frames.asm"
 TonquitoFrames:    INCLUDE "gfx/pokemon/tonquito/frames.asm"
@@ -184,6 +184,7 @@ PupitarFrames:    INCLUDE "gfx/pokemon/pupitar/frames.asm"
 TyranitarFrames:  INCLUDE "gfx/pokemon/tyranitar/frames.asm"
 LugiaFrames:      INCLUDE "gfx/pokemon/lugia/frames.asm"
 HoOhFrames:       INCLUDE "gfx/pokemon/ho_oh/frames.asm"
-ShiShiFrames:     INCLUDE "gfx/pokemon/shi_shi/frames.asm"
+HyoshuYangFrames: INCLUDE "gfx/pokemon/hyoshu_yang/frames.asm"
+HyoshuYinFrames:  INCLUDE "gfx/pokemon/hyoshu_yin/frames.asm"
 CelebiFrames:     INCLUDE "gfx/pokemon/celebi/frames.asm"
 EggFrames:        INCLUDE "gfx/pokemon/egg/frames.asm"

gfx/pokemon/munchlax/credit.txt

@@ -0,0 +1,2 @@
+Taken from here: https://github.com/pret/pokecrystal/wiki/Add-a-new-Pok%C3%A9mon
+Made by SCMidna

gfx/pokemon/oniyanma/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/oniyanma/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/shi_shi/shiny.pal

@@ -1,2 +0,0 @@
-	RGB 18, 18, 11
-	RGB 25, 25, 18

gfx/pokemon/tanobi/anim.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/tanobi/anim_idle.asm

@@ -0,0 +1 @@
+	endanim

gfx/pokemon/unown_anim_pointers.asm

@@ -26,4 +26,6 @@ UnownAnimationPointers:
 	dw UnownXAnimation
 	dw UnownYAnimation
 	dw UnownZAnimation
+	dw UnownExclamationAnimation
+	dw UnownQuestionAnimation
 	assert_table_length NUM_UNOWN

gfx/pokemon/unown_anims.asm

@@ -24,3 +24,5 @@ UnownWAnimation: INCLUDE "gfx/pokemon/unown_w/anim.asm"
 UnownXAnimation: INCLUDE "gfx/pokemon/unown_x/anim.asm"
 UnownYAnimation: INCLUDE "gfx/pokemon/unown_y/anim.asm"
 UnownZAnimation: INCLUDE "gfx/pokemon/unown_z/anim.asm"
+UnownExclamationAnimation: INCLUDE "gfx/pokemon/unown_exclamation/anim.asm"
+UnownQuestionAnimation: INCLUDE "gfx/pokemon/unown_question/anim.asm"

gfx/pokemon/unown_bitmask_pointers.asm

@@ -26,4 +26,6 @@ UnownBitmasksPointers:
 	dw UnownXBitmasks
 	dw UnownYBitmasks
 	dw UnownZBitmasks
+	dw UnownExclamationBitmasks
+	dw UnownQuestionBitmasks
 	assert_table_length NUM_UNOWN

gfx/pokemon/unown_bitmasks.asm

@@ -24,3 +24,5 @@ UnownWBitmasks: INCLUDE "gfx/pokemon/unown_w/bitmask.asm"
 UnownXBitmasks: INCLUDE "gfx/pokemon/unown_x/bitmask.asm"
 UnownYBitmasks: INCLUDE "gfx/pokemon/unown_y/bitmask.asm"
 UnownZBitmasks: INCLUDE "gfx/pokemon/unown_z/bitmask.asm"
+UnownExclamationBitmasks: INCLUDE "gfx/pokemon/unown_exclamation/bitmask.asm"
+UnownQuestionBitmasks: INCLUDE "gfx/pokemon/unown_question/bitmask.asm"

gfx/pokemon/unown_exclamation/anim.asm

@@ -0,0 +1,9 @@
+	frame 0, 09
+	frame 1, 09
+	frame 2, 09
+	frame 3, 05
+	frame 2, 05
+	frame 4, 05
+	frame 1, 05
+	frame 1, 05
+	endanim

gfx/pokemon/unown_exclamation/anim_idle.asm

@@ -0,0 +1,6 @@
+	frame 0, 18
+	setrepeat 2
+	frame 5, 05
+	frame 0, 05
+	dorepeat 2
+	endanim

gfx/pokemon/unown_exclamation/credit.txt

@@ -0,0 +1 @@
+Taken from Rangi's Tutorial: https://github.com/pret/pokecrystal/wiki/Add-a-new-Unown-form

gfx/pokemon/unown_frame_pointers.asm

@@ -26,4 +26,6 @@ UnownFramesPointers:
 	dw UnownXFrames
 	dw UnownYFrames
 	dw UnownZFrames
+	dw UnownExclamationFrames
+	dw UnownQuestionFrames
 	assert_table_length NUM_UNOWN

gfx/pokemon/unown_frames.asm

@@ -26,3 +26,5 @@ UnownWFrames: INCLUDE "gfx/pokemon/unown_w/frames.asm"
 UnownXFrames: INCLUDE "gfx/pokemon/unown_x/frames.asm"
 UnownYFrames: INCLUDE "gfx/pokemon/unown_y/frames.asm"
 UnownZFrames: INCLUDE "gfx/pokemon/unown_z/frames.asm"
+UnownExclamationFrames: INCLUDE "gfx/pokemon/unown_exclamation/frames.asm"
+UnownQuestionFrames: INCLUDE "gfx/pokemon/unown_question/frames.asm"

gfx/pokemon/unown_idle_pointers.asm

@@ -26,4 +26,6 @@ UnownAnimationIdlePointers:
 	dw UnownXAnimationIdle
 	dw UnownYAnimationIdle
 	dw UnownZAnimationIdle
+	dw UnownExclamationAnimationIdle
+	dw UnownQuestionAnimationIdle
 	assert_table_length NUM_UNOWN

gfx/pokemon/unown_idles.asm

@@ -24,3 +24,5 @@ UnownWAnimationIdle: INCLUDE "gfx/pokemon/unown_w/anim_idle.asm"
 UnownXAnimationIdle: INCLUDE "gfx/pokemon/unown_x/anim_idle.asm"
 UnownYAnimationIdle: INCLUDE "gfx/pokemon/unown_y/anim_idle.asm"
 UnownZAnimationIdle: INCLUDE "gfx/pokemon/unown_z/anim_idle.asm"
+UnownExclamationAnimationIdle: INCLUDE "gfx/pokemon/unown_exclamation/anim_idle.asm"
+UnownQuestionAnimationIdle: INCLUDE "gfx/pokemon/unown_question/anim_idle.asm"

gfx/pokemon/unown_question/anim.asm

@@ -0,0 +1,8 @@
+	frame 0, 09
+	setrepeat 3
+	frame 1, 05
+	frame 2, 05
+	frame 1, 05
+	frame 0, 05
+	dorepeat 2
+	endanim

gfx/pokemon/unown_question/anim_idle.asm

@@ -0,0 +1,6 @@
+	frame 0, 13
+	setrepeat 2
+	frame 3, 05
+	frame 0, 05
+	dorepeat 2
+	endanim

gfx/pokemon/unown_question/credit.txt

@@ -0,0 +1 @@
+Taken from Rangi's Tutorial: https://github.com/pret/pokecrystal/wiki/Add-a-new-Unown-form

gfx/splash/ditto.pal

@@ -1,4 +1,4 @@
 	RGB 31, 31, 31
 	RGB 13, 11, 00
-	RGB 23, 12, 28
+	RGB 17, 22, 28
 	RGB 00, 00, 00

gfx/splash/ditto_fade.pal

@@ -2,19 +2,19 @@
 ; Fade from pink to orange.
 ; One color per step.
 
-	RGB 23, 12, 28
-	RGB 23, 12, 27
-	RGB 23, 13, 26
-	RGB 23, 13, 24
-	RGB 24, 14, 22
-	RGB 24, 14, 20
-	RGB 24, 15, 18
-	RGB 24, 15, 16
-	RGB 25, 16, 14
-	RGB 25, 16, 12
-	RGB 25, 17, 10
-	RGB 25, 17, 08
-	RGB 26, 18, 06
-	RGB 26, 18, 04
+	RGB 17, 22, 28
+	RGB 17, 22, 27
+	RGB 18, 22, 26
+	RGB 19, 22, 24
+	RGB 19, 21, 22
+	RGB 20, 21, 20
+	RGB 21, 21, 18
+	RGB 21, 21, 16
+	RGB 22, 20, 14
+	RGB 23, 20, 12
+	RGB 23, 20, 10
+	RGB 24, 20, 08
+	RGB 25, 19, 06
+	RGB 25, 19, 04
 	RGB 26, 19, 02
 	RGB 26, 19, 00

gfx/stats/pages.pal

@@ -13,3 +13,9 @@
 	RGB 17, 31, 31
 	RGB 17, 31, 31
 	RGB 00, 00, 00
+; orange
+	RGB 31, 31, 31
+	RGB 30, 24, 16
+	RGB 30, 22, 12
+	RGB 00, 00, 00
+	

gfx/stats/stats.pal

@@ -4,3 +4,5 @@
 	RGB 21, 31, 14
 ; blue
 	RGB 17, 31, 31
+; orange
+	RGB 30, 24, 16

gfx/tilesets.asm

@@ -565,18 +565,6 @@ INCBIN "data/tilesets/pokecenter_metatiles.bin"
 TilesetPokecenterColl::
 INCLUDE "data/tilesets/pokecenter_collision.asm"
 
-TilesetLavenderCryptAttr::
-INCBIN "data/tilesets/lavendercrypt_attributes.bin"
-
-TilesetLavenderCryptGFX::
-INCBIN "gfx/tilesets/lavendercrypt.2bpp.lz"
-
-TilesetLavenderCryptMeta::
-INCBIN "data/tilesets/lavendercrypt_metatiles.bin"
-
-TilesetLavenderCryptColl::
-INCLUDE "data/tilesets/lavendercrypt_collision.asm"
-
 TilesetBlueLabAttr::
 INCBIN "data/tilesets/bluelab_attributes.bin"
 
@@ -613,8 +601,6 @@ INCBIN "data/tilesets/nihonmart_metatiles.bin"
 TilesetNihonMartColl::
 INCLUDE "data/tilesets/nihonmart_collision.asm"
 
-SECTION "Tileset Data 15", ROMX
-
 TilesetNihonWhiteCityAttr::
 INCBIN "data/tilesets/nihon_whitecity_attributes.bin"
 
@@ -627,7 +613,8 @@ INCBIN "data/tilesets/nihon_whitecity_metatiles.bin"
 TilesetNihonWhiteCityColl::
 INCLUDE "data/tilesets/nihon_whitecity_collision.asm"
 
-; Inclusion of NEW things made it so I had to move it. THE DOMAIN EXPANSION, WAHOO!
+SECTION "Tileset Data 15", ROMX
+
 TilesetTowerGFX::
 INCBIN "gfx/tilesets/tower.2bpp.lz"
 
@@ -651,3 +638,19 @@ INCLUDE "data/tilesets/sevii_collision.asm"
 
 TilesetSeviiAttr::
 INCBIN "data/tilesets/sevii_attributes.bin"
+
+; there should be space here, lavender crypt's set is just big
+
+SECTION "Tileset Data 16", ROMX
+; This tileset is very big and detailed.
+TilesetLavenderCryptAttr::
+INCBIN "data/tilesets/lavendercrypt_attributes.bin"
+
+TilesetLavenderCryptGFX::
+INCBIN "gfx/tilesets/lavendercrypt.2bpp.lz"
+
+TilesetLavenderCryptMeta::
+INCBIN "data/tilesets/lavendercrypt_metatiles.bin"
+
+TilesetLavenderCryptColl::
+INCLUDE "data/tilesets/lavendercrypt_collision.asm"