pokeemerald

mirror of https://github.com/pret/pokeemerald.git synced 2026-05-14 07:20:00 -05:00

Author	SHA1	Message	Date
Ariel A	a6ef9c7577	Merge branch 'followers' into followers-expanded-id	2025-01-01 00:39:14 -05:00
Ariel A	4047f9b764	feat: added FadeScreenHardware utility	2025-01-01 00:37:35 -05:00
Ariel A	faf773a54b	feat: added time-blend override	2025-01-01 00:37:21 -05:00
Ariel A	a515cb3c6b	Merge branch 'followers' into lighting	2025-01-01 00:37:09 -05:00
Eduardo Quezada	e1275594c5	Renamed OW type effectiveness function for clarity (#5917 )	2024-12-31 22:55:42 +01:00
Eduardo Quezada	004efd1e5a	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-31 18:38:03 -03:00
Alex	51cfb96fd5	Fixes Sparkling Aria Shield Dust / Covert Cloak interaction (#5911 )	2024-12-31 12:52:16 +01:00
Ariel A	3fffb9fac6	feat: added configuration to restrict following pokemon. Closes #42	2024-12-30 21:38:18 -05:00
Alex	9d30299148	Fixes Stance Change, Sleep Talk interaction (#5909 )	2024-12-31 00:38:01 +01:00
Bassoonian	bf125c8f5e	Fix wrong value for NUM_MOVE_EFFECTS (#5913 )	2024-12-30 23:51:48 +01:00
Alex	3db351359a	Clean up redundancy for mugshots (#5906 )	2024-12-30 18:32:21 +01:00
Alex	af19b13195	Adds Pledge Side Statuses as Starting Statuses (#5899 )	2024-12-30 09:18:23 +01:00
Alex	f864bf8b70	Adds Generational config for Magic Guard (Fix for Gen4+) (#5893 )	2024-12-30 09:01:20 +01:00
Eduardo Quezada	009de5c98c	Setting Battle configs during tests (#5803 ) Co-authored-by: sbird <sbird@no.tld>	2024-12-29 23:28:39 +01:00
Hedara	2088f2a12d	Merge branch 'master' into master-upcoming	2024-12-29 21:43:07 +01:00
Eduardo Quezada	7ddb4cdc1b	Fixed TODO tests not showing up when filtering by name (#5894 )	2024-12-29 14:18:33 +01:00
AlexOn1ine	74f1d7cb80	merge rhh/upcomig	2024-12-28 21:03:34 +01:00
AlexOn1ine	6a906a3fc1	refactor done	2024-12-28 20:55:59 +01:00
Eduardo Quezada	3bc4126558	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-28 15:28:07 -03:00
AlexOn1ine	0bb86e4437	struct	2024-12-28 10:23:28 +01:00
Alex	5900a01061	Atk Canceller refactor / reorder / clean up (#5885 )	2024-12-27 21:14:05 +01:00
Eduardo Quezada	50d325f081	Slight contest documentation (#2078 ) Some checks failed CI / build (push) Has been cancelled Details	2024-12-27 11:09:33 -05:00
Eduardo Quezada	91c7bd9e53	Fixed givemon not respecting perfect IVs for species (#5873 )	2024-12-26 21:22:45 +01:00
AlexOn1ine	9c34634dd6	Draft Change	2024-12-25 11:03:32 +01:00
DizzyEggg	b1dbc6e9b2	Fix ASSUMPTIONS not working (#5869 )	2024-12-24 06:46:40 -03:00
Alex	8edf14423a	Refactors argument into a union (#5853 ) Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-12-23 15:51:35 -03:00
Eduardo Quezada	f9fed98665	Fixed MOVE_EFFECT_FREEZE_OR_FROSTBITE not being usable in battle scripts (#5859 )	2024-12-22 23:39:48 +01:00
Bassoonian	5560f339d0	Remove unused various (#5851 )	2024-12-21 20:26:46 -03:00
Alex	f61a0f6a30	Sheer Force fix and move effect cleanup (#5812 )	2024-12-21 19:45:50 +01:00
Eduardo Quezada	1e6628b78d	Address Review comments Pt2	2024-12-21 10:49:59 -03:00
Eduardo Quezada	dbc3cc28b8	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-12-21 09:31:23 -03:00
Eduardo Quezada	25075239a2	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-21 08:46:33 -03:00
Eduardo Quezada	e175c5aca8	Changes Various defines to an Enum (#5840 ) Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-12-21 11:48:31 +01:00
AlexOn1ine	573200d56a	nobody saw anything but again	2024-12-21 11:23:30 +01:00
AlexOn1ine	ff4c2aaf78	nobody saw anything	2024-12-21 10:24:34 +01:00
AlexOn1ine	71318eca5f	Revert weather order	2024-12-21 10:04:16 +01:00
Eduardo Quezada	53aebc34dd	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-20 20:48:13 -03:00
AlexOn1ine	2c419ccb57	review comments	2024-12-20 22:43:05 +01:00
Eduardo Quezada	82252251e7	Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220	2024-12-20 16:04:33 -03:00
Eduardo Quezada	05f300f6cc	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-12-20 15:22:14 -03:00
Bassoonian	5cc0b35d81	Replace power checks with IS_MOVE_STATUS (#5820 ) Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-12-20 08:20:46 -03:00
hedara90	e579333427	Egg cycle length fix (#5828 ) Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-12-20 11:23:51 +01:00
Alex	f27bf843cb	Changes Various defines to an Enum (#5839 )	2024-12-20 10:49:40 +01:00
AlexOn1ine	eb4427db94	primal weather fix	2024-12-19 21:41:32 +01:00
AlexOn1ine	99fef0260f	Battle Weather Refactor	2024-12-19 20:50:08 +01:00
PhallenTree	f4a0cc0055	Adds Thief/Covet config to send stolen item to bag and Pickup config to pickup user's item in wild battles (#5829 )	2024-12-19 13:51:03 +01:00
Alex	a2aba3f86a	Changes target TURN_DAMAGED and MAX_HP to inlines (#5822 )	2024-12-17 17:21:12 -05:00
Eduardo Quezada	bcc65e74a6	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-14 13:03:16 -03:00
Alex	4bff9f8ee9	Fixes simu hp reduction when no partner was on field (#5799 )	2024-12-10 21:48:31 +01:00
PhallenTree	3ad5de5fef	Adds missing Friend Ball friendship bonus upon catching (#5795 )	2024-12-10 08:26:23 -03:00
GriffinR	dbff8c4360	Merge branch 'porymap-6' into generate-map-constants	2024-12-09 20:25:41 -05:00
hedara90	75eaf890a2	Evolution level 1 learn (#5791 ) Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-12-09 13:21:30 +01:00
hedara90	09a8d051d4	Added the missing config to use new terrains (#5792 ) Co-authored-by: Hedara <hedara90@gmail.com>	2024-12-09 12:28:31 +01:00
Eduardo Quezada	66a2a16bbc	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-08 12:00:29 -03:00
Alex	3f3f4cfe1c	New Volt Switch Animation (#5729 ) Co-authored-by: Hedara <hedara90@gmail.com>	2024-12-07 15:52:13 +01:00
hedara90	54d372162f	Added NBSP and up+down arrows to all fonts (#5767 ) Co-authored-by: Hedara <hedara90@gmail.com>	2024-12-07 07:26:23 -03:00
PhallenTree	775ea3b564	Pursuit refactor (#5707 )	2024-12-06 19:14:46 +01:00
Eduardo Quezada	29ef1cf9ad	Stick to the new name	2024-12-05 21:00:55 -03:00
Pawkkie	da2a1e2aba	Destiny Bond fails on repeated use in Gen 7+ (#5652 )	2024-12-05 22:29:20 +01:00
Eduardo Quezada	720b2daecc	Improve Pyramid location documentaion	2024-12-05 18:25:27 -03:00
Philipp AUER	7744298788	Fix fixed point damage calculation off-by-1s (#5775 ) Co-authored-by: sbird <sbird@no.tld>	2024-12-05 11:35:56 +00:00
Eduardo Quezada	458bd5ad4d	Review changes pt 1	2024-12-05 07:56:49 -03:00
Eduardo Quezada	d151e00c70	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-12-04 19:15:48 -03:00
Eduardo Quezada	a92350fb53	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-04 18:55:56 -03:00
Pawkkie	599f4d339b	Adds SleepClauseBlock enum to CanBeSlept (#5773 )	2024-12-04 21:54:31 +01:00
Eduardo Quezada	68b5b63ecb	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/hp_reduction	2024-12-04 12:04:47 -03:00
Eduardo Quezada	e4f8b4ccf0	Addressed review changes (minus encapsulation)	2024-12-04 11:31:28 -03:00
Eduardo Quezada	5c180a0b09	Added FONT_SHORT_NARROWER (#5101 )	2024-12-04 06:30:19 -08:00
Frank DeBlasio	1b880a1185	Converted item-related variables to COMPOUND_STRINGs (#5714 )	2024-12-03 23:11:59 +01:00
Alex	70224f0ea3	Fixes items preventing other switch in effects (#5732 ) Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-12-03 11:15:29 -05:00
Martin Griffin	993663d9b0	Variadic IS_BATTLER_OF_TYPE and GetBattlerTypes (#5708 )	2024-12-03 13:12:54 +01:00
Frank DeBlasio	a97cfaa068	Converts multi-choice options to COMPOUND_STRINGs (#5686 )	2024-12-03 12:32:13 +01:00
Pawkkie	c8b0da2493	Add AI_FLAG_WEIGH_ABILITY_PREDICTION (#5636 )	2024-12-03 12:28:22 +01:00
Pawkkie	b15f7ad4f1	Sleep Clause global config (#5762 )	2024-12-02 16:35:28 -05:00
AlexOn1ine	8acb31339d	rename critChance and moveDamage	2024-12-02 19:57:45 +01:00
AlexOn1ine	d95dbadccc	merge rhh/upcoming	2024-12-02 19:00:55 +01:00
AlexOn1ine	aa61f24e81	clean up	2024-12-02 18:25:24 +01:00
Eduardo Quezada	7ac7ab8f6f	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-02 13:49:43 -03:00
AlexOn1ine	09c9d8a800	merge rhh/upcoming	2024-12-02 17:45:00 +01:00
Pawkkie	2b7905beb1	Add B_FLAG_SLEEP_CLAUSE (#5566 ) Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu> Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com> Co-authored-by: Hedara <hedara90@gmail.com>	2024-12-02 09:06:03 +01:00
Eduardo Quezada	0322d51887	Split "Do nothing" move effects (#5613 )	2024-12-02 09:05:04 +01:00
Eduardo Quezada	4635f0e0f8	Converted Stance Change to proper Form Change + Tests (#5749 )	2024-12-01 22:36:25 +01:00
Eduardo Quezada	00cb7b36e1	Actually start 1.11.0 cycle	2024-12-01 15:36:39 -03:00
Eduardo Quezada	2e30e66e15	Begin 1.11.0 cycle	2024-12-01 15:33:42 -03:00
Eduardo Quezada	7e5327864e	Start of 1.10.1 cycle	2024-12-01 15:27:01 -03:00
Eduardo Quezada	bd7a46f9c7	Version 1.10.0	2024-12-01 15:10:46 -03:00
Eduardo Quezada	720938f040	Fix conflicts	2024-12-01 14:28:26 -03:00
Eduardo Quezada	7010080465	Merge branch '_RHH/upcoming' into _RHH/pr/master/1.10.0	2024-12-01 14:28:12 -03:00
Eduardo Quezada	6fe935f1b8	Version 1.9.4	2024-12-01 14:04:13 -03:00
Alex	0ca588943b	Fixes choiced moves not locked in after ability block (#5738 )	2024-12-01 13:45:35 +01:00
Eduardo Quezada	1a581c407c	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-01 08:11:32 -03:00
Alex	b3b0973fbb	Fixes Population Bomb / Triple Kick missing message (#5747 )	2024-11-30 18:06:17 -05:00
hedara90	e4ef3a440f	Automatic Line Breaks, somewhat even lines (#5689 ) Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-11-29 18:46:45 +01:00
Hedara	f6fdca615f	Merge branch 'master' into master-to-upcoming	2024-11-29 11:32:12 +01:00
Alex	0f4b598984	Fixes Aegislash not reverting back (#5734 )	2024-11-28 23:21:42 +01:00
Alex	88cdd8bdfb	Fixes Kee Maranga and Enigma Berry (#5727 )	2024-11-28 11:22:32 +01:00
Alex	6b170d70f1	Fixes Red Card / Eject Pack interaction (#5724 )	2024-11-27 14:05:11 -05:00
GriffinR	382ee9e276	Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6	2024-11-23 16:10:33 -05:00
Alex	194f7644b8	Changes taget bit of Flower Shield (#5698 )	2024-11-23 12:02:40 -05:00
AlexOn1ine	97b30cb712	simultaneous hp reduction	2024-11-23 08:35:01 +01:00
Alex	612c8d3ff6	Fixes heal blocked leeach seed in tests (#5700 )	2024-11-21 17:18:44 +00:00
Eduardo Quezada	b2ef363ac8	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-19 14:19:53 -03:00
AERDU	5388ed0cad	Mimicry updates typing with RemoveAllTerrains() (#5666 ) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-11-17 10:21:01 +01:00
Alex	67c7106fee	Refactors Absorb to use Moveend (#5670 )	2024-11-17 09:59:04 +01:00
ghoulslash	6f78288a9b	fix dexNavSearchLevels array size	2024-11-13 21:21:45 -05:00
hedara90	3481340da8	Critical Hit documentation and distorted match up struct switch (#5665 )	2024-11-13 22:30:27 +01:00
PhallenTree	0919fbdc2d	Fix Order Up + Tera Stellar breaking each other with Commander (#5667 )	2024-11-13 11:45:08 +01:00
AlexOn1ine	4dc784bd2d	fix conflict	2024-11-12 23:30:49 +01:00
AlexOn1ine	3204454853	Critical Hit documentation and distorted match up struct switch	2024-11-12 23:27:53 +01:00
hedara90	1d7e4cf8fc	Cleans up Primal Reversion code (#5659 )	2024-11-12 13:48:06 +01:00
Alex	b55c87f73f	Fixes Take heart (#5658 ) Co-authored-by: KyleLaporte <moog272@gmail.com> Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-11-11 14:58:09 -05:00
Alex	a8351e305c	Fixes Red Card / Eject Pack interaction with Emergency Exit (#5657 ) Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-11-11 14:56:51 -05:00
AlexOn1ine	a3fe53dd28	Cleans up Primal Reversion code	2024-11-11 20:31:21 +01:00
Eduardo Quezada	b48e5770be	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-11 15:58:42 -03:00
ghoulslash	931a05f12b	Mrcrge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav	2024-11-11 12:38:52 -05:00
Martin Griffin	f770cb1ea3	Check that PASSES_RANDOMLY affected a Random call (#5635 )	2024-11-11 10:59:58 +01:00
kittenchilly	7409b87d17	Add merged placeholder text for trainer name with class (#5622 )	2024-11-10 21:21:27 -03:00
Eduardo Quezada	5f87d2e8a7	Convert gBattleStringsTable to COMPOUND_STRINGs (#5649 )	2024-11-10 00:22:37 +01:00
GriffinR	b89fda79ea	Generate MAPSEC constants from JSON	2024-11-06 21:43:13 -05:00
Eduardo Quezada	e005ffb576	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-06 10:01:48 -03:00
Alex	8581646c22	Convert 3 variouses to callnatives (#5646 )	2024-11-06 10:09:49 +01:00
Alex	dc740b4e9a	Fixes Magic Coat message (#5645 )	2024-11-06 10:09:00 +01:00
Bassoonian	6d38e260d6	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov	2024-11-05 10:31:40 +01:00
Eduardo Quezada	ee2535be96	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-03 12:21:22 -03:00
ghoulslash	57225e878a	some more fixes	2024-11-03 10:11:05 -05:00
ghoulslash	b488ff9b53	merge w upcoming	2024-11-03 07:11:40 -05:00
hedara90	02d7767327	Set default battle shadow to Gen3 (#5632 ) Co-authored-by: Hedara <hedara90@gmail.com>	2024-11-03 07:29:09 -03:00
Alex	45d063dcf8	Fixes Dragon Tail using the effect twice during a Parental Bond attack (#5630 ) Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-11-02 09:38:29 -03:00
Martin Griffin	39f5596d09	Improve unneeded SEND_OUT error	2024-11-01 17:06:22 +00:00
Eduardo Quezada	ac1dd857f7	Fixed text wrap obtaining the incorrect glyph width (#5620 )	2024-11-01 15:07:58 +01:00
Alex	35a22d6e82	Follow up for #5570 (#5625 )	2024-10-31 10:58:00 +01:00
Alex	d5f8e9cc0e	Combines CalculateMoveDamage arguments into a struct (#5570 )	2024-10-31 07:59:28 +01:00
GhoulMage	5df6f0b753	`AI_FLAG_ACE_POKEMON` takes into account separate trainers (#5608 )	2024-10-29 15:18:29 -04:00
Eduardo Quezada	dfa3690d74	Added config to disable gender differences (#5595 )	2024-10-29 15:38:26 +01:00
Alex	76eae8ed00	Decouple Poke Ball ids from item ids (#5560 )	2024-10-28 18:03:15 +01:00
Alex	0b66f52ead	Minor BattleStruct clean up (#5585 )	2024-10-28 16:35:31 +01:00
Eduardo Quezada	e8b8ca19a9	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-28 12:13:55 -03:00
Eduardo Quezada	3442b09852	Renamed folders and symbols to match species defines (#5581 )	2024-10-27 20:15:11 +01:00
Eduardo Quezada	13d3245204	Added compressed OW mon VRAM notice in config file (#5599 )	2024-10-27 14:04:33 -04:00
GhoulMage	6819dd3c37	New AI flag for marking the two last Pokémon as Ace Pokémon. (#5587 )	2024-10-27 11:32:45 -04:00
Martin Griffin	09c424b70f	Mark all tests as used (#5531 )	2024-10-25 13:05:19 +02:00
Pawkkie	7413d107ae	Should switch refactor to facilitate switch prediction (#5466 ) Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2024-10-25 13:04:42 +02:00
Eduardo Quezada	afa7ab9b2e	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-24 07:47:52 -03:00
Pawkkie	03eda5749d	Healer ability tests (#5559 )	2024-10-22 19:02:28 +02:00
hedara90	bcfdf41078	Follower female fix (#5475 ) Co-authored-by: Hedara <hedara90@gmail.com>	2024-10-22 12:38:06 -03:00
Martin Griffin	1421ed1b24	Tests: detect task leaks (#5528 )	2024-10-22 10:19:00 +02:00
kittenchilly	db24128ee3	Update battle messages to Gen 5+ standards (#3240 ) Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-10-21 14:52:45 -03:00
Frank	544b76fbbf	Added value for bard sound length	2024-10-21 09:04:42 -04:00
Eduardo Quezada	3205f377d5	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-21 08:18:44 -03:00
GhoulMage	d11fd21cd6	Changing EVO_NONE from 0xFFFE to 0 (#5547 )	2024-10-21 07:33:21 -03:00
Ariel A	0f706ac9e0	Merge branch 'followers' into followers-expanded-id	2024-10-21 00:05:26 -04:00
Ariel A	4056804575	feat: improved follower handling during scripted movements	2024-10-20 23:55:05 -04:00
ghoulslash	4fc07c4369	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav	2024-10-20 18:46:54 -04:00
Eduardo Quezada	59e617b16d	Updated Wring Out effects to match Eruption effects (#5549 )	2024-10-20 21:44:28 +02:00
Bassoonian	601438e980	Centralise AI Tests trainer name (#5532 )	2024-10-19 17:51:20 -03:00
ghoulslash	d487bd0548	Revival Blessing fixes + Using Lunar Blessing's animation (#5490 ) * revival blessing fixes, add anim * fix lunar blessing anim * Added support for Revival Blessing in tests * Added test to confirm absent flag fix --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-10-19 11:34:58 -03:00
RavePossum	85197eda5e	Move Relearner and Renaming From Summary Screen (#5513 ) * implement move relearner in summary screen * implement renaming in summary screen * Enable summary screen rename and relearn by default * Store original callback when opening screen to invoke later, hide rename/relearn for mons being moved in PC * add a config to not restore full PP when relearning from summary screen * hide summary relearner option if mon has no relearnable moves * add note not to decap RELEARN string * re-static function that now no longer needs to be accessible elsewhere * Fix move relearner not showing up if you first select a mon with no moves * The great curly brace massacre of 2024 (PR feedback) * sprinkling in some parentheses * PR feedback 2 (curly braces & whitespace)	2024-10-19 14:43:05 +02:00
ghoulslash	229525d122	some cleanup	2024-10-18 22:13:49 -04:00
ghoulslash	cb9f1f27a7	move dexnav flags, vars to config, add DEXNAV_ENABLED config to add static asserts that flags, vars are setup and dexnav cannot be used/accessed otherwise	2024-10-18 22:00:19 -04:00
ghoulslash	54484593b3	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav	2024-10-18 21:46:54 -04:00
kittenchilly	04aa5b7c24	Add more later gen fishing mechanics (#5518 ) * Add new fishing bite odds and follower boost * Sticky * Update item.h * Update field_player_avatar.c * Update field_player_avatar.c	2024-10-18 16:45:31 +02:00
Eduardo Quezada	358c0d0699	Added back GBA sprites via config (#5206 ) * Add back older sprites * Graphics config * Added GBA most graphical data to gSpeciesInfo * Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files * GBA mon icons * Split GBA footprints into separate config * Separated GBA icons into their own config * Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS * Moved GBA sprites to regular folder with prefix * Renamed configs * Temporarely disabled shadows when GBA sprites are enabled * Removed remaining files from pokemon_old folder	2024-10-18 13:37:00 +02:00
Eduardo Quezada	ee9c6d4912	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-17 00:16:01 -03:00
Pawkkie	9882e0aea6	Refactor ShouldSwitchIfAllBadMoves (#5452 ) * Refactor ShouldSwitchIfAllBadMoves * Rest of bugfix * Enable Shed Tail test * Revert "Enable Shed Tail test" This reverts commit e0b9a3affcf3c465c8743741e5ca61bde6c8cb18. * Better names for i, j * Fix MAX_MON_MOVES that should be MAX_BATTLERS_COUNT * battlerIndex / moveIndex fix * Update src/battle_controller_player_partner.c --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-10-16 11:22:48 -04:00
ghoulslash	43f184d0a5	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav	2024-10-16 10:26:55 -04:00
Bassoonian	d4387d880c	Replace hardcoded flute check with consumability check (#5508 )	2024-10-16 12:07:34 +02:00
GriffinR	0eb6d1d74c	Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants	2024-10-15 22:04:45 -04:00
GriffinR	da9c0239d9	Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6	2024-10-15 22:02:40 -04:00
ghoulslash	bb78d45400	some fixes	2024-10-15 21:24:53 -04:00
ghoulslash	cf78462fab	merge w upcoming	2024-10-15 21:24:47 -04:00
Eduardo Quezada	9ed153ff93	Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015	2024-10-15 22:22:52 -03:00
Eduardo Quezada	80447bee8e	Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015	2024-10-15 20:56:56 -03:00
luckytyphlosion	a55c75d350	Get rid of common syms (#2040 ) Some checks failed CI / build (push) Has been cancelled Details	2024-10-14 23:52:11 -04:00
GriffinR	a0be2cbf7b	Fix Fallorbor typo Some checks failed CI / build (push) Has been cancelled Details	2024-10-12 23:50:12 -04:00
GriffinR	f61c0099b9	OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA	2024-10-12 23:34:02 -04:00
Eduardo Quezada	0a4b3a8dd7	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-12 16:23:27 -03:00
Bassoonian	eedeaf1ead	Clean up scrcmd PR (#5511 ) Renamed CheckPartyHasSpecie to CheckPartyHasSpecies and cleaned up function calls	2024-10-12 10:34:05 -07:00
Bassoonian	8dba27249c	Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210	2024-10-12 18:41:33 +02:00
Ariel A	e10005010e	Merge branch 'followers' into followers-expanded-id	2024-10-12 12:27:05 -04:00
Ariel A	d80190fe10	fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh	2024-10-12 12:23:18 -04:00
GriffinR	a2a3255bdd	Fix typo, remove old size check	2024-10-12 03:30:35 -04:00
GriffinR	9f31b0fe90	Generate local IDs from map.json files	2024-10-12 03:04:24 -04:00
psf	0ef3f7dedd	Merge branch 'upcoming' into scriptCommands	2024-10-11 16:27:02 -07:00
ghoulslash	353915ef64	Add various tests, add RNG_RANDOM_TARGET (#5438 ) * burn dmg test depends on config * burn and frostbite tests use B_BURN_DAMAGE config for denom val * update kings shield test with config * add RNG_RANDOM_TARGET, use SetRandomTarget in HandleAction_UseMove target acquisition, update uproar test to PASSES_RANDOMLY since test will fail if you target the soundproof voltorb. Slightly faster UproarWakeUpCheck * add sticky web+contrary test * add EXPECT_EQ to contrary+sticky web test * Update src/battle_script_commands.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Update src/battle_util.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Update test/battle/move_effect/uproar.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * fix test * syntax fix --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-10-11 23:47:46 +02:00
SarnPoke	2db1f071fa	Add battle flag that prevents running from wild Pokémon (#5502 ) * Add No Running Battle Flag Adds a flag that if set prevents the player from being able to run from wild battles. * Formatting battle_util.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Adjust for pre-Gen 8 Teleport Addresses the edge case with Teleport when used with under Gen 8 mechanics. --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-10-11 21:59:50 +02:00
GriffinR	091b7269df	Move heal locations data to their associated map.json (#2034 )	2024-10-11 15:15:55 -04:00
Pawkkie	464c90a862	ShouldSwitchIfGameStatePrompt Tests (#5462 ) * Weird tests plz help <3 * better RNG tag names? * DATA.trial for data to reset between trials * Fix Wonder Guard test * Unused errors * Finish new tests * Split fix into its own PR * Spacing * Rename RNG_AI_SWITCH_TOXICD * Forgot to save file lol --------- Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2024-10-11 19:57:19 +02:00
hedara90	cac815164a	Cleanup extraneous function in header (#5506 )	2024-10-11 12:14:14 +02:00
kittenchilly	5b4acea651	Add config to change Vivillon's breeding form (#4813 ) * Add config to change Vivillon's default form * Update daycare.c * Remove the default form stuff * Update daycare.c * Clean up * Assert and fancy	2024-10-10 21:27:50 +02:00
ghoulslash	9dbcd18251	Unify GetBattlerAbility/TerrainAffected to remove duplicate ai function (#5497 )	2024-10-10 10:42:09 -04:00
Bassoonian	d0379b9b55	Turn item hold effects into an enum (#5498 ) * Turn item hold effects into an enum * Rename to ItemHoldEffect	2024-10-10 14:23:59 +02:00
Pawkkie	2afc7f6138	ShouldPivot type cleanup (#5441 ) * Cleanup ShouldPivot type * PIVOT to SHOULD_PIVOT	2024-10-10 12:54:35 +02:00
AlexOn1ine	d0a97970ba	Unify GetBattlerAbility/TerrainAffected to remove duplicate ai function	2024-10-10 09:55:25 +02:00
Alex	1454644376	Removes duplicate code in AI functions (#5457 ) * Make functions CanAbilityAbsorbMove and CanAbilityBlockMove * clean up * Replace ai code with CanAbilityBlockMove / CanAbilityAbsorbMove * Adds CanPartnerAbilityBlockMove * Use switches instead of if-blocks * solve potential bug in singles with spread attacks * fix test * revert other fix * flash fire does not increase a stat * left a comment for a future test and addition * remove more checks * comment was incorrect. it only applies to storm drain and lightning rod * revert ndebug * revert minor change * Update src/battle_util.c	2024-10-09 15:50:59 +02:00
SonikkuA-DatH	708f64247f	Heart Swap Move Animation (#5460 )	2024-10-09 10:43:04 +02:00
Eduardo Quezada	1d9557811b	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-10-08 15:58:17 -03:00
Eduardo Quezada	ee00c251ae	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-08 14:52:12 -03:00
Eduardo Quezada	541ca2619b	Start 1.9.4 cycle	2024-10-08 14:47:32 -03:00
Eduardo Quezada	a76f7fe92e	Version 1.9.3 (#5485 ) * Version 1.9.3 * Updated to latest master	2024-10-08 14:45:09 -03:00
Pawkkie	efad9a32a9	Fix AI tests using PASSES_RANDOMLY (#5486 )	2024-10-08 13:04:35 -04:00
Eduardo Quezada	f913f2884b	Add config for shadow intensity	2024-10-08 12:21:06 -03:00
psf	0dcb28ba0e	Add OW_UNION_DISABLE_CHECK and OW_FLAG_MOVE_UNION_ROOM_CHECK (#5448 ) * First addition of both checks * Updated config file * fixed spacing * Updated spacing * Fixed issues where feature was always on * Update overworld.h fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5448#discussion_r1789647611	2024-10-07 17:07:23 +02:00
ghoulslash	a6a6737c42	some dexnav improvements, use CalculateDexnavShinyRolls for shiny rolls	2024-10-04 13:54:56 -04:00
Eduardo Quezada	a7fca616b0	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-04 14:28:13 -03:00
ghoulslash	2e52e3331f	merge w upcoming	2024-10-04 12:56:21 -04:00
wiz1989	6f59d26753	updated Conversion 2 mechanics to 5+ (#5453 ) * updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2 * fixes and added new test cases * bugfixing and added EWRAM u16 gLastUsedMoveType * update after Pawkkie review --------- Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>	2024-10-04 12:42:15 -04:00
kittenchilly	19009c6d21	Add support for overworld sprite gender differences + add all the sprites (#5394 )	2024-10-04 17:56:21 +02:00
Eduardo Quezada	0f8b2a1ba8	Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909	2024-10-04 10:23:58 -03:00
Alex	077bbd3442	Adds padding in AiLogicData (#5468 ) * Adds padding in AiLogicData * Update battle.h * Update battle.h * Update battle.h	2024-10-03 22:11:54 -04:00
Eduardo Quezada	80af2af9ad	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-03 14:33:01 -03:00
ghoulslash	be5f2e095e	fix duplicating flute glitch (#5436 ) Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-10-03 13:01:18 +02:00
kittenchilly	44bf14e6fd	Add functionality to Poké Flute and Town Map (#5405 ) * Add functionality to Poké Flute and Town Map * Poke flute in-battle * Address reviews * Update item_use.c * Update battle_message.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c * Update battle_script_commands.c	2024-10-03 10:52:59 +02:00
psf	2597d8a35a	Updated species defines (#5075 ) * First version of new defines * Fixed cloaks * Fixed cloaks * Fixed cloaks * Fixed cloaks * Fixed cloaks * Removed old defines * Removed old defines * Removed old defines and cleaned up some macros * Undid changes to documentation Deleted unused defines Updated defines Fixed tests fixed docs * moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599 * fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591	2024-10-02 18:24:57 -03:00
Pawkkie	ded97e5296	Switch AI refactor + considers free switches (#5379 ) * Switch AI considers free switches from pivot move * Fix Baton Pass refactor * Some cleanup and comments * Mon fainting to hazards is a 0HKO * Revert "Mon fainting to hazards is a 0HKO" This reverts commit 446f73822651af55ee1a36aeb61f3f0c9317d244. * Cleanup speed check / Eject Pack * Move eject trackers to AiLogicData * Review feedback and WhoStrikesFirst changes * This linebreak will bug me lol * Also this comment, heck * Last bit of comment cleanup	2024-10-01 23:10:02 +02:00
Alex	b93e58266e	Fixes recoil moves not triggering berries if possible (#5449 ) * Fixes recoil moves not triggering berries if possible * Update battle_script_commands.h	2024-10-01 10:43:58 +02:00
Eduardo Quezada	d1056f887b	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-09-30 15:52:49 -03:00
psf	58aa1e0034	Merge branch 'upcoming' into scriptCommands	2024-09-30 06:57:54 -07:00
Bassoonian	5a8a393dcd	Add Sideways Stairs (#4836 )	2024-09-30 00:06:25 +02:00
Alex	42c43a3f8f	Adds Commander and Order Up (#5246 ) * Adds Commander * review points * new line * correction * regression / double targeting still broken * fix wrong target order * transform fixes * haze test * fixes, tests * bring back wrongly removed else if case * Eject Pack / Button test + fix * red card fix * test fixes * Fixes Tatsu being hit by multi hit move * change transform check * fix test + revert change * Fix Tatsugiri attacking after freed up from Dozo in the same turn * Dragon Darts tests * fix test * review comments * assumtion in wrong file * Order Up test fixes --------- Co-authored-by: hedara90 <90hedara@gmail.com>	2024-09-29 22:45:50 +02:00
ghoulslash	c8afe9bbde	some formatting fixes	2024-09-29 13:34:11 -04:00
ghoulslash	be3ee1ba85	merge w upcoming	2024-09-29 13:33:20 -04:00
Pawkkie	5e027754c7	Add ShouldSwitch result to AiLogicData (#5440 ) * Add ShouldSwitch to AiLogicData * Convert shouldSwitch to bitfield * Update include/battle.h Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Update include/battle.h --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-09-29 12:16:33 -04:00
Eduardo Quezada	5130ea9da3	Merge branch '_RHH/master' into _RHH/upcoming	2024-09-28 11:45:49 -03:00
Bassoonian	7dad83070f	Added MB_X_Y_STAIR_WARP metatile behaviors (#5278 )	2024-09-28 15:21:11 +02:00
pkmnsnfrn	6cea365135	Merge branch 'upcoming' into stairWarps	2024-09-27 17:25:57 -07:00
kittenchilly	c1dffc694e	Merge level_caps and ev_caps into one caps file (#5429 ) * Merge level_caps and ev_caps into one caps file * Update caps.h	2024-09-27 23:40:49 +02:00
PhallenTree	e67d5a23ed	Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive (#5430 ) * Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive) * Add Snatch interactions with Dancer, Swallow * Trace fix + cleanup * Simplify Quash * Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests * Fix Booster Energy Ability Popup * Accidentally removed healing from Swallow * More Trace cleanup	2024-09-24 18:40:44 +02:00
psf	ad0778722b	Adds SAVE_TYPE_ERROR_SCREEN (#5188 ) * Original commit * Moved config from save to general https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747901 Reindent function per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747984 Split Compound String into seperate lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104 Changed Rom to ROM per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104 Removed extra new line per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748172 * fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2295134679 * Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2306527812 * Removed comment and made line breaks consistent per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#pullrequestreview-2320266015	2024-09-22 19:07:17 +02:00
psf	009b42394e	Merge branch 'upcoming' into stairWarps	2024-09-22 09:40:34 -07:00
ghoulslash	b7246a018c	merge w upcoming	2024-09-22 09:13:25 -04:00
Frank DeBlasio	1ba0875654	Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS (#5166 ) * Removed FRONTIER_BRAIN_SPRITES * Updated TRAINER_SPRITE and TRAINER_BACK_SPRITE * Updated TRAINER_CLASS macro * Removed FRONTIER_BRAIN_TEXTS * Turned Frontier Brain text to COMPOUND_STRINGs * Removed frontier_brain.inc from event_scripts.s * Addressed front sprite comment * Addressed backsprite comments	2024-09-22 09:54:01 +02:00
Frank DeBlasio	d1bb7770d3	Converted berry and PokeBlock strings to COMPOUND_STRINGs (#5324 ) * Converted bag pocket names to COMPOUND_STRINGs * Converted berry-related text to COMPOUND_STRINGs * Converted PokeBlock-related text to COMPOUND_STRINGs * Added indexes to BerryFirmnessStrings * Updated call to sBerryFirmnessStrings * Changed gText to sText	2024-09-21 20:44:25 +02:00
Bassoonian	8ba96fdac4	Add `OW_AUTO_SIGNPOST` and associated metatile behaviors (#5044 )	2024-09-21 20:39:07 +02:00
GriffinR	a551efea43	Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6	2024-09-19 12:33:34 -04:00
GriffinR	e4e90eacd6	Merge pull request #2023 from Bassoonian/updatemapmacros Fix defines in MAP_NUM and MAP_GROUP	2024-09-19 12:17:16 -04:00
psf	fee26e29f5	Add AUTO_SCROLL_TEXT and NUM_FRAMES_AUTO_SCROLL_DELAY (#5054 ) * Added AUTO_SCROLL_TEXT * Moved NUM_FRAMES_AUTO_SCROLL_DELAY * Moved NUM_FRAMES_AUTO_SCROLL_DELAY per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268265 * Apply suggestions from https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268524 Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Added ability to skip text with button press per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054\#issuecomment-2267100771 * Update gflib/text.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054#issuecomment-2274402891 * Update text.h * Fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files\#r1711780606 * Moved NUM_FRAMES_AUTO_SCROLL_DELAY * Update gflib/text.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-09-19 12:01:12 +02:00
Alex	71dfd3e7c0	Ogerpon masks were missing their hold effects (#5391 ) * Ogerpon masks were missing their hold effects * fix wrong num * test * correct tests and additional fix * added hold effect to battle debug	2024-09-19 00:25:53 +02:00
PhallenTree	76656e85c2	Fix Quash implementation, adds After You and Quash missing configs + tests (#5400 ) * Fix Quash + After You and Quash configs * Add tests	2024-09-19 00:10:29 +02:00
nescioquid	ac2b41ae71	Typo fixes and Growth move description change (#5398 ) * changes Growth's move description to account for Gen 5+ behavior * completes B_DIVE_BALL_MODIFIER comment * fixes typos and incongruent spacing in various files * Update src/data/moves_info.h Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-09-18 23:03:36 +02:00
Alex	6ef36837e9	Fixed corruption of the next turn used move caused by Scale Shot (#5397 )	2024-09-18 16:58:49 +02:00
Kurausukun	52c2728ff6	remove gflib	2024-09-18 10:37:34 -04:00
Eduardo Quezada	53414cb8bb	Form changes and evolutions happen based on fake RTC	2024-09-16 16:15:30 -03:00
Eduardo Quezada	6116b8b04e	Start 1.9.3 cycle	2024-09-16 11:57:41 -03:00
Eduardo Quezada	889a02d263	Version 1.9.2 (#5357 ) * Version 1.9.2 * Apply suggestions from code review Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com> * Updated to latest master * Updated to latest master * Fix last PR * Corrected order + Pumpkaboo/Gourgeist credits --------- Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-09-16 12:12:34 -03:00
Bassoonian	0b429a8649	Merrp merge (September 9th) (#5359 )	2024-09-15 13:21:39 +02:00
Alex	25e9ca2ac6	Cleaned up a bit of code with GetBattlerPartyData (#5378 ) * rename GetBattlerPartyData	2024-09-15 08:24:26 +02:00
Sadfish the Sad	f6319d8446	new animations for many moves more details in description (#5367 ) New: Me First, Zippy Zap, Splishy Splash, Floaty Fall, Pika Papow, Bouncy Bubble, Buzzy Buzz, Sizzly Slide, Glitzy Glow, Baddy Bad, Sappy Seed, Freezy Frost, Sparkly Swirl, Veevee Volley, Snap Trap, Astral Barrage, Burning Bulwark Updated: Aura Sphere, Dark Void, Spirit Shackle Fixed: Springtide Storm, Bleakwind Storm, Wildbolt Storm, Sandsear Storm, Clangorous Soul(Blaze)	2024-09-15 08:22:40 +02:00
Alex	0d7c193e4c	fixes Micle Berry not increasing accuracy on the next turn (#5358 ) * fixes Micle Berry not increasing accuracy on the next turn * adds bitfield instead of using protect struct * test from pawkkie * ndebug * renaming * delete redundant comment * typo * micle berry more detailed descriptions	2024-09-14 19:55:03 -04:00
DizzyEggg	c4b5818d98	remove ScriptContext_Enable from secret_base.h	2024-09-14 19:13:02 +02:00
pkmnsnfrn	60fb0b34fd	Modified getobjectxy to allow for custom destinations	2024-09-14 07:48:24 -07:00
Pawkkie	79776bf6bb	ShouldSwitchIfWonderGuard tests and cleanup (#5383 )	2024-09-14 10:45:26 +02:00
PhallenTree	100c7dd8ad	Fixes Powder (status) interactions + tests (#5370 ) * Simplified fix from #4638 * Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge * Powder Tests * Remove duplicate * Assume Powder is a powder move * Add config for Powder Rain interaction * Only primal rain * Z-Moves fix handled in Canceller_Z_Moves * Fix BattleScript name * Make sure Z-Move + Powder still damages user	2024-09-13 18:08:23 +02:00
hedara90	9633cefd11	Custom anim table follower macro & Farfetch'd example (#5309 ) Co-authored-by: Hedara <hedara90@gmail.com>	2024-09-13 10:30:01 -03:00
pkmnsnfrn	510af1bee6	Restored original functions and made script versions	2024-09-12 20:55:37 -07:00
psf	1ba8e7d300	Merge branch 'upcoming' into signpost	2024-09-12 14:45:37 -07:00
psf	51a69b6a9d	Merge branch 'upcoming' into stairWarps	2024-09-12 14:43:46 -07:00
Liamjd14	5d8c61d813	Pokemon follower changes for issue #5135 (#5336 )	2024-09-12 18:55:30 +02:00
Eduardo Quezada	56859e35e0	Using TIME instead of TIME_OF_DAY	2024-09-12 10:26:58 -03:00
pkmnsnfrn	a0e914b749	Merge branch 'upcoming' into scriptCommands	2024-09-12 05:39:24 -07:00
Eduardo Quezada	831b394ca1	Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909 # Conflicts: # Makefile # include/battle.h # include/battle_main.h # include/battle_util.h # include/data.h # make_tools.mk # map_data_rules.mk # src/battle_setup.c # src/fieldmap.c	2024-09-11 15:26:14 -03:00
Eduardo Quezada	fc1212b060	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-09-11 08:09:09 -03:00
Pawkkie	047289a639	Improve AI's Skill Swap handling in double battles (#5360 ) * Improve AI contrary * Update src/battle_ai_util.c Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Fix additionalEffects loop * moves[i] to aiMove * Update src/battle_ai_util.c Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-09-11 00:00:29 +02:00
Rachel	b478881fc6	Add in-battle shadows underneath all enemy battlers (#5178 ) * Add data to SpeciesInfo entries for in-battle shadows * Implement sized shadows in the sprite visualizer * Implement sized shadows in game code * Show shadows for the lead battler for opponents during their battle anim * Feedback on shadows, round 1 * Revert removal of Goomy and Sliggoo shadows * Fixed GEN_3 setting * Code cleanup + remove pre-processor branches * Fix bugs with gen-3 configuration branch * Style corrections, final shadow coordinate adjustments * Adjustments to Garbodor and Araquanid	2024-09-10 21:27:49 +02:00
psf	2477f1d5ca	Made BuildColorMaps redundant by using static tables (#5289 ) * Added config for ColorMaps * Fixed delclartion of static maps * First commit complete * Removed config * Removed config * fixed overworld config per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#discussion_r1747583812 * Fixed pointer alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#pullrequestreview-2286973040 * Update overworld.h Removed new lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289/files#r1749325673	2024-09-10 14:44:08 +02:00
Eduardo Quezada	002c770f07	Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge	2024-09-09 13:52:34 -03:00
Alex	3cfc0004b6	Removes redundant moveTargetType ai function (#5354 ) * Removes redundant moveTargetType ai function * Beautify GetBattlerMoveTargetType for better readability	2024-09-09 11:30:39 -04:00
Ariel A	d3a4839808	meta: included `COLOR_MAP` constants in `field_effect_script`. Credit: SDH	2024-09-08 16:02:51 -04:00
Eduardo Quezada	6d020eb366	Cleaned up duplicate dynamic type functions (#5338 ) * Cleaned up duplicated dynamic type functions * Small cleanup * Oops, last cleanup broke stuff * Alignment Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-09-08 19:14:05 +02:00
SonikkuA-DatH	8c3531ffc7	Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak (#5325 )	2024-09-07 18:04:47 +02:00
Alex	5c86aa126f	Revert rtc based encounters (#5331 ) * Revert "RTC-based wild encounters follow up (#5328)" This reverts commit `9a95c9b07a`. * Revert "RTC-based wild encounters (#5313)" This reverts commit `7c7fd905ba`.	2024-09-06 21:09:04 +02:00
psf	0e1b62c732	Merge branch 'upcoming' into signpost	2024-09-05 17:11:32 -07:00
psf	1143da0c1c	Merge branch 'upcoming' into stairWarps	2024-09-05 17:09:45 -07:00
Frank DeBlasio	d3a3565fef	Converted PC strings to COMPOUND_STRINGs (#5314 ) * Converted PC strings to COMPOUND_STRINGs * Update src/pokemon_storage_system.c Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> --------- Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-09-04 16:43:34 -04:00
Frank DeBlasio	3aa24f527e	Converted Mechadoll text to COMPOUND_STRINGs (#5276 )	2024-09-04 14:56:19 -04:00
cawtds	6e3ce9db2f	Move battle anim arrays to C (#5306 ) * move battle anim arrays to c * use ARRAY_COUNT instead * remove B_ANIM_STATUS_WRAPPED * move anim rename * rename battle anims status/general/special	2024-09-04 11:21:40 +02:00
Pawkkie	720bc6464d	AI_FLAG_SETUP_FIRST_TURN Rename and Clarifications (#5310 ) * Rename AI_FLAG_SETUP_FIRST_TURN * Update all AI flags with comments	2024-09-04 11:12:55 +02:00
Hiram Anderson	7c7fd905ba	RTC-based wild encounters (#5313 ) * Some jsonproc string utility functions Adds stringContains, stringStartsWith and stringEndsWith for use in jsonproc. * Time-based wild encounters This adds some configs that allows users to define wild encounter groups on a map that are automatically cycled through depending on the time of day.	2024-09-03 21:54:03 +02:00
Eduardo Quezada	8533b0c045	Merge branch '_RHH/master' into _RHH/upcoming	2024-09-03 14:39:50 -04:00
ghoulslash	28a9ad3399	(Default Off) Item Description Headers (#4767 ) * add item descption headers and (default-off) config * revert test script * OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling * add ow item header config value labels * Update include/config/overworld.h Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Update src/overworld.c * Update include/overworld.h * ScriptShowItemDescription remove unused var * fix ScriptShowItemDescription warning --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-09-03 20:22:01 +02:00
Alex	04b5c013a9	Adds config to show target of ingame partner (#5307 ) * Adds config to show chosen move and target of ingame partner, `#define B_SHOW_PARTNER_TARGET`, default `FALSE` --------- Co-authored-by: Hedara <hedara90@gmail.com>	2024-09-03 19:28:59 +02:00
SarnPoke	a422db09c6	Fix Slateport Battle Tent/Battle Factory (#5281 ) * Fix Slateport Battle Tent/Battle Factory Stops the Battle Factory and Slateport Battle Tent from returning no Pokémon when player wants to swap their Pokémon. * Fix player rental party being junk data after rest Fixes #5280 * Consolidate checks into single method Consolidates every gSpecialVar_0x8005 check into a singular method.	2024-09-02 16:53:03 -04:00
Ariel A	8795c15ab9	feat: Allowed custom `COLOR_MAP_*` in `field_effect_scripts`. Credit: SDH	2024-09-01 17:22:44 -04:00
Ariel A	42d9f24c84	feat: added `OW_MON_WANDER_WALK` config option	2024-09-01 17:17:24 -04:00
Erickson Russell	de242c8a29	EV Caps and EV Items (#5269 ) * EV Caps and EV Items Introduces EV caps, inspired by level caps, with configurable options for various cap implementations. Additionally, modifies EV items to interact with these caps based on a configurable setting. * EV Caps fixes Changed the EV caps to be less redundant and work better overall. * EV Caps Fix part 2 Set the items back to ItemUseOutOfBattle_Medicine, got rid of ItemUseOutOfBattle_EVItem and ItemUseCB_EVItem, and reverted CB2_ReturnToPartyMenuUsingItem to CB2_ReturnToPartyMenuUsingRareCandy * EV Caps Fixes Part 3 Fixed being able to use EV items to go over 252 limit on single stats. * Update src/ev_caps.c Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-09-01 23:15:39 +02:00
Ariel A	839cf2e790	feat: static OW pokemon now bob while walking in place (per `OW_MON_BOBBING`)	2024-09-01 15:31:12 -04:00
Eduardo Quezada	484acdc138	Convert 8 various to callnatives (#5172 ) * Convert 8 various to callnatives * Address review comments	2024-09-01 15:12:43 +02:00
Alex	bbcb1cd5a2	Adds basic trainer and smart trainer flags (#5298 )	2024-08-31 17:50:37 -04:00
psf	83d3d95f58	Merge branch 'upcoming' into stairWarps	2024-08-31 07:02:37 -07:00
psf	95167936d4	Merge branch 'upcoming' into signpost	2024-08-31 07:02:18 -07:00
Eduardo Quezada	aa6d540b75	Code style adjustments	2024-08-30 12:17:31 -04:00
Eduardo Quezada	396a390114	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2024-08-29 19:58:17 -04:00
psf	4f39354185	Deprecate MMBN Names (#5240 ) * Removed HANDLE_EXPANDED_MOVE_NAME * Removed HANDLE_EXPANDED_TYPE_NAME * Removed HANDLE_EXPANDED_ITEM_NAME * Removed HANDLE_EXPANDED_SPECIES_NAME * Removed I_EXPANDED_ITEM_NAMES * Removed B_EXPANDED_MOVE_NAMES * Removed B_EXPANDED_TYPE_NAMES * Removed B_EXPANDED_ABILITY_NAMES * Removed B_EXPANDED_ABILITY_NAMES * Added documentation of names * Github markdown spacing is silly * Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339 * Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339	2024-08-29 16:33:25 -04:00
Icedude907	625a006cab	[Build System Rewrite] `mapjson` now takes output directory parameters. (#1949 )	2024-08-29 14:01:01 -04:00
Hedara	2ab0dd77de	Added performance counter	2024-08-29 16:20:52 +02:00
cawtds	8af35a7e0d	add Sirfetch'd alias for competitive format (#5283 )	2024-08-29 08:11:21 -04:00
psf	6dd78cfdb9	Merge branch 'upcoming' into stairWarps	2024-08-28 21:30:04 -07:00
Eduardo Quezada	aebbe448b8	Merge branch '_RHH/master' into _RHH/upcoming	2024-08-28 12:58:14 -04:00
GriffinR	7532f8ddb8	Revert MB name changes	2024-08-28 11:19:27 -04:00
SarnPoke	622dead80c	Shed Tail Retarget (#5275 ) Re-targets Shed Tail PR to upcoming	2024-08-28 13:40:35 +02:00
psf	113226b03a	Change metatile behaviors to enum (#2027 )	2024-08-28 00:45:09 -04:00
psf	e7023088ed	Merge branch 'upcoming' into scriptCommands	2024-08-27 21:31:14 -07:00
psf	23134cec85	Merge branch 'upcoming' into signpost	2024-08-27 21:31:07 -07:00
psf	be4fbf80ed	Merge branch 'upcoming' into stairWarps	2024-08-27 21:30:32 -07:00
pkmnsnfrn	04faf370e6	Cleaned up and reordered functions	2024-08-27 20:56:09 -07:00
Alex	98dbf3a575	Fixes Charged up status (#5274 ) Charge changed to last until the damage boost is consumed instead of next turn, previous behavior accessible with `B_CHARGE`	2024-08-27 20:01:51 +02:00
PhallenTree	930cac6aca	Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted (#5262 ) * Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves * Fix Entry Hazards targeting the wrong side of the field if opponent fainted * Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS * Alternative fix + Fix gBattlerTarget initially set to 2 * Fix Instruct animation * Alternative anim fix	2024-08-27 14:46:56 +02:00
Eduardo Quezada	c075d8e6b1	Fixed test system documentation (#5266 )	2024-08-26 21:59:01 +02:00
psf	b6299ac4ce	Fix a display issue with B_SHOW_TYPES (#5201 ) * Moved HandleInputChooseTarget and ShowEntireFieldTargets to non-static and added them as cases to ShouldHideTypeIcon * Made ShouldHideTypeIcon easier to parse * Made ShouldHideTypeIcon a for loop * Fixed identation * Made showTypesControllerFuncs a static const array per https://github.com/rh-hideout/pokeemerald-expansion/pull/5201\#discussion_r1730336265	2024-08-26 15:16:56 -04:00
kittenchilly	03e0472cbe	Add I_REPEL_INCLUDE_FAINTED config and behavior (#5239 ) * Add I_REPEL_INCLUDE_FAINTED config * Update src/wild_encounter.c Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Update wild_encounter.c * Update wild_encounter.c * Update src/wild_encounter.c --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-08-26 15:58:12 +02:00
pkmnsnfrn	fe428fc89b	original merge of branch	2024-08-25 16:46:22 -07:00
Salem	ceec17ec7b	remove unused bs signature (#5257 )	2024-08-25 23:13:40 +02:00
hedara90	51a127fcb5	Better implementation of the obedience fix (#5245 ) Co-authored-by: Hedara <hedara90@gmail.com>	2024-08-25 11:20:26 +02:00
Greenphx9	fc3a700357	Fix up some auto merge stuff	2024-08-25 18:01:23 +10:00
Greenphx9	ad969c968c	Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2	2024-08-25 17:54:28 +10:00
tertu	17f68563eb	Remove support for the original LCG random number generator (#5078 )	2024-08-24 10:07:00 -07:00
Martin Griffin	56d3faa32f	Merge pull request #2025 from Bassoonian/cleandefinespaces Clean up defines lacking spaces	2024-08-21 19:04:12 +01:00
Eduardo Quezada	77148f83a6	DoBattleIntro state documentation (#5231 ) * DoBattleIntro state documentation * Removed unused state * Update src/battle_main.c Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Fixed state jumps * BattleStruct state uses enum * Renamed state enums --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-08-21 15:57:28 +02:00
Eduardo Quezada	6ac18a6fe5	Merge branch '_RHH/master' into _RHH/upcoming	2024-08-20 08:00:05 -04:00
psf	af12697845	Adds OW_BERRY_IMMORTAL (#5187 ) * Added OW_BERRY_IMMORTAL Added cases for OW_BERRY_IMMORTAL * removed one preproc * removed other preproc * Fixed identation * Set config to FALSE * Update include/config/overworld.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187#discussion_r1720747388 Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Reordered condition per https://github.com/rh-hideout/pokeemerald-expansion/pull/5187\#discussion_r1720747652 * Update include/config/overworld.h --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-08-20 07:23:33 -04:00
Eduardo Quezada	becb2fcac8	Start 1.9.2 cycle	2024-08-19 18:29:48 -04:00
Eduardo Quezada	a11f03ed9d	Version 1.9.1 (#5199 ) * Version 1.9.1 * Added 5195 * Apply suggestions from code review Co-authored-by: hedara90 <90hedara@gmail.com> * Added 5196 and 5207 --------- Co-authored-by: hedara90 <90hedara@gmail.com>	2024-08-19 18:25:39 -04:00
hedara90	e4c81ba6e0	Removed all instances of gBitTable[x] (#5123 ) * Replaced all the gBitTable[X] usages with 1 << X, and cleaned up script output * Fixed failed merge in online viewer --------- Co-authored-by: Hedara <hedara90@gmail.com>	2024-08-17 10:28:09 -05:00
Frank DeBlasio	15348eae84	Consolidated the values of Rotom's moves and added Gen9 base form effect (#5186 ) * Consolidated Rotom move values * Updated changing Rotom into its base form to its Gen9 effect * Fixed order of if statement	2024-08-16 23:31:19 +02:00
Frank DeBlasio	bced2c97a1	Created PokeNav COMPOUND_STRINGS (#4983 ) * Converted Match Call names and descriptions to COMPOUND_STRINGs * Moved May/Brendan and Elite Four descriptions into pokenav_match_call_data.c * Moved Steven, Brendan, and May's Match Call text to pokenav_match_call_data.c * Cleaned up Steven's Match Call text * Added PokeNav option text to match_call_gfx * Moved PokeNav page descriptions to menu_handler_gfx * Moved help bar texts to pokenav_main_menu.c * Moved various PokeNav strings out of strings.c and into their relevant files * Removed unused PokeNav strings	2024-08-16 22:41:26 +02:00
PhallenTree	ec3a86dd9a	Adds in-battle effect of Pickup, adds Harvest and Pickup tests (#5170 ) * Adds Harvest tests * Adds Pickup in-battle effect + tests * Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish) * Change canPickupItem to bit field * Make RandomUniformExcept inclusive (higher end) + convert bitfield * Use CantPickupItem in PickupHasValidTargetc check * Review	2024-08-16 15:37:23 +02:00
GriffinR	3f49c5cbaf	Fix trainer match call flags	2024-08-15 23:00:20 +02:00
Bassoonian	c1ee43254e	Clean up defines lacking spaces	2024-08-15 19:34:56 +02:00
hedara90	47356d181a	Fixed followers breaking for species IDs above 1535 (#5179 ) * Fixed followers breaking for species Ids above 1535 * Added reminder to increase follower species bits if needed in the future --------- Co-authored-by: Hedara <hedara90@gmail.com>	2024-08-15 10:27:35 -07:00
hedara90	45f10d734f	Fixed Ice Face, implemented tests (#5171 ) * Fixed Ice Face, implemented tests * Fixed agbcc and bad battle mon looping * Fixed the ShouldChangeFormInWeather function again * Cleaned up End of Turn weather form changes, simplified Ice Face --------- Co-authored-by: Hedara <hedara90@gmail.com>	2024-08-15 13:51:39 +02:00
pkmnsnfrn	287f6baaa9	spaces over tabs please don't eat my ass	2024-08-14 22:14:48 -07:00
Eduardo Quezada	18980b20a3	Remove trailing whitespace (master) (#5174 )	2024-08-14 19:48:20 -07:00
pkmnsnfrn	67f8a61eef	Moved current and template positions to headers	2024-08-14 19:44:18 -07:00
pkmnsnfrn	dc06321054	Moved pokedex flags to constants files andadded constants to header of event_scripts	2024-08-14 19:24:55 -07:00
pkmnsnfrn	458340e043	Moved pokedex special constants to header	2024-08-14 19:09:56 -07:00
Eduardo Quezada	661ec0a9fd	Merge branch '_RHH/master' into _RHH/upcoming	2024-08-14 17:10:20 -04:00
Sadfish the Sad	fde85e9357	some gen 9 move anims + fickle beam rework (#5159 ) * new move anims + fickle beam rework * more fickle beam changes * removed the true for consistency * ficklebeamboosted gets cleared now * mortal spin and thunderclap changes * minor mortal spin pal change * removed hex numbers and made hard press quicker	2024-08-14 17:20:18 +02:00
Eduardo Quezada	6f0004ec4e	Removed some hardcoding of move IDs + Gen4/5 Defog (#5156 ) * Removed some hardcoding of move IDs * Added Defog Gen6+ config (+ updated tests)	2024-08-14 15:51:34 +02:00
Alex	7119d60a67	Set new anim particles by default to off (#5161 )	2024-08-14 06:31:26 -07:00
Bassoonian	5fefd743a2	Fix defines in MAP_NUM and MAP_GROUP	2024-08-14 13:02:40 +02:00
Bassoonian	63a1f85d81	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug	2024-08-14 12:33:04 +02:00
GriffinR	a3d5f54b75	Fix type for offset in MapConnection	2024-08-13 19:10:24 +02:00
Ariel A	3abf4871fd	Merge branch 'followers-expanded-id' into lighting-expanded-id	2024-08-12 23:13:02 -04:00
Ariel A	8a8c27c6c7	Merge branch 'lighting' into lighting-expanded-id	2024-08-12 23:11:27 -04:00
Ariel A	0745eaf2e0	fix: Uninitialized value used in `LightenSpritePaletteInFog`	2024-08-12 22:42:31 -04:00
Eduardo Quezada	abb1fd20f3	Merge branch '_RHH/master' into _RHH/upcoming	2024-08-12 16:24:04 -04:00
cawtds	ba1512f864	Fix specific tiles changing to pc tiles when using boxlink/debug pc (#5141 )	2024-08-12 15:52:55 -04:00
pkmnsnfrn	30cc06785d	Fixed global variable naming conventions	2024-08-12 06:55:33 -07:00
pkmnsnfrn	4387b6ef70	Removed SetWalkingIntoSignVars per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1712963824	2024-08-11 18:10:18 -07:00
pkmnsnfrn	c3c433439e	Removed ClearMsgBoxCancelableState per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1712963672	2024-08-11 18:01:52 -07:00
pkmnsnfrn	846e8a29da	Removed IsMsgSignPost per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1712963672	2024-08-11 17:49:07 -07:00
Eduardo Quezada	e6e2285c44	Added OBJ_EVENT_GFX_SPECIES_SHINY	2024-08-11 14:50:38 -04:00
Alex	805bb2888c	Fixes wrong padding in struct SpeciesInfo (#5139 ) Fixes wrong padding in struct SpeciesInfo that is if I counted correctly. After I opened #5138 I realized it might be an issue on master as well.	2024-08-11 18:27:22 +02:00
psf	d1183f4b8a	Add B_SHOW_TYPES and cleaned up IsDoubleBattle (#5131 ) * First attempt at a port * Slightly broken but working * Got images working and opponent palettes * half finished compressed spritesheet approach instead * fix the palettes (smh) * fix hflip, and a lot of clean-up * Add B_SHOW_TYPES * Got Illusion working * Add num type enum * Updated function to get type * Fixed type icon position and cleaned up functions * Updated illusions and Tera handling * Added BATTLE_TYPE_IS_SINGLE and DOUBLE * Removed IS_BATTLE_TYPE_SINGLE * Implemented BATTLE_TYPE_IS_DOUBLE across repo * Removed SIDE macro * Updated config * Deprecated battler alive macro * Reindented file * Added exceptions for 2v1 * Replaced Fainted check with Null check * Added functionality for only types of caught mons * UseDoubleBattleCoords updated * Added ShouldFlipTypeIcon * Renamed TryLoadTypeIcon * Refactored functions * Refactored functions * Refactored functions * Refactored functions * Renamed SEEN to CAUGHT * Reset config * Added useSecondPalette and isOrdinary to gTypesInfo * Further simplified secondPalette and isOrdinary * Changed isordinary to isSpecialCase * Renamed to useSecondTypeIconPalette * Fixed Stellar type interactions * fixed spacing * fixed include/config/battle.h * fixed * fixed include/config/general.h * changed type1 and type2 * Moved IsDoubleBattle to include.battle.h Removed BATTLE_TYPE_IS_DOUBLE Removed IS_DOUBLE_BATTLE * Changed IsBattlerFainted to IsBattlerAlive * Removed IsBattlerNull * Moved GetBattlerData to be inline * Renamed GetMonDefensiveTeraType * Removed IsIllusionActive * Fixed identation * found one last isDoubleBattle hold out * fixed redundant brackets * Fixed spacing for B_SHOW_TYPES * Update src/battle_script_commands.c Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * Fixed padding * Reindent file and refactored GetTypeIconHideMovement * Update include/data.h --------- Co-authored-by: RavePossum <ravepossum@proton.me> Co-authored-by: Frank <fdeblasio1004@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-08-11 17:55:51 +02:00
Alex	97fa0be36e	Dynamic move type clean up (#5132 ) * Minor clean up of the new function DynamicMoveType * wrongly removed func * Overworld Weather Bug * wrong comparison	2024-08-11 14:18:56 +02:00
pkmnsnfrn	811b5d286e	Added getobjectposition	2024-08-10 21:17:50 -07:00
Eduardo Quezada	113f8de9b1	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # src/battle_controller_player.c	2024-08-08 13:22:49 -04:00
Eduardo Quezada	182809b515	Made perfect IV count into a granular setting (#5115 ) * Made perfect IV count into a granular setting * Fixed optional parameter comment in SPECIES_NONE	2024-08-08 13:46:22 -05:00
Frank DeBlasio	754beeee5d	Created COMPOUND_STRINGs for default player names (#5037 ) * Converted default names to COMPOUND_STRINGs * Moved new game strings out to main_menu	2024-08-08 14:46:17 +02:00
Galaxeeh	355739db63	Dynamic Move Types in Summary Screen/Battle (#5084 ) * Dynamic Hidden Power Types * Dynamic Ivy Cudgel is summary screens * Dynamic Move types * missed unnecessary comment that got left in * format cleanup, return cleanup, added Tera Blast and Tera Starstorm, Revelation dance fix-> now displays live type update when tera is selected during battle before move selection * forgot to revert config defaults * Update src/pokemon.c Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> * if block spaces/ raging bull fix/ more condensing on checks/ reallocating config check/ tera blast fix (was displaying tera blast type on non tera'd mons in party when battler was tera'd) * revert configs * added Hail check to Weather Ball * Fixed agbcc compile/brackets/u32 changes * Quick fix to ensure Judgment/Techno Blast/Natural Gift are not affected by -ate abilities * Update src/pokemon_summary_screen.c --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-08-08 11:08:50 +02:00
Bassoonian	c390999141	Pret Merge (7th of August) (#5116 )	2024-08-08 10:23:14 +02:00
psf	b8dab587ab	Update include/battle.h Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-08-07 14:32:36 -07:00
pkmnsnfrn	5fbe5a331c	Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5114\#discussion_r1707607637	2024-08-07 13:33:35 -07:00
Bassoonian	0b1f06b594	Merrp merge (7th of August) (#5110 )	2024-08-07 22:05:07 +02:00
pkmnsnfrn	5635f94036	More changes from typeX to types[X]	2024-08-07 11:35:45 -07:00
Eduardo Quezada	d88834dd58	Backported OBJ_EVENT_GFX_SPECIES macro from Expansion	2024-08-07 13:42:18 -04:00
Bassoonian	cb4e687917	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergeforpsf	2024-08-07 19:05:46 +02:00
Pawkkie	9f845a79e5	Fix Switch AI Bug: AI never switching out when it could be OHKO'd (#5089 ) * Fix switch AI bug * Forgot to save a file lol * Fix infinite loop test compatibility	2024-08-07 15:58:39 +02:00
Bassoonian	207129e0c8	Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug	2024-08-07 12:42:45 +02:00
psf	312749dd31	Changed type1 and type2 to be consistent (#2021 ) * Changed type1 and type2 in gBattleMons to match gSpeciesInfo * Changed monType1 and monType2 to monTypes to match gSpeciesInfo	2024-08-07 06:44:03 +01:00
kittenchilly	e4f09c8103	Move Relearner now displays move category (#5081 ) * Move relearner now displays move category * Update move_relearner.c * Update move_relearner.c * Address reviews	2024-08-06 23:58:18 +02:00
Alex	dbb9ee874b	Change GET_MOVE_TYPE to a function (#5090 ) * Change GET_MOVE_TYPE to a function * add in battle check to GetMoveType function, move it to battle_util.c * Update src/battle_util.c Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update src/battle_util.c --------- Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-08-05 22:02:31 -04:00
Alex	745db06dc8	Doesn't compile on some compilers (#5099 ) the u8 should be brought back once we remove agbcc.	2024-08-05 18:12:55 -04:00
Alex	12351d520d	Changes Evolution methods to Enums (#4977 ) * Changes Evolution methods to Enums * make U8_ENUM to include/constants/global.h * revert previous commit * Update include/constants/pokemon.h --------- Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-08-05 15:54:37 -04:00
DizzyEggg	9ac8d0de25	Optimize/get rid of unused palette vars/functions (#4841 )	2024-08-04 21:41:55 -04:00
ghoulslash	d2f3d319a7	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/sideways_stairs	2024-08-04 12:26:20 -04:00
pkmnsnfrn	0fb48e8a9a	Fixed expanded OW IDs	2024-08-03 17:04:33 -07:00
AlexOn1ine	0f3f2915fb	Merge remote-tracking branch 'rhh/master' into master_merge	2024-08-03 20:19:33 +02:00
Martin Griffin	9d97537ee2	Fix speed ties (#4780 ) * Fix speed ties * fixup! Fix speed ties * fixup! Fix speed ties * fixup! fixup! Fix speed ties * fixup! Fix speed ties * Workaround for Comatose-Ditto interaction	2024-08-03 17:29:47 +02:00
cawtds	3af93bdfee	FRLG+ whiteout message (#4967 ) * FRLG whiteout message + post whiteout event	2024-08-02 08:28:05 -07:00
Eduardo Quezada	4082adf5b1	Start 1.10.0 cycle	2024-08-01 17:07:50 -04:00
Eduardo Quezada	512c44b698	Start 1.9.1 cycle	2024-08-01 17:04:48 -04:00
Eduardo Quezada	7ec24b89c8	Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0	2024-08-01 16:58:19 -04:00
Eduardo Quezada	f95322628d	Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0	2024-08-01 16:47:50 -04:00
Eduardo Quezada	483121dfc0	Version 1.8.6 (#5005 )	2024-08-01 19:52:29 -04:00
Eduardo Quezada	3372503430	Added OBJ_EVENT_GFX_SPECIES_SHINY macro (#5049 ) * Added OBJ_EVENT_GFX_SPECIES_SHINY * Update src/event_object_movement.c Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-07-29 18:41:03 +02:00
Eduardo Quezada	b4eca0a6ec	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # data/battle_anim_scripts.s # src/battle_util.c	2024-07-29 09:36:16 -04:00
hedara90	a89820fa96	Fixed Hidden Power damage category for PSS < GEN_4 (#5053 ) * Fixed Hidden Power damage category for PSS < GEN_4 * Fixed category display regression * Wrapped GET_MOVE_TYPE --------- Co-authored-by: Hedara <hedara90@gmail.com>	2024-07-29 13:45:14 +02:00
pkmnsnfrn	91255a6054	Removed mb labels	2024-07-27 15:49:22 -07:00
pkmnsnfrn	fb53297e64	Added documentation around OW_AUTO_SIGNPOST	2024-07-27 15:45:48 -07:00
pkmnsnfrn	0a997fa6ca	Moved follower scripts back to original position https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003538	2024-07-27 14:57:53 -07:00
Eduardo Quezada	18aff2db3b	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # asm/macros/battle_anim_script.inc # data/battle_anim_scripts.s # include/constants/battle_anim.h # src/battle_anim.c # src/data/battle_anim.h	2024-07-27 16:26:37 -04:00
Eduardo Quezada	bb471746d6	Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM (#5046 )	2024-07-27 21:41:05 +02:00
Eduardo Quezada	1e8773356c	Changed EVO_OVERWORLD_STEPS to use an EWRAM variable (#5047 ) * Changed EVO_OVERWORLD_STEPS to use an EWRAM variable * Fixed PC swapping not resetting the follower steps	2024-07-27 20:48:59 +02:00
pkmnsnfrn	1ad3ba1f32	Fixed compilations errors with abgcc	2024-07-27 10:58:51 -07:00
Bassoonian	c603e11310	Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july	2024-07-27 12:01:39 +02:00
pkmnsnfrn	91b48a10d4	Added constant for NUM_SNOWFLAKE_SPRITES	2024-07-26 21:57:42 -07:00
pkmnsnfrn	59c2eeac21	Default signpost config is off	2024-07-26 21:22:29 -07:00
Pawkkie	3c1fbbb06e	Fixes cantBeSurpressed ability check for breakable abilities (#5043 )	2024-07-26 15:57:01 -04:00
AlexOn1ine	89563cb9b1	check for breakable ability	2024-07-26 21:11:16 +02:00
hedara90	b0b63f66b9	Added Ivy Cudgel Animation (#5034 ) * Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command * Make the 20 year old compiler not complain * Maybe better cudgel * Moved animation --------- Co-authored-by: Hedara <hedara90@gmail.com>	2024-07-26 18:06:44 +02:00
pkmnsnfrn	7717812154	Clean up files	2024-07-25 20:34:14 -07:00
pkmnsnfrn	2a5f384e66	Added metatile behaviors to mart and center signs	2024-07-25 19:44:26 -07:00
pkmnsnfrn	b5c58e53de	Removed all comments	2024-07-25 19:35:28 -07:00
pkmnsnfrn	fd69ef339c	Got pokemart and pokecenter changes working	2024-07-25 19:33:07 -07:00
Martin Griffin	5b251b614c	trainerproc: Support Ogerpon	2024-07-25 14:50:32 +01:00
pkmnsnfrn	a0c5e5511c	Added gSignPostWindow_Gfx Added LoadSignBoxGfx Add LoadSignPostWindowFrameGfx	2024-07-24 19:41:36 -07:00
Eduardo Quezada	0b02527e5c	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # test/test_runner.c	2024-07-21 13:36:07 -04:00
Eduardo Quezada	9d5e253867	Improved Test Runner Summary (#4641 ) * Filename in list (no proper sorting yet) * Line number and message in error list + removed sorting * Style adjustment * Added missing file/line number to "expected N passes/successes" * Fixed Known Failing Passing test list * Separated test list from totals * Assumption fails list * Better names * Filename for KNOWN_FAILINGs passing * Moved total back to the bottom * Spaces correction * Fixed test list count * Source file for Alloc fails on tests * Moved sourceLine from BattleTest to Test struct * Fixed assumptions failed "and more" counter * Fixed ASSUMPTION block not printing their line numbers * Fixed when stopLine is printed * Renamed stopLine to failedAssumptionsBlockLine	2024-07-20 18:22:40 +02:00
tertu	5ccf3e2688	Fix chain fishing shiny rolls (#4906 )	2024-07-19 09:48:14 -05:00
Eduardo Quezada	98eb4e5027	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # asm/macros/battle_script.inc # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/frontier_util.c # test/battle/ai/ai.c	2024-07-19 09:20:05 -04:00
Alex	552e2768da	Fixes to Opportunist and Mirror Herb adjustments (#4928 ) * Replace Opportunist todo tests with proper tests * add failing test * desc * Fixes to Opportunist and Mirror Herb adjustments * more tests * some fixes * first turn events switch * simple enum + revert test desc	2024-07-19 11:01:46 +02:00
Alex	b21ffa1f9b	Changes score adjustments to tempScore increases (#4987 )	2024-07-17 23:36:15 +02:00
fakuzatsu	0625c90277	fix tests when B_USE_FROSTBITE is TRUE (#4986 )	2024-07-17 23:23:52 +02:00
pkmnsnfrn	61eff23d89	Moved menu defines to header file Added FRLG signpost border Started working on LoadSignPostWindowFrameGfx	2024-07-15 22:57:29 -07:00
pkmnsnfrn	1ae615651d	Renamed gWalkAwayFromSignInhibitTimer to gWalkAwayFromSignpostTimer	2024-07-15 22:33:31 -07:00
pkmnsnfrn	b54cf221d8	Renamed and refactored FieldInput_HandleCancelSignpost into CancelSignPostMessageBox	2024-07-15 22:13:33 -07:00
pkmnsnfrn	8445d44fb6	Renamed DoPicboxCancel to UseBlankMessageToCancelPokemonPic	2024-07-15 21:48:24 -07:00
pkmnsnfrn	b43e0e07f7	Add config to disable OW_AUTO_SIGNPOST	2024-07-15 21:45:34 -07:00
pkmnsnfrn	28183ec299	first merge of ghoul's branch	2024-07-15 21:35:58 -07:00
psf	7b3b635c67	Add AUTO_LOWERCASE_KEYBOARD (#4976 ) * Added SwapKeyboardToLowerAfterFirstCapitalLetter and AUTO_LOWERCASE_KEYBOARD * Fixed tabs and spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4976/files\#r1677868397 * Removed semicolon found by https://github.com/rh-hideout/pokeemerald-expansion/pull/4976\#discussion_r1678105502	2024-07-15 19:06:01 +02:00
Eduardo Quezada	2b40e79ac3	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # include/battle_util.h # src/battle_ai_main.c	2024-07-14 22:44:00 -04:00
sneed	6aa308e1d8	EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves (#4923 )	2024-07-14 15:35:11 +02:00
psf	5c38532281	Add B_ENEMY_THROW_BALLS, B_PLAYER_THROW_BALLS_SOUND, and B_ENEMY_THROW_BALLS_SOUND (#4953 ) * First proof of concept works * Added B_THROW_BALLS_SOUND * Made generic MonSendOut * Changed magic number to constant * added acute e and changed to GEN_LATEST * Removed tabs * Undef'd HIBYTE and removed extra bool32 * Made functions inline per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1675397114 Split into B_THROW_BALLS_SOUND B_PLAYER_THROW_BALLS_SOUND and B_ENEMY_THROW_BALLS_SOUND per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1676143761 * Reset debug script * Removed static assert per Discord conversation with Alex	2024-07-14 14:46:04 +02:00
psf	d410f56a8c	Add P_CAN_FORGET_HIDDEN_MOVE (#4968 ) * Added P_CAN_FORGET_HMS * Renamed to can forget hidden move * Bypass IsLastMonThatKnowsSurf * Fixed typo * Moved P_CAN_FORGET_HIDDEN_MOVE * Update src/party_menu.c per https://github.com/rh-hideout/pokeemerald-expansion/pull/4968#discussion_r1677033837 Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-07-14 11:23:49 +02:00
Pawkkie	c721f1b04a	Smarter Focus Punch and Substitute (#4952 ) * Smarter Focus Punch * Smarter Substitute, review feedback * Use HasAnyKnownMove instead of isFirstTurn * When are we removing agbcc again * Use HasMoveEffect	2024-07-14 08:29:27 +02:00
Bassoonian	385b7017f3	Fix fake RTC being on by default (#4965 )	2024-07-13 21:20:55 +02:00
Alex	5e2e2e9fce	Minor shouldUseGimmick refactor (#4962 )	2024-07-13 20:56:18 +02:00
psf	3e03419bdb	Add OW_FLAG_PAUSE_TIME, pausefakertc, resumefakertc and togglefakertc (#4954 ) * First concept * Fixed config file and added static assert * Reset debug scripts * Cleaned up overworld config * Renamed new Rtc pausing functions per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1675393121 * Added tabs instead of spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1676791279 * Update include/config/overworld.h --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-07-13 20:44:27 +02:00
Bassoonian	367f6dc8fd	Address concerns	2024-07-13 18:01:54 +02:00
Frank DeBlasio	d224db43c8	Consolidated Lilycove Contest Lady's values into one struct (#4951 ) * Consolidated Lilycove Contest Lady's values into one struct * Converted Lilycove Lady strings to COMPOUND_STRINGS	2024-07-13 14:44:22 +02:00
Alex	edc883d038	Refactors residual damage (#4945 ) * Refactors damage non types * correction * Refactor weather damage script * new line * correction * there was a hail test already * ndebug * add sandstorm test * Update src/battle_script_commands.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-07-13 12:12:40 +02:00
Bassoonian	003bd54600	Rename battle terrain to environment	2024-07-13 12:02:18 +02:00
psf	522a8ba3f7	Allow users to increase MAX_MONEY (#4943 ) * Added GetMaxNumMoneyDigits and GetMoneyBoxHorizontalPosition to header Replaced use of PrintMoneyAmount * Added define for MAX_MONEY_DIGITS Removed GetMaxNumMoneyDigits Converted uses of ConvertIntToDecimalStringN that called for 7 money digits to use MAX_MONEY_DIGITS Replaced 6 money digits in PrintMoneyAmount with MAX_MONEY_DIGITS * Use preproc and MAX_MONEY_DIGITS to increase the width of the sell item money box * Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS * Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS * Removed width and tilemap changes * Modified CountDigits to count digits greater than 1 Fixed PrintMoneyAmount to work with large digits * Added an early return to PrependFontIdToFit * First prototype working * Updated GetMoneyBoxHorizontalPosition with amount * Updated GetMoneyBoxHorizontalPosition with amount * Got version working with one space before * Got version working with one space before * Got version working with all spacingOC * cleaned up PrintMoneyAmount * Created CalculateleadingSpacesForMoney * Cleaned up for PR * Changed tabs to spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4943\#issuecomment-2223023365	2024-07-13 11:16:34 +02:00
Bassoonian	ef76a6b21b	Merge branch 'upcoming' into disablefollowersbydefault	2024-07-11 14:08:55 +02:00
Alex	7b6ff1b560	Fixes Trace turn order (#4941 ) * Fixes Trace turn order * Update battle_script_commands.c * Update test/battle/ability/trace.c --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-07-10 22:29:26 +02:00
psf	e953a809ff	Added OW_USE_FAKE_RTC and OW_ALTERED_TIME_RATIO (#4910 ) * Added OW_USE_FAKE_RTC, OW_ALTERED_TIME_RATIO and src/fake_rtc.c * Changed ALTERED_TIME_RATIO to GEN_LATEST * Changed spaces to tabs per https://github.com/rh-hideout/pokeemerald-expansion/pull/4910/files\#r1667111624	2024-07-10 20:58:01 +02:00
Eduardo Quezada	fb708b7ed3	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-10 10:05:10 -04:00
Eduardo Quezada	0613af5604	Untag	2024-07-10 09:47:35 -04:00
Eduardo Quezada	c0eb9af2e6	Version 1.8.5 (#4921 ) * Version 1.8.5 * Updated up to PR 4926 (squash) * Fixed descriptions (squash) * Updated up to PR4939 (squash)	2024-07-10 09:44:55 -04:00
ghoulslash	e1d8ef8190	Dynamic AI Functions (#4908 ) * dynamic ai func * add AI_TagBattlePreferFoe as an example * Update src/battle_ai_main.c * Update src/battle_ai_main.c --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-07-09 13:50:48 +02:00
ghoulslash	bd014e4fb7	syntax, alignment fixes	2024-07-08 14:15:41 -04:00
Pawkkie	0f21415130	Minor AI flag fixes / cleanup (#4924 ) * AI flag fixes / cleanup * Review feedback	2024-07-08 20:15:12 +02:00
ghoulslash	48d2bff553	merge w upcoming	2024-07-08 14:12:00 -04:00
ghoulslash	0cffe4a96a	syntax fixes, turn slow movement on rock stairs default off, remove petalburg layout change	2024-07-08 14:08:15 -04:00
Alex	637a7072f0	Add missing adjust scores (#4925 ) * Add missing adjust scores * ai log made the test fail	2024-07-08 12:05:32 +02:00
psf	4ddae07451	Removed AI_FLAG_HELP_PARTNER (#4918 )	2024-07-08 11:38:52 +02:00
Eduardo Quezada	de609a2f5b	Added missing redirect abilities Gen 3-4 config (#4920 ) * Added missing redirect abilities Gen 3-4 config * Combined 3 Battle Script Natives into 1 * Cleaner FindMonThatAbsorbsOpponentsMove	2024-07-07 09:52:59 +02:00
cawtds	5dda4b846e	fishing chain only resets on failed attempt or when map warping, encountering different species does not break the chain, differentiate between max shiny streak and max chain length	2024-07-06 15:18:51 +02:00
cawtds	3babd7f130	shiny roll calc as separate function	2024-07-06 02:10:30 +02:00
Eduardo Quezada	fcdc9ed65a	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # src/battle_util.c # src/data/pokemon/species_info/gen_7_families.h # test/battle/ability/download.c # test/battle/ability/intimidate.c # test/battle/ability/supreme_overlord.c # test/battle/ability/zero_to_hero.c # test/battle/ai/ai.c # test/battle/move_effect/plasma_fists.c	2024-07-05 14:25:25 -04:00
Pawkkie	3660a054a2	Forgot to update this when adding AI_FLAG_SEQUENCE_SWITCHING (#4911 )	2024-07-05 18:41:29 +02:00
psf	2a5e4343c8	Implemented OW_IGNORE_EGGS_ON_HEAL (#4888 ) * Implemented OW_IGNORE_EGGS_ON_HEAL * Removed videos and change nPokemon to u32 * Changed OW_IGNORE_EGGS_ON_HEAL to GEN_LATEST per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888\#issuecomment-2205271486 * Update include/config/overworld.h Fixed spelling error per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888#discussion_r1664454436 Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-07-04 16:03:42 +02:00
Alex	dd7b735211	Fixes Grassy Terrain heal turn duration (#4903 )	2024-07-03 22:53:15 +02:00
cawtds	91550eb75f	chain fishing refactored	2024-07-03 17:02:12 +02:00
Alex	594633aa15	Remove Duplicate ai code from battle_ai_util.c (#4883 ) * Remove Duplicate ai code from battle_ai_util.c * Add GetBattlerAbility in toxic self check	2024-07-03 10:48:31 +02:00
DizzyEggg	d81662daa2	Add parentheses to species egg macro (#4899 )	2024-07-02 13:39:41 +01:00
Pawkkie	7e167f0b3c	Add AI_FLAG_SEQUENCE_SWITCHING (#4878 ) * AI_FLAG_BAD_SWITCHING * Cleanup and tests, U-Turn / Baton Pass / Parting Shot aren't working properly * Fix U-Turn etc. tests * Test overhaul with Egg's suggestions * Add EFFECT_HIT_SWITCH_TARGET to tests * Review feedback * Re-review feedback	2024-07-01 08:53:07 +02:00
Frank DeBlasio	6957fc70c9	Allowed rematches to occur if I_VS_SEEKER_CHARGING isn't enabled (#4866 )	2024-06-29 22:12:26 +02:00
Frank DeBlasio	103ed85b83	Added config to prevent unobtainable Pokemon from being shiny (#4735 ) * Added config to prevent unobtainable Pokemon from being shiny * Added config for disabling shinies if the player has no Poke Balls * Removed check for adventure started flag	2024-06-29 22:07:14 +02:00
DizzyEggg	cd5a862b95	Fix Megas gaining abilities after fainting (#4873 )	2024-06-26 23:44:01 +02:00
Alex	55c13a80bc	Force species in tests (#4810 ) * Force species in tests * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> * Update include/config/test.h Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com> --------- Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-06-26 18:38:14 +02:00
Bassoonian	81bd14818e	Add day limit for forms support (#4778 ) * Add day limit for forms support * Add missing newline * Incorporate review suggestions	2024-06-26 10:36:44 +02:00
fakuzatsu	6c9dcd60bc	simple button config for the move description menu (#4860 ) * simple button config for the move description menu * change from preproc to normal if	2024-06-25 11:09:01 +02:00
DizzyEggg	f2e8482488	Fix how switch-in effects are played out after multiple faints in the same turn (#4864 ) * Multiple switch-ins after fainting * empty new lines * Fix failing tests	2024-06-24 20:37:47 +02:00
AgustinGDLV	9797640dff	Gimmick Refactor (#4449 ) * consolidated gimmick checks, triggers, communication, and activation; updated test runner * fixed improper use of .usableGimmick * cleaning up battle_dynamax.c, changing function args to u32s * fixed '#ifdef TESTING' causing errors * updated z-moves to use gimmick interface, pared down redundancies; no AI/tests * added support for z-moves in tests, consolidated gimmick fields * removed ShouldUseMaxMove and .usingMaxMove * renamed TryChangeZIndicator, updated z move display * added several z-move tests and fixed various z-move interactions; fixed z-move category calc * fixed useless battler arg in GetTypeBasedZMove * added basic test check for bad Z-Move or Mega usage * reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky * fixed gimmick test logic; fixed damage category override * fixed mega rayquaza test fail * consolidated gimmick indicator logic; added graphics to gGimmicksInfo * removed TeraData struct * reimplemented AI logic for Z-Moves; no changes * updated Z-Move and Ultra Burst trigger gfx * added testrunner check for multiple gimmick use * fixed duplicate z-move call in test * reorganized data/graphics/gimmicks.h * added signature Z-Move ability tests; implemented Guardian of Alola * fixed bad test update * fixed Thousand Arrows not affecting Tera Flying; clean-up * fixed -ate tests * fixed tera tests * fixed tera tests really * fixed last batch of tests * fixed -ate mega test again * code review * code review pt.2 * tweaked CanTera again * dynamax flag only required for player	2024-06-22 22:25:40 +02:00
DizzyEggg	d0bb03e5a9	Fix AI's right slot switching-in too early (#4851 ) * apply safe switching to trainer doubles battles - with a config * get rid of the config * make it compile	2024-06-21 12:17:12 +02:00
DizzyEggg	b9d1438162	move 3 btl ctrl player vars to gBattleStruct (#4840 )	2024-06-20 17:42:52 +02:00
ghoulslash	b8dea3c7ec	sideways stairs, try to integrate with follower code	2024-06-19 10:50:59 -04:00
ghoulslash	45da91e773	Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs	2024-06-19 10:25:50 -04:00
Eduardo Quezada	4d6452e14e	Move general config file to the config folder (#4805 )	2024-06-19 13:42:01 +02:00
kittenchilly	74f53a7e18	Fix caught wild pokemon not restoring their used held item (#4803 ) * Fix caught wild pokemon not restoring their used held item * Actually we can use the same struct	2024-06-18 20:31:03 +02:00
sneed	609754f0f6	Add RandomChance macro and ability trigger chance config (#4829 ) * RandomChance macro, contact ability chance config * Unify config, add shed skin	2024-06-18 20:13:44 +02:00
sneed	b6d3bdf622	Confusion, cursed body and poison touch trigger chance fixes and tests (#4831 ) * accurate confusion chance and a test * Accurate Poison Touch chance and tests * Accurate cursed body chance * Create cursed_body.c	2024-06-18 20:07:40 +02:00
Alex	f106b21344	Adds Toxic Chain's effect (#4823 )	2024-06-18 20:04:28 +02:00
Bassoonian	a24b767276	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun	2024-06-18 15:27:06 +02:00
Frank DeBlasio	eb0c3b0a12	Fixed instance of MAROWAX (#4830 )	2024-06-18 10:45:55 +02:00
PhallenTree	161f61284a	Use RandomWeighted; fix Test	2024-06-17 17:48:05 +01:00
DizzyEggg	203318b9a2	Get rid of hardcoded stat raise anim values (#4825 )	2024-06-17 13:51:04 +02:00
sneed	e64a2f3e25	Roamer's frostbite carries over between battles (#4822 )	2024-06-17 11:44:47 +02:00
ghoulslash	cb1696384c	merge in original dexnav code with some rhh specific tweaks	2024-06-16 10:39:28 -04:00
ghoulslash	652cb007ce	merge w pret master, add USE_DEXNAV_SEARCH_LEVELS flag	2024-06-16 09:45:38 -04:00
Eduardo Quezada	1eb0b3261f	Added option to disable species cries (#4791 ) * Added option to disable cries * Update src/pokemon.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-06-15 22:07:13 +02:00
Bassoonian	22994c79d4	Add support for multiple roamers (#4762 ) * Replicate initial commit * Integrate the rest of Duke's vanilla commits * Alter Roamer struct to add frostbite support * Fix some indentation issues * Add option to hide substitute followers * Revert "Add option to hide substitute followers" This reverts commit 3fadaafae50aeb48c089d5a27af6deca9580ff64. * Incorporate feedback	2024-06-15 11:17:32 +02:00
Alex	3ec8691590	Fixing my mess [correct hex in speciesInfo] (#4800 )	2024-06-14 11:15:18 +02:00
Alex	9f7222e48b	Species info hex (#4798 ) * Adds missing hex in speciesInfo * fix * review * fix compiling * dumb mistakes	2024-06-14 10:20:27 +02:00
Eduardo Quezada	88028c0c37	Split Pokémon Object Events from Following Pokémon functionality (#4761 ) * Split Pokémon Object Events from Following Pokémon functionality * Renamed follower pngs and palettes * Define renames * Reorder configs * Renaming: SpeciesInfo fields, macros and palettes.	2024-06-13 22:46:27 +02:00
DizzyEggg	84d13d0abf	Fix Smack Down anim + move anim tests (#4774 ) * Fix Smack Down anim + move anim tests * really agbcc * fix undefined reference * hopefully everything works	2024-06-13 15:30:28 -04:00
ghoulslash	353727a805	Add createmon Script Cmd, Support for 2v1Wild Battles (#4688 ) * add createmon and setwilddoubleflag script cmds to support createing mons at given player or enemy slots and setting up 2v1 battles * give givemon macro PARTY_SIZE for tests * style fixes * add createmon test --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-06-13 19:11:36 +02:00
Eduardo Quezada	06153e4280	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # include/battle.h # include/constants/battle_script_commands.h # include/constants/pokemon.h # src/battle_ai_util.c # src/battle_main.c # src/battle_util.c # test/battle/ai.c	2024-06-13 11:44:28 -04:00
Bassoonian	03cc0ae6b3	Add option to hide substitute followers (#4765 ) * Add option to hide substitute followers * Update event_object_movement.c	2024-06-12 13:53:01 -04:00
Bassoonian	76c566a0ca	Add the Let's Go evolution method (#4758 ) * Add overworld step evolution method * Increase evolutionTracker bits from 9 to 10 * Implement tracker increase * Remove leftover NDEBUG activation * Reset evolution tracker data upon evolution * Revert an accidental change to unrelated code * Add missing break in switch case, oops	2024-06-12 11:31:19 +02:00
Alex	9c72392891	Fixes Shell Side Arm (#4753 ) * Fixes Shell Side Arm * Fixes to random call * hardcoded the effect to the move * minor change * minor change 2 * applied reviews	2024-06-12 11:21:44 +02:00
Bassoonian	dffaaeaaa6	Add Leader's Crest evolution method (#4768 ) * Add Leader's Crest evolution method * Fix typo in in HGSS dex * Update src/pokedex_plus_hgss.c Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com> * Update src/battle_script_commands.c --------- Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com> Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-06-12 09:31:59 +02:00
cawtds	4724b5dfd6	Improved Surf/Thunderbolt test (#4764 ) * improved Surf/Thunderbolt test that previously relied on correct AI guess * remove unnecessary mod * fixed infinite rng loop * wrong ability num and readability * Update src/battle_ai_util.c --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-06-12 09:09:15 +02:00
Bassoonian	341fa3692c	Make Tandemaus only evolve at the end of battles (#4759 )	2024-06-12 08:43:51 +02:00
Bassoonian	5fe0aee063	Add config to turn off two-framed front sprites (#4750 ) * Add config to turn off two-framed front sprites * Two frames should be on by default * Simplifies integration	2024-06-11 13:10:23 -04:00
sneed	821d5dccab	AI calculates/stores minimum possible move damage and uses it with AI_FLAG_TRY_TO_FAINT (#4760 ) * AI uses safest option to faint foes * dont calculate non crit dmg unless it's needed * struct SimulatedDamage * add GetDamageByRollType and name DamageRollType * Parametrize test AI flags * use simDamage member's instead of dmg & minDmg	2024-06-11 18:28:16 +02:00
Eduardo Quezada	64f82cdd5f	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # src/battle_ai_util.c # src/battle_util.c	2024-06-11 08:12:03 -04:00
sneed	1ca4676c4c	fix ai crit calculations	2024-06-09 23:09:34 +03:00
Eduardo Quezada	7df0219003	BW2 Style Map Pop-Ups (#4396 )	2024-06-09 16:03:41 -04:00
Bassoonian	bbc05234b9	Make Pokémon Sprite Visualizer name official (#4745 ) * Rename files to PSV * Rename functions and defines * Add missing newlines * Integrate feedback	2024-06-09 12:12:35 -04:00
Alex	d83f90d51f	Tera Shell AI calcs (#4742 ) * Tera Shell AI calcs * agbcc	2024-06-08 20:56:20 +02:00
Alex	78f1da4131	Adds 1 vs 2 macro (#4741 )	2024-06-08 09:49:28 +02:00
Bassoonian	568ce39c5d	Adds forbidden status parameter to FORM_CHANGE_ITEM_USE (#4738 )	2024-06-08 07:36:39 +02:00
sneed	f1911dae59	Fix mycelium might and ability shield (#4740 ) * Fix mycelium might and ability shield * fix check	2024-06-08 07:27:44 +02:00
sneed	2cc2dc01ca	Fix daycare move transferring between evolved mons and allow sharing moves between different forms of the same species (#4479 ) * Fix daycare move transferring between evolved mons Also allow sharing moves between different forms * Make sure Snorlax gets Snorlax's egg moves instead of Munchlax's * Use GET_BASE_SPECIES_ID * Actually fix Snorlax/Roselia/etc behavior * remove preproc checks * rename ambiguous GetEggMovesSpecies function * remove extra indentation, add incense breeding check * update comment * Update src/daycare.c --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-06-07 21:54:58 +02:00
Bassoonian	d6422da284	Fix partner palette problem (#4736 )	2024-06-07 21:05:16 +02:00
sneed	fa81861593	Add newer generation Heal Bell interactions with Soundproof (#4732 ) * newer generation soundproof heal bell interactions * Fix bugs and rewrite AnyPartyMemberStatused * add missing check, tests, clean up * fix ai code and rename battler for clarity	2024-06-07 18:51:21 +02:00
Bassoonian	8e15603fbc	Fix center crash (#4725 )	2024-06-05 11:52:42 +02:00
Bassoonian	f4c890df1e	Disable OW followers by default	2024-06-04 15:37:02 +02:00
kittenchilly	7f8f480ecb	Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types (#4438 ) * Add FORM_CHANGE_BATTLE_TERASTALLIZATION and allow species to force tera types * Fix form change not changing tera type * Update form_species_tables.h * Address reviews * Can't change the forced Tera Type anymore * Revert "Can't change the forced Tera Type anymore" This reverts commit 67157250efeaf5ffefc45ac1955b09f27f09788b. * Fix a lot of things * Oops * Update pokemon.h * Update pokemon.h * Address reviews * Update tera_starstorm.c * Update test/battle/gimmick/terastal.c --------- Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-06-04 13:38:49 +02:00
sneed	87e2526665	Add switching message macros for tests (#4717 ) * Add switching message macros * Add test	2024-06-03 19:59:28 -04:00
RavePossum	69b367e350	PR feedback - 32 bit params, multiline condition formatting	2024-06-03 00:10:10 -04:00
Eduardo Quezada	ee1d14755a	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-06-02 11:06:41 -04:00
Alex	4eda5f61af	Use 9th roll instead of average in AI calcs (#4679 ) * Use 9th roll instead of average in AI calcs * damage_roll * duke suggestion	2024-06-02 15:36:12 +02:00
cawtds	97143e020f	Refactor move animations (#4683 ) * fix getboxmondata for evolutiontracker if compiled with agbcc * refactored move animation scripts as part of gMovesInfo * migration script for move anims * default animation, migration for battle_anim_scripts.s * added warning for missing animation * add include to migration * add struct member in migration script * removed include and struct member from migration script --------- Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>	2024-06-02 08:18:13 +02:00
Eduardo Quezada	1359966a14	Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers # Conflicts: # src/event_object_movement.c # src/scrcmd.c	2024-06-01 20:17:19 -04:00
Ariel A	d6762d4dbc	Merge branch 'lighting' into lighting-expanded-id	2024-06-01 15:22:21 -04:00
Ariel A	d410ca6999	Merge branch 'followers' into lighting	2024-06-01 15:21:57 -04:00
Ariel A	e420f99fc3	Merge branch 'followers' into followers-expanded-id	2024-06-01 15:20:56 -04:00
Ariel A	3727be9511	fix: fixed a few oversights with follower message generation	2024-06-01 14:46:45 -04:00
Eduardo Quezada	0be643a517	Set TYPE_NONE as type 0 + other type data tweaks (#4462 ) * Set TYPE_MYSTERY as type 0 * Remove redundant TYPE_NONE * Moved Gen 1-3 type damage categories to gTypesInfo * Set TYPE_NONE as 0 instead * Grouped type info to a single file * Fixed sTypeEffectivenessTable static name * Adjusted MON_DATA_TERA_TYPE to account for shift in type IDs * oops, missed the extern * Moved Tera Type RGB values to gTypesInfo * Fixed Tera Type test * Added option test feature to set IVs * Hidden Power type test * Tera Type safeguard in givemon * Removed isHiddenPowerType for a future PR that refactors Hidden Power * Review changes	2024-06-01 07:38:22 +02:00
Eduardo Quezada	c79188e3b3	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # src/battle_ai_util.c # src/battle_util.c	2024-05-31 12:04:33 -04:00
Bassoonian	e3959a764b	Rename MgbaPrintf_ to Test_MgbaPrintf (#4642 )	2024-05-31 17:54:25 +02:00
sneed	e869aaf70b	Add global constants for damage roll related code and make AverageRollDmg faster (#4663 ) * faster AverageRollDmg, global dmg roll constants * restore MAX_ROLL_PERCENTAGE & MIN_ROLL_PERCENTAGE * rename AverageRollDmg	2024-05-31 16:56:17 +02:00
Alex	d55e072747	Adds AI_IsFaster and AI_IsSlower functions (#4671 )	2024-05-31 12:55:15 +02:00
Bassoonian	52d45674f0	Move Descriptions in battle (#4152 ) * Port xaman move desc to modern expansion * Fix modern compiler error * Fix compliling + EFFECT_PLACEHOLDER support * Change to L-button to avoid conflict with Mega Evolution * Reorder and change priority to category * add sprite for move category icon, declare category icon sprite data extern * remove static category icon sprite data from hgss dex for global data * Change to else if --------- Co-authored-by: Pawkkie <moog272@gmail.com> Co-authored-by: RavePossum <ravepossum@proton.me>	2024-05-31 12:10:03 +02:00
Alex	462dca0c09	Remove temp scores in AI_CalcMoveEffectScores (#4655 )	2024-05-30 09:54:24 +02:00
ghoulslash	7b1248b167	add savedBattlerAttacker and stack for saved target/attacker (#4061 ) * add saveattacker/savetarget stack * add safety checks to savedAttackerCount/savedTargetCount * add testing warnings for saveattacker/savetarget * update frisk with saveattacker * restoretarget at end of red card battle scripts, remove testing checks on SaveAttacker,SaveTarget --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-05-29 21:50:24 +02:00
Pawkkie	a0006d8dfb	AI_FLAG_RISKY Improvements (#4648 ) * #defines for damage roll bounds * Risky AI behavior implemented * Ignore score penalty to EFFECT_RECOIL_IF_MISS moves if accuracy has been lowered * Adjust score defines * EFFECT_MIND_BLOWN * Use GetBestDmgMoveFromBattler instead of AI_CompareDamagingMoves	2024-05-29 19:54:18 +02:00
Eduardo Quezada	ff480dec27	More review comments	2024-05-28 18:32:20 -04:00
Eduardo Quezada	021074cd2e	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers # Conflicts: # src/data/graphics/pokemon.h # src/data/pokemon/species_info.h # src/data/pokemon/species_info/gen_1_families.h # src/data/pokemon/species_info/gen_2_families.h # src/data/pokemon/species_info/gen_4_families.h # src/data/pokemon/species_info/gen_5_families.h # src/data/pokemon/species_info/gen_8_families.h	2024-05-28 14:28:33 -04:00
Eduardo Quezada	8854eaa880	Removed duplicated object event tags	2024-05-28 14:16:34 -04:00
Alex	7a393a974a	Adds Dragon Darts effect (CFRU port) (#4612 ) * Adds Dragon Darts effect (CFRU port) * fix test compile * review	2024-05-28 11:34:56 +02:00
Alex	df6fab7284	Missing ignoreSubstitute flags (#4623 ) * Missing ignoreSubstitute flags * update defog flag	2024-05-28 10:29:37 +02:00
Pawkkie	be2517415b	Damage roll selection in AI_CalcDamage (#4615 ) * Damage roll selection and AI_FLAG_CONSERVATIVE * Clarify enum names * Simplify AverageRollDmg line * Change u8s to u32s * Turns out Boomburst does a lot of damage lol * Spacing	2024-05-28 10:21:25 +02:00
hedara90	d999092689	Upgraded Dragon Darts Animation (#4620 ) * Upgraded Dragon Darts Animation * Fixed Dragon Darts not workin in link battles * Apply suggestions from code review Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> --------- Co-authored-by: Hedara <hedara90@gmail.com> Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-05-28 10:17:52 +02:00
Eduardo Quezada	80b193280d	Merge branch '_RHH/master' into _RHH/upcoming # Conflicts: # src/battle_main.c # src/data/item_icon_table.h # src/data/pokemon/species_info/gen_9_families.h	2024-05-27 10:13:42 -04:00
Eduardo Quezada	069161b716	Untag release	2024-05-27 09:31:06 -04:00
Eduardo Quezada	767a1c7937	Version 1.8.4 (#4639 ) * Version 1.8.4 * Missing labels	2024-05-27 09:06:34 -04:00
Philipp AUER	431cb64b3e	Pre-1.8.4 pret merge (2024/05/26) (v2) (#4637 )	2024-05-27 12:40:41 +02:00
Eduardo Quezada	acd62b0065	Reverted bad implementation of Sparkling Aria+Covert Cloak/Shield Dust (#4634 )	2024-05-27 06:38:05 +02:00
Eduardo Quezada	9e72271c8e	Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526 # Conflicts: # src/battle_anim_poison.c # src/pokemon.c # src/pokemon_icon.c	2024-05-26 18:34:26 -04:00
Pawkkie	c279aa23c6	Belch AI Scoring Fix (#4616 ) * Belch scoring fix and test * Add assumptions for pocket * Update test to AI_SINGLE_BATTLE_TEST * Alex's fixes * Missed reverting a line * Mucked up spacing mb * Mucked up the spacing fix mb MB	2024-05-26 22:23:04 +02:00
sneed	b592c6eae5	Add POKE_ICON_BASE_PAL_TAG to a header	2024-05-23 02:45:22 +03:00
Alex	ba07d2b3d4	Renames evolution methods the were labeled as evo level (#4607 ) * [FIX] EVO_LEVEL_MOVE_TWENTY_TIMES -> EVO_USE_MOVE_TWENTY_TIMES * rename evo_level_recoil_damage * change EVO_LEVEL_ITEM_COUNT_999	2024-05-22 11:06:24 +02:00
Ariel A	ed98b0b8ba	fix: added shadows on direct corner map Fixed #18	2024-05-21 22:12:03 -04:00
Eduardo Quezada	14ab00cfeb	Moved message counts to their own file + remove unneeded include	2024-05-21 22:04:22 -04:00
Eduardo Quezada	9fc7e37c73	Comment updates	2024-05-21 19:38:42 -04:00
Eduardo Quezada	2fe18c22f9	Style fixes	2024-05-21 18:57:09 -04:00

... 9 10 11 12 13 ...

7396 Commits