diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:51:21 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-16 07:51:21 -0400 |
| commit | 0367cc7d7884ff4100b90832ac000a3e415d2896 (patch) | |
| tree | a06d1aa77e267d20d0d925477fc27ffb303594a8 /sym_ewram.txt | |
| parent | 9c2e157123903ba18ee51655c42c7304517b37cc (diff) | |
| parent | f44f89a463d7280a95094e8f37a56873a90da843 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system
Diffstat (limited to 'sym_ewram.txt')
| -rw-r--r-- | sym_ewram.txt | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sym_ewram.txt b/sym_ewram.txt index 790fb435a..531ae1434 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -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 |