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

through sub_8114324

Browse Source
This commit is contained in:
PikalaxALT
2018-11-08 15:23:15 -05:00
parent 3e418d7a7b
commit 10900139e3
2 changed files with 222 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/quest_log.s
-277
View File
@@ -5,283 +5,6 @@
.text
thumb_func_start sub_811414C
sub_811414C: @ 811414C
push {r4,lr}
adds r4, r2, 0
lsls r0, 16
lsrs r0, 16
bl sub_8113DE0
adds r1, r0, 0
cmp r1, 0
beq _0811416A
ldrh r0, [r4]
strh r0, [r1]
ldrh r0, [r4, 0x4]
strh r0, [r1, 0x2]
adds r0, r1, 0x4
b _0811416C
_0811416A:
movs r0, 0
_0811416C:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_811414C
thumb_func_start sub_8114174
sub_8114174: @ 8114174
push {lr}
adds r3, r0, 0
adds r2, r1, 0
movs r0, 0x5
adds r1, r3, 0
bl sub_811414C
pop {r1}
bx r1
thumb_func_end sub_8114174
thumb_func_start sub_8114188
sub_8114188: @ 8114188
push {r4,r5,lr}
adds r1, r0, 0
movs r0, 0x5
bl sub_8113E88
adds r4, r0, 0
ldrh r0, [r4, 0x2]
ldr r1, _081141C0 @ =gStringVar1
movs r2, 0
bl QuestLog_AutoGetSpeciesName
ldr r5, _081141C4 @ =gStringVar2
ldrh r0, [r4]
bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
bl StringCopy
ldr r0, _081141C8 @ =gStringVar4
ldr r1, _081141CC @ =gUnknown_841AB74
bl StringExpandPlaceholders
adds r4, 0x4
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_081141C0: .4byte gStringVar1
_081141C4: .4byte gStringVar2
_081141C8: .4byte gStringVar4
_081141CC: .4byte gUnknown_841AB74
thumb_func_end sub_8114188
thumb_func_start sub_81141D0
sub_81141D0: @ 81141D0
push {lr}
adds r3, r0, 0
adds r2, r1, 0
movs r0, 0x6
adds r1, r3, 0
bl sub_811414C
pop {r1}
bx r1
thumb_func_end sub_81141D0
thumb_func_start sub_81141E4
sub_81141E4: @ 81141E4
push {r4,r5,lr}
adds r1, r0, 0
movs r0, 0x6
bl sub_8113E88
adds r4, r0, 0
ldrh r0, [r4, 0x2]
ldr r1, _0811421C @ =gStringVar1
movs r2, 0
bl QuestLog_AutoGetSpeciesName
ldr r5, _08114220 @ =gStringVar2
ldrh r0, [r4]
bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
bl StringCopy
ldr r0, _08114224 @ =gStringVar4
ldr r1, _08114228 @ =gUnknown_841AB8E
bl StringExpandPlaceholders
adds r4, 0x4
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_0811421C: .4byte gStringVar1
_08114220: .4byte gStringVar2
_08114224: .4byte gStringVar4
_08114228: .4byte gUnknown_841AB8E
thumb_func_end sub_81141E4
thumb_func_start sub_811422C
sub_811422C: @ 811422C
push {lr}
adds r3, r0, 0
adds r2, r1, 0
movs r0, 0x7
adds r1, r3, 0
bl sub_811414C
pop {r1}
bx r1
thumb_func_end sub_811422C
thumb_func_start sub_8114240
sub_8114240: @ 8114240
push {r4,r5,lr}
adds r1, r0, 0
movs r0, 0x7
bl sub_8113E88
adds r4, r0, 0
ldrh r0, [r4, 0x2]
ldr r1, _08114278 @ =gStringVar2
movs r2, 0
bl QuestLog_AutoGetSpeciesName
ldr r5, _0811427C @ =gStringVar1
ldrh r0, [r4]
bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
bl StringCopy
ldr r0, _08114280 @ =gStringVar4
ldr r1, _08114284 @ =gUnknown_841A6A5
bl StringExpandPlaceholders
adds r4, 0x4
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_08114278: .4byte gStringVar2
_0811427C: .4byte gStringVar1
_08114280: .4byte gStringVar4
_08114284: .4byte gUnknown_841A6A5
thumb_func_end sub_8114240
thumb_func_start sub_8114288
sub_8114288: @ 8114288
push {lr}
adds r3, r0, 0
adds r2, r1, 0
movs r0, 0x8
adds r1, r3, 0
bl sub_811414C
pop {r1}
bx r1
thumb_func_end sub_8114288
thumb_func_start sub_811429C
sub_811429C: @ 811429C
push {r4,r5,lr}
adds r1, r0, 0
movs r0, 0x8
bl sub_8113E88
adds r4, r0, 0
ldrh r0, [r4, 0x2]
ldr r1, _081142D4 @ =gStringVar1
movs r2, 0
bl QuestLog_AutoGetSpeciesName
ldr r5, _081142D8 @ =gStringVar2
ldrh r0, [r4]
bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
bl StringCopy
ldr r0, _081142DC @ =gStringVar4
ldr r1, _081142E0 @ =gUnknown_841A1CD
bl StringExpandPlaceholders
adds r4, 0x4
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_081142D4: .4byte gStringVar1
_081142D8: .4byte gStringVar2
_081142DC: .4byte gStringVar4
_081142E0: .4byte gUnknown_841A1CD
thumb_func_end sub_811429C
thumb_func_start sub_81142E4
sub_81142E4: @ 81142E4
push {r4,lr}
adds r4, r2, 0
lsls r0, 16
lsrs r0, 16
bl sub_8113DE0
adds r1, r0, 0
cmp r1, 0
beq _08114306
ldrh r0, [r4]
strh r0, [r1]
ldrh r0, [r4, 0x2]
strh r0, [r1, 0x2]
ldrh r0, [r4, 0x4]
strh r0, [r1, 0x4]
adds r0, r1, 0x6
b _08114308
_08114306:
movs r0, 0
_08114308:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81142E4
thumb_func_start sub_8114310
sub_8114310: @ 8114310
push {lr}
adds r3, r0, 0
adds r2, r1, 0
movs r0, 0x9
adds r1, r3, 0
bl sub_81142E4
pop {r1}
bx r1
thumb_func_end sub_8114310
thumb_func_start sub_8114324
sub_8114324: @ 8114324
push {r4,r5,lr}
adds r1, r0, 0
movs r0, 0x9
bl sub_8113E88
adds r4, r0, 0
ldrh r0, [r4, 0x4]
ldr r1, _0811436C @ =gStringVar1
movs r2, 0
bl QuestLog_AutoGetSpeciesName
ldr r5, _08114370 @ =gStringVar2
ldrh r0, [r4]
bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
bl StringCopy
ldr r5, _08114374 @ =gStringVar3
ldrh r0, [r4, 0x2]
bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
bl StringCopy
ldr r0, _08114378 @ =gStringVar4
ldr r1, _0811437C @ =gUnknown_841A193
bl StringExpandPlaceholders
adds r4, 0x6
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
.align 2, 0
_0811436C: .4byte gStringVar1
_08114370: .4byte gStringVar2
_08114374: .4byte gStringVar3
_08114378: .4byte gStringVar4
_0811437C: .4byte gUnknown_841A193
thumb_func_end sub_8114324
thumb_func_start sub_8114380
sub_8114380: @ 8114380
push {lr}
src/quest_log.c
+222 -5
View File
@@ -276,15 +276,130 @@ bool8 sub_81153E4(u16, void*);
extern const u8 gUnknown_841A155[];
extern const u8 gUnknown_841A16F[];
extern const u8 gUnknown_841B073[];
extern const u8 gUnknown_841AFA6[];
extern const u8 gUnknown_841A193[];
extern const u8 gUnknown_841A1CD[];
extern const u8 gUnknown_841A1E7[];
extern const u8 gUnknown_841A210[];
extern const u8 gUnknown_841A220[];
extern const u8 gUnknown_841A965[];
extern const u8 gUnknown_841A277[];
extern const u8 gUnknown_841A938[];
extern const u8 gUnknown_841A255[];
extern const u8 gUnknown_841A277[];
extern const u8 gUnknown_841A2B0[];
extern const u8 gUnknown_841A2E1[];
extern const u8 gUnknown_841A312[];
extern const u8 gUnknown_841A349[];
extern const u8 gUnknown_841A391[];
extern const u8 gUnknown_841A3DA[];
extern const u8 gUnknown_841A3FF[];
extern const u8 gUnknown_841A422[];
extern const u8 gUnknown_841A477[];
extern const u8 gUnknown_841A4C6[];
extern const u8 gUnknown_841A502[];
extern const u8 gUnknown_841A506[];
extern const u8 gUnknown_841A50B[];
extern const u8 gUnknown_841A53A[];
extern const u8 gUnknown_841A566[];
extern const u8 gUnknown_841A59C[];
extern const u8 gUnknown_841A5D9[];
extern const u8 gUnknown_841A5FA[];
extern const u8 gUnknown_841A60A[];
extern const u8 gUnknown_841A632[];
extern const u8 gUnknown_841A64F[];
extern const u8 gUnknown_841A66E[];
extern const u8 gUnknown_841A694[];
extern const u8 gUnknown_841A6A5[];
extern const u8 gUnknown_841A6E1[];
extern const u8 gUnknown_841A732[];
extern const u8 gUnknown_841A74E[];
extern const u8 gUnknown_841A756[];
extern const u8 gUnknown_841A762[];
extern const u8 gUnknown_841A76A[];
extern const u8 gUnknown_841A7B0[];
extern const u8 gUnknown_841A7DD[];
extern const u8 gUnknown_841A810[];
extern const u8 gUnknown_841A858[];
extern const u8 gUnknown_841A896[];
extern const u8 gUnknown_841A8D4[];
extern const u8 gUnknown_841A8DD[];
extern const u8 gUnknown_841A8E0[];
extern const u8 gUnknown_841A90C[];
extern const u8 gUnknown_841A938[];
extern const u8 gUnknown_841A965[];
extern const u8 gUnknown_841A9A9[];
extern const u8 gUnknown_841A9D4[];
extern const u8 gUnknown_841AA01[];
extern const u8 gUnknown_841AA2B[];
extern const u8 gUnknown_841AA76[];
extern const u8 gUnknown_841AAAA[];
extern const u8 gUnknown_841AAEC[];
extern const u8 gUnknown_841AB29[];
extern const u8 gUnknown_841AB74[];
extern const u8 gUnknown_841AB8E[];
extern const u8 gUnknown_841ABAB[];
extern const u8 gUnknown_841ABCD[];
extern const u8 gUnknown_841ABF9[];
extern const u8 gUnknown_841AC2A[];
extern const u8 gUnknown_841AC51[];
extern const u8 gUnknown_841AC93[];
extern const u8 gUnknown_841ACBC[];
extern const u8 gUnknown_841ACF9[];
extern const u8 gUnknown_841AD1D[];
extern const u8 gUnknown_841AD3C[];
extern const u8 gUnknown_841AD69[];
extern const u8 gUnknown_841AD9E[];
extern const u8 gUnknown_841ADC8[];
extern const u8 gUnknown_841ADFF[];
extern const u8 gUnknown_841AE1E[];
extern const u8 gUnknown_841AE48[];
extern const u8 gUnknown_841AE8F[];
extern const u8 gUnknown_841AEA7[];
extern const u8 gUnknown_841AEDC[];
extern const u8 gUnknown_841AF0C[];
extern const u8 gUnknown_841AF3E[];
extern const u8 gUnknown_841AF6D[];
extern const u8 gUnknown_841AF98[];
extern const u8 gUnknown_841AF9F[];
extern const u8 gUnknown_841AFA6[];
extern const u8 gUnknown_841AFD1[];
extern const u8 gUnknown_841AFD6[];
extern const u8 gUnknown_841B005[];
extern const u8 gUnknown_841B03F[];
extern const u8 gUnknown_841B064[];
extern const u8 gUnknown_841B073[];
extern const u8 gUnknown_841B09F[];
extern const u8 gUnknown_841B0A4[];
extern const u8 gUnknown_841B0B5[];
extern const u8 gUnknown_841B0B9[];
extern const u8 gUnknown_841B0CD[];
extern const u8 gUnknown_841B0DD[];
extern const u8 gUnknown_841B0F6[];
extern const u8 gUnknown_841B0FF[];
extern const u8 gUnknown_841B109[];
extern const u8 gUnknown_841B116[];
extern const u8 gUnknown_841B11F[];
extern const u8 gUnknown_841B130[];
extern const u8 gUnknown_841B141[];
extern const u8 gUnknown_841B14B[];
extern const u8 gUnknown_841B15A[];
extern const u8 gUnknown_841B166[];
extern const u8 gUnknown_841B172[];
extern const u8 gUnknown_841B180[];
extern const u8 gUnknown_841B190[];
extern const u8 gUnknown_841B1A3[];
extern const u8 gUnknown_841B1B7[];
extern const u8 gUnknown_841B1C7[];
extern const u8 gUnknown_841B1DA[];
extern const u8 gUnknown_841B1E5[];
extern const u8 gUnknown_841B1F4[];
extern const u8 gUnknown_841B200[];
extern const u8 gUnknown_841B20E[];
extern const u8 gUnknown_841B21C[];
extern const u8 gUnknown_841B226[];
extern const u8 gUnknown_841B236[];
extern const u8 gUnknown_841B246[];
extern const u8 gUnknown_841B25B[];
extern const u8 gUnknown_841B268[];
extern const u8 gUnknown_841B277[];
const struct WindowTemplate gUnknown_845661C[3] = {
{ 0, 0, 0, 30, 2, 15, 0x0e9 },
@@ -3633,3 +3748,105 @@ u16 * sub_8113FBC(u16 * a0)
}
return r5 + 3;
}
u16 * sub_811414C(u16 a0, u16 * a1, u16 * a2)
{
u16 * r1 = sub_8113DE0(a0, a1);
if (r1 == NULL)
return NULL;
r1[0] = a2[0];
r1[1] = a2[2];
return r1 + 2;
}
u16 * sub_8114174(u16 * a0, u16 * a1)
{
return sub_811414C(5, a0, a1);
}
u16 * sub_8114188(u16 * a0)
{
u16 * r4 = sub_8113E88(5, a0);
QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name);
StringExpandPlaceholders(gStringVar4, gUnknown_841AB74);
r4 += 2;
return r4;
}
u16 * sub_81141D0(u16 * a0, u16 * a1)
{
return sub_811414C(6, a0, a1);
}
u16 * sub_81141E4(u16 * a0)
{
u16 * r4 = sub_8113E88(6, a0);
QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name);
StringExpandPlaceholders(gStringVar4, gUnknown_841AB8E);
r4 += 2;
return r4;
}
u16 * sub_811422C(u16 * a0, u16 * a1)
{
return sub_811414C(7, a0, a1);
}
u16 * sub_8114240(u16 * a0)
{
u16 * r4 = sub_8113E88(7, a0);
QuestLog_AutoGetSpeciesName(r4[1], gStringVar2, 0);
StringCopy(gStringVar1, ItemId_GetItem(r4[0])->name);
StringExpandPlaceholders(gStringVar4, gUnknown_841A6A5);
r4 += 2;
return r4;
}
u16 * sub_8114288(u16 * a0, u16 * a1)
{
return sub_811414C(8, a0, a1);
}
u16 * sub_811429C(u16 * a0)
{
u16 * r4 = sub_8113E88(8, a0);
QuestLog_AutoGetSpeciesName(r4[1], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name);
StringExpandPlaceholders(gStringVar4, gUnknown_841A1CD);
r4 += 2;
return r4;
}
u16 * sub_81142E4(u16 a0, u16 * a1, u16 * a2)
{
u16 * r1 = sub_8113DE0(a0, a1);
if (r1 == NULL)
return NULL;
r1[0] = a2[0];
r1[1] = a2[1];
r1[2] = a2[2];
return r1 + 3;
}
u16 * sub_8114310(u16 * a0, u16 * a1)
{
return sub_81142E4(9, a0, a1);
}
u16 * sub_8114324(u16 * a0)
{
u16 * r4 = sub_8113E88(9, a0);
QuestLog_AutoGetSpeciesName(r4[2], gStringVar1, 0);
StringCopy(gStringVar2, ItemId_GetItem(r4[0])->name);
StringCopy(gStringVar3, ItemId_GetItem(r4[1])->name);
StringExpandPlaceholders(gStringVar4, gUnknown_841A193);
r4 += 3;
return r4;
}