dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

through sub_80C22C4

Browse Source
This commit is contained in:
PikalaxALT
2020-01-04 17:54:47 -05:00
parent 550f7f8482
commit a54c1b0664
2 changed files with 145 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/region_map.s
-462
View File
@@ -5,468 +5,6 @@
.text
thumb_func_start sub_80C1F80
sub_80C1F80: @ 80C1F80
push {r4-r6,lr}
sub sp, 0x8
lsls r0, 24
cmp r0, 0
bne _080C2014
ldr r1, _080C1FF0 @ =gUnknown_20399DC
ldr r2, [r1]
ldr r0, _080C1FF4 @ =0x00003d4b
adds r3, r2, r0
ldrb r0, [r3]
adds r6, r1, 0
cmp r0, 0x7
bhi _080C2024
ldr r4, _080C1FF8 @ =0x00003e16
adds r1, r2, r4
adds r4, 0x8
adds r0, r2, r4
ldrh r0, [r0]
ldrh r4, [r1]
adds r0, r4
strh r0, [r1]
ldr r0, _080C1FFC @ =0x00003e18
adds r1, r2, r0
ldr r4, _080C2000 @ =0x00003e20
adds r0, r2, r4
ldrh r0, [r0]
ldrh r4, [r1]
adds r0, r4
strh r0, [r1]
ldr r0, _080C2004 @ =0x00003e1a
adds r1, r2, r0
ldr r4, _080C2008 @ =0x00003e22
adds r0, r2, r4
ldrh r0, [r0]
ldrh r4, [r1]
adds r0, r4
strh r0, [r1]
ldr r0, _080C200C @ =0x00003e1c
adds r1, r2, r0
ldr r4, _080C2010 @ =0x00003e24
adds r0, r2, r4
ldrh r0, [r0]
ldrh r2, [r1]
adds r0, r2
strh r0, [r1]
ldrb r0, [r3]
adds r0, 0x1
strb r0, [r3]
ldr r0, [r6]
subs r4, 0x10
adds r1, r0, r4
ldrh r0, [r1]
cmp r0, 0x5
bhi _080C2086
adds r0, 0x1
b _080C2084
.align 2, 0
_080C1FF0: .4byte gUnknown_20399DC
_080C1FF4: .4byte 0x00003d4b
_080C1FF8: .4byte 0x00003e16
_080C1FFC: .4byte 0x00003e18
_080C2000: .4byte 0x00003e20
_080C2004: .4byte 0x00003e1a
_080C2008: .4byte 0x00003e22
_080C200C: .4byte 0x00003e1c
_080C2010: .4byte 0x00003e24
_080C2014:
ldr r1, _080C2028 @ =gUnknown_20399DC
ldr r3, [r1]
ldr r0, _080C202C @ =0x00003d4b
adds r5, r3, r0
ldrb r0, [r5]
adds r6, r1, 0
cmp r0, 0
bne _080C2030
_080C2024:
movs r0, 0x1
b _080C20DE
.align 2, 0
_080C2028: .4byte gUnknown_20399DC
_080C202C: .4byte 0x00003d4b
_080C2030:
ldr r1, _080C20E8 @ =0x00003e16
adds r2, r3, r1
ldr r4, _080C20EC @ =0x00003e1e
adds r1, r3, r4
ldrh r0, [r2]
ldrh r1, [r1]
subs r0, r1
strh r0, [r2]
ldr r0, _080C20F0 @ =0x00003e18
adds r2, r3, r0
adds r4, 0x2
adds r1, r3, r4
ldrh r0, [r2]
ldrh r1, [r1]
subs r0, r1
strh r0, [r2]
ldr r0, _080C20F4 @ =0x00003e1a
adds r2, r3, r0
adds r4, 0x2
adds r1, r3, r4
ldrh r0, [r2]
ldrh r1, [r1]
subs r0, r1
strh r0, [r2]
ldr r0, _080C20F8 @ =0x00003e1c
adds r2, r3, r0
adds r4, 0x2
adds r1, r3, r4
ldrh r0, [r2]
ldrh r1, [r1]
subs r0, r1
strh r0, [r2]
ldrb r0, [r5]
subs r0, 0x1
strb r0, [r5]
ldr r0, [r6]
ldr r2, _080C20FC @ =0x00003e14
adds r1, r0, r2
ldrh r0, [r1]
cmp r0, 0
beq _080C2086
subs r0, 0x1
_080C2084:
strh r0, [r1]
_080C2086:
ldr r4, [r6]
ldr r1, _080C20E8 @ =0x00003e16
adds r0, r4, r1
ldrh r0, [r0]
ldr r5, _080C2100 @ =0xffff0000
ldr r2, [sp]
ands r2, r5
orrs r2, r0
str r2, [sp]
adds r1, 0x2
adds r0, r4, r1
ldrh r1, [r0]
lsls r1, 16
ldr r3, _080C2104 @ =0x0000ffff
adds r0, r3, 0
ands r0, r2
orrs r0, r1
str r0, [sp]
ldr r2, _080C20F4 @ =0x00003e1a
adds r4, r2
ldrh r0, [r4]
ldr r1, [sp, 0x4]
ands r1, r5
orrs r1, r0
str r1, [sp, 0x4]
ldr r0, [r6]
ldr r4, _080C20F8 @ =0x00003e1c
adds r0, r4
ldrh r0, [r0]
lsls r0, 16
ands r3, r1
orrs r3, r0
str r3, [sp, 0x4]
movs r0, 0x1
mov r1, sp
bl sub_80C4CF0
ldr r0, [r6]
ldr r1, _080C20FC @ =0x00003e14
adds r0, r1
ldrh r0, [r0]
bl sub_80C4C48
movs r0, 0
_080C20DE:
add sp, 0x8
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_080C20E8: .4byte 0x00003e16
_080C20EC: .4byte 0x00003e1e
_080C20F0: .4byte 0x00003e18
_080C20F4: .4byte 0x00003e1a
_080C20F8: .4byte 0x00003e1c
_080C20FC: .4byte 0x00003e14
_080C2100: .4byte 0xffff0000
_080C2104: .4byte 0x0000ffff
thumb_func_end sub_80C1F80
thumb_func_start nullsub_63
nullsub_63: @ 80C2108
bx lr
thumb_func_end nullsub_63
thumb_func_start sub_80C210C
sub_80C210C: @ 80C210C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x28
adds r5, r0, 0
lsls r5, 24
lsls r1, 24
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
ldr r0, _080C21E0 @ =gUnknown_20399E0
mov r9, r0
ldr r6, [r0]
lsrs r5, 22
adds r6, r5
ldr r0, [r6]
str r0, [sp, 0x18]
movs r3, 0x80
lsls r3, 3
mov r10, r3
add r0, sp, 0x18
lsls r3, r1, 16
mov r4, r10
orrs r3, r4
str r3, [r0, 0x4]
ldr r3, _080C21E4 @ =gUnknown_83EF3A4
str r3, [sp, 0x20]
ldr r4, _080C21E8 @ =0xffff0000
add r7, sp, 0x20
mov r8, r7
ldr r3, [r7, 0x4]
ands r3, r4
orrs r3, r2
str r3, [r7, 0x4]
mov r3, sp
movs r4, 0
strh r1, [r3]
strh r2, [r3, 0x2]
ldr r3, _080C21EC @ =gUnknown_83F1C20
str r3, [sp, 0x4]
ldr r3, _080C21F0 @ =gUnknown_83F1C30
str r3, [sp, 0x8]
str r4, [sp, 0xC]
ldr r3, _080C21F4 @ =gDummySpriteAffineAnimTable
str r3, [sp, 0x10]
ldr r3, _080C21F8 @ =nullsub_63
str r3, [sp, 0x14]
ldr r3, [r6]
movs r4, 0x81
lsls r4, 3
adds r3, r4
strh r1, [r3]
ldr r1, [r6]
ldr r7, _080C21FC @ =0x0000040a
adds r1, r7
strh r2, [r1]
bl LoadSpriteSheet
mov r0, r8
bl LoadSpritePalette
mov r1, r9
ldr r0, [r1]
adds r0, r5
ldr r0, [r0]
ldr r2, _080C2200 @ =0x00000404
adds r1, r0, r2
movs r3, 0
ldrsh r1, [r1, r3]
subs r4, 0x2
adds r0, r4
movs r7, 0
ldrsh r2, [r0, r7]
mov r0, sp
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r2, r9
ldr r1, [r2]
adds r1, r5
ldr r2, [r1]
add r2, r10
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, _080C2204 @ =gSprites
adds r1, r0
str r1, [r2]
adds r1, 0x3E
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
add sp, 0x28
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080C21E0: .4byte gUnknown_20399E0
_080C21E4: .4byte gUnknown_83EF3A4
_080C21E8: .4byte 0xffff0000
_080C21EC: .4byte gUnknown_83F1C20
_080C21F0: .4byte gUnknown_83F1C30
_080C21F4: .4byte gDummySpriteAffineAnimTable
_080C21F8: .4byte nullsub_63
_080C21FC: .4byte 0x0000040a
_080C2200: .4byte 0x00000404
_080C2204: .4byte gSprites
thumb_func_end sub_80C210C
thumb_func_start sub_80C2208
sub_80C2208: @ 80C2208
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
mov r9, r1
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r4, _080C22A4 @ =gUnknown_20399E0
ldr r0, _080C22A8 @ =0x00000cd4
bl AllocZeroed
str r0, [r4]
movs r6, 0
_080C2224:
ldr r0, _080C22AC @ =0x0000040c
bl AllocZeroed
adds r5, r0, 0
ldr r7, _080C22A4 @ =gUnknown_20399E0
ldr r4, [r7]
lsls r0, r6, 2
adds r4, r0
str r5, [r4]
adds r0, r6, 0
movs r1, 0x3
bl __udivsi3
lsls r0, 24
lsrs r0, 19
adds r0, 0x68
ldr r1, _080C22B0 @ =0x00000404
adds r5, r1
strh r0, [r5]
ldr r4, [r4]
adds r0, r6, 0
movs r1, 0x3
bl __umodsi3
lsls r0, 24
lsrs r0, 18
adds r0, 0x28
ldr r2, _080C22B4 @ =0x00000406
adds r4, r2
strh r0, [r4]
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x5
bls _080C2224
movs r0, 0
bl sub_80C4AAC
bl sub_80C4BE4
bl sub_80C24BC
movs r0, 0x1
bl sub_80C0A88
ldr r0, [r7]
ldr r1, _080C22B8 @ =0x00000cc8
adds r0, r1
mov r2, r9
str r2, [r0]
ldr r1, _080C22BC @ =gTasks
mov r2, r8
lsls r0, r2, 2
add r0, r8
lsls r0, 3
adds r0, r1
ldr r1, _080C22C0 @ =sub_80C267C
str r1, [r0]
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080C22A4: .4byte gUnknown_20399E0
_080C22A8: .4byte 0x00000cd4
_080C22AC: .4byte 0x0000040c
_080C22B0: .4byte 0x00000404
_080C22B4: .4byte 0x00000406
_080C22B8: .4byte 0x00000cc8
_080C22BC: .4byte gTasks
_080C22C0: .4byte sub_80C267C
thumb_func_end sub_80C2208
thumb_func_start sub_80C22C4
sub_80C22C4: @ 80C22C4
push {r4-r7,lr}
lsls r0, 24
lsrs r2, r0, 24
lsls r1, 24
lsrs r4, r1, 24
cmp r2, 0x6
bne _080C2310
movs r3, 0
ldr r7, _080C230C @ =gUnknown_20399E0
movs r6, 0x80
lsls r6, 3
movs r1, 0x1
adds r0, r4, 0
ands r0, r1
lsls r4, r0, 2
movs r5, 0x5
negs r5, r5
_080C22E6:
ldr r0, [r7]
lsls r1, r3, 2
adds r0, r1
ldr r0, [r0]
adds r0, r6
ldr r1, [r0]
adds r1, 0x3E
ldrb r2, [r1]
adds r0, r5, 0
ands r0, r2
orrs r0, r4
strb r0, [r1]
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x5
bls _080C22E6
b _080C2338
.align 2, 0
_080C230C: .4byte gUnknown_20399E0
_080C2310:
ldr r0, _080C2340 @ =gUnknown_20399E0
ldr r0, [r0]
lsls r1, r2, 2
adds r0, r1
ldr r0, [r0]
movs r1, 0x80
lsls r1, 3
adds r0, r1
ldr r2, [r0]
adds r2, 0x3E
movs r0, 0x1
adds r1, r4, 0
ands r1, r0
lsls r1, 2
ldrb r3, [r2]
movs r0, 0x5
negs r0, r0
ands r0, r3
orrs r0, r1
strb r0, [r2]
_080C2338:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080C2340: .4byte gUnknown_20399E0
thumb_func_end sub_80C22C4
thumb_func_start sub_80C2344
sub_80C2344: @ 80C2344
push {lr}
src/region_map.c
+145 -4
View File
@@ -112,10 +112,28 @@ struct UnkStruct_20399DC
u16 field_3E24;
}; // size = 0x3E28
struct UnkStruct_20399E0_000
{
u16 field_000[0x200];
struct Sprite * field_400;
s16 field_404;
s16 field_406;
u16 field_408;
u16 field_40A;
};
struct UnkStruct_20399E0
{
struct UnkStruct_20399E0_000 * field_000[6];
u8 filler_018[0xCB0];
TaskFunc field_CC8;
u8 filler_CCC[0x8];
}; // size = 0xCD4
EWRAM_DATA struct UnkStruct_20399D4 * gUnknown_20399D4 = NULL;
EWRAM_DATA struct UnkStruct_20399D8 * gUnknown_20399D8 = NULL;
EWRAM_DATA struct UnkStruct_20399DC * gUnknown_20399DC = NULL;
EWRAM_DATA void * gUnknown_20399E0 = NULL;
EWRAM_DATA struct UnkStruct_20399E0 * gUnknown_20399E0 = NULL;
EWRAM_DATA void * gUnknown_20399E4 = NULL;
EWRAM_DATA void * gUnknown_20399E8 = NULL;
EWRAM_DATA void * gUnknown_20399EC = NULL;
@@ -161,7 +179,7 @@ void sub_80C1BE0(u8 taskId);
void sub_80C1E14(u8 taskId);
void sub_80C1E94(void);
void sub_80C1E78(u8 bgId, const u16 * tilemap);
bool8 sub_80C1F80(u8 a0);
bool8 sub_80C1F80(bool8 a0);
void sub_80C4AAC(u8 a0);
void sub_80C4BE4(void);
void sub_80C4C2C(u8 a0, u16 a1, u16 a2);
@@ -172,6 +190,8 @@ void sub_80C4C88(u16 a0);
void sub_80C4C9C(u8 a0, u8 a1);
void sub_80C4CF0(u8 a0, const struct UnkStruct_80C4CF0 *a1);
void sub_80C2208(u8 taskId, TaskFunc taskFunc);
void sub_80C24BC(void);
void sub_80C267C(u8 taskId);
void sub_80C25BC(void);
void sub_80C2C1C(u8 taskId);
void sub_80C3008(u16 a0, u16 a1);
@@ -203,6 +223,7 @@ u16 sub_80C3580(void);
extern const u16 gUnknown_83EF23C[];
extern const u16 gUnknown_83EF2DC[];
extern const u16 gUnknown_83EF384[];
extern const u16 gUnknown_83EF3A4[];
extern const u32 gUnknown_83EF3C4[];
extern const u32 gUnknown_83EF450[];
extern const u32 gUnknown_83EF61C[];
@@ -227,6 +248,8 @@ extern const struct UnkStruct_80C4CF0 gUnknown_83F1B0C[3];
extern const struct OamData gUnknown_83F1B24;
extern const union AnimCmd *const gUnknown_83F1B38[];
extern const struct UnkStruct_83F1B3C gUnknown_83F1B3C[];
extern const struct OamData gUnknown_83F1C20;
extern const union AnimCmd *const gUnknown_83F1C30[];
extern const u8 *const gUnknown_83F1CAC[];
static void RegionMap_DarkenPalette(u16 *pal, u16 size, u16 tint)
@@ -1309,14 +1332,14 @@ void sub_80C1A94(u8 taskId)
gUnknown_20399DC->field_3D48++;
break;
case 6:
if (sub_80C1F80(0) == TRUE)
if (sub_80C1F80(FALSE) == TRUE)
gUnknown_20399DC->field_3D48++;
break;
case 7:
gTasks[taskId].func = sub_80C1BE0;
break;
case 8:
if (sub_80C1F80(1) == TRUE)
if (sub_80C1F80(TRUE) == TRUE)
{
gUnknown_20399DC->field_3D48++;
}
@@ -1427,3 +1450,121 @@ void sub_80C1E94(void)
gUnknown_20399DC->field_3E22 = (0xE0 - gUnknown_20399DC->field_3E1A) / 8;
gUnknown_20399DC->field_3E24 = (0x88 - gUnknown_20399DC->field_3E1C) / 8;
}
bool8 sub_80C1F80(bool8 a0)
{
struct UnkStruct_80C4CF0 data;
if (!a0)
{
if (gUnknown_20399DC->field_3D4B < 8)
{
gUnknown_20399DC->field_3E16 += gUnknown_20399DC->field_3E1E;
gUnknown_20399DC->field_3E18 += gUnknown_20399DC->field_3E20;
gUnknown_20399DC->field_3E1A += gUnknown_20399DC->field_3E22;
gUnknown_20399DC->field_3E1C += gUnknown_20399DC->field_3E24;
gUnknown_20399DC->field_3D4B++;
if (gUnknown_20399DC->field_3E14 < 6)
gUnknown_20399DC->field_3E14++;
}
else
{
return TRUE;
}
}
else
{
if (gUnknown_20399DC->field_3D4B == 0)
{
return TRUE;
}
else
{
gUnknown_20399DC->field_3E16 -= gUnknown_20399DC->field_3E1E;
gUnknown_20399DC->field_3E18 -= gUnknown_20399DC->field_3E20;
gUnknown_20399DC->field_3E1A -= gUnknown_20399DC->field_3E22;
gUnknown_20399DC->field_3E1C -= gUnknown_20399DC->field_3E24;
gUnknown_20399DC->field_3D4B--;
if (gUnknown_20399DC->field_3E14 > 0)
gUnknown_20399DC->field_3E14--;
}
}
data.v0 = gUnknown_20399DC->field_3E16;
data.v2 = gUnknown_20399DC->field_3E18;
data.v4 = gUnknown_20399DC->field_3E1A;
data.v6 = gUnknown_20399DC->field_3E1C;
sub_80C4CF0(1, &data);
sub_80C4C48(gUnknown_20399DC->field_3E14);
return FALSE;
}
void nullsub_63(struct Sprite * sprite)
{
}
void sub_80C210C(u8 a0, u8 a1, u8 a2)
{
u8 spriteId;
struct SpriteSheet spriteSheet = {
.data = gUnknown_20399E0->field_000[a0],
.size = 0x400,
.tag = a1
};
struct SpritePalette spritePalette = {
.data = gUnknown_83EF3A4,
.tag = a2
};
struct SpriteTemplate template = {
.tileTag = a1,
.paletteTag = a2,
.oam = &gUnknown_83F1C20,
.anims = gUnknown_83F1C30,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = nullsub_63
};
gUnknown_20399E0->field_000[a0]->field_408 = a1;
gUnknown_20399E0->field_000[a0]->field_40A = a2;
LoadSpriteSheet(&spriteSheet);
LoadSpritePalette(&spritePalette);
spriteId = CreateSprite(&template, gUnknown_20399E0->field_000[a0]->field_404, gUnknown_20399E0->field_000[a0]->field_406, 0);
gUnknown_20399E0->field_000[a0]->field_400 = &gSprites[spriteId];
gSprites[spriteId].invisible = TRUE;
}
void sub_80C2208(u8 taskId, TaskFunc taskFunc)
{
u8 i;
gUnknown_20399E0 = AllocZeroed(sizeof(struct UnkStruct_20399E0));
for (i = 0; i < 6; i++)
{
gUnknown_20399E0->field_000[i] = AllocZeroed(sizeof(struct UnkStruct_20399E0_000));
gUnknown_20399E0->field_000[i]->field_404 = 32 * (i / 3) + 0x68;
gUnknown_20399E0->field_000[i]->field_406 = 64 * (i % 3) + 0x28;
}
sub_80C4AAC(0);
sub_80C4BE4();
sub_80C24BC();
sub_80C0A88(1);
gUnknown_20399E0->field_CC8 = taskFunc;
gTasks[taskId].func = sub_80C267C;
}
void sub_80C22C4(u8 a0, bool8 a1)
{
u8 i;
if (a0 == 6)
{
for (i = 0; i < 6; i++)
{
gUnknown_20399E0->field_000[i]->field_400->invisible = a1;
}
}
else
{
gUnknown_20399E0->field_000[a0]->field_400->invisible = a1;
}
}