Eduardo Quezada
|
790bdd69f8
|
Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2
|
2022-09-03 00:28:32 -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
|
97021baec6
|
Drop usage of global directive
|
2022-09-02 21:53:44 -04:00 |
|
GriffinR
|
8b7230c3c4
|
CpuFastFill -> CpuFastFill16 in fieldmap
|
2022-09-02 19:41:28 -04:00 |
|
GriffinR
|
7f1c4720a2
|
Update arguments for ApplyGlobalTintToPaletteSlot
|
2022-09-02 19:36:46 -04:00 |
|
GriffinR
|
03a98c72bc
|
Sync fieldmap
|
2022-09-02 19:29:35 -04:00 |
|
GriffinR
|
ff53a553bc
|
Merge pull request #1761 from AsparagusEduardo/pret/tmFlagNames
Renamed TM flags to keep consistency with the rest of the repo
|
2022-09-02 17:09:49 -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
|
13cc640b78
|
whitspace changes, removed wrong comment
|
2022-09-02 18:53:51 +02: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 |
|
Eduardo Quezada D'Ottone
|
cc174b622c
|
Merge pull request #2278 from rh-hideout/DizzyEggg-dragontailweakarmor
Dragon Tail Weak Armor fix
|
2022-09-01 19:54:33 -04:00 |
|
Eduardo Quezada D'Ottone
|
875f656045
|
Merge pull request #2284 from StephenLynx/master
Fixed pickup running when it shouldn't in some cases.
|
2022-09-01 14:55:36 -04:00 |
|
Sérgio Augusto Vianna
|
60132b29fb
|
Fixed pickup running when it shouldn't in some cases.
|
2022-09-01 15:37:52 -03:00 |
|
GriffinR
|
a28fbbc1b8
|
Merge pull request #1748 from GriffinRichards/fix-judgement
Standardize judgement vs judgment spelling
|
2022-09-01 11:51:04 -04:00 |
|
GriffinR
|
d211adbc77
|
Merge pull request #1760 from LOuroboros/bermuda
Updated a couple of sizeofs in src/battle_pyramid_bag.c
|
2022-09-01 11:42:09 -04:00 |
|
Eduardo Quezada D'Ottone
|
bf830fca41
|
Merge pull request #2280 from LOuroboros/laMoves
Added Legends: Arceus' move data
|
2022-08-31 22:51:04 -04:00 |
|
LOuroboros
|
5d346fd939
|
Updated a couple more sizeofs
|
2022-08-31 23:49:43 -03:00 |
|
LOuroboros
|
b9a32a93f5
|
Update src/data/text/move_descriptions.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-08-31 23:39:59 -03:00 |
|
GriffinR
|
b66de1f056
|
Merge pull request #1759 from LOuroboros/pyramidSchemes
Automatized the contents of some sideof in src/item.c
|
2022-08-31 22:14:06 -04:00 |
|
LOuroboros
|
ea345f90f5
|
Picked the correct pointers for correctness' sake
|
2022-08-31 23:06:20 -03:00 |
|
LOuroboros
|
e02b33ee11
|
Automatized the contents of some sideof in src/item.c
|
2022-08-31 23:00:24 -03: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 |
|
Eduardo Quezada
|
fe5f30c200
|
Fixed moves learned at the same level being skipped while using exp candies
|
2022-08-30 22:50:46 -04:00 |
|
Eduardo Quezada
|
29448b6acc
|
Fixed XL Candy going out of bounds. Also added failsafe in case an invalid param is used.
|
2022-08-30 22:06:25 -04:00 |
|
Eduardo Quezada
|
494e8791d7
|
Fixed tutors changing levels
|
2022-08-30 22:06:25 -04:00 |
|
LOuroboros
|
7b8226a8af
|
Added descriptions for LA's moves
|
2022-08-30 23:05:22 -03:00 |
|
LOuroboros
|
cc86b2fd96
|
Added Z-Move stats for LA's moves
|
2022-08-30 20:29:36 -03:00 |
|
LOuroboros
|
c167e2c6cc
|
Added Legends: Arceus' move data
|
2022-08-30 19:32:44 -03:00 |
|
DizzyEggg
|
d167b4ea0a
|
Dragon Tail Weak Armor fix
|
2022-08-30 20:08:50 +02:00 |
|
DizzyEggg
|
7cb010d71e
|
fix magic bounce conflicts and fix magic coat
|
2022-08-30 19:36:06 +02:00 |
|
TheXaman
|
c13561e5ba
|
simplified filed controls code for debug menu
|
2022-08-30 18:15: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
|
e09ba650f3
|
imrpoved code formatting in field_control_avatar as per suggestion
|
2022-08-30 17:12:23 +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 |
|
TheXaman
|
5fed45e40b
|
Update src/item_use.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-08-30 17:04:14 +02:00 |
|
TheXaman
|
2f61407c78
|
Update src/field_control_avatar.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-08-30 17:04:02 +02:00 |
|
TheXaman
|
725a9102ee
|
Update src/new_game.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-08-30 17:03:44 +02:00 |
|
TheXaman
|
155465a919
|
Update src/pokemon_storage_system.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-08-30 17:03:28 +02:00 |
|
TheXaman
|
79c4fa560f
|
Update src/start_menu.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-08-30 17:03:07 +02:00 |
|
TheXaman
|
cc921c62d7
|
Update src/field_control_avatar.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-08-30 17:01:59 +02:00 |
|
TheXaman
|
61c95421eb
|
Update src/event_object_movement.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-08-30 17:01:46 +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
|
8cf2933658
|
added preproc directive to main debug.c code
|
2022-08-29 19:46:03 +02:00 |
|