g_ItemIconSlots to e_collect

hohle · Aug 9, 2024 · ba9a0f6 · ba9a0f6
1 parent 02f9cbd
commit ba9a0f6
Show file tree

Hide file tree

Showing 28 changed files with 58 additions and 36 deletions.
diff --git a/config/splat.us.stcen.yaml b/config/splat.us.stcen.yaml
@@ -82,7 +82,7 @@ segments:
  - [0x1B274, c]
  - [0x1BED4, c, prim_helpers]
  - [0x1C704, .bss, header]
- - [0x1C718, .bss, create_entity]
- - [0x1C71C, .bss, holyglassescutscene]
+ - [0x1C764, .bss, create_entity]
+ - [0x1C774, .bss, holyglassescutscene]
  - [0x1C7C0, .bss, 15C84]
  - [0x1D46C]
diff --git a/config/splat.us.stdre.yaml b/config/splat.us.stdre.yaml
@@ -95,5 +95,6 @@ segments:
  - [0x22018, c, prim_helpers]
  - [0x22848, c]
  - [0x23264, .bss, create_entity]
- - [0x2330A, .bss, bss]
+ - [0x232CA, .bss, bss]
+ - [0x23FB6, .bss, 1C7DC]
  - [0x23FCC]
diff --git a/config/splat.us.stmad.yaml b/config/splat.us.stmad.yaml
@@ -90,4 +90,5 @@ segments:
  - [0x18FA0, c, prim_helpers]
  - [0x197D8, .bss, create_entity]
  - [0x197ED, .bss, bss]
+ - [0x19E7E, .bss, 139E0]
  - [0x19E94]
diff --git a/config/splat.us.stno3.yaml b/config/splat.us.stno3.yaml
@@ -108,4 +108,5 @@ segments:
  - [0x56880, c, prim_helpers]
  - [0x570B0, .bss, create_entity]
  - [0x57120, .bss, bss]
+ - [0x57DD8, .bss, 46684]
  - [0x57E18]
diff --git a/config/splat.us.stnp3.yaml b/config/splat.us.stnp3.yaml
@@ -132,4 +132,6 @@ segments:
  - [0x51F38, c, prim_helpers]
  - [0x52768, .bss, create_entity]
  - [0x5277D, .bss, bss]
+ - [0x53378, .bss, 4D540]
+ - [0x533F4, .bss, e_collect]
  - [0x53434]
diff --git a/config/splat.us.stnz0.yaml b/config/splat.us.stnz0.yaml
@@ -128,5 +128,6 @@ segments:
  - [0x49930, c, prim_helpers]
  - [0x4A160, c, lifeupspawn]
  - [0x4AA14, .bss, create_entity]
- - [0x4AA84, .bss, bss]
+ - [0x4AA24, .bss, bss]
+ - [0x4B740, .bss, e_collect]
  - [0x4B780]
diff --git a/config/splat.us.strwrp.yaml b/config/splat.us.strwrp.yaml
@@ -87,4 +87,5 @@ segments:
  - [0x151F0, c, wrp/prim_helpers]
  - [0x15A20, .bss, wrp/create_entity]
  - [0x15A36, .bss, rwrp/bss]
+ - [0x166A8, .bss, wrp/e_collect]
  - [0x166E8]
diff --git a/config/splat.us.stst0.yaml b/config/splat.us.stst0.yaml
@@ -101,4 +101,5 @@ segments:
  - [0x3D8F0, c]
  - [0x3EB00, .bss, create_entity]
  - [0x400B6, .bss, bss]
+ - [0x42584, .bss, 36358]
  - [0x425C4]
diff --git a/config/splat.us.stwrp.yaml b/config/splat.us.stwrp.yaml
@@ -86,4 +86,5 @@ segments:
  - [0x13270, c, prim_helpers]
  - [0x13AB0, .bss, create_entity]
  - [0x13AC6, .bss, bss]
+ - [0x14728, .bss, e_collect]
  - [0x14768]
diff --git a/src/st/cen/15C84.c b/src/st/cen/15C84.c
@@ -228,7 +228,7 @@ void EntityPrizeDrop(Entity* self) {
 
 #include "../blink_item.h"
 
-u16 g_ItemIconSlots[32];
+static u16 g_ItemIconSlots[ICON_SLOT_NUM];
 
 extern s32 D_80097410;
 extern s32 D_80097414;

diff --git a/src/st/create_entity.h b/src/st/create_entity.h
@@ -1,3 +1,11 @@
+//
+// Section Sizes:
+//
+// | Data | RO Data | Text | BSS |
+// +-------+---------+--------+------+
+// PSX US | TBD | TBD | 0xB788 | 0x10 |
+//
+
 #include <common.h>
 
 // TODO: should this be it's own header?

diff --git a/src/st/dre/1C7DC.c b/src/st/dre/1C7DC.c
@@ -1,6 +1,8 @@
 #include "dre.h"
 #include "sfx.h"
 
+static u16 g_ItemIconSlots[ICON_SLOT_NUM];
+
 void EntityEquipItemDrop(Entity* self) {
  u16 itemId = self->params & 0x7FFF;
  s32 primIndex;

diff --git a/src/st/dre/bss.c b/src/st/dre/bss.c
@@ -1,4 +1,4 @@
-#include <game.h>
+#include <common.h>
 
 STATIC_PAD_BSS(3072);
 u32 D_801A3ED4;
@@ -28,4 +28,3 @@ u16 D_801A3F16;
 u32 D_801A3F18[27];
 u32 D_801A3F84;
 u32 D_801A3F88;
-u16 g_ItemIconSlots[ICON_SLOT_NUM];
diff --git a/src/st/e_collect.h b/src/st/e_collect.h
@@ -1,3 +1,10 @@
+//
+// Section Sizes:
+//
+// | Data | RO Data | Text | BSS |
+// +-------+---------+--------+------+
+// PSX US | 0x2F0 | 0x88 | 0x1AC0 | 0x40 |
+//
 #include <stage.h>
 #include "sfx.h"
 
@@ -91,9 +98,6 @@ static u8* g_ExplosionAnimations[] = {
  D_80180ED8, g_bigRedFireballAnim, D_80180F08, D_80180F38, D_80180F6C,
 };
 
-// TODO BSS
-extern u16 g_ItemIconSlots[];
-
 // from another file
 extern u16 g_InitializeData0[];
 
@@ -476,6 +480,8 @@ extern u16 g_InitializeEntityData0[];
 
 #include "blink_item.h"
 
+static u16 g_ItemIconSlots[ICON_SLOT_NUM];
+
 void EntityEquipItemDrop(Entity* self) {
  Collider collider;
  Primitive* prim;

diff --git a/src/st/mad/139E0.c b/src/st/mad/139E0.c
@@ -5,6 +5,8 @@ extern u16 D_80180D4C[];
 extern u8* D_80180DB0[];
 extern u16 D_80180E10[];
 
+static u16 g_ItemIconSlots[ICON_SLOT_NUM];
+
 void EntityPrizeDrop(Entity* self) {
  Collider collider;
  Primitive* prim;

diff --git a/src/st/mad/bss.c b/src/st/mad/bss.c
@@ -1,5 +1,4 @@
-#include <game.h>
+#include <types.h>
 
 u16 D_801997E8[768];
 u32 D_80199DE8[27];
-u16 g_ItemIconSlots[ICON_SLOT_NUM];
diff --git a/src/st/no3/46684.c b/src/st/no3/46684.c
@@ -1,6 +1,8 @@
 #include "no3.h"
 #include "sfx.h"
 
+static u16 g_ItemIconSlots[ICON_SLOT_NUM];
+
 void EntityPrizeDrop(Entity* self) {
  Collider collider;
  Primitive* prim;

diff --git a/src/st/no3/bss.c b/src/st/no3/bss.c
@@ -1,6 +1,7 @@
-#include <game.h>
+#include <common.h>
 
 STATIC_PAD_BSS(3072);
+
 u32 D_801D7D20;
 u32 g_Dialogue;
 u16 D_801D7D28;
@@ -28,4 +29,3 @@ u16 D_801D7D62;
 u32 D_801D7D64[27];
 u32 D_801D7DD0;
 u32 D_801D7DD4;
-u16 g_ItemIconSlots[ICON_SLOT_NUM];
diff --git a/src/st/no3/no3.h b/src/st/no3/no3.h
@@ -215,7 +215,6 @@ extern s32 D_801D7D20;
 extern s32 D_801D7D54;
 extern s32 D_801D7D58;
 extern u32 D_801D7DD0;
-extern u16 g_ItemIconSlots[0x20];
 
 extern PfnEntityUpdate PfnEntityUpdates[];
 

diff --git a/src/st/np3/4D540.c b/src/st/np3/4D540.c
@@ -35,6 +35,13 @@ void func_801CD620(Entity* self) {
  }
 }
 
+static s32 D_801D3378;
+static s32 D_801D337C;
+static s32 D_801D3380;
+static s32 D_801D3384;
+static s32 D_801D3388;
+STATIC_PAD_BSS(104);
+
 void func_801CD658(void) {
  g_CurrentBuffer = g_CurrentBuffer->next;
  FntPrint("a:%x\n", D_801D3378);

diff --git a/src/st/np3/bss.c b/src/st/np3/bss.c
@@ -1,9 +1,3 @@
-#include <game.h>
+#include <common.h>
 
 STATIC_PAD_BSS(3072);
-u32 D_801D3378;
-u32 D_801D337C;
-u32 D_801D3380;
-u32 D_801D3384;
-u32 D_801D3388[27];
-u16 g_ItemIconSlots[ICON_SLOT_NUM];
diff --git a/src/st/np3/e_collect.c b/src/st/np3/e_collect.c
@@ -331,6 +331,8 @@ void EntityPrizeDrop(Entity* self) {
 
 #include "../blink_item.h"
 
+static u16 g_ItemIconSlots[ICON_SLOT_NUM];
+
 void EntityEquipItemDrop(Entity* self) {
  u16 itemId = self->params & 0x7FFF;
  s32 primIndex;

diff --git a/src/st/np3/np3.h b/src/st/np3/np3.h
@@ -268,11 +268,6 @@ extern s32 D_80182530;
 // *** EntityBloodyZombie properties START ***
 
 extern u16 D_80180B38[]; // InitProps
-extern s32 D_801D3378;
-extern s32 D_801D337C;
-extern s32 D_801D3380;
-extern s32 D_801D3384;
-extern s32 D_801D3388;
 extern s32 D_801825D4;
 extern u16 D_801825E4[];
 extern u8 D_801825EC[]; // Animation: Walking

diff --git a/src/st/nz0/bss.c b/src/st/nz0/bss.c
@@ -1,4 +1,4 @@
-#include <game.h>
+#include <common.h>
 
 STATIC_PAD_BSS(3072);
 u32 D_801CB684;
@@ -29,4 +29,3 @@ u32 D_801CB6C8[27];
 u16 g_mariaCutsceneFlags;
 u16 D_801CB736[3];
 u32 D_801CB73C;
-u16 g_ItemIconSlots[ICON_SLOT_NUM];
diff --git a/src/st/rwrp/bss.c b/src/st/rwrp/bss.c
@@ -1,4 +1,3 @@
-#include <game.h>
+#include <common.h>
 
 STATIC_PAD_BSS(0xC68);
-u16 g_ItemIconSlots[ICON_SLOT_NUM];
diff --git a/src/st/st0/36358.c b/src/st/st0/36358.c
@@ -6,6 +6,8 @@ extern u16 g_InitializeData0[];
 extern u8* D_80181D18[];
 extern u16 D_80181D74[];
 
+static u16 g_ItemIconSlots[ICON_SLOT_NUM];
+
 // if self->params & 0x8000 then the item will not disappear
 // self->ext.generic.unk80.modeS8.unk0: frames left before the prize disappear
 void EntityPrizeDrop(Entity* self) {

diff --git a/src/st/st0/bss.c b/src/st/st0/bss.c
@@ -1,4 +1,4 @@
-#include "common.h"
+#include <types.h>
 
 u16 D_801C00B0[768];
 u32 D_801C06B0[4];
@@ -36,4 +36,3 @@ u32 D_801C250C[27];
 u32 D_801C2578;
 u32 D_801C257C;
 u32 D_801C2580;
-u16 g_ItemIconSlots[32];
diff --git a/src/st/wrp/bss.c b/src/st/wrp/bss.c
@@ -1,5 +1,4 @@
-#include <game.h>
+#include <common.h>
 
 u16 D_801997E8[0x600];
-static s32 pad2[0x1A];
-u16 g_ItemIconSlots[ICON_SLOT_NUM];
+STATIC_PAD_BSS(104);