merge with upcoming

Makefile

@@ -142,7 +142,8 @@ ROMTESTHYDRA := tools/mgba-rom-test-hydra/mgba-rom-test-hydra$(EXE)
 
 PERL := perl
 
-TOOLDIRS := $(filter-out tools/mgba tools/agbcc tools/binutils,$(wildcard tools/*))
+TOOLDIRS := tools/aif2pcm tools/bin2c tools/gbafix tools/gbagfx tools/jsonproc tools/mapjson tools/mid2agb tools/preproc tools/ramscrgen tools/rsfont tools/scaninc
+CHECKTOOLDIRS = tools/patchelf tools/mgba-rom-test-hydra
 TOOLBASE = $(TOOLDIRS:tools/%=%)
 TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
 
@@ -158,7 +159,7 @@ MAKEFLAGS += --no-print-directory
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:
 
-.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS) libagbsyscall modern tidymodern tidynonmodern check
+.PHONY: all rom clean compare tidy tools check-tools mostlyclean clean-tools clean-check-tools $(TOOLDIRS) $(CHECKTOOLDIRS) libagbsyscall modern tidymodern tidynonmodern check
 
 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
 
@@ -176,9 +177,9 @@ endif
 ifeq (,$(MAKECMDGOALS))
   SCAN_DEPS ?= 1
 else
-  # clean, tidy, tools, mostlyclean, clean-tools, $(TOOLDIRS), tidymodern, tidynonmodern don't even build the ROM
+  # clean, tidy, tools, check-tools, mostlyclean, clean-tools, clean-check-tools, $(TOOLDIRS), $(CHECKTOOLDIRS), tidymodern, tidynonmodern don't even build the ROM
   # libagbsyscall does its own thing
-  ifeq (,$(filter-out clean tidy tools mostlyclean clean-tools $(TOOLDIRS) tidymodern tidynonmodern libagbsyscall,$(MAKECMDGOALS)))
+  ifeq (,$(filter-out clean tidy tools mostlyclean clean-tools $(TOOLDIRS) clean-check-tools $(CHECKTOOLDIRS) tidymodern tidynonmodern libagbsyscall,$(MAKECMDGOALS)))
     SCAN_DEPS ?= 0
   else
     SCAN_DEPS ?= 1
@@ -229,11 +230,16 @@ all: rom
 
 tools: $(TOOLDIRS)
 
+check-tools: $(CHECKTOOLDIRS)
+
 syms: $(SYM)
 
 $(TOOLDIRS):
 	@$(MAKE) -C $@
 
+$(CHECKTOOLDIRS):
+	@$(MAKE) -C $@
+
 rom: $(ROM)
 ifeq ($(COMPARE),1)
 	@$(SHA1) rom.sha1
@@ -242,11 +248,14 @@ endif
 # For contributors to make sure a change didn't affect the contents of the ROM.
 compare: all
 
-clean: mostlyclean clean-tools
+clean: mostlyclean clean-tools clean-check-tools
 
 clean-tools:
 	@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)
 
+clean-check-tools:
+	@$(foreach tooldir,$(CHECKTOOLDIRS),$(MAKE) clean -C $(tooldir);)
+
 mostlyclean: tidynonmodern tidymodern
 	rm -f $(SAMPLE_SUBDIR)/*.bin
 	rm -f $(CRY_SUBDIR)/*.bin
@@ -455,11 +464,11 @@ LD_SCRIPT_TEST := ld_script_test.txt
 $(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST) $(LD_SCRIPT_DEPS)
 	cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT_TEST) > ld_script_test.ld
 
-$(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall
+$(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall check-tools
 	@echo "cd $(OBJ_DIR) && $(LD) -T ld_script_test.ld -o ../../$@ <objects> <test-objects> <lib>"
 	@cd $(OBJ_DIR) && $(LD) $(TESTLDFLAGS) -T ld_script_test.ld -o ../../$@ $(OBJS_REL) $(TEST_OBJS_REL) $(LIB)
 	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
-	$(PATCHELF) pokeemerald-test.elf gTestRunnerArgv "$(TESTS)\0"
+	$(PATCHELF) $(TESTELF) gTestRunnerArgv "$(TESTS)\0"
 
 ifeq ($(GITHUB_REPOSITORY_OWNER),rh-hideout)
 TEST_SKIP_IS_FAIL := \x01

asm/macros/battle_script.inc

@@ -731,7 +731,7 @@
 	.4byte \ptr
 	.endm
 
-	.macro jumpifcantmakeasleep ptr:req
+	.macro jumpifuproarwakes ptr:req
 	.byte 0x84
 	.4byte \ptr
 	.endm

data/battle_anim_scripts.s

@@ -2644,7 +2644,6 @@ GigaImpactContinuity:
 	delay 11
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5
 	delay 6
-	waitbgfadeout
 	createsprite gBasicHitSplatSpriteTemplate, 4, 4, -10, 0, 1, 0
 	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	delay 1
@@ -4333,12 +4332,12 @@ Move_SPACIAL_REND:
 	waitbgfadein
 	loopsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET, 3, 5
 	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, SOUND_PAN_ATTACKER, 0xb0, 0x28
-	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xff40, 0xf0, 0x28
+	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xff40, 0xf0, 0x28
-	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, SOUND_PAN_ATTACKER, 0xff60, 0x28
+	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, SOUND_PAN_ATTACKER, 0xff60, 0x28
-	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xff40, 0xff90, 0x28
+	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xff40, 0xff90, 0x28
-	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xa0, 0x30, 0x28
+	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xa0, 0x30, 0x28
-	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xff20, 0xffe0, 0x28
+	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xff20, 0xffe0, 0x28
-	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0x70, 0xff80, 0x28
+	createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0x70, 0xff80, 0x28
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
 	waitforvisualfinish
 	restorebg
@@ -14003,11 +14002,12 @@ Move_STRANGE_STEAM::
 	clearmonbg ANIM_DEF_PARTNER
 	end
 StrangeSteamCloud:
-	launchtemplate gStrangeSteamPinkCloudTemplate 0x82 0x5 0xf 0xf 0x14 0x0 0x0
+	createsprite gStrangeSteamPinkCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0, 0
-	launchtemplate gStrangeSteamGreenCloudTemplate 0x82 0x5 0xf 0xf 0x14 0xa 0x5
+	createsprite gStrangeSteamGreenCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xa, 0x5
-	launchtemplate gStrangeSteamPinkCloudTemplate 0x82 0x5 0xf 0xf 0x14 0xfff6 0xfffb
+	createsprite gStrangeSteamPinkCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xfff6, 0xfffb
-	launchtemplate gStrangeSteamGreenCloudTemplate 0x82 0x5 0xf 0xf 0x14 0x14 0xa
+	delay 0x1
-	launchtemplate gStrangeSteamBlueCloudTemplate 0x82 0x5 0xf 0xf 0x14 0xffec 0xfff6
+	createsprite gStrangeSteamGreenCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0x14, 0xa
+	createsprite gStrangeSteamBlueCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xffec, 0xfff6
 	delay 0x2
 	return
 
@@ -14371,6 +14371,21 @@ Move_SCORCHING_SANDS::
 Move_JUNGLE_HEALING::
 	goto Move_AROMATHERAPY
 		
+Move_SILK_TRAP::
+	loadspritegfx ANIM_TAG_PROTECT
+	loadspritegfx ANIM_TAG_SPIDER_WEB
+	splitbgprio ANIM_ATTACKER
+	playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
+	createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, FALSE
+	waitforvisualfinish
+	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, RGB_LIME_GREEN
+	monbg ANIM_ATK_PARTNER 
+	waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10 
+	createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90
+	waitforvisualfinish
+	clearmonbg ANIM_ATK_PARTNER 
+	end
+
 Move_WICKED_BLOW::
 Move_SURGING_STRIKES::
 Move_THUNDER_CAGE::
@@ -14406,7 +14421,6 @@ Move_SANDSEAR_STORM::
 Move_LUNAR_BLESSING::
 Move_TAKE_HEART::
 Move_TERA_BLAST::
-Move_SILK_TRAP::
 Move_AXE_KICK::
 Move_LAST_RESPECTS::
 Move_LUMINA_CRASH::
@@ -21119,7 +21133,11 @@ Move_POISON_GAS:
 	createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 40
 	loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 28, 6
+.if B_UPDATED_MOVE_DATA >= GEN_5
+	createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_DEF_SIDE, 6, 2, 0, 12, RGB(26, 0, 26)
+.else
 	createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 6, 2, 0, 12, RGB(26, 0, 26)
+.endif
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_DEF_PARTNER

data/battle_scripts_1.s

@@ -3164,7 +3164,9 @@ BattleScript_EffectSleep::
 	ppreduce
 	jumpifsubstituteblocks BattleScript_ButItFailed
 	jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_AlreadyAsleep
-	jumpifcantmakeasleep BattleScript_CantMakeAsleep
+	jumpifuproarwakes BattleScript_CantMakeAsleep
+	jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_InsomniaProtects
+	jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_InsomniaProtects
 	jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
 	jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects
 	jumpifflowerveil BattleScript_FlowerVeilProtects
@@ -3262,6 +3264,14 @@ BattleScript_LeafGuardProtects:
 	orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
 	goto BattleScript_MoveEnd
 	
+BattleScript_InsomniaProtects:
+	pause B_WAIT_TIME_SHORT
+	call BattleScript_AbilityPopUp
+	printstring STRINGID_PKMNSTAYEDAWAKEUSING
+	waitmessage B_WAIT_TIME_LONG
+	orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
+	goto BattleScript_MoveEnd
+
 BattleScript_AlreadyAsleep::
 	setalreadystatusedmoveattempt BS_ATTACKER
 	pause B_WAIT_TIME_SHORT
@@ -3823,7 +3833,9 @@ BattleScript_EffectRest::
 	ppreduce
 	jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_RestIsAlreadyAsleep
 	jumpifability BS_ATTACKER, ABILITY_COMATOSE, BattleScript_RestIsAlreadyAsleep
-	jumpifcantmakeasleep BattleScript_RestCantSleep
+	jumpifuproarwakes BattleScript_RestCantSleep
+	jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_InsomniaProtects
+	jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_InsomniaProtects
 	trysetrest BattleScript_AlreadyAtFullHp
 	pause B_WAIT_TIME_SHORT
 	printfromtable gRestUsedStringIds
@@ -4136,6 +4148,7 @@ BattleScript_EffectParalyze:
 BattleScript_BattleScript_EffectParalyzeNoTypeCalc:
 	jumpifmovehadnoeffect BattleScript_ButItFailed
 	jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_AlreadyParalyzed
+	jumpifabsorbaffected BS_TARGET, BattleScript_VoltAbsorbHeal
 	tryparalyzetype BS_ATTACKER, BS_TARGET, BattleScript_NotAffected
 	jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
 	jumpifterrainaffected BS_TARGET, STATUS_FIELD_MISTY_TERRAIN, BattleScript_MistyTerrainPrevents
@@ -4150,6 +4163,11 @@ BattleScript_BattleScript_EffectParalyzeNoTypeCalc:
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
 	
+BattleScript_VoltAbsorbHeal:
+	copybyte gBattlerAbility, gBattlerTarget
+	tryhealquarterhealth BS_TARGET BattleScript_MonMadeMoveUseless @ Check if max hp
+	goto BattleScript_MoveHPDrain
+
 BattleScript_AlreadyParalyzed:
 	setalreadystatusedmoveattempt BS_ATTACKER
 	pause B_WAIT_TIME_SHORT
@@ -5847,9 +5865,9 @@ BattleScript_EffectYawn::
 	attackcanceler
 	attackstring
 	ppreduce
-	jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBankAbilityMadeIneffective
+	jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBattlerAbilityMadeIneffective
-	jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective
+	jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_PrintBattlerAbilityMadeIneffective
-	jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_PrintBankAbilityMadeIneffective
+	jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_PrintBattlerAbilityMadeIneffective
 	jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects
 	jumpifflowerveil BattleScript_FlowerVeilProtects
 	jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects
@@ -5857,17 +5875,18 @@ BattleScript_EffectYawn::
 	jumpifsubstituteblocks BattleScript_ButItFailed
 	jumpifsafeguard BattleScript_SafeguardProtected
 	accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
-	jumpifcantmakeasleep BattleScript_ButItFailed
+	jumpifuproarwakes BattleScript_ButItFailed
 	setyawn BattleScript_ButItFailed
 	attackanimation
 	waitanimation
 	printstring STRINGID_PKMNWASMADEDROWSY
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
-BattleScript_PrintBankAbilityMadeIneffective::
+BattleScript_PrintBattlerAbilityMadeIneffective::
 	copybyte sBATTLER, gBattlerAbility
 BattleScript_PrintAbilityMadeIneffective::
 	pause B_WAIT_TIME_SHORT
+	call BattleScript_AbilityPopUp
 	printstring STRINGID_PKMNSXMADEITINEFFECTIVE
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
@@ -7868,6 +7887,16 @@ BattleScript_AftermathDmg::
 	tryfaintmon BS_ATTACKER
 	return
 	
+BattleScript_DampPreventsAftermath::
+	pause B_WAIT_TIME_SHORT
+	call BattleScript_AbilityPopUp
+	pause 40
+	copybyte gBattlerAbility, sBATTLER
+	call BattleScript_AbilityPopUp
+	printstring STRINGID_PKMNSABILITYPREVENTSABILITY
+	waitmessage B_WAIT_TIME_LONG
+	return
+
 BattleScript_MoveUsedIsAsleep::
 	printstring STRINGID_PKMNFASTASLEEP
 	waitmessage B_WAIT_TIME_LONG

graphics/battle_anims/backgrounds/giga_impact_contest.bin

@@ -1,3 +1,3 @@
-<EFBFBD>$<24>$<24>$<24>$<24>$<24>$<24>$<24>$<24>$<24> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> D!E!F!G!H!I!@!<21>$<24>$<24>$<24>$<24>$<24>$<24>$<24>$<24>$<24> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> <20> њ ћ ќ § ў џ ђ Ј$Ї$І$Ѕ$Є$Ѓ$Ђ$Ё$ $  Ё Ђ Ѓ Є Ѕ І Ї Ј Љ Њ Ћ Ќ ­ Ў Џ 
+	 
        $$ $$$$
$	 	 	 
-!!!
!!!!И$З$Ж$Е$Д$Г$В$Б$А$А Б В Г Д Е Ж З И Й К Л М Н О П !!!!!!!Ш$Ч$Ц$Х$Ф$У$Т$С$Р$Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я *!+!,!-!.!/!"!и$з$ж$е$д$г$в$б$а$а б в г д е ж з и й к л м н о п :!;!<!=!>!?!2!ш$ч$ц$х$ф$у$т$с$р$р с т у ф х ц ч ш щ ъ ы ь э ю я J!K!L!M!N!O!B!ш,ч,ц,х,ф,у,т,с,р,р(с(т(у(ф(х(ц(ч(ш(щ(ъ(ы(ь(э(ю(я(J)K)L)M)N)O)B)и,з,ж,е,д,г,в,б,а,а(б(в(г(д(е(ж(з(и(й(к(л(м(н(о(п(:);)<)=)>)?)2)Ш,Ч,Ц,Х,Ф,У,Т,С,Р,Р(С(Т(У(Ф(Х(Ц(Ч(Ш(Щ(Ъ(Ы(Ь(Э(Ю(Я(*)+),)-).)/)")И,З,Ж,Е,Д,Г,В,Б,А,А(Б(В(Г(Д(Е(Ж(З(И(Й(К(Л(М(Н(О(П()))))))Ј,Ї,І,Ѕ,Є,Ѓ,Ђ,Ё, , (Ё(Ђ(Ѓ(Є(Ѕ(І(Ї(Ј(Љ(Њ(Ћ(Ќ(­(Ў(Џ(
+  	  
     	 	 	 	         $$ $$$$$	    	       	 ! " # $ % & ' (  ) * + , ,$+$*$)$ ($'$&$%$- . 	 / 0 1 	 	 	 2 3 4 5 	 6 7 8 9 : ; < = > >$=$<$;$:$9$8$7$6$	 	 	 	 	 	 	 	 	 	 	 	 	 	 ? @ A B C D E E F F$E E D$C$B$A$@$?$G H I J 	 	 	 	 	 	 	 	 	 	 K L M N O P Q E E E E Q$P$O$N$M$L$K$R S T 	 	 U V W X Y Z [ \ ] ^ _ ` a b E E E E E E E E b$a$`$_$^$	 	 	 c d e f g h i j k 	 	 ^(_(`(a(b(E E E E E E E E b,a,`,_,^,	 	 	 c(d(e(f(g(h(i(j(k(	 	 K(L(M(N(O(P(Q(E E E E Q,P,O,N,M,L,K,R(S(T(	 	 U(V(W(X(Y(Z([(\(](?(@(A(B(C(D(E E F(F,E E D,C,B,A,@,?,G(H(I(J(	 	 	 	 	 	 	 	 	 	 6(7(8(9(:(;(<(=(>(>,=,<,;,:,9,8,7,6,	 	 	 	 	 	 	 	 	 	 	 	 	 	 %(&('((( )(*(+(,(,,+,*,), (,',&,%,-(.(	 /(0(1(	 	 	 2(3(4(5(	 	 ((((( ((,, ,,,,,	 (((	 (((( (	 !("(#($(	 
((((( ((,, ,,,,
,	 	 	 
-)))
))))<29>,<2C>,<2C>,<2C>,<2C>,<2C>,<2C>,<2C>,<2C>,<2C>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(њ(ћ(ќ(§(ў(џ(ђ(<28>,<2C>,<2C>,<2C>,<2C>,<2C>,<2C>,<2C>,<2C>,<2C>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(<28>(D)E)F)G)H)I)@)
+((	 (
(( ((	 	 	 

graphics/expansion_intro/credits.pal

@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+0 0 0
+255 255 255
+222 222 222
+222 222 214
+198 198 198
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+247 247 247
+231 231 231
+222 222 222
+222 222 214
+214 214 214
+198 198 198
+181 181 181
+165 165 165
+148 148 148
+132 132 132
+115 115 115
+99 99 99
+82 82 82
+66 66 66
+49 49 49
+33 33 33
+16 16 16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/expansion_intro/sprites/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+199 225 209
+248 248 248
+197 197 197
+139 213 238
+89 189 230
+7 172 213
+7 131 164
+7 89 114
+246 213 246
+238 172 238
+255 97 207
+197 56 165
+123 40 88
+0 0 0
+0 0 0
+0 0 0

graphics/pokemon/abra/normal.pal

@@ -4,14 +4,14 @@ JASC-PAL
 152 208 160
 88 56 8
 120 96 24
-248 224 40
+255 230 41
-72 48 64
+90 57 8
-200 184 32
+205 189 32
-240 240 160
+246 246 164
 168 136 24
-152 120 120
+172 131 41
 16 16 16
-104 72 64
+131 98 8
 208 176 80
 176 160 152
 0 0 0

graphics/pokemon/aerodactyl/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 104 128
+115 98 131
-64 48 96
+65 49 98
-184 184 224
+189 189 222
-152 144 160
+156 139 172
-112 80 144
+115 82 148
-144 96 200
+148 98 205
-168 128 216
+172 131 222
 16 16 16
 248 248 248
 200 200 200
-56 112 80
+49 115 41
-128 32 64
+131 32 65
-200 56 72
+205 57 74
-224 136 152
+230 139 156
 72 56 80

graphics/pokemon/alakazam/normal.pal

@@ -3,14 +3,14 @@ JASC-PAL
 16
 152 208 160
 112 88 8
-248 232 24
+255 238 41
-200 176 16
+213 189 16
 16 16 16
-248 240 168
+255 246 172
-104 72 64
+131 98 8
-72 48 64
+82 49 8
-200 184 168
+213 180 82
-152 120 120
+180 131 41
 88 88 88
 248 248 248
 176 176 168

graphics/pokemon/arbok/normal.pal

@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 16 16 16
-160 128 192
+164 131 197
-192 160 232
+197 164 238
-120 96 168
+123 98 172
-80 56 120
+82 57 123
-192 192 192
+197 197 197
-248 248 248
+255 255 255
-160 56 96
+156 16 0
-216 96 112
+197 65 24
-192 64 24
+156 16 0
-240 112 72
+197 65 24
-240 176 200
+246 115 74
-232 224 80
+197 180 0
 120 96 168
 0 0 0

graphics/pokemon/arcanine/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 96 32
+148 98 32
 16 16 16
-248 232 152
+255 246 148
-216 192 120
+238 197 115
-96 48 0
+98 16 0
-224 104 16
+238 115 49
-184 80 8
+197 82 90
 216 216 208
 248 248 240
 88 104 112
-248 136 24
+255 156 106
 168 48 16
-184 152 88
+148 98 32
 0 0 0
 0 0 0

graphics/pokemon/articuno/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-0 80 112
+32 82 156
-144 192 248
+148 197 255
-0 120 184
+41 115 189
-104 168 240
+123 164 255
 16 16 16
 8 48 80
 32 136 176
-144 192 248
+148 197 255
 248 248 248
 184 40 56
-88 56 24
+90 57 24
-176 144 112
+180 148 115
-136 104 80
+139 106 82
 200 224 248
 192 200 200

graphics/pokemon/beedrill/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 120 144
+139 123 148
-184 168 192
+189 172 197
-248 248 248
+255 255 255
 24 24 24
-216 200 240
+222 205 246
-80 88 120
+82 90 123
-120 88 0
+131 74 0
-200 152 16
+230 148 32
-248 240 160
+255 246 164
-248 200 72
+255 205 74
-152 0 8
+156 0 8
-208 24 48
+213 24 49
-248 144 104
+255 148 106
-152 120 0
+180 98 16
 232 224 248

graphics/pokemon/bellsprout/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-168 120 64
+148 106 65
-248 248 176
+255 255 255
-240 240 88
+255 238 164
-88 56 0
+90 57 0
-208 200 72
+230 189 131
 248 248 248
 16 16 16
 144 104 64
-152 32 72
+115 32 0
-232 168 176
+230 139 148
-64 104 16
+65 106 16
-232 136 160
+213 98 106
-120 192 80
+123 197 82
-208 96 136
+180 65 49
-96 160 64
+98 164 65

graphics/pokemon/blastoise/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 248 192 248
-88 136 192
+32 98 172
-48 88 144
+8 57 98
-128 192 248
+148 172 230
-96 168 240
+90 139 205
-72 72 72
+74 74 74
-16 16 16
+0 0 0
-200 200 208
+205 205 213
-96 88 56
+90 57 24
-144 144 144
+148 148 148
-136 104 80
+139 98 65
-248 248 248
+255 255 255
-208 200 128
+213 172 74
-248 240 184
+246 213 156
-200 144 96
+213 172 74
 156 136 80

graphics/pokemon/blastoise/shiny.pal

@@ -15,5 +15,5 @@ JASC-PAL
 248 248 248
 184 176 96
 240 224 192
-216 184 144
+189 180 90
 112 144 72

graphics/pokemon/butterfree/normal.pal

@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 0 0 0
-48 48 48
+49 49 82
-64 48 96
+90 74 115
-128 120 144
+131 131 189
-232 232 248
+238 238 255
-96 80 120
+115 98 172
-184 184 224
+189 189 230
-224 96 128
+230 98 131
-96 48 56
+98 49 57
-248 152 176
+255 156 180
 48 48 80
-216 48 48
+222 49 49
-80 120 192
+82 123 197
-104 184 200
+106 189 205
 240 248 248

graphics/pokemon/caterpie/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-128 56 72
+123 57 74
-248 120 64
+255 123 65
-248 176 56
+255 180 57
-248 64 64
+255 65 65
-32 120 72
+32 123 74
-168 240 64
+172 246 65
-16 16 16
+0 0 0
-24 88 64
+24 90 65
-104 208 48
+106 213 49
-48 168 64
+49 172 65
-240 232 136
+246 238 139
-208 184 128
+213 189 131
-120 128 72
+123 131 74
 72 200 40
 240 232 136

graphics/pokemon/chansey/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-224 120 128
+230 123 131
-152 64 80
+139 65 65
-248 224 232
+255 230 230
-248 208 224
+255 213 222
-152 48 80
+139 65 65
-232 120 136
+238 123 123
-240 152 168
+246 164 156
 248 248 248
 16 16 16
-56 136 184
+139 65 65
-232 168 184
+246 164 180
-168 160 112
+172 164 115
-112 104 72
+115 106 74
-224 216 184
+230 222 189
 0 0 0

graphics/pokemon/charizard/normal.pal

@@ -7,13 +7,13 @@ JASC-PAL
 240 160 16
 232 176 88
 248 224 104
-200 80 64
+205 82 65
 16 16 16
-232 128 40
+238 131 41
 8 64 80
 32 112 144
 200 200 200
 248 248 248
 0 128 248
-232 216 120
+238 222 123
-232 176 88
+238 180 90

graphics/pokemon/clefable/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 64 56
+82 65 57
 16 16 16
-120 104 96
+123 106 98
-136 72 80
+139 74 82
-216 96 96
+222 98 98
-248 192 176
+255 197 180
-232 144 144
+238 148 148
-184 88 120
+189 90 123
-104 72 80
+82 49 74
-208 120 160
+213 123 164
 248 248 248
-128 128 128
+131 131 131
-208 120 136
+213 123 139
-136 72 80
+222 57 90
 104 72 80

graphics/pokemon/clefable/shiny.pal

@@ -15,5 +15,5 @@ JASC-PAL
 248 248 248
 128 128 128
 208 136 152
-184 96 96
+222 57 90
 80 48 72

graphics/pokemon/clefairy/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 80 88
+156 82 82
-184 128 136
+230 123 123
-248 208 184
+255 213 189
-112 72 56
+115 74 57
-88 48 32
+90 49 32
-152 128 112
+156 131 115
 16 16 16
-248 168 168
+255 172 172
-144 144 144
+148 148 148
-248 248 248
+255 255 255
-232 64 56
+238 65 57
-64 120 168
+148 148 148
 176 56 40
 0 0 0
 0 0 0

graphics/pokemon/cloyster/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 88 144
+123 82 131
-184 168 232
+213 189 238
-136 120 184
+172 123 189
-40 32 72
+74 32 82
 16 16 16
-192 192 192
+197 197 197
-64 64 64
+65 65 65
 248 248 248
-144 144 144
+148 148 148
-96 96 96
+98 98 98
-56 40 104
+82 41 90
-112 104 176
+131 90 164
-64 56 152
+106 65 131
-160 120 184
+164 123 189
 120 96 176

graphics/pokemon/cubone/normal.pal

@@ -2,14 +2,14 @@ JASC-PAL
 0100
 16
 152 208 160
-128 128 128
+139 131 106
 248 248 248
-0 0 0
+41 41 41
-192 192 208
+197 197 213
-80 80 56
+82 82 57
-144 104 88
+148 106 90
-192 152 72
+197 156 74
-80 56 16
+82 57 16
 200 168 136
 240 208 176
 224 224 232

graphics/pokemon/dewgong/normal.pal

@@ -3,13 +3,13 @@ JASC-PAL
 16
 153 210 164
 106 123 164
-69 73 96
+65 82 98
-161 167 204
+156 164 189
-219 235 249
+230 230 246
 16 16 16
-192 207 226
+213 205 238
 255 255 255
-114 92 75
+131 123 123
 112 40 40
 232 128 120
 0 0 0

graphics/pokemon/diglett/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-160 88 88
+164 90 90
-216 152 88
+222 156 90
-192 112 64
+197 115 65
-88 48 24
+90 49 24
-248 248 248
+255 255 255
 16 16 16
-192 32 136
+213 57 74
-144 64 112
+115 0 24
-248 176 224
+255 172 148
-232 120 184
+255 106 90
-96 96 104
+131 123 74
-136 136 144
+180 172 115
-56 56 56
+90 82 32
-176 184 192
+230 230 180
 0 0 0

graphics/pokemon/dodrio/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-64 64 64
+65 65 65
 16 16 16
-104 104 104
+131 131 131
-160 120 88
+164 123 90
-88 48 32
+90 65 32
-200 152 80
+205 156 82
 248 248 248
-96 88 64
+98 90 65
-232 216 168
+238 222 172
-176 160 120
+180 164 123
-112 40 40
+180 65 65
-232 128 120
+246 131 164
-176 64 64
+180 65 65
-240 128 160
+246 131 164
-248 208 224
+255 213 230

graphics/pokemon/dragonite/normal.pal

@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 152 88 72
-248 232 184
+255 238 189
-208 136 48
+213 139 49
-232 184 136
+238 189 139
 248 200 104
-232 176 72
+238 180 74
 88 56 32
 248 248 248
 200 200 200
 16 16 16
 96 96 96
-32 80 64
+16 65 49
-24 104 96
+24 106 98
-32 160 120
+32 164 123
-152 128 88
+172 139 65

graphics/pokemon/dugtrio/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-160 88 88
+164 90 90
-216 152 88
+222 156 90
-88 48 24
+90 49 24
-192 112 64
+197 115 65
-248 248 248
+255 255 255
 16 16 16
-144 64 112
+115 0 24
-248 176 224
+255 172 148
-232 120 184
+255 106 90
-192 32 136
+213 57 74
-96 96 104
+131 123 74
-136 136 144
+180 172 115
-56 56 56
+90 82 32
-176 184 192
+230 230 180
 0 0 0

graphics/pokemon/eevee/normal.pal

@@ -2,16 +2,16 @@ JASC-PAL
 0100
 16
 152 208 160
-160 96 72
+165 99 74
-112 72 72
+115 74 74
-208 152 72
+214 156 74
-16 16 16
+0 0 0
-56 40 24
+82 49 33
-96 48 32
+82 49 33
-184 152 120
+189 156 123
-224 192 144
+230 197 148
 248 248 248
-248 224 168
+255 230 173
 224 184 120
 96 72 56
 0 0 0

graphics/pokemon/ekans/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 16 72
+90 16 74
-160 72 160
+164 74 139
-216 160 232
+238 164 213
-192 96 200
+205 98 180
-120 48 104
+123 49 106
-176 152 48
+180 123 49
-248 224 120
+255 213 106
 16 16 16
-208 184 72
+230 172 90
-160 56 96
+156 16 0
 88 72 48
-216 96 112
+197 65 24
-224 168 192
+246 115 74
 248 224 152
 0 0 0

graphics/pokemon/electrode/normal.pal

@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-88 80 80
+90 82 82
-160 160 160
+164 156 156
-232 232 232
+238 238 238
 248 248 248
-200 200 224
+205 205 222
 16 16 16
-200 40 64
+213 49 65
-248 80 32
+255 82 32
-240 160 136
+255 131 90
-128 16 16
+131 16 16
-232 56 48
+238 65 49
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/exeggcute/normal.pal

@@ -2,15 +2,15 @@ JASC-PAL
 0100
 16
 152 208 160
-192 112 144
+197 115 148
-136 56 88
+139 32 32
-248 208 216
+255 213 222
 16 16 16
-248 232 136
+255 238 139
-200 136 8
+205 139 8
 248 248 248
-248 232 232
+255 238 238
-216 216 216
+222 222 222
 224 176 184
 232 192 192
 0 0 0