TheXaman
|
6cab795c5c
|
Update include/constants/overworld_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-09-05 11:02:44 +02:00 |
|
Eduardo Quezada
|
89550ed05d
|
Updated Sport Ball's modifier.
|
2022-09-04 18:54:23 -03:00 |
|
Eduardo Quezada D'Ottone
|
4017fc3e20
|
Apply style suggestions from code review
|
2022-09-03 21:22:15 -04:00 |
|
Eduardo Quezada
|
41bf6bde25
|
Removed pointless macro
|
2022-09-03 00:28:53 -04:00 |
|
Eduardo Quezada
|
03498d7240
|
Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER
|
2022-09-02 23:57:43 -04:00 |
|
Eduardo Quezada
|
5403cd036e
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
# Conflicts:
# include/battle.h
# include/battle_controllers.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
|
2022-09-02 23:24:08 -04:00 |
|
GriffinR
|
03a98c72bc
|
Sync fieldmap
|
2022-09-02 19:29:35 -04:00 |
|
Eduardo Quezada
|
c7fc2e13f7
|
Renamed TM flags to keep consistency with the rest of the repo
|
2022-09-02 16:54:58 -04:00 |
|
Porygon23
|
ba6aad5bcc
|
Merge branch 'master' into AI-Logic-Updates
|
2022-09-02 14:44:47 -06:00 |
|
TheXaman
|
b4b3e84cbd
|
removed default flags and added ingame warning if a function that requires them is used
|
2022-09-02 18:39:38 +02:00 |
|
TheXaman
|
367b12801e
|
changed debug_config.h to overworld_config.h,
changed no bag use and no catching flags to battle_config.h,
removed TX reference (big sad)
|
2022-09-02 12:33:42 +02:00 |
|
TheXaman
|
ad57551db1
|
removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation
|
2022-09-02 12:10:11 +02:00 |
|
Eduardo Quezada D'Ottone
|
59f1f10dec
|
Merge pull request #2260 from DizzyEggg/magic_bounce
Fix Magic Bounce targets
|
2022-09-01 19:56:15 -04:00 |
|
GriffinR
|
a28fbbc1b8
|
Merge pull request #1748 from GriffinRichards/fix-judgement
Standardize judgement vs judgment spelling
|
2022-09-01 11:51:04 -04:00 |
|
Eduardo Quezada
|
8d94c58cac
|
Shows exp when leveling up with Exp Candies
|
2022-08-31 21:54:27 -04:00 |
|
Eduardo Quezada
|
3264c3c87a
|
Shows amount of Exp gained.
|
2022-08-31 09:05:51 -04:00 |
|
LOuroboros
|
c167e2c6cc
|
Added Legends: Arceus' move data
|
2022-08-30 19:32:44 -03:00 |
|
DizzyEggg
|
7cb010d71e
|
fix magic bounce conflicts and fix magic coat
|
2022-08-30 19:36:06 +02:00 |
|
TheXaman
|
3debf0442d
|
changed the locations of tx_debug_system related #defines to its own file 'constants/debug_config.h'
|
2022-08-30 18:02:23 +02:00 |
|
TheXaman
|
04c40677bd
|
Changed the way debug flags are handled, now in constants/battle_config.h
|
2022-08-30 17:41:35 +02:00 |
|
TheXaman
|
d9bd272452
|
removed the entries ld_script as per pret#1738, added newline to debug.h
|
2022-08-30 17:08:35 +02:00 |
|
LOuroboros
|
df88317a98
|
Introduced FORM_BATTLE form changes
For species such as Xerneas and Zacian.
|
2022-08-29 19:10:52 -03:00 |
|
TheXaman
|
bed5639074
|
Changed preproc defines to TRUE/FALSE, small cleanup
|
2022-08-29 19:36:44 +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 |
|
ghoulslash
|
2cd01bd95d
|
Merge pull request #2239 from DizzyEggg/quash
Quash
|
2022-08-29 10:43:54 -04:00 |
|
Blackforest92
|
61c33f56a0
|
Updated to latest master branch + add PLA's data to teachable_learnsets.h
|
2022-08-29 21:01:31 +07: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 |
|
Eduardo Quezada
|
12b32606f5
|
Fixed PokemonSubstruct3 alignment
|
2022-08-27 03:05:06 -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 |
|
Eduardo Quezada
|
15d611ba65
|
Usage of BATTLE_PARTNER
|
2022-08-27 01:26:13 -04:00 |
|
Eduardo Quezada
|
0a34d47041
|
Merge remote-tracking branch 'pret/master' into pret_clean2
|
2022-08-27 00:56:00 -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 |
|
crater-git
|
f8fb4e8cf2
|
Renamed funcs, lists, etc. - Teach->Teachable
|
2022-08-26 14:48:06 -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
|
b8a3cc2846
|
Consolidated funcs, renamed CanMonLearnMove
|
2022-08-26 11:07:08 -04:00 |
|
crater-git
|
54ee960970
|
Fixed Battle Frontier tutor move IDs
|
2022-08-26 10:12:11 -04:00 |
|
ghoulslash
|
ae2ff4c1d8
|
Merge pull request #2258 from AsparagusEduardo/RHH_enableBugfix
Enable BUGFIX by default
|
2022-08-26 09:56:19 -04:00 |
|
DizzyEggg
|
6331931ba3
|
Fix Magic Coat targets
|
2022-08-26 15:01:51 +02:00 |
|
Eduardo Quezada D'Ottone
|
399a0c9d6f
|
Merge pull request #2142 from AgustinGDLV/exp_candy
Gen 8 EXP Candies
|
2022-08-25 23:03:24 -04:00 |
|
Eduardo Quezada D'Ottone
|
6b414d9555
|
Apply suggestions from code review
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-08-25 22:40:19 -04:00 |
|
Eduardo Quezada
|
4c999b40b1
|
Enable BUGFIX by default
|
2022-08-25 22:35:33 -04:00 |
|
crater-git
|
ed02c4b425
|
Removed tutor move distinction, combined llists
|
2022-08-25 19:56:47 -04:00 |
|
AgustinGDLV
|
e204527f43
|
changed candy item parameters
|
2022-08-25 15:52:47 -07:00 |
|
LOuroboros
|
8bd7103b9d
|
Even more review corrections
|
2022-08-25 17:32:12 -03:00 |
|
DizzyEggg
|
622a7f8141
|
merge with master
|
2022-08-25 22:10:59 +02:00 |
|
LOuroboros
|
2cf2c00b29
|
Updated friendship labels
|
2022-08-25 17:10:11 -03:00 |
|
ghoulslash
|
552d1f3d7b
|
Merge pull request #2237 from gruxor/compat_define
Reworked branch defines into single compatibility define
|
2022-08-25 15:36:01 -04:00 |
|
ghoulslash
|
15a368163d
|
Merge pull request #2247 from AsparagusEduardo/RHH_specialPic
LoadSpecialPokePic adjustments
|
2022-08-25 15:35:21 -04:00 |
|