Commit Graph
26 Commits
Author SHA1 Message Date
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 34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
W1serV1ser 04a4cc0987 Reordered constants and changed IsFlyingPokemonGraphic
Species constants are reordered in pokemon_expansion, and IsFlyingGraphic now uses constants, so the proper sprites will/will not bounce, regardless of how the constants are ordered.
2022-03-26 16:10:30 -07:00
W1serV1ser 0ed7064e62 Reordered constants and used constants in IsFlyingPokemonGraphic
Pokemon_expansion reorders the species constants, so the object event constants need to be reordered as well.
Changing IsFlyingPokemonGraphic to use constants makes sure that the proper sprites do/don't bounce, regardless of how the constants are organized.
2022-03-26 16:04:41 -07:00
W1serV1ser 4e511f6149 Added shrinking into/growing out of Pokeball animation.
Still don't know how to fix weird pink glitch with sparkle, nor do I know how to get the follower to immediately re-enter animation after walking into a building.
2022-03-16 23:24:09 -07:00
W1serV1ser b24f44bee3 Added a shrinking into/growing out of Pokeball animation
Still don't know how to get rid of that occasionally visual glitch with the sparkle, nor do I know how to get the follower to continue its animation immediately upon entering a building.
2022-03-16 22:20:11 -07:00
W1serV1ser 5775ee101b Added Gen 3 Pokemon and other minor changes
sprite.c: Animation changes when bouncing up instead of bouncing down. If-statement is slightly more efficient for when non-following object events go through it.

ld_script.txt: Removed hard-coded memory locations due to overflow from added sprites and palettes.

object_event_anims.h: Moved uniqueEast and Double animations to be closer to their respective tables.

object_event_graphics_info.h: Made spaces between generations and gave a few really big Pokemon larger shadows.

overworld.c: Removed unnecessary do-while loop.
2022-02-09 16:50:12 -08:00
W1serV1ser 252023df2d Added Gen 2 sprites and allowed for more than 255 palettes 2022-01-22 18:27:41 -08:00
W1serV1ser 5ea3d064c6 Added Following Pokemon mechanics and sprites/palettes for all Gen 1 Pokemon 2022-01-08 13:32:43 -08:00
GriffinR afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
GriffinR 42d2fefe02 Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
GriffinR f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04:00
LOuroboros 554210c5e3 Removed trailing spaces in the most relevant files
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
PikalaxALT 810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
gAlfonso-bitandMarcus Huderle a454f9c187 UBFIX: sprite.c (#1442)
Fix out-of-bounds array access in `SortSprites()`.

Co-authored-by: Marcus Huderle <huderlem@gmail.com>
2021-05-23 09:10:55 -05:00
GriffinR dfc6ee0e9e Add SAFE_DIV 2021-03-21 13:43:14 -05:00
GriffinR b04f0aaa2b Use SPRITE_NONE constant 2021-02-24 11:03:32 -05:00
Sierraffinity a982e6ab88 Make div by zero fix more concice 2021-01-04 16:39:47 -08:00
Sierraffinity 67a656a4df Fix/document possible division by zero in ConvertScaleParam 2021-01-04 16:26:28 -08:00
Sierraffinity 072a98ca9a Document undefined sprite template behavior 2020-04-25 18:25:55 -07:00
GriffinR 2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
PikalaxALT 306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00