Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system
This commit is contained in:
+3
-9
@@ -71,7 +71,7 @@ gUnknown_2031DE8: @ 2031DE8
|
||||
gUnknown_2031DEA: @ 2031DEA
|
||||
.space 0x2
|
||||
|
||||
gUnknown_2031DEC: @ 2031DEC
|
||||
gLinkPlayerObjectEvents: @ 2031DEC
|
||||
.space 0x10
|
||||
|
||||
.align 2
|
||||
@@ -87,20 +87,14 @@ gUnknown_2036E30: @ 2036E30
|
||||
gUnknown_2036E34: @ 2036E34
|
||||
.space 0x4
|
||||
|
||||
.align 2
|
||||
@ .include "src/event_object_movement.o"
|
||||
gObjectEvents: @ 2036E38
|
||||
.space 0x240
|
||||
|
||||
gPlayerAvatar: @ 2037078
|
||||
.space 0x20
|
||||
|
||||
gUnknown_2037098: @ 2037098
|
||||
.space 0x2
|
||||
|
||||
gUnknown_203709A: @ 203709A
|
||||
.space 0x2
|
||||
|
||||
.align 2
|
||||
.include "src/event_object_movement.o"
|
||||
.align 2
|
||||
.include "src/field_message_box.o"
|
||||
.align 2
|
||||
|
||||
Reference in New Issue
Block a user