7396 Commits

Author	SHA1	Message	Date
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
Eduardo Quezada	2d78ac0192	Implemented Lures using the same vars as repels	2022-09-12 10:21:49 -03:00
Deokishisu	e3c19f5df5	Implement B2W2 Repel System ... The game now asks if the player would like to use another Repel when the one they used runs out. # Conflicts: # include/constants/vars.h	2022-09-12 10:21:38 -03:00
Eduardo Quezada	66177e7958	Reworked shiny charm rerolls allow adding additional rerolls when necessary	2022-09-12 10:21:21 -03:00
Eduardo Quezada	65108c3192	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
Eduardo Quezada	61752a4977	Added parenthesis to GET_SHINY_VALUE	2022-09-11 13:35:58 -04:00
Ariel A	e54c18fb8e	Merge branch 'followers' into lighting	2022-09-10 22:29:18 -04:00
Eduardo Quezada	4b1aca19cb	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_controller_link_opponent.c # src/battle_controller_opponent.c # src/battle_controller_recorded_opponent.c # src/battle_controllers.c # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h # src/pokemon.c	2022-09-10 00:17:03 -04:00
LOuroboros	12fee71008	Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE	2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone	69d3fafdcf	Merge pull request #2273 from LOuroboros/zazaForms ... Introduced FORM_BATTLE form changes	2022-09-09 14:15:53 -04:00
Blackforest92	29529a0c47	Remove primal_particle leftovers	2022-09-09 22:28:11 +07:00
Blackforest92	d870d71dbe	Remove windstorm_brew leftovers	2022-09-09 22:26:29 +07:00
Blackforest92	431cb6fa7c	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
Eduardo Quezada	8449f237c2	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags ... # Conflicts: # src/pokemon.c	2022-09-09 09:02:35 -04:00
Eduardo Quezada	21df8c279b	Added SPECIES_FLAG_CANNOT_BE_TRADED ... - Also corrected Cylarex's forms not having the legendary flag	2022-09-09 08:59:53 -04:00
Eduardo Quezada	9144779634	Removed repeated extern consts in strings.h	2022-09-09 08:49:16 -04:00
Blackforest92	caf323a653	Erase ghost data in include/constants/map_groups.h	2022-09-09 00:40:30 +07:00
Blackforest92	3acb32acb8	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07:00
Eduardo Quezada	7fe1e706b7	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig ... # Conflicts: # include/constants/pokemon_config.h	2022-09-08 08:52:13 -04:00
Eduardo Quezada D'Ottone	066a5bee85	Merge pull request #2277 from TheXaman/tx_debug_system_rhh ... Inclusion of the tx_debug_system	2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone	47a50b3dac	Merge branch 'master' into weather_forms_fixes	2022-09-07 23:07:25 -04:00
sbird	3a0759d458	[doc] fix misnamed dma <--> aslr	2022-09-07 14:37:03 +02:00
GriffinR	74b563f696	Merge pull request #1749 from GriffinRichards/ur-classes ... Fix names and constant usage for union room classes	2022-09-06 21:35:10 -04:00
LOuroboros	c8f4a44380	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-09-06 20:40:34 -03:00
LOuroboros	8705d1656b	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-09-06 20:38:28 -03:00
TheXaman	6062cf45fa	Merge branch 'master' into tx_debug_system_rhh	2022-09-07 00:03:58 +02:00
LOuroboros	f1c153e469	Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD ... There was never a reason not to.	2022-09-06 18:37:16 -03:00
TheXaman	b249399a53	changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()'	2022-09-06 23:00:26 +02:00
Eduardo Quezada	3a6318f1d9	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor ... # Conflicts: # include/constants/battle_config.h	2022-09-06 15:20:54 -04:00
ghoulslash	59de7e48e5	Merge pull request #2265 from AsparagusEduardo/RHH_substructFix ... Fixed PokemonSubstruct3 alignment	2022-09-06 15:14:45 -04:00
ghoulslash	971081b8fd	Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 ... Flat Merge Friday (Weekly merge)	2022-09-06 15:13:47 -04:00
LOuroboros	0b07f4a06e	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms	2022-09-06 10:53:12 -03:00
LOuroboros	bb290d5ab0	Updates ... -Removed the pointless param1 setting in sXerneasFormChangeTable -Updated the descriptions of Behemoth Blade and Behemoth Bash -Added a new parameter to the struct FormChange -Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves". -Added missing calls to "CalculateMonStats". -Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake -Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.) Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.	2022-09-06 10:45:07 -03:00
sbird	584bfe0221	[debug] add support for mgba printf ... * adds support for mgba printf debugging as well as adding support for switching between debugging configuration * adds `mini_printf` as an alternative to libc printf as well as switches to choose a pretty printing handler * adds a pretty printing format to `mini_printf` to print preproc encoded strings	2022-09-06 13:40:31 +02:00
Eduardo Quezada	e253a87bc5	Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once.	2022-09-05 14:49:14 -04:00
Eduardo Quezada	7c7da8e176	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs ... # Conflicts: # src/battle_script_commands.c	2022-09-05 14:43:04 -04:00
Eduardo Quezada	dbd56efaef	Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 ... # Conflicts: # src/battle_util.c	2022-09-05 12:20:57 -04:00
TheXaman	6cab795c5c	Update include/constants/overworld_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-09-05 11:02:44 +02:00
Eduardo Quezada	2ee843c70d	Proper label for species flags	2022-09-04 22:13:28 -03:00
Eduardo Quezada	a4c242f2f8	Implemented Shiny Lock functionality	2022-09-04 21:55:59 -03:00
Eduardo Quezada	74c3fdfba7	Flag to allow certain species to always have perfect IVs (like Partner Pikachu and Eevee)	2022-09-04 19:41:01 -03:00
Eduardo Quezada	89550ed05d	Updated Sport Ball's modifier.	2022-09-04 18:54:23 -03:00
Eduardo Quezada D'Ottone	4017fc3e20	Apply style suggestions from code review	2022-09-03 21:22:15 -04:00
Eduardo Quezada	41bf6bde25	Removed pointless macro	2022-09-03 00:28:53 -04:00
Eduardo Quezada	03498d7240	Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER	2022-09-02 23:57:43 -04:00
Eduardo Quezada	5403cd036e	Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 ... # Conflicts: # include/battle.h # include/battle_controllers.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controllers.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c	2022-09-02 23:24:08 -04:00
GriffinR	03a98c72bc	Sync fieldmap	2022-09-02 19:29:35 -04:00
Eduardo Quezada	c7fc2e13f7	Renamed TM flags to keep consistency with the rest of the repo	2022-09-02 16:54:58 -04:00
Porygon23	ba6aad5bcc	Merge branch 'master' into AI-Logic-Updates	2022-09-02 14:44:47 -06:00
TheXaman	b4b3e84cbd	removed default flags and added ingame warning if a function that requires them is used	2022-09-02 18:39:38 +02:00
TheXaman	367b12801e	changed debug_config.h to overworld_config.h, ... changed no bag use and no catching flags to battle_config.h, removed TX reference (big sad)	2022-09-02 12:33:42 +02:00
TheXaman	ad57551db1	removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation	2022-09-02 12:10:11 +02:00
Eduardo Quezada D'Ottone	59f1f10dec	Merge pull request #2260 from DizzyEggg/magic_bounce ... Fix Magic Bounce targets	2022-09-01 19:56:15 -04:00
GriffinR	a28fbbc1b8	Merge pull request #1748 from GriffinRichards/fix-judgement ... Standardize judgement vs judgment spelling	2022-09-01 11:51:04 -04:00
Eduardo Quezada	8d94c58cac	Shows exp when leveling up with Exp Candies	2022-08-31 21:54:27 -04:00
Eduardo Quezada	3264c3c87a	Shows amount of Exp gained.	2022-08-31 09:05:51 -04:00
LOuroboros	c167e2c6cc	Added Legends: Arceus' move data	2022-08-30 19:32:44 -03:00
DizzyEggg	7cb010d71e	fix magic bounce conflicts and fix magic coat	2022-08-30 19:36:06 +02:00
Eduardo Quezada	925384eedc	Generations of Pokémon can now be disabled individually	2022-08-30 12:50:59 -04:00
Eduardo Quezada	df4c065ea6	Separated P_NEW_POKEMON into sections by generation. ... Sizes: - GEN_3 15.690.076 bytes - GEN_4 17.480.816 bytes - GEN_5 19.544.944 bytes - GEN_6 20.907.332 bytes - GEN_7 22.233.288 bytes - GEN_8 23.605.744 bytes	2022-08-30 12:50:59 -04:00
TheXaman	3debf0442d	changed the locations of tx_debug_system related #defines to its own file 'constants/debug_config.h'	2022-08-30 18:02:23 +02:00
TheXaman	04c40677bd	Changed the way debug flags are handled, now in constants/battle_config.h	2022-08-30 17:41:35 +02:00
TheXaman	d9bd272452	removed the entries ld_script as per pret#1738, added newline to debug.h	2022-08-30 17:08:35 +02:00
LOuroboros	df88317a98	Introduced FORM_BATTLE form changes ... For species such as Xerneas and Zacian.	2022-08-29 19:10:52 -03:00
TheXaman	bed5639074	Changed preproc defines to TRUE/FALSE, small cleanup	2022-08-29 19:36:44 +02:00
TheXaman	8c9a59ec1c	Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh	2022-08-29 19:13:11 +02:00
ghoulslash	2cd01bd95d	Merge pull request #2239 from DizzyEggg/quash ... Quash	2022-08-29 10:43:54 -04:00
Blackforest92	61c33f56a0	Updated to latest master branch + add PLA's data to teachable_learnsets.h	2022-08-29 21:01:31 +07:00
Eduardo Quezada D'Ottone	8ca2f949e3	Merge pull request #2233 from gruxor/tmhm_rework ... Reworked TMHM into expandable list format	2022-08-29 04:20:45 -04:00
Ariel A	c704591c8c	Fixed field move mon palette at night.	2022-08-29 01:45:02 -04:00
Ariel A	66acabe5c6	Refactored follower messages.	2022-08-29 00:43:38 -04:00
Eduardo Quezada	12b32606f5	Fixed PokemonSubstruct3 alignment	2022-08-27 03:05:06 -04:00
Eduardo Quezada	69f4c226f0	Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs ... # Conflicts: # src/battle_ai_main.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_script_commands.c # src/pokemon.c # src/pokemon_summary_screen.c	2022-08-27 02:42:22 -04:00
Eduardo Quezada	15d611ba65	Usage of BATTLE_PARTNER	2022-08-27 01:26:13 -04:00
Eduardo Quezada	0a34d47041	Merge remote-tracking branch 'pret/master' into pret_clean2	2022-08-27 00:56:00 -04:00
Eduardo Quezada	7c86bd5d08	Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 ... # Conflicts: # include/battle_interface.h # src/battle_anim_effects_1.c # src/battle_script_commands.c # src/field_specials.c	2022-08-26 22:23:37 -04:00
LOuroboros	922bbacd71	Updated GetMonFriendshipScore ... -Moved it to src/pokemon.c -Made a battle specific variant called GetBattlerFriendshipScore. -Made that variant return 0 for Mega Evolved 'mons and if called on link battles.	2022-08-26 21:33:43 -03:00
Eduardo Quezada D'Ottone	bee36edd9c	Merge pull request #2173 from LOuroboros/yourAffection ... Implement affection-now-friendship mechanics	2022-08-26 14:54:32 -04:00
GriffinR	0516f94837	Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore ... Added constants for GetLeadMonFriendshipScore	2022-08-26 14:52:10 -04:00
crater-git	f8fb4e8cf2	Renamed funcs, lists, etc. - Teach->Teachable	2022-08-26 14:48:06 -04:00
GriffinR	c5e873aa2b	Merge pull request #1742 from GriffinRichards/sound-pan ... Add missing usage of SOUND_PAN_*	2022-08-26 14:47:24 -04:00
crater-git	b8a3cc2846	Consolidated funcs, renamed CanMonLearnMove	2022-08-26 11:07:08 -04:00
crater-git	54ee960970	Fixed Battle Frontier tutor move IDs	2022-08-26 10:12:11 -04:00
ghoulslash	ae2ff4c1d8	Merge pull request #2258 from AsparagusEduardo/RHH_enableBugfix ... Enable BUGFIX by default	2022-08-26 09:56:19 -04:00
DizzyEggg	6331931ba3	Fix Magic Coat targets	2022-08-26 15:01:51 +02:00
Eduardo Quezada D'Ottone	399a0c9d6f	Merge pull request #2142 from AgustinGDLV/exp_candy ... Gen 8 EXP Candies	2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone	6b414d9555	Apply suggestions from code review ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-25 22:40:19 -04:00
Eduardo Quezada	4c999b40b1	Enable BUGFIX by default	2022-08-25 22:35:33 -04:00
GriffinR	ce4a6e9067	MAP_NONE -> MAP_DYNAMIC	2022-08-25 21:34:05 -04:00
crater-git	ed02c4b425	Removed tutor move distinction, combined llists	2022-08-25 19:56:47 -04:00
AgustinGDLV	e204527f43	changed candy item parameters	2022-08-25 15:52:47 -07:00
LOuroboros	8bd7103b9d	Even more review corrections	2022-08-25 17:32:12 -03:00
DizzyEggg	622a7f8141	merge with master	2022-08-25 22:10:59 +02:00
LOuroboros	2cf2c00b29	Updated friendship labels	2022-08-25 17:10:11 -03:00
ghoulslash	552d1f3d7b	Merge pull request #2237 from gruxor/compat_define ... Reworked branch defines into single compatibility define	2022-08-25 15:36:01 -04:00
ghoulslash	15a368163d	Merge pull request #2247 from AsparagusEduardo/RHH_specialPic ... LoadSpecialPokePic adjustments	2022-08-25 15:35:21 -04:00
ghoulslash	591bac25c4	Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves ... Moves with EFFECT_PLACEHOLDER can't be used.	2022-08-25 15:34:23 -04:00
LOuroboros	5dd143f19d	Applied Blackforest's changes to General_AffectionHangedOn	2022-08-25 13:07:52 -03:00
LOuroboros	1fc63c3431	More review corrections	2022-08-25 11:52:21 -03:00
DizzyEggg	a0ec8a5a80	4 digit hp in battle	2022-08-25 16:40:56 +02:00
LOuroboros	11d6ae4820	Renamed the GetLeadMonFriendshipScore constants	2022-08-25 11:34:37 -03:00
LOuroboros	e792fae415	Review corrections ... -Simplified the affection mechanics' battle scripts. -Corrected the value seting inside CalcCritChanceStage. -Simplified the checks inside Cmd_adjustdamage -Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added. -Added constants for the values returned by GetMonFriendshipScore.	2022-08-25 10:45:57 -03:00
LOuroboros	1f4ef2a0fb	Added constants for GetLeadMonFriendshipScore	2022-08-25 10:40:56 -03:00
ghoulslash	f736766c94	Merge pull request #2238 from DizzyEggg/multi ... Wild multi battles and doubles 2 vs 1 interface	2022-08-25 08:47:02 -04:00
Eduardo Quezada	af137c9b9d	Multiple changes ... - Simplified LoadSpecialPokePic - Changed all checks flag checks to houldShowFemaleDifferences	2022-08-25 03:42:41 -04:00
LOuroboros	7b7ba93d45	Fixed P_UPDATED_ABILITIES's comment	2022-08-24 20:35:13 -03:00
crater-git	6012731f27	Removed redundant ifdef	2022-08-24 19:31:55 -04:00
DizzyEggg	91b76e2e4f	quash pr clean up	2022-08-24 23:39:34 +02:00
DizzyEggg	06b4548603	Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash	2022-08-24 23:35:42 +02:00
DizzyEggg	7aa55f2753	better interface 1 player mon in double	2022-08-24 23:00:21 +02:00
crater-git	940f9f1726	Moved branch defs to config.h, now only for compat	2022-08-24 16:10:32 -04:00
DizzyEggg	e3ab439ec0	Fix multi wild battles	2022-08-24 21:56:24 +02:00
LOuroboros	b7ca63d151	Implemented Ice Face ... Thanks to Benício Gonçalves#3454 who provided a base to work with.	2022-08-24 13:45:34 -03:00
Blackforest92	07a07ddc8d	Update to latest master branch + allow Reveal Glass to work with Enamorus	2022-08-24 15:00:48 +07:00
Eduardo Quezada D'Ottone	21867a6061	Merge branch 'master' into AI	2022-08-24 01:07:35 -04:00
Eduardo Quezada	eea718cfc6	Placeholder moves can't be used in battle.	2022-08-24 00:30:49 -04:00
Eduardo Quezada	56a2e91518	Updated move limitations	2022-08-23 22:40:04 -04:00
Ct11217	67f473f38b	Fixed recommended issues. ... Added additional comments. Reordered switching ladder in ShouldSwitch() function. Functions that can specify a specific party mon to switch into need to come first.	2022-08-23 19:49:54 -06:00
crater-git	45511fcc44	Reworked TMHM into expandable list format	2022-08-23 21:44:42 -04:00
Eduardo Quezada	1f5adf93c7	Cleaned up use of configs be almost exclusively preproc functions	2022-08-23 21:00:08 -04:00
GriffinR	3771abbe08	Fix names and constant usage for union room classes	2022-08-23 12:44:07 -04:00
Eduardo Quezada	7c7887aa65	Moved ABILITY_NAME_LENGTH back to include/constants/global.h to keep in line with upstream pret	2022-08-23 08:25:27 -04:00
DizzyEggg	05ec8fb182	AI knows Party mons	2022-08-23 11:58:17 +02:00
Eduardo Quezada	afcc1178b2	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate ... # Conflicts: # data/battle_ai_scripts.s # data/battle_scripts_1.s # include/battle_controllers.h # include/battle_script_commands.h # include/battle_util.h # include/constants/battle_script_commands.h # include/constants/global.h # include/decompress.h # src/battle_anim_effects_1.c # src/battle_anim_normal.c # src/battle_anim_poison.c # src/battle_anim_water.c # src/battle_arena.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_safari.c # src/battle_controller_wally.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/berry.c # src/data/trainers.h # src/decompress.c # src/field_effect.c # src/hall_of_fame.c # src/overworld.c # src/pokeball.c # src/pokemon.c # src/pokemon_icon.c # src/pokemon_storage_system.c # src/scrcmd.c	2022-08-22 20:30:45 -04:00
DizzyEggg	327782646b	Save party mons ai	2022-08-23 01:07:25 +02:00
Eduardo Quezada	75ac960365	Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms	2022-08-22 17:27:21 -04:00
GriffinR	898ec580ae	Merge pull request #1737 from GriffinRichards/lock-unlock ... Clean up lock/unlock anim movement	2022-08-22 01:30:33 -04:00
GriffinR	30906762ed	Merge pull request #1740 from AsparagusEduardo/pret_stringTabs ... Fixed inconsistent use of white space for scripts, .c files and .h files.	2022-08-20 23:03:59 -04:00
GriffinR	261b0ff118	Standardize judgement vs judgment spelling	2022-08-20 22:58:46 -04:00
GriffinR	9e175a1037	Merge pull request #1735 from GriffinRichards/arena-const ... Add some missing battle arena constants	2022-08-20 22:54:32 -04:00
Eduardo Quezada	76d2d92abb	Merge branch 'pretmaster' into pret_clean2	2022-08-20 12:43:09 -04:00
GriffinR	1685365cd4	Merge pull request #1727 from AsparagusEduardo/pret_clean ... Cleanup from https://github.com/pret/pokefirered/pull/532	2022-08-19 21:27:55 -04:00
Martin Griffin	d57442a511	Decimal paletteNums	2022-08-19 17:05:22 +01:00
GriffinR	c2d5dd2a1f	Additional battle anim sync	2022-08-19 11:51:13 -04:00
Martin Griffin	5719a7f7bc	Use static inline instead of extern inline for modern	2022-08-19 15:47:50 +01:00
Martin Griffin	6fed961ed6	Write palette IDs in hex	2022-08-19 15:29:35 +01:00
Blackforest92	a9d09bcd17	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion	2022-08-19 17:53:01 +07:00
Blackforest92	00a827b3fb	Add PLA pokemon to Form Species Table, add Kleavor's graphics	2022-08-19 17:47:34 +07:00
Eduardo Quezada	3bc2cf921c	Sync src/battle_controllers.c with pokefirered	2022-08-18 14:30:22 -04:00
Eduardo Quezada	59f89bde9e	Misc cleanup	2022-08-18 14:23:45 -04:00
Ct11217	a4b53126f6	Added AI_FLAG_ACE_POKEMON ... When this flag is set, the trainer will have an "Ace" pokemon that will always be sent out last. If this flag is set, the last Pokemon in the party will be considered the "Ace" Pokemon. This is similar to the gym leader functionality found in Sword & Shield.	2022-08-17 18:23:12 -06:00
Ariel A	891b432669	Fixed shadow tile tag.	2022-08-17 20:00:45 -04:00
Ariel A	0b1c81af66	Merge branch 'romhack' into lighting	2022-08-17 19:59:58 -04:00
Ariel A	d846b9c781	Added dynamic palette support for virtual objects. ... Added flag to hide follower on certain maps.	2022-08-17 19:58:46 -04:00
Ariel A	16babe87fc	Follower pokemon now disappears when teleporting. ... Fixed GF's incorrect GFX id on Route 123.	2022-08-17 19:50:22 -04:00
Ariel A	7edb7bbc23	Added battle slide-in animation for Pokemon follower.	2022-08-16 19:52:38 -04:00
Eduardo Quezada	5933c42439	Synced Route 4 and 10's MapSec labels	2022-08-16 18:23:37 -04:00
GriffinR	26734d80f3	Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum ... Convert MON_DATA constants into enum to ease editing and addition of fields.	2022-08-15 18:51:32 -04:00
Eduardo Quezada	0149f420f9	Corrected comment	2022-08-15 17:36:55 -04:00
Eduardo Quezada	e8a05e92e4	Corrected additional inconsistent uses of whitespace	2022-08-15 17:04:34 -04:00
tustin2121	ec73158f16	Moving documentation comments per request ... from the discord chat.	2022-08-15 16:37:38 -04:00
tustin2121	1cb659df8c	Renaming Script Contexts ... - Determined how the various script contexts were used and renamed accordingly. - ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts. - ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames. - ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.	2022-08-15 15:18:12 -04:00
GriffinR	5515e328b2	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
GriffinR	2df6cc1820	Merge pull request #1730 from GriffinRichards/sync-naming-screen ... Clean up naming screen graphics	2022-08-12 11:05:55 -04:00
GriffinR	574cf1ddb9	Merge pull request #1725 from GriffinRichards/security-signature ... Sector security -> signature	2022-08-12 10:47:10 -04:00
Ct11217	b95e450cb6	Added corner case logic for AI Switching. ... 1. Refactor Perish Song 2. Yawn 3. Secondary Damage (Leech Seed, Cursed etc). 4. Added Preliminary logic to help AI be smarter against semi-invulnerable Added AI logic regarding abilities that benefit from switching 1. Natural Cure 2. Regenerator	2022-08-11 22:48:36 -06:00
GriffinR	cf4d05e9e7	Fix typo	2022-08-11 12:09:38 -04:00
GriffinR	63468f9fcb	Add some missing battle arena constants	2022-08-11 12:02:56 -04:00
GriffinR	286a99eb1d	Merge pull request #1723 from GriffinRichards/fix-impassable ... MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes	2022-08-10 21:28:14 -04:00
GriffinR	bfdbbad468	Split naming screen palettes/graphics, use correct image palettes, clean up	2022-08-09 09:27:28 -04:00
Eduardo Quezada	1fd1870a13	Moved enum to include/pokemon.h	2022-08-08 18:40:47 -04:00
Eduardo Quezada	75d52dc762	Convert MON_DATA constants into enum to ease editing and addition of fields.	2022-08-08 18:18:17 -04:00
Eduardo Quezada	4b08a511c3	Cleanup from https://github.com/pret/pokefirered/pull/532	2022-08-07 22:40:15 -04:00
GriffinR	2487ddb128	Sector security -> signature	2022-08-05 10:42:31 -04:00
ghoulslash	c7c7a76608	Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav	2022-08-04 19:06:29 -04:00
DizzyEggg	c991131b75	Change language stuff based on the french decomp	2022-08-04 11:53:16 +02:00
GriffinR	e5c36cd745	MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes	2022-08-03 14:21:13 -04:00
GriffinR	79384ec9f3	Merge pull request #1702 from GriffinRichards/clean-psn ... Clean up field_poison.c	2022-08-02 13:20:49 -04:00
GriffinR	99a37b5aa5	Merge pull request #1717 from mrgriffin/trainer-party-macro ... Macros for keeping .partyFlags, .partySize, and .party in sync	2022-08-02 13:11:43 -04:00
ExpoSeed	807c3fd17f	Delete item and ability defines in configs	2022-08-02 00:28:42 -05:00
ExpoSeed	49da2ee53f	Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION	2022-08-02 00:15:55 -05:00
GriffinR	79c5a5983e	Merge pull request #1721 from AsparagusEduardo/pret_clean2 ... Companion PR to pokefirered #525	2022-08-01 16:57:40 -04:00
Eduardo Quezada	c6cdb2a281	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-31 22:57:46 -04:00
ghoulslash	deddda451b	merge w pret	2022-07-30 18:35:41 -04:00
GriffinR	5101811407	Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands ... Further cleaning after comparing with pokefirered	2022-07-30 09:09:23 -04:00
Eduardo Quezada	40805fffc0	Space cleanup	2022-07-29 21:28:39 -04:00
Eduardo Quezada	5d4b76c0ba	Review changes from pokefirered #524	2022-07-29 17:00:07 -04:00
Eduardo Quezada	9dc64b67cd	Review changes	2022-07-29 15:38:23 -04:00
ghoulslash	906622f04d	add gExitStairsMovementDisabled	2022-07-29 11:26:21 -04:00
Eduardo Quezada	01558ff8f3	Struct pointers star standarizing	2022-07-29 11:15:33 -04:00
ghoulslash	7322166f8b	merge w pret	2022-07-29 11:05:08 -04:00
Eduardo Quezada	13672680b0	void pointer standarized	2022-07-29 10:52:35 -04:00
Eduardo Quezada	7b3401ee27	Standarized use of star in pointer types	2022-07-29 10:17:58 -04:00
Eduardo Quezada	9caca17064	Cleanup by syncing src/battle_script_commands.c with pokefirered	2022-07-29 09:43:16 -04:00
Jaizu	7a8c28ccca	Remove duplicated CB2_InitCopyrightScreenAfterBootup	2022-07-29 10:52:36 +02:00
Greenphx9	05cbd6a906	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names	2022-07-29 18:49:25 +10:00
LOuroboros	b9c83710c4	Sync this branch's include/constants/moves.h with the BE's	2022-07-28 11:12:28 -03:00
Eduardo Quezada	09af7422d5	Further cleaning after comparing with pokefirered ... STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs	2022-07-28 01:27:05 -04:00
Martin Griffin	2380d13a43	Macros for keeping .partyFlags, .partySize, and .party in sync	2022-07-27 23:25:37 +01:00
GriffinR	1da46a4bbc	Merge pull request #1715 from AsparagusEduardo/pret_docBooleans ... Documented boolean uses	2022-07-27 12:09:02 -04:00
Eduardo Quezada	e1c15a9cf6	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-27 08:16:10 -04:00
LOuroboros	b59f7aed7f	Added a constant for NPC trainer name length (#1712)	2022-07-25 22:59:13 -04:00
Eduardo Quezada	a37d8b1346	Documented boolean uses	2022-07-25 14:59:14 -04:00
LOuroboros	032b7b2ab9	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection	2022-07-25 10:24:19 -03:00
Eduardo Quezada D'Ottone	bfb86fdc86	Config for Gen 3 faint switch mechanics	2022-07-24 14:57:47 -04:00
Eduardo Quezada	e96c9c87fa	Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge ... # Conflicts: # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 23:38:52 -04:00
Eduardo Quezada	231727d02b	Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge ... # Conflicts: # asm/macros/event.inc # data/specials.inc # include/constants/species.h # src/data/pokemon/base_stats.h	2022-07-22 23:33:04 -04:00
Eduardo Quezada	f3bebcd12c	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge ... # Conflicts: # include/battle_anim.h # include/global.h # include/pokemon.h # src/battle_message.c # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 22:57:02 -04:00
ghoulslash	1260666c91	Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides ... Added Egg breeding species overrides.	2022-07-22 14:05:14 -04:00
ghoulslash	3a77b52bad	Merge pull request #2194 from AsparagusEduardo/BE_pretmerge ... Battle Engine pret merge	2022-07-22 14:00:40 -04:00
Eduardo Quezada D'Ottone	56b9a50109	Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus ... # Conflicts: # include/constants/battle_config.h	2022-07-21 16:28:16 -04:00
ghoulslash	49a932a892	Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky ... Fixed Light That Burns The Sky not using the calculated damage category	2022-07-21 16:14:38 -04:00
ghoulslash	30a494f964	Merge pull request #2197 from AsparagusEduardo/BE_explosion ... Config for Explosion halving defense	2022-07-21 16:11:32 -04:00
ghoulslash	504600c996	Merge pull request #2201 from AsparagusEduardo/BE_sturdy ... Config for Sturdy's Gen5+ effect.	2022-07-21 16:09:01 -04:00
Eduardo Quezada D'Ottone	e4ae280ca6	Fixed calls to IsZMove	2022-07-21 15:32:14 -04:00
Eduardo Quezada D'Ottone	25397e5794	Fixed Light That Burns The Sky not using the calculated damage category ... Also: - Modified move defines to ease with future move expansion. - Enabled Instruct's check for Z Moves in AI_CheckBadMove.	2022-07-21 15:13:00 -04:00
Eduardo Quezada D'Ottone	0f3fdd410a	Config for Sturdy's Gen5+ effect.	2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone	e14afd8957	Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.	2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone	cb34119711	Config for Charge raising Sp. Def.	2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone	fe63dafcc1	Merge branch 'battle_engine' into BE_pretmerge ... # Conflicts: # src/battle_anim_fire.c # src/battle_controller_player.c	2022-07-20 08:50:30 -04:00
ghoulslash	99424e1aaf	Update include/battle.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-07-19 19:03:05 -04:00
ghoulslash	2b5bb9f6e4	move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check	2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone	1cfb267b34	Config for Explosion halving defense	2022-07-18 13:10:27 -04:00
Eduardo Quezada D'Ottone	1dcbf59686	Config for Plus and Minus interaction	2022-07-18 08:11:02 -04:00
Ariel A	671fa68410	Merge branch 'romhack' into lighting	2022-07-17 16:07:50 -04:00
Ariel A	9beee311c4	Merge branch 'master' into romhack	2022-07-17 15:13:15 -04:00
ghoulslash	6b84a9f0b3	merge w be	2022-07-17 12:40:43 -04:00
Ariel A	b4cc3ca7b7	Tileset swapPalettes can now use palette 12 for swapping. ... Fixed Slateport Fan Club lights.	2022-07-15 19:32:13 -04:00
Eduardo Quezada D'Ottone	e791cf90ad	Merge tag 'pretmaster' into BE_pretmerge2 ... # Conflicts: # data/battle_anim_scripts.s # include/battle_anim.h # include/battle_controllers.h # include/battle_interface.h # include/battle_main.h # include/battle_setup.h # include/constants/battle_anim.h # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_anim_fire.c # src/battle_anim_normal.c # src/battle_controllers.c # src/battle_dome.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/pokemon.c	2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone	f78bb4fb84	Merge remote-tracking branch 'pret/master' into item_expansion ... # Conflicts: # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-12 17:42:32 -04:00
Eduardo Quezada D'Ottone	c69275f373	Merge remote-tracking branch 'pret/master' into PE_pretmerge ... # Conflicts: # include/battle_anim.h # include/pokemon.h # src/data/pokemon/base_stats.h	2022-07-12 17:20:49 -04:00
GriffinR	30a5821997	Merge pull request #1705 from sphericalice/move-unavailable ... Introduces a MOVE_UNAVAILABLE constant	2022-07-12 11:32:57 -04:00
sphericalice	186f2c0232	Introduce a MOVE_UNAVAILABLE constant	2022-07-11 15:18:13 +01:00
Greenphx9	4294682d8c	16-letter move names ... Move define, add spaces between comments, fix include if TRUE -> if set to TRUE Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>	2022-07-11 12:49:30 +10:00
LOuroboros	a1004485c5	Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH	2022-07-10 20:08:28 -03:00
GriffinR	06dc93fc2f	Clean up field_poison.c	2022-07-06 21:04:54 -04:00
Blackforest92	ff861ff963	Add some of Legends Arceus battle sprites	2022-07-04 12:28:40 +07:00
ghoulslash	fac6f21ed0	AI_EFFECTIVENESS_xY are enums	2022-07-03 16:28:34 -04:00
ghoulslash	e4bf99d777	merge w be	2022-07-03 16:20:05 -04:00
LOuroboros	c04f7d5e5b	Changed B_TELEPORT_BEHAVIOR's description comment	2022-07-03 13:51:34 -03:00
LOuroboros	8f728dcd79	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-07-03 13:49:18 -03:00
Blackforest92	8c88e8a9b7	Legends Arceus Pokemon 95% Finished	2022-07-03 17:15:37 +07:00
ghoulslash	02a62e245b	Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney ... Config for lost money after losing a battle	2022-07-01 11:58:36 -04:00
ghoulslash	6cf0620f93	Merge pull request #2159 from Sneed69/trap-move-arrays ... Trap move battle string related code cleanup	2022-07-01 11:07:28 -04:00
sneed	c1af418340	define B_MSG_WRAPPED_ constants	2022-07-01 17:52:46 +03:00
ghoulslash	fc2cfd8c9d	Merge pull request #2136 from LOuroboros/pePretMerge ... Pret merge for the pokemon_expansion	2022-07-01 09:22:55 -04:00
ghoulslash	a349462b78	Merge pull request #2134 from LOuroboros/bePretMerge ... Pret merge for the battle_engine	2022-07-01 09:21:51 -04:00
ghoulslash	42f3cccdbe	Merge pull request #2154 from HamishSinclair/poltergeist ... add poltergeist animation	2022-07-01 09:19:49 -04:00
ghoulslash	f4918222e8	Merge pull request #2156 from Sneed69/ai_3rd_type ... Type effectivess related AI bugfixes	2022-07-01 09:09:12 -04:00
ghoulslash	80ac427443	Merge pull request #2160 from Sneed69/ignore-mystery-type-3 ... IS_BATTLER_OF_TYPE ignores third type if it's Mystery	2022-07-01 08:55:08 -04:00
LOuroboros	aa5c6a3f01	Implemented affection-now-friendship mechanics	2022-06-22 00:18:01 -03:00
GriffinR	57222323c1	Merge pull request #1678 from GriffinRichards/const-frontier ... Add some battle frontier constant usage	2022-06-18 10:22:58 -04:00
GriffinR	4660f8c88b	Document battle tower TV show	2022-06-14 09:37:39 -04:00
GriffinR	7143865f6f	Add some battle frontier constant usage	2022-06-09 12:57:28 -04:00
GriffinR	1f540845cb	Merge pull request #1675 from GriffinRichards/doc-arg ... Document generic arguments	2022-06-09 11:11:02 -04:00
ghoulslash	b33a8b0cb4	move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use	2022-06-05 11:09:04 -04:00
ghoulslash	c694e0cb90	merge w be	2022-06-05 08:22:24 -04:00
GriffinR	bc2dbd772e	Add warning to NUM_OBJ_EVENT_GFX	2022-06-03 16:18:34 -04:00
GriffinR	1ca1bff81c	Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg	2022-06-03 15:43:21 -04:00
GriffinR	34438e6bc4	Continue documenting generic arguments	2022-06-03 15:38:03 -04:00
Sneed69	c60de5055d	remove IsMoveWithoutAnimation	2022-06-03 17:42:42 +03:00
sphericalice	380cb46919	Correct CreateRegionMapPlayerIcon's argument names ... Correct CreateRegionMapPlayerIcon's argument names in include/region_map.h	2022-06-03 15:04:52 +01:00
sphericalice	35bdaccedc	Add the HEAL_LOCATION_NONE constant	2022-06-03 14:59:01 +01:00
sneed	5934acbdc5	IS_BATTLER_OF_TYPE ignores 3rd type if mystery	2022-06-01 22:21:32 +03:00
sneed	86b436782a	trap move related code cleanup	2022-06-01 22:01:50 +03:00
GriffinR	a8437493c1	Document generic argument names in battle anim palettes	2022-06-01 12:25:01 -04:00
GriffinR	5e6d8a77e4	Document some generic argument names	2022-05-31 14:34:25 -04:00
sneed	2e855b204a	ai accounts for a third type	2022-05-29 04:55:37 +03:00
Martin Griffin	1cc59acca9	Static assertion for size of save structs	2022-05-25 19:48:42 +01:00
sneed	c8e08edbae	rename item1 and item2 in BaseStats	2022-05-23 19:10:24 +03:00
hamish	307d5d93c4	add potlergeist animation	2022-05-23 08:53:08 -04:00
sneed	ce468a0903	add macros for handling form base stats	2022-05-23 01:04:21 +03:00
Eduardo Quezada D'Ottone	f2c509eab7	Merge pull request #2151 from Sneed69/dummy_abilities ... Add dummy abilities to make base stats header smaller	2022-05-22 13:27:27 -04:00
sneed	587b056ccb	add dummy abilities to PE	2022-05-22 19:55:09 +03:00
BuffelSaft	16570e8c3f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-22 12:55:55 +12:00
Sneed69	d0a2be9630	weather forms fixes and config	2022-05-22 03:20:48 +03:00
GriffinR	6d772a5e30	Merge pull request #1662 from GriffinRichards/door-gfx ... Clean up door animations	2022-05-21 16:07:02 -04:00
Ariel A	6d79b6dbaa	Merge branch 'romhack' into lighting	2022-05-18 20:14:22 -04:00
Ariel A	01f73f54e1	Added follower transform effect and Castform forms. Credit: larryturbo ... Castform forms from https://www.deviantart.com/larryturbo/art/351-Castform-Froms-830190053	2022-05-18 19:12:30 -04:00
GriffinR	5c8e1e81ea	Color single-palette door anim graphics	2022-05-18 12:41:20 -04:00
GriffinR	593e2c9be0	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
AgustinGDLV	bd008e4c80	fixed softlocks / messages	2022-05-16 15:25:13 -07:00
TheXaman	675957c24a	new caught mon page should now show proper form in PE	2022-05-15 00:41:35 +02:00
ghoulslash	f6f4227f49	better bug bite impl, fix item removal	2022-05-13 16:21:41 -04:00
LOuroboros	74265efe61	Corrected size value of trainerHillTimes	2022-05-13 10:55:53 -03:00
LOuroboros	577791a6bc	Moved order of defined header files in include/global.h	2022-05-13 10:52:09 -03:00
LOuroboros	1d75f3ffde	Moved order of defined header files in include/global.h	2022-05-13 10:51:49 -03:00
LOuroboros	5397d020d7	Moved order of defined header files in include/global.h	2022-05-13 10:51:13 -03:00
LOuroboros	08225bbba9	Post Pret merge fix ... I made an oopsie.	2022-05-13 10:46:08 -03:00
BuffelSaft	bb25746e05	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-13 22:40:43 +12:00
LOuroboros	52d6c96e69	Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge	2022-05-13 03:20:42 -03:00
LOuroboros	12d956872b	Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge	2022-05-13 03:18:37 -03:00
LOuroboros	2263caef7a	Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine	2022-05-13 03:17:31 -03:00
Ariel A	9862b0f63d	Merge branch 'romhack' into lighting	2022-05-11 20:44:48 -04:00
Ariel A	28ec60a776	Fixed some field effect palettes. Removed leftover CacheLightMetatiles.	2022-05-10 23:21:54 -04:00
sneed	bceccf5474	changes	2022-05-10 08:17:31 +03:00
sneed	709f583390	Initial commit	2022-05-10 02:58:24 +03:00
Eduardo Quezada D'Ottone	f80bab897f	Merge pull request #2112 from AgustinGDLV/evo_battle ... Gen 8 Evolution Mechanics (Battle Engine)	2022-05-09 17:40:19 -04:00
Eduardo Quezada D'Ottone	b6922a1dab	Merge branch 'pokemon_expansion' into evo_overworld	2022-05-09 16:36:34 -04:00
AgustinGDLV	9bb5db2275	removed duplicate define	2022-05-08 21:23:51 -07:00
ghoulslash	07b0ce9737	add inner focus ability popup msg	2022-05-08 17:57:30 -04:00
Eduardo Quezada D'Ottone	13f9919b9e	Merge pull request #2123 from Sneed69/wikiberry_battle ... Update Confuse Berry Hold Effect (Battle Engine)	2022-05-08 09:02:33 -04:00
Eduardo Quezada D'Ottone	c71b60d9f8	Merge branch 'PokemonExpansion' into PE_breedOverrides ... # Conflicts: # include/constants/pokemon_config.h	2022-05-07 19:45:06 -04:00
Eduardo Quezada D'Ottone	989ec641f4	Merge pull request #2120 from ghoulslash/be/healblock ... Heal Block AI and Pollen Puff Selection Prevention	2022-05-07 19:29:24 -04:00
sneed	f83875cf0f	remove item expansion check	2022-05-07 23:34:38 +03:00
AgustinGDLV	7b0154336d	Merge branch 'battle_engine' into symbiosis	2022-05-07 13:26:21 -07:00
AgustinGDLV	c7bee35161	fixed conflict with new PR	2022-05-07 13:23:41 -07:00
AgustinGDLV	9d222d3ab4	fixed gems and damage-reducing berries	2022-05-07 13:12:21 -07:00
sneed	c6b529ed50	add missing constant	2022-05-07 22:09:08 +03:00
AgustinGDLV	8a0a2a5a39	Apply suggestions from code review ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-05-07 09:36:03 -07:00
AgustinGDLV	017f44f5ac	Apply suggestions from code review ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-05-07 09:35:00 -07:00
ghoulslash	0172f84617	Merge pull request #2070 from AsparagusEduardo/PE_evoData ... Updated missing evolution and form change data	2022-05-07 11:37:11 -04:00
ghoulslash	9fa4d916d3	Merge pull request #2055 from AsparagusEduardo/BE_configs ... Once again, Battle Configs	2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone	dc25bc6145	Merge branch 'battle_engine' into BE_WhiteOutMoney ... # Conflicts: # include/constants/battle_string_ids.h # src/battle_message.c	2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone	cbe73de8c8	Merge pull request #1861 from LOuroboros/primalReversionTweaks ... Primal Reversion Tweaks	2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone	096fe3c11d	Removed unecessary B_LEEK_ALWAYS_CRIT config	2022-05-07 10:56:31 -04:00
Eduardo Quezada D'Ottone	4e7ce0b663	Merge branch 'battle_engine' into BE_configs ... # Conflicts: # include/constants/battle_config.h	2022-05-07 10:25:34 -04:00
ghoulslash	07579bd42b	prevent ally pollen puff selection under heal block. add some ai checks for heal block	2022-05-07 09:56:32 -04:00
ghoulslash	adfb336a3f	Merge pull request #2105 from Sneed69/healblock ... Add missing Heal Block functionalities	2022-05-07 09:13:18 -04:00
ghoulslash	e5b777695c	Merge pull request #2107 from Sneed69/steelbeam ... Steel Beam Move Effect Implementation	2022-05-07 08:40:34 -04:00
AgustinGDLV	542a0f07b4	fixed bug bite / bestow	2022-05-06 22:07:25 -07:00
BuffelSaft	57003c62fd	EFFECT_SOLAR_BEAM ... Fix definition.	2022-05-07 14:20:56 +12:00
BuffelSaft	3e1934ebe3	Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE ... Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.	2022-05-07 14:20:37 +12:00
BuffelSaft	8693db632b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-07 12:27:20 +12:00
AgustinGDLV	0cb6529ae2	functional but not perfect implementation	2022-05-06 14:53:16 -07:00
sneed	ef7cd3cdfe	BattleScript_DefiantActivates rename	2022-05-06 11:15:24 +03:00
LOuroboros	43053d2e6c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-05-06 02:22:14 -03:00
AgustinGDLV	e730d64945	corrections	2022-05-05 15:54:33 -07:00
AgustinGDLV	03c48b4f3f	compatibility with evo_battle	2022-05-05 15:46:53 -07:00
AgustinGDLV	7d42f93861	added special overworld evo changes	2022-05-05 11:55:31 -07:00
AgustinGDLV	6235970722	added special battle evo changes	2022-05-05 11:41:27 -07:00
sneed	865b771db7	initial commit	2022-05-05 00:57:19 +03:00
Ariel A	19df355574	Merge branch 'romhack' into lighting	2022-05-03 23:01:52 -04:00
Ariel A	831c73c18c	Added system for conditional follower messages.	2022-05-03 23:01:02 -04:00
Eduardo Quezada D'Ottone	49905cee04	Ability Patch	2022-05-03 14:14:04 -04:00
sneed	60d7d8f97e	Initial Commit	2022-05-03 03:38:44 +03:00
sneed	b17d1f7816	Add generation specific interactions	2022-05-02 17:56:09 +03:00
sneed	23870a40a8	Initial commit	2022-05-02 06:04:16 +03:00
PikalaxALT	ff936c15e1	Sync arg descriptions from FireRed ... https://github.com/pret/pokefirered/pull/501	2022-04-28 13:46:23 -04:00
Ariel A	a05adff325	Merge branch 'romhack' into lighting	2022-04-27 22:51:51 -04:00
Ariel A	483d4b3448	Fixed all field effects with gendered palette tags (warp arrow, surf blob, bird)	2022-04-27 22:43:12 -04:00
Eduardo Quezada D'Ottone	cb9cace04f	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE_KadabraEverstone ... # Conflicts: # include/constants/pokemon_config.h	2022-04-27 12:05:33 -04:00
ghoulslash	7bc50392d0	Merge pull request #2072 from AsparagusEduardo/PE_ShellBlastEverstone ... Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone	2022-04-27 08:51:37 -04:00
ghoulslash	166b16d22c	Merge pull request #2091 from AsparagusEduardo/PE_LegendaryIV ... Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs	2022-04-27 08:48:22 -04:00
ghoulslash	574be40f26	Merge pull request #2099 from Greenphx9/calyrex_rider_icons ... Calyrex Rider Icons	2022-04-27 08:43:53 -04:00
BuffelSaft	746d9ea6c5	Add AI_GetBattlerMoveTargetType() ... Add AI version of the function that handles move target selection, as it needs to have ability and item info that it may not have access to.	2022-04-27 22:23:20 +12:00
BuffelSaft	af6242f2e0	Requested changes, Sticky Web edge case ... Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.	2022-04-27 21:51:10 +12:00
BuffelSaft	5358cc0a00	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-04-25 13:38:13 +12:00
Greenphx9	b3294c60a2	Calyrex Rider Icons	2022-04-22 16:31:17 +10:00
GriffinR	fc5747f0f7	Merge pull request #1649 from GriffinRichards/clean-trainer ... Trainer hill clean up	2022-04-20 00:20:44 -04:00
Ariel A	f94a92fe1f	Fixed shadow brightness during battle transition.	2022-04-19 15:55:10 -04:00
Ariel A	2d376d8317	Removed shadows in puddles or sand piles. Optimized shadow tile loading.	2022-04-18 01:30:10 -04:00
Ariel A	bc2b50cd2e	Added LoadPaletteFast function.	2022-04-18 00:23:15 -04:00
Ariel A	6e621d80a1	Added day/night palette swapping. ... Updated lighting for lava, Petalburg, Slateport, Dewford, Verdanturf, Oldale, Mossdeep, Lilycove, Fallarbor. Improved lantern appearance & added neon signs on PokeCenter & Mart. Optimized gamma shift code. Removed obselete CacheLightMetatiles.	2022-04-18 00:23:11 -04:00
TheXaman	c54bf21b01	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2022-04-16 23:18:35 +02:00
TheXaman	8006b8dbcd	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss	2022-04-16 23:17:55 +02:00
Eduardo Quezada D'Ottone	a6175d2622	Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs	2022-04-16 13:01:15 -04:00
Eduardo Quezada D'Ottone	84d713a50f	Legendary and Mythical flags	2022-04-14 18:44:20 -04:00
TheXaman	2fa812df26	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge	2022-04-13 20:51:35 +02:00
LOuroboros	446bcd3181	Merge branch 'master' of https://github.com/pret/pokeemerald into pePret	2022-04-11 01:23:18 -03:00
LOuroboros	eb1834ce84	Merge branch 'master' of https://github.com/pret/pokeemerald into iePret	2022-04-11 01:22:48 -03:00
LOuroboros	b6e2945072	Merge branch 'master' of https://github.com/pret/pokeemerald into bePret	2022-04-11 01:22:10 -03:00
ghoulslash	959f3cca77	merge w pret	2022-04-07 12:11:45 -04:00
LOuroboros	3ca9ac5b37	Post merge corrections	2022-04-03 14:27:33 -03:00
LOuroboros	f82c946ff3	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge	2022-04-03 13:26:27 -03:00
LOuroboros	af2f70e000	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge	2022-04-03 13:21:40 -03:00
LOuroboros	fa39dc76dc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
GriffinR	328b925a08	Move trainer hill map data to bin files	2022-03-31 14:08:31 -04:00
GriffinR	62f3f144ab	Clean up some trainer hill	2022-03-31 12:54:07 -04:00
GriffinR	66cbe29c14	Add bugfix for Battle Factory trainer IVs	2022-03-30 09:37:03 -04:00
LOuroboros	434f6cf5ad	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2022-03-26 08:43:55 -03:00
ExpoSeed	5fd468f507	Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns	2022-03-22 13:10:24 -05:00
ExpoSeed	f50a406b18	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2022-03-22 12:56:23 -05:00
ghoulslash	0036a4dc36	pc acccess	2022-03-18 13:30:08 -04:00
Ariel A	07333b5219	Merge branch 'romhack' into lighting	2022-03-16 19:43:13 -04:00
Ariel A	c78736c94f	Fixed bug where decor icons cleared dynamic palettes in the Frontier Exchange Corner shop.	2022-03-15 19:13:22 -04:00
GriffinR	5160520639	Merge pull request #1642 from GriffinRichards/bstrings ... Add usage of battle strings table offset constant	2022-03-14 16:40:54 -04:00
Eduardo Quezada D'Ottone	ff9556cb44	Update include/constants/pokedex.h	2022-03-13 11:25:44 -03:00
Eduardo Quezada D'Ottone	8f34249ab2	Update include/constants/pokedex.h	2022-03-13 11:25:37 -03:00
GriffinR	d664135572	Add usage of battle strings table offset constant	2022-03-10 10:44:04 -05:00
ultima-soul	2d3ba500c9	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2022-03-01 15:10:19 -08:00
ultima-soul	84a7f960c8	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2022-02-28 23:37:41 -08:00
ultima-soul	86089ce935	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2022-02-28 22:13:14 -08:00
GriffinR	a2ee0c8393	Merge pull request #1639 from GriffinRichards/typo-hoppy ... Fix bunny hoppy typo	2022-02-28 22:34:24 -05:00
GriffinR	5d58cdd297	Fix bunny hoppy typo	2022-02-28 13:34:39 -05:00
Eduardo Quezada D'Ottone	054f667446	Config for Kadabra ignoring Everstone upon evolving	2022-02-26 22:04:24 -03:00
Eduardo Quezada D'Ottone	ed1ea69759	Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone	2022-02-26 21:40:20 -03:00
Eduardo Quezada D'Ottone	755b31bee0	Enable form change for the Forces of Nature	2022-02-26 12:19:38 -03:00
ghoulslash	7c2bbf1df3	fix struggle bug anim	2022-02-25 08:54:35 -05:00
Ariel A	d23b8e99d7	Merge branch 'romhack' into lighting	2022-02-22 21:27:44 -05:00
Ariel A	2273a61b37	Re-indexed follower & pokeball GFX IDs.	2022-02-22 20:14:02 -05:00
sphericalice	40efac0ddf	Rename GetBattlePyramindTrainerEncounterMusicId to fix typo	2022-02-22 19:13:17 +00:00
Ariel A	ab6b14868b	Merge branch 'romhack' into lighting	2022-02-21 15:58:45 -05:00
BuffelSaft	6a119c5a30	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-02-13 21:06:15 +13:00
Eduardo Quezada D'Ottone	dde65d5cea	Config for Sheer Cold being less accurate when not used by Ice type Pokémon	2022-02-13 01:07:42 -03:00
Eduardo Quezada D'Ottone	c849197a88	Config for Minimize raising 2 stages	2022-02-13 00:45:35 -03:00
Eduardo Quezada D'Ottone	d73e6faab8	Config for Growth being affected by sunlight	2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone	748ce99de3	Config for Ingrain grounding the user	2022-02-13 00:17:37 -03:00
Eduardo Quezada D'Ottone	76e0b38960	Config for Pokémon with Oblivious being affected by Taunt	2022-02-12 23:57:23 -03:00
Eduardo Quezada D'Ottone	389a38b3cd	Config for Facade being affected by burns	2022-02-12 23:55:54 -03:00
Eduardo Quezada D'Ottone	0dd2de988a	Merge branch 'battle_engine' into primalReversionTweaks	2022-02-12 23:08:12 -03:00
LOuroboros	92d8268603	Update include/constants/battle_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-02-12 00:18:24 -03:00
LOuroboros	b52233ec31	Updated Conversion's effect	2022-02-11 21:42:39 -03:00
Ariel A	7daa78311b	Added more follower footprint types. Credit: Sonikku-DatH ... https://www.pokecommunity.com/showthread.php?p=10410294#post10410294	2022-02-07 23:06:38 -05:00
GriffinR	7d2344c07b	Merge pull request #1616 from GriffinRichards/missing-req ... Add missing :req, remove old macros	2022-02-02 22:09:36 -05:00
BuffelSaft	9d1800f53e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-01-27 17:18:51 +13:00
LOuroboros	88b7326325	Ported the IE's flingPower item field and ItemId_GetFlingPower	2022-01-26 21:48:01 -03:00
LOuroboros	21244d6393	Modified and moved IsPinchBerryItemEffect	2022-01-26 21:45:24 -03:00
GriffinR	2efbd5f549	Merge pull request #1608 from GriffinRichards/fix-fieldmap ... Fix some incorrect fieldmap names	2022-01-26 17:51:56 -05:00
GriffinR	2495d18132	Add missing :req, remove old macros	2022-01-23 18:52:04 -05:00
ghoulslash	bc94a2bb16	Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies ... Wild mon natural enemies in double wild battles	2022-01-23 18:43:12 -05:00
LOuroboros	8eaf0718ec	Review changes ... Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.	2022-01-23 19:13:04 -03:00
LOuroboros	a8a8c7e2fa	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone	e880e4afdd	Merge branch 'battle_engine' into be_recalc_turn_order_after_actions	2022-01-22 19:01:45 -03:00
LOuroboros	367ba2d5bf	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE	2022-01-22 05:39:48 -03:00
GriffinR	3d0326106e	Z coord / height -> elevation	2022-01-21 12:48:19 -05:00
GriffinR	79dfac92c9	Merge pull request #1604 from GriffinRichards/clean-spinda ... Document Spinda spot algorithm	2022-01-21 09:55:43 -05:00
GriffinR	fb81d9ad4a	Correct map data comment	2022-01-20 23:26:39 -05:00
Eduardo Quezada D'Ottone	7d75e16312	Small documentation and cleanup	2022-01-20 12:25:48 -03:00
GriffinR	062cdbe01c	Merge pull request #1599 from GriffinRichards/fix-tilemaps ... Break up graphics/interface and graphics/misc	2022-01-20 08:53:44 -05:00
GriffinR	a7e6045d71	Merge pull request #1597 from GriffinRichards/misc-cleanup ... Miscellaneous fixes	2022-01-19 22:17:37 -05:00
GriffinR	c4f33f2b2b	TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE	2022-01-19 12:54:55 -05:00
GriffinR	e682c12519	sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE	2022-01-19 12:39:11 -05:00
GriffinR	8200fda14e	Fix decorations metatile attribute names	2022-01-19 10:56:54 -05:00
GriffinR	a8b466dc80	Disambiguate fieldmap names	2022-01-19 10:15:32 -05:00
GriffinR	f127e64a3c	Name overworld tilemaps for their bg, add layer type constants	2022-01-19 09:37:12 -05:00
GriffinR	225147a94f	Document Spinda spot algorithm	2022-01-17 15:34:18 -05:00
Eduardo Quezada D'Ottone	925f65c450	Realigned config to previous state	2022-01-16 21:10:09 -03:00
GriffinR	69759b2d12	Merge pull request #1601 from GriffinRichards/fix-decor-flag ... Fix FLAG_DECORATION_0 name	2022-01-16 17:44:58 -05:00
LOuroboros	a4d31da923	Updated the value of MAX_MAP_DATA_SIZE	2022-01-16 19:22:28 -03:00
Ariel A	5e3c48acfc	Fixed bug where lighting branch wouldn't build on modern. Credit: Jaizu	2022-01-16 17:12:13 -05:00
Eduardo Quezada D'Ottone	02da6cc627	Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb ... # Conflicts: # include/graphics.h # src/data/graphics/items.h # src/data/item_icon_table.h # src/data/items.h # src/data/text/item_descriptions.h	2022-01-16 18:44:03 -03:00
Eduardo Quezada D'Ottone	d40119010e	Merge branch 'BattleEngine' into BE_wildNaturalEnemies ... # Conflicts: # include/constants/battle_config.h	2022-01-16 16:23:12 -03:00
Eduardo Quezada D'Ottone	6aabe58649	Merge branch 'battle_engine' into magician	2022-01-15 13:06:13 -03:00
Eduardo Quezada D'Ottone	b86694876c	Merge pull request #1508 from Scott-Bonner/get_ability ... Handle GetAbilityBySpecies edge cases	2022-01-15 12:56:50 -03:00
LOuroboros	43921e0894	Updated the default state and comments of FREE_BATTLE_TOWER_E_READER and FREE_MYSTERY_EVENT_BUFFERS	2022-01-13 20:05:01 -03:00
ghoulslash	a0aaad2856	Merge pull request #2016 from AsparagusEduardo/PE_genderDiff ... Optimized SpeciesHasGenderDifference into Base Stat flag	2022-01-13 11:55:29 -05:00
ghoulslash	46c2a9ada5	Merge pull request #2033 from LOuroboros/galarianZenMode ... Allow Galarian Darmanitan's Zen Mode to work	2022-01-13 11:42:54 -05:00
ghoulslash	543252bc6c	Merge pull request #2034 from LOuroboros/proteanMsgboxFlush ... Tweaked Protean's effect's InGame appearance	2022-01-13 11:42:31 -05:00
ghoulslash	035b2332af	cache ai damage, effectiveness calcs	2022-01-13 11:28:27 -05:00
LOuroboros	a4f0de5106	Removed the last bits of HOLD_EFFECT_GRACIDEA	2022-01-12 01:54:29 -03:00
LOuroboros	b2965e5522	Added a pause to BattleScript_ProteanActivates	2022-01-11 20:15:47 -03:00
GriffinR	694aa3c65d	Move balls, shop, link, map popups, and bag out of interface	2022-01-11 13:53:23 -05:00
GriffinR	7103839a61	Move summary screen graphics out of interface, fix some names	2022-01-11 11:22:45 -05:00
GriffinR	fde18b4774	Fix berry crusher graphics name	2022-01-11 10:42:00 -05:00
GriffinR	0a78cb5c9e	Fix some battle dome graphics names	2022-01-11 10:04:47 -05:00
LOuroboros	24b5a5709a	Allow Galarian Darmanitan's Zen Mode to work	2022-01-10 23:01:18 -03:00
GriffinR	4024b3f1b3	Merge pull request #1590 from GriffinRichards/dex-enum ... Convert pokedex defines to enums	2022-01-10 14:56:26 -05:00
GriffinR	8b920691e6	Fix FLAG_DECORATION_0 name	2022-01-09 01:31:42 -05:00
LOuroboros	5281fe63fc	Update NUM_TECHNICAL_MACHINES	2022-01-08 21:27:29 -03:00
Eduardo Quezada D'Ottone	97baedbd5e	Merge pull request #1923 from WiserVisor/battle_engine ... Added Sky Drop to Battle Engine	2022-01-07 18:14:40 -03:00
GriffinR	577e6cc740	Merge pull request #1586 from GriffinRichards/clean-areascreen ... Clean up pokedex_area_screen	2022-01-06 23:02:23 -05:00
GriffinR	5d033c2e4d	Convert pokedex defines to enums	2022-01-05 12:18:49 -05:00
GriffinR	ce55e58ad8	Misc cleanup	2022-01-04 10:09:42 -05:00
TheXaman	44a6c4c0ec	changed EGG_MOVES_ARRAY_COUN to 19 to include all the added egg moves (19 is max value (Buneary))	2022-01-04 00:23:24 +01:00
TheXaman	b2601f043b	added the ability to check out all data (base stats, moves, abilities etc) for the forms implmeneted in the RHH pokemon_expansion	2022-01-03 21:38:59 +01:00
TheXaman	9446ad112a	added the ability to directly open evolutions from the EVO page	2022-01-03 16:48:50 +01:00
Ariel A	609a304890	Merge branch 'romhack' into lighting	2022-01-03 02:08:14 -05:00
Eduardo Quezada D'Ottone	4f9e6faa48	Merge branch 'item_expansion' into flingIE	2022-01-02 18:31:03 -03:00
Eduardo Quezada D'Ottone	221e38ff86	Merge pull request #1957 from ghoulslash/be/ability_popup ... Ability Popup Fixes + Longer Ability Names config	2022-01-01 19:39:55 -03:00
Eduardo Quezada D'Ottone	3bbaf5a15d	Optimized SpeciesHasGenderDifference into Base Stat flag	2022-01-01 19:24:34 -03:00
LOuroboros	74aa4f29df	Corrections and additions ... -Fixed a handful of prices -Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable. -Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo. -Fixed small syntax mistakes in src/data/text/item_descriptions.h -Slightly changed some item descriptions based on AsparagusEduardo's suggestions. -Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.	2022-01-01 17:17:21 -03:00
Ariel A	cf673fda9f	Added movements to follower messages. Movement credit: SonikkuA-DatH	2021-12-31 19:23:44 -05:00
Eduardo Quezada D'Ottone	b25c89f8a1	Removed Redundant Key Stone item	2021-12-31 18:22:23 -03:00
LOuroboros	9b1fd796ae	Gave the Gracidea's old hold effect slot to the Enigma Berry	2021-12-31 18:07:33 -03:00
Eduardo Quezada D'Ottone	313df31e7e	Removed Jade Orb, since it has no use besides being a key-lock item.	2021-12-31 17:44:03 -03:00
LOuroboros	0c5652596b	Removed HOLD_EFFECT_GRACIDEA	2021-12-31 17:34:16 -03:00
LOuroboros	5a8e51d858	Filled in missing items' sprite data	2021-12-31 16:27:06 -03:00
GriffinR	23f5c9fd5c	Clean up pokedex_area_screen	2021-12-31 00:16:56 -05:00
Ariel A	d3d758e36f	Merge branch 'romhack' into lighting	2021-12-30 01:58:54 -05:00
Ariel A	d06e1d4af6	Added flag for safe follower movement.	2021-12-30 01:46:42 -05:00
Eduardo Quezada D'Ottone	5b54986e6b	Merge pull request #1980 from LOuroboros/multiBattles ... Multi battle updates	2021-12-29 22:09:06 -03:00
GriffinR	aadab8b016	Move pokemon and easy chat constants to global, misc clean-up	2021-12-28 18:07:41 -05:00
LOuroboros	ce7815ebcc	Update pokemon.h	2021-12-28 15:11:52 -03:00
LOuroboros	677da7b5e7	Fixed struct names	2021-12-28 14:48:57 -03:00
Eduardo Quezada D'Ottone	e405bd8ad3	Merge pull request #2005 from LOuroboros/evoMoves ... Implemented evolution moves	2021-12-26 17:24:37 -03:00
Eduardo Quezada D'Ottone	7bffe6d1d5	Merge pull request #2004 from ghoulslash/be/sports ... Add sport effects back	2021-12-24 18:59:50 -03:00
ghoulslash	93a7e139ec	merge w be	2021-12-24 09:40:12 -05:00
Eduardo Quezada D'Ottone	2ebe427a42	Merge branch 'BattleEngine' into BE_wildNaturalEnemies ... # Conflicts: # src/battle_controller_opponent.c	2021-12-23 21:19:59 -03:00
ghoulslash	770224d341	increase TEXT_BUFF_ARRAY_COUNT for expanded ability names	2021-12-23 18:58:15 -05:00
WiserVisor	8923ffb3af	Merge branch 'battle_engine' into battle_engine	2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone	934ffd5a7e	Merge pull request #2002 from LOuroboros/gen78footprints ... Added the footprints of all Gen. 7 and 8 species	2021-12-23 20:28:55 -03:00
Eduardo Quezada D'Ottone	67697d2de3	Merge pull request #1582 from ghoulslash/smart_wild_ai ... Smart Wild AI Option	2021-12-23 20:18:18 -03:00
ghoulslash	0a95a31ee9	fix formatting	2021-12-23 08:44:54 -05:00
Ariel A	11c7eee285	Restored lighting & shadows code removed from follower branch.	2021-12-22 23:20:11 -05:00
Ariel A	e1c56d76ac	Merge branch 'romhack-no-lighting' into lighting	2021-12-22 23:08:32 -05:00
Ariel A	5034d14ffb	Merge branch 'romhack' into lighting	2021-12-22 22:59:59 -05:00
Ariel A	26c38e8093	Removed lighting/day-night/shadow code from follower branch.	2021-12-22 22:58:52 -05:00
Ariel A	29150322ce	Fixed follower script release bug.	2021-12-22 22:13:23 -05:00
LOuroboros	713d97891f	Update include/constants/battle_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-12-22 21:32:10 -03:00
LOuroboros	d6a78f386f	Implemented evolution moves ... Thanks to UltimaSoul and Sagiri/Zeturic	2021-12-22 18:02:23 -03:00
ghoulslash	2736223b1b	Merge pull request #1698 from AsparagusEduardo/PE_FormChangeHoldItems ... Form changing by holding items	2021-12-21 09:10:23 -05:00
ghoulslash	b4cc5e3cd8	Merge pull request #1952 from AsparagusEduardo/PE_natureEvo ... Added Nature evolution methods	2021-12-20 14:08:47 -05:00
ghoulslash	05f91bc243	Update include/constants/battle_config.h ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-12-20 14:06:32 -05:00
ghoulslash	02fe96cc08	fix config settings	2021-12-20 13:06:23 -05:00
ghoulslash	f9856c2833	merge w pret	2021-12-20 12:32:24 -05:00
ghoulslash	ad514cf3fd	Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav	2021-12-20 11:49:23 -05:00
ghoulslash	7a70fc0d73	Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs	2021-12-20 11:25:14 -05:00
LOuroboros	cb44de13b3	B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT	2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone	4ab4250d5d	Merge branch 'battle_engine' into be/sports	2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone	a57043b589	Merge pull request #1983 from sphericalice/last_ball_refactor ... Refactor CanThrowLastUsedBall and related functions	2021-12-19 20:21:50 -03:00
Eduardo Quezada D'Ottone	6d17156f74	Merge pull request #1934 from BuffelSaft/fix-burmy ... Fix Burmy form change	2021-12-19 20:18:19 -03:00
Eduardo Quezada D'Ottone	8b49f8f925	Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems	2021-12-19 12:08:52 -03:00
LOuroboros	ffe35fbb06	Updated defeat condition on multi battles	2021-12-19 08:30:43 -03:00
Blackforest92	76b9459e42	fix .8bpp palette + revert hippo icons	2021-12-19 17:38:01 +07:00
Ariel A	9de9442c39	Merge branch 'romhack' into lighting	2021-12-18 17:25:56 -05:00
Ariel A	bdcbb5c700	Merge branch 'master' into romhack	2021-12-18 17:14:52 -05:00
Eduardo Quezada D'Ottone	39ef356be1	Merge pull request #1935 from LOuroboros/someGenderDiffs ... Added gender differences for a couple of Gen. 4 Pokémon	2021-12-18 13:46:23 -03:00
Eduardo Quezada D'Ottone	a075cca448	Merge branch 'battle_engine' into fix-burmy	2021-12-18 13:38:12 -03:00
ultima-soul	18afd06f6d	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-18 00:28:18 -08:00
ultima-soul	b0b8b9bf46	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 23:51:29 -08:00
ultima-soul	4f2e3bf214	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 21:23:54 -08:00
LOuroboros	4a74d288d4	Review corrections	2021-12-18 00:01:50 -03:00
LOuroboros	dbca24aa82	[LEAK INFORMED] Documented the unk19 item field	2021-12-17 19:41:39 -03:00
ExpoSeed	d6747527da	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-12-16 21:44:01 -06:00
ultima-soul	356cf96654	Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.	2021-12-15 19:33:35 -08:00
TheXaman	fe95e88938	added option to view changes for front/back sprite picCoords and elevation live	2021-12-13 22:31:37 +01:00
TheXaman	f1f4082f62	added footprints	2021-12-13 19:24:19 +01:00
TheXaman	d113d5efd9	Update include/battle_bg.h ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-12-13 18:56:50 +01:00
LOuroboros	46977b52fa	Added the footprints of all Gen. 7 and 8 species	2021-12-13 13:39:12 -03:00
TheXaman	123969f093	fixed front sprite position including elevation and shadow for flying mon's (shadow palette too dark atm)	2021-12-13 15:05:17 +01:00
Eduardo Quezada D'Ottone	7ca07527fa	Config for HP bars moving faster for higher HP amounts. Credit to Dat.H	2021-12-12 12:33:49 -03:00
Eduardo Quezada D'Ottone	bbf7b62ceb	Config for lost money after losing a battle	2021-12-11 23:03:50 -03:00
LOuroboros	f317b542e2	Updated Teleport	2021-12-11 21:20:04 -03:00
TheXaman	51371661c2	Added new menu naviagtion, now all options can be changed	2021-12-11 15:03:56 +01:00
TheXaman	bbe918941e	added include/constants/pokemon_debug,h for defines, restructured code order	2021-12-11 12:13:14 +01:00
ultima-soul	26f29a04fd	Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" ... This reverts commit ac2bcece75, reversing changes made to 349262ebc3.	2021-12-10 09:41:54 -08:00
TheXaman	f6d9b74a1a	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug	2021-12-10 16:48:46 +01:00
Eduardo Quezada D'Ottone	aa2b2e6a70	Merge pull request #1929 from ultima-soul/battle_engine_sync ... Battle Engine Upstream Sync	2021-12-09 20:02:45 -03:00
ultima-soul	ac2bcece75	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync	2021-12-09 14:16:05 -08:00
ultima-soul	d99ac2e44a	Resolved review suggestions for upstream Pokemon Expansion sync.	2021-12-09 09:51:28 -08:00
ultima-soul	a5afdac0ae	Resolved review suggestions for upstream Battle Engine sync.	2021-12-08 12:08:16 -08:00
Blackforest92	a7c9e6e230	Reverse both Hippopotas and Hippowdon icons to use male only	2021-12-09 00:24:31 +07:00
Blackforest92	55477234ef	Palette conversion GEN5	2021-12-08 21:39:31 +07:00
DizzyEggg	97539d7443	Merge pull request #1951 from ghoulslash/be/sheercold ... Ice Types immune to Sheer Cold	2021-12-06 14:12:06 +01:00
sphericalice	5c02facde4	Use more specific enum names for throwable Balls	2021-12-05 23:17:44 +00:00
sphericalice	3db871c49a	Refactor CanThrowLastUsedBall and related functions	2021-12-05 23:10:05 +00:00
ghoulslash	c0e408bfab	fix aqua ring heal anim	2021-12-05 14:44:22 -05:00
Eduardo Quezada D'Ottone	1708ac4b1b	Wild mon that have a natural enemy or preys on other mon will attack them whem partnered in double wild battles.	2021-12-04 22:13:29 -03:00
SonikkuA-DatH	b6fff16a7d	Update battle.h	2021-12-03 18:04:44 -08:00
ultima-soul	349262ebc3	Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync	2021-12-03 17:31:02 -08:00
ultima-soul	7369f60c06	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-12-03 17:30:45 -08:00
Eduardo Quezada D'Ottone	96b8d21b7a	Added form switching + Button icons	2021-12-03 19:32:31 -03:00
TheXaman	40f7247e11	changed P_ENABLE_DEBUG to TRUE/FALSE	2021-12-03 11:02:22 +01:00
TheXaman	bf0d2b8393	Changed definition of P_ENABLE_DEBUG to pokemon_config.h	2021-12-02 19:29:04 +01:00
ultima-soul	d408b56549	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-12-01 20:18:57 -08:00
ultima-soul	a68a39e35f	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-12-01 20:17:49 -08:00
ultima-soul	23bf41713c	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-12-01 20:17:08 -08:00
LOuroboros	2e67153982	Renamed the Enigma Berries' constants	2021-12-01 22:16:38 -03:00
LOuroboros	e7bef25fb1	Updated hold_effects.h	2021-12-01 13:32:43 -03:00
Blackforest92	2ad3c3f6be	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
LOuroboros	19af517bbb	Edited pointless or useless Primal Reversion code ... Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion. Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion. Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.	2021-12-01 00:56:33 -03:00
LOuroboros	f2dd7bce99	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks	2021-11-30 20:39:58 -03:00
TheXaman	c402a840b1	changed to P_ENABLE_DEBUG	2021-11-30 11:20:26 +01:00
TheXaman	50e95878e9	added Select button text, added gender based icons, imrpoved code	2021-11-30 11:16:30 +01:00
TheXaman	b0f8408fb6	added gender based sprites, added textbox line, adjusted sprite offset to match line	2021-11-30 02:29:33 +01:00
TheXaman	6c520659aa	implemented a inital pokemon debug menu based on code from Gamer2020 and AsparagusEduardo	2021-11-29 22:52:08 +01:00
ghoulslash	7a7c6afc39	larger ability popup, fix ability name printing/clearing, and config for longer ability names	2021-11-29 12:42:01 -05:00
SonikkuA-DatH	7b5dfa83af	Update battle_move_effects.h	2021-11-28 19:44:02 -08:00
SonikkuA-DatH	002556cf3f	Update battle_script_commands.h	2021-11-28 19:42:32 -08:00
SonikkuA-DatH	ca4207d497	Update battle_anim.h	2021-11-28 19:40:55 -08:00
SonikkuA-DatH	c8fba3fa90	Update graphics.h	2021-11-28 19:36:17 -08:00
ghoulslash	384bdaee18	merge w pret	2021-11-28 19:09:43 -05:00
ghoulslash	6f6ed0a25c	Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav	2021-11-28 15:01:19 -05:00
TheXaman	5780560007	fixed some bugs, thanks to cbt	2021-11-28 20:28:54 +01:00
ghoulslash	d108f77aa4	revert ai item usage code	2021-11-28 13:12:56 -05:00
ultima-soul	01a90ca6c2	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-11-27 22:17:05 -08:00
ultima-soul	d0623d7b71	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-27 21:40:08 -08:00
ultima-soul	0312c5be8b	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-27 21:38:26 -08:00
Eduardo Quezada D'Ottone	fa995894b7	Added Nature evolution methods	2021-11-27 20:46:19 -03:00
TheXaman	8f94b91365	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss	2021-11-27 12:11:24 +01:00
Eduardo Quezada D'Ottone	7c6f76323a	Added NidoranM/Volbeat Ditto breeding config + Rotom & Furfrou	2021-11-26 22:56:48 -03:00
ghoulslash	e2af9ec3b4	ice type immunity to sheer cold	2021-11-26 11:49:49 -05:00
Ariel A	bd3c9ed3b9	Fixed warp arrow palette bug. Optimized weather palette loading.	2021-11-26 04:55:29 -05:00
ghoulslash	5c52abd856	gen3 sport move functionality behind config	2021-11-23 21:20:32 -05:00
ghoulslash	e3ddad2d11	add sport effects back	2021-11-23 18:36:10 -05:00
BuffelSaft	cca7ec8c58	Fix and rename GetMoveTargetType ... Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.	2021-11-24 12:09:54 +13:00
kleeenexfeu	9b25e0147c	Update include/constants/battle_config.h ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-23 14:35:37 +01:00
kleeenexfeu	f2755ad970	reword B_RECALC_TURN_AFTER_ACTIONS explanation	2021-11-23 14:28:52 +01:00
kleeenexfeu	84e6e083f7	hate the explanations about turn order ._. ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-11-23 14:24:30 +01:00
kleeenexfeu	6ceffaaf3e	recalculate turn order after relevant actions	2021-11-23 13:46:36 +01:00
kleeenexfeu	1a5d3191e2	battle_engine merge	2021-11-23 13:38:36 +01:00
BuffelSaft	a89ce0c38a	Swapped webs don't trigger Defiant ... Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect? Also, fix Sticky Web not activating Defiant.	2021-11-23 22:54:30 +13:00
BuffelSaft	499fb8071d	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2021-11-23 17:12:24 +13:00
BuffelSaft	fa0b5188bb	Dynamic move targeting ... Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.	2021-11-23 16:56:11 +13:00
BuffelSaft	6b8f86c276	Snap Trap placeholder anims ... Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.	2021-11-23 11:05:36 +13:00
BuffelSaft	ff60882b29	Requested changes	2021-11-23 11:04:39 +13:00
Jaizu	b7f4658077	Added Kricketot line gender difference sprites	2021-11-22 16:30:05 -03:00
LOuroboros	8373312ed7	Add gender differences for some Gen. 4 Pokémon ... Namely: Bidoof, Kricketot, Shinx, Starly, Staravia and Staraptor Credits to CyanSMP64/Furret and Jaizu.	2021-11-22 16:25:25 -03:00
BuffelSaft	62f01e89d7	Fix Burmy form change ... Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.	2021-11-23 00:46:43 +13:00
BuffelSaft	50d0cd52e8	Clean up Corrosive Gas ... Remove code and unused move effect.	2021-11-22 15:13:54 +13:00
BuffelSaft	d2eb5f0e61	Remove shell trap effect code ... Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.	2021-11-22 14:46:47 +13:00
BuffelSaft	42b8f18cb1	Remove Corrosive Gas code ... This was not working at all in testing, so it can be done by a separate PR later.	2021-11-22 14:35:01 +13:00
BuffelSaft	70f0018c08	Partially implement Shell Trap ... Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.	2021-11-22 14:14:41 +13:00
ultima-soul	a8f9a54787	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-21 10:41:32 -08:00
ultima-soul	57bf1c7824	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-11-21 10:41:12 -08:00
ultima-soul	3ed51d6d91	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
Eduardo Quezada D'Ottone	dee7f97a8d	Merge branch 'battle_engine' into battle_ai	2021-11-21 14:46:09 -03:00
Eduardo Quezada D'Ottone	30a4ef3723	Merge pull request #1924 from ghoulslash/be/wish ... Fix wish	2021-11-21 14:04:06 -03:00
ghoulslash	3404039330	Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn ... Mega Evolution alters turn order	2021-11-21 08:12:21 -05:00
BuffelSaft	bcaa17ffb3	Finish/tidy up Court Change ... Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.	2021-11-21 17:20:45 +13:00
Eduardo Quezada D'Ottone	31d7719429	Merge pull request #1913 from LOuroboros/healingItems ... Changed I_LEGACY_HEALING_ITEMS	2021-11-20 23:37:24 -03:00
ghoulslash	3fb62f74c6	fix rampage cancelling	2021-11-20 18:35:56 -05:00
ghoulslash	37ab20e29c	fix wish	2021-11-20 16:49:04 -05:00
W1serV1ser	c2f81cd5f5	Added Sky Drop	2021-11-20 11:44:48 -08:00
kleeenexfeu	6402a7ab6e	follow suggestion ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-19 23:42:20 +01:00
kleeenexfeu	acddeeb1f9	follow suggestion ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-19 23:30:33 +01:00
LOuroboros	ad8582064b	#elif without condition bad, #else good	2021-11-19 18:49:30 -03:00
kleeenexfeu	03a9f3f413	Mega Evolution alters turn order	2021-11-19 22:03:10 +01:00
Eduardo Quezada D'Ottone	1696e60b9f	Merge pull request #1876 from ghoulslash/be/ai_updates ... Some more CanAIFaintTarget checks and other AI updates	2021-11-19 17:33:21 -03:00
BuffelSaft	14a2e86313	Fix Scale Shot ... Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.	2021-11-19 21:57:32 +13:00
BuffelSaft	98712e576e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2021-11-19 17:48:11 +13:00
BuffelSaft	16a4fc9062	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-19 16:33:24 +13:00
TheXaman	111555132f	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss	2021-11-18 16:48:49 +01:00
TheXaman	2f8896f2f0	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2021-11-18 15:13:04 +01:00
TheXaman	5104293344	Changed to TX_DEBUGGING define instead of makefile DEBUGGING option	2021-11-18 15:09:06 +01:00
GriffinR	c89dfd9f56	Finish updating macro comments	2021-11-18 01:47:58 -05:00
GriffinR	b5b5d95de6	Distinguish 'virtual object' names from object events	2021-11-17 23:40:53 -05:00
GriffinR	b9fa18bdd4	Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros	2021-11-17 22:03:37 -05:00
GriffinR	c940b67716	Continue macro comment updating	2021-11-17 17:45:59 -05:00
GriffinR	c1970a4bc8	Remove dead sub references	2021-11-17 15:47:47 -05:00
GriffinR	ecb13cdbf7	Merge pull request #1550 from GriffinRichards/doc-pokenav ... Document Pokénav	2021-11-17 14:47:34 -05:00
GriffinR	eb95ac0b9c	Document field_tasks	2021-11-17 14:44:42 -05:00
LOuroboros	7ae30f8913	I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY ... Also fixed its inaccurate description.	2021-11-17 07:15:14 -03:00
LOuroboros	7d71fe6ce8	I_NEW_VITAMIN_EV_CAP -> I_VITAMIN_EV_CAP	2021-11-16 21:25:03 -03:00
GriffinR	61aa9c3ba9	More updating event macro comments	2021-11-16 17:46:34 -05:00
LOuroboros	f62ec0630a	Updated Vitamins cap	2021-11-16 18:36:49 -03:00
GriffinR	d414787932	Some TV clean-up	2021-11-16 16:22:17 -05:00
GriffinR	5d9c31a610	Label slot machine ids, fix GetPriceReduction	2021-11-16 15:43:52 -05:00
GriffinR	63c5905914	Continue updating event macro comments	2021-11-16 13:10:23 -05:00
GriffinR	04cc923d6c	Handle optional arguments for warp commands, add WARP_ID_NONE	2021-11-16 10:53:00 -05:00
Eduardo Quezada D'Ottone	cc833ebb59	Created macro + config for always critting when using high-crit moves	2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone	a1bd6bd52f	Updated species that benefit from Leek	2021-11-15 22:30:20 -03:00
LOuroboros	5c485d9769	Fixed Fling when gLastUsedItem is 0 ... Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.	2021-11-15 14:02:33 -03:00
GriffinR	c1130592fa	Drop some overworld prefixes	2021-11-15 10:58:05 -05:00
GriffinR	65d3b58374	Add PARTY_NOTHING_CHOSEN	2021-11-15 10:57:06 -05:00
LOuroboros	de74177966	Oops	2021-11-15 12:52:05 -03:00
LOuroboros	a01fd2eb7a	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2021-11-15 12:47:26 -03:00
ghoulslash	2a1299715f	merge w be	2021-11-15 10:45:59 -05:00
LOuroboros	ea12dfdf2c	Implemented Fling	2021-11-15 12:41:00 -03:00
LOuroboros	cbb6639f8d	Fling tweaks ... -Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER) -Updated BattleScript_EffectFling following Smogon's description of Fling's effect. -Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect -No need to define flingPower when its value is 0 -Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes. -Added a preproc config for Klutz.	2021-11-15 12:40:10 -03:00
ghoulslash	0e397c43fe	Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks ... Adjusted elements to simplify the conflicts between BE and IE	2021-11-15 08:27:28 -05:00
GriffinR	4275cf4b90	Rename pokenav match call files	2021-11-15 01:30:21 -05:00
GriffinR	14d78d7633	Finish match call menu doc	2021-11-15 01:20:03 -05:00
GriffinR	c779d03b3e	Rename pokenav_match_call_ui	2021-11-15 00:21:40 -05:00
GriffinR	d4d4234283	Finish pokenav list ui doc	2021-11-15 00:09:02 -05:00
Wiz	927f9d27df	Designate gBattleAnimBgImage_Attract and related as arrays	2021-11-14 17:08:03 -05:00
ghoulslash	8b296b97a8	Merge pull request #1887 from BuffelSaft/knock-off ... Fix Knock Off, add config	2021-11-14 08:27:51 -05:00
GriffinR	f42eafc85b	Merge branch 'master' into doc-banim	2021-11-13 23:26:46 -05:00
GriffinR	159bb37bbe	Merge branch 'master' into fix_saveblock_reorder	2021-11-13 23:19:57 -05:00
GriffinR	9a932cd9c3	Merge pull request #1549 from GriffinRichards/doc-binterface ... Document remaining symbols in battle_interface, palette, and save	2021-11-13 23:19:08 -05:00
ProjectRevoTPP	9d3345a6d6	Enforce structs to enforce save block order for modern toolchains.	2021-11-13 21:41:16 -05:00
GriffinR	b14fe9dce3	Merge pull request #1547 from GriffinRichards/doc-sounddata ... Clean up sound, add CRY_MODE constants	2021-11-13 15:54:40 -05:00
GriffinR	b3e593dff5	Continue pokenav list ui doc	2021-11-13 15:52:58 -05:00
GriffinR	ec05157568	Move pokenav list item union out of list struct	2021-11-13 11:27:11 -05:00
Eduardo Quezada D'Ottone	bcbdb353f5	Adjusted elements to simplify the conflicts between BE and IE	2021-11-13 12:10:20 -03:00
Eduardo Quezada D'Ottone	67f12ef782	Fixed Hold Effect file spacing	2021-11-13 11:56:17 -03:00
ghoulslash	940a165be7	merge w be	2021-11-13 09:09:15 -05:00
Eduardo Quezada D'Ottone	8f52996144	Merge pull request #1892 from ghoulslash/be/wish ... wish update	2021-11-13 11:01:04 -03:00
ghoulslash	9df66f4ac1	Merge pull request #1843 from Blackforest92/battle_engine ... Update Giga Impact's graphic and use fade-in battle animation.	2021-11-13 08:54:37 -05:00
ghoulslash	a4204e5491	Update include/constants/battle_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-11-13 08:50:24 -05:00
LOuroboros	2fe015e5ce	Implemented Fling	2021-11-13 10:27:05 -03:00
Eduardo Quezada D'Ottone	bcb0f1b915	Merge pull request #1890 from kleeenexfeu/battle_engine ... Bypassing screens and protections correctly	2021-11-13 10:11:02 -03:00
kleeenexfeu	f808710932	Moving IsBattlerProtected	2021-11-13 13:38:07 +01:00
BuffelSaft	04867ac0d3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-13 17:33:25 +13:00
BuffelSaft	55b279ba0a	Fix several move effects ... Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.	2021-11-13 16:29:12 +13:00
GriffinR	3b91d8fdaf	Start pokenav list ui doc	2021-11-12 20:36:19 -05:00
GriffinR	da5752fd0d	Start match call menu doc	2021-11-12 20:17:06 -05:00
BuffelSaft	6232b046b1	Fix Burn Up ... Now works properly with and without Parental Bond. It wasn't broken before, but its interaction with Parental Bond was.	2021-11-13 12:40:45 +13:00
ghoulslash	c4efe06f38	wish update	2021-11-12 17:55:05 -05:00
Eduardo Quezada D'Ottone	a7870dbef0	Merge branch 'battle_engine' into magician	2021-11-12 19:40:34 -03:00
GriffinR	ffe2970e30	Rename pokenav menu handler files	2021-11-12 17:13:50 -05:00
GriffinR	baeacbe2f1	Clean up pokenav general menus, organize pokenav graphics	2021-11-12 17:08:12 -05:00
ghoulslash	96fd8e696b	brick break gen 4 and 5 config. clears aurora veil	2021-11-12 15:00:21 -05:00
ultima-soul	294fecd57c	Merge pull request #1888 from ghoulslash/be/contrary ... Fix Contrary Animation	2021-11-12 10:19:37 -08:00
Eduardo Quezada D'Ottone	34555b46e8	Oops	2021-11-12 14:47:35 -03:00
ghoulslash	a26da51e9d	fix contrary animations for MOVE_EFFECT_statchange	2021-11-12 12:44:45 -05:00
ultima-soul	c5dabf34b8	Improve Serene Grace boost config comment.	2021-11-12 09:39:18 -08:00
GriffinR	004d1cab3f	Clean up pokenav conditions doc	2021-11-12 11:13:49 -05:00
GriffinR	35aeff1b6d	Rename pokenav conditions files	2021-11-12 11:07:52 -05:00
GriffinR	f5152094a9	Finish pokenav conditions doc	2021-11-12 11:01:22 -05:00
ghoulslash	201a38f487	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/ai_updates	2021-11-12 08:13:21 -05:00
ghoulslash	6214d8b625	rename config	2021-11-12 07:47:24 -05:00
BuffelSaft	bdbdd0564f	Fix Knock Off, add config ... Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.	2021-11-12 21:05:42 +13:00
Eduardo Quezada D'Ottone	ae26a7529c	Restored FRLG items	2021-11-11 22:26:58 -03:00
ghoulslash	adc1413d98	add kings rock serene grace boost config	2021-11-11 17:48:15 -05:00
ghoulslash	2fac38cc83	merge w be	2021-11-11 16:16:26 -05:00
GriffinR	7efdc0902b	Finish condition graph doc	2021-11-11 15:29:15 -05:00
ultima-soul	fd4d0db912	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects	2021-11-10 18:02:00 -08:00
GriffinR	4590887359	Clean up some register constant use	2021-11-10 17:01:21 -05:00
GriffinR	343ac99049	Start pokenav conditions doc	2021-11-10 17:00:54 -05:00
GriffinR	342b7da5d3	Fix CRY_MODE_ECHO	2021-11-10 11:59:15 -05:00
ultima-soul	c74e19c062	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-11-09 20:58:19 -08:00
GriffinR	ef935f6f4a	Merge pull request #1544 from GriffinRichards/romheadergf ... Split headers from crt0.s	2021-11-09 23:54:57 -05:00
ultima-soul	69e3719f75	Add back TM Case, Bicycle, and Vs. Seeker. Add Poké Radar.	2021-11-09 19:19:48 -08:00
BuffelSaft	e2599c2469	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-10 14:31:32 +13:00
GriffinR	8e424b6985	Merge branch 'master' into doc-binterface	2021-11-09 16:09:48 -05:00
GriffinR	43e942c3af	Clean up pokenav ribbons	2021-11-09 12:50:35 -05:00
ghoulslash	fdaa979bd6	Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav	2021-11-09 08:58:29 -05:00
ghoulslash	e635930a15	fixes	2021-11-08 21:33:00 -05:00
GriffinR	1c82571fa0	Merge pull request #1542 from GriffinRichards/doc-menu ... Document menu	2021-11-08 21:23:21 -05:00
GriffinR	adf773f1ed	Document remainder of save.c	2021-11-08 19:45:14 -05:00
GriffinR	ab1074e629	Label unknown palette functions	2021-11-08 16:08:36 -05:00
GriffinR	684f599a44	Label remaining battle_interface symbols	2021-11-08 16:03:44 -05:00
GriffinR	e3b6337c3a	Finish battle_anim_mons doc	2021-11-08 14:29:37 -05:00
ghoulslash	01cf8e6452	add AI_MoveMakesContact, dissuade multi-hit attacks against rocky helmet	2021-11-08 11:55:06 -05:00
GriffinR	d20341646a	Start battle_anim_mons doc	2021-11-08 11:46:13 -05:00
ghoulslash	8f320a8d33	some ai updates, recycle + ripen logic	2021-11-08 11:37:41 -05:00
GriffinR	1548e902cd	Add MonCoods size macro	2021-11-08 09:41:23 -05:00
Blackforest92	76ba9d835a	pulled latest RHH battle_engine 08-11-2021	2021-11-08 16:38:42 +07:00
BuffelSaft	d3a845d511	Fix CanAIFaintTarget ... Rename CanAIFaintTarget to CanIndexMoveFaintTarget and create a new function, CanAIFaintTarget, that checks if any known move can KO the target.	2021-11-08 20:37:28 +13:00
ghoulslash	a90cf4a501	Merge pull request #1724 from AsparagusEduardo/BE_TerrainMoves ... Moves affected by Terrain: Camouflage, Secret Power & Terrain Pulse	2021-11-07 17:39:03 -05:00
GriffinR	c4169cfd29	Disambiguate cry functions	2021-11-07 14:26:09 -05:00
GriffinR	54b254a829	Add CRY_MODE constants	2021-11-07 13:33:05 -05:00
BuffelSaft	e407883b58	Rethink final strike effects ... This is now checked in SetMoveEffect instead of in each move that should behave this way. Some effects will need to be redone to make them play nice with this change, but some just work as is.	2021-11-07 20:31:09 +13:00
BuffelSaft	d30f2b5712	Fix move effects list ... Fixed it properly this time!	2021-11-07 15:22:33 +13:00
BuffelSaft	9351df5ed8	Revert "Update move effect defines" ... This reverts commit be518608e8.	2021-11-07 12:25:26 +13:00
BuffelSaft	c69e7666e7	Update battle_move_effects.h	2021-11-07 12:22:55 +13:00
BuffelSaft	be518608e8	Update move effect defines ... Removing move effects above the ones that have stat change animations causes the wrong stat change to be shown, so I've reordered the list to fix that.	2021-11-07 12:16:06 +13:00
BuffelSaft	72d12a575d	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-07 12:13:18 +13:00
Eduardo Quezada D'Ottone	4e6a459b14	Optimized terrain timers	2021-11-06 19:46:52 -03:00
Eduardo Quezada D'Ottone	8773e552ac	Organized config and added failsafe to AnimTask_SetCamouflageBlend	2021-11-06 19:24:06 -03:00
Eduardo Quezada D'Ottone	1c4a0c205a	Camouflage types config + extra terrains	2021-11-06 19:09:35 -03:00
Eduardo Quezada D'Ottone	b220da1d2a	Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table	2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone	e9804a5023	Secret Power animation config	2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone	328976bf81	Secret Power effect config	2021-11-06 17:05:13 -03:00
ghoulslash	da6ec51fc2	merge w be	2021-11-06 10:43:35 -04:00
ghoulslash	41bf1dc2f4	merge w be	2021-11-06 10:40:57 -04:00
ghoulslash	f7d11527aa	Merge pull request #1867 from AsparagusEduardo/BE_synchroToxic ... Config for Synchronize's interaction with toxic poisoning	2021-11-06 10:36:50 -04:00
Eduardo Quezada D'Ottone	ae8de0f07a	Merge branch 'BattleEngine' into BE_TerrainMoves ... # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_util.c	2021-11-06 10:44:05 -03:00
BuffelSaft	5acebe32aa	Merge pull request #1817 from LOuroboros/photonGeyser ... Implemented Photon Geyser and Shell Side Arm	2021-11-06 16:04:53 +13:00
Eduardo Quezada D'Ottone	202827068c	a ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone	8e49e3e653	Config for Synchronize's interaction with toxic poisoning	2021-11-05 21:16:13 -03:00
BuffelSaft	4007a8d1f8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song	2021-11-06 11:52:51 +13:00
Eduardo Quezada D'Ottone	6c70a6b872	Merge pull request #1863 from LOuroboros/soulDewBE ... Added a battle config for the Soul Dew	2021-11-05 17:09:44 -03:00
LOuroboros	5f458c9cd3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-05 10:58:53 -03:00
ghoulslash	0b2542e447	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into smart_wild_ai	2021-11-05 09:46:12 -04:00
LOuroboros	05c7f7ebfb	Fixed the comment for I_SOUL_DEW_BOOST	2021-11-05 10:39:27 -03:00
LOuroboros	d15eeeb8eb	Fixed the comment for B_SOUL_DEW_BOOST	2021-11-05 10:37:41 -03:00
ghoulslash	eee3f5b181	merge w pret	2021-11-05 09:22:24 -04:00
BuffelSaft	ee83d1142c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-05 21:40:05 +13:00
BuffelSaft	bf786c6c9a	Fix Magma Storm ... Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.	2021-11-05 18:22:52 +13:00
BuffelSaft	a8d44f84a1	Merge pull request #1852 from Blackforest92/battle_engine_2 ... Update waterfall, trick room, & focus blast BG	2021-11-05 15:27:52 +13:00
BuffelSaft	6df3975fc6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-05 14:32:33 +13:00
Eduardo Quezada D'Ottone	5eb8f1c158	Merge pull request #1855 from ghoulslash/be/abilityonside ... AI versions of CanPoisonType, CanBePoisoned and IsAbilityOnSide	2021-11-04 21:49:31 -03:00
GriffinR	e65677c944	Update modern linker script	2021-11-04 17:28:41 -04:00
LOuroboros	10a3c8f119	Added an item config for the Soul Dew	2021-11-04 17:29:17 -03:00
LOuroboros	671cbabc3d	Added a battle config for the Soul Dew	2021-11-04 17:25:31 -03:00
cbt6	0fe3881961	Rename WalkInPlaceFastest to WalkInPlaceFaster	2021-11-05 01:54:34 +08:00
ghoulslash	0ac6860855	Merge pull request #1810 from BuffelSaft/ai_improvements ... AI: Multi-strike moves, variable power moves, sleep check	2021-11-04 12:28:00 -04:00
GriffinR	be7d0bd3b0	Merge branch 'master' into doc-menu	2021-11-04 12:11:31 -04:00
GriffinR	17b657d83a	Finish menu documentation	2021-11-04 11:52:43 -04:00
LOuroboros	22f7e81bef	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-04 12:25:26 -03:00
LOuroboros	b64d506809	Made a function to lift Mimicry's effect	2021-11-04 12:20:31 -03:00
LOuroboros	4f251e6ec2	Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN	2021-11-04 12:13:55 -03:00
LOuroboros	e0b53f87fc	Primal Reversion Tweaks ... -Fixed the inconsistent Primal Reversion activation in double battles. -Optimized the primal weather checks in attackcanceler a little. -Fixed the issue with multi-target fire/water moves during primal rain/sun.	2021-11-04 12:04:14 -03:00
ghoulslash	6b10801ee8	convert AI_IsabilityOnSide to bool	2021-11-04 10:43:33 -04:00
ghoulslash	c7a8d58eec	merge w pret	2021-11-04 10:03:33 -04:00
BuffelSaft	cecd341011	Fix Tar Shot ... If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.	2021-11-04 20:47:45 +13:00
BuffelSaft	28e78cb6c4	Gen 8 moves initial commit ... Full credit to Nunuchu42 and cfmnephrite for this code.	2021-11-04 19:50:54 +13:00
BuffelSaft	7d10097684	Replace IsTwoStrikesMove with FLAG_TWO_STRIKES ... Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.	2021-11-04 17:11:56 +13:00
BuffelSaft	4a7ddb737b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai_improvements	2021-11-04 15:51:11 +13:00
BuffelSaft	e930dae278	Remove ability pop up for Hunger Switch ... Morpeko should change form each turn without showing its ability.	2021-11-04 15:40:26 +13:00
BuffelSaft	616be576fc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-04 15:29:38 +13:00
LOuroboros	b931e34172	Handled Mimicry's interaction with Steel Roller's effect	2021-11-03 23:23:28 -03:00
ghoulslash	4466fbd930	ai version of CanPoisonType, CanBePoisoned and IsAbilityOnSide	2021-11-03 21:36:33 -04:00
BuffelSaft	eeb40daede	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2	2021-11-04 13:52:58 +13:00
GriffinR	d6f873ba69	Continue menu documentation	2021-11-03 20:38:23 -04:00
Eduardo Quezada D'Ottone	6ee2a3aba1	Merge branch 'BattleEngine' into booleanStandard ... # Conflicts: # src/battle_main.c	2021-11-03 20:44:25 -03:00
LOuroboros	f6628e301f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-03 20:43:33 -03:00
BuffelSaft	6132f9a9fe	Merge pull request #1750 from ghoulslash/mirror_armor ... Mirror Armor	2021-11-04 11:43:59 +13:00
BuffelSaft	5a855db4ad	Fix prototype of CanBePoisoned	2021-11-04 11:08:37 +13:00
GriffinR	085f8adec6	Start remaining menu documentation	2021-11-03 17:38:08 -04:00
GriffinR	9a0618afc3	Add COPYWIN constants	2021-11-03 15:29:18 -04:00
ghoulslash	48c29a9cd8	proper mirror armor sticky web targeting	2021-11-03 15:05:52 -04:00
GriffinR	3e49ac804b	Merge branch 'master' into doc-finalmisc	2021-11-03 13:56:22 -04:00
GriffinR	e14210ce1f	Merge pull request #1536 from GriffinRichards/clean-braille ... Add font id constants, better braille support	2021-11-03 13:17:29 -04:00
GriffinR	0ba22ca112	Merge pull request #1534 from GriffinRichards/doc-btrans ... Document battle transition	2021-11-03 11:26:20 -04:00
LOuroboros	af6e72ecfe	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-03 08:56:01 -03:00
Blackforest92	b9c23f7c62	Update waterfall, trick room, & focus blast BG	2021-11-03 16:29:09 +07:00
BuffelSaft	6ce1f01b8c	Hunger Switch and Aura Wheel ... Implement the ability Hunger Switch and the move Aura Wheel.	2021-11-03 19:45:03 +13:00
BuffelSaft	74c85b5818	Implement Relic Song's form change ... Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.	2021-11-03 17:23:33 +13:00
BuffelSaft	f323e2c047	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil	2021-11-03 14:18:28 +13:00
GriffinR	afb9ff3a40	Document files with a few remaining symbols	2021-11-02 18:06:06 -04:00
cbt6	3556024a06	Distinguish clearly the two enums related to speed	2021-11-03 02:51:30 +08:00
cbt6	3f5f057ebe	Rename GoSpeedX functions to WalkNormal, WalkFast, etc.	2021-11-03 01:50:53 +08:00
cbt6	4cedd2d551	Rename WalkFastest functions to WalkFaster	2021-11-03 01:50:53 +08:00
LOuroboros	69b42de0d9	Implemented Mimicry ... Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.	2021-11-02 14:44:55 -03:00
ghoulslash	4c9f48e9d8	Merge pull request #1842 from AsparagusEduardo/be_Gen8ContestData ... Added Gen 8 contest data	2021-11-02 12:50:45 -04:00
ghoulslash	ffcba355b0	merge w be	2021-11-02 10:36:08 -04:00
BuffelSaft	95435b5f7f	Pastel Veil switchin effect attempt ... Battle script isn't working for partner for some reason.	2021-11-02 23:06:10 +13:00
BuffelSaft	40bced517a	Pastel Veil blocks poison for whole side ... Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.	2021-11-02 20:00:57 +13:00
Blackforest92	2d5ed4a1e2	Allow Giga Impact fadein background & upgrade its graphic	2021-11-02 12:53:11 +07:00
BuffelSaft	1e3b3d482b	Merge pull request #1838 from Blackforest92/battle_engine ... Edit Spacial Rend and Hurricane background	2021-11-02 17:11:47 +13:00
Eduardo Quezada D'Ottone	8332bfae46	Gen 8 combo moves	2021-11-01 21:59:34 -03:00
Eduardo Quezada D'Ottone	f3013d8ee9	Standarized Solarbeam into Solar Beam	2021-11-01 18:36:35 -03:00
GriffinR	54a70ca4d4	Merge pull request #1530 from GriffinRichards/doc-graphics ... Label remaining symbols in graphics.c	2021-11-01 17:00:06 -04:00
ghoulslash	98b4b821dc	merge with be	2021-11-01 13:55:55 -04:00
ghoulslash	a1e64fce4f	handle simple beam, gastro acid	2021-11-01 13:50:57 -04:00
ghoulslash	b5d20da927	merge with be	2021-11-01 11:36:18 -04:00
BuffelSaft	5d678bc2ce	Fix move effect defines ... Had a define in a comment, which offset all the new move effects and misaligned their battle scripts.	2021-11-01 23:51:03 +13:00
BuffelSaft	0345dea918	Replace EFFECT_DOUBLE_HIT with FLAG_TWO_STRIKES ... This removes the need to have separate move effects for Twineedle, Double Iron Bash, and any custom two strike moves.	2021-11-01 23:39:37 +13:00
BuffelSaft	fb25e1ac98	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-01 22:37:23 +13:00
GriffinR	ef2971d8dc	Convert GF ROM header to C	2021-11-01 01:42:02 -04:00
Blackforest92	9b6cd383a4	Optimized Rock Wrecker and Hurricane	2021-11-01 01:06:39 +07:00
Blackforest92	e59d0dd5cf	clean Spacial Rend background	2021-10-31 22:58:43 +07:00
ghoulslash	52d4d1cd34	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-31 11:40:00 -04:00
ghoulslash	bc170f3a43	merge with be	2021-10-31 11:04:39 -04:00
GriffinR	36039e1b86	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
ghoulslash	e1f0e6285b	Merge pull request #1828 from BuffelSaft/gorilla-tactics ... Implement Gorilla Tactics	2021-10-30 21:44:33 -04:00
ghoulslash	468ee66cd8	fix synthesis and leaf guard w utility umbrella	2021-10-30 11:04:50 -04:00
GriffinR	875be8a8a8	Merge pull request #1528 from GriffinRichards/doc-ereaderscr ... Document ereader screen	2021-10-30 09:34:14 -04:00
ghoulslash	ee7b63e372	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-30 09:26:33 -04:00
ghoulslash	f4537b1213	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit	2021-10-30 09:14:32 -04:00
Blackforest92	799852ea77	Introduce alternate Steel Beam	2021-10-30 17:00:55 +07:00
BuffelSaft	52054e4bfe	Fix Corrosion, Poison Touch ... - CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.	2021-10-30 21:12:18 +13:00
BuffelSaft	47bfeaeecd	Implement Gorilla Tactics ... It's Choice Band but as an ability.	2021-10-30 18:31:44 +13:00
ghoulslash	af914ee7ed	merge w be	2021-10-29 22:33:50 -04:00
ghoulslash	28bc7dc14d	start ability	2021-10-29 22:32:19 -04:00
BuffelSaft	6b65ef5bcf	Merge pull request #1824 from ghoulslash/itemheal_fix ... Fix iteam healing after a failed move	2021-10-30 15:25:28 +13:00
BuffelSaft	f0e9b09258	Merge pull request #1822 from ghoulslash/harvest ... fix recycle and harvest	2021-10-30 15:00:56 +13:00
GriffinR	f51247615e	Finish documenting battle_transition	2021-10-29 18:32:53 -04:00
cbt6	9a1764f83e	Label some animation index numbers	2021-10-30 01:37:49 +08:00
GriffinR	07bf225f94	Continue battle_transition documenting	2021-10-29 11:24:36 -04:00
ghoulslash	2502820e83	document a couple hitmarkers. fix failing moves not updating hp from own healing effects	2021-10-29 09:03:14 -04:00
ghoulslash	204748e01a	fix recycle and harvest	2021-10-28 17:52:52 -04:00
ghoulslash	f342e7c590	merge with be	2021-10-28 17:03:10 -04:00
ghoulslash	e2e31f0b74	skill swap config option for switchin abilities	2021-10-28 16:53:00 -04:00
LOuroboros	a77f058146	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-10-28 14:24:43 -03:00
ghoulslash	34e966fdee	Merge pull request #1815 from LOuroboros/hyperspaceFury ... Implemented Hyperspace Fury	2021-10-28 13:20:33 -04:00
LOuroboros	82101d3581	Optimizations	2021-10-28 14:02:43 -03:00
LOuroboros	28522f3ffb	Fixed Hyperspace Fury not breaking through protections ... Also repositioned VARIOUS_JUMP_IF_SPECIES.	2021-10-28 12:09:44 -03:00
ghoulslash	bebaded415	merge with be	2021-10-27 16:48:38 -04:00
GriffinR	41ecae91f8	Label remaining symbols in graphics.c	2021-10-27 13:47:18 -04:00
LOuroboros	8c35a68060	Quick syntax tweaks	2021-10-27 11:19:39 -03:00
LOuroboros	fc7f1acf20	Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser	2021-10-27 11:13:59 -03:00
LOuroboros	1ab8c84f41	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury	2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone	773c773bac	Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape ... # Conflicts: # include/constants/battle_config.h	2021-10-26 20:35:01 -03:00
GriffinR	b0c27a8521	Document ereader screen	2021-10-26 15:44:42 -04:00
GriffinR	f9f91be60a	Merge pull request #1527 from cbt6/field-player ... Document field player functions	2021-10-26 14:29:44 -04:00
GriffinR	d6571f2355	Merge pull request #1525 from GriffinRichards/doc-recmix ... Document remainder of Record Mixing	2021-10-26 14:18:38 -04:00
cbt6	b3d779fd0d	Document field player functions	2021-10-27 01:39:00 +08:00
ghoulslash	782c16209d	Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs	2021-10-26 13:24:33 -04:00
ghoulslash	222d1d3194	merge with pret	2021-10-26 13:21:50 -04:00
BuffelSaft	adcf563ba1	Add missing berry data ... Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.	2021-10-26 14:42:06 +13:00
GriffinR	4f7f6c1082	Merge pull request #1526 from sphericalice/doc-curtain-special ... Document the CloseBattlePikeCurtain special	2021-10-25 16:10:45 -04:00
sphericalice	7b5267c799	Rename TILESET_WIDTH to METATILE_ROW_WIDTH	2021-10-25 20:51:04 +01:00
ghoulslash	07d2f73306	Merge pull request #1804 from AsparagusEduardo/PE_shedinjaball ... Config for Shedinja needing a Poké Ball to be created	2021-10-25 15:49:25 -04:00
sphericalice	5bce17cbce	Fix typo in the TILESET_WIDTH comment	2021-10-25 18:11:06 +01:00
sphericalice	120e75d275	Document the CloseBattlePikeCurtain special	2021-10-25 18:03:14 +01:00
GriffinR	a612c27f2d	Drop battle transition 'phase' terminology	2021-10-25 10:20:48 -04:00
GriffinR	6dc3c9864c	Merge pull request #1520 from GriffinRichards/doc-random ... Document random remaining symbols	2021-10-24 23:43:17 -04:00
Katelyn Gigante	347a173402	Prevent text glitch if a pokemon has an unspecified custom evolution	2021-10-25 13:24:48 +11:00
Eduardo Quezada D'Ottone	44625561e5	Taunt turn config	2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone	70aeaf288f	Rough Skin damage config	2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone	8699db942b	More ordering	2021-10-24 20:03:21 -03:00
GriffinR	7a89ad98c3	Document record mixing hall records	2021-10-24 16:13:07 -04:00
GriffinR	ab80264921	Merge pull request #1519 from GriffinRichards/doc-mgift ... Document Mystery Gift	2021-10-24 15:50:39 -04:00
GriffinR	7f3c529935	Document record mixing mail swap	2021-10-24 15:49:19 -04:00
TheXaman	475bb8a624	added preEvolutions to the EvoScreen!	2021-10-24 16:31:19 +02:00
BuffelSaft	4310868bee	AI handles multi-strike and fixed dmg moves ... Does not account for Parental Bond or Beat Up yet as those require some functions from #1676.	2021-10-24 18:49:17 +13:00
Eduardo Quezada D'Ottone	71ff664700	Ordered config into new categories	2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone	d95351dd97	Merge branch 'BattleEngine' into BE_config ... # Conflicts: # include/constants/battle_config.h	2021-10-23 19:46:33 -03:00
LOuroboros	d31700d2ac	Replaced the Red and Blue Orbs' sprites	2021-10-23 13:49:02 -03:00
Eduardo Quezada D'Ottone	abb8a97d21	Merge pull request #1616 from LOuroboros/statCalcs ... Added configs for modern post-battle stat calcs	2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone	9a8b88bdb3	Updated config description	2021-10-23 11:59:57 -03:00
Eduardo Quezada D'Ottone	76b6250104	Merge branch 'battle_engine' into plasmaFists	2021-10-23 11:06:34 -03:00
Jademalo	62436d9f67	IDE support formatting and consistency	2021-10-23 10:10:00 +01:00
Eduardo Quezada D'Ottone	382ec13492	Merge pull request #1752 from ghoulslash/quick_draw ... Quick Draw	2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone	d0253640fb	Merge pull request #1739 from LOuroboros/primalReversionBE ... Implemented Primal Reversion	2021-10-22 22:27:45 -03:00
Eduardo Quezada D'Ottone	35d5bc4367	Config for Shedinja needing a Poké Ball to be created	2021-10-22 20:50:53 -03:00
Jademalo	eb860a368e	Improve IDE support	2021-10-22 04:30:33 +01:00
GriffinR	303ce856ad	Fix GET_CARD_BATTLE_LOST typo	2021-10-21 16:54:16 -04:00
GriffinR	bc409baeff	Fix incorrect NUM_SECTORS_PER_SLOT define	2021-10-19 16:30:00 -04:00
ghoulslash	416c517e49	Merge pull request #1786 from Xavion3/damage_debug ... Adds simulated damage to the debug menu	2021-10-19 12:14:38 -04:00
LOuroboros	a6315ffc75	Implemented Plasma Fists	2021-10-19 09:50:18 -03:00
ghoulslash	eda99fcf29	Merge pull request #1742 from AsparagusEduardo/be_gStatuses4 ... Add gStatutes4	2021-10-19 08:45:47 -04:00
GriffinR	934a7e7a5d	Merge pull request #1516 from GriffinRichards/doc-miscbattle ... Miscellaneous battle documentation	2021-10-19 08:09:17 -04:00
Xavion3	150dd7c633	Add damage information to the debug menus	2021-10-19 22:39:07 +11:00
LOuroboros	d9b8e11a9c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE	2021-10-19 07:47:42 -03:00
GriffinR	24b4e898ad	More mauville_old_man clean up	2021-10-18 14:40:04 -04:00
GriffinR	b31bddddca	Clean up metatile_behavior	2021-10-18 12:54:29 -04:00
GriffinR	46dd10c87b	Clean up trainer_pokemon_sprites	2021-10-18 01:56:24 -04:00
GriffinR	db8ce5d7f9	Clean up mauville_old_man, drop ScrSpecial prefix	2021-10-18 01:09:41 -04:00
ghoulslash	8dc77e6fe3	Merge pull request #1782 from LOuroboros/glare ... Updated Glare	2021-10-17 22:11:33 -04:00
GriffinR	ed6fdd743f	Some pokemon_icon clean up	2021-10-17 22:04:08 -04:00
GriffinR	a950f9c771	Clean up international_string_util	2021-10-17 21:51:11 -04:00
Eduardo Quezada D'Ottone	ead5c92469	Merge branch 'battle_engine' into PLG	2021-10-17 17:38:54 -03:00
LOuroboros	e7ad7319e3	Updated Glare	2021-10-17 12:03:35 -03:00
Eduardo Quezada D'Ottone	df817fb2ab	Merge pull request #1772 from LOuroboros/gravApple ... Added Grav Apple's power boost	2021-10-17 09:51:29 -03:00
LOuroboros	59cfbe55c1	Gave Grav Apple a move effect of its own	2021-10-17 09:27:35 -03:00
GriffinR	ece7ef3410	Correct usage of MysteryEvent to MysteryGift	2021-10-17 03:00:48 -04:00
GriffinR	d0455485c3	Clean up mystery gift headers	2021-10-17 02:18:24 -04:00
GriffinR	3cd27acbea	Document wonder news	2021-10-17 02:09:31 -04:00
GriffinR	5f9069628d	Clean up mevent2	2021-10-17 01:35:26 -04:00
GriffinR	c7d550e96c	Clean up wonder card/news view	2021-10-17 01:15:16 -04:00
GriffinR	845a5e99cc	General mystery gift documentation, finish mystery gift client/server/scripts	2021-10-16 23:35:17 -04:00
ghoulslash	964e7efba9	fix MOVE_TARGET_ALL_BATTLERS and other u8 vars	2021-10-16 16:23:17 -04:00
ghoulslash	5509ceea04	expand move target field	2021-10-16 16:10:45 -04:00
BuffelSaft	df2223a5bc	Merge pull request #1745 from LOuroboros/retaliate ... Implemented Retaliate's effect	2021-10-16 22:49:32 +13:00
LOuroboros	3b6ceb1dfa	Turned Retaliate into a side timer	2021-10-16 06:04:04 -03:00
GriffinR	e1900efe1e	Merge branch 'master' into doc-miscbattle	2021-10-15 22:46:43 -04:00
GriffinR	1f39c34ca4	Merge branch 'master' into minor-constants	2021-10-15 22:44:49 -04:00
GriffinR	a4a3c1c9e5	Merge pull request #1511 from GriffinRichards/doc-union ... Document link_rfu / Union Room	2021-10-15 22:44:01 -04:00
ghoulslash	1f176242aa	add missing func definition	2021-10-15 16:06:50 -04:00
ghoulslash	c077091dbf	small fixes, check GetCatchingBattler's semi-invulnerability	2021-10-15 14:57:26 -04:00
ghoulslash	b94f710c80	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ballthrow	2021-10-15 14:49:37 -04:00
GriffinR	e3bb257bcf	Fix some trainer card link access	2021-10-15 12:22:19 -04:00
GriffinR	c02001c46d	Document mystery gift link scripts, general mystery gift	2021-10-15 12:05:06 -04:00
Eduardo Quezada D'Ottone	0a090616ef	Merge pull request #1765 from ghoulslash/shell_smash ... Shell Smash Animation	2021-10-15 12:09:06 -03:00
ghoulslash	ef19c8c415	fix gen define	2021-10-15 09:22:50 -04:00
ghoulslash	883a249836	config for catching semi-invulnerable mons	2021-10-15 09:20:32 -04:00
LOuroboros	3a25bce185	Turned Retaliate's effect into a side status	2021-10-15 06:03:48 -03:00
LOuroboros	1f97198267	Oops, I forgot to take the opponent's side into account	2021-10-15 05:02:14 -03:00
BuffelSaft	e59be67023	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-10-15 16:25:11 +13:00
Eduardo Quezada D'Ottone	b9816f0f28	Saftety Goggles typo for Item Expansion	2021-10-14 20:38:13 -03:00
Eduardo Quezada D'Ottone	21837b659a	Merge branch 'battle_engine' into bug_bite	2021-10-14 19:46:50 -03:00
GriffinR	37e52c4f34	Document some mystery gift	2021-10-14 15:10:41 -04:00
GriffinR	95406384f4	Start wonder card/news documenting	2021-10-14 13:24:20 -04:00
ghoulslash	85ce72a4d0	add shell smash anim	2021-10-14 10:47:39 -04:00
BuffelSaft	fc6e8f598c	Merge branch 'battle_engine' into battle_bond	2021-10-14 16:24:59 +13:00
GriffinR	9ab03f454d	Small correction to map script comments	2021-10-13 23:24:10 -04:00
BuffelSaft	bb8d0e3d6b	Fix Battle Bond ... Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.	2021-10-14 16:18:11 +13:00
Eduardo Quezada D'Ottone	d689842689	Merge pull request #1657 from ghoulslash/rototiller ... Rototiller Fix + MOVE_TARGET_ALL_BATTLERS	2021-10-13 22:45:50 -03:00
ghoulslash	a3d2bdc9cf	merge with be	2021-10-13 18:30:53 -04:00
GriffinR	def6cc8158	Label battle script macro arguments	2021-10-13 17:44:04 -04:00
GriffinR	fc15b0d5f0	Add controller buffer constants, finish misc battle doc	2021-10-13 16:21:39 -04:00
ghoulslash	3248bd796a	add quick draw	2021-10-12 21:49:18 -04:00
ghoulslash	996301d5d3	add mirror armor	2021-10-12 18:04:34 -04:00
ghoulslash	bbd09fdcf7	add wandering spirit	2021-10-12 10:32:51 -04:00
GriffinR	b0598b1aef	Clean up recorded_battle, add MOVE_IS_PERMANENT	2021-10-12 01:14:17 -04:00
GriffinR	f23e0beeba	Rename battle anim cmds, move its data, name remaining symbols	2021-10-11 13:18:21 -04:00
GriffinR	3a7995bc7c	Fix misleading RecordMixTrainerNames name	2021-10-11 10:39:37 -04:00
GriffinR	b8a44bf10a	Calculate pokemon substruct size, missing MON_PIC_SIZE	2021-10-11 10:35:53 -04:00
LOuroboros	6c550cd749	Implemented Retaliate's effect	2021-10-11 03:19:21 -03:00
ghoulslash	06bcfea3b8	merge with be	2021-10-10 19:56:33 -04:00
ghoulslash	fcada4fcad	handle rototiller + prankster	2021-10-10 19:54:17 -04:00
Eduardo Quezada D'Ottone	c3f8b77d82	Setting for pre-Gen6 Hidden Power Damage.	2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone	7798468ce9	Merge pull request #1738 from BuffelSaft/safety-googles ... Fix Safety Googles	2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone	cf6e3873b4	Moved Electrified to Status4.	2021-10-10 01:13:23 -03:00
Eduardo Quezada D'Ottone	903c4cbf68	Config for Blizzard + Hail	2021-10-09 23:52:37 -03:00
Eduardo Quezada D'Ottone	004f705607	Merge pull request #1549 from ghoulslash/last_ball ... add last used ball	2021-10-09 17:27:28 -03:00
GriffinR	862febe03a	Add MAP_OFFSET	2021-10-09 13:19:27 -04:00
GriffinR	28de627913	Add TRACKS_ALL, remove BGCntrlBitfield	2021-10-09 11:34:51 -04:00
GriffinR	d8e65fc4b6	More battle doc, add battle window ids	2021-10-09 03:01:10 -04:00
LOuroboros	2a7d78e68b	Oopsie	2021-10-09 01:55:36 -03:00
LOuroboros	91a68cd5db	Implemented Primal Reversion	2021-10-09 00:36:41 -03:00
BuffelSaft	07bdd2ffe6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-10-09 15:18:51 +13:00
BuffelSaft	274e964d91	Fix Safety Googles ... Fix typo and update gLastUsedItem before calling the safety goggles battle script.	2021-10-09 15:05:01 +13:00
GriffinR	31b501e7eb	Start misc battle documentation	2021-10-08 16:39:46 -04:00
ghoulslash	ce455ac7e7	merge with be	2021-10-08 07:44:32 -04:00
BuffelSaft	fbc4d7584e	Merge pull request #1610 from LOuroboros/primalAbilities ... Implement Desolate Land, Primordial Sea and Delta Stream	2021-10-08 20:01:09 +13:00
ghoulslash	9a4e0cf757	magician fixes, handle edge cases	2021-10-07 17:37:47 -04:00
GriffinR	7c5c41f23c	Combine link slot length constants	2021-10-07 16:19:02 -04:00
GriffinR	a2655ba9ab	Merge branch 'master' into doc-union	2021-10-07 16:10:35 -04:00
GriffinR	e86d3410a1	Update argument names in link headers, link_rfu doc cleanup	2021-10-07 16:05:12 -04:00
GriffinR	846942ce48	Finish remaining symbols in link_rfu_2	2021-10-07 15:23:47 -04:00
GriffinR	6aaf50ee27	Rename GF Gname, Rfu, finish bulk of Union Room, more link doc	2021-10-07 10:43:03 -04:00
ghoulslash	1031703309	magician base functionality	2021-10-06 16:00:02 -04:00
ghoulslash	4aeadd96c9	merge with be	2021-10-06 14:49:23 -04:00
ghoulslash	658235c03d	merge with be	2021-10-06 14:33:26 -04:00
ghoulslash	391cfabcac	merge with be	2021-10-06 14:31:21 -04:00
ghoulslash	ee3a2c97ee	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball	2021-10-06 13:54:40 -04:00
ghoulslash	1ad8448532	remove saveblock field	2021-10-06 13:54:33 -04:00
ghoulslash	4382420dd2	merge with be	2021-10-06 13:32:59 -04:00
ultima-soul	ce4375a10c	Ported new Ball catch rate modifier effects from Item Expansion.	2021-10-06 10:28:18 -07:00
ghoulslash	040e56b758	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_ai	2021-10-06 10:05:55 -04:00
ghoulslash	1f4844c7f5	Merge pull request #1710 from AsparagusEduardo/BE_Struggle ... Implemented modern effect of struggle with config	2021-10-06 09:27:10 -04:00
ghoulslash	245ef1ad2d	Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag ... Config for Shadow Tag vs Shadow Tag	2021-10-06 09:02:58 -04:00
LOuroboros	2b32581c14	Fixed infinite loop	2021-10-06 09:27:33 -03:00
GriffinR	4efa6c882a	Continue misc link documentation, rename reset_save_heap	2021-10-05 23:37:54 -04:00
ultima-soul	06f36595d6	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-10-05 19:25:52 -07:00
Eduardo Quezada D'Ottone	2b54b48b04	Merge branch 'PokemonExpansion' into PE_FormChangeHoldItems ... # Conflicts: # src/pokemon.c	2021-10-05 21:13:36 -03:00
Eduardo Quezada D'Ottone	43d42c95cf	Terrain Pulse effect implemented	2021-10-04 22:45:37 -03:00
Eduardo Quezada D'Ottone	5019615be1	Refactored Secret Power move effect into a function	2021-10-04 21:28:15 -03:00
ultima-soul	78d2215196	Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding.	2021-10-03 10:16:09 -07:00
LOuroboros	b85b3094c8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev	2021-10-03 07:05:56 -03:00
GriffinR	6e62c057f5	Document remaining symbols in pokemon.c	2021-10-02 23:48:12 -04:00
GriffinR	739e7d3c31	Document summary screen sprite manager	2021-10-02 23:47:59 -04:00
Eduardo Quezada D'Ottone	978f73475b	Config for Shadow Tag vs Shadow Tag	2021-10-02 19:01:11 -03:00
Eduardo Quezada D'Ottone	57ea20bc6d	Implemented modern effect of struggle with config	2021-10-02 13:32:36 -03:00
LOuroboros	c464b1b5dd	STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES	2021-10-01 23:12:59 -03:00
LOuroboros	f3ded43a88	Implemented Battle Bond	2021-10-01 22:49:17 -03:00
Eduardo Quezada D'Ottone	5593a83783	Fixed compile	2021-09-30 22:35:28 -03:00
Eduardo Quezada D'Ottone	5bf300f97c	Fixed issue where by default mon would change into the last form due to the IE items being defined as ITEM_NONE	2021-09-30 22:12:02 -03:00
GriffinR	001a25e49c	Merge pull request #1507 from GriffinRichards/doc-walda ... Document Walda Phrase	2021-09-30 12:27:20 -04:00
Pokestia	38a4dea402	Rename Battle Weather flags	2021-09-30 12:08:20 +02:00
Eduardo Quezada D'Ottone	55b61313a4	PSS uses form change table for holding items. ... # Conflicts: # src/pokemon.c	2021-09-29 02:13:44 -03:00
ghoulslash	e75a8fb67c	merge ai move and item decisions. AI will prefer to defeat player over healing	2021-09-27 21:03:27 -04:00
ghoulslash	761006a164	merge with be	2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone	4fbe4da7d0	Sitrus Berry Gen4+ heal. Credit to SBird1337	2021-09-26 18:46:34 -03:00
GriffinR	8a79ca3818	Document walda_phrase	2021-09-26 17:01:39 -04:00
LOuroboros	1b039062da	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-09-25 22:20:34 -03:00
LOuroboros	234f3290c3	Added a day time exclusive equivalent to FORM_USE_ITEM ... Primarily for Shaymin, since it can only change its form with the Gracidea during the day. Special thanks to AsparagusEduardo.	2021-09-25 22:00:10 -03:00
LOuroboros	813d114132	Synced include/constants/hold_effects.h with the BE	2021-09-25 20:58:07 -03:00
GriffinR	a66d7e1b43	Document some single-remaining symbols	2021-09-24 17:14:20 -04:00
Syreldar	4c05520bf3	Fixed Retaliate's naming.	2021-09-24 16:02:26 +02:00
GriffinR	a6ab2eb883	Merge branch 'master' into trailingSpaces	2021-09-23 21:39:21 -04:00
Eduardo Quezada D'Ottone	e87c170db0	Merge branch 'BattleEngine' into booleanStandard ... # Conflicts: # src/battle_main.c # src/battle_script_commands.c	2021-09-23 18:20:35 -03:00
ghoulslash	2f69748e0d	merge with be	2021-09-23 14:38:01 -04:00
ghoulslash	94ec25319f	syntax fixes. Use BlocksPrankster for perish song battle script	2021-09-23 14:35:37 -04:00
ghoulslash	768598b154	fix bad merge	2021-09-23 12:22:36 -04:00
ghoulslash	33972b5493	merge with be	2021-09-23 12:04:13 -04:00
ghoulslash	3f34fec42f	change last ball graphic based on config. replace saveblock field with ewram field	2021-09-23 12:03:01 -04:00
BuffelSaft	530998c4b7	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-09-23 16:41:35 +12:00
Eduardo Quezada D'Ottone	d084d2a68d	Merge branch 'BattleEngine' into booleanStandard ... # Conflicts: # include/battle.h # src/battle_main.c # src/battle_script_commands.c	2021-09-22 23:42:00 -03:00
BuffelSaft	2f03ac31b9	Multihit refactor and Parental Bond ... Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.	2021-09-23 14:31:21 +12:00
Eduardo Quezada D'Ottone	075c0299a1	Better names for Micle and Custap flags	2021-09-22 23:29:26 -03:00
Eduardo Quezada D'Ottone	2c66aa84b6	Merge pull request #1378 from ghoulslash/gen8_move_effects ... Several Gen 8 Move Effects	2021-09-22 22:48:29 -03:00
ghoulslash	9bf2ffe459	fix lash out stat fell	2021-09-22 21:15:02 -04:00
ghoulslash	d738297f24	merge with be	2021-09-22 16:26:09 -04:00
ghoulslash	3559a1b8e6	fix prankster + magic coat	2021-09-22 16:09:23 -04:00
ghoulslash	1309eea8ec	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects	2021-09-22 09:43:48 -04:00
ghoulslash	13062b5a8f	fix lash out, obstruct, and decorate	2021-09-22 09:43:40 -04:00
ghoulslash	fc84ebbd3e	redo prankster checks to handle assist	2021-09-22 08:06:42 -04:00
sbird	0ee13418dc	[ai] use expected value move dmg calculation	2021-09-22 13:15:43 +02:00
Eduardo Quezada D'Ottone	f9d1375451	Merge pull request #1375 from ExpoSeed/PE/form-change-table ... Form change table	2021-09-22 00:04:26 -03:00
Eduardo Quezada D'Ottone	287ffff2e2	Merge branch 'battle_engine' into burmy-form-change	2021-09-21 22:34:37 -03:00
Eduardo Quezada D'Ottone	f338813c6a	Merge pull request #1538 from DizzyEggg/double_onemon_battles ... Support for double battles with only one pokemon	2021-09-20 23:40:08 -03:00
Eduardo Quezada D'Ottone	08d3c31abe	Merge pull request #1584 from Blackforest92/pokemon_expansion ... Port missing Gen8 icons from DPE	2021-09-20 22:48:57 -03:00
Eduardo Quezada D'Ottone	18d91cc935	Merge pull request #1647 from BuffelSaft/gender-diff-fixes1 ... Show gender differences in evo scene	2021-09-20 22:03:23 -03:00
ghoulslash	0ea6c65b83	merge with be	2021-09-17 09:10:09 -04:00
ghoulslash	faa963fd04	merge with be	2021-09-17 09:07:38 -04:00
ghoulslash	b916d7991c	merge with be	2021-09-16 21:52:29 -04:00
ghoulslash	e756b0accc	merge with be	2021-09-16 21:41:29 -04:00
ghoulslash	af8d86f0c9	merge with be	2021-09-16 13:33:35 -04:00
ghoulslash	c2e0990aab	fix some merge conflicts	2021-09-16 13:29:36 -04:00
ghoulslash	9d8672e3df	merge with be	2021-09-16 13:12:59 -04:00
ghoulslash	ac42b19de7	some formatting fixes	2021-09-16 11:54:27 -04:00
ghoulslash	aac7ae3595	add MOVE_TARGET_ALL_BATTLERS	2021-09-16 10:45:33 -04:00
ghoulslash	9c94eb6140	but it failed check for rototiller	2021-09-16 10:24:32 -04:00
ghoulslash	85f3982fb9	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster	2021-09-15 17:52:45 -04:00
ghoulslash	f61d516aad	some syntax/format fixes	2021-09-15 17:15:50 -04:00
ghoulslash	845e333ba1	fix electric/misty terrain interactions with yawn/rest failures	2021-09-15 17:11:42 -04:00
ghoulslash	aa475ab300	merge with be	2021-09-15 16:42:23 -04:00
ghoulslash	0bca01cb74	mental herb fixes	2021-09-15 12:56:58 -04:00
ghoulslash	b85586a33a	merge with be	2021-09-15 12:54:39 -04:00
ghoulslash	c4ce4c150d	fix eject pack	2021-09-14 15:38:16 -04:00
ghoulslash	55c3e152cf	replace some BufferStatChange, fix room service and terrain seeds	2021-09-14 15:07:15 -04:00
ghoulslash	60713a8f2d	fix room service activation msg, stat target	2021-09-14 12:50:36 -04:00
ghoulslash	95af97593b	fix some comment styling. fix throat spray for multi-target moves	2021-09-14 11:53:35 -04:00
ghoulslash	f3f26d1a6f	merge with be	2021-09-13 19:40:28 -04:00
BuffelSaft	4aa7c096b7	Show gender differences in evo scene	2021-09-11 16:30:09 +12:00
BuffelSaft	db928a1329	Data entry for new sprites ... Add sprite defines, entries to gender tables, etc.	2021-09-11 14:12:41 +12:00
GriffinR	cbf8863e5b	Clean up Lilycove Lady	2021-09-09 15:24:34 -04:00
ghoulslash	6915b029bd	fix echoed voice power boost	2021-09-09 11:15:58 -04:00
ghoulslash	d7938bc2dc	Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster	2021-09-09 09:44:25 -04:00
ghoulslash	b8a71cabd1	merge with be	2021-09-09 09:44:18 -04:00
BuffelSaft	a4b630e6b5	Fix MOVE_EFFECT_REMOVE_STATUS ... Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured. Also, fix Ice Hammer's effect chance.	2021-09-07 16:34:32 +12:00
DizzyEggg	68c33895fd	Merge pull request #1622 from BuffelSaft/money-boost ... Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE	2021-09-06 11:32:53 +02:00
DizzyEggg	cdec3077b2	Merge pull request #1630 from BuffelSaft/disguise2 ... Fix many Disguise bugs	2021-09-06 10:32:37 +02:00
DizzyEggg	fa081d1fc5	Merge pull request #1618 from BuffelSaft/protect-like ... Fix protect-like moves	2021-09-06 10:24:29 +02:00
BuffelSaft	bdbb4b5f7e	Fix many Disguise bugs ... Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.	2021-09-06 18:27:42 +12:00
LOuroboros	376b65f6bf	Update hold_effects.h	2021-09-04 15:36:47 -03:00
ghoulslash	933696b3cd	merge with be	2021-09-03 17:41:00 -04:00
ghoulslash	c7a587913b	replace statStages checks with CompareStat	2021-09-03 13:13:02 -04:00
ghoulslash	93e2e09148	fix terrain seeds. create generic CompareStat function	2021-09-03 12:17:38 -04:00
ghoulslash	6ce1227447	fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case	2021-09-03 11:05:11 -04:00
ExpoSeed	5a5c257f68	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-09-02 21:43:20 -05:00
ghoulslash	7c53214dad	merge with be	2021-09-02 15:33:42 -04:00
ultima-soul	a10a02a536	Merge pull request #1221 from ghoulslash/battle_engine ... Implement Pickpocket	2021-09-02 11:33:34 -07:00
Ariel Antonitis	913afabe5d	Merge branch 'romhack' into lighting	2021-09-02 01:08:08 -04:00
Ariel Antonitis	8a3b04e837	Merge branch 'master' into romhack	2021-09-02 01:03:13 -04:00
BuffelSaft	13636f8691	Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE ... moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.	2021-09-02 16:15:58 +12:00
ghoulslash	dfe59992d3	merge with be	2021-09-01 07:37:45 -04:00
BuffelSaft	3371773e5c	Move touchedProtectLike to protect structs ... This makes more sense than putting it in DisableStruct.	2021-09-01 21:34:47 +12:00
BuffelSaft	ea6ce80ad4	Fix protect-like moves ... Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target. This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.	2021-09-01 19:57:03 +12:00
Ariel Antonitis	b64eb7ea14	Modified palette tint behavior.	2021-09-01 00:12:14 -04:00
LOuroboros	d2bcc2ad5b	Added configs for modern post-battle stat calcs	2021-09-01 00:31:50 -03:00
ghoulslash	0daf330628	undefine FREE_TRAINER_HILL by default	2021-08-31 12:57:44 -04:00
LOuroboros	69b7910f47	Gave an entrance animation to Delta Stream	2021-08-31 00:15:17 -03:00
LOuroboros	0a38054925	Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly	2021-08-30 21:21:07 -03:00
ultima-soul	5cb73a012c	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-08-30 11:57:27 -07:00
ExpoSeed	0f99d9d4c6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-08-30 13:26:40 -05:00
LOuroboros	216d8f0608	Solved game freezing issue ... My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.	2021-08-27 18:28:34 -03:00
LOuroboros	9e4f33d09e	Implemented Desolate Land, Primordial Sea and Delta Stream	2021-08-27 17:56:43 -03:00
LOuroboros	554210c5e3	Removed trailing spaces in the most relevant files ... Command used for the job: egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g' Credits to Grant Murphy from Stack Overflow.	2021-08-24 19:59:32 -03:00
LOuroboros	5c1d7e52dc	Added footprints for Gen. 6 species	2021-08-23 06:28:10 -03:00
GriffinR	8f5e2bbeba	Label swap line margin flag	2021-08-21 11:04:28 -04:00
ghoulslash	5b47bfacf2	Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs	2021-08-18 20:22:26 -06:00
ghoulslash	03fa4939ff	merge with pret	2021-08-18 20:22:03 -06:00
ghoulslash	019a582c47	replace level bonus with current chain	2021-08-18 20:02:44 -06:00
ultima-soul	43e8f76338	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:55:48 -07:00
ultima-soul	4c3ed52c2f	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:39:11 -07:00
ultima-soul	988320b89a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-08-17 11:25:13 -07:00
ultima-soul	840e2bc3f9	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-08-16 16:33:34 -07:00
ultima-soul	76a7a2720d	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-08-16 16:10:59 -07:00
ultima-soul	b620349da0	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-16 15:43:27 -07:00
GriffinR	dfdcfc1568	Document remaining functions in cable_club	2021-08-15 16:22:15 -04:00
GriffinR	e01ae55c13	Start more link_rfu_2 documentation	2021-08-15 15:13:42 -04:00
ghoulslash	a2d885c0d4	merge with be	2021-08-12 14:48:58 -06:00
ghoulslash	0bbbd1e7a9	fix electric/misty yawn/rest interactions	2021-08-12 14:08:41 -06:00
ghoulslash	c7c0fbc296	merge with be, make AI CanBeStatused functions separate from general util ones	2021-08-12 13:37:53 -06:00
ghoulslash	d218322b2c	merge with be	2021-08-12 01:26:13 -04:00
ultima-soul	64a48800c9	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-08-11 17:10:57 -07:00
ultima-soul	3f75a58137	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-08-11 16:55:29 -07:00
ultima-soul	02c9e040df	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-11 16:33:10 -07:00
GriffinR	80348e7188	Merge branch 'master' into doc-itemmenu2	2021-08-11 19:01:47 -04:00
GriffinR	cc51627465	Merge pull request #1489 from GriffinRichards/doc-playerpc ... Document player pc	2021-08-11 18:59:58 -04:00
GriffinR	0bc26d9d79	Merge pull request #1488 from GriffinRichards/doc-frontierpass2 ... Document frontier pass	2021-08-11 17:40:55 -04:00
GriffinR	28a8fe191a	Document item menu	2021-08-10 22:13:02 -04:00
BuffelSaft	30c983d9ca	Define Burmy forms in battle engine ... Title. BE needs these to compile on its own.	2021-08-08 13:14:51 +12:00
ghoulslash	b903d02c06	handle battle engine hidden ability change	2021-08-07 12:38:10 -04:00
BuffelSaft	f0cb6190e0	Implement Burmy form change ... Burmy changes form based on where it last battled.	2021-08-07 20:56:10 +12:00
LOuroboros	b4c4650186	Corrected inconsistent flag label spelling	2021-08-05 17:26:03 -03:00
GriffinR	bd5cf07059	Merge branch 'master' into doc-playerpc	2021-08-02 14:08:10 -04:00
GriffinR	06b909bcd8	Document player pc	2021-08-02 13:58:40 -04:00
GriffinR	3e60a78406	Merge branch 'master' into doc-frontierpass2	2021-07-31 13:30:40 -04:00
GriffinR	602855ea99	Document frontier pass	2021-07-31 13:28:08 -04:00
Blackforest92	3bd81d347d	Add missing Gen8 icons	2021-07-31 14:48:55 +07:00
ghoulslash	ab529b4e89	add stuff cheeks	2021-07-27 10:31:48 -06:00
ghoulslash	0a0687ae78	add smart wild AI	2021-07-27 09:49:39 -06:00
LOuroboros	f1195e1884	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-07-27 09:08:52 -03:00
LOuroboros	8012f4b25a	Re-ordered the hidden item flags list ... Instead of sorting them by location, it makes more sense to sort them by their value.	2021-07-26 20:18:11 -03:00
ghoulslash	4ca6d76160	add bug bite	2021-07-25 14:55:52 -06:00
ghoulslash	c914ed8572	fix sucker punch, surging strikes, obstruct, and snipe shot	2021-07-25 09:38:54 -06:00
ghoulslash	a37d4c3da9	merge with be, give life dew jungle healing effect	2021-07-25 08:22:05 -06:00
ghoulslash	e6a2d2226f	Merge pull request #1540 from DizzyEggg/rage_powder ... Rage powder updated to gen6	2021-07-24 07:15:58 -06:00
LOuroboros	bfa824f761	Removed unused status ailment constants	2021-07-23 13:18:24 -03:00
Ariel Antonitis	f3cb35467a	Merge branch 'romhack' into lighting	2021-07-20 19:45:40 -04:00
Ariel Antonitis	783149bd3f	Fixed bug where moving truck had a shadow.	2021-07-20 19:38:32 -04:00
ghoulslash	45d4cee243	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball	2021-07-18 11:11:03 -06:00
DizzyEggg	304f3b9203	Merge pull request #1565 from BuffelSaft/disguise-fix ... Fix Disguise reverting on switch out	2021-07-16 09:17:10 +02:00
BuffelSaft	90fdb74ccb	Remove UndoFormChangeOnSwitch ... Handle switching out Mimikyu Busted in UndoFormChange.	2021-07-16 17:56:53 +12:00
GriffinR	01f2381e01	Add LINK_MANAGER field comments from SDK	2021-07-11 16:48:59 -04:00
GriffinR	72bb2bd160	Merge pull request #1474 from GriffinRichards/clean-miragetower ... Clean up Mirage Tower	2021-07-10 23:26:41 -04:00
BuffelSaft	63faa6e3a9	Fix Disguise reverting on switch out ... Make Mimikyu's disguise stay busted when it's switched out.	2021-07-11 14:15:24 +12:00
ghoulslash	59c16ff1cf	AI_IsTerrainAffected checks	2021-07-10 16:41:41 -06:00
GriffinR	32fe412755	Merge pull request #1475 from GriffinRichards/doc-minor ... Label remaining symbols in a few files	2021-07-08 00:24:56 -04:00
GriffinR	fced9e507d	Merge pull request #1478 from Kurausukun/itemprint ... Change ItemPrintFunc to Use u32 Instead of s32	2021-07-08 00:15:45 -04:00
ultima-soul	ad8cfda831	Add and rearrange Key Items.	2021-07-06 17:03:46 -07:00
ultima-soul	2d8d38f44c	Add TM51 through TM100.	2021-07-05 18:11:57 -07:00
GriffinR	0f538102d9	Add local id constants for C	2021-07-05 13:54:43 -04:00
ExpoSeed	de3caaccfb	Include expansion_branches.h in global.h	2021-07-04 12:42:34 -05:00
ExpoSeed	630d172393	Include expansion_branches.h in global.h	2021-07-04 12:41:21 -05:00
ExpoSeed	0ed1d29ece	Include expansion_branches.h in global.h	2021-07-04 12:39:30 -05:00
Kurausukun	42730a8315	Revert "remove gflib" ... This reverts commit 8b59909ac5.	2021-07-03 17:39:33 -04:00
GriffinR	b4f66496ed	Merge pull request #1471 from GriffinRichards/fix-lock ... Fix some object lock names	2021-07-03 11:21:10 -04:00
ultima-soul	53e900a643	Rearranged rest of item ids except for Key Items.	2021-07-02 22:43:50 -07:00
ExpoSeed	fb69b65337	Fix redefinition error in battle_config.h	2021-07-02 14:36:55 -05:00
ExpoSeed	788b9f675f	Fix redefinition error in pokemon_config.h	2021-07-02 14:36:02 -05:00
ExpoSeed	ebe0d21c54	Fix redefinition error in item_config.h	2021-07-02 14:34:29 -05:00
TheXaman	af355fcb12	added Debug to StartMenu via DEBUG_MENU option	2021-07-02 11:49:32 +02:00
GriffinR	64d06f4c8f	Condense battle AI scripts, minor clean up	2021-07-02 02:46:01 -04:00
GriffinR	8f43d1ebeb	Document smart shopper TV show	2021-07-02 01:45:23 -04:00
GriffinR	fe89a4d147	Label remaining region_map symbols	2021-07-02 00:52:36 -04:00
GriffinR	10886a586b	Clean up mirage tower	2021-07-01 23:46:15 -04:00
ghoulslash	53e6ba1c48	Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav	2021-06-27 07:43:02 -06:00
ghoulslash	c06029bc72	add last used ball	2021-06-25 13:37:59 -06:00
TheXaman	defd7d9e07	Added Sound menu for SE and MUS	2021-06-22 12:38:00 +02:00
PikalaxALT	e0b58592b2	Merge pull request #1469 from GriffinRichards/fix-contesthearts ... Clarify contest heart tiles	2021-06-21 13:59:50 -04:00
GriffinR	810b51f96c	Clarify contest heart tiles	2021-06-21 13:48:03 -04:00
ultima-soul	9e0b866f09	Rearranged Poke Ball item ids.	2021-06-18 21:46:20 -07:00
BuffelSaft	4c18cb7fe7	Remove EFFECT_THAW_HIT	2021-06-19 11:49:00 +12:00
Kurausukun	10c80230c4	change printItemFunc to use u32 instead of s32 ... also change a use of -2 to LIST_CANCEL	2021-06-18 00:15:45 -04:00
Kurausukun	8b59909ac5	remove gflib	2021-06-17 22:09:48 -04:00
ghoulslash	608dd9ddc5	add shiny chaining	2021-06-17 11:15:53 -06:00
ghoulslash	7405c11934	add r to search	2021-06-16 09:47:53 -06:00
Xhyzi	c2bd046ea6	Shell Trap	2021-06-15 20:22:50 +02:00
Xhyzi	155e9b6332	Court Change	2021-06-15 20:14:10 +02:00
Xhyzi	271f19e6cb	Terrain Pulse	2021-06-15 20:01:57 +02:00
Xhyzi	0202b75822	Beak Blast	2021-06-15 19:57:21 +02:00
Xhyzi	7799e49e3a	Corrosive Gas	2021-06-15 19:45:24 +02:00
Xhyzi	e7ec4df70b	Rising Voltage	2021-06-15 17:51:59 +02:00
Xhyzi	ee3f3eb78f	Meteor Beam	2021-06-15 17:06:21 +02:00
Xhyzi	62525516a4	Scale Shot	2021-06-15 16:50:19 +02:00
Xhyzi	60ce39543e	Expanding Force	2021-06-15 16:29:06 +02:00
Xhyzi	5a094a3033	Snap Trap	2021-06-15 16:22:42 +02:00
TheXaman	6b8f40b3b1	new layout for evo screen and new buttons for the PE version	2021-06-14 17:29:42 +02:00
TheXaman	2d4a91f0b4	added Decapped version of the button prompts	2021-06-14 15:00:26 +02:00
TheXaman	d0012305c0	stats page new navigation button prompts	2021-06-14 14:55:55 +02:00
ExpoSeed	b6b0062bd6	Change map header flags to use a bitfield	2021-06-13 17:02:06 -05:00
MissingNoL	721dbe9178	Implemented all PLG effects	2021-06-12 18:01:35 -07:00
TheXaman	1530da10a0	changed catch rate to words	2021-06-13 01:17:47 +02:00
TheXaman	537a17714c	EV Arrows now close to stats	2021-06-13 00:35:38 +02:00
TheXaman	13256b856e	Egg groups now in one line (if 2 different one), ... changed where the bg is cleared	2021-06-12 23:38:08 +02:00
MissingNoL	610b18bfdb	Implemented Double Iron Bash's effect	2021-06-12 14:27:50 -07:00
MissingNoL	beb126b534	Implemented Zippy Zap's effect	2021-06-12 13:58:54 -07:00
TheXaman	6bbdc79f5a	EVs represented by Arrows instead of numbers, also now in 1 line	2021-06-12 21:55:02 +02:00
TheXaman	73cc40fd03	Egg cycles now with icons insteat of numbers	2021-06-12 19:52:43 +02:00
TheXaman	74e562da33	friendship now emoji based	2021-06-12 15:29:01 +02:00
ultima-soul	bca67ac683	Refactor Poke Ball code to not rely on Master Ball being the first item internally.	2021-06-11 18:22:50 -07:00
ghoulslash	bf4b5a926d	merge with pret	2021-06-11 12:23:16 -06:00
ghoulslash	0c14ec4b78	Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav	2021-06-11 12:22:15 -06:00
ultima-soul	b7706f1b99	Remove ball catch rate modifier effects.	2021-06-10 21:59:13 -07:00
ExpoSeed	c8fc141287	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-06-10 11:54:20 -05:00
ExpoSeed	3ed06c2cc2	Remove remaining grey and replace with gray	2021-06-10 11:36:10 -05:00
BuffelSaft	e6a8faec1e	Fix thawing moves ... Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.	2021-06-10 23:48:18 +12:00
DizzyEggg	f27dcab784	Rage powder has powder moves qualities when forcing a target	2021-06-10 12:55:05 +02:00
Ariel Antonitis	385c94d068	Merge branch 'romhack' into lighting	2021-06-08 17:58:29 -04:00
ghoulslash	1b3f53bae8	Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs	2021-06-08 13:31:36 -06:00
DizzyEggg	4b29ae39ad	Allow one mon double battles	2021-06-08 16:40:47 +02:00
ultima-soul	425746763a	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-06-07 20:08:43 -07:00
ultima-soul	f3f4d8e608	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-06-07 19:52:20 -07:00
ultima-soul	0a87adad1a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-06-07 18:05:52 -07:00
LOuroboros	588b3638d3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus	2021-06-07 19:22:20 -03:00
LOuroboros	8726107d42	Removed BattleScript_FlinchPrevention ... Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.	2021-06-07 19:18:15 -03:00
ultima-soul	d30ab7760f	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-06-07 13:52:08 -07:00
ultima-soul	cf19635a80	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-06-07 13:15:46 -07:00
ultima-soul	092f02f119	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-06-07 12:00:23 -07:00
MissingNoL	bfc66a21cc	gBattlescriptCurrInstr[3] is not reading species parameter	2021-06-06 19:14:11 -07:00
ultima-soul	2563bc5c83	Merge pull request #1521 from DizzyEggg/largeexp ... Allow larger exp gains	2021-06-06 13:33:33 -07:00
MissingNoL	9cd522d254	Merge branch 'battle_engine' into Photon_Geyser	2021-06-05 16:46:28 -07:00
MissingNoL	921b80de7c	Update battle_script_commands.h ... Properly aligned the list of number IDs	2021-06-05 16:40:03 -07:00
Ariel Antonitis	e4b9bb75e2	Merge branch 'master' into romhack	2021-06-04 23:36:21 -04:00
Ariel Antonitis	37f0684d98	Unown followers now appear as the right letter.	2021-06-04 23:35:10 -04:00
Ariel Antonitis	c267dd6ee6	Added function to check for newer emulators/hardware.	2021-06-04 23:35:04 -04:00
Ariel Antonitis	e9d01b4808	Added a non-RNG, PID-preserving way to modify pokemon nature. ... (wip) Preserve shiny value when changing nature. (WIP) Preserve shiny value. (WIP) Preserve nature. (WIP) Removed some debugging statements. (WIP) Removed more debugging statements. (WIP) Nature changing now supports Unown.	2021-06-04 22:49:20 -04:00
ultima-soul	3448e19275	Merge pull request #1459 from ExpoSeed/BE/rename-flags ... Rename flags	2021-06-04 19:33:45 -07:00
ExpoSeed	4bb33367df	Newline	2021-06-04 19:35:16 -05:00
ExpoSeed	ec2c140ecb	Disambiguate Thousand Arrows flag from other flags	2021-06-04 19:34:37 -05:00
ExpoSeed	15914d7af8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags	2021-06-04 19:00:29 -05:00
ultima-soul	6edec5bc3d	Merge pull request #1437 from LOuroboros/oblivious ... Tweaked Oblivious	2021-06-04 16:51:38 -07:00
ExpoSeed	0e96b47584	Review comments	2021-06-04 18:50:11 -05:00
LOuroboros	b552db7193	Tweaked the Oblivious immunities ... Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.	2021-06-04 19:23:07 -03:00
DizzyEggg	4b744374c8	Allow larger exp gains	2021-06-03 23:17:44 +02:00
LOuroboros	b215b44951	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales	2021-06-03 05:09:14 -03:00
ultima-soul	fc19023087	Merge pull request #1493 from LOuroboros/feathers ... Corrected the Wings/Feathers	2021-06-02 22:56:16 -07:00
LOuroboros	03647c7790	Adjusted the list of item hold effects	2021-06-02 17:27:45 -03:00
LOuroboros	6ccb493f12	Adjusted the list of item hold effects	2021-06-02 17:23:58 -03:00
BuffelSaft	2a6b989c92	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press	2021-06-02 12:41:28 +12:00
LOuroboros	d48a6e00d4	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious	2021-06-01 18:15:01 -03:00
Kurausukun	2bbaf71998	[LEAK-INFORMED] fix CreateShedinja fakematch ... info: the header change is required. accesses to the struct need to be treated as non-const, even though the array must be const. thanks to jiang for figuring this out.	2021-05-31 08:20:46 -05:00
amiosi	b588e94395	more requested changes	2021-05-28 15:05:33 -04:00
MissingNoL	f30a9542ee	Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm	2021-05-27 22:21:55 -07:00
amiosi	f7651fd592	most fixes from requested changes	2021-05-27 15:55:19 -04:00
amiosi	fc81994579	Merge branch 'battle_engine' into old_findings	2021-05-27 15:28:02 -04:00
ultima-soul	eedd374a5f	Merge pull request #1420 from Blackforest92/pokemon_expansion ... Added missing gen8 battle sprites and available icons and various fixes	2021-05-24 21:13:12 -07:00
Blackforest92	d74492b591	Returning Alcremie back to monkey	2021-05-25 10:57:06 +07:00
ultima-soul	1f859e340d	Merge pull request #1415 from ghoulslash/item_expansion ... Add Berry Hold Effects	2021-05-24 11:07:35 -07:00
ghoulslash	c356ffaed4	merge with be. fix null ptr check in GetBattleMoveSplit	2021-05-24 10:46:53 -06:00
ghoulslash	5840b1f0ed	utility umbrella effect	2021-05-24 09:52:45 -06:00
Scott	265cdcdc12	Handle GetAbilityBySpecies edge cases	2021-05-23 16:17:43 -04:00
ghoulslash	c3e28e9b1a	merge with be	2021-05-23 12:22:52 -06:00
ghoulslash	54b03a474d	fix SIDE_STATUS_SCREEN_ANY	2021-05-23 12:22:07 -06:00
Eduardo Quezada D'Ottone	04c6331a60	Merge pull request #1432 from BuffelSaft/thousand_arrows ... Fix Thousand Arrows	2021-05-21 11:40:13 -04:00
ghoulslash	cedd2967d8	merge w pret	2021-05-20 11:28:26 -06:00
ghoulslash	abe68b7466	incremement dexnav chain fix	2021-05-18 09:31:53 -06:00
ghoulslash	3c4bf808f1	merge with pret	2021-05-18 09:31:34 -06:00
LOuroboros	0bc8ed59f5	Wings -> Feathers	2021-05-17 21:58:17 -03:00
ultima-soul	50c2514267	Merge pull request #1469 from ultima-soul/pokemon_expansion_sync ... Pokemon Expansion Upstream Sync	2021-05-13 20:56:29 -07:00
gAlfonso-bit	2be29cdb77	Update IsPokemonCryPlaying	2021-05-13 11:23:11 -05:00
GriffinR	65fd334256	Name map groups	2021-05-11 10:16:04 -05:00
LOuroboros	95d41524a2	Implemented Clanging Scales' effect	2021-05-09 18:20:03 -03:00
Flametix	a8fab62c89	Fix Substitute typo	2021-05-06 20:49:04 -04:00
Ariel Antonitis	bfe0c58326	Merge branch 'romhack' into lighting	2021-05-05 20:01:15 -04:00
Ariel Antonitis	3201422bbb	Merge branch 'master' into romhack	2021-05-04 22:14:50 -04:00
GriffinR	6ce27c0ff0	Restore EReaderTrainerHillSet dummy	2021-05-04 15:43:24 -04:00
ultima-soul	e864c39a5d	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-05-04 10:04:35 -07:00
GriffinR	4206359862	Fix some object lock names	2021-05-04 01:21:50 -04:00
Ariel Antonitis	147e101df5	More testing of fog blending.	2021-05-02 02:55:23 -04:00
Ariel Antonitis	65e616342b	Changed time blending to work with FadeScreen.	2021-05-02 02:53:30 -04:00
ultima-soul	cf0fd961b9	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-28 23:56:58 -07:00
ultima-soul	00c3f060b1	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-04-28 23:53:23 -07:00
ultima-soul	56fc420187	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-28 21:34:30 -07:00
GriffinR	f7a699c686	Merge pull request #1421 from GriffinRichards/doc-tvrecordmix ... Document TV	2021-04-29 00:25:01 -04:00
ultima-soul	75a9fdbafa	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-04-28 20:50:59 -07:00
ultima-soul	0da3f74a7e	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-28 18:58:38 -07:00
GriffinR	6c38837b26	Merge pull request #1420 from GriffinRichards/doc-dataanims ... Document battler affine anims, default pokeball throw	2021-04-28 13:56:42 -04:00
GriffinR	58cef0ae52	Merge pull request #1418 from GriffinRichards/sync-ereaderhelp ... Sync e-reader helpers, document trainer hill e-reader	2021-04-28 06:08:57 -04:00
ultima-soul	14a0303e2f	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-27 18:36:37 -07:00
GriffinR	c6300b5325	Merge pull request #1417 from GriffinRichards/doc-pyramidbag ... Document Battle Pyramid Bag	2021-04-27 14:48:09 -04:00
GriffinR	18f85b5cf0	Merge pull request #1415 from GriffinRichards/doc-contestutil ... Some Contest clean up	2021-04-27 02:29:41 -04:00
GriffinR	d74017d256	Merge pull request #1419 from GriffinRichards/doc-animstatus ... Label more unused battle anims	2021-04-26 13:32:15 -04:00
GriffinR	c0aedf8df4	Merge pull request #1410 from GriffinRichards/doc-tradedata ... Document trade sequence animation, some trade cleanup	2021-04-26 13:26:12 -04:00
GriffinR	aad090e154	Document TV	2021-04-26 12:35:35 -04:00
Ariel Antonitis	0cc6c7b111	Made BlendPalettesFine global.	2021-04-25 22:01:33 -04:00
Ariel Antonitis	a160012dbf	Added shadow toggle to weather structure.	2021-04-25 22:01:33 -04:00
Ariel Antonitis	4454a6397b	Fixed bug where TOD was updated too frequently.	2021-04-25 22:01:33 -04:00
Ariel Antonitis	dbc4cb8293	Refactored BlendSettings storage inside gPaletteFade.	2021-04-25 16:26:24 -04:00
Ariel Antonitis	4bb7abb520	Fixed palette fades during intermediate times of day.	2021-04-25 16:26:23 -04:00
Ariel Antonitis	da345c1eeb	Optimized time-of-day & native palette blending.	2021-04-25 16:26:23 -04:00
Ariel Antonitis	ae4f596885	Averaging function can now tint.	2021-04-25 16:26:23 -04:00
Ariel Antonitis	93ab4451fc	Testing combined averaging function.	2021-04-25 16:26:23 -04:00
Ariel Antonitis	def9d39fbb	Testing evening tint.	2021-04-25 16:26:22 -04:00
Ariel Antonitis	22c429d0d6	Added inter-time-of-day blending.	2021-04-25 16:26:22 -04:00
Ariel Antonitis	e11d050423	Added weighted palette average.	2021-04-25 16:26:22 -04:00
Ariel Antonitis	3c52e9b7ca	Experimental TOD tint.	2021-04-25 16:26:22 -04:00
Ariel Antonitis	cd9276c569	Refactored light metatile caching.	2021-04-25 16:26:22 -04:00
Ariel Antonitis	56b9764aec	Added default light blending color. ... Fixed light palette header offsets. Changed blending function names.	2021-04-25 16:26:22 -04:00
Ariel Antonitis	127749369d	Allowed map headers to specify light palettes.	2021-04-25 16:26:21 -04:00
GriffinR	bee60f4c64	Document battler sprite affine anims, default pokeball throw	2021-04-25 02:18:34 -04:00
GriffinR	e065c0c285	Label more unused battle anims	2021-04-24 18:26:25 -04:00
GriffinR	86475c5ded	Document trainer hill ereader	2021-04-24 18:04:27 -04:00
GriffinR	004c37bf02	Sync ereader_helpers with pokefirered	2021-04-24 18:03:06 -04:00
GriffinR	8c820878bf	Document Battle Pyramid Bag	2021-04-23 15:07:36 -04:00
GriffinR	bc9fc38254	Misc contest cleanup	2021-04-22 15:51:04 -04:00
GriffinR	dbe24f0baa	Clean up contest_painting	2021-04-21 20:04:12 -04:00
GriffinR	a2a9f22612	Clean up contest_util	2021-04-20 21:16:47 -04:00
GriffinR	04af378904	Document trade sequence animation, some trade cleanup	2021-04-20 05:50:39 -04:00
Ariel Antonitis	221569a710	Merge branch 'master' into romhack	2021-04-18 22:17:53 -04:00
Ariel Antonitis	fbbd58a823	Added music messages.	2021-04-18 21:00:27 -04:00
Ariel Antonitis	875c4edd50	Added some conditional messages. ... Added emote graphics.	2021-04-18 21:00:27 -04:00
Ariel Antonitis	e647e926a8	Added all unconditional HGSS messages.	2021-04-18 20:59:23 -04:00
GriffinR	cd2a99b7c4	Doc storage - misc cleanup, some item/cursor	2021-04-17 13:33:29 -04:00
ExpoSeed	f922d42988	Refactor hidden abilities	2021-04-16 23:38:35 -05:00
ExpoSeed	db2b995bc6	Introduce NUM_ABILITY_SLOTS	2021-04-16 23:37:55 -05:00
ExpoSeed	27c6964a05	Merge branch 'num_ability_slots' into BE/num_ability_slots	2021-04-16 20:45:34 -05:00
ExpoSeed	49bb345338	Introduce NUM_ABILITY_SLOTS	2021-04-16 20:36:45 -05:00
GriffinR	80cc7d46ae	Doc storage - fix row/column flip	2021-04-16 15:07:10 -04:00
GriffinR	838a452363	Doc storage - choose box menu, move wallpaper gfx	2021-04-15 18:46:20 -04:00
GriffinR	a1ed59450e	Doc storage - wallpaper and titles	2021-04-15 16:09:41 -04:00
GriffinR	c4ef45c161	Merge pull request #1403 from GriffinRichards/doc-pokeblock ... Document Pokéblock menu and feeding scene	2021-04-14 14:17:36 -04:00
GriffinR	33ea2a1061	Remove unnecessary scope for TEST_BUTTON	2021-04-13 02:50:50 -04:00
GriffinR	82f870091e	Merge pull request #1400 from GriffinRichards/doc-pokemonanim ... Document Pokémon animation	2021-04-13 01:36:15 -04:00
GriffinR	042a2ecc41	Document pokeblock feed scene	2021-04-12 18:44:37 -04:00
GriffinR	c786a9b20c	Document pokeblock menu	2021-04-11 18:10:05 -04:00
ghoulslash	98bccaa35d	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion	2021-04-10 14:28:07 -06:00
GriffinR	09a9efd5c5	Merge pull request #1398 from GriffinRichards/doc-field ... Document field	2021-04-10 13:05:51 -04:00
GriffinR	f6016838b1	Merge pull request #1397 from GriffinRichards/doc-moremisc ... Clean up battle scripts	2021-04-10 12:41:35 -04:00
GriffinR	72ba8cf58d	Document pokemon animation types	2021-04-10 00:50:28 -04:00
ExpoSeed	8494306d1d	Rename flags	2021-04-07 16:07:30 -05:00
LOuroboros	75b6d2837e	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller	2021-04-07 17:10:52 -03:00
GriffinR	d717a635c8	event_object_movement cleanup	2021-04-06 17:55:29 -04:00
ghoulslash	71b85031e0	update NUM_BATTLE_MOVE_EFFECTS	2021-04-06 15:42:21 -06:00
GriffinR	0dc7ff8994	Minor misc field doc	2021-04-06 17:17:41 -04:00
GriffinR	4a1cfbead2	Document remaining overworld	2021-04-06 16:55:43 -04:00
GriffinR	86a9d94ce1	Document fieldmap	2021-04-06 16:05:43 -04:00
GriffinR	8bad478b49	Document disguise field effects	2021-04-06 14:51:39 -04:00
GriffinR	756fad0e61	Document some event object movement	2021-04-06 14:34:36 -04:00
GriffinR	00c3044c96	Clarify Groudon/Kyogre/Rayquaza gfx names	2021-04-06 02:38:15 -04:00
GriffinR	806abe2999	Document some objev anims, make objevgfx info static	2021-04-05 19:52:35 -04:00
GriffinR	553fe6239a	Document more field effects	2021-04-05 18:21:17 -04:00
GriffinR	f90026826a	Document some weather, field effects	2021-04-04 17:52:07 -04:00
ExpoSeed	cf9d5f8563	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table	2021-04-04 01:11:32 -05:00
ultima-soul	be7acc919a	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-04-03 21:53:29 -07:00
GriffinR	5fa20534f9	Label remaining fields in Weather struct	2021-04-04 00:52:17 -04:00
GriffinR	b926fa6b07	Document thunderstorm	2021-04-04 00:44:20 -04:00
GriffinR	1494a83035	Sync drought with pokefirered, add weather tags	2021-04-03 22:47:58 -04:00
GriffinR	b6711441f5	Fix AI Guard Spec use, and Specs->Spec	2021-04-03 15:18:17 -04:00
GriffinR	f4d8a91ba4	Misc battle script cleanup	2021-04-03 14:07:31 -04:00
GriffinR	9ea9ffde09	Add remaining multistring chooser constants	2021-04-03 11:49:06 -04:00
LOuroboros	f04f35f5c3	Added a config for the amount of HP recovered by healing items	2021-04-02 20:34:57 -03:00
ultima-soul	4a81102a46	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-04-02 13:57:19 -07:00
ultima-soul	b8721034ef	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-02 13:42:05 -07:00
ultima-soul	939608f5b8	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-04-02 13:16:40 -07:00
ghoulslash	5e948e746b	add dexnav	2021-04-02 12:28:00 -06:00
GriffinR	1b8d405b5e	Add missing include guard suffixes	2021-04-02 12:54:40 -04:00
ghoulslash	42c7a5fea2	fix z move move IDs	2021-04-02 10:28:08 -06:00
ghoulslash	4b02f26e73	Merge branch 'master' of https://github.com/pret/pokeemerald into stair_warps	2021-04-02 10:10:58 -06:00
Evan	ef6c4ddbb1	remove 1000ish bytes with ramscript (thx griffinR for advice)	2021-04-02 09:17:10 -06:00
Evan	741f62fc0b	merge 9fd576f37e021f119513a38d3d6e39a2c64f85ec	2021-04-02 09:17:00 -06:00
ghoulslash	d89e2c1775	merge with be	2021-04-02 08:55:54 -06:00
GriffinR	c9d3b26ff7	Label miss string indexes	2021-04-02 02:12:46 -04:00
GriffinR	8be2c5d60b	Document Contest Lady TV Show	2021-04-02 01:49:38 -04:00
GriffinR	a0b3d4df12	Merge pull request #1390 from GriffinRichards/doc-introcred ... Document intro and credits sequences	2021-04-01 23:13:59 -04:00
ghoulslash	42cc81a0b9	DoBobbingFieldEffect declaration	2021-04-01 20:26:21 -06:00
GriffinR	51970f97b0	Merge pull request #1393 from GriffinRichards/doc-dewfordtrend ... Document Dewford Trend and match_call.c	2021-04-01 22:19:48 -04:00
Evan	13c5f15e56	cherry pick 53731a7fc7579e61d5ee7d32d0e06f1cbe5a085d	2021-04-01 20:15:51 -06:00
Evan	01d08d3cee	fix sand onto sideways stairs bug	2021-04-01 20:15:02 -06:00
Evan	397da3736c	follower movement and slow stairs	2021-04-01 20:14:55 -06:00
Evan	a23f716209	add slow stair movement back	2021-04-01 20:14:47 -06:00
Evan	d3d29d7cb5	cherry pick 0cccbfd0ba608287d5f2b642ea613d9674cd919d	2021-04-01 20:12:43 -06:00
Evan	228b76e136	finish conditional slow stairs movement, clean up code a bit	2021-04-01 20:10:41 -06:00
Evan	e4674ccd03	fully working walk/run/mach bike/acro bike regular movement	2021-04-01 20:10:30 -06:00
Evan	31e9f97d52	cherry pick 4eb7fcc261934c0f9f10985761cd3e7b7abf0dab	2021-04-01 20:10:21 -06:00
Evan	33dfa321b0	init branch	2021-04-01 20:09:12 -06:00
ghoulslash	dfce7f1548	add auto read signposts	2021-04-01 09:45:17 -06:00
GriffinR	f58465a274	Document match_call.c	2021-04-01 03:29:15 -04:00
LOuroboros	ed74430d26	Added a variation of BattleScript_NotAffected ... This one triggers the Ability PopUp.	2021-03-31 23:33:51 -03:00
GriffinR	771a434730	Label Trend Watcher TV show texts	2021-03-31 16:29:42 -04:00
GriffinR	86856098a3	Document Dewford Trend	2021-03-31 16:08:42 -04:00
BuffelSaft	35add44a90	Thousand Arrows hits airborne targets ... Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc. Also fixed its effect chance, which was 0 instead of 100.	2021-03-31 23:05:30 +13:00
GriffinR	50e9666e16	Merge branch 'master' into doc-introcred	2021-03-29 20:56:15 -04:00
GriffinR	dea07dc865	Standardize intro gfx names	2021-03-29 20:48:48 -04:00
GriffinR	09ff1524b4	Finish documenting credits	2021-03-29 19:58:29 -04:00
Kurausukun	102582a3df	Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc	2021-03-29 18:36:18 -04:00
GriffinR	c40fb9288c	Merge pull request #1378 from GriffinRichards/doc-berrycrush ... Document Berry Crush	2021-03-29 12:38:16 -04:00
GriffinR	62968895ca	Add MON_PIC_SIZE constant	2021-03-29 09:38:19 -04:00
GriffinR	357c5439f5	Document some credits	2021-03-29 08:52:40 -04:00
GriffinR	c86cc8b371	Document intro, start intro_credits/credits	2021-03-28 23:13:56 -04:00
ghoulslash	a595b213b4	merge with be	2021-03-28 17:29:22 -06:00
GriffinR	7a5c6d4d86	Standardize Friendship/Happiness	2021-03-27 17:27:20 -05:00
ultima-soul	7abfe7469a	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-03-23 18:41:53 -07:00
Ariel Antonitis	6df5a71b0d	Merge branch 'master' into romhack	2021-03-23 18:42:00 -04:00
ultima-soul	56a1cab314	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-03-23 15:21:19 -07:00
ultima-soul	5bab9474dc	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-03-22 23:08:19 -07:00
GriffinR	6127c6f32e	Misc labels in battle facilities	2021-03-22 15:30:19 -05:00
GriffinR	dfc6ee0e9e	Add SAFE_DIV	2021-03-21 13:43:14 -05:00
GriffinR	557152b06e	Minor link cleanup	2021-03-21 13:40:40 -05:00
Kurausukun	5b910a11b4	port miscellaneous fr documentation	2021-03-18 20:35:39 -04:00
GriffinR	22e2c0a47c	Document Berry Crush	2021-03-18 15:18:23 -04:00
BuffelSaft	7d237d8ff6	Implement Body Press' effect ... Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.	2021-03-16 22:56:44 +13:00
GriffinR	ecd269ba2c	Merge pull request #1372 from GriffinRichards/doc-countdown ... Document minigame countdown	2021-03-15 21:39:58 -04:00
PikalaxALT	925e68c03f	Update newly named fields	2021-03-15 15:22:41 -04:00
Blackforest92	badf8945d8	Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie	2021-03-14 18:31:24 +07:00
amiosi	b081a00891	Merge branch 'battle_engine' into old_findings	2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone	292993e360	Merge pull request #1338 from ghoulslash/ripen ... Add Ripen and Finish Gen4 Berries	2021-03-13 11:16:42 -03:00
PikalaxALT	8d4dcb228a	More documentation in battle_main	2021-03-12 16:55:58 -05:00
PikalaxALT	e32a1571af	Resolve link comm buffers in gBattleStruct	2021-03-12 15:37:31 -05:00
GriffinR	b1a69d95ea	Document minigame countdown	2021-03-11 14:25:22 -05:00
GriffinR	6c297d19e8	Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking ... Document Dodrio Berry Picking	2021-03-10 18:55:41 -05:00
Ariel Antonitis	89774dfc48	Merge branch 'lighting' into romhack	2021-03-10 17:50:25 -05:00
Ariel Antonitis	7bcd2c8fb5	Fixed bird fly sprite shadow position. ... Object event shadows are now displayed by default.	2021-03-10 17:49:18 -05:00
LOuroboros	68980cf18c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile	2021-03-10 03:58:21 -03:00
ghoulslash	d5004638a9	Update include/constants/battle_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-03-09 16:35:47 -07:00
ExpoSeed	3655fe52f3	Prison Bottle and Reveal Glass don't exist yet	2021-03-09 11:54:56 -06:00
ghoulslash	3f9bf5acc0	merge with be	2021-03-09 10:33:48 -07:00
Ariel Antonitis	9f441f4e05	Merge branch 'master' into romhack	2021-03-09 01:25:22 -05:00
ghoulslash	68388f633f	merge with be	2021-03-08 18:58:16 -07:00
Ariel Antonitis	a15b0de70e	Fixed light spawning causing screen tears.	2021-03-07 03:58:02 -05:00
GriffinR	55a40b901f	Label battle tower link script	2021-03-04 19:30:19 -06:00
ExpoSeed	f49da96f1d	Fix consumable item form change	2021-03-03 15:24:58 -06:00
ExpoSeed	07af84db8a	Implement FORM_ITEM_USE. Credits to Lunos for work on Gracidea	2021-03-03 13:54:25 -06:00
GriffinR	b9c733495b	Document dodrio berry picking	2021-03-03 14:26:05 -05:00
ExpoSeed	6f64c1b2b9	Implement GetFormChangeTargetSpecies	2021-03-03 13:07:50 -06:00
Evan	41d47a867e	format fixes	2021-03-03 10:48:57 -07:00
Evan	791fd5e709	finish berry hold effects	2021-03-03 09:25:25 -07:00
Evan	2ccdf1d89e	merge with be. magic guard checks	2021-03-03 09:21:06 -07:00
ghoulslash	0ee9425599	Update include/battle_scripts.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-03 09:14:07 -07:00
ghoulslash	3a30fe900a	Update include/constants/hold_effects.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-03-03 09:13:49 -07:00
Ariel Antonitis	d7697e1502	Fixed bug so that field moves do not clear follower palettes.	2021-03-03 02:10:20 -05:00
Ariel Antonitis	8dd1811ce5	Updated follower messages. ... Added remote build scripts/workflows. Fixed followers getting stuck when entering doors.	2021-03-03 02:07:08 -05:00
Ariel Antonitis	42d5fe07fa	Start of implementation for time of day filter.	2021-03-03 02:05:21 -05:00
Ariel Antonitis	12e3b4efad	Added alpha-blending shadows.	2021-03-03 02:01:39 -05:00
Ariel Antonitis	b5c8b0f494	Added more follower messages.	2021-03-03 02:00:32 -05:00
Ariel Antonitis	92b76a98cb	Fixed follower behavior when seen by trainers.	2021-03-03 01:48:29 -05:00
Ariel Antonitis	65515f58a6	Added additional follower messages.	2021-03-03 01:47:43 -05:00
Ariel Antonitis	edbc773120	Refactored and added support for shiny followers.	2021-03-03 01:47:26 -05:00
Ariel Antonitis	38f538b755	Moved follower species into a proper union.	2021-03-03 01:47:14 -05:00
Ariel Antonitis	db7e98c6a8	Merged SpawnFollowingPokemon into UpdateFollowingPokemon.	2021-03-03 01:35:52 -05:00
Ariel Antonitis	4bd6642033	Use front sprite palettes for event objects.	2021-03-03 01:29:52 -05:00
Ariel Antonitis	8598c59fad	Fixed tree disguise for dynamic palettes.	2021-03-03 01:24:30 -05:00
Ariel Antonitis	66dd1aecf9	Made (most) field effects use dynamic palettes.	2021-03-03 01:21:40 -05:00
Ariel Antonitis	69ae5b18c0	Made pokemon event objects dynamic.	2021-03-03 01:12:05 -05:00
Ariel Antonitis	12a2ec9f26	Added dynamic reflections.	2021-03-03 01:10:48 -05:00
Ariel Antonitis	e52b70e46f	Updated follower scripting (applymovement).	2021-03-03 01:04:37 -05:00
Ariel Antonitis	8a3dfbf252	Added pokemon followers & script commands.	2021-03-03 01:04:22 -05:00
Ariel Antonitis	2e32a27d75	Testing follower pokemon.	2021-03-03 00:51:43 -05:00
ExpoSeed	f7d42cd3c8	Formatting	2021-03-02 14:25:15 -06:00
ExpoSeed	ec1a09bcd5	Revamp table	2021-03-02 14:18:34 -06:00
ExpoSeed	7e8659c4ee	Fix missed merge conflict	2021-03-02 14:17:48 -06:00
ExpoSeed	7802264732	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table	2021-03-01 19:38:13 -06:00
Evan	b130396c0e	merge with be	2021-03-01 17:05:10 -07:00
ultima-soul	e5fa583a08	Merge pull request #1334 from ghoulslash/gen8_abilities ... More Gen 8 Abilities	2021-03-01 10:40:09 -08:00
Evan	6cb8c6309a	merge with be	2021-03-01 11:28:51 -07:00
Evan	55649a67cc	Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain	2021-03-01 11:23:05 -07:00
Evan	55b8538f68	merge with be	2021-03-01 11:22:37 -07:00
ultima-soul	f6147ee054	Merge pull request #1356 from ghoulslash/tailwind_turns ... Update tailwind timer To Gen5	2021-03-01 08:51:40 -08:00
GriffinR	91ab30fa71	Rename mon markings struct	2021-02-28 17:11:46 -06:00
GriffinR	ed0347476c	Remove old declaration and define	2021-02-28 17:11:46 -06:00
GriffinR	031da44cab	Document mon markings	2021-02-28 17:11:46 -06:00
GriffinR	cbc7a72814	Merge pull request #1346 from GriffinRichards/doc-pokejump ... Document pokemon jump	2021-02-28 11:19:02 -05:00
N	cab3728e96	Strangest match	2021-02-28 10:06:07 -06:00
huderlem	10c77f1bc2	Merge pull request #1345 from GriffinRichards/doc-rtcscreen ... Document/clean up some minor screens	2021-02-28 10:03:22 -06:00
Marcus Huderle	c900de35e7	Fix build and cleanup mistakes	2021-02-28 09:54:55 -06:00
Marcus Huderle	a85fada314	Document more battle anim effects	2021-02-28 09:54:55 -06:00
GriffinR	1912b0cf0a	Merge branch 'master' into doc-rtcscreen	2021-02-28 10:28:43 -05:00
GriffinR	3f59362397	Merge branch 'master' into doc-pokejump	2021-02-28 10:27:50 -05:00
GriffinR	ea748ff7f5	Merge pull request #1344 from GriffinRichards/doc-ec ... Document easy chat and mail, script.c cleanup, add/use some general constants	2021-02-28 10:26:49 -05:00
Marcus Huderle	c323e7f061	Document some battle anim funcs and data	2021-02-27 11:04:45 -06:00
GriffinR	117b90a261	Document pokemon jump	2021-02-26 17:26:39 -05:00
GriffinR	f172ff84c9	Clean up save_failed_screen	2021-02-24 14:53:32 -05:00
GriffinR	b71b10623b	Add palette selection constants	2021-02-24 11:03:51 -05:00
GriffinR	c6141fea83	Document easy chat	2021-02-24 11:03:45 -05:00
GriffinR	1cac608dbe	Document mail	2021-02-24 11:03:39 -05:00
GriffinR	a5852d57d1	Use TASK_NONE constant	2021-02-24 11:03:25 -05:00
GriffinR	e52b46ab43	Clean up script.c	2021-02-24 11:03:17 -05:00
GriffinR	06ae5a37e2	Merge pull request #1336 from GriffinRichards/giftribbons ... Document some ribbon usage	2021-02-24 10:07:59 -05:00
GriffinR	fc3d6eb178	Merge pull request #1328 from GriffinRichards/doc-pokeuseitem ... Document PokemonUseItemEffects	2021-02-22 12:15:19 -05:00
SphericalIce	381116b3c4	Add labels for cracked floor metatiles	2021-02-22 15:29:14 +00:00
GriffinR	64fc585cc3	Document pokenav ribbons summary screen	2021-02-18 11:33:55 -05:00
GriffinR	d62f89b20c	Minor window/bg cleanup	2021-02-18 10:00:07 -05:00
GriffinR	02c1fbd733	Document ribbon TV show, add new ribbon IDs/size	2021-02-18 09:59:24 -05:00
GriffinR	e059c4fdfa	Use new gift ribbons size, label unused ribbons	2021-02-17 14:11:45 -05:00
Deokishisu	1dda9939ab	Fix Swapped Comments on PokeCoupon Tiers	2021-02-16 16:08:58 -05:00
Deokishisu	7f55bf875c	Move BoxRS Data Down to ExternalEventFlags ... As suggested, moved the BoxRS data fields into ExternalEventFlags and packed that struct.	2021-02-16 16:01:18 -05:00
Deokishisu	fb60e036ce	Document Box: Ruby & Sapphire Fields ... Labeled another field in the ExternalEventData struct used by Pokémon Box: Ruby & Sapphire. Special thanks to Citrus Bolt#4642.	2021-02-16 15:37:58 -05:00
Deokishisu	cd89d17b12	Document More External Events ... Did research to determine how the Japanese Colosseum Bonus Disc modifies the ExternalEventData fields. The Ageto Celebi flag, as well as the flag for the three PokeCoupon title rewards, have been documented and included into the struct. The PokeCoupon fields are actually 3-byte fields, so they have been turned into bitfields, since u24 isn't possible. Also discovered that Channel and US Colosseum Bonus Disc Jirachi use the same flag, so renamed that flag and commented to explain. Also made general comments explaining how the ExternalEventData and ExternalEventFlags are applicable to Emerald specifically.	2021-02-16 09:41:07 -05:00
GriffinR	ee4af94a36	Merge pull request #1324 from GriffinRichards/doc-sb ... Document remainder of secret_base.c	2021-02-15 17:41:55 -05:00
Deokishisu	7b2bf8c7e2	Rename obedient/fatefulEncounter to eventLegal ... Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind. Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.	2021-02-15 14:54:35 -05:00
Deokishisu	b89c3e901e	Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h ... The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi. The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.	2021-02-15 11:40:16 -05:00
GriffinR	5f58ea02c6	Merge pull request #1330 from sphericalice/hidden-to-buried ... Rename 'hidden' Trainers/obj events to 'buried'	2021-02-14 21:48:21 -05:00
SphericalIce	56e047f949	Fix Lilcove Motel typos	2021-02-14 21:38:39 +00:00
SphericalIce	70ff6c3b84	Rename 'hidden' Trainers/obj events to 'buried'	2021-02-14 19:25:23 +00:00
GriffinR	be0699bd64	Merge pull request #1326 from GriffinRichards/doc-layouts ... Label unused layouts	2021-02-14 14:22:28 -05:00
GriffinR	a85ac11b28	Merge pull request #1325 from GriffinRichards/constants-berrytree ... Add berry tree id constants	2021-02-14 14:15:51 -05:00
Evan	d65d5cb8fd	add AI_FLAG_SMART_SWITCHING, some burn checks	2021-02-14 09:37:04 -07:00
GriffinR	8634710996	Document PokemonUseItemEffects	2021-02-12 16:02:04 -05:00
Evan	0664daf384	fix some post-merge errors	2021-02-12 11:02:10 -07:00
Evan	f3d975e239	merge with be	2021-02-12 08:59:55 -07:00
Evan	4782f713f2	update semi invulnerable state check	2021-02-12 08:57:57 -07:00
LOuroboros	21ee6cb9fb	Added constant labels for EV manipulating item effects	2021-02-12 07:26:11 -03:00
TheXaman	c89df9d9d1	Changed graphics file structure, added DECAPPED version by NobodySociety, added constant to make custom dark palette switch easy	2021-02-12 11:16:23 +01:00
amiosi	1df295a582	battle config and zippy zap ... plus fix mirror move mistakes	2021-02-11 17:11:07 -05:00
amiosi	c0ba7436af	water shuriken and howl	2021-02-11 16:20:13 -05:00
TheXaman	1b3b717248	Added Forms screen for PokemonExpansion (rhh)	2021-02-11 17:55:53 +01:00
GriffinR	20b76c6071	Fix swapped route 102 berries	2021-02-10 16:26:09 -05:00
GriffinR	987fdf6fcd	Merge pull request #1321 from GriffinRichards/doc-evoscene ... Document evolution scene	2021-02-08 18:21:30 -05:00
GriffinR	2237d0748f	Label unused layouts	2021-02-08 14:45:56 -05:00
GriffinR	0851c34bac	Add berry tree id constants	2021-02-05 15:25:12 -05:00
GriffinR	a240481d5f	Document secret_base.c	2021-02-05 12:08:25 -05:00
Deokishisu	ac43365d58	Fix "Compatibility" Misspelling ... Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.	2021-02-05 01:27:11 -05:00
TheXaman	965bcfa29d	Added newest Makefile and fixed making from clean	2021-02-04 18:04:00 +01:00
TheXaman	fbbc604848	Added evolution screen! Improved BE compatibility	2021-02-04 13:48:32 +01:00
ultima-soul	46e853c13b	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-02-03 16:23:23 -08:00
ultima-soul	daf5e0167e	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-02-03 16:06:48 -08:00
GriffinR	15906ca143	Document evolution scene	2021-02-03 17:55:37 -05:00
amiosi	762dcb8a7c	cry fixes, type null	2021-02-03 14:10:39 -05:00
amiosi	663cc5b15c	oricorio...	2021-02-03 13:02:13 -05:00
Evan	6139b12a49	fix hp boxes not dissapearing	2021-02-02 23:30:08 -07:00
amiosi	f46f21bb38	tapus again	2021-02-02 14:40:04 -05:00
amiosi	9c2c337e6f	tapu case	2021-02-02 14:24:15 -05:00
amiosi	f700004188	proper CamelCase	2021-02-02 14:21:00 -05:00
Evan	0483114a05	merge and some fixes	2021-02-02 11:45:15 -07:00
amiosi	2d6b80455d	Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr	2021-02-02 13:25:53 -05:00
amiosi	47e1d6b790	MIMEJR -> MIME_JR	2021-02-02 12:36:05 -05:00
Evan	f4d4cf262e	fix screen cleaner, curious medicine, as one	2021-02-02 09:00:07 -07:00
GriffinR	64460e01ae	Merge pull request #1314 from GriffinRichards/doc-controllers ... Document battle controllers, misc other battle	2021-02-02 00:24:16 -05:00
GriffinR	7e26aa3d21	Merge pull request #1316 from GriffinRichards/doc-scrcmd ... Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree	2021-02-01 21:04:00 -05:00
ultima-soul	5fdb578747	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-02-01 15:58:18 -08:00
ultima-soul	2a20d50904	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-02-01 15:54:08 -08:00
Evan	f428e5e2dc	some quick claw/custap berry fixes	2021-01-31 23:31:27 -07:00
ultima-soul	96232ea166	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-01-28 23:59:08 -08:00
GriffinR	12af03cd62	Label bard music pitch table	2021-01-28 16:36:56 -05:00
GriffinR	89b85a49ec	Index gBardSounds_Moves and gBardSounds_Pokemon with constants	2021-01-28 15:55:33 -05:00
Evan	9fcf7d2453	zero terrain timers for steel roll, remove unused move effectd	2021-01-28 13:51:39 -07:00
Evan	c009b51ae8	add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot	2021-01-28 13:27:00 -07:00
Evan	a37acb8345	coaching, lash out, burning jealousy	2021-01-28 12:21:11 -07:00
Evan	dd51edd881	add eerie spell, surging strikes, jungle healing	2021-01-28 10:51:00 -07:00
ExpoSeed	34c6771e94	Create form change table	2021-01-27 16:30:43 -06:00
Evan	c003f1c023	check move effectiveness with status effects	2021-01-26 15:41:59 -07:00
GriffinR	92bd6400b7	Fix up berry sparkle	2021-01-26 05:40:34 -05:00
GriffinR	9e59581220	Document object lock and some trainer approach	2021-01-26 04:42:18 -05:00
GriffinR	0064333e4a	Clean up scrcmd.c	2021-01-26 02:16:26 -05:00
GriffinR	3fd5e143a9	Misc battle anim documentation	2021-01-23 00:40:46 -05:00
GriffinR	a392cca928	Misc battle documentation	2021-01-23 00:40:31 -05:00
GriffinR	c106f7f130	Document battle_controller_opponent.c	2021-01-22 21:35:16 -05:00
GriffinR	63a7828772	Document battle_controller_player.c	2021-01-22 20:03:27 -05:00
GriffinR	4eca05ccf5	Document remainder of battle_controllers.c	2021-01-22 02:48:22 -05:00
ghoulslash	32cc04c91c	Merge pull request #1311 from ultima-soul/deoxys_handling_removal ... Remove Special Handling for Deoxys	2021-01-21 12:22:03 -07:00
Evan	5aff5333dc	fix B_MEMENTO_FAIL comment	2021-01-21 12:05:01 -07:00
Evan	bfb7333507	memento gen4 failing	2021-01-21 12:03:30 -07:00
GriffinR	8fe4d004e3	Merge pull request #1305 from GriffinRichards/doc-battletv ... Document battle tv data	2021-01-21 12:27:14 -05:00
Evan	4611c71bd1	merge with be	2021-01-21 08:55:14 -07:00
Evan	39139323f6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into zmove	2021-01-20 17:36:37 -07:00
Evan	8ec12c665c	merge with be	2021-01-20 17:36:13 -07:00
Evan	e61309dce6	merge with be	2021-01-20 17:34:24 -07:00
GriffinR	3ceb43177d	Merge pull request #1312 from sphericalice/pokeemerald ... Fix misnamed ground effect flags & document reflections	2021-01-20 18:50:31 -05:00
Evan	16d54b6d32	merge with be, add form checks to CanBattlerGetOrLoseItem	2021-01-20 14:28:03 -07:00
ghoulslash	9b1a482837	Merge pull request #1317 from ultima-soul/form_species_tables_ie ... Add Form Species ID Tables	2021-01-20 13:54:58 -07:00
ghoulslash	71f18bfbf4	Merge pull request #1316 from ultima-soul/form_species_tables_be ... Add Form Species ID Tables	2021-01-20 13:54:39 -07:00
ghoulslash	b4b1d2b9e2	Merge pull request #1315 from ultima-soul/form_species_tables_pe ... Add Form Species ID Tables	2021-01-20 13:54:20 -07:00
ultima-soul	9663ed0d3c	Merge branch 'form_species_tables' into form_species_tables_pe	2021-01-20 12:06:59 -08:00
ultima-soul	d3b0e98325	Merge branch 'form_species_tables' into form_species_tables_be	2021-01-20 11:40:48 -08:00
ultima-soul	f571c8af2a	Merge branch 'form_species_tables' into form_species_tables_ie	2021-01-20 11:34:59 -08:00
ultima-soul	267900bdcb	Add Form Species ID tables and functions to access them.	2021-01-20 11:31:20 -08:00
SphericalIce	4334f7a379	Include NUM_REFLECTION_TYPES in the ReflectionTypes enum	2021-01-20 10:17:07 +00:00
ExpoSeed	61db82e64a	Revert "Included global.h into battle_config.h"	2021-01-19 22:55:08 -06:00
GriffinR	6999b237eb	Merge pull request #1309 from GriffinRichards/misc-macro ... Use constants for item data, misc other constants/fixes	2021-01-19 20:49:58 -05:00
SphericalIce	2746fd1f95	Name object event ID arguments properly	2021-01-19 23:35:57 +00:00
SphericalIce	6dd973012b	Correct ground effect flag names for reflections & document sprite data usage	2021-01-19 23:21:50 +00:00
ghoulslash	9d9da6a485	Update include/constants/battle_config.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-01-19 15:01:51 -07:00
Evan	b576eb5247	fix var_terrain default, wording	2021-01-19 13:26:36 -07:00
Evan	6b59a9ac01	add ai info debug option	2021-01-19 12:58:58 -07:00
GriffinR	752982552e	Add FIRST_BALL, some FIRST_BERRY_INDEX usage	2021-01-19 13:39:18 -05:00
SphericalIce	2dfaba9472	Name color return values more accurately	2021-01-19 17:59:36 +00:00
GriffinR	305ebdbc4a	Parentheses for GET_UNOWN_LETTER	2021-01-19 12:36:36 -05:00
SphericalIce	8de76ed533	Make broader use of RGB macros	2021-01-19 17:15:12 +00:00
GriffinR	cf9f8d01c5	Add misc item data constants	2021-01-19 05:49:20 -05:00
GriffinR	bc20fda604	Use GET_UNOWN_LETTER macro	2021-01-19 04:03:16 -05:00
LOuroboros	77d714ead5	Included global.h into battle_config.h ... Fixes the dupplicated defines issue.	2021-01-16 20:37:34 -03:00
Evan	a49b5d1ad0	prankster updated to gen 7	2021-01-16 16:14:36 -07:00
Evan	c2dfc571b2	misty terrain blocks confusion	2021-01-16 12:21:04 -07:00
Evan	10b1d33d13	handle battler being affected by terrain	2021-01-16 12:05:51 -07:00
Evan	9e29d303ec	electric and misty terrain preventions	2021-01-16 11:40:02 -07:00
Evan	544d598506	update tailwind timer	2021-01-15 18:34:47 -07:00
Evan	449c2bcc34	add config option	2021-01-15 18:28:10 -07:00
Evan	0d8f804194	update mental herb to gen 5	2021-01-15 18:11:55 -07:00
Evan	f1d89b2d79	merge with be	2021-01-15 11:17:45 -07:00
ExpoSeed	b166e9a5e3	Merge pull request #1276 from LOuroboros/x_items_BE ... Reworked the effects of the X Items #1	2021-01-15 12:05:07 -06:00
GriffinR	2da0c3436e	Make filler in PokemonSubstruct0 explicit	2021-01-15 00:14:46 -05:00
LOuroboros	c2f718d3d3	Implemented Cramorant's Gulp Missile form change	2021-01-14 17:23:09 -03:00
GriffinR	564278fd49	Document battle tv data	2021-01-14 06:29:59 -05:00
Evan	d571c8b028	B_TERRAIN_BG_CHANGE TRUE by default	2021-01-13 16:02:32 -07:00
Evan	d26605c9fe	fix bad bg fade if no permanent terrain	2021-01-13 16:01:47 -07:00
Evan	9902f6e603	merge with be	2021-01-13 14:32:14 -07:00
Evan	8ef6a2c80d	merge with be	2021-01-13 14:23:30 -07:00
Evan	c568c3d5f7	Merge branch 'master' of https://github.com/pret/pokeemerald into stair_warps	2021-01-13 13:58:09 -07:00
GriffinR	b9e1b050e1	Label remaining battle types	2021-01-13 15:20:29 -05:00
Evan	09dc1b7e89	fix double battle ai logic	2021-01-13 11:08:43 -07:00
Evan	56395a060f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-13 09:23:07 -07:00
ultima-soul	9c5ec33aa7	Sync Crown Tundra and renamed moves Battle Engine defines.	2021-01-12 14:22:33 -08:00
ghoulslash	fba17a96a4	Merge pull request #1253 from surskitty/battle_engine ... Increase readability of too-long names	2021-01-12 09:20:53 -07:00
Evan	4912bc1d25	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion	2021-01-11 17:15:41 -07:00
ultima-soul	3cb09b6507	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal	2021-01-11 15:19:11 -08:00
GriffinR	92de664f79	List battle animation indexes alongside tables	2021-01-11 16:07:16 -05:00
Philipp AUER	b5fa0129d5	[pokemon-expansion] Changes as requested by code review ... Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update include/constants/pokemon_config.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update src/data/pokemon/evolution.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update src/data/pokemon/evolution.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> Update src/data/pokemon/evolution.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-01-11 21:43:00 +01:00
surskitty	29343ce1ec	Remove synonyms ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-01-11 15:00:11 -05:00
opakedragon	cbaf9b38b2	rename string id to reflect usage	2021-01-11 08:48:00 -05:00
surskitty	f58539b602	Renaming the last two and fixing the merge conflict with PE.	2021-01-10 15:48:57 -05:00
surskitty	a0f1dcb9cf	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2021-01-10 15:40:21 -05:00
sbird	95665c24b4	[pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable	2021-01-10 18:30:15 +01:00
Evan	1e22ae4cf2	merge with be	2021-01-10 09:08:25 -07:00
Evan	d4e4405cf5	merge with be	2021-01-10 09:04:21 -07:00
Evan	c95bfae701	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_hold_effects	2021-01-10 09:02:21 -07:00
Evan	e748db8ef4	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-10 08:58:16 -07:00
LOuroboros	3ffa7f993a	Renamed some X Defend labels to reflect its new name in the IE	2021-01-10 01:58:02 -03:00
ultima-soul	b5b4efdaa0	Merge pull request #1314 from LOuroboros/battle_debug_constant ... battle_config.h tweaks	2021-01-09 12:36:37 -08:00
Evan	b5128be68b	eject packer invisible before openpartymenu	2021-01-08 08:02:00 -07:00
Evan	6dabff1ee3	merge with be	2021-01-07 21:24:21 -07:00
Evan	2bd5167a6c	eject pack	2021-01-07 21:11:56 -07:00
Evan	0118723a9c	add eject button	2021-01-07 20:31:27 -07:00
Evan	5eb49722c0	add red card effect	2021-01-07 19:33:39 -07:00
SphericalIce	3c2a33b9b2	Use constants for max IVs & the random IV generation flag	2021-01-07 22:13:14 +00:00
ultima-soul	d2d961e447	Merge pull request #1262 from LOuroboros/gen8_abilities_BE ... Implemented various Gen. 8 abilities	2021-01-07 13:31:17 -08:00
LOuroboros	8511ed57e4	Tweaked Steam Engine's battle string	2021-01-07 18:13:16 -03:00
ghoulslash	c392a2011e	Merge pull request #1325 from ExpoSeed/BE/sync ... Sync battle engine	2021-01-07 12:13:26 -07:00
LOuroboros	3d124944b3	Review correction to B_X_ITEMS_BUFF's comment	2021-01-07 16:09:23 -03:00
LOuroboros	cb22cbd3f6	Tweaked preprocessor constant in include/constants/item_effects.h	2021-01-07 16:06:55 -03:00
Evan	bf644f23a7	add heavy duty boots	2021-01-06 20:53:48 -07:00
Evan	7fffe23e63	add terrain seeds	2021-01-06 20:22:05 -07:00
Evan	0cdab790dc	add blunder policy	2021-01-06 15:40:20 -07:00
Evan	db6f9d05ec	add throat spray	2021-01-06 15:28:58 -07:00
Evan	d5d2cac60c	init branch	2021-01-06 14:42:45 -07:00
Evan	aac3f9c3db	kee, maranga, sitrus beries	2021-01-06 13:07:18 -07:00
Evan	c3615485f3	merge in berry branch	2021-01-06 12:54:02 -07:00
Evan	7646855e79	jaboca, rowap berry effects	2021-01-06 11:15:56 -07:00
Evan	efa4fe89ad	micle berry	2021-01-06 10:47:07 -07:00
Evan	f2e486eb0d	custap berry effect, custap/quick claw activation message	2021-01-06 09:37:31 -07:00
Evan	b3a6df8d57	stat raising berries	2021-01-05 22:13:32 -07:00
Evan	4c1e8f2f2e	add curious medicine	2021-01-05 20:02:11 -07:00
Evan	0a3908ee92	add neigh and as one abilities	2021-01-05 19:37:23 -07:00
Evan	f21b0140b9	revert to CheckViability and stat change effect viabilities	2021-01-04 19:39:59 -07:00
Evan	1ae57f26a3	fix up some negative checks, organize some effects in AI_CheckBadMove	2021-01-04 15:30:02 -07:00
Evan	5ae1e3c25b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2021-01-04 11:43:36 -07:00
GriffinR	e0c0143f41	Fix substitute back sprite	2021-01-04 10:14:01 -05:00
LOuroboros	adf039fe12	Made BufferStatRoseMessage print an extra string if B_X_ITEMS_BUFF == GEN_7 ... Also turned sText_StatSharply into gText_StatSharply.	2021-01-04 07:41:56 -03:00
LOuroboros	dbc3690282	Tweaked preprocessor directives ... Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION	2021-01-04 03:58:31 -03:00
LOuroboros	517c8ffdd0	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE	2021-01-03 22:05:14 -03:00
ExpoSeed	7dadcb94b8	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2021-01-03 17:14:43 -06:00
BuffelSaft	10cf5b3673	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only	2021-01-04 10:55:30 +13:00
GriffinR	d992e4277e	Merge pull request #1283 from GriffinRichards/doc-factscreen ... Document battle factory screen	2021-01-03 02:51:59 -05:00
GriffinR	f2ce06683d	Merge pull request #1285 from GriffinRichards/doc-fieldscr ... Minor field_screen_effect / field_player_avatar documentation	2021-01-03 01:59:36 -05:00
ExpoSeed	10f4b48215	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2021-01-01 14:14:51 -08:00
GriffinR	88e951bfe3	Label some ReturnToField funcs	2021-01-01 17:11:06 -05:00
GriffinR	c711a2f73b	Document warp spin functions	2021-01-01 17:11:02 -05:00
Evan	f172245ad6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem	2021-01-01 08:49:43 -07:00
Evan	7f4e936e87	fix z move ordering	2021-01-01 08:49:29 -07:00
Evan	0c648c0071	merge with be	2021-01-01 08:34:09 -07:00
ExpoSeed	208e0abe04	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2020-12-31 18:44:43 -06:00
ExpoSeed	24362e8bed	Merge pull request #1250 from ghoulslash/infestation ... infestation between turn anim	2020-12-31 18:06:13 -06:00
surskitty	aa9796a6ae	Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip.	2020-12-31 18:57:36 -05:00
GriffinR	ec85c01e7c	Merge branch 'master' into doc-factscreen	2020-12-31 00:40:45 -05:00
GriffinR	0bf49198f6	Resume factory screen doc	2020-12-30 13:28:15 -05:00
GriffinR	2f426e0e7d	Index battle controller cmd tables	2020-12-29 17:21:58 -05:00
GriffinR	769ddf22c2	Label remaining subs in battle_tower.c	2020-12-24 16:18:47 -05:00
Evan	59813c9ce7	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config	2020-12-23 10:27:54 -07:00
ghoulslash	450ac70ab2	Merge pull request #1288 from LOuroboros/comments ... Some more small battle_config.h tweaks	2020-12-23 10:27:09 -07:00
LOuroboros	320cc37ac9	USE_BATTLE_DEBUG -> B_ENABLE_DEBUG	2020-12-23 14:04:14 -03:00
LOuroboros	b3c5613ff7	battle_config.h tweaks ... -Moved the USE_BATTLE_DEBUG constant from include/battle_debug.h -Slight correction to a few comments in battle_config.h	2020-12-23 13:16:01 -03:00
Evan	a426092006	fix sticky barb theft in trainer battles	2020-12-22 08:35:11 -07:00
ultima-soul	6a0939cd4e	Remove special handling for Deoxys.	2020-12-21 22:39:19 -08:00
ghoulslash	0af8cab87e	Merge pull request #1283 from LOuroboros/ct_moves_data ... Added the data of SwSh's Crown Tundra's moves	2020-12-21 23:13:23 -07:00
Evan	5bdf266000	add additional item theft check	2020-12-20 19:06:50 -07:00
Evan	a0b9ece980	merge with BE	2020-12-20 16:39:50 -07:00
Evan	21e7d6d318	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai	2020-12-20 16:33:43 -07:00
Evan	7988a1f41d	Ai_TryOnAlly and reorganize files	2020-12-20 14:47:20 -07:00
Evan	31ec3e8479	non-partner good move checks	2020-12-19 21:58:23 -07:00
LOuroboros	a417a1b2b9	Corrected Punk Rock's checks	2020-12-19 16:18:39 -03:00
Evan	8a544665e4	move common ai params to preloaded struct	2020-12-16 22:56:10 -07:00
ultima-soul	ad67068f7e	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data	2020-12-16 13:28:42 -08:00
ultima-soul	c675c92a1d	Add Gen 8 Pokemon data.	2020-12-16 12:57:36 -08:00
Evan	916d0416e3	outline AI_CheckGoodMove	2020-12-15 21:57:33 -07:00
GriffinR	15c2856b24	Merge pull request #1265 from Kurausukun/berry_crush ... fakematch fixes, begin documenting Berry Crush (based on #1187)	2020-12-14 23:22:41 -05:00
GriffinR	c611421882	Merge pull request #1267 from ipatix/m4a_names ... refactor m4a.c/m4a_1.s constant/variable/type naming	2020-12-14 20:03:53 -05:00
GriffinR	18a5feb413	Merge pull request #1269 from GriffinRichards/bugfix ... Use BUGFIX for some inline fixes	2020-12-14 20:00:59 -05:00
Evan	e70e2bcd65	merge with be	2020-12-14 09:09:51 -07:00
Evan	b85dacce9d	fix conflicts	2020-12-14 08:50:41 -07:00
Evan	67fefd0261	var terrain, surge fixes	2020-12-13 19:42:48 -07:00
Evan	97172fc5b5	merge with be	2020-12-13 17:21:22 -07:00
Evan	ead8637e4f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation	2020-12-13 17:09:04 -07:00
Evan	ac332d5e98	check bad move	2020-12-13 15:02:21 -07:00
GriffinR	f7a729df30	BUGFIX implies UBFIX	2020-12-13 16:16:48 -05:00
Tim Gates	581306db7b	docs: fix simple typo, redunant -> redundant ... There is a small typo in include/constants/battle_frontier.h. Should read `redundant` rather than `redunant`.	2020-12-13 22:14:50 +11:00
GriffinR	81d95b9325	Use BUGFIX for some inline fixes	2020-12-12 23:30:51 -05:00
Eduardo Quezada D'Ottone	47d96aed3c	Merge pull request #1285 from LOuroboros/spite ... Updated Spite	2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone	db9933ce67	Merge pull request #1244 from ghoulslash/popup ... toggleable manual ability popup destruction	2020-12-12 20:36:55 -03:00
LOuroboros	55bc2b4bb9	Corrected small inconsistency in move flag names	2020-12-12 12:18:56 -03:00
LOuroboros	31d483ef44	Some more battle_config.h tweaks	2020-12-12 11:35:05 -03:00
Michael Panzlaff	91ccf9e343	fix typo	2020-12-12 13:07:56 +01:00
LOuroboros	c5e04cf243	Removed the unnecessary Dragon Energy effect ... The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up. I took the chance and fixed its target too.	2020-12-12 01:35:54 -03:00
LOuroboros	33d7f22494	Improved the comment of B_STANCE_CHANGE_FAIL	2020-12-11 21:54:17 -03:00
LOuroboros	17a9555715	Oopsie.	2020-12-11 21:43:18 -03:00
LOuroboros	9ec2e44f4c	Updated Spite	2020-12-11 21:36:59 -03:00
LOuroboros	0ac026e6ca	Added the data of SwSh's Crown Tundra's moves ... And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.	2020-12-11 20:49:23 -03:00
LOuroboros	c930a63c84	Implemented Punk Rock	2020-12-11 19:46:33 -03:00
LOuroboros	2b0702ec04	Implemented Perish Body ... Inspired by Raguzero's implementation.	2020-12-11 19:44:32 -03:00
LOuroboros	7d8b8083e8	Implemented Sand Spit	2020-12-11 16:47:23 -03:00
Michael Panzlaff	f177c736fc	more CgbSound decipher work	2020-12-11 16:33:58 +01:00
Michael Panzlaff	15ff55eee5	use better m4a variable/constant names	2020-12-11 16:33:55 +01:00
Evan	28698a982d	try to faint script -> c	2020-12-11 08:05:00 -07:00
Evan	aad3a800c3	c functions for ai roamers/safari/first battle	2020-12-10 22:10:21 -07:00
Kurausukun	58976ebaa8	Merge remote-tracking branch 'upstream/master' into berry_crush	2020-12-10 23:30:52 -05:00
LOuroboros	322918e280	Implemented Steam Engine ... And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.	2020-12-10 18:27:35 -03:00
LOuroboros	8b5a5a1896	Reverted include/constants/abilities.h to vanilla ... With the new abilities introduced by the battle_engine in src/data/pokemon/base_stats.h behind locked behind that branch's defined label, we don't need to define them in this branch anymore.	2020-12-10 16:38:29 -03:00
Evan	34dd11448b	sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem	2020-12-09 10:28:18 -07:00
Evan	a93a8b2194	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-12-08 20:50:43 -07:00
LOuroboros	791d561f14	Reworked the effects of the X Items ... Thanks to Karathan's indications.	2020-12-08 18:24:42 -03:00
Evan	a0ae0ece53	add ultranecrozium-z and update z crystal data	2020-12-08 09:55:50 -07:00
GriffinR	f95192ed87	Define terminal species IDs relatively	2020-12-08 00:45:05 -05:00
BuffelSaft	72b769ec75	Add config options for Jump Kick ... Added options for: - Gen 4 style recoil when target is immune (user takes 50% of target's max HP) - Gen 3 style recoil when target is immune (i.e no recoil) - Gen 5+ recoil was already implemented but was bugged	2020-12-07 19:30:31 +13:00
Evan	426ea191ad	style fix	2020-12-05 21:04:12 -07:00
Evan	d5ad14c349	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup	2020-12-05 21:03:20 -07:00
Evan	21cab1b7a7	better negative totem boost system, totems occur before switch in abilities	2020-12-05 21:00:51 -07:00
LOuroboros	ce8f794100	Updated abilities.h ... Straight up copied from the BE to avoid silly merge conflicts.	2020-12-05 14:57:13 -03:00
LOuroboros	6a0fee9c56	Fixed Intrepid Sword and Dauntless Shield ... And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn	2020-12-05 14:03:13 -03:00
LOuroboros	002973d373	Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn ... This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.	2020-12-05 13:50:47 -03:00
LOuroboros	e2f4ca27b0	BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn	2020-12-05 02:43:29 -03:00
ghoulslash	66ed10a826	Merge pull request #1251 from ExpoSeed/PE-mon-flags ... Add mon flags	2020-12-03 15:07:17 -05:00
Evan	39cbc21925	fix trainer theft, update config option	2020-12-03 08:42:12 -05:00
LOuroboros	9e1d7cc827	Implemented Ball Fetch	2020-12-02 23:09:35 -03:00
LOuroboros	0c4c6fc778	Implemented Cotton Down	2020-12-02 22:53:00 -03:00
LOuroboros	e11fa09632	Implemented Intrepid Sword and Dauntless Shield and... ... -Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd -Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin Their labels reflect the instances of a battle in which they can be called.	2020-12-02 19:07:08 -03:00
Evan	dcefaf2563	anim particle changes false by default	2020-12-01 18:01:02 -05:00
Evan	4ad5e368a9	fix merge conflicts	2020-12-01 17:57:57 -05:00
Evan	1e68c46890	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation	2020-12-01 17:51:38 -05:00
Evan	5478179464	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims	2020-12-01 17:46:26 -05:00
Evan	25abdeacc5	tidy up z move code	2020-12-01 16:36:44 -05:00
Evan	2bfc7ea9b1	merge upstream	2020-12-01 15:42:04 -05:00
Evan	f54cd0b25d	fix z effect scripts	2020-12-01 15:35:39 -05:00
Evan	9755923cc3	light that burns the sky split, fix electric z move anims	2020-12-01 14:44:45 -05:00
Evan	ce19e33cc4	handle double and multi battles	2020-12-01 13:43:15 -05:00
Evan	fd8951d040	trainer z move ai	2020-12-01 08:24:33 -05:00
Evan	a0bde70493	z move effects	2020-11-30 10:55:46 -05:00
Evan	539a88207e	add z crystal and z ring	2020-11-29 10:00:03 -05:00
Evan	752aca7698	finish z move anims	2020-11-29 09:22:31 -05:00
ExpoSeed	aa7facf57b	Merge pull request #1243 from ghoulslash/abilities ... Finish Switch In Ability Activation Messages	2020-11-28 20:27:32 -06:00
Evan	f114534ae3	z move anim/effect, black hole eclipse anim	2020-11-28 13:09:43 -05:00
Eduardo Quezada D'Ottone	7aa999af59	Merge pull request #1235 from ultima-soul/ability_expansion ... Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony	2020-11-28 14:56:01 -03:00
Evan	2b1dfe73cf	z move unleash anim, fix active/used flags	2020-11-27 23:38:29 -05:00
Evan	4060b09bd6	expand top left move window. add z move init anim	2020-11-27 17:06:36 -05:00
Evan	348d70b309	z move indicator and some data	2020-11-26 15:56:18 -05:00
ExpoSeed	f2259d7ce1	Remove IS_ULTRA_BEAST	2020-11-24 22:44:00 -06:00
ExpoSeed	3adf316574	Add mon flags	2020-11-24 22:42:42 -06:00
LOuroboros	c4c802162e	A few more evo related changes. ... -EVO_MAP -> EVO_MAPSEC -Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!) -Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.	2020-11-25 01:15:19 -03:00
LOuroboros	89f6036e77	Bumped EVOS_PER_MON from 8 to 10	2020-11-24 23:47:07 -03:00
Evan	7c6e74ab69	update terrain bg config option comment	2020-11-24 21:17:31 -05:00
Evan	6c0878b5fe	infestation between turn anim	2020-11-24 17:21:59 -05:00
GriffinR	9d056e8656	Move object event pal declarations to graphics	2020-11-23 14:45:16 -05:00
GriffinR	513c7c5f45	Clarify Kecleon objects	2020-11-23 14:42:47 -05:00
GriffinR	bf65c1fb25	Name object event pals/tags	2020-11-23 14:24:48 -05:00
Evan	ef43596a79	toggleable manual ability popup destruction	2020-11-19 15:16:27 -07:00
Evan	07a4400d50	finish switch in ability messages	2020-11-19 11:42:00 -07:00
Evan	99d9a36860	add totem boosts	2020-11-19 10:35:37 -07:00
ultima-soul	fdfe330330	Merge pull request #519 from Pyredrid/doublescriptedwilds ... Added commands for scripted double wild battles	2020-11-18 08:57:19 -08:00
Evan	5c658c6950	config option for terrain bg change	2020-11-17 20:26:09 -07:00
Evan	c026f705b3	permanent terrain move bgs	2020-11-17 19:45:27 -07:00
ultima-soul	e15a86caae	Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8.	2020-11-17 10:32:24 -08:00
kageru	6f91f7e0e3	Use more constants in Battle Tower code	2020-11-17 17:40:26 +01:00
ultima-soul	63bd0ec836	Remove Cacophony and fix some Gen 8 ability descriptions to fit.	2020-11-16 15:42:09 -08:00
ultima-soul	e32659d4bb	Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.	2020-11-16 13:50:26 -08:00
TheXaman	6422164d31	Added moves, trainer edits and fixed abilities, now only possible ones including hidden when using PE ... Give all TMs, watch credits, change trainer name/gender/id implemented moves	2020-11-16 19:45:53 +01:00
Eduardo Quezada D'Ottone	4da357aef4	Fixed compatibility with Pokémon Expansion	2020-11-15 13:35:02 -03:00
LOuroboros	890144f153	Defined Isle of Armor moves ... Straight up copied from the battle_engine branch.	2020-11-15 13:05:49 -03:00
ghoulslash	686ff59b11	Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves ... LGPE & Isle of Armor move data.	2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone	f0154028ff	Review changes 2	2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone	29c33b908b	Apply suggestions from code review ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2020-11-13 21:34:37 -03:00
Evan	66152538ec	add back accidentally deleted item theft battle type checks	2020-11-13 13:42:49 -07:00
Eduardo Quezada D'Ottone	54630ff5a9	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms ... # Conflicts: # src/data/pokemon/evolution.h	2020-11-13 16:40:31 -03:00
Eduardo Quezada D'Ottone	b2f078410f	Review changes 2	2020-11-13 16:13:13 -03:00
Eduardo Quezada D'Ottone	26db02e95a	Review changes 1	2020-11-13 15:36:36 -03:00
Evan	a05d8f7d43	fix conflicts	2020-11-13 11:21:15 -07:00
Evan	435f928aa4	opponent trainer theft config option. Clean up code a bit	2020-11-13 11:00:44 -07:00
Eduardo Quezada D'Ottone	e87f0f1ddb	Review changes	2020-11-13 14:51:50 -03:00
ultima-soul	236d7145ae	Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances ... Added config option for Steel type resistances.	2020-11-12 23:25:21 -08:00
Evan	64bcac4589	move pickpocket to back of moveend sequence	2020-11-12 23:30:00 -07:00
ultima-soul	c3423b4212	Merge pull request #1206 from ExpoSeed/type-changing-moves ... Refactor move effects for type changing moves	2020-11-12 19:10:48 -08:00
Evan	520f00f4ae	add pickpocket	2020-11-11 18:08:46 -07:00
Eduardo Quezada D'Ottone	4b9d0d8e24	Added config option for Steel type resistances.	2020-11-11 17:48:02 -03:00
LOuroboros	6f122ac8f8	Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility	2020-11-11 15:18:39 -03:00
ExpoSeed	0912577ea1	Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo ... Implemented Wish Mega Evolution	2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone	caf6253ba3	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms ... # Conflicts: # src/pokemon_icon.c	2020-11-10 19:37:02 -03:00
Eduardo Quezada D'Ottone	d97932c009	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms ... # Conflicts: # src/pokemon.c	2020-11-10 19:29:50 -03:00
Eduardo Quezada D'Ottone	e021a4aa87	Critical Capture Config Option And Catching Charm #556 from ghoulslash ... Critical Capture Config Option And Catching Charm	2020-11-10 17:31:08 -03:00
Eduardo Quezada D'Ottone	e6f8d57f08	Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo ... # Conflicts: # include/constants/battle_string_ids.h	2020-11-10 17:28:17 -03:00
ghoulslash	7a9476323c	Merge pull request #566 from AsparagusEduardo/PE-GenderDifferences ... Support for Gender Differences	2020-11-10 12:31:03 -07:00
LOuroboros	bb4f00737e	B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE	2020-11-10 14:26:47 -03:00
Evan	de0518121e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-11-10 09:00:30 -07:00
LOuroboros	a25190f357	A few things. ... -Introduced a Gen. 8 styled text string for Intimidate -Added an ability popup to BattleScript_IntimidatePrevented	2020-11-10 10:34:51 -03:00
LOuroboros	e179b9b5fe	Updated Intimidate to Gen. 8 standard	2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone	6f29abbe0e	Plate type data and hold effect #1207 from ExpoSeed	2020-11-09 15:24:13 -03:00
Eduardo Quezada D'Ottone	b19ee3c554	Capitalization.	2020-11-09 14:53:10 -03:00
Eduardo Quezada D'Ottone	03c7843e45	Capitalization	2020-11-09 14:52:58 -03:00
Eduardo Quezada D'Ottone	33ed87e2cb	Capitalization	2020-11-09 14:52:18 -03:00
Eduardo Quezada D'Ottone	3a984136e7	Updated comment.	2020-11-09 14:50:18 -03:00
Eduardo Quezada D'Ottone	690307dbf9	Updated comment.	2020-11-09 14:49:23 -03:00
Eduardo Quezada D'Ottone	102e686a94	Updated comment.	2020-11-09 14:48:47 -03:00
Eduardo Quezada D'Ottone	bacabf03a8	Review changes.	2020-11-09 13:45:08 -03:00
Eduardo Quezada D'Ottone	df11b68acb	Moved POKEMON_EXPANSION define to global.h to fix reading from other branches	2020-11-09 12:58:03 -03:00
Eduardo Quezada D'Ottone	df4d927e31	Moved BATTLE_ENGINE define to global.h to fix reading from other branches	2020-11-09 12:45:31 -03:00
Eduardo Quezada D'Ottone	b4cf674fa1	Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine	2020-11-09 12:38:53 -03:00
Eduardo Quezada D'Ottone	ddb6142709	Review changes 3.	2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone	35d5324324	Review changes.	2020-11-08 21:02:34 -03:00
Evan	03f480fa17	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine	2020-11-08 15:21:48 -07:00
Evan	980f208b78	use NATIONAL_DEX_COUNT for critical capture odds	2020-11-08 14:07:43 -07:00
Eduardo Quezada D'Ottone	2e01654eb9	Plate type data and hold effect.	2020-11-08 01:47:05 -06:00
ExpoSeed	d2566c8988	Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect	2020-11-07 23:34:04 -06:00
ultima-soul	99fdc13e61	Merge branch 'master' into battle_engine_sync	2020-11-07 15:59:20 -08:00
TheXaman	abf5d238c2	PokedexPlus with HGSS styled UI by TheXaman ... more ui, BROKEN atm type icons in info screen working topbar dpad for switching and white mon name initial working stats screen additional stats, proper move list array Working stats screen, all infos in, all icons in, buggy when switching Fixed sprite bug, proper sprite destruction, works with old compiler new navigation: info>area>stats power+accuracy text, change of positions layout for stats screen, other screen visually broken new stats layout properly working plus toggle infos show lvl of LevelUpMove and TM/HM of TMHM_Move 3 dashes for EggMoves and CORRECT icon for TM/HMs pog improved layout and contest move data! TutorMoves now available hold dpad to scroll, pure relieve search by move code working 6evs, 16 character move names, tripple digit moves, new eduardo layout working tileset, info screen no correct xy layout for elements yet new list menu start new layout working, only missing stats bars new list, new search fixed area screen change and fixed "new caught" bug (type icons)	2020-11-08 00:49:14 +01:00
Eduardo Quezada D'Ottone	68627882a5	Merge remote-tracking branch 'pret/master' into PE-pretSync	2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone	8d86169283	Merge remote-tracking branch 'pret/master' into IE-pretSync	2020-11-07 14:54:52 -03:00
Eduardo Quezada D'Ottone	09a5d6c722	Implemented Wish Mega Evolution	2020-11-07 10:13:32 -03:00
Eduardo Quezada D'Ottone	cb6802f01e	Standarized naming schemes.	2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone	5e33281350	Support for gender difference mon icons.	2020-11-06 17:48:03 -03:00
Eduardo Quezada D'Ottone	d7fbaa6cbf	Support for gender palettes.	2020-11-06 17:12:57 -03:00
MCboy	e31158d017	add spaces around - and remove comment from include in battle.h	2020-11-06 23:29:52 +03:30
Eduardo Quezada D'Ottone	3849f7dd5d	Female Eevee backsprite.	2020-11-06 16:45:25 -03:00
MCboy	3b91735e63	use constants for ball throw count	2020-11-06 22:59:46 +03:30
Eduardo Quezada D'Ottone	4d4b111327	Front pic gender differences for Eevee	2020-11-06 16:21:45 -03:00
Evan	b3d1e8b5b8	turn crit capture odds into a ratio	2020-11-03 08:57:11 -07:00