Eduardo Quezada 1fc712f153 Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210 ... # Conflicts: # Makefile # data/battle_scripts_1.s # gflib/malloc.c # gflib/malloc.h # include/battle.h # ld_script.ld # ld_script_modern.ld # src/battle_ai_script_commands.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/species_info.h # src/pokemon.c		2023-12-10 13:27:09 -03:00
..
spots	Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin	2023-11-12 14:28:11 +13:00
anim_front.png	Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks (#3127)	2023-07-14 11:45:40 -04:00
back.png	Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks (#3127)	2023-07-14 11:45:40 -04:00
footprint.png	Index pokemon footprint pngs	2023-05-09 22:43:48 -04:00
icon.png	Revert unneeded sprite changes from 3051 (#3205)	2023-08-25 16:33:15 -04:00
normal.pal	Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks (#3127)	2023-07-14 11:45:40 -04:00
shiny.pal	Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks (#3127)	2023-07-14 11:45:40 -04:00