Eduardo Quezada D'Ottone
21fe205f0f
Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes
...
Fix multiple pokemon icons & tidying pokemon graphic folders
2022-08-24 00:52:49 -04:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
Eduardo Quezada
75ac960365
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
2022-08-22 17:27:21 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Blackforest92
56f4c319a4
Fix multiple pokemon graphics, tidying pokemon graphic folders
2022-07-22 22:17:29 +07:00
Greenphx9
b3294c60a2
Calyrex Rider Icons
2022-04-22 16:31:17 +10:00
Eduardo Quezada D'Ottone
d328c2e006
Fixed references by debug menu.
2022-01-01 21:07:49 -03:00
Eduardo Quezada D'Ottone
3bbaf5a15d
Optimized SpeciesHasGenderDifference into Base Stat flag
2022-01-01 19:24:34 -03:00
Eduardo Quezada D'Ottone
39ef356be1
Merge pull request #1935 from LOuroboros/someGenderDiffs
...
Added gender differences for a couple of Gen. 4 Pokémon
2021-12-18 13:46:23 -03:00
TheXaman
f6d9b74a1a
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug
2021-12-10 16:48:46 +01:00
TheXaman
7ff8c1c9eb
Update src/pokemon_icon.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:42:11 +01:00
TheXaman
44dab3cc93
Update src/pokemon_icon.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:42:07 +01:00
TheXaman
99d03259ff
Update src/pokemon_icon.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:42:02 +01:00
TheXaman
5a63cbd527
Update src/pokemon_icon.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-03 11:41:58 +01:00
TheXaman
40f7247e11
changed P_ENABLE_DEBUG to TRUE/FALSE
2021-12-03 11:02:22 +01:00
TheXaman
c402a840b1
changed to P_ENABLE_DEBUG
2021-11-30 11:20:26 +01:00
TheXaman
50e95878e9
added Select button text, added gender based icons, imrpoved code
2021-11-30 11:16:30 +01:00
Jaizu
b7f4658077
Added Kricketot line gender difference sprites
2021-11-22 16:30:05 -03:00
LOuroboros
8373312ed7
Add gender differences for some Gen. 4 Pokémon
...
Namely: Bidoof, Kricketot, Shinx, Starly, Staravia and Staraptor
Credits to CyanSMP64/Furret and Jaizu.
2021-11-22 16:25:25 -03:00
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
GriffinR
d20341646a
Start battle_anim_mons doc
2021-11-08 11:46:13 -05:00
GriffinR
ed6fdd743f
Some pokemon_icon clean up
2021-10-17 22:04:08 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none
2021-09-24 10:17:34 -04:00
Eduardo Quezada D'Ottone
08d3c31abe
Merge pull request #1584 from Blackforest92/pokemon_expansion
...
Port missing Gen8 icons from DPE
2021-09-20 22:48:57 -03:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -04:00
BuffelSaft
db928a1329
Data entry for new sprites
...
Add sprite defines, entries to gender tables, etc.
2021-09-11 14:12:41 +12:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
Blackforest92
3bd81d347d
Add missing Gen8 icons
2021-07-31 14:48:55 +07:00
Blackforest92
d1261165b8
Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor
2021-05-25 11:44:47 +07:00
ultima-soul
eedd374a5f
Merge pull request #1420 from Blackforest92/pokemon_expansion
...
Added missing gen8 battle sprites and available icons and various fixes
2021-05-24 21:13:12 -07:00
ultima-soul
56a1cab314
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-03-23 15:21:19 -07:00
Blackforest92
badf8945d8
Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie
2021-03-14 18:31:24 +07:00
GriffinR
1cac608dbe
Document mail
2021-02-24 11:03:39 -05:00
GriffinR
642ae8295e
Some constant use in pokemon_icon.c
2021-02-17 14:11:59 -05:00
amiosi
762dcb8a7c
cry fixes, type null
2021-02-03 14:10:39 -05:00
amiosi
a021204389
oricorio pau constants
2021-02-02 14:49:01 -05:00
amiosi
032f8ac834
tapus pls
2021-02-02 14:43:12 -05:00
amiosi
9c2c337e6f
tapu case
2021-02-02 14:24:15 -05:00
amiosi
f700004188
proper CamelCase
2021-02-02 14:21:00 -05:00
amiosi
2d6b80455d
Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr
2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790
MIMEJR -> MIME_JR
2021-02-02 12:36:05 -05:00
ultima-soul
96232ea166
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-01-28 23:59:08 -08:00
GriffinR
bc20fda604
Use GET_UNOWN_LETTER macro
2021-01-19 04:03:16 -05:00
ultima-soul
6a0939cd4e
Remove special handling for Deoxys.
2020-12-21 22:39:19 -08:00
ultima-soul
c675c92a1d
Add Gen 8 Pokemon data.
2020-12-16 12:57:36 -08:00
Eduardo Quezada D'Ottone
26db02e95a
Review changes 1
2020-11-13 15:36:36 -03:00
Eduardo Quezada D'Ottone
caf6253ba3
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/pokemon_icon.c
2020-11-10 19:37:02 -03:00
Eduardo Quezada D'Ottone
cb6802f01e
Standarized naming schemes.
2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
209ff3aa5e
Fixed spacing.
2020-11-06 18:11:05 -03:00
Eduardo Quezada D'Ottone
5e33281350
Support for gender difference mon icons.
2020-11-06 17:48:03 -03:00
