Commit Graph

7425 Commits

Author SHA1 Message Date
Eduardo Quezada dbd02d3a56 Clarified Champion Ribbon's description to avoid being interpreted as needing to beat the champion in both RSE and FRLG. 2023-02-15 14:06:42 -03:00
Eduardo Quezada bd54990333 Review changes 2023-02-15 13:56:11 -03:00
Eduardo Quezada a937b3221a Documented Ribbons 2023-02-11 23:16:24 -03:00
Eduardo Quezada 96865f66af Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
Eduardo Quezada 6da5e0a280 Rename eventLegal to fatefulEncounter 2023-02-11 17:13:53 -03: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 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
Jaizu 717ba22ea1 Make contest opponents an enum
I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
2023-02-03 15:49:22 +01:00
GriffinR 62aed217fe Remove unused common symbols in window.c 2023-02-01 16:14:32 -05:00
GriffinR 020266463c Add fix for described UB 2023-02-01 15:44:48 -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
Jaizu a3ae182fc2 Add constants when using GetMonsStateToDoubles_2 2023-01-15 09:50:31 +01: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
Eduardo Quezada 70d59d6aa9 Improve Easy Chat documentation 2023-01-15 02:15:11 -03:00
GriffinR aeec8d65ee Merge pull request #1844 from Kurausukun/patch-2
Update INSTALL.md
2023-01-14 21:10:43 -05:00
Kurausukun c28d8056c3 Update INSTALL.md
Clarify that WSL is also available on Windows 11
2023-01-14 21:05:10 -05:00
GriffinR 41c85b4af6 Fix slot_machine/menu colors 2023-01-14 16:34:14 -05:00