Merge pull request #346 from ProjectRevoTPP/sound_check_menu

Sound check menu

data/sound_check_menu.s

@@ -1,121 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2 @ object file boundary?
-
-gDebugText_SoundCheckJap:: @ 83D02C8
-	.string "サウンドチェック$" @ Sound Check
-
-gDebugText_BGM:: @ 83D02D1
-	.string "BGM$"
-
-gDebugText_SE:: @ 83D02D5
-	.string "SE $"
-
-gUnknown_083D02D9:: @ 83D02D9
-	.string "A‥さいせい　B‥おわり$"
-
-gDebugText_UpDown:: @ 83D02E6
-	.string "L‥UP R‥DOWN$"
-
-gDebugText_DriverTest:: @ 83D02F2
-	.string "R‥DRIVER-TEST$"
-
-gUnknown_083D0300:: @ 83D0300
-	.byte  1,  1
-	.byte  1,  3
-	.byte  1,  5
-	.byte  1,  7
-	.byte  1,  9
-	.byte  1, 11
-	.byte  1, 13
-	.byte  1, 15
-	.byte  1, 17
-
-gUnknown_083D0312:: @ 83D0312
-	.string "Bぼたんで　もどる$"
-
-gUnknown_083D031C:: @ 83D031C
-	.string "Aぼたんで　さいせい$"
-
-gDebugText_Voice:: @ 83D0327
-	.string "VOICE‥‥‥‥$"
-
-gDebugText_Volume:: @ 83D0331
-	.string "VOLUME‥‥‥$"
-
-gDebugText_Panpot:: @ 83D033B
-	.string "PANPOT‥‥‥$"
-
-gDebugText_Pitch:: @ 83D0345
-	.string "PITCH‥‥‥‥$"
-
-gDebugText_Length:: @ 83D034F
-	.string "LENGTH‥‥‥$"
-
-gDebugText_Release:: @ 83D0359
-	.string "RELEASE‥‥$"
-
-gDebugText_Progress:: @ 83D0363
-	.string "PROGRESS‥$"
-
-gDebugText_Chorus:: @ 83D036D
-	.string "CHORUS‥‥‥$"
-
-gDebugText_Priority:: @ 83D0377
-	.string "PRIORITY‥$"
-
-gUnknown_083D0381:: @ 83D0381
-	.string "さいせいちゆう‥$" @ 再生中 (playing)
-
-gUnknown_083D038A:: @ 83D038A
-	.string "はんてん‥‥‥‥$" @ 反転 (reverse)
-
-gUnknown_083D0393:: @ 83D0393
-	.string "すてれお‥‥‥‥$" @ stereo
-
-	.align 2
-gUnknown_083D039C:: @ 83D039C
-	.4byte    0,   387
-	.4byte    0,   127
-	.4byte -127,   127
-	.4byte -128, 32639
-	.4byte    0, 65535
-	.4byte    0,   255
-	.4byte    0, 65535
-	.4byte  -64,    63
-
-gUnknown_083D03DC:: @ 83D03DC
-	.string "▶$"
-
-gUnknown_083D03DE:: @ 83D03DE
-	.string " $"
-
-	.align 2
-gUnknown_083D03E0:: @ 83D03E0
-	.4byte      1
-	.4byte     10
-	.4byte    100
-	.4byte   1000
-	.4byte  10000
-	.4byte 100000
-
-gUnknown_083D03F8:: @ 83D03F8
-	.byte 0x3F, 0x00, 0xC0, 0x7F, 0x80 @ stereo panning
-
-gOtherText_SE:: @ 83D03FD
-	.string "SE$"
-
-gOtherText_Pan:: @ 83D0400
-	.string "PAN$"
-
-gOtherText_LR:: @ 83D0404
-	.string "  LR$"
-
-gOtherText_RL:: @ 83D0409
-	.string "  RL$"
-
-@ 83D040E
-	.include "data/text/song_names.inc"

include/global.h

@@ -43,6 +43,17 @@ fndec\
 #define min(a, b) (a >= b ? a : b)
 #define max(a, b) (a <= b ? a : b)
 
+// why does GF hate 2d arrays
+#define MULTI_DIM_ARR(x, dim, y) ((x) * dim + (y))
+
+// dim access enums
+enum
+{
+	B_8 = 1,
+	B_16 = 2,
+	B_32 = 4
+};
+
 enum
 {
     VERSION_SAPPHIRE = 1,

include/player_pc.h

@@ -1,10 +1,6 @@
 #ifndef GUARD_PLAYER_PC_H
 #define GUARD_PLAYER_PC_H
 
-// general task defines
-#define TASK gTasks[taskId]
-#define FUNC func
-
 // local task defines
 #define PAGE_INDEX data[0]
 #define ITEMS_ABOVE_TOP data[1]

include/task.h

@@ -1,6 +1,10 @@
 #ifndef GUARD_TASK_H
 #define GUARD_TASK_H
 
+// general task defines
+#define TASK gTasks[taskId]
+#define FUNC func
+
 typedef void (*TaskFunc)(u8 taskId);
 
 struct Task

include/text.h

@@ -6,6 +6,7 @@
 #define CHAR_QUESTION_MARK  0xAC
 #define CHAR_PERIOD         0xAD
 #define CHAR_HYPHEN         0xAE
+#define CHAR_ELLIPSIS       0xB0
 #define CHAR_MALE           0xB5
 #define CHAR_FEMALE         0xB6
 #define CHAR_COMMA          0xB8

ld_script.txt

@@ -169,7 +169,7 @@ SECTIONS {
         asm/contest_effect.o(.text);
         src/record_mixing.o(.text);
         asm/record_mixing.o(.text);
-        asm/sound_check_menu.o(.text);
+        src/sound_check_menu.o(.text);
         src/secret_base.o(.text);
         asm/secret_base.o(.text_80BC1D0);
 		src/tv.o(.text);
@@ -409,7 +409,7 @@ SECTIONS {
         data/money.o(.rodata);
         data/contest_effect.o(.rodata);
         data/record_mixing.o(.rodata);
-        data/sound_check_menu.o(.rodata);
+        src/sound_check_menu.o(.rodata);
         data/secret_base.o(.rodata);
         data/tv.o(.rodata);
         data/contest_link_80C2020.o(.rodata);

src/battle_ai.c

@@ -1990,7 +1990,7 @@ static void BattleAICmd_get_used_item(void)
         index = gBankTarget;
 
     // this hack and a half matches. whatever. i dont care. someone else fix this mess later. PS: still cant fix this.
-    AI_THINKING_STRUCT->funcResult = ewram[0x160CC + (index * 2)];
+    AI_THINKING_STRUCT->funcResult = ewram[MULTI_DIM_ARR(index, B_16, 0x160CC)];
 
     gAIScriptPtr += 2;
 }