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
