7396 Commits

Author	SHA1	Message	Date
DizzyEggg	065c0ec588	Fairy Lock animation fix (#4111) ... * Fairy Lock animation fix * remove comment * fairy lock anim hopefully works --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-02-04 23:23:03 +01:00
Nephrite	65c508d193	Secondary effects overhaul minor follow-up (#4062) ... * settwoturnstring command * Unified two-turn attacks and Meteor Beam To do: Solar Beam * Solar Beam Also fixed various function, removed EFFECT_GUST (who knows why that exists?) * Updated Solar Beam + tests * Redid two turn move + animations logic Removed pointless various function; to do: remove Skull Bash, fix AI test * Removed now-pointless flag * Removed Skull Bash And temporarily commented out failing AI tests * Removed Sky Uppercut effect Not sure when or why this was ever necessary * Removed BattleScript_EffectSemiInvulnerable Now uses BattleScript_EffectTwoTurnsAttack. Kept the effect; used the argument field to determine which STATUS3 such moves should apply but added a function to jump over weather checks in BattleScript_EffectTwoTurnsAttack if the current move is semi-invulnerable (since the instant-fire weather check and STATUS3 use the same field) * Applied review changes * Replaced VARIOUS with callnative Tried to fix test but couldn't :/ wtf is going on * Fixed one AI test Cant fix the other... * Added KNOWN_FAILING to failing AI tests Separated them out into their own test * Optimised script, overhauled charge turn string setting Condensed multiple confusing macros into one, jumpifweathercheckchargeeffects. Script now tweaked and trimmed, string ids for charge turns now added to argument along with status3 (thanks to compression macro) and instant-fire-weather for semi-invulnerable and two-turn moves respectively. Also introduced a savedStringId in gBattleScripting to make string selection work. * Unified two turn move tests + minor corrections * Added semi-invulnerable move tests Set the Razor Wind test to known failing - something to do with its animation? --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-02-04 23:02:59 +01:00
Nephrite	7ae50ea507	Metaprogram (#3968) ... * metaprogram.h Created by Mr. Griffin. Removed non-relevant parts * Added DEFAULT/DEFAULT_2 macros Also added a demonstration in battle_main * Removed GET_ARGS * Expanded DEFAULT Because why not? * Added EXCEPT Expands to everything but the first x arguments. * Added BIT_INDEX (thanks to MGriffin) and COMPRESS_BIT macros These let you compress a bit up to a word in size inside a single byte and uncompress at the same time. BIT_INDEX just tells you where the bit is. * Updated HANDLE_EXPANDED_MOVE_NAME --------- Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2024-02-04 16:28:27 -03:00
LOuroboros	691b1879f8	Renamed VAR_TERRAIN to B_VAR_TERRAIN and added a var-based field terrain timer (#4132) ... * Renamed VAR_TERRAIN and introduced a var-based field terrains timer * Fixed sky battle configs alignment and syntax * Added B_VAR_TERRAIN_TIMER handling to Overworld_ResetBattleFlagsAndVars * Removed pointless edits to EndTurnTerrain * Updated B_VAR_TERRAIN_TIMER's comment * Updated the syntax of ABILITYEFFECT_SWITCH_IN_TERRAIN to comply with Agbcc * Nuked pointless VarGet calls in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects * Reverted changes made to BS_SetRemoveTerrain I shouldn't have touched it at all since it's not involved with B_VAR_TERRAIN functionality. * Removed trailing spaces in the case ABILITYEFFECT_SWITCH_IN_TERRAIN of AbilityBattleEffects	2024-02-04 13:04:55 +01:00
DizzyEggg	85eea4869d	Fix move animation crashing on some emulators because of division by zero (#4121) ... * fix flip turn div by zero * fix incinerate move anim div by zero	2024-02-03 16:56:50 +01:00
Alex	ab2774f8c7	Adds Dragon Cheer (#4122) ... * Adds Dragon Cheer * fix assumptions --------- Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>	2024-02-03 08:00:41 -07:00
DizzyEggg	132ca1be14	Change Safe Div to explicitly check b != 0	2024-02-02 22:57:02 +01:00
Bassoonian	adc3308d13	Actually multi battles seem to work fine too	2024-02-02 16:52:39 +01:00
Bassoonian	6c1a111c14	No questionnaires are actually broken	2024-02-02 16:45:58 +01:00
Bassoonian	06d04c1194	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into ghoulsaveblock	2024-02-02 16:39:15 +01:00
Bassoonian	b8b7dd304b	Add final config documentation	2024-02-02 16:38:33 +01:00
Bassoonian	6f668fb31d	Add FREE_MYSTERY_GIFT	2024-02-02 16:31:19 +01:00
Bassoonian	4092d0283a	Fix FREE_BATTLE_TOWER_E_READER	2024-02-02 15:58:27 +01:00
ghoulslash	83b9b95662	add supersweet syrup, unify single-use entry abilities to single field (#4115) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-02-02 15:44:14 +01:00
Bassoonian	db95a06ae0	Fix FREE_TRAINER_HILL	2024-02-02 15:24:46 +01:00
Bassoonian	dedba114be	Fix FREE_LINK_BATTLE_RECORDS	2024-02-02 15:16:18 +01:00
Bassoonian	a1c17a1de7	Fix FREE_ENIGMA_BERRY	2024-02-02 15:01:50 +01:00
Bassoonian	cc57452695	Fix FREE_UNION_ROOM_CHAT	2024-02-02 14:57:40 +01:00
Bassoonian	24ed9e77ff	Fix FREE_MATCH_CALL	2024-02-02 14:13:16 +01:00
Bassoonian	deb3e6a11d	Add dependency #error	2024-02-02 13:47:53 +01:00
Bassoonian	27a65a5961	Fix FREE_RECORD_MIXING_HALL_RECORDS	2024-02-02 13:46:19 +01:00
Bassoonian	90be8436d9	Fix FREE_POKEMON_JUMP	2024-02-02 13:39:21 +01:00
Bassoonian	26a4c56843	Ensure FREE_EXTRA_SEEN_FLAGS works	2024-02-02 13:32:13 +01:00
Bassoonian	495ee6698c	Clean up code	2024-02-02 13:13:27 +01:00
Bassoonian	acf5d8133a	Convert ifndef configs to standard configs	2024-02-02 12:43:31 +01:00
Bassoonian	d1bb078919	Merge branch 'saveblock' of https://github.com/ghoulslash/pokeemerald into ghoulsaveblock	2024-02-02 11:27:48 +01:00
kaicardenas2	e828ae58a1	Non-Tagged Release (#4109)	2024-02-01 21:20:10 -03:00
Eduardo Quezada D'Ottone	2d24f96420	Version 1.7.3 (#4106) ... * Version 1.7.3 * Latest changelog	2024-02-01 20:55:53 -03:00
Bassoonian	ccfebe5e05	Adds missing evolution methods (#4087) ... * Add evolution tracker to BoxMon struct * Add "use move 20 times, then lv up" evolution method * Add recoil tracker * Reduce to 9 bits * Fix agbcc complaint * Put MOVEEND_CLEAR_BITS at the end * Remove battle argument from tryupdaterecoiltrackker * Add null checks * Fix upcoming merge * Add requested formatting changes * Condense evolution check into a single function for easier customisation later * Incorporate review requests * Update src/pokedex_plus_hgss.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-02-01 18:35:38 -03:00
Eduardo Quezada	09d12fb154	Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # ld_script_modern.ld # src/battle_ai_switch_items.c	2024-02-01 12:52:31 -03:00
ZnogyroP	71b49a114f	Adds move Upper Hand (#4085) ... * Remove non-existent tilesets from label comments and alphabetize * Fixed braces style * gbagfx bit depth upconversion fix * jsonproc: filter out every non-alphanumeric character * fix(linking): link gflib/malloc.c at top of EWRAM in ld_script_modern.ld * Adds move Upper Hand * Requested changes - Tabs / spaces where proper - HitFromAtkString -> HitFromAccCheck - Actually compiles now lol - Moved assumes into relevant tests - Cleaned up the check for TryUpperHand * Fixed || positioning * Update upper_hand.c * Revert "Merge remote-tracking branch 'upstream/master' into upper-hand" This reverts commit b21275dfe9a8c106069a5d34ecba9c84064f599f, reversing changes made to 89b1ad1ea1655bf30c51a7f0f7a0b176cc64635a. * AI logic and conflicts solved * Test fix * Fix Sheer Force test * Requested changes * Requested changes * Update battle_script_commands.c --------- Co-authored-by: GriffinR <griffin.g.richards@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> Co-authored-by: Sierraffinity <sierra@domoreaweso.me> Co-authored-by: sbird <sbird@no.tld>	2024-02-01 12:23:58 +01:00
Nephrite	8a8d181654	AdditionalEffects storage tweak ... Uses some macro and bitwise trickery to store additional effects and the count thereof in a single word	2024-02-01 15:19:10 +09:00
Alex	6d3fa525d5	Rename EFFECT_FAKE_OUT to EFFECT_FIRST_TURN_ONLY (#4081) ... * Splits First Impression effect from Fake Out * Fix test failing * rename EFFECT_FAKE_OUT * use moveeffect chance for fake out and priority field for first impression * rename rest of fake out * messed up merge * remove useful comment --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-31 09:32:58 -03:00
DizzyEggg	f5623595a0	Fix AI trying to switch into the same mon 2 times (#4098)	2024-01-30 16:14:33 +01:00
Nephrite	086375ab13	Moved a couple more flags	2024-01-30 18:05:52 +09:00
Nephrite	02ffd05aea	Removed Sheer Force flag	2024-01-30 13:37:38 +09:00
Nephrite	e602a310c9	BattleMove adjustment ... Moved one or two flags to the effects array as well	2024-01-30 13:37:29 +09:00
LOuroboros	a64e1c63c1	Move data unification (#3999) ... * Made gBattleMoves handle the InGame name and description of battle moves No more multiple arrays in separate, individual files. Note: -Keep an eye on Task_LearnedMove. * Reintroduced move names Misc: -Fixed Trick-or-Treat and Light of Ruin's expanded names. -Introduced a new field for Z-Move names, and a constant for their name length. -Added a few TODOs to GetBattleMoveName. -Updated GetMaxMoveName and GetZMoveName. There's no reason not to let GetBattleMoveName handle everything on its own. * Updated GetBattleMoveName to handle Z-Move Names Misc: -Removed pointless TODO about MOVE_NAME_LENGTH. -The compiler doesn't allow to have a move name with a value higher than MOVE_NAME_LENGTH, therefore it's pointless to worry about it. * Fixed a couple of expanded move names * Removed zMoveName variable of struct BattleMove and extended the name variable's size * Ditched no longer used MOVE_NAME_LENGTH constant * Corrected the names of the max moves I should have done this after updating the size of the name variable of the struct BattleMove, but I didn't think about it at all until Cancer Fairy indirectly gave me the idea. * Fixed U-turn's name * Brought back MOVE_NAME_LENGTH I think it doesn't make sense to have a Z_MOVE_NAME_LENGTH because the length in question is used for all battle moves, not just the Z-Moves. * Introduced a union for Move/Z-Move names in the struct BattleMove * Fixed the union for gBattleMoves move names Also updated GetBattleMoveName to properly handle Max Move names. Also also renamed the "zMoveName" variable to "bigMoveName" which better reflects its purpose. Z-Move names weren't the only thing it covered, since it also handles Max Move names. * Removed deprecated GetZMoveName and GetMaxMoveName * Reintroduced mention to gMoveNames in sGFRomHeader * Fixed move names and ported move descriptions * Fused the struct ContestMove into the struct BattleMove * Removed no longer used Z_MOVE_NAME_LENGTH constant * Renamed the struct BattleMove's bigMoveName variable and introduced macros to prettify move names * Reintroduced the contest parameters for Pokémon moves * Renamed gBattleMoves to gMovesInfo This is consistent with gSpeciesInfo, the array that contains most of the species data. * Renamed the BattleMove struct to MovesInfo This is consistent with the struct SpeciesInfo, which contains the variables used by the gSpeciesInfo array. * Removed empty lines separating battle params from contest params in gMovesInfo * Renamed MovesInfo to MoveInfo * Added Cancer Fairy's HANDLE_EXPANDED_MOVE_NAME macro Used to handle moves with expanded names in a more comfortable manner. Also fixed Trick-or-Treat's expanded name. * Renamed GetBattleMoveName to GetMoveName * Added a comment pointing out that the shared move descriptions are shared move descriptions * Re-aligned one of the escape characters of CHECK_MOVE_FLAG * Renamed the battle_moves.h file to moves_info.h instead for consistency's sake * Applied Eduardo's adjustments * Using compound string for regular move names as well, saving 1180 bytes and making their use consistent * Move description formatting * Updated Pursuit test after merge * Renamed the BATTLE_CATEGORY constants to DAMAGE_CATEGORY --------- Co-authored-by: Nephrite <thechurchofcage@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-29 08:51:32 -03:00
Alex	199e863909	Adds move score defines + minor score clean up (#4075) ... * Adds move score defines + minor score clean up * fixes compiling, added comments + more replacements * fix agbcc * Update include/battle_ai_main.h Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-01-29 12:28:16 +01:00
Eduardo Quezada D'Ottone	308bf50dcc	Set EFFECT_PLACEHOLDER as the default move effect (#4079)	2024-01-27 15:33:29 -03:00
Bassoonian	b9a02b205d	Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068) ... * Rename gItems to gItemsInfo * Rename gAbilities to gAbilitiesInfo * Just fixing up my bad merge --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-26 15:25:52 -03:00
Alex	0bdc0b2aa5	Fix leftover (#4074)	2024-01-26 18:58:07 +01:00
Bassoonian	80e6ca1df0	Converts a bunch of #if to regular conditions (#4071) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-01-26 18:15:45 +01:00
Alex	d0a35eec1d	AI score changes, mostly IncreaseStatUpScore + few others (#4036)	2024-01-26 16:48:51 +00:00
Eduardo Quezada D'Ottone	c8d73c0827	Merge branch 'upcoming' into guillotine-expansion	2024-01-26 10:10:27 -03:00
Eduardo Quezada	f5239aae3c	Reading Follower data from gSpeciesInfo	2024-01-24 19:28:40 -03:00
Bassoonian	78708cad55	Adds universal move array (#4052) ... * Add universal move list * Exclude TM illiterates from learning universal moves * Add config for literacy checks * Fix config check * Update src/pokemon.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Other review remarks --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-24 11:45:22 -03:00
Bassoonian	4c21c85ee2	PLA Items (#3825) ... * Add PLA item data * Add most item sprites * Incorporate review feedback	2024-01-23 18:24:58 +01:00
Eduardo Quezada	ebbcb7d025	Whitespace, documentation and style	2024-01-22 19:12:52 -03:00
Eduardo Quezada	00e2ca6030	Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_ai_util.c # src/battle_script_commands.c # src/battle_tv.c # src/data/battle_moves.h # src/data/pokemon/species_info/gen_9.h	2024-01-22 15:56:10 -03:00
Alex	0ec777dd24	Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect (#4043) ... * Fixes Mind Blown / Magic Guard interaction and renames Steel Beam effect * review fixes --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-01-21 23:42:01 +01:00
Ariel A	b56158428e	Added new follower pokeballs & toggle. ... Credit: shikashipx	2024-01-21 17:21:33 -05:00
Alex	d125da7797	Fixes Life Orb + Eject Pack / Red Card interaction (#4038) ... * Fixes Life Orb + Eject Pack / Red Card interaction * fix test	2024-01-20 22:48:34 +01:00
Eduardo Quezada	d1f02a8395	Centered follower sprite better in debug menu	2024-01-19 14:24:50 -03:00
Nephrite	89a632cfa4	Moved scripts array to src/data/battle_move_effects.h (#3994) ... * Created gMoveBattleEffects array * Renamed array to gBattleMoveEffects Applied array in battle_util.c and battle_script_commands.c; doesn't build yet... * Got it building... * Added missing battle_tv effects * Fixed and got it building I'm an idiot sometimes * Added battle_tv scores, encourage Encore flag All works and builds just fine * Merge fixes * Reformatted battle_move_effects Also tweaked struct, added macro --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-01-19 16:44:09 +01:00
tertu	179a0ea97a	Seed the RNG with the time in seconds in HQ mode (#3812)	2024-01-19 10:27:42 +00:00
GriffinR	8e8d2f5efa	Remove non-existent tilesets from label comments and alphabetize	2024-01-18 14:31:04 -05:00
Bassoonian	1aff65029f	Deprecate GetBerryCountString (#4012) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-01-18 18:59:42 +01:00
Eduardo Quezada	5233d0dc97	Showing followers in debug menu (no animation yet)	2024-01-18 12:00:11 -03:00
Eduardo Quezada	381a0bf8a1	Fixed compile issues	2024-01-18 09:10:20 -03:00
Eduardo Quezada	5d372b5f8a	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # README.md # gflib/sprite.c # graphics/object_events/pics/pokemon/togetic.png # src/data/object_events/object_event_graphics.h # src/data/object_events/object_event_graphics_info.h # src/data/object_events/object_event_graphics_info_followers.h # src/event_object_movement.c # src/field_effect_helpers.c	2024-01-18 08:12:09 -03:00
Alex	9efdd9e0cd	Adds Move Shed Tail (#4016) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-01-18 00:14:18 +01:00
Eduardo Quezada	ddc752eb14	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # asm/macros/event.inc # data/field_effect_scripts.s # data/maps/BattleFrontier_BattleTowerLobby/scripts.inc # data/script_cmd_table.inc # graphics/pokemon/castform/sunny/anim_front.png # graphics/pokemon/castform/sunny/normal.pal # include/battle_util.h # include/constants/event_object_movement.h # include/constants/field_effects.h # src/battle_controller_player.c # src/battle_util.c # src/data/object_events/movement_action_func_tables.h # src/data/object_events/object_event_pic_tables.h # src/data/trainer_graphics/back_pic_anims.h # src/daycare.c # src/event_object_movement.c # src/field_effect_helpers.c # src/load_save.c # src/scrcmd.c # src/trainer_see.c	2024-01-17 18:11:35 -03:00
Eduardo Quezada	71fe6b34dc	Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # include/battle_scripts.h # src/battle_script_commands.c	2024-01-17 12:29:33 -03:00
Eduardo Quezada	cadaeb7074	Non-tagged	2024-01-17 11:52:04 -03:00
Eduardo Quezada D'Ottone	3636ff6d69	Version 1.7.2 (#4013) ... * Version 1.7.2 * I got one more in me, couch	2024-01-17 11:51:00 -03:00
Ariel A	8a52316dd2	Reformatted for code review. Moved config to include/config/decap.h.	2024-01-17 01:12:04 -05:00
Alex	87472d4a6c	A few new gen 9 move animations (#3989) ... * A few new gen 9 move animations * draco meteor anim tmp * applied suggestions * fix compile * add more crystals to ice spinner * further fixes --------- Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>	2024-01-16 19:33:49 -07:00
Alex	8f99ef16be	Adds Move Psychic Noise (#4005) ... * Adds Move Psychic Noise * changes psychic noise from effect to move_effect * remove leftover --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-01-16 22:52:56 +01:00
psf	cdf7190d15	Add pluralName to gItems to allow the proper spelling when multiple items are received at once (#4001) ... * Updated CopyItemNameHandlePlural to deal with plural names * Fixed whitespace in a few places * Fixed whitespace in a few places * Add remaining plural forms. * Created ITEM_NAME_PLURAL_LENGTH * Updated ITEM_NAME_PLURAL_LENGTH per feedback https://github.com/rh-hideout/pokeemerald-expansion/pull/4001\#discussion_r1453598165 * Reverted ITEM_NAME_PLURAL_LENGTH to +2 and added new comment * Removed GetBerryCountString from CopyItemNameHandlePlural Will deprecate the former in a future feature: https://github.com/rh-hideout/pokeemerald-expansion/issues/4010 --------- Co-authored-by: Zimmermann Gyula <graiondilach@hotmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-01-16 19:05:41 +01:00
Bassoonian	9a1f6dfb64	Allow one-mon double battles (#4007) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-01-16 18:24:49 +01:00
Frank DeBlasio	0bdac90cfe	Refactor mugshots (#4000) ... * Refactor battle mugshots The battle mugshot transitions have been merged into the one transition id and are now loaded depending on the trainer data. Two new fields have been added to struct Trainer; mugshotEnabled and mugshotColor. mugshotEnabled is the toggle for loading the mugshot transition when set to TRUE and mugshotColor is the color of the mugshot for that particular trainer. The Elite Four and Champion have been updated so their mugshots are correctly loaded when you battle them. A bug has also been fixed where if the player starts on a tile that has an active field effect, the player's sprite will use the palette of the opponent's sprite. * Added a new folder in src/data named battle_transitions. The two look ups for the opponent rotation scaling and coords have been put into their own files and added into this new folder. The coords look up has also been changed to use the struct. * Fixed errors with modern that were preventing compile * Added mugshot coords to gTrainerSprites * Added rotation scales to gTrainerSprites * Replaced tabs with spaces * Incorporated comments * Added battle_transition include back to data.c * Fixed alignment issues in Mugshots_CreateTrainerPics --------- Co-authored-by: pkmnsnfrn <pkmnsnfrn@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-01-16 00:45:13 +01:00
Bassoonian	e8a238a775	Exp yield configs (#3995) ... * Gen 1 exp yield config * I'm a dumdum * Gen 2 configs * Exp yield configs up to gen3 * Gen 4 configs * Gen 5 configs * Configs up to gen6 * Gen7 configs * Final form exp adjustments	2024-01-15 23:49:12 +01:00
Alex	f6c08c08b6	Fix item usage in double battles (#3977) ... * Fix item usage in double battles * fix failing tests --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-15 21:55:35 +01:00
psf	bf8b09b1b6	Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) ... * Emptied out item_ball_scripts Added GetObjectEventTrainerRangeFromTemplate Added Common_EventScript_FindItem * Replaced trainer_sight_or_berry_tree_id with item constant Replaced scripts with Common_EventScript_FindItem * Renamed to GetItemBallIdAndAmountFromTemplate Moved to item_ball.c * Updated ObjectEventTemplate * Updated inc files to support plural item names * Refactored CopyItemNameHandlePlural to handle all items * Change failsafe in GetItemBallIdFromTemplate to be ITEM_NONE + 1 instead of ITEMS_COUNT * Converted spaces to tabs https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415663 https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415525 https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415409 https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415130 * Added warning on object_event macro to prevent silent failure Reverted global.fieldmap to original state, per feedback --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-01-14 21:35:45 +01:00
LOuroboros	80ffaa5e2c	Raised the limit of max items per stack to 999 (#3923) ... * Expanded the amount of max items per stack from 99 to 999 * Set Battle Pyramid Bag stack limit back to 99 This commit exists for archival purposes. People who may want to set the limit of item stacks in the Battle Pyramid's bag to 999 can refer to its code diff. * Reintroduced the Battle Pyramid changes through a MAX_PYRAMID_BAG_ITEM_CAPACITY constant * Gave 3 digit support to the Battle Pyramid's bag * Rewrote the comment for MAX_PYRAMID_BAG_ITEM_CAPACITY * Made DebugAction_Give_Item_SelectQuantity use MAX_ITEM_DIGITS * Ditched BERRY_CAPACITY_DIGITS and BAG_ITEM_CAPACITY_DIGITS * Removed MAX_BERRY_CAPACITY No point in keeping it if we're making all item stacks cap at 999. * Applied review corrections * Removed pointless local var in DebugAction_Give_Item_SelectQuantity * Defined a MAX_PYRAMID_ITEM_DIGITS * Cleaned up some of the functions in which MAX_ITEM_DIGITS is used Summary: -Removed pointless local variables in CheckBagHasSpace, AddBagItem, PrintItemQuantity and PrintItemSoldAmount. -Removed pointless brackets in an if statement of CheckBagHasSpace. -Initialized the pocket local variable of CheckBagHasSpace from the get go to save a few lines too. --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-14 16:32:38 -03:00
Bassoonian	4846e2a884	Add updated EV configs (#3993) ... * Add updated EV configs * Fix Misdreavus ternary	2024-01-14 15:26:34 +01:00
Eduardo Quezada D'Ottone	9445953833	Moved Item Effects to gItems (#3991) ... * Moved Item Effects to gItems * Removed redundant item effects --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-01-14 10:03:48 +01:00
Eduardo Quezada D'Ottone	ff0aed31b3	Removed some hardcoded move IDs (#3982) ... * Removed EFFECT_HURRICANE in favor of using EFFECT_THUNDER * Added EFFECT_BLIZZARD * Helping the IDE a little * Added EFFECT_RAIN_ALWAYS_HIT for Forces of Nature moves * Removed MOVE_SELF_DESTRUCT and MOVE_EXPLOSION hardcoding * Removed EFFECT_FRUSTRATION hardcoding MOVE_SELF_DESTRUCT * Cleaned up sPoints_MoveEffect * Removed MOVE_AURA_WHEEL and MOVE_PRESENT hardcoding * Fixed compile	2024-01-12 22:41:46 +01:00
Eduardo Quezada D'Ottone	e5b58b04b6	Renamed healBlockBanned to healingMove (#3981) ... * Renamed healBlockBanned to healingMove * Fix fix	2024-01-12 18:41:45 +01:00
Biffalo XIII	a89f1eeb50	Revert "healBlockBanned -> healingMove (#3976)" ... This reverts commit a947b20f31.	2024-01-12 12:10:59 -03:00
Nephrite	1ced2bf324	Converted EFFECT_x defines to enum (#3975) ... follow up PR Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-12 07:30:58 -03:00
kittenchilly	a947b20f31	healBlockBanned -> healingMove (#3976)	2024-01-12 01:05:26 +01:00
Biffalo XIII	2cc26d935a	Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # data/battle_scripts_1.s # include/config/pokemon.h # src/birch_pc.c	2024-01-11 19:51:11 -03:00
Nephrite	f6efc75c1a	Move functions to battle_ai_util.c	2024-01-12 04:01:33 +09:00
Nephrite	baefa08bee	Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul	2024-01-12 03:13:42 +09:00
Nephrite	a76e3c70ba	Applied more review fixes	2024-01-12 03:02:48 +09:00
Nephrite	3c93f97166	Apply suggestions from code review ... Thanks, Edu Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-12 02:13:55 +09:00
Bassoonian	a8a504ef25	Refactor dex completion (again) (#3937) ... * Refactor dex completion * Incorporate Alex's requests * rename to dexForceRequired * Revert GetPokedexRatingText argument type * Apply suggestions from code review Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Revert "Revert GetPokedexRatingText argument type" This reverts commit a9b0c280409196ee0e6cfe170104f45d9e0168a7. * Fix HasAllMons * Fix oops --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-11 13:35:31 -03:00
Bassoonian	ce48616477	Add power item config (#3961)	2024-01-11 09:34:19 +01:00
Nephrite	c4616739d8	Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul	2024-01-11 00:35:35 +09:00
Nephrite	67e76f2b59	Some more review fixes + Fling fix ... Not the ideal solution but Fling now has a hardcoded check for Shield Dust and acts accordingly - a better long term solution inolves making a bunch of reusable MOVE_EFFECTS and rejigging attackcanceler but I didn't feel like doing that today...	2024-01-11 00:27:06 +09:00
Alex	4dc1b1dda3	Revert "Update catch curve for pokeballs (#3685)" (#3955) ... This reverts commit 929ec54a39.	2024-01-09 21:20:51 -03:00
Alex	c56acb944b	New Feature: Level Caps (#3632) ... * New Feature: Level Caps * B_LEVEL_CAP_EXP_UP and fixes * 1 exp fix for hard level caps * remove 1 exp hack * Reviews applied * fix u8/u16 --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-01-09 18:47:23 +01:00
Alex	5498098438	Syrup Bomb / Sticky Syrup addition (#3948) ... * Syrup Bomb / Sticky Syrup addition * Update test/battle/move_effect/syrup_bomb.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update src/battle_script_commands.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-01-09 13:37:07 +01:00
Biffalo XIII	4a3954ff34	Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/birch_pc.c # src/main.c	2024-01-09 09:19:12 -03:00
Ariel A	85aab338a9	Merge branch 'guillotine' into guillotine-expansion	2024-01-08 19:43:06 -05:00
Bassoonian	d73c9b0b9d	Fix some ball multiplier configs (#3939) ... * Fix some ball multiplier configs * Updated the comment of B_LURE_BALL_MODIFIER * Specified the effects of B_LURE_BALL_MODIFIER in itsa state its effects in a more specific manner Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Corrected the comments of B_DREAM_BALL_MODIFIER, B_SPORT_BALL_MODIFIER and B_SAFARI_BALL_MODIFIER Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Turned the ternaries in the case for the Lure Ball's catch rate in Cmd_handleballthrow into a regular if/else if statement Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> --------- Co-authored-by: LOuroboros <lunosouroboros@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2024-01-08 18:26:05 -03:00
Ariel A	1ce961768e	Added automatic runtime decapitalization.	2024-01-07 20:21:14 -05:00
Bassoonian	7b0904c580	Fix extended berry stage palettes	2024-01-05 11:32:59 +01:00
Bassoonian	f9c21afb75	Dynamic regional dex rating (#3900)	2024-01-05 09:47:28 +01:00
Bassoonian	418e551960	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion	2024-01-05 00:32:21 +01:00
BiffaloXIII	8b80a54a7a	Removed footprint field when P_FOOTPRINTS is FALSE (#3925)	2024-01-04 21:54:03 +01:00
Bassoonian	1ee568ac6b	Remove leftover code for myself	2024-01-04 16:12:39 +00:00
Bassoonian	b948accc80	Remove redundant table	2024-01-04 16:07:12 +00:00
Bassoonian	b56a9e6286	Remove unused function	2024-01-04 16:04:00 +00:00
Frank DeBlasio	4d5c572d0c	Refactor trainer classes (#3875) ... * Created TrainerClass struct * Added money multiplier to TrainerClass struct * Added Poke Balls to struct * Condensed gTrainerClasses * Simplified trainer Poke Balls * Moved trainer classes into battle_main.c * Removed complicated ball macro --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-01-04 13:30:42 +01:00
Bassoonian	f94e65a400	Footprint config (#3902) ... * Footprint config * Don't enable by default	2024-01-03 21:24:45 +01:00
Alex	34f51da5f8	Merge branch 'upcoming' into feature/dynmulti-expansion	2024-01-03 15:54:39 +01:00
ghoulslash	91dfa93d3b	fix genie storm move anims for both targets, add AnimEllipticalGustCentered, AnimParticleInVortex handles multiple targets, add dynamic pals based on move target in UnpackSelectedBattlePalettes (#3895) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-01-02 23:46:07 +01:00
aronson	3c21e23555	Allocate initialized sections for EWRAM and IWRAM (#3892)	2024-01-02 14:24:52 +00:00
Martin Griffin	d1ab525552	Revert "Allocate initialized sections for EWRAM and IWRAM (#3877)" (#3891) ... This reverts commit f24deb9301.	2024-01-02 13:54:42 +00:00
aronson	f24deb9301	Allocate initialized sections for EWRAM and IWRAM (#3877)	2024-01-02 13:46:01 +00:00
Nephrite	59d76c9321	A few fixes, added effects for Meteor Beam/Electro Shot	2024-01-02 20:27:50 +09:00
Nephrite	4556ecc71e	Removed PRIMARY/SECONDARY macros; added flags ... Just a couple for now; cleaned up parts of setadditionaleffects	2024-01-02 20:06:49 +09:00
Nephrite	ab75ad6d02	Ability flags update (#3886) ... * Added five ability flags Omitted duplicate flags that are basically "can't copy" (Role Play, Receiver, Entrainment, Skill Swap), didn't bother adding Neutralizing Gas flag, * Mold Breaker and Trace * Gastro Acid, Simple Beam, Worry Seed Decided to keep the Simple Beam/Worry Seed functions * Entrainment done * Skill Swap * Doodle/Role Play + flag descriptions Also adjusted Doodle test * Wandering Spirit, Mummy, Neutralizing Gas Neutralizing Gas really only needs to check for other mons with Neutralizing Gas, otherwise unsuppressable abilities are handled separately. * Renamed flags	2024-01-01 15:03:34 +01:00
Nephrite	0980253cce	Merge branch 'upcoming' into secondary_effects_overhaul	2024-01-01 20:40:11 +09:00
kittenchilly	f6f287d637	Add Indigo Disk Pokemon data (#3878) ... * Archaludon? * more archuladon stuff * Hydrapple and Gouging Fire * Raging Bolt * Iron Boulder and Iron Crown * Terapagos * Pecharunt * Update gen_9.h * Pokedex orders	2024-01-01 01:38:50 +01:00
Nephrite	923d22b42b	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into secondary_effects_overhaul_merge	2024-01-01 03:50:36 +09:00
Ariel A	98221c4f70	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-12-31 02:48:37 -05:00
Ariel A	398a9ee8fa	Merge branch 'followers' into followers-expanded-id	2023-12-31 01:49:56 -05:00
Ariel A	72c81db042	Merge branch 'followers' into lighting	2023-12-31 01:45:07 -05:00
Ariel A	7d7531f2fa	Merge branch 'master' into followers	2023-12-31 01:28:27 -05:00
Ariel A	dcaaac92d9	Added support for compressed OW graphics. ... Added CpuSmartCopy macros (Credit: luckytyphlosion)	2023-12-31 00:35:27 -05:00
Alex	15fa85ca2f	Merge branch 'upcoming' into feature/dynmulti-expansion	2023-12-31 00:16:44 +01:00
Bassoonian	a32e2ccc88	Move Ability AI scores to gAbilities (#3862) ... * Ability refactor * Adds abilities to RHH rom header * Move Ability Ratings to gAbilities * Add previously unknown ai ratings --------- Co-authored-by: Martin Griffin <martinrgriffin@gmail.com> Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>	2023-12-30 23:07:18 +01:00
DizzyEggg	726c6f48e3	Fix weird stat drop anim (#3870) ... * Fix weird stat drop anim * PACKED define	2023-12-30 22:53:46 +01:00
DizzyEggg	b83b1f7e88	Merge branch 'upcoming' into feature/dynmulti-expansion	2023-12-30 22:41:59 +01:00
Bassoonian	9e051aa058	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears	2023-12-30 20:49:05 +01:00
Alex	cc32e378d6	Adds some Indigo Disk moves (#3853) ... * Burning Bulwark * Fickle Beam * Alluring Voice * Electro Shot * forgot sheer force flag for alluring voice * review changes * additional alluring voice test * Simple Allruing Voice animation * Update battle.h --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-30 20:20:12 +01:00
Nephrite	9dfa0d264f	Merge branch 'upcoming' into secondary_effects_overhaul	2023-12-30 23:54:01 +09:00
Nephrite	60a0020833	Tweaked macro to be more appealing	2023-12-30 20:41:29 +09:00
Nephrite	ff51eb2b6c	Removed unused move effects, various ids, and one script command	2023-12-30 20:35:48 +09:00
Nephrite	e34373effc	Renamed seteffectwithchance to setadditionaleffects ... Function no longer has ability to apply effects from moveEffect - for that, seteffectprimary or secondary is now recommended. Removed EFFECT_RAMPAGE, updated a few tests	2023-12-30 20:29:09 +09:00
kittenchilly	66a638f7b4	Change Ivy Cudgel to be based on Ogerpon form rather than held item (#3865) ... * Change Ivy Cudgel to be based on Ogerpon form rather than held item * Update ivy_cudgel.c * Address reviews * Update test/battle/move_effect/ivy_cudgel.c --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-30 11:40:58 +01:00
Martin Griffin	ed850d3f6c	VSync BENCHMARKs and avoid AdvanceRandom in tests (#3866)	2023-12-30 11:10:40 +01:00
Martin Griffin	515aa367bf	VSync BENCHMARKs and avoid AdvanceRandom in tests (#3867)	2023-12-30 11:10:21 +01:00
Nephrite	b6da1a1e1d	Tweaked helper functions	2023-12-30 17:42:53 +09:00
Nephrite	f5ae8e0686	Rapid Spin uses additional effects + test	2023-12-30 17:02:59 +09:00
Nephrite	e7de08eca2	Unified Sonic Boom & Dragon Rage ... Not really in scope, but what the hell	2023-12-30 15:40:50 +09:00
Martin Griffin	ab900e38df	Merge remote-tracking branch 'rhh/master' into upcoming	2023-12-29 19:48:21 +00:00
Bassoonian	1662dc3478	Merge branch 'upcoming' into berryexpansion	2023-12-29 14:32:10 +01:00
Bassoonian	6bc0bf9f8b	Ability refactor (#3861) ... * Ability refactor * Adds abilities to RHH rom header --------- Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2023-12-29 14:25:24 +01:00
Nephrite	39773c0659	Burn Up and Double Shock ... Both working by applying an additional effect; added a generic "jumpifnotcurrentmoveargtype" type command to make it possible, relpacing secret power's function	2023-12-29 12:44:38 +09:00
Nephrite	7c38056da7	Review fixes ... Added more move effect considerations to AI; redid way it calculates secondaryEffectChance; misc fixes	2023-12-29 12:04:42 +09:00
Bassoonian	bc4d4d21e4	Fix 3851 (#3857)	2023-12-29 00:33:18 +01:00
Eduardo Quezada D'Ottone	0a40cd15d1	Non-tagged release	2023-12-28 19:54:06 -03:00
Bassoonian	d3f971f0e8	Version 1.7.1 (#3855)	2023-12-28 19:50:21 -03:00
kittenchilly	94a650a203	Add Fillet Away + Belly Drum tweaks (#3616) ... * Add Fillet Away * Fillet Away and Belly Drum tests * More tests * Update fillet_away.c * Update fillet_away.c * Newlines * Update battle_scripts_1.s * Update belly_drum.c * Address reviews * Fix order * Swords Dance assume * Update belly_drum.c * Try some stuff * Fix hp not being halved in certain cases * Update battle_scripts_1.s * AI stuff	2023-12-28 23:27:09 +01:00
kittenchilly	1e958ada8c	Add Indigo Disk item data (#3854)	2023-12-28 23:00:34 +01:00
Nephrite	417a02c95e	Fixed Make it Rain ... To do: misc fixes here and there, maybe do Burn Up/Double Shock, Dragon Rage/SonicBoom...	2023-12-29 01:40:43 +09:00
Bassoonian	fde3fc0a52	Metronome move fix (#3852) ... * Draft Indigo Disk move data * Add basic defines (flags, targets and priority missing) * Update move flags * Temper Flare is Stomping Tantrum * Fix failing tests * Disable Burning Bulwark for now	2023-12-28 16:57:29 +01:00
Bassoonian	bc3737772a	Define new abilities (#3838) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-28 12:33:29 +01:00
Bassoonian	872ddf32c6	The Indigo Disk Moves (#3704) ... * Draft Indigo Disk move data * Add basic defines (flags, targets and priority missing) * Update move flags * Temper Flare is Stomping Tantrum * Forgot to push, please squash :D * Fix failing tests	2023-12-28 12:21:52 +01:00
kittenchilly	28f17772ec	Implement Pokemon Box Link functionality (#3837) ... * Implement Pokemon Box Link functionality * Update item_use.c * Update item_use.c * Can only use box link if the map allows escape * Revert "Can only use box link if the map allows escape" This reverts commit be5b46b6c4420cd350ac1932d4c3562f7bfbebe5. * Overworld_IsEscapingAllowed --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-28 11:47:00 +01:00
Bassoonian	88b0bd6394	Add gen9 item prices + configs (#3834) ... * Add gen9 item prices + configs * Adjust gen 1 PP item costs --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-27 22:48:56 +01:00
Martin Griffin	3ad66028e9	Backwards-compatible BoxPokémon Refactor (#3438) ... * Check progress in non-battle PARAMETRIZEd tests * Overworld Script Tests * Backward-compatible BoxPokemon Refactor Reuses space that contains zeros to provide space for: - HP/status in the box - 12-character nicknames - Up to 63 PokéBalls - Shininess separate from PID - Hidden Nature - Hyper Training - Dynamax Level - Gigantamax Factor - Terastallization Types - Shadow Implements: - OW_PC_HEAL to switch between Gen7- and Gen8+ behavior - Nature Mints - Dynamax Candy - Hyper Training commands (canhypertrain/hypertrain) - Gigantamax Factor commands (hasgigantamaxfactor/togglegigantamaxfactor) - Terastallization Type on the summary screen - Prevents Gigantamax Factor Pokémon from evolving into a species without a Gigantamax form * fixup! Backward-compatible BoxPokemon Refactor * displaydexinfo fix from Jasper	2023-12-27 17:48:17 +01:00
Bassoonian	a4b819ac41	Merge branch 'upcoming' into berryexpansion	2023-12-27 14:00:12 +01:00
ghoulslash	a9d6832908	Separate AI flags by battler position (#3003) ... * ai flags by battlerId * fix recoded battle saved ai flags * update aiFlags check in OpponentHandleChoosePokemon * add header for TRAINER_CUSTOM_PARTNER define * initialize flags in BattleAI_SetupAIData * fix usage of TRAINER_CUSTOM_PARTNER * remove whitespace --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-12-27 13:54:37 +01:00
Nephrite	77c722ea09	Obsoleted 22 more effects ... Also added a better way of calculating battle_tv score properly; to do: Make it Rain	2023-12-27 17:43:20 +09:00
sbird	c27ea10eb1	Merge branch 'feature/dynmulti' into feature/dynmulti-expansion	2023-12-26 14:22:49 +01:00
Nephrite	cd5c59ae5a	Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul	2023-12-26 13:19:10 +09:00
Nephrite	c5061f0161	Updated remaining moves which use secondaryEffectChance ... secondaryEffectChance is no longer considered anywhere in the code; tidied up scripts and more	2023-12-26 13:12:11 +09:00
Nephrite	76b4e08e5e	Trapping moves, Secret Power, rampage moves ... Also tidied up a lot of #ifs and commas in battle_moves.h	2023-12-26 10:46:11 +09:00
Nephrite	b0b9883625	Removed unused effects + fixed tests + removed secondaryEffectChance ... To do: remaining moves that make use of `secondaryEffectChance` field	2023-12-25 12:53:15 +09:00
Nephrite	f3e67cf543	Removed all unused effects ... Some util updates	2023-12-25 12:32:13 +09:00
Nephrite	cda445c2f5	Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul_rebase	2023-12-25 12:19:38 +09:00
Alex	1339256d5d	Adds Ability Hospitality (#3818) ... * Adds Ability Hospitality * fix agbcc	2023-12-25 01:43:57 +01:00
Bassoonian	c47a20a446	Fix gem boost description + test (#3817)	2023-12-25 01:14:01 +01:00
Bassoonian	77f0ab88d4	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion	2023-12-24 23:17:58 +01:00
Bassoonian	c115649349	Fix 6 stage Berry trees not growing properly	2023-12-24 23:08:15 +01:00
LOuroboros	58b03cb3bd	Implemented a CannotUseItemsInBattle function (#3524) ... * Implemented a CannotUseItemsInBattle function This fucntion is the result of merging CannotUseBagBattleItem and CannotUsePartyBattleItem. No reason to split the work between 2 functions when you can do it all with just 1. Misc. Changes: -Turned most of the if statements inside the function into "else if" statements for performance reasons. -Refactored how the local variable "cannotUse" was used turning it into a bool. * Made CannotUseItemsInBattle use a switch statement Misc. Changes: -Removed pointless parentheses from case EFFECT_ITEM_SET_FOCUS_ENERGY -Removed pointless i loop variable from case EFFECT_ITEM_INCREASE_ALL_STATS and replaced a hardcoded 1 in its for loop. -Turned the i loop variable declared at the top of the function into a u32 variable -Removed pointless comments. The EFFECT_ITEM constants are readable enough to convey what sort of items they affect. --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-24 22:10:01 +01:00
Nephrite	e87fe533c3	Superpower, CC, Hammer Arm	2023-12-24 23:43:12 +09:00
Nephrite	a8967da1c5	Overheat (and clones) ... Also, Syrup Bomb (really weird script)	2023-12-24 23:27:21 +09:00
Nephrite	a244d7b8b6	Updated moves that raise the target's own stats ... To do: moves like CC, Overheat that LOWER stats; did NOT remove the effect for raising all stats due to an AI function	2023-12-24 22:55:53 +09:00
Zimmermann Gyula	f700466e8d	Implement optional Gen1 type immunity logic. (#3627) ... * Implement optional Gen1 type immunity logic. * Add tests against Gen1 burn, freeze and paralysis. * !fixup Expand tests with Gen1 paths. * Fixup tests. Remove superflous defines. Explicitly ASSUME used move type and effect. * Fix flipped definitions on Freezing Glare test. --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-23 16:34:24 +01:00
Alex	61e6365470	Fixes Photon Geyeser category + minor AI calc fixes (#3807)	2023-12-23 12:31:40 +01:00
Bassoonian	db0a9484ae	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion	2023-12-23 00:39:10 +01:00
DizzyEggg	1a7166c2bb	Tests do not allow to use SEND_OUT if the chosen mon is fainted (#3752) ... * Tests dont allow to send out pokemon with 0 hp * remove test test * handle in-game 0 hp sent out --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-23 00:27:40 +01:00
tertu	fb28ce50ae	Optional high-quality RNG (#3780) ... High-quality RNG, behind the HQ_RANDOM flag, enabled by default Makes the shuffle test error a bit more tolerant	2023-12-22 17:39:15 +00:00
kittenchilly	505b8b63eb	Add Doodle + update ability banlists (#3609) ... * Add Doodle * Doodle test * Oops * Update battle_util.c --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-22 16:45:55 +01:00
DizzyEggg	cd0b4db09b	same lists for healing moves (#3787) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-21 14:07:54 +01:00
fakuzatsu	2af6d65893	added ability to set flags in tests (#3786)	2023-12-21 13:01:13 +00:00
DizzyEggg	fcdc515be2	Fix rain dance/sunny day not blending opponent sprite (#3785)	2023-12-21 13:17:05 +01:00
DizzyEggg	698e69f2b3	add emitResult argument to ShouldSwitch AI functions (#3784)	2023-12-21 11:40:04 +01:00
Frank DeBlasio	5cdee87489	Refactor Trainer sprites (#3597) ... * Added TrainerSprite struct with coordinates * Added .frontPic to struct * Added .palette to TrainerSprite struct * Added .animation to the struct * Added define for sprite size * Condensed animations since they were all the same * Improved TRAINER_SPRITE/PAL defines * Simplified seemingly unused .y_offset and TRAINER_PIC_SIZE values * Condensed TRAINER_SPRITE and TRAINER_PAL into TRAINER_PIC * Renamed .size to .y_offset since that what it appears to actually be * Moved y_offset into TRAINER_PIC * Moved animation inside of TRAINER_PIC * Added array number to preproc * Removed trailing spaces * Added sprite/palette files to preproc * Revert adding sprites to preproc as it fails agbcc This reverts commit dce57f8d1bfab70b4c6630a9c4e5b43495891459. * Added backsprite struct * Added animations to backsprite struct * Changed TRAINER_PIC to TRAINER_SPRITE * Added animation to backsprite preproc * Added .backPic to struct * Moved array number into backsprite preproc * Removed definitions for trainer sprites * Hardcoded sAnims_Trainer into struct since every sprite uses it * Fixed TRAINER_SPRITE arguments	2023-12-20 23:14:33 +01:00
Martin Griffin	3a5ca6f8f0	Small test runner improvements (#3761) ... * u16 for FunctionTest PARAMETRIZE * Speed up CB2_TestRunner * Use DACS to handle illegal instructions DACS is available in mgba from 44e074a15e This is not 0.10.2, but will presumably be available in the next release. Alternatively, a GBA BIOS could be used. --------- Co-authored-by: DizzyEggg <jajkodizzy@wp.pl> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-20 17:33:45 +01:00
Nephrite	1708c80200	Removed ALWAYS_CRIT, renamed critBoost (#3779) ... Replaced ALWAYS_CRIT with an alwaysCriticalHit flag to account for the fact that in earlier generations, there is no crit stage at which crits are guaranteed. Renamed critBoost to criticalHitStage (at Edu's prompting). Reorder .criticalHitStage defines in battle_moves.h to be aligned with struct order.	2023-12-20 16:16:02 +01:00
DizzyEggg	6137db102e	Ally Switch (#3533) ... * ally switch move animation * Ally Switch anim done * ally switch test and improve animation * derp * add ally switch known failing test for ally targeting moves * moves which targetted ally fail after ally switch * ally switch works like protect --------- Co-authored-by: root <root@LAPTOP-3SNV7DEQ> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-20 15:26:28 +01:00
DizzyEggg	8d238c88b9	Follow -1, 1, 0 convention for comparision functions (#3777) ... * change comparision functions to use -1, 1, 0 * m	2023-12-20 14:47:14 +01:00
Martin Griffin	50cbcebc81	Merge remote-tracking branch 'rhh/master' into upcoming	2023-12-20 12:56:35 +00:00
Alex	1e25b53433	Partner Battle refactor (#3592) ... * Partner Battle refactor * fix for steven id * clean up * Use trainer partner names for id * removed testing leftover * comment change * more review changes * fix compiling * remove partener count --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-20 12:38:28 +01:00
Alex	069769710b	Fixes Item Metronome damage (#3767) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-20 11:24:12 +01:00
Eduardo Quezada D'Ottone	442620cf6b	Renamed Battle Move "Split" to the proper "Category" (#3774)	2023-12-20 10:08:26 +01:00
Martin Griffin	13a4bf5838	Merge remote-tracking branch 'rhh/master' into upcoming	2023-12-19 18:08:13 +00:00
kittenchilly	c16d85e497	EXPECT_MUL_EQ thresholds are always ±1	2023-12-19 09:21:18 -06:00
Nephrite	4a1a6c5625	Battlemove refactored (recoil, crit and Z moves) (#3575) ... * Unified EFFECT_RECOIL Combined EFFECT_RECOIL_25/33/50/33_STATUS into a single EFFECT; added an extra field to BattleMove 'secondaryData' that contains the franction of HP recoil; argument still holds status effect for Flare Blitz/Volt Tackle * BattleMove struct change Added critrate, recoil, multihit fields, made zMove into a union of effect/powerOverride for status/non-status moves respectively. Added new recoil field and zMove field to all moves. To-do: crit rate, multihit * Critrate field added Moves use a critRate field instead of a flag - obsoletes EFFECT_ALWAYS_CRIT * Just a little define Makes clear that critBoost = 3 means ALWAYS CRIT * Added a proper recoil field Just to make it unambiguous and flexible - can finally have a move with 69% recoil. * Fixed AI damage calculation for multi-strike moves * Fixes + removed unused effects * Tests fixes Two to fix: pass when run in isolation but not when the whole group is run, which is annoying... * Minor fixes * Minor tweaks * Fixed move effects * recoil tests --------- Co-authored-by: Alex <alexthenotes@gmail.com>	2023-12-19 16:10:07 +01:00
Eduardo Quezada	ce03d49d35	Forgot to disable EXPANSION_TAGGED_RELEASE	2023-12-18 16:27:12 -03:00
DizzyEggg	59a159c338	Fix Ice Face ignoring move effects (#3755) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-18 16:02:07 +01:00
Eduardo Quezada	1b586e78a3	Version 1.7.0	2023-12-17 18:18:54 -03:00
Eduardo Quezada	d92c046a80	Merge branch 'RHH/master' into RHH/upcoming	2023-12-17 17:31:10 -03:00
DizzyEggg	76a7513dcd	Fix Magician Life orb recoil when stealing (#3753) ... * Fix Magician Life orb recoil * get rid of unneeded assume	2023-12-17 19:50:43 +01:00
Eduardo Quezada D'Ottone	df1a8a25cb	Reserved remaining form ID that are left to support (#3750) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-17 09:22:33 -03:00
ghoulslash	3209cb0dc9	Merge branch 'upcoming' into regression	2023-12-16 07:39:08 -05:00
Alex	cdeb43228d	Use battler turn damaged	2023-12-16 09:33:45 +01:00
Eduardo Quezada	fbbee39886	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # src/battle_main.c	2023-12-15 18:50:20 -03:00
Bassoonian	0fd08a32ac	Add status form change	2023-12-15 11:17:35 +01:00
Alex	be045fdc0c	Fixes Quick Draw (#3724) ... * Fixes Quick Draw * Fixes Custap and rest of Quick Draw * review applied	2023-12-15 00:03:59 +01:00
Alex	38c61854e6	Changed Ivy Gudgel effect (#3721) ... * Change Ivy Gudgel effect * test assumptions --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-14 18:09:06 +01:00
Bassoonian	02ca83cc81	The Indigo Disk Item/Move/Ability ids (#3727) ... * Reserve ability ids * Reserve item ids (base64 encoding for reference) * Reserve move ids --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-14 16:06:11 +01:00
Eduardo Quezada D'Ottone	78fda2c19d	Reserved Species IDs for Indigo Disk (#3726)	2023-12-14 12:53:51 +01:00
Eduardo Quezada D'Ottone	9bb95d506e	Reserved dex flag space for Indigo Disk mon (#3725)	2023-12-14 11:24:11 +01:00
Eduardo Quezada D'Ottone	996009e8ef	Fixed compile when setting everything to GEN_1 (#3723)	2023-12-14 00:24:31 +01:00
Zimmermann Gyula	ba2bb4f07f	Use the same relative gBattleTextBuff3 declaration in both definitions. (#3719) ... Compare against https://github.com/rh-hideout/pokeemerald-expansion/blob/upcoming/src/battle_main.c#L135.	2023-12-13 18:49:25 +01:00
Zimmermann Gyula	a68cf9f4dc	Fix Vs Seeker description. (#3718)	2023-12-13 18:05:37 +01:00
Zimmermann Gyula	bbc29fff0d	Fix a copypaste error and a typo in config. (#3717)	2023-12-13 17:39:26 +01:00
Bassoonian	6365431122	Add PokéNav too	2023-12-12 23:20:22 +01:00
Alex	1f51ff8dfb	Add Gen5 Imprison config (#3710) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-12 19:06:24 +01:00
Bassoonian	e5ac2fe0b1	Clean up pokemon/ball/dex mentions in comments	2023-12-12 19:02:36 +01:00
AtariDreams	929ec54a39	Update catch curve for pokeballs (#3685) ... Since Gen 6, the capture rate curve was changed to make pokeballs more effective on lower level pokemon It's by 65536 divided by 255 to the power of(1/5.33) and I did the work of translating that so a rough approximation can be done in integers, and so far, it seems to work close enough. I use this in my romhack for months now and it works fine.	2023-12-12 16:25:33 +01:00
Alex	44e81d4f4c	Gen 9 configs for Protean/Libero, Intrepid Sword and Dauntless Sword (#3614) ... * Gen 9 configs for Protean/Libero, Intrepid Sword and Dauntless Sword * use bitfield * battler fix * fields	2023-12-12 00:08:44 +01:00
Eduardo Quezada D'Ottone	26a8c2a5a9	Fixed FORM_CHANGE_ITEM_USE_MULTICHOICE documentation (#3700) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-11 22:23:27 +01:00
LOuroboros	ed3e944870	Added a GetSpeciesPreEvolution function and fixed EVO_NONE value (#3696)	2023-12-11 13:54:34 -03:00
Martin Griffin	ee1fb1d454	SpeciesInfo tests (#3688) ... * Remove unnecessary const * Test that species ID tables are shared between all forms * Use P_FAMILY_MELTAN * Test that form change tables contain only IDs in form species tables * Fix isPrimalReversion typo * Test form change targets have appropriate species flags * Fix #3689	2023-12-11 13:54:20 +01:00
Bassoonian	ec9cc9a443	Config for trying to catch a Trainer's Pokémon (#3684) ... * Config for trying to catch a Trainer's Pokémon * Prevent removal instead of adding it back	2023-12-11 00:05:39 +01:00
Eduardo Quezada	b2917fac5d	Merge remote-tracking branch '_RHH_origin/master' into RHH/upcoming ... # Conflicts: # include/constants/battle_script_commands.h # src/battle_script_commands.c	2023-12-10 14:29:42 -03:00
Eduardo Quezada	ce7fe75ac1	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/pret_20231210 ... # Conflicts: # src/data/pokemon/species_info.h	2023-12-10 13:49:55 -03:00
Eduardo Quezada	1fc712f153	Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210 ... # Conflicts: # Makefile # data/battle_scripts_1.s # gflib/malloc.c # gflib/malloc.h # include/battle.h # ld_script.ld # ld_script_modern.ld # src/battle_ai_script_commands.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/species_info.h # src/pokemon.c	2023-12-10 13:27:09 -03:00
Alex	628eb95925	Adds Rage Fist (#3573) ... * Adds Rage Fist * Fix initial implementation * fix merge * review changes * endure test * add field enduredDamage * rage fist: transform, disguise and field change * merge fix	2023-12-10 12:33:25 +01:00
Alex	d5f3df6f08	Fix Defog and Prevent Escape effects (#3668) ... * Fix Defog and Prevent Escape effects * pain split / mirror coat interaction * remove unused various define * use pain split effect * remove test	2023-12-10 00:26:03 +01:00
Eduardo Quezada D'Ottone	2a329cacf7	Fixed non-HGSS dex showing 4 digits in list when National Dex is disabled (#3655)	2023-12-08 16:18:00 +01:00
Eduardo Quezada D'Ottone	4adc2dcb16	Species Simplifier™ - Part 3 (#3562) ... * Added SpeciesInfo fields # Conflicts: # include/pokemon.h * Added missing comments * Renamed gigantamax to isGigantamax * Converted species flags to agbcc bit flags * Added padding after flags * Pikachu form config * Dex text * Reordered Paradox flag * Missing Pikachu ifdef comments * Moved P_GEN_x_POKEMON settings to the species_families file * Gen 1 Dex entries * Renamed file to species_enabled.h * Prevent Pokémon from evolving if their evolution is disabled * Prevent Pokémon from being affected by Eviolite if their evolution is disabled * Prevent Pokémon offspring if they're disabled * Corrected imprementation of evolution prevention It could potentially overwrite items by accident * Cross-evo configs * Gen 2 dex entries * Changed cry table to use assignable IDs # Conflicts: # include/pokemon.h * Form table pointers * Beginning support for moving data to gSpeciesInfo * Pokédexes reads text from gSpeciesInfo * Reading species names from gSpeciesInfo * Fixed erroneous copy-paste * Moved Bulbasaur to Raichu Family data do gSpeciesinfo * Added female pic sizes * Macros for Front, Back, Palette and Learnsets * Sandshrew to Dugtrio Families * Obtains Height/Weight from gSpeciesInfo * Read category from gSpeciesInfo * Removed unused data from pokedex_entries.h * Moved Gen 1 data to gSpeciesInfo * Moved Gen 2 data to gSpeciesInfo + fixed Ursaluna Bloodmoon not producing Teddiursa eggs * Moved Gen 3 data to gSpeciesInfo * Moved Gen 4 data to gSpeciesInfo * HGSS dex properly shows form sprites * Fixed data type for GetSpeciesHeight/Weight * Reading Pokédex Size data from gSpeciesInfo * Cleaned up mon graphic decompression function * Reading Front Pics gSpeciesInfo * Reading Back Pics gSpeciesInfo * Updated uses of GetMonSpritePalStruct to allow loading the data directly instead of reading the struct * Reading palettes from gSpeciesInfo * Reading animation delay from gSpeciesInfo * Fixed Pokémon Debug Menu not reading animation delay * Reading front anim Id from gSpeciesInfo * Reading back anim Id from gSpeciesInfo * Reading Animation Frames from gSpeciesInfo * Reading Icon Sprites from gSpeciesInfo * Reading Icon Palette IDs from gSpeciesInfo * Reading Footprints from gSpeciesInfo * Reading Mon Pic sizes from gSpeciesInfo * Separate mon pic sizes for female mon * Reading Level Up Learnsets from gSpeciesInfo * Reading Teachable Learnsets from gSpeciesInfo * Reading National Dex Number from gSpeciesInfo * Reading Enemy Mon Elevation from gSpeciesInfo * Reading Evolutions from gSpeciesInfo * Reading form table from gSpeciesInfo * Fixed button label inconsistency in pokémon debug menu * Reading form change table from gSpeciesInfo * Removed need to define mon graphics in include/graphics.h * Reordered mon graphics by family * Fixed National dex number offset * gFrontierBannedSpecies now checks IsSpeciesEnabled * Added 3 more toggles for Fusions, Primal Reversions and Ultra Burst * Gen 3 & 4 family toggles for dex entries * Fixed missing Mr. Rime data * Gen 1 dex descriptions as compound strings * Gen 2 dex descriptions as compound strings * Gen 3 dex descriptions as compound strings * Gen 4 dex descriptions as compound strings * Fixed compile in agbcc * Moved Gen 5 data to gSpeciesInfo * Using PLACEHOLDER_ANIM_SINGLE_FRAME when needed (same hash) * Renamed PLACEHOLDER_TWO_FRAME_ANIMATION to PLACEHOLDER_ANIM_TWO_FRAMES * Fixed capitalization for front pic anims * Fixed `CanEvolve` * Moved Gen 6 data to gSpeciesInfo * Gen 7 without macros * Gen 8 without macros * Gen 9 without macros * Fixed Gen 9 sound data * Finished moving Gen 7 data in macros (by Alex) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Ultra Necrozma is now included in the fusion forms define * Cries are now properly excluded from the rom when disabling species * Removed P_GEN_x_POKEMON from form_change_tables.h * Fixed Yanmega's cry ignoring the P_GEN_4_CROSS_EVOS setting * Added P_NEW_EVOS_IN_REGIONAL_DEX setting * Automatic ASSUMPTION_FAIL when used species are disabled * Finished moving Gen 8 data in macros (by Alex) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Expanded Alcremie macro * Finished moving Gen 9 data in macros (by Alex) * Fixed missing data for Komala and Marshadow * Form species id tables use family toggles + added missing Ursaluna form species id table * Fixed Genesect palettes * Fixed Flabébé family graphics * Fixed Minior Graphics * Fixed missing Calyrex data * Family toggles in mon graphcis (By Jasper/Bassoonian) Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Fixed missing Ogerpon data * Ordered Level Up Learnsets (missing toggles) Also added White Basculin learnset * Added more Minior synonyms * Fixed enamorus order * Reordered teachable learnsets * Removed sSpeciesXXX level up learnsets + reordered * Removed unneeded assumes * Removed unused extra animations * Family toggles in mon level up learnsets (By Jasper/Bassoonian) Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Fixed Phione graphics inclusion * Family toggles for Teachable Learnsets Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Ordered Front Pic Anims * Family toggles for front pic animations Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Fixed HGSS dex incorrectly showing the wrong mon when catching it * Family toggles for Egg Moves + reodered Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Fixed HGSS not checking for null footprints * Review changes * Fixed Female difference mon not using their macros * Fixed Alcremie Macro * Fixed compile error when disabling the Bulbasaur family * Fixed Turtwig and Chimchar family + Houndour and Mareep cries not being excluded properly * Re-added missing Egg graphical data * Fixed crash during the Birch Intro when Lotad is disabled * Renamed PALLETE to PALETTES * Removed extra spacing for YOffsets * Fixed compile when only disabling cross-gen evolutions * Added Tera Forms define (Ogerpon and Terapagos) * Fixed Necrozma macro * Removed .noFlip = FALSE * Fixed dex number in summary screen for forms when nat dex is disabled * Fixed Paldean form paths --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-12-08 15:05:10 +01:00
Bassoonian	ffb16c0dd5	ORAS drain rate	2023-12-08 12:03:16 +01:00
Bassoonian	6173f9b81d	Add soil moisturing config	2023-12-08 01:01:01 +01:00
Bassoonian	061e56a564	Make weeds and pests affect yield	2023-12-08 00:22:12 +01:00
Bassoonian	2b71187000	Add caretaking bonuses to berry data	2023-12-07 23:50:08 +01:00
Bassoonian	d7959879f1	Preset yield config	2023-12-07 18:06:20 +01:00
Bassoonian	ccb0e11235	Add generation-based growth rate config	2023-12-07 14:18:54 +01:00
Bassoonian	9d09b367a0	Refactor growth time and add six stage toggle	2023-12-07 13:22:01 +01:00
Bassoonian	c8d356a3f1	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion	2023-12-07 12:18:50 +01:00
Bassoonian	9be5d4fba1	Add single stage growth to debug menu	2023-12-07 12:05:12 +01:00
Bassoonian	8e43b7d696	Debug Berry functions	2023-12-06 21:08:09 +01:00
Patrick Curran	f7ca839f23	EFFECT_CHILLY_RECEPTION (#3379) ... * Chilly Reception Effect * Wrap Chilling Reception Message Better * Animation & Some Testing * Remove Wimp Out cases from Chilly Reception tests * Animation tweaks * Battle Script Updates * Created CheckPrimalWeather macro for Weather Effects * Updated Chilly Reception logic to switch even if weather doesn't change Testing Updates * Fixed test: Move does not animate if weather fails to change * Remove snow animation check during failure path test * * Fix indentation * Move Chilly Reception animation to always play (even when weather change fails) * Updates to MoveSwitch and PartingShot to get closer to original logic * Update BattleScript_EffectChillyReception logic * * Move CHILLY_RECEPTION animation * Test updates * Fix Chilly Reception MESSAGE checks --------- Co-authored-by: Patrick Curran <rapidnutcracker@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-06 17:11:13 +01:00
Bassoonian	e6a6ea4977	Start gen defines at Gen I (#3628) ... * Start gen defines at Gen I * Refactor Shuckle config * Oops --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-12-06 16:52:01 +01:00
Bassoonian	36befdcdf8	Add moisture clock, weeds and pest generation	2023-12-05 21:54:17 +01:00
Bassoonian	5f2c8dfb0b	Replace watered bits with a single equivalent field	2023-12-05 20:24:03 +01:00
Bassoonian	e4fd7845ee	Store mutation as mutation id instead of berry id	2023-12-05 20:07:00 +01:00
Bassoonian	6da03e6cf0	Add Berry color and drain rate	2023-12-05 02:16:22 +01:00
Bassoonian	0d70d9951d	Put Mulch behind config	2023-12-04 00:33:25 +01:00
Eduardo Quezada	d076193b9f	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # asm/macros/battle_script.inc # include/constants/battle.h # include/constants/battle_script_commands.h # src/battle_script_commands.c # src/data/battle_moves.h	2023-12-03 16:39:32 -03:00
Bassoonian	b02b3d074f	Add Mulch effects	2023-12-03 13:17:34 +01:00
LOuroboros	6b1ea33be8	Fixed Trace (#3623) ... * Applied Alex's fix for ABILITYEFFECT_TRACE * Added Trace tests written by Alex/Rainonline * Updated Trace's target-choosing capabilities and added a double battle test for it Credits to Alex/Rainonline. * Removed 2 of the 3 'Trace on opponent's switch-in' tests * Added another Trace test	2023-12-02 23:09:09 +01:00
Bassoonian	4628af3d55	Non-watering mulch effects	2023-11-30 13:34:33 +01:00
Alex	4bde378c0d	Fixes Floral Healing + Tests (#3604)	2023-11-29 13:57:29 +01:00
Bassoonian	a517e14c06	Berry Mutations	2023-11-29 13:26:43 +01:00
sbird	ecab5cc106	Merge remote-tracking branch 'pret/master' into feature/dynmulti	2023-11-29 13:06:18 +01:00
ghoulslash	8c4058c7a8	add HITMARKER_DISABLE_ANIMATION for bug bite consumeberry (#3607) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-28 18:57:11 +01:00
Nephrite	460eeff3e5	All moves (I think) that hit and lower a stat ... Includes Grav Apple - test that checks the AI can see its power bump needs fixing	2023-11-28 16:17:11 +09:00
Nephrite	a1a62f431d	More moves ... Poison Fang, Knock Off, Thunder, Hurricane, Snore; also Thief, hit_and_escape moves, recharge moves, (but didn't remove effect)	2023-11-28 00:03:42 +09:00
Bassoonian	b72581985c	Add bad poison downgrade config (#3605) ... Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-11-27 12:42:53 +01:00
psf	fe16a2cdee	Port pokefirered's Vs. Seeker to pokeemerald (#3256) ... * First version of Vs. Seeker * Update movement.inc 98f7e9978d (r1306721924) * Update field_effect_scripts.s https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004 * Update field_effect_scripts.s https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024 * Update item_use.h https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401 * Update movement_action_func_tables.h https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828 * Update event_object_movement.c https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887 * Update overworld.c https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396 * Update vs_seeker.h https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158 * Update vs_seeker.c Addressed some cleanup comments from SBird * Update UpdateRandomTrainerRematches Fixed typo in ClearAllTrainerRematchStates Fixed types in GetRematchableTrainerLocalId * Updated UseVsSeekerEffect_2 * Updated UseVsSeekerEffect_3 * Updated UseVsSeekerEffect_4 * Fixed bug that allowed Vs Seeker to be used indoors in correct places Moved VsSeeker function declarations into header * Refactored FieldUseFunc_VsSeeker * Added curly braces to else case in FieldUseFunc_VsSeeker * renamed data[x] in Task_ResetObjectsRematchWantedState * Refactored Task_ResetObjectsRematchWantedState * Refactored VsSeekerResetObjectMovementAfterChargeComplete * Refactored ResetMovementOfRematchableTrainers * Refactored GatherNearbyTrainerInfo * Refactored Task_VsSeeker_3 * CanUseVsSeeker * Refactored GetVsSeekerResponseInArea * GetCurVsSeekerResponse refactored * Cleaned up GetTrainerFlagFromScript * Gave sensible names to Task_VsSeeker * Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater * Renamed UseVsSeeker Functions * Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned Removed extra VsSeeker animation code * Addressed PR feedback * Fixed issue with building non-modern * Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId * Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850 Removed the check to see if a map was not indoors to improve readability Made IsValidLocationForVsSeeker into a static function * Added changes in response to Jasper's feedback https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522 * Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392 * Removed ifdef tags around the repo unless needed b5dc744ced	2023-11-26 18:58:43 +01:00
psf	493478e94b	Added support for XY's Sky Battles (#2950) ... * Original implementation from Phlayne * Moved Sky Battle Flag / Var into a config * Optimized existing code and fixed existing bugs Added error message for when sky battle var and flag are not set Merged CanDoSkyBattle and PrepareSkyBattle into one special * Added compatibility for Gen7+ * Commented out Volt Crash from banned moves * Cleaned up debug scripts from testing * Fixed bug where player did not white out even if they had no healthy Pokémon and only an egg Zeroed out both Sky Battle configs * Removed extra include from src/field_specials.c Removed extra line break in src/battle_script_commands.c * Added FLAG_DISABLED_IN_SKY_BATTLE Added FLAG_DISABLED_IN_SKY_BATTLE to appropriate moves * Changed DoesSkyBattleCancelCurrentMove to look at move flags * Fixed alignment and spacing in battle_moves.h * Added FLAG_DISABLED_IN_SKY_BATTLE to Sticky Web * Added FLAG_DISABLED_IN_SKY_BATTLE to Steel Roller * Disabled the ability to change Battle Terrain when Sky Battle is happening Stopped Ceaseless Edge from spawning Spikes when Sky Battle is happening Added B_SKY_BATTLE_STRICT_MECHANICS config * Fixed bug with SKY_BATTLE_STRICT_MECHANICS where conditions were not consistently being applied * Add rulesVariants to the BattleStruct Added skyBattle check in AllocateBattleResources * Replaced B_FLAG_SKY_BATTLE checks with rulesVariants.skyBattle checks * Fixed debug script * Reverted include/config/battle.h * Fixed spacing and placement of functions * Fixed debug script omission Fixed bug where Spikes did not set from Ceaseless Edge and Stone Axe * Added FLAG_DISABLED_IN_SKY_BATTLE to Psychic Terrain * Addressed DizzyEgg PR feedback * Forgot a file in last commit * Addressed feedback from DizzyEggg * Address Lunos' PR feedback * Update specials.inc Added an empty line at the end of data/specials.inc * Fixed spacing * Apply suggestions from code review Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Updated skyBattleBanned and HandleBattleVariantEndParty to use correct names * Removed STRICT_MOVES and STRICT_MECHANICS * Fixed minor spacing issues with merge * Merged in upcoming * Implemented feedback from Jasper 5da6117d1b --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-11-26 16:59:44 +01:00
Nephrite	2d0ec53cb6	Misc moves + cmd_seteffectwithchance fix ... Added check to prevent loops in cmd_seteffectwithchance. Updated Pay Day, Tri Attack, Spectral Thief, Clear Smog, V Create, Core Enforcer	2023-11-27 00:32:40 +09:00
Nephrite	4058d16f2f	2-Turn moves + unique moves with secondary effects ... Two turn moves (Bounce, Freeze Shock, Sky Attack, Shadow/Phantom Force), Dire Claw, Stone Axe, Ceaseless Edge, Wicked Torque, Relic Song, Fake Out,	2023-11-25 23:56:17 +09:00
Nephrite	0e23160f2e	Fixed macro + Jaw Lock test	2023-11-25 23:06:51 +09:00
Nephrite	98b2c93b3f	Freeze/frostbite causing moves ... Added move effect FREEZE_OR_FROSTBITE macro so that we only need that if statement once...	2023-11-25 19:22:28 +09:00
Eduardo Quezada	c8b0545d20	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # include/battle.h	2023-11-25 00:51:33 -03:00
Bassoonian	74bb0f05f5	Battle Dome Automation (#3596) ... * MOVE_POINTS_STRONG * MOVE_POINTS_POWERFUL * MOVE_POINTS_LOW_PP * MOVE_POINTS_STAT_RAISE * Removed duplicate function * MOVE_POINTS_STAT_LOWER * MOVE_POINTS_DMG * MOVE_POINTS_ACCURATE * MOVE_POINTS_HEAL * MOVE_POINTS_DEF * MOVE_POINTS_RISKY * MOVE_POINTS_EFFECT * MOVE_POINTS_LUCK * MOVE_POINTS_POPULAR * MOVE_POINTS_STATUS * MOVE_POINTS_RARE * MOVE_POINTS_COMBO * Apply review suggestions * More implemented review suggestions --------- Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2023-11-24 16:19:32 +01:00
Frank DeBlasio	b7cd6502d4	Add config for times of day (#3579) ... * Added initial config for times of day * Changed TIME_DUSK/DUSK_EVO to EVENING * Added morning and evening to Gens 3/4 * Renamed *_EVO_HOUR_BEGIN/END to just *_HOUR_BEGIN/END * Incorporated comments	2023-11-24 15:57:08 +01:00
kittenchilly	b6ff973f38	Add support for legendary fusion (#3274) ... * Legendary Mon Fusion Evolution Compatibility Added Kyurem, Calyrex, and Necrozma Fusions have been implemented, however, the animation for the the process is incomplete, the party menu screen needs to be updated while the screen is whited out and it has proved beyond me right now. Smh * Added Fusion Move Prompts Handles cases for learning the fusion moves from the other fused mon and deleting the move when you unfuse (plus learning confusion (well a set choice in the data struct) if there are no moves left after deleting one) * Fix Bug With Fusion Mon Move Learning If the main fusion came after the fused mon in the party order it would try to teach the move to the next member in the party * Apply suggestions from code review Co-authored-by: LOuroboros <lunosouroboros@gmail.com> * Fix build * Fix fusion items being used up * Fixed animations * RefreshPartyMenu * Apply suggestions from code review Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Apply suggestions * Update form_change_tables.h * Fix animation and simplify fusion tables * Fix party full message * Remove trailing whitespaces * Update party_menu.c * Update party_menu.c * Make IsFusionMon better * Apply suggestions from code review Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: TeamAquasHideout <jonathonheddings@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Co-authored-by: LOuroboros <lunosouroboros@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-23 22:59:51 +01:00
psf	8d6cb9692a	Improved Repel / Lure Menu (#3594) ... * First draft of repel lure * Updated all lure and repel scripts * Optimized inc file * Updated y coord * optimized sprays.c * Removed spray.inc * Updated cosnt use * Removed dead repel and lure code * Updated debug for testing * testing new inc file * turn on debug and options * playground generated inc file without ifs * pory generated inc with ifdef complete * Updated spray.c with new inc * reverted item config * Reverted event scripts * Reverted event scripts * Revert config * Added testing scripts for debug * Added back specials * reverted debug scripts * Updated use of constants * Addressed tabs > spaces feedback https://github.com/rh-hideout/pokeemerald-expansion/pull/3594\#discussion_r1402917676 * Updated constant names to avoid confusion Made inc file changes https://github.com/rh-hideout/pokeemerald-expansion/pull/3594\#pullrequestreview-1746418044 * Updated constant name of NUM_SPRAY_TYPES to NUM_SPRAY_STRENGTH to be more accurate	2023-11-23 21:31:33 +01:00
Alex	71fd95e6d4	Fixes Protosynthesis and Quark Drive ability pop up (#3595)	2023-11-23 19:49:21 +01:00
Nephrite	5eae07e4b9	Jaw Lock, Axe Kick, Spin Out ... Jaw Lock needs a test but I'm too lazy to write it	2023-11-23 23:43:11 +09:00
Nephrite	b7d77ad59e	Confusion moves	2023-11-23 23:33:55 +09:00
Nephrite	d81bf6afde	EFFECT_POISON_HIT ... Also tidied up paralysis/burn scripts; updated Barb Barrage	2023-11-23 22:29:11 +09:00
Nephrite	bec0fea7f6	Flinching moves ... All work fine - all tests pass	2023-11-23 17:14:50 +09:00
Nephrite	d9f64b7537	Fixed seteffectwithchance ... Now has the ability to loop over multiple effects without causing problems - requires a maybe controversial macro modification...	2023-11-23 17:08:30 +09:00
GriffinR	2db9ab2a2f	Document camera sprite functions	2023-11-22 13:52:56 -05:00
Nephrite	ffe89c7248	Redid Fang Moves ... Pass tests too	2023-11-23 00:21:57 +09:00
Alex	ba6d223f17	matcha gotcha	2023-11-22 19:20:30 +09:00
Bassoonian	a7beed5b25	Dynamax messages (#3581) ... * Dynamax messages * Convert various to callnative * Remove battler argument from callnatives * Rename i variable * Fix missing else	2023-11-21 19:18:18 +01:00
Alex	b9edbb429b	Adds combined pledge move effects (#3336) ... * Adds combined pledge move effects * added pledge status and various other fixes * leftover * fix triple arrow test tag * pledge moves can not be redirected by absorbing abilities * more pledge changes * remove duplicate test * Stab boost, Rainbow anim and new SeaOfFire anim * leftover --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-21 16:23:22 +01:00
Alex	be42d4eafb	Increase score of secondary effects only at 100% chance (#3583) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-21 11:30:20 +01:00
Bassoonian	cb245a00c6	Includes older item and move names as variants (#3580) ... * Item name variants * Updated move names --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2023-11-20 18:35:00 +01:00
Nephrite	1dadc79b8b	Triple Arrows redo ... Sorry, Lunos	2023-11-20 19:39:13 +09:00
Bassoonian	59a7d2cb92	Update colors and add config	2023-11-19 18:30:18 +01:00
Alex	4cb03d4add	Adds Raging Bull and various fixes (#3552) ... * Adds Raging Bull and various fixes * fix compiling on abgcc * syrup bomb anim fix * sticky syrup anim in link battles * fix sticky syrup in link battles * fix battler index --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-19 17:45:58 +01:00
Nephrite	45d8491148	Fixed macro + implemented working Mortal Spin ... It's that easy	2023-11-19 05:05:19 +09:00
Nephrite	41202a964a	Initial struct change + paralysis test ... Works great	2023-11-19 03:20:33 +09:00
Frank DeBlasio	42076897d3	Made function for time-based evolutions (#3369) ... * Made function for time-based evolutions * Incorporated Edu's comments and time variables * Moved time of day begin/end variables to rtc.h * Fixed if/else statement to pass building with modern * Added morning * Added ability to check if end time > beginning time * Updated times to match SwSh --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-18 16:53:56 +01:00
Alex	5fa1bffa8d	Adds Glaive Rush, fixes for Plasma Fists and Relic Song (#3476) ... * Adds Glaive Rush * Fixes: Glaive Rush status is removed until users next turn * Glaive Rush no affect * simplify glaive rush script * simlify script further * leftover * Fix Plasma Fists and Relic Song + tests * Callnative for Plasma Fists * Use Status Field Ion Deludge for Plasma Fists * add assumes for flinch_status --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-18 15:19:38 +01:00
SnorlaxMonster	190e77e9c8	Rename HITMARKER_IGNORE_SAFEGUARD ... Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT. This flag is used exclusively by status-inflicting Abilities, and has 3 main functions: - Whether the effect bypasses Shield Dust - Whether the effect bypasses Safeguard - Which text string to display when the status condition is inflicted (i.e. whether it was inflicted by a move or Ability) I believe this new name better represents what the flag actually does. This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.	2023-11-18 13:57:50 +11:00
Frank DeBlasio	efe4929ce2	Added Japan-only Walda PC icons (#3550) ... * Added Japan-only Walda PC icons * Added a config for the Japanese icons * Update overworld.h with suggestions --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-11-18 00:54:13 +01:00
ghoulslash	bf8c9609ae	add battle pyramid wild reqs (#2581) ... * add battle pyramid wild reqs * fix comment * fix ice type round to match vanilla. move config to overworld * some fixes * BATTLE_PYRAMID_RANDOM_ENCOUNTERS define to FALSE defualt * fix GetSpeciesName * fix GetTotalBaseStat define, gEvolutionTable targetSpecies call * fix wildMons call * fix call to CheckBattlePyramidEvoRequirement * fix arg 2 in CheckBattlePyramidEvoRequirement * free->Free and fix evoItems ptr * move sBurningMoves * fix comment fix ice type round to match vanilla. move config to overworld some fixes BATTLE_PYRAMID_RANDOM_ENCOUNTERS define to FALSE defualt fix GetSpeciesName fix GetTotalBaseStat define, gEvolutionTable targetSpecies call fix wildMons call fix call to CheckBattlePyramidEvoRequirement fix arg 2 in CheckBattlePyramidEvoRequirement free->Free and fix evoItems ptr move sBurningMoves BATTLE_PYRAMID_RANDOM_ENCOUNTERS defaults to false * fix errors * initial movesCount, abilitiesCount --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-17 16:04:41 +01:00
Eduardo Quezada D'Ottone	c46f9ec6a5	Form changing method for Shaymin Sky into Land at night (#1690) ... * Form changing method for Shaymin Sky into Land at night * Ordered form change tables * Refactored form change type to support both night and day * Removed added space --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-17 00:09:43 +01:00
kittenchilly	85e75a72c6	Update affection mechanics to gen 8+ (#3495) ... * Update affection mechanics to gen 8+ * Update battle.h --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-14 21:29:38 +01:00
Eduardo Quezada D'Ottone	93c7a70caa	Species Simplifier™ - Part 2 (#3546) ... * Gen 1 and 2 families + fixes - Fixed mixed identation. - Fixed Azurill being Normal/Water type in Pre-Gen6 setting. - Fixed Wobbuffett being before Wynaut - Fixed Dudunsparce's macro being out of order * Updated macros of Megas that shared held item with base forms * Gen 3 families * Separated Latis macro * Gen 4 families * Moved Misc Info to the top of arrays * Renamed FAMILY_x to P_FAMILY_x * Gen 5 families * Gen 6 families * Gen 7 families * Gen 8 families * Gen 9 families * Mega Evolutions * Gigantamax Form toggles * Alolan Forms * Galarian Forms * Added missing comments * Hisuian Forms * Paldean Forms * Fixed missing Paldean form flags * Fixed order --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2023-11-14 16:40:26 +01:00
kittenchilly	c1cdc320bb	Implement Rotom Catalog and Zygarde Cube (#3284) ... Co-authored-by: Martin Griffin <martinrgriffin@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-11-13 17:46:25 -03:00
Pawkkie	b93dfb9d59	Smarter SwitchAI Mon Choices | HasBadOdds Switch Check (#3253) ... * SwitchAI makes much smarter mon choices * Add HasHadOdds check to ShouldSwitch decision * Remove early return * Rework Baton Pass check as per discussion with Alex * Forgot to adjust a comment * Don't program before breakfast lol (if / else if fix) * Switch AI_CalcDamage for AI_DATA->simulatedDmg in HasBadOdds Thanks Alex! :D * Typo in a hitToKO comparison * Remove and replace AI_CalcPartyMonBestMoveDamage and IsAiPartyMonOHKOBy from https://github.com/rh-hideout/pokeemerald-expansion/pull/3146 See https://discord.com/channels/419213663107416084/1144447521960251472 for details * Major refactor, new struct, switchin considers damage / healing from hazards / status / held item / weather * Forgot Snow exists and heals Ice Body, haven't played Switch games lol * (766a1a27a7) Compatibility, use new struct field instead of function call * Fixing oversight from previous upstream merge * Improve TSpikes handling to make GetSwitchinHazardDamage more applicable Small fixes: - EFFECT_EXPLOSION typo (!= to ==) - Order of if statements near bestResistEffective - Spacing of terms in big HasBadOdds if statements * Forgot to uncomment blocks disabled for debugging what turned out to be vanilla behaviour lol * Remove another holdover from debugging, sorry :/ * Lastly, undoing my debug trainer * Type matchup based on species type rather than current type Suggested by BLourenco on Discord, the idea is that a mon that's had its type affected by a move like Soak will still have moves as though it was its regular typing, and so prioritizing the temporary typing wouldn't be ideal. https://discord.com/channels/419213663107416084/1144447521960251472/1146644578141736970 * gActiveBattler upcoming merge fixes * Egg changes part 1 * Egg changes part 2, just need to address EWRAM still * Move SwitchinCandidate struct to AiLogicData * Consider Steel type when checking TSpikes * Comment about CanBePoisoned compatibility * Changes for Egg's 2nd review * Put period back in comment, whoops lol * Latest upcoming merge fixes * Missed a few u32 updates * Combine GetBestMonIntegrate functions / flags, some modularization * Fix merge error * Make modern fixes * Two tests done, two to go * Accidentally pushed reference test, removing it * Type matchup switching tests * Tests for defensive vs offense switches --------- Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>	2023-11-11 14:37:35 +01:00
Martin Griffin	3fc47d137a	Defines for Expansion version number (#3454)	2023-11-10 08:08:36 -03:00
hedara90	7ccdd4b5b3	Added Teal Mask item graphics + updated install instructions (#3527) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-11-09 21:57:04 -03:00
Frank DeBlasio	b5b67973bd	Fixes Stantler's evolution's boolean (#3548) ... * Stantler's evolution now has the proper gen boolean * Fixed comment for new evo methods	2023-11-10 00:11:29 +01:00
Frank DeBlasio	33815079ae	Added missing cross-gen evolutions (#3547) ... * Added missing cross-gen evolutions * Added forms for evos * Converted some EVO_NONEs into EVO_MOVE * Moved Ursaring's evolution up * Added evolution methods for Dudunsparce and Maushold	2023-11-09 23:29:22 +01:00
Alex	e79583be63	Remove function GetMoveDamageResult (#3536) ... * Remove function GetMoveDamageResult * fix test * test clean up --------- Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>	2023-11-09 20:53:14 +01:00
Alex	4b3c96a89b	Adds ability Zero to Hero (#3542)	2023-11-09 08:25:46 -03:00
GriffinR	12a64fecb4	Merge pull request #1936 from GriffinRichards/doc-datahpupdate ... Document datahpupdate	2023-11-07 12:25:26 -05:00
Eduardo Quezada D'Ottone	4aa14355d7	Merge branch 'upcoming' into gen9-species-nomigration	2023-11-06 13:49:02 -03:00
Eduardo Quezada	57c1dd97bb	Merge branch 'RHH/master' into RHH/upcoming	2023-11-03 21:59:08 -03:00
kittenchilly	90471741e9	Add Fairy Feather sprite (#3520)	2023-11-03 16:32:12 -03:00
Eduardo Quezada D'Ottone	820be61c9f	Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen9mon-4	2023-11-02 21:32:23 -04:00
Eduardo Quezada D'Ottone	eccd2c4a65	Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration	2023-11-02 21:28:53 -04:00
Alex	53b7e4bf66	Remove powerfulMoveEffects array (#3515) ... * Remove powerfulMoveEffects array * Solar Beam test	2023-11-02 08:44:23 +01:00
kittenchilly	244ca0be95	Add custom female icon sprites for Pikachu and Wobbuffet (#3506) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-11-01 18:49:44 -03:00
DizzyEggg	47341f3f30	Fix Anger Shell activation (#3508)	2023-11-01 14:55:50 +01:00
DizzyEggg	7eb1b12224	Fix Knock Off healing berries (#3509)	2023-11-01 14:47:31 +01:00
Alex	64ba52d214	Remove redundant AI score increases (#3504) ... * Remove redundant AI score increases * review applied * fix score	2023-10-31 13:41:22 +01:00
Eduardo Quezada	e281103575	Reverted PR3455	2023-10-31 07:33:53 -03:00
Eduardo Quezada D'Ottone	2dfae911aa	Added config for Weak Armor's Gen 5-6 effect (#3498)	2023-10-30 17:18:00 -03:00
kittenchilly	c0c100d90d	Base friendship Gen 8+ config (#3491) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-10-30 16:45:52 -03:00
DizzyEggg	0c8fdce1a4	New tests + Sheer Force / Last Resort minor bug fixes (#3378) ... * tests for intimidate defiant * sheer force fix + tests * white herb tests * tests for stealth rock, weak armor and last resort fix * style changes to weak armor test	2023-10-30 11:39:41 +01:00
Eduardo Quezada D'Ottone	1467ffa3d8	Added missing Alcremie forms (#3469) ... * Alcremie form sprites Co-authored-by: Blackforest92 <rico.anjaya@gmail.com> # Conflicts: # graphics/pokemon/alcremie/lemon_cream/front.png # graphics/pokemon/alcremie/matcha_cream/back.png # graphics/pokemon/alcremie/matcha_cream/front.png # graphics/pokemon/alcremie/mint_cream/front.png # graphics/pokemon/alcremie/ruby_cream/front.png # graphics/pokemon/alcremie/salted_cream/front.png # include/graphics.h # src/data/graphics/pokemon.h # src/data/pokemon/species_info.h # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/footprint_table.h # src/data/pokemon_graphics/front_pic_anims.h # src/data/pokemon_graphics/front_pic_coordinates.h # src/data/pokemon_graphics/front_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon.c * Fixed cries * Removed Todos * Temp: all forms use the same icon * Grouped form data + Fixed missing Level up and Teachable learnsets * Added missing data for form changes and back animations * Grouped defines together * Fixed compile --------- Co-authored-by: Alex <alexthenotes@gmail.com>	2023-10-29 20:30:56 +01:00
Bassoonian	ab25e6bfa5	Fixes Synchronize's OW effect and adds configs (#3480)	2023-10-28 23:24:20 -03:00
Bassoonian	0dd22305a4	Adds Illuminate's Gen9 effect (#3482) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-10-28 23:22:41 -03:00
Eduardo Quezada	ae1266e077	Automatically change dex number digits based on NATIONAL_DEX_COUNT	2023-10-28 22:15:21 -03:00
Bassoonian	f472d768dd	Rename Undiscovered to No Eggs Discovered	2023-10-28 16:32:55 +02:00
kittenchilly	5087095aae	Obedience levels now increase per badge (#3475)	2023-10-27 19:17:17 -03:00
Alex	f2fddf4ee1	Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474)	2023-10-27 19:14:45 -03:00
Ariel A	eaff8abefb	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-10-26 19:41:07 -04:00
Ariel A	294657a585	Fixes for make modern.	2023-10-26 19:37:19 -04:00
leo60228	a505afac1d	address review	2023-10-26 18:57:06 -04:00
kittenchilly	d9ccc80b31	Sprites	2023-10-26 17:34:21 -04:00
kittenchilly	5cbcf60c7e	Begin some stuff	2023-10-26 17:34:18 -04:00
kittenchilly	86917f1453	Update species.h	2023-10-26 17:33:20 -04:00
leo60228	5f2b6f57f7	Merge branch 'upcoming' into gen9-species-nomigration	2023-10-26 17:31:31 -04:00
Alex	f6781a77d4	merge rhh/upcoming	2023-10-25 09:42:19 +02:00
leo60228	f6e5076dc0	add new sprites	2023-10-24 23:20:59 -04:00
Eduardo Quezada	1137d54b61	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # asm/macros/battle_script.inc # src/battle_script_commands.c	2023-10-23 17:36:42 -03:00
Philipp AUER	4aabd09ab3	Fix test_runner.c modern warning (#3451)	2023-10-23 19:41:59 +02:00
Eduardo Quezada	ed3e2f8e09	Gen 9 form order	2023-10-23 13:30:32 -03:00
Bassoonian	5592706a71	Fix Synchronize devnote + Gen9 behaviour	2023-10-23 17:59:07 +02:00
Eduardo Quezada	174ad11535	SPECIES_GIMMIGHOUL_CHEST	2023-10-23 12:09:44 -03:00
Eduardo Quezada	2e9e157cf8	SPECIES_DUDUNSPARCE_TWO_SEGMENT	2023-10-23 11:45:15 -03:00
Eduardo Quezada	be921c57fc	SPECIES_TATSUGIRI_CURLY	2023-10-23 11:26:50 -03:00
Eduardo Quezada	82bb758d19	SPECIES_PALAFIN_ZERO	2023-10-23 11:08:06 -03:00
Eduardo Quezada	792aee86ea	SPECIES_SQUAWKABILLY_GREEN_PLUMAGE	2023-10-23 10:55:16 -03:00
Eduardo Quezada	ff60b7ff73	Maushold Family of Three define	2023-10-23 10:24:47 -03:00
Eduardo Quezada	e6c5077d7c	Oinkologne Male define	2023-10-23 10:12:55 -03:00
Eduardo Quezada	a92a3256df	Fixed Paldean Tauros Combat Breed order and data names	2023-10-23 09:33:37 -03:00
Eduardo Quezada	f570d14f2d	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration ... # Conflicts: # include/constants/species.h # sound/cry_tables.inc # src/data/pokemon_graphics/enemy_mon_elevation.h # src/data/pokemon_graphics/front_pic_anims.h	2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone	26971fc3ac	Add species defines for base forms with names (#3248) ... * Fixed Aegislash test not being properly made. * Added conditions to BattleSetup_StartLegendaryBattle switch	2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone	6585a62b13	Dynamax Cleanup (#3435) ... * Mon animation names * Moved indicator code so it follows the same standards as the other indicators * Whitespace * Fixed modern compile * Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed	2023-10-23 11:39:22 +01:00
LOuroboros	cd59e055c2	Made Reflect Type handle 3rd types (#3303) ... * Made Reflect Type handle 3rd types Misc: -Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType) -Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle. -Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.	2023-10-23 10:08:36 +01:00
Martin Griffin	b0b6e16042	Separate ASSIGN_TEST from NEXT_TEST ... Silences a warning about an invalid pointer when building with modern.	2023-10-23 07:58:45 +01:00
kittenchilly	3755155e9d	Update friendship evo threshold to gen 8+ with config (#3376)	2023-10-22 18:05:54 -03:00
Eduardo Quezada	bcf0377d9a	Merge branch 'RHH/master' into RHH/upcoming	2023-10-22 16:30:26 -03:00
kittenchilly	d495e177b9	Add Snow weather animation (#3440) ... * Snow weather animation * Update battle_anim_scripts.s * Apply changes from review	2023-10-22 21:15:07 +02:00
Eduardo Quezada D'Ottone	7fdc4aacda	Fixed Cheat Start not initiating time-based events (#3446)	2023-10-22 21:03:54 +02:00
sbird	196038eaee	[pokedex_plus] refactor #if to C if	2023-10-22 03:26:24 +02:00
voloved	ebdf14c620	Push B in wild battle moves to Run (#3362) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-10-21 12:45:40 -03:00
GriffinR	5712777dc2	Correct dynamic type flag name	2023-10-20 12:57:36 -04:00
GriffinR	ffdc2456cb	Document datahpupdate	2023-10-20 12:50:32 -04:00
kittenchilly	33a0fdbbc6	Add new move flags and update all flags for every move (#3425) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-10-19 20:16:37 -03:00
Alex	ceb6beb254	merge upcoming	2023-10-19 12:30:55 +02:00
Eduardo Quezada D'Ottone	d153947aa2	Merge branch 'upcoming' into dynamax	2023-10-18 19:37:09 -03:00
leo60228	87a03c3c73	Fix Paldean form order	2023-10-18 14:44:30 -04:00
leo60228	ba0534386d	Address review	2023-10-18 14:37:29 -04:00
leo60228	920fd481e7	Regional Dex numbers are always 3 digits	2023-10-18 14:37:28 -04:00
Eduardo Quezada	6cc2a1ef03	4 digits option for dex numbers ... (cherry picked from commit 9bad51cbc69786ecd2e6719f2bca201a961bff5e)	2023-10-18 14:37:28 -04:00
leo60228	b3e5c3179f	Revert "reorder species.h" ... This reverts commit d68eb27bbe906eb80c55dd2988c8af4e4970cf72.	2023-10-18 14:37:27 -04:00
leo60228	3e1ecec800	revert SPECIES_DARMANITAN_GALARIAN_* renames	2023-10-18 14:37:27 -04:00
leo60228	61d3cdd8da	revert separate SPECIES_UNOWN	2023-10-18 14:37:21 -04:00
Eduardo Quezada D'Ottone	6df433735e	reorder species.h	2023-10-18 14:37:01 -04:00
Eduardo Quezada D'Ottone	a502427a7f	Merge pull request #18 from AlexOn1ine/speciesReorderItems ... (cherry picked from commit 6dc58dcc1797f8b72170c2c104c9cdf9b53c7b50)	2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone	c221c67202	Merge pull request #16 from AlexOn1ine/speciesReorder ... (cherry picked from commit e081d2b7730d2a7554b88af3a39ba3a2c0f5ba01)	2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone	133ffc7260	Merge pull request #15 from Bassoonian/rhhspeciesreorder ... Add gen 9 Pokémon data (cherry picked from commit cd3e65f5c92b22f1ce48f4f8275796d40f2ef1c6)	2023-10-18 14:33:56 -04:00
Alex	91b6722322	Octolock, more tests	2023-10-18 20:25:34 +02:00
sbird	b77bc71862	fix -Warray-parameter, -Waddress, -Warray-bounds warnings ... those are introduced by some compiler between gcc 10 and gcc 13 when using -Wall	2023-10-16 09:36:36 +01:00
Eduardo Quezada	ca101e9952	Updated AI to use non-dynamax HP (Leech Seed, Nightmare, Trap Damage, Hail, Sandstorm	2023-10-15 09:42:56 -03:00
Ariel A	f27a252958	Merge branch 'followers' into followers-expanded-id	2023-10-15 02:46:46 -04:00
Ariel A	a63242d96f	Merge branch 'followers' into lighting	2023-10-15 00:43:54 -04:00
Eduardo Quezada	c0540a3559	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax ... # Conflicts: # include/battle.h # include/constants/battle_move_effects.h # include/constants/battle_string_ids.h # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c	2023-10-15 00:30:00 -03:00
Ariel A	9c77aa3c66	Improved support for 64x64 followers. Updated reflection code. ... Added 24x24 subsprite tables.	2023-10-14 22:14:42 -04:00
Eduardo Quezada	3409869f9c	Merge branch 'RHH/master' into RHH/upcoming	2023-10-13 17:44:43 -03:00
Martin Griffin	45897cefbc	Move battle tests off the heap (#3414)	2023-10-13 16:31:10 -03:00
Bassoonian	231ebea3f0	Tests for 6 more abilities (#3399) ... * Tests for 6 more abilities * Fix most of Egg's comments * Update Purifying Salt and Leaf Guard * Parenthesis fixes	2023-10-13 20:50:48 +02:00
Martin Griffin	cbdba65218	Move battle tests off the heap (#3413) ... * Catch OOM in tests * Alias gBattleTestRunnerState with sBackupMapData Reverts #3398 "Fix Broken Move Anims in Tests" which moved the AI logs to statically-allocated EWRAM_DATA instead of being part of gBattleTestRunnerState.	2023-10-13 20:29:30 +02:00
DizzyEggg	a7b9d139da	Fix Wall Werrors on modern (#3412) ... * Fix Wall Werror errors * fix hgss pokedex modern errors * tests build on modern * learnset change * Update src/battle_ai_util.c Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com> * Update src/battle_anim_new.c Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com> * Update src/debug.c Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com> * Update src/debug.c Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com> * Update src/pokedex_plus_hgss.c Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com> * review changes * unused cmd args * various args back --------- Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>	2023-10-13 18:39:35 +02:00
Martin Griffin	311224d32f	Converted most battle preproc ifs to regular ifs (#3392)	2023-10-12 15:28:41 +01:00
Martin Griffin	f5b149b971	Test improvements (#3408) ... * Run assumptions on all runners * Make i const in battle tests This avoids the pitfall of using i in a PARAMETRIZEd test and confusing the runner.	2023-10-12 12:14:07 +02:00
Eduardo Quezada	805c65b255	Merge branch 'RHH/master' into RHH/upcoming	2023-10-11 13:14:23 -03:00
Eduardo Quezada	482029d7ec	Removed Transistor from master	2023-10-11 13:07:16 -03:00
Eduardo Quezada	186884120c	Merge branch 'RHH/master' into RHH/upcoming	2023-10-11 13:02:12 -03:00
Eduardo Quezada D'Ottone	eedc61709d	Various tests + Poison Heal fix + Transistor update (#3385)	2023-10-11 11:34:20 -03:00
Alex	0b9126ff53	Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel (#3402) ... * initial commit * done * clean up	2023-10-11 11:09:50 +02:00
kittenchilly	a795148068	Add Pikachu World Cap mini icon (#3401)	2023-10-11 11:02:28 +02:00
DizzyEggg	403326035e	fix broken move anims in tests (#3398)	2023-10-10 22:41:34 -03:00
Eduardo Quezada	3cb29f87a6	gBattleCommunication ids	2023-10-10 19:53:56 -03:00
Eduardo Quezada	4d4d566c2b	Undid flag	2023-10-10 18:09:42 -03:00
Eduardo Quezada	f830b0725a	GMAX -> GIGANTAMAX	2023-10-10 18:07:12 -03:00
Eduardo Quezada	644fba2db1	Gigantamax Flag	2023-10-10 17:37:18 -03:00
ghoulslash	70fbf9e9df	Opportunist Ability (#2994) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-10-09 22:35:00 -03:00
Eduardo Quezada	2fac60055f	Merge branch 'RHH/master' into RHH/upcoming	2023-10-09 22:08:32 -03:00
Eduardo Quezada	92301398bc	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax ... # Conflicts: # asm/macros/battle_script.inc # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle.h # include/battle_controllers.h # include/battle_interface.h # include/config/battle.h # include/constants/battle.h # include/constants/battle_anim.h # include/constants/battle_move_effects.h # include/constants/battle_string_ids.h # include/data.h # include/random.h # sound/cry_tables.inc # src/battle_anim_new.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/species_info.h # src/data/text/move_names.h # test/test_runner_battle.c	2023-10-09 16:51:41 -03:00
Eduardo Quezada D'Ottone	68c2c45b52	Fixed VSCode shenanigans (#3383)	2023-10-09 12:20:09 +02:00
Eduardo Quezada D'Ottone	9ed7fe1c94	Made Gen6 exp share easier to understand (#3384)	2023-10-09 12:15:13 +02:00
Eduardo Quezada D'Ottone	25540a7fec	Fixed Rivalry's effect + Tests (#3381) ... - It was doing the opposite if neither attacker or target were genderless - It wasn't accounting for genderless mon	2023-10-09 12:14:18 +02:00
Eduardo Quezada	d1c672d3ce	Converted most battle preproc ifs to regular ifs	2023-10-08 21:32:15 -03:00
kittenchilly	b5f7a51351	Add Teal Mask item, move, and ability data (#3349)	2023-10-08 15:56:09 -03:00
Petuuuhhh	fd19c261d2	Add calculation boosts for Light Ball and Sandstorm (#3387) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-10-07 22:30:16 -03:00
Alex	28506b4cf8	Use move flags instead of lists for AI calcs (#3389)	2023-10-07 18:31:25 +01:00
Bassoonian	cee84f0f74	Fix issues and add more ability tests	2023-10-06 15:13:26 +02:00
Eduardo Quezada	7c7396c1be	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # src/battle_ai_main.c	2023-10-05 13:31:22 -03:00
kittenchilly	ab8bc6e493	Add new sell value of 1/4 of an item's price, with config (#3315) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-10-05 09:14:42 -03:00
Pawkkie	7ebaddc290	Adjust evo strings for HGSS dex (#3375)	2023-10-05 08:58:28 -03:00
Brandon Lourenco	89e4f30867	Roost suppresses the user's Flying-type rather than remove and re-add it. Added tests for EFFECT_ROOST. (#3258) ... * Fixed Roost clearing type3 when used by a pure Flying-type. (Gen 5+) * Created a test file for Roost. * Marked tests as TODO for now. * Added more tests for HP healed and type changing. * Created a function to handle Roost's Flying suppression when getting a battler's type. Added more tests. * Added test for not-yet-aquired Flying-type. Fixed/rewrote some other tests. * Now using GetBattlerType() in most relevant places. Fixed some tests. * Added tests for interactions between Roost and Delta Stream, type-changing effects, Grassy Terrain healing, Levitate, Air Balloon, Magnet Rise, and Telekinesis. * Added test for interaction between Roost and Reflect Type. * Gen 4 tests merged with Gen 5+ tests. * Removed errant space. Co-authored-by: LOuroboros <lunosouroboros@gmail.com> --------- Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2023-10-05 09:19:29 +02:00
DizzyEggg	be5683e899	AI battle tests + AI logic fixes (#3361)	2023-10-04 18:53:29 +01:00
Eduardo Quezada D'Ottone	966f89eeb6	pret merge 2023-10-02 (#3372)	2023-10-02 17:37:03 -03:00
Eduardo Quezada D'Ottone	20e3b43f7c	HGSS Style Pokedex (#3288)	2023-10-02 17:28:37 -03:00
Eduardo Quezada	a6940c9e03	Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002 ... # Conflicts: # src/battle_ai_script_commands.c # src/battle_controller_player.c # src/battle_controller_recorded_opponent.c # src/battle_controller_safari.c # src/battle_controller_wally.c # src/battle_controllers.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/mystery_gift_menu.c # src/pokemon.c	2023-10-02 17:17:41 -03:00
Eduardo Quezada	ca81aba3b6	Merge branch 'RHH/master' into RHH/upcoming	2023-10-02 14:11:24 -03:00
DizzyEggg	c69d8e0960	Improve how AI chooses damaging moves (#3199) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-10-01 20:36:57 -03:00
DizzyEggg	10adba3af4	Fixed entry hazards switch in issue (#3316) ... * fix entry hazards switch in issue * accidental known failing fix	2023-10-01 10:30:41 -03:00
kittenchilly	cc1d748b47	Fixed Shiny Charm doing too many rerolls by default (#3327) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-09-30 20:34:52 -03:00
kittenchilly	9f1dbeeead	Pickup Table Refactor (#3351)	2023-09-28 17:41:42 -03:00
DizzyEggg	2fcb9bbc9b	Wild battle tests + tests for exp points (#3342) ... * Add WIld Battles to test runner + exp tests	2023-09-27 08:35:05 +01:00
kittenchilly	baca050724	Allow Sliggoo to evolve during overworld fog (#3343)	2023-09-26 17:05:44 -03:00
Eduardo Quezada	9144b36ac1	Merge remote-tracking branch 'pret/master' into RHH/upcoming ... # Conflicts: # include/graphics.h # src/anim_mon_front_pics.c # src/data/graphics/pokemon.h # src/data/pokemon/level_up_learnsets.h # src/data/pokemon/pokedex_text.h # src/data/pokemon_graphics/still_front_pic_table.h # src/wild_encounter.c	2023-09-26 08:13:49 -03:00
Eduardo Quezada D'Ottone	de577f955a	Greatly reduce AI lag (#3308)	2023-09-26 07:28:18 -03:00
ghoulslash	0b9f12efe4	Adds support for placing Pokémon in the PC with the B button (#3329) ... Adds support for placing Pokémon in the PC with the B button	2023-09-24 21:35:16 -04:00
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
DizzyEggg	996bc6ba24	Fix order of messages in gen6 exp share (#3339) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-09-24 17:07:56 -03:00
DizzyEggg	7d9555dadb	change some more variables to u32	2023-09-24 11:06:45 +02:00
DizzyEggg	5d77123c50	merge with master	2023-09-24 10:52:41 +02: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
ghoulslash	b77dec1234	Transform updates AI_PARTY data (#3295) ... * Cmd_transformdataexecution overwrite AI_PARTY data * remove whitespace * add RecordAllMoves --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-09-23 10:44:30 +02:00
DizzyEggg	662dd7d2c6	Fix give daycare egg option giving buggy eggs (#3335)	2023-09-22 12:20:00 -03:00
Bassoonian	b673738ba5	Add config for pressing B in the PC	2023-09-21 16:26:00 +02:00
kittenchilly	d4217739e6	Add type boosting held item power config (#3326) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-09-20 22:03:00 -03:00
Eduardo Quezada	927e4b6071	Renamed time amounts	2023-09-20 19:04:50 -03:00
DizzyEggg	136ea395ac	Fix tests breaking on modern (#3319) ... * Fix tests breaking on modern * modern tests fix - macro and rodata changes * ld script rodata modern	2023-09-19 12:15:03 +02:00
Eduardo Quezada	fb6f45b2c3	Slight RTC documentation + Evolution times constants	2023-09-17 13:45:06 -03:00
Aaghat	75bf32e0d1	Applied requested changes	2023-09-17 17:07:58 +05:30
DizzyEggg	74fd561759	merge with upcoming	2023-09-17 11:27:18 +02:00
Alex	a073e7bd59	Adds Gigaton Hammer and Salt Cure (#3297)	2023-09-15 11:18:47 -03:00
kittenchilly	4a3ee0db7f	Implement Exp Charm and unevolved Exp multipliers + Exp formula fixes (#3301) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-09-14 15:37:57 -03:00
Eduardo Quezada	f3217c18dc	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # src/battle_util.c	2023-09-14 09:12:12 -03:00
DizzyEggg	7936910f90	Bug Bite - Tests and small fix (#3282) ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-09-14 08:57:30 -03:00
Alex	db039ee4e2	Tera Shards Icons (#3307)	2023-09-14 07:38:45 -03:00
DizzyEggg	25459073e5	ai lag fixes ready	2023-09-14 11:44:44 +02:00
DizzyEggg	bb9501449c	final ai optimizations	2023-09-14 11:05:00 +02:00
DizzyEggg	5ea66f3c0c	more optimizations	2023-09-14 00:07:41 +02:00
DizzyEggg	38dcb3c66c	ai weather optimization	2023-09-13 17:28:26 +02:00
DizzyEggg	b7d0d37757	fix conflicts	2023-09-13 15:14:09 +02:00
DizzyEggg	94a3e80c8e	Remove redundant side macros/funcs (#3299) ... Co-authored-by: gruxor <gruxor@proton.me>	2023-09-13 09:19:18 -03:00
DizzyEggg	9031f5a063	get battlers' speed only once	2023-09-13 14:04:25 +02:00
DizzyEggg	1a64938c9b	optimize dmg move result and ai who is faster	2023-09-13 13:23:19 +02:00
DizzyEggg	406209f738	score to s32	2023-09-13 09:27:49 +02:00
GriffinR	de3493ff0e	Merge pull request #1921 from citrusbolt/blockboxrs ... [LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`	2023-09-12 18:48:05 -04:00
DizzyEggg	9778587935	optimize battle util and item functions by setting u32 variables	2023-09-13 00:02:26 +02:00
DizzyEggg	44bd830d2a	optimize dmg calc and ai dmg calc to reduce lag	2023-09-12 23:20:09 +02:00
Eduardo Quezada	b89722500f	Fixed Mr. Mime capitalization	2023-09-12 13:09:56 -03:00
DizzyEggg	bd48cca8a2	ai delay timer	2023-09-12 10:35:05 +02:00
ghoulslash	b861f6dd9a	Fix overworld snow weather + make overworld fog cause misty terrain (#3241)	2023-09-11 09:28:44 -04:00
ghoulslash	582cfb0ae7	Convert various to callnatives - Part 1 (#3269)	2023-09-11 09:19:56 -04:00
Aaghat	daeb2efd46	some minor clean up	2023-09-11 17:55:17 +05:30
Eduardo Quezada	6a70b06240	Removed unused itemId field	2023-09-10 19:42:33 -03:00
Eduardo Quezada	755e260da4	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # include/constants/battle_move_effects.h # test/battle/move_effect/multi_hit.c	2023-09-10 18:38:46 -03:00
Alex	18577ce598	Fix Scale Shot bug and use Canceller Multihit Moves (#3290)	2023-09-10 11:57:19 -03:00
Aaghat	2d2a255e6f	Forgot to change caught mon dex page	2023-09-09 11:29:24 +05:30
Aaghat	1b17e3adff	set hgss pokedex off by default	2023-09-09 10:59:44 +05:30
Aaghat	332cc29273	Add new Evo methods	2023-09-09 10:56:45 +05:30
Aaghat	6ac16c8c2e	More clean up	2023-09-09 10:16:14 +05:30
kittenchilly	7a24167b4d	Merge remote-tracking branch 'upstream/upcoming' into overworldsnow	2023-09-08 11:47:35 -05:00
Aaghat	dbeaa2b2e9	add config comment	2023-09-08 21:56:12 +05:30
Aaghat	7832a43544	Minor fixes	2023-09-08 21:47:43 +05:30
Aaghat	cc273ed2c4	Clean Up	2023-09-08 19:25:01 +05:30
Aaghat	c4231ba860	Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss	2023-09-08 18:47:26 +05:30
psf	75d06bb599	Generation 6 Experience Share (#3276)	2023-09-07 23:18:18 -03:00
kittenchilly	e20383b0a4	Merge branch 'upcoming' into overworldsnow	2023-09-07 14:29:30 -05:00
Eduardo Quezada	3333395ff7	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1 ... # Conflicts: # include/constants/battle_script_commands.h # src/battle_script_commands.c	2023-09-07 15:54:55 -03:00
Eduardo Quezada	820113d883	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle_scripts.h # include/battle_util.h # src/battle_script_commands.c # src/battle_util.c	2023-09-07 15:13:06 -03:00
citrusbolt	d31b168522	Add blockBoxRS field to struct BoxPokemon	2023-09-05 06:17:10 -06:00
DizzyEggg	cfd802423b	Fling fixes and tests (#3191) ... * begin fling tests * fling fixes and tests * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * Update test/move_effect_fling.c Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> * scripts names change * fix fling's test file --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-09-05 06:56:36 -03:00
ghoulslash	675aa5db41	fix GetBattleAnimMoveTargets logic (#3278) ... * fix GetBattleAnimMoveTargets logic * more efficient GetBattleAnimMoveTargets --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-09-05 09:21:14 +02:00
kittenchilly	1e10bbe007	Merge branch 'upcoming' into overworldsnow	2023-09-04 17:57:20 -05:00
kittenchilly	2fa4206bf1	Add new Substitute doll sprites (#3263)	2023-09-04 19:48:43 -03: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
Ariel A	f8ca559378	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-09-03 18:17:50 -04:00
Ariel A	d800d71461	Merge branch 'followers' into lighting	2023-09-03 17:49:27 -04:00
Ariel A	bf80e5cf4f	Merge branch 'followers' into followers-expanded-id ... # TODOs changed: # -: Define action flags:	2023-09-03 17:42:31 -04:00
Ariel A	8df538479a	Merge branch 'master' into followers	2023-09-03 17:39:35 -04:00
Ariel A	d929aa60ed	Added support for 48x48 and 64x64 followers. See event_objects.h	2023-09-03 16:51:43 -04:00
kittenchilly	0a781217ea	Merge branch 'upcoming' into overworldsnow	2023-09-02 15:17:23 -05:00
Eduardo Quezada	66710ac22a	Updated various defines	2023-08-31 23:54:11 -04:00
Eduardo Quezada	c4553c71aa	5 more callnatives ... - jumpifshelltrap - jumpifemergencyexited - jumpifrodaffected - jumpifabsorbaffected - jumpifmotoraffected	2023-08-31 23:43:48 -04:00
Eduardo Quezada	4ac61ad15f	handleultraburst, handleprimalreversion, handlemegaevo	2023-08-31 22:34:57 -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
kittenchilly	9fcb1a8687	Merge remote-tracking branch 'upstream/upcoming' into overworldsnow	2023-08-31 11:56:12 -05:00
LOuroboros	d78d63e537	Fixed redundant calls in Teleport's battle script (#3212) ... The battle script was originally making an extra call to attackcanceler and attackstring pointlessly whenever there was a jump to BattleScript_EffectBatonPass. This commit addresses that by relocating BattleScript_EffectTeleport's own calls to attackcanceler and attackstring.	2023-08-31 09:07:06 +02:00
DizzyEggg	aae4a0970c	merge with upcoming	2023-08-30 15:46:27 +02: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	a7615f9649	remove almost all usage of active battler	2023-08-30 11:21:10 +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
kittenchilly	d540eccbb1	Merge branch 'upcoming' into ultraburst	2023-08-29 16:17:35 -05:00
DizzyEggg	0381ccdf32	remove more of gActiveBattler	2023-08-29 16:20:16 +02:00
DizzyEggg	156aa59f18	start removing gActiveBattler in controller emitters	2023-08-29 15:21:31 +02:00
DizzyEggg	44acd287f1	solve conflicts	2023-08-29 10:41:05 +02:00
DizzyEggg	6ae1ba10da	fix conflicts	2023-08-28 13:55:45 +02:00
GriffinR	d67914e114	Merge pull request #1912 from GriffinRichards/moves-mask ... Handful of fixes related to MAX_MON_MOVES	2023-08-27 19:40:59 -04:00
kittenchilly	37f6685949	Merge branch 'upcoming' into overworldsnow	2023-08-27 14:51:57 -05:00
WhenGryphonsFly	5abeb6718d	Correct KEY_INTR_ENABLE	2023-08-27 14:30:57 -05:00
kittenchilly	48d6fe2e64	Merge branch 'upcoming' into ultraburst	2023-08-26 14:43:31 -05:00
voloved	2a2cd77cf4	Allow Cycling Through Balls in the Last Ball Used Menu (#3039)	2023-08-24 19:23:26 -04:00
LOuroboros	9d6953cc63	Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243) ... * Deleted sTMHMMoves array, TMs/HMs read moves from their secondaryId item field now The unused "registrability" variable has been removed in order to preserve the size of the gItems array after turning the secondaryId variable into a u16. * Made ItemIdToBattleMoveId return ITEM_NONE if an item that is not a TM/HM is passed through it * Renamed IsMoveHm to IsMoveHM	2023-08-21 12:49:17 +01:00
DizzyEggg	9cf5376c96	use GetBattlerParty in LoadMonSprite	2023-08-21 09:43:01 +02:00
kittenchilly	a79898f1b1	Make fog cause misty terrain	2023-08-20 13:51:48 -05:00
GriffinR	4941e2602a	Merge pull request #1909 from GriffinRichards/stat-anim ... Document stat change animation	2023-08-20 14:29:11 -04:00
kittenchilly	0ad3919f22	Fix overworld snow weather	2023-08-19 01:40:31 -05:00
Eduardo Quezada	d3333812dd	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer	2023-08-17 17:52:28 -04:00
GriffinR	bdc0ea1037	Add MOD to match mod with powers of 2	2023-08-16 16:44:45 -04:00
GriffinR	057928438a	Document ChooseMoveAndTargetInBattlePalace	2023-08-16 16:41:29 -04:00
GriffinR	aca7998b93	Add missing use of ALL_MOVES_MASK	2023-08-16 14:33:15 -04:00
GriffinR	10a10e914b	Merge pull request #1910 from GriffinRichards/misc-constants ... Use miscellaneous missing constants	2023-08-15 17:53:41 -04:00
sbird	6a622eb006	Merge remote-tracking branch 'pret/master' into feature/dynmulti	2023-08-14 13:20:03 +02:00
GriffinR	4c2b12541b	Merge pull request #1908 from GriffinRichards/name-buffer ... Automatically update nickname buffer sizes	2023-08-12 23:36:19 -04:00
kittenchilly	3435c590c9	Merge branch 'upcoming' into ultraburst	2023-08-12 18:58:38 -05:00
Eduardo Quezada	09fc48461f	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # test/battle/move_flags/three_strikes.c # test/move_flag_strike_count.c # test/move_flag_three_strikes.c # test/powder_moves.c # test/status1.c	2023-08-12 16:31:44 -04:00
Eduardo Quezada D'Ottone	d62c0d6d51	Organized tests into subfolders (#2822)	2023-08-12 20:00:15 +01:00
kittenchilly	5e8caa8d45	Merge branch 'upcoming' into ultraburst	2023-08-12 12:36:11 -05:00
kittenchilly	2b27b0bf00	Constants	2023-08-12 12:30:36 -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
Philipp AUER	59da940283	Refactor damage formula to match Gen5+ (#3196) ... * [battle, damage] refactor damage formula to match gen5+ * [test] use exact values for dry skin, swarm tests * fixup: assume stats for dry-skin, swarm tests --------- Co-authored-by: sbird <sbird@no.tld>	2023-08-11 16:28:38 -04:00
GriffinR	b248791f47	Merge pull request #1904 from GriffinRichards/temp-alias ... Add temp flag and var aliases	2023-08-11 15:45:00 -04:00
Eduardo Quezada	f026b51b48	Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer ... # Conflicts: # src/battle_main.c # src/battle_tower.c # src/match_call.c	2023-08-11 11:41:44 -04:00
Kermalis	9226b23fb8	Remove ewram in headers	2023-08-10 20:11:07 -04:00
GriffinR	60a6c9d160	Merge pull request #1903 from GriffinRichards/frontier-gfx ... Fix some frontier gfx, adjacent cleanup	2023-08-10 14:49:44 -04:00
GriffinR	18319e8da3	Misc missing constant use	2023-08-10 01:42:18 -04:00
GriffinR	079f2da0f6	Fix some missing constant use in Apprentice	2023-08-10 00:38:23 -04:00
kittenchilly	c3e31af5f3	Ultra burst trigger	2023-08-09 22:12:26 -05:00
GriffinR	d1c2a30149	Merge pull request #1907 from GriffinRichards/fix-tv ... Fix Bravo Trainer Tower member names	2023-08-09 15:25:45 -04:00
GriffinR	6eaaa50ad5	Correct berry fix graphics colors, more PLTT constant use (#1892)	2023-08-09 12:49:21 -04:00
Martin Griffin	912a80e27a	Reference TMs and HMs by move instead of number (#1732)	2023-08-09 10:51:01 -04:00
DizzyEggg	fec8f14fff	IsAiAiBattle function	2023-08-09 15:57:22 +02:00
DizzyEggg	8d5ba6c6d1	allow ai vs ai battles	2023-08-09 09:15:42 +02:00
GriffinR	6598cb30bc	Document stat change animation	2023-08-08 23:56:16 -04:00
GriffinR	65fee186f8	Automatically update nickname buffer sizes	2023-08-08 16:28:09 -04:00
GriffinR	087a2cecef	Fix Bravo Trainer Tower member names	2023-08-08 14:38:00 -04:00
DizzyEggg	f72ec368fc	improve switching with ai bad moves	2023-08-08 12:55:47 +02: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
Alex	8ee3a3c5bb	solve conflics	2023-08-07 14:25:30 +02:00
DizzyEggg	ce18df46e6	replace global usage of gActiveBattler in controller files	2023-08-07 12:51:58 +02:00
DizzyEggg	b8ba6139cb	health bar update	2023-08-07 10:29:02 +02:00
DizzyEggg	546b0c7e97	handle move anim	2023-08-07 09:26:03 +02:00
DizzyEggg	e8d6c99e6d	more controllers work	2023-08-07 01:05:09 +02:00
DizzyEggg	ef8024d8c5	draw trainer pic	2023-08-06 21:50:59 +02:00
DizzyEggg	a9483c361b	trainer intro ball throw	2023-08-06 12:41:36 +02:00
DizzyEggg	ffb0e20049	hide show party status summary	2023-08-05 23:27:56 +02:00
DizzyEggg	18db0cb3b7	controller string	2023-08-05 22:41:13 +02:00
DizzyEggg	f9e131b6ac	fix recorded, exp update the same for player partner	2023-08-05 21:34:17 +02:00
DizzyEggg	0b4c1aa275	more work on controllers	2023-08-05 20:42:19 +02:00
DizzyEggg	1793b9e1da	more controller functions	2023-08-05 14:11:25 +02:00
DizzyEggg	a505cd7fb9	simplify the get mon set mon data functions more	2023-08-05 12:53:14 +02:00
DizzyEggg	cbebdf044a	handle se, bgm and fainting cry	2023-08-05 12:13:50 +02:00
DizzyEggg	5a8b6c18ef	ball throw and start removing empty controller functions	2023-08-05 11:05:37 +02:00
GriffinR	41847cd5aa	STAT_ANIM constant usage	2023-08-04 16:27:45 -04:00
DizzyEggg	c72bb27325	faint animation	2023-08-04 22:15:39 +02:00
GriffinR	866c32a735	Add temp var aliases	2023-08-04 14:17:28 -04:00
DizzyEggg	7360a4a18a	up to return mon to ball	2023-08-04 17:29:29 +02:00
DizzyEggg	7ba8a0216f	more work on controllers	2023-08-04 13:42:40 +02:00
ghoulslash	a0dd77dd41	Improve AI switching, so it doesn't get killed on switch-in (#3146)	2023-08-04 07:34:58 -04:00
DizzyEggg	cc30d2fb53	start removing duplicate controller functions	2023-08-04 12:10:38 +02:00
GriffinR	6d4dadd7b5	Add temp flag aliases	2023-08-03 15:55:06 -04:00
GriffinR	16c0be7ed2	Fix some frontier gfx, adjacent cleanup	2023-08-03 11:15:15 -04:00
Philipp AUER	7d8bcce9a5	Optimize sprite.c (#3175)	2023-08-03 15:57:04 +03:00
Martin Griffin	b3295d1cfb	Reverted BattleMove power to u8 (#3187)	2023-08-02 12:20:11 +01: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
Philipp AUER	44eb6260cc	[battle, anim] woodhammer animation overhaul (#3192) ... * [battle, anim] woodhammer animation overhaul * squashme: timings --------- Co-authored-by: sbird <sbird@no.tld>	2023-08-01 19:10:18 -04:00
Eduardo Quezada D'Ottone	54816816a0	Fixed null dereferencing errors with -fanalyzer on modern (#3165)	2023-07-31 14:49:08 -04:00
Eduardo Quezada D'Ottone	f0d03dd99b	Set GEN_LATEST to GEN_9 (#3186)	2023-07-31 15:41:53 +02:00
DizzyEggg	efb98e97c7	remove unused config B_CHECK_IF_CHARGED_UP	2023-07-31 14:22:48 +02: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
Ariel A	394b4cb3a5	Merge branch 'followers' into followers-expanded-id	2023-07-29 17:26:31 -04:00
Ariel A	712669c822	Added support for follower bobbing. See event_objects.h	2023-07-29 17:23:32 -04:00
Alex	bca29d8586	Adds Mortal Spin and Population Bomb	2023-07-26 17:37:56 +02:00
DizzyEggg	7b7cbf506d	Merge branch 'upcoming' into ai_switching	2023-07-26 09:23:53 +02:00
Martin Griffin	0e5c78aeb6	Merge remote-tracking branch 'pret/master' into 'rhh/master'	2023-07-25 19:49:18 +01: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
Martin Griffin	31a3ada7de	Detect potential misalignment in modern	2023-07-24 19:42:56 +01:00
Martin Griffin	3f5daa8cf1	Add BENCHMARK to test runner ... Counts the time spent in the block in arbitrary time units (64-cycles currently). If the block takes more than ~4 million cycles (~0.25s) the benchmark will wrap around. Note that the time can be affected by the timeout IRQs, and should only be taken as a loose indication of relative performance.	2023-07-24 15:18:28 +01:00
Martin Griffin	b53cca1a06	Declarations for 2- and 3-argument GetMonData (#1756) ... * Type-safe GetMonData/GetBoxMonData * Comments	2023-07-24 09:57:37 -04:00
ghoulslash	b5431898c2	RNG for Metronome, multi-hit moves, and Loaded Dice (#3159)	2023-07-23 08:15:14 -04:00
Martin Griffin	fc321965a9	RNG_HITS and RNG_LOADED_DICE	2023-07-23 10:24:58 +01:00
ghoulslash	a527d6c7de	Fix wrong color in stat move animation (#3161)	2023-07-23 04:38:25 -04:00
gruxor	fc8ee625b6	Fixed outstanding UB with -fanalyzer on modern	2023-07-21 15:51:03 -04:00
Alex	ad25dfe1e9	Set otGender + Moves in FillPartnerParty (#3163)	2023-07-21 14:43:39 -04:00
DizzyEggg	fc37345c29	Fix wrong color in stat move animation	2023-07-21 10:42:39 +02:00
Martin Griffin	b406a9c1bd	RandomUniformExcept and RNG_METRONOME	2023-07-20 10:25:03 +01:00
Eduardo Quezada	47cea526ec	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # src/battle_util.c	2023-07-19 23:22:07 -04:00
Bassoonian	7fa6ed8b05	Fix priortiy typos	2023-07-19 17:33:28 +02:00
Alex	6b5d1e7577	Adds some gen9 moves (#3147) ... * Adds some gen9 moves * Fix Test + Tabs * Collision Course boost changed to 1.3333	2023-07-19 13:25:20 +02:00
Eduardo Quezada D'Ottone	cf29c9eb69	Fixed enemy parties not reverting to their original form post-battle (#3150)	2023-07-19 08:46:57 +02:00
Eclipse	ca792d43cc	Gender differences sprites, final part (#3122) ... * The last survivors * Tweaked Numel, Milotic and Relicanth Updated their sprites according to their current depictions. --------- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-07-18 21:31:22 -04:00
DizzyEggg	f4dc5e931f	some more stuff	2023-07-18 12:01:25 +02:00
DizzyEggg	1bd4f9c7a8	rework incoming surviability	2023-07-18 11:36:09 +02:00
Eduardo Quezada D'Ottone	b08c8f85fc	Fixed Utility Umbrella damage calculations (#2835) ... * Fixed Utility Umbrella holders not receiving regular damage when being hurt by what would've been weakened rain/sun attacks * Fixed reading move incorrectly * Tests: Sun, Rain, Utility Umbrella and Hydro Steam * [STASH] Skeli changes, needs to remake tests * Fixed tests * Removed redundant tests * Removed unused variable * Removed Primal Todo tests	2023-07-18 09:22:05 +02:00
Eduardo Quezada D'Ottone	6fec0e4dd1	Ported TheXaman's latest changes to the Debug Menu (#2815) ... * Added option for generating incrementing pokemon in pc boxes # Conflicts: # src/debug.c * added submenu arrows, increased menu high to full screen # Conflicts: # src/debug.c * combined flags and vars into one submenu # Conflicts: # src/debug.c * added new window to flags/vars showing the current state and added submenu indicator # Conflicts: # src/debug.c * added alligned arrows for debug submenus # Conflicts: # src/debug.c * used {CLEAR_TO X} instead of manual spaces # Conflicts: # src/debug.c * renamed gDebugText to proper sDebugText # Conflicts: # src/debug.c * added Fill submenu, added fill function for PC items and all bag pockets @LOuroboros # Conflicts: # src/debug.c * put cheat start into utility # Conflicts: # src/debug.c * put fill submenu into main menu # Conflicts: # src/debug.c * tiny fix * renaming and reordering # Conflicts: # src/debug.c * Added reset pokedex flags for @AsparagusEduardo * made flag toggle list dynamic # Conflicts: # src/debug.c * initial battle debug menu WIP # Conflicts: # src/debug.c # src/wild_encounter.c * fix visual bug * added battle start # Conflicts: # include/debug.h # src/battle_ai_script_commands.c * Added faster way to add initial movesets to mon * Added waiting music for the slow box filling * Simplified the call to scripts * Simplified debug scripts * Disabled Battle Test for now * Fixed personality on fast PC fill being always 0 * Removed BATTLE_ENGINE instances + added AI_FLAG_COUNT * Added missing return TRUE * Sets nickname * Changed how GetSpeciesName to how it's used upstream --------- Co-authored-by: TheXaman <48356183+TheXaman@users.noreply.github.com>	2023-07-18 09:17:03 +02:00
Eduardo Quezada D'Ottone	43ad1a4d3b	Unified multi-strike move flags (#3126) ... * Unified twoStrikes and threeStrikes flags into strikeCount * Decreased strikeCount max from 255 to 15.	2023-07-18 09:07:14 +02:00
Alex	38655b9d1f	Fix gem boost on multi hit moves and config for gem param (#3144)	2023-07-18 06:11:54 +01:00
DizzyEggg	1f1d24b3e4	Fix Primal Reversion not activating when switching in after fainting (#3141) ... * Fixed Primal Reversion not activating when switching in after a fainting * add tests for primal reversion Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2023-07-16 12:26:54 +01:00
Martin Griffin	17f8f50a59	Merge remote-tracking branch 'rhh/master' into upcoming	2023-07-16 07:46:34 +01:00
DizzyEggg	3c5c68ac58	Fix how AI categorizes Weak moves and give priority to always hits moves when needed (#3109) ... * ai weak move fix and always hits move prioritarizing	2023-07-16 07:24:59 +01:00
Martin Griffin	58ede15263	Fix Roullout Fury Cutter AI power calc (#3110)	2023-07-16 06:45:35 +01:00
Martin Griffin	c4057cb0e0	Fix Metronome's/Mirror Move's called move to take powder moves / multi hit moves into account (#3135)	2023-07-16 06:41:18 +01:00
DizzyEggg	2a249654e7	fix mirror move/metronome powder/multi hit moves & tests	2023-07-15 14:00:55 +02:00
Eduardo Quezada	168b005406	Merge branch 'RHH/master' into RHH/upcoming	2023-07-14 12:40:01 -04:00
SonikkuA-DatH	6382640f8a	Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks (#3127) ... * Casrform graphics. Palette changes, edited backs, and 2 Frame anims * Castform Graphics * Cherrim graphics, and Castform redefinitions * Spheal and Spinda Graphic edits. Spheal mouth adjustment, Spinda 2 frame and palette * Revised Spinda Spot drawing function, removed tabs * Animations for Castform forms, Spinda, Cherrim Sun, and Spheal set * Spacing * Forgot shiny pal. Fixed * Delete .vs directory * remove vs ref	2023-07-14 11:45:40 -04:00
Eduardo Quezada	240f41fc58	Reverted BattleMove power to u8 ... Nothing was using it, despite what the comment suggested	2023-07-14 10:53:40 -04:00
Eduardo Quezada D'Ottone	5f29ae6f99	Failed tests are now listed in the total (#3073) ... * Failed tests are now listed in the total	2023-07-14 10:17:54 +01:00
Martin Griffin	d3d582dd70	[battle, fpmath] revert changes to Q_24_8 format (#3125)	2023-07-14 10:15:55 +01:00
DizzyEggg	0c0b841a80	Remove debug item effect override (#3106)	2023-07-13 18:47:01 -04:00
sbird	cb66e8b770	[battle, fpmath] revert changes to Q_24_8 format	2023-07-13 23:43:02 +02:00
Eduardo Quezada D'Ottone	0efc9a29ad	Disabled species now default their graphics to SPECIES_NONE (#3116)	2023-07-12 20:11:07 -04:00
gruxor	5fd881a1b6	Remove unused macro to fix syntax highlights	2023-07-12 14:44:23 -04:00
Eduardo Quezada	3aaa89ce71	Changed all instances of gSpeciesNames so that it uses GetSpeciesName	2023-07-07 14:37:51 -04:00
Eduardo Quezada	adfc0af372	Mon graphics are now loaded depending on their availability ... - If it has a female sprite/palette, it's loaded. - If it the species is enabled and it has a sprite/palette, it's loaded. - Otherwise, load the SPECIES_NONE graphics.	2023-07-07 14:36:30 -04:00
sbird	6482279fa3	[battle, math] refactor damage calculation to use proper fp type and inlined multiplication	2023-07-07 18:51:23 +02:00
Eduardo Quezada	4405f79d24	Merge branch 'RHH/master' into RHH/upcoming	2023-07-06 13:15:06 -04:00
Eduardo Quezada	f21953f254	Merge remote-tracking branch 'pret/master' into RHH/master	2023-07-06 13:06:31 -04:00
DizzyEggg	9a09f1e3b9	Fix Roullout Fury Cutter AI power calc	2023-07-06 13:41:16 +02:00
Eduardo Quezada	b10b5fd9c3	EVERYTHING_CUSTOMIZED -> TRAINER_PARTY	2023-07-05 18:31:08 -04:00
Eduardo Quezada	e8487961c7	TrainerMonCustomized -> TrainerMon	2023-07-05 18:29:28 -04:00
Eduardo Quezada	b86184a4f6	Removed TrainerMonPtr	2023-07-05 18:23:18 -04:00
Eduardo Quezada	2f9e0ecd9f	Removed uses of F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED	2023-07-05 18:22:48 -04:00
ghoulslash	1a53154324	Beat Up AI Damage Calc (#3104) ... * add specific AI dmg calc for new beat up * beat up ai calc optimizations --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-07-05 20:59:42 +02:00
Martin Griffin	eab4e32e2a	Shuffle implementation (#3097)	2023-07-05 19:46:40 +02:00
Eduardo Quezada	3dd7a2c09e	Removed TrainerMonNoItemDefaultMoves	2023-07-04 21:29:58 -04:00
Eduardo Quezada	9c961b4fd5	Removed TrainerMonNoItemCustomMoves	2023-07-04 21:22:27 -04:00
Eduardo Quezada	1ef56f6ae1	Removed TrainerMonItemDefaultMoves	2023-07-04 21:16:47 -04:00
Eduardo Quezada	c201cae2ee	Removed TrainerMonItemCustomMoves	2023-07-04 21:06:55 -04:00
Eduardo Quezada D'Ottone	862602233d	Gender differences sprites, part 3 (#3095)	2023-07-04 11:36:24 -04:00
ghoulslash	cc3a6d4d94	make special case ABILITYEFFECT_xx ids their own caseId switch cases to fix potential overlap with ability IDs 0xFF etc (#3083) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-07-03 10:03:50 +02:00
Eduardo Quezada D'Ottone	1fa9a05470	Convert move flags and bans into GCC bitfields (#2952) ... * Slicing moves to new bitfield * Wind moves to new bitfield * Two-strike moves to new bitfield * Forgot to add flagTwoStrikes to battle_moves.h * Removed "flag" from field names * FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER * Airborne moves * FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE * FLAG_BALLISTIC and FLAG_PROTECTION_MOVE * Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c * FLAG_SOUND * FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER * FLAG_DMG_MINIMIZE * Cleanup * FLAG_STAT_STAGES_IGNORED * Updated Pollen Puff's ballistic flag * FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST * thaw * FLAG_THREE_STRIKES * FLAG_IRON_FIST_BOOST * FLAG_RECKLESS_BOOST * FLAG_HIGH_CRIT * Removed empty flags * Moves that fail when called by Me First + added missing Shell Trap * Moves that fail when Gravity is active * Better names for banned fields * Moves that fail when called by Instruct * Cleanup * Contact Moves + Fixed Wandering Spirit skipping contact checks * Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect. * Simplified B_MOVE_FLAGS configs * FORBIDDEN_METRONOME * Renamed hitsPastSubstitute to ignoresSubstitute * FORBIDDEN_PARENTAL_BOND * Struggle uncallable by Metronome * FORBIDDEN_MIMIC * FLAG_KINGS_ROCK_AFFECTED * Made a single config for move flags * Macro for checking move flags * FLAG_MAGIC_COAT_AFFECTED * Fixed HasMagicCoatAffectedMove * FLAG_SNATCH_AFFECTED * Removed unused EFFECT_FLINCH_MINIMIZE_HIT * Fixed Stench/King's Rock interaction * Removed sMovesNotAffectedByStench in favor of checking move effects * Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT * Changed Gen2 configs to less than Gen 3 * FORBIDDEN_SLEEP_TALK * Cleanup * Inverted FLAG_MIRROR_MOVE_AFFECTED * FLAG_SHEER_FORCE_BOOST * Ordered * FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT * Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field * Fixed Triple Arrows test	2023-07-03 10:01:59 +02:00
SubzeroEclipse	23d51df7c0	Added Hisuian Sneasel	2023-07-01 11:16:31 +02:00
SubzeroEclipse	d202bdd09c	Added even more gender difference sprites, 2/2	2023-07-01 10:25:17 +02:00
Eduardo Quezada	2c4a9b754d	Merge branch 'RHH/master' into RHH/upcoming	2023-06-30 16:14:57 -04:00
SubzeroEclipse	0733e0908c	Added even more gender difference sprites, 1/2	2023-06-30 10:40:46 +02:00
Eduardo Quezada D'Ottone	81e59ace25	Cleaned up remaining Castform hack stuff (#3063) ... * Removed gCastformFrontSpriteCoords * Removed sCastformElevations and IsCastformForm * Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct * Scrubbed unused BS commands * Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants * Removed redundant function in Pokémon Debug menu * Removed handling in animation scripts * Removed gBattleMonForms * Reduced MAX_MON_PIC_FRAMES to 2 * Removed Castform/Cherrim makefile stuff * Fixed weather form change tests not checking species. * Fixed Castform palettes after Lunos' PR	2023-06-30 09:58:07 +02:00
Eduardo Quezada D'Ottone	4c4365b0c1	Config for LGPE friendship stat boost (#2257) ... * Config for LGPE friendship stat boost * Separated Exp and Stat settings	2023-06-28 18:44:53 +02:00
Alex	20099274d8	Fix Clear Amulet visual bug + Tests (#3074) ... * Fix Clear Amulet visual bug + Tests TODO Tests, additional tests + Triple Kick pp bug * Wonder Guard message, switch instead of if, misalignments	2023-06-28 12:26:03 -04:00
Eclipse	fc52414383	Added many more gender differences sprites (#3082) ... Added sprites for the remaining Gen1 mons and a couple of evolutions.	2023-06-27 21:11:01 -04:00
Eclipse	a44af6f06f	Gender differences sprites, part 1 (#3070) ... * Added some gender difference sprites Added sprites for: - Pikachu/Raichu - Doduo/Dodrio - Goldeen/Seaking - Xatu - Politoed - Meditite/Medicham - Gible/Gabite/Garchomp NOTE: I had to tweak Doduo's palette file because it wasn't matching the normal one and a result Doduo's beak looked weird. * Swapped Pikachu sprites Replaced them with the ones provided by CyanSixFour because they looked better than the ones that I had. * Added Gloom and Vileplume * Fixed Pikachu forms Edited the macros so that only base Pikachu would show different forms based on gender. Big thanks to AsparagusEduardo for helping with this. * Swapped a few more sprites Replaced Goldeen (female back), Politoad (female back), Medicham (female all) sprites with those provided by CyanSixFour because they looked better. Also tweaked my male Meditite back	2023-06-26 19:04:19 -04:00
PacFire	4b3b9b5e0a	Added icon for Clear Amulet (#3078) ... * Update graphics.h * Update item_icon_table.h * Update items.h * Add files via upload added icon for clear amulet, shards still missing. * Add files via upload added clear amulet's palette * Update graphics.h	2023-06-26 18:19:33 -04:00
Eduardo Quezada	f9bf91a2f0	Merge branch 'RHH/master' into RHH/upcoming	2023-06-26 18:09:53 -04:00
ghoulslash	c7e8edf19b	Easy Chat always shows words in uppercase (#3050)	2023-06-24 13:28:13 -04:00
Eduardo Quezada	ca1d9f5393	Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # include/battle_util.h	2023-06-21 15:01:14 -04:00
ghoulslash	7371a9e401	Add many gen 8 move animations (#2861) ... * port many gen8 and 9 move anims from cfru * fix thunder cage, shell smash, shelter anims. update anim credits --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-06-21 13:19:54 -04:00
Pawkkie	62ae3b1df1	Fix bug due to variable overflow when AI chooses new Pokemon to send out (#3068)	2023-06-21 12:59:30 -04:00
Eduardo Quezada	6342da3b58	Merge remote-tracking branch 'RHH_origin/master' into RHH/upcoming	2023-06-20 15:41:30 -04:00
Eduardo Quezada D'Ottone	b01f7927cf	Fixed Sylveon's evolution method (#3048)	2023-06-19 16:17:51 -04:00
Eduardo Quezada D'Ottone	5128520291	Fixes Hisuian mon not evolving + Fixed regional mon not breeding correctly (#3047)	2023-06-19 16:16:55 -04:00
Eduardo Quezada D'Ottone	0d86ab0945	Gen. 9 Move Effects, 2nd batch (#2870)	2023-06-19 14:00:03 -04:00
LOuroboros	2bf88502a7	More corrections	2023-06-19 04:18:53 -03:00
Eduardo Quezada	03a4793324	Added LoadPlayerObjectEventPalette to load gender pals	2023-06-18 02:24:18 -04:00
Eduardo Quezada	c391c66249	Cleanup pt4 ... - Removed TIME_OF_DAY_FADE and UpdateTimeOfDayPaletteFade - Renamed FieldCallback_Fly back to FieldCallback_UseFly	2023-06-18 01:45:04 -04:00
Eduardo Quezada	bf814e11cd	Cleanup ... - Proper whitespace - Bracket pret style - Simplified RemoveObjectEventInternal - SImplified GetMonInfo - Made IsFollowerVisible easier to read	2023-06-18 01:19:46 -04:00
Eduardo Quezada	148641da15	Cleanup pt2 ... - Reverted GetPlayerAvatarGenderByGraphicsId return type - Removed IsAccurateGBA - Removed TIME_OF_DAY constants	2023-06-17 23:45:44 -04:00
Eduardo Quezada	e7a1c93774	Removed MON_DATA_NATURE	2023-06-17 23:40:38 -04:00
Eduardo Quezada	4bbe3278d6	Cleanup pt1 ... - Moved Tracks to the end of field effect scripts - Restored whitespace in scripts to minimize conflicts - Restored data/maps/map_groups.json - Proper tab uses in scripts - Allow SHADOW_SIZE_XL to be used	2023-06-17 23:34:01 -04:00
Eduardo Quezada	621ca115a2	Added OBJ_EVENT_GFX_SPECIES macro to help setting up OW Graphic IDs	2023-06-17 23:05:59 -04:00
Eduardo Quezada	33012d841a	Cleaning up follower Object Event IDs + Reverted OW Regis ... TODO: allow OW mon to have their frames play more than once	2023-06-17 23:05:29 -04:00
Eduardo Quezada	ab6c7a1df0	Fixed Castform	2023-06-16 22:57:00 -04:00
Eduardo Quezada	341ce6fd95	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 ... # Conflicts: # .github/workflows/build.yml # README.md # gflib/sprite.c # graphics/pokemon/banette/anim_front.png # graphics/pokemon/banette/normal.pal # graphics/pokemon/sentret/normal.pal # graphics/pokemon/togetic/anim_front.png # graphics/pokemon/togetic/normal.pal # include/battle_script_commands.h # include/data.h # ld_script.txt # src/battle_controller_player.c # src/bike.c # src/event_object_movement.c	2023-06-16 21:25:16 -04:00
LOuroboros	9896f20eb8	Applied fixes and corrections (Jun 2023)	2023-06-15 09:22:26 -03:00
LOuroboros	313f522622	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2	2023-06-13 05:44:37 -03:00
Eduardo Quezada	49ffd4a2e9	Easy Chat always shows words in uppercase	2023-06-06 10:55:42 -04:00
Eduardo Quezada	601a96f34a	Fixes Hisuian mon not evolving + fixed regional mon not breeding correctly	2023-06-06 08:01:29 -04:00
Bassoonian	7bf34448e4	Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS	2023-06-05 14:15:07 +02:00
AgustinGDLV	d795256142	remove debug	2023-06-03 11:56:01 -07:00
AgustinGDLV	53fa7e524c	allow for illegal abilities within tests	2023-06-03 11:32:54 -07: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
Martin Griffin	412f6f5352	Separate build directory for tests and TESTING define (#3002) ... * Separate build directory for tests and TESTING define * fixup! Separate build directory for tests and TESTING define * fixup! Separate build directory for tests and TESTING define * fixup! Separate build directory for tests and TESTING define	2023-05-31 09:38:37 -04:00
GriffinR	5100eef017	Merge pull request #1890 from GriffinRichards/pal-macro ... Add some missing palette macro use	2023-05-28 18:28:50 -04:00
AgustinGDLV	3d4789c492	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-28 11:10:50 -07:00
ghoulslash	a929ae8b48	Replace launchtemplate and launchtask in battle anims (#2640) ... * replace launchtemplate with createsprite using fix_launchtemplate.py * tidy up script * fix comment handing in fix_launchtemplate.py * fix double comma after sprite template * remove py script * convert launchtask -> createvisualtask * fix launchtask->createvisualtask issue * fix ANIM_PAL ORs * remove launchtemplate, launchtask macros * fix pal macros in z moves * fix bloom doom * add F_PAL_ALL_BUT_DEF * remove all ANIM_PAL_ usages * devestating drake fix * convert launchsoundtask and setblends * Reworked CFRU macro PR --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2023-05-27 17:32:53 -04:00
Eduardo Quezada D'Ottone	d0e6ea7612	Optimized battle gender checks (#3020) ... * Optimized battle gender checks * Apply suggestions from code review Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com> --------- Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>	2023-05-27 17:23:02 -04:00
GriffinR	14f7e49099	Add some missing palette macro use	2023-05-25 15:09:16 -04:00
AgustinGDLV	5a8715e608	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix	2023-05-23 16:10:44 -07:00
AgustinGDLV	d4c7e5e559	changed B_WEATHER_FORM preproc to affect tables instead of function	2023-05-23 14:03:38 -07:00
ghoulslash	e52349b474	fix missed conflict	2023-05-22 12:28:32 -04:00
Eduardo Quezada D'Ottone	f979013b7e	Disable Gen8+ Obedience Mechanics by default (#2980)	2023-05-21 16:57:43 -04:00
psf	9506b205e6	Changed 999999 in MaxMoney to MAX_MONEY constant (#3015)	2023-05-20 08:25:59 -04:00
LOuroboros	29d2d4202e	Evolution updates (#3009) ... * Add Hisuian Sneasel's evolution to gEvolutionTable * Updates -Added EVO_ITEM_NIGHT, (it's like EVO_ITEM_DAY but nighttime specific) -Added EVO_ITEM_HOLD (it's like the day based variations, but day agnostic) -Turned the trade evo items into regular evolution items -Ditched the config for the Razor Claw by request -Updated every entry in gEvolutionTable for species that could only evolve via EVO_TRADE_ITEM to LA's standard * Review corrections (extrapolations) * Post Cherrypick corrections * Corrected the description of EVO_ITEM_NIGHT * Added a config for the new items' field-evolving functionality	2023-05-18 06:39:14 -04:00
AgustinGDLV	d133564e21	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-16 21:57:06 -07:00
AgustinGDLV	785b100693	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix	2023-05-16 16:29:38 -07:00
AgustinGDLV	0c182345bf	reworked weather form reversion + added more tests	2023-05-16 16:24:25 -07:00
Ariel A	540c536342	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-05-15 19:15:38 -04:00
Ariel A	5d392244be	Merge branch 'followers' into followers-expanded-id	2023-05-15 19:08:45 -04:00
Ariel A	996f43120d	Merge branch 'followers' into lighting	2023-05-15 18:50:55 -04:00
Ariel A	d12efe8cd7	Merge branch 'master' into followers	2023-05-15 18:37:38 -04:00
LOuroboros	49a9210e9d	Fixed typo in include/config/battle.h	2023-05-15 16:45:30 -03:00
ghoulslash	60710f823e	merge w upcoming	2023-05-15 13:13:28 -04:00
Eduardo Quezada D'Ottone	2aca82300c	Merge branch 'upcoming' into mega_evo_issues	2023-05-14 22:33:01 -04:00
AgustinGDLV	e47eca1c5a	mid converting script commands to callnative	2023-05-13 22:07:04 -07:00
Bassoonian	c05404e772	Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge	2023-05-12 13:48:52 +02:00
AgustinGDLV	3b6389ec21	updated tests	2023-05-11 22:13:43 -07:00
AgustinGDLV	aec51b5b04	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-11 20:02:06 -07:00
ghoulslash	0585123da9	merge w pret	2023-05-11 10:44:57 -04:00
ghoulslash	5657f8369e	merge w pret	2023-05-11 10:44:18 -04:00
ghoulslash	ee0652416d	merge w pret	2023-05-11 10:27:41 -04:00
ghoulslash	b227d4c637	Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs	2023-05-11 10:03:46 -04:00
GriffinR	8b37b4292a	Document DrawFootprint	2023-05-09 22:43:25 -04:00
Salem	fe5e59c910	Merge branch 'upcoming' into RHH/content/gen9SnowWeather	2023-05-07 17:27:58 +02:00
Martin Griffin	9cd13cc520	Fix USE_ITEM explicit targets	2023-05-07 07:50:41 +01:00
Eduardo Quezada D'Ottone	220b60f315	Detect memory leaks in tests (#2698)	2023-05-06 21:22:47 -04:00
Eduardo Quezada D'Ottone	c530eb2445	Add mirror herb (#2873)	2023-05-06 21:20:37 -04:00
Eduardo Quezada D'Ottone	84aed50c5b	Manually port daycare expansion to modern standards (#2963)	2023-05-06 21:03:05 -04:00
Eduardo Quezada D'Ottone	42445512ad	Battle Item Tests + critical fixes + new test macro (#2940)	2023-05-06 20:43:32 -04:00
GriffinR	dd65eddbdd	Merge pull request #1883 from GriffinRichards/doc-mod ... Add some missing ARRAY_COUNT, make TV_SHOWS_COUNT depend on NUM_NORMAL_TVSHOW_SLOTS	2023-05-05 02:38:30 -04:00
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
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
Shae	ae2d5f7d1e	Weather related Ability tests, fix for Leaf Guard not preventing Rest. (#2957)	2023-05-02 14:08:05 -04:00
CallmeEchoo	6758f6ebe7	add some snow related tests	2023-05-02 16:25:26 +02:00
CallmeEchoo	0bf92943d4	spelling	2023-05-02 16:25:26 +02:00
CallmeEchoo	76721b16f8	add snow weather	2023-05-02 16:25:26 +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	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
Alex	176c6750aa	Set new animations as default (#2964)	2023-04-30 10:02:18 -04:00
Bassoonian	8f75844ece	Add Ability inheritance	2023-04-30 12:58:18 +02:00
Bassoonian	acf4529d8b	Allow Egg Move transfer for non-eggs	2023-04-30 11:25:48 +02:00
Bassoonian	b53c913558	Manually port daycare expansion to modern standards	2023-04-29 18:16:36 +02:00
GriffinR	c2dad5ac44	Redefine TV_SHOWS_COUNT	2023-04-27 13:59:09 -04:00
Bassoonian	c279830892	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution	2023-04-27 10:50:32 +02:00
Eduardo Quezada D'Ottone	408aa30aa7	Merge pull request #17 from AgustinGDLV/pr/castform_fix	2023-04-26 14:25:36 -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
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	2aa4d2da38	Fix Ice Heal message	2023-04-25 19:38:47 +02:00
CallmeEchoo	632668e8b2	Merge branch 'battleItemFixes' into battleItemTests	2023-04-24 21:13:12 +02:00
ghoulslash	868838a87d	Add thunder cage case to trap anim IDs (#2941)	2023-04-24 14:35:42 -04:00
sbird	12d4b43755	Merge remote-tracking branch 'pret/master' into feature/dynmulti	2023-04-24 18:30:30 +02: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
Bassoonian	a2bc21d902	Update battle_ai_util.h ... Co-Authored-By: Salem <65783283+callmeechoo@users.noreply.github.com>	2023-04-24 14:05:35 +02: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	13f6acf9a1	General mechanics	2023-04-23 19:20:48 +02:00
ghoulslash	909a20c27a	Reset battle vars and flags after player whites out (#2875)	2023-04-23 08:42:52 -04:00
ghoulslash	594bc831d6	Adds define B_RESTORE_HELD_BATTLE_ITEMS following Gen9 (#2932)	2023-04-23 08:26:51 -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
Martin Griffin	c81a985b5b	Fix USE_ITEM explicit targets	2023-04-20 21:45:16 +01:00
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
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
LOuroboros	2043380ee2	Oopsie	2023-04-18 10:34:39 -03: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
ghoulslash	7d010529d6	merge w master	2023-04-15 22:06:08 -04:00
ghoulslash	6c8cf2c026	merge w master	2023-04-15 22:04:35 -04: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
Alex	8c4396ddaf	Gen9 move tests batch2	2023-03-29 13:01:20 +02: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
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
AgustinGDLV	504ec36b2b	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-27 16:22:11 -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	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
TheXaman	bc2c3e1d49	Moved all HGSS pokedex code into its own file ... - reordered all hgss code - cleanup needed! - restored the vanilla dex	2023-03-27 11:28:28 +02:00
AgustinGDLV	aa80e3fd4e	fixed G-Max Wildfire, Max Guard interactions, and reworked changedSpecies	2023-03-26 19:14:33 -07: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	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	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
AgustinGDLV	aac4ef4d2a	fixed terrain effects	2023-03-25 20:02:48 -07:00
AgustinGDLV	e1c819a863	opponents properly revert Gigantamax + understand Max Guard	2023-03-25 19:26:55 -07:00
AgustinGDLV	fff0f78c89	fixed Gigantamax and level bugs + lots of clean-up and debug removal	2023-03-25 15:33:50 -07: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
TheXaman	207fcec599	fixes teachable moves change from rhh	2023-03-25 14:50:15 +01:00
TheXaman	eaa74ca7cc	Merge commit 'f4cb6d229f9c0130f763fa711c8a1f7ef59ac2c9' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss	2023-03-25 14:49:27 +01:00
AgustinGDLV	886bee2b90	fixed double HP multiplier application + slapped KNOWN_FAILING on RNG-based tests	2023-03-24 23:11:53 -07:00
AgustinGDLV	5d508f7963	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-24 22:40:51 -07:00
AgustinGDLV	2bcfaf8b57	CanDynamax rewrite, level-up + misc. bug fixes	2023-03-24 22:06:09 -07: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
AgustinGDLV	6dc3c7a143	level reappears in healthbox and form reversion occurs correctly when Dynamax ends	2023-03-23 21:27:45 -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
AgustinGDLV	6233627a57	more tests + fixed hp reversion issues	2023-03-22 17:04:05 -07: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
AgustinGDLV	788642347b	added HP-based damage/healing interactions with Dynamax Pokemon	2023-03-21 11:36:04 -07:00
AgustinGDLV	69fd63a922	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-21 09:56:58 -07:00
AgustinGDLV	5a9e1de836	Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax	2023-03-20 21:14:33 -07:00
AgustinGDLV	7d70222770	added most Dynamax immunities/interactions + tests + fixed some move selection bugs	2023-03-20 16:40:05 -07: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
Ariel A	582761f56a	Merge branch 'lighting' into lighting-expanded-id	2023-03-13 18:22:53 -04:00
Ariel A	07995f8925	Fixed some decoration icons being darkened at night in outdoor shops.	2023-03-13 18:11:05 -04: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
AgustinGDLV	c823e19705	implemented Gigantamax form change	2023-03-11 10:48:21 -08:00
AgustinGDLV	b708da3998	Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax	2023-03-11 00:17:30 -08:00
AgustinGDLV	4293dc8a24	not entirely confident implementation of Dynamax indicator	2023-03-10 23:03:51 -08:00
AgustinGDLV	317b52f3f6	added Dynamax trigger sprite	2023-03-10 22:05:23 -08:00
AgustinGDLV	ec4b330b9b	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-10 21:00:41 -08:00
AgustinGDLV	06bf934b02	Dynamaxed pokemon now have increased HP	2023-03-10 20:38:17 -08:00
LOuroboros	6dbe772e27	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-03-10 18:23:33 -03:00
AgustinGDLV	76073fab52	added basic Dynamax-in-battle	2023-03-10 10:20:27 -08: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
AgustinGDLV	ac649a476f	added Gigantamax check + move display and tint when dynamaxed	2023-03-07 19:21:59 -08: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
AgustinGDLV	7de7599a7b	reworked scripts to remove jumpifnotally / jumpiftargetabsent	2023-03-07 12:07:11 -08:00
AgustinGDLV	e937482c27	fixed potential G-Max Chi Strike, Court Change bugs	2023-03-07 11:18:19 -08: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
AgustinGDLV	7c853ef45e	implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Finale	2023-02-28 16:37:48 -08:00
GriffinR	ec89e519f9	Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful ... Rename eventLegal to modernFatefulEncounter	2023-02-28 11:48:34 -05:00
AgustinGDLV	3cdcf2a356	implemented G-Max Chi Strike, finished G-Max Gold Rush	2023-02-27 22:01:19 -08:00
AgustinGDLV	da24b717e4	implemented all status1 and status2 G-Max Moves: Befuddle, Volt Crash, Malodor, Stun Shock, Gold Rush, Cuddle, Terror, Meltdown, Smite	2023-02-27 21:26:03 -08: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
AgustinGDLV	0908129c84	implemented G-Max Gravitas, G-Max Snooze, G-Max Depletion; Spite works on Max Moves	2023-02-27 18:43:06 -08:00
AgustinGDLV	93d8efd51f	implemented G-Max Resonance	2023-02-27 14:34:08 -08:00
AgustinGDLV	05fe62cbab	implemented G-Max Drum Solo, G-Max Hydrosnipe, G-Max Fireball	2023-02-27 12:11:52 -08:00
DizzyEggg	c92a65dc40	Add config for stockpile raising def stats	2023-02-27 21:09:02 +01:00
AgustinGDLV	92c8503869	reorganized max move functionality to remove redundant move effects	2023-02-27 11:54:49 -08: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
AgustinGDLV	c6c92da19c	implemented G-Max Wind Rage	2023-02-27 10:19:56 -08: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
AgustinGDLV	a36c35aea1	implemented G-Max Vine Lash, G-Max Wildfire, G-Max Cannonade, G-Max Volcalith	2023-02-26 23:35:36 -08:00
AgustinGDLV	4d19659b0b	implemented G-Max Stonesurge, G-Max Steelsurge	2023-02-26 22:02:06 -08: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
AgustinGDLV	b4ec273353	Merge branch 'upcoming' into dynamax	2023-02-25 14:04:55 -08: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
AgustinGDLV	38f462551f	pulled rhh master, i hate merge conflicts	2023-02-22 18:50:54 -08:00
AgustinGDLV	d69de9fb17	added longer 'used move' messages for max moves	2023-02-22 14:18:15 -08: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
AgustinGDLV	87a9150134	added base functionality for max moves	2023-02-21 20:16:25 -08: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
Ariel A	15e6acc0a3	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-02-10 19:49:54 -05:00
Ariel A	b733cd14a5	Merge branch 'followers' into followers-expanded-id	2023-02-10 19:40:44 -05:00
Ariel A	2ddd292b36	Merge branch 'followers' into lighting	2023-02-10 19:27:23 -05:00
sbird	4bcbb7c9e1	[intro] refactor expansion intro	2023-02-09 23:12:29 +01: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
DizzyEggg	0048e59e05	Fix SpeciesInfo struct offsets	2023-02-08 22:08:12 +01: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
DizzyEggg	896b575c07	Fix volt switch breaking ace pokemon	2023-02-08 12:42:38 +01: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
ghoulslash	7e9d40d401	Merge pull request #2645 from DizzyEggg/damp_aftermath ... Damp shows ability pop-up when reacting with Aftermath	2023-02-07 10:18:23 -05:00
DizzyEggg	dcb63e1518	Merge pull request #2610 from ghoulslash/be/animsilktrap ... Silk trap Animation	2023-02-07 16:13:53 +01:00
DizzyEggg	f762ed728d	remove pointless timers from disable struct	2023-02-07 15:10:20 +01:00
DizzyEggg	47ebf2e167	hmm	2023-02-07 13:33:43 +01:00
DizzyEggg	0dc5e1e685	aftermath damp pop-ups and string	2023-02-07 13:01:56 +01:00
PSF	6e124584f8	Clean up swp files	2023-02-04 14:08:35 -08:00
PSF	0790882fd8	Merged with pret	2023-02-04 14:03:38 -08:00
PSF	3c2bf0b0f3	Renamed functions to match current pret counterparts, changed IsElevationMismatchAt to non-static	2023-02-04 13:52:50 -08:00
Eduardo Quezada	101ea6522d	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_util.c	2023-02-02 17:56:13 -03:00
GriffinR	5793a1a5e7	Correct some union room chat documentation	2023-02-02 11:41:02 -05:00
LOuroboros	4b5a6e2328	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-02-01 20:18:56 -03:00
Philipp AUER	8983739267	Merge pull request #2564 from mrgriffin/rhh-battle-tests ... Battle Tests	2023-02-01 22:18:17 +01:00
GriffinR	3b15fd34cc	Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames	2023-02-01 16:09:01 -05:00
GriffinR	4328ed8b19	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows	2023-02-01 14:59:45 -05:00
GriffinR	9003966fcc	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
Martin Griffin	f1b9872bf0	Test moves, items, and abilities in battle ... Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic Spikes tests! Co-authored-by: sbird <sbird@no.tld>	2023-02-01 13:53:57 +00:00
Jaizu	4eb7b7048e	Make transform not break	2023-01-31 12:41:07 +01:00
Jaizu	424f457ec2	Remove unused INHERITED_IV_COUNT define	2023-01-31 09:44:47 +01:00
Ariel A	66c57e3442	Merge branch 'master' into followers	2023-01-29 18:44:06 -05:00
ghoulslash	3f616215ea	add silk trap anim	2023-01-28 09:03:18 -05:00
Martin Griffin	bdb04da9a5	Refactor battle animations	2023-01-28 00:16:25 +00:00
Martin Griffin	cba4b78df6	Move-based mega evolution message for NPCs/recorded battles	2023-01-28 00:16:24 +00:00
Eduardo Quezada D'Ottone	53e41a2b3d	Merge pull request #2605 from mrgriffin/rhh-battle-tests-fixes ... Rhh battle tests fixes	2023-01-27 19:24:13 -03:00
ghoulslash	2b58593e33	Merge pull request #2595 from AsparagusEduardo/RHH/pr/data/Gen9Items ... Added some Gen9 item data and fixed Punching Glove's effect	2023-01-27 16:13:50 -05:00
Martin Griffin	a13ffdbfba	U-turn does not switch the user out if Emergency Exit activates	2023-01-27 00:57:22 +00:00
Ariel A	5047f1280e	Improved saving & loading object events.	2023-01-26 17:55:32 -05:00
Eduardo Quezada	7774c9727d	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 ... # Conflicts: # tools/mapjson/mapjson.cpp	2023-01-25 20:28:55 -03:00
Eduardo Quezada	3288309c43	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-01-25 19:57:19 -03:00
Eduardo Quezada	a044774896	Added Gen9 item data and fixed Punching Glove's effect	2023-01-24 16:47:54 -03:00
GriffinR	7681340966	Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade	2023-01-23 14:45:51 -05:00
ghoulslash	321634ed3b	Silk Trap Effect (#2512) ... * add silk trap effect, analog of obstruct Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-01-23 16:42:47 -03:00
Eduardo Quezada D'Ottone	1bfc922c72	Merge pull request #2471 from ghoulslash/be/gen9items ... Start Gen9 Hold Effects	2023-01-23 14:58:08 -03:00
Eduardo Quezada D'Ottone	2b22bdf1e7	Merge pull request #2579 from LOuroboros/allahu ... Fixed Explosion & Intimidate's 'interaction'	2023-01-23 11:37:06 -03:00
ghoulslash	f97ec1975a	merge w upcoming	2023-01-23 09:24:03 -05:00
GriffinR	29c1af50ca	Fix Best Streak stat name	2023-01-20 11:25:04 -05:00
Eduardo Quezada	749225ace1	Matching merge from upstream pret ... # Conflicts: # graphics/interface/menu_info.png # include/pokemon.h # src/battle_ai_switch_items.c # src/battle_anim_mons.c # src/battle_anim_water.c # src/battle_controller_opponent.c # src/battle_gfx_sfx_util.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/data/pokemon/species_info.h # src/pokemon.c # src/pokemon_summary_screen.c	2023-01-20 12:31:54 -03:00
sbird	766964387e	Merge branch 'master' into feature/dynmulti	2023-01-18 23:39:31 +01:00
GriffinR	0851e55ccb	Merge pull request #1657 from PikalaxALT/sync_battle_anim_args ... Sync battle anim args	2023-01-18 12:16:49 -05:00
GriffinR	b7d92e8537	Revert incorrect constant usage, add new correct ones	2023-01-18 12:11:09 -05:00
GriffinR	d1e4bd44ce	Correct comment in maps.h	2023-01-18 11:54:06 -05:00
GriffinR	5a906c33ac	Merge branch 'master' into sync_battle_anim_args	2023-01-18 11:47:33 -05:00
GriffinR	0cc10a1ada	Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize	2023-01-18 11:07:12 -05:00
GriffinR	d68e81c2be	Clarify MB_SEMI_DEEP_WATER name	2023-01-17 21:32:55 -05:00
LOuroboros	773e7f0de2	Fixed Explosion & Intimidate's 'interaction'	2023-01-17 22:16:42 -03:00
sbird	a7cd4ca592	[script-command, dynmultichoice] implement event handler	2023-01-17 21:49:06 +01:00
sbird	276ce62d95	[script-command, dynmultichoice] add shouldSort, initialSelected arguments. read pushed arguments front to back	2023-01-17 21:49:06 +01:00
sbird	569fa0a60a	[script-command] add dynmultichoice ... * supports variable length arguments * automatically scrolls * supports building list menus from a stack	2023-01-17 21:49:06 +01:00
GriffinR	d5a4bfcd6f	Merge pull request #1843 from GriffinRichards/colorize ... Colorize more grayscaled/incorrectly colored pngs	2023-01-15 12:48:42 -05:00
GriffinR	18384894e0	Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups ... Made Types and Egg Groups into arrays	2023-01-15 00:27:20 -05:00
Eduardo Quezada	70d59d6aa9	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
GriffinR	387ea563fc	Move FRLG trainer card gfx to own folder, fix tiles	2023-01-13 13:40:13 -05:00
Eduardo Quezada	ac4825ad28	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_util.c	2023-01-13 11:50:47 -03:00
ghoulslash	c72274ee98	Merge pull request #2566 from AsparagusEduardo/RHH/pr/feature/breedBalls ... Config for ball inheritence when breeding	2023-01-13 09:35:15 -05:00
Ariel A	244f3ceb15	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-01-12 21:58:39 -05:00
Ariel A	7b40e481ce	Improved saving & loading expanded OWs.	2023-01-12 21:45:41 -05:00
Ariel A	3a0dc0f4f6	Reworked how OW pokemon's graphics are loaded.	2023-01-12 21:45:36 -05:00
Ariel A	5d5d97b46a	Fixed most functions that take/return graphicsIds to accept u16s.	2023-01-12 21:44:56 -05:00
GriffinR	12cbb0b30f	Colorize and combine birch_bag/birch_grass	2023-01-12 15:22:23 -05:00
Bassoonian	333917941b	Add PLA+ obedience mechanics (with config)	2023-01-11 08:15:57 +01:00
GriffinR	b873d69679	Sync trade anim	2023-01-09 15:32:04 -05:00
LOuroboros	bdcc84f019	Updated the implementation	2023-01-09 15:18:22 -03:00
LOuroboros	dccceb9689	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2023-01-09 14:59:41 -03:00
ghoulslash	cc7c546011	Merge pull request #2473 from LOuroboros/mimicry ... Reimplemented Mimicry	2023-01-09 12:54:44 -05:00
LOuroboros	620a6a5e90	Extra review changes ... -Foolproofed the ability checks in ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN -Made BattleScript_OverworldWeatherStarts and BattleScript_OverworldTerrain call the battle scripts that handle weather form changes, weather abilities, terrain seeds and terrain abilities. -Consequentially, I removed the activation for weather and terrain abilities that I added to TryDoEventsBeforeFirstTurn, and the activation of Protosynthesis in ABILITYEFFECT_ON_SWITCHIN. -Added a weatherAbilityDone to prevent abilities that lack self-checks like Protosynthesis from getting stuck in a loop. -Removed now pointless ABILITYEFFECT_WEATHER_FORM. I think Duke/Sneed69 added it to fix Castform's form change, but it no longer serves a purpose.	2023-01-09 14:22:14 -03:00
Eduardo Quezada	f8c9e7af40	Fixed config comment	2023-01-09 11:06:27 -03:00
Eduardo Quezada	1b0ce96e12	Config for ball inheritence when breeding	2023-01-09 02:16:29 -03:00
LOuroboros	c32f584940	Applied review changes	2023-01-08 19:50:27 -03:00
Eduardo Quezada	911541ba4f	Merge branch 'RHH/upcoming' into RHH/pr/feature/IncenseBaby ... # Conflicts: # include/config/pokemon.h	2023-01-08 18:48:01 -03:00
ghoulslash	da27df9f18	Merge pull request #2326 from AsparagusEduardo/RHH/pr/reworkScald ... Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2023-01-08 16:25:29 -05:00
Ariel A	72e723df65	Expanded graphicsId field.	2023-01-07 19:54:12 -05:00
GriffinR	c91b13a12b	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows	2023-01-07 13:30:11 -05:00
Eduardo Quezada D'Ottone	7622d84a4f	Revert "Removed Unown hack"	2023-01-07 11:39:56 -03:00
Eduardo Quezada	d72a3731d4	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_move_effects.h	2023-01-06 15:25:49 -03:00
LOuroboros	72566e6323	Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs	2023-01-05 03:02:56 -03:00
Eduardo Quezada D'Ottone	34d27eca0e	Merge pull request #2457 from AsparagusEduardo/RHH/pr/cleanup/unown ... Removed Unown hack	2023-01-04 18:57:28 -03:00
Eduardo Quezada	74d8c587fe	Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown ... # Conflicts: # src/data/pokemon/species_info.h # src/data/pokemon_graphics/front_pic_anims.h	2023-01-04 17:58:54 -03:00
Eduardo Quezada	55be15f690	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/config/pokemon.h	2023-01-04 16:19:57 -03:00
ghoulslash	1d2cb49bc6	Merge pull request #2542 from AsparagusEduardo/RHH/pr/config/multiTargetDmg ... Config to restore Gen 3's damage reduction to multi target moves	2023-01-04 09:18:39 -05:00
Eduardo Quezada	ca46c22533	Removed SpeciesInfo array defines	2023-01-04 08:14:34 -03:00
GriffinR	36c89d345c	Merge branch 'master' into doc-wnews	2023-01-03 22:28:21 -05:00
Ariel A	4bee03bc18	Merge branch 'followers' into lighting	2023-01-03 18:19:19 -05:00
Ariel A	a59564fc1e	Improved follower pokemon animation code.	2023-01-03 18:18:13 -05:00
Eduardo Quezada	e0802f13a2	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103 ... # Conflicts: # include/link_rfu.h	2023-01-03 15:40:33 -03:00
LOuroboros	f1ca254c28	Updated the Mimicry reimplementation ... Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN. Misc. changes: -Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN. -Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains. -Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs. -Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about. -Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes. -There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it. -Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.	2023-01-03 02:27:41 -03:00
LOuroboros	d0f5653f5e	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2023-01-02 19:00:41 -03:00
Eduardo Quezada	a23501a4a3	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-01-02 18:54:57 -03:00
LOuroboros	0a00942a26	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-01-02 16:00:13 -03:00
ghoulslash	2944ebfe7b	Merge pull request #2543 from AsparagusEduardo/RHH/pr/fix/shinyChances ... Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+	2023-01-02 13:55:36 -05:00
LOuroboros	cdfec0fc05	Updated B_DOUBLE_WILD_CHANCE	2023-01-02 15:42:30 -03:00
LOuroboros	13d8c0d167	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2023-01-02 14:34:24 -03:00
LOuroboros	ca32d43433	Streamlined ability-on-weather changes ... Also renamed activateweatherabilities and activateterrainabilities.	2023-01-02 14:32:56 -03:00
Eduardo Quezada	16e8a5dd7f	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/battle_util.h	2023-01-01 16:02:40 -03:00
LOuroboros	f2e63a2e41	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-12-31 03:33:42 -03:00
Eduardo Quezada D'Ottone	0e1836d42b	Merge pull request #2106 from Sneed69/PartyBattlerShouldAvoidHazards ... PartyBattlerShouldAvoidHazards rewrite	2022-12-30 17:55:53 -03:00
Eduardo Quezada D'Ottone	4dc72dcfc1	Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2 ... Implementing Teatime effect	2022-12-30 17:49:54 -03:00
LOuroboros	e8dfb66c30	Adding ability effect triggers for terrains and weather ... A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change. Misc. changes: -EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all. -The main reason for the rename was the inconsistency with the battle script's label. -Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.	2022-12-30 03:25:16 -03:00
LOuroboros	0ef148dfbb	Applied more corrections ... -Removed BattleScript_WindRiderActivatesEnd2 -Tweaked the condition of Wind Power in AbilityBattleEffects -Renamed ApplySupremeOverlordModifier to GetSupremeOverlordModifier	2022-12-28 08:50:15 -03:00
LOuroboros	0159065dea	Removed Shell Trap ... It's time to let it go for my own mental sanity. Besides, it's a Gen. 7 move. I shouldn't have added it here.	2022-12-28 07:51:11 -03:00
GriffinR	d02d518917	Merge pull request #1829 from AsparagusEduardo/pret/doc/SaveBlockPadding ... Documenting padding in structs used by Saveblocks	2022-12-27 20:50:37 -05:00
Eduardo Quezada	1fc86e52b5	Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+	2022-12-27 21:18:20 -03:00
Eduardo Quezada	95f39c8c81	Config to restore Gen 3's damage reduction to multi target moves	2022-12-27 15:24:43 -03:00
SphericalIce	200b71be02	Fix Beat Up's battle script to avoid an out-of-bounds array access	2022-12-27 10:49:57 +00:00
Eduardo Quezada D'Ottone	b5b7631be7	Added guards to form_change_types.h	2022-12-26 09:14:28 -03:00
Eduardo Quezada	28cffda9d4	Hatch level config	2022-12-22 10:38:54 -03:00
Eduardo Quezada	d103025527	Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/config/pokemon.h	2022-12-22 10:30:01 -03:00
LOuroboros	4bb86c5d96	Implemented Barb Barrage's effect	2022-12-21 19:48:50 -03:00
LOuroboros	1229fa752a	Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's	2022-12-21 19:48:49 -03:00
LOuroboros	2cb9400ef0	Implemented Dire Claw's effect	2022-12-21 19:48:48 -03:00
LOuroboros	3ce4869766	Implemented Shell Trap's effect	2022-12-21 19:48:10 -03:00
LOuroboros	ae482ed1f4	Implemented Ceaseless Edge's effect	2022-12-21 19:47:00 -03:00
Eduardo Quezada	4ed20dca8c	Forgot to restore config to GEN_LATEST	2022-12-21 17:28:24 -03:00
Eduardo Quezada	c0d4e14a61	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/config/battle.h # include/constants/battle_move_effects.h	2022-12-21 12:46:09 -03:00
Eduardo Quezada	8840d0bbf6	Refactored incense baby checks into table and added Gen 9 config.	2022-12-21 12:31:59 -03:00
Martin Griffin	632ec92475	Minor Roost changes ... - Fix 'mon with Flying in type3 but not type1 or type2 is set to uninitialized roostTypes. - Remove unread third roostTypes element. - Option for Gen IV pure-Flying behavior.	2022-12-21 14:52:01 +00:00
LOuroboros	d943f891c5	Applied Wind Power and Wind Rider correction ... -Renamed TryActivateWindRiderLoop to BattleScript_TryTailwindAbilitiesLoop -Modified how it handles the check for Wind Rider by using a various and incorporated Wind Power into the mix because that ability is affected by Tailwind as well.	2022-12-21 10:08:16 -03:00
SonikkuA-DatH	2c28076696	Update include/constants/battle_script_commands.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-20 18:08:38 -08:00
LOuroboros	6153b8e904	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2022-12-20 07:11:36 -03:00
LOuroboros	c8abf00cac	Applied corrections ... Anger Shell: -Made it print a string from the gStatDownStringIds table while lowering Def and Sp. Def -Made it use the shiny new modifybattlerstatstage macro. -Made it activate multiple times per battle, as it should. Well-Baked Body: -Turned it into an absorbing ability. Wind Rider: -Turned it into an absorbing ability. -For its Tailwind interaction, I made it activate only when Tailwind kicks in successfully, instead of whenever it's active at the end of a turn. Guard Dog: -Updated its check inside BattleScript_EffectHitEscape. -Moved it from Cmd_forcerandomswitch to BattleScript_EffectRoar. Wind Power: -Split off its move end effect from Electromorphosis'. Electromorphosis: -Split off its move end effect from Wind Power's. Hadron Engine: -Merged its Switch In effect with Electric Surge's. Protosynthesis: -Fixed its stat boost. Quark Drive: -Fixed its stat boost. Cud Chew: -Updated its ENDTURN effect's berry check. Supreme Overlord: -Tweaked the looping i variable's data type, the order of the variables and the checks inside ApplySupremeOverlordModifier. Earth Eater: -Turned it into an absorbing ability. Misc changes: -Added a variable to set the amount of stat stages raised inside AbilityMoveEffects' case ABILITYEFFECT_ABSORBING. -Added a preproc config to update the text string that they print. -Limited the scope of atkHighestStat and defHighestStat in CalcMoveBasePowerAfterModifiers to Protosynthesis's and Quark Drive's effects.	2022-12-20 07:08:29 -03:00
SonikkuA-DatH	f6fab92ac8	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-19 15:52:20 -08:00
Eduardo Quezada	1580f892a5	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/constants/pokemon.h # src/battle_script_commands.c	2022-12-19 18:53:26 -03:00
ghoulslash	79fa2c79e2	Merge pull request #2517 from LOuroboros/speed_swap ... Fixed Speed Swap's effect	2022-12-19 08:56:36 -05:00
SonikkuA-DatH	ffda816507	Update battle_script_commands.h ... Whoops, forgot the to copy paste various	2022-12-18 22:41:15 -08:00
SonikkuA-DatH	f0aee1f8d3	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-18 17:50:39 -08:00
Eduardo Quezada	66d1c9bc65	Documenting padding in structs used by Saveblocks	2022-12-17 22:55:43 -03:00
Eduardo Quezada	6a57dcdc4c	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216 ... # Conflicts: # src/data.c # src/data/pokemon_graphics/front_pic_anims.h	2022-12-16 19:19:23 -03:00
GriffinR	2aa6a9c164	Remove two unreferenced metatile labels	2022-12-16 11:05:56 -05:00
LOuroboros	852f06deea	Updated SIDE constant usages	2022-12-15 17:44:56 -03:00
GriffinR	347a02ace1	Sync trade	2022-12-15 15:40:59 -05:00
LOuroboros	4c9446ed0a	Fixed Speed Swap's effect	2022-12-14 12:00:45 -03:00
LOuroboros	6ef30da492	Update battle.h	2022-12-13 02:44:49 -03:00
LOuroboros	a56cfd1aa7	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2022-12-12 19:55:48 -03:00
Eduardo Quezada	1290a9411d	Reorganized SpecialStatus struct to minimize padding.	2022-12-12 00:37:00 -03:00
ghoulslash	340278c83b	Merge pull request #2452 from LOuroboros/intimidate ... Optimized Intimidate's code	2022-12-11 22:04:16 -05:00
ghoulslash	e3e0d60222	Merge pull request #2467 from Bassoonian/gen9moves ... Generation IX Moves	2022-12-11 14:47:47 -05:00
LOuroboros	0d1f9d9613	Reimplemented Mimicry	2022-12-09 20:46:18 -03:00
sbird	0d5adac1e1	[debug, printf] add DebugPrintfLevel macro	2022-12-07 00:03:25 +01:00
sbird	fab26b99f1	[fix] DebugPrintf with no format arguments	2022-12-06 15:59:59 +01:00
ghoulslash	6d28882e44	start gen9 hold effects	2022-12-06 09:48:36 -05:00
LOuroboros	107ace784b	Implemented Mycelium Might's effect	2022-12-06 06:18:18 -03:00
LOuroboros	d6b9f07681	Implemented Earth Eater's effect	2022-12-06 05:30:21 -03:00
LOuroboros	a961980e0f	Implemented Toxic Debris' effect	2022-12-06 05:23:30 -03:00
LOuroboros	aa051dab02	Implemented Costar's effect	2022-12-06 05:23:30 -03:00
LOuroboros	7a52404fd3	Implemented Supreme Overlord's effect	2022-12-06 05:23:30 -03:00
LOuroboros	3c30e6bdc3	Implemented Sharpness' effect	2022-12-06 05:23:30 -03:00
LOuroboros	f96137eb5e	Implemented Cud Chew's effect	2022-12-06 05:23:30 -03:00
LOuroboros	24465858a7	Implemented the 4 Ruin Abilities	2022-12-06 05:23:29 -03:00
LOuroboros	de05c4dd56	Implemented Good as Gold's effect	2022-12-06 05:23:29 -03:00
LOuroboros	e25f843db3	Implemented Quark Drive's effect ... Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.	2022-12-06 05:23:29 -03:00
LOuroboros	a328088122	Implemented Protosynthesis' effect ... Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.	2022-12-06 05:23:29 -03:00
LOuroboros	34cafa746c	Implemented Electromorphosis' effect ... Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied. Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.) As a result, the game will trigger the ability multiple times if they're hit by a multihit move. This directive makes the code end the ability effect preemptively if the target does have the status flag applied.	2022-12-06 05:23:29 -03:00
LOuroboros	88cae380d0	Implemented Wind Power's effect	2022-12-06 05:23:29 -03:00
LOuroboros	4dc44150c5	Implemented Wind Rider's effect	2022-12-06 05:23:29 -03:00
LOuroboros	ca656b63b9	Added Well Baked Body's effect and misc. changes ... -Added a modifybattlerstatstage macro to handle stat stages in battle. -Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.	2022-12-06 05:21:24 -03:00
Bassoonian	58a54c90d2	Restore GEN_LATEST to GEN_8	2022-12-04 18:16:37 +01:00
GriffinR	f55443656f	Add NUM_TILES_PER_METATILE	2022-12-03 17:29:02 -05:00
LOuroboros	acb9c31bd4	Implemented Anger Shell's effect	2022-12-03 01:19:24 -03:00
LOuroboros	b0027cb78b	Implemented Seed Sower's effect	2022-12-02 23:31:41 -03:00
LOuroboros	653364fd71	Added the basic data for the Gen. 9 Abilities	2022-12-02 23:01:22 -03:00
Eduardo Quezada	9d1149c423	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 ... # Conflicts: # src/pokemon.c	2022-11-29 17:40:09 -03:00
ghoulslash	34ba9b4e0d	convert a few various to callnatives	2022-11-28 14:36:19 -05:00
Eduardo Quezada	4bac880042	Removed Unown hack	2022-11-25 16:55:53 -03:00
Eduardo Quezada	e858b4e709	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 ... # Conflicts: # include/battle.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_dome.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/battle_tower.c # src/data/pokemon/species_info.h # src/pokemon.c	2022-11-24 15:36:00 -03:00
Eduardo Quezada	7327be6f9e	Made Types and Egg Groups into arrays	2022-11-22 17:05:25 -03:00
GriffinR	483c3d5c13	Document wonder news	2022-11-22 02:17:03 -05:00
Ariel A	5cae740eba	Merge branch 'followers' into lighting	2022-11-21 22:17:14 -05:00
Ariel A	e6d1cfae24	Merge branch 'master' into followers	2022-11-21 21:21:50 -05:00
GriffinR	4736b4b14d	Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename ... Renamed gBaseStats to gSpeciesInfo	2022-11-18 17:45:23 -05:00
GriffinR	5fa364256d	Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides ... Introduce NUM_BATTLE_SIDES	2022-11-18 17:39:00 -05:00
Bassoonian	739680e425	Victory Dance effect	2022-11-18 22:23:34 +01:00
Bassoonian	29ae22183b	Mystical Power effect	2022-11-18 22:17:08 +01:00
Bassoonian	9512b3a57a	Implement Double Shock functionality with temporary string	2022-11-18 22:12:26 +01:00
Bassoonian	3ac3cb249e	Wicked Torque effect	2022-11-18 22:00:21 +01:00
Bassoonian	f7d1a12d2d	Data entry for gen9 moves	2022-11-18 12:15:44 +01:00
Eduardo Quezada	791c547b2c	Renamed missing overworld debug configs	2022-11-14 14:07:32 -03:00
Eduardo Quezada	540f4679bb	Implemented uses of Shiny config	2022-11-14 11:56:02 -03:00
Eduardo Quezada	011ec16f1e	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
LOuroboros	11c99cac61	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-13 23:17:59 -03:00
LOuroboros	31a602f3b6	Optimized Intimidate's code	2022-11-12 18:03:46 -03:00
Eduardo Quezada	f2d0e547ac	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/rom_header_gf.c	2022-11-09 19:54:44 -03:00
GriffinR	1d1c2d41bb	Add list menu cursor constants	2022-11-09 15:16:46 -05:00
Eduardo Quezada	2ef2134be1	Moved Hunger Switch to form change table.	2022-11-06 17:12:34 -03:00
Eduardo Quezada	62912f8caf	Battle indicator now depends on species instead of held item ... - This is to avoid a situation where a user would plop a Primal Groudon and its indicator would become Alpha if it doesn't have a Red Orb.	2022-11-06 16:01:07 -03:00
Eduardo Quezada	57bdb683ec	DoBurmyFormChange handled by FORM_CHANGE_END_BATTLE_TERRAIN	2022-11-05 23:27:40 -03:00
Eduardo Quezada	99536089cf	Renamed form change defines to be consistant with which function calls which	2022-11-05 22:02:25 -03:00
Eduardo Quezada	8f289714b2	Moved form change defines and descriptions to their own header	2022-11-05 21:36:45 -03:00
Eduardo Quezada	ceb5c8a00a	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/battle_util.h # src/battle_util.c	2022-11-05 20:11:33 -03:00
Eduardo Quezada	42f8e8c114	Multiple refactors ... - Added a general GetBattleFormChangeTargetSpecies instead of getting specific ones for Mega Evolution and Primal Reversion. - Added FORM_CHANGE_BATTLE_HP_PERCENT, to replace ShouldChangeFormHpBased. - Cleaned ifdefs for hold effects. - Finally removed UndoMegaEvolution. - FORM_CHANGE_FAINT and FORM_CHANGE_BATTLE_END restore to the first form before a battle form change if species isn't specified. - When changing from a form with more HP to one with less, now current HP is kept to fix Zygarde edge case. (Will likely need to be reworked for Dynamax, as it behaves differently) - Uses DoesSpeciesUseHoldItemToChangeForm in CanBattlerGetOrLoseItem.	2022-11-05 20:00:12 -03:00
BuffelSaft	1da4eb3b14	Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid ... Config for Dark Void being only usable by Darkrai	2022-11-05 22:42:51 +13:00
Eduardo Quezada	44bf4a15e3	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h # include/constants/battle_move_effects.h	2022-11-04 12:19:40 -03:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
ghoulslash	1e6903840a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite	2022-11-04 09:29:45 -04:00
ghoulslash	d13431b4ab	merge w rhh master	2022-11-04 09:29:39 -04:00
Eduardo Quezada	edf4e45c4d	Config for Dark Void being only usable by Darkrai	2022-11-03 21:36:12 -03:00
BuffelSaft	c169a9523e	Merge branch 'upcoming' into fix-stat-boost-on-hit	2022-11-03 22:01:30 +13:00
BuffelSaft	736ca893b6	Fix abilities that raise target's stat after hit ... Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.	2022-11-03 21:54:56 +13:00
Eduardo Quezada	15c12af2cf	Using TryBattleFormChange in place of certain TryFormChange	2022-11-01 23:50:26 -03:00
LOuroboros	86e322dcea	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-01 22:41:31 -03:00
Eduardo Quezada D'Ottone	b8371500d3	Merge pull request #1676 from BuffelSaft/multistrike ... Multi-hit refactor and Parental Bond	2022-11-01 21:16:04 -03:00
ghoulslash	53061c7d62	Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney ... Implemented Honey's Sweet Scent functionality	2022-11-01 20:09:30 -04:00
ghoulslash	c6cb54b54e	Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures ... Implemented Lures and Repel/Lure "use another" menu	2022-11-01 20:05:15 -04:00
Eduardo Quezada	797c5514d3	Mega Evolution in form change tables	2022-11-01 18:37:23 -03:00
Eduardo Quezada	a57f6d184b	Fainting by poison in the overworld reverts forms	2022-11-01 12:24:04 -03:00
LOuroboros	5ebc996c51	Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config	2022-10-30 22:03:14 -03:00
Eduardo Quezada	e4a439aa46	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h	2022-10-30 12:30:38 -03:00
Eduardo Quezada	3172273c73	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures ... # Conflicts: # src/pokemon.c	2022-10-30 12:16:09 -03:00
GriffinR	c76beed989	Merge pull request #1807 from pret/porymap-5 ... Update for Porymap 5.0.0	2022-10-30 11:01:37 -04:00
TheXaman	933ec5ee65	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss	2022-10-30 15:10:32 +01:00
AgustinGDLV	ae7cbc2aa1	merged physical and special max moves	2022-10-27 20:38:40 -07:00
AgustinGDLV	0663510583	merged regi battle type into BATTLE_TYPE_LEGENDARY	2022-10-27 19:52:52 -07:00
AgustinGDLV	caaec99e77	added data and graphics for gigantamax mons	2022-10-27 16:18:37 -07:00
AgustinGDLV	056048daf9	added data for max moves	2022-10-27 13:17:15 -07:00
AgustinGDLV	7981887f0a	merge kyogre, groudon, rayquaza battle types	2022-10-27 11:20:46 -07:00
Eduardo Quezada	85c0d2dac8	Review changes	2022-10-27 11:26:09 -03:00
BuffelSaft	224ca256ce	Requested clean up ... Rename constants, remove white space, improve B_BEAT_UP description. * Rename B_BEAT_UP_DMG to B_BEAT_UP * Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG * Remove trailing whitespace * Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE	2022-10-27 22:25:33 +13:00
BuffelSaft	3327758cdb	Move B_BEAT_UP_DMG to other move settings ... This is more of a mechanical change like gen 8's change to Teleport, so it should go in the same block of settings.	2022-10-26 23:29:09 +13:00
Eduardo Quezada	3ed485632f	Renamed gBaseStats to gSpeciesInfo	2022-10-24 17:01:48 -03:00
BuffelSaft	d9cc98a4fe	Suggested changes ... - Various style fixes - Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle	2022-10-24 22:19:35 +13:00
BuffelSaft	a5ede1ee90	Move B_PARENTAL_BOND_DAMAGE to damage settings ... Title.	2022-10-23 21:41:42 +13:00
BuffelSaft	9b076a9dcf	Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES ... - Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally. - Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().	2022-10-23 21:40:04 +13:00
BuffelSaft	1b056f9044	Fix various Parental Bond issues ... - Dragon Tail and Circle Throw strike twice and then switch the target - Z moves are unaffected by Parental Bond - Renamed parentalBondOn to parentalBondState - Added constants for possible values of parentalBondState - Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP	2022-10-23 17:37:23 +13:00
BuffelSaft	3775c5d00c	Fix move effects ... Restore unintentionally removed MOVEEND_DEFROST, fix move effect definitions.	2022-10-22 18:54:25 +13:00
BuffelSaft	6035c5a280	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-10-22 14:31:13 +13:00
Eduardo Quezada	0a79390ec0	Primal Reversion in Form Change tables	2022-10-21 02:08:37 -03:00
Eduardo Quezada	861590f747	Form change when fainting. Goodbye UndoFormChange!	2022-10-20 18:53:12 -03:00
Eduardo Quezada	d8cc7f7abe	Form change when switching out	2022-10-20 17:56:56 -03:00
Eduardo Quezada	b74f0777da	Renamed form change constants	2022-10-20 17:22:58 -03:00
Eduardo Quezada	620e69945d	Form change for starting and ending battles. Adjusted PP for Iron Head/Behemoth moves	2022-10-20 16:40:24 -03:00
GriffinR	e752c8a2f9	Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately ... Document seldom-used trigger functionality	2022-10-20 11:45:35 -04:00
Eduardo Quezada D'Ottone	18e7fc5efc	Introduce NUM_BATTLE_SIDES	2022-10-20 08:41:18 -03:00
GriffinR	3e8baa5b04	Merge branch 'master' into porymap-5	2022-10-18 22:54:25 -04:00
GriffinR	a418f8d976	Merge pull request #1755 from GriffinRichards/map-dynamic ... Rename special map constants, treat warp ids as strings	2022-10-18 22:45:56 -04:00
tustin2121	4730870646	VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY ... Getting rid of the VAR_ prefix, to avoid the porymap problem.	2022-10-18 21:12:31 -04:00
GriffinR	e33581ff9c	Merge pull request #1671 from sphericalice/heal-location-none ... Add the HEAL_LOCATION_NONE constant	2022-10-18 18:41:04 -04:00
Abaresk	7f09894045	Merge branch 'master' into thunder	2022-10-18 04:37:56 +00:00
Marcus Huderle	48ab684b48	Fix weather color map documentation	2022-10-17 17:41:27 -07:00
ghoulslash	7431044da1	dont open dexnav from start menu if map has no encounters	2022-10-17 09:19:41 -04:00
ghoulslash	4775e0372a	merge w pret	2022-10-17 09:06:27 -04:00
tustin2121	327c648e87	Document seldom-used trigger functionality ... Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.	2022-10-16 20:46:50 -04:00
Eduardo Quezada D'Ottone	1607291982	Implemented Honey's Sweet Scent functionality	2022-10-16 20:20:13 -03:00
Abaresk	e67d55bfc4	Fix names	2022-10-15 13:37:24 +00:00
Abaresk	b538239f18	Add more documentation to thunder weather	2022-10-15 04:25:35 +00:00
Eduardo Quezada D'Ottone	4cbc6d4de1	Config for running indoors	2022-10-14 22:31:45 -03:00
LOuroboros	90f79999bb	Added class-based Poké Balls for trainers ... Thanks to Ghoulslash for helping me optimizing things.	2022-10-14 11:14:30 -03:00
GriffinR	60e1ad20e4	Add NUM_MON_PIC_FRAMES, and trainer pic size constants	2022-10-10 23:16:08 -04:00
GriffinR	bd023b1c6c	Merge pull request #1796 from GriffinRichards/tilesets-c ... Convert tilesets.s to C	2022-10-10 12:47:47 -04:00
GriffinR	65d3944a93	Give tileset palettes proper type, name compressed secret base tiles	2022-10-08 02:02:12 -04:00
Ariel A	3a86c8bd4c	Merge branch 'followers' into lighting	2022-10-07 21:08:06 -04:00
Ariel A	1c011a9c1c	Merge branch 'master' into followers	2022-10-07 20:52:15 -04:00
Eduardo Quezada D'Ottone	2ce340e8e1	Merge pull request #2262 from LOuroboros/becomingAHero ... Fixed Mega Evolved Pokémon being able to get Friendship effects in battle	2022-10-07 18:27:29 -03:00
ghoulslash	06bddbac23	Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007 ... One for the go! (pret merge 2022/10/07)	2022-10-07 17:14:00 -04:00
Eduardo Quezada	8ea060044a	Battle text pauses config	2022-10-07 17:22:29 -03:00
Eduardo Quezada	453da8aa8c	Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID	2022-10-07 15:49:00 -03:00
Eduardo Quezada	77f24d42e4	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-10-07 15:39:02 -03:00
Eduardo Quezada	44754f8ca7	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/constants/pokemon_config.h # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c	2022-10-07 15:27:16 -03:00
Eduardo Quezada	2a8048b677	Removed ItemId_GetId like in upstream	2022-10-07 14:53:58 -03:00
Eduardo Quezada	68b474c0f0	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007 ... # Conflicts: # include/constants/items.h # src/battle_interface.c	2022-10-07 14:52:32 -03:00
Eduardo Quezada	9b977486fe	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/base_stats.h	2022-10-07 14:05:45 -03:00
LOuroboros	50ca188cb2	Replaced didMegaEvo with a shiny new species flag	2022-10-07 12:32:36 -03:00
LOuroboros	02c6bc64b2	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero	2022-10-07 12:20:52 -03:00
ghoulslash	441586f23f	Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags ... 4 new species flags	2022-10-07 10:55:43 -04:00
ghoulslash	923046c993	Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925 ... I don't have any Sunday memes (pret merge 2022-09-25)	2022-10-07 10:25:59 -04:00
GriffinR	e293986fbb	Merge pull request #1793 from GriffinRichards/clean-shop ... Clean up shop.c	2022-10-06 17:24:53 -04:00
GriffinR	c6e4c29ea3	Merge pull request #1792 from GriffinRichards/display-tiles ... Add DISPLAY_TILE_* constants	2022-10-05 20:44:28 -04:00
Eduardo Quezada	a20334f79a	Removed unused functions in item header	2022-10-04 22:06:07 -03:00
Eduardo Quezada D'Ottone	af171eb4d4	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 ... # Conflicts: # src/pokemon_summary_screen.c	2022-10-01 17:32:32 -03:00
Eduardo Quezada	0370cb3fd2	Removed comment MAP_GROUP_COUNT	2022-09-30 22:05:10 -03:00
GriffinR	fb87616e9d	Use window constants in mystery_gift_menu	2022-09-29 15:48:19 -04:00
GriffinR	4af1044439	Use window constants in region_map	2022-09-29 13:11:38 -04:00
GriffinR	16be1e8447	Use window constants for move relearner	2022-09-29 12:10:10 -04:00
GriffinR	6db489e2d5	Use constants for overworld object palette slots	2022-09-27 20:16:48 -04:00
GriffinR	4f407a1066	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
Eduardo Quezada	ecad6ff0db	Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2	2022-09-27 10:46:49 -03:00
Eduardo Quezada	fb9105f8ac	Added Mega Evolution flag	2022-09-27 10:21:26 -03:00
Eduardo Quezada	3d214f8204	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags ... # Conflicts: # src/pokemon.c	2022-09-27 10:13:32 -03:00
GriffinR	e515e52abb	Add DISPLAY_TILE_* constants	2022-09-26 19:52:17 -04:00
ghoulslash	8ecdf68491	Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix ... Fixes: Pokémon Debug isn't loading female icon palettes correctly	2022-09-26 09:09:14 -04:00
Eduardo Quezada	dfdfb72365	Separate config for updated move types	2022-09-26 07:50:43 -03:00
TheXaman	886a487bf1	Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes	2022-09-26 12:40:30 +02:00
Eduardo Quezada	5054cf3586	Documented unk40EF in Summary Screen	2022-09-25 21:33:20 -03:00
Eduardo Quezada	f969effd36	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone	17c8842ad4	Merge branch 'dev' into teleport	2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone	38df216ebd	Merge pull request #2355 from ghoulslash/be/aiparty ... Add overwrittenAbilities field	2022-09-24 14:33:02 -03:00
ghoulslash	c22671d2a2	add overwrittenAbilities field	2022-09-24 12:12:31 -04:00
Eduardo Quezada D'Ottone	a483899043	Merge branch 'dev' into symbiosis	2022-09-24 11:58:35 -03:00
Eduardo Quezada D'Ottone	d59d8b92af	Merge branch 'dev' into AI	2022-09-24 11:07:09 -03:00
GriffinR	9b6b164aad	Merge pull request #1768 from SBird1337/feature/mgba-print ... [debug] add support for mgba printf	2022-09-23 13:49:48 -04:00
sbird	343d7f7d26	[debug] do not use heap allocation for MgbaPrintf	2022-09-23 04:12:57 +02:00
sbird	12670e8e3e	[debug] simplify macros, add EX versions	2022-09-23 03:48:58 +02:00
sbird	22329d3318	[debug] use boolean constants for nStopProgram	2022-09-23 03:23:44 +02:00
sbird	44a5a8d31e	[debug] fix AGBAssert for AGBPrintf debug block	2022-09-23 03:22:57 +02:00
GriffinR	1107ff954d	Clean up shop.c	2022-09-22 15:08:17 -04:00
LOuroboros	5f67335212	Fixed typo in BoxMonKnowsMove	2022-09-19 05:21:54 -03:00
Eduardo Quezada D'Ottone	681ad8c7a9	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h # src/data/pokemon/form_species_table_pointers.h # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h	2022-09-18 18:25:05 -03:00
Eduardo Quezada D'Ottone	293a880238	Apply suggestions from code review	2022-09-18 00:50:21 -03:00
Ct11217	5f74781a7d	Remove ACE_POKEMON_FUNCTIONALITY	2022-09-17 17:44:50 -06:00
Eduardo Quezada	720cb249d6	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-09-16 12:06:06 -03:00
ghoulslash	8bbe1b9037	Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome ... Config to limit the moves called by Metronome (by generation)	2022-09-16 11:03:33 -04:00
Eduardo Quezada	6b79c7772c	Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_interface.c	2022-09-16 11:56:50 -03:00
Porygon23	36c1c4dc11	Update include/battle_ai_switch_items.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-09-16 08:21:13 -06:00
Eduardo Quezada	672f572ff8	Config to limit the moves called by Metronome (by generation)	2022-09-16 11:04:30 -03:00
Eduardo Quezada	77696ca686	Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2022-09-16 10:31:02 -03:00
Ct11217	cc4a9b9f4b	Recommit to Dev branch	2022-09-15 22:57:29 -06:00
Eduardo Quezada D'Ottone	7825153bb2	Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix ... Exp Candy Fixes	2022-09-15 22:46:59 -03:00
ghoulslash	6616c89451	Merge pull request #2303 from Blackforest92/RHH-PR-Branch ... Tidying graphics - Trio Weather	2022-09-15 18:01:43 -04:00
ghoulslash	354a8256e4	Merge pull request #2226 from Porygon23/AI-Logic-Updates ... Added corner case logic for AI Switching.	2022-09-15 17:56:35 -04:00
Eduardo Quezada	bca1267ca8	Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes	2022-09-15 14:52:18 -03:00
Eduardo Quezada	dc423ef7ff	Handling repel/lure menu	2022-09-14 00:18:01 -03:00
Eduardo Quezada	ee628de82f	Config to turn off Hippopotas' and Hippowdon's female icons	2022-09-13 21:42:53 -03:00
Eduardo Quezada	0caf79f702	Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2 ... # Conflicts: # graphics/pokemon/cherrim/anim_front.png # graphics/pokemon/scyther/anim_front.png # graphics/pokemon/scyther/front.png # graphics/pokemon/shinx/anim_front.png # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/front_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c	2022-09-13 20:44:49 -03:00
Eduardo Quezada	de32940fdf	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
Eduardo Quezada	1d7e8bd730	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c	2022-09-13 16:22:42 -03:00
GriffinR	91c040b081	Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace ... Cleaned trailing whitespace	2022-09-13 14:00:11 -04:00
GriffinR	4c34babb4d	Merge pull request #1780 from LOuroboros/raquaza ... Fixed a typo and scripting vars alignment	2022-09-12 22:02:46 -04:00
LOuroboros	14c6d8b91a	Fixed alignment for the value of vars 0x4020 to 0x40FF	2022-09-12 21:33:03 -03:00
LOuroboros	cb83a09203	Fixed vars alignment	2022-09-12 21:27:53 -03:00
LOuroboros	222362e804	Fixed Raquaza typo	2022-09-12 21:26:22 -03:00
Eduardo Quezada	5eb9312250	Added missing labels in headers	2022-09-12 21:14:15 -03:00
GriffinR	d3d8b4a181	Merge pull request #1762 from GriffinRichards/sync-fieldmap ... Sync fieldmap	2022-09-12 14:32:27 -04:00
Eduardo Quezada	0944232059	Added shiny rerolls to Lures + reverted repel var name	2022-09-12 10:21:57 -03:00
Eduardo Quezada	e3005e5275	Item config for repel prompt	2022-09-12 10:21:52 -03:00