mirror of
https://github.com/pret/pmd-red.git
synced 2024-11-23 05:00:12 +00:00
Merge pull request #260 from DizzyEggg/decompress
Some checks are pending
GithubCI / build (push) Waiting to run
Some checks are pending
GithubCI / build (push) Waiting to run
Match sub_8007AA4 and DecompressATGlobal
This commit is contained in:
AnonymousRandomPerson
GitHub
commit
07692d8153
738
src/decompress.c
738
src/decompress.c
@ -12,21 +12,10 @@ EWRAM_DATA u32 gDecompressBufferByteInInt = {0};
|
||||
|
||||
#include "data/decompress.h"
|
||||
|
||||
#ifndef NONMATCHING
|
||||
UNUSED // Remove "UNUSED" when DecompressATGlobal is done
|
||||
static void DecompressAT_AppendByte(char);
|
||||
UNUSED
|
||||
static void DecompressAT_Finish(void);
|
||||
UNUSED
|
||||
static char DecompressAT_GetByte(s32);
|
||||
UNUSED
|
||||
static void DecompressAT_Init(u32 *);
|
||||
#else
|
||||
static void DecompressAT_AppendByte(char);
|
||||
static void DecompressAT_Finish(void);
|
||||
static char DecompressAT_GetByte(s32);
|
||||
static void DecompressAT_Init(u32 *);
|
||||
#endif
|
||||
static u32 DecompressATGlobal(u32 *, s32, const char *);
|
||||
static void NDS_DecompressRLE(void *);
|
||||
|
||||
@ -232,35 +221,16 @@ u32 DecompressATGlobalFile(u32 *result, s32 resultLength, OpenedFile *file)
|
||||
return DecompressATGlobal(result, resultLength, file->data);
|
||||
}
|
||||
|
||||
#ifndef NONMATCHING
|
||||
NAKED
|
||||
#endif
|
||||
static u32 DecompressATGlobal(u32 *result, s32 resultLength, const char *compressedData)
|
||||
{
|
||||
#ifdef NONMATCHING
|
||||
s32 compressedLength;
|
||||
s32 flags[9];
|
||||
s32 curIndex;
|
||||
s32 bytesWritten;
|
||||
s32 cmdBit;
|
||||
s32 currentByte;
|
||||
s32 flags1;
|
||||
s32 flags2;
|
||||
s32 flags3;
|
||||
s32 flags4;
|
||||
s32 flags5;
|
||||
s32 flags6;
|
||||
s32 flags7;
|
||||
s32 flags8;
|
||||
s32 flags9;
|
||||
u32 command;
|
||||
u32 tmp;
|
||||
u32 tmp2;
|
||||
s32 firstIndex;
|
||||
u32 c;
|
||||
|
||||
compressedLength = compressedData[5] + (compressedData[6] << 8);
|
||||
bytesWritten = 0;
|
||||
currentByte = 0;
|
||||
cmdBit = 8;
|
||||
s32 compressedLength = compressedData[5] + (compressedData[6] << 8);
|
||||
s32 bytesWritten = 0;
|
||||
s32 currentByte = 0;
|
||||
s32 cmdBit = 8;
|
||||
|
||||
DecompressAT_Init(result);
|
||||
|
||||
@ -268,607 +238,147 @@ static u32 DecompressATGlobal(u32 *result, s32 resultLength, const char *compres
|
||||
&& compressedData[1] == 'T'
|
||||
&& compressedData[2] == '4'
|
||||
&& compressedData[3] == 'P') {
|
||||
tmp2 = compressedData[0x10] + (compressedData[0x11] << 8);
|
||||
if (resultLength != 0 && resultLength != tmp2)
|
||||
s32 checkLength = compressedData[0x10] + (compressedData[0x11] << 8);
|
||||
if (resultLength != 0 && resultLength != checkLength)
|
||||
return bytesWritten;
|
||||
curIndex = 0x12;
|
||||
} else if (compressedData[0] == 'A'
|
||||
firstIndex = 0x12;
|
||||
}
|
||||
else if (compressedData[0] == 'A'
|
||||
&& compressedData[1] == 'T'
|
||||
&& compressedData[2] == '3'
|
||||
&& compressedData[3] == 'P') {
|
||||
curIndex = 0x10;
|
||||
} else {
|
||||
firstIndex = 0x10;
|
||||
}
|
||||
else {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (compressedData[4] == 'N') {
|
||||
// uncompressed mode, unused
|
||||
for (bytesWritten = 0; bytesWritten < compressedLength; bytesWritten++) {
|
||||
DecompressAT_AppendByte(compressedData[bytesWritten + 7]);
|
||||
for (curIndex = 0; curIndex < compressedLength; curIndex++) {
|
||||
DecompressAT_AppendByte(compressedData[curIndex + 7]);
|
||||
}
|
||||
DecompressAT_Finish();
|
||||
return bytesWritten;
|
||||
return curIndex;
|
||||
}
|
||||
|
||||
flags1 = compressedData[0x7] + 3;
|
||||
flags2 = compressedData[0x8] + 3;
|
||||
flags3 = compressedData[0x9] + 3;
|
||||
flags4 = compressedData[0xa] + 3;
|
||||
flags5 = compressedData[0xb] + 3;
|
||||
flags6 = compressedData[0xc] + 3;
|
||||
flags7 = compressedData[0xd] + 3;
|
||||
flags8 = compressedData[0xe] + 3;
|
||||
flags9 = compressedData[0xf] + 3;
|
||||
flags[0] = compressedData[0x7] + 3;
|
||||
flags[1] = compressedData[0x8] + 3;
|
||||
flags[2] = compressedData[0x9] + 3;
|
||||
flags[3] = compressedData[0xa] + 3;
|
||||
flags[4] = compressedData[0xb] + 3;
|
||||
flags[5] = compressedData[0xc] + 3;
|
||||
flags[6] = compressedData[0xd] + 3;
|
||||
flags[7] = compressedData[0xe] + 3;
|
||||
flags[8] = compressedData[0xf] + 3;
|
||||
|
||||
if (curIndex < compressedLength) {
|
||||
curIndex = firstIndex;
|
||||
|
||||
do {
|
||||
if (resultLength != 0 && bytesWritten >= resultLength)
|
||||
return 0;
|
||||
while (curIndex < compressedLength) {
|
||||
if (resultLength != 0 && bytesWritten >= resultLength)
|
||||
return 0;
|
||||
|
||||
if (cmdBit == 8) {
|
||||
currentByte = compressedData[curIndex++];
|
||||
cmdBit = 0;
|
||||
}
|
||||
if ((currentByte & 0x80) == 0) {
|
||||
// if bit is unset, process command
|
||||
command = (compressedData[curIndex] >> 4) + 3;
|
||||
tmp2 = (compressedData[curIndex] & 0xf) << 8;
|
||||
if (cmdBit == 8) {
|
||||
currentByte = compressedData[curIndex++];
|
||||
cmdBit = 0;
|
||||
}
|
||||
if ((currentByte & 0x80) == 0) {
|
||||
// if bit is unset, process command
|
||||
s32 command = (compressedData[curIndex] >> 4) + 3;
|
||||
s32 tmp2 = (compressedData[curIndex] & 0xf) << 8;
|
||||
|
||||
if (command == flags1) command = 0x1f;
|
||||
if (command == flags2) command = 0x1e;
|
||||
if (command == flags3) command = 0x1d;
|
||||
if (command == flags4) command = 0x1c;
|
||||
if (command == flags5) command = 0x1b;
|
||||
if (command == flags6) command = 0x1a;
|
||||
if (command == flags7) command = 0x19;
|
||||
if (command == flags8) command = 0x18;
|
||||
if (command == flags9) command = 0x17;
|
||||
if (command == flags[0]) command = 0x1f;
|
||||
if (command == flags[1]) command = 0x1e;
|
||||
if (command == flags[2]) command = 0x1d;
|
||||
if (command == flags[3]) command = 0x1c;
|
||||
if (command == flags[4]) command = 0x1b;
|
||||
if (command == flags[5]) command = 0x1a;
|
||||
if (command == flags[6]) command = 0x19;
|
||||
if (command == flags[7]) command = 0x18;
|
||||
if (command == flags[8]) command = 0x17;
|
||||
|
||||
switch (command) {
|
||||
case 0x1f: { // aaaa
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1e: { // abbb
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 1) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 1) & 0xf) << 4) | ((c + 1) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1d: { // babb
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c - 1) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1c: { // bbab
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c - 1) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1b: { // bbba
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c - 1) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1a: { // baaa -- the horrible, unmatching case
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c - 1) & 0xf)); bytesWritten++;
|
||||
c -= 1;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x19: { // abaa
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 1) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x18: { // aaba
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 1) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x17: { // aaab
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 1) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
tmp = compressedData[curIndex++, curIndex++] + tmp2 - 0x1000 + bytesWritten;
|
||||
for (; command != 0; tmp++, command--) {
|
||||
DecompressAT_AppendByte(DecompressAT_GetByte(tmp)); bytesWritten++;
|
||||
}
|
||||
switch (command) {
|
||||
case 0x1f: { // aaaa
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1e: { // abbb
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 1) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 1) & 0xf) << 4) | ((c + 1) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1d: { // babb
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c - 1) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1c: { // bbab
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c - 1) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1b: { // bbba
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c - 1) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x1a: { // baaa -- the horrible, unmatching case
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c - 1) & 0xf)); bytesWritten++;
|
||||
c -= 1;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x19: { // abaa
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 1) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x18: { // aaba
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 1) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
case 0x17: { // aaab
|
||||
c = compressedData[curIndex++] & 0xf;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 0) & 0xf)); bytesWritten++;
|
||||
DecompressAT_AppendByte((((c + 0) & 0xf) << 4) | ((c + 1) & 0xf)); bytesWritten++;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
s32 i;
|
||||
s32 a;
|
||||
|
||||
curIndex++;
|
||||
tmp2 += compressedData[curIndex++];
|
||||
a = tmp2 - 0x1000;
|
||||
tmp2 = a + bytesWritten;
|
||||
for (i = 0; i < command; i++) {
|
||||
DecompressAT_AppendByte(DecompressAT_GetByte(tmp2)); bytesWritten++;
|
||||
tmp2++;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// if bit is set, just copy next byte
|
||||
DecompressAT_AppendByte(compressedData[curIndex]); bytesWritten++;
|
||||
curIndex++;
|
||||
}
|
||||
cmdBit++;
|
||||
currentByte <<= 1;
|
||||
} while (curIndex < compressedLength);
|
||||
DecompressAT_Finish();
|
||||
}
|
||||
else {
|
||||
// if bit is set, just copy next byte
|
||||
DecompressAT_AppendByte(compressedData[curIndex]); bytesWritten++;
|
||||
curIndex++;
|
||||
}
|
||||
cmdBit++;
|
||||
currentByte <<= 1;
|
||||
}
|
||||
|
||||
DecompressAT_Finish();
|
||||
return bytesWritten;
|
||||
#else
|
||||
asm_unified(
|
||||
"DecompressATGlobal:\n"
|
||||
" push {r4-r7,lr}\n"
|
||||
" mov r7, r10\n"
|
||||
" mov r6, r9\n"
|
||||
" mov r5, r8\n"
|
||||
" push {r5-r7}\n"
|
||||
" sub sp, 0x34\n"
|
||||
" str r1, [sp, 0x24]\n"
|
||||
" mov r10, r2\n"
|
||||
" ldrb r2, [r2, 0x5]\n"
|
||||
" mov r3, r10\n"
|
||||
" ldrb r1, [r3, 0x6]\n"
|
||||
" lsls r1, 8\n"
|
||||
" adds r2, r1\n"
|
||||
" str r2, [sp, 0x28]\n"
|
||||
" movs r1, 0\n"
|
||||
" mov r9, r1\n"
|
||||
" movs r2, 0\n"
|
||||
" str r2, [sp, 0x2C]\n"
|
||||
" movs r3, 0x8\n"
|
||||
" str r3, [sp, 0x30]\n"
|
||||
" bl DecompressAT_Init\n"
|
||||
" mov r1, r10\n"
|
||||
" ldrb r0, [r1]\n"
|
||||
" cmp r0, 0x41\n"
|
||||
" bne _0800AE90\n"
|
||||
" ldrb r0, [r1, 0x1]\n"
|
||||
" adds r1, r0, 0\n"
|
||||
" cmp r1, 0x54\n"
|
||||
" bne _0800AE98\n"
|
||||
" mov r2, r10\n"
|
||||
" ldrb r0, [r2, 0x2]\n"
|
||||
" cmp r0, 0x34\n"
|
||||
" bne _0800AE98\n"
|
||||
" ldrb r0, [r2, 0x3]\n"
|
||||
" cmp r0, 0x50\n"
|
||||
" bne _0800AE98\n"
|
||||
" ldrb r1, [r2, 0x10]\n"
|
||||
" ldrb r0, [r2, 0x11]\n"
|
||||
" lsls r0, 8\n"
|
||||
" adds r1, r0\n"
|
||||
" ldr r3, [sp, 0x24]\n"
|
||||
" cmp r3, 0\n"
|
||||
" beq _0800AE94\n"
|
||||
" cmp r3, r1\n"
|
||||
" beq _0800AE94\n"
|
||||
"_0800AE90:\n"
|
||||
" movs r0, 0\n"
|
||||
" b _0800B1AA\n"
|
||||
"_0800AE94:\n"
|
||||
" movs r1, 0x12\n"
|
||||
" b _0800AEB2\n"
|
||||
"_0800AE98:\n"
|
||||
" mov r2, r10\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" cmp r0, 0x41\n"
|
||||
" bne _0800AE90\n"
|
||||
" cmp r1, 0x54\n"
|
||||
" bne _0800AE90\n"
|
||||
" ldrb r0, [r2, 0x2]\n"
|
||||
" cmp r0, 0x33\n"
|
||||
" bne _0800AE90\n"
|
||||
" ldrb r0, [r2, 0x3]\n"
|
||||
" cmp r0, 0x50\n"
|
||||
" bne _0800AE90\n"
|
||||
" movs r1, 0x10\n"
|
||||
"_0800AEB2:\n"
|
||||
" mov r3, r10\n"
|
||||
" ldrb r0, [r3, 0x4]\n"
|
||||
" cmp r0, 0x4E\n"
|
||||
" bne _0800AEE0\n"
|
||||
" movs r0, 0\n"
|
||||
" mov r8, r0\n"
|
||||
" ldr r1, [sp, 0x28]\n"
|
||||
" cmp r8, r1\n"
|
||||
" bge _0800AED8\n"
|
||||
"_0800AEC4:\n"
|
||||
" mov r0, r8\n"
|
||||
" add r0, r10\n"
|
||||
" ldrb r0, [r0, 0x7]\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" ldr r3, [sp, 0x28]\n"
|
||||
" cmp r8, r3\n"
|
||||
" blt _0800AEC4\n"
|
||||
"_0800AED8:\n"
|
||||
" bl DecompressAT_Finish\n"
|
||||
" mov r0, r8\n"
|
||||
" b _0800B1AA\n"
|
||||
"_0800AEE0:\n"
|
||||
" mov r2, r10\n"
|
||||
" ldrb r0, [r2, 0x7]\n"
|
||||
" adds r0, 0x3\n"
|
||||
" str r0, [sp]\n"
|
||||
" ldrb r0, [r2, 0x8]\n"
|
||||
" adds r0, 0x3\n"
|
||||
" str r0, [sp, 0x4]\n"
|
||||
" ldrb r0, [r2, 0x9]\n"
|
||||
" adds r0, 0x3\n"
|
||||
" str r0, [sp, 0x8]\n"
|
||||
" ldrb r0, [r2, 0xA]\n"
|
||||
" adds r0, 0x3\n"
|
||||
" str r0, [sp, 0xC]\n"
|
||||
" ldrb r0, [r2, 0xB]\n"
|
||||
" adds r0, 0x3\n"
|
||||
" str r0, [sp, 0x10]\n"
|
||||
" ldrb r0, [r2, 0xC]\n"
|
||||
" adds r0, 0x3\n"
|
||||
" str r0, [sp, 0x14]\n"
|
||||
" ldrb r0, [r2, 0xD]\n"
|
||||
" adds r0, 0x3\n"
|
||||
" str r0, [sp, 0x18]\n"
|
||||
" ldrb r0, [r2, 0xE]\n"
|
||||
" adds r0, 0x3\n"
|
||||
" str r0, [sp, 0x1C]\n"
|
||||
" ldrb r0, [r2, 0xF]\n"
|
||||
" adds r0, 0x3\n"
|
||||
" str r0, [sp, 0x20]\n"
|
||||
" mov r8, r1\n"
|
||||
" ldr r3, [sp, 0x28]\n"
|
||||
" cmp r8, r3\n"
|
||||
" blt _0800AF22\n"
|
||||
" b _0800B1A4\n"
|
||||
"_0800AF22:\n"
|
||||
" ldr r0, [sp, 0x24]\n"
|
||||
" cmp r0, 0\n"
|
||||
" beq _0800AF2C\n"
|
||||
" cmp r9, r0\n"
|
||||
" bge _0800AE90\n"
|
||||
"_0800AF2C:\n"
|
||||
" ldr r1, [sp, 0x30]\n"
|
||||
" cmp r1, 0x8\n"
|
||||
" bne _0800AF42\n"
|
||||
" mov r0, r10\n"
|
||||
" add r0, r8\n"
|
||||
" ldrb r0, [r0]\n"
|
||||
" str r0, [sp, 0x2C]\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" movs r3, 0\n"
|
||||
" str r3, [sp, 0x30]\n"
|
||||
"_0800AF42:\n"
|
||||
" movs r0, 0x80\n"
|
||||
" ldr r1, [sp, 0x2C]\n"
|
||||
" ands r0, r1\n"
|
||||
" cmp r0, 0\n"
|
||||
" beq _0800AF4E\n"
|
||||
" b _0800B180\n"
|
||||
"_0800AF4E:\n"
|
||||
" mov r2, r10\n"
|
||||
" add r2, r8\n"
|
||||
" ldrb r1, [r2]\n"
|
||||
" lsrs r0, r1, 4\n"
|
||||
" adds r3, r0, 0x3\n"
|
||||
" movs r0, 0xF\n"
|
||||
" ands r0, r1\n"
|
||||
" lsls r7, r0, 8\n"
|
||||
" ldr r0, [sp]\n"
|
||||
" cmp r3, r0\n"
|
||||
" bne _0800AF66\n"
|
||||
" movs r3, 0x1F\n"
|
||||
"_0800AF66:\n"
|
||||
" ldr r0, [sp, 0x4]\n"
|
||||
" cmp r3, r0\n"
|
||||
" bne _0800AF6E\n"
|
||||
" movs r3, 0x1E\n"
|
||||
"_0800AF6E:\n"
|
||||
" ldr r0, [sp, 0x8]\n"
|
||||
" cmp r3, r0\n"
|
||||
" bne _0800AF76\n"
|
||||
" movs r3, 0x1D\n"
|
||||
"_0800AF76:\n"
|
||||
" ldr r0, [sp, 0xC]\n"
|
||||
" cmp r3, r0\n"
|
||||
" bne _0800AF7E\n"
|
||||
" movs r3, 0x1C\n"
|
||||
"_0800AF7E:\n"
|
||||
" ldr r0, [sp, 0x10]\n"
|
||||
" cmp r3, r0\n"
|
||||
" bne _0800AF86\n"
|
||||
" movs r3, 0x1B\n"
|
||||
"_0800AF86:\n"
|
||||
" ldr r0, [sp, 0x14]\n"
|
||||
" cmp r3, r0\n"
|
||||
" bne _0800AF8E\n"
|
||||
" movs r3, 0x1A\n"
|
||||
"_0800AF8E:\n"
|
||||
" ldr r0, [sp, 0x18]\n"
|
||||
" cmp r3, r0\n"
|
||||
" bne _0800AF96\n"
|
||||
" movs r3, 0x19\n"
|
||||
"_0800AF96:\n"
|
||||
" ldr r0, [sp, 0x1C]\n"
|
||||
" cmp r3, r0\n"
|
||||
" bne _0800AF9E\n"
|
||||
" movs r3, 0x18\n"
|
||||
"_0800AF9E:\n"
|
||||
" ldr r0, [sp, 0x20]\n"
|
||||
" cmp r3, r0\n"
|
||||
" bne _0800AFA6\n"
|
||||
" movs r3, 0x17\n"
|
||||
"_0800AFA6:\n"
|
||||
" adds r0, r3, 0\n"
|
||||
" subs r0, 0x17\n"
|
||||
" cmp r0, 0x8\n"
|
||||
" bls _0800AFB0\n"
|
||||
" b _0800B13C\n"
|
||||
"_0800AFB0:\n"
|
||||
" lsls r0, 2\n"
|
||||
" ldr r1, _0800AFBC\n"
|
||||
" adds r0, r1\n"
|
||||
" ldr r0, [r0]\n"
|
||||
" mov pc, r0\n"
|
||||
" .align 2, 0\n"
|
||||
"_0800AFBC: .4byte _0800AFC0\n"
|
||||
" .align 2, 0\n"
|
||||
"_0800AFC0:\n"
|
||||
" .4byte _0800B104\n"
|
||||
" .4byte _0800B0DE\n"
|
||||
" .4byte _0800B0BA\n"
|
||||
" .4byte _0800B090\n"
|
||||
" .4byte _0800B06E\n"
|
||||
" .4byte _0800B048\n"
|
||||
" .4byte _0800B024\n"
|
||||
" .4byte _0800AFFE\n"
|
||||
" .4byte _0800AFE4\n"
|
||||
"_0800AFE4:\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" movs r1, 0xF\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" ands r1, r0\n"
|
||||
" lsls r4, r1, 4\n"
|
||||
" orrs r4, r1\n"
|
||||
" adds r0, r4, 0\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r3, 0x1\n"
|
||||
" add r9, r3\n"
|
||||
" b _0800B128\n"
|
||||
"_0800AFFE:\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" movs r6, 0xF\n"
|
||||
" ands r6, r0\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" movs r1, 0xF\n"
|
||||
" lsls r0, r6, 4\n"
|
||||
" adds r4, r6, 0x1\n"
|
||||
" ands r4, r1\n"
|
||||
" orrs r0, r4\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r3, 0x1\n"
|
||||
" add r9, r3\n"
|
||||
" lsls r0, r4, 4\n"
|
||||
" orrs r0, r4\n"
|
||||
" lsls r0, 24\n"
|
||||
" lsrs r0, 24\n"
|
||||
" b _0800B12A\n"
|
||||
"_0800B024:\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" movs r1, 0xF\n"
|
||||
" movs r6, 0xF\n"
|
||||
" ands r6, r0\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" adds r5, r6, 0\n"
|
||||
" ands r5, r1\n"
|
||||
" lsls r4, r5, 4\n"
|
||||
" subs r0, r6, 0x1\n"
|
||||
" ands r0, r1\n"
|
||||
" orrs r0, r4\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r3, 0x1\n"
|
||||
" add r9, r3\n"
|
||||
" orrs r4, r5\n"
|
||||
" b _0800B128\n"
|
||||
"_0800B048:\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" movs r5, 0xF\n"
|
||||
" movs r6, 0xF\n"
|
||||
" ands r6, r0\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" adds r4, r6, 0\n"
|
||||
" ands r4, r5\n"
|
||||
" lsls r0, r4, 4\n"
|
||||
" orrs r0, r4\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r3, 0x1\n"
|
||||
" add r9, r3\n"
|
||||
" subs r0, r6, 0x1\n"
|
||||
" ands r0, r5\n"
|
||||
" lsls r0, 4\n"
|
||||
" orrs r0, r4\n"
|
||||
" b _0800B12A\n"
|
||||
"_0800B06E:\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" movs r5, 0xF\n"
|
||||
" movs r6, 0xF\n"
|
||||
" ands r6, r0\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" adds r1, r6, 0\n"
|
||||
" ands r1, r5\n"
|
||||
" lsls r4, r1, 4\n"
|
||||
" adds r0, r4, 0\n"
|
||||
" orrs r0, r1\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r3, 0x1\n"
|
||||
" add r9, r3\n"
|
||||
" subs r0, r6, 0x1\n"
|
||||
" b _0800B124\n"
|
||||
"_0800B090:\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" movs r6, 0xF\n"
|
||||
" ands r6, r0\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" movs r1, 0xF\n"
|
||||
" lsls r0, r6, 4\n"
|
||||
" subs r4, r6, 0x1\n"
|
||||
" ands r4, r1\n"
|
||||
" orrs r0, r4\n"
|
||||
" lsls r0, 24\n"
|
||||
" lsrs r0, 24\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r3, 0x1\n"
|
||||
" add r9, r3\n"
|
||||
" lsls r0, r4, 4\n"
|
||||
" orrs r0, r4\n"
|
||||
" lsls r0, 24\n"
|
||||
" lsrs r0, 24\n"
|
||||
" b _0800B12A\n"
|
||||
"_0800B0BA:\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" movs r1, 0xF\n"
|
||||
" movs r6, 0xF\n"
|
||||
" ands r6, r0\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" adds r5, r6, 0\n"
|
||||
" ands r5, r1\n"
|
||||
" lsls r4, r5, 4\n"
|
||||
" adds r0, r6, 0x1\n"
|
||||
" ands r0, r1\n"
|
||||
" orrs r0, r4\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r3, 0x1\n"
|
||||
" add r9, r3\n"
|
||||
" orrs r4, r5\n"
|
||||
" b _0800B128\n"
|
||||
"_0800B0DE:\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" movs r5, 0xF\n"
|
||||
" movs r6, 0xF\n"
|
||||
" ands r6, r0\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" adds r4, r6, 0\n"
|
||||
" ands r4, r5\n"
|
||||
" lsls r0, r4, 4\n"
|
||||
" orrs r0, r4\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r3, 0x1\n"
|
||||
" add r9, r3\n"
|
||||
" adds r0, r6, 0x1\n"
|
||||
" ands r0, r5\n"
|
||||
" lsls r0, 4\n"
|
||||
" orrs r0, r4\n"
|
||||
" b _0800B12A\n"
|
||||
"_0800B104:\n"
|
||||
" ldrb r0, [r2]\n"
|
||||
" movs r5, 0xF\n"
|
||||
" movs r6, 0xF\n"
|
||||
" ands r6, r0\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" adds r1, r6, 0\n"
|
||||
" ands r1, r5\n"
|
||||
" lsls r4, r1, 4\n"
|
||||
" adds r0, r4, 0\n"
|
||||
" orrs r0, r1\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r3, 0x1\n"
|
||||
" add r9, r3\n"
|
||||
" adds r0, r6, 0x1\n"
|
||||
"_0800B124:\n"
|
||||
" ands r0, r5\n"
|
||||
" orrs r4, r0\n"
|
||||
"_0800B128:\n"
|
||||
" adds r0, r4, 0\n"
|
||||
"_0800B12A:\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r0, 0x1\n"
|
||||
" add r9, r0\n"
|
||||
" ldr r5, [sp, 0x30]\n"
|
||||
" adds r5, 0x1\n"
|
||||
" ldr r1, [sp, 0x2C]\n"
|
||||
" lsls r4, r1, 1\n"
|
||||
" b _0800B198\n"
|
||||
"_0800B13C:\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r8, r2\n"
|
||||
" mov r0, r10\n"
|
||||
" add r0, r8\n"
|
||||
" ldrb r0, [r0]\n"
|
||||
" adds r7, r0\n"
|
||||
" add r8, r2\n"
|
||||
" ldr r1, _0800B17C\n"
|
||||
" adds r0, r7, r1\n"
|
||||
" mov r2, r9\n"
|
||||
" adds r7, r0, r2\n"
|
||||
" ldr r5, [sp, 0x30]\n"
|
||||
" adds r5, 0x1\n"
|
||||
" ldr r0, [sp, 0x2C]\n"
|
||||
" lsls r4, r0, 1\n"
|
||||
" cmp r3, 0\n"
|
||||
" beq _0800B198\n"
|
||||
" adds r6, r3, 0\n"
|
||||
"_0800B160:\n"
|
||||
" adds r0, r7, 0\n"
|
||||
" bl DecompressAT_GetByte\n"
|
||||
" lsls r0, 24\n"
|
||||
" lsrs r0, 24\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r1, 0x1\n"
|
||||
" add r9, r1\n"
|
||||
" adds r7, 0x1\n"
|
||||
" subs r6, 0x1\n"
|
||||
" cmp r6, 0\n"
|
||||
" bne _0800B160\n"
|
||||
" b _0800B198\n"
|
||||
" .align 2, 0\n"
|
||||
"_0800B17C: .4byte 0xfffff000\n"
|
||||
"_0800B180:\n"
|
||||
" mov r0, r10\n"
|
||||
" add r0, r8\n"
|
||||
" ldrb r0, [r0]\n"
|
||||
" bl DecompressAT_AppendByte\n"
|
||||
" movs r2, 0x1\n"
|
||||
" add r9, r2\n"
|
||||
" add r8, r2\n"
|
||||
" ldr r5, [sp, 0x30]\n"
|
||||
" adds r5, 0x1\n"
|
||||
" ldr r3, [sp, 0x2C]\n"
|
||||
" lsls r4, r3, 1\n"
|
||||
"_0800B198:\n"
|
||||
" str r5, [sp, 0x30]\n"
|
||||
" str r4, [sp, 0x2C]\n"
|
||||
" ldr r0, [sp, 0x28]\n"
|
||||
" cmp r8, r0\n"
|
||||
" bge _0800B1A4\n"
|
||||
" b _0800AF22\n"
|
||||
"_0800B1A4:\n"
|
||||
" bl DecompressAT_Finish\n"
|
||||
" mov r0, r9\n"
|
||||
"_0800B1AA:\n"
|
||||
" add sp, 0x34\n"
|
||||
" pop {r3-r5}\n"
|
||||
" mov r8, r3\n"
|
||||
" mov r9, r4\n"
|
||||
" mov r10, r5\n"
|
||||
" pop {r4-r7}\n"
|
||||
" pop {r1}\n"
|
||||
" bx r1");
|
||||
#endif
|
||||
}
|
||||
|
||||
static void DecompressAT_Init(u32 *buffer)
|
||||
@ -940,4 +450,4 @@ bool8 sub_800B2D4(char *arg0, char *arg1, s32 length)
|
||||
break;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
66
src/text2.c
66
src/text2.c
@ -1919,50 +1919,42 @@ UNUSED static void nullsub_157(void)
|
||||
{
|
||||
}
|
||||
|
||||
// https://decomp.me/scratch/4tFKb
|
||||
void sub_8007AA4(UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, s32 a4, u32 color)
|
||||
void sub_8007AA4(struct UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, s32 a4, u32 color)
|
||||
{
|
||||
s32 r2;
|
||||
s32 r3;
|
||||
UnkTextStruct1 *r4;
|
||||
u32 ip;
|
||||
u32 *dest;
|
||||
struct unkStruct_80B8848 dataLOL;
|
||||
struct UnkTextStruct1 *r4 = &a0[a1];
|
||||
u32 ip = gUnknown_80B853C[color & 0xF] + 0x11111111;
|
||||
struct unkStruct_80B8848 dataLOL = gUnknown_80B8848;
|
||||
s32 r3 = y / 8;
|
||||
u32 *dest = r4->unk18 + ((r4->unk4 * r3 + x / 8) * 8);
|
||||
s32 r2 = x / 8;
|
||||
|
||||
r4 = &a0[a1];
|
||||
ip = gUnknown_80B853C[color & 0xF] + 0x11111111;
|
||||
#ifndef NONMATCHING
|
||||
asm("" : : : "r8");
|
||||
#endif // NONMATCHING
|
||||
dataLOL = gUnknown_80B8848;
|
||||
a4++; a4--;
|
||||
r3 = y / 8;
|
||||
|
||||
dest = r4->unk18 + ((r4->unk4 * r3 + x / 8) * 8);
|
||||
r2 = x / 8;
|
||||
dest += r3 * -8 + y;
|
||||
ip &= dataLOL.arr[x & 7];
|
||||
|
||||
if (r2 >= r4->unk4)
|
||||
return;
|
||||
goto thecheck;
|
||||
label:
|
||||
y++;
|
||||
dest++;
|
||||
if ((y % 8) == 0)
|
||||
dest += r4->unk20;
|
||||
a4--;
|
||||
thecheck:
|
||||
if (a4 <= 0 || r3 >= r4->unk8)
|
||||
return;
|
||||
if (r2 < r4->unk4) {
|
||||
// This goto looks like a fakematch, but I couldn't get it to work otherwise.
|
||||
goto LOOP_MIDDLE;
|
||||
while (1) {
|
||||
y++;
|
||||
dest++;
|
||||
if ((y % 8) == 0)
|
||||
dest += r4->unk20;
|
||||
a4--;
|
||||
|
||||
dest[0] |= ip;
|
||||
LOOP_MIDDLE:
|
||||
if (a4 <= 0)
|
||||
return;
|
||||
if (r3 >= r4->unk8)
|
||||
return;
|
||||
|
||||
if (r4->unk3C > dest)
|
||||
r4->unk3C = dest;
|
||||
if (r4->unk40 < dest)
|
||||
r4->unk40 = dest;
|
||||
goto label;
|
||||
dest[0] |= ip;
|
||||
|
||||
if (r4->unk3C > dest)
|
||||
r4->unk3C = dest;
|
||||
if (r4->unk40 < dest)
|
||||
r4->unk40 = dest;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8007B7C(u32 a0, s32 x, s32 y, s32 a3, u32 color)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user