ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-29 01:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,992 Commits 1 Branch 0 Tags 235 MiB
cd51471c96
Commit Graph

5226 Commits

Author SHA1 Message Date
Martin Griffin
76f02774ea Detect memory leaks in tests 
Can use KNOWN_LEAKING; to specify that a test is known to leak memory.

The location information is available in regular game builds. Thus it is
available for use in debugging leaks in-game too. In the future we
should consider replacing it with NULL if NDEBUG is defined. This is not
currently possible because the tests do not force NDEBUG to be
undefined.
 2023-04-20 20:35:22 +01: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
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
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
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
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
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
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
1094861667
Modify "FillPartnerParty" to work with "Everything Customized" (#2889) 2023-04-08 13:02:47 -04: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
psf
59dfc7c3ad
Update include/config/battle.h 
Took suggestions from https://github.com/rh-hideout/pokeemerald-expansion/pull/2875#discussion_r1160574308

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-04-07 06:07:12 -07: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
Martin Griffin
35952cf7ad Clamp RandomPercentage to 0...100 2023-04-05 13:07:02 +01:00
psf
48f90a7155
Update explanation in include/config/battle.h 
Changed the comment in include/config/battle.h per PR comment: https://github.com/rh-hideout/pokeemerald-expansion/pull/2878#discussion_r1154322931

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-01 14:12:50 -07: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
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
afc4b4cdee add mirror herb 2023-03-28 15:07:37 -04:00
ghoulslash
00d695ac2b add AI_FLAG_OMNISCIENT 2023-03-28 10:38:48 -04: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
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
6574e01e73
Gen. 9 Move Effects, 1st batch (#2534) 2023-03-26 16:20:47 -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
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
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
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
Zunawe
492422b6bd Fix scanner item flag name 2023-03-23 21:47:26 -07: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
80d0efae0c Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhhupcomingdev 2023-03-23 23:04:23 +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
GriffinR
8d67bebd51
Merge pull request #1869 from GriffinRichards/const-map 
Treat map data as const
 2023-03-22 13:00:06 -04:00
Eduardo Quezada
ef914a2fac Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-21 16:13:27 -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
372c6a1afa Add new item variables and defines 2023-03-19 20:55:39 +01: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
GriffinR
00e211a417
Merge pull request #1873 from AsparagusEduardo/pret/pr2/stringConversionIDE 
Changed IDE macros to allow their use in compound literals without IDE errors
 2023-03-15 03:00:01 -04:00
Eduardo Quezada
2cb54c49da Changed definitions of string conversion IDE macros to allow their use in compound literals without IDE errors 2023-03-14 15:38:18 -03: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
a0feaabef1 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-12 15:53:32 -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
DizzyEggg
d695c76881 test for assist and removed assist array from battle struct 2023-03-08 22:11:28 +01: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
GriffinR
dbf757be88 Treat map data as const 2023-03-08 12:00:30 -05: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
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
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
ce6875817f
Merge pull request #1860 from GriffinRichards/metatile-labels 
Format metatile_labels
 2023-03-04 23:36:04 -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
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
Eduardo Quezada
3b27b602fd End of file 2023-02-28 00:09:43 -03:00
Eduardo Quezada
90021f3be6 Removed zMovePower field in gBattleMoves in favor of a function. 2023-02-27 23:49:43 -03:00
DizzyEggg
c92a65dc40 Add config for stockpile raising def stats 2023-02-27 21:09:02 +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
GriffinR
4a6ea87247
Merge pull request #1865 from AsparagusEduardo/pret/doc/species2 
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarity
 2023-02-27 13:06:04 -05:00
DizzyEggg
3338a6b786 add messages for stockpile effects wear off 2023-02-27 12:31:29 +01:00
LOuroboros
a54a8d9b2a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-27 07:43:19 -03: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
DizzyEggg
4bdca43dbd refactor mega evolution indicator sprite 2023-02-26 12:51:35 +01:00
Zunawe
f376b71f7c Fix wrong route in item flag name 2023-02-25 13:48:39 -08:00
Eduardo Quezada
31ab56bceb Fixed footprint symbol names. 2023-02-25 09:23:34 -03:00
Eduardo Quezada
ca81d7a0f9 Forgot about Jangmo-o 2023-02-24 21:58:09 -03: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
dc83708443 Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd 2023-02-22 22:51:59 +01:00
Zunawe
60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08: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
DizzyEggg
31138455de remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS 2023-02-22 09:28:12 +01:00
Eduardo Quezada
5ca9213d07 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-02-21 17:47:02 -03: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
LOuroboros
24581426a1 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-21 04:46:28 -03:00
LOuroboros
3a91a5c930 Added new trainer slide-in msg conditions 
Now they can say something:
-When their last Pokémon's HP is between 25% and 50%.
-When a critical hit is dealt to their first Pokémon for the first time.
-When a super effective hit is dealt to their first Pokémon for the first time.
-When a STAB move is used against (but doesn't faint) the opponent's Pokémon.
-When the Player's Pokémon's move doesn't affect the opponent's Pokémon.
-When they're about to trigger a Mega Evolution.
-When they're about to trigger a Z-Move.

Misc. changes:
-Split GetEnemyMonCount for readability's sake.
-Optimized the size allocated to trainerSlideLowHpMsgDone.
 2023-02-21 04:40:02 -03:00
Zunawe
8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08: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
DizzyEggg
380af442c3
Fix buggy pokemon anims with Illusion (#2639) 
* try illusion fix

* fix
 2023-02-19 12:05:56 +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
DizzyEggg
66d2f253a1 merge with master 2023-02-17 15:43:15 +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
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
DizzyEggg
d637ee3b13
Fix After You for gen8 (#2646) 
Fix After You
 2023-02-16 20:59:36 +00:00
Eduardo Quezada
f4f8ab6ee9 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-02-16 17:06:49 -03: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
DizzyEggg
978d342953 use NUM_BATTLE_SIDES 2023-02-16 15:26:26 +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
dbd02d3a56 Clarified Champion Ribbon's description to avoid being interpreted as needing to beat the champion in both RSE and FRLG. 2023-02-15 14:06:42 -03:00
Eduardo Quezada
bd54990333 Review changes 2023-02-15 13:56:11 -03:00
GriffinR
671c9c5353 Merge branch 'master' into doc-chat 2023-02-15 10:57:05 -05:00
GriffinR
a322379feb
Merge branch 'master' into doc-windows 2023-02-15 10:04:48 -05:00
DizzyEggg
3f0f7c6b7f Fix Battle Bond activating multiple times in battle 2023-02-15 15:30:29 +01:00
GriffinR
d3d680c1dd Sort metatile labels alphabetically 2023-02-14 14:36:27 -05:00
GriffinR
b656565af0 Standardize RS mossdeep gym metatile labels 2023-02-14 11:42:13 -05:00
GriffinR
0df56b808d Remove duplicate metatile label sections 2023-02-14 11:40:15 -05: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
DizzyEggg
0577d8d04d Fix Mirror Armor against Clear Body 2023-02-13 14:44:34 +01: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
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
sbird
4bcbb7c9e1 [intro] refactor expansion intro 2023-02-09 23:12:29 +01:00