don't generate ld scripts

5 files changed, 410 insertions, 418 deletions

diff --git a/Makefile b/Makefile
index 7718ee523..83f37d8b7 100644
--- a/Makefile
+++ b/Makefile
@@ -109,16 +109,12 @@ tidy:
 	$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
 
 %.elf: $(LD_SCRIPT) $(ALL_OBJECTS)
-	cd $(BUILD_DIR) && $(LD) -T ld_script.ld -Map ../../$(MAP) -o ../../$@ ../../$(LIBGCC) ../../$(LIBC)
+	cd $(BUILD_DIR) && $(LD) -T ld_script.ld -Map ../../$(MAP) ../../$(LIBGCC) ../../$(LIBC) -o ../../$@
 
-$(LD_SCRIPT): $(BUILD_DIR)/sym_bss.ld $(BUILD_DIR)/sym_common.ld $(BUILD_DIR)/sym_ewram.ld ld_script.txt
-	cd $(BUILD_DIR) && sed -f ../../ld_script.sed ../../ld_script.txt | sed "s#tools/#../../tools/#g" >ld_script.ld
-$(BUILD_DIR)/sym_bss.ld: sym_bss.txt
-	cd $(BUILD_DIR) && ../../$(RAMSCRGEN) .bss ../../sym_bss.txt $(GAME_LANGUAGE) >sym_bss.ld
+$(LD_SCRIPT): $(BUILD_DIR)/sym_common.ld ld_script.txt
+	cd $(BUILD_DIR) && sed -e "s#tools/#../../tools/#g" ../../ld_script.txt >ld_script.ld
 $(BUILD_DIR)/sym_common.ld: sym_common.txt
 	$(CPP) -P $(CPPFLAGS) $< > $@
-$(BUILD_DIR)/sym_ewram.ld: sym_ewram.txt
-	cd $(BUILD_DIR) && ../../$(RAMSCRGEN) ewram_data ../../sym_ewram.txt $(GAME_LANGUAGE) >sym_ewram.ld
 
 $(C_OBJECTS): $(BUILD_DIR)/%.o: %.c $$(C_DEP)
 	$(CPP) $(CPPFLAGS) $< -o $(BUILD_DIR)/$*.i
diff --git a/ld_script.sed b/ld_script.sed
deleted file mode 100644
index 76b18c301..000000000
--- a/ld_script.sed
+++ /dev/null
@@ -1,4 +0,0 @@
-/<BSS>/ {
-    r sym_bss.ld
-    d
-}
diff --git a/ld_script.txt b/ld_script.txt
index 18de179bc..6931eb661 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -9,7 +9,7 @@ SECTIONS {
     ewram (NOLOAD) :
     ALIGN(4)
     {
-        INCLUDE "sym_ewram.ld"
+        INCLUDE "../../sym_ewram.txt"
 
         . = 0x40000;
     }
@@ -20,7 +20,7 @@ SECTIONS {
     ALIGN(4)
     {
         /* .bss starts at 0x3000000 */
-<BSS>
+        INCLUDE "../../sym_bss.txt"
 
         /* .bss.code starts at 0x3000F60 */
         src/libs/m4a_2.o(.bss.code);
diff --git a/sym_bss.txt b/sym_bss.txt
index 6e95a609f..f36785ce8 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -1,42 +1,42 @@
-	.include "src/engine/main.o"
-	.include "src/engine/sprite.o"
-	.include "src/engine/text.o"
-	.include "src/engine/string_util.o"
-	.include "src/engine/link.o"
-	.include "src/engine/rtc.o"
-	.include "src/field/daycare.o"
-	.include "src/engine/trade.o"
-	.include "src/scene/berry_blender.o"
-	.include "src/engine/play_time.o"
-	.include "src/field/overworld.o"
-	.include "src/field/field_camera.o"
-	.include "src/field/field_map_obj.o"
-	.include "src/field/field_message_box.o"
-	.include "src/engine/text_window.o"
-	.include "src/engine/script.o"
-	.include "src/field/start_menu.o"
-	.include "src/engine/menu.o"
-	.include "src/engine/tileset_anim.o"
-	.include "src/engine/sound.o"
-	.include "src/field/field_weather.o"
-	.include "src/field/field_effect.o"
-	.include "src/field/item_menu.o"
-	.include "src/field/shop.o"
-	.include "src/engine/record_mixing.o"
-	.include "src/field/tv.o"
-	.include "src/battle/battle_anim_80CA710.o"
-	.include "src/easy_chat_2.o"
-	.include "src/pokenav_before.o"
-	.include "src/field/mauville_man.o"
-	.include "src/field/menu_helpers.o"
-	.include "src/scene/contest_painting.o"
-	.include "src/field/pokeblock.o"
-	.include "src/field/field_specials.o"
-	.include "src/pokemon/learn_move.o"
-	.include "src/field/player_pc.o"
-	.include "src/libs/m4a_1.o"
-	.include "src/libs/agb_flash.o"
-	.include "src/libs/siirtc.o"
-	.include "tools/agbcc/lib/libgcc.a:dp-bit.o"
-	.include "tools/agbcc/lib/libgcc.a:fp-bit.o"
-	.include "tools/agbcc/lib/libc.a:syscalls.o"
+. = ALIGN(4); src/engine/main.o(.bss);
+. = ALIGN(4); src/engine/sprite.o(.bss);
+. = ALIGN(4); src/engine/text.o(.bss);
+. = ALIGN(4); src/engine/string_util.o(.bss);
+. = ALIGN(4); src/engine/link.o(.bss);
+. = ALIGN(4); src/engine/rtc.o(.bss);
+. = ALIGN(4); src/field/daycare.o(.bss);
+. = ALIGN(4); src/engine/trade.o(.bss);
+. = ALIGN(4); src/scene/berry_blender.o(.bss);
+. = ALIGN(4); src/engine/play_time.o(.bss);
+. = ALIGN(4); src/field/overworld.o(.bss);
+. = ALIGN(4); src/field/field_camera.o(.bss);
+. = ALIGN(4); src/field/field_map_obj.o(.bss);
+. = ALIGN(4); src/field/field_message_box.o(.bss);
+. = ALIGN(4); src/engine/text_window.o(.bss);
+. = ALIGN(4); src/engine/script.o(.bss);
+. = ALIGN(4); src/field/start_menu.o(.bss);
+. = ALIGN(4); src/engine/menu.o(.bss);
+. = ALIGN(4); src/engine/tileset_anim.o(.bss);
+. = ALIGN(4); src/engine/sound.o(.bss);
+. = ALIGN(4); src/field/field_weather.o(.bss);
+. = ALIGN(4); src/field/field_effect.o(.bss);
+. = ALIGN(4); src/field/item_menu.o(.bss);
+. = ALIGN(4); src/field/shop.o(.bss);
+. = ALIGN(4); src/engine/record_mixing.o(.bss);
+. = ALIGN(4); src/field/tv.o(.bss);
+. = ALIGN(4); src/battle/battle_anim_80CA710.o(.bss);
+. = ALIGN(4); src/easy_chat_2.o(.bss);
+. = ALIGN(4); src/pokenav_before.o(.bss);
+. = ALIGN(4); src/field/mauville_man.o(.bss);
+. = ALIGN(4); src/field/menu_helpers.o(.bss);
+. = ALIGN(4); src/scene/contest_painting.o(.bss);
+. = ALIGN(4); src/field/pokeblock.o(.bss);
+. = ALIGN(4); src/field/field_specials.o(.bss);
+. = ALIGN(4); src/pokemon/learn_move.o(.bss);
+. = ALIGN(4); src/field/player_pc.o(.bss);
+. = ALIGN(4); src/libs/m4a_1.o(.bss);
+. = ALIGN(4); src/libs/agb_flash.o(.bss);
+. = ALIGN(4); src/libs/siirtc.o(.bss);
+. = ALIGN(4); ../../tools/agbcc/lib/libgcc.a:dp-bit.o(.bss);
+. = ALIGN(4); ../../tools/agbcc/lib/libgcc.a:fp-bit.o(.bss);
+. = ALIGN(4); ../../tools/agbcc/lib/libc.a:syscalls.o(.bss);
diff --git a/sym_ewram.txt b/sym_ewram.txt
index d2fd0aabe..f6b4852a8 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1,471 +1,471 @@
-	.include "src/engine/main.o"
-	.include "src/engine/sprite.o"
-	.include "src/engine/text.o"
-	.include "src/engine/string_util.o"
+. = ALIGN(4); src/engine/main.o(ewram_data);
+. = ALIGN(4); src/engine/sprite.o(ewram_data);
+. = ALIGN(4); src/engine/text.o(ewram_data);
+. = ALIGN(4); src/engine/string_util.o(ewram_data);
 
-	.space 0x2E8
+. += 0x2E8;
 
-	.include "src/engine/link.o"
-	.include "src/rom3.o"
+. = ALIGN(4); src/engine/link.o(ewram_data);
+. = ALIGN(4); src/rom3.o(ewram_data);
 
-@ battle
+/* battle */
 
-	.align 2
-gUnknown_020238C8: @ 20238C8
-	.space 0x4
+	. = ALIGN(4);
+gUnknown_020238C8 = .; /* 20238C8 */
+    . += 0x4;
 
-gDisplayedStringBattle: @ 20238CC
-	.space 0x12C
+gDisplayedStringBattle = .; /* 20238CC */
+    . += 0x12C;
 
-gBattleTypeFlags: @ 20239F8
-	.space 0x4
+gBattleTypeFlags = .; /* 20239F8 */
+    . += 0x4;
 
-gUnknown_020239FC: @ 20239FC
-	.space 0x4
+gUnknown_020239FC = .; /* 20239FC */
+    . += 0x4;
 
-gUnknown_02023A00: @ 2023A00
-	.space 0x4
+gUnknown_02023A00 = .; /* 2023A00 */
+    . += 0x4;
 
-gUnknown_02023A04: @ 2023A04
-	.space 0x10
+gUnknown_02023A04 = .; /* 2023A04 */
+    . += 0x10;
 
-gUnknown_02023A14: @ 2023A14
-	.space 0x4C
+gUnknown_02023A14 = .; /* 2023A14 */
+    . += 0x4C;
 
-gBattleBufferA: @ 2023A60
-	.space 0x2
+gBattleBufferA = .; /* 2023A60 */
+    . += 0x2;
 
-gUnknown_02023A62: @ 2023A62
-	.space 0x1
+gUnknown_02023A62 = .; /* 2023A62 */
+    . += 0x1;
 
-gUnknown_02023A63: @ 2023A63
-	.space 0x1
+gUnknown_02023A63 = .; /* 2023A63 */
+    . += 0x1;
 
-gUnknown_02023A64: @ 2023A64
-	.space 0x7FC
+gUnknown_02023A64 = .; /* 2023A64 */
+    . += 0x7FC;
 
-gBattleBufferB: @ 2024260
-	.space 0x4
+gBattleBufferB = .; /* 2024260 */
+    . += 0x4;
 
-gUnknown_02024264: @ 2024264
-	.space 0x7FC
+gUnknown_02024264 = .; /* 2024264 */
+    . += 0x7FC;
 
-gActiveBank: @ 2024A60
-	.space 0x4
+gActiveBank = .; /* 2024A60 */
+    . += 0x4;
 
-gBattleExecBuffer: @ 2024A64
-	.space 0x4
+gBattleExecBuffer = .; /* 2024A64 */
+    . += 0x4;
 
-gNoOfAllBanks: @ 2024A68
-	.space 0x2
+gNoOfAllBanks = .; /* 2024A68 */
+    . += 0x2;
 
-gBattlePartyID: @ 2024A6A
-	.space 0x8
+gBattlePartyID = .; /* 2024A6A */
+    . += 0x8;
 
-gBanksBySide: @ 2024A72
-	.space 0x4
+gBanksBySide = .; /* 2024A72 */
+    . += 0x4;
 
-gActionsByTurnOrder: @ 2024A76
-	.space 0x4
+gActionsByTurnOrder = .; /* 2024A76 */
+    . += 0x4;
 
-gBanksByTurnOrder: @ 2024A7A
-	.space 0x4
+gBanksByTurnOrder = .; /* 2024A7A */
+    . += 0x4;
 
-gCurrentTurnActionNumber: @ 2024A7E
-	.space 0x1
+gCurrentTurnActionNumber = .; /* 2024A7E */
+    . += 0x1;
 
-gCurrentActionFuncId: @ 2024A7F
-	.space 0x1
+gCurrentActionFuncId = .; /* 2024A7F */
+    . += 0x1;
 
-gBattleMons: @ 2024A80
-	.space 0xC
+gBattleMons = .; /* 2024A80 */
+    . += 0xC;
 
-gUnknown_02024A8C: @ 2024A8C
-	.space 0xC
+gUnknown_02024A8C = .; /* 2024A8C */
+    . += 0xC;
 
-gUnknown_02024A98: @ 2024A98
-	.space 0xC
+gUnknown_02024A98 = .; /* 2024A98 */
+    . += 0xC;
 
-gUnknown_02024AA4: @ 2024AA4
-	.space 0x4
+gUnknown_02024AA4 = .; /* 2024AA4 */
+    . += 0x4;
 
-gUnknown_02024AA8: @ 2024AA8
-	.space 0x24
+gUnknown_02024AA8 = .; /* 2024AA8 */
+    . += 0x24;
 
-gUnknown_02024ACC: @ 2024ACC
-	.space 0x4
+gUnknown_02024ACC = .; /* 2024ACC */
+    . += 0x4;
 
-gUnknown_02024AD0: @ 2024AD0
-	.space 0x110
+gUnknown_02024AD0 = .; /* 2024AD0 */
+    . += 0x110;
 
-gObjectBankIDs: @ 2024BE0
-	.space 0x4
+gObjectBankIDs = .; /* 2024BE0 */
+    . += 0x4;
 
-gCurrMovePos: @ 2024BE4
-	.space 0x1
+gCurrMovePos = .; /* 2024BE4 */
+    . += 0x1;
 
-gUnknown_02024BE5: @ 2024BE5
-	.space 0x1
+gUnknown_02024BE5 = .; /* 2024BE5 */
+    . += 0x1;
 
-gCurrentMove: @ 2024BE6
-	.space 0x2
+gCurrentMove = .; /* 2024BE6 */
+    . += 0x2;
 
-gChosenMove: @ 2024BE8
-	.space 0x2
+gChosenMove = .; /* 2024BE8 */
+    . += 0x2;
 
-gRandomMove: @ 2024BEA
-	.space 0x2
+gRandomMove = .; /* 2024BEA */
+    . += 0x2;
 
-gBattleMoveDamage: @ 2024BEC
-	.space 0x4
+gBattleMoveDamage = .; /* 2024BEC */
+    . += 0x4;
 
-gHpDealt: @ 2024BF0
-	.space 0x4
+gHpDealt = .; /* 2024BF0 */
+    . += 0x4;
 
-gTakenDmg: @ 2024BF4
-	.space 0x10
+gTakenDmg = .; /* 2024BF4 */
+    . += 0x10;
 
-gLastUsedItem: @ 2024C04
-	.space 0x2
+gLastUsedItem = .; /* 2024C04 */
+    . += 0x2;
 
-gLastUsedAbility: @ 2024C06
-	.space 0x1
+gLastUsedAbility = .; /* 2024C06 */
+    . += 0x1;
 
-gBankAttacker: @ 2024C07
-	.space 0x1
+gBankAttacker = .; /* 2024C07 */
+    . += 0x1;
 
-gBankTarget: @ 2024C08
-	.space 0x1
+gBankTarget = .; /* 2024C08 */
+    . += 0x1;
 
-gBank1: @ 2024C09
-	.space 0x1
+gBank1 = .; /* 2024C09 */
+    . += 0x1;
 
-gEffectBank: @ 2024C0A
-	.space 0x1
+gEffectBank = .; /* 2024C0A */
+    . += 0x1;
 
-gStringBank: @ 2024C0B
-	.space 0x1
+gStringBank = .; /* 2024C0B */
+    . += 0x1;
 
-gAbsentBankFlags: @ 2024C0C
-	.space 0x1
+gAbsentBankFlags = .; /* 2024C0C */
+    . += 0x1;
 
-gCritMultiplier: @ 2024C0D
-	.space 0x1
+gCritMultiplier = .; /* 2024C0D */
+    . += 0x1;
 
-gMultiHitCounter: @ 2024C0E
-	.space 0x2
+gMultiHitCounter = .; /* 2024C0E */
+    . += 0x2;
 
-gBattlescriptCurrInstr: @ 2024C10
-	.space 0x8
+gBattlescriptCurrInstr = .; /* 2024C10 */
+    . += 0x8;
 
-gActionForBanks: @ 2024C18
-	.space 0x4
+gActionForBanks = .; /* 2024C18 */
+    . += 0x4;
 
-gUnknown_02024C1C: @ 2024C1C
-	.space 0x10
+gUnknown_02024C1C = .; /* 2024C1C */
+    . += 0x10;
 
-gUnknown_02024C2C: @ 2024C2C
-	.space 0x8
+gUnknown_02024C2C = .; /* 2024C2C */
+    . += 0x8;
 
-gLastUsedMove: @ 2024C34
-	.space 0x8
+gLastUsedMove = .; /* 2024C34 */
+    . += 0x8;
 
-gLastLandedMoves: @ 2024C3C
-	.space 0x8
+gLastLandedMoves = .; /* 2024C3C */
+    . += 0x8;
 
-gLastHitByType: @ 2024C44
-	.space 0x8
+gLastHitByType = .; /* 2024C44 */
+    . += 0x8;
 
-gUnknown_02024C4C: @ 2024C4C
-	.space 0x8
+gUnknown_02024C4C = .; /* 2024C4C */
+    . += 0x8;
 
-gLockedMoves: @ 2024C54
-	.space 0x8
+gLockedMoves = .; /* 2024C54 */
+    . += 0x8;
 
-gUnknown_02024C5C: @ 2024C5C
-	.space 0x4
+gUnknown_02024C5C = .; /* 2024C5C */
+    . += 0x4;
 
-gChosenMovesByBanks: @ 2024C60
-	.space 0x8
+gChosenMovesByBanks = .; /* 2024C60 */
+    . += 0x8;
 
-gBattleMoveFlags: @ 2024C68
-	.space 0x4
+gBattleMoveFlags = .; /* 2024C68 */
+    . += 0x4;
 
-gHitMarker: @ 2024C6C
-	.space 0x4
+gHitMarker = .; /* 2024C6C */
+    . += 0x4;
 
-gUnknown_02024C70: @ 2024C70
-	.space 0x4
+gUnknown_02024C70 = .; /* 2024C70 */
+    . += 0x4;
 
-gTakenDmgBanks: @ 2024C74
-	.space 0x4
+gTakenDmgBanks = .; /* 2024C74 */
+    . += 0x4;
 
-gUnknown_02024C78: @ 2024C78
-	.space 0x2
+gUnknown_02024C78 = .; /* 2024C78 */
+    . += 0x2;
 
-gSideAffecting: @ 2024C7A
-	.space 0x6
+gSideAffecting = .; /* 2024C7A */
+    . += 0x6;
 
-gSideTimers: @ 2024C80
-	.space 0x18
+gSideTimers = .; /* 2024C80 */
+    . += 0x18;
 
-gStatuses3: @ 2024C98
-	.space 0x10
+gStatuses3 = .; /* 2024C98 */
+    . += 0x10;
 
-gDisableStructs: @ 2024CA8
-	.space 0x70
+gDisableStructs = .; /* 2024CA8 */
+    . += 0x70;
 
-gPauseCounterBattle: @ 2024D18
-	.space 0x2
+gPauseCounterBattle = .; /* 2024D18 */
+    . += 0x2;
 
-gPaydayMoney: @ 2024D1A
-	.space 0x2
+gPaydayMoney = .; /* 2024D1A */
+    . += 0x2;
 
-gRandomTurnNumber: @ 2024D1C
-	.space 0x2
+gRandomTurnNumber = .; /* 2024D1C */
+    . += 0x2;
 
-gBattleCommunication: @ 2024D1E
-	.space 0x1
+gBattleCommunication = .; /* 2024D1E */
+    . += 0x1;
 
-gUnknown_02024D1F: @ 2024D1F
-	.space 0x7
+gUnknown_02024D1F = .; /* 2024D1F */
+    . += 0x7;
 
-gBattleOutcome: @ 2024D26
-	.space 0x2
+gBattleOutcome = .; /* 2024D26 */
+    . += 0x2;
 
-gProtectStructs: @ 2024D28
-	.space 0x40
+gProtectStructs = .; /* 2024D28 */
+    . += 0x40;
 
-gSpecialStatuses: @ 2024D68
-	.space 0x50
+gSpecialStatuses = .; /* 2024D68 */
+    . += 0x50;
 
-gBattleWeather: @ 2024DB8
-	.space 0x4
+gBattleWeather = .; /* 2024DB8 */
+    . += 0x4;
 
-gWishFutureKnock: @ 2024DBC
-	.space 0x20
+gWishFutureKnock = .; /* 2024DBC */
+    . += 0x20;
 
-gUnknown_02024DDC: @ 2024DDC
-	.space 0xC
+gUnknown_02024DDC = .; /* 2024DDC */
+    . += 0xC;
 
-gUnknown_02024DE8: @ 2024DE8
-	.space 0x2
+gUnknown_02024DE8 = .; /* 2024DE8 */
+    . += 0x2;
 
-gSentPokesToOpponent: @ 2024DEA
-	.space 0x2
+gSentPokesToOpponent = .; /* 2024DEA */
+    . += 0x2;
 
-gDynamicBasePower: @ 2024DEC
-	.space 0x2
+gDynamicBasePower = .; /* 2024DEC */
+    . += 0x2;
 
-gExpShareExp: @ 2024DEE
-	.space 0x2
+gExpShareExp = .; /* 2024DEE */
+    . += 0x2;
 
-gEnigmaBerries: @ 2024DF0
-	.space 0x8
+gEnigmaBerries = .; /* 2024DF0 */
+    . += 0x8;
 
-gUnknown_02024DF8: @ 2024DF8
-	.space 0x68
+gUnknown_02024DF8 = .; /* 2024DF8 */
+    . += 0x68;
 
-gActionSelectionCursor: @ 2024E60
-	.space 0x4
+gActionSelectionCursor = .; /* 2024E60 */
+    . += 0x4;
 
-gMoveSelectionCursor: @ 2024E64
-	.space 0x4
+gMoveSelectionCursor = .; /* 2024E64 */
+    . += 0x4;
 
-gUnknown_02024E68: @ 2024E68
-	.space 0x4
+gUnknown_02024E68 = .; /* 2024E68 */
+    . += 0x4;
 
-gBankInMenu: @ 2024E6C
-	.space 0x1
+gBankInMenu = .; /* 2024E6C */
+    . += 0x1;
 
-gDoingBattleAnim: @ 2024E6D
-	.space 0x3
+gDoingBattleAnim = .; /* 2024E6D */
+    . += 0x3;
 
-gTransformedPersonalities: @ 2024E70
-	.space 0x10
+gTransformedPersonalities = .; /* 2024E70 */
+    . += 0x10;
 
-gBattleMovePower: @ 2024E80
-	.space 0x2
+gBattleMovePower = .; /* 2024E80 */
+    . += 0x2;
 
-gMoveToLearn: @ 2024E82
-	.space 0x2
+gMoveToLearn = .; /* 2024E82 */
+    . += 0x2;
 
-gBattleMonForms: @ 2024E84
-	.space 0x4
+gBattleMonForms = .; /* 2024E84 */
+    . += 0x4;
 
-	.include "src/pokemon/pokemon_1.o"
-	.include "src/pokemon/pokemon_2.o"
-	.include "src/engine/load_save.o"
-	.include "src/engine/trade.o"
-	.include "src/scene/berry_blender.o"
-	.include "src/scene/new_game.o"
-	.include "src/field/overworld.o"
-	.include "src/field/fieldmap.o"
-	.include "src/field/field_camera.o"
-	.include "src/field/field_player_avatar.o"
-	.include "src/field/field_message_box.o"
-	.include "src/engine/script.o"
-	.include "src/field/scrcmd.o"
-	.include "src/field/field_control_avatar.o"
-	.include "src/field/event_data.o"
-	.include "src/field/party_menu.o"
-	.include "src/field/start_menu.o"
-	.include "src/engine/menu.o"
-	.include "src/engine/tileset_anim.o"
-	.include "src/engine/palette.o"
-	.include "src/engine/sound.o"
-	.include "src/battle/battle_anim.o"
-	.include "src/rom_8077ABC.o"
-	.include "src/scene/title_screen.o"
-	.include "src/field/field_weather.o"
-	.include "src/battle/battle_setup.o"
-	.include "src/field/wild_encounter.o"
-	.include "src/field/field_effect.o"
-	.include "src/scanline_effect.o"
-	.include "src/pokemon/pokemon_menu.o"
-	.include "src/pokemon/pokedex.o"
-	.include "src/engine/trainer_card.o"
-	.include "src/pokemon/pokemon_storage_system.o"
+. = ALIGN(4); src/pokemon/pokemon_1.o(ewram_data);
+. = ALIGN(4); src/pokemon/pokemon_2.o(ewram_data);
+. = ALIGN(4); src/engine/load_save.o(ewram_data);
+. = ALIGN(4); src/engine/trade.o(ewram_data);
+. = ALIGN(4); src/scene/berry_blender.o(ewram_data);
+. = ALIGN(4); src/scene/new_game.o(ewram_data);
+. = ALIGN(4); src/field/overworld.o(ewram_data);
+. = ALIGN(4); src/field/fieldmap.o(ewram_data);
+. = ALIGN(4); src/field/field_camera.o(ewram_data);
+. = ALIGN(4); src/field/field_player_avatar.o(ewram_data);
+. = ALIGN(4); src/field/field_message_box.o(ewram_data);
+. = ALIGN(4); src/engine/script.o(ewram_data);
+. = ALIGN(4); src/field/scrcmd.o(ewram_data);
+. = ALIGN(4); src/field/field_control_avatar.o(ewram_data);
+. = ALIGN(4); src/field/event_data.o(ewram_data);
+. = ALIGN(4); src/field/party_menu.o(ewram_data);
+. = ALIGN(4); src/field/start_menu.o(ewram_data);
+. = ALIGN(4); src/engine/menu.o(ewram_data);
+. = ALIGN(4); src/engine/tileset_anim.o(ewram_data);
+. = ALIGN(4); src/engine/palette.o(ewram_data);
+. = ALIGN(4); src/engine/sound.o(ewram_data);
+. = ALIGN(4); src/battle/battle_anim.o(ewram_data);
+. = ALIGN(4); src/rom_8077ABC.o(ewram_data);
+. = ALIGN(4); src/scene/title_screen.o(ewram_data);
+. = ALIGN(4); src/field/field_weather.o(ewram_data);
+. = ALIGN(4); src/battle/battle_setup.o(ewram_data);
+. = ALIGN(4); src/field/wild_encounter.o(ewram_data);
+. = ALIGN(4); src/field/field_effect.o(ewram_data);
+. = ALIGN(4); src/scanline_effect.o(ewram_data);
+. = ALIGN(4); src/pokemon/pokemon_menu.o(ewram_data);
+. = ALIGN(4); src/pokemon/pokedex.o(ewram_data);
+. = ALIGN(4); src/engine/trainer_card.o(ewram_data);
+. = ALIGN(4); src/pokemon/pokemon_storage_system.o(ewram_data);
 
-@ still pokemon_storage_system
+/* still pokemon_storage_system */
 
-	.align 2
-gUnknown_02038470: @ 2038470
-	.space 0x3
+    . = ALIGN(4);
+gUnknown_02038470 = .; /* 2038470 */
+    . += 0x3;
 
-gUnknown_02038473: @ 2038473
-	.space 0x1
+gUnknown_02038473 = .; /* 2038473 */
+    . += 0x1;
 
-gUnknown_02038474: @ 2038474
-	.space 0x4
+gUnknown_02038474 = .; /* 2038474 */
+    . += 0x4;
 
-gUnknown_02038478: @ 2038478
-	.space 0x4
-
-gUnknown_0203847C: @ 203847C
-	.space 0x1
-
-gUnknown_0203847D: @ 203847D
-	.space 0x1
-
-gUnknown_0203847E: @ 203847E
-	.space 0x1
-
-gUnknown_0203847F: @ 203847F
-	.space 0x1
-
-gUnknown_02038480: @ 2038480
-	.space 0x64
-
-gUnknown_020384E4: @ 20384E4
-	.space 0x1
-
-gUnknown_020384E5: @ 20384E5
-	.space 0x1
-
-gUnknown_020384E6: @ 20384E6
-	.space 0x1
-
-gUnknown_020384E7: @ 20384E7
-	.space 0x1
-
-gUnknown_020384E8: @ 20384E8
-	.space 0x1
-
-gUnknown_020384E9: @ 20384E9
-	.space 0x1
-
-gUnknown_020384EA: @ 20384EA
-	.space 0x2
-
-gUnknown_020384EC: @ 20384EC
-	.space 0x4
-
-	.include "src/pokemon/pokemon_summary_screen.o"
-	.include "src/field/script_movement.o"
-	.include "src/field/map_name_popup.o"
-	.include "src/field/item_menu.o"
-	.include "src/contest.o"
-	.include "src/field/shop.o"
-	.include "src/field/fldeff_escalator.o"
-	.include "src/field/money.o"
-	.include "src/engine/record_mixing.o"
-	.include "src/debug/sound_check_menu.o"
-	.include "src/field/secret_base.o"
-	.include "src/field/tv.o"
-	.include "src/field/pc_screen_effect.o"
-	.include "src/field/rotating_gate.o"
-	.include "src/field/safari_zone.o"
-	.include "src/easy_chat_2.o"
-
-@ pokenav
-
-	.align 2
-gUnknown_020388B0: @ 20388B0
-	.space 0x4
-
-gUnknown_020388B4: @ 20388B4
-	.space 0x4
-
-	.include "src/pokemon/mon_markings.o"
-	.include "src/field/mauville_man.o"
-	.include "src/field/menu_helpers.o"
-	.include "src/field/region_map.o"
-	.include "src/field/decoration.o"
-	.include "src/battle/battle_ai.o"
-	.include "src/rom6.o"
-	.include "src/field/pokeblock.o"
-	.include "src/field/field_specials.o"
-
-@ pokedex_area_screen
-
-	.align 2
-gUnknown_02039260: @ 2039260
-	.space 0x2
+gUnknown_02038478 = .; /* 2038478 */
+    . += 0x4;
+
+gUnknown_0203847C = .; /* 203847C */
+    . += 0x1;
+
+gUnknown_0203847D = .; /* 203847D */
+    . += 0x1;
+
+gUnknown_0203847E = .; /* 203847E */
+    . += 0x1;
+
+gUnknown_0203847F = .; /* 203847F */
+    . += 0x1;
+
+gUnknown_02038480 = .; /* 2038480 */
+    . += 0x64;
+
+gUnknown_020384E4 = .; /* 20384E4 */
+    . += 0x1;
+
+gUnknown_020384E5 = .; /* 20384E5 */
+    . += 0x1;
+
+gUnknown_020384E6 = .; /* 20384E6 */
+    . += 0x1;
+
+gUnknown_020384E7 = .; /* 20384E7 */
+    . += 0x1;
+
+gUnknown_020384E8 = .; /* 20384E8 */
+    . += 0x1;
+
+gUnknown_020384E9 = .; /* 20384E9 */
+    . += 0x1;
+
+gUnknown_020384EA = .; /* 20384EA */
+    . += 0x2;
+
+gUnknown_020384EC = .; /* 20384EC */
+    . += 0x4;
+
+. = ALIGN(4); src/pokemon/pokemon_summary_screen.o(ewram_data);
+. = ALIGN(4); src/field/script_movement.o(ewram_data);
+. = ALIGN(4); src/field/map_name_popup.o(ewram_data);
+. = ALIGN(4); src/field/item_menu.o(ewram_data);
+. = ALIGN(4); src/contest.o(ewram_data);
+. = ALIGN(4); src/field/shop.o(ewram_data);
+. = ALIGN(4); src/field/fldeff_escalator.o(ewram_data);
+. = ALIGN(4); src/field/money.o(ewram_data);
+. = ALIGN(4); src/engine/record_mixing.o(ewram_data);
+. = ALIGN(4); src/debug/sound_check_menu.o(ewram_data);
+. = ALIGN(4); src/field/secret_base.o(ewram_data);
+. = ALIGN(4); src/field/tv.o(ewram_data);
+. = ALIGN(4); src/field/pc_screen_effect.o(ewram_data);
+. = ALIGN(4); src/field/rotating_gate.o(ewram_data);
+. = ALIGN(4); src/field/safari_zone.o(ewram_data);
+. = ALIGN(4); src/easy_chat_2.o(ewram_data);
+
+/* pokenav */
+
+    . = ALIGN(4);
+gUnknown_020388B0 = .; /* 20388B0 */
+    . += 0x4;
+
+gUnknown_020388B4 = .; /* 20388B4 */
+    . += 0x4;
+
+. = ALIGN(4); src/pokemon/mon_markings.o(ewram_data);
+. = ALIGN(4); src/field/mauville_man.o(ewram_data);
+. = ALIGN(4); src/field/menu_helpers.o(ewram_data);
+. = ALIGN(4); src/field/region_map.o(ewram_data);
+. = ALIGN(4); src/field/decoration.o(ewram_data);
+. = ALIGN(4); src/battle/battle_ai.o(ewram_data);
+. = ALIGN(4); src/rom6.o(ewram_data);
+. = ALIGN(4); src/field/pokeblock.o(ewram_data);
+. = ALIGN(4); src/field/field_specials.o(ewram_data);
+
+/* pokedex_area_screen */
+
+    . = ALIGN(4);
+gUnknown_02039260 = .; /* 2039260 */
+    . += 0x2;
 
-gUnknown_02039262: @ 2039262
-	.space 0x2
+gUnknown_02039262 = .; /* 2039262 */
+    . += 0x2;
 
-gUnknown_02039264: @ 2039264
-	.space 0x2
+gUnknown_02039264 = .; /* 2039264 */
+    . += 0x2;
 
-gUnknown_02039266: @ 2039266
-	.space 0x2
+gUnknown_02039266 = .; /* 2039266 */
+    . += 0x2;
 
-gUnknown_02039268: @ 2039268
-	.space 0x2
+gUnknown_02039268 = .; /* 2039268 */
+    . += 0x2;
 
-gUnknown_0203926A: @ 203926A
-	.space 0x2
-
-	.include "src/battle/battle_message.o"
-	.include "src/field/choose_party.o"
-	.include "src/scene/cable_car.o"
-	.include "src/engine/save.o"
-	.include "src/engine/mystery_event_script.o"
-	.include "src/field/roamer.o"
-	.include "src/field/use_pokeblock.o"
-	.include "src/field/player_pc.o"
-	.include "src/scene/intro.o"
-	.include "src/scene/hall_of_fame.o"
-	.include "src/scene/credits.o"
-	.include "src/field/lottery_corner.o"
-	.include "src/field/berry_tag_screen.o"
-	.include "src/engine/mystery_event_menu.o"
-	.include "src/engine/save_failed_screen.o"
-	.include "src/pokemon/pokeblock_feed.o"
-	.include "src/scene/intro_credits_graphics.o"
-
-@ ???
-
-	.align 4
-gTileBuffer: @ 2039360
-	.space 0x100
-
-gUnknown_02039460: @ 2039460
-	.space 0x300
-
-gUnknown_02039760: @ 2039760
-	.space 0xC00
-
-	.include "src/engine/menu_cursor.o"
+gUnknown_0203926A = .; /* 203926A */
+    . += 0x2;
+
+. = ALIGN(4); src/battle/battle_message.o(ewram_data);
+. = ALIGN(4); src/field/choose_party.o(ewram_data);
+. = ALIGN(4); src/scene/cable_car.o(ewram_data);
+. = ALIGN(4); src/engine/save.o(ewram_data);
+. = ALIGN(4); src/engine/mystery_event_script.o(ewram_data);
+. = ALIGN(4); src/field/roamer.o(ewram_data);
+. = ALIGN(4); src/field/use_pokeblock.o(ewram_data);
+. = ALIGN(4); src/field/player_pc.o(ewram_data);
+. = ALIGN(4); src/scene/intro.o(ewram_data);
+. = ALIGN(4); src/scene/hall_of_fame.o(ewram_data);
+. = ALIGN(4); src/scene/credits.o(ewram_data);
+. = ALIGN(4); src/field/lottery_corner.o(ewram_data);
+. = ALIGN(4); src/field/berry_tag_screen.o(ewram_data);
+. = ALIGN(4); src/engine/mystery_event_menu.o(ewram_data);
+. = ALIGN(4); src/engine/save_failed_screen.o(ewram_data);
+. = ALIGN(4); src/pokemon/pokeblock_feed.o(ewram_data);
+. = ALIGN(4); src/scene/intro_credits_graphics.o(ewram_data);
+
+/* ??? */
+
+    . = ALIGN(16);
+gTileBuffer = .; /* 2039360 */
+    . += 0x100;
+
+gUnknown_02039460 = .; /* 2039460 */
+    . += 0x300;
+
+gUnknown_02039760 = .; /* 2039760 */
+    . += 0xC00;
+
+. = ALIGN(4); src/engine/menu_cursor.o(ewram_data);