Extract some data

And split up subtasks and world events.

1 files changed, 104 insertions, 33 deletions

diff --git a/linker.ld b/linker.ld
index 1f509c68..50a77389 100644
--- a/linker.ld
+++ b/linker.ld
@@ -73,7 +73,7 @@ SECTIONS {
         . = 0x00024030; gMessageChoices = .;
         . = 0x00024048; gUnk_02024048 = .;
         . = 0x00024050; gRoomMemory = .;
-        . = 0x00024090; gUnk_02024090 = .;
+        . = 0x00024090; gPaletteBufferBackup = .;
         . = 0x00024490; gGFXSlots = .;
         . = 0x000246B0; gUnk_020246B0 = .;
         . = 0x00025EB0; gMapBottom = .;
@@ -95,6 +95,7 @@ SECTIONS {
         . = 0x00034CF0; gUnk_02034CF0 = .;
         . = 0x00034D30; gUnk_02034D30 = .;
         . = 0x00034DF0; gUnk_02034DF0 = .;
+        . = 0x00034E4E; gUnk_02034E4E = .;
         . = 0x0003508E; gUnk_0203508E = .;
         . = 0x000350E2; gUnk_020350E2 = .;
         . = 0x000350F0; gUnk_020350F0 = .;
@@ -405,9 +406,38 @@ SECTIONS {
         src/fade.o(.text);
         src/fileselect.o(.text);
         src/game.o(.text);
+        src/subtask/subtaskAuxCutscene.o(.text);
+        src/gameOverTask.o(.text);
+        src/gameUtils.o(.text);
+        src/cutscene.o(.text);
+        src/itemUtils.o(.text);
+        src/subtask/subtaskWorldEvent.o(.text);
         src/playerItem/playerItemLantern.o(.text);
-        src/subtask.o(.text);
-        src/sub_08055E08.o(.text);
+        src/worldEvent/worldEvent4.o(.text);
+        src/worldEvent/worldEvent3.o(.text);
+        src/worldEvent/worldEvent19.o(.text);
+        src/worldEvent/worldEvent1.o(.text);
+        src/worldEvent/worldEvent17.o(.text);
+        src/worldEvent/worldEvent16.o(.text);
+        src/worldEvent/worldEvent13.o(.text);
+        src/worldEvent/worldEvent14.o(.text);
+        src/worldEvent/worldEvent5.o(.text);
+        src/worldEvent/worldEvent6.o(.text);
+        src/worldEvent/worldEvent8.o(.text);
+        src/worldEvent/worldEvent11.o(.text);
+        src/worldEvent/worldEvent10.o(.text);
+        src/worldEvent/worldEvent21.o(.text);
+        src/worldEvent/worldEvent15.o(.text);
+        src/worldEvent/worldEvent23.o(.text);
+        src/worldEvent/worldEvent12.o(.text);
+        src/worldEvent/worldEvent20.o(.text);
+        src/worldEvent/worldEvent2.o(.text);
+        src/worldEvent/worldEvent9.o(.text);
+        src/worldEvent/worldEvent25.o(.text);
+        src/worldEvent/worldEvent7.o(.text);
+        src/worldEvent/worldEvent24.o(.text);
+        src/worldEvent/worldEvent0.o(.text);
+        src/worldEvent/worldEvent22.o(.text);
         src/main.o(.text);
         src/message.o(.text);
         src/manager/lightRayManager.o(.text);
@@ -790,10 +820,14 @@ SECTIONS {
 #endif
         src/sound.o(.text);
         src/staffroll.o(.text);
-        src/menu/kinstone_menu.o(.text);
-        src/menu/figurine_menu.o(.text);
-        src/menu/pause_menu.o(.text);
-        src/subtask2.o(.text);
+        src/menu/kinstoneMenu.o(.text);
+        src/menu/figurineMenu.o(.text);
+        src/menu/pauseMenu.o(.text);
+        src/subtask/subtaskMapHint.o(.text);
+        src/menu/pauseMenuScreen6.o(.text);
+        src/subtask/subtaskLocalMapHint.o(.text);
+        src/subtask/subtaskFastTravel.o(.text);
+        src/subtask.o(.text);
         src/playerItem/playerItemSword.o(.text);
         src/playerItemUtils.o(.text);
         src/projectileUtils.o(.text);
@@ -862,7 +896,6 @@ SECTIONS {
         src/kinstone.o(.rodata);
         src/playerItem/playerItemGustBig.o(.rodata);
         src/playerItem/playerItemBow.o(.rodata);
-        data/const/playerItem/playerItemBow.o(.rodata);
         src/playerItem/playerItemSwordBeam.o(.rodata);
         data/const/beanstalkSubtask.o(.rodata);
         src/beanstalkSubtask.o(.rodata);
@@ -873,6 +906,7 @@ SECTIONS {
         src/playerItem/playerItemBottle.o(.rodata);
         data/const/playerItem/playerItemCellOverwriteSet.o(.rodata);
         src/playerItem/playerItemCellOverwriteSet.o(.rodata);
+        data/const/collisionMatrix.o(.rodata);
         data/const/ui.o(.rodata);
         src/sineTable.o(.rodata);
         data/const/common.o(.rodata);
@@ -1059,20 +1093,49 @@ SECTIONS {
         src/enemy/treeItem.o(.rodata);
         src/enemy/enemy66.o(.rodata);
         src/enemy.o(.rodata);
-        data/const/enemyUtils.o(.rodata);
-        data/const/enterPortalSubtask.o(.rodata);
+        src/enemyUtils.o(.rodata);
+        src/enterPortalSubtask.o(.rodata);
         data/map/entity_headers.o(.rodata);
-        data/const/fade.o(.rodata);
-        data/const/fileselect_before.o(.rodata);
+        src/fade.o(.rodata);
         src/fileselect.o(.rodata);
-        data/const/fileselect_after.o(.rodata);
         src/game.o(.rodata);
-        data/const/game.o(.rodata);
+        src/subtask/subtaskAuxCutscene.o(.rodata);
+        src/gameOverTask.o(.rodata);
+        src/gameUtils.o(.rodata);
+        src/cutscene.o(.rodata);
+        src/data/hitbox.o(.rodata);
+        src/itemUtils.o(.rodata);
+        src/subtask/subtaskWorldEvent.o(.rodata);
         src/itemMetaData.o(.rodata);
+        data/animations/spriteAnimations322.o(.rodata);
+        src/gameData.o(.rodata);
         data/const/game_2.o(.rodata);
         src/playerItem/playerItemLantern.o(.rodata);
-        data/const/subtask.o(.rodata);
-        data/const/sub_08055E08.o(.rodata);
+        src/worldEvent/worldEvent4.o(.rodata);
+        src/worldEvent/worldEvent3.o(.rodata);
+        src/worldEvent/worldEvent19.o(.rodata);
+        src/worldEvent/worldEvent1.o(.rodata);
+        src/worldEvent/worldEvent17.o(.rodata);
+        src/worldEvent/worldEvent16.o(.rodata);
+        src/worldEvent/worldEvent13.o(.rodata);
+        src/worldEvent/worldEvent14.o(.rodata);
+        src/worldEvent/worldEvent5.o(.rodata);
+        src/worldEvent/worldEvent6.o(.rodata);
+        src/worldEvent/worldEvent8.o(.rodata);
+        src/worldEvent/worldEvent11.o(.rodata);
+        src/worldEvent/worldEvent10.o(.rodata);
+        src/worldEvent/worldEvent21.o(.rodata);
+        src/worldEvent/worldEvent15.o(.rodata);
+        src/worldEvent/worldEvent23.o(.rodata);
+        src/worldEvent/worldEvent12.o(.rodata);
+        src/worldEvent/worldEvent20.o(.rodata);
+        src/worldEvent/worldEvent2.o(.rodata);
+        src/worldEvent/worldEvent9.o(.rodata);
+        src/worldEvent/worldEvent25.o(.rodata);
+        src/worldEvent/worldEvent7.o(.rodata);
+        src/worldEvent/worldEvent24.o(.rodata);
+        src/worldEvent/worldEvent0.o(.rodata);
+        src/worldEvent/worldEvent22.o(.rodata);
         data/gfx/palette_groups.o(.rodata);
         data/gfx/gfx_groups.o(.rodata);
         src/main.o(.rodata);
@@ -1121,8 +1184,10 @@ SECTIONS {
         src/manager/repeatedSoundManager.o(.rodata);
         src/manager/vaati3StartManager.o(.rodata);
         src/manager/floatingPlatformManager.o(.rodata);
+        src/manager/enterRoomTextboxManager.o(.rodata);
         data/const/manager/enterRoomTextboxManager.o(.rodata);
         data/const/entity.o(.rodata);
+        src/entity.o(.rodata);
         src/code_0805EC04.o(.rodata);
         data/const/text.o(.rodata);
         src/debug.o(.rodata);
@@ -1130,15 +1195,15 @@ SECTIONS {
         data/animations/npc/gentari.o(.rodata);
         src/npc/festari.o(.rodata);
         data/animations/npc/festari.o(.rodata);
-        data/const/npc/forestMinish.o(.rodata);
+        src/npc/forestMinish.o(.rodata);
         data/animations/npc/forestMinish.o(.rodata);
-        data/const/npc/postman.o(.rodata);
+        src/npc/postman.o(.rodata);
         data/animations/npc/postman.o(.rodata);
         src/npc/npc5.o(.rodata);
         data/animations/npc/npc5.o(.rodata);
         data/const/npc/townsperson.o(.rodata);
         data/animations/npc/townsperson.o(.rodata);
-        data/const/npc/kid.o(.rodata);
+        src/npc/kid.o(.rodata);
         data/animations/npc/kid.o(.rodata);
         src/npc/npc9.o(.rodata);
         data/animations/npc/npc9.o(.rodata);
@@ -1158,10 +1223,11 @@ SECTIONS {
         data/animations/npc/beedle.o(.rodata);
         src/npc/brocco.o(.rodata);
         data/animations/npc/brocco.o(.rodata);
-        data/const/npc/sittingPerson.o(.rodata);
+        src/npc/sittingPerson.o(.rodata);
         data/animations/npc/sittingPerson.o(.rodata);
         src/npc/pina.o(.rodata);
         data/animations/npc/pina.o(.rodata);
+        src/npc/guard.o(.rodata);
         data/const/npc/guard.o(.rodata);
         src/npc/guardWithSpear.o(.rodata);
         data/animations/npc/guardWithSpear.o(.rodata);
@@ -1170,6 +1236,7 @@ SECTIONS {
         data/animations/npc/din.o(.rodata);
         data/animations/npc/nayru.o(.rodata);
         data/animations/npc/farore.o(.rodata);
+        src/npc/sturgeon.o(.rodata);
         data/const/npc/sturgeon.o(.rodata);
         data/animations/npc/sturgeon.o(.rodata);
         src/npc/tingleSiblings.o(.rodata);
@@ -1210,7 +1277,7 @@ SECTIONS {
         data/animations/npc/mountainMinish.o(.rodata);
         src/npc/melari.o(.rodata);
         data/animations/npc/melari.o(.rodata);
-        data/const/npc/bladeBrothers.o(.rodata);
+        src/npc/bladeBrothers.o(.rodata);
         data/animations/npc/bladeBrothers.o(.rodata);
         src/npc/cow.o(.rodata);
         data/animations/npc/cow.o(.rodata);
@@ -1218,9 +1285,9 @@ SECTIONS {
         data/animations/npc/goron.o(.rodata);
         src/npc/goronMerchant.o(.rodata);
         data/animations/npc/goronMerchant.o(.rodata);
-        data/const/npc/gorman.o(.rodata);
+        src/npc/gorman.o(.rodata);
         data/animations/npc/gorman.o(.rodata);
-        data/const/npc/dog.o(.rodata);
+        src/npc/dog.o(.rodata);
         data/animations/npc/dog.o(.rodata);
         src/npc/syrup.o(.rodata);
         data/animations/npc/syrup.o(.rodata);
@@ -1277,7 +1344,6 @@ SECTIONS {
         src/npc/npc58.o(.rodata);
         src/npcDefinitions.o(.rodata);
         src/npcUtils.o(.rodata);
-        data/const/npcUtils.o(.rodata);
         src/physics.o(.rodata);
         src/playerHitbox.o(.rodata);
         data/gfx/sprite_frames.o(.rodata);
@@ -1300,7 +1366,7 @@ SECTIONS {
         src/item/itemJarEmpty.o(.rodata);
         data/item.o(.rodata);
         src/itemDefinitions.o(.rodata);
-        data/const/playerUtils.o(.rodata);
+        src/playerUtils.o(.rodata);
         data/map/room_headers.o(.rodata);
         src/flags.o(.rodata);
         src/save.o(.rodata);
@@ -1542,20 +1608,25 @@ SECTIONS {
         src/object/linkAnimation.o(.rodata);
         src/objectDefinitions.o(.rodata);
         src/playerItemDefinitions.o(.rodata);
-        data/const/objectUtils.o(.rodata);
-        data/const/playerItem/playerItemShield.o(.rodata);
+        src/objectUtils.o(.rodata);
+        data/animations/spriteAnimations166.o(.rodata);
+        src/playerItem/playerItemShield.o(.rodata);
         src/playerItem/playerItemFireRodProjectile.o(.rodata);
 #ifdef DEMO_USA
         src/demo.o(.rodata);
 #endif
         src/staffroll.o(.rodata);
         data/const/staffroll.o(.rodata);
-        src/menu/kinstone_menu.o(.rodata);
-        src/menu/figurine_menu.o(.rodata);
+        src/menu/kinstoneMenu.o(.rodata);
+        src/menu/figurineMenu.o(.rodata);
         data/gfx/figurines.o(.rodata);
-        data/const/figurine_menu.o(.rodata);
-        src/menu/pause_menu.o(.rodata);
-        data/const/subtask2.o(.rodata);
+        src/data/figurineMenuData.o(.rodata);
+        src/menu/pauseMenu.o(.rodata);
+        src/subtask/subtaskMapHint.o(.rodata);
+        src/menu/pauseMenuScreen6.o(.rodata);
+        src/subtask/subtaskLocalMapHint.o(.rodata);
+        src/subtask/subtaskFastTravel.o(.rodata);
+        data/const/subtask.o(.rodata);
         src/playerItem/playerItemSword.o(.rodata);
         data/projectile_functions.o(.rodata);
         src/projectile/darkNutSwordSlash.o(.rodata);
@@ -1622,7 +1693,7 @@ SECTIONS {
         src/playerItem/playerItemGustJar.o(.rodata);
         data/const/playerItem/playerItemGustJar.o(.rodata);
         data/gfx/fixed_type_gfx.o(.rodata);
-        data/const/movement.o(.rodata);
+        src/data/objPalettes.o(.rodata);
         src/movement.o(.rodata);
         src/data/transitions.o(.rodata);
         src/data/screenTransitions.o(.rodata);