ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,124 Commits 1 Branch 0 Tags 235 MiB
ce18df46e6
Commit Graph

33 Commits

Author SHA1 Message Date
Eduardo Quezada
3aaa89ce71 Changed all instances of gSpeciesNames so that it uses GetSpeciesName 2023-07-07 14:37:51 -04:00
Eduardo Quezada
adfc0af372 Mon graphics are now loaded depending on their availability 
- If it has a female sprite/palette, it's loaded.
- If it the species is enabled and it has a sprite/palette, it's loaded.
- Otherwise, load the SPECIES_NONE graphics.
 2023-07-07 14:36:30 -04:00
sbird
aea5d79aa2 [trainer_parties] implement fully customizable npc trainer parties 
fix nature related bug, fix hash generation, add tests
 2023-03-25 20:00:04 +01:00
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
GriffinR
60e1ad20e4 Add NUM_MON_PIC_FRAMES, and trainer pic size constants 2022-10-10 23:16:08 -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
Martin Griffin
2380d13a43 Macros for keeping .partyFlags, .partySize, and .party in sync 2022-07-27 23:25:37 +01:00
LOuroboros
b59f7aed7f
Added a constant for NPC trainer name length (#1712) 2022-07-25 22:59:13 -04:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
Eduardo Quezada D'Ottone
3bbaf5a15d Optimized SpeciesHasGenderDifference into Base Stat flag 2022-01-01 19:24:34 -03:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06:00
ultima-soul
01a90ca6c2 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-27 22:17:05 -08: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
1548e902cd Add MonCoods size macro 2021-11-08 09:41:23 -05:00
GriffinR
739e7d3c31 Document summary screen sprite manager 2021-10-02 23:47:59 -04:00
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06: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
bee60f4c64 Document battler sprite affine anims, default pokeball throw 2021-04-25 02:18:34 -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
Evan
348d70b309 z move indicator and some data 2020-11-26 15:56:18 -05:00
Eduardo Quezada D'Ottone
d7fbaa6cbf Support for gender palettes. 2020-11-06 17:12:57 -03:00
Eduardo Quezada D'Ottone
3849f7dd5d Female Eevee backsprite. 2020-11-06 16:45:25 -03: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
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
GriffinR
85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
DizzyEggg
c090f6cda9 Add Unown forms 2019-04-07 12:40:18 +02: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