Merge branch 'lighting-expanded-id' of https://github.com/aarant/pokeemerald

2025-10-06 00:12:45 +02:00 · 2024-03-09 16:27:19 +01:00
parent 7829e99538 e8b5252790
commit 5975a5a7e5
102 changed files with 11 additions and 18 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/abra.png
+++ b/graphics/object_events/pics/pokemon/abra.png
--- a/graphics/object_events/pics/pokemon/aerodactyl.png
+++ b/graphics/object_events/pics/pokemon/aerodactyl.png
--- a/graphics/object_events/pics/pokemon/altaria.png
+++ b/graphics/object_events/pics/pokemon/altaria.png
--- a/graphics/object_events/pics/pokemon/articuno.png
+++ b/graphics/object_events/pics/pokemon/articuno.png
--- a/graphics/object_events/pics/pokemon/beedrill.png
+++ b/graphics/object_events/pics/pokemon/beedrill.png
--- a/graphics/object_events/pics/pokemon/beldum.png
+++ b/graphics/object_events/pics/pokemon/beldum.png
--- a/graphics/object_events/pics/pokemon/butterfree.png
+++ b/graphics/object_events/pics/pokemon/butterfree.png
--- a/graphics/object_events/pics/pokemon/castform.png
+++ b/graphics/object_events/pics/pokemon/castform.png
--- a/graphics/object_events/pics/pokemon/castform_sunny.png
+++ b/graphics/object_events/pics/pokemon/castform_sunny.png
--- a/graphics/object_events/pics/pokemon/crobat.png
+++ b/graphics/object_events/pics/pokemon/crobat.png
--- a/graphics/object_events/pics/pokemon/dragonite.png
+++ b/graphics/object_events/pics/pokemon/dragonite.png
--- a/graphics/object_events/pics/pokemon/duskull.png
+++ b/graphics/object_events/pics/pokemon/duskull.png
--- a/graphics/object_events/pics/pokemon/dustox.png
+++ b/graphics/object_events/pics/pokemon/dustox.png
--- a/graphics/object_events/pics/pokemon/fearow.png
+++ b/graphics/object_events/pics/pokemon/fearow.png
--- a/graphics/object_events/pics/pokemon/flygon.png
+++ b/graphics/object_events/pics/pokemon/flygon.png
--- a/graphics/object_events/pics/pokemon/gastly.png
+++ b/graphics/object_events/pics/pokemon/gastly.png
--- a/graphics/object_events/pics/pokemon/glalie.png
+++ b/graphics/object_events/pics/pokemon/glalie.png
--- a/graphics/object_events/pics/pokemon/gligar.png
+++ b/graphics/object_events/pics/pokemon/gligar.png
--- a/graphics/object_events/pics/pokemon/gorebyss.png
+++ b/graphics/object_events/pics/pokemon/gorebyss.png
--- a/graphics/object_events/pics/pokemon/gulpin.png
+++ b/graphics/object_events/pics/pokemon/gulpin.png
--- a/graphics/object_events/pics/pokemon/gyarados.png
+++ b/graphics/object_events/pics/pokemon/gyarados.png
--- a/graphics/object_events/pics/pokemon/haunter.png
+++ b/graphics/object_events/pics/pokemon/haunter.png
--- a/graphics/object_events/pics/pokemon/hoppip.png
+++ b/graphics/object_events/pics/pokemon/hoppip.png
--- a/graphics/object_events/pics/pokemon/huntail.png
+++ b/graphics/object_events/pics/pokemon/huntail.png
--- a/graphics/object_events/pics/pokemon/jirachi.png
+++ b/graphics/object_events/pics/pokemon/jirachi.png
--- a/graphics/object_events/pics/pokemon/jumpluff.png
+++ b/graphics/object_events/pics/pokemon/jumpluff.png
--- a/graphics/object_events/pics/pokemon/kingdra.png
+++ b/graphics/object_events/pics/pokemon/kingdra.png
--- a/graphics/object_events/pics/pokemon/koffing.png
+++ b/graphics/object_events/pics/pokemon/koffing.png
--- a/graphics/object_events/pics/pokemon/lanturn.png
+++ b/graphics/object_events/pics/pokemon/lanturn.png
--- a/graphics/object_events/pics/pokemon/latias.png
+++ b/graphics/object_events/pics/pokemon/latias.png
--- a/graphics/object_events/pics/pokemon/latios.png
+++ b/graphics/object_events/pics/pokemon/latios.png
--- a/graphics/object_events/pics/pokemon/ledian.png
+++ b/graphics/object_events/pics/pokemon/ledian.png
--- a/graphics/object_events/pics/pokemon/ledyba.png
+++ b/graphics/object_events/pics/pokemon/ledyba.png
--- a/graphics/object_events/pics/pokemon/lunatone.png
+++ b/graphics/object_events/pics/pokemon/lunatone.png
--- a/graphics/object_events/pics/pokemon/luvdisc.png
+++ b/graphics/object_events/pics/pokemon/luvdisc.png
--- a/graphics/object_events/pics/pokemon/magikarp.png
+++ b/graphics/object_events/pics/pokemon/magikarp.png
--- a/graphics/object_events/pics/pokemon/magnemite.png
+++ b/graphics/object_events/pics/pokemon/magnemite.png
--- a/graphics/object_events/pics/pokemon/magneton.png
+++ b/graphics/object_events/pics/pokemon/magneton.png
--- a/graphics/object_events/pics/pokemon/mantine.png
+++ b/graphics/object_events/pics/pokemon/mantine.png
--- a/graphics/object_events/pics/pokemon/masquerain.png
+++ b/graphics/object_events/pics/pokemon/masquerain.png
--- a/graphics/object_events/pics/pokemon/meditite.png
+++ b/graphics/object_events/pics/pokemon/meditite.png
--- a/graphics/object_events/pics/pokemon/metang.png
+++ b/graphics/object_events/pics/pokemon/metang.png
--- a/graphics/object_events/pics/pokemon/mew.png
+++ b/graphics/object_events/pics/pokemon/mew.png
--- a/graphics/object_events/pics/pokemon/misdreavus.png
+++ b/graphics/object_events/pics/pokemon/misdreavus.png
--- a/graphics/object_events/pics/pokemon/moltres.png
+++ b/graphics/object_events/pics/pokemon/moltres.png
--- a/graphics/object_events/pics/pokemon/ninjask.png
+++ b/graphics/object_events/pics/pokemon/ninjask.png
--- a/graphics/object_events/pics/pokemon/noctowl.png
+++ b/graphics/object_events/pics/pokemon/noctowl.png
--- a/graphics/object_events/pics/pokemon/pelipper.png
+++ b/graphics/object_events/pics/pokemon/pelipper.png
--- a/graphics/object_events/pics/pokemon/pidgeot.png
+++ b/graphics/object_events/pics/pokemon/pidgeot.png
--- a/graphics/object_events/pics/pokemon/pidgeotto.png
+++ b/graphics/object_events/pics/pokemon/pidgeotto.png
--- a/graphics/object_events/pics/pokemon/porygon.png
+++ b/graphics/object_events/pics/pokemon/porygon.png
--- a/graphics/object_events/pics/pokemon/porygon2.png
+++ b/graphics/object_events/pics/pokemon/porygon2.png
--- a/graphics/object_events/pics/pokemon/relicanth.png
+++ b/graphics/object_events/pics/pokemon/relicanth.png
--- a/graphics/object_events/pics/pokemon/remoraid.png
+++ b/graphics/object_events/pics/pokemon/remoraid.png
--- a/graphics/object_events/pics/pokemon/sharpedo.png
+++ b/graphics/object_events/pics/pokemon/sharpedo.png
--- a/graphics/object_events/pics/pokemon/shedinja.png
+++ b/graphics/object_events/pics/pokemon/shedinja.png
--- a/graphics/object_events/pics/pokemon/shuppet.png
+++ b/graphics/object_events/pics/pokemon/shuppet.png
--- a/graphics/object_events/pics/pokemon/skarmory.png
+++ b/graphics/object_events/pics/pokemon/skarmory.png
--- a/graphics/object_events/pics/pokemon/skiploom.png
+++ b/graphics/object_events/pics/pokemon/skiploom.png
--- a/graphics/object_events/pics/pokemon/solrock.png
+++ b/graphics/object_events/pics/pokemon/solrock.png
--- a/graphics/object_events/pics/pokemon/swablu.png
+++ b/graphics/object_events/pics/pokemon/swablu.png
--- a/graphics/object_events/pics/pokemon/swellow.png
+++ b/graphics/object_events/pics/pokemon/swellow.png
--- a/graphics/object_events/pics/pokemon/tentacool.png
+++ b/graphics/object_events/pics/pokemon/tentacool.png
--- a/graphics/object_events/pics/pokemon/tentacruel.png
+++ b/graphics/object_events/pics/pokemon/tentacruel.png
--- a/graphics/object_events/pics/pokemon/unown_a.png
+++ b/graphics/object_events/pics/pokemon/unown_a.png
--- a/graphics/object_events/pics/pokemon/unown_b.png
+++ b/graphics/object_events/pics/pokemon/unown_b.png
--- a/graphics/object_events/pics/pokemon/unown_c.png
+++ b/graphics/object_events/pics/pokemon/unown_c.png
--- a/graphics/object_events/pics/pokemon/unown_d.png
+++ b/graphics/object_events/pics/pokemon/unown_d.png
--- a/graphics/object_events/pics/pokemon/unown_e.png
+++ b/graphics/object_events/pics/pokemon/unown_e.png
--- a/graphics/object_events/pics/pokemon/unown_exclamation.png
+++ b/graphics/object_events/pics/pokemon/unown_exclamation.png
--- a/graphics/object_events/pics/pokemon/unown_f.png
+++ b/graphics/object_events/pics/pokemon/unown_f.png
--- a/graphics/object_events/pics/pokemon/unown_g.png
+++ b/graphics/object_events/pics/pokemon/unown_g.png
--- a/graphics/object_events/pics/pokemon/unown_h.png
+++ b/graphics/object_events/pics/pokemon/unown_h.png
--- a/graphics/object_events/pics/pokemon/unown_i.png
+++ b/graphics/object_events/pics/pokemon/unown_i.png
--- a/graphics/object_events/pics/pokemon/unown_j.png
+++ b/graphics/object_events/pics/pokemon/unown_j.png
--- a/graphics/object_events/pics/pokemon/unown_k.png
+++ b/graphics/object_events/pics/pokemon/unown_k.png
--- a/graphics/object_events/pics/pokemon/unown_l.png
+++ b/graphics/object_events/pics/pokemon/unown_l.png
--- a/graphics/object_events/pics/pokemon/unown_m.png
+++ b/graphics/object_events/pics/pokemon/unown_m.png
--- a/graphics/object_events/pics/pokemon/unown_n.png
+++ b/graphics/object_events/pics/pokemon/unown_n.png
--- a/graphics/object_events/pics/pokemon/unown_o.png
+++ b/graphics/object_events/pics/pokemon/unown_o.png
--- a/graphics/object_events/pics/pokemon/unown_p.png
+++ b/graphics/object_events/pics/pokemon/unown_p.png
--- a/graphics/object_events/pics/pokemon/unown_q.png
+++ b/graphics/object_events/pics/pokemon/unown_q.png
--- a/graphics/object_events/pics/pokemon/unown_question.png
+++ b/graphics/object_events/pics/pokemon/unown_question.png
--- a/graphics/object_events/pics/pokemon/unown_r.png
+++ b/graphics/object_events/pics/pokemon/unown_r.png
--- a/graphics/object_events/pics/pokemon/unown_s.png
+++ b/graphics/object_events/pics/pokemon/unown_s.png
--- a/graphics/object_events/pics/pokemon/unown_t.png
+++ b/graphics/object_events/pics/pokemon/unown_t.png
--- a/graphics/object_events/pics/pokemon/unown_u.png
+++ b/graphics/object_events/pics/pokemon/unown_u.png
--- a/graphics/object_events/pics/pokemon/unown_v.png
+++ b/graphics/object_events/pics/pokemon/unown_v.png
--- a/graphics/object_events/pics/pokemon/unown_w.png
+++ b/graphics/object_events/pics/pokemon/unown_w.png
--- a/graphics/object_events/pics/pokemon/unown_x.png
+++ b/graphics/object_events/pics/pokemon/unown_x.png
--- a/graphics/object_events/pics/pokemon/unown_y.png
+++ b/graphics/object_events/pics/pokemon/unown_y.png
--- a/graphics/object_events/pics/pokemon/unown_z.png
+++ b/graphics/object_events/pics/pokemon/unown_z.png
--- a/graphics/object_events/pics/pokemon/venomoth.png
+++ b/graphics/object_events/pics/pokemon/venomoth.png
--- a/graphics/object_events/pics/pokemon/volbeat.png
+++ b/graphics/object_events/pics/pokemon/volbeat.png
--- a/graphics/object_events/pics/pokemon/weezing.png
+++ b/graphics/object_events/pics/pokemon/weezing.png
--- a/graphics/object_events/pics/pokemon/whiscash.png
+++ b/graphics/object_events/pics/pokemon/whiscash.png
--- a/graphics/object_events/pics/pokemon/wingull.png
+++ b/graphics/object_events/pics/pokemon/wingull.png
--- a/graphics/object_events/pics/pokemon/yanma.png
+++ b/graphics/object_events/pics/pokemon/yanma.png
--- a/graphics/object_events/pics/pokemon/zapdos.png
+++ b/graphics/object_events/pics/pokemon/zapdos.png
--- a/Show More
+++ b/Show More