GriffinR
|
2487ddb128
|
Sector security -> signature
|
2022-08-05 10:42:31 -04:00 |
|
DizzyEggg
|
c991131b75
|
Change language stuff based on the french decomp
|
2022-08-04 11:53:16 +02:00 |
|
GriffinR
|
e5c36cd745
|
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
|
2022-08-03 14:21:13 -04:00 |
|
GriffinR
|
79384ec9f3
|
Merge pull request #1702 from GriffinRichards/clean-psn
Clean up field_poison.c
|
2022-08-02 13:20:49 -04:00 |
|
GriffinR
|
99a37b5aa5
|
Merge pull request #1717 from mrgriffin/trainer-party-macro
Macros for keeping .partyFlags, .partySize, and .party in sync
|
2022-08-02 13:11:43 -04:00 |
|
ExpoSeed
|
807c3fd17f
|
Delete item and ability defines in configs
|
2022-08-02 00:28:42 -05:00 |
|
ExpoSeed
|
49da2ee53f
|
Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION
|
2022-08-02 00:15:55 -05:00 |
|
GriffinR
|
79c5a5983e
|
Merge pull request #1721 from AsparagusEduardo/pret_clean2
Companion PR to pokefirered #525
|
2022-08-01 16:57:40 -04:00 |
|
Eduardo Quezada
|
c6cdb2a281
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
|
2022-07-31 22:57:46 -04:00 |
|
GriffinR
|
5101811407
|
Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands
Further cleaning after comparing with pokefirered
|
2022-07-30 09:09:23 -04:00 |
|
Eduardo Quezada
|
40805fffc0
|
Space cleanup
|
2022-07-29 21:28:39 -04:00 |
|
Eduardo Quezada
|
5d4b76c0ba
|
Review changes from pokefirered #524
|
2022-07-29 17:00:07 -04:00 |
|
Eduardo Quezada
|
9dc64b67cd
|
Review changes
|
2022-07-29 15:38:23 -04:00 |
|
Eduardo Quezada
|
01558ff8f3
|
Struct pointers star standarizing
|
2022-07-29 11:15:33 -04:00 |
|
Eduardo Quezada
|
13672680b0
|
void pointer standarized
|
2022-07-29 10:52:35 -04:00 |
|
Eduardo Quezada
|
7b3401ee27
|
Standarized use of star in pointer types
|
2022-07-29 10:17:58 -04:00 |
|
Eduardo Quezada
|
9caca17064
|
Cleanup by syncing src/battle_script_commands.c with pokefirered
|
2022-07-29 09:43:16 -04:00 |
|
Jaizu
|
7a8c28ccca
|
Remove duplicated CB2_InitCopyrightScreenAfterBootup
|
2022-07-29 10:52:36 +02:00 |
|
Greenphx9
|
05cbd6a906
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names
|
2022-07-29 18:49:25 +10:00 |
|
LOuroboros
|
b9c83710c4
|
Sync this branch's include/constants/moves.h with the BE's
|
2022-07-28 11:12:28 -03:00 |
|
Eduardo Quezada
|
09af7422d5
|
Further cleaning after comparing with pokefirered
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
|
2022-07-28 01:27:05 -04:00 |
|
Martin Griffin
|
2380d13a43
|
Macros for keeping .partyFlags, .partySize, and .party in sync
|
2022-07-27 23:25:37 +01:00 |
|
GriffinR
|
1da46a4bbc
|
Merge pull request #1715 from AsparagusEduardo/pret_docBooleans
Documented boolean uses
|
2022-07-27 12:09:02 -04:00 |
|
Eduardo Quezada
|
e1c15a9cf6
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
|
2022-07-27 08:16:10 -04:00 |
|
LOuroboros
|
b59f7aed7f
|
Added a constant for NPC trainer name length (#1712)
|
2022-07-25 22:59:13 -04:00 |
|
Eduardo Quezada
|
a37d8b1346
|
Documented boolean uses
|
2022-07-25 14:59:14 -04:00 |
|
LOuroboros
|
032b7b2ab9
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection
|
2022-07-25 10:24:19 -03:00 |
|
Eduardo Quezada D'Ottone
|
bfb86fdc86
|
Config for Gen 3 faint switch mechanics
|
2022-07-24 14:57:47 -04:00 |
|
Eduardo Quezada
|
e96c9c87fa
|
Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 23:38:52 -04:00 |
|
Eduardo Quezada
|
231727d02b
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
# Conflicts:
# asm/macros/event.inc
# data/specials.inc
# include/constants/species.h
# src/data/pokemon/base_stats.h
|
2022-07-22 23:33:04 -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 |
|
ghoulslash
|
1260666c91
|
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides
Added Egg breeding species overrides.
|
2022-07-22 14:05:14 -04:00 |
|
ghoulslash
|
3a77b52bad
|
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
Battle Engine pret merge
|
2022-07-22 14:00:40 -04:00 |
|
Eduardo Quezada D'Ottone
|
56b9a50109
|
Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus
# Conflicts:
# include/constants/battle_config.h
|
2022-07-21 16:28:16 -04:00 |
|
ghoulslash
|
49a932a892
|
Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky
Fixed Light That Burns The Sky not using the calculated damage category
|
2022-07-21 16:14:38 -04:00 |
|
ghoulslash
|
30a494f964
|
Merge pull request #2197 from AsparagusEduardo/BE_explosion
Config for Explosion halving defense
|
2022-07-21 16:11:32 -04:00 |
|
ghoulslash
|
504600c996
|
Merge pull request #2201 from AsparagusEduardo/BE_sturdy
Config for Sturdy's Gen5+ effect.
|
2022-07-21 16:09:01 -04:00 |
|
Eduardo Quezada D'Ottone
|
e4ae280ca6
|
Fixed calls to IsZMove
|
2022-07-21 15:32:14 -04:00 |
|
Eduardo Quezada D'Ottone
|
25397e5794
|
Fixed Light That Burns The Sky not using the calculated damage category
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
|
2022-07-21 15:13:00 -04:00 |
|
Eduardo Quezada D'Ottone
|
0f3fdd410a
|
Config for Sturdy's Gen5+ effect.
|
2022-07-20 13:06:41 -04:00 |
|
Eduardo Quezada D'Ottone
|
e14afd8957
|
Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.
|
2022-07-20 10:33:18 -04:00 |
|
Eduardo Quezada D'Ottone
|
cb34119711
|
Config for Charge raising Sp. Def.
|
2022-07-20 10:13:18 -04:00 |
|
Eduardo Quezada D'Ottone
|
fe63dafcc1
|
Merge branch 'battle_engine' into BE_pretmerge
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
|
2022-07-20 08:50:30 -04:00 |
|
ghoulslash
|
99424e1aaf
|
Update include/battle.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-07-19 19:03:05 -04:00 |
|
ghoulslash
|
2b5bb9f6e4
|
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
|
2022-07-19 18:24:53 -04:00 |
|
Eduardo Quezada D'Ottone
|
1cfb267b34
|
Config for Explosion halving defense
|
2022-07-18 13:10:27 -04:00 |
|
Eduardo Quezada D'Ottone
|
1dcbf59686
|
Config for Plus and Minus interaction
|
2022-07-18 08:11:02 -04:00 |
|
ghoulslash
|
6b84a9f0b3
|
merge w be
|
2022-07-17 12:40:43 -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 |
|
Eduardo Quezada D'Ottone
|
f78bb4fb84
|
Merge remote-tracking branch 'pret/master' into item_expansion
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-12 17:42:32 -04:00 |
|