Commit Graph

367 Commits

Author SHA1 Message Date
cawtds
69366e22b9
[SAVEBREAKING] Refactor/remove battle tower (#107) 2026-02-02 18:28:36 +01:00
cawtds
8494999c31 update makefile and tools 2025-11-19 22:07:16 +01:00
cawtds
65d9a1b71e update debug menu 2025-05-30 17:17:13 +02:00
cawtds
92962fef08 update battle engine 2025-05-30 01:17:44 +02:00
cawtds
3ab6e9bc1e Merge 'pret/master' into porymap6-pret-merge 2025-05-28 17:11:40 +02:00
GriffinR
82d2283108 Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6 2025-05-14 11:52:22 -04:00
cawtds
3fb74b2997 sync mapsecs 2025-05-03 14:29:30 +02:00
cawtds
961a5d26d7 fix dark palettes after fadescreen 2025-03-08 16:36:16 +01:00
cawtds
fcd2bd2107 Merge remote-tracking branch 'pret/master' into pret-merge 2025-02-12 18:15:52 +01:00
GriffinR
5f9f173b6a Generate heal location constants automatically, move data back to a single file. 2025-02-03 16:00:29 -05:00
Kevin
d844877218
Rename the Move Relearner specials. (#684)
Some checks failed
CI / build (push) Has been cancelled
2025-01-19 14:14:55 -05:00
cawtds
f7c12bc4f0 seasonal tilesets for indigo plateau 2024-10-31 17:51:33 +01:00
cawtds
9cb5babcf8 seasonal tilesets for berry forest 2024-10-30 22:09:25 +01:00
cawtds
bc31c638b5 winter tileset for sevii islands 123 2024-10-29 22:46:08 +01:00
cawtds
e7aac8032d seasonal tilesets for celadon city 2024-10-29 21:16:16 +01:00
cawtds
35e33c00bc seasonal tilesets for saffron city 2024-10-29 20:50:49 +01:00
cawtds
8888724d6d seasonal tilesets for lavender town 2024-10-29 19:42:47 +01:00
cawtds
104fb91f57 finished primary tilesets and fixed grass effects 2024-10-29 00:01:05 +01:00
GriffinR
94b8dc79de Use LOCALID constants for clone's target_local_id 2024-10-16 15:27:53 -04:00
GriffinR
50babdb07f Move local IDs to map.json 2024-10-15 02:51:08 -04:00
GriffinR
4dc5c47799 OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA 2024-10-14 22:48:30 -04:00
GriffinR
bb50006fc9
Move heal locations data to their associated map.json (#673) 2024-10-11 15:17:18 -04:00
cawtds
0c1bd3a6c9 season tilesets (experimental) 2024-09-20 19:48:29 +02:00
cawtds
2ff6311c44 dns 2024-09-17 18:00:38 +02:00
GriffinR
5e464c2091 Sync map macro change with pokeemerald 2024-08-27 13:57:07 -04: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
cb94efc976 readd clone events 2024-07-20 19:19:10 +02:00
cawtds
b8899f6c2e convert clone_events to object_events 2024-07-20 17:12:17 +02:00
cawtds
d40b9bc855 fix palette issue after questlog 2024-07-17 19:24:39 +02:00
cawtds
3da84fc317 first working version with followers, OW_GFX_COMPRESS not functional 2024-07-09 19:32:58 +02:00
cawtds
e26a2249b2 pret merge 2024-06-28 15:26:36 +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
GriffinR
b2e2648d15 Use C preprocessor directives 2024-06-22 11:51:16 -04:00
cawtds
7200d3d552 debug menu 2024-06-19 16:58:28 +02:00
cawtds
57686b5aed tera working without animations 2024-06-18 19:11:22 +02:00
cawtds
f55636b549 added lure functionality, fixed update repel counter 2024-06-05 22:55:36 +02:00
cawtds
53424164c0 added exp share gen6+ functionality 2024-06-04 22:04:22 +02:00
cawtds
90f3b961a6 refactor fresh start mochi item use 2024-06-04 21:20:55 +02:00
cawtds
cb64e6f676 added box link functionality 2024-06-04 21:06:27 +02:00
cawtds
76ce909146 added honey functionality 2024-06-02 23:36:50 +02:00
cawtds
260383969f implemented fusion item functionality 2024-06-02 18:56:27 +02:00
cawtds
1002d2cabd fixed regional variant breeding 2024-06-02 09:39:24 +02:00
cawtds
b5695ea8e5 added rotom catalog and zygarde cube functionality 2024-06-01 22:30:07 +02:00
cawtds
d7519b540e dynamax candy functionality 2024-06-01 21:12:29 +02:00
cawtds
48013b0879 added mint functionality and nature mod color 2024-05-30 14:29:40 +02:00
cawtds
253c75849b updated daycare/egg hatching:
added nature inheritance
updated iv inheritance
updated incense based species
added item based egg moves
added ability inheritance
updated egg species determination for regional variants
2024-05-26 21:04:00 +02:00
cawtds
d55f15e57e readded some key item field functions, pokedex refactoring 2024-05-25 14:45:33 +02:00
Deokishisu
4578a59673
Fix Localization Oversight in Daisy's Text
Based on the FONT_NORMAL and FONT_FEMALE control codes in Daisy's text when finishing her grooming of a Pokémon, it seems the original intention was for the first part of this text to be NPC_TEXT_COLOR_NEUTRAL and for Daisy's dialogue to be NPC_TEXT_COLOR_FEMALE. If the localizers had caught it, they would've replaced FONT_NORMAL with COLOR DARK_GRAY and FONT_FEMALE with COLOR RED. This commit creates a .ifdef BUGFIX for this oversight.
2024-05-24 22:09:31 -04:00
cawtds
cf09c3d886 fixed mr mime typing
fixed pokedex screen crashing after battle due to memory
fixed dex ordering modes a-z, lightest, smallest and type
2024-05-20 17:53:56 +02:00
cawtds
64f3aa42f1 finished revival blessing 2024-05-19 13:00:15 +02:00