Decompile e_stage_name for PSP wrp / lib (#2178)

Resubmitting after progress.py fix
Xeeynamo · Feb 5, 2025 · f7ded4d · f7ded4d
1 parent 880920e
commit f7ded4d
Show file tree

Hide file tree

Showing 7 changed files with 232 additions and 17 deletions.
diff --git a/Makefile.psp.mk b/Makefile.psp.mk
@@ -100,7 +100,7 @@ $(BUILD_DIR)/stlib.elf: $(BUILD_DIR)/stlib.ld $(addprefix $(BUILD_DIR)/src/st/li
 ST_ST0_MERGE = prologue_scroll title_card popup e_room_fg st_common collision e_lock_camera st_update e_red_door create_entity st_debug 2A218 e_particles e_collect prim_helpers e_bg_vortex e_misc 2805C 2A8DC
 $(BUILD_DIR)/stst0.elf: $(BUILD_DIR)/stst0.ld $(addprefix $(BUILD_DIR)/src/st/st0/,$(addsuffix .c.o,$(ST_ST0_MERGE))) $$(call list_o_files_psp,st/st0_psp) $(BUILD_DIR)/assets/st/st0/mwo_header.bin.o
 	$(call link_with_deadstrip,stst0,$@)
-ST_WRP_MERGE = st_update e_particles e_room_fg st_common st_debug e_breakable popup warp e_red_door create_entity prim_helpers collision
+ST_WRP_MERGE = st_update e_particles e_room_fg st_common st_debug e_breakable popup warp e_red_door create_entity prim_helpers collision e_stage_name
 $(BUILD_DIR)/stwrp.elf: $(BUILD_DIR)/stwrp.ld $(addprefix $(BUILD_DIR)/src/st/wrp/,$(addsuffix .c.o,$(ST_WRP_MERGE))) $$(call list_o_files_psp,st/wrp_psp) $(BUILD_DIR)/assets/st/wrp/mwo_header.bin.o
 	$(call link_with_deadstrip,stwrp,$@)
 

diff --git a/config/splat.pspeu.stwrp.yaml b/config/splat.pspeu.stwrp.yaml
@@ -44,7 +44,7 @@ segments:
     subalign: 8
     subsegments:
       - [0x80, c, wrp/create_entity]
-      - [0x1028, c, wrp_psp/e_stage_name]
+      - [0x1028, c, wrp/e_stage_name]
       - [0x1EA8, c, wrp/e_red_door]
       - [0x31B0, c, wrp/st_update]
       - [0x36E8, c, wrp_psp/e_particles_maria1]

diff --git a/config/symbols.pspeu.stlib.txt b/config/symbols.pspeu.stlib.txt
@@ -109,6 +109,7 @@ LIB_RedDoorTiles = 0x09275F08;
 LIB_EntityUpdates = 0x09275F18;
 g_EInitObtainable = 0x09276058;
 g_EInitParticle = 0x09276068;
+g_EInitInteractable = 0x09276088;
 g_EInitUnkId13 = 0x09276098;
 g_EInitCommon = 0x092760B8;
 g_EInitDamageNum = 0x092760C8;