Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,593 Commits 1 Branch 0 Tags
c593ee6fac4274e1a4b459e8c8a69be99876abeb
Commit Graph
7593 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
W1serV1ser c593ee6fac Sprite priority & follower face command fixes 2023-04-07 12:14:09 -07:00
W1serV1ser b0e907962d Added missing #include 2023-04-03 14:27:12 -07:00
W1serV1ser 10265938f7 Bug fixes involving warps and followers 
Fixes issues where follower would load in strangely after a scripted warp. Also added a macro (setfollowerwarppos) to control how the follower appears after scripted warps.
 2023-04-02 18:11:18 -07:00
W1serV1ser 2d639a01fa Fixed follower/level script bug 
After finishing a script that triggers upon loading a map, followers will no longer act as if they're exiting a door when the player takes their first step, assuming the follower was moved at all during said script.
 2023-03-31 15:52:20 -07:00
W1serV1ser ee9875e185 Fixed follower/script bug 
Follower will now move as directed by scripts that are triggered by interacting with an object.
 2023-03-31 14:51:45 -07:00
W1serV1ser 20f8fbffc0 Extra change to fit with pret sync 2023-03-29 21:31:32 -07:00
W1serV1ser d076aa96d4 Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-29 21:31:06 -07:00
WiserVisor ac3b657aa4 Merge pull request #13 from pret/master 
Pret sync
 2023-03-29 21:01:48 -07:00
W1serV1ser 2dbeffa92b Added option to speed up follower interactions 
By setting the FAST_FOLLOWERS define to TRUE, you can now:
- Have the follower exit a door faster, avoiding the need to stop and wait for the follower to exit.
- Have the follower jump down ledges faster, avoiding the need to stop and wait for the follower to land.
 2023-03-29 20:58:14 -07:00
W1serV1ser 872d06ce9a Fixed collision and surfing bugs 
- If the player collides with something immediately after exiting a door, the follower will no longer exit the door, walking into the player.

- If the player surfs immediately after exiting a door, the follower will no longer exit the door and walk out of sync.
 2023-03-29 12:20:59 -07:00
W1serV1ser 3c8ba61913 Fixed specific fly/door glitch 
Before, if the player stepped out of a door and then immediately flew, the follower would not appear after landing until the player reloaded the map. This fixes that.
 2023-03-28 23:30:10 -07:00
W1serV1ser 32c644ee92 Added faster/fastest animations for followers 
Also made a few minor changes to make both FollowingPokemon branches a little more in-sync.
 2023-03-26 15:30:37 -07:00
GriffinR 6be9a79b8c Merge pull request #1871 from GriffinRichards/doc-trendy-sayings 
Document the trendy sayings word group
 2023-03-24 08:05:51 -04:00
GriffinR 590eda3446 Merge pull request #1875 from Zunawe/fix-scanner-flag-name 
Fix scanner item flag name
 2023-03-24 01:04:04 -04:00
Zunawe 492422b6bd Fix scanner item flag name 2023-03-23 21:47:26 -07:00
GriffinR 8d67bebd51 Merge pull request #1869 from GriffinRichards/const-map 
Treat map data as const
 2023-03-22 13:00:06 -04:00
GriffinR 00e211a417 Merge pull request #1873 from AsparagusEduardo/pret/pr2/stringConversionIDE 
Changed IDE macros to allow their use in compound literals without IDE errors
 2023-03-15 03:00:01 -04:00
GriffinR 02a37830cc Merge pull request #1872 from AsparagusEduardo/pret/pr2/friendship 
Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments
 2023-03-15 02:52:45 -04:00
Eduardo Quezada 2cb54c49da Changed definitions of string conversion IDE macros to allow their use in compound literals without IDE errors 2023-03-14 15:38:18 -03:00
Eduardo Quezada 0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
W1serV1ser 69c07fe3c8 Added fix for shadow issues when follower shrinks (thanks to Karl) 2023-03-13 15:31:06 -07:00
GriffinR 0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
W1serV1ser 9e1c9cf720 Added more SetObjectEventDirection calls to follower_face commands 2023-03-13 11:06:10 -07:00
W1serV1ser 2ac4feaa2c Added follower_face macros and fixed FaceEast (both thanks to Karl) 2023-03-12 16:23:15 -07:00
W1serV1ser 260fca5b46 Removed the Gen 4 Pokemon that snuck in 2023-03-12 13:10:31 -07:00
W1serV1ser bbe087d27d Updated gamma names to color names 2023-03-12 12:34:34 -07:00
W1serV1ser a6dc26acb7 Updated names and updated dynamic palette system 2023-03-11 16:32:42 -08:00
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
GriffinR dbf757be88 Treat map data as const 2023-03-08 12:00:30 -05:00
GriffinR bb078e0618 Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments 
Document music usage to make it easier to search for a specific track
 2023-03-05 15:29:38 -05:00
Eduardo Quezada a6bd35ceab Review changes 2023-03-05 17:17:39 -03:00
GriffinR ce6875817f Merge pull request #1860 from GriffinRichards/metatile-labels 
Format metatile_labels
 2023-03-04 23:36:04 -05:00
GriffinR 4d99d2c926 Merge pull request #1859 from AsparagusEduardo/pret/doc/natures 
Reformatted gNatureStatTable
 2023-03-04 23:31:43 -05:00
GriffinR ec89e519f9 Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful 
Rename eventLegal to modernFatefulEncounter
 2023-02-28 11:48:34 -05: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 8d88a38561 Merge pull request #1854 from GriffinRichards/constants-num-frames 
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
 2023-02-27 13:16:49 -05:00
GriffinR 4a6ea87247 Merge pull request #1865 from AsparagusEduardo/pret/doc/species2 
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarity
 2023-02-27 13:06:04 -05:00
GriffinR c7b50c6dcb Merge pull request #1866 from AsparagusEduardo/pret/feature/toolsWhitelist 
Whitelist instead of Blacklist for TOOLDIRS in Makefiles
 2023-02-27 12:59:52 -05:00
GriffinR be84793713 Let scaninc/preproc ignore empty asm files 2023-02-27 12:47:35 -05:00
GriffinR 588100e4ab Merge pull request #1867 from Zunawe/fix-item-flag 
Fix wrong route in item flag name
 2023-02-25 17:12:08 -05:00
Zunawe f376b71f7c Fix wrong route in item flag name 2023-02-25 13:48:39 -08:00
Eduardo Quezada d00c8902f9 Whitelist instead of Blacklist for TOOLDIRS in Makefiles 2023-02-25 16:49:41 -03:00
Eduardo Quezada 079ca8ab29 Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification 2023-02-24 07:53:02 -03:00
Eduardo Quezada d330ca051a Document music usage to make it easier to search for a specific track 2023-02-23 11:44:23 -03:00
Eduardo Quezada f5aa3b8272 Document the 2 different sText_GotchaPkmnCaught 2023-02-23 11:43:40 -03:00
GriffinR f209a5a66c Merge pull request #1863 from Zunawe/fix-hidden-item-flag 
Fix wrong route in hidden item flag name
 2023-02-22 16:20:55 -05:00
Zunawe 60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08:00
GriffinR d45e67e16e Merge pull request #1862 from Zunawe/fix-spelling 
Fix spelling mistake for item flag
 2023-02-20 22:10:07 -05:00
Zunawe 8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08:00