2186 Commits

Author	SHA1	Message	Date
cawtds	cf6cee281f	expansion sync: battle_anim_bugs	2025-01-20 17:27:52 +01:00
cawtds	44861c9d18	fix UB when accessing move result flags	2025-01-15 18:05:22 +01:00
cawtds	3625b33c9b	updated battle animations	2025-01-13 18:19:09 +01:00
cawtds	19ea13caa7	sync battle.h	2025-01-09 01:04:49 +01:00
cawtds	c393f5dc07	sync battle_controllers.c	2025-01-07 21:52:43 +01:00
cawtds	a027c98cd9	update player controller	2025-01-06 23:08:33 +01:00
cawtds	dfa6461aa3	more expansion alignment: librfu, makefile and potential unaligned fixes	2025-01-05 23:07:13 +01:00
cawtds	a613203bf1	update cries, fix failing tests with speedup, align a few files with expansion	2025-01-05 13:00:26 +01:00
cawtds	40cf1bab25	update and fix tests	2025-01-04 19:05:19 +01:00
cawtds	9658e4c520	battle engine update 2025-03-01	2025-01-04 13:44:47 +01:00
GriffinR	587d494421	Merge branch 'porymap-6' into generate-map-constants	2024-12-17 20:48:28 -05:00
GriffinR	b10c2f7584	Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6	2024-11-26 12:47:28 -05:00
GriffinR	2a3e92e10f	Sync Makefile and common syms (#676)	2024-11-26 12:46:12 -05:00
GriffinR	d4eee4692f	Generate region_map_sections from JSON (#677)	2024-11-26 12:45:53 -05:00
cawtds	1038a1c2e9	add snow effects for tire, bug, and spot tracks	2024-11-22 12:33:43 +01:00
cawtds	2895511a66	snow slither tracks	2024-11-22 12:21:13 +01:00
cawtds	83cedefad6	ground effect enum	2024-11-22 12:01:31 +01:00
cawtds	8b6daddb88	small ground effect refactoring	2024-11-22 11:35:44 +01:00
cawtds	d284a2bde1	fake rtc changes	2024-11-22 11:07:55 +01:00
cawtds	102445f1c7	fake rtc datetime	2024-11-20 14:20:32 +01:00
cawtds	45ca6405b8	fixed watering animation, fixed fake rtc	2024-11-19 19:27:35 +01:00
cawtds	e5b3b705b2	fixed berry tree palettes and added grow sparkle	2024-11-19 14:19:56 +01:00
cawtds	109100b5a1	first working berry tree implementation	2024-11-19 13:51:07 +01:00
cawtds	1c0e0c3e4a	delete field_weather_util, finish syncing field_weather_effects	2024-11-18 14:33:58 +01:00
cawtds	229bca64ea	field_weather_effects.c up to snow	2024-11-18 13:31:07 +01:00
cawtds	dc009d2c6c	renamed to sync with emerald	2024-11-18 12:08:33 +01:00
cawtds	e3242907b0	added drought, aligned with emerald	2024-11-18 10:48:31 +01:00
cawtds	5bce2e483e	added FLDEFF_NONE, use enum FieldEffect where appropriate	2024-11-17 00:26:53 +01:00
cawtds	7802fed176	rename functions	2024-11-16 22:57:53 +01:00
cawtds	c6bdd950e0	config for hm-less field moves, more field move/effect refactoring	2024-11-12 17:50:44 +01:00
cawtds	c51ef0c13c	field move refactoring: FieldMoveInfo	2024-11-06 17:49:22 +01:00
cawtds	9726946f54	remove field effect object templates array, refactor and fix track ground effects	2024-11-05 21:42:07 +01:00
cawtds	32a7bb7279	refactor field effects	2024-11-05 00:07:47 +01:00
cawtds	77b929f00b	add missing gender difference implementations	2024-11-03 18:26:00 +01:00
cawtds	81734961e7	update battle anims, rename scripts	2024-11-03 17:12:44 +01:00
cawtds	1890427455	gen4 shadows	2024-11-03 15:02:17 +01:00
cawtds	c096471c2b	fix some strings, update configs files	2024-11-03 02:32:58 +01:00
cawtds	e5bd75c3dd	ignore layouts and map_groups	2024-11-02 17:03:17 +01:00
cawtds	0ee4a53cfc	update tools	2024-11-02 16:59:57 +01:00
cawtds	dae2ae18d4	fixed remaining tests: updated battle string, added missing ability/item/move effects, clean up leaking tasks during testing	2024-11-02 13:26:33 +01:00
cawtds	0f7e42c75f	strange ball and ball refactoring	2024-11-02 01:11:47 +01:00
cawtds	d907b9fe36	update tests + makefile	2024-11-01 23:46:21 +01:00
cawtds	a50af80042	expansion update	2024-11-01 20:21:22 +01:00
cawtds	95a84ba33b	Merge pull request #27 from cawtds/overworld_seasons ... Overworld seasons	2024-11-01 14:04:49 +01:00
cawtds	1acbaa40b4	whitespace	2024-11-01 12:48:09 +01:00
cawtds	967e25717f	snow footprints	2024-10-31 23:13:46 +01:00
cawtds	496df3b86f	seasonal battle backgrounds for grass terrain	2024-10-31 17:30:37 +01:00
cawtds	104fb91f57	finished primary tilesets and fixed grass effects	2024-10-29 00:01:05 +01:00
cawtds	8e0464eb22	improved seasonal tilesets, added overworld config for seasons, added handling for secondary tilesets	2024-10-25 00:25:19 +02:00
GriffinR	50babdb07f	Move local IDs to map.json	2024-10-15 02:51:08 -04:00
GriffinR	a2e408cf4e	Add support for local IDs in map.json	2024-10-14 22:44:16 -04:00
GriffinR	bb50006fc9	Move heal locations data to their associated map.json (#673)	2024-10-11 15:17:18 -04:00
cawtds	626b62a01d	fix ogerpon mask test, remove shortened item names	2024-09-28 22:42:29 +02:00
cawtds	bca079bcbd	updated battle engine	2024-09-28 21:22:27 +02:00
cawtds	0c1bd3a6c9	season tilesets (experimental)	2024-09-20 19:48:29 +02:00
GriffinR	d45b94ea64	Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6	2024-09-18 19:40:41 -04:00
cawtds	89e57d753b	remove gflib again	2024-09-18 20:13:51 +02:00
cawtds	2ff6311c44	dns	2024-09-17 18:00:38 +02:00
GriffinR	93b4a7b815	Toolchain sync fixes	2024-09-12 17:49:50 -04:00
GriffinR	2ed7806380	Deleted generated constants, add midi.cfg	2024-09-12 12:58:22 -04:00
cawtds	7aa0c9b46e	remove buy_menu_helpers	2024-09-05 16:19:04 +02:00
cawtds	dd8f38f18e	massive refactoring: removed new_menu_helpers and aligned with expansion	2024-09-04 23:41:17 +02:00
cawtds	4cf855947c	move functions from new_menu_helpers to text	2024-09-04 18:04:35 +02:00
cawtds	880b5a377f	remove B_ANIM_STATUS_WRAPPED	2024-09-01 14:04:30 +02:00
cawtds	838c5bcb1b	battle anim scripts refactor	2024-09-01 12:40:19 +02:00
cawtds	a468febc86	sirfetchd	2024-08-29 15:24:02 +02:00
cawtds	61e7e2fde2	rename parameters	2024-08-28 21:32:38 +02:00
cawtds	85476a7fc2	renaming in item_menu_icons for expansion alignment	2024-08-28 21:27:01 +02:00
cawtds	c9e7438bef	item_icon refactor	2024-08-28 21:03:11 +02:00
cawtds	ed7136cfc5	item_menu refactoring	2024-08-28 18:53:52 +02:00
cawtds	cbc887c4d9	item_menu_icons as seperate file from item_icon	2024-08-28 18:28:27 +02:00
cawtds	79039b36ca	updated move animations	2024-08-28 17:53:38 +02:00
cawtds	cf65dc485c	renamed item_menu_icons to item_icon	2024-08-28 16:18:17 +02:00
cawtds	5d5021d9c9	some battle_main renaming	2024-08-28 14:42:08 +02:00
cawtds	130e97e663	tmhm enum refactor	2024-08-28 14:06:58 +02:00
cawtds	5095883b8f	port trainerproc from expansion	2024-08-28 12:33:20 +02:00
cawtds	435f8ebda4	updated battle engine to 0bb43626afe2cdc6f9bdd7c246e2dca7198ddab3	2024-08-27 21:05:49 +02:00
GriffinR	5e464c2091	Sync map macro change with pokeemerald	2024-08-27 13:57:07 -04:00
cawtds	66848f6f25	added font short	2024-08-27 16:31:38 +02:00
cawtds	7b586efed1	separate fonts file	2024-08-27 16:00:07 +02:00
cawtds	576e056c77	refactored trainer front sprite + mugshots	2024-08-26 14:11:38 +02:00
cawtds	44d838354b	trainer backsprite refactoring	2024-08-26 11:40:58 +02:00
cawtds	d190503fa1	save block restructuring	2024-08-25 19:48:39 +02:00
cawtds	e63dec5389	remove encryption key	2024-08-25 17:39:31 +02:00
cawtds	513b64ec74	removed pokedex flag anticheat	2024-08-25 12:52:45 +02:00
cawtds	ded2f6aac5	reorder ghost battle type	2024-08-25 12:52:13 +02:00
cawtds	3b21783b94	reformatted includes	2024-08-24 16:52:58 +02:00
cawtds	77ed8799df	merged window_8bpp.c into window.c and refactored	2024-08-24 12:40:41 +02:00
cawtds	b02dc89213	refactored text_window.c and aligend more closely with emerald	2024-08-23 14:51:09 +02:00
cawtds	f662ee4d95	emerald changes	2024-08-23 09:46:27 +02:00
cawtds	53cbbc684a	saveblocks	2024-08-23 00:54:58 +02:00
cawtds	af8a8d4024	main.c and adjacent refactoring	2024-08-23 00:00:12 +02:00
cawtds	4afb2c96cb	vblankCounter1 to non-pointer	2024-08-22 22:47:17 +02:00
cawtds	782a8252b9	merged battle types with emerald	2024-08-22 18:53:55 +02:00
cawtds	56627fac50	fix compiler warning	2024-08-22 15:55:58 +02:00
cawtds	a5990e88b1	rtc refactoring	2024-08-22 15:29:05 +02:00
Kurausukun	bceff5fb5f	add constant for 3 main bag pockets	2024-08-12 14:33:52 -04:00
cawtds	9c33fc4662	better solution	2024-08-11 23:31:03 +02:00
cawtds	8072cfe7af	fix pc spawning on specific tiles when using boxlink/debug pc access	2024-08-11 22:06:40 +02:00
cawtds	de72056f0d	fix ghost unveil animation	2024-08-11 12:53:57 +02:00
cawtds	3a8a54768f	updated tests	2024-08-10 19:57:06 +02:00
cawtds	cab873540b	updated to aeb9da337e506cae3548b23b507ddb89c5975014	2024-08-10 19:12:03 +02:00
cawtds	b57a8c2193	frlg fishing	2024-08-10 18:02:39 +02:00
cawtds	1befedae1d	added emerald and bw popups and remaining ow configs	2024-08-04 01:02:13 +02:00
cawtds	c550702899	implemented more ow configs	2024-08-03 16:03:33 +02:00
cawtds	f1516bee05	refactoring	2024-08-03 15:26:36 +02:00
cawtds	557ae12ffb	added battle_controller_player_partner, added functionality for BATTLE_TYPE_INGAME_PARTNER with multi_2_vs_2, fixed issues in battle_controller_opponent	2024-08-03 13:41:35 +02:00
cawtds	87b7d73494	add saveblock3 and fake rtc	2024-07-31 22:50:31 +02:00
cawtds	86ba8a24fe	OW_SYNCHRONIZE_NATURE + scripted wild double battle	2024-07-31 22:14:03 +02:00
cawtds	db82cdbff4	implemented OW_PC configs	2024-07-31 21:45:23 +02:00
cawtds	cc1f18abee	removed unused	2024-07-31 19:45:37 +02:00
cawtds	768ce26cbe	added trainer slide, fixed follower and trainer see font color, refactoring	2024-07-31 19:35:20 +02:00
cawtds	55b67e23ee	added trainer see double battle and more overworld configs	2024-07-28 12:47:27 +02:00
cawtds	2d09a14b02	pokemon config updates	2024-07-25 17:38:50 +02:00
cawtds	f02068e163	implemented fishing minigame and proximity	2024-07-25 00:15:18 +02:00
cawtds	21e1858fed	fix chain fishing	2024-07-24 22:43:49 +02:00
cawtds	e7629e6d12	update general config	2024-07-24 22:34:01 +02:00
cawtds	fdab07c3d6	change default	2024-07-24 21:33:58 +02:00
cawtds	1f11ff06e9	add last used ball feature	2024-07-24 21:25:31 +02:00
cawtds	c48d2b698e	added move description window	2024-07-24 20:34:30 +02:00
cawtds	b2d370ef10	added missing battle configs	2024-07-24 20:06:13 +02:00
cawtds	4975ea2144	refactor legendary battle flags	2024-07-23 22:25:34 +02:00
cawtds	9893bf8ef2	remove unused field	2024-07-23 20:53:51 +02:00
cawtds	48552f6c12	update tests/test framework + failed test	2024-07-23 19:54:49 +02:00
cawtds	f2174c41d4	AI updates	2024-07-23 18:30:33 +02:00
cawtds	4af1168627	battle engine updates	2024-07-23 18:18:50 +02:00
cawtds	fe39593c85	level caps	2024-07-22 18:35:42 +02:00
cawtds	0862865c96	fix player palette after hall of fame	2024-07-21 15:01:29 +02:00
cawtds	cb94efc976	readd clone events	2024-07-20 19:19:10 +02:00
cawtds	e80324f8d3	fix palettes	2024-07-20 17:41:56 +02:00
cawtds	d40b9bc855	fix palette issue after questlog	2024-07-17 19:24:39 +02:00
cawtds	eb9c5bdf35	refactoring	2024-07-11 16:14:16 +02:00
cawtds	3da84fc317	first working version with followers, OW_GFX_COMPRESS not functional	2024-07-09 19:32:58 +02:00
cawtds	f0c9e5beb4	added missing configs and implemented item configs	2024-07-02 23:15:22 +02:00
cawtds	168bafaccb	terrain refactor	2024-07-02 20:51:55 +02:00
cawtds	b3238d716f	removed unused vars	2024-07-02 18:43:54 +02:00
cawtds	7ca12420f4	added mon animations to trainer battles, wild encounters and sprite visualizer	2024-07-02 18:36:30 +02:00
cawtds	e376427760	updated tests to upcoming and fixed failing tests	2024-06-29 04:37:30 +02:00
cawtds	6b0fe47b6c	gimmick not usable repeatably, properly show and hide gimmick indicator, config for hiding hp bar during move anim, reload shadow in ReloadBattlerSprites	2024-06-29 01:52:27 +02:00
cawtds	b8ad2ce1a2	compiles	2024-06-29 00:37:43 +02:00
cawtds	e26a2249b2	pret merge	2024-06-28 15:26:36 +02:00
cawtds	cd65c6126e	added all battle animations	2024-06-28 03:44:48 +02:00
cawtds	6b219245f1	palette.c refactoring from expansion	2024-06-27 23:36:54 +02:00
cawtds	de242b19a1	allow 6 digit shop price	2024-06-25 15:41:20 +02:00
cawtds	13b2103ba9	revert dev changes: ... - wild encounters - viridian city mart - starting money - move tutor route 2 - test battle route 2	2024-06-25 12:58:01 +02:00
cawtds	a0675f17c6	sMapTilesBackup as pointer to free up EWRAM	2024-06-24 13:59:46 +02:00
cawtds	62572fadaa	added move category icon to summary	2024-06-23 13:20:30 +02:00
GriffinR	c6a2f50491	Merge pull request #657 from aarant/master ... Linkerscript now tracks RAM/ROM usage	2024-06-22 12:02:35 -04:00
GriffinR	21e8a142db	Revert section rename	2024-06-22 11:58:39 -04:00
GriffinR	9b2fc69e5e	Merge pull request #656 from SatoMew/misc-fixes ... Spring cleaning	2024-06-22 11:46:13 -04:00