Merge branch 'master' into fldeff
This commit is contained in:
+2
-9
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user