Merge branch 'master' into decompile_battle_frontier_1

This commit is contained in:
DizzyEggg
2018-08-25 20:02:09 +02:00
118 changed files with 21234 additions and 25833 deletions
+3 -24
View File
@@ -727,30 +727,9 @@ gUnknown_0203CF00: @ 203CF00
.include "src/fossil_specials.o"
.include "src/fldeff_groundshake.o"
gUnknown_0203CF1C: @ 203CF1C
.space 0x4
gUnknown_0203CF20: @ 203CF20
.space 0x1
gUnknown_0203CF21: @ 203CF21
.space 0x3
gUnknown_0203CF24: @ 203CF24
.space 0x4
gUnknown_0203CF28: @ 203CF28
.space 0x4
gUnknown_0203CF2C: @ 203CF2C
.space 0x4
gUnknown_0203CF30: @ 203CF30
.space 0x8
gUnknown_0203CF38: @ 203CF38
.space 0x4
.include "src/pokemon_summary_screen.o"
.include "src/unk_pokedex_area_screen_helper.o"
.include "src/battle_pyramid.o"
gUnknown_0203CF3C: @ 203CF3C
.space 0x4