Eduardo Quezada
|
7fe1e706b7
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig
# Conflicts:
# include/constants/pokemon_config.h
|
2022-09-08 08:52:13 -04:00 |
|
Eduardo Quezada D'Ottone
|
066a5bee85
|
Merge pull request #2277 from TheXaman/tx_debug_system_rhh
Inclusion of the tx_debug_system
|
2022-09-08 00:26:37 -04:00 |
|
Eduardo Quezada D'Ottone
|
4a6d3d1deb
|
Whitespace
|
2022-09-08 00:19:13 -04:00 |
|
Eduardo Quezada D'Ottone
|
0d4455f951
|
Merge pull request #2150 from Sneed69/weather_forms_fixes
Weather forms fixes and config
|
2022-09-07 23:15:48 -04:00 |
|
Eduardo Quezada D'Ottone
|
47a50b3dac
|
Merge branch 'master' into weather_forms_fixes
|
2022-09-07 23:07:25 -04:00 |
|
TheXaman
|
6062cf45fa
|
Merge branch 'master' into tx_debug_system_rhh
|
2022-09-07 00:03:58 +02:00 |
|
TheXaman
|
94995c54fb
|
fix?
|
2022-09-06 23:35:05 +02: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 |
|
TheXaman
|
b249399a53
|
changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()'
|
2022-09-06 23:00:26 +02:00 |
|
Eduardo Quezada D'Ottone
|
3fe9ef26b5
|
Merge pull request #2299 from ghoulslash/readme_updates
update readme with credits, wiki links
|
2022-09-06 15:52:23 -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
|
59de7e48e5
|
Merge pull request #2265 from AsparagusEduardo/RHH_substructFix
Fixed PokemonSubstruct3 alignment
|
2022-09-06 15:14:45 -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 |
|
ghoulslash
|
9e4b18dfe2
|
update readme with credits, wiki links
|
2022-09-06 14:28:52 -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
|
e253a87bc5
|
Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once.
|
2022-09-05 14:49:14 -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 D'Ottone
|
75c4e7dc13
|
Merge pull request #2295 from Yak-Attack-1012/water_sport_past_gens
v -> STATUS4_WATER_SPORT (battle_script_commands.c)
|
2022-09-05 13:37:04 -03: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 |
|
Eduardo Quezada D'Ottone
|
65a4d4ed44
|
Merge pull request #2294 from LOuroboros/patch-2
Updated GetBattleMonMoveSlot
|
2022-09-05 07:09:47 -03:00 |
|
TheXaman
|
f6d111d0c7
|
Update src/debug.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-09-05 11:17:21 +02:00 |
|
TheXaman
|
40e3379921
|
removed music expansion songs, added newline, removed all weekday remains
|
2022-09-05 11:15:18 +02:00 |
|
TheXaman
|
7696a78760
|
Update src/trainer_see.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-09-05 11:04:21 +02:00 |
|
TheXaman
|
57296dde71
|
Update src/field_control_avatar.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-09-05 11:03:23 +02:00 |
|
TheXaman
|
0b3eddc9a4
|
Update src/field_control_avatar.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-09-05 11:03:01 +02:00 |
|
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 |
|
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 D'Ottone
|
1287c3d263
|
Fixed call to ItemIdToBattleMoveId
|
2022-09-03 21:27:29 -04:00 |
|
Eduardo Quezada D'Ottone
|
4017fc3e20
|
Apply style suggestions from code review
|
2022-09-03 21:22:15 -04:00 |
|
Eduardo Quezada D'Ottone
|
1ba46e0b01
|
Merge pull request #2287 from LOuroboros/patch-2
Updated the Master branch's README.md
|
2022-09-03 19:35:46 -04:00 |
|
LOuroboros
|
9df8d2dc63
|
Updated the README again
|
2022-09-03 10:50:01 -03:00 |
|
LOuroboros
|
8079224340
|
Copy-pasted Eduardo's README
|
2022-09-03 10:26:50 -03:00 |
|
LOuroboros
|
7e920040ca
|
Update README.md
|
2022-09-03 09:59:53 -03: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 |
|
TheXaman
|
13cc640b78
|
whitspace changes, removed wrong comment
|
2022-09-02 18:53:51 +02:00 |
|