Eduardo Quezada
|
566ec93492
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# include/constants/battle_script_commands.h
# include/constants/battle_string_ids.h
# src/battle_script_commands.c
# src/data/battle_moves.h
|
2023-09-24 20:32:45 -03:00 |
|
LOuroboros
|
35e76e9868
|
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN (#3247)
Co-authored-by: Alex <alexthenotes@gmail.com>
|
2023-09-24 00:01:18 -03:00 |
|
Alex
|
a073e7bd59
|
Adds Gigaton Hammer and Salt Cure (#3297)
|
2023-09-15 11:18:47 -03:00 |
|
DizzyEggg
|
94a3e80c8e
|
Remove redundant side macros/funcs (#3299)
Co-authored-by: gruxor <gruxor@proton.me>
|
2023-09-13 09:19:18 -03:00 |
|
kittenchilly
|
7a24167b4d
|
Merge remote-tracking branch 'upstream/upcoming' into overworldsnow
|
2023-09-08 11:47:35 -05:00 |
|
psf
|
75d06bb599
|
Generation 6 Experience Share (#3276)
|
2023-09-07 23:18:18 -03:00 |
|
kittenchilly
|
1e10bbe007
|
Merge branch 'upcoming' into overworldsnow
|
2023-09-04 17:57:20 -05:00 |
|
DizzyEggg
|
d9677763e5
|
remove gActiveBattler replacement
|
2023-09-04 10:26:37 +02:00 |
|
DizzyEggg
|
7c2ad314d4
|
merge with upcoming
|
2023-09-04 09:40:48 +02:00 |
|
kittenchilly
|
0a781217ea
|
Merge branch 'upcoming' into overworldsnow
|
2023-09-02 15:17:23 -05:00 |
|
Eduardo Quezada
|
35d7201935
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# data/battle_scripts_1.s
# include/battle_scripts.h
|
2023-08-31 20:46:53 -04:00 |
|
Eduardo Quezada D'Ottone
|
c4e88760f5
|
Pret merge (2023/08/31) (#3268)
|
2023-08-31 14:52:18 -04:00 |
|
Eduardo Quezada
|
0d5b00aaf2
|
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
|
2023-08-31 14:28:01 -04:00 |
|
DizzyEggg
|
493c330cbd
|
merge with upcoming
|
2023-08-30 13:23:55 +02:00 |
|
DizzyEggg
|
c29f8259f6
|
remove gActiveBattler entirely
|
2023-08-30 12:46:22 +02:00 |
|
DizzyEggg
|
4683783a92
|
remove active battler from other files
|
2023-08-30 10:18:31 +02:00 |
|
kittenchilly
|
c8aac3407e
|
Merge branch 'upcoming' into overworldsnow
|
2023-08-29 21:02:33 -05:00 |
|
Eduardo Quezada
|
be152fbee8
|
Merge branch 'RHH/master' into RHH/pr/master/opponentName
|
2023-08-29 13:11:32 -04:00 |
|
kittenchilly
|
0ad3919f22
|
Fix overworld snow weather
|
2023-08-19 01:40:31 -05:00 |
|
GriffinR
|
344fe4dd65
|
Stop double-counting EOS in assert
|
2023-08-12 23:13:11 -04:00 |
|
kittenchilly
|
5e8caa8d45
|
Merge branch 'upcoming' into ultraburst
|
2023-08-12 12:36:11 -05:00 |
|
Eduardo Quezada
|
952bacd858
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
# .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
# .github/ISSUE_TEMPLATE/04_other_errors.yaml
|
2023-08-11 17:50:28 -04:00 |
|
Eduardo Quezada D'Ottone
|
ada29313de
|
Fix for wild double battles with an in-game partner (#3210)
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
|
2023-08-11 17:29:10 -04:00 |
|
kittenchilly
|
c3e31af5f3
|
Ultra burst trigger
|
2023-08-09 22:12:26 -05:00 |
|
GriffinR
|
65fee186f8
|
Automatically update nickname buffer sizes
|
2023-08-08 16:28:09 -04:00 |
|
DizzyEggg
|
1fb42e4497
|
Sticky web / Court Change / Mirror Armor tests + small fixes (#3160)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
|
2023-08-07 10:27:57 -04:00 |
|
Eduardo Quezada
|
d9a17467cf
|
Kept previous check while using gTestRunnerEnabled
|
2023-08-06 14:28:02 -04:00 |
|
Eduardo Quezada
|
f94efa94e1
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-08-02 01:18:07 -04:00 |
|
ghoulslash
|
7a814999e5
|
MOVE_CORROSIVE_GAS Effect (#3152)
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
|
2023-08-02 01:05:54 -04:00 |
|
Eduardo Quezada
|
87050d8c08
|
Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets (#3143)
|
2023-08-01 23:54:04 -04:00 |
|
DizzyEggg
|
5eec3b2fc3
|
fix various issues with primal weather blocking water/fire type moves (#3138)
* fix various issues with primal weather blocking water/fire type moves
* forgot to change return to effect=1
* fix bugs
|
2023-07-30 10:50:51 -04:00 |
|
Eduardo Quezada
|
8dafc5e208
|
Fixed B_ATK_TRAINER_NAME not working properly in tests
|
2023-07-26 17:36:37 -04:00 |
|
Eduardo Quezada
|
ad78dfcf68
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# src/battle_script_commands.c
# src/battle_util.c
|
2023-07-25 14:38:53 -04:00 |
|
DizzyEggg
|
e0271a92e9
|
Fix trainer messages appearing for frontier trainers
|
2023-07-21 11:40:15 +02:00 |
|
DizzyEggg
|
c0f10623d6
|
Merge branch 'be/staminafix' of https://github.com/ghoulslash/pokeemerald into stamina_fix
|
2023-07-17 15:35:40 +02:00 |
|
Martin Griffin
|
17f8f50a59
|
Merge remote-tracking branch 'rhh/master' into upcoming
|
2023-07-16 07:46:34 +01:00 |
|
DizzyEggg
|
2a249654e7
|
fix mirror move/metronome powder/multi hit moves & tests
|
2023-07-15 14:00:55 +02:00 |
|
Eduardo Quezada
|
3aaa89ce71
|
Changed all instances of gSpeciesNames so that it uses GetSpeciesName
|
2023-07-07 14:37:51 -04:00 |
|
Eduardo Quezada
|
4c57b84cd9
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
# Conflicts:
# graphics/pokemon/mawile/footprint.png
# src/battle_gfx_sfx_util.c
# src/fldeff_sweetscent.c
# src/pokedex.c
|
2023-06-02 11:45:28 -04:00 |
|
GriffinR
|
14f7e49099
|
Add some missing palette macro use
|
2023-05-25 15:09:16 -04:00 |
|
Eduardo Quezada D'Ottone
|
2aca82300c
|
Merge branch 'upcoming' into mega_evo_issues
|
2023-05-14 22:33:01 -04:00 |
|
Salem
|
fe5e59c910
|
Merge branch 'upcoming' into RHH/content/gen9SnowWeather
|
2023-05-07 17:27:58 +02:00 |
|
Eduardo Quezada D'Ottone
|
c530eb2445
|
Add mirror herb (#2873)
|
2023-05-06 21:20:37 -04:00 |
|
Eduardo Quezada D'Ottone
|
42445512ad
|
Battle Item Tests + critical fixes + new test macro (#2940)
|
2023-05-06 20:43:32 -04:00 |
|
CallmeEchoo
|
eb5b81684c
|
refactored snow into damaging weather
this is necessary for ice body to properly work.
doesnt actually do any damage
|
2023-05-05 01:38:12 +02:00 |
|
CallmeEchoo
|
c5a73f59a4
|
ad suggested changes
|
2023-05-02 21:17:14 +02:00 |
|
CallmeEchoo
|
76721b16f8
|
add snow weather
|
2023-05-02 16:25:26 +02:00 |
|
CallmeEchoo
|
15ce9eb71c
|
fix dire hit message mismatch
|
2023-05-01 18:53:06 +02:00 |
|
ghoulslash
|
445e9c4b8b
|
merge w upcoming
|
2023-05-01 12:05:07 -04:00 |
|
Bassoonian
|
b1f75569a1
|
Merge branch 'upcoming' into rhhupcomingdev
|
2023-04-25 19:50:26 +02:00 |
|