Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis
2022-09-24 11:58:35 -03:00
LOuroboros
c64593cb9c
Fixed LTBTS's animation
2022-09-24 09:04:15 -03:00
Eduardo Quezada
6b79c7772c
Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# src/battle_interface.c
2022-09-16 11:56:50 -03:00
ghoulslash
6616c89451
Merge pull request #2303 from Blackforest92/RHH-PR-Branch
...
Tidying graphics - Trio Weather
2022-09-15 18:01:43 -04:00
Eduardo Quezada
de32940fdf
Further removed trailing whitespaces
2022-09-13 16:26:36 -03:00
Eduardo Quezada
1d7e8bd730
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
...
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
2022-09-13 16:22:42 -03:00
GriffinR
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
...
Cleaned trailing whitespace
2022-09-13 14:00:11 -04:00
LOuroboros
222362e804
Fixed Raquaza typo
2022-09-12 21:26:22 -03:00
Eduardo Quezada
65108c3192
Cleaned trailing whitespace
2022-09-11 14:14:49 -04:00
Eduardo Quezada
69f01d73cd
Added missing uses of Fairy type for Union Room and Battle Factory
2022-09-11 12:41:56 -04:00
Blackforest92
431cb6fa7c
Tidying graphics - Trio Weather
2022-09-09 21:57:40 +07:00
Blackforest92
3acb32acb8
Tyding graphics - Acupressure
2022-09-09 00:25:43 +07: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
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
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
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
4017fc3e20
Apply style suggestions from code review
2022-09-03 21:22:15 -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
c7fc2e13f7
Renamed TM flags to keep consistency with the rest of the repo
2022-09-02 16:54:58 -04: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
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
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
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
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
9f16d1dd12
Fixed battle frontier tutors (for real this time)
2022-08-27 22:45:10 -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
GriffinR
8aead3b4c8
Merge pull request #1747 from GriffinRichards/contest-ai-bug
...
Incorporate commented bug fixes in contest AI scripts
2022-08-26 23:53:44 -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
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
54ee960970
Fixed Battle Frontier tutor move IDs
2022-08-26 10:12:11 -04:00
DizzyEggg
6331931ba3
Fix Magic Coat targets
2022-08-26 15:01:51 +02:00
Eduardo Quezada
6fb4da68f3
Corrected Oldale Town Sign labels
2022-08-25 22:00:24 -04:00
crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
LOuroboros
410045028a
Optimized General_AffectionHangedOn
2022-08-25 20:01:14 -03:00
LOuroboros
8bd7103b9d
Even more review corrections
2022-08-25 17:32:12 -03:00
LOuroboros
2cf2c00b29
Updated friendship labels
2022-08-25 17:10:11 -03:00
LOuroboros
7539051942
Further tweaked the affection animation
2022-08-25 17:05:57 -03:00
LOuroboros
5dd143f19d
Applied Blackforest's changes to General_AffectionHangedOn
2022-08-25 13:07:52 -03:00
LOuroboros
1fc63c3431
More review corrections
2022-08-25 11:52:21 -03:00
LOuroboros
11d6ae4820
Renamed the GetLeadMonFriendshipScore constants
2022-08-25 11:34:37 -03:00
LOuroboros
e792fae415
Review corrections
...
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
2022-08-25 10:45:57 -03:00
LOuroboros
1f4ef2a0fb
Added constants for GetLeadMonFriendshipScore
2022-08-25 10:40:56 -03:00
