Commit Graph
410 Commits
Author SHA1 Message Date
W1serV1ser 260fca5b46 Removed the Gen 4 Pokemon that snuck in 2023-03-12 13:10:31 -07:00
W1serV1ser 76ba156a5c Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-11 16:31:44 -08:00
GriffinR adf28c2f63 Merge pull request #1855 from GriffinRichards/doc-chat
Add/correct some union room chat documentation
2023-02-27 13:25:05 -05:00
GriffinR bc3805f9d3 Fix two binary palettes 2023-02-17 13:27:39 -05:00
GriffinR 5793a1a5e7 Correct some union room chat documentation 2023-02-02 11:41:02 -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
GriffinR c0e68f33f7 Colorize pokemon storage tiles 2023-01-15 00:39:51 -05:00
GriffinR 41c85b4af6 Fix slot_machine/menu colors 2023-01-14 16:34:14 -05:00
GriffinR 71d4b1687a Fix party_menu/bg colors 2023-01-14 12:32:54 -05:00
GriffinR 9be0818b78 Fix intro/scene_1 tiles 2023-01-14 00:48:58 -05:00
GriffinR 9c34bc2385 Colorize picture_frame tiles 2023-01-13 15:30:57 -05:00
GriffinR 387ea563fc Move FRLG trainer card gfx to own folder, fix tiles 2023-01-13 13:40:13 -05:00
GriffinR 1707f82992 Combine/colorize status graphics 2023-01-13 12:53:08 -05:00
GriffinR 0064db7a6d Correct colors for frontier_pass 2023-01-13 02:25:23 -05:00
GriffinR ee3f5033b3 Colorize contest/interface.png 2023-01-13 00:26:40 -05:00
GriffinR 52e00ac603 Correct colors in summary_screen/tiles.png 2023-01-12 21:41:06 -05:00
GriffinR 3a253ece0f Fix some colors in crusher.png 2023-01-12 19:04:49 -05:00
GriffinR 89286c91e3 Merge pull request #1842 from GriffinRichards/gbagfx-pals
Automatically constrain png pixels to bit depth
2023-01-12 16:36:05 -05:00
GriffinR a12432a0f3 Colorize crusher.png 2023-01-12 16:34:36 -05:00
GriffinR 12cbb0b30f Colorize and combine birch_bag/birch_grass 2023-01-12 15:22:23 -05:00
GriffinR 863779afbb Colorize rayquaza_scene/scene_1/clouds.png 2023-01-12 14:56:44 -05:00
GriffinR 0fd0eb7163 Colorize cable_car/bg.png 2023-01-12 14:47:04 -05:00
GriffinR 68f97d02f4 Colorize menu_info.png 2023-01-12 13:17:31 -05:00
GriffinR cf14c1fd13 Colorize mirage_tower.png 2023-01-12 11:40:15 -05:00
GriffinR 3009cc7220 Colorize door animations that use multiple palettes 2023-01-11 13:31:17 -05:00
SphericalIce 09d20bd634 Rename ball_display_unused_extra 2022-12-26 11:30:12 +00:00
GriffinR 3b1c8dfb17 Update list menu graphics 2022-11-09 19:44:58 -05:00
GriffinR b3e75138da Sync wireless improvements 2022-11-09 15:14:18 -05:00
GriffinR 3e8baa5b04 Merge branch 'master' into porymap-5 2022-10-18 22:54:25 -04:00
GriffinR a10ec0487e Color rotating gate pngs 2022-10-12 19:19:42 -04:00
GriffinR 7223dbd62f Merge branch 'master' into rme-update 2022-09-25 11:56:57 -04:00
GriffinR 9bcc36fe08 Merge pull request #1767 from GriffinRichards/trainer-pals
Generate trainer pic palettes from image
2022-09-22 11:34:03 -04:00
GriffinR c8afeea182 Generate trainer pic palettes from image 2022-09-05 16:09:45 -04:00
GriffinR 261b0ff118 Standardize judgement vs judgment spelling 2022-08-20 22:58:46 -04:00
Martin Griffin 5e593a62fb Ignore num_tiles if it would truncate non-transparent tiles (#1729) 2022-08-18 23:07:25 -04:00
GriffinR bfdbbad468 Split naming screen palettes/graphics, use correct image palettes, clean up 2022-08-09 09:27:28 -04:00
W1serV1ser 559316da4b Fixed Krabby sprite and removed unecessary palette 2022-07-10 18:57:33 -07:00
W1serV1ser 2873b75645 Fixed messed up commits and applied proper changes
This SHOULD be a fixed commit, where pret is properly merged, the bug fixes relating to the follower and saves, bikes, and ground effects, and the improved dynamic palette system is present.
2022-07-06 20:11:02 -07:00
W1serV1ser 372f786da5 Reverting more commits 2022-07-06 09:53:00 -07:00
W1serV1ser 21ec0f0223 Revert "Merge branch 'master' into FollowingPokemon_Gen1-3"
This reverts commit 63b2bd9a44, reversing
changes made to a716f522f3.
2022-07-06 09:02:50 -07:00
W1serV1ser 63b2bd9a44 Merge branch 'master' into FollowingPokemon_Gen1-3 2022-07-06 00:53:51 -07:00
W1serV1ser c6b9e7994f Revert "Merge branch 'FollowingPokemon' into master"
This reverts commit 435a4f84e2, reversing
changes made to bee11f31cd.
2022-07-06 00:37:51 -07:00
W1serV1ser 435a4f84e2 Merge branch 'FollowingPokemon' into master 2022-07-05 23:21:20 -07:00
W1serV1ser 3421fdb1ed Added Gen 4 and fixed some bugs
overworld.c: Fixed bug where, upon reloading a save with the follower present,  the follower wouldn't go into the pokeball.

event_object_movement.c, overworld.c: Fixed bug where follower would glitch out when the player immediately starts running after dismounting from their bike or immediately starts riding when they mount their bike. Fix forces player to stand still until follower sprite affine animation is complete.

follow_me.c: Fixed bug where follower would appear if the player steps out of a door, gets on their bike, and rides away.

field_player_avatar.c: Fixed bug where, upon reloading a save when the follower is present, the player couldn't run, even if they had the running shoes.
2022-07-05 23:09:19 -07:00
GriffinR 277750b088 Merge branch 'master' into rme-update 2022-06-22 10:02:17 -04:00
GriffinR c2dc4a5dea Some field door comments 2022-05-18 13:03:02 -04:00
GriffinR 5c8e1e81ea Color single-palette door anim graphics 2022-05-18 12:41:20 -04:00
GriffinR fc5747f0f7 Merge pull request #1649 from GriffinRichards/clean-trainer
Trainer hill clean up
2022-04-20 00:20:44 -04:00