Merge branch 'master' into fldeff

This commit is contained in:
ultima-soul
2019-04-28 16:55:43 -07:00
523 changed files with 19874 additions and 6922 deletions
+2 -9
View File
@@ -1615,19 +1615,12 @@ sLocationHistory: @ 203F3A8
sRoamerLocation: @ 203F3AE
.space 0x2
gUnknown_203F3B0: @ 203F3B0
.space 0x8
gUnknown_203F3B8: @ 203F3B8
.space 0x4
.include "src/mystery_gift_menu.o"
.include "src/mevent.o"
.include "src/mevent_server_helpers.o"
.include "src/mevent_server.o"
.include "src/mevent_8145654.o"
gUnknown_203F3D0: @ 203F3D0
.space 0x4
.include "src/seagallop.o"
gUnknown_203F3D4: @ 203F3D4
.space 0x4