Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

This commit is contained in:
ultima-soul committed 2021-04-27 18:36:37 -07:00
commit 14a0303e2f
325 files changed
+14502 -13367

No files matched your search

+2 -2
View File
@@ -447,8 +447,8 @@ RESUME_MUSIC = FC 18
TRANSPARENT = 00
WHITE = 01
DARK_GREY = 02
LIGHT_GREY = 03
DARK_GRAY = 02
LIGHT_GRAY = 03
RED = 04
LIGHT_RED = 05
GREEN = 06