Eduardo Quezada D'Ottone
dc6ff13c6a
Existing tests work with new species disabled ( #2818 )
2023-03-09 07:59:14 -03:00
Alex
9358265954
electrify ai speed check
2023-03-09 09:52:27 +01:00
DizzyEggg
eead8e8e61
Tests work with new pokemon disabled
2023-03-09 09:49:50 +01:00
Alex
35645fe01c
electrify works on all move types ( #2817 )
2023-03-08 23:00:25 +01:00
DizzyEggg
d695c76881
test for assist and removed assist array from battle struct
2023-03-08 22:11:28 +01:00
LOuroboros
ff7686482f
Updated PokeStorageSys related debug functions
2023-03-08 15:56:16 -03:00
LOuroboros
f06c040bca
Updated the debug menu
...
-Updated the text string used by Debug_FlagsNotSetMessage.
-Renamed Debug_FlagsNotSetMessage to Debug_FlagsNotSetOverworldConfigMessage.
-Added an equivalent for the battle config file called Debug_FlagsNotSetBattleConfigMessage,
-DEBUG_FLAG_NO_COLLISION -> OW_FLAG_NO_COLLISION
-And moved it to include/config/overworld.h, because at the end of the day it's still an overworld flag just like the other 2 already in that file.
-Corrected miswritten preproc config in DebugAction_Flags_CatchingOnOff.
-Updated the comment that describes the effect of DEBUG_OVERWORLD_MENU reducing the number of characters a tiny bit and fixing a typo.
2023-03-08 15:27:22 -03:00
Alex
27e342d7a6
Use function HasDamagingMove to avoid looping
2023-03-08 19:25:26 +01:00
GriffinR
dbf757be88
Treat map data as const
2023-03-08 12:00:30 -05:00
Alex
59a0def706
delete leftover
2023-03-08 17:30:07 +01:00
Alex
c3674d6c17
Wrong score for Work Up and Growth
2023-03-08 17:23:44 +01:00
LOuroboros
fdebc994d2
Updated Supreme Overlord's effect's code
2023-03-07 19:14:38 -03:00
Eduardo Quezada D'Ottone
13ca2271e2
Add meltan and melmetal teachable moves ( #2732 )
2023-03-07 10:25:05 -03:00
DizzyEggg
318666e21d
debug minor touches to give item max quantity and map number display
2023-03-07 12:20:36 +01:00
Eduardo Quezada D'Ottone
81a80e566c
Refactor Mega Evolution indicator sprite ( #2805 )
2023-03-07 08:06:28 -03:00
DizzyEggg
e055456b7e
Fix Protean / Libero when AI calculates Damage ( #2714 )
...
* Fix Protean / Libero when AI calculates Damage
* fix ai changing types when calculating dmg
2023-03-07 09:34:26 +01:00
DizzyEggg
a04046dbb6
Add tests for Defog and fix Defog battle strings ( #2737 )
...
* start working on defog tests
* defog tests + improve terrain end battlescripts
* newline
2023-03-06 20:35:08 +01:00
DizzyEggg
306c4565a0
merge
2023-03-06 15:32:28 +01:00
DizzyEggg
d3d99c3f8c
alpha omega indicator sprites use the same palete
2023-03-06 15:22:28 +01:00
GriffinR
bb078e0618
Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments
...
Document music usage to make it easier to search for a specific track
2023-03-05 15:29:38 -05:00
Eduardo Quezada
a6bd35ceab
Review changes
2023-03-05 17:17:39 -03:00
ghoulslash
dec1b16138
Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile ( #2790 )
2023-03-05 09:50:47 -05:00
GriffinR
4d99d2c926
Merge pull request #1859 from AsparagusEduardo/pret/doc/natures
...
Reformatted gNatureStatTable
2023-03-04 23:31:43 -05:00
Eduardo Quezada
9917f5cc8b
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
...
# Conflicts:
# Makefile
# include/constants/pokemon.h
# include/pokemon.h
# make_tools.mk
# src/battle_ai_script_commands.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_script_commands.c
# src/party_menu.c
# src/pokemon.c
# src/trade.c
# src/trainer_pokemon_sprites.c
2023-03-03 11:00:50 -03:00
Alex
58b408cbbf
some new sprites
2023-03-02 17:04:24 +01:00
ghoulslash
6cf84ee53e
Fixes certain moves preventing Z status moves. ( #2791 )
2023-03-02 09:41:02 -05:00
ghoulslash
ad6495980f
Partially fix dex size inconsistencies ( #2799 )
2023-03-02 09:35:32 -05:00
Alex
487e26e700
fix enamorus_t + samuroutt sprite + conflicts
2023-03-02 11:05:59 +01:00
LOuroboros
fe735f9700
Applied review suggestions
...
-Merged EFFECT_CEASELESS_EDGE and EFFECT_STONE_AXE into EFFECT_HIT_SET_ENTRY_HAZARD
-Updated gDmgHazardsStringIds and relevant battle scripts. Can't say that I like it at all. String tables are stupid imo.
-Coupled Barb Barrage's effect in CalcMoveBasePower with Venoshock's
2023-03-02 01:39:44 -03:00
LOuroboros
23673c2e9d
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
2023-03-01 03:57:00 -03:00
GriffinR
ec89e519f9
Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful
...
Rename eventLegal to modernFatefulEncounter
2023-02-28 11:48:34 -05:00
DizzyEggg
12db276a71
fix endif
2023-02-28 10:36:11 +01:00
DizzyEggg
1fb2560f7b
newline
2023-02-28 10:14:16 +01:00
DizzyEggg
9d1e31ab39
accidentally removed ifs
2023-02-28 10:12:50 +01:00
DizzyEggg
cc2778b8bb
some touches
2023-02-28 10:08:31 +01:00
Eduardo Quezada
90021f3be6
Removed zMovePower field in gBattleMoves in favor of a function.
2023-02-27 23:49:43 -03:00
DizzyEggg
3159508603
fix dex size inaccuraccies
2023-02-27 23:08:54 +01:00
GriffinR
adf28c2f63
Merge pull request #1855 from GriffinRichards/doc-chat
...
Add/correct some union room chat documentation
2023-02-27 13:25:05 -05:00
GriffinR
8d88a38561
Merge pull request #1854 from GriffinRichards/constants-num-frames
...
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
2023-02-27 13:16:49 -05:00
Alex
21ca6defa7
forgot torment
2023-02-27 18:39:17 +01:00
Alex
1a2504d5ee
forgot disable
2023-02-27 18:29:29 +01:00
Alex
930a88b0e2
z status moves did not work properly
2023-02-27 18:00:32 +01:00
DizzyEggg
5a745020ee
add tests for stockpile swallow spit up
2023-02-27 16:27:58 +01:00
DizzyEggg
3338a6b786
add messages for stockpile effects wear off
2023-02-27 12:31:29 +01:00
DizzyEggg
468625ed1d
fit long z-moves names on battle textbox
2023-02-27 10:32:45 +01:00
AgustinGDLV
e537be76ea
Z-moves bypass protection ( #2730 )
2023-02-27 09:17:07 +01:00
DizzyEggg
919fb184fe
AI knows how to handle Illusion ( #2726 )
...
* AI knows how to handle Illusion
2023-02-27 09:12:52 +01:00
DizzyEggg
44d2cc7232
Fix bugs related to Trainer Slide messages ( #2699 )
...
* start working on trainer slides
* use cmd->nextInstr
2023-02-27 09:11:25 +01:00
Eduardo Quezada
41bf9ea63c
Removed trailing whitespaces
2023-02-26 18:43:15 -03:00
DizzyEggg
4bdca43dbd
refactor mega evolution indicator sprite
2023-02-26 12:51:35 +01:00
BuffelSaft
deb3109c81
Use proper symbol name styles for Jangmo-o family ( #2739 )
2023-02-26 13:15:53 +13:00
Eduardo Quezada D'Ottone
abc0e20aaf
Consider Nature Power in AI_CalcDamage ( #2776 )
2023-02-25 12:30:53 -03:00
Alex
f249b58c01
fix style
2023-02-25 15:24:31 +01:00
Alex
7ea82820ec
Consider nature power in AI_CalcDamage
2023-02-25 15:07:45 +01:00
Eduardo Quezada
31ab56bceb
Fixed footprint symbol names.
2023-02-25 09:23:34 -03:00
Alex
df47312e32
Fix move to battle_util.c
2023-02-25 12:38:57 +01:00
Alex
fc5c93fd83
exclude status move type check
2023-02-25 12:15:40 +01:00
Eduardo Quezada
ca81d7a0f9
Forgot about Jangmo-o
2023-02-24 21:58:09 -03:00
Alex
1e1686b69a
Fixes #2414
2023-02-24 23:38:23 +01:00
Eduardo Quezada
bbefee6bd4
Use proper symbol styles for Hakamo-O and Kommo-O
2023-02-24 15:22:58 -03:00
Eduardo Quezada
079ca8ab29
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification
2023-02-24 07:53:02 -03:00
Alex
48391d8eff
Basculegion female form
2023-02-24 08:46:34 +01:00
Eduardo Quezada
d330ca051a
Document music usage to make it easier to search for a specific track
2023-02-23 11:44:23 -03:00
Eduardo Quezada
f5aa3b8272
Document the 2 different sText_GotchaPkmnCaught
2023-02-23 11:43:40 -03:00
ghoulslash
827bf11307
Merge pull request #2660 from DizzyEggg/ace_voltswitch
...
Fix Volt Switch / Roar with ace pokemon
2023-02-23 09:20:18 -05:00
Alex
a870ec3c22
enamorus_t cry, basculegionf sprite, new typhlosion back sprite
2023-02-23 15:20:12 +01:00
DizzyEggg
3ff8c95c4e
add meltan melmetal teachable moves
2023-02-23 10:53:55 +01:00
DizzyEggg
23272074bf
fix uninitialized ai modifier variable in ai calc damage
2023-02-23 10:25:53 +01:00
Alex
1c832768bb
fix trainer party
2023-02-22 20:44:03 +01:00
Alex
1f694ae7ed
missing pla sprites
2023-02-22 20:41:01 +01:00
DizzyEggg
877e3fd6af
merge with upcoming
2023-02-22 19:27:42 +01:00
DizzyEggg
e0b76e98ff
Add MOVE_SHELL_TRAP Effect ( #2716 )
...
* implemented Shell Trap
Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
2023-02-22 13:55:34 +00:00
Jaizu
403a6f4544
Merge pull request #2712 from DizzyEggg/fix_abilities_empty_field
...
Fix switch-in abilities activating on an empty field
2023-02-22 09:49:13 +01:00
DizzyEggg
31138455de
remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS
2023-02-22 09:28:12 +01:00
DizzyEggg
bca47a0891
Update src/battle_script_commands.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-02-22 09:17:23 +01:00
DizzyEggg
d73ab0246f
Fix Explosion + Galvanize + Volt Absorb and Mind Blown ( #2688 )
...
* Fix Explosion and Mind Blown
* Use battler ability in jumpifabilitypresent
2023-02-21 22:50:29 +00:00
DizzyEggg
61064ab07e
Merge branch 'upcoming' into fix_abilities_empty_field
2023-02-21 16:22:26 +01:00
Martin Griffin
29c64c82f3
Test Red Card
...
Dragon Tail activates Red Card if the target does not switch.
2023-02-21 10:44:58 +00:00
Martin Griffin
afe09e9653
Test Dragon Tail
...
Remove the "But it failed!" message if the foe cannot be switched.
2023-02-21 10:43:57 +00:00
Martin Griffin
666e59b37f
Test Roar
...
The original implementation of forcerandomswitch was biased towards
certain party members.
2023-02-21 10:43:57 +00:00
ghoulslash
6f23ada6e2
Merge pull request #2705 from DizzyEggg/pickup
...
correct Cmd_pickup
2023-02-20 12:15:20 -05:00
DizzyEggg
a8c0e1ebeb
fix intimidate
2023-02-20 13:15:08 +01:00
DizzyEggg
03915524c5
Fix switch-in abilities activating on empty field
2023-02-20 12:42:06 +01:00
DizzyEggg
53180ebf87
Update Healing wish to gen5 / gen8 mechanics ( #2708 )
...
* Updated Healing Wish and added config
* Fixed Lunar Dance message
Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2023-02-20 11:25:43 +00:00
GriffinR
f888021c8f
Merge pull request #1857 from GriffinRichards/sync-mapjson
...
Sync mapjson
2023-02-19 20:48:13 -05:00
LOuroboros
c33cc834bc
Updated Psyshield Bash's accuracy
2023-02-19 19:04:36 -03:00
DizzyEggg
380af442c3
Fix buggy pokemon anims with Illusion ( #2639 )
...
* try illusion fix
* fix
2023-02-19 12:05:56 +01:00
DizzyEggg
c82f35d6bf
correct Cmd_pickup
2023-02-19 12:01:13 +01:00
ghoulslash
4b64433816
Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes ( #2649 )
...
* add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims
* add missing semicolon
* add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting
* remove duplicate func
* improve origin pulse anim
* fix IsDoubleBattle call
* venom drench acid uses average battler positions
* add GetSubpriorityForMoveAnim
* add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-02-19 11:48:12 +01:00
Eduardo Quezada D'Ottone
ec343cef02
Config to have Shuckle make Berry Juice from Oran Berries ( #2331 )
...
* Removed unused ifdefs and made actually check for Z Power Ring
* Config to have Shuckle make Berry Juice from Oran Berries
* Ordered species-specific configs
2023-02-19 10:45:59 +01:00
Eduardo Quezada D'Ottone
fcf13aab2b
Fixed evolutions that use held items to evolve not working when using Rare Candies. ( #2565 )
2023-02-19 10:40:55 +01:00
ghoulslash
79ea2e8074
add howl AI check for new effect ( #2703 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-02-18 11:37:29 +01:00
LOuroboros
4be4ec3081
metatitleBehavior -> metatileBehavior
2023-02-17 16:43:22 -03:00
GriffinR
bc3805f9d3
Fix two binary palettes
2023-02-17 13:27:39 -05:00
DizzyEggg
66d2f253a1
merge with master
2023-02-17 15:43:15 +01:00
Jaizu
31316dbfd2
Merge pull request #2529 from mrgriffin/rhh-battlescript-cmd-args
...
Readable BattleScript command arguments
2023-02-17 15:35:03 +01:00
DizzyEggg
0c523f9518
Fix Magic bounce powder moves against grass types ( #2633 )
...
* Fix Magic bounce powder moves against grass types
2023-02-17 13:55:51 +00:00
DizzyEggg
56c9564e7a
8th gen Howl's effect ( #2700 )
...
* Howl gen8 effect
2023-02-17 10:28:46 +00:00
Martin Griffin
0573aa455a
Introduce macros to parse battle script arguments
...
CMD_ARGS for regular commands, VARIOUS_ARGS for various commands, and
NATIVE_ARGS for callnative commands.
2023-02-17 10:05:57 +00:00
Eduardo Quezada D'Ottone
625a7622e2
Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214
...
It's ya boi, pret merge! (pret merge 2023/02/16)
2023-02-16 21:57:41 -03:00
Eduardo Quezada
a60b179bcb
Incorporated fixes from upstream
2023-02-16 18:20:54 -03:00
DizzyEggg
d637ee3b13
Fix After You for gen8 ( #2646 )
...
Fix After You
2023-02-16 20:59:36 +00:00
DizzyEggg
6cdca24c31
use forced switch battler bit
2023-02-16 21:58:00 +01:00
DizzyEggg
d7f68a3893
IsAceMon - not isAceMon
2023-02-16 15:57:15 +01:00
ghoulslash
f4ef67d897
Merge pull request #2689 from DizzyEggg/grenja
...
Fix Battle Bond activating multiple times in battle
2023-02-16 09:36:02 -05:00
ghoulslash
6b0b427d93
Merge pull request #2680 from DizzyEggg/mirror_armor
...
Fix Mirror Armor against Clear Body
2023-02-16 09:29:04 -05:00
ghoulslash
05bef50a1f
Merge pull request #2658 from DizzyEggg/one_vs_two_egg
...
Fix 1 vs 2 battles with eggs
2023-02-16 09:20:18 -05:00
ghoulslash
60a3da5811
Merge pull request #2691 from DizzyEggg/clang_scales
...
Fix Clanging Scales target and effect
2023-02-16 09:13:33 -05:00
ghoulslash
8c81cf1e66
Merge pull request #2692 from DizzyEggg/shields_down
...
Fix Shield Down Ability pop-up
2023-02-16 09:11:24 -05:00
sbird
fea54c9277
[intro] add fading, refactor abort, align intro gfx
2023-02-16 10:43:50 +01:00
DizzyEggg
97f9c0a4d9
oof
2023-02-15 23:45:53 +01:00
DizzyEggg
f6a0c882d1
Fix Shield Down Ability pop-up
2023-02-15 23:44:00 +01:00
DizzyEggg
94651e77a5
Fix Clang Scales target and effect
2023-02-15 22:18:18 +01:00
Eduardo Quezada
7ddebb6671
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
...
# Conflicts:
# data/battle_ai_scripts.s
# src/menu_specialized.c
# src/mystery_gift_menu.c
2023-02-15 14:18:00 -03:00
Eduardo Quezada
b62e5aa72e
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
...
# Conflicts:
# src/battle_main.c
# src/field_specials.c
# src/trade.c
2023-02-15 14:11:03 -03:00
Eduardo Quezada
bd54990333
Review changes
2023-02-15 13:56:11 -03:00
GriffinR
69fdf0faa4
Merge pull request #1853 from GriffinRichards/doc-contest-bar
...
Clarify AI_CV_AttackDown_UnknownTypeList
2023-02-15 11:29:57 -05:00
GriffinR
671c9c5353
Merge branch 'master' into doc-chat
2023-02-15 10:57:05 -05:00
Alex
e4045a7a5f
z move pp color ( #2690 )
2023-02-15 16:19:09 +01:00
GriffinR
a322379feb
Merge branch 'master' into doc-windows
2023-02-15 10:04:48 -05:00
GriffinR
9c1c598160
GROUPTYPE_NONE to unsigned
2023-02-15 09:49:33 -05:00
DizzyEggg
3f0f7c6b7f
Fix Battle Bond activating multiple times in battle
2023-02-15 15:30:29 +01:00
LOuroboros
7885941d3c
Tweaked Task_HandleExpansionIntro to fix the water drops glitch
...
Thanks to Tustin2121.
2023-02-14 14:03:18 -03:00
ghoulslash
908b509401
Fix Round's Base Power calc, Add Turn order effects ( #2602 )
...
* fix round base power calc, add turn order change
* remove unused callnative cmd
* fix round turn order update
* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-02-14 16:49:50 +01:00
ghoulslash
094554b3a3
Merge pull request #2681 from DizzyEggg/jaw_lock
...
Fix Jaw Lock locking player pokemon
2023-02-13 10:40:47 -05:00
DizzyEggg
2b4d2a7695
Fix Jaw Lock locking player pokemon
2023-02-13 16:27:21 +01:00
ghoulslash
d1ef53f93a
Merge pull request #2678 from AlexOn1ine/z_indicator_in_doubles
...
Z-Move Indicator was wrongly displayed in double battles
2023-02-13 08:52:06 -05:00
DizzyEggg
0577d8d04d
Fix Mirror Armor against Clear Body
2023-02-13 14:44:34 +01:00
ghoulslash
c399391891
Merge pull request #2677 from AlexOn1ine/z_moves_switch_order
...
Fix switching Z-Moves when pressing SELECT in battle
2023-02-13 08:41:58 -05:00
DizzyEggg
5d958e245a
Merge pull request #2669 from Jaizu/giga_impact_contests
...
Fix Giga Impact on contests.
2023-02-13 09:22:24 +01:00
Alex
2b32bfcdc1
add battlerId arg to ShowZMoveTriggerSprite
2023-02-12 19:39:14 +01:00
Eduardo Quezada
d699d55ba3
Reformatted gNatureStatTable
2023-02-12 01:19:03 -03:00
Eduardo Quezada
a937b3221a
Documented Ribbons
2023-02-11 23:16:24 -03:00
Eduardo Quezada
96865f66af
Updated term to modernFatefulEncounter
2023-02-11 22:36:42 -03:00
Eduardo Quezada
6da5e0a280
Rename eventLegal to fatefulEncounter
2023-02-11 17:13:53 -03:00
Alex
d363ed8152
z indicator in double battles
2023-02-11 19:55:08 +01:00
Alex
ce416be297
z_move switch move bug
2023-02-11 18:32:07 +01:00
sbird
4bcbb7c9e1
[intro] refactor expansion intro
2023-02-09 23:12:29 +01:00
ghoulslash
deb23fc7c6
Merge pull request #2648 from AlexOn1ine/pollen_puff
...
Fixes Pollen Puff issue #2611
2023-02-09 08:21:33 -05:00
ghoulslash
27933836b5
Merge pull request #2662 from AlexOn1ine/heal_pulse_v2
...
Add Logic for Heal Pulse effects in double battles
2023-02-09 08:18:00 -05:00
Jaizu
9f7267e48d
Fix Giga Impact on contests.
2023-02-09 11:29:29 +01:00
GriffinR
c32fbf594a
Merge pull request #1851 from GriffinRichards/doc-fldspc
...
Document remaining field_specials task data
2023-02-08 22:34:57 -05:00
GriffinR
de56e400ff
Sync clone object macro
2023-02-08 13:11:10 -05:00
Eduardo Quezada D'Ottone
8381b14c51
Implemented Xhyzi's RHH copyright intro (with config) ( #2415 )
...
* Rhh & Pret Copyright Screen
* Porygon recovered his voice
* Expansion text
---------
Co-authored-by: Xhyzi <xhyzdot@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
2023-02-08 15:54:12 +01:00
Alex
41d64ea41e
heal pulse effect in double battles
2023-02-08 13:02:41 +01:00
DizzyEggg
84d7024add
cleanup
2023-02-08 12:48:48 +01:00
DizzyEggg
896b575c07
Fix volt switch breaking ace pokemon
2023-02-08 12:42:38 +01:00
DizzyEggg
8c257bde99
Fix 1 vs 2 battles with eggs
2023-02-08 10:24:19 +01:00
Eduardo Quezada
6c30c5490c
Test PR
2023-02-08 00:51:59 -03:00
DizzyEggg
ff088752e7
Insomnia ability pop-up ( #2643 )
...
* Insomnia ability pop-up
* remove B_MSG_STAYED_AWAKE_USING constant
2023-02-07 18:47:23 +01:00
