DizzyEggg
7cb010d71e
fix magic bounce conflicts and fix magic coat
2022-08-30 19:36:06 +02:00
TheXaman
8c9a59ec1c
Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh
2022-08-29 19:13:11 +02:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework
...
Reworked TMHM into expandable list format
2022-08-29 04:20:45 -04:00
crater-git
9f16d1dd12
Fixed battle frontier tutors (for real this time)
2022-08-27 22:45:10 -04:00
Eduardo Quezada
69f4c226f0
Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs
...
# Conflicts:
# src/battle_ai_main.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_script_commands.c
# src/pokemon.c
# src/pokemon_summary_screen.c
2022-08-27 02:42:22 -04:00
GriffinR
8aead3b4c8
Merge pull request #1747 from GriffinRichards/contest-ai-bug
...
Incorporate commented bug fixes in contest AI scripts
2022-08-26 23:53:44 -04:00
Eduardo Quezada
7c86bd5d08
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
...
# Conflicts:
# include/battle_interface.h
# src/battle_anim_effects_1.c
# src/battle_script_commands.c
# src/field_specials.c
2022-08-26 22:23:37 -04:00
Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection
...
Implement affection-now-friendship mechanics
2022-08-26 14:54:32 -04:00
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore
...
Added constants for GetLeadMonFriendshipScore
2022-08-26 14:52:10 -04:00
GriffinR
c5e873aa2b
Merge pull request #1742 from GriffinRichards/sound-pan
...
Add missing usage of SOUND_PAN_*
2022-08-26 14:47:24 -04:00
crater-git
54ee960970
Fixed Battle Frontier tutor move IDs
2022-08-26 10:12:11 -04:00
DizzyEggg
6331931ba3
Fix Magic Coat targets
2022-08-26 15:01:51 +02:00
Eduardo Quezada
6fb4da68f3
Corrected Oldale Town Sign labels
2022-08-25 22:00:24 -04:00
crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
LOuroboros
410045028a
Optimized General_AffectionHangedOn
2022-08-25 20:01:14 -03:00
LOuroboros
8bd7103b9d
Even more review corrections
2022-08-25 17:32:12 -03:00
LOuroboros
2cf2c00b29
Updated friendship labels
2022-08-25 17:10:11 -03:00
LOuroboros
7539051942
Further tweaked the affection animation
2022-08-25 17:05:57 -03:00
LOuroboros
5dd143f19d
Applied Blackforest's changes to General_AffectionHangedOn
2022-08-25 13:07:52 -03:00
LOuroboros
1fc63c3431
More review corrections
2022-08-25 11:52:21 -03:00
LOuroboros
11d6ae4820
Renamed the GetLeadMonFriendshipScore constants
2022-08-25 11:34:37 -03:00
LOuroboros
e792fae415
Review corrections
...
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
2022-08-25 10:45:57 -03:00
LOuroboros
1f4ef2a0fb
Added constants for GetLeadMonFriendshipScore
2022-08-25 10:40:56 -03:00
Eduardo Quezada
eea718cfc6
Placeholder moves can't be used in battle.
2022-08-24 00:30:49 -04:00
Eduardo Quezada
56a2e91518
Updated move limitations
2022-08-23 22:40:04 -04:00
Eduardo Quezada
1f5adf93c7
Cleaned up use of configs be almost exclusively preproc functions
2022-08-23 21:00: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
Eduardo Quezada
2b7a2c4d09
Merge remote-tracking branch 'RHH/battle_engine' into MergedBranchUltimate
2022-08-22 17:30:48 -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
GriffinR
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock
...
Clean up lock/unlock anim movement
2022-08-22 01:30:33 -04:00
GriffinR
30906762ed
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs
...
Fixed inconsistent use of white space for scripts, .c files and .h files.
2022-08-20 23:03:59 -04:00
GriffinR
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const
...
Add some missing battle arena constants
2022-08-20 22:54:32 -04:00
GriffinR
11b4958f23
Incorporate commented bug fixes in contest AI scripts
2022-08-19 19:45:15 -04:00
GriffinR
c2d5dd2a1f
Additional battle anim sync
2022-08-19 11:51:13 -04:00
Eduardo Quezada
e43f65cc69
using BATTLE_RUN constants in BattleScript_EffectTeleport
2022-08-15 21:06:26 -04:00
Eduardo Quezada
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
Eduardo Quezada
63e4a8adcd
Fixed instances of .string being used with spaces instead of tabs
2022-08-15 14:32:01 -04:00
GriffinR
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
GriffinR
cf4d05e9e7
Fix typo
2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb
Add some missing battle arena constants
2022-08-11 12:02:56 -04:00
Eduardo Quezada D'Ottone
54097951f7
Using B_WAIT_TIME_LONG
2022-08-03 16:51:02 -04: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
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
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
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
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
2b5bb9f6e4
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
2022-07-19 18:24:53 -04:00
ghoulslash
5d91bdeafc
add B_ANIM_RESTORE_BG to BattleScript_EffectTerrainHit
2022-07-17 19:13:45 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
ghoulslash
9b5aee3b93
fix z stat-boosts
2022-07-17 12:17:54 -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
c69275f373
Merge remote-tracking branch 'pret/master' into PE_pretmerge
...
# Conflicts:
# include/battle_anim.h
# include/pokemon.h
# src/data/pokemon/base_stats.h
2022-07-12 17:20:49 -04:00
GriffinR
e6a374f2b6
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
2022-07-06 14:49:08 -04:00
LOuroboros
8f728dcd79
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
2022-07-03 13:49:18 -03:00
ghoulslash
02a62e245b
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney
...
Config for lost money after losing a battle
2022-07-01 11:58:36 -04:00
ghoulslash
b9be123716
Merge pull request #2163 from Sneed69/terrain-softlock-fix
...
Fix terrain move softlock
2022-07-01 11:58:00 -04:00
ghoulslash
a349462b78
Merge pull request #2134 from LOuroboros/bePretMerge
...
Pret merge for the battle_engine
2022-07-01 09:21:51 -04:00
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03:00
Colton G. Rushton
3de23b332a
Supplant https://github.com/pret/pokeemerald/pull/1579
2022-06-18 21:51:05 -03:00
GriffinR
21ed288f50
Merge pull request #1687 from SimplyBLGDev/patch-1
...
Format newlines in surf.inc
2022-06-18 11:04:39 -04:00
Colton G. Rushton
c8e6d69fdc
Format newline in BattleBattleFrontier_BattlePikeLobby/scripts.inc
...
One of the strings declared in BattleFrontier_BattlePikeLobby/scripts.inc was poorly formatted.
2022-06-18 11:49:13 -03:00
GriffinR
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier
...
Add some battle frontier constant usage
2022-06-18 10:22:58 -04:00
Simply BLG
324a157b34
Format newlines in surf.inc
...
One of the strings declared in surf.inc was poorly formatted.
## Description
Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.
2022-06-17 15:21:12 -03:00
Simply BLG
380cc8615b
Format newlines in pc_transfer.inc
2022-06-17 14:22:31 -03:00
Simply BLG
1860b61fe3
Corrected two missing newlines
2022-06-17 12:05:32 -03:00
Simply BLG
e48341f7fc
Format newlines in contest_string.inc
...
Some of the strings declared in contest_string.inc were poorly formatted, containing newline characters in the middle of the string, opposing the format used by every string in data/text, I just updated them to match the format, making it more readable.
2022-06-17 11:52:54 -03:00
GriffinR
4660f8c88b
Document battle tower TV show
2022-06-14 09:37:39 -04:00
GriffinR
dec54e6e92
Additional constant usage
2022-06-13 03:21:20 -04:00
sneed
f419fc3ae7
fix terrain move softlock
2022-06-04 18:36:18 +03:00
GriffinR
1ca1bff81c
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg
2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
GriffinR
a8437493c1
Document generic argument names in battle anim palettes
2022-06-01 12:25:01 -04:00
hamish
307d5d93c4
add potlergeist animation
2022-05-23 08:53:08 -04:00
sneed
5b0afffd91
popup and flower gift description fixes
2022-05-22 13:10:51 +03:00
sneed
fe42eacdf0
tabs over spaces
2022-05-22 05:23:06 +03:00
BuffelSaft
16570e8c3f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-22 12:55:55 +12:00
Sneed69
d0a2be9630
weather forms fixes and config
2022-05-22 03:20:48 +03:00
TheXaman
cbe8f30001
added FLAG_ADVENTURE_STARTED to cheat start
2022-05-21 12:54:02 +02:00
sneed
928d3c5a28
change form on weather fade
2022-05-19 15:08:03 +03:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
ghoulslash
ebb711b6e5
fix bug bite not activating if faints target. also save original move target through the effect
2022-05-13 18:24:52 -04:00
ghoulslash
b09dad68d5
minor edits to consumeberry calls
2022-05-13 16:29:37 -04:00
ghoulslash
cdd37ad1bb
fix stuff cheeks w new consumeberry impl
2022-05-13 16:28:23 -04:00
ghoulslash
f6f4227f49
better bug bite impl, fix item removal
2022-05-13 16:21:41 -04:00
BuffelSaft
bb25746e05
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2022-05-13 22:40:43 +12:00
LOuroboros
52d6c96e69
Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge
2022-05-13 03:20:42 -03:00
LOuroboros
2263caef7a
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
2022-05-13 03:17:31 -03:00
AgustinGDLV
54163240d8
implemented toggelable cancellation / multi-evo
2022-05-08 20:55:29 -07:00
ghoulslash
07b0ce9737
add inner focus ability popup msg
2022-05-08 17:57:30 -04:00
AgustinGDLV
7b0154336d
Merge branch 'battle_engine' into symbiosis
2022-05-07 13:26:21 -07:00
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs
...
Once again, Battle Configs
2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone
dc25bc6145
Merge branch 'battle_engine' into BE_WhiteOutMoney
...
# Conflicts:
# include/constants/battle_string_ids.h
# src/battle_message.c
2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone
cbe73de8c8
Merge pull request #1861 from LOuroboros/primalReversionTweaks
...
Primal Reversion Tweaks
2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone
4e7ce0b663
Merge branch 'battle_engine' into BE_configs
...
# Conflicts:
# include/constants/battle_config.h
2022-05-07 10:25:34 -04:00
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock
...
Add missing Heal Block functionalities
2022-05-07 09:13:18 -04:00
ghoulslash
e5b777695c
Merge pull request #2107 from Sneed69/steelbeam
...
Steel Beam Move Effect Implementation
2022-05-07 08:40:34 -04:00
AgustinGDLV
2ffff788b4
fixed Fling
2022-05-06 22:29:40 -07:00
