diff options
| -rw-r--r-- | common_syms/field_camera.txt | 2 | ||||
| -rw-r--r-- | sym_bss.txt | 16 | ||||
| -rw-r--r-- | sym_common.txt | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/common_syms/field_camera.txt b/common_syms/field_camera.txt index 65de29fc3..02301ce23 100644 --- a/common_syms/field_camera.txt +++ b/common_syms/field_camera.txt @@ -1,3 +1,3 @@ gFieldCamera gTotalCameraPixelOffsetY -gTotalCameraPixelOffsetX
\ No newline at end of file +gTotalCameraPixelOffsetX diff --git a/sym_bss.txt b/sym_bss.txt index 0ada68f3e..9195e3ee4 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -1,12 +1,8 @@ + .align 3 .include "src/gpu_regs.o" - - .space 0x4 - + .align 3 .include "src/dma3_manager.o" - - .space 0x4 - - .align 2 + .align 3 .include "src/bg.o" .align 2 .include "src/malloc.o" @@ -24,7 +20,9 @@ .include "src/trade.o" .align 2 .include "src/play_time.o" + .align 2 + @ .include "src/overworld.o" gUnknown_3000E80: @ 3000E80 .space 0x4 @@ -39,7 +37,6 @@ gUnknown_3000E89: @ 3000E89 .align 3 .include "src/field_camera.o" - .align 3 .include "src/script.o" .align 2 @@ -51,6 +48,8 @@ gUnknown_3000E89: @ 3000E89 .align 2 .include "src/field_effect.o" + .align 2 + @ .include "src/pokemon_storage_system.o" gUnknown_3000FE8: @ 3000FE8 .space 0x184 @@ -66,6 +65,7 @@ gUnknown_3000FE8: @ 3000FE8 .include "src/union_room.o" .align 2 + @ .include "src/pokemon_special_anim.o" gUnknown_3002030: @ 3002030 .space 0x8 diff --git a/sym_common.txt b/sym_common.txt index 2ec8e6188..1865bcbc4 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -20,6 +20,7 @@ .include "load_save.o" .align 2 + @ .include "overworld.o" gBGTilemapBuffers1: @ 3005014 .space 0x4 @@ -44,7 +45,7 @@ gLocalLinkPlayerId: @ 300502C gFieldLinkPlayerCount: @ 3005030 .space 0x10 - .align 2 + .align 4 .include "fieldmap.o" .align 4 @@ -54,6 +55,7 @@ gFieldLinkPlayerCount: @ 3005030 .include "scrcmd.o" .align 2 + @ .include "field_control_avatar.o" gSelectedObjectEvent: @ 3005074 .space 0x4 |