ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,414 Commits 1 Branch 0 Tags 235 MiB
5496f0e6b0
Commit Graph

7414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
GriffinR
1707f82992 Combine/colorize status graphics 2023-01-13 12:53:08 -05:00
GriffinR
0064db7a6d Correct colors for frontier_pass 2023-01-13 02:25:23 -05:00
GriffinR
ee3f5033b3 Colorize contest/interface.png 2023-01-13 00:26:40 -05:00
GriffinR
52e00ac603 Correct colors in summary_screen/tiles.png 2023-01-12 21:41:06 -05:00
GriffinR
3a253ece0f Fix some colors in crusher.png 2023-01-12 19:04:49 -05:00
GriffinR
89286c91e3
Merge pull request #1842 from GriffinRichards/gbagfx-pals 
Automatically constrain png pixels to bit depth
 2023-01-12 16:36:05 -05:00
GriffinR
a12432a0f3 Colorize crusher.png 2023-01-12 16:34:36 -05:00