Progress on main_psp

config/splat.pspeu.main.yaml

@@ -325,7 +325,9 @@ segments:
       - [0x280FC, c, main_psp/280FC]
       - [0x28A90, c, main_psp/28A90]
       - [0x2B69C, c, main_psp/2B69C]
-      - [0x2D1D4, c, main_psp/dvdumd_io]
+      - [0x2B910, c, main_psp/sound/2B910]
+      - [0x2C0E0, c, main_psp/sound/at3plus]
+      - [0x2D1D4, c, main_psp/sound/dvdumd_io]
       - [0x2D608, c, main_psp/2D608]
       - [0x30F3C, asm, func_psp_0892F848]
       - [0x3104C, asm, func_psp_0892F958]
@@ -389,9 +391,10 @@ segments:
       - [0x47BC4, .data, main_psp/1BCFC]
       - [0x47D7C, .data, main_psp/2758C]
       - [0x47DA0, .data, main_psp/280FC]
-      - [0x6348C, data]
-      - [0x647C0, .data, main_psp/2B69C]
-      - [0x649A4, .data, main_psp/dvdumd_io]
+      - [0x6348C, .data, main_psp/2B69C]
+      - [0x64538, .data, main_psp/sound/2B910]
+      - [0x64574, .data, main_psp/sound/at3plus]
+      - [0x649A4, .data, main_psp/sound/dvdumd_io]
       - [0x649BC, data]
       - [0x65808, .data, main_psp/31178]
       - [0xAEBAC, data]
@@ -412,7 +415,9 @@ segments:
       - {start: 0xAEF24, type: bss, vram: 0x08C63124, name: bss4}
       - {start: 0xAEF24, type: .bss, vram: 0x08C63C28, name: main_psp/28A90}
       - {start: 0xAEF24, type: bss, vram: 0x08C6BC30, name: bss5}
+      - {start: 0xAEF24, type: .bss, vram: 0x08DADC40, name: main_psp/sound/2B910}
+      - {start: 0xAEF24, type: bss, vram: 0x08DADCB4, name: bss6}
       - {start: 0xAEF24, type: .bss, vram: 0x08DAF2C8, name: main_psp/31178}
-      - {start: 0xAEF24, type: bss, vram: 0x08E2E5F8, name: bss6}
+      - {start: 0xAEF24, type: bss, vram: 0x08E2E5F8, name: bss7}
   - [0xAEF24, bin, elf_footer]
   - [0xB3E1C]

config/symbols.pspeu.main.txt

@@ -310,23 +310,6 @@ func_psp_08918338 = 0x08918338; // ignore:true
 _init = 0x089199FC;
 _fini = 0x08919A04;
 main = 0x0891A1CC;
-strFileOpen = 0x0892A9EC;
-strFileRead = 0x0892AB74;
-strFileLseek = 0x0892ABE8;
-play_bgm = 0x0892ABF0;
-init_atrac3plus = 0x0892AC94;
-play_atrac3plus = 0x0892AF44;
-createPlayModeFlag = 0x0892B2D8;
-setPlayMode = 0x0892B2E8;
-checkPlayMode = 0x0892B31C;
-waitPlayMode = 0x0892B384;
-clearPlayMode = 0x0892B394;
-release_arg = 0x0892B3C8;
-at3plus_addData = 0x0892B440;
-reset_position = 0x0892B5CC;
-fadeoutOperation = 0x0892B760;
-DvdUmdIoInit = 0x0892BAE0;
-DvdUmdIoTerm = 0x0892BB60;
 func_psp_0892C860 = 0x0892C860; // ignore:false
 func_psp_0892CA28 = 0x0892CA28; // ignore:false
 func_psp_0892CA90 = 0x0892CA90; // ignore:false
@@ -689,7 +672,8 @@ D_psp_08C63BA8 = 0x08C63BA8; // size:0x20
 D_psp_08C63BC8 = 0x08C63BC8; // size:0x20
 D_psp_08C63BE8 = 0x08C63BE8; // size:0x20
 D_psp_08C6BC40 = 0x08C6BC40;
-D_psp_08C6FC40 = 0x08C6FC40;
+D_psp_08C6FC40 = 0x08C6FC40; // size:0x3E000
+D_psp_08CADC40 = 0x08CADC40; // size:0x3C000
 D_psp_08CE9C48 = 0x08CE9C48;
 D_psp_08D2DC40 = 0x08D2DC40;
 D_psp_08D6DC40 = 0x08D6DC40;

include/pspsdk/pspatrac3.h

@@ -82,17 +82,17 @@ int sceAtracSetDataAndGetID(void *buf, SceSize bufsize);
  * Decode a frame of data. 
  *
  * @param atracID - the atrac ID
- * @param outSamples - pointer to a buffer that receives the decoded data of the current frame
- * @param outN - pointer to a integer that receives the number of audio samples of the decoded frame
- * @param outEnd - pointer to a integer that receives a boolean value indicating if the decoded frame is the last one
+ * @param outAddr - pointer to a buffer that receives the decoded data of the current frame
+ * @param outSamples - pointer to a integer that receives the number of audio samples of the decoded frame
+ * @param outFinishFlag - pointer to a integer that receives a boolean value indicating if the decoded frame is the last one
  * @param outRemainFrame - pointer to a integer that receives either -1 if all at3 data is already on memory, 
  *  or the remaining (not decoded yet) frames at memory if not all at3 data is on memory
  *
  * 
  * @return < 0 on error, otherwise 0
  *
 */
-int sceAtracDecodeData(int atracID, u16 *outSamples, int *outN, int *outEnd, int *outRemainFrame);
+int sceAtracDecodeData(SceInt32 atracID, SceShort16 *outAddr, SceUInt32 *outSamples, SceUInt32 *outFinishFlag, SceInt32 *outRemainFrame);
 
 /**
  * Gets the remaining (not decoded) number of frames

src/dra/7E4BC.c

@@ -2507,8 +2507,8 @@ void EntityTeleport(Entity* self) {
     case 6:
         PLAYER.palette = PAL_FLAG(PAL_PLAYER_HIDDEN);
 #ifdef VERSION_PSP
-        func_psp_0892A620(0, 1);
-        func_psp_0892A620(1, 1);
+        func_psp_0892A620(0, true);
+        func_psp_0892A620(1, true);
 #endif
         var_s5 = true;
         if (--self->ext.teleport.timer == 0) {

src/dra/game_handlers.c

@@ -496,8 +496,8 @@ void HandlePlay(void) {
         PlaySfx(SET_UNK_0B);
         MuteSound();
 #ifdef VERSION_PSP
-        func_psp_0892A620(0, 1);
-        func_psp_0892A620(1, 1);
+        func_psp_0892A620(0, true);
+        func_psp_0892A620(1, true);
 #endif
         if (D_80097C98 & 0x80000000) {
             func_800E4970();
@@ -532,8 +532,8 @@ void HandlePlay(void) {
         }
         if (D_80097C98 & 0x08000000) {
 #ifdef VERSION_PSP
-            func_psp_0892A620(0, 1);
-            func_psp_0892A620(1, 1);
+            func_psp_0892A620(0, true);
+            func_psp_0892A620(1, true);
 #endif
             func_800E4970();
             return;

src/dra/sound.c

@@ -1419,8 +1419,8 @@ void ExecSoundCommands(void) {
         case SET_UNK_0B:
             AddCdSoundCommand(CD_SOUND_COMMAND_FADE_OUT_2);
 #ifdef VERSION_PSP
-            func_psp_0892A620(0, 0);
-            func_psp_0892A620(1, 0);
+            func_psp_0892A620(0, false);
+            func_psp_0892A620(1, false);
 #endif
             StopSeq();
             SetReleaseRate2();
@@ -1429,8 +1429,8 @@ void ExecSoundCommands(void) {
         case SET_UNK_0C:
             AddCdSoundCommand(CD_SOUND_COMMAND_FADE_OUT_2);
 #ifdef VERSION_PSP
-            func_psp_0892A620(0, 0);
-            func_psp_0892A620(1, 0);
+            func_psp_0892A620(0, false);
+            func_psp_0892A620(1, false);
 #endif
             StopSeq();
             SoundWait();