7714 Commits

Author SHA1 Message Date
Ariel A
9da790b2da Merge branch 'lighting' into lighting-expanded-id 2023-04-23 17:52:17 -04:00
Ariel A
6a89e5b0d2 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-04-23 17:50:20 -04:00
Ariel A
159faf8ff4 Fixed tall grass field effect discoloration in fog.
Improved/optimized fog blending during fades.
2023-04-23 17:47:18 -04:00
Ariel A
095994dc96 Fixed gamma shift for special sprite palette tags (lights, emotes).
Supersedes c82510e22bffb98fd9c63dc246c332dd1da602cd
2023-04-23 17:40:54 -04:00
Ariel A
ad9a77fe2c Merge branch 'followers' into lighting 2023-04-23 17:40:33 -04:00
Ariel A
9e00e23b96 Added OW daycare pokemon. 2023-04-23 17:34:38 -04:00
Ariel A
921baa78c6 Merge branch 'followers' into followers-expanded-id 2023-04-23 17:31:34 -04:00
Ariel A
0d3061574c Made follower disappear when decorating.
Decreased number of max sprite decorations to 13.
2023-04-23 17:26:13 -04:00
Ariel A
582761f56a Merge branch 'lighting' into lighting-expanded-id 2023-03-13 18:22:53 -04:00
Ariel A
284ec24e0c Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-03-13 18:19:35 -04:00
Ariel A
35b4d2f37e Merge branch 'followers' into lighting 2023-03-13 18:18:08 -04:00
Ariel A
6b2e49ffbc Updated Ever Grande window lights. 2023-03-13 18:15:42 -04:00
Ariel A
07995f8925 Fixed some decoration icons being darkened at night in outdoor shops. 2023-03-13 18:11:05 -04:00
Ariel A
2ec895fbee Updated CreateObjectGraphicsSprite with new system. 2023-03-13 18:03:01 -04:00
Ariel A
96c829ca99 Merge branch 'followers' into followers-expanded-id 2023-03-13 17:59:44 -04:00
Ariel A
b1ea5fb8c3 Fixed bug with applymovement not hiding followers after a battle. 2023-03-13 17:51:35 -04:00
Ariel A
829427a4b7 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-02-26 18:37:00 -05:00
Ariel A
2c922adbf9 Merge branch 'followers' into followers-expanded-id 2023-02-26 18:34:35 -05:00
Ariel A
edbb95f2a5 Cherry-pick of d6bac9895: Fixed contest palette load errors. 2023-02-19 01:13:57 -05:00
Ariel A
f83970f2fc Merge branch 'followers' into lighting 2023-02-10 22:06:52 -05:00
Ariel A
3b3e45cff7 Fixed shadow positioning bug in some battle facilities. 2023-02-10 22:06:29 -05:00
Ariel A
84e8df98fb Fix bug with ledge jumps and invisible followers. 2023-02-10 20:18:47 -05:00
Ariel A
13873727ba Updated README with new branches. 2023-02-10 19:59:02 -05:00
Ariel A
15e6acc0a3 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-02-10 19:49:54 -05:00
Ariel A
b733cd14a5 Merge branch 'followers' into followers-expanded-id 2023-02-10 19:40:44 -05:00
Ariel A
9fd7542629 Fixed nighttime WEATHER_DOWNPOUR gamma shift. 2023-02-10 19:33:54 -05:00
Ariel A
6fe4ce05e1 Added lighting to Sootopolis lava. 2023-02-10 19:32:48 -05:00
Ariel A
2ddd292b36 Merge branch 'followers' into lighting 2023-02-10 19:27:23 -05:00
Ariel A
66c57e3442 Merge branch 'master' into followers 2023-01-29 18:44:06 -05:00
Ariel A
5047f1280e Improved saving & loading object events. 2023-01-26 17:55:32 -05:00
GriffinR
f4cb6d229f Add some missing sizeof usage for SpriteSheets 2023-01-24 17:04:48 -05:00
GriffinR
10230799d3 Simplify some max value macros 2023-01-23 16:01:46 -05:00
GriffinR
f40fad528d
Merge pull request #1847 from GriffinRichards/mapjson-err
Better type conversions and errors for mapjson
2023-01-22 18:38:06 -05:00
GriffinR
29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -05:00
GriffinR
0851e55ccb
Merge pull request #1657 from PikalaxALT/sync_battle_anim_args
Sync battle anim args
2023-01-18 12:16:49 -05:00
GriffinR
b7d92e8537 Revert incorrect constant usage, add new correct ones 2023-01-18 12:11:09 -05:00
GriffinR
d1e4bd44ce Correct comment in maps.h 2023-01-18 11:54:06 -05:00
GriffinR
5a906c33ac
Merge branch 'master' into sync_battle_anim_args 2023-01-18 11:47:33 -05:00
GriffinR
ff3168f6cc
Merge pull request #1746 from mrgriffin/ui-standardize
Standardize the UI code
2023-01-18 11:15:52 -05:00
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
GriffinR
4a9c4951ab
Merge pull request #1815 from tustin2121/patch-5
Adding FindObjectEventPaletteIndexByTag bugfix
2023-01-18 10:40:07 -05:00
GriffinR
a203c03eac Add bugfix to LoadObjectEventPalette 2023-01-18 10:33:39 -05:00
GriffinR
d68e81c2be Clarify MB_SEMI_DEEP_WATER name 2023-01-17 21:32:55 -05:00
GriffinR
713e1825bd Report JSON field names in errors 2023-01-17 16:25:33 -05:00
GriffinR
1e3b0e8d76 Treat all mapjson fields as strings 2023-01-17 16:00:09 -05:00
GriffinR
b836d9ebfb Stop some redundant JSON reads 2023-01-17 15:40:39 -05:00
GriffinR
15431bd397 Add initial mapsjon type conversions 2023-01-17 15:25:39 -05:00
GriffinR
d5a4bfcd6f
Merge pull request #1843 from GriffinRichards/colorize
Colorize more grayscaled/incorrectly colored pngs
2023-01-15 12:48:42 -05:00
GriffinR
e839c8ebe5 Colorize tourney_info_card.png 2023-01-15 12:42:47 -05:00
GriffinR
0415cf73df Fix results_screen/tiles.png colors 2023-01-15 12:04:29 -05:00