Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214

# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c
This commit is contained in:
Eduardo Quezada committed 2023-02-15 14:11:03 -03:00
commit b62e5aa72e
28 files changed
+2217 -2238

No files matched your search

-3
View File
@@ -1,5 +1,2 @@
gUnusedWindowVar1
gUnusedWindowVar2
gTransparentTileNumber
gUnusedWindowVar3
gWindowBgTilemapBuffers