Next PSP DRA file code-share (#2274)

This finishes out the DRA entities which is cool. Will need to deconflict.
Xeeynamo · Mar 2, 2025 · 9c64892 · 9c64892
1 parent efdb8f7
commit 9c64892
Show file tree

Hide file tree

Showing 26 changed files with 833 additions and 979 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -208,7 +208,6 @@ set(SOURCE_FILES_DRA
     src/dra/d_DBD4.c
     src/dra/d_E294.c
     src/dra/d_10798.c
-    src/dra/843B0.c
     src/dra/84B88.c
     src/dra/8A0A4.c
     src/dra/8BEF8.c

diff --git a/Makefile.psp.mk b/Makefile.psp.mk
@@ -78,7 +78,8 @@ $(BUILD_DIR)/st%.ld: $(CONFIG_DIR)/splat.pspeu.st%.yaml $(BASE_SYMBOLS) $(CONFIG
 $(BUILD_DIR)/tt_%.ld: $(CONFIG_DIR)/splat.pspeu.tt_%.yaml $(BASE_SYMBOLS) $(CONFIG_DIR)/symbols.pspeu.tt_%.txt
 	$(SPLAT) $<
 
-ST_DRA_MERGE = 624DC 628AC 6BF64 alu_anim 6DF70 6E42C 6FDF8 704D0 7879C 84B88 8A0A4
+ST_DRA_MERGE = 624DC 628AC 6BF64 alu_anim 6DF70 6E42C 6FDF8 704D0 7879C 7E4BC 84B88 8A0A4
+
 $(BUILD_DIR)/dra.elf: $(BUILD_DIR)/dra.ld $(addprefix $(BUILD_DIR)/src/dra/,$(addsuffix .c.o,$(ST_DRA_MERGE))) $$(call list_o_files_psp,dra_psp)
 	$(call link_with_deadstrip,dra,$@)
 $(BUILD_DIR)/tt_%.elf: $(BUILD_DIR)/tt_%.ld $$(call list_o_files_psp,servant/tt_$$*) $(BUILD_DIR)/assets/servant/tt_%/mwo_header.bin.o

diff --git a/config/splat.hd.dra.yaml b/config/splat.hd.dra.yaml
@@ -162,7 +162,6 @@ segments:
       - [0x41904, .rodata, 75F54]
       - [0x41960, .rodata, 7879C]
       - [0x41BD0, .rodata, 7E4BC]
-      - [0x41CF0, .rodata, 843B0]
       - [0x41D50, .rodata, 84B88]
       - [0x41DAC, .rodata, 8A0A4]
       - [0x41DCC, .rodata, 8D3E8]
@@ -203,7 +202,6 @@ segments:
       - [0x75C44, c, 75F54]
       - [0x7848C, c, 7879C]
       - [0x7E168, c, 7E4BC]
-      - [0x8403C, c, 843B0]
       - [0x84814, c, 84B88]
       - [0x8A528, c, 8A0A4]
       - [0x8BB50, c, 8BEF8]

diff --git a/config/splat.pspeu.dra.yaml b/config/splat.pspeu.dra.yaml
@@ -111,14 +111,8 @@ segments:
       - [0x3D738, c, dra/84B88]
       - [0x45688, c, dra/8A0A4]
       - [0x47EA8, c, dra/7879C]
-      - [0x507F0, c, dra_psp/507F0]
-      - [0x51A40, c, dra_psp/51A40]
-      - [0x53DB0, c, dra_psp/53DB0]
-      - [0x54180, c, dra_psp/54180]
-      - [0x581A0, c, dra_psp/581A0]
-      - [0x585C0, c, dra_psp/585C0]
-      - [0x58C20, c, dra_psp/58C20]
-      - [0x58E60, c, dra_psp/58E60]
+      - [0x507F0, c, dra/7E4BC]
+      - [0x59E20, c, dra_psp/59E20]
       - [0x5A560, c, dra_psp/5A560]
       - [0x5A5B0, c, dra_psp/5A5B0]
       - [0x5B8C0, c, dra_psp/5B8C0]
@@ -163,6 +157,8 @@ segments:
       - [0xA6B48, data]
       - [0xA6E78, .data, dra/7879C]
       - [0xA6FD8, data]
+      - [0xA72C0, .data, dra/7E4BC]
+      - [0xA79D0, data]
       - [0xEE380, .rodata, dra_psp/80]
       - [0xEE3A0, .rodata, dra/624DC]
       - [0xEE3C0, .rodata, dra/628AC]
@@ -188,9 +184,7 @@ segments:
       - [0xEE898, .rodata, dra/84B88]
       - [0xEE8B8, .rodata, dra/8A0A4]
       - [0xEE8D8, .rodata, dra/7879C]
-      - [0xEEB28, .rodata, dra_psp/507F0]
-      - [0xEEBF8, .rodata, dra_psp/53DB0]
-      - [0xEEC18, .rodata, dra_psp/54180]
+      - [0xEEB28, .rodata, dra/7E4BC]
       - [0xEEC30, .rodata, dra_psp/5C420]
       - [0xEEC58, .rodata, dra_psp/5DA20]
       - [0xEECA8, .rodata, dra_psp/5EC50]

diff --git a/config/splat.us.dra.yaml b/config/splat.us.dra.yaml
@@ -218,7 +218,7 @@ segments:
       # - [0x41D84, .rodata, 7E4BC] # EntityPlayerPinkEffect
       # - [0x41DA4, .rodata, 7E4BC] # EntityPlayerDissolves
       # - [0x41DBC, .rodata, 7E4BC] # EntityMist
-      - [0x41DD4, .rodata, 843B0] # EntityTeleport
+      # - [0x41DD4, .rodata, 7E4BC] # EntityTeleport
       - [0x41E34, .rodata, 84B88] # EntitySubwpnCrashCross
       # - [0x41E48, .rodata, 84B88] # EntityHellfireHandler
       # - [0x41E7C, .rodata, 84B88] # func_80128C2C
@@ -269,7 +269,6 @@ segments:
       - [0x75F54, c, 75F54]
       - [0x7879C, c, 7879C]
       - [0x7E4BC, c, 7E4BC]
-      - [0x843B0, c, 843B0]
       - [0x84B88, c, 84B88]
       - [0x8A0A4, c, 8A0A4]
       - [0x8BEF8, c, 8BEF8]

diff --git a/config/symbols.pspeu.dra.txt b/config/symbols.pspeu.dra.txt
@@ -254,12 +254,15 @@ EntityTransparentWhiteCircle = 0x0912F7F8;
 EntityPlayerPinkEffect = 0x09130730;
 EntityPlayerDissolves = 0x09130B00;
 EntityLevelUpAnimation = 0x09131CA8;
+func_80121F14 = 0x091324E0;
+func_80121F58 = 0x09132550;
 EntityMist = 0x09132AF0;
 UnknownEntId48 = 0x09134B20;
 UnknownEntId49 = 0x09134D08;
 func_80123A60 = 0x09134F40;
 func_80123B40 = 0x09135098;
 func_80123F78 = 0x091355A0;
+func_80124164 = 0x091357E0;
 EntityTeleport = 0x09135BE8;
 EntityPlayerSleepZ = 0x09136620;
 func_8012F894 = 0x0913A448;
@@ -306,6 +309,7 @@ D_800CF324 = 0x0916F800;
 D_800C52F8 = 0x09170960;
 D_800AFDA4 = 0x0917C638;
 D_800B0130 = 0x0917C9F8;
+D_800B0188 = 0x0917CA50;
 D_800B01B8 = 0x0917CA80;
 D_800B0594 = 0x0917CE60;
 g_SensorsCeiling = 0x091832F0;
@@ -339,6 +343,33 @@ D_800AD5F0 = 0x09183DA0;
 D_800AD5FC = 0x09183DB0;
 D_800AD670 = 0x09183DE8;
 D_800AD9B8 = 0x09184130;
+D_800ADB98 = 0x09184310;
+D_800ADBD4 = 0x09184350;
+D_800ADC10 = 0x09184390;
+D_800ADC44 = 0x091843C8;
+D_800ADC7C = 0x09184400;
+D_800ADCC8 = 0x09184498;
+D_800ADDE8 = 0x091845B8;
+D_800ADEF0 = 0x091846C0;
+D_800AE120 = 0x091848F0;
+D_800AE130 = 0x09184900;
+D_800AE138 = 0x09184908;
+D_800AE140 = 0x09184910;
+D_800AE180 = 0x09184950;
+D_800AE190 = 0x09184960;
+D_800AE1B0 = 0x09184980;
+D_800AE1F0 = 0x091849C0;
+D_800AE230 = 0x09184A00;
+D_800AE250 = 0x09184A20;
+D_800AE270 = 0x09184A40;
+D_800AE274 = 0x09184A48;
+D_800AE278 = 0x09184A50;
+D_800AE27C = 0x09184A58;
+D_800AE280 = 0x09184A60;
+D_800AE284 = 0x09184A68;
+D_800AE288 = 0x09184A70;
+D_800AE28C = 0x09184A78;
+D_800AE290 = 0x09184A80;
 D_800AE294 = 0x09184A88;
 D_800A3BB8 = 0x0918BC90;
 g_SubwpnDefs = 0x09190EC8;
@@ -376,7 +407,10 @@ D_8006C3C4 = 0x091F55F8;
 g_DemoMode = 0x091fc420;
 D_800973EC = 0x091fc428;
 D_8003C730 = 0x091FC498;
+D_800ACE44 = 0x09234B70;
 D_8013AECC = 0x09234B98;
+D_80139778 = 0x09234BA0;
+D_801396F8 = 0x09234C20;
 g_BatScreechDone = 0x09234CD8;
 g_WingSmashTimer = 0x09234CE0;
 g_WingSmashButtonCounter = 0x09234CF0;
@@ -393,6 +427,22 @@ g_ButtonCombo = 0x09234D70;
 D_80138424 = 0x09234DB8;
 D_8013841C = 0x09234DC0;
 D_800AD630 = 0x09234DD0;
+D_8013839C = 0x09234E10;
+D_80138398 = 0x09234E90;
+D_80138394 = 0x09234E98;
+D_801381F4 = 0x09234EA0;
+D_801381F0 = 0x09235060;
+D_801381EC = 0x09235068;
+D_801381E8 = 0x09235070;
+D_801381E4 = 0x09235078;
+D_801381E0 = 0x09235080;
+D_801381DC = 0x09235088;
+D_801381D8 = 0x09235090;
+D_801381D4 = 0x09235098;
+D_80138094 = 0x092350A0;
+D_80138090 = 0x092351E0;
+D_80139A7C = 0x092351E8;
+D_8013808C = 0x092365E8;
 D_8013804C = 0x092365F0;
 D_80138048 = 0x09236630;
 D_80138044 = 0x09236638;

diff --git a/config/symbols.pspeu.txt b/config/symbols.pspeu.txt
@@ -6,6 +6,7 @@ psp_sprintf = 0x0890C6FC;
 DrawSync = 0x0891B448;
 VSync = 0x0891B5BC;
 LoadImage = 0x0891BFE4;
+StoreImage = 0x0891C5A0;
 ClearImage = 0x0891CA60;
 MoveImage = 0x0891CAB0;
 LoadTPage = 0x0891CF3C;

diff --git a/include/entity.h b/include/entity.h
@@ -1325,10 +1325,10 @@ typedef struct {
 #ifdef PLATFORM_64BIT
     s32 _align_parent[2];
 #endif
-    s32 unk7C;
-    s32 unk80;
-    s32 unk84;
-    s32 unk88;
+    s32 width;
+    s32 height;
+    s32 timer;
+    s32 colorIntensity;
     struct Entity* parent;
     s32 unk90;
 } ET_Teleport;

diff --git a/include/player_steps.h b/include/player_steps.h
@@ -19,7 +19,7 @@ typedef enum {
     Player_Unk17,
     Player_Teleport, // also Grand Cross and Spiral Axe
     Player_FlameWhip,
-    Player_Hydrostorm,
+    Player_Unk20,
     Player_ThousandBlades,
     Player_RichterFourHolyBeasts,
     Player_Slide,

diff --git a/include/unkstruct.h b/include/unkstruct.h
@@ -138,8 +138,8 @@ typedef struct {
     /* 0x03 */ u8 b;
     /* 0x04 */ u8 w;
     /* 0x05 */ u8 h;
-    /* 0x06 */ u16 priority;
-    /* 0x08 */ u16 drawMode;
+    /* 0x06 */ s16 priority;
+    /* 0x08 */ s16 drawMode;
     /* 0x0A */ s16 unkA;
     /* 0x0C */ u32 flags;
 } unkStr_8011E4BC; // size = 0x10