Eduardo Quezada
|
dbd56efaef
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
# Conflicts:
# src/battle_util.c
|
2022-09-05 12:20:57 -04:00 |
|
GriffinR
|
797aa08141
|
Merge pull request #1764 from AsparagusEduardo/pret/battlerMacros
Further uses of GET_BATTLER_SIDE macros'
|
2022-09-03 01:04:55 -04:00 |
|
Eduardo Quezada
|
41bf6bde25
|
Removed pointless macro
|
2022-09-03 00:28:53 -04:00 |
|
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
|
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 |
|
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 |
|
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 |
|
ghoulslash
|
2cd01bd95d
|
Merge pull request #2239 from DizzyEggg/quash
Quash
|
2022-08-29 10:43:54 -04:00 |
|
Eduardo Quezada D'Ottone
|
280fd4b50b
|
Merge pull request #2177 from Blackforest92/Legends_Arceus_Expansion
Legends arceus pokemon expansion
|
2022-08-29 10:40:52 -04:00 |
|
Blackforest92
|
b209645b20
|
Changes Origin to Origin Forme
|
2022-08-29 21:33:28 +07:00 |
|
Eduardo Quezada D'Ottone
|
32a1017c2d
|
Fixed tab
|
2022-08-29 10:13:01 -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 |
|
DizzyEggg
|
2d4ac679a6
|
tabs
|
2022-08-29 10:26:55 +02:00 |
|
DizzyEggg
|
27010e9ee6
|
quash faintclearsetdata
|
2022-08-29 10:23:26 +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
|
1c735e1abe
|
Restored bool32 type to shouldUseMove
|
2022-08-29 03:47:11 -04:00 |
|
DizzyEggg
|
57c929275f
|
Merge pull request #2269 from AsparagusEduardo/RHH/pr/fairyicon
Update Fairy icon
|
2022-08-29 09:20:18 +02:00 |
|
DizzyEggg
|
b9babd9ff1
|
Merge pull request #2264 from AsparagusEduardo/RHH_pretMerge20220826
Friday Night Mergin' (weekly merge)
|
2022-08-29 09:17:40 +02:00 |
|
Eduardo Quezada D'Ottone
|
78c44b5f41
|
Merge pull request #2271 from LOuroboros/patch-2
Removed unused local var in SetMonFormPSS
|
2022-08-28 12:01:42 -04:00 |
|
LOuroboros
|
5801047e50
|
Removed unused local var in SetMonFormPSS
|
2022-08-28 12:10:54 -03:00 |
|
Blackforest92
|
d6998d4579
|
Edited PLA' pokedex_text.h
|
2022-08-28 19:55:45 +07:00 |
|
crater-git
|
9f16d1dd12
|
Fixed battle frontier tutors (for real this time)
|
2022-08-27 22:45:10 -04:00 |
|
phxGAMMA
|
4577f635c9
|
Update fairy.png
|
2022-08-27 22:42:05 -04:00 |
|
GriffinR
|
0a2ac61b0f
|
Merge pull request #1757 from AsparagusEduardo/pret_clean2
Cleanup based on previous PRs
|
2022-08-27 11:40:33 -04:00 |
|
Eduardo Quezada
|
1c8d3a4922
|
Removed unnecessary parenthesis
|
2022-08-27 11:19:50 -04:00 |
|
Eduardo Quezada
|
99fbad92e2
|
IS_BATTLER_OF_TYPE
|
2022-08-27 02:50:55 -04:00 |
|
Eduardo Quezada
|
866d916f2f
|
SpriteTemplate formatting
|
2022-08-27 02:07:58 -04:00 |
|
Eduardo Quezada
|
1f0a952546
|
Usage of BATTLE_OPPOSITE
|
2022-08-27 01:44:39 -04:00 |
|
Eduardo Quezada
|
15d611ba65
|
Usage of BATTLE_PARTNER
|
2022-08-27 01:26:13 -04:00 |
|
Eduardo Quezada
|
6c457f42af
|
Corrected uses of GetBattlerSide
|
2022-08-27 00:59:12 -04:00 |
|
Eduardo Quezada
|
0a34d47041
|
Merge remote-tracking branch 'pret/master' into pret_clean2
|
2022-08-27 00:56:00 -04:00 |
|
Eduardo Quezada
|
481210b7f3
|
Missing uses of MAX_SPRITES
|
2022-08-27 00:54:30 -04:00 |
|