Commit Graph

3244 Commits

Author SHA1 Message Date
cawtds
2dac07efb9 fix move info indicator 2025-03-20 17:05:37 +01:00
cawtds
537722ae74 regional form changes 2025-03-19 14:09:14 +01:00
cawtds
3129b95866 fix questlog palette tint 2025-03-19 13:37:42 +01:00
cawtds
5840775148 more DNS changes from expansion -> fixes secondary tileset flickering 2025-03-18 19:53:13 +01:00
cawtds
cc218d730c finally fix registermon running out of heap space 2025-03-16 23:37:14 +01:00
cawtds
300806d7a5 load general field palette 1 depending on season 2025-03-15 17:06:30 +01:00
cawtds
2b03d1c009 fix cave dust palette 2025-03-15 01:06:45 +01:00
cawtds
6361c6967a fix map name position 2025-03-15 00:44:17 +01:00
cawtds
3e65702ac3 ported dexnav from e-expansion 2025-03-15 00:23:39 +01:00
cawtds
8701ded2d5 fix exclamation mark palette 2025-03-12 23:10:36 +01:00
cawtds
4a80d6a9f2 handle count = 0 in AddBagItem 2025-03-11 17:30:55 +01:00
cawtds
2731a659ee fix FieldEffectScript_LoadFadedPal 2025-03-09 17:14:18 +01:00
cawtds
1739382dd0 update move descriptions 2025-03-09 16:04:43 +01:00
cawtds
58ab7ba9fd updated battle engine files 2025-03-09 15:50:46 +01:00
cawtds
1a2a4cc791 fix time based palette updates 2025-03-09 13:13:12 +01:00
cawtds
89aafe292f fix dns palette during credits 2025-03-09 11:54:35 +01:00
cawtds
0ae5dc26a0 fix abilities like hadron engine triggering in old man tutorial 2025-03-08 16:25:12 +01:00
cawtds
311e5532ab fix dns palette issue 2025-03-08 15:44:12 +01:00
cawtds
045af1fd25 dns expansion alignment 2025-03-08 15:27:22 +01:00
cawtds
3b029feb47 add OW_SHOW_ITEM_DESCRIPTIONS implementations 2025-03-07 21:39:09 +01:00
cawtds
03893294a4 revert IsContest changes 2025-02-16 18:47:15 +01:00
cawtds
77596bdfa0 add dynamic multi choice 2025-02-16 17:52:50 +01:00
cawtds
9019bdb559 readd tint 2025-02-16 14:33:41 +01:00
cawtds
4310caecec update follower system 2025-02-16 14:02:13 +01:00
cawtds
1724f57941 fix teachy tv 2025-02-16 13:57:32 +01:00
cawtds
52d4ba57cc add DNS config 2025-02-16 01:33:58 +01:00
cawtds
310607a7e3 fix trainer card showing wrong trainer pic 2025-02-15 21:33:05 +01:00
cawtds
c7d2874431 readd teachy tv and fame checker functionality. 2025-02-15 21:19:29 +01:00
cawtds
ce6e8317f2 sync main.c 2025-02-15 20:51:13 +01:00
cawtds
657ef3761a sync task.c 2025-02-15 15:38:54 +01:00
cawtds
e27406254c sync region_map_entries 2025-02-15 14:56:09 +01:00
cawtds
645023b55f more storage sync 2025-02-15 13:39:29 +01:00
cawtds
f5008263b3 merge pokemon_storage_system files 2025-02-15 12:53:42 +01:00
cawtds
52f9fd0a92 sync window.c 2025-02-15 00:46:38 +01:00
cawtds
0e03398749 faster intro 2025-02-14 23:30:28 +01:00
cawtds
ba6cbb267b sync sprite.c/h 2025-02-14 22:26:57 +01:00
cawtds
a042dbf68f more text.c sync 2025-02-14 20:40:22 +01:00
cawtds
4cb6aa16c5 rename braille_text.c -> braille.c 2025-02-14 19:48:14 +01:00
cawtds
310764c56f more sync 2025-02-14 19:10:50 +01:00
cawtds
ba946852d0 sync text.c 2025-02-14 18:44:25 +01:00
cawtds
4e13af09df fix UB caused by nickname length, fixed link saving by syncing with expansion 2025-02-13 00:09:54 +01:00
cawtds
fcd2bd2107 Merge remote-tracking branch 'pret/master' into pret-merge 2025-02-12 18:15:52 +01:00
cawtds
3c8232cbf1 trainer_see sync 2025-02-12 16:39:09 +01:00
cawtds
4e6334f76b fix trainer approach 2025-02-12 00:29:10 +01:00
cawtds
3b2299fc52 remove unused strings 2025-02-12 00:07:17 +01:00
cawtds
53240e7693 sync battle string table 2025-02-11 18:10:34 +01:00
cawtds
ddf1da9584 update move description line breaks 2025-02-10 23:12:59 +01:00
cawtds
5b6db1a94f fix trainer slide and script effect tests 2025-02-10 22:42:32 +01:00
cawtds
7f99972c88 fix switch in tests 2025-02-10 20:42:38 +01:00
cawtds
c439b1f1b3 update pokemon.c 2025-02-10 20:05:57 +01:00
cawtds
d65ef7fa25 fix form change tests 2025-02-10 18:43:55 +01:00
cawtds
889912b41c update tests 2025-02-10 15:54:48 +01:00
cawtds
690c0ef52e expansion update 2025-02-08 2025-02-08 17:09:17 +01:00
GriffinR
5f9f173b6a Generate heal location constants automatically, move data back to a single file. 2025-02-03 16:00:29 -05:00
GriffinR
bf6bfbd2ed
Merge pull request #668 from Kurausukun/pockets
Some checks failed
CI / build (push) Has been cancelled
Add Constant for 3 Main Bag Pockets
2025-02-03 12:29:05 -05:00
cawtds
355b92f791
consolidate arrow tiles (#682) 2025-02-03 12:19:40 -05:00
cawtds
323472ad30 rename bg_regs -> io_reg 2025-01-21 21:03:14 +01:00
cawtds
d988f94af8 remove blend_palette 2025-01-21 20:55:50 +01:00
cawtds
19fb6f997d expansion sync: image_processing_effects 2025-01-21 20:46:25 +01:00
cawtds
1a13906faf expansion sync: agbrfu_linkmanager 2025-01-21 19:20:43 +01:00
cawtds
5f599a45dd remove macro 2025-01-21 17:30:45 +01:00
cawtds
f2bdad47c2 expansion sync: battle_anim 2025-01-21 17:20:11 +01:00
cawtds
07d892d673 expansion sync: battle_anim_water 2025-01-21 00:17:40 +01:00
cawtds
8dd0a21a6a expansion sync: battle_anim_utility_funcs 2025-01-21 00:14:18 +01:00
cawtds
6069654134 rename battle_anim_special -> battle_anim_throw 2025-01-20 23:58:46 +01:00
cawtds
c512d155f0 expansion sync: battle_anim_special <-> battle_anim_throw 2025-01-20 23:57:55 +01:00
cawtds
44bbb77933 expansion sync: battle_anim_status_effects 2025-01-20 23:39:19 +01:00
cawtds
204f56c430 expansion sync: battle_anim_sound_tasks 2025-01-20 23:34:07 +01:00
cawtds
8e835702cf expansion sync: battle_anim_smokescreen 2025-01-20 23:30:29 +01:00
cawtds
d20c612100 expansion sync: battle_anim_rock 2025-01-20 23:29:42 +01:00
cawtds
d937aaebb6 expansion sync: battle_anim_psychic 2025-01-20 23:27:08 +01:00
cawtds
525e78c883 expansion sync: battle_anim_poison 2025-01-20 23:24:46 +01:00
cawtds
0e6894a26f expansion sync: battle_anim_normal 2025-01-20 23:23:11 +01:00
cawtds
fd03858c3d expansion sync: battle_anim_new 2025-01-20 23:19:56 +01:00
cawtds
45964aa4fb expansion sync: battle_anim_mons 2025-01-20 23:18:09 +01:00
cawtds
eff1a51333 expansion sync: battle_anim_mon_movement 2025-01-20 22:50:57 +01:00
cawtds
d201b1a075 expansion sync: battle_anim_ground 2025-01-20 22:37:01 +01:00
cawtds
4993fb17e5 expansion sync: battle_anim_ghost 2025-01-20 22:35:25 +01:00
cawtds
fddee4381b expansion sync: battle_anim_flying 2025-01-20 22:27:05 +01:00
cawtds
2a7e08a31f expansion sync: battle_anim_fire 2025-01-20 22:23:48 +01:00
cawtds
c3ba848c18 expansion sync: battle_anim_fight 2025-01-20 22:19:24 +01:00
cawtds
45080cde46 expansion sync: battle_anim_electric 2025-01-20 22:16:25 +01:00
cawtds
4640852091 expansion sync: battle_anim_effects_3 2025-01-20 18:43:38 +01:00
cawtds
971ecf68e3 revert 2025-01-20 18:21:47 +01:00
cawtds
2ef3f650a3 rename 2025-01-20 18:19:20 +01:00
cawtds
f2897e5172 expansion sync: battle_anim_effects_2, MonSpritesGfx 2025-01-20 18:15:55 +01:00
cawtds
2e3e44797a expansion sync: battle_anim_effects_1 2025-01-20 17:56:13 +01:00
cawtds
cd5fbe7f9b expansion sync: battle_anim_dragon 2025-01-20 17:46:29 +01:00
cawtds
b0a759b2db expansion sync: battle_anim_dark 2025-01-20 17:42:18 +01:00
cawtds
cf6cee281f expansion sync: battle_anim_bugs 2025-01-20 17:27:52 +01:00
cawtds
04e482faca expansion sync: battle_anim_ice 2025-01-19 23:32:16 +01: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
4b8004d77c reenable help system 2025-01-18 12:31:32 +01:00
cawtds
bd6f849c77 partially free help system ewram 2025-01-18 12:30:44 +01:00
cawtds
44861c9d18 fix UB when accessing move result flags 2025-01-15 18:05:22 +01:00
cawtds
69e2c4778a fix caps UB 2025-01-13 23:24:39 +01:00
cawtds
3625b33c9b updated battle animations 2025-01-13 18:19:09 +01:00
cawtds
ada01ea2ac fix hall of fame crash 2025-01-09 23:38:31 +01:00
cawtds
5d3de0eee8 fix follower quest log recording/replay 2025-01-09 18:53:21 +01:00
cawtds
19ea13caa7 sync battle.h 2025-01-09 01:04:49 +01:00
cawtds
54e48a2f68 fix rom header and trainer back anims 2025-01-08 22:46:43 +01:00
cawtds
f8266d257e rom_header sync 2025-01-08 17:33:16 +01:00
cawtds
240a7fc7b2 consolidate down arrow tiles 2025-01-07 23:39:47 +01:00
cawtds
bf1d036acd remove comment 2025-01-07 23:29:11 +01:00
cawtds
3757c6b634 readd first battle condition 2025-01-07 23:19:16 +01:00
cawtds
9bdc8f6f3a formatting 2025-01-07 22:33:30 +01:00
cawtds
d0dbc7036c update oak/old man/pokedude controllers 2025-01-07 22:22:05 +01:00
cawtds
c393f5dc07 sync battle_controllers.c 2025-01-07 21:52:43 +01:00
cawtds
ea7b00786e sync safari controller 2025-01-06 23:46:08 +01:00
cawtds
81fc30df2f sync recorded player 2025-01-06 23:40:41 +01:00
cawtds
69faaef6a1 sync recorded opponent 2025-01-06 23:39:03 +01:00
cawtds
5a7a4422d5 sync player partner controller 2025-01-06 23:37:52 +01:00
cawtds
da483e8b2b sync battle controller link partner 2025-01-06 23:35:27 +01:00
cawtds
562cdb4806 update battle controller link opponent 2025-01-06 23:33:20 +01:00
cawtds
320ab747b3 sync battle controller opponent 2025-01-06 23:26:18 +01:00
cawtds
a027c98cd9 update player controller 2025-01-06 23:08:33 +01:00
cawtds
2d21579cd7 fix shiny object events 2025-01-06 18:25:06 +01:00
cawtds
dfa6461aa3 more expansion alignment: librfu, makefile and potential unaligned fixes 2025-01-05 23:07:13 +01:00
cawtds
cab40fc5fa fix issue with time window and link save 2025-01-05 22:45:20 +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
d3dd6abf87 expansion changes to m4a and crt0 2025-01-04 20:19:15 +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)
Some checks failed
CI / build (push) Has been cancelled
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
eaa9621485 fix illusion cries 2024-11-24 16:23:54 +01:00
cawtds
60e8ae9919 rename isagbprn 2024-11-24 15:56:54 +01: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
f6bd9b03a4 dynamic time window updates 2024-11-21 00:01:00 +01:00
cawtds
102445f1c7 fake rtc datetime 2024-11-20 14:20:32 +01:00
GriffinR
b76867fc3b Replace incorrect Japanese characters
Some checks failed
CI / build (push) Has been cancelled
2024-11-19 19:35:18 -05: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
633a2d313e weather coord events 2024-11-18 14:43:49 +01:00
cawtds
1c0e0c3e4a delete field_weather_util, finish syncing field_weather_effects 2024-11-18 14:33:58 +01:00
cawtds
87fc00320e finish field_weather_effects.c 2024-11-18 13:53:22 +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
66761306aa fix incorrect palette being used when changing form 2024-11-17 14:44:39 +01:00
cawtds
71faf131eb reorder conditions 2024-11-17 12:53:55 +01:00
cawtds
5bce2e483e added FLDEFF_NONE, use enum FieldEffect where appropriate 2024-11-17 00:26:53 +01:00
cawtds
f404f8c5a1 readded surf flag check 2024-11-16 23:09:44 +01:00