Dedupe no0 e_collect (#1759)

config/splat.us.stno0.yaml

@@ -48,7 +48,8 @@ segments:
       - [0x1540, .data, e_room_fg]
       - [0x15CC, .data, e_particles]
       - [0x164C, .data, st_common] # g_SineTable
-      - [0x184C, data]
+      - [0x184C, .data, e_collect]
+      - [0x1B3C, data]
       - [0x41368, .rodata, first_c_file]
       - [0x4137C, .rodata, e_red_door]
       - [0x41394, .rodata, e_collect]
@@ -74,5 +75,6 @@ segments:
       - [0x4F4A8, c, unk_4F4A8]
       - [0x5E09C, c, prim_helpers]
       - [0x5E8CC, .bss, create_entity]
-      - [0x5E8DC, sbss]
+      - [0x5E8DC, bss]
+      - [0x5F54C, .bss, e_collect]
   - [0x5F58C]

config/symbols.us.stno0.txt

@@ -34,7 +34,6 @@ g_goldCollectTexts = 0x801819C0;
 c_GoldPrizes = 0x801819E8;
 c_HeartPrizes = 0x80181A78;
 g_ExplosionYVelocities = 0x80181A7C;
-g_bigRedFireballAnim = 0x80181AA4;
 g_ExplosionAnimations = 0x80181B28;
 g_eUnk14SpawnRots = 0x80181BA0;
 unk15_rot = 0x80181BB0;

src/st/no0/e_collect.c

@@ -1,49 +1,2 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-#include "common.h"
-#include "stage.h"
-
-extern s8 c_HeartPrizes[];
-
-#include "../prize_drop_fall.h"
-
-#include "../prize_drop_fall2.h"
-
-#include "../collect_heart.h"
-
-#include "../collect_gold.h"
-
-INCLUDE_ASM("st/no0/nonmatchings/e_collect", CollectSubweapon);
-
-#include "../collect_heart_vessel.h"
-
-#include "../collect_life_vessel.h"
-
-#include "../destroy_current_entity.h"
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C1394);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C139C);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C13A4);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C13AC);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C13B4);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C13BC);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C13C4);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C13CC);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C13D4);
-
-INCLUDE_RODATA("st/no0/nonmatchings/e_collect", D_us_801C13DC);
-
-INCLUDE_ASM("st/no0/nonmatchings/e_collect", EntityPrizeDrop);
-
-#include "../entity_explosion.h"
-
-#include "../blink_item.h"
-
-INCLUDE_ASM("st/no0/nonmatchings/e_collect", EntityEquipItemDrop);
+#include "../e_collect.h"

src/st/no0/e_misc.c

@@ -35,7 +35,8 @@ INCLUDE_ASM("st/no0/nonmatchings/e_misc", MakeEntityFromId);
 
 INCLUDE_ASM("st/no0/nonmatchings/e_misc", func_us_801CC1D0);
 
-INCLUDE_ASM("st/no0/nonmatchings/e_misc", EntityBigRedFireball);
+extern u16 g_InitializeEntityData0[];
+#include "../entity_big_red_fireball.h"
 
 INCLUDE_ASM("st/no0/nonmatchings/e_misc", ClutLerp);