Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo

2024-03-18 11:52:26 -03:00 · 2024-03-18 11:52:26 -03:00 · e479fa1007
commit e479fa1007
parent 39ed85635f 3486097ee9
411 changed files with 41 additions and 23 deletions
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@ -559,7 +559,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
+      "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
      "x": 14,
      "y": 12,
      "elevation": 3,
--- a/graphics/object_events/pics/pokemon/wailord.png
+++ b/graphics/object_events/pics/pokemon/wailord.png
--- a/graphics/pokemon/abra/follower.png
+++ b/graphics/pokemon/abra/follower.png
--- a/graphics/pokemon/absol/follower.png
+++ b/graphics/pokemon/absol/follower.png
--- a/graphics/pokemon/aerodactyl/follower.png
+++ b/graphics/pokemon/aerodactyl/follower.png
--- a/graphics/pokemon/aggron/follower.png
+++ b/graphics/pokemon/aggron/follower.png
--- a/graphics/pokemon/aipom/follower.png
+++ b/graphics/pokemon/aipom/follower.png
--- a/graphics/pokemon/alakazam/follower.png
+++ b/graphics/pokemon/alakazam/follower.png
--- a/graphics/pokemon/altaria/follower.png
+++ b/graphics/pokemon/altaria/follower.png
--- a/graphics/pokemon/ampharos/follower.png
+++ b/graphics/pokemon/ampharos/follower.png
--- a/graphics/pokemon/anorith/follower.png
+++ b/graphics/pokemon/anorith/follower.png
--- a/graphics/pokemon/arbok/follower.png
+++ b/graphics/pokemon/arbok/follower.png
--- a/graphics/pokemon/arcanine/follower.png
+++ b/graphics/pokemon/arcanine/follower.png
--- a/graphics/pokemon/ariados/follower.png
+++ b/graphics/pokemon/ariados/follower.png
--- a/graphics/pokemon/armaldo/follower.png
+++ b/graphics/pokemon/armaldo/follower.png
--- a/graphics/pokemon/aron/follower.png
+++ b/graphics/pokemon/aron/follower.png
--- a/graphics/pokemon/articuno/follower.png
+++ b/graphics/pokemon/articuno/follower.png
--- a/graphics/pokemon/azumarill/follower.png
+++ b/graphics/pokemon/azumarill/follower.png
--- a/graphics/pokemon/azurill/follower.png
+++ b/graphics/pokemon/azurill/follower.png
--- a/graphics/pokemon/bagon/follower.png
+++ b/graphics/pokemon/bagon/follower.png
--- a/graphics/pokemon/baltoy/follower.png
+++ b/graphics/pokemon/baltoy/follower.png
--- a/graphics/pokemon/banette/follower.png
+++ b/graphics/pokemon/banette/follower.png
--- a/graphics/pokemon/barboach/follower.png
+++ b/graphics/pokemon/barboach/follower.png
--- a/graphics/pokemon/bayleef/follower.png
+++ b/graphics/pokemon/bayleef/follower.png
--- a/graphics/pokemon/beautifly/follower.png
+++ b/graphics/pokemon/beautifly/follower.png
--- a/graphics/pokemon/beedrill/follower.png
+++ b/graphics/pokemon/beedrill/follower.png
--- a/graphics/pokemon/beldum/follower.png
+++ b/graphics/pokemon/beldum/follower.png
--- a/graphics/pokemon/bellossom/follower.png
+++ b/graphics/pokemon/bellossom/follower.png
--- a/graphics/pokemon/bellsprout/follower.png
+++ b/graphics/pokemon/bellsprout/follower.png
--- a/graphics/pokemon/blastoise/follower.png
+++ b/graphics/pokemon/blastoise/follower.png
--- a/graphics/pokemon/blaziken/follower.png
+++ b/graphics/pokemon/blaziken/follower.png
--- a/graphics/pokemon/blissey/follower.png
+++ b/graphics/pokemon/blissey/follower.png
--- a/graphics/pokemon/breloom/follower.png
+++ b/graphics/pokemon/breloom/follower.png
--- a/graphics/pokemon/bulbasaur/follower.png
+++ b/graphics/pokemon/bulbasaur/follower.png
--- a/graphics/pokemon/butterfree/follower.png
+++ b/graphics/pokemon/butterfree/follower.png
--- a/graphics/pokemon/cacnea/follower.png
+++ b/graphics/pokemon/cacnea/follower.png
--- a/graphics/pokemon/cacturne/follower.png
+++ b/graphics/pokemon/cacturne/follower.png
--- a/graphics/pokemon/camerupt/follower.png
+++ b/graphics/pokemon/camerupt/follower.png
--- a/graphics/pokemon/carvanha/follower.png
+++ b/graphics/pokemon/carvanha/follower.png
--- a/graphics/pokemon/cascoon/follower.png
+++ b/graphics/pokemon/cascoon/follower.png
--- a/graphics/pokemon/castform/follower.png
+++ b/graphics/pokemon/castform/follower.png
--- a/graphics/pokemon/caterpie/follower.png
+++ b/graphics/pokemon/caterpie/follower.png
--- a/graphics/pokemon/celebi/follower.png
+++ b/graphics/pokemon/celebi/follower.png
--- a/graphics/pokemon/chansey/follower.png
+++ b/graphics/pokemon/chansey/follower.png
--- a/graphics/pokemon/charizard/follower.png
+++ b/graphics/pokemon/charizard/follower.png
--- a/graphics/pokemon/charmander/follower.png
+++ b/graphics/pokemon/charmander/follower.png
--- a/graphics/pokemon/charmeleon/follower.png
+++ b/graphics/pokemon/charmeleon/follower.png
--- a/graphics/pokemon/chikorita/follower.png
+++ b/graphics/pokemon/chikorita/follower.png
--- a/graphics/pokemon/chimecho/follower.png
+++ b/graphics/pokemon/chimecho/follower.png
--- a/graphics/pokemon/chinchou/follower.png
+++ b/graphics/pokemon/chinchou/follower.png
--- a/graphics/pokemon/clamperl/follower.png
+++ b/graphics/pokemon/clamperl/follower.png
--- a/graphics/pokemon/claydol/follower.png
+++ b/graphics/pokemon/claydol/follower.png
--- a/graphics/pokemon/clefable/follower.png
+++ b/graphics/pokemon/clefable/follower.png
--- a/graphics/pokemon/clefairy/follower.png
+++ b/graphics/pokemon/clefairy/follower.png
--- a/graphics/pokemon/cleffa/follower.png
+++ b/graphics/pokemon/cleffa/follower.png
--- a/graphics/pokemon/cloyster/follower.png
+++ b/graphics/pokemon/cloyster/follower.png
--- a/graphics/pokemon/combusken/follower.png
+++ b/graphics/pokemon/combusken/follower.png
--- a/graphics/pokemon/corphish/follower.png
+++ b/graphics/pokemon/corphish/follower.png
--- a/graphics/pokemon/corsola/follower.png
+++ b/graphics/pokemon/corsola/follower.png
--- a/graphics/pokemon/cradily/follower.png
+++ b/graphics/pokemon/cradily/follower.png
--- a/graphics/pokemon/crawdaunt/follower.png
+++ b/graphics/pokemon/crawdaunt/follower.png
--- a/graphics/pokemon/crobat/follower.png
+++ b/graphics/pokemon/crobat/follower.png
--- a/graphics/pokemon/croconaw/follower.png
+++ b/graphics/pokemon/croconaw/follower.png
--- a/graphics/pokemon/cubone/follower.png
+++ b/graphics/pokemon/cubone/follower.png
--- a/graphics/pokemon/cyndaquil/follower.png
+++ b/graphics/pokemon/cyndaquil/follower.png
--- a/graphics/pokemon/delcatty/follower.png
+++ b/graphics/pokemon/delcatty/follower.png
--- a/graphics/pokemon/delibird/follower.png
+++ b/graphics/pokemon/delibird/follower.png
--- a/graphics/pokemon/deoxys/follower.png
+++ b/graphics/pokemon/deoxys/follower.png
--- a/graphics/pokemon/dewgong/follower.png
+++ b/graphics/pokemon/dewgong/follower.png
--- a/graphics/pokemon/diglett/follower.png
+++ b/graphics/pokemon/diglett/follower.png
--- a/graphics/pokemon/ditto/follower.png
+++ b/graphics/pokemon/ditto/follower.png
--- a/graphics/pokemon/dodrio/follower.png
+++ b/graphics/pokemon/dodrio/follower.png
--- a/graphics/pokemon/doduo/follower.png
+++ b/graphics/pokemon/doduo/follower.png
--- a/graphics/pokemon/donphan/follower.png
+++ b/graphics/pokemon/donphan/follower.png
--- a/graphics/pokemon/dragonair/follower.png
+++ b/graphics/pokemon/dragonair/follower.png
--- a/graphics/pokemon/dragonite/follower.png
+++ b/graphics/pokemon/dragonite/follower.png
--- a/graphics/pokemon/dratini/follower.png
+++ b/graphics/pokemon/dratini/follower.png
--- a/graphics/pokemon/drowzee/follower.png
+++ b/graphics/pokemon/drowzee/follower.png
--- a/graphics/pokemon/dugtrio/follower.png
+++ b/graphics/pokemon/dugtrio/follower.png
--- a/graphics/pokemon/dunsparce/follower.png
+++ b/graphics/pokemon/dunsparce/follower.png
--- a/graphics/pokemon/dusclops/follower.png
+++ b/graphics/pokemon/dusclops/follower.png
--- a/graphics/pokemon/duskull/follower.png
+++ b/graphics/pokemon/duskull/follower.png
--- a/graphics/pokemon/dustox/follower.png
+++ b/graphics/pokemon/dustox/follower.png
--- a/graphics/pokemon/eevee/follower.png
+++ b/graphics/pokemon/eevee/follower.png
--- a/graphics/pokemon/ekans/follower.png
+++ b/graphics/pokemon/ekans/follower.png
--- a/graphics/pokemon/electabuzz/follower.png
+++ b/graphics/pokemon/electabuzz/follower.png
--- a/graphics/pokemon/electrike/follower.png
+++ b/graphics/pokemon/electrike/follower.png
--- a/graphics/pokemon/electrode/follower.png
+++ b/graphics/pokemon/electrode/follower.png
--- a/graphics/pokemon/elekid/follower.png
+++ b/graphics/pokemon/elekid/follower.png
--- a/graphics/pokemon/entei/follower.png
+++ b/graphics/pokemon/entei/follower.png
--- a/graphics/pokemon/espeon/follower.png
+++ b/graphics/pokemon/espeon/follower.png
--- a/graphics/pokemon/exeggcute/follower.png
+++ b/graphics/pokemon/exeggcute/follower.png
--- a/graphics/pokemon/exeggutor/follower.png
+++ b/graphics/pokemon/exeggutor/follower.png
--- a/graphics/pokemon/exploud/follower.png
+++ b/graphics/pokemon/exploud/follower.png
--- a/graphics/pokemon/farfetchd/follower.png
+++ b/graphics/pokemon/farfetchd/follower.png
--- a/graphics/pokemon/fearow/follower.png
+++ b/graphics/pokemon/fearow/follower.png
--- a/graphics/pokemon/feebas/follower.png
+++ b/graphics/pokemon/feebas/follower.png
--- a/graphics/pokemon/feraligatr/follower.png
+++ b/graphics/pokemon/feraligatr/follower.png
--- a/graphics/pokemon/flaaffy/follower.png
+++ b/graphics/pokemon/flaaffy/follower.png
--- a/graphics/pokemon/flareon/follower.png
+++ b/graphics/pokemon/flareon/follower.png
--- a/Show more
+++ b/Show more