Commit Graph

2186 Commits

Author SHA1 Message Date
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
cawtds
bf3ff137d5 gen5 seasons 2024-06-22 14:34:07 +02:00
cawtds
dcb5d38982 revert messagewait time 2024-06-22 01:08:53 +02:00
cawtds
b28e3b0484 0 wait time when testing 2024-06-22 00:12:33 +02:00
cawtds
c84f05baaa added 5 narrow fonts from expansion 2024-06-21 23:16:57 +02:00
cawtds
59cd3ecf1f fixed summary name lengths 2024-06-21 21:23:50 +02:00
cawtds
e054aaf2a1 fixed more warnings 2024-06-21 18:06:54 +02:00
cawtds
6e4a9bc995 type changes 2024-06-20 23:59:11 +02:00
cawtds
cbd72bd515 expanded names for everything so tests pass, fixed some missed changes from upcoming 2024-06-20 23:02:24 +02:00
cawtds
070f3db941 test adjustments 2024-06-20 21:59:29 +02:00
cawtds
daaefad2f0 updated testframework and tests 2024-06-20 17:42:21 +02:00
cawtds
26ea437c97 freed some ewram 2024-06-19 23:29:59 +02:00
cawtds
bb6ce1a742 debug menu adjustments 2024-06-19 22:22:38 +02:00
cawtds
82f44b8742 add sprite debug menu 2024-06-19 21:21:46 +02:00
cawtds
36241c743a added battle_debug 2024-06-19 20:24:06 +02:00
cawtds
bd97821ba6 added underscore to charmap.txt, updated tools/preproc 2024-06-19 19:10:52 +02:00
cawtds
cd9254cd42 fix map bug introduced with debug 2024-06-19 17:59:12 +02:00
cawtds
7200d3d552 debug menu 2024-06-19 16:58:28 +02:00
cawtds
12443215f9 refactored item icon/palette usage 2024-06-18 20:55:47 +02:00
cawtds
12d8da7135 updated items 2024-06-18 20:41:00 +02:00
cawtds
f276da42e8 renamed pockets to align with expansion 2024-06-18 20:06:02 +02:00
cawtds
94cd3866d7 updates to items 2024-06-18 20:01:41 +02:00
cawtds
d02b8bd3e1 added tera animations 2024-06-18 19:24:32 +02:00
cawtds
57686b5aed tera working without animations 2024-06-18 19:11:22 +02:00
cawtds
4adea56576 terastal mechanically integrated 2024-06-18 18:16:49 +02:00
cawtds
97b1b5f176 updated battle_script_commands to expansion 2024-06-18 17:58:16 +02:00
cawtds
a8c74d1c4d updating battle_script_commands 2024-06-18 17:04:09 +02:00
cawtds
c4807e34da daycare updates 2024-06-18 00:45:48 +02:00
cawtds
bcc4ac4bec updated speciesinfo to current expansion 2024-06-18 00:33:49 +02:00
cawtds
4291aa3343 updated battle_util.c 2024-06-18 00:20:24 +02:00
cawtds
00b005fcb8 battle_util.h aligned with expansion 2024-06-17 23:44:23 +02:00
cawtds
b9b06c3884 more battle_util reordering 2024-06-17 23:03:18 +02:00
cawtds
fddda28ba7 battle script updates 2024-06-17 22:36:41 +02:00
cawtds
0b0db8c744 integrate updates from expansion 2024-06-17 18:37:18 +02:00
cawtds
3cb3ccb6df natures refactoring 2024-06-17 17:30:05 +02:00
cawtds
e9661be94a types refactoring 2024-06-17 16:59:32 +02:00
cawtds
c5be8a5f7c removed a bunch of unused stuff 2024-06-17 16:23:02 +02:00
cawtds
63c9877b3c fixed warnings 2024-06-16 22:39:45 +02:00
cawtds
1294ea6d66 fixed last warning, reenabled -Werror 2024-06-16 19:03:57 +02:00
cawtds
a108f6ac88 fixed lots of warnings 2024-06-16 15:09:00 +02:00
cawtds
a5332b0eed removed revision and game language 2024-06-14 22:52:58 +02:00
cawtds
9f945f58e2 fixed more warnings 2024-06-14 21:26:11 +02:00
cawtds
bbfd9114d5 more warnings 2024-06-14 18:00:03 +02:00
cawtds
030ebb9f12 fixed warnings in battle_controllers 2024-06-13 23:40:33 +02:00
cawtds
79a4c19733 fix more compiler warnings 2024-06-13 23:33:48 +02:00
cawtds
61ff41ce55 compiler warning 2024-06-13 23:18:06 +02:00
cawtds
4f93c774e0 compiler warnings party_menu.c 2024-06-13 23:12:31 +02:00
cawtds
fb15e62954 fixed remaining tests 2024-06-09 23:01:28 +02:00
cawtds
77637c48d0 more tests fixed 2 2024-06-09 22:37:32 +02:00
cawtds
b3a8a1b7cb more test fixes 2024-06-09 21:37:25 +02:00
cawtds
7b7c66bc56 various updates: fixed switch in ability message, gulpmissile, explosion... 2024-06-09 19:55:37 +02:00
cawtds
cadf4e3173 more test updates, added HQ_RANDOM to config 2024-06-09 19:21:54 +02:00
cawtds
c57cb16884 fixed tests: updated ai classes and strings to match pokeemerald expansion 2024-06-09 15:29:21 +02:00
cawtds
1bab23c4ff fixed large exp test: added autoclick for lvlup popup + increased timeout for tests 2024-06-09 13:44:11 +02:00
cawtds
94ad1ce6a1 fixed an issue with ball throw anim in battle_controller_recorded_player 2024-06-09 11:48:32 +02:00
cawtds
74c82505a5 fixed givemon, adjusted makefile to allow leafgreen again, fixed bugs introduced with test framework 2024-06-09 03:08:36 +02:00
cawtds
16746737a4 fully(?) integrated testframework 2024-06-08 21:19:20 +02:00
cawtds
2f6a832875 implemented test framework semi-functional 2024-06-08 03:15:53 +02:00
Kurausukun
6bd758f45d fix compilation on gcc 14 2024-06-06 23:22:37 -04:00
cawtds
f55636b549 added lure functionality, fixed update repel counter 2024-06-05 22:55:36 +02:00
cawtds
6cd6e4feaf updated repel functionality and added spray menu 2024-06-04 23:53:02 +02:00
cawtds
53424164c0 added exp share gen6+ functionality 2024-06-04 22:04:22 +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
c58b846165 removed special deoxys sprite handling 2024-06-01 23:11:53 +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
b20c4638e5 move anim refactoring 2024-06-01 16:18:47 +02:00
cawtds
e37718e4c0 hp as part of statStr buffer 2024-05-31 21:13:06 +02:00
cawtds
f422f4b7f8 added EV and IV display in pokemon summary 2024-05-31 16:38:27 +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
636de5fda4 fixed teachy tv crash 2024-05-26 15:27:36 +02:00
cawtds
d55f15e57e readded some key item field functions, pokedex refactoring 2024-05-25 14:45:33 +02:00
cawtds
ee69e9f140 rename gItems to gItemsInfo 2024-05-24 22:31:38 +02:00
cawtds
9256aaeff1 refactoring dex constants 2024-05-24 21:52:19 +02:00
cawtds
a7e025d27c animation changes 2024-05-24 21:22:53 +02:00
cawtds
2ee1fd9719 fixed pokemon summary for 4 digit numbers, changed move descriptions to fit window 2024-05-21 23:07:00 +02:00
cawtds
f5568b0aae removed dex_mode macro, merged dex_category and dex_order indices 2024-05-21 18:30:44 +02:00
cawtds
f6403670f4 support 4 digit dex numbers 2024-05-21 18:18:51 +02:00
cawtds
2e019d2c6b added metric units and optional imperial 2024-05-20 21:19:31 +02: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
f17f42b479 fixed party menu display for learnable moves, added wild encounter manipulation with ability 2024-05-20 12:24:08 +02:00
cawtds
6e09249156 fix full restore 2024-05-20 00:58:18 +02:00
cawtds
8d114bdd8c fixed poison_point freezing game by reading B_BUFF_ABILITY as u16 instead of u8 2024-05-19 19:11:34 +02:00
cawtds
0e9263ae37 dynamax animation 2024-05-19 14:59:41 +02:00
cawtds
183c782ac6 added ability popup 2024-05-19 14:06:19 +02:00
cawtds
2a38365c71 dont do time based events in pokemon center 1f 2024-05-19 13:52:24 +02:00
cawtds
12f9853133 bounce refactoring 2024-05-19 13:39:34 +02:00
cawtds
64f3aa42f1 finished revival blessing 2024-05-19 13:00:15 +02:00
cawtds
c995dadd05 fixed pokedex entry handling for forms, removed unused 2024-05-19 12:43:06 +02:00
cawtds
6fe79e23bd fixed state change shift, removed unused 2024-05-19 01:38:06 +02:00
cawtds
91851dd1b5 fixed ultra burst and added animation for necrozma moves
fixed pokedex entries and crashes with categories/post battle registering
2024-05-19 01:19:35 +02:00
cawtds
5ea880f8b7 fixed z-moves 2024-05-18 13:53:20 +02:00
cawtds
b801236595 added dynamax 2024-05-17 18:44:29 +02:00
Ariel A
bc76541189 feat: Linkerscript now tracks RAM/ROM usage
Based on https://github.com/pret/pokeemerald/pull/1952
2024-05-16 19:03:37 -04:00
cawtds
b1b92c94ca added start menu window for time, season, day 2024-05-16 23:29:17 +02:00
cawtds
4efba579cd added seasons and season based form encounters 2024-05-15 17:58:28 +02:00
cawtds
b2a56f6b6c added new pokeball graphics, fixed/refactored tmhms, smaller pokedex entry font to fit whole text 2024-05-14 22:20:07 +02:00