Skip to content

Commit 8b15d52

Browse files
authored
NO3 PSP BlitChar (Xeeynamo#2631)
Simple case of modifying the splat a little bit. No real code changes. Next is e_collect, which in my opinion is a little messy in the main repo. I'm going to try to clean it up so all overlays are using the .h file, and then try to flatten the .h file. That will involve a lot of little changes in different places. If I didn't expect to do a ton of messing with things there, I would include BlitChar in that next PR, but since I'm expecting to do a lot, I'm starting by keeping this isolated here for the moment.
1 parent b618ab8 commit 8b15d52

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

config/splat.pspeu.stno3.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ segments:
7777
- [0x18B40, c, no3/e_merman]
7878
- [0x1A068, c, no3/e_particles]
7979
- [0x1B5F8, c, no3/e_warg]
80-
- [0x1D060, c, no3_psp/working_on]
80+
- [0x1D060, c, no3/blit_char]
81+
- [0x1D6F0, c, no3_psp/working_on]
8182
- [0x1F830, c, no3_psp/e_misc]
8283
- [0x21CC8, c, no3_psp/collision]
8384
- [0x28140, c, no3_psp/e_room_fg]
@@ -133,4 +134,6 @@ segments:
133134
- [0x621F0, .bss, no3/e_lock_camera]
134135
- [0x621F8, .bss, no3/create_entity]
135136
- [0x62218, bss, 62218]
137+
- [0x62260, .bss, no3/blit_char]
138+
- [0x62278, bss, 62278]
136139
- [0x62280]

config/symbols.pspeu.stno3.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ EntityEnemyBlood = 0x09252660;
8585
EntityWarg = 0x09252EF8;
8686
EntityUnkId4B = 0x09254348;
8787
EntityWargExplosionPuffTransparent = 0x092545B8;
88+
BlitChar = 0x092547B8;
8889
EntityPrizeDrop = 0x09255540;
8990
EntityExplosion = 0x09256358;
9091
EntityEquipItemDrop = 0x09256658;

src/st/no3/blit_char.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
// SPDX-License-Identifier: AGPL-3.0-or-later
2+
#include "no3.h"
3+
4+
#ifdef VERSION_PSP
5+
#include "../blit_char_psp.h"
6+
#else
27
#include "../blit_char.h"
8+
#endif

src/st/no3_psp/working_on.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
// SPDX-License-Identifier: AGPL-3.0-or-later
22
#include "common.h"
33

4-
INCLUDE_ASM("st/no3_psp/psp/no3_psp/working_on", func_pspeu_092546E0);
5-
6-
INCLUDE_ASM("st/no3_psp/psp/no3_psp/working_on", func_pspeu_09254778);
7-
8-
INCLUDE_ASM("st/no3_psp/psp/no3_psp/working_on", func_pspeu_092547B8);
9-
104
INCLUDE_ASM("st/no3_psp/psp/no3_psp/working_on", func_pspeu_09254D70);
115

126
INCLUDE_ASM("st/no3_psp/psp/no3_psp/working_on", func_pspeu_09254E48);

0 commit comments

Comments
 (0)