Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,565 Commits 1 Branch 0 Tags
76ba156a5cfd0eb4f1899d8b062bcbbb4482dcbe
Commit Graph
47 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
W1serV1ser 76ba156a5c Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-11 16:31:44 -08:00
W1serV1ser c07686871b Merge branch 'master' of https://github.com/W1serV1ser/pokeemerald 2023-03-10 15:41:32 -08:00
W1serV1ser 0b0fca58e8 Merge branch 'pret-master' into FollowingPokemon_Gen1-3 2023-01-25 11:35:10 -08:00
W1serV1ser 559316da4b Fixed Krabby sprite and removed unecessary palette 2022-07-10 18:57:33 -07:00
W1serV1ser 8137760010 Improved comments and constant dynamism 2022-07-06 20:28:57 -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 0b15d6500f Revert "Merge adjustments" 
This reverts commit a716f522f3.
 2022-07-06 09:10:16 -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 143b2a51e2 Revert "Bug fixes" 
This reverts commit 76fdc51440.
 2022-07-06 09:02:35 -07:00
W1serV1ser 76fdc51440 Bug fixes 
Fixed quick movement bugs, bike out of door bugs, running bugs, and sand/water effects bugs, all relating to followers. Very nervous that a lot of the changes in this commit seem to be things that I assumed were already in this repository.
 2022-07-06 01:26:44 -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 a716f522f3 Merge adjustments 2022-07-06 00:15:30 -07:00
W1serV1ser 59e91c9b5f Merge branch 'pr/3' into FollowingPokemon_Gen1-3 2022-07-05 23:58:14 -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
W1serV1ser e752b8caaa Fixed ledge jump running frame glitch 
Before this fix, if the next step the player after jumping down a ledge is a running step, the player would be waiting in their running sprite rather than their standing sprite. This fixes that.
 2022-03-29 18:07:54 -07:00
W1serV1ser c4ebbef330 Fixed ledge jump running frame glitch 
Before this fix, if the next step the player after jumping down a ledge is a running step, the player would be waiting in their running sprite rather than their standing sprite. This fixes that.
 2022-03-29 17:44:09 -07:00
W1serV1ser 07310bdfe5 Fixed shallow water bug with followers 
Before this fix, if the follower shrunk into its pokeball while standing on shallow water, the rippling effect would still be happening. This fixes that.
 2022-03-29 16:07:58 -07:00
W1serV1ser 2836e8471b Fixed shallow water bug with followers 
Before this fix, if the follower shrunk into its pokeball while standing on shallow water, the rippling effect would still be happening. This fixes that.
 2022-03-29 16:05:10 -07:00
W1serV1ser 557e517bbb Accounted for expansion in FollowerSparkleCoords 
Added check to make sure the sparkle coordinates for each follower was in the correct order, depending on expansion.
 2022-03-28 01:14:22 -07:00
W1serV1ser 96db459f46 Accounted for expansion in FollowerSparkleCoords 
Added check to make sure the sparkle coordinates for each follower was in the correct order, depending on expansion.
 2022-03-28 00:30:43 -07:00
W1serV1ser 01ab4280f3 Fixed glitch when follower goes in/out of pokeball a lot 
Before this fix, if the follower went into/out of their pokeball enough times, both the follower and the sparkles would start glitching out whenever the into/out of animation played. This fixes that.
 2022-03-27 22:17:06 -07:00
W1serV1ser 4f18a3fa89 Fixed glitch when going in/out of pokeball a lot 
Before this fix, if the follower did their into/out of pokeball animation enough times without the map being reloaded, both the follower and the sparkle sprites would start to glitch out a lot. This fixes that.
 2022-03-27 22:13:59 -07: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 376129f973 Fixed palette tag constants 2022-03-24 01:03:24 -07:00
W1serV1ser c87ce46e9c Added item_expansion pokeball sprites. 2022-03-24 00:52:06 -07:00
W1serV1ser 2baef470a1 Added item_expansion pokeball sprites. 2022-03-24 00:37:45 -07:00
W1serV1ser 7d5659ddca Used more constants for dynamism 2022-03-23 12:03:50 -07:00
W1serV1ser 8ee84b5843 More constants in use for dynamism 2022-03-23 11:55:08 -07:00
W1serV1ser 52c4a9c868 obj_event constants account for expansion, constants are used more 
This allows for expansion projects to work with this project, as well as accounts for if extra object events are added, offsetting some of the follower's/pokeball's constants.
 2022-03-22 13:09:44 -07:00
W1serV1ser ef6f39d32f obj_event constants account for expansion, all functions use constants 
This allows for discrepancies between expansion and non-expansion projects, as well as projects that have extra object events that offset stuff.
 2022-03-22 12:16: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 881ab7c405 Merge branch 'master' into FollowingPokemon 2022-02-11 15:25:52 -08:00
W1serV1ser 35de8b1c06 Squashed commit of the following: 
commit fabad02201
Merge: 087244104 eb07617a2
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Thu Feb 10 16:03:45 2022 -0800

    Merge branch 'pret:master' into master

commit eb07617a20
Merge: 7d2344c07 a86a27918
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 9 08:34:10 2022 -0500

    Merge pull request #1623 from kiliwily/master

    Update money.c

commit a86a279184
Author: kiliwily <69381603+kiliwily@users.noreply.github.com>
Date:   Sun Feb 6 16:25:56 2022 +0100

    Update money.c

commit 7d2344c07b
Merge: f494238a9 dc7d86f02
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 2 22:09:36 2022 -0500

    Merge pull request #1616 from GriffinRichards/missing-req

    Add missing :req, remove old macros

commit f494238a9d
Merge: e30b16f0f 1ff0b0efa
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 30 23:00:05 2022 -0500

    Merge pull request #1621 from GriffinRichards/constants-collision

    Add missing collision constant usage

commit 1ff0b0efa9
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 29 21:13:46 2022 -0500

    Add missing collision constant usage

commit e30b16f0fd
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 21:50:15 2022 -0500

    Fix Swap_HandleQuitSwappingResposne typo

commit 2efbd5f549
Merge: 4188dd405 3d0326106
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:51:56 2022 -0500

    Merge pull request #1608 from GriffinRichards/fix-fieldmap

    Fix some incorrect fieldmap names

commit 4188dd405c
Merge: 9f2b6ab2f 6470b0d00
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:44:26 2022 -0500

    Merge pull request #1620 from LOuroboros/gBallSpriteTemplates

    Used ball constants in gBallSpriteTemplates

commit 6470b0d004
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Wed Jan 26 18:36:21 2022 -0300

    Used ball constants in gBallSpriteTemplates

commit dc7d86f026
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 19:26:22 2022 -0500

    Add new macro comments

commit 2495d18132
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 18:51:56 2022 -0500

    Add missing :req, remove old macros

commit 9f2b6ab2f2
Merge: 79dfac92c 2cc301603
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 22 21:41:37 2022 -0500

    Merge pull request #1613 from Kurausukun/m4asymbols

    Move M4A Track Definitions

commit 2cc301603e
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 21:30:39 2022 -0500

    lmao whitespace

commit 0872441048
Merge: 3c46f3194 79dfac92c
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 22 18:28:09 2022 -0800

    Merge branch 'pret:master' into master

commit 3b756bfb3d
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 20:38:41 2022 -0500

    fix compilation on modern

commit 317e302147
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:43:11 2022 -0500

    fix inconsistent indentation

commit 04013fbdf2
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:41:31 2022 -0500

    forgot we could do this

commit a83e41b2cc
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:37:46 2022 -0500

    move m4a track definitions

commit 3d0326106e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 12:48:19 2022 -0500

    Z coord / height -> elevation

commit 79dfac92c9
Merge: 874317268 30d970441
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 09:55:43 2022 -0500

    Merge pull request #1604 from GriffinRichards/clean-spinda

    Document Spinda spot algorithm

commit fb81d9ad4a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 23:26:39 2022 -0500

    Correct map data comment

commit 8743172686
Merge: 062cdbe01 7d75e1631
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 12:11:27 2022 -0500

    Merge pull request #1612 from AsparagusEduardo/pret_misc

    Small documentation and cleanup

commit 7d75e16312
Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date:   Thu Jan 20 12:25:48 2022 -0300

    Small documentation and cleanup

commit 062cdbe01c
Merge: a7e6045d7 bd43b905b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 08:53:44 2022 -0500

    Merge pull request #1599 from GriffinRichards/fix-tilemaps

    Break up graphics/interface and graphics/misc

commit a7e6045d71
Merge: 69759b2d1 f899a02ac
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 22:17:37 2022 -0500

    Merge pull request #1597 from GriffinRichards/misc-cleanup

    Miscellaneous fixes

commit c4f33f2b2b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:54:55 2022 -0500

    TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE

commit e682c12519
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:39:11 2022 -0500

    sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE

commit e3b49604d4
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:59:37 2022 -0500

    Use metatile layer constants in shop

commit 8200fda14e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:56:54 2022 -0500

    Fix decorations metatile attribute names

commit a8b466dc80
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:15:32 2022 -0500

    Disambiguate fieldmap names

commit f127e64a3c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 09:37:12 2022 -0500

    Name overworld tilemaps for their bg, add layer type constants

commit 30d9704418
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:27:17 2022 -0500

    Specify unsigned in spot comment

commit 313f14ed63
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:00:18 2022 -0500

    Add Spinda spot color constants

commit 177863da47
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 16:04:02 2022 -0500

    Fix typo

commit 225147a94f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 13:19:52 2022 -0500

    Document Spinda spot algorithm

commit 69759b2d12
Merge: 14a11899c 8b920691e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:44:58 2022 -0500

    Merge pull request #1601 from GriffinRichards/fix-decor-flag

    Fix FLAG_DECORATION_0 name

commit 14a11899cf
Merge: dad413276 a4d31da92
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:37:26 2022 -0500

    Merge pull request #1603 from LOuroboros/patch-2

    Updated the value of MAX_MAP_DATA_SIZE

commit a4d31da923
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Sun Jan 16 19:22:28 2022 -0300

    Updated the value of MAX_MAP_DATA_SIZE

commit dad4132762
Merge: 60162a98b 429d53b95
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 14:03:20 2022 -0500

    Merge pull request #1596 from GriffinRichards/player-avatar-arr-const

    Add missing array constants in field_player_avatar

commit 60162a98b9
Merge: 755d9143a 6d6ff9126
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 13:55:16 2022 -0500

    Merge pull request #1602 from GriffinRichards/charmap-quote

    Allow right single quotation mark in charmap

commit 6d6ff91268
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 10:29:15 2022 -0500

    Allow right single quotation mark in charmap

commit 755d9143a6
Merge: 9ded1eb14 fd7457b05
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 15 12:20:22 2022 -0500

    Merge pull request #1600 from GriffinRichards/remove-berry-fix

    Remove berry fix

commit bd43b905b7
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:39:00 2022 -0500

    Apply palettes to some field effect pngs

commit 4dec9b83a3
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:29:30 2022 -0500

    Move more graphics out of misc

commit 9ded1eb14e
Merge: fa2d25d36 1a33187ba
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 09:12:05 2022 -0500

    Merge pull request #1598 from atasro2/master

    Give sensical names to Unused_AdjustBgMosaic

commit 1a33187bad
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:48:46 2022 +0330

    Move enum to bg.h

commit 998900bd1b
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:37:27 2022 +0330

    Give sensical names to Unused_AdjustBgMosaic

commit fd7457b05a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 13 15:26:20 2022 -0500

    Remove berry fix

commit f899a02ac6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 12 18:34:21 2022 -0500

    Use MON_GIVEN_TO_ constants for givemon

commit 01af8e877f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 14:18:22 2022 -0500

    Move starter choose out of interface/misc

commit 694aa3c65d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:59:24 2022 -0500

    Move balls, shop, link, map popups, and bag out of interface

commit fa2d25d366
Merge: 4024b3f1b ca9bc34be
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 12:26:02 2022 -0500

    Merge pull request #1594 from GriffinRichards/pokestorage-clean

    Misc pokemon_storage_system cleanup

commit d782d3544d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:46:58 2022 -0500

    Move pokeblock graphics out of interface

commit 565dd24309
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:37:13 2022 -0500

    Move party menu graphics out of interface

commit 7103839a61
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:14:59 2022 -0500

    Move summary screen graphics out of interface, fix some names

commit fde18b4774
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:42:00 2022 -0500

    Fix berry crusher graphics name

commit 0a78cb5c9e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:04:47 2022 -0500

    Fix some battle dome graphics names

commit 49418f8c01
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:19:20 2022 -0500

    Add missing commas

commit 3a6c633905
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:16:25 2022 -0500

    Add seteventmon

commit 110fbc559c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:08:14 2022 -0500

    Make item optional for givemon and setwildbattle

commit 4024b3f1b3
Merge: ded202136 d4111d552
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 10 14:56:26 2022 -0500

    Merge pull request #1590 from GriffinRichards/dex-enum

    Convert pokedex defines to enums

commit 3c46f3194e
Merge: 4375a8014 ded202136
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sun Jan 9 13:54:52 2022 -0800

    Merge branch 'pret:master' into master

commit 429d53b95c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 11:12:35 2022 -0500

    Use runningState directly in CheckMovementInputNotOnBike

commit 8b920691e6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 01:31:42 2022 -0500

    Fix FLAG_DECORATION_0 name

commit 4375a80142
Merge: a499e8dc7 30dbf3f85
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 8 21:47:19 2022 -0800

    Merge branch 'pret:master' into master

commit 8f1a760937
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 8 23:53:55 2022 -0500

    Add missing array constants in field_player_avatar

commit ca9bc34bea
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:26:23 2022 -0500

    Clean up pokemon_storage_system graphics

commit 5cbe572607
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:02:12 2022 -0500

    Add window constants in pokemon_storage_system

commit d4111d5520
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 14:50:19 2022 -0500

    Add comment about pokedex reordering

commit 5d033c2e4d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 12:18:49 2022 -0500

    Convert pokedex defines to enums

commit ce55e58ad8
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 4 10:09:42 2022 -0500

    Misc cleanup
 2022-02-11 11:09:34 -08:00
W1serV1ser 005059dfed Squashed commit of the following: 
commit fabad02201
Merge: 087244104 eb07617a2
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Thu Feb 10 16:03:45 2022 -0800

    Merge branch 'pret:master' into master

commit eb07617a20
Merge: 7d2344c07 a86a27918
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 9 08:34:10 2022 -0500

    Merge pull request #1623 from kiliwily/master

    Update money.c

commit a86a279184
Author: kiliwily <69381603+kiliwily@users.noreply.github.com>
Date:   Sun Feb 6 16:25:56 2022 +0100

    Update money.c

commit 7d2344c07b
Merge: f494238a9 dc7d86f02
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 2 22:09:36 2022 -0500

    Merge pull request #1616 from GriffinRichards/missing-req

    Add missing :req, remove old macros

commit f494238a9d
Merge: e30b16f0f 1ff0b0efa
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 30 23:00:05 2022 -0500

    Merge pull request #1621 from GriffinRichards/constants-collision

    Add missing collision constant usage

commit 1ff0b0efa9
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 29 21:13:46 2022 -0500

    Add missing collision constant usage

commit e30b16f0fd
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 21:50:15 2022 -0500

    Fix Swap_HandleQuitSwappingResposne typo

commit 2efbd5f549
Merge: 4188dd405 3d0326106
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:51:56 2022 -0500

    Merge pull request #1608 from GriffinRichards/fix-fieldmap

    Fix some incorrect fieldmap names

commit 4188dd405c
Merge: 9f2b6ab2f 6470b0d00
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:44:26 2022 -0500

    Merge pull request #1620 from LOuroboros/gBallSpriteTemplates

    Used ball constants in gBallSpriteTemplates

commit 6470b0d004
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Wed Jan 26 18:36:21 2022 -0300

    Used ball constants in gBallSpriteTemplates

commit dc7d86f026
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 19:26:22 2022 -0500

    Add new macro comments

commit 2495d18132
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 18:51:56 2022 -0500

    Add missing :req, remove old macros

commit 9f2b6ab2f2
Merge: 79dfac92c 2cc301603
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 22 21:41:37 2022 -0500

    Merge pull request #1613 from Kurausukun/m4asymbols

    Move M4A Track Definitions

commit 2cc301603e
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 21:30:39 2022 -0500

    lmao whitespace

commit 0872441048
Merge: 3c46f3194 79dfac92c
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 22 18:28:09 2022 -0800

    Merge branch 'pret:master' into master

commit 3b756bfb3d
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 20:38:41 2022 -0500

    fix compilation on modern

commit 317e302147
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:43:11 2022 -0500

    fix inconsistent indentation

commit 04013fbdf2
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:41:31 2022 -0500

    forgot we could do this

commit a83e41b2cc
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:37:46 2022 -0500

    move m4a track definitions

commit 3d0326106e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 12:48:19 2022 -0500

    Z coord / height -> elevation

commit 79dfac92c9
Merge: 874317268 30d970441
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 09:55:43 2022 -0500

    Merge pull request #1604 from GriffinRichards/clean-spinda

    Document Spinda spot algorithm

commit fb81d9ad4a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 23:26:39 2022 -0500

    Correct map data comment

commit 8743172686
Merge: 062cdbe01 7d75e1631
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 12:11:27 2022 -0500

    Merge pull request #1612 from AsparagusEduardo/pret_misc

    Small documentation and cleanup

commit 7d75e16312
Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date:   Thu Jan 20 12:25:48 2022 -0300

    Small documentation and cleanup

commit 062cdbe01c
Merge: a7e6045d7 bd43b905b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 08:53:44 2022 -0500

    Merge pull request #1599 from GriffinRichards/fix-tilemaps

    Break up graphics/interface and graphics/misc

commit a7e6045d71
Merge: 69759b2d1 f899a02ac
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 22:17:37 2022 -0500

    Merge pull request #1597 from GriffinRichards/misc-cleanup

    Miscellaneous fixes

commit c4f33f2b2b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:54:55 2022 -0500

    TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE

commit e682c12519
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:39:11 2022 -0500

    sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE

commit e3b49604d4
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:59:37 2022 -0500

    Use metatile layer constants in shop

commit 8200fda14e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:56:54 2022 -0500

    Fix decorations metatile attribute names

commit a8b466dc80
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:15:32 2022 -0500

    Disambiguate fieldmap names

commit f127e64a3c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 09:37:12 2022 -0500

    Name overworld tilemaps for their bg, add layer type constants

commit 30d9704418
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:27:17 2022 -0500

    Specify unsigned in spot comment

commit 313f14ed63
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:00:18 2022 -0500

    Add Spinda spot color constants

commit 177863da47
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 16:04:02 2022 -0500

    Fix typo

commit 225147a94f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 13:19:52 2022 -0500

    Document Spinda spot algorithm

commit 69759b2d12
Merge: 14a11899c 8b920691e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:44:58 2022 -0500

    Merge pull request #1601 from GriffinRichards/fix-decor-flag

    Fix FLAG_DECORATION_0 name

commit 14a11899cf
Merge: dad413276 a4d31da92
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:37:26 2022 -0500

    Merge pull request #1603 from LOuroboros/patch-2

    Updated the value of MAX_MAP_DATA_SIZE

commit a4d31da923
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Sun Jan 16 19:22:28 2022 -0300

    Updated the value of MAX_MAP_DATA_SIZE

commit dad4132762
Merge: 60162a98b 429d53b95
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 14:03:20 2022 -0500

    Merge pull request #1596 from GriffinRichards/player-avatar-arr-const

    Add missing array constants in field_player_avatar

commit 60162a98b9
Merge: 755d9143a 6d6ff9126
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 13:55:16 2022 -0500

    Merge pull request #1602 from GriffinRichards/charmap-quote

    Allow right single quotation mark in charmap

commit 6d6ff91268
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 10:29:15 2022 -0500

    Allow right single quotation mark in charmap

commit 755d9143a6
Merge: 9ded1eb14 fd7457b05
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 15 12:20:22 2022 -0500

    Merge pull request #1600 from GriffinRichards/remove-berry-fix

    Remove berry fix

commit bd43b905b7
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:39:00 2022 -0500

    Apply palettes to some field effect pngs

commit 4dec9b83a3
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:29:30 2022 -0500

    Move more graphics out of misc

commit 9ded1eb14e
Merge: fa2d25d36 1a33187ba
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 09:12:05 2022 -0500

    Merge pull request #1598 from atasro2/master

    Give sensical names to Unused_AdjustBgMosaic

commit 1a33187bad
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:48:46 2022 +0330

    Move enum to bg.h

commit 998900bd1b
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:37:27 2022 +0330

    Give sensical names to Unused_AdjustBgMosaic

commit fd7457b05a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 13 15:26:20 2022 -0500

    Remove berry fix

commit f899a02ac6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 12 18:34:21 2022 -0500

    Use MON_GIVEN_TO_ constants for givemon

commit 01af8e877f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 14:18:22 2022 -0500

    Move starter choose out of interface/misc

commit 694aa3c65d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:59:24 2022 -0500

    Move balls, shop, link, map popups, and bag out of interface

commit fa2d25d366
Merge: 4024b3f1b ca9bc34be
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 12:26:02 2022 -0500

    Merge pull request #1594 from GriffinRichards/pokestorage-clean

    Misc pokemon_storage_system cleanup

commit d782d3544d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:46:58 2022 -0500

    Move pokeblock graphics out of interface

commit 565dd24309
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:37:13 2022 -0500

    Move party menu graphics out of interface

commit 7103839a61
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:14:59 2022 -0500

    Move summary screen graphics out of interface, fix some names

commit fde18b4774
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:42:00 2022 -0500

    Fix berry crusher graphics name

commit 0a78cb5c9e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:04:47 2022 -0500

    Fix some battle dome graphics names

commit 49418f8c01
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:19:20 2022 -0500

    Add missing commas

commit 3a6c633905
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:16:25 2022 -0500

    Add seteventmon

commit 110fbc559c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:08:14 2022 -0500

    Make item optional for givemon and setwildbattle

commit 4024b3f1b3
Merge: ded202136 d4111d552
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 10 14:56:26 2022 -0500

    Merge pull request #1590 from GriffinRichards/dex-enum

    Convert pokedex defines to enums

commit 3c46f3194e
Merge: 4375a8014 ded202136
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sun Jan 9 13:54:52 2022 -0800

    Merge branch 'pret:master' into master

commit 429d53b95c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 11:12:35 2022 -0500

    Use runningState directly in CheckMovementInputNotOnBike

commit 8b920691e6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 01:31:42 2022 -0500

    Fix FLAG_DECORATION_0 name

commit 4375a80142
Merge: a499e8dc7 30dbf3f85
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 8 21:47:19 2022 -0800

    Merge branch 'pret:master' into master

commit 8f1a760937
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 8 23:53:55 2022 -0500

    Add missing array constants in field_player_avatar

commit ca9bc34bea
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:26:23 2022 -0500

    Clean up pokemon_storage_system graphics

commit 5cbe572607
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:02:12 2022 -0500

    Add window constants in pokemon_storage_system

commit d4111d5520
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 14:50:19 2022 -0500

    Add comment about pokedex reordering

commit 5d033c2e4d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 12:18:49 2022 -0500

    Convert pokedex defines to enums

commit ce55e58ad8
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 4 10:09:42 2022 -0500

    Misc cleanup
 2022-02-11 10:51:47 -08:00
W1serV1ser 2fbbaf0afd Merge branch 'master' into FollowingPokemon_Gen1-3 2022-02-11 10:41:19 -08:00
W1serV1ser ecfef6c5e2 Reduced number of palettes 2022-02-10 15:35:15 -08:00
W1serV1ser bce0fcc081 Allowed each Unown shape to appear in overworld and added constants for other Deoxys forms 
Still have yet to figure out how to check for which form a given Deoxys is in. Thus, all Deoxys will appear as Normal form, regardless of their actual form.
 2022-02-09 16:54:03 -08: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 06ba6d7675 Added custom footprints from Sonikku A and applied them to all Gen 1 Pokemon 2022-01-09 21:26:29 -08:00
W1serV1ser 04c203b352 Fixed custom script error 2022-01-09 13:51:21 -08:00
W1serV1ser 5ea3d064c6 Added Following Pokemon mechanics and sprites/palettes for all Gen 1 Pokemon 2022-01-08 13:32:43 -08:00
W1serV1ser 1903dd28a6 Removed AI Revive code to revert back to just pret code 2022-01-07 12:31:51 -08:00