summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/audio.c41
-rw-r--r--src/code_0805F9A0.c30
-rw-r--r--src/enemy/bombPeahat.c2
-rw-r--r--src/main.c8
-rw-r--r--src/manager/manager4.c2
-rw-r--r--src/manager/manager7.c4
-rw-r--r--src/npc/phonograph.c2
-rw-r--r--src/projectile/projectile13.c2
8 files changed, 6 insertions, 85 deletions
diff --git a/src/audio.c b/src/audio.c
index b9de7665..e8301fd6 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -744,11 +744,7 @@ extern const SongHeader sfx21F;
extern const SongHeader sfx220;
extern const SongHeader sfx221;
-#ifdef DEMO
-extern MusicPlayerTrack gMPlayTracksDEMO[];
-#else
extern MusicPlayerTrack gMPlayTracks[];
-#endif
extern MusicPlayerInfo gMPlayInfos[0x1C];
extern u8 gMPlayMemAccArea[0x10];
@@ -789,42 +785,6 @@ typedef enum {
MUSIC_PLAYER_BGM,
} MusicPlayerE;
-#ifdef DEMO
-const MusicPlayer gMusicPlayers[] = {
- [MUSIC_PLAYER_00] = { &gMPlayInfos[0x08], &gMPlayTracksDEMO[0x00], 2, 1 },
- [MUSIC_PLAYER_PLY_VO] = { &gMPlayInfos[0x12], &gMPlayTracksDEMO[0x02], 1, 1 },
- [MUSIC_PLAYER_02] = { &gMPlayInfos[0x13], &gMPlayTracksDEMO[0x03], 1, 1 },
- [MUSIC_PLAYER_03] = { &gMPlayInfos2[0x2], &gMPlayTracksDEMO[0x04], 2, 1 },
- [MUSIC_PLAYER_04] = { &gMPlayInfos[0x1B], &gMPlayTracksDEMO[0x06], 2, 1 },
- [MUSIC_PLAYER_05] = { &gMPlayInfos[0x03], &gMPlayTracksDEMO[0x08], 2, 1 },
- [MUSIC_PLAYER_06] = { &gMPlayInfos[0x07], &gMPlayTracksDEMO[0x0A], 2, 1 },
- [MUSIC_PLAYER_07] = { &gMPlayInfos[0x11], &gMPlayTracksDEMO[0x0C], 2, 1 },
- [MUSIC_PLAYER_08] = { &gMPlayInfos2[0x1], &gMPlayTracksDEMO[0x0E], 2, 1 },
- [MUSIC_PLAYER_09] = { &gMPlayInfos[0x06], &gMPlayTracksDEMO[0x10], 2, 1 },
- [MUSIC_PLAYER_0A] = { &gMPlayInfos[0x14], &gMPlayTracksDEMO[0x12], 2, 1 },
- [MUSIC_PLAYER_0B] = { &gMPlayInfos2[0x3], &gMPlayTracksDEMO[0x14], 2, 1 },
- [MUSIC_PLAYER_0C] = { &gMPlayInfos[0x19], &gMPlayTracksDEMO[0x16], 2, 1 },
- [MUSIC_PLAYER_0D] = { &gMPlayInfos[0x02], &gMPlayTracksDEMO[0x18], 2, 1 },
- [MUSIC_PLAYER_0E] = { &gMPlayInfos[0x0E], &gMPlayTracksDEMO[0x1A], 2, 1 },
- [MUSIC_PLAYER_0F] = { &gMPlayInfos[0x18], &gMPlayTracksDEMO[0x1C], 2, 1 },
- [MUSIC_PLAYER_10] = { &gMPlayInfos[0x05], &gMPlayTracksDEMO[0x1E], 2, 1 },
- [MUSIC_PLAYER_11] = { &gMPlayInfos[0x1A], &gMPlayTracksDEMO[0x20], 2, 1 },
- [MUSIC_PLAYER_12] = { &gMPlayInfos[0x0D], &gMPlayTracksDEMO[0x22], 2, 1 },
- [MUSIC_PLAYER_13] = { &gMPlayInfos[0x00], &gMPlayTracksDEMO[0x24], 2, 1 },
- [MUSIC_PLAYER_14] = { &gMPlayInfos[0x0A], &gMPlayTracksDEMO[0x26], 2, 1 },
- [MUSIC_PLAYER_15] = { &gMPlayInfos[0x0C], &gMPlayTracksDEMO[0x28], 2, 1 },
- [MUSIC_PLAYER_16] = { &gMPlayInfos[0x17], &gMPlayTracksDEMO[0x2A], 2, 1 },
- [MUSIC_PLAYER_17] = { &gMPlayInfos[0x01], &gMPlayTracksDEMO[0x2C], 2, 1 },
- [MUSIC_PLAYER_18] = { &gMPlayInfos[0x0B], &gMPlayTracksDEMO[0x2E], 2, 1 },
- [MUSIC_PLAYER_19] = { &gMPlayInfos[0x15], &gMPlayTracksDEMO[0x30], 2, 1 },
- [MUSIC_PLAYER_1A] = { &gMPlayInfos[0x09], &gMPlayTracksDEMO[0x32], 2, 1 },
- [MUSIC_PLAYER_1B] = { &gMPlayInfos2[0x0], &gMPlayTracksDEMO[0x34], 2, 1 },
- [MUSIC_PLAYER_1C] = { &gMPlayInfos[0x0F], &gMPlayTracksDEMO[0x36], 2, 1 },
- [MUSIC_PLAYER_1D] = { &gMPlayInfos[0x16], &gMPlayTracksDEMO[0x38], 2, 1 },
- [MUSIC_PLAYER_1E] = { &gMPlayInfos[0x04], &gMPlayTracksDEMO[0x3A], 0xc, 0 },
- [MUSIC_PLAYER_BGM] = { &gMPlayInfos[0x10], &gMPlayTracksDEMO[0x46], 0xc, 0 },
-};
-#else
const MusicPlayer gMusicPlayers[] = {
[MUSIC_PLAYER_00] = { &gMPlayInfos[0x08], &gMPlayTracks[0x00], 2, 1 },
[MUSIC_PLAYER_PLY_VO] = { &gMPlayInfos[0x12], &gMPlayTracks[0x02], 1, 1 },
@@ -859,7 +819,6 @@ const MusicPlayer gMusicPlayers[] = {
[MUSIC_PLAYER_1E] = { &gMPlayInfos[0x04], &gMPlayTracks[0x3A], 0xc, 0 },
[MUSIC_PLAYER_BGM] = { &gMPlayInfos[0x10], &gMPlayTracks[0x46], 0xc, 0 },
};
-#endif
const Song gSongTable[] = {
[SFX_NONE] = { &sfxNone, MUSIC_PLAYER_BGM, MUSIC_PLAYER_BGM },
diff --git a/src/code_0805F9A0.c b/src/code_0805F9A0.c
index 55c1545d..120a7625 100644
--- a/src/code_0805F9A0.c
+++ b/src/code_0805F9A0.c
@@ -5,13 +5,8 @@
extern u16 gUnk_081092D4;
extern u8 gUnk_081094CE;
-#ifdef DEMO
-extern u8 gUnk_02036AD0;
-extern u8 gUnk_02036A50;
-#else
extern u8 gUnk_02036AD8;
extern u8 gUnk_02036A58;
-#endif
extern void* gUnk_081092AC[];
typedef struct {
@@ -64,11 +59,7 @@ void sub_0805F820(WStruct* r0, u32* r1) {
VStruct* temp3;
if (r0->unk4 - r0->unk6 > 0) {
-#ifdef DEMO
- sub_08002724(r1, &gUnk_02036A50);
-#else
sub_08002724(r1, &gUnk_02036A58);
-#endif
if (r0->unk1 == 0) {
u32 tmp = sub_0805F7A0(*r1);
uVar6 = tmp & 0xf;
@@ -86,11 +77,7 @@ void sub_0805F820(WStruct* r0, u32* r1) {
uVar3 = uVar4;
}
-#ifdef DEMO
- puVar8 = &gUnk_02036A50 + uVar6;
-#else
puVar8 = &gUnk_02036A58 + uVar6;
-#endif
temp2 = r0->unk8;
temp = gUnk_0810942E[r0->unk3].filler0[r0->unk2 * 2];
uVar7 = r0->unk6;
@@ -133,40 +120,23 @@ void sub_0805F918(u32 idx, u32 idx2, void* dest) {
u8* temp;
u8* temp2;
-#ifdef DEMO
- MemFill32(sub_0805F8F8(idx2), &gUnk_02036AD0, 0xe0);
-#else
MemFill32(sub_0805F8F8(idx2), &gUnk_02036AD8, 0xe0);
-#endif
puVar1 = gUnk_081092AC[idx];
temp = &gUnk_081094CE + idx2 * 0xc0;
idx3 = 0;
for (i = 0; i < 3; i++) {
-#ifdef DEMO
- puVar2 = &gUnk_02036A50;
- sub_08002724(puVar1, &gUnk_02036A50);
-#else
puVar2 = &gUnk_02036A58;
sub_08002724(puVar1, &gUnk_02036A58);
-#endif
puVar1 += 0x40;
for (j = 0; j < 8; j++) {
-#ifdef DEMO
- sub_080026C4(puVar2, &gUnk_02036AD0, temp, idx3);
-#else
sub_080026C4(puVar2, &gUnk_02036AD8, temp, idx3);
-#endif
puVar2++;
idx3++;
}
}
-#ifdef DEMO
- LoadResourceAsync((const void*)&gUnk_02036AD0, (u32)dest, 0xe0);
-#else
LoadResourceAsync((const void*)&gUnk_02036AD8, (u32)dest, 0xe0);
-#endif
}
u32 sub_0805F9A0(u32 r0) {
diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c
index f94035fc..4e7bbdad 100644
--- a/src/enemy/bombPeahat.c
+++ b/src/enemy/bombPeahat.c
@@ -365,7 +365,7 @@ void sub_0802AD54(Entity* this) {
#ifdef EU
// TODO regalloc in EU version
NAKED void sub_0802ADDC(Entity* this) {
- asm(".incbin \"baserom_eu.gba\", 0x02AD48, 0x000004C"); // TODOg disassemble
+ asm(".incbin \"baserom_eu.gba\", 0x02AD48, 0x000004C"); // TODO disassemble
}
#else
void sub_0802ADDC(Entity* this) {
diff --git a/src/main.c b/src/main.c
index 286e128a..421fe0f1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -92,11 +92,7 @@ void AgbMain(void) {
// Interrupt handlers that are loaded into RAM.
extern u8 sub_080B197C[];
extern u8 gUnk_030056F0[];
-#ifdef DEMO
-extern u8 gUnk_02038558[];
-#else
extern u8 gUnk_02038560[];
-#endif
extern u8 gUnk_080B2CD8[];
extern u8 gUnk_080B2CD8_2[];
extern u8 gUnk_080B2CD8_3[];
@@ -118,11 +114,7 @@ static void sub_08055F70(void) {
size = (u32)gUnk_080B2CD8_2 - (u32)gUnk_080B2CD8_3;
if (size != 0) {
-#ifdef DEMO
- MemCopy(gUnk_080B2CD8_3, gUnk_02038558, size);
-#else
MemCopy(gUnk_080B2CD8_3, gUnk_02038560, size);
-#endif
}
DispReset(0);
diff --git a/src/manager/manager4.c b/src/manager/manager4.c
index ccce7d47..99b61179 100644
--- a/src/manager/manager4.c
+++ b/src/manager/manager4.c
@@ -98,7 +98,7 @@ extern void sub_08080930();
#ifdef EU
NAKED void sub_08057A18(Manager* this, DiggingCaveEntrance* entr) {
- asm(".incbin \"baserom_eu.gba\", 0x057580, 0x0000078"); // TODOg disassemble
+ asm(".incbin \"baserom_eu.gba\", 0x057580, 0x0000078"); // TODO disassemble
}
#else
void sub_08057A18(Manager* this, DiggingCaveEntrance* entr) {
diff --git a/src/manager/manager7.c b/src/manager/manager7.c
index b30beaf1..70af525c 100644
--- a/src/manager/manager7.c
+++ b/src/manager/manager7.c
@@ -57,7 +57,7 @@ const u8 gUnk_081081E4[] = { 0x16, 0x17, 0x17, 0x18, 0x18 };
#ifdef EU
NAKED void Manager7_Main(Manager7* this) {
- asm(".incbin \"baserom_eu.gba\", 0x0578A0, 0x00000CC"); // TODOg disassemble
+ asm(".incbin \"baserom_eu.gba\", 0x0578A0, 0x00000CC"); // TODO disassemble
}
#else
void Manager7_Main(Manager7* this) {
@@ -134,7 +134,7 @@ void sub_08057E64() {
#ifdef EU
NAKED void sub_08057E7C(u32 unk1) {
- asm(".incbin \"baserom_eu.gba\", 0x0579B8, 0x0000050"); // TODOg disassemble
+ asm(".incbin \"baserom_eu.gba\", 0x0579B8, 0x0000050"); // TODO disassemble
}
#else
void sub_08057E7C(u32 unk1) {
diff --git a/src/npc/phonograph.c b/src/npc/phonograph.c
index f2061b41..e6c23f1e 100644
--- a/src/npc/phonograph.c
+++ b/src/npc/phonograph.c
@@ -27,7 +27,7 @@ ASM_FUNC("asm/non_matching/phonograph/sub_0806E964.inc",
#ifdef EU
NAKED void sub_0806EABC(Entity* this, u32 param) {
- asm(".incbin \"baserom_eu.gba\", 0x06E4F8, 0x000003C"); // TODOg disassemble
+ asm(".incbin \"baserom_eu.gba\", 0x06E4F8, 0x000003C"); // TODO disassemble
}
#else
void sub_0806EABC(Entity* this, u32 param) {
diff --git a/src/projectile/projectile13.c b/src/projectile/projectile13.c
index 092a99bc..1397a72e 100644
--- a/src/projectile/projectile13.c
+++ b/src/projectile/projectile13.c
@@ -125,7 +125,7 @@ void sub_080A9FD0(Entity* this) {
#ifdef EU
NAKED void sub_080AA044(Entity* this) {
- asm(".incbin \"baserom_eu.gba\", 0x0A983C, 0x00000C4"); // TODOg disassemble
+ asm(".incbin \"baserom_eu.gba\", 0x0A983C, 0x00000C4"); // TODO disassemble
}
#else
void sub_080AA044(Entity* this) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-01 09:40:04 +0000