ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,541 Commits 1 Branch 0 Tags 235 MiB
6eaaa50ad5
Commit Graph

7541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
GriffinR
da238562f0
Merge pull request #1902 from AsparagusEduardo/pret/rgb 
Using RGB color constants where appropiate
 2023-07-31 17:55:11 -04:00
Eduardo Quezada
f8c0f91c66 Using RGB color constants where appropiate 2023-07-31 15:33:14 -04:00
GriffinR
39192725f2
Merge pull request #1901 from mrgriffin/pret-potential-misalignment 
Detect potential misalignment in modern
 2023-07-25 14:21:42 -04:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
Martin Griffin
b53cca1a06
Declarations for 2- and 3-argument GetMonData (#1756) 
* Type-safe GetMonData/GetBoxMonData

* Comments
 2023-07-24 09:57:37 -04:00
GriffinR
56ec3b6461
Merge pull request #1900 from Bassoonian/priortiy 
Fix priortiy typos
 2023-07-19 11:44:10 -04:00
Bassoonian
7fa6ed8b05 Fix priortiy typos 2023-07-19 17:33:28 +02:00
luckytyphlosion
8ec0bff034
Update msys2 instructions 
Add pacman -Sy msys2-keyring
 2023-07-18 19:28:41 -04:00
GriffinR
d79e62690b
Merge pull request #1899 from gruxor/master 
Remove unused macro to fix syntax highlights
 2023-07-15 13:28:29 -04:00
gruxor
5fd881a1b6 Remove unused macro to fix syntax highlights 2023-07-12 14:44:23 -04:00
GriffinR
f4111d8082 Sync castform folder organization 2023-07-09 14:57:51 -04:00
GriffinR
010ce6bc63 Revert "Install libpng using pacman instead of manual build for msys2" 
This reverts commit dc2e210ade.
 2023-07-06 11:56:04 -04:00
GriffinR
8822264130
Merge pull request #1896 from PokemonSanFran/incrementgamestat_fix 
Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat
 2023-06-29 11:45:13 -04:00
PSF
b2901c51b0 Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat 2023-06-27 15:34:31 -07:00
GriffinR
fce97dc397
Merge pull request #1891 from ipatix/makefilefix 
Fix compilation for modern under certain circumstances
 2023-06-08 12:20:42 -04:00
Michael Panzlaff
2651401e6b Fix PATH for modern target for non dkp systems 
When prepending something to PATH, we should use PATH=/foo/bar:$PATH
and not PATH=/foo/bar:PATH. Because your shell won't certainly find
something under the literal name PATH.

If one is not using devkitarm, TOOLCHAIN will resolve to an empty
string. If TOOLCHAIN is an empty string the only search path for the
modern gcc will be /bin which may work on some installations but is
probably not what was originally intended with this line. So let's just
search the standard search path if nothing can be found under $(TOOLCHAIN).

Either way, PATH is already set up previously, so we can make sure
MODERNCC is invoked properly by calling MODERNCC with PATH=$(PATH).
 2023-06-08 12:42:17 +02:00
GriffinR
7ecdb3046a
Merge pull request #1894 from mrgriffin/patch-2 
Fix EWRAM_DATA wildcards
 2023-06-06 09:32:11 -04:00
Martin Griffin
62f592f4df
Fix EWRAM_DATA wildcards 
`ewram_data` not `.ewram_data`, doh!
 2023-06-06 09:02:52 +01:00
GriffinR
9c4a59f865 Fix swapped Dodrio Berry Picking palettes 2023-06-05 19:53:59 -04:00
GriffinR
86459acb69 Fix sTVPokemonAnslerTextGroup typo 2023-06-05 13:13:35 -04:00
GriffinR
859eb4dab6
Merge pull request #1893 from Bassoonian/fixfishinggamestat 
Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS
 2023-06-05 08:45:05 -04:00
Bassoonian
7bf34448e4 Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS 2023-06-05 14:15:07 +02:00
GriffinR
23b57050c2 Fix some compressed tilemaps 2023-06-01 15:31:12 -04:00
GriffinR
5100eef017
Merge pull request #1890 from GriffinRichards/pal-macro 
Add some missing palette macro use
 2023-05-28 18:28:50 -04:00
GriffinR
890d00471a
Merge pull request #1886 from GriffinRichards/1bpp 
Index footprint images, convert Spinda spots to .png files
 2023-05-27 21:58:45 -04:00
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
GriffinR
6fdf75bd8c Support plain pixel conversion, convert spinda spots to .png 2023-05-11 13:41:38 -04:00
GriffinR
8c537ccd72 Colorize bag select button 2023-05-10 00:33:43 -04:00
GriffinR
41ac28b210 Index pokemon footprint pngs 2023-05-09 22:43:48 -04:00
GriffinR
8b37b4292a Document DrawFootprint 2023-05-09 22:43:25 -04:00
GriffinR
1497719f8c
Merge pull request #1884 from GriffinRichards/mapjson-err 
Fix mapjson misreporting errors when processing map_groups.json
 2023-05-09 10:48:29 -04:00
GriffinR
dd65eddbdd
Merge pull request #1883 from GriffinRichards/doc-mod 
Add some missing ARRAY_COUNT, make TV_SHOWS_COUNT depend on NUM_NORMAL_TVSHOW_SLOTS
 2023-05-05 02:38:30 -04:00
GriffinR
f91abdf765
Merge pull request #1882 from GriffinRichards/ambient 
Add time ranges to UpdateAmbientCry
 2023-05-05 02:16:57 -04:00
GriffinR
8e5347b450 Fix mapjson misreporting errors when processing map_groups.json 2023-04-30 23:29:31 -04:00
GriffinR
c2dad5ac44 Redefine TV_SHOWS_COUNT 2023-04-27 13:59:09 -04:00
GriffinR
36e6981ac0 Replace some & usage with % 2023-04-26 16:12:00 -04:00
GriffinR
e83e08f21c Add time ranges to UpdateAmbientCry 2023-04-26 12:32:43 -04:00
GriffinR
73a6a583b3
Merge pull request #1879 from GriffinRichards/cable-car-tilemap 
Use tilemap file for cable car pylons
 2023-04-09 13:19:43 -04:00
GriffinR
d4e243136f
Merge pull request #1878 from GriffinRichards/num-text-printers 
Replace NUM_TEXT_PRINTERS with WINDOWS_MAX
 2023-04-08 08:41:04 -04:00
GriffinR
57396026b2 Replace NUM_TEXT_PRINTERS with WINDOWS_MAX 2023-03-31 14:57:51 -04:00
GriffinR
4b859ff1e4 Use tilemap file for cable car pylons 2023-03-31 00:44:22 -04: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