Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,646 Commits 1 Branch 0 Tags
9379107d1520aabdfbe23407476784e99bc01f45
Commit Graph
47 Commits
Author SHA1 Message Date
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 7c7887aa65 Moved ABILITY_NAME_LENGTH back to include/constants/global.h to keep in line with upstream pret 2022-08-23 08:25:27 -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 4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 2022-08-07 22:40:15 -04:00
Eduardo Quezada a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -04:00
Eduardo Quezada D'Ottone e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
 2022-07-15 12:58:46 -04:00
LOuroboros a1004485c5 Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH 2022-07-10 20:08:28 -03:00
Eduardo Quezada D'Ottone 221e38ff86 Merge pull request #1957 from ghoulslash/be/ability_popup 
Ability Popup Fixes + Longer Ability Names config
 2022-01-01 19:39:55 -03:00
Eduardo Quezada D'Ottone 67697d2de3 Merge pull request #1582 from ghoulslash/smart_wild_ai 
Smart Wild AI Option
 2021-12-23 20:18:18 -03:00
ghoulslash 0a95a31ee9 fix formatting 2021-12-23 08:44:54 -05:00
ghoulslash 7a7c6afc39 larger ability popup, fix ability name printing/clearing, and config for longer ability names 2021-11-29 12:42:01 -05:00
ultima-soul 0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
ultima-soul 3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR e3b6337c3a Finish battle_anim_mons doc 2021-11-08 14:29:37 -05:00
GriffinR 31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
ghoulslash e75a8fb67c merge ai move and item decisions. AI will prefer to defeat player over healing 2021-09-27 21:03:27 -04:00
ghoulslash 0a0687ae78 add smart wild AI 2021-07-27 09:49:39 -06:00
ultima-soul 5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
GriffinR a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
GriffinR 63a7828772 Document battle_controller_player.c 2021-01-22 20:03:27 -05:00
GriffinR 4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
ExpoSeed 9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
PokeCodec e84da39d8a Match BattleIntroOpponent1SendsOutMonAnimation 2020-09-08 18:54:51 -04:00
PokeCodec 3336eb341d More adjustments 2020-09-08 14:26:37 -04:00
DizzyEggg 97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
GriffinR afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
DizzyEggg 62dc94e9c8 Merge with master 2020-07-15 10:13:19 +02:00
DizzyEggg 0425cb66ef Give proper names to some functions 2020-07-14 11:13:03 +02:00
DizzyEggg 1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR 27169f634b Review changes for party menu doc 2019-10-31 21:33:01 -04:00
GriffinR e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR 6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg a001faeced New AI command for using priority moves in death situatiions 2019-02-16 14:54:17 +01:00
DizzyEggg 78d7c29290 Move buffers to allocated reousrces, get rid of old type effectiveness table 2019-01-05 16:00:57 +01:00
DizzyEggg 6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
DizzyEggg efa820469a move data to c 2018-12-23 14:52:47 +01:00
DizzyEggg f7a7ddde0c Fix Quick Guard 2018-12-22 15:10:24 +01:00
DizzyEggg e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
golem galvanize d3d725cc83 decompiled up to sub_81B0948 2018-10-11 21:23:39 -04:00
DizzyEggg 0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
Slawter666 f40fa37398 Move battle_bg data to C 2018-09-11 23:37:47 +01:00
DizzyEggg d628d1f5fd Move Weather Ball, Hidden power, AI support for dynamic type moves and AI debug support 2018-07-29 11:32:40 +02:00
DizzyEggg 5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02:00
DizzyEggg ab36efdaf4 document bounce effect 2018-06-20 23:07:51 +02:00
DizzyEggg 1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
DizzyEggg 5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
camthesaxman b4bb562363 rename battle_2.c to battle_main.c 2018-01-16 16:15:02 -06:00