static strings, types, and changes based on Xeeynamo's comments

hohle · Oct 20, 2024 · b743204 · b743204
1 parent 3af117f
commit b743204
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 37 deletions.
diff --git a/config/splat.us.borbo3.yaml b/config/splat.us.borbo3.yaml
@@ -39,7 +39,7 @@ segments:
  subalign: 4
  subsegments:
  - [0x0, data, header]
- - [0x10EA8, .rodata, rbo3]
+ - [0x10E80, .rodata, rbo3]
  - [0x10F3C, .rodata, e_red_door]
  - [0x10F54, .rodata, e_collect]
  - [0x10FDC, .rodata, e_misc]

diff --git a/src/boss/rbo3/rbo3.c b/src/boss/rbo3/rbo3.c
@@ -2,23 +2,20 @@
 
 #include "rbo3.h"
 
-extern u16 D_us_80180468;
-extern s8 D_us_80190E80;
-extern s8 D_us_80190E8C;
-extern s8 D_us_80190E98;
+extern EInit D_us_80180468;
 
 void func_us_80191438(Entity* self) {
  s16 params;
  s16 y;
 
  params = self->params;
- FntPrint(&D_us_80190E80, params);
- FntPrint(&D_us_80190E8C, g_Tilemap.left);
- FntPrint(&D_us_80190E98, g_Tilemap.right);
+ FntPrint("set:%04x\n", params);
+ FntPrint("sx:%04x\n", g_Tilemap.left);
+ FntPrint("ex:%04x\n", g_Tilemap.right);
 
  switch (self->step) {
  case 0:
- InitializeEntity(&D_us_80180468);
+ InitializeEntity(D_us_80180468);
  self->animSet = 2;
  self->animCurFrame = 1;
  self->zPriority = 176;
@@ -145,14 +142,14 @@ void func_us_80191438(Entity* self) {
 
 extern Entity D_8007A958;
 extern Entity D_8007C0D8;
-extern u16 D_us_80180480;
-extern u8 D_us_801805F0;
-extern u8 D_us_801805FC;
-extern u8 D_us_8018060C;
-extern u8 D_us_80180618;
-extern u8 D_us_80180624;
-extern u8 D_us_80180630;
-extern u8 D_us_8018063C;
+extern EInit D_us_80180480;
+extern u8 D_us_801805F0[];
+extern u8 D_us_801805FC[];
+extern u8 D_us_8018060C[];
+extern u8 D_us_80180618[];
+extern u8 D_us_80180624[];
+extern u8 D_us_80180630[];
+extern u8 D_us_8018063C[];
 extern s8 D_us_80180648[];
 extern u8 D_us_80180670[];
 extern s32 D_us_80180728;
@@ -174,7 +171,7 @@ void EntityMedusa(Entity* self) {
 
  switch (self->step) {
  case 0:
- InitializeEntity(&D_us_80180480);
+ InitializeEntity(D_us_80180480);
  self->animCurFrame = 1;
  self->hitboxState = 0;
  CreateEntityFromEntity(UNK_ENTITY_25, self, self + 1);
@@ -189,14 +186,14 @@ void EntityMedusa(Entity* self) {
 
  case 2:
  // n.b.! AnimateEntity is not declared
- if (!AnimateEntity(&D_us_801805F0, self)) {
+ if (!AnimateEntity(D_us_801805F0, self)) {
  self->hitboxState = 3;
  SetStep(3);
  }
  break;
 
  case 3:
- AnimateEntity(&D_us_801805FC, self);
+ AnimateEntity(D_us_801805FC, self);
  if (self->step_s == 0) {
  self->ext.GS_Props.timer = 64;
  self->step_s++;
@@ -248,7 +245,7 @@ void EntityMedusa(Entity* self) {
  self->step_s++;
  }
  self->ext.GS_Props.flag = 1;
- if (AnimateEntity(&D_us_80180624, self) == 0) {
+ if (AnimateEntity(D_us_80180624, self) == 0) {
  self->ext.GS_Props.flag = 0;
  SetStep(3);
  }
@@ -260,15 +257,15 @@ void EntityMedusa(Entity* self) {
  }
  self->step_s++;
  }
- if (AnimateEntity(&D_us_8018060C, self) == 0) {
+ if (AnimateEntity(D_us_8018060C, self) == 0) {
  SetStep(3);
  if (g_Player.status & PLAYER_STATUS_STONE) {
  SetStep(8);
  }
  }
 
  if (self->animFrameIdx == 4 && self->animFrameDuration == 0) {
- entity = AllocEntity(&D_8007A958, &D_8007A958 + 32);
+ entity = AllocEntity(&g_Entities[0xA0], &g_Entities[0xC0]);
  if (entity != NULL) {
  CreateEntityFromEntity(UNK_ENTITY_24, self, entity);
  entity->facingLeft = self->facingLeft;
@@ -287,13 +284,13 @@ void EntityMedusa(Entity* self) {
  PlaySfxPositional(SFX_RBO3_UNK_7FD);
  self->step_s++;
  }
- if (AnimateEntity(&D_us_80180618, self) == 0) {
+ if (AnimateEntity(D_us_80180618, self) == 0) {
  SetStep(3);
  }
  if (self->animFrameIdx == 3 && self->animFrameDuration == 0) {
  PlaySfxPositional(SFX_RBO3_UNK_7D1);
  for (i = 0; i < 2; i++) {
- entity = AllocEntity(&D_8007A958, &D_8007A958 + 32);
+ entity = AllocEntity(&g_Entities[0xA0], &g_Entities[0xC0]);
  if (entity != NULL) {
  CreateEntityFromEntity(UNK_ENTITY_26, self, entity);
  entity->rotZ = i * 1024 - 512;
@@ -316,7 +313,7 @@ void EntityMedusa(Entity* self) {
  self->step_s++;
  }
 
- if (!AnimateEntity(&D_us_80180630, self)) {
+ if (!AnimateEntity(D_us_80180630, self)) {
  self->facingLeft = GetSideToPlayer() & 1;
  SetStep(4);
  }
@@ -330,15 +327,15 @@ void EntityMedusa(Entity* self) {
  self->step_s++;
  // fallthrough
  case 1:
- if (!AnimateEntity(&D_us_8018063C, self)) {
+ if (!AnimateEntity(D_us_8018063C, self)) {
  self->ext.GS_Props.timer = 80;
  PlaySfxPositional(SFX_RBO3_UNK_7C5);
  self->step_s++;
  }
  break;
 
  case 2:
- entity = AllocEntity(&D_8007C0D8, &D_8007C0D8 + 64);
+ entity = AllocEntity(&g_Entities[0xC0], &g_Entities[0x100]);
  if (entity != NULL) {
  CreateEntityFromEntity(UNK_ENTITY_27, self, entity);
  entity->params = 0;
@@ -402,7 +399,7 @@ void EntityMedusa(Entity* self) {
  self->hitboxHeight = *rect++;
 }
 
-extern u16 D_us_80180498[];
+extern EInit D_us_80180498;
 
 void func_us_80192020(Entity* self) {
  Primitive* prim;
@@ -495,7 +492,7 @@ void func_us_80192020(Entity* self) {
  }
 }
 
-extern u16 D_us_8018048C;
+extern EInit D_us_8018048C;
 extern s8 D_us_80180684[];
 extern u8 D_us_801806B0[];
 
@@ -506,7 +503,7 @@ void func_us_801922EC(Entity* self) {
  s8* rect;
 
  if (!self->step) {
- InitializeEntity(&D_us_8018048C);
+ InitializeEntity(D_us_8018048C);
  }
 
  prev = self - 1;
@@ -538,7 +535,7 @@ void func_us_801922EC(Entity* self) {
 
 INCLUDE_ASM("boss/rbo3/nonmatchings/rbo3", func_us_801923DC);
 
-extern u16 D_us_8018042C[];
+extern EInit D_us_8018042C;
 extern Unkstruct_80180FE0 D_us_8018071C[];
 
 // Entity ID 0x1B
@@ -591,7 +588,7 @@ void func_us_80192998(Entity* self) {
 }
 
 extern Entity D_8007A958;
-extern u16 D_us_80180444;
+extern EInit D_us_80180444;
 extern s32 D_us_80180728;
 extern s32 D_us_8018072C;
 
@@ -602,7 +599,7 @@ void func_us_80192B38(Entity* self) {
 
  switch (self->step) {
  case 0:
- InitializeEntity(&D_us_80180444);
+ InitializeEntity(D_us_80180444);
  // fallthrough
  case 1:
  entity = &PLAYER;
@@ -644,7 +641,7 @@ void func_us_80192B38(Entity* self) {
  case 5:
  x = 256 - g_Tilemap.scrollX.i.hi;
  y = 128 - g_Tilemap.scrollY.i.hi;
- entity = AllocEntity(&D_8007A958, &D_8007A958 + 32);
+ entity = AllocEntity(&g_Entities[0xA0], &g_Entities[0xC0]);
  if (entity == NULL) {
  break;
  }
@@ -675,7 +672,7 @@ void func_us_80192B38(Entity* self) {
 
 INCLUDE_ASM("boss/rbo3/nonmatchings/rbo3", func_us_80192D64);
 
-extern u16 D_us_80180444;
+extern EInit D_us_80180444;
 
 void func_us_80193050(Entity* self) {
  Primitive* prim;
@@ -686,7 +683,7 @@ void func_us_80193050(Entity* self) {
  return;
  }
 
- InitializeEntity(&D_us_80180444);
+ InitializeEntity(D_us_80180444);
  primIndex = g_api.AllocPrimitives(PRIM_GT4, 5);
 
  if (primIndex == -1) {