LOuroboros
|
c8f4a44380
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux
|
2022-09-06 20:40:34 -03:00 |
|
Eduardo Quezada D'Ottone
|
f79e9f02de
|
Merge pull request #2289 from Blackforest92/RHH-PR-Branch
Tidying Graphics/Battle_Anims
|
2022-09-06 17:02:25 -04:00 |
|
ghoulslash
|
d33e4b0fe8
|
Merge pull request #2297 from AsparagusEduardo/RHH/pr/configRefactor
Config refactor
|
2022-09-06 15:32:37 -04:00 |
|
Eduardo Quezada
|
3a6318f1d9
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor
# Conflicts:
# include/constants/battle_config.h
|
2022-09-06 15:20:54 -04:00 |
|
ghoulslash
|
79bfbfb1b0
|
Merge pull request #2198 from AsparagusEduardo/BE_BattlePikeComatose
Comatose prevents Battle Pike's status effects.
|
2022-09-06 15:18:48 -04:00 |
|
ghoulslash
|
971081b8fd
|
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902
Flat Merge Friday (Weekly merge)
|
2022-09-06 15:13:47 -04:00 |
|
ghoulslash
|
51a569b66b
|
Merge pull request #2290 from AsparagusEduardo/RHH/pr/ballMulti_fix
Fixed ball multiplier fallthroughs
|
2022-09-06 15:10:28 -04:00 |
|
Eduardo Quezada
|
cb97f93ef6
|
Fixed B_SHADOW_TAG_ESCAPE use for Gen 3 config
|
2022-09-05 14:49:40 -04:00 |
|
Eduardo Quezada
|
7c7da8e176
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs
# Conflicts:
# src/battle_script_commands.c
|
2022-09-05 14:43:04 -04:00 |
|
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 |
|
U-DESKTOP-K1J86FD\Owner
|
7dabd903ce
|
v -> STATUS4_WATER_SPORT (applicable to Gens 3-5)
|
2022-09-05 12:07:38 -04:00 |
|
Eduardo Quezada D'Ottone
|
99a9b9f859
|
Merge pull request #2218 from LOuroboros/patch-1
Updated Serene Grace checks in AI_CheckViability
|
2022-09-05 10:30:18 -03:00 |
|
LOuroboros
|
2deabc2f36
|
Quick update for GetBattleMonMoveSlot
|
2022-09-05 04:27:21 -03:00 |
|
Eduardo Quezada
|
89550ed05d
|
Updated Sport Ball's modifier.
|
2022-09-04 18:54:23 -03:00 |
|
Eduardo Quezada
|
ce3dec43a7
|
Fixed ball multiplier fallthroughs
|
2022-09-04 17:21:23 -03:00 |
|
Blackforest92
|
2a8d2df6e7
|
Fix minor oopsies of src/graphics.c - gBattleAnimSpritePal_PrimalParticles
|
2022-09-04 23:40:00 +07:00 |
|
Blackforest92
|
7e9d243677
|
Tidying graphics/battle_anims
|
2022-09-04 23:24:37 +07: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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
8612300020
|
Merge branch 'master' into patch-1
|
2022-08-29 04:22:48 -04: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
|
b9babd9ff1
|
Merge pull request #2264 from AsparagusEduardo/RHH_pretMerge20220826
Friday Night Mergin' (weekly merge)
|
2022-08-29 09:17:40 +02: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 |
|
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
|
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
|
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 |
|