summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile46
-rw-r--r--assets/assets.json51
-rw-r--r--data/animations/projectile/torchTrapProjectile.s2
-rw-r--r--data/data_080B7B74.s6
-rw-r--r--src/save.c6
-rwxr-xr-xtools/agb2mid/agb.cpp192
-rwxr-xr-xtools/agb2mid/error.cpp3
-rwxr-xr-xtools/agb2mid/main.cpp313
-rwxr-xr-xtools/agb2mid/midi.cpp135
-rwxr-xr-xtools/agb2mid/midi.h28
-rwxr-xr-xtools/agb2mid/tables.cpp309
-rw-r--r--tools/asset_processor/Makefile4
-rw-r--r--tools/asset_processor/assets/asset.h2
-rw-r--r--tools/asset_processor/main.cpp15
-rwxr-xr-xtools/scaninc/scaninc.cpp2
-rw-r--r--tools/tmc_strings/main.cpp32
16 files changed, 438 insertions, 708 deletions
diff --git a/Makefile b/Makefile
index b7320780..ddd26c61 100644
--- a/Makefile
+++ b/Makefile
@@ -272,49 +272,3 @@ demo_usa: ; @$(MAKE) GAME_VERSION=DEMO_USA
jp: ; @$(MAKE) GAME_VERSION=JP
demo_jp: ; @$(MAKE) GAME_VERSION=DEMO_JP
eu: ; @$(MAKE) GAME_VERSION=EU
-
-ifeq ($(GAME_VERSION), USA)
-baserom.gba:
- $(error "You need to provide a USA ROM as baserom.gba")
-.PHONY: baserom_demo.gba baserom_jp.gba baserom_eu.gba baserom_demo_jp.gba
-baserom_demo.gba:
-baserom_jp.gba:
-baserom_eu.gba:
-baserom_demo_jp.gba:
-endif
-ifeq ($(GAME_VERSION), DEMO_USA)
-baserom_demo.gba:
- $(error "You need to provide a DEMO ROM as baserom_demo.gba")
-.PHONY: baserom_jp.gba baserom_eu.gba baserom.gba baserom_demo_jp.gba
-baserom.gba:
-baserom_jp.gba:
-baserom_eu.gba:
-baserom_demo_jp.gba:
-endif
-ifeq ($(GAME_VERSION), JP)
-baserom_jp.gba:
- $(error "You need to provide a JP ROM as baserom_jp.gba")
-.PHONY: baserom_demo.gba baserom_eu.gba baserom.gba baserom_demo_jp.gba
-baserom.gba:
-baserom_demo.gba:
-baserom_eu.gba:
-baserom_demo_jp.gba:
-endif
-ifeq ($(GAME_VERSION), DEMO_JP)
-baserom_demo_jp.gba:
- $(error "You need to provide a DEMO JP ROM as baserom_demo_jp.gba")
-.PHONY: baserom_jp.gba baserom_eu.gba baserom.gba baserom_demo.gba
-baserom.gba:
-baserom_jp.gba:
-baserom_eu.gba:
-baserom_demo.gba:
-endif
-ifeq ($(GAME_VERSION), EU)
-baserom_eu.gba:
- $(error "You need to provide a EU ROM as baserom_eu.gba")
-.PHONY: baserom_demo.gba baserom.gba baserom_jp.gba baserom_demo_jp.gba
-baserom.gba:
-baserom_jp.gba:
-baserom_demo.gba:
-baserom_demo_jp.gba:
-endif
diff --git a/assets/assets.json b/assets/assets.json
index e5edca9d..d00b1836 100644
--- a/assets/assets.json
+++ b/assets/assets.json
@@ -21024,6 +21024,21 @@
"size": 8
},
{
+ "path": "data_080B7B74/gCollisionMtx.bin",
+ "start": 752500,
+ "size": 1210
+ },
+ {
+ "path": "data_080B7B74/gUnk_080B802E.bin",
+ "start": 753710,
+ "size": 8850
+ },
+ {
+ "path": "data_080B7B74/gUnk_080BA2C0.bin",
+ "start": 762560,
+ "size": 4064
+ },
+ {
"path": "data_080B7B74/gUnk_080B7B74_1_EU.bin",
"variants": [
"EU"
@@ -42725,6 +42740,36 @@
"size": 34
},
{
+ "path": "demo/save1.bin",
+ "starts": {
+ "DEMO_USA": 1171472
+ },
+ "size": 1280,
+ "variants": [
+ "DEMO_USA"
+ ]
+ },
+ {
+ "path": "demo/save2.bin",
+ "starts": {
+ "DEMO_USA": 1172752
+ },
+ "size": 1280,
+ "variants": [
+ "DEMO_USA"
+ ]
+ },
+ {
+ "path": "demo/save3.bin",
+ "starts": {
+ "DEMO_USA": 1174032
+ },
+ "size": 1280,
+ "variants": [
+ "DEMO_USA"
+ ]
+ },
+ {
"offsets": {
"DEMO_USA": 2572,
"DEMO_JP": -2192
@@ -48402,6 +48447,12 @@
"type": "animation"
},
{
+ "path": "animations/gSpriteAnimations_TorchTrapProjectile_0_0.bin",
+ "start": 1221600,
+ "size": 20,
+ "type": "animation"
+ },
+ {
"path": "animations/gSpriteAnimations_TorchTrapProjectile_1_0.bin",
"start": 1221628,
"size": 20,
diff --git a/data/animations/projectile/torchTrapProjectile.s b/data/animations/projectile/torchTrapProjectile.s
index 68f30f1f..4faa9d09 100644
--- a/data/animations/projectile/torchTrapProjectile.s
+++ b/data/animations/projectile/torchTrapProjectile.s
@@ -5,7 +5,7 @@
.align 2
gSpriteAnimations_TorchTrapProjectile_0_0:: @ 0812A3E0
- .incbin "baserom.gba", 0x12A3E0, 0x0000014
+ .include "animations/gSpriteAnimations_TorchTrapProjectile_0_0.s"
gSpriteAnimations_TorchTrapProjectile_0:: @ 0812A3F4
.4byte gSpriteAnimations_TorchTrapProjectile_0_0
diff --git a/data/data_080B7B74.s b/data/data_080B7B74.s
index d206a13e..fe27fb40 100644
--- a/data/data_080B7B74.s
+++ b/data/data_080B7B74.s
@@ -5,13 +5,13 @@
.align 2
gCollisionMtx:: @ 080B7B74
- .incbin "baserom.gba", 0x0B7B74, 0x00004BA
+ .incbin "data_080B7B74/gCollisionMtx.bin"
gUnk_080B802E:: @ 080B802E
- .incbin "baserom.gba", 0x0B802E, 0x0002292
+ .incbin "data_080B7B74/gUnk_080B802E.bin"
gUnk_080BA2C0:: @ 080BA2C0
- .incbin "baserom.gba", 0x0BA2C0, 0x0000FE0
+ .incbin "data_080B7B74/gUnk_080BA2C0.bin"
gUnk_080BB2A0:: @ 080BB2A0
.ifdef EU
diff --git a/src/save.c b/src/save.c
index 562f116e..71657e58 100644
--- a/src/save.c
+++ b/src/save.c
@@ -59,9 +59,9 @@ static SaveResult (*const sSaveHandlers[])(u32) = { HandleSaveInit, HandleSaveIn
#if defined(DEMO_USA) || defined(DEMO_JP)
#ifdef DEMO_USA
-asm("demoPointer1: .incbin \"baserom_demo.gba\", 0x11e010, 0x500");
-asm("demoPointer2: .incbin \"baserom_demo.gba\", 0x11e510, 0x500");
-asm("demoPointer3: .incbin \"baserom_demo.gba\", 0x11ea10, 0x500");
+asm("demoPointer1: .incbin \"demo/save1.bin\"");
+asm("demoPointer2: .incbin \"demo/save2.bin\"");
+asm("demoPointer3: .incbin \"demo/save3.bin\"");
extern const u8 demoPointer1[];
extern const u8 demoPointer2[];
diff --git a/tools/agb2mid/agb.cpp b/tools/agb2mid/agb.cpp
index f79acc0f..ce4b946d 100755
--- a/tools/agb2mid/agb.cpp
+++ b/tools/agb2mid/agb.cpp
@@ -44,20 +44,12 @@ void Seek(long offset);
std::vector<std::uint32_t> trackPointers;
-/*const int FILE_OFFSET = 0x10000;
-// const int START_OFFSET = 0x1c;
-const int START_OFFSET = 0x2DE4;
-const int REDUCE_POINTERS = 0;*/
-
-const int FILE_OFFSET = 0;
-const int START_OFFSET = 0xDE38F0;
const unsigned int REDUCE_POINTERS = 0x8000000;
extern int g_fileStartOffset; // TODO move to header
void ReadAgbSong() {
-
- Seek(FILE_OFFSET + g_fileStartOffset);
+ Seek(g_fileStartOffset);
int numTracks = ReadInt8();
int numBlocks = ReadInt8();
@@ -101,7 +93,6 @@ std::vector<std::vector<Event>> trackEvents;
std::vector<Event> metaEvents;
int convertTime(int time) {
- // event.time = (24 * g_clocksPerBeat * event.time) / g_midiTimeDiv;
return ((float)time * g_midiTimeDiv) / (24 * g_clocksPerBeat);
}
@@ -112,19 +103,13 @@ std::uint32_t GetCurrentPtr() {
}
std::uint32_t PtrToFileAddr(std::uint32_t ptr) {
- return ptr + FILE_OFFSET - REDUCE_POINTERS;
+ return ptr - REDUCE_POINTERS;
}
void insertAtCorrectTimeFromEnd(std::vector<Event>& events, const Event& event) {
- // std::printf("time: %d\n", event.time);
for (auto it = events.rbegin(); it != events.rend(); it++) {
if ((*it).time <= event.time) {
events.insert(it.base(), event);
-
- /* for (const auto& event : events) {
- std::printf("e: %X t: %d\n", (int)event.type, event.time);
- }
- std::cin.ignore();*/
return;
}
}
@@ -132,15 +117,9 @@ void insertAtCorrectTimeFromEnd(std::vector<Event>& events, const Event& event)
}
void insertAtCorrectTimeFromStart(std::vector<Event>& events, const Event& event) {
- // std::printf("time: %d\n", event.time);
for (auto it = events.begin(); it != events.end(); it++) {
if ((*it).time >= event.time) {
events.insert(it, event);
-
- /* for (const auto& event : events) {
- std::printf("e: %X t: %d\n", (int)event.type, event.time);
- }
- std::cin.ignore();*/
return;
}
}
@@ -149,9 +128,6 @@ void insertAtCorrectTimeFromStart(std::vector<Event>& events, const Event& event
void ReadAgbTracks() {
size_t count = 0;
-
-
-
int addedPadding = 8;
// TODO configurable???
@@ -168,10 +144,9 @@ void ReadAgbTracks() {
for (uint32_t trackPointer : trackPointers) {
std::vector<Event> events;
- count ++;
+ count++;
if (g_verbose)
std::printf("\n\ntrackPointer: %X -> %X %ld\n", trackPointer, trackPointer - REDUCE_POINTERS, count);
-
// Search for loop in this trac
bool hasLoop = false;
@@ -180,10 +155,12 @@ void ReadAgbTracks() {
int loopStartTime = 0;
unsigned int trackEnd =
- (trackPointers.size() > count ? trackPointers[count] : (g_fileStartOffset + REDUCE_POINTERS)) ; // Use offset to header as end for last track
+ (trackPointers.size() > count
+ ? trackPointers[count]
+ : (g_fileStartOffset + REDUCE_POINTERS)); // Use offset to header as end for last track
if (g_verbose)
std::printf("End of track: %X\n", trackEnd);
- Seek(FILE_OFFSET + trackEnd - REDUCE_POINTERS);
+ Seek(trackEnd - REDUCE_POINTERS);
// search for a few bytes whether there is a loop end
for (int i = 5; i < 10 + addedPadding; i++) {
@@ -191,11 +168,11 @@ void ReadAgbTracks() {
// Ignore GOTOs from the previous track.
continue;
}
- Seek(FILE_OFFSET + trackEnd - REDUCE_POINTERS -i);
+ Seek(trackEnd - REDUCE_POINTERS - i);
if (ReadInt8() == GOTO) {
if (g_verbose)
std::printf("Has loop: %d\n", i);
- loopAddress = lReadInt32() + FILE_OFFSET - REDUCE_POINTERS;
+ loopAddress = lReadInt32() - REDUCE_POINTERS;
if (loopAddress > 0x1000000) {
// The 0xB1 was probably part of the pointer or something.
continue;
@@ -211,32 +188,17 @@ void ReadAgbTracks() {
if (g_verbose)
std::printf("Has loop: %d, %X\n", hasLoop, loopAddress);
-
-
-
// Read all track events
-
- Seek(FILE_OFFSET + trackPointer - REDUCE_POINTERS);
+ Seek(trackPointer - REDUCE_POINTERS);
int type = ReadInt8();
- // std::printf("type: %X\n", type);
// VOL?
if (type == VOL) {
- // TODO extract to function and reuse below
-
int val = ReadInt8();
-
+
if (g_verbose)
std::printf("ignore vol: %X\n", val);
-
- // TODO if this is a change to 127*mvl/mxv, there was no event in midi
- /*std::printf("VOL: %X\n", val);
- Event event;
- event.type = EventType::Controller;
- event.param1 = 0x7;
- event.param2 = std::round((float)val * MXV / MVL); // TODO inverse "%u*%s_mvl/mxv", event.param2,
- g_asmLabel.c_str()); events.push_back(event);*/
type = ReadInt8();
}
@@ -249,7 +211,6 @@ void ReadAgbTracks() {
if (g_verbose)
std::printf("KEYSH: %d\n", keyShift);
// TODO initial shift is always 0? Or is this set as the whole key shift?
-
} else {
std::printf("Error: initial type %X not implemented\n", type);
return;
@@ -273,11 +234,10 @@ void ReadAgbTracks() {
int returnPtr = 0;
while (!endOfTrack) {
- // std::printf("type: %X\n", type);
- if (hasLoop && !foundLoop && GetCurrentPtr()-1 == loopAddress) {
- if (g_verbose)
+ if (hasLoop && !foundLoop && GetCurrentPtr() - 1 == loopAddress) {
+ if (g_verbose)
std::printf("<<<< inserted loop start\n");
- //foundLoop = true;
+ // foundLoop = true;
loopStartTime = currentTime;
Event event;
event.time = loopStartTime;
@@ -291,8 +251,6 @@ void ReadAgbTracks() {
// Repeat last command
Skip(-1);
type = lastCommand;
- // std::printf("%X ", type);
- // std::printf("Repeat last command: %X\n", lastCommand);
if (g_verbose)
std::printf("(repeat cmd) ");
} else {
@@ -310,7 +268,6 @@ void ReadAgbTracks() {
Event event;
event.time = currentTime;
event.type = EventType::Tempo;
- // 60000000 / event.param2
event.param2 = 60000000 / (val * 2);
metaEvents.push_back(event);
@@ -328,9 +285,7 @@ void ReadAgbTracks() {
break;
}
case VOL: {
- // const int MVL = 90; // TODO configurable per song?
const int MVL = 128;
-
const int MXV = 0x7F;
int val = ReadInt8();
@@ -340,8 +295,7 @@ void ReadAgbTracks() {
event.time = currentTime;
event.type = EventType::Controller;
event.param1 = 0x7;
- event.param2 = std::ceil((float)val * MXV /
- MVL); // TODO inverse "%u*%s_mvl/mxv", event.param2, g_asmLabel.c_str());
+ event.param2 = std::ceil((float)val * MXV / MVL);
events.push_back(event);
break;
}
@@ -414,7 +368,6 @@ void ReadAgbTracks() {
// Already handled
loopEndTime = currentTime;
-
break;
}
case EOT: {
@@ -601,7 +554,6 @@ void ReadAgbTracks() {
}
default:
if (type >= 0x80 && type <= 0x80 + 48) {
-
const int lenTbl[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 28, 30, 32, 36, 40, 42, 44, 48, 52,
54, 56, 60, 64, 66, 68, 72, 76, 78, 80, 84, 88, 90, 92, 96 };
@@ -613,65 +565,31 @@ void ReadAgbTracks() {
patternDuration += wait;
if (!currentlyPlayingNotes.empty()) {
-
- // std::printf("Testing... %d\n", (int)currentlyPlayingNotes.size());
for (auto it = currentlyPlayingNotes.begin(); it != currentlyPlayingNotes.end();) {
Event& note = *it; // Modify the note in the list if we don't remove it now.
note.time -= wait;
if (note.time <= 0) {
-
- /*if (note.time < 0) {
- std::printf("<0: %d\n", note.time);
- std::cin.ignore();
- }*/
- // note.time += currentTime; // Set to the global time the note was finished.
- // TODO negative=
note.time += currentTime + wait;
-
- // std::printf("Note off at %d\n", note.time);
insertAtCorrectTimeFromEnd(events, note);
-
it = currentlyPlayingNotes.erase(it);
} else {
++it;
}
- // // TODO handle multiple notes playing at the same time on the same track?
- // if (wait >= currentlyPlayingNotes[0].time) {
- // Event event = currentlyPlayingNotes[0];
- // std::printf("Finished playing note\n");
- // event.time = currentTime;
- // events.push_back(event);
- // currentlyPlayingNotes.pop_back();
- // } else {
- // currentlyPlayingNotes[0].time -= wait;
- // }
}
- // std::printf("Done... %d\n", (int)currentlyPlayingNotes.size());
}
currentTime += wait;
-
- /* if (wait > 0) {
- Event event;
- event.type = EventType::Wait;
- event.time = currentTime+convertTime(wait);
- events.push_back(event);
- }*/
-
} else if (type >= 0xD0 && type <= 0xD0 + 47) {
-
// Handle note with a fixed length
int noteType = type;
int note = ReadInt8();
int velocity = 0;
int length = 0;
-
bool usedLastNote = false;
bool usedLastVelocity = false;
if (note < 0x80) { // a valid note
lastNote = note;
velocity = ReadInt8();
if (velocity < 0x80) { // a valid velocity
- // std::printf("Explicit velocity%d\n", velocity);
lastVelocity = velocity;
length = ReadInt8();
if (length < 0x80) { // a valid length
@@ -681,7 +599,6 @@ void ReadAgbTracks() {
length = 0;
}
} else {
- // std::printf("Reusing last vel %d\n", lastVelocity);
type = velocity;
velocity = lastVelocity;
usedLastVelocity = true;
@@ -732,56 +649,12 @@ void ReadAgbTracks() {
}
std::printf("\n");
}
-
- // std::printf("Wait before convert: %d\n", wait);
- // std::printf("Wait after convert: %d\n", event.param2);
events.push_back(event);
event.type = EventType::NoteOff;
event.time = wait;
- // std::printf("Should be off at %d...\n", currentTime+wait);
- // std::printf("Note length: %d\n", wait);
- // std::cin.ignore();
currentlyPlayingNotes.push_back(event);
- // event.param2 = wait;
-
- /* int duration = wait; // event.param2;
-
- if (!g_exactGateTime) { // && duration < 96)
- // TODO inverse lut
- std::printf("asdf\n");
- for (size_t i = 0; i < 97; i++) {
- if (g_noteDurationLUT[i] == duration) {
- duration = i;
- std::printf("test%d\n", (int)i);
- break;
- }
- }
- }
-
- if (duration == 1)
- duration = 0;
-
- // event.param2 = (duration * g_midiTimeDiv) /(24 * g_clocksPerBeat);
- event.param2 = g_noteDurationInverseLUT[duration];
- std::printf("Wait after convert: %d\n", event.param2);*/
-
- /*
- event.param1 = g_noteVelocityLUT[event.param1];
-
- std::uint32_t duration = (24 * g_clocksPerBeat * event.param2) / g_midiTimeDiv;
-
- if (duration == 0)
- duration = 1;
-
- if (!g_exactGateTime && duration < 96)
- duration = g_noteDurationLUT[duration];
-
- event.param2 = duration;
- */
-
continue; // Next type was already read
-
} else {
std::printf("ERROR: Unhandled type %X\n", type);
return;
@@ -789,8 +662,6 @@ void ReadAgbTracks() {
break;
}
-
-
// TODO notes, waits,
type = ReadInt8();
}
@@ -809,37 +680,17 @@ void ReadAgbTracks() {
}
insertAtCorrectTimeFromEnd(events, note);
}
- if (g_verbose)
+ if (g_verbose)
std::printf("Found notes from %d up to %d.\n", currentTime, latestTime);
currentTime = latestTime;
- if (g_verbose)
+ if (g_verbose)
std::cin.ignore();
}
- /*if (foundLoop) {
- // Place the loop begin event as the last event for that time on the meta events track.
- // TODO this does not help as TEMPO events are not placed on the meta track?
-
- Event event;
- event.time = loopStartTime;
- event.type = EventType::LoopBegin;
- insertAtCorrectTimeFromEnd(events, event);
- std::printf("--- Inserting loop at %d\n", loopStartTime);
- }*/
-
if (hasLoop) {
Event event;
event.type = EventType::LoopEnd;
event.time = loopEndTime;
- // Place loop end at the end of the track that has the latest end.
- /*for (const auto& events : trackEvents) {
- int trackEnd = events.back().time;
- if (trackEnd > event.time) {
- event.time = trackEnd;
- }
- }*/
- // std::printf("####### loop End %d\n", event.time);
- //events.push_back(event);
insertAtCorrectTimeFromEnd(events, event);
}
@@ -847,14 +698,12 @@ void ReadAgbTracks() {
event.type = EventType::EndOfTrack;
event.time = currentTime;
events.push_back(event);
- if (g_verbose)
+ if (g_verbose)
std::printf("END OF TRACK: %d\n", currentTime);
trackEvents.push_back(events);
}
-
-
// Insert manual time signature change event
for (const auto& change : timeSignatureChanges) {
bool inserted = false;
@@ -866,17 +715,14 @@ void ReadAgbTracks() {
for (size_t i = 0; i < metaEvents.size() - 1; i++) {
int prevTime = metaEvents[i].time;
int nextTime = metaEvents[i + 1].time;
- //std::printf("%d < %d <= %d?\n", prevTime, event.time, nextTime);
if (event.time > prevTime && event.time <= nextTime) {
- //std::printf("axd%d\n", (int)metaEvents.size());
metaEvents.insert(metaEvents.begin() + i + 1, event);
inserted = true;
break;
}
}
- //std::printf("asd %d\n", (int)metaEvents.size());
if (!inserted) {
- metaEvents.push_back(event);
+ metaEvents.push_back(event);
}
}
}
diff --git a/tools/agb2mid/error.cpp b/tools/agb2mid/error.cpp
index 13e38ffa..d824ae86 100755
--- a/tools/agb2mid/error.cpp
+++ b/tools/agb2mid/error.cpp
@@ -23,8 +23,7 @@
#include <cstdarg>
// Reports an error diagnostic and terminates the program.
-[[noreturn]] void RaiseError(const char* format, ...)
-{
+[[noreturn]] void RaiseError(const char* format, ...) {
const int bufferSize = 1024;
char buffer[bufferSize];
std::va_list args;
diff --git a/tools/agb2mid/main.cpp b/tools/agb2mid/main.cpp
index 2774915f..8c057021 100755
--- a/tools/agb2mid/main.cpp
+++ b/tools/agb2mid/main.cpp
@@ -49,60 +49,49 @@ int g_denominatorExp = 2;
bool g_verbose = false;
std::vector<TimeSignatureChange> timeSignatureChanges;
-
-
-[[noreturn]] static void PrintUsage()
-{
- std::printf(
- "Usage: AGB2MID baserom start_offset input_file output_file [options]\n"
- "\n"
- " baserom path to the baserom\n"
- " start_offset offset to the sound header\n"
- " input_file filename(.s) for AGB file\n"
- " output_file filename(.mid) of MIDI file (default:input_file)\n"
- "\n"
- "options -L??? label for assembler (default:output_file)\n"
- " -V??? master volume (default:127)\n"
- " -G??? voice group number (default:0)\n"
- " -P??? priority (default:0)\n"
- " -R??? reverb (default:off)\n"
- " -X 48 clocks/beat (default:24 clocks/beat)\n"
- " -E exact gate-time\n"
- " -N no compression\n"
- " -n??? midi time nominator\n"
- " -d??? midi time denominator\n"
- " -t ? ? ? time signature change\n"
- " -v verbose\n"
- );
+[[noreturn]] static void PrintUsage() {
+ std::printf("Usage: AGB2MID baserom start_offset input_file output_file [options]\n"
+ "\n"
+ " baserom path to the baserom\n"
+ " start_offset offset to the sound header\n"
+ " input_file filename(.s) for AGB file\n"
+ " output_file filename(.mid) of MIDI file (default:input_file)\n"
+ "\n"
+ "options -L??? label for assembler (default:output_file)\n"
+ " -V??? master volume (default:127)\n"
+ " -G??? voice group number (default:0)\n"
+ " -P??? priority (default:0)\n"
+ " -R??? reverb (default:off)\n"
+ " -X 48 clocks/beat (default:24 clocks/beat)\n"
+ " -E exact gate-time\n"
+ " -N no compression\n"
+ " -n??? midi time nominator\n"
+ " -d??? midi time denominator\n"
+ " -t ? ? ? time signature change\n"
+ " -v verbose\n");
std::exit(1);
}
-static std::string StripExtension(std::string s)
-{
+static std::string StripExtension(std::string s) {
std::size_t pos = s.find_last_of('.');
- if (pos > 0 && pos != std::string::npos)
- {
+ if (pos > 0 && pos != std::string::npos) {
s = s.substr(0, pos);
}
return s;
}
-static std::string GetExtension(std::string s)
-{
+static std::string GetExtension(std::string s) {
std::size_t pos = s.find_last_of('.');
- if (pos > 0 && pos != std::string::npos)
- {
+ if (pos > 0 && pos != std::string::npos) {
return s.substr(pos + 1);
}
-
return "";
}
-static std::string BaseName(std::string s)
-{
+static std::string BaseName(std::string s) {
std::size_t posAfterSlash = s.find_last_of("/\\");
if (posAfterSlash == std::string::npos)
@@ -117,11 +106,10 @@ static std::string BaseName(std::string s)
return s;
}
-static const char *GetArgument(int argc, char **argv, int& index)
-{
+static const char* GetArgument(int argc, char** argv, int& index) {
assert(index >= 0 && index < argc);
- const char *option = argv[index];
+ const char* option = argv[index];
assert(option != nullptr);
assert(option[0] == '-');
@@ -131,144 +119,133 @@ static const char *GetArgument(int argc, char **argv, int& index)
return option + 2;
// Otherwise, try to get the next arg.
- if (index + 1 < argc)
- {
+ if (index + 1 < argc) {
index++;
return argv[index];
- }
- else
- {
+ } else {
return nullptr;
}
}
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
std::string baseromPath;
std::string startOffset;
std::string inputFilename;
std::string outputFilename;
- for (int i = 1; i < argc; i++)
- {
- const char *option = argv[i];
-
- if (option[0] == '-' && option[1] != '\0')
- {
- const char *arg;
-
- switch (option[1])
- {
- case 'E':
- g_exactGateTime = true;
- break;
- case 'G':
- arg = GetArgument(argc, argv, i);
- if (arg == nullptr)
- PrintUsage();
- g_voiceGroup = std::stoi(arg);
- break;
- case 'L':
- arg = GetArgument(argc, argv, i);
- if (arg == nullptr)
- PrintUsage();
- g_asmLabel = arg;
- break;
- case 'N':
- g_compressionEnabled = false;
- break;
- case 'P':
- arg = GetArgument(argc, argv, i);
- if (arg == nullptr)
- PrintUsage();
- g_priority = std::stoi(arg);
- break;
- case 'R':
- arg = GetArgument(argc, argv, i);
- if (arg == nullptr)
- PrintUsage();
- g_reverb = std::stoi(arg);
- break;
- case 'V':
- arg = GetArgument(argc, argv, i);
- if (arg == nullptr)
- PrintUsage();
- g_masterVolume = std::stoi(arg);
- break;
- case 'X':
- g_clocksPerBeat = 2;
- break;
- case 'n':
- arg = GetArgument(argc, argv, i);
- if (arg == nullptr)
- PrintUsage();
- g_nominator = std::stoi(arg);
- break;
- case 'd':
- {
- arg = GetArgument(argc, argv, i);
- if (arg == nullptr)
- PrintUsage();
- int denominator = std::stoi(arg);
- if (denominator == 1) {
- g_denominatorExp = 0;
- } else if (denominator == 2) {
- g_denominatorExp = 1;
- } else if (denominator == 4) {
- g_denominatorExp = 2;
- } else if (denominator == 8) {
- g_denominatorExp = 3;
- } else if (denominator == 16) {
- g_denominatorExp = 4;
- } else if (denominator == 32) {
- g_denominatorExp = 5;
- } else {
- std::printf("ERROR: denominator %d\n", denominator);
- exit(1);
+ for (int i = 1; i < argc; i++) {
+ const char* option = argv[i];
+
+ if (option[0] == '-' && option[1] != '\0') {
+ const char* arg;
+
+ switch (option[1]) {
+ case 'E':
+ g_exactGateTime = true;
+ break;
+ case 'G':
+ arg = GetArgument(argc, argv, i);
+ if (arg == nullptr)
+ PrintUsage();
+ g_voiceGroup = std::stoi(arg);
+ break;
+ case 'L':
+ arg = GetArgument(argc, argv, i);
+ if (arg == nullptr)
+ PrintUsage();
+ g_asmLabel = arg;
+ break;
+ case 'N':
+ g_compressionEnabled = false;
+ break;
+ case 'P':
+ arg = GetArgument(argc, argv, i);
+ if (arg == nullptr)
+ PrintUsage();
+ g_priority = std::stoi(arg);
+ break;
+ case 'R':
+ arg = GetArgument(argc, argv, i);
+ if (arg == nullptr)
+ PrintUsage();
+ g_reverb = std::stoi(arg);
+ break;
+ case 'V':
+ arg = GetArgument(argc, argv, i);
+ if (arg == nullptr)
+ PrintUsage();
+ g_masterVolume = std::stoi(arg);
+ break;
+ case 'X':
+ g_clocksPerBeat = 2;
+ break;
+ case 'n':
+ arg = GetArgument(argc, argv, i);
+ if (arg == nullptr)
+ PrintUsage();
+ g_nominator = std::stoi(arg);
+ break;
+ case 'd': {
+ arg = GetArgument(argc, argv, i);
+ if (arg == nullptr)
+ PrintUsage();
+ int denominator = std::stoi(arg);
+ if (denominator == 1) {
+ g_denominatorExp = 0;
+ } else if (denominator == 2) {
+ g_denominatorExp = 1;
+ } else if (denominator == 4) {
+ g_denominatorExp = 2;
+ } else if (denominator == 8) {
+ g_denominatorExp = 3;
+ } else if (denominator == 16) {
+ g_denominatorExp = 4;
+ } else if (denominator == 32) {
+ g_denominatorExp = 5;
+ } else {
+ std::printf("ERROR: denominator %d\n", denominator);
+ exit(1);
+ }
+ break;
}
- break;
- }
- case 't':
- {
- int nominator = std::stoi(argv[i+1]);
- int denominator = std::stoi(argv[i+2]);
- if (denominator == 1) {
- denominator = 0;
- } else if (denominator == 2) {
- denominator = 1;
- } else if (denominator == 4) {
- denominator = 2;
- } else if (denominator == 8) {
- denominator = 3;
- } else if (denominator == 16) {
- denominator = 4;
- } else if (denominator == 32) {
- denominator = 5;
- } else {
- std::printf("ERROR: denominator %d\n", denominator);
- exit(1);
+ case 't': {
+ int nominator = std::stoi(argv[i + 1]);
+ int denominator = std::stoi(argv[i + 2]);
+ if (denominator == 1) {
+ denominator = 0;
+ } else if (denominator == 2) {
+ denominator = 1;
+ } else if (denominator == 4) {
+ denominator = 2;
+ } else if (denominator == 8) {
+ denominator = 3;
+ } else if (denominator == 16) {
+ denominator = 4;
+ } else if (denominator == 32) {
+ denominator = 5;
+ } else {
+ std::printf("ERROR: denominator %d\n", denominator);
+ exit(1);
+ }
+ int time = std::stoi(argv[i + 3]);
+ i += 3;
+ TimeSignatureChange change;
+ change.nominator = nominator;
+ change.denominator = denominator;
+ change.time = time;
+
+ // TODO sort by time?
+ timeSignatureChanges.push_back(change);
+ break;
}
- int time = std::stoi(argv[i+3]);
- i += 3;
- TimeSignatureChange change;
- change.nominator = nominator;
- change.denominator = denominator;
- change.time = time;
-
- // TODO sort by time?
- timeSignatureChanges.push_back(change);
- break;
- }
- case 'v': {
- g_verbose = true;
- break;
- }
- default:
- PrintUsage();
+ case 'v': {
+ g_verbose = true;
+ break;
+ }
+ default:
+ PrintUsage();
}
- }
- else
- {
+ } else {
if (baseromPath.empty())
baseromPath = argv[i];
else if (startOffset.empty())
@@ -285,16 +262,12 @@ int main(int argc, char** argv)
if (inputFilename.empty())
PrintUsage();
- /*if (GetExtension(inputFilename) != "out") // TODO unify with baserom parameter?
- RaiseError("input filename extension is not \"out\"");
-*/
if (outputFilename.empty())
outputFilename = StripExtension(inputFilename) + ".mid";
if (GetExtension(outputFilename) != "mid")
RaiseError("output filename extension is not \"mid\"");
-
if (g_asmLabel.empty())
g_asmLabel = BaseName(outputFilename);
@@ -310,16 +283,10 @@ int main(int argc, char** argv)
g_fileStartOffset = std::stoul(startOffset, nullptr, 16);
-
ReadAgbSong();
ReadAgbTracks();
WriteMidiFile();
- /*ReadMidiFileHeader();
- PrintAgbHeader();
- ReadMidiTracks();
- PrintAgbFooter();*/
-
std::fclose(g_inputFile);
std::fclose(g_outputFile);
diff --git a/tools/agb2mid/midi.cpp b/tools/agb2mid/midi.cpp
index 689b80e0..03b07ee5 100755
--- a/tools/agb2mid/midi.cpp
+++ b/tools/agb2mid/midi.cpp
@@ -222,76 +222,71 @@ void WriteTrack(int channelId, const std::vector<Event>& events) {
bool DEBUG = g_verbose && false;
for (const auto& event : events) {
-
- if (DEBUG) { std::printf("TIME: %d\n", event.time); }
-
-
-/* if (event.type == EventType::Wait) { // Handle special wait event
- waiting += event.time;
- continue;
- }*/
-
-
- // TODO can remove type parameter if it is the same type as before?
-
- // Delta time to previous event
- // std::printf("delta Time: %d\n", event.time);
- // TODO make sure currentTime <= event.time!!
- writeDeltaTime(data, event.time - currentTime); // - previousTime);
+ if (DEBUG) {
+ std::printf("TIME: %d\n", event.time);
+ }
+ writeDeltaTime(data, event.time - currentTime);
currentTime = event.time;
- // previousTime = event.time;
-
switch (event.type) {
case EventType::InstrumentChange:
- if (DEBUG) { std::printf("InstrumentChange\n");}
- data.push_back(0xC0 + channelId); // type
- data.push_back(event.param1); // instrument
+ if (DEBUG) {
+ std::printf("InstrumentChange\n");
+ }
+ data.push_back(0xC0 + channelId); // type
+ data.push_back(event.param1); // instrument
break;
case EventType::Controller:
- if (DEBUG) { std::printf("Controller\n");}
- /*if (event.param1 == 7 && !firstVol) {
- firstVol = true; // hack TODO
- } else {*/
- data.push_back(0xB0 + channelId); // type
- //}
- data.push_back(event.param1); // controller index
- data.push_back(event.param2); // value
+ if (DEBUG) {
+ std::printf("Controller\n");
+ }
+ data.push_back(0xB0 + channelId); // type
+ data.push_back(event.param1); // controller index
+ data.push_back(event.param2); // value
break;
case EventType::Note:
- if (DEBUG) { std::printf("Note\n");}
- data.push_back(0x90 + channelId); // type
- data.push_back(event.note); // note
- data.push_back(event.param1); // velocity
+ if (DEBUG) {
+ std::printf("Note\n");
+ }
+ data.push_back(0x90 + channelId); // type
+ data.push_back(event.note); // note
+ data.push_back(event.param1); // velocity
break;
case EventType::NoteOff:
- if (DEBUG) { std::printf("NoteOff\n");}
+ if (DEBUG) {
+ std::printf("NoteOff\n");
+ }
// Wait and note_end
- data.push_back(0x80 + channelId); // type
- data.push_back(event.note); // note
- data.push_back(0); // Ignored velocity
+ data.push_back(0x80 + channelId); // type
+ data.push_back(event.note); // note
+ data.push_back(0); // Ignored velocity
break;
- case EventType::TimeSignature:
- {
- if (DEBUG) { std::printf("TimeSignature\n");}
+ case EventType::TimeSignature: {
+ if (DEBUG) {
+ std::printf("TimeSignature\n");
+ }
// One time meta event at the beginning of the meta track.
data.push_back(0xff); // meta
data.push_back(88); // TIME_SIGNATURE
writeDeltaTime(data, 4); // m_length
- data.push_back(event.param1); // numerator
- data.push_back(event.param2); // denominator
+ data.push_back(event.param1); // numerator
+ data.push_back(event.param2); // denominator
data.push_back(24 * g_clocksPerBeat); // clocksPerClick
data.push_back(8); // 32ndPer4th
break;
}
case EventType::Tempo:
- if (DEBUG) { std::printf("Tempo\n");}
- data.push_back(0xff); // meta
- data.push_back(81); // META_TEMPO
- writeDeltaTime(data, 3); // only valid tempo size is 3
+ if (DEBUG) {
+ std::printf("Tempo\n");
+ }
+ data.push_back(0xff); // meta
+ data.push_back(81); // META_TEMPO
+ writeDeltaTime(data, 3); // only valid tempo size is 3
writeInt24(data, event.param2); // usecPerQuarterNote
break;
case EventType::Extended:
- if (DEBUG) { std::printf("Extended\n");}
+ if (DEBUG) {
+ std::printf("Extended\n");
+ }
if (event.note == 0x1d) {
// for some reason the first one is in a meta change?
data.push_back(0xb0);
@@ -300,41 +295,47 @@ void WriteTrack(int channelId, const std::vector<Event>& events) {
data.push_back(event.param1);
writeDeltaTime(data, 0); // Next midi event
- data.push_back(0x1d); // TODO why twice 0x1d? event.note);
+ data.push_back(0x1d); // TODO why twice 0x1d? event.note);
data.push_back(event.param2);
break;
case EventType::PitchBend:
- if (DEBUG) { std::printf("PitchBend\n");}
+ if (DEBUG) {
+ std::printf("PitchBend\n");
+ }
data.push_back(0xe0 + channelId); // petch bend
- data.push_back(0); // lsb
+ data.push_back(0); // lsb
data.push_back(event.param2);
break;
case EventType::EndOfTrack:
- if (DEBUG) { std::printf("EndOfTrack\n");}
+ if (DEBUG) {
+ std::printf("EndOfTrack\n");
+ }
// End of track
data.push_back(0xff); // meta
data.push_back(47); // META_END_OF_TRACK
writeDeltaTime(data, 0); // length
break;
case EventType::LoopBegin:
- if (DEBUG) { std::printf("LoopBegin\n");}
- data.push_back(0xff); // meta
- data.push_back(0x6); // META_MARKER
- data.push_back(0x1); // length
+ if (DEBUG) {
+ std::printf("LoopBegin\n");
+ }
+ data.push_back(0xff); // meta
+ data.push_back(0x6); // META_MARKER
+ data.push_back(0x1); // length
data.push_back(0x5B); // [
break;
case EventType::LoopEnd:
- if (DEBUG) { std::printf("LoopEnd\n");}
- data.push_back(0xff); // meta
- data.push_back(0x6); // META_MARKER
- data.push_back(0x1); // length
+ if (DEBUG) {
+ std::printf("LoopEnd\n");
+ }
+ data.push_back(0xff); // meta
+ data.push_back(0x6); // META_MARKER
+ data.push_back(0x1); // length
data.push_back(0x5D); // ]
break;
-
}
}
-
// MidiTrack header
std::fprintf(g_outputFile, "MTrk");
// length of track data
@@ -355,19 +356,11 @@ void WriteMidiFile() {
// u16 midiTimeDiv (24 in example)
WriteInt16(g_midiTimeDiv);
-
// Add end of track to meta events
Event event;
event.type = EventType::EndOfTrack;
- /*event.time = 0;
- // Place loop end at the end of the track that has the latest end.
- for (const auto& events:trackEvents) {
- int trackEnd = events.back().time;
- if (trackEnd > event.time) {
- event.time = trackEnd;
- }
- }*/
- // EndOfTrack event needs to be at the last meta event (can be earlier than the end of other tracks) for bgmVaatiMotif to work
+ // EndOfTrack event needs to be at the last meta event (can be earlier than the end of other tracks) for
+ // bgmVaatiMotif to work
event.time = metaEvents.back().time;
metaEvents.push_back(event);
diff --git a/tools/agb2mid/midi.h b/tools/agb2mid/midi.h
index 47bf01a1..f69cf382 100755
--- a/tools/agb2mid/midi.h
+++ b/tools/agb2mid/midi.h
@@ -23,14 +23,9 @@
#include <cstdint>
-enum class MidiFormat
-{
- SingleTrack,
- MultiTrack
-};
+enum class MidiFormat { SingleTrack, MultiTrack };
-enum class EventType
-{
+enum class EventType {
EndOfTie = 0x01,
Label = 0x11,
LoopEnd = 0x12,
@@ -53,25 +48,19 @@ enum class EventType
NoteOff,
};
-struct Event
-{
+struct Event {
std::int32_t time = 0;
EventType type;
std::uint8_t note = 0;
std::uint8_t param1 = 0;
std::int32_t param2 = 0;
- bool operator==(const Event& other)
- {
- return (time == other.time
- && type == other.type
- && note == other.note
- && param1 == other.param1
- && param2 == other.param2);
+ bool operator==(const Event& other) {
+ return (time == other.time && type == other.type && note == other.note && param1 == other.param1 &&
+ param2 == other.param2);
}
- bool operator!=(const Event& other)
- {
+ bool operator!=(const Event& other) {
return !(*this == other);
}
};
@@ -81,8 +70,7 @@ void WriteMidiFile();
extern int g_midiChan;
extern std::int32_t g_initialWait;
-inline bool IsPatternBoundary(EventType type)
-{
+inline bool IsPatternBoundary(EventType type) {
return type == EventType::EndOfTrack || (int)type <= 0x17;
}
extern std::int16_t g_midiTimeDiv;
diff --git a/tools/agb2mid/tables.cpp b/tools/agb2mid/tables.cpp
index 400ff602..7d3902dc 100755
--- a/tools/agb2mid/tables.cpp
+++ b/tools/agb2mid/tables.cpp
@@ -20,18 +20,17 @@
#include "tables.h"
-const int g_noteDurationLUT[] =
-{
- 0, // 0
- 1, // 1
- 2, // 2
- 3, // 3
- 4, // 4
- 5, // 5
- 6, // 6
- 7, // 7
- 8, // 8
- 9, // 9
+const int g_noteDurationLUT[] = {
+ 0, // 0
+ 1, // 1
+ 2, // 2
+ 3, // 3
+ 4, // 4
+ 5, // 5
+ 6, // 6
+ 7, // 7
+ 8, // 8
+ 9, // 9
10, // 10
11, // 11
12, // 12
@@ -121,105 +120,104 @@ const int g_noteDurationLUT[] =
96, // 96
};
-const int g_noteVelocityLUT[] =
-{
- 0, // 0
- 4, // 1
- 4, // 2
- 4, // 3
- 4, // 4
- 8, // 5
- 8, // 6
- 8, // 7
- 8, // 8
- 12, // 9
- 12, // 10
- 12, // 11
- 12, // 12
- 16, // 13
- 16, // 14
- 16, // 15
- 16, // 16
- 20, // 17
- 20, // 18
- 20, // 19
- 20, // 20
- 24, // 21
- 24, // 22
- 24, // 23
- 24, // 24
- 28, // 25
- 28, // 26
- 28, // 27
- 28, // 28
- 32, // 29
- 32, // 30
- 32, // 31
- 32, // 32
- 36, // 33
- 36, // 34
- 36, // 35
- 36, // 36
- 40, // 37
- 40, // 38
- 40, // 39
- 40, // 40
- 44, // 41
- 44, // 42
- 44, // 43
- 44, // 44
- 48, // 45
- 48, // 46
- 48, // 47
- 48, // 48
- 52, // 49
- 52, // 50
- 52, // 51
- 52, // 52
- 56, // 53
- 56, // 54
- 56, // 55
- 56, // 56
- 60, // 57
- 60, // 58
- 60, // 59
- 60, // 60
- 64, // 61
- 64, // 62
- 64, // 63
- 64, // 64
- 68, // 65
- 68, // 66
- 68, // 67
- 68, // 68
- 72, // 69
- 72, // 70
- 72, // 71
- 72, // 72
- 76, // 73
- 76, // 74
- 76, // 75
- 76, // 76
- 80, // 77
- 80, // 78
- 80, // 79
- 80, // 80
- 84, // 81
- 84, // 82
- 84, // 83
- 84, // 84
- 88, // 85
- 88, // 86
- 88, // 87
- 88, // 88
- 92, // 89
- 92, // 90
- 92, // 91
- 92, // 92
- 96, // 93
- 96, // 94
- 96, // 95
- 96, // 96
+const int g_noteVelocityLUT[] = {
+ 0, // 0
+ 4, // 1
+ 4, // 2
+ 4, // 3
+ 4, // 4
+ 8, // 5
+ 8, // 6
+ 8, // 7
+ 8, // 8
+ 12, // 9
+ 12, // 10
+ 12, // 11
+ 12, // 12
+ 16, // 13
+ 16, // 14
+ 16, // 15
+ 16, // 16
+ 20, // 17
+ 20, // 18
+ 20, // 19
+ 20, // 20
+ 24, // 21
+ 24, // 22
+ 24, // 23
+ 24, // 24
+ 28, // 25
+ 28, // 26
+ 28, // 27
+ 28, // 28
+ 32, // 29
+ 32, // 30
+ 32, // 31
+ 32, // 32
+ 36, // 33
+ 36, // 34
+ 36, // 35
+ 36, // 36
+ 40, // 37
+ 40, // 38
+ 40, // 39
+ 40, // 40
+ 44, // 41
+ 44, // 42
+ 44, // 43
+ 44, // 44
+ 48, // 45
+ 48, // 46
+ 48, // 47
+ 48, // 48
+ 52, // 49
+ 52, // 50
+ 52, // 51
+ 52, // 52
+ 56, // 53
+ 56, // 54
+ 56, // 55
+ 56, // 56
+ 60, // 57
+ 60, // 58
+ 60, // 59
+ 60, // 60
+ 64, // 61
+ 64, // 62
+ 64, // 63
+ 64, // 64
+ 68, // 65
+ 68, // 66
+ 68, // 67
+ 68, // 68
+ 72, // 69
+ 72, // 70
+ 72, // 71
+ 72, // 72
+ 76, // 73
+ 76, // 74
+ 76, // 75
+ 76, // 76
+ 80, // 77
+ 80, // 78
+ 80, // 79
+ 80, // 80
+ 84, // 81
+ 84, // 82
+ 84, // 83
+ 84, // 84
+ 88, // 85
+ 88, // 86
+ 88, // 87
+ 88, // 88
+ 92, // 89
+ 92, // 90
+ 92, // 91
+ 92, // 92
+ 96, // 93
+ 96, // 94
+ 96, // 95
+ 96, // 96
100, // 97
100, // 98
100, // 99
@@ -253,90 +251,17 @@ const int g_noteVelocityLUT[] =
127, // 127
};
-const char* g_noteTable[] =
-{
- "Cn%01u ",
- "Cs%01u ",
- "Dn%01u ",
- "Ds%01u ",
- "En%01u ",
- "Fn%01u ",
- "Fs%01u ",
- "Gn%01u ",
- "Gs%01u ",
- "An%01u ",
- "As%01u ",
- "Bn%01u ",
-};
-
-const char* g_minusNoteTable[] =
-{
- "CnM%01u",
- "CsM%01u",
- "DnM%01u",
- "DsM%01u",
- "EnM%01u",
- "FnM%01u",
- "FsM%01u",
- "GnM%01u",
- "GsM%01u",
- "AnM%01u",
- "AsM%01u",
- "BnM%01u",
+const char* g_noteTable[] = {
+ "Cn%01u ", "Cs%01u ", "Dn%01u ", "Ds%01u ", "En%01u ", "Fn%01u ",
+ "Fs%01u ", "Gn%01u ", "Gs%01u ", "An%01u ", "As%01u ", "Bn%01u ",
};
-const int g_noteIdLUT[] = {
- 0, //
+const char* g_minusNoteTable[] = {
+ "CnM%01u", "CsM%01u", "DnM%01u", "DsM%01u", "EnM%01u", "FnM%01u",
+ "FsM%01u", "GnM%01u", "GsM%01u", "AnM%01u", "AsM%01u", "BnM%01u",
};
const int g_noteDurationInverseLUT[] = {
- 0,
- 1,
- 2,
- 3,
- 4,
- 5,
- 6,
- 7,
- 8,
- 9,
- 10,
- 11,
- 12,
- 13,
- 14,
- 15,
- 16,
- 17,
- 18,
- 19,
- 20,
- 21,
- 22,
- 23,
- 24,
- 28,
- 30,
- 32,
- 36,
- 40,
- 42,
- 44,
- 48,
- 52,
- 54,
- 56,
- 60,
- 64,
- 66,
- 68,
- 72,
- 76,
- 78,
- 80,
- 84,
- 88,
- 90,
- 92,
- 96,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 28, 30, 32, 36, 40, 42, 44, 48, 52, 54, 56, 60, 64, 66, 68, 72, 76, 78, 80, 84, 88, 90, 92, 96,
}; \ No newline at end of file
diff --git a/tools/asset_processor/Makefile b/tools/asset_processor/Makefile
index 98bf70a8..4373d61c 100644
--- a/tools/asset_processor/Makefile
+++ b/tools/asset_processor/Makefile
@@ -1,9 +1,9 @@
CXX = g++
-CXXFLAGS = -O3 -Wall -Wextra -std=c++17
+CXXFLAGS = -O3 -Wall -Wextra -Werror -std=c++17
#CXXFLAGS += -g # debug
-BUILD_FOLDER=build
+BUILD_FOLDER = build
SRCS = $(wildcard *.cpp)
SRCS += $(wildcard assets/*.cpp)
diff --git a/tools/asset_processor/assets/asset.h b/tools/asset_processor/assets/asset.h
index 56289199..c076e075 100644
--- a/tools/asset_processor/assets/asset.h
+++ b/tools/asset_processor/assets/asset.h
@@ -13,6 +13,8 @@ class BaseAsset {
: path(path), start(start), size(size), asset(asset) {
}
+ virtual ~BaseAsset() = default;
+
void setup() {
// Cannot call virtual functions in constructor, so another function call is necessary
assetPath = this->generateAssetPath();
diff --git a/tools/asset_processor/main.cpp b/tools/asset_processor/main.cpp
index 28cea050..f642d64f 100644
--- a/tools/asset_processor/main.cpp
+++ b/tools/asset_processor/main.cpp
@@ -71,13 +71,13 @@ int main(int argc, char** argv) {
argCount--;
args++;
} else {
- std::cerr << "Unrecognized argument `" << args[0] << "`" << std::endl;
+ std::cerr << "Error: Unrecognized argument `" << args[0] << "`" << std::endl;
std::exit(1);
}
}
if (argCount != 3) {
- std::cerr << "Not enough arguments. expected: 3, actual: " << argCount << std::endl;
+ std::cerr << "Error: Not enough arguments. expected: 3, actual: " << argCount << std::endl;
usage();
}
@@ -88,18 +88,23 @@ int main(int argc, char** argv) {
} else if (strcmp(args[0], "build") == 0) {
gMode = BUILD;
} else {
- std::cerr << "Unsupported mode `" << args[0] << "`" << std::endl;
+ std::cerr << "Error: Unsupported mode `" << args[0] << "`" << std::endl;
std::exit(1);
}
gVariant = args[1];
if (gVariant != "USA" && gVariant != "EU" && gVariant != "JP" && gVariant != "DEMO_USA" && gVariant != "DEMO_JP") {
- std::cerr << "Unsupported variant `" << gVariant << "`" << std::endl;
+ std::cerr << "Error: Unsupported variant `" << gVariant << "`" << std::endl;
std::exit(1);
}
gAssetsFolder = args[2];
gBaseromPath = baseroms[gVariant];
+ if (!std::filesystem::exists(gBaseromPath)) {
+ std::cerr << "Error: You need to provide a " << gVariant << " ROM as " << gBaseromPath << std::endl;
+ std::exit(1);
+ }
+
// Read baserom.
std::ifstream file(gBaseromPath, std::ios::binary | std::ios::ate);
std::streamsize size = file.tellg();
@@ -255,7 +260,7 @@ std::unique_ptr<BaseAsset> getAssetHandlerByType(const std::filesystem::path& pa
// Unknown binary asset
assetHandler = std::make_unique<BaseAsset>(path, start, size, asset);
} else {
- std::cerr << "Unimplemented asset type `" << type << "`" << std::endl;
+ std::cerr << "Error: Unimplemented asset type `" << type << "`" << std::endl;
std::exit(1);
}
assetHandler->setup();
diff --git a/tools/scaninc/scaninc.cpp b/tools/scaninc/scaninc.cpp
index bb33ae97..1bf7feb5 100755
--- a/tools/scaninc/scaninc.cpp
+++ b/tools/scaninc/scaninc.cpp
@@ -99,7 +99,7 @@ int main(int argc, char **argv)
std::string path(includeDir + incbin);
if (CanOpenFile(path))
{
- dependencies.insert(path).second;
+ dependencies.insert(path);
break;
}
}
diff --git a/tools/tmc_strings/main.cpp b/tools/tmc_strings/main.cpp
index af44c2b8..6490113a 100644
--- a/tools/tmc_strings/main.cpp
+++ b/tools/tmc_strings/main.cpp
@@ -28,11 +28,11 @@ namespace {
};
constexpr const char *const ColorStrings[] = {
- [Color_White] = "White",
- [Color_Red] = "Red",
- [Color_Green] = "Green",
- [Color_Blue] = "Blue",
- [Color_Yellow] = "Yellow",
+ "White",
+ "Red",
+ "Green",
+ "Blue",
+ "Yellow",
};
enum Input {
@@ -52,17 +52,17 @@ namespace {
};
constexpr const char *const InputStrings[] = {
- [Input_A] = "A",
- [Input_B] = "B",
- [Input_Left] = "Left",
- [Input_Right] = "Right",
- [Input_DUp] = "DUp",
- [Input_DDown] = "DDown",
- [Input_DLeft] = "DLeft",
- [Input_DRight] = "DRight",
- [Input_Dpad] = "Dpad",
- [Input_Select] = "Select",
- [Input_Start] = "Start",
+ "A",
+ "B",
+ "Left",
+ "Right",
+ "DUp",
+ "DDown",
+ "DLeft",
+ "DRight",
+ "Dpad",
+ "Select",
+ "Start",
};
const std::map<u8, std::string> CharConvertArray = {
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 08:04:36 +0000