Annotate undumped symbols in sym_ewram.txt

src/field_effect.c

@@ -32,6 +32,8 @@
 #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
 #define FIELD_EFFECT_COUNT 32
 
+EWRAM_DATA u32 gFieldEffectArguments[8] = {0};
+
 static u8 sFieldEffectActiveList[FIELD_EFFECT_COUNT];
 
 static void FieldEffectActiveListAdd(u8 fldeff);

src/fieldmap.c

@@ -32,6 +32,7 @@ static EWRAM_DATA u16 gBackupMapLayout[VIRTUAL_MAP_SIZE] = {};
 EWRAM_DATA struct MapHeader gMapHeader = {};
 EWRAM_DATA struct Camera gCamera = {};
 static EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {};
+EWRAM_DATA u8 gUnknown_2036E28 = 0;
 
 static const struct ConnectionFlags sDummyConnectionFlags = {};
 

src/item.c

@@ -12,6 +12,8 @@
 #include "constants/items.h"
 #include "constants/maps.h"
 
+EWRAM_DATA struct BagPocket gBagPockets[NUM_BAG_POCKETS] = {};
+
 void SortAndCompactBagPocket(struct BagPocket * pocket);
 
 // Item descriptions and data

sym_ewram.txt

@@ -34,6 +34,7 @@
 	.include "src/new_game.o"
 
 	.align 2
+	@ .include "src/overworld.o"
 gUnknown_2031DB4: @ 2031DB4
 	.space 0x8
 
@@ -76,18 +77,21 @@ gUnknown_2031DEC: @ 2031DEC
 	.align 2
 	.include "src/fieldmap.o"
 
-gUnknown_2036E28: @ 2036E28
+	.align 2
-	.space 0x4
+	@ .include "src/field_camera.o"
-
 gUnknown_2036E2C: @ 2036E2C
 	.space 0x4
 
+	.align 2
+	@ .include "src/field_player_avatar.o"
 gUnknown_2036E30: @ 2036E30
 	.space 0x4
 
 gUnknown_2036E34: @ 2036E34
 	.space 0x4
 
+	.align 2
+	@ .include "src/event_object_movement.o"
 gObjectEvents: @ 2036E38
 	.space 0x240
 
@@ -124,6 +128,7 @@ gUnknown_203709A: @ 203709A
 	.include "src/title_screen.o"
 
 	.align 2
+	@ .include "src/field_weather.o"
 gUnknown_2037F34: @ 2037F34
 	.space 0x200
 
@@ -146,11 +151,8 @@ gUnknown_20386A8: @ 20386A8
 	.include "src/battle_setup.o"
 	.align 2
 	.include "src/wild_encounter.o"
-
 	.align 2
-gFieldEffectArguments: @ 20386E0
+	.include "src/field_effect.o"
-	.space 0x20
-
 	.align 2
 	.include "src/scanline_effect.o"
 	.align 2
@@ -158,28 +160,30 @@ gFieldEffectArguments: @ 20386E0
 	.align 2
 	.include "src/trainer_card.o"
 
-gUnknown_20397A8: @ 20397A8
+	.align 2
+	@ .include "src/pokemon_storage_system.o"
+sPreviousBoxOption: @ 20397A8
 	.space 0x4
 
 gUnknown_20397AC: @ 20397AC
 	.space 0x4
 
-gUnknown_20397B0: @ 20397B0
+sPSSData: @ 20397B0
 	.space 0x4
 
-gUnknown_20397B4: @ 20397B4
+sInPartyMenu: @ 20397B4
 	.space 0x1
 
-gUnknown_20397B5: @ 20397B5
+sCurrentBoxOption: @ 20397B5
 	.space 0x1
 
 gUnknown_20397B6: @ 20397B6
 	.space 0x1
 
-gUnknown_20397B7: @ 20397B7
+sWhichToReshow: @ 20397B7
 	.space 0x1
 
-gUnknown_20397B8: @ 20397B8
+sLastUsedBox: @ 20397B8
 	.space 0x2
 
 gUnknown_20397BA: @ 20397BA
@@ -188,22 +192,22 @@ gUnknown_20397BA: @ 20397BA
 gUnknown_20397BC: @ 20397BC
 	.space 0x64
 
-gUnknown_2039820: @ 2039820
+sBoxCursorArea: @ 2039820
 	.space 0x1
 
-gUnknown_2039821: @ 2039821
+sBoxCursorPosition: @ 2039821
 	.space 0x1
 
-gUnknown_2039822: @ 2039822
+sIsMonBeingMoved: @ 2039822
 	.space 0x1
 
-gUnknown_2039823: @ 2039823
+sMovingMonOrigBoxId: @ 2039823
 	.space 0x1
 
-gUnknown_2039824: @ 2039824
+sMovingMonOrigBoxPos: @ 2039824
 	.space 0x1
 
-gUnknown_2039825: @ 2039825
+sCanOnlyMove: @ 2039825
 	.space 0x1
 
 gUnknown_2039826: @ 2039826
@@ -221,10 +225,8 @@ gUnknown_203982C: @ 203982C
 	.include "src/fldeff_cut.o"
 	.align 2
 	.include "src/item_menu_icons.o"
-
+	.align 2
-gBagPockets: @ 203988C
+	.include "src/item.o"
-	.space 0x28
-
 	.align 2
 	.include "src/shop.o"
 	.align 2
@@ -233,12 +235,12 @@ gBagPockets: @ 203988C
 	.include "src/script_menu.o"
 
 	.align 2
+	@ .include "src/naming_screen.o"
 gUnknown_203998C: @ 203998C
 	.space 0x4
 
 	.align 2
 	.include "src/money.o"
-
 	.align 2
 	.include "src/safari_zone.o"
 	.align 2
@@ -313,15 +315,15 @@ gUnknown_203998C: @ 203998C
 	.include "src/link_rfu_3.o"
 	.align 2
 
+	@ .include "src/easy_chat_2.o"
 gUnknown_203ACE8: @ 203ACE8
 	.space 0x4
 
 gUnknown_203ACEC: @ 203ACEC
 	.space 0x4
 
-gUnknown_203ACF0: @ 203ACF0
+	.align 2
-	.space 0x4
+	.include "src/pokedex_screen.o"
-
 	.align 2
 	.include "src/list_menu.o"
 	.align 2
@@ -348,6 +350,7 @@ gUnknown_203ACF0: @ 203ACF0
 	.include "src/union_room_battle.o"
 
 	.align 2
+	@ .include "src/pokemon_special_anim.o"
 gUnknown_203B090: @ 203B090
 	.space 0x4
 
@@ -376,6 +379,8 @@ gUnknown_203B098: @ 203B098
 	.align 2
 	.include "src/menu_indicators.o"
 
+	.align 2
+	@ .include "src/pokemon_summary_screen.o"
 gUnknown_203B140: @ 203B140
 	.space 0x4