Commit Graph
100 Commits
Author SHA1 Message Date
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 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
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
GriffinR 0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04: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
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
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
GriffinR d45e67e16e Merge pull request #1862 from Zunawe/fix-spelling
Fix spelling mistake for item flag
2023-02-20 22:10:07 -05:00
GriffinR f888021c8f Merge pull request #1857 from GriffinRichards/sync-mapjson
Sync mapjson
2023-02-19 20:48:13 -05:00
GriffinR a164a021e4 Merge pull request #1861 from LOuroboros/metatitle
Fixed minor spelling mistake
2023-02-17 15:26:38 -05:00
GriffinR bc3805f9d3 Fix two binary palettes 2023-02-17 13:27:39 -05:00
GriffinR 69fdf0faa4 Merge pull request #1853 from GriffinRichards/doc-contest-bar
Clarify AI_CV_AttackDown_UnknownTypeList
2023-02-15 11:29:57 -05:00
GriffinR 671c9c5353 Merge branch 'master' into doc-chat 2023-02-15 10:57:05 -05:00
GriffinR ef950e6663 Merge pull request #1852 from GriffinRichards/doc-windows
Document window IDs
2023-02-15 10:47:13 -05:00
GriffinR a322379feb Merge branch 'master' into doc-windows 2023-02-15 10:04:48 -05:00
GriffinR 9c1c598160 GROUPTYPE_NONE to unsigned 2023-02-15 09:49:33 -05:00
GriffinR d3d680c1dd Sort metatile labels alphabetically 2023-02-14 14:36:27 -05:00
GriffinR b656565af0 Standardize RS mossdeep gym metatile labels 2023-02-14 11:42:13 -05:00
GriffinR 0df56b808d Remove duplicate metatile label sections 2023-02-14 11:40:15 -05:00
GriffinR c32fbf594a Merge pull request #1851 from GriffinRichards/doc-fldspc
Document remaining field_specials task data
2023-02-08 22:34:57 -05:00
GriffinR c29cf5a5e5 Remove unnecessary version check 2023-02-08 13:34:38 -05:00
GriffinR de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
GriffinR 118a9701c9 Add event type errors 2023-02-08 12:52:28 -05:00
GriffinR db5edc49d7 Sync mapjson 2023-02-08 12:52:06 -05:00
GriffinR bbf0cf0103 Stop hard-coding number of preset names 2023-02-04 00:00:38 -05:00
GriffinR 5496f0e6b0 Merge pull request #1850 from GriffinRichards/sync-trade
Sync trade
2023-02-03 19:05:00 -05:00
GriffinR c1cfd3ac66 Add fix for commented bug 2023-02-03 16:01:13 -05:00
GriffinR 6c3bc86b56 Merge pull request #1856 from Jaizu/patch-4
Make contest opponents an enum
2023-02-03 12:42:13 -05:00
GriffinR 5793a1a5e7 Correct some union room chat documentation 2023-02-02 11:41:02 -05:00
GriffinR 62aed217fe Remove unused common symbols in window.c 2023-02-01 16:14:32 -05:00
GriffinR 3b15fd34cc Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames 2023-02-01 16:09:01 -05:00
GriffinR 28ada9c93b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar 2023-02-01 15:52:19 -05:00
GriffinR 020266463c Add fix for described UB 2023-02-01 15:44:48 -05:00
GriffinR 07e00b2e41 Additional window id constant usage 2023-02-01 15:24:15 -05:00
GriffinR 4328ed8b19 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-02-01 14:59:45 -05:00
GriffinR 30f893f255 Fix comment mistake 2023-02-01 11:52:32 -05:00
GriffinR 9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
GriffinR 43af7d46ca Label data for elevator effects 2023-02-01 10:43:10 -05:00
GriffinR 27a5e05f75 Label data for screen effect tasks 2023-02-01 10:20:23 -05:00
GriffinR 603d870ea0 Fix debug printing negative values 2023-02-01 09:36:18 -05:00
GriffinR 65d476d575 Remove some incorrect color constant usage 2023-02-01 09:32:41 -05:00
GriffinR f4cb6d229f Add some missing sizeof usage for SpriteSheets 2023-01-24 17:04:48 -05:00
GriffinR 10230799d3 Simplify some max value macros 2023-01-23 16:01:46 -05:00
GriffinR 7681340966 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade 2023-01-23 14:45:51 -05:00
GriffinR f40fad528d Merge pull request #1847 from GriffinRichards/mapjson-err
Better type conversions and errors for mapjson
2023-01-22 18:38:06 -05:00
GriffinR 29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -05:00
GriffinR 0851e55ccb Merge pull request #1657 from PikalaxALT/sync_battle_anim_args
Sync battle anim args
2023-01-18 12:16:49 -05:00
GriffinR b7d92e8537 Revert incorrect constant usage, add new correct ones 2023-01-18 12:11:09 -05:00
GriffinR d1e4bd44ce Correct comment in maps.h 2023-01-18 11:54:06 -05:00
GriffinR 5a906c33ac Merge branch 'master' into sync_battle_anim_args 2023-01-18 11:47:33 -05:00
GriffinR ff3168f6cc Merge pull request #1746 from mrgriffin/ui-standardize
Standardize the UI code
2023-01-18 11:15:52 -05:00
GriffinR 0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
GriffinR 4a9c4951ab Merge pull request #1815 from tustin2121/patch-5
Adding FindObjectEventPaletteIndexByTag bugfix
2023-01-18 10:40:07 -05:00
GriffinR a203c03eac Add bugfix to LoadObjectEventPalette 2023-01-18 10:33:39 -05:00
GriffinR d68e81c2be Clarify MB_SEMI_DEEP_WATER name 2023-01-17 21:32:55 -05:00
GriffinR 713e1825bd Report JSON field names in errors 2023-01-17 16:25:33 -05:00
GriffinR 1e3b0e8d76 Treat all mapjson fields as strings 2023-01-17 16:00:09 -05:00
GriffinR b836d9ebfb Stop some redundant JSON reads 2023-01-17 15:40:39 -05:00
GriffinR 15431bd397 Add initial mapsjon type conversions 2023-01-17 15:25:39 -05:00
GriffinR d5a4bfcd6f Merge pull request #1843 from GriffinRichards/colorize
Colorize more grayscaled/incorrectly colored pngs
2023-01-15 12:48:42 -05:00
GriffinR e839c8ebe5 Colorize tourney_info_card.png 2023-01-15 12:42:47 -05:00
GriffinR 0415cf73df Fix results_screen/tiles.png colors 2023-01-15 12:04:29 -05:00
GriffinR ba8bed4da3 Merge pull request #1846 from Jaizu/patch-31
Add constants when using GetMonsStateToDoubles_2
2023-01-15 08:46:11 -05:00
GriffinR c0e68f33f7 Colorize pokemon storage tiles 2023-01-15 00:39:51 -05:00
GriffinR c663154760 Merge pull request #1836 from GriffinRichards/fix-clone
Add fix for Battle Tower cloning bug
2023-01-15 00:32:24 -05:00
GriffinR 18384894e0 Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups
Made Types and Egg Groups into arrays
2023-01-15 00:27:20 -05:00
GriffinR 14e8526a55 Merge pull request #1845 from AsparagusEduardo/pret/pr2/EasyChat
Improve Easy Chat documentation
2023-01-15 00:22:57 -05:00
GriffinR aeec8d65ee Merge pull request #1844 from Kurausukun/patch-2
Update INSTALL.md
2023-01-14 21:10:43 -05:00
GriffinR 41c85b4af6 Fix slot_machine/menu colors 2023-01-14 16:34:14 -05:00
GriffinR 71d4b1687a Fix party_menu/bg colors 2023-01-14 12:32:54 -05:00
GriffinR 9be0818b78 Fix intro/scene_1 tiles 2023-01-14 00:48:58 -05:00
GriffinR 9c34bc2385 Colorize picture_frame tiles 2023-01-13 15:30:57 -05:00
GriffinR 387ea563fc Move FRLG trainer card gfx to own folder, fix tiles 2023-01-13 13:40:13 -05:00