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
anim_front.png
back.png
footprint.png
icon.png
normal.pal
shiny.pal