dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
7,649 Commits 4 Branches 0 Tags
b98e044ce914a9068ee5e763831179b83398b585
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR bcd5fc1481 Merge pull request #1972 from GriffinRichards/metatile-labels 
Remove non-existent tilesets from label comments and alphabetize
 2024-01-19 10:44:29 -05:00
GriffinR 1eadbc39da Merge pull request #1973 from AsparagusEduardo/_pret/pr2/braces 
Fixed braces style
 2024-01-19 10:40:25 -05:00
GriffinR 8e8d2f5efa Remove non-existent tilesets from label comments and alphabetize 2024-01-18 14:31:04 -05:00
GriffinR 6c96641035 Merge pull request #1969 from Kurausukun/macros 
Safeguard SQUARE and CUBE Macro Arguments in Parentheses
 2023-12-27 17:39:37 -05:00
GriffinR 6385f0426d Merge pull request #1968 from Jaizu/patch-5 
Missing constant
 2023-12-20 09:03:35 -05:00
GriffinR 0e10fc3ca5 Merge pull request #1966 from Bassoonian/pokeacutemonpret 
Clean up pokemon/ball/dex mentions in comments
 2023-12-13 13:30:32 -05:00
GriffinR e4149e83f8 Merge pull request #1962 from LOuroboros/patch-1 
Updated the size of the struct InGameTrade's otName variable
 2023-12-02 10:44:31 -05:00
GriffinR 15e1cd81a7 Merge pull request #1952 from Icedude907/build-linkerscript 
[Build System Rewrite] Linkerscript now tracks RAM/ROM usage
 2023-11-23 17:01:29 -05:00
GriffinR b302291bd3 Merge pull request #1953 from Icedude907/move-files 
Moved files - spinda spots, jp fonts, redyellowgreen_frame.bin
 2023-11-20 12:27:05 -05:00
GriffinR 758f7446f0 Merge pull request #1959 from SnorlaxMonster/master 
Rename HITMARKER_IGNORE_SAFEGUARD
 2023-11-18 08:43:44 -05:00
GriffinR 12a64fecb4 Merge pull request #1936 from GriffinRichards/doc-datahpupdate 
Document datahpupdate
 2023-11-07 12:25:26 -05:00
GriffinR 2e1fe4c82b Merge pull request #1940 from LOuroboros/copyMonToPC 
Renamed SendMonToPC to CopyMonToPC instead
 2023-11-07 12:22:31 -05:00
GriffinR 92e7963eff Merge pull request #1939 from Bassoonian/noeggsdiscovered 
Rename Undiscovered to No Eggs Discovered
 2023-11-07 12:20:07 -05:00
GriffinR 973f797d95 Merge pull request #1944 from quocmanh94/master 
Delete the redundant files generated after running build
 2023-11-03 01:56:43 -04:00
GriffinR 959623f82e Merge pull request #1942 from KABoissonneault/fix/dual-non-immunity 
Added BUGFIX for "dual non-immunity" glitch.
 2023-11-02 11:26:58 -04:00
GriffinR 2304283c3e Merge pull request #1935 from GriffinRichards/bugfixfix 
Use BUGFIX in assembly files
 2023-10-26 17:42:41 -04:00
GriffinR c169b856d4 Merge pull request #1937 from kittenchilly/removewhitespace 
Remove all trailing whitespace
 2023-10-26 10:09:00 -04:00
GriffinR 3a8df46832 Merge pull request #1938 from AsparagusEduardo/pret/pr2/ndebugModern 
Fix mini_printf encoded string -Werror=pointer-sign warning
 2023-10-26 10:08:25 -04:00
GriffinR 5712777dc2 Correct dynamic type flag name 2023-10-20 12:57:36 -04:00
GriffinR ffdc2456cb Document datahpupdate 2023-10-20 12:50:32 -04:00
GriffinR a5c2ac5e49 Use BUGFIX in assembly files 2023-10-20 09:10:49 -04:00
GriffinR ad0c28df70 Merge pull request #1919 from AnonymousRandomPerson/master 
Replaced decomp list with pret.github.io link
 2023-10-17 02:44:08 -04:00
GriffinR 104e81b359 Merge pull request #1915 from GriffinRichards/misc-tasks 
Add some task/sprite data defines
 2023-10-07 21:34:52 -04:00
GriffinR f01a6afc98 Merge branch 'master' into misc-tasks 2023-10-07 17:25:20 -04:00
GriffinR 6f71fbe521 Add some missing trainer hill constant usage 2023-10-06 15:17:55 -04:00
GriffinR dec4b580a3 Merge pull request #1930 from KABoissonneault/fix/factory_oob 
Fixed out-of-bounds access in GetFactoryMonFixedIV for BUGFIX
 2023-10-05 11:51:17 -04:00
GriffinR 654b6380b1 Merge pull request #1926 from AsparagusEduardo/pret/pr2/EggWall 
Solved a bunch of -Wall errors on modern
 2023-10-01 11:57:30 -04:00
GriffinR 3ff27bdae0 Merge pull request #1928 from kittenchilly/friendship 
Add friendship evo threshold constant
 2023-10-01 11:53:03 -04:00
GriffinR 3eb1fa6fcb Merge pull request #1925 from AsparagusEduardo/pret/pr2/dayNightConst 
Slight RTC documentation + Evolution times constants
 2023-09-26 15:01:37 -04:00
GriffinR 7cc75eb5b8 Merge pull request #1927 from Kurausukun/m4asym 
Add Missing Constant Usage in m4a_1
 2023-09-23 21:49:12 -04:00
GriffinR 003d7d7e2e Merge pull request #1923 from SBird1337/bugfix/ability-wild-mons 
[BUGFIX] for abilities affecting wild encounter tables
 2023-09-19 14:47:25 -04:00
GriffinR de3493ff0e Merge pull request #1921 from citrusbolt/blockboxrs 
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
 2023-09-12 18:48:05 -04:00
GriffinR 16c0a24683 Merge pull request #1922 from AsparagusEduardo/pret/pr2/MrMime 
Fixed Mr. Mime capitalization
 2023-09-12 12:26:34 -04:00
GriffinR 4439253f39 Add include guards for assembly constants files 2023-09-03 20:57:54 -04:00
GriffinR d67914e114 Merge pull request #1912 from GriffinRichards/moves-mask 
Handful of fixes related to MAX_MON_MOVES
 2023-08-27 19:40:59 -04:00
GriffinR dcaf03e360 Merge pull request #1918 from WhenGryphonsFly/key_intr_enable 
Correct KEY_INTR_ENABLE
 2023-08-27 17:23:16 -04:00
GriffinR 843830374c Merge pull request #1916 from grunt-lucas/gbagfx-cc 
gbagfx to respect user CC setting
 2023-08-22 14:57:32 -04:00
GriffinR 56ff4ce998 Add defines for field effect sprite data, misc task data 2023-08-20 17:45:58 -04:00
GriffinR e70577d59b Add missing sizeof in trainer_see 2023-08-20 17:22:29 -04:00
GriffinR 4941e2602a Merge pull request #1909 from GriffinRichards/stat-anim 
Document stat change animation
 2023-08-20 14:29:11 -04:00
GriffinR 6792028254 Document title screen task data 2023-08-20 01:18:44 -04:00
GriffinR 5beec06d9d Document Task_MapNamePopUpWindow 2023-08-19 17:20:53 -04:00
GriffinR 4f3068406c Merge pull request #1914 from AnonymousRandomPerson/master 
Added newer decomp projects to readme
 2023-08-18 23:45:44 -04:00
GriffinR bdc0ea1037 Add MOD to match mod with powers of 2 2023-08-16 16:44:45 -04:00
GriffinR 057928438a Document ChooseMoveAndTargetInBattlePalace 2023-08-16 16:41:29 -04:00
GriffinR aca7998b93 Add missing use of ALL_MOVES_MASK 2023-08-16 14:33:15 -04:00
GriffinR 10a10e914b Merge pull request #1910 from GriffinRichards/misc-constants 
Use miscellaneous missing constants
 2023-08-15 17:53:41 -04:00
GriffinR 4c2b12541b Merge pull request #1908 from GriffinRichards/name-buffer 
Automatically update nickname buffer sizes
 2023-08-12 23:36:19 -04:00
GriffinR 344fe4dd65 Stop double-counting EOS in assert 2023-08-12 23:13:11 -04:00
GriffinR c5fb5fbb5f Merge pull request #1906 from AsparagusEduardo/pret/pr2/butItFailed 
Renamed "ButItFailed" script names
 2023-08-12 23:00:57 -04:00
GriffinR b248791f47 Merge pull request #1904 from GriffinRichards/temp-alias 
Add temp flag and var aliases
 2023-08-11 15:45:00 -04:00
GriffinR a0b42d0cd6 Merge pull request #1911 from Kermalis/remove-ewram-in-headers 
Remove ewram in headers
 2023-08-10 20:16:12 -04:00
GriffinR 60a6c9d160 Merge pull request #1903 from GriffinRichards/frontier-gfx 
Fix some frontier gfx, adjacent cleanup
 2023-08-10 14:49:44 -04:00
GriffinR d5d46bb438 More DISPLAY_WIDTH/HEIGHT constant usage 2023-08-10 01:42:38 -04:00
GriffinR 18319e8da3 Misc missing constant use 2023-08-10 01:42:18 -04:00
GriffinR 079f2da0f6 Fix some missing constant use in Apprentice 2023-08-10 00:38:23 -04:00
GriffinR d1c2a30149 Merge pull request #1907 from GriffinRichards/fix-tv 
Fix Bravo Trainer Tower member names
 2023-08-09 15:25:45 -04:00
GriffinR 6eaaa50ad5 Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
GriffinR 6598cb30bc Document stat change animation 2023-08-08 23:56:16 -04:00
GriffinR 65fee186f8 Automatically update nickname buffer sizes 2023-08-08 16:28:09 -04:00
GriffinR 087a2cecef Fix Bravo Trainer Tower member names 2023-08-08 14:38:00 -04:00
GriffinR 41847cd5aa STAT_ANIM constant usage 2023-08-04 16:27:45 -04:00
GriffinR 866c32a735 Add temp var aliases 2023-08-04 14:17:28 -04:00
GriffinR 6d4dadd7b5 Add temp flag aliases 2023-08-03 15:55:06 -04:00
GriffinR 16c0be7ed2 Fix some frontier gfx, adjacent cleanup 2023-08-03 11:15:15 -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
GriffinR 39192725f2 Merge pull request #1901 from mrgriffin/pret-potential-misalignment 
Detect potential misalignment in modern
 2023-07-25 14:21:42 -04:00
GriffinR 56ec3b6461 Merge pull request #1900 from Bassoonian/priortiy 
Fix priortiy typos
 2023-07-19 11:44:10 -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
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
GriffinR fce97dc397 Merge pull request #1891 from ipatix/makefilefix 
Fix compilation for modern under certain circumstances
 2023-06-08 12:20:42 -04:00
GriffinR 7ecdb3046a Merge pull request #1894 from mrgriffin/patch-2 
Fix EWRAM_DATA wildcards
 2023-06-06 09:32:11 -04: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
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
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