ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange

Browse Source
This commit is contained in:
Eduardo Quezada 2023-02-16 17:06:49 -03:00
commit f4f8ab6ee9
451 changed files with 3072 additions and 1599 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -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

2
asm/macros/battle_script.inc
View File

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

44
data/battle_anim_scripts.s
View File

@ -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, 5, 0, 10, SOUND_PAN_ATTACKER, 0xff60, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xff40, 0xff90, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xa0, 0x30, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xff20, 0xffe0, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0x70, 0xff80, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xff40, 0xf0, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, SOUND_PAN_ATTACKER, 0xff60, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xff40, 0xff90, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xa0, 0x30, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xff20, 0xffe0, 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
launchtemplate gStrangeSteamGreenCloudTemplate 0x82 0x5 0xf 0xf 0x14 0xa 0x5
launchtemplate gStrangeSteamPinkCloudTemplate 0x82 0x5 0xf 0xf 0x14 0xfff6 0xfffb
launchtemplate gStrangeSteamGreenCloudTemplate 0x82 0x5 0xf 0xf 0x14 0x14 0xa
launchtemplate gStrangeSteamBlueCloudTemplate 0x82 0x5 0xf 0xf 0x14 0xffec 0xfff6
createsprite gStrangeSteamPinkCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0, 0
createsprite gStrangeSteamGreenCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xa, 0x5
createsprite gStrangeSteamPinkCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xfff6, 0xfffb
delay 0x1
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

110
data/battle_scripts_1.s
View File

@ -250,7 +250,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_GYRO_BALL
.4byte BattleScript_EffectHit @ EFFECT_ECHOED_VOICE
.4byte BattleScript_EffectHit @ EFFECT_PAYBACK
.4byte BattleScript_EffectHit @ EFFECT_ROUND
.4byte BattleScript_EffectRound @ EFFECT_ROUND
.4byte BattleScript_EffectHit @ EFFECT_BRINE
.4byte BattleScript_EffectHit @ EFFECT_VENOSHOCK
.4byte BattleScript_EffectHit @ EFFECT_RETALIATE
@ -1283,8 +1283,12 @@ BattleScript_JungleHealingTryRestoreAlly:
goto BattleScript_MoveEnd
BattleScript_EffectAttackerDefenseDownHit:
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_NoMoveEffect
setmoveeffect MOVE_EFFECT_DEF_MINUS_1 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_NoMoveEffect:
setmoveeffect 0
goto BattleScript_EffectHit
BattleScript_EffectRelicSong:
setmoveeffect MOVE_EFFECT_RELIC_SONG | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
@ -3082,6 +3086,10 @@ BattleScript_EffectPlaceholder:
printstring STRINGID_NOTDONEYET
goto BattleScript_MoveEnd
BattleScript_EffectRound:
setmoveeffect MOVE_EFFECT_ROUND
goto BattleScript_EffectHit
BattleScript_EffectHit::
BattleScript_HitFromAtkCanceler::
attackcanceler
@ -3167,13 +3175,15 @@ BattleScript_EffectSleep::
ppreduce
jumpifsubstituteblocks BattleScript_ButItFailed
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_AlreadyAsleep
jumpifcantmakeasleep BattleScript_CantMakeAsleep
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects
jumpifuproarwakes BattleScript_CantMakeAsleep
jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_InsomniaProtects
jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_InsomniaProtects
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_AbilityProtectsDoesntAffect
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_AbilityProtectsDoesntAffect
jumpifflowerveil BattleScript_FlowerVeilProtects
jumpifability BS_TARGET_SIDE, ABILITY_SWEET_VEIL, BattleScript_SweetVeilProtects
jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
jumpifleafguardprotected BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifshieldsdown BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
jumpifterrainaffected BS_TARGET, STATUS_FIELD_ELECTRIC_TERRAIN, BattleScript_ElectricTerrainPrevents
jumpifterrainaffected BS_TARGET, STATUS_FIELD_MISTY_TERRAIN, BattleScript_MistyTerrainPrevents
@ -3253,15 +3263,23 @@ BattleScript_PastelVeilProtects:
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
BattleScript_LeafGuardProtectsRet::
BattleScript_AbilityProtectsDoesntAffectRet::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
printstring STRINGID_ITDOESNTAFFECT
waitmessage B_WAIT_TIME_LONG
return
BattleScript_LeafGuardProtects:
call BattleScript_LeafGuardProtectsRet
BattleScript_AbilityProtectsDoesntAffect:
call BattleScript_AbilityProtectsDoesntAffectRet
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
@ -3574,7 +3592,7 @@ BattleScript_MirrorArmorReflect::
call BattleScript_AbilityPopUp
jumpifsubstituteblocks BattleScript_AbilityNoSpecificStatLoss
BattleScript_MirrorArmorReflectStatLoss:
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_MirrorArmorReflectEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_MIRROR_ARMOR | STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_MirrorArmorReflectEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_MirrorArmorReflectAnim
goto BattleScript_MirrorArmorReflectWontFall
BattleScript_MirrorArmorReflectAnim:
@ -3763,12 +3781,12 @@ BattleScript_EffectToxic::
attackstring
ppreduce
jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_AbilityProtectsDoesntAffect
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_AbilityProtectsDoesntAffect
jumpifability BS_TARGET_SIDE, ABILITY_PASTEL_VEIL, BattleScript_PastelVeilProtects
jumpifflowerveil BattleScript_FlowerVeilProtects
jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
jumpifleafguardprotected BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifshieldsdown BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifsubstituteblocks BattleScript_ButItFailed
jumpifstatus BS_TARGET, STATUS1_POISON | STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
@ -3826,7 +3844,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
@ -4102,12 +4122,12 @@ BattleScript_EffectPoison::
attackstring
ppreduce
jumpifability BS_TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_AbilityProtectsDoesntAffect
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_AbilityProtectsDoesntAffect
jumpifability BS_TARGET_SIDE, ABILITY_PASTEL_VEIL, BattleScript_PastelVeilProtects
jumpifflowerveil BattleScript_FlowerVeilProtects
jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
jumpifleafguardprotected BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifshieldsdown BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifsubstituteblocks BattleScript_ButItFailed
jumpifstatus BS_TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
jumpifstatus BS_TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
@ -4129,16 +4149,17 @@ BattleScript_EffectParalyze:
attackstring
ppreduce
jumpifability BS_TARGET, ABILITY_LIMBER, BattleScript_LimberProtected
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_AbilityProtectsDoesntAffect
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_AbilityProtectsDoesntAffect
jumpifflowerveil BattleScript_FlowerVeilProtects
jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
jumpifleafguardprotected BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifshieldsdown BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifsubstituteblocks BattleScript_ButItFailed
typecalc
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
@ -4153,6 +4174,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
@ -5559,11 +5585,11 @@ BattleScript_EffectWillOWisp::
jumpiftype BS_TARGET, TYPE_FIRE, BattleScript_NotAffected
jumpifability BS_TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents
jumpifability BS_TARGET, ABILITY_WATER_BUBBLE, BattleScript_WaterVeilPrevents
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_AbilityProtectsDoesntAffect
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_AbilityProtectsDoesntAffect
jumpifflowerveil BattleScript_FlowerVeilProtects
jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
jumpifleafguardprotected BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifshieldsdown BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_ButItFailed
jumpifterrainaffected BS_TARGET, STATUS_FIELD_MISTY_TERRAIN, BattleScript_MistyTerrainPrevents
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
@ -5655,6 +5681,9 @@ BattleScript_EffectFollowMe::
attackcanceler
attackstring
ppreduce
.if B_UPDATED_MOVE_DATA >= GEN_6
jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_ButItFailed
.endif
setforcedtarget
attackanimation
waitanimation
@ -5850,27 +5879,28 @@ BattleScript_EffectYawn::
attackcanceler
attackstring
ppreduce
jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBankAbilityMadeIneffective
jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_PrintBankAbilityMadeIneffective
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_LeafGuardProtects
jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBattlerAbilityMadeIneffective
jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_PrintBattlerAbilityMadeIneffective
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_PrintBattlerAbilityMadeIneffective
jumpifability BS_TARGET, ABILITY_PURIFYING_SALT, BattleScript_AbilityProtectsDoesntAffect
jumpifflowerveil BattleScript_FlowerVeilProtects
jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardProtects
jumpifshieldsdown BS_TARGET, BattleScript_LeafGuardProtects
jumpifleafguardprotected BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
jumpifshieldsdown BS_TARGET, BattleScript_AbilityProtectsDoesntAffect
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
@ -7896,6 +7926,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

6
graphics/battle_anims/backgrounds/giga_impact_contest.bin
View File

@ -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)Ш,Ч,Ц,Х,Ф,У,Т,С,Р,Р(С(Т(У(Ф(Х(Ц(Ч(Ш(Щ(Ъ(Ы(Ь(Э(Ю(Я(*)+),)-).)/)")И,З,Ж,Е,Д,Г,В,Б,А,А(Б(В(Г(Д(Е(Ж(З(И(Й(К(Л(М(Н(О(П()))))))Ј,Ї,І,Ѕ,Є,Ѓ,Ђ,Ё, , (Ё(Ђ(Ѓ(Є(Ѕ(І(Ї(Ј(Љ(Њ(Ћ(Ќ(­(Ў(Џ(
) ) ) ))))<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)@)
        $$ $$$$$
            $$ $$$$$        ! " # $ % & ' (  ) * + , ,$+$*$)$ ($'$&$%$- . / 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( ((((( ((,, ,,,,, ((( (((( ( !("(#($( ((((( ((,, ,,,,,
( ( ( (( ((

BIN
graphics/battle_anims/backgrounds/giga_impact_contest.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

259
graphics/expansion_intro/credits.pal Normal file
View File

@ -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

BIN
graphics/expansion_intro/powered_by.bin Normal file
View File

Binary file not shown.

BIN
graphics/expansion_intro/powered_by.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 336 B

BIN
graphics/expansion_intro/rhh_credits.bin Normal file
View File

Binary file not shown.

BIN
graphics/expansion_intro/rhh_credits.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
graphics/expansion_intro/sprites/dizzy_egg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/expansion_intro/sprites/porygon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

19
graphics/expansion_intro/sprites/shiny.pal Normal file
View File

@ -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

BIN
graphics/pokemon/abra/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 935 B

After

Width:  |  Height:  |  Size: 861 B

BIN
graphics/pokemon/abra/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 620 B

After

Width:  |  Height:  |  Size: 635 B

12
graphics/pokemon/abra/normal.pal
View File

@ -4,14 +4,14 @@ JASC-PAL
152 208 160
88 56 8
120 96 24
248 224 40
72 48 64
200 184 32
240 240 160
255 230 41
90 57 8
205 189 32
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

BIN
graphics/pokemon/aerodactyl/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/aerodactyl/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 935 B

After

Width:  |  Height:  |  Size: 905 B

22
graphics/pokemon/aerodactyl/normal.pal
View File

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

BIN
graphics/pokemon/alakazam/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/alakazam/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 922 B

After

Width:  |  Height:  |  Size: 932 B

14
graphics/pokemon/alakazam/normal.pal
View File

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

BIN
graphics/pokemon/arbok/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/arbok/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 818 B

After

Width:  |  Height:  |  Size: 800 B

24
graphics/pokemon/arbok/normal.pal
View File

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

BIN
graphics/pokemon/arcanine/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
graphics/pokemon/arcanine/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

16
graphics/pokemon/arcanine/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
112 96 32
148 98 32
16 16 16
248 232 152
216 192 120
96 48 0
224 104 16
184 80 8
255 246 148
238 197 115
98 16 0
238 115 49
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

BIN
graphics/pokemon/articuno/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
graphics/pokemon/articuno/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

16
graphics/pokemon/articuno/normal.pal
View File

@ -2,18 +2,18 @@ JASC-PAL
0100
16
152 208 160
0 80 112
144 192 248
0 120 184
104 168 240
32 82 156
148 197 255
41 115 189
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
176 144 112
136 104 80
90 57 24
180 148 115
139 106 82
200 224 248
192 200 200

BIN
graphics/pokemon/beedrill/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
graphics/pokemon/beedrill/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 849 B

After

Width:  |  Height:  |  Size: 840 B

26
graphics/pokemon/beedrill/normal.pal
View File

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

BIN
graphics/pokemon/bellsprout/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 839 B

After

Width:  |  Height:  |  Size: 765 B

BIN
graphics/pokemon/bellsprout/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 529 B

After

Width:  |  Height:  |  Size: 479 B

24
graphics/pokemon/bellsprout/normal.pal
View File

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

BIN
graphics/pokemon/blastoise/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
graphics/pokemon/blastoise/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 797 B

After

Width:  |  Height:  |  Size: 747 B

BIN
graphics/pokemon/blastoise/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1006 B

After

Width:  |  Height:  |  Size: 988 B

28
graphics/pokemon/blastoise/normal.pal
View File

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

2
graphics/pokemon/blastoise/shiny.pal
View File

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

BIN
graphics/pokemon/butterfree/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/butterfree/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 798 B

After

Width:  |  Height:  |  Size: 790 B

24
graphics/pokemon/butterfree/normal.pal
View File

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

BIN
graphics/pokemon/caterpie/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 715 B

After

Width:  |  Height:  |  Size: 701 B

BIN
graphics/pokemon/caterpie/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 496 B

26
graphics/pokemon/caterpie/normal.pal
View File

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

BIN
graphics/pokemon/chansey/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1001 B

BIN
graphics/pokemon/chansey/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 591 B

24
graphics/pokemon/chansey/normal.pal
View File

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

BIN
graphics/pokemon/charizard/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
graphics/pokemon/charizard/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1007 B

8
graphics/pokemon/charizard/normal.pal
View File

@ -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
232 176 88
238 222 123
238 180 90

BIN
graphics/pokemon/clefable/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 955 B

BIN
graphics/pokemon/clefable/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 690 B

After

Width:  |  Height:  |  Size: 631 B

BIN
graphics/pokemon/clefable/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 695 B

After

Width:  |  Height:  |  Size: 639 B

24
graphics/pokemon/clefable/normal.pal
View File

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

2
graphics/pokemon/clefable/shiny.pal
View File

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

BIN
graphics/pokemon/clefairy/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 766 B

BIN
graphics/pokemon/clefairy/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 528 B

22
graphics/pokemon/clefairy/normal.pal
View File

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

BIN
graphics/pokemon/cloyster/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
graphics/pokemon/cloyster/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 887 B

After

Width:  |  Height:  |  Size: 861 B

24
graphics/pokemon/cloyster/normal.pal
View File

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

BIN
graphics/pokemon/cubone/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 810 B

After

Width:  |  Height:  |  Size: 822 B

BIN
graphics/pokemon/cubone/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 493 B

After

Width:  |  Height:  |  Size: 495 B

14
graphics/pokemon/cubone/normal.pal
View File

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

BIN
graphics/pokemon/dewgong/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
graphics/pokemon/dewgong/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 757 B

After

Width:  |  Height:  |  Size: 643 B

10
graphics/pokemon/dewgong/normal.pal
View File

@ -3,13 +3,13 @@ JASC-PAL
16
153 210 164
106 123 164
69 73 96
161 167 204
219 235 249
65 82 98
156 164 189
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

BIN
graphics/pokemon/diglett/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 482 B

After

Width:  |  Height:  |  Size: 466 B

BIN
graphics/pokemon/diglett/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 371 B

26
graphics/pokemon/diglett/normal.pal
View File

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

BIN
graphics/pokemon/dodrio/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
graphics/pokemon/dodrio/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 984 B

After

Width:  |  Height:  |  Size: 944 B

26
graphics/pokemon/dodrio/normal.pal
View File

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

BIN
graphics/pokemon/dragonite/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
graphics/pokemon/dragonite/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1015 B

After

Width:  |  Height:  |  Size: 974 B

16
graphics/pokemon/dragonite/normal.pal
View File

@ -3,17 +3,17 @@ JASC-PAL
16
152 208 160
152 88 72
248 232 184
208 136 48
232 184 136
255 238 189
213 139 49
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
24 104 96
32 160 120
152 128 88
16 65 49
24 106 98
32 164 123
172 139 65

BIN
graphics/pokemon/dugtrio/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 817 B

After

Width:  |  Height:  |  Size: 771 B

BIN
graphics/pokemon/dugtrio/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 618 B

After

Width:  |  Height:  |  Size: 587 B

26
graphics/pokemon/dugtrio/normal.pal
View File

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

BIN
graphics/pokemon/eevee/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 857 B

After

Width:  |  Height:  |  Size: 835 B

BIN
graphics/pokemon/eevee/anim_frontf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 842 B

After

Width:  |  Height:  |  Size: 840 B

BIN
graphics/pokemon/eevee/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 535 B

BIN
graphics/pokemon/eevee/frontf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 542 B

After

Width:  |  Height:  |  Size: 538 B

18
graphics/pokemon/eevee/normal.pal
View File

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

BIN
graphics/pokemon/ekans/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 908 B

After

Width:  |  Height:  |  Size: 898 B

BIN
graphics/pokemon/ekans/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 593 B

22
graphics/pokemon/ekans/normal.pal
View File

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

BIN
graphics/pokemon/electrode/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 759 B

After

Width:  |  Height:  |  Size: 729 B

BIN
graphics/pokemon/electrode/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 500 B

After

Width:  |  Height:  |  Size: 472 B

18
graphics/pokemon/electrode/normal.pal
View File

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

BIN
graphics/pokemon/exeggcute/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
graphics/pokemon/exeggcute/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 618 B

After

Width:  |  Height:  |  Size: 636 B

14
graphics/pokemon/exeggcute/normal.pal
View File

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

BIN
graphics/pokemon/exeggutor/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
graphics/pokemon/exeggutor/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 956 B

After

Width:  |  Height:  |  Size: 916 B

Some files were not shown because too many files have changed in this diff Show More