Eduardo Quezada
124c17d315
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
2024-02-17 23:40:08 -03:00
Eduardo Quezada
c29a33ea78
Moved follower sprites to graphics/pokemon folder
2024-01-23 14:04:16 -03:00
Alex
5b5b9e7e50
Revert "Organized pokemon graphics by generation ( #3868 )" ( #3959 )
...
This reverts commit b077d92731
2024-01-10 15:49:58 -03:00
MartyKen
b077d92731
Organized pokemon graphics by generation ( #3868 )
...
* VSync BENCHMARKs and avoid AdvanceRandom in tests (#3867 )
* Organized pokemon graphics per generation
title says it all
---------
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-01-08 20:48:12 +01:00
Eduardo Quezada D'Ottone
76075ffe57
Revert unneeded sprite changes from 3051 ( #3205 )
2023-08-25 16:33:15 -04:00
Eclipse
c76e5deb9f
Fixed Wailord icon ( #3183 )
2023-07-30 10:08:56 -04:00
ghoulslash
5de84d9a2f
Killed the bKGD invalid index warnings and fixed the bit depth of the species sprites ( #3051 )
2023-06-24 13:27:40 -04:00
LOuroboros
d385ae3d5e
Killed the bKGD invalid index warning
...
Special thanks to:
-Blackforest for the tips on how to go about fixing the sprites with GIMP.
-Dat.S.H for a tip on how to make the conversion process easier to perform.
-Psf for actually going and doing it.
2023-06-07 23:13:07 -03:00
Eduardo Quezada
4c57b84cd9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
...
# Conflicts:
# graphics/pokemon/mawile/footprint.png
# src/battle_gfx_sfx_util.c
# src/fldeff_sweetscent.c
# src/pokedex.c
2023-06-02 11:45:28 -04:00
GriffinR
41ac28b210
Index pokemon footprint pngs
2023-05-09 22:43:48 -04:00
Jaizu
01a12d81c7
Fix gen 3 icons
2023-04-01 08:20:06 +02:00
Eduardo Quezada
501cff84b9
Removed unused single-frame front pics
2023-02-27 18:09:54 -03:00
Blackforest92
98e5b1f031
Palette conversion GEN3
2021-11-30 23:29:44 +07:00
Eduardo Quezada D'Ottone
80d8e4cfd4
Revert "Fix the 'bKGD: invalid index' error"
2021-10-17 07:32:49 -03:00
LOuroboros
1c59586e67
Fixed the 'bKGD: invalid index' error
2021-09-21 22:06:01 -03:00
DizzyEggg
7c6077ef8b
Add icons for gen1-gen6 mons
2019-04-11 18:20:03 +02:00
DizzyEggg
b407967cea
Gen5 sprites and icon placeholder data
2019-04-04 12:57:01 +02:00
DizzyEggg
0d6b13759a
Change gen1-gen3 sprites to sugimori palettes
2019-04-03 21:04:23 +02:00
garak
d0115db565
move pokemon graphics to mon-specific directories
2019-03-16 12:21:47 -05:00
