document digit_obj_util
This commit is contained in:
+14
-14
@@ -63,7 +63,7 @@ _0814D63A:
|
||||
ldr r0, _0814D65C @ =gReservedSpritePaletteCount
|
||||
strb r4, [r0]
|
||||
movs r0, 0x3
|
||||
bl sub_815C980
|
||||
bl DigitObjUtil_Init
|
||||
b _0814D878
|
||||
.align 2, 0
|
||||
_0814D658: .4byte 0x01000200
|
||||
@@ -427,7 +427,7 @@ _0814D9A2:
|
||||
bl DestroyWirelessStatusIndicatorSprite
|
||||
adds r0, r5, 0
|
||||
bl sub_814EF10
|
||||
bl sub_815C9F4
|
||||
bl DigitObjUtil_Teardown
|
||||
b _0814D9BA
|
||||
_0814D9B2:
|
||||
movs r0, 0
|
||||
@@ -2578,15 +2578,15 @@ sub_814EAD4: @ 814EAD4
|
||||
movs r0, 0x4
|
||||
ldrsh r1, [r4, r0]
|
||||
movs r0, 0
|
||||
bl sub_815CD70
|
||||
bl DigitObjUtil_PrintNumOn
|
||||
movs r0, 0x6
|
||||
ldrsh r1, [r4, r0]
|
||||
movs r0, 0x1
|
||||
bl sub_815CD70
|
||||
bl DigitObjUtil_PrintNumOn
|
||||
movs r0, 0x8
|
||||
ldrsh r1, [r4, r0]
|
||||
movs r0, 0x2
|
||||
bl sub_815CD70
|
||||
bl DigitObjUtil_PrintNumOn
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -2608,13 +2608,13 @@ sub_814EB04: @ 814EB04
|
||||
strb r0, [r1]
|
||||
movs r0, 0x2
|
||||
movs r1, 0x1
|
||||
bl sub_815D1A8
|
||||
bl DigitObjUtil_HideOrShow
|
||||
movs r0, 0x1
|
||||
movs r1, 0x1
|
||||
bl sub_815D1A8
|
||||
bl DigitObjUtil_HideOrShow
|
||||
movs r0, 0
|
||||
movs r1, 0x1
|
||||
bl sub_815D1A8
|
||||
bl DigitObjUtil_HideOrShow
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_814EB04
|
||||
@@ -3060,17 +3060,17 @@ _0814EE3E:
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
bl sub_815CA40
|
||||
bl DigitObjUtil_CreatePrinter
|
||||
adds r2, r4, 0
|
||||
adds r2, 0x10
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
bl sub_815CA40
|
||||
bl DigitObjUtil_CreatePrinter
|
||||
adds r4, 0x20
|
||||
movs r0, 0x2
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
bl sub_815CA40
|
||||
bl DigitObjUtil_CreatePrinter
|
||||
ldrh r0, [r6, 0x12]
|
||||
cmp r0, 0x1
|
||||
bne _0814EED8
|
||||
@@ -3130,11 +3130,11 @@ _0814EF46:
|
||||
cmp r4, 0x1
|
||||
bls _0814EF46
|
||||
movs r0, 0x2
|
||||
bl sub_815D108
|
||||
bl DigitObjUtil_DeletePrinter
|
||||
movs r0, 0x1
|
||||
bl sub_815D108
|
||||
bl DigitObjUtil_DeletePrinter
|
||||
movs r0, 0
|
||||
bl sub_815D108
|
||||
bl DigitObjUtil_DeletePrinter
|
||||
movs r4, 0
|
||||
movs r1, 0xC2
|
||||
lsls r1, 1
|
||||
|
||||
+10
-7
@@ -4665,7 +4665,7 @@ _08149D20: .4byte sub_8149DC8
|
||||
sub_8149D24: @ 8149D24
|
||||
push {lr}
|
||||
bl FreeAllWindowBuffers
|
||||
bl sub_815C9F4
|
||||
bl DigitObjUtil_Teardown
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8149D24
|
||||
@@ -6284,7 +6284,10 @@ sub_814A9C8: @ 814A9C8
|
||||
push {r4,lr}
|
||||
sub sp, 0x10
|
||||
mov r1, sp
|
||||
movs r0, 0x40
|
||||
movs r0, 0x40 @ strConvMode = 0
|
||||
@ shape = SPRITE_SHAPE(8x8)
|
||||
@ size = SPRITE_SIZE(8x8)
|
||||
@ priority = 1
|
||||
strb r0, [r1]
|
||||
movs r0, 0x5
|
||||
strb r0, [r1, 0x1]
|
||||
@@ -6299,11 +6302,11 @@ sub_814A9C8: @ 814A9C8
|
||||
ldr r0, _0814AA20 @ =gUnknown_846D968
|
||||
str r0, [sp, 0xC]
|
||||
movs r0, 0x2
|
||||
bl sub_815C980
|
||||
bl DigitObjUtil_Init
|
||||
movs r0, 0
|
||||
movs r1, 0
|
||||
mov r2, sp
|
||||
bl sub_815CA40
|
||||
bl DigitObjUtil_CreatePrinter
|
||||
mov r1, sp
|
||||
movs r0, 0x4
|
||||
strb r0, [r1, 0x1]
|
||||
@@ -6314,7 +6317,7 @@ sub_814A9C8: @ 814A9C8
|
||||
movs r0, 0x1
|
||||
movs r1, 0
|
||||
mov r2, sp
|
||||
bl sub_815CA40
|
||||
bl DigitObjUtil_CreatePrinter
|
||||
add sp, 0x10
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
@@ -6329,7 +6332,7 @@ sub_814AA24: @ 814AA24
|
||||
push {lr}
|
||||
adds r1, r0, 0
|
||||
movs r0, 0
|
||||
bl sub_815CD70
|
||||
bl DigitObjUtil_PrintNumOn
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_814AA24
|
||||
@@ -6341,7 +6344,7 @@ sub_814AA34: @ 814AA34
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
movs r0, 0x1
|
||||
bl sub_815CD70
|
||||
bl DigitObjUtil_PrintNumOn
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_814AA34
|
||||
|
||||
+19
-13
@@ -339,22 +339,28 @@ gUnknown_846F458:: @ 846F458
|
||||
gUnknown_846F470:: @ 846F470
|
||||
spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
|
||||
|
||||
gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not
|
||||
.byte 9, 2, 8
|
||||
gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate
|
||||
@ strConvMode, shape, size, priority
|
||||
.byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9
|
||||
.byte 2, 8 @ ndigits, width
|
||||
.align 2
|
||||
.2byte 0x9c, 0x00
|
||||
.4byte gUnknown_846F2F8 + 0x18
|
||||
.4byte gUnknown_846F320 + 0x10
|
||||
.byte 8, 2, 8
|
||||
.2byte 0x9c, 0x00 @ x, y
|
||||
.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
|
||||
.4byte gUnknown_846F320 + 0x10 @ spritePalette
|
||||
@ strConvMode, shape, size, priority
|
||||
.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
|
||||
.byte 2, 8 @ ndigits, width
|
||||
.align 2
|
||||
.2byte 0xb4, 0x00
|
||||
.4byte gUnknown_846F2F8 + 0x18
|
||||
.4byte gUnknown_846F320 + 0x10
|
||||
.byte 8, 2, 8
|
||||
.2byte 0xb4, 0x00 @ x, y
|
||||
.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
|
||||
.4byte gUnknown_846F320 + 0x10 @ spritePalette
|
||||
@ strConvMode, shape, size, priority
|
||||
.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
|
||||
.byte 2, 8 @ ndigits, width
|
||||
.align 2
|
||||
.2byte 0xcc, 0x00
|
||||
.4byte gUnknown_846F2F8 + 0x18
|
||||
.4byte gUnknown_846F320 + 0x10
|
||||
.2byte 0xcc, 0x00 @ x, y
|
||||
.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
|
||||
.4byte gUnknown_846F320 + 0x10 @ spritePalette
|
||||
|
||||
gUnknown_846F4B8:: @ 846F4B8
|
||||
.4byte gUnknown_841D034
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
#ifndef GUARD_DIGIT_OBJ_UTIL_H
|
||||
#define GUARD_DIGIT_OBJ_UTIL_H
|
||||
|
||||
struct DigitObjUtilTemplate
|
||||
{
|
||||
u8 strConvMode:2;
|
||||
u8 shape:2;
|
||||
u8 size:2;
|
||||
u8 priority:2;
|
||||
u8 oamCount;
|
||||
u8 xDelta;
|
||||
s16 x;
|
||||
s16 y;
|
||||
const struct SpriteSheet *spriteSheet;
|
||||
const struct SpritePalette *spritePal;
|
||||
};
|
||||
|
||||
void DigitObjUtil_Teardown(void);
|
||||
bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemplate *template);
|
||||
void DigitObjUtil_PrintNumOn(u32 id, s32 num);
|
||||
void DigitObjUtil_DeletePrinter(u32 id);
|
||||
void DigitObjUtil_HideOrShow(u32 id, bool32 hide);
|
||||
|
||||
#endif //GUARD_DIGIT_OBJ_UTIL_H
|
||||
@@ -1,24 +0,0 @@
|
||||
#ifndef GUARD_UNK_815C980_H
|
||||
#define GUARD_UNK_815C980_H
|
||||
|
||||
struct UnkStruct3
|
||||
{
|
||||
u8 field_0_0:2;
|
||||
u8 shape:2;
|
||||
u8 size:2;
|
||||
u8 priority:2;
|
||||
u8 field_1;
|
||||
u8 xDelta;
|
||||
s16 x;
|
||||
s16 y;
|
||||
const struct SpriteSheet *spriteSheet;
|
||||
const struct SpritePalette *spritePal;
|
||||
};
|
||||
|
||||
void sub_815C9F4(void);
|
||||
void sub_815D108(u32 id);
|
||||
void sub_815D1A8(u32 id, bool32 arg1);
|
||||
bool32 sub_815CA40(u32 id, s32 arg1, const struct UnkStruct3 *arg2);
|
||||
void sub_815CD70(u32 id, s32 arg1);
|
||||
|
||||
#endif //GUARD_UNK_815C980_H
|
||||
+2
-2
@@ -290,7 +290,7 @@ SECTIONS {
|
||||
asm/dodrio_berry_picking_2.o(.text);
|
||||
src/teachy_tv.o(.text);
|
||||
src/ereader_helpers.o(.text);
|
||||
src/unk_815C980.o(.text);
|
||||
src/digit_obj_util.o(.text);
|
||||
src/ss_anne.o(.text);
|
||||
src/cereader_tool.o(.text);
|
||||
src/renewable_hidden_items.o(.text);
|
||||
@@ -575,7 +575,7 @@ SECTIONS {
|
||||
src/dodrio_berry_picking.o(.rodata);
|
||||
src/battle_controller_pokedude.o(.rodata);
|
||||
src/teachy_tv.o(.rodata);
|
||||
src/unk_815C980.o(.rodata);
|
||||
src/digit_obj_util.o(.rodata);
|
||||
data/data_8479668.o(.rodata);
|
||||
src/ss_anne.o(.rodata);
|
||||
src/cereader_tool.o(.rodata);
|
||||
|
||||
@@ -0,0 +1,449 @@
|
||||
#include "global.h"
|
||||
#include "malloc.h"
|
||||
#include "decompress.h"
|
||||
#include "digit_obj_util.h"
|
||||
#include "main.h"
|
||||
#include "battle.h"
|
||||
|
||||
struct DigitPrinterAlloc
|
||||
{
|
||||
u32 count;
|
||||
struct DigitPrinter
|
||||
{
|
||||
bool8 isActive;
|
||||
u8 firstOamId;
|
||||
u8 strConvMode;
|
||||
u8 oamCount;
|
||||
u8 palTagIndex;
|
||||
u8 size;
|
||||
u8 shape;
|
||||
u8 priority;
|
||||
u8 xDelta;
|
||||
u8 tilesPerImage;
|
||||
u16 tileStart;
|
||||
s16 x;
|
||||
s16 y;
|
||||
u16 tileTag;
|
||||
u16 palTag;
|
||||
u32 pow10;
|
||||
s32 lastPrinted;
|
||||
} *array;
|
||||
};
|
||||
|
||||
// this file's functions
|
||||
static u8 GetFirstOamId(u8 oamCount);
|
||||
static void CopyWorkToOam(struct DigitPrinter *objWork);
|
||||
static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool32 sign);
|
||||
static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign);
|
||||
static void DrawNumObjsMinusInBack(struct DigitPrinter *objWork, s32 num, bool32 sign);
|
||||
static bool32 SharesTileWithAnyActive(u32 id);
|
||||
static bool32 SharesPalWithAnyActive(u32 id);
|
||||
static u8 GetTilesPerImage(u32 shape, u32 size);
|
||||
|
||||
// ewram
|
||||
static EWRAM_DATA struct DigitPrinterAlloc *sOamWork = {0};
|
||||
|
||||
// const rom data
|
||||
static const u8 sTilesPerImage[4][4] =
|
||||
{
|
||||
[ST_OAM_SQUARE] = {
|
||||
[ST_OAM_SIZE_0] = 0x01, // SPRITE_SIZE_8x8
|
||||
[ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_16x16
|
||||
[ST_OAM_SIZE_2] = 0x10, // SPRITE_SIZE_32x32
|
||||
[ST_OAM_SIZE_3] = 0x40 // SPRITE_SIZE_64x64
|
||||
},
|
||||
[ST_OAM_H_RECTANGLE] = {
|
||||
[ST_OAM_SIZE_0] = 0x02, // SPRITE_SIZE_16x8
|
||||
[ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_32x8
|
||||
[ST_OAM_SIZE_2] = 0x08, // SPRITE_SIZE_32x16
|
||||
[ST_OAM_SIZE_3] = 0x20 // SPRITE_SIZE_64x32
|
||||
},
|
||||
[ST_OAM_V_RECTANGLE] = {
|
||||
[ST_OAM_SIZE_0] = 0x02, // SPRITE_SIZE_8x16
|
||||
[ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_8x32
|
||||
[ST_OAM_SIZE_2] = 0x08, // SPRITE_SIZE_16x32
|
||||
[ST_OAM_SIZE_3] = 0x20 // SPRITE_SIZE_32x64
|
||||
}
|
||||
};
|
||||
|
||||
// code
|
||||
bool32 DigitObjUtil_Init(u32 count)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
if (sOamWork != NULL)
|
||||
DigitObjUtil_Teardown();
|
||||
|
||||
sOamWork = Alloc(sizeof(*sOamWork));
|
||||
if (sOamWork == NULL)
|
||||
return FALSE;
|
||||
|
||||
sOamWork->array = Alloc(sizeof(struct DigitPrinter) * count);
|
||||
if (sOamWork->array == NULL)
|
||||
{
|
||||
Free(sOamWork);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
sOamWork->count = count;
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
sOamWork->array[i].isActive = FALSE;
|
||||
sOamWork->array[i].firstOamId = 0xFF;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void DigitObjUtil_Teardown(void)
|
||||
{
|
||||
if (sOamWork != NULL)
|
||||
{
|
||||
if (sOamWork->array != NULL)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
for (i = 0; i < sOamWork->count; i++)
|
||||
DigitObjUtil_DeletePrinter(i);
|
||||
|
||||
Free(sOamWork->array);
|
||||
}
|
||||
|
||||
FREE_AND_SET_NULL(sOamWork);
|
||||
}
|
||||
}
|
||||
|
||||
bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemplate *template)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
if (sOamWork == NULL)
|
||||
return FALSE;
|
||||
if (sOamWork->array[id].isActive)
|
||||
return FALSE;
|
||||
|
||||
sOamWork->array[id].firstOamId = GetFirstOamId(template->oamCount);
|
||||
if (sOamWork->array[id].firstOamId == 0xFF)
|
||||
return FALSE;
|
||||
|
||||
sOamWork->array[id].tileStart = GetSpriteTileStartByTag(template->spriteSheet->tag);
|
||||
if (sOamWork->array[id].tileStart == 0xFFFF)
|
||||
{
|
||||
if (template->spriteSheet->size != 0)
|
||||
{
|
||||
sOamWork->array[id].tileStart = LoadSpriteSheet(template->spriteSheet);
|
||||
}
|
||||
else
|
||||
{
|
||||
struct CompressedSpriteSheet compObjectPic;
|
||||
|
||||
compObjectPic = *(struct CompressedSpriteSheet*)(template->spriteSheet);
|
||||
compObjectPic.size = GetDecompressedDataSize(template->spriteSheet->data);
|
||||
sOamWork->array[id].tileStart = LoadCompressedSpriteSheet(&compObjectPic);
|
||||
}
|
||||
|
||||
if (sOamWork->array[id].tileStart == 0xFFFF)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
sOamWork->array[id].palTagIndex = IndexOfSpritePaletteTag(template->spritePal->tag);
|
||||
if (sOamWork->array[id].palTagIndex == 0xFF)
|
||||
sOamWork->array[id].palTagIndex = LoadSpritePalette(template->spritePal);
|
||||
|
||||
sOamWork->array[id].strConvMode = template->strConvMode;
|
||||
sOamWork->array[id].oamCount = template->oamCount;
|
||||
sOamWork->array[id].x = template->x;
|
||||
sOamWork->array[id].y = template->y;
|
||||
sOamWork->array[id].shape = template->shape;
|
||||
sOamWork->array[id].size = template->size;
|
||||
sOamWork->array[id].priority = template->priority;
|
||||
sOamWork->array[id].xDelta = template->xDelta;
|
||||
sOamWork->array[id].tilesPerImage = GetTilesPerImage(template->shape, template->size);
|
||||
sOamWork->array[id].tileTag = template->spriteSheet->tag;
|
||||
sOamWork->array[id].palTag = template->spritePal->tag;
|
||||
sOamWork->array[id].isActive = TRUE;
|
||||
|
||||
// Decimal left shift
|
||||
sOamWork->array[id].pow10 = 1;
|
||||
for (i = 1; i < template->oamCount; i++)
|
||||
sOamWork->array[id].pow10 *= 10;
|
||||
|
||||
CopyWorkToOam(&sOamWork->array[id]);
|
||||
DigitObjUtil_PrintNumOn(id, num);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void CopyWorkToOam(struct DigitPrinter *objWork)
|
||||
{
|
||||
u32 i;
|
||||
u32 oamId = objWork->firstOamId;
|
||||
u32 x = objWork->x;
|
||||
u32 oamCount = objWork->oamCount + 1;
|
||||
|
||||
CpuFill16(0, &gMain.oamBuffer[oamId], sizeof(struct OamData) * oamCount);
|
||||
for (i = 0, oamId = objWork->firstOamId; i < oamCount; i++, oamId++)
|
||||
{
|
||||
gMain.oamBuffer[oamId].y = objWork->y;
|
||||
gMain.oamBuffer[oamId].x = x;
|
||||
gMain.oamBuffer[oamId].shape = objWork->shape;
|
||||
gMain.oamBuffer[oamId].size = objWork->size;
|
||||
gMain.oamBuffer[oamId].tileNum = objWork->tileStart;
|
||||
gMain.oamBuffer[oamId].priority = objWork->priority;
|
||||
gMain.oamBuffer[oamId].paletteNum = objWork->palTagIndex;
|
||||
|
||||
x += objWork->xDelta;
|
||||
}
|
||||
|
||||
oamId--;
|
||||
gMain.oamBuffer[oamId].x = objWork->x - objWork->xDelta;
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
|
||||
gMain.oamBuffer[oamId].tileNum = objWork->tileStart + (objWork->tilesPerImage * 10);
|
||||
}
|
||||
|
||||
void DigitObjUtil_PrintNumOn(u32 id, s32 num)
|
||||
{
|
||||
bool32 sign;
|
||||
|
||||
if (sOamWork == NULL)
|
||||
return;
|
||||
if (!sOamWork->array[id].isActive)
|
||||
return;
|
||||
|
||||
sOamWork->array[id].lastPrinted = num;
|
||||
if (num < 0)
|
||||
{
|
||||
sign = TRUE;
|
||||
num *= -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
sign = FALSE;
|
||||
}
|
||||
|
||||
switch (sOamWork->array[id].strConvMode)
|
||||
{
|
||||
case 0:
|
||||
default:
|
||||
DrawNumObjsLeadingZeros(&sOamWork->array[id], num, sign);
|
||||
break;
|
||||
case 1:
|
||||
DrawNumObjsMinusInFront(&sOamWork->array[id], num, sign);
|
||||
break;
|
||||
case 2:
|
||||
DrawNumObjsMinusInBack(&sOamWork->array[id], num, sign);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool32 sign)
|
||||
{
|
||||
u32 pow10 = objWork->pow10;
|
||||
u32 oamId = objWork->firstOamId;
|
||||
|
||||
while (pow10 != 0)
|
||||
{
|
||||
u32 digit = num / pow10;
|
||||
num -= (digit * pow10);
|
||||
pow10 /= 10;
|
||||
|
||||
gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
|
||||
oamId++;
|
||||
}
|
||||
|
||||
if (sign)
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
|
||||
else
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
|
||||
}
|
||||
|
||||
static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign)
|
||||
{
|
||||
u32 pow10 = objWork->pow10;
|
||||
static int oamId;
|
||||
static int curDigit;
|
||||
static int firstDigit;
|
||||
|
||||
oamId = objWork->firstOamId;
|
||||
curDigit = 0;
|
||||
firstDigit = -1;
|
||||
|
||||
while (pow10 != 0)
|
||||
{
|
||||
u32 digit = num / pow10;
|
||||
num -= (digit * pow10);
|
||||
pow10 /= 10;
|
||||
|
||||
if (digit != 0 || firstDigit != -1 || pow10 == 0)
|
||||
{
|
||||
gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
|
||||
|
||||
if (firstDigit == -1)
|
||||
firstDigit = curDigit;
|
||||
}
|
||||
else
|
||||
{
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
|
||||
}
|
||||
|
||||
oamId++;
|
||||
curDigit++;
|
||||
}
|
||||
|
||||
if (sign)
|
||||
{
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
|
||||
gMain.oamBuffer[oamId].x = objWork->x + ((firstDigit - 1) * objWork->xDelta);
|
||||
}
|
||||
else
|
||||
{
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
|
||||
}
|
||||
}
|
||||
|
||||
static void DrawNumObjsMinusInBack(struct DigitPrinter *objWork, s32 num, bool32 sign)
|
||||
{
|
||||
u32 pow10 = objWork->pow10;
|
||||
u32 oamId = objWork->firstOamId;
|
||||
u32 printingDigits = 0;
|
||||
s32 nsprites = 0;
|
||||
|
||||
while (pow10 != 0)
|
||||
{
|
||||
u32 digit = num / pow10;
|
||||
num -= (digit * pow10);
|
||||
pow10 /= 10;
|
||||
|
||||
if (digit != 0 || printingDigits != 0 || pow10 == 0)
|
||||
{
|
||||
printingDigits = 1;
|
||||
gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
|
||||
|
||||
oamId++;
|
||||
nsprites++;
|
||||
}
|
||||
}
|
||||
|
||||
while (nsprites < objWork->oamCount)
|
||||
{
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
|
||||
oamId++;
|
||||
nsprites++;
|
||||
}
|
||||
|
||||
if (sign)
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
|
||||
else
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
|
||||
}
|
||||
|
||||
void DigitObjUtil_DeletePrinter(u32 id)
|
||||
{
|
||||
s32 oamId, oamCount, i;
|
||||
|
||||
if (sOamWork == NULL)
|
||||
return;
|
||||
if (!sOamWork->array[id].isActive)
|
||||
return;
|
||||
|
||||
oamCount = sOamWork->array[id].oamCount + 1;
|
||||
oamId = sOamWork->array[id].firstOamId;
|
||||
|
||||
for (i = 0; i < oamCount; i++, oamId++)
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
|
||||
|
||||
if (!SharesTileWithAnyActive(id))
|
||||
FreeSpriteTilesByTag(sOamWork->array[id].tileTag);
|
||||
if (!SharesPalWithAnyActive(id))
|
||||
FreeSpritePaletteByTag(sOamWork->array[id].palTag);
|
||||
|
||||
sOamWork->array[id].isActive = FALSE;
|
||||
}
|
||||
|
||||
void DigitObjUtil_HideOrShow(u32 id, bool32 hide)
|
||||
{
|
||||
s32 oamId, oamCount, i;
|
||||
|
||||
if (sOamWork == NULL)
|
||||
return;
|
||||
if (!sOamWork->array[id].isActive)
|
||||
return;
|
||||
|
||||
oamCount = sOamWork->array[id].oamCount + 1;
|
||||
oamId = sOamWork->array[id].firstOamId;
|
||||
if (hide)
|
||||
{
|
||||
for (i = 0; i < oamCount; i++, oamId++)
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i = 0; i < oamCount; i++, oamId++)
|
||||
gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
|
||||
|
||||
DigitObjUtil_PrintNumOn(id, sOamWork->array[id].lastPrinted);
|
||||
}
|
||||
}
|
||||
|
||||
static u8 GetFirstOamId(u8 oamCount)
|
||||
{
|
||||
u32 i;
|
||||
u16 firstOamId = 64;
|
||||
|
||||
for (i = 0; i < sOamWork->count; i++)
|
||||
{
|
||||
if (!sOamWork->array[i].isActive)
|
||||
{
|
||||
if (sOamWork->array[i].firstOamId != 0xFF && sOamWork->array[i].oamCount <= oamCount)
|
||||
return sOamWork->array[i].firstOamId;
|
||||
}
|
||||
else
|
||||
{
|
||||
firstOamId += 1 + sOamWork->array[i].oamCount;
|
||||
}
|
||||
}
|
||||
|
||||
if (firstOamId + oamCount + 1 > 128)
|
||||
return 0xFF;
|
||||
else
|
||||
return firstOamId;
|
||||
}
|
||||
|
||||
static bool32 SharesTileWithAnyActive(u32 id)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
for (i = 0; i < sOamWork->count; i++)
|
||||
{
|
||||
if (sOamWork->array[i].isActive && i != id
|
||||
&& sOamWork->array[i].tileTag == sOamWork->array[id].tileTag)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static bool32 SharesPalWithAnyActive(u32 id)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
for (i = 0; i < sOamWork->count; i++)
|
||||
{
|
||||
if (sOamWork->array[i].isActive && i != id
|
||||
&& sOamWork->array[i].palTag == sOamWork->array[id].palTag)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static u8 GetTilesPerImage(u32 shape, u32 size)
|
||||
{
|
||||
return sTilesPerImage[shape][size];
|
||||
}
|
||||
@@ -1,437 +0,0 @@
|
||||
#include "global.h"
|
||||
#include "malloc.h"
|
||||
#include "decompress.h"
|
||||
#include "unk_815C980.h"
|
||||
#include "main.h"
|
||||
#include "battle.h"
|
||||
|
||||
struct UnkStruct2
|
||||
{
|
||||
bool8 isActive;
|
||||
u8 firstOamId;
|
||||
u8 field_2;
|
||||
u8 oamCount;
|
||||
u8 palTagIndex;
|
||||
u8 size;
|
||||
u8 shape;
|
||||
u8 priority;
|
||||
u8 xDelta;
|
||||
u8 field_9;
|
||||
u16 tileStart;
|
||||
s16 x;
|
||||
s16 y;
|
||||
u16 tileTag;
|
||||
u16 palTag;
|
||||
u32 field_14;
|
||||
s32 field_18;
|
||||
};
|
||||
|
||||
struct UnkStruct1
|
||||
{
|
||||
u32 count;
|
||||
struct UnkStruct2 *array;
|
||||
};
|
||||
|
||||
// this file's functions
|
||||
static u8 sub_815D244(u8 arg0);;
|
||||
static void sub_815CC28(struct UnkStruct2 *arg0);
|
||||
static void sub_815CDDC(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
|
||||
static void sub_815CE90(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
|
||||
static void sub_815CFEC(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
|
||||
static bool32 SharesTileWithAnyActive(u32 id);
|
||||
static bool32 SharesPalWithAnyActive(u32 id);
|
||||
static void sub_8035648(void);
|
||||
static u8 sub_815D324(u32 shape, u32 size);
|
||||
|
||||
// ewram
|
||||
static EWRAM_DATA struct UnkStruct1 *gUnknown_203F454 = {0};
|
||||
|
||||
// const rom data
|
||||
static const u8 gUnknown_8479658[][4] =
|
||||
{
|
||||
{0x01, 0x04, 0x10, 0x40},
|
||||
{0x02, 0x04, 0x08, 0x20},
|
||||
{0x02, 0x04, 0x08, 0x20},
|
||||
{0x00, 0x00, 0x00, 0x00}
|
||||
};
|
||||
|
||||
// code
|
||||
bool32 sub_815C980(u32 count)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
if (gUnknown_203F454 != NULL)
|
||||
sub_815C9F4();
|
||||
|
||||
gUnknown_203F454 = Alloc(sizeof(*gUnknown_203F454));
|
||||
if (gUnknown_203F454 == NULL)
|
||||
return FALSE;
|
||||
|
||||
gUnknown_203F454->array = Alloc(sizeof(struct UnkStruct2) * count);
|
||||
if (gUnknown_203F454->array == NULL)
|
||||
{
|
||||
Free(gUnknown_203F454);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
gUnknown_203F454->count = count;
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
gUnknown_203F454->array[i].isActive = FALSE;
|
||||
gUnknown_203F454->array[i].firstOamId = 0xFF;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void sub_815C9F4(void)
|
||||
{
|
||||
if (gUnknown_203F454 != NULL)
|
||||
{
|
||||
if (gUnknown_203F454->array != NULL)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
for (i = 0; i < gUnknown_203F454->count; i++)
|
||||
sub_815D108(i);
|
||||
|
||||
Free(gUnknown_203F454->array);
|
||||
}
|
||||
|
||||
FREE_AND_SET_NULL(gUnknown_203F454);
|
||||
}
|
||||
}
|
||||
|
||||
bool32 sub_815CA40(u32 id, s32 arg1, const struct UnkStruct3 *arg2)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
if (gUnknown_203F454 == NULL)
|
||||
return FALSE;
|
||||
if (gUnknown_203F454->array[id].isActive)
|
||||
return FALSE;
|
||||
|
||||
gUnknown_203F454->array[id].firstOamId = sub_815D244(arg2->field_1);
|
||||
if (gUnknown_203F454->array[id].firstOamId == 0xFF)
|
||||
return FALSE;
|
||||
|
||||
gUnknown_203F454->array[id].tileStart = GetSpriteTileStartByTag(arg2->spriteSheet->tag);
|
||||
if (gUnknown_203F454->array[id].tileStart == 0xFFFF)
|
||||
{
|
||||
if (arg2->spriteSheet->size != 0)
|
||||
{
|
||||
gUnknown_203F454->array[id].tileStart = LoadSpriteSheet(arg2->spriteSheet);
|
||||
}
|
||||
else
|
||||
{
|
||||
struct CompressedSpriteSheet compObjectPic;
|
||||
|
||||
compObjectPic = *(struct CompressedSpriteSheet*)(arg2->spriteSheet);
|
||||
compObjectPic.size = GetDecompressedDataSize(arg2->spriteSheet->data);
|
||||
gUnknown_203F454->array[id].tileStart = LoadCompressedSpriteSheet(&compObjectPic);
|
||||
}
|
||||
|
||||
if (gUnknown_203F454->array[id].tileStart == 0xFFFF)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
gUnknown_203F454->array[id].palTagIndex = IndexOfSpritePaletteTag(arg2->spritePal->tag);
|
||||
if (gUnknown_203F454->array[id].palTagIndex == 0xFF)
|
||||
gUnknown_203F454->array[id].palTagIndex = LoadSpritePalette(arg2->spritePal);
|
||||
|
||||
gUnknown_203F454->array[id].field_2 = arg2->field_0_0;
|
||||
gUnknown_203F454->array[id].oamCount = arg2->field_1;
|
||||
gUnknown_203F454->array[id].x = arg2->x;
|
||||
gUnknown_203F454->array[id].y = arg2->y;
|
||||
gUnknown_203F454->array[id].shape = arg2->shape;
|
||||
gUnknown_203F454->array[id].size = arg2->size;
|
||||
gUnknown_203F454->array[id].priority = arg2->priority;
|
||||
gUnknown_203F454->array[id].xDelta = arg2->xDelta;
|
||||
gUnknown_203F454->array[id].field_9 = sub_815D324(arg2->shape, arg2->size);
|
||||
gUnknown_203F454->array[id].tileTag = arg2->spriteSheet->tag;
|
||||
gUnknown_203F454->array[id].palTag = arg2->spritePal->tag;
|
||||
gUnknown_203F454->array[id].isActive = TRUE;
|
||||
gUnknown_203F454->array[id].field_14 = 1;
|
||||
|
||||
for (i = 1; i < arg2->field_1; i++)
|
||||
gUnknown_203F454->array[id].field_14 *= 10;
|
||||
|
||||
sub_815CC28(&gUnknown_203F454->array[id]);
|
||||
sub_815CD70(id, arg1);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void sub_815CC28(struct UnkStruct2 *arg0)
|
||||
{
|
||||
u32 i;
|
||||
u32 oamId = arg0->firstOamId;
|
||||
u32 x = arg0->x;
|
||||
u32 oamCount = arg0->oamCount + 1;
|
||||
|
||||
CpuFill16(0, &gMain.oamBuffer[oamId], sizeof(struct OamData) * oamCount);
|
||||
for (i = 0, oamId = arg0->firstOamId; i < oamCount; i++, oamId++)
|
||||
{
|
||||
gMain.oamBuffer[oamId].y = arg0->y;
|
||||
gMain.oamBuffer[oamId].x = x;
|
||||
gMain.oamBuffer[oamId].shape = arg0->shape;
|
||||
gMain.oamBuffer[oamId].size = arg0->size;
|
||||
gMain.oamBuffer[oamId].tileNum = arg0->tileStart;
|
||||
gMain.oamBuffer[oamId].priority = arg0->priority;
|
||||
gMain.oamBuffer[oamId].paletteNum = arg0->palTagIndex;
|
||||
|
||||
x += arg0->xDelta;
|
||||
}
|
||||
|
||||
oamId--;
|
||||
gMain.oamBuffer[oamId].x = arg0->x - arg0->xDelta;
|
||||
gMain.oamBuffer[oamId].affineMode = 2;
|
||||
gMain.oamBuffer[oamId].tileNum = arg0->tileStart + (arg0->field_9 * 10);
|
||||
}
|
||||
|
||||
void sub_815CD70(u32 id, s32 arg1)
|
||||
{
|
||||
bool32 r2;
|
||||
|
||||
if (gUnknown_203F454 == NULL)
|
||||
return;
|
||||
if (!gUnknown_203F454->array[id].isActive)
|
||||
return;
|
||||
|
||||
gUnknown_203F454->array[id].field_18 = arg1;
|
||||
if (arg1 < 0)
|
||||
{
|
||||
r2 = TRUE;
|
||||
arg1 *= -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
r2 = FALSE;
|
||||
}
|
||||
|
||||
switch (gUnknown_203F454->array[id].field_2)
|
||||
{
|
||||
case 0:
|
||||
default:
|
||||
sub_815CDDC(&gUnknown_203F454->array[id], arg1, r2);
|
||||
break;
|
||||
case 1:
|
||||
sub_815CE90(&gUnknown_203F454->array[id], arg1, r2);
|
||||
break;
|
||||
case 2:
|
||||
sub_815CFEC(&gUnknown_203F454->array[id], arg1, r2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_815CDDC(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
|
||||
{
|
||||
u32 r5 = arg0->field_14;
|
||||
u32 oamId = arg0->firstOamId;
|
||||
|
||||
while (r5 != 0)
|
||||
{
|
||||
u32 r4 = arg1 / r5;
|
||||
arg1 -= (r4 * r5);
|
||||
r5 /= 10;
|
||||
|
||||
gMain.oamBuffer[oamId].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
|
||||
oamId++;
|
||||
}
|
||||
|
||||
if (arg2)
|
||||
gMain.oamBuffer[oamId].affineMode = 0;
|
||||
else
|
||||
gMain.oamBuffer[oamId].affineMode = 2;
|
||||
}
|
||||
|
||||
static void sub_815CE90(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
|
||||
{
|
||||
u32 r5 = arg0->field_14;
|
||||
static int gUnknown_3002078;
|
||||
static int gUnknown_300207C;
|
||||
static int gUnknown_3002080;
|
||||
|
||||
gUnknown_3002078 = arg0->firstOamId;
|
||||
gUnknown_300207C = 0;
|
||||
gUnknown_3002080 = -1;
|
||||
|
||||
while (r5 != 0)
|
||||
{
|
||||
u32 r4 = arg1 / r5;
|
||||
arg1 -= (r4 * r5);
|
||||
r5 /= 10;
|
||||
|
||||
if (r4 != 0 || gUnknown_3002080 != -1 || r5 == 0)
|
||||
{
|
||||
gMain.oamBuffer[gUnknown_3002078].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
|
||||
gMain.oamBuffer[gUnknown_3002078].affineMode = 0;
|
||||
|
||||
if (gUnknown_3002080 == -1)
|
||||
gUnknown_3002080 = gUnknown_300207C;
|
||||
}
|
||||
else
|
||||
{
|
||||
gMain.oamBuffer[gUnknown_3002078].affineMode = 2;
|
||||
}
|
||||
|
||||
gUnknown_3002078++;
|
||||
gUnknown_300207C++;
|
||||
}
|
||||
|
||||
if (arg2)
|
||||
{
|
||||
gMain.oamBuffer[gUnknown_3002078].affineMode = 0;
|
||||
gMain.oamBuffer[gUnknown_3002078].x = arg0->x + ((gUnknown_3002080 - 1) * arg0->xDelta);
|
||||
}
|
||||
else
|
||||
{
|
||||
gMain.oamBuffer[gUnknown_3002078].affineMode = 2;
|
||||
}
|
||||
}
|
||||
|
||||
static void sub_815CFEC(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
|
||||
{
|
||||
u32 r5 = arg0->field_14;
|
||||
u32 oamId = arg0->firstOamId;
|
||||
u32 var_28 = 0;
|
||||
s32 r9 = 0;
|
||||
|
||||
while (r5 != 0)
|
||||
{
|
||||
u32 r4 = arg1 / r5;
|
||||
arg1 -= (r4 * r5);
|
||||
r5 /= 10;
|
||||
|
||||
if (r4 != 0 || var_28 != 0 || r5 == 0)
|
||||
{
|
||||
var_28 = 1;
|
||||
gMain.oamBuffer[oamId].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
|
||||
gMain.oamBuffer[oamId].affineMode = 0;
|
||||
|
||||
oamId++;
|
||||
r9++;
|
||||
}
|
||||
}
|
||||
|
||||
while (r9 < arg0->oamCount)
|
||||
{
|
||||
gMain.oamBuffer[oamId].affineMode = 2;
|
||||
oamId++;
|
||||
r9++;
|
||||
}
|
||||
|
||||
if (arg2)
|
||||
gMain.oamBuffer[oamId].affineMode = 0;
|
||||
else
|
||||
gMain.oamBuffer[oamId].affineMode = 2;
|
||||
}
|
||||
|
||||
void sub_815D108(u32 id)
|
||||
{
|
||||
s32 oamId, oamCount, i;
|
||||
|
||||
if (gUnknown_203F454 == NULL)
|
||||
return;
|
||||
if (!gUnknown_203F454->array[id].isActive)
|
||||
return;
|
||||
|
||||
oamCount = gUnknown_203F454->array[id].oamCount + 1;
|
||||
oamId = gUnknown_203F454->array[id].firstOamId;
|
||||
|
||||
for (i = 0; i < oamCount; i++, oamId++)
|
||||
gMain.oamBuffer[oamId].affineMode = 2;
|
||||
|
||||
if (!SharesTileWithAnyActive(id))
|
||||
FreeSpriteTilesByTag(gUnknown_203F454->array[id].tileTag);
|
||||
if (!SharesPalWithAnyActive(id))
|
||||
FreeSpritePaletteByTag(gUnknown_203F454->array[id].palTag);
|
||||
|
||||
gUnknown_203F454->array[id].isActive = FALSE;
|
||||
}
|
||||
|
||||
void sub_815D1A8(u32 id, bool32 arg1)
|
||||
{
|
||||
s32 oamId, oamCount, i;
|
||||
|
||||
if (gUnknown_203F454 == NULL)
|
||||
return;
|
||||
if (!gUnknown_203F454->array[id].isActive)
|
||||
return;
|
||||
|
||||
oamCount = gUnknown_203F454->array[id].oamCount + 1;
|
||||
oamId = gUnknown_203F454->array[id].firstOamId;
|
||||
if (arg1)
|
||||
{
|
||||
for (i = 0; i < oamCount; i++, oamId++)
|
||||
gMain.oamBuffer[oamId].affineMode = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i = 0; i < oamCount; i++, oamId++)
|
||||
gMain.oamBuffer[oamId].affineMode = 0;
|
||||
|
||||
sub_815CD70(id, gUnknown_203F454->array[id].field_18);
|
||||
}
|
||||
}
|
||||
|
||||
static u8 sub_815D244(u8 arg0)
|
||||
{
|
||||
u32 i;
|
||||
u16 oamCount = 64;
|
||||
|
||||
for (i = 0; i < gUnknown_203F454->count; i++)
|
||||
{
|
||||
if (!gUnknown_203F454->array[i].isActive)
|
||||
{
|
||||
if (gUnknown_203F454->array[i].firstOamId != 0xFF && gUnknown_203F454->array[i].oamCount <= arg0)
|
||||
return gUnknown_203F454->array[i].firstOamId;
|
||||
}
|
||||
else
|
||||
{
|
||||
oamCount += 1 + gUnknown_203F454->array[i].oamCount;
|
||||
}
|
||||
}
|
||||
|
||||
if (oamCount + arg0 + 1 > 128)
|
||||
return 0xFF;
|
||||
else
|
||||
return oamCount;
|
||||
}
|
||||
|
||||
static bool32 SharesTileWithAnyActive(u32 id)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
for (i = 0; i < gUnknown_203F454->count; i++)
|
||||
{
|
||||
if (gUnknown_203F454->array[i].isActive && i != id
|
||||
&& gUnknown_203F454->array[i].tileTag == gUnknown_203F454->array[id].tileTag)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static bool32 SharesPalWithAnyActive(u32 id)
|
||||
{
|
||||
u32 i;
|
||||
|
||||
for (i = 0; i < gUnknown_203F454->count; i++)
|
||||
{
|
||||
if (gUnknown_203F454->array[i].isActive && i != id
|
||||
&& gUnknown_203F454->array[i].palTag == gUnknown_203F454->array[id].palTag)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static u8 sub_815D324(u32 shape, u32 size)
|
||||
{
|
||||
return gUnknown_8479658[shape][size];
|
||||
}
|
||||
+1
-1
@@ -97,7 +97,7 @@ gUnknown_3002044: @ 3002044
|
||||
.include "src/ereader_helpers.o"
|
||||
|
||||
.align 3
|
||||
.include "src/unk_815C980.o"
|
||||
.include "src/digit_obj_util.o"
|
||||
|
||||
.align 3
|
||||
.include "asm/m4a_1.o"
|
||||
|
||||
+1
-1
@@ -483,7 +483,7 @@ gUnknown_203F440: @ 203F440
|
||||
.align 2
|
||||
.include "src/teachy_tv.o"
|
||||
.align 2
|
||||
.include "src/unk_815C980.o"
|
||||
.include "src/digit_obj_util.o"
|
||||
.align 2
|
||||
.include "src/trainer_tower.o"
|
||||
.align 2
|
||||
|
||||
Reference in New Issue
Block a user