Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-06-02 22:04:27 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

quest_log_battle, 2

Browse Source
This commit is contained in:
PikalaxALT 2018-11-23 21:55:21 -05:00
parent 91bfbfb9fb
commit d5d220bc5c
14 changed files with 105 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/battle_1.s
View File

@ -703,7 +703,7 @@ _0800F734:
movs r5, 0
movs r6, 0x3
_0800F744:
ldr r0, _0800F760 @ =gUnknown_2022744
ldr r0, _0800F760 @ =gLinkPlayers + 8
adds r1, r5, r0
subs r0, 0x8
adds r4, r5, r0
@ -717,7 +717,7 @@ _0800F744:
b _0800F7C2
.align 2, 0
_0800F75C: .4byte gBattleTypeFlags
_0800F760: .4byte gUnknown_2022744
_0800F760: .4byte gLinkPlayers + 8
_0800F764:
cmp r0, 0x2
beq _0800F790

8
asm/battle_message.s
View File

@ -1834,11 +1834,11 @@ _080D8162:
lsls r0, r7, 3
subs r0, r7
lsls r0, 2
ldr r1, _080D8170 @ =gUnknown_2022744
ldr r1, _080D8170 @ =gLinkPlayers + 8
adds r4, r0, r1
b _080D8382
.align 2, 0
_080D8170: .4byte gUnknown_2022744
_080D8170: .4byte gLinkPlayers + 8
_080D8174:
ldr r4, _080D8184 @ =gLinkPlayers
lsls r0, r7, 3
@ -1888,12 +1888,12 @@ _080D81C8:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r0, _080D81D8 @ =gUnknown_2022744
ldr r0, _080D81D8 @ =gLinkPlayers + 8
adds r4, r1, r0
b _080D8382
.align 2, 0
_080D81D4: .4byte gBattleScripting
_080D81D8: .4byte gUnknown_2022744
_080D81D8: .4byte gLinkPlayers + 8
_080D81DC:
ldr r0, _080D81E4 @ =gSaveBlock2Ptr
ldr r4, [r0]

4
asm/cable_club.s
View File

@ -2408,7 +2408,7 @@ sub_8081A34: @ 8081A34
lsls r1, r4, 3
subs r1, r4
lsls r1, 2
ldr r2, _08081A7C @ =gUnknown_2022744
ldr r2, _08081A7C @ =gLinkPlayers + 8
adds r1, r2
bl StringCopy
adds r0, r4, 0
@ -2429,7 +2429,7 @@ sub_8081A34: @ 8081A34
.align 2, 0
_08081A74: .4byte gUnknown_20370C4
_08081A78: .4byte gStringVar1
_08081A7C: .4byte gUnknown_2022744
_08081A7C: .4byte gLinkPlayers + 8
_08081A80: .4byte gStringVar2
_08081A84: .4byte gUnknown_83C6AB8
_08081A88:

4
asm/link_rfu_2.s
View File

@ -9954,7 +9954,7 @@ _080FD1C8:
subs r0, r4
lsls r0, 2
str r0, [sp, 0x1C]
ldr r2, _080FD24C @ =gUnknown_2022744
ldr r2, _080FD24C @ =gLinkPlayers + 8
mov r10, r2
ldr r6, _080FD250 @ =0x00003ba8
movs r4, 0
@ -10007,7 +10007,7 @@ _080FD22C:
ldr r6, [sp, 0x14]
b _080FD2A4
.align 2, 0
_080FD24C: .4byte gUnknown_2022744
_080FD24C: .4byte gLinkPlayers + 8
_080FD250: .4byte 0x00003ba8
_080FD254: .4byte gSaveBlock1Ptr
_080FD258:

8
asm/link_rfu_3.s
View File

@ -6293,7 +6293,7 @@ _08118ED6:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r4, _08118F24 @ =gUnknown_2022744
ldr r4, _08118F24 @ =gLinkPlayers + 8
adds r1, r4
adds r0, r5, 0
bl StringCopy
@ -6312,7 +6312,7 @@ _08118ED6:
bl _081198DA
.align 2, 0
_08118F20: .4byte gStringVar1
_08118F24: .4byte gUnknown_2022744
_08118F24: .4byte gLinkPlayers + 8
_08118F28: .4byte gStringVar4
_08118F2C: .4byte gUnknown_8457C20
_08118F30:
@ -6543,7 +6543,7 @@ _08119122:
movs r0, 0x21
strb r0, [r6, 0x14]
ldr r0, _08119154 @ =gStringVar1
ldr r4, _08119158 @ =gUnknown_2022760
ldr r4, _08119158 @ =gLinkPlayers + 0x24
adds r1, r4, 0
bl StringCopy
adds r0, r4, 0
@ -6562,7 +6562,7 @@ _08119122:
.align 2, 0
_08119150: .4byte sub_8117280
_08119154: .4byte gStringVar1
_08119158: .4byte gUnknown_2022760
_08119158: .4byte gLinkPlayers + 0x24
_0811915C: .4byte gStringVar4
_08119160: .4byte gUnknown_8457BCC
_08119164:

12
asm/link_rfu_4.s
View File

@ -1731,12 +1731,12 @@ _0814315C:
movs r0, 0xB
strb r0, [r5, 0x8]
ldr r0, _0814316C @ =gStringVar1
ldr r1, _08143170 @ =gUnknown_2022744
ldr r1, _08143170 @ =gLinkPlayers + 8
bl StringCopy
b _081435C6
.align 2, 0
_0814316C: .4byte gStringVar1
_08143170: .4byte gUnknown_2022744
_08143170: .4byte gLinkPlayers + 8
_08143174:
adds r4, r5, 0
adds r4, 0x9
@ -1847,7 +1847,7 @@ _08143242:
cmp r0, 0x1
bne _08143250
ldr r0, _0814325C @ =gStringVar1
ldr r1, _08143260 @ =gUnknown_2022744
ldr r1, _08143260 @ =gLinkPlayers + 8
bl StringCopy
_08143250:
movs r0, 0xF
@ -1856,7 +1856,7 @@ _08143250:
.align 2, 0
_08143258: .4byte gUnknown_841E7A3
_0814325C: .4byte gStringVar1
_08143260: .4byte gUnknown_2022744
_08143260: .4byte gLinkPlayers + 8
_08143264:
ldrb r1, [r5, 0xC]
ldrb r2, [r5, 0xD]
@ -2229,14 +2229,14 @@ _08143514:
_08143528:
bl task_add_05_task_del_08FA224_when_no_RfuFunc
ldr r0, _0814353C @ =gStringVar1
ldr r1, _08143540 @ =gUnknown_2022760
ldr r1, _08143540 @ =gLinkPlayers + 0x24
bl StringCopy
movs r0, 0x22
strb r0, [r5, 0x8]
b _081435C6
.align 2, 0
_0814353C: .4byte gStringVar1
_08143540: .4byte gUnknown_2022760
_08143540: .4byte gLinkPlayers + 0x24
_08143544:
bl sub_80FA4F8
lsls r0, 24

137
asm/quest_log_battle.s
View File

@ -5,143 +5,6 @@
.text
thumb_func_start sub_812C224
sub_812C224: @ 812C224
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0xC
ldr r4, _0812C2B8 @ =gBattleTypeFlags
ldr r0, [r4]
movs r1, 0x2
ands r0, r1
cmp r0, 0
beq _0812C31C
movs r0, 0x18
bl Alloc
adds r5, r0, 0
ldr r0, _0812C2BC @ =gUnknown_2023E8A
ldrb r0, [r0]
subs r0, 0x1
strb r0, [r5]
ldr r1, [r4]
movs r0, 0x40
ands r0, r1
cmp r0, 0
beq _0812C2C4
movs r0, 0xF
mov r8, r0
add r4, sp, 0x4
mov r0, sp
adds r1, r4, 0
bl sub_812C334
movs r3, 0
mov r9, r4
adds r1, r5, 0x1
mov r12, r1
adds r7, r5, 0
adds r7, 0x8
adds r6, r5, 0
adds r6, 0xF
ldr r4, _0812C2C0 @ =gUnknown_2022744
_0812C274:
mov r0, r12
adds r2, r0, r3
ldr r1, [sp]
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r3, r0
adds r0, r4
ldrb r0, [r0]
strb r0, [r2]
adds r2, r7, r3
ldr r1, [sp, 0x4]
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r3, r0
adds r0, r4
ldrb r0, [r0]
strb r0, [r2]
adds r2, r6, r3
mov r0, r9
ldr r1, [r0, 0x4]
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r3, r0
adds r0, r4
ldrb r0, [r0]
strb r0, [r2]
adds r3, 0x1
cmp r3, 0x6
ble _0812C274
b _0812C30E
.align 2, 0
_0812C2B8: .4byte gBattleTypeFlags
_0812C2BC: .4byte gUnknown_2023E8A
_0812C2C0: .4byte gUnknown_2022744
_0812C2C4:
movs r0, 0x1
ands r1, r0
cmp r1, 0
beq _0812C2D2
movs r1, 0xE
mov r8, r1
b _0812C2E2
_0812C2D2:
bl InUnionRoom
movs r1, 0xD
mov r8, r1
cmp r0, 0x1
bne _0812C2E2
movs r0, 0x13
mov r8, r0
_0812C2E2:
movs r3, 0
adds r4, r5, 0x1
ldr r1, _0812C32C @ =gUnknown_2022744
mov r12, r1
ldr r7, _0812C330 @ =gBattleStruct
movs r6, 0x1
_0812C2EE:
adds r2, r4, r3
ldr r0, [r7]
adds r0, 0xB5
ldrb r0, [r0]
adds r1, r6, 0
eors r1, r0
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
adds r0, r3, r0
add r0, r12
ldrb r0, [r0]
strb r0, [r2]
adds r3, 0x1
cmp r3, 0x6
ble _0812C2EE
_0812C30E:
mov r0, r8
adds r1, r5, 0
bl sub_8113550
adds r0, r5, 0
bl Free
_0812C31C:
add sp, 0xC
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0812C32C: .4byte gUnknown_2022744
_0812C330: .4byte gBattleStruct
thumb_func_end sub_812C224
thumb_func_start sub_812C334
sub_812C334: @ 812C334
push {r4-r6,lr}

28
asm/trade.s
View File

@ -664,7 +664,7 @@ _0804CB9C:
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
ldr r1, _0804CC20 @ =gUnknown_2022744
ldr r1, _0804CC20 @ =gLinkPlayers + 8
adds r0, r1
ldr r1, [r6, 0xC]
str r5, [sp]
@ -702,7 +702,7 @@ _0804CB9C:
_0804CC14: .4byte gSaveBlock2Ptr
_0804CC18: .4byte gUnknown_2031C94
_0804CC1C: .4byte gDecompressionBuffer
_0804CC20: .4byte gUnknown_2022744
_0804CC20: .4byte gLinkPlayers + 8
_0804CC24: .4byte gUnknown_8261ECC
_0804CC28: .4byte gMain
_0804CC2C: .4byte gUnknown_2031DA8
@ -762,7 +762,7 @@ _0804CC62:
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
ldr r1, _0804CD08 @ =gUnknown_2022744
ldr r1, _0804CD08 @ =gLinkPlayers + 8
adds r1, r0, r1
movs r0, 0x1
movs r2, 0
@ -811,7 +811,7 @@ _0804CCC6:
_0804CCFC: .4byte gSaveBlock2Ptr
_0804CD00: .4byte gUnknown_8261E8A
_0804CD04: .4byte gUnknown_8261CC8
_0804CD08: .4byte gUnknown_2022744
_0804CD08: .4byte gLinkPlayers + 8
_0804CD0C: .4byte gMain
_0804CD10:
ldr r4, _0804CDCC @ =gUnknown_8261CC8
@ -1354,7 +1354,7 @@ _0804D19C:
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
ldr r1, _0804D220 @ =gUnknown_2022744
ldr r1, _0804D220 @ =gLinkPlayers + 8
adds r0, r1
ldr r1, [r6, 0xC]
str r5, [sp]
@ -1393,7 +1393,7 @@ _0804D200:
_0804D214: .4byte gSaveBlock2Ptr
_0804D218: .4byte gUnknown_2031C94
_0804D21C: .4byte gDecompressionBuffer
_0804D220: .4byte gUnknown_2022744
_0804D220: .4byte gLinkPlayers + 8
_0804D224: .4byte gUnknown_8261ECC
_0804D228: .4byte gMain
_0804D22C: .4byte gUnknown_2031DA8
@ -1459,7 +1459,7 @@ _0804D270:
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
ldr r1, _0804D318 @ =gUnknown_2022744
ldr r1, _0804D318 @ =gLinkPlayers + 8
adds r1, r0, r1
movs r0, 0x1
movs r2, 0
@ -1508,7 +1508,7 @@ _0804D2D4:
_0804D30C: .4byte gSaveBlock2Ptr
_0804D310: .4byte gUnknown_8261E8A
_0804D314: .4byte gUnknown_8261CC8
_0804D318: .4byte gUnknown_2022744
_0804D318: .4byte gLinkPlayers + 8
_0804D31C: .4byte gMain
_0804D320:
ldr r4, _0804D3B0 @ =gUnknown_8261CC8
@ -7706,7 +7706,7 @@ _0805039C:
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
ldr r0, _08050428 @ =gUnknown_2022744
ldr r0, _08050428 @ =gLinkPlayers + 8
adds r1, r0
adds r0, r4, 0
movs r2, 0x7
@ -7721,7 +7721,7 @@ _08050418: .4byte gUnknown_2031DA4
_0805041C: .4byte gPlayerParty
_08050420: .4byte gUnknown_2031DAC
_08050424: .4byte gEnemyParty
_08050428: .4byte gUnknown_2022744
_08050428: .4byte gLinkPlayers + 8
_0805042C: .4byte gMain
_08050430:
bl sub_805049C
@ -7947,7 +7947,7 @@ _08050628:
strb r0, [r1]
movs r0, 0x6
strb r0, [r1, 0x1]
ldr r4, _080506D4 @ =gUnknown_2022744
ldr r4, _080506D4 @ =gLinkPlayers + 8
ldr r0, _080506D8 @ =gSaveBlock2Ptr
ldr r1, [r0]
adds r0, r4, 0
@ -8014,7 +8014,7 @@ _08050628:
.align 2, 0
_080506CC: .4byte gUnknown_2031DA4
_080506D0: .4byte gSpecialVar_0x8005
_080506D4: .4byte gUnknown_2022744
_080506D4: .4byte gLinkPlayers + 8
_080506D8: .4byte gSaveBlock2Ptr
_080506DC: .4byte gEnemyParty
_080506E0: .4byte gUnknown_2031DAC
@ -8871,7 +8871,7 @@ sub_8050E24: @ 8050E24
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
ldr r0, _08050E9C @ =gUnknown_2022744
ldr r0, _08050E9C @ =gLinkPlayers + 8
adds r1, r0
adds r0, r3, 0
bl StringCopy
@ -8905,7 +8905,7 @@ sub_8050E24: @ 8050E24
.align 2, 0
_08050E94: .4byte gUnknown_2031DAC
_08050E98: .4byte gStringVar1
_08050E9C: .4byte gUnknown_2022744
_08050E9C: .4byte gLinkPlayers + 8
_08050EA0: .4byte gUnknown_2031DA4
_08050EA4: .4byte gEnemyParty
_08050EA8: .4byte gStringVar3

4
asm/unk_8147AA8.s
View File

@ -2687,7 +2687,7 @@ _08148EFA:
ldr r2, [sp]
cmp r0, 0
beq _08148F34
ldr r1, _08148F58 @ =gUnknown_2022744
ldr r1, _08148F58 @ =gLinkPlayers + 8
add r1, r9
adds r0, r7, 0
bl StringCopy
@ -2723,7 +2723,7 @@ _08148F44:
bx r0
.align 2, 0
_08148F54: .4byte 0x000082a8
_08148F58: .4byte gUnknown_2022744
_08148F58: .4byte gLinkPlayers + 8
thumb_func_end sub_8148E80
thumb_func_start sub_8148F5C

4
asm/unk_814B6F0.s
View File

@ -508,7 +508,7 @@ _0814BAC4:
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
ldr r2, _0814BB2C @ =gUnknown_2022744
ldr r2, _0814BB2C @ =gLinkPlayers + 8
adds r1, r2
bl StringCopy
adds r4, r6, r4
@ -555,7 +555,7 @@ _0814BB14:
beq _0814BB3A
b _0814BB46
.align 2, 0
_0814BB2C: .4byte gUnknown_2022744
_0814BB2C: .4byte gLinkPlayers + 8
_0814BB30: .4byte gSaveBlock2Ptr
_0814BB34:
cmp r0, 0x2

8
asm/unk_81507FC.s
View File

@ -5763,13 +5763,13 @@ _081533F0:
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
ldr r1, _08153400 @ =gUnknown_2022744
ldr r1, _08153400 @ =gLinkPlayers + 8
_081533F8:
adds r0, r1
pop {r1}
bx r1
.align 2, 0
_08153400: .4byte gUnknown_2022744
_08153400: .4byte gLinkPlayers + 8
thumb_func_end sub_81533C4
thumb_func_start sub_8153404
@ -6605,7 +6605,7 @@ _08153A14:
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
ldr r1, _08153A94 @ =gUnknown_2022744
ldr r1, _08153A94 @ =gLinkPlayers + 8
adds r0, r1
lsls r1, r4, 2
adds r1, r5
@ -6668,7 +6668,7 @@ _08153A7E:
.align 2, 0
_08153A8C: .4byte gUnknown_203F3E0
_08153A90: .4byte gUnknown_8475648
_08153A94: .4byte gUnknown_2022744
_08153A94: .4byte gLinkPlayers + 8
_08153A98: .4byte gUnknown_8475608
thumb_func_end sub_8153A04

6
include/battle.h
View File

@ -604,7 +604,11 @@ struct BattleStruct
u8 hpScale;
u8 synchronizeMoveEffect;
u8 field_B3;
void (*savedCallback)(void);
u8 field_B4;
u8 field_B5;
u8 field_B6;
u8 field_B7;
// void (*savedCallback)(void);
u16 usedHeldItems[BATTLE_BANKS_COUNT];
u8 chosenItem[4]; // why is this an u8?
u8 AI_itemType[2];

61
src/quest_log_battle.c
View File

@ -2,10 +2,11 @@
#include "constants/species.h"
#include "malloc.h"
#include "battle.h"
#include "link.h"
#include "overworld.h"
#include "quest_log.h"
struct QuestLogStruct_01
struct QuestLogStruct_TrainerBattleRecord
{
u16 v0;
u16 v2;
@ -14,19 +15,21 @@ struct QuestLogStruct_01
u8 v7;
};
struct QuestLogStruct_02
struct QuestLogStruct_WildBattleRecord
{
u16 v0;
u16 v2;
u8 v4;
};
void sub_812C334(u32 *, u32 *);
void sub_812BFDC(void)
{
if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_DOME)) && (gUnknown_2023E8A == 1 || gUnknown_2023E8A == 7))
{
struct QuestLogStruct_01 * questLogTrainerBattleRecord = Alloc(sizeof(struct QuestLogStruct_01));
struct QuestLogStruct_02 * questLogWildBattleRecord = Alloc(sizeof(struct QuestLogStruct_02));
struct QuestLogStruct_TrainerBattleRecord * questLogTrainerBattleRecord = Alloc(sizeof(struct QuestLogStruct_TrainerBattleRecord));
struct QuestLogStruct_WildBattleRecord * questLogWildBattleRecord = Alloc(sizeof(struct QuestLogStruct_WildBattleRecord));
u16 questLogMessageType;
u16 playerEndingHP;
u16 playerMaxHP;
@ -95,3 +98,53 @@ void sub_812BFDC(void)
Free(questLogWildBattleRecord);
}
}
struct QuestLogStruct_LinkBattleRecord
{
u8 v0;
u8 v1[3][7];
};
void sub_812C224(void)
{
u32 sp0;
u32 sp4[2];
u16 r8;
s32 r3;
u32 r0;
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
struct QuestLogStruct_LinkBattleRecord * r5 = Alloc(sizeof(struct QuestLogStruct_LinkBattleRecord));
r5->v0 = gUnknown_2023E8A - 1;
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
r8 = 15;
sub_812C334(&sp0, sp4);
for (r3 = 0; r3 < 7; r3++)
{
r5->v1[0][r3] = gLinkPlayers[sp0].name[r3];
r5->v1[1][r3] = gLinkPlayers[sp4[0]].name[r3];
r5->v1[2][r3] = gLinkPlayers[sp4[1]].name[r3];
}
}
else
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
r8 = 14;
else
{
r0 = InUnionRoom();
r8 = 13;
if (r0 == TRUE)
r8 = 19;
}
for (r3 = 0; r3 < 7; r3++)
{
r5->v1[0][r3] = gLinkPlayers[gBattleStruct->field_B5 ^ 1].name[r3];
}
}
sub_8113550(r8, (const u16 *)r5);
Free(r5);
}
}

8
sym_ewram.txt
View File

@ -80,13 +80,7 @@ gUnknown_2022720: @ 2022720
.space 0x1C
gLinkPlayers: @ 202273C
.space 0x8
gUnknown_2022744: @ 2022744
.space 0x1C
gUnknown_2022760: @ 2022760
.space 0x68
.space 0x8C
gUnknown_20227C8: @ 20227C8
.space 0x8C