Skip to content

Commit f7086b6

Browse files
Add PSP code sharing for st0 st_debug (Xeeynamo#2061)
Small one which was already a match on PSP
1 parent 63f01a2 commit f7086b6

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

Makefile.psp.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ $(BUILD_DIR)/dra.elf: $(BUILD_DIR)/dra.ld $(addprefix $(BUILD_DIR)/src/dra/,$(ad
9191
$(BUILD_DIR)/tt_%.elf: $(BUILD_DIR)/tt_%.ld $$(call list_o_files_psp,servant/tt_$$*) $(BUILD_DIR)/assets/servant/tt_%/mwo_header.bin.o
9292
$(call link_with_deadstrip,tt_$*,$@)
9393

94-
ST_ST0_MERGE = prologue_scroll title_card popup e_room_fg st_common collision e_lock_camera st_update e_red_door create_entity
94+
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
9595
$(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
9696
$(call link_with_deadstrip,stst0,$@)
9797
ST_WRP_MERGE = st_update e_particles e_room_fg st_common st_debug e_breakable popup warp e_red_door create_entity

config/splat.pspeu.stst0.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ segments:
5555
- [0xE658, c, st0_psp/3C5C0]
5656
- [0xF320, c, st0_psp/st_init_st0]
5757
- [0xF560, c, st0_psp/2850C]
58-
- [0xFD18, c, st0_psp/st_debug]
58+
- [0xFD18, c, st0/st_debug]
5959
- [0xFDF8, c, st0_psp/2A218]
6060
- [0x10678, c, st0/e_lock_camera]
6161
- [0x10A00, c, st0/create_entity]

config/symbols.pspeu.stst0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ g_EInitDraculaRainAttack = 0x09252D50;
130130
g_EInitSecretStairs = 0x09252D60;
131131
ST0_RedDoorTiles = 0x09252D70;
132132
g_Rooms = 0x09257350;
133+
ST0_BackgroundBlockInit = 0x092791F0;
133134
aluric_subweapons_idx = 0x09279420;
134135
aluric_subweapons_id = 0x09279438;
135136
c_GoldPrizes = 0x09279450;

src/st/st0/st_debug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
extern ObjInit OVL_EXPORT(BackgroundBlockInit)[];
55
extern u16 g_EInitCommon[];
6-
// void func_801A7D64(Entity* self) {
6+
77
void OVL_EXPORT(EntityBackgroundBlock)(Entity* self) {
88
ObjInit* obj = &OVL_EXPORT(BackgroundBlockInit)[self->params];
99
if (!self->step) {

src/st/st0_psp/st_debug.c

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)