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

through sub_80C144C

Browse Source
This commit is contained in:
PikalaxALT
2020-01-03 11:00:37 -05:00
parent 20c5160bf7
commit e2fb677742
3 changed files with 194 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/region_map.s
-465
View File
@@ -5,471 +5,6 @@
.text
thumb_func_start sub_80C1098
sub_80C1098: @ 80C1098
push {r4,r5,lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _080C10BC @ =gUnknown_20399D8
ldr r0, [r1]
ldr r3, _080C10C0 @ =0x00001cc8
adds r0, r3
ldrb r0, [r0]
adds r4, r1, 0
cmp r0, 0xC
bls _080C10B0
b _080C1274
_080C10B0:
lsls r0, 2
ldr r1, _080C10C4 @ =_080C10C8
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080C10BC: .4byte gUnknown_20399D8
_080C10C0: .4byte 0x00001cc8
_080C10C4: .4byte _080C10C8
.align 2, 0
_080C10C8:
.4byte _080C10FC
.4byte _080C111C
.4byte _080C112E
.4byte _080C1146
.4byte _080C115C
.4byte _080C1168
.4byte _080C1180
.4byte _080C1192
.4byte _080C11B0
.4byte _080C11BE
.4byte _080C1220
.4byte _080C1236
.4byte _080C1254
_080C10FC:
bl sub_80C08E0
ldr r0, _080C1110 @ =gUnknown_8418EBC
bl sub_80C4E18
ldr r0, _080C1114 @ =gUnknown_20399D8
ldr r1, [r0]
ldr r0, _080C1118 @ =0x00001cc8
adds r1, r0
b _080C1262
.align 2, 0
_080C1110: .4byte gUnknown_8418EBC
_080C1114: .4byte gUnknown_20399D8
_080C1118: .4byte 0x00001cc8
_080C111C:
ldr r1, [r4]
movs r2, 0x80
lsls r2, 5
movs r0, 0x2
movs r3, 0
bl LoadBgTiles
ldr r1, [r4]
b _080C125E
_080C112E:
ldr r1, [r4]
movs r0, 0x80
lsls r0, 5
adds r1, r0
movs r0, 0x2
bl sub_80C1324
movs r0, 0x2
bl CopyBgTilemapBufferToVram
ldr r1, [r4]
b _080C125E
_080C1146:
bl sub_80C0CA0
ldr r0, _080C1154 @ =gUnknown_20399D8
ldr r1, [r0]
ldr r0, _080C1158 @ =0x00001cc8
adds r1, r0
b _080C1262
.align 2, 0
_080C1154: .4byte gUnknown_20399D8
_080C1158: .4byte 0x00001cc8
_080C115C:
bl sub_80C0FE0
movs r0, 0x2
bl ShowBg
b _080C125A
_080C1168:
bl sub_80C08F4
ldr r0, _080C1178 @ =gUnknown_20399D8
ldr r1, [r0]
ldr r0, _080C117C @ =0x00001cc8
adds r1, r0
b _080C1262
.align 2, 0
_080C1178: .4byte gUnknown_20399D8
_080C117C: .4byte 0x00001cc8
_080C1180:
bl sub_80C1014
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080C127A
bl sub_80C1390
b _080C125A
_080C1192:
bl sub_80C144C
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080C127A
ldr r0, _080C11A8 @ =gUnknown_20399D8
ldr r1, [r0]
ldr r0, _080C11AC @ =0x00001cc8
adds r1, r0
b _080C1262
.align 2, 0
_080C11A8: .4byte gUnknown_20399D8
_080C11AC: .4byte 0x00001cc8
_080C11B0:
bl sub_80C16D0
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080C127A
b _080C125A
_080C11BE:
bl sub_80C1478
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080C127A
ldr r5, _080C1214 @ =gUnknown_20399D8
ldr r0, [r5]
ldr r4, _080C1218 @ =0x00001cca
adds r0, r4
ldrb r0, [r0]
bl sub_80C0E48
bl sub_80C0E34
ldr r1, [r5]
adds r1, r4
lsls r0, 24
lsrs r0, 24
ldrb r1, [r1]
cmp r0, r1
bne _080C120C
movs r0, 0
bl sub_80C4324
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
movs r1, 0x19
movs r2, 0
bl sub_80C48BC
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
movs r1, 0x19
movs r2, 0
bl sub_80C4960
_080C120C:
ldr r1, [r5]
ldr r0, _080C121C @ =0x00001cc8
adds r1, r0
b _080C1262
.align 2, 0
_080C1214: .4byte gUnknown_20399D8
_080C1218: .4byte 0x00001cca
_080C121C: .4byte 0x00001cc8
_080C1220:
bl sub_80C12EC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080C127A
bl sub_80C1880
bl sub_80C0FE0
b _080C125A
_080C1236:
bl sub_80C1058
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080C127A
ldr r0, _080C124C @ =gUnknown_20399D8
ldr r1, [r0]
ldr r0, _080C1250 @ =0x00001cc8
adds r1, r0
b _080C1262
.align 2, 0
_080C124C: .4byte gUnknown_20399D8
_080C1250: .4byte 0x00001cc8
_080C1254:
movs r0, 0
bl sub_80C3154
_080C125A:
ldr r0, _080C126C @ =gUnknown_20399D8
ldr r1, [r0]
_080C125E:
ldr r3, _080C1270 @ =0x00001cc8
adds r1, r3
_080C1262:
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
b _080C127A
.align 2, 0
_080C126C: .4byte gUnknown_20399D8
_080C1270: .4byte 0x00001cc8
_080C1274:
adds r0, r2, 0
bl sub_80C1280
_080C127A:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_80C1098
thumb_func_start sub_80C1280
sub_80C1280: @ 80C1280
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r2, _080C12D4 @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r4, _080C12D8 @ =gUnknown_20399D8
ldr r0, [r4]
ldr r2, _080C12DC @ =0x00001cd0
adds r0, r2
ldr r0, [r0]
str r0, [r1]
movs r0, 0x2
bl HideBg
ldr r0, _080C12E0 @ =gUnknown_8418EB5
bl sub_80C4E18
ldr r0, _080C12E4 @ =gUnknown_8418EA7
bl sub_80C4E74
bl sub_80C0AB8
bl sub_80C0B9C
ldr r1, _080C12E8 @ =gUnknown_83F1B0C+16
movs r0, 0
bl sub_80C4CF0
ldr r0, [r4]
cmp r0, 0
beq _080C12CC
bl Free
movs r0, 0
str r0, [r4]
_080C12CC:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080C12D4: .4byte gTasks
_080C12D8: .4byte gUnknown_20399D8
_080C12DC: .4byte 0x00001cd0
_080C12E0: .4byte gUnknown_8418EB5
_080C12E4: .4byte gUnknown_8418EA7
_080C12E8: .4byte gUnknown_83F1B0C+16
thumb_func_end sub_80C1280
thumb_func_start sub_80C12EC
sub_80C12EC: @ 80C12EC
push {lr}
ldr r0, _080C1308 @ =gUnknown_20399D8
ldr r0, [r0]
ldr r2, _080C130C @ =0x00001cdc
adds r1, r0, r2
ldrh r0, [r1]
cmp r0, 0
bne _080C1310
movs r0, 0x54
movs r1, 0
bl SetGpuReg
movs r0, 0x1
b _080C131E
.align 2, 0
_080C1308: .4byte gUnknown_20399D8
_080C130C: .4byte 0x00001cdc
_080C1310:
subs r0, 0x1
strh r0, [r1]
ldrh r1, [r1]
movs r0, 0x54
bl SetGpuReg
movs r0, 0
_080C131E:
pop {r1}
bx r1
thumb_func_end sub_80C12EC
thumb_func_start sub_80C1324
sub_80C1324: @ 80C1324
push {r4-r7,lr}
adds r7, r1, 0
lsls r0, 24
ldr r1, _080C1360 @ =gUnknown_20399D4
lsrs r0, 12
ldr r2, _080C1364 @ =0x00001796
adds r0, r2
ldr r1, [r1]
adds r6, r1, r0
movs r1, 0
_080C1338:
movs r2, 0
lsls r5, r1, 16
asrs r1, r5, 16
lsls r3, r1, 5
lsls r0, r1, 4
subs r0, r1
lsls r4, r0, 1
_080C1346:
lsls r0, r2, 16
asrs r1, r0, 16
adds r2, r0, 0
cmp r1, 0x1D
bgt _080C1368
adds r0, r3, r1
lsls r0, 1
adds r0, r6
adds r1, r4, r1
lsls r1, 1
adds r1, r7
ldrh r1, [r1]
b _080C1370
.align 2, 0
_080C1360: .4byte gUnknown_20399D4
_080C1364: .4byte 0x00001796
_080C1368:
adds r0, r3, r1
lsls r0, 1
adds r0, r6
ldrh r1, [r7]
_080C1370:
strh r1, [r0]
movs r1, 0x80
lsls r1, 9
adds r0, r2, r1
lsrs r2, r0, 16
asrs r0, 16
cmp r0, 0x1F
ble _080C1346
adds r0, r5, r1
lsrs r1, r0, 16
asrs r0, 16
cmp r0, 0x13
ble _080C1338
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80C1324
thumb_func_start sub_80C1390
sub_80C1390: @ 80C1390
push {r4,r5,lr}
sub sp, 0x8
ldr r0, _080C1428 @ =gUnknown_20399D8
ldr r2, [r0]
ldr r1, _080C142C @ =0x00001cd4
adds r0, r2, r1
movs r1, 0x48
strh r1, [r0]
ldr r5, _080C1430 @ =0xffff0000
ldr r0, [sp]
ands r0, r5
orrs r0, r1
str r0, [sp]
ldr r0, _080C1434 @ =0x00001cce
adds r3, r2, r0
ldr r1, _080C1438 @ =0x00001cca
adds r0, r2, r1
ldrb r1, [r0]
lsls r1, 2
ldrh r3, [r3]
adds r1, r3
lsls r1, 3
ldr r0, _080C143C @ =0x00001cd6
adds r4, r2, r0
strh r1, [r4]
lsls r1, 16
ldr r3, _080C1440 @ =0x0000ffff
ldr r0, [sp]
ands r0, r3
orrs r0, r1
str r0, [sp]
ldr r1, _080C1444 @ =0x00001cd8
adds r0, r2, r1
movs r1, 0xA8
strh r1, [r0]
ldr r0, [sp, 0x4]
ands r0, r5
orrs r0, r1
str r0, [sp, 0x4]
ldrh r1, [r4]
adds r1, 0x20
ldr r0, _080C1448 @ =0x00001cda
adds r2, r0
strh r1, [r2]
ands r1, r3
lsls r1, 16
ldr r0, [sp, 0x4]
ands r0, r3
orrs r0, r1
str r0, [sp, 0x4]
bl sub_80C4BE4
movs r0, 0
movs r1, 0x15
movs r2, 0xC0
bl sub_80C4C2C
movs r0, 0x1F
movs r1, 0x15
bl sub_80C4C74
movs r0, 0x3F
bl sub_80C4C88
movs r0, 0x1
movs r1, 0
bl sub_80C4C9C
movs r0, 0x1
mov r1, sp
bl sub_80C4CF0
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080C1428: .4byte gUnknown_20399D8
_080C142C: .4byte 0x00001cd4
_080C1430: .4byte 0xffff0000
_080C1434: .4byte 0x00001cce
_080C1438: .4byte 0x00001cca
_080C143C: .4byte 0x00001cd6
_080C1440: .4byte 0x0000ffff
_080C1444: .4byte 0x00001cd8
_080C1448: .4byte 0x00001cda
thumb_func_end sub_80C1390
thumb_func_start sub_80C144C
sub_80C144C: @ 80C144C
push {lr}
ldr r0, _080C1460 @ =gUnknown_20399D8
ldr r0, [r0]
ldr r2, _080C1464 @ =0x00001cdc
adds r1, r0, r2
ldrh r0, [r1]
cmp r0, 0x5
bls _080C1468
movs r0, 0x1
b _080C1474
.align 2, 0
_080C1460: .4byte gUnknown_20399D8
_080C1464: .4byte 0x00001cdc
_080C1468:
adds r0, 0x1
strh r0, [r1]
ldrh r0, [r1]
bl sub_80C4C48
movs r0, 0
_080C1474:
pop {r1}
bx r1
thumb_func_end sub_80C144C
thumb_func_start sub_80C1478
sub_80C1478: @ 80C1478
push {r4-r7,lr}
include/strings.h
+1
View File
@@ -1010,5 +1010,6 @@ extern const u8 gUnknown_8418E8D[];
extern const u8 gUnknown_8418E95[];
extern const u8 gUnknown_8418EA7[];
extern const u8 gUnknown_8418EB0[];
extern const u8 gUnknown_8418EBC[];
#endif //GUARD_STRINGS_H
src/region_map.c
+193 -13
View File
@@ -46,7 +46,7 @@ struct UnkStruct_20399D4
struct UnkStruct_20399D8
{
u8 field_0000[0x1000];
u8 field_1000[0x4B0];
u16 field_1000[0x258];
u8 filler_14B0[0x408];
u16 field_18B8;
u8 filler_18BA[0x40A];
@@ -60,9 +60,18 @@ struct UnkStruct_20399D8
u8 field_1CCD;
u16 field_1CCE;
TaskFunc field_1CD0;
u8 filler_1CD4[0xC];
u16 field_1CD4[4];
u16 field_1CDC;
}; // size = 0x1CE0
struct UnkStruct_80C4CF0
{
u16 v0;
u16 v2;
u16 v4;
u16 v6;
};
EWRAM_DATA struct UnkStruct_20399D4 * gUnknown_20399D4 = NULL;
EWRAM_DATA struct UnkStruct_20399D8 * gUnknown_20399D8 = NULL;
EWRAM_DATA void * gUnknown_20399DC = NULL;
@@ -91,7 +100,19 @@ void sub_80C0AB8(void);
void sub_80C0B18(void);
void sub_80C0B9C(void);
void sub_80C0BB0(void);
void sub_80C0CC8(u8 bg, u16 *map);
bool8 sub_80C0E04(u8 a0);
u8 sub_80C0E20(void);
void sub_80C0E70(u8 a0, u8 taskId, TaskFunc taskFunc);
void sub_80C1098(u8 taskId);
void sub_80C1280(u8 taskId);
bool8 sub_80C12EC(void);
void sub_80C1324(u8 bg, u16 *map);
void sub_80C1390(void);
bool8 sub_80C144C(void);
bool8 sub_80C1478(void);
bool8 sub_80C16D0(void);
void sub_80C1880(void);
void sub_80C4AAC(u8 a0);
void sub_80C4BE4(void);
void sub_80C4C2C(u8 a0, u16 a1, u16 a2);
@@ -100,11 +121,7 @@ void sub_80C4C5C(u16 a0);
void sub_80C4C74(u16 a0, u16 a1);
void sub_80C4C88(u16 a0);
void sub_80C4C9C(u8 a0, u8 a1);
void sub_80C0CC8(u8 bg, u16 *map);
void sub_80C4CF0(u8 a0, const u16 *a1);
bool8 sub_80C0E04(u8 a0);
u8 sub_80C0E20(void);
void sub_80C0E70(u8 a0, u8 taskId, TaskFunc taskFunc);
void sub_80C4CF0(u8 a0, const struct UnkStruct_80C4CF0 *a1);
void sub_80C195C(u8 a0, u8 taskId, TaskFunc taskFunc);
void sub_80C2208(u8 taskId, TaskFunc taskFunc);
void sub_80C25BC(void);
@@ -152,7 +169,7 @@ extern const struct WindowTemplate gUnknown_83F1A60[];
extern const u8 gUnknown_83F1A90[];
extern const u8 sSeviiMapsecs[3][30];
extern const u8 gUnknown_83F1B00[3][4];
extern const u16 gUnknown_83F1B0C[3][4];
extern const struct UnkStruct_80C4CF0 gUnknown_83F1B0C[3];
extern const u8 *const gUnknown_83F1A9C[];
extern const u8 *const gUnknown_83F1CAC[];
@@ -651,8 +668,8 @@ void sub_80C0AB8(void)
sub_80C4C48(6);
sub_80C4C74(0x39, 0x39);
sub_80C4C88(0x1b);
sub_80C4CF0(0, gUnknown_83F1B0C[0]);
sub_80C4CF0(1, gUnknown_83F1B0C[1]);
sub_80C4CF0(0, &gUnknown_83F1B0C[0]);
sub_80C4CF0(1, &gUnknown_83F1B0C[1]);
sub_80C4C9C(0, 0);
if (sub_80C3580() != MAPSEC_NONE)
sub_80C4C9C(1, 0);
@@ -664,7 +681,7 @@ void sub_80C0B18(void)
FillWindowPixelBuffer(0, PIXEL_FILL(0));
if (sub_80C3520() == MAPSEC_NONE)
{
sub_80C4CF0(0, gUnknown_83F1B0C[2]);
sub_80C4CF0(0, &gUnknown_83F1B0C[2]);
}
else
{
@@ -672,13 +689,13 @@ void sub_80C0B18(void)
AddTextPrinterParameterized3(0, 2, 2, 2, gUnknown_83F1A90, 0, gUnknown_20399D4->field_0000);
PutWindowTilemap(0);
CopyWindowToVram(0, 2);
sub_80C4CF0(0, gUnknown_83F1B0C[0]);
sub_80C4CF0(0, &gUnknown_83F1B0C[0]);
}
}
void sub_80C0B9C(void)
{
sub_80C4CF0(1, gUnknown_83F1B0C[1]);
sub_80C4CF0(1, &gUnknown_83F1B0C[1]);
}
void sub_80C0BB0(void)
@@ -843,3 +860,166 @@ bool8 sub_80C1058(void)
return TRUE;
}
}
void sub_80C1098(u8 taskId)
{
switch (gUnknown_20399D8->field_1CC8)
{
case 0:
sub_80C08E0();
sub_80C4E18(gUnknown_8418EBC);
gUnknown_20399D8->field_1CC8++;
break;
case 1:
LoadBgTiles(2, gUnknown_20399D8->field_0000, 0x1000, 0x000);
gUnknown_20399D8->field_1CC8++;
break;
case 2:
sub_80C1324(2, gUnknown_20399D8->field_1000);
CopyBgTilemapBufferToVram(2);
gUnknown_20399D8->field_1CC8++;
break;
case 3:
sub_80C0CA0();
gUnknown_20399D8->field_1CC8++;
break;
case 4:
sub_80C0FE0();
ShowBg(2);
gUnknown_20399D8->field_1CC8++;
break;
case 5:
sub_80C08F4();
gUnknown_20399D8->field_1CC8++;
break;
case 6:
if (sub_80C1014() == TRUE)
{
sub_80C1390();
gUnknown_20399D8->field_1CC8++;
}
break;
case 7:
if (sub_80C144C() == TRUE)
{
gUnknown_20399D8->field_1CC8++;
}
break;
case 8:
if (sub_80C16D0() == TRUE)
{
gUnknown_20399D8->field_1CC8++;
}
break;
case 9:
if (sub_80C1478() == TRUE)
{
sub_80C0E48(gUnknown_20399D8->field_1CCA);
if (sub_80C0E34() == gUnknown_20399D8->field_1CCA)
{
sub_80C4324(0);
sub_80C48BC(gUnknown_20399D8->field_1CCA, 25, 0);
sub_80C4960(gUnknown_20399D8->field_1CCA, 25, 0);
}
gUnknown_20399D8->field_1CC8++;
}
break;
case 10:
if (sub_80C12EC() == TRUE)
{
sub_80C1880();
sub_80C0FE0();
gUnknown_20399D8->field_1CC8++;
}
break;
case 11:
if (sub_80C1058() == TRUE)
{
gUnknown_20399D8->field_1CC8++;
}
break;
case 12:
sub_80C3154(0);
gUnknown_20399D8->field_1CC8++;
break;
default:
sub_80C1280(taskId);
break;
}
}
void sub_80C1280(u8 taskId)
{
gTasks[taskId].func = gUnknown_20399D8->field_1CD0;
HideBg(2);
sub_80C4E18(gUnknown_8418EB5);
sub_80C4E74(gUnknown_8418EA7);
sub_80C0AB8();
sub_80C0B9C();
sub_80C4CF0(0, &gUnknown_83F1B0C[2]);
if (gUnknown_20399D8 != NULL)
{
FREE_AND_SET_NULL(gUnknown_20399D8);
}
}
bool8 sub_80C12EC(void)
{
if (gUnknown_20399D8->field_1CDC != 0)
{
gUnknown_20399D8->field_1CDC--;
SetGpuReg(REG_OFFSET_BLDY, gUnknown_20399D8->field_1CDC);
return FALSE;
}
else
{
SetGpuReg(REG_OFFSET_BLDY, 0);
return TRUE;
}
}
void sub_80C1324(u8 bg, u16 *map)
{
s16 i;
s16 j;
u16 *buffer = gUnknown_20399D4->field_1796[bg];
for (i = 0; i < 20; i++)
{
for (j = 0; j < 32; j++)
{
if (j < 30)
buffer[32 * i + j] = map[30 * i + j];
else
buffer[32 * i + j] = map[0];
}
}
}
void sub_80C1390(void)
{
struct UnkStruct_80C4CF0 data;
data.v0 = gUnknown_20399D8->field_1CD4[0] = 0x48;
data.v2 = gUnknown_20399D8->field_1CD4[1] = 8 * (gUnknown_20399D8->field_1CCE + 4 * gUnknown_20399D8->field_1CCA);
data.v4 = gUnknown_20399D8->field_1CD4[2] = 0xA8;
data.v6 = gUnknown_20399D8->field_1CD4[3] = gUnknown_20399D8->field_1CD4[1] + 32;
sub_80C4BE4();
sub_80C4C2C(0, 0x15, 0xc0);
sub_80C4C74(0x1f, 0x15);
sub_80C4C88(0x3f);
sub_80C4C9C(1, 0);
sub_80C4CF0(1, &data);
}
bool8 sub_80C144C(void)
{
if (gUnknown_20399D8->field_1CDC < 6)
{
gUnknown_20399D8->field_1CDC++;
sub_80C4C48(gUnknown_20399D8->field_1CDC);
return FALSE;
}
else
{
return TRUE;
}
}