Eduardo Quezada
f830b0725a
GMAX -> GIGANTAMAX
2023-10-10 18:07:12 -03:00
Eduardo Quezada
92301398bc
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
Eduardo Quezada D'Ottone
76075ffe57
Revert unneeded sprite changes from 3051 ( #3205 )
2023-08-25 16:33:15 -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
AgustinGDLV
ec4b330b9b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-10 21:00:41 -08:00
Eduardo Quezada
501cff84b9
Removed unused single-frame front pics
2023-02-27 18:09:54 -03:00
AgustinGDLV
38f462551f
pulled rhh master, i hate merge conflicts
2023-02-22 18:50:54 -08:00
AgustinGDLV
2139e138a9
removed duplicate sprites and changed folder format for gmax
2022-10-27 19:44:06 -07:00
Blackforest92
55477234ef
Palette conversion GEN5
2021-12-08 21:39:31 +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
LOuroboros
87461db04d
Added missing 2nd frames for Gen. 5 species
...
Also made certain Pokémon such as Zebstrika or Galvantula use their 2nd frame.
2021-08-23 08:28:58 -03:00
LOuroboros
7cf3c256cd
Added footprints for the Gen. 5 species, thanks to Blackforest
2020-11-01 09:44:05 -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