Eduardo Quezada
|
9917f5cc8b
|
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
# Conflicts:
# Makefile
# include/constants/pokemon.h
# include/pokemon.h
# make_tools.mk
# src/battle_ai_script_commands.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_script_commands.c
# src/party_menu.c
# src/pokemon.c
# src/trade.c
# src/trainer_pokemon_sprites.c
|
2023-03-03 11:00:50 -03:00 |
|
GriffinR
|
3b15fd34cc
|
Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames
|
2023-02-01 16:09:01 -05:00 |
|
Eduardo Quezada
|
2d694a84e3
|
Trying to fix remote reference
|
2022-12-05 21:57:28 -03:00 |
|
GriffinR
|
60e1ad20e4
|
Add NUM_MON_PIC_FRAMES, and trainer pic size constants
|
2022-10-10 23:16:08 -04:00 |
|
Eduardo Quezada D'Ottone
|
3bbaf5a15d
|
Optimized SpeciesHasGenderDifference into Base Stat flag
|
2022-01-01 19:24:34 -03: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 |
|
BuffelSaft
|
db928a1329
|
Data entry for new sprites
Add sprite defines, entries to gender tables, etc.
|
2021-09-11 14:12:41 +12:00 |
|
ultima-soul
|
cf0fd961b9
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-04-28 23:56:58 -07:00 |
|
GriffinR
|
e40f89b175
|
Move unknown data table, reference with species
|
2021-04-25 02:19:01 -04:00 |
|
GriffinR
|
bee60f4c64
|
Document battler sprite affine anims, default pokeball throw
|
2021-04-25 02:18:34 -04:00 |
|
ultima-soul
|
b8721034ef
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-04-02 13:42:05 -07:00 |
|
GriffinR
|
62968895ca
|
Add MON_PIC_SIZE constant
|
2021-03-29 09:38:19 -04:00 |
|
ultima-soul
|
56a1cab314
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-03-23 15:21:19 -07:00 |
|
GriffinR
|
a392cca928
|
Misc battle documentation
|
2021-01-23 00:40:31 -05:00 |
|
ExpoSeed
|
10f4b48215
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2021-01-01 14:14:51 -08:00 |
|
GriffinR
|
076b2c2edc
|
Designated initializers for gTrainerBackPicTable
|
2020-11-30 15:32:08 -05:00 |
|
Eduardo Quezada D'Ottone
|
4d4b111327
|
Front pic gender differences for Eevee
|
2020-11-06 16:21:45 -03:00 |
|
ExpoSeed
|
5794fc69e8
|
Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion
|
2020-10-04 02:35:23 -05:00 |
|
GriffinR
|
5259898325
|
Replace POKEMON_SLOTS_NUMBER
|
2020-10-01 17:07:12 -05:00 |
|
DizzyEggg
|
88bdeed1a6
|
Merge with master
|
2020-04-15 14:40:16 +02:00 |
|
DizzyEggg
|
4c462a726e
|
Merge with master and learnsets
|
2019-10-06 15:57:33 +02:00 |
|
PikalaxALT
|
306ce048ad
|
Move gflib srcs and headers to gflib subdir
|
2019-09-08 21:07:54 -04:00 |
|
DizzyEggg
|
8213222337
|
Merge with master
|
2019-04-06 23:20:16 +02:00 |
|
DizzyEggg
|
b0223f691f
|
Clean up data headers
|
2019-04-05 07:53:23 -05:00 |
|
DizzyEggg
|
c36476af85
|
Clean up data2b.c
|
2019-04-05 07:53:23 -05:00 |
|