DRA import more data (#1239)

Importing some data from `DBD4` with the goal of making the _Sound_ app
more accurate.

I do not know in which file to put this data into, so I created a file
ad-hoc.

EDIT: I kept importing more
This commit is contained in:
Luciano Ciccariello 2024-06-02 19:29:17 +01:00 committed by GitHub
parent dc101d0ac7
commit 97c8090b88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 1751 additions and 81 deletions

View File

@ -87,6 +87,8 @@ set(SOURCE_FILES_DRA
#src/dra/75F54.c # unable to link it, the file needs to be splitted
#src/dra/7A4D0.c # loads of unimplemented calls and symbols
src/dra/7E4BC.c
src/dra/d_DBD4.c
src/dra/d_E294.c
src/dra/843B0.c
#src/dra/8D3E8.c # countless unimplemented symbols
src/dra/90264.c
@ -96,6 +98,7 @@ set(SOURCE_FILES_DRA
src/dra/93BDC.c
src/dra/94F50.c
src/dra/953A0.c
src/dra/d_24CEC.c
)
set(SOURCE_FILES_STAGE_SEL

View File

@ -103,7 +103,10 @@ segments:
- [0xD0C4, .data, 7A4D0]
- [0xD1D4, assets, factory_blueprint, g_FactoryBlueprints]
- [0xD4B8, .data, 7E4BC]
- [0xDBD4, data]
- [0xDBD4, .data, d_DBD4]
- [0xE270, data]
- [0xE294, .data, d_E294]
- [0x10658, data]
- [0x10A3C, .data, 90264] # D_800B0A3C to D_800B0AEC
- [0x10B34, data]
- [0x1107C, raw, vh_0] # aPbav
@ -125,7 +128,7 @@ segments:
- [0x23560, cmp, D_800C3560]
- [0x24864, cmp, D_800C4864]
- [0x24A90, cmp, D_800C4A90]
- [0x24CEC, data]
- [0x24CEC, .data, d_24CEC]
- [0x25324, raw, g_GfxEquipIcon]
- [0x2F324, data]
- [0x388D4, raw, g_PalEquipIcon]

View File

@ -56,6 +56,7 @@ D_800ADCC8 = 0x800ADD8C;
D_800AE130 = 0x800AE1F4;
D_800AE270 = 0x800AE334;
D_800AE294 = 0x800AE358;
D_800AFDA4 = 0x800AFE68;
D_800AFDA6 = 0x800AFE6A;
D_800AFFB8 = 0x800B007C;
D_800B0130 = 0x800B01F4;

View File

@ -27,3 +27,5 @@ D_801A6E7C = 0x801A6E7C;
D_8017D000 = 0x8017D000;
D_8017D000 = 0x8017D000;
D_800AFC52 = 0x800AFC52;

View File

@ -2053,7 +2053,7 @@ void DrawHudSubweapon() {
func_800FEE6C();
// Represents MP fill level in fraction of 50 (2% each)
mpFillSteps = (g_Status.mp * 50) / g_Status.mpMax;
LoadTPage(D_800C52F8[10] + 1, 0, 0, 0x3DC, 0x100, 8, mpFillSteps);
LoadTPage(D_800C52F8[10] + 4, 0, 0, 0x3DC, 0x100, 8, mpFillSteps);
// Use one clut if MP is full, otherwise a different one
prim->clut = mpFillSteps == 50 ? 0x162 : 0x174;

View File

@ -252,7 +252,7 @@ bool BatFormFinished(void) {
HandleTransformationMP(FORM_BAT, REDUCE) < 0) {
SetPlayerStep(Player_UnmorphBat);
func_8010DA48(0xCA);
D_800AFDA6[0] = 6;
D_800AFDA4[1] = 6;
g_Entities->palette = 0x810D;
g_Player.unk66 = 0;
g_Player.unk68 = 0;
@ -444,7 +444,7 @@ void ControlBatForm(void) {
g_Player.unk44 = 0;
if (g_Entities[16].entityId == 0x22) {
PLAYER.animSet = 0xD;
D_800AFDA6[0] = 6;
D_800AFDA4[1] = 6;
PLAYER.unk5A = 0;
PLAYER.ext.player.unkAC = 0xCA;
if (func_8011203C() == 0) {
@ -475,14 +475,14 @@ void ControlBatForm(void) {
}
func_8010DA48(0xCA);
PLAYER.palette = 0x810D;
D_800AFDA6[0] = (s16)PLAYER.animCurFrame;
D_800AFDA4[1] = (s16)PLAYER.animCurFrame;
if (g_Player.unk66 == 1) {
return;
}
if (g_Player.unk66 == 2) {
PLAYER.animSet = 0xD;
PLAYER.unk5A = 0;
D_800AFDA6[0] = 6;
D_800AFDA4[1] = 6;
return;
}
}
@ -808,10 +808,10 @@ void func_801177A0(void) {
g_Player.unk66 = 1;
if (g_Player.unk68 != 0) {
PLAYER.step_s = 2;
D_800AFDA6[0] = 0xC7;
D_800AFDA4[1] = 0xC7;
} else {
PLAYER.step_s = 1;
D_800AFDA6[0] = 0x5F;
D_800AFDA4[1] = 0x5F;
}
}
break;
@ -971,7 +971,7 @@ void ControlMistForm(void) {
PLAYER.velocityY = -ySpeedOrtho;
}
func_8010DA48(0xCA);
D_800AFDA6[0] = PLAYER.animCurFrame;
D_800AFDA4[1] = PLAYER.animCurFrame;
func_800EA538(8);
if (!IsRelicActive(RELIC_GAS_CLOUD)) {
func_800EA5E4(0x11CU);

View File

@ -244,7 +244,7 @@ void func_80124A8C(Entity* entity) {
SetSpeedX(0x4000);
entity->unk5A = 0x50;
entity->palette = 0x819F;
entity->unk4C = &D_800AE294;
entity->unk4C = D_800AE294;
entity->flags = FLAG_UNK_100000;
entity->facingLeft = 0;
entity->posY.i.hi -= 16;
@ -2277,7 +2277,7 @@ bool WolfFormFinished(void) {
HandleTransformationMP(FORM_WOLF, REDUCE) < 0) {
SetPlayerStep(Player_UnmorphWolf);
func_8010DA48(0xCA);
D_800AFDA6[0] = 1;
D_800AFDA4[1] = 1;
PLAYER.palette = 0x810D;
g_Player.unk66 = 0;
g_Player.unk68 = 0;

View File

@ -595,10 +595,10 @@ void func_8012EAD0(void) {
g_Player.unk66 = 1;
if (g_Player.unk68 != 0) {
PLAYER.step_s = 2;
D_800AFDA6[0] = 0xC7;
D_800AFDA4[1] = 0xC7;
} else {
PLAYER.step_s = 1;
D_800AFDA6[0] = 0x5F;
D_800AFDA4[1] = 0x5F;
}
}
return;

169
src/dra/d_24CEC.c Normal file
View File

@ -0,0 +1,169 @@
#include <game.h>
u8 D_800C4CEC[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0x12, 0x12, 0x01, 0x00, 0x00, 0x00, 0x10, 0x22, 0x61,
0x31, 0x13, 0x00, 0x00, 0x00, 0x21, 0x12, 0xF6, 0x16, 0x23, 0x01, 0x00,
0x10, 0x22, 0x12, 0x61, 0x11, 0x32, 0x12, 0x00, 0x10, 0x22, 0x51, 0xF6,
0x56, 0x21, 0x12, 0x00, 0x21, 0x22, 0xC1, 0x11, 0xC1, 0x21, 0x22, 0x01,
0x21, 0x12, 0x1D, 0x11, 0x11, 0x1D, 0x22, 0x01, 0x21, 0xE1, 0xF9, 0xAA,
0xAA, 0xE9, 0x21, 0x01, 0x10, 0xE1, 0xF9, 0xAA, 0xAA, 0xE9, 0x11, 0x00,
0x10, 0xD1, 0x92, 0x99, 0x99, 0xD2, 0x11, 0x00, 0x00, 0x11, 0xED, 0xEE,
0xDE, 0x1E, 0x01, 0x00, 0x00, 0x10, 0x11, 0x11, 0x11, 0x11, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C4D70[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x10, 0x22, 0x22,
0x33, 0x13, 0x00, 0x00, 0x00, 0x21, 0x22, 0x32, 0x33, 0x23, 0x01, 0x00,
0x10, 0x22, 0x22, 0x33, 0x33, 0x32, 0x12, 0x00, 0x10, 0x22, 0xE2, 0x33,
0x23, 0x23, 0x12, 0x00, 0x51, 0x55, 0xF5, 0xEC, 0xEE, 0xCE, 0x11, 0x01,
0x61, 0x66, 0xF6, 0xFE, 0xFF, 0xFF, 0xCE, 0x01, 0x41, 0x44, 0xF4, 0xCC,
0xCC, 0xCC, 0x11, 0x01, 0x10, 0x11, 0xE1, 0x11, 0x11, 0x11, 0x11, 0x00,
0x10, 0x33, 0x11, 0x21, 0x22, 0x22, 0x12, 0x00, 0x00, 0x21, 0x23, 0x22,
0x22, 0x22, 0x01, 0x00, 0x00, 0x10, 0x22, 0x22, 0x22, 0x12, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C4DF4[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x10, 0x16, 0x22,
0x33, 0x13, 0x00, 0x00, 0x00, 0x11, 0x64, 0x31, 0x13, 0x23, 0x01, 0x00,
0x10, 0x22, 0x41, 0x1E, 0x11, 0x31, 0x12, 0x00, 0x10, 0x22, 0x12, 0xE1,
0xB1, 0x1F, 0x12, 0x00, 0x21, 0x22, 0x11, 0x11, 0xBB, 0xFB, 0x21, 0x01,
0x21, 0x12, 0x1F, 0xC1, 0xBC, 0xBB, 0x21, 0x01, 0x21, 0x13, 0xEF, 0xBB,
0xCC, 0x1B, 0x22, 0x01, 0x10, 0x13, 0xEF, 0xBE, 0xCB, 0xE1, 0x12, 0x00,
0x10, 0x13, 0xFF, 0xEE, 0x1B, 0x12, 0x12, 0x00, 0x00, 0x21, 0xF1, 0xEF,
0x1E, 0x21, 0x01, 0x00, 0x00, 0x10, 0x12, 0xFF, 0xFF, 0x11, 0x00, 0x00,
0x00, 0x00, 0x11, 0x11, 0x11, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C4E78[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0x12, 0x12, 0x01, 0x00, 0x00, 0x00, 0x10, 0x22, 0x61,
0x31, 0x13, 0x00, 0x00, 0x00, 0x21, 0x12, 0xF6, 0x16, 0x23, 0x01, 0x00,
0x10, 0x22, 0x12, 0x61, 0x11, 0x32, 0x12, 0x00, 0x10, 0x22, 0x51, 0xF6,
0x56, 0x21, 0x12, 0x00, 0x21, 0x22, 0xC1, 0x11, 0xC1, 0x21, 0x22, 0x01,
0x21, 0x12, 0x1D, 0x11, 0x11, 0x1D, 0x22, 0x01, 0x21, 0xE1, 0xF9, 0xAA,
0xAA, 0xE9, 0x21, 0x01, 0x10, 0xE1, 0xF9, 0xAA, 0xAA, 0xE9, 0x11, 0x00,
0x10, 0xD1, 0x92, 0x99, 0x99, 0xD2, 0x11, 0x00, 0x00, 0x11, 0xED, 0xEE,
0xDE, 0x1E, 0x01, 0x00, 0x00, 0x10, 0x11, 0x11, 0x11, 0x11, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C4EFC[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0xAA, 0x1A, 0x01, 0x00, 0x00, 0x00, 0x10, 0x12, 0xFA,
0x19, 0x13, 0x00, 0x00, 0x00, 0x21, 0x12, 0xFA, 0x19, 0x23, 0x01, 0x00,
0x10, 0x11, 0x11, 0xFA, 0x19, 0x11, 0x11, 0x00, 0x10, 0xAA, 0xAA, 0xFA,
0xA9, 0xAA, 0x1A, 0x00, 0x11, 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0x19, 0x01,
0x11, 0x99, 0x99, 0xF9, 0x99, 0x99, 0x19, 0x01, 0x11, 0x11, 0x11, 0xFA,
0x19, 0x11, 0x11, 0x01, 0x10, 0x33, 0x13, 0xFA, 0x19, 0x22, 0x12, 0x00,
0x10, 0x33, 0x12, 0xFA, 0x19, 0x22, 0x12, 0x00, 0x00, 0x21, 0x13, 0xFA,
0x19, 0x22, 0x01, 0x00, 0x00, 0x10, 0x12, 0xFA, 0x19, 0x12, 0x00, 0x00,
0x00, 0x00, 0x11, 0x99, 0x19, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C4F80[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0x11, 0x11, 0x01, 0x00, 0x00, 0x00, 0x10, 0xF6, 0xFF,
0xFF, 0x1E, 0x00, 0x00, 0x00, 0x41, 0xC6, 0xED, 0xEE, 0x1E, 0x01, 0x00,
0x10, 0x51, 0x77, 0x66, 0x66, 0x17, 0x12, 0x00, 0x10, 0x51, 0x17, 0xF1,
0x11, 0x16, 0x12, 0x00, 0x21, 0x41, 0x16, 0xE1, 0x11, 0x16, 0x22, 0x01,
0x21, 0x41, 0xF6, 0xEE, 0xFE, 0x16, 0x22, 0x01, 0x21, 0x51, 0x16, 0xE1,
0x11, 0x16, 0x22, 0x01, 0x10, 0x51, 0x16, 0xE1, 0x11, 0x16, 0x12, 0x00,
0x10, 0x51, 0x16, 0xE1, 0x11, 0x16, 0x12, 0x00, 0x00, 0x41, 0x16, 0xF1,
0x11, 0x16, 0x01, 0x00, 0x00, 0x10, 0x66, 0x66, 0x66, 0x16, 0x00, 0x00,
0x00, 0x00, 0x11, 0x11, 0x11, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C5004[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0x12, 0x12, 0x01, 0x00, 0x00, 0x00, 0x10, 0x22, 0xD1,
0x31, 0x13, 0x00, 0x00, 0x00, 0x21, 0x12, 0xEE, 0x1E, 0x23, 0x01, 0x00,
0x10, 0x22, 0x22, 0xD1, 0x31, 0x32, 0x12, 0x00, 0x10, 0x22, 0x12, 0xCF,
0x1F, 0x23, 0x12, 0x00, 0x21, 0x22, 0xF1, 0xCF, 0xFF, 0x21, 0x22, 0x01,
0x21, 0x12, 0xFF, 0xCF, 0xFF, 0x1F, 0x22, 0x01, 0x21, 0x13, 0xFE, 0xCF,
0xCC, 0x1E, 0x22, 0x01, 0x10, 0x13, 0xFF, 0xFF, 0xFF, 0x1F, 0x12, 0x00,
0x10, 0x33, 0xF1, 0xFF, 0xFF, 0x21, 0x12, 0x00, 0x00, 0x21, 0x13, 0xEF,
0x1F, 0x22, 0x01, 0x00, 0x00, 0x10, 0x22, 0x11, 0x21, 0x12, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C5088[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x10, 0x22, 0x22,
0x33, 0x13, 0x00, 0x00, 0x00, 0x21, 0x22, 0x32, 0x33, 0x23, 0x01, 0x00,
0x10, 0x22, 0x22, 0x33, 0x33, 0x32, 0x12, 0x00, 0x10, 0x22, 0x32, 0x33,
0x23, 0x23, 0x12, 0x00, 0x21, 0x22, 0x33, 0x11, 0x31, 0x22, 0x22, 0x01,
0x21, 0x32, 0x13, 0xFF, 0x1F, 0x22, 0x22, 0x01, 0x21, 0x33, 0xA1, 0xFA,
0x99, 0x21, 0x22, 0x01, 0x10, 0x33, 0x13, 0xAA, 0x19, 0x22, 0x12, 0x00,
0x10, 0x33, 0x32, 0xA1, 0x21, 0x22, 0x12, 0x00, 0x00, 0x21, 0x23, 0x12,
0x22, 0x22, 0x01, 0x00, 0x00, 0x10, 0x22, 0x22, 0x22, 0x12, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C510C[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x10, 0x22, 0x22,
0x33, 0x13, 0x00, 0x00, 0x00, 0x21, 0x22, 0x32, 0x33, 0x23, 0x01, 0x00,
0x10, 0x22, 0x12, 0x11, 0x33, 0x11, 0x11, 0x00, 0x10, 0x22, 0x71, 0x67,
0x11, 0x46, 0x14, 0x00, 0x21, 0x12, 0x77, 0x77, 0x67, 0x74, 0x44, 0x01,
0x21, 0x71, 0x47, 0x74, 0x77, 0x64, 0x44, 0x01, 0x21, 0x71, 0x65, 0x75,
0x77, 0x61, 0x44, 0x01, 0x10, 0x71, 0x56, 0x67, 0x15, 0x61, 0x14, 0x00,
0x10, 0x71, 0x71, 0x15, 0x21, 0x11, 0x11, 0x00, 0x00, 0x11, 0x11, 0x21,
0x22, 0x22, 0x01, 0x00, 0x00, 0x10, 0x2F, 0x22, 0x22, 0x12, 0x00, 0x00,
0x00, 0x00, 0x11, 0x22, 0x12, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C5190[] = {
0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x11, 0x11, 0x11, 0x01, 0x00, 0x00, 0x00, 0x10, 0x22, 0xE1,
0x1E, 0x13, 0x00, 0x00, 0x00, 0x21, 0x11, 0xE1, 0x1E, 0x21, 0x01, 0x00,
0x10, 0x12, 0xEE, 0x1E, 0x6C, 0x15, 0x11, 0x00, 0x10, 0xE1, 0xDE, 0xED,
0x46, 0x56, 0x16, 0x00, 0x11, 0xEF, 0xFD, 0xCC, 0x6E, 0x64, 0xE6, 0x01,
0xC1, 0xE1, 0xCF, 0xEC, 0xFC, 0x55, 0xE1, 0x01, 0x71, 0x1C, 0xCC, 0xE1,
0xC1, 0xEF, 0x2E, 0x01, 0x10, 0xCC, 0x11, 0xC1, 0x11, 0xEC, 0x1C, 0x00,
0x10, 0x11, 0x1E, 0x11, 0x11, 0xCE, 0x11, 0x00, 0x00, 0x11, 0xEC, 0x11,
0xE1, 0x1C, 0x01, 0x00, 0x00, 0x10, 0xC1, 0xFE, 0xCE, 0x11, 0x00, 0x00,
0x00, 0x00, 0x11, 0xCC, 0x1C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
u8 D_800C5214[] = {
0x08, 0x38, 0x00, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x30, 0x54, 0x4F, 0x00, 0x30, 0x72, 0x5F, 0x00, 0x30, 0x52, 0x56, 0x00,
0x90, 0x99, 0x99, 0x00, 0x90, 0x99, 0x99, 0x00, 0x90, 0x99, 0x99, 0x00,
0x90, 0x99, 0x99, 0x00, 0x90, 0x99, 0x99, 0x00, 0x90, 0x99, 0x99, 0x00,
};
u8* D_800C52F8[] = {
// subweapon graphics?
D_800C4CEC, D_800C4D70, D_800C4DF4, D_800C4E78, D_800C4EFC, D_800C4F80,
D_800C5004, D_800C5088, D_800C510C, D_800C5190, D_800C5214,
};

147
src/dra/d_DBD4.c Normal file
View File

@ -0,0 +1,147 @@
#include "dra.h"
AnimationFrame D_800ADBD4[] = {
{2, 1}, {2, 2}, {2, 3}, {2, 4}, {2, 5}, {2, 4}, {2, 3}, {2, 4},
{2, 3}, {2, 4}, {2, 5}, {1, 6}, {1, 7}, {1, 8}, {-1, 0},
};
AnimationFrame D_800ADC10[] = {
{1, 9}, {2, 10}, {2, 11}, {2, 12}, {2, 13}, {2, 14}, {2, 15},
{2, 16}, {2, 17}, {2, 18}, {3, 19}, {4, 20}, {-1, 0},
};
AnimationFrame D_800ADC44[] = {
{2, 1}, {2, 2}, {2, 3}, {2, 4}, {2, 5}, {2, 6}, {2, 7},
{2, 8}, {2, 9}, {2, 10}, {2, 11}, {2, 12}, {2, 13}, {-1, 0},
};
u16 D_800ADC7C[] = {PAL_DRA(0x194), PAL_DRA(0x199)};
static s16_pair D_800ADC80 = {0xFFFE, 0xFFE8};
static s16_pair D_800ADC84 = {0x0000, 0xFFF8};
static s16_pair D_800ADC88 = {0x0002, 0x0008};
static s16_pair D_800ADC8C = {0x0000, 0x0018};
static s16_pair D_800ADC90 = {0x0006, 0xFFF4};
static s16_pair D_800ADC94 = {0x0008, 0x0000};
static s16_pair D_800ADC98 = {0x0007, 0x000C};
static s16_pair D_800ADC9C = {0xFFF8, 0xFFF4};
static s16_pair D_800ADCA0 = {0xFFF7, 0x0000};
static s16_pair D_800ADCA4 = {0xFFF9, 0x000C};
static s16_pair D_800ADCA8 = {0xFFF2, 0xFFFA};
static s16_pair D_800ADCAC = {0xFFF1, 0x0007};
static s16_pair D_800ADCB0 = {0x000D, 0xFFF9};
static s16_pair D_800ADCB4 = {0x0010, 0x0008};
static s16_pair D_800ADCB8 = {0xFFF9, 0xFFEA};
static s16_pair D_800ADCBC = {0x0006, 0xFFEB};
static s16_pair D_800ADCC0 = {0xFFF8, 0x0015};
static s16_pair D_800ADCC4 = {0x0007, 0x0016};
s16_pair* D_800ADCC8[] = {
&D_800ADC80, &D_800ADC90, &D_800ADC84, &D_800ADC90, &D_800ADC94,
&D_800ADC84, &D_800ADC94, &D_800ADC88, &D_800ADC84, &D_800ADC94,
&D_800ADC98, &D_800ADC88, &D_800ADC98, &D_800ADC8C, &D_800ADC88,
&D_800ADC88, &D_800ADC8C, &D_800ADCA4, &D_800ADC88, &D_800ADCA4,
&D_800ADCA0, &D_800ADC84, &D_800ADC88, &D_800ADCA0, &D_800ADC84,
&D_800ADCA0, &D_800ADC9C, &D_800ADC84, &D_800ADC9C, &D_800ADC80,
&D_800ADC90, &D_800ADCB0, &D_800ADC94, &D_800ADCB0, &D_800ADCB4,
&D_800ADC94, &D_800ADCB4, &D_800ADC98, &D_800ADC94, &D_800ADC9C,
&D_800ADCA0, &D_800ADCA8, &D_800ADCA0, &D_800ADCAC, &D_800ADCA8,
&D_800ADCA0, &D_800ADCA4, &D_800ADCAC, &D_800ADC80, &D_800ADC9C,
&D_800ADCB8, &D_800ADC80, &D_800ADCBC, &D_800ADC90, &D_800ADC8C,
&D_800ADCC0, &D_800ADCA4, &D_800ADC98, &D_800ADCC4, &D_800ADC8C,
&D_800ADCB8, &D_800ADC9C, &D_800ADCA8, &D_800ADCBC, &D_800ADCB0,
&D_800ADC90, &D_800ADCAC, &D_800ADCA4, &D_800ADCC0, &D_800ADCB4,
&D_800ADCC4, &D_800ADC98,
};
u16 D_800ADDE8[] = {
0x0000, 0x0000, 0x0100, 0x0100, 0x0100, 0x0100, 0x0500, 0x0A00, 0x0100,
0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0100, 0x7000, 0x7000, 0x0200,
0x0000, 0x0000, 0x7100, 0x7100, 0x0100, 0x1000, 0x0000, 0x0000, 0x7100,
0x0100, 0x7000, 0x0800, 0x0000, 0x0000, 0x0100, 0x7100, 0x0100, 0x0400,
0x0500, 0x0A00, 0x0100, 0x0100, 0x0100, 0x0100, 0x0500, 0x0A00, 0x0100,
0x0200, 0x7100, 0x0100, 0x0000, 0x0000, 0x0100, 0x0400, 0x0400, 0x0100,
0x0000, 0x0000, 0x7100, 0x0100, 0x7100, 0x0100, 0x0000, 0x0000, 0x7100,
0x7100, 0x0100, 0x0200, 0x0000, 0x0000, 0x7100, 0x7100, 0x0100, 0x0400,
0x0500, 0x0A00, 0x0100, 0x0100, 0x0100, 0x0400, 0x0A00, 0x0500, 0x0100,
0x0100, 0x0100, 0x0800, 0x0500, 0x0A00, 0x0100, 0x0100, 0x0100, 0x0100,
0x0000, 0x0000, 0x0100, 0x0200, 0x7200, 0x0400, 0x0000, 0x0000, 0x0100,
0x0100, 0x7100, 0x0400, 0x0000, 0x0000, 0x7100, 0x7100, 0x0100, 0x0400,
0x0000, 0x0000, 0x7100, 0x0100, 0x7000, 0x0400, 0x0000, 0x0000, 0x0100,
0x7100, 0x0100, 0x0100, 0x0000, 0x0000, 0x0100, 0x0200, 0x7100, 0x0100,
0x0000, 0x0000, 0x0100, 0x7100, 0x0100, 0x0400,
};
u32 D_800ADEF0[] = {
// it might be a struct, used by EntityPlayerPinkEffect
0x20101001, 0x000000FF, 0x28353535, 0x00000000, 0x0F535353, 0x00000000,
0x00000080, 0x20101001, 0x000000FF, 0x28353535, 0x00000000, 0x10545454,
0x00000000, 0x00000081, 0x0000FF02, 0x00000000, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000082, 0x0000FF02, 0x00000000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x00000083, 0x50101001, 0x0000FF20,
0x28353535, 0x0000002C, 0x070D0C06, 0x00000001, 0x00000004, 0x50101001,
0x0000FF20, 0x28353535, 0x0000002C, 0x060B0A03, 0x00000003, 0x00000002,
0x50101001, 0x0000FF20, 0x28353535, 0x0000002C, 0x03090904, 0x00000004,
0x00000003, 0x50101001, 0x0000FF20, 0x28353535, 0x0000002C, 0x05080801,
0x00000002, 0x00000001, 0x50101001, 0x0000FF20, 0x28353535, 0x0000002C,
0x04000000, 0x00000014, 0x00000000, 0x20101001, 0x0000FF20, 0x28353535,
0x0000002C, 0x084F4F4E, 0x00000045, 0x00000005, 0x20101001, 0x0000FF20,
0x28353535, 0x0000002C, 0x0950504E, 0x0000004B, 0x00000007, 0x20101001,
0x0000FF20, 0x28353535, 0x0000002C, 0x0A51514E, 0x0000004C, 0x00000006,
0x20101001, 0x0000FF20, 0x28353535, 0x0000002C, 0x0B40404E, 0x00000049,
0x0000000A, 0x20101001, 0x0000FF20, 0x28353535, 0x0000002C, 0x0C45454E,
0x00000050, 0x00000008, 0x20101001, 0x0000FF20, 0x28353535, 0x0000002C,
0x0D52524E, 0x0000004D, 0x00000009, 0x20101001, 0x0000FF20, 0x28353535,
0x0000002C, 0x1255554E, 0x0000005E, 0x0000000B, 0x50101001, 0x0000FF20,
0x28353535, 0x0000002C, 0x0E120207, 0x00000048, 0x00000084, 0x50101001,
0x0000FF20, 0x28353535, 0x0000002C, 0x0E120207, 0x00000048, 0x00000085,
0x50101001, 0x0000FF20, 0x28353535, 0x0000002C, 0x0E120207, 0x00000048,
0x00000086, 0x50101001, 0x0000FF20, 0x28353535, 0x0000002C, 0x13120207,
0x0000005F, 0x00000087,
};
u8 D_800AE120[] = {
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x13, 0x12, 0x12, 0x12, 0x12,
};
RECT D_800AE130 = {512, 256, 32, 80};
RECT D_800AE138 = {512 + 32, 256, 32, 80};
u8 D_800AE140[] = {
0x00, 0x11, 0x21, 0x22, 0x32, 0x43, 0x44, 0x54, 0x90, 0x91, 0x82,
0x83, 0x94, 0xA5, 0xB6, 0xB7, 0xC7, 0xD8, 0xE8, 0xF7, 0xE9, 0xEA,
0xEB, 0xEC, 0x7F, 0x7E, 0x7D, 0x8C, 0x9B, 0xAA, 0xB9, 0xA8, 0x07,
0x17, 0x27, 0x38, 0x47, 0x57, 0x56, 0x58, 0x7A, 0x6B, 0x5C, 0x4D,
0x3E, 0x2D, 0x1C, 0x0C, 0xE0, 0xF1, 0xF2, 0xF3, 0xF4, 0xE4, 0xF5,
0xF6, 0xB9, 0xC9, 0xCA, 0xCB, 0xCC, 0xDD, 0xEE, 0xEF,
};
u16 D_800AE180[] = {
PAL_DRA(0x19F), 0x0030, PAL_DRA(0x19F), 0x0018,
PAL_DRA(0x19F), 0x0000, PAL_DRA(0x19F), 0x0048,
};
u16 D_800AE190[] = {
0x0000, 0x0200, 0x0400, 0x0600, 0x0800, 0x0A00, 0x0C00, 0x0E00,
0x1000, 0x1200, 0x1400, 0x1600, 0x1800, 0x1A00, 0x1C00, 0x1E00,
};
u16 D_800AE1B0[] = {
0x48, 0x48, 0x48, 0x44, 0x44, 0x40, 0x40, 0x3C, 0x40, 0x40, 0x44,
0x48, 0x4C, 0x50, 0x58, 0x60, 0x60, 0x58, 0x50, 0x4C, 0x48, 0x44,
0x40, 0x40, 0x3C, 0x40, 0x40, 0x44, 0x44, 0x48, 0x48, 0x48,
};
u16 D_800AE1F0[] = {
-1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1,
};
u32 D_800AE230[] = {
7, 0, 1, 2, 3, 4, 5, 6,
};
u32 D_800AE250[] = {
2, 1, 0, 7, 6, 5, 4, 3,
};

1402
src/dra/d_E294.c Normal file

File diff suppressed because it is too large Load Diff

View File

@ -404,19 +404,19 @@ extern AnimationFrame D_800AD57C[25];
extern u8 D_800AD5E0[14];
extern u8 D_800AD5F0[10];
extern AnimationFrame D_800AD5FC[];
extern AnimationFrame D_800ADBD4[15];
extern AnimationFrame D_800ADC10[13];
extern s32 D_800ADC44;
extern s16 D_800ADC7C[2];
extern s16_pair* D_800ADCC8[72];
extern AnimationFrame D_800ADBD4[];
extern AnimationFrame D_800ADC10[];
extern AnimationFrame D_800ADC44[];
extern u16 D_800ADC7C[2];
extern s16_pair* D_800ADCC8[];
extern RECT D_800AE130;
extern s32 D_800AE270[9];
extern AnimationFrame* D_800AE294;
extern s16 D_800AFDA6[];
extern AnimationFrame D_800AE294[];
extern s16 D_800AFDA4[];
extern RECT c_backbufferClear;
extern s16 D_800AFFB8[];
extern s32 D_800B0130[];
extern s32 D_800B01B8[];
extern u32* D_800B01B8[];
extern AnimationFrame* D_800B0594[];
extern u8 D_800B0608[];
extern Point32 D_800B0688[];
@ -443,7 +443,7 @@ extern s32 D_800BD1C4;
extern s16 g_CurrentXaSoundId;
extern s32 g_VabAddrs[6];
extern u8* D_800C1ECC[172];
extern PixPattern* D_800C52F8[];
extern u8* D_800C52F8[];
extern const char D_800DB524[];
extern const char a0104x04x;
extern const char a2304x04x;

View File

@ -62,21 +62,6 @@ s32 D_800978C4;
s32 D_80097C98;
s8 D_80097B98;
s8 D_80097B99;
AnimationFrame D_800B0594_sub[] = {
{0x0002, 0x0239},
{0xFFFF, 0x0000},
};
AnimationFrame* D_800B0594[] = {
D_800B0594_sub, D_800B0594_sub, D_800B0594_sub, D_800B0594_sub,
D_800B0594_sub, D_800B0594_sub, D_800B0594_sub, D_800B0594_sub,
D_800B0594_sub, D_800B0594_sub, D_800B0594_sub, D_800B0594_sub,
D_800B0594_sub, D_800B0594_sub, D_800B0594_sub, D_800B0594_sub,
D_800B0594_sub, D_800B0594_sub, D_800B0594_sub, D_800B0594_sub,
D_800B0594_sub, D_800B0594_sub, D_800B0594_sub, D_800B0594_sub,
D_800B0594_sub, D_800B0594_sub, D_800B0594_sub, D_800B0594_sub,
D_800B0594_sub, D_800B0594_sub,
};
u8 D_800B0608[0xC0]; // size guessed
s16 D_80136308[1];
u16 g_Clut[0x3000];
u16 D_8006EBCC[0x1000]; // part of g_Clut?
@ -153,17 +138,6 @@ u32 D_8003C744 = 0;
s32 D_80097448[2];
s32 D_80097450;
Pos D_80097488;
PixPattern* mocked_800C52F8[0x200] = {NULL};
PixPattern* D_800C52F8[] = {
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
mocked_800C52F8, mocked_800C52F8, mocked_800C52F8, mocked_800C52F8,
};
// dra.h
u16 D_800AC958[] = {
@ -198,38 +172,9 @@ s16 D_800ACF6C[4]; // guessed size
s16 D_800ACF8A[5]; // guessed size
s16 D_800ACF94[16]; // guessed size
u8 D_800AD094[0x30];
s16 D_800ADC7C[2];
s16_pair D_800ADCC8_stub;
s16_pair* D_800ADCC8[] = {
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
&D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub, &D_800ADCC8_stub,
};
unkstr_800cfe48* D_800CFE48[18]; // guessed size
Unkstruct_80138094 D_80138094[100]; // unknown size
s32 D_800AE270[9]; // guessed size
AnimationFrame D_800ADBD4[15];
AnimationFrame D_800ADC10[13];
u32 D_800B0188[] = {
0x00000000, 0x0000E1E0, 0x05041509, 0x0705F312, 0x0711F512, 0x0705050B,
0x0710070C, 0x0705F20F, 0x0713F612, 0x070CF606, 0x08080613, 0x090B0C15,
};
s32 D_800ADC44;
s32 D_800AE270[] = {0xFF, 0xFF, 0xFF, 0x7F, 0x7F, 0x3F, 0x7F, 0x3F, 0x7F};
s32 D_8013808C;
GpuUsage g_GpuMaxUsage;
GpuBuffer* g_BackBuffer;
@ -553,8 +498,6 @@ u8 g_CdMode[3];
struct XaMusicConfig g_XaMusicConfigs[563] = {0};
s32 D_800B0130[] = {0, -1, 0, -1}; // dummy data
s32 D_800B01B8[] = {0, -1, 0, -1}; // dummy data
s8 D_80138F64[20];
u8 D_801390C4;
s16 D_8013AE8A[1];