Declare movie functions

Author: martinbean

SLUS_007.79.yaml

@@ -61,7 +61,7 @@ segments:
       - [0x11B60, asm, 11B60]
       - [0x14C1C, asm, decode_data]
       - [0x14CB0, asm, 14CB0]
-      - [0x14CC4, asm, movie]
+      - [0x14CC4, c, movie]
       - [0x156C8, asm, 156C8]
       - [0x3A3F4, data, 3A3F4] # estimated
   - [0x5C000]

THUNDER.ld

@@ -30,7 +30,7 @@ SECTIONS
         BUILD_PATH/asm/11B60.s.o(.rodata);
         BUILD_PATH/asm/decode_data.s.o(.rodata);
         BUILD_PATH/asm/14CB0.s.o(.rodata);
-        BUILD_PATH/asm/movie.s.o(.rodata);
+        BUILD_PATH/src/movie.c.o(.rodata);
         BUILD_PATH/asm/156C8.s.o(.rodata);
         . = ALIGN(., 4);
         main_RODATA_END = .;
@@ -42,7 +42,7 @@ SECTIONS
         BUILD_PATH/asm/11B60.s.o(.text);
         BUILD_PATH/asm/decode_data.s.o(.text);
         BUILD_PATH/asm/14CB0.s.o(.text);
-        BUILD_PATH/asm/movie.s.o(.text);
+        BUILD_PATH/src/movie.c.o(.text);
         BUILD_PATH/asm/156C8.s.o(.text);
         . = ALIGN(., 4);
         main_TEXT_END = .;
@@ -62,8 +62,8 @@ SECTIONS
         BUILD_PATH/asm/decode_data.s.o(.data);
         _14CB0_s = .;
         BUILD_PATH/asm/14CB0.s.o(.data);
-        movie_s = .;
-        BUILD_PATH/asm/movie.s.o(.data);
+        movie_c = .;
+        BUILD_PATH/src/movie.c.o(.data);
         _156C8_s = .;
         BUILD_PATH/asm/156C8.s.o(.data);
         _3A3F4_data__s = .;
@@ -79,7 +79,7 @@ SECTIONS
         BUILD_PATH/asm/11B60.s.o(.bss);
         BUILD_PATH/asm/decode_data.s.o(.bss);
         BUILD_PATH/asm/14CB0.s.o(.bss);
-        BUILD_PATH/asm/movie.s.o(.bss);
+        BUILD_PATH/src/movie.c.o(.bss);
         BUILD_PATH/asm/156C8.s.o(.bss);
         . = ALIGN(., 4);
         main_BSS_END = .;

src/movie.c

@@ -0,0 +1,17 @@
+#include "common.h"
+
+INCLUDE_ASM("asm/nonmatchings/movie", play_movie);
+
+INCLUDE_ASM("asm/nonmatchings/movie", strSetDefDecEnv);
+
+INCLUDE_ASM("asm/nonmatchings/movie", strInit);
+
+INCLUDE_ASM("asm/nonmatchings/movie", strCallback);
+
+INCLUDE_ASM("asm/nonmatchings/movie", strNextVlc);
+
+INCLUDE_ASM("asm/nonmatchings/movie", strNext);
+
+INCLUDE_ASM("asm/nonmatchings/movie", strSync);
+
+INCLUDE_ASM("asm/nonmatchings/movie", strKickCD);

symbol_addrs.txt

@@ -2,6 +2,7 @@ _bu_init = 0x800487b4; // type:func
 _card_info = 0x800487c4; // type:func
 _card_load = 0x800487d4; // type:func
 cache_file_pos = 0x80021310; // type:func
+CdControl = 0x8002fbc8; // type:func
 CdGetToc = 0x8002f6b4; // type:func
 CdGetToc2 = 0x8002f6d8; // type:func
 CdInit = 0x8002f8fc; // type:func
@@ -64,6 +65,7 @@ StopCARD = 0x80048874; // type:func
 strCallback = 0x800249cc; // type:func
 strInit = 0x80024948; // type:func
 strKickCD = 0x80024e54; // type:func
+strNext = 0x80024c8c; // type:func
 strNextVlc = 0x80024bf4; // type:func
 strSetDefDecEnv = 0x80024890; // type:func
 strSync = 0x80024d90; // type:func