ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,124 Commits 1 Branch 0 Tags 235 MiB
ce18df46e6
Commit Graph

9255 Commits

Author SHA1 Message Date
AgustinGDLV
a5f28afe42 fixed Forecast and Flower Gift 2023-05-04 17:04:54 -07: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
74f074f5f3 ai scoring for snow and hail relation 
we generally dont want to ecourage to use snow when hail is up and vice versa to avoid looping between the two weathers if score adds up. so we return false in the ShouldSetX functions if either weather is up
We also reduce score by a little as further disincentive to loop and since both effect are so similar that switching between them is usually not a good idea
 2023-05-03 16:26:41 +02:00
Bassoonian
1068ec5d9f Fix Plus/Minus to only work with special moves 2023-05-03 13:03:40 +02:00
Salem
a877266400
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-02 21:19:01 +02:00
CallmeEchoo
c5a73f59a4 ad suggested changes 2023-05-02 21:17:14 +02:00
Alex
dd43d62a12
Fixes Triple Dive effect (#2947) 2023-05-02 15:06:21 -04:00
CallmeEchoo
095422c0c0 small ai logic fix 2023-05-02 19:48:03 +02:00
CallmeEchoo
c6fbde6d5c remove stupidity 
for some reason I added the 50% def increase in snow check twice? this removes that
 2023-05-02 16:25:26 +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
ghoulslash
8cce130643
Add Frostbite status (#2942) 2023-05-01 09:45:47 -04:00
Bassoonian
dd96ac0c4f Add Comatose check to AI "can be Xed" status checks 2023-05-01 15:35:05 +02:00
Bassoonian
39b50d09dd Add missing CanGetFrostbite 2023-05-01 11:19:10 +02:00
Ultimate_Bob
32e63d8cc7
Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-30 21:15:03 -04:00
Bassoonian
f1d60a4a04 Fixed wrong generation in check 2023-04-30 22:52:37 +02:00
ghoulslash
62ca66bc6b
Refactoring Battle Form changes into the form change tables (#2411) 2023-04-30 08:41:54 -04:00
Bassoonian
8f75844ece Add Ability inheritance 2023-04-30 12:58:18 +02:00
Bassoonian
21fa91b80b Add ClearHatchedEggMoves per SBird's suggestion 
Co-Authored-By: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-04-30 11:45:24 +02:00
Bassoonian
acf4529d8b Allow Egg Move transfer for non-eggs 2023-04-30 11:25:48 +02:00
ghoulslash
b30dad3e7a
Fix anger shell activating when fainted (#2945) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-04-29 21:56:23 -04:00
Bassoonian
c7d39e561d Clarify weather function 2023-04-29 20:41:54 +02:00
Bassoonian
c82c2c185e Integrate ghoul's review 
Co-Authored-By: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
 2023-04-29 18:29:50 +02:00
Bassoonian
b53c913558 Manually port daycare expansion to modern standards 2023-04-29 18:16:36 +02:00
Bassoonian
854e9be325 Fix move defrosting for both Freeze and Frostbite 2023-04-28 11:26:31 +02:00
Bassoonian
c279830892 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution 2023-04-27 10:50:32 +02:00
GriffinR
36e6981ac0 Replace some & usage with % 2023-04-26 16:12:00 -04:00
Eduardo Quezada D'Ottone
408aa30aa7
Merge pull request #17 from AgustinGDLV/pr/castform_fix 2023-04-26 14:25:36 -04:00
GriffinR
e83e08f21c Add time ranges to UpdateAmbientCry 2023-04-26 12:32:43 -04:00
Martin Griffin
4a0abc5129
Merge branch 'upcoming' into rhh-get-party 2023-04-26 12:12:03 +01:00
CallmeEchoo
a2809acfd1 fix gChosenMovePos not being assigned correctly for battle items 
thanks griffin <3

Co-Authored-By: Martin Griffin <838573+mrgriffin@users.noreply.github.com>
 2023-04-26 01:02:47 +02:00
Bassoonian
0315f704c1 Fix thawing being triggered by every move 2023-04-25 23:01:58 +02:00
Salem
78c4d07b23
Add Berserk Gene Item (#2893) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-25 15:03:57 -04:00
Bassoonian
b1f75569a1
Merge branch 'upcoming' into rhhupcomingdev 2023-04-25 19:50:26 +02:00
Bassoonian
2885ec2411 Fix move descriptions 2023-04-25 19:48:45 +02:00
Bassoonian
2aa4d2da38 Fix Ice Heal message 2023-04-25 19:38:47 +02:00
Frank DeBlasio
9562c7a37a
Added forbidden Metronome moves from PLA and SV (#2949) 2023-04-24 18:49:53 -04:00
CallmeEchoo
632668e8b2 Merge branch 'battleItemFixes' into battleItemTests 2023-04-24 21:13:12 +02:00
CallmeEchoo
503035010e Merge branch 'upcoming' into battleItemFixes 2023-04-24 21:11:34 +02:00
CallmeEchoo
e0cae31a13 Merge branch 'battleItemFixes' into battleItemTests 2023-04-24 21:05:58 +02:00
ghoulslash
868838a87d
Add thunder cage case to trap anim IDs (#2941) 2023-04-24 14:35:42 -04:00
LOuroboros
a128192bfe Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-04-24 09:36:09 -03:00
LOuroboros
330e85ba64 Updates 
-Undeclared size for certain trainer slide-in variables at struct BattleStruct for reasons.
-Added a BattlerHPPercentage function to make HP threshold checks in ShouldDoTrainerSlide a bit more readable.
 2023-04-24 09:34:11 -03:00
ghoulslash
1f6e335a24 merge w upcoming 2023-04-23 18:11:57 -04:00
Bassoonian
f13c39d784 Thawing out for frostbite 2023-04-23 21:20:23 +02:00
Bassoonian
0b8d148c26 Let AI take Frostbite into account 2023-04-23 20:53:51 +02:00
Bassoonian
6b2a873071 Add comment in Ice Beam 2023-04-23 20:41:19 +02:00
Bassoonian
a020001a78 Battle Pike functionality 2023-04-23 20:33:28 +02:00
Bassoonian
13f6acf9a1 General mechanics 2023-04-23 19:20:48 +02:00
ghoulslash
25327b9031
Adds GetMovesArray in CanTargetFaintAi (#2936) 2023-04-23 08:50:06 -04:00
ghoulslash
909a20c27a
Reset battle vars and flags after player whites out (#2875) 2023-04-23 08:42:52 -04:00
ghoulslash
cf17324040
Fixed duplicate item strings in Bag/Party menus with battle items (#2915) 2023-04-23 08:32:38 -04:00
ghoulslash
594bc831d6
Adds define B_RESTORE_HELD_BATTLE_ITEMS following Gen9 (#2932) 2023-04-23 08:26:51 -04:00
ghoulslash
2332c6d5a0
Fixes status z-moves overwrting damage dealing z-moves (#2937) 2023-04-23 08:23:58 -04:00
Bassoonian
a561c6da6a Add config to Frostbite & allow it to be inflicted 2023-04-22 23:14:49 +02:00
Bassoonian
9c9a1fb831 Allow for healing with items 2023-04-22 19:18:10 +02:00
Bassoonian
f50bfb3770 Frostbite hurts at the end of the turn and halves SpA 2023-04-22 18:47:36 +02:00
Bassoonian
623e7c5f25 Add Frostbite status 2023-04-22 18:23:08 +02:00
Alex
30204e9953 fix wrong z-move ususage 2023-04-21 20:59:54 +02:00
Alex
4a08ede2c4 Add GetMovesArray in GetMovesArray 2023-04-21 20:13:30 +02:00
CallmeEchoo
301a12fe98 fix battleUsage for heal powder 2023-04-21 10:51:43 +02:00
Martin Griffin
c81a985b5b Fix USE_ITEM explicit targets 2023-04-20 21:45:16 +01:00
DizzyEggg
ae80d545c5
Support for multi battles where Trainer has only one mon (#2670) 2023-04-20 10:12:11 -04:00
citrusbolt
6c7f5881e4
Add two EV-related configs (#2825) 2023-04-20 10:05:32 -04:00
Alex
3aec63b8cf new define to restore items after battle 2023-04-20 15:08:42 +02:00
Jaizu
115efe7ea5
fix dire hit and paralyze heal (#2931) 2023-04-20 10:00:59 +02:00
CallmeEchoo
216b7a4dfd fix dire hit and paralyze heal 2023-04-20 09:44:18 +02:00
psf
d3fed5639b
Added config to enable NEW_ROCKS_PARTICLE (#2929) 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-04-19 18:54:57 -04:00
Bassoonian
52ce399240
Fix TM reusability shortcomings (#2930) 2023-04-19 11:01:00 -04:00
LOuroboros
b09ab5a3ee Updated Triple Arrows' effect's code and tests yet again 
Also added a function to get a move's secondaryEffectChance, meant to handle abilities, side statuses and the like that modify it.
 2023-04-19 01:57:34 -03:00
Bassoonian
d5b36c7c60
Reusable TMs (#2903) 
* Reusable TMs
* Forgot about Gen9 making TMs expendable again
* Change importance check based on Alex's suggestion
* Prevent items with importance from being bought more than once
* Change importance check to ghoul's suggestion
* Update include/config/item.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-18 19:52:20 -04:00
Alex
76d0d8a94e
Fix battle message strings for stats (#2927) 
* Fix battle message strings for stats
 2023-04-18 22:02:51 +01:00
Frank DeBlasio
9d93af2261
Fixed Budew evolution method (#2928) 2023-04-18 16:28:02 -04:00
LOuroboros
28ce87f6d3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2 2023-04-18 07:35:59 -03:00
LOuroboros
43a5aa09ef Corrections 
-Optimized BattleScript_EffectTakeHeart
-Updated the checks for EFFECT_JUNGLE_HEALING and EFFECT_TAKE_HEART in AI_CheckBadMove
-Updated the code for MOVE_EFFECT_TRIPLE_ARROWS inside SetMoveEffect
 2023-04-18 07:34:05 -03:00
Eduardo Quezada D'Ottone
afdfe1503d
fix several issues in BS_ItemCureStatus (#2916) 2023-04-17 16:04:59 -04:00
CallmeEchoo
efd7465c12 fix gBattleMons using party indices instead of battle indices 2023-04-17 13:34:11 +02:00
Jaizu
73ba8264e0 Fix Rare Candies 2023-04-16 21:34:07 +02:00
CallmeEchoo
7d4807d956 fix nightmare status only being healed in doubles 
this came up in a conversation on discord. its not tested.
 2023-04-16 13:11:49 +02:00
AgustinGDLV
d3a090020b added code review 2023-04-15 15:30:07 -07:00
Martin Griffin
aefe582596 GetSideParty/GetBattlerParty 
Inline GetBattlerPartyData into its callers because its name is
confusing and we couldn't think of a better one.

This seems to fix a bug in one place where GetBattlerPartyData was being
used as if it had GetBattlerParty semantics.
 2023-04-15 23:04:13 +01:00
AgustinGDLV
82dc1e3e93 fixed dupe strings in battle item use 2023-04-15 09:27:28 -07:00
LOuroboros
7d499548e8 Updates 
-Added EFFECT_JUNGLE_HEALING to IsHealingMoveEffect
-Modified the code for EFFECT_TAKE_HEART inside AI_CheckViability and AI_CheckBadMove
 2023-04-15 11:15:44 -03:00
AgustinGDLV
2eabcea86e
Battle Item Refactor (#2902) 
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
 2023-04-14 19:25:50 +01:00
Eduardo Quezada
11beec62ee Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/data/pokemon/evolution.h
#	src/field_poison.c
 2023-04-14 11:31:02 -04:00
Eduardo Quezada
958bc34cdf Fixed AI not considering Hidden Abilities in its team during switching logic 2023-04-14 09:42:48 -04:00
Eduardo Quezada
7c29a24110 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413 2023-04-13 17:05:48 -04:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect (#2883) 
* implemented Revival Blessing
 2023-04-12 01:14:25 +01:00
ghoulslash
e3ca217d64 rename IsBattlerAIControlled 2023-04-10 11:36:17 -04:00
ghoulslash
5f4bfd9bb4 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/aiflag 2023-04-10 09:48:49 -04:00
ghoulslash
e49bb21ee4 some IsBattlerAIControlled replacements w BattlerHasAi 2023-04-10 09:48:44 -04:00
Jaizu
5c0e5d2133 Don't toggle mega indicator visibility on the Safari Zone 2023-04-10 14:40:56 +02:00
Jaizu
0f958806ea Remove unused battle funcs 2023-04-10 14:39:14 +02:00
aaghaht
bd54c70020 Add PLA evo items 2023-04-10 10:47:31 +05:30
Eduardo Quezada D'Ottone
5c1efe9419
RandomElement for structured RNG (#2868) 2023-04-09 21:20:04 -04:00
Eduardo Quezada D'Ottone
6fa3332879
Merge branch 'upcoming' into trainer_moves_fix 2023-04-09 21:08:43 -04:00
GriffinR
73a6a583b3
Merge pull request #1879 from GriffinRichards/cable-car-tilemap 
Use tilemap file for cable car pylons
 2023-04-09 13:19:43 -04:00
Jaizu
1df10886b0
fix an oversight that caused battles to continuesly be double battles (#2894) 2023-04-09 18:23:52 +02:00
Eduardo Quezada D'Ottone
1094861667
Modify "FillPartnerParty" to work with "Everything Customized" (#2889) 2023-04-08 13:02:47 -04:00
Bassoonian
02af4d0943 Fixes Ominous Wind targeting 2023-04-08 18:53:04 +02:00
GriffinR
d4e243136f
Merge pull request #1878 from GriffinRichards/num-text-printers 
Replace NUM_TEXT_PRINTERS with WINDOWS_MAX
 2023-04-08 08:41:04 -04:00
sbird
903b56756d fix an oversight that caused battles to continuesly be double battles 2023-04-08 02:23:43 +02:00
ghoulslash
ff2afb0eec
Fixed Comatose AI checks (#2866) 2023-04-07 09:27:28 -04:00
ghoulslash
c3e9f4b571
Added B_DOUBLE_WILD_REQUIRE_2_MONS to use of B_DOUBLE_WILD_CHANCE even when there is only one Pokémon in the party (#2878) 2023-04-07 09:26:22 -04:00
Philipp AUER
d57d8e6e71 Revert "Fix overworld poison not working on newer generations config" 
This reverts commit e1beb55a51.
 2023-04-07 11:35:30 +02:00
Jaizu
e1beb55a51 Fix overworld poison not working on newer generations config 2023-04-07 11:21:47 +02:00
Jaizu
4709d2b46f Fix trainers having empty movesets 2023-04-07 10:53:44 +02:00
Alex
bd4736cc97 initial commit 
test multi battle

final

remove empty line
 2023-04-06 20:56:44 +02:00
Bassoonian
50b5dba655 Fix string issue as requested by Jaizu 2023-04-06 10:13:32 +02:00
Bassoonian
dfee8a4759 OW Poison configs 2023-04-06 00:26:52 +02:00
Eduardo Quezada D'Ottone
5fe79d83c1
Fix CalcMoveBasePower using battler addresses (#2858) 2023-04-03 23:27:36 -04:00
GriffinR
57396026b2 Replace NUM_TEXT_PRINTERS with WINDOWS_MAX 2023-03-31 14:57:51 -04:00
GriffinR
4b859ff1e4 Use tilemap file for cable car pylons 2023-03-31 00:44:22 -04:00
PSF
24df9823e8 In response to PR discussion, added new preproc config for developers to toggle Overworld_ResetBattleFlagsAndVars 2023-03-30 06:35:38 -07:00
pkmnsnfrn
6a7466c929 Added B_DOUBLE_WILD_REQUIRE_2_MONS to allow use of B_DOUBLE_WILD_CHANCE even when there is only one Pokémon in the party 2023-03-29 11:11:07 -07:00
Alex
8c4396ddaf Gen9 move tests batch2 2023-03-29 13:01:20 +02:00
LOuroboros
977a55bdee Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2 2023-03-29 07:40:16 -03:00
PSF
686d42709a Added documentation on resetting battle flags and vars 
Added Overworld_ResetBattleFlagsAndVars to Overworld_ResetStateAfterWhiteOut
 2023-03-28 15:50:58 -07:00
ghoulslash
f8bbcdfe73 minor fix to mirror herb message 2023-03-28 15:12:54 -04:00
ghoulslash
afc4b4cdee add mirror herb 2023-03-28 15:07:37 -04:00
ghoulslash
10ef3e8348 style fixes 2023-03-28 10:58:44 -04:00
ghoulslash
00d695ac2b add AI_FLAG_OMNISCIENT 2023-03-28 10:38:48 -04:00
LOuroboros
ed9e860400 Post cherrypick corrections and improvements 
-Made BattleScript_EffectTakeHeart use modifybattlerstatstage
-Optimized usage of BattleScript_EffectInfernalParade
-Tweaked the way in which Triple Arrows' increased crit. hit chance is handled
-Optimized syntax for case MOVE_EFFECT_TRIPLE_ARROWS in SetMoveEffect
-Optimized case EFFECT_INFERNAL_PARADE in CalcMoveBasePower
 -Infernal Parade is not known to interact with Comatose, so Eduardo and I will extrapolate that here
-Added AI conditionals for some of the effects
-Made Triage notice Jungle Healing and moves that use its effect
 2023-03-28 10:08:52 -03:00
ghoulslash
dd99cb6da8
Fixed instances of gSideTimers not using side constants (#2867) 2023-03-27 21:48:50 -04:00
Eduardo Quezada D'Ottone
fa245c6edf
fix GetBattleAnimMoveTargets for non-player gBattleAnimAttacker (#2848) 2023-03-27 18:11:22 -03:00
AgustinGDLV
b856cb3e62 fixed Eiscue + multiple weather form changes at once (probably) 2023-03-27 12:05:06 -07:00
AgustinGDLV
2017bee3f8 fixed Castform + Cherrim 2023-03-27 11:35:23 -07:00
Martin Griffin
7b306b6147 RandomElement for structured RNG 
Converts Tri Attack and Dire Claw to use structured RNG.
 2023-03-27 18:50:18 +01:00
Eduardo Quezada
f6a924a791 Fixed instances of gSideTimers not using side constants 2023-03-27 11:49:50 -03:00
Eduardo Quezada
3888b10769 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/form_change_tables.h
 2023-03-27 10:55:38 -03:00
Eduardo Quezada
0b8285737a Fixed Comatose AI checks 2023-03-27 09:19:48 -03:00
ghoulslash
8d8819b797
Adds missing cases for 'Everything Customized' (#2862) 2023-03-26 21:02:46 -04:00
LOuroboros
000077f671 Implemented Axe Kick's effect 2023-03-26 20:05:30 -03:00
LOuroboros
8ae57dc912 Implemented Take Heart's effect 2023-03-26 20:05:13 -03:00
LOuroboros
d2a221eb85 Corrected Lunar Blessing's data 2023-03-26 20:04:56 -03:00
LOuroboros
05a34edb7d Implemented Infernal Parade's effect 2023-03-26 20:04:55 -03:00
LOuroboros
1595a66559 Implemented Triple Arrows' effect 2023-03-26 20:04:36 -03:00
ghoulslash
6574e01e73
Gen. 9 Move Effects, 1st batch (#2534) 2023-03-26 16:20:47 -04:00
ghoulslash
d2d2e05a62
Fixed Grassy Terrain not healing + Added To-Do test results (#2857) 2023-03-26 15:18:42 -04:00
Alex
4b43f3eb9d add cases for everything customized 2023-03-26 21:10:51 +02:00
Eduardo Quezada
32b2c01619 Merge branch 'RHH/upcoming' into RHH/pr/fix/GassyTerrain 
# Conflicts:
#	test/test.h
 2023-03-26 16:06:04 -03:00
ghoulslash
dc63d096f2
add check for Gorilla Tactics when resetting choicedMove from knock off (#2854) 2023-03-26 15:03:56 -04:00
ghoulslash
dc9f0b5107
Implement Customizable NPC Trainer Parties (#2733) 2023-03-26 09:32:51 -04:00
ghoulslash
5d71afd1c0
Add Gen IX items (#2838) 2023-03-26 07:29:14 -04:00
ghoulslash
a0b95ae27e
Fix Intimidate targetting dead sides and false postpones (#2850) 2023-03-26 07:27:14 -04:00
sbird
aea5d79aa2 [trainer_parties] implement fully customizable npc trainer parties 
fix nature related bug, fix hash generation, add tests
 2023-03-25 20:00:04 +01:00
sbird
b9447f88fc fix compound eyes ohko test 2023-03-24 16:37:52 +01:00
ghoulslash
2c3db74702 fix base power calcs using battler addresses 2023-03-24 10:36:10 -04:00
Philipp AUER
4928911cd0
Speed up PASSES_RANDOMLY via structured RNG (#2720) 2023-03-24 15:16:29 +01:00
ghoulslash
dca6182ed2
remove assist array from battle struct (#2816) 2023-03-24 09:23:49 -04:00
Eduardo Quezada
c383c995f1 Applied review changes 2023-03-24 10:12:09 -03:00
GriffinR
6be9a79b8c
Merge pull request #1871 from GriffinRichards/doc-trendy-sayings 
Document the trendy sayings word group
 2023-03-24 08:05:51 -04:00
Eduardo Quezada D'Ottone
1da65c4051 Fixed Grassy Terrain not healing 2023-03-23 22:33:47 -03:00
Bassoonian
cd6d71cd01 Add most of the new item icons (Clear Amulet & Shards missing) 2023-03-24 00:50:06 +01:00
Bassoonian
e601719c91 Add new PLA form change items 2023-03-24 00:04:08 +01:00
Bassoonian
f15fb1540f Allow Kubfu evolution with Scroll items 2023-03-23 23:16:08 +01:00
Bassoonian
80d0efae0c Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhhupcomingdev 2023-03-23 23:04:23 +01:00
DizzyEggg
8cf357a37b tests for dire claw ceaseless edge barb barrage 2023-03-23 12:29:04 +01:00
LOuroboros
7ce5c5fc66 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-03-23 06:27:09 -03:00
Eduardo Quezada D'Ottone
2658fe32c2
Removed ITEM_HAS_EFFECT (#2840) 2023-03-23 10:02:32 +01:00
Eduardo Quezada D'Ottone
023cc4d38d
Fixed erroneous uses of non e-reader Enigma Berries (#2839) 2023-03-23 09:58:26 +01:00
AgustinGDLV
03f6fe635f
changed CanBeConfused to actually check its argument (#2855) 2023-03-23 09:50:44 +01:00
CallmeEchoo
4541cc3319 add check for Gorilla Tactics 
knock off shouldnt reset choicedMove when the pokemon has the Gorilla Tactics ability
 2023-03-22 22:30:24 +01:00
GriffinR
8d67bebd51
Merge pull request #1869 from GriffinRichards/const-map 
Treat map data as const
 2023-03-22 13:00:06 -04:00
tennis
358180946d Fix Intimidate targetting dead sides and false postpones 2023-03-22 11:46:50 +00:00
ghoulslash
74ec59cace add sAnimHideHpBoxes to fix healthbox reappearing from e.g. B_ANIM_SWITCH_OUT_OPPONENT_MON 2023-03-21 18:11:49 -04:00
Eduardo Quezada
ef914a2fac Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-21 16:13:27 -03:00
ghoulslash
c61797bc38 styling and syntax fix 2023-03-21 14:31:09 -04:00
ghoulslash
1adc6b761e remove random space 2023-03-21 13:38:24 -04:00
ghoulslash
3bd680cab9 fix GetBattleAnimMoveTargets for non-player gBattleAnimAttacker 2023-03-21 13:36:45 -04:00
Eduardo Quezada
47b4e6095d Undo Timburr and Stunfisk friendships, as they don't change 2023-03-19 22:00:18 -03:00
Eduardo Quezada
51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 
# Conflicts:
#	data/battle_scripts_2.s
#	include/constants/battle_string_ids.h
#	include/constants/songs.h
#	src/battle_message.c
#	src/data/pokemon/species_info.h
 2023-03-19 20:28:56 -03:00
Bassoonian
d480fc90f2 Fix Scrolls type 2023-03-19 21:21:43 +01:00
Bassoonian
372c6a1afa Add new item variables and defines 2023-03-19 20:55:39 +01:00
Eduardo Quezada
bef5d98b88 Fixed Pokémon fainting in the Overworld that don't have that specific form change entry 2023-03-18 09:47:54 -03:00
LOuroboros
f4e8389779 Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
Martin Griffin
89deda0416 Allow tests to override specific RNG calls 2023-03-15 13:39:17 +00:00
LOuroboros
aefd318945 Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect 2023-03-14 11:43:52 -03:00
Eduardo Quezada
0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
GriffinR
0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
Alex
aa29eced1f
Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites 2023-03-13 17:46:53 +01:00
Eduardo Quezada D'Ottone
a8c9309458
Fixed Wring Out's power (#2824) 
Fixes #2823
 2023-03-13 09:07:29 +01:00
Eduardo Quezada
a0feaabef1 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-12 15:53:32 -03:00
Eduardo Quezada
c46e70ca82 Forgot about Primal Reversion 2023-03-12 02:38:27 -03:00
Eduardo Quezada
7ce68994ec Made Mega Evolution properly use TryBattleFormChange 2023-03-12 02:32:09 -03:00
LOuroboros
6dbe772e27 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-03-10 18:23:33 -03:00
ghoulslash
6f13e4cfc5
word-align battle_interface u8 array gfx (#2812) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-03-10 20:52:22 +01:00
ghoulslash
c669745b9c
Fixed score for Work up and Growth (#2813) 2023-03-09 11:12:51 -05:00
Eduardo Quezada D'Ottone
aedf18fea9
Debug Menu improvements (#2814) 2023-03-09 08:23:58 -03:00
Eduardo Quezada D'Ottone
bb90dc7dd1
Debug menu to give items based on max quantity and map number 3digits display (#2807) 2023-03-09 08:17:29 -03:00
Eduardo Quezada D'Ottone
73236344ba
Fixes the check for speed on electrify (#2819) 2023-03-09 08:02:00 -03:00
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
DizzyEggg
bf4735e87c remove test changes 2023-03-08 13:41:08 +01:00
DizzyEggg
51c8edd825 Add tests for Mega Evo, Focus Punch, Beak Blast 2023-03-08 13:22:53 +01:00
LOuroboros
fdebc994d2 Updated Supreme Overlord's effect's code 2023-03-07 19:14:38 -03:00
DizzyEggg
f6089a0057 Mega Evolution after switching and based on speed 2023-03-07 22:34:57 +01:00
Eduardo Quezada
46bdd21e7a Cleaned up stray comment 2023-03-07 11:39:47 -03:00
Eduardo Quezada
4625a46748 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-03-07 11:26:33 -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
ff15856820 Added yet another trainer slide condition 
Now a trainer NPC can also say something before the first turn of a battle starts for good.
 2023-03-02 06:16:44 -03: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
LOuroboros
8a036e6007 Made this build again 2023-02-27 07:51:36 -03:00
LOuroboros
a54a8d9b2a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-27 07:43:19 -03: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
LOuroboros
fe09f3e0d3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-26 23:42:01 -03:00
Eduardo Quezada
41bf9ea63c Removed trailing whitespaces 2023-02-26 18:43:15 -03:00