through sub_8113530

This commit is contained in:
PikalaxALT
2018-10-16 21:46:09 -07:00
parent 7670f0527f
commit 0ba5268858
3 changed files with 43 additions and 91 deletions
-89
View File
@@ -5,95 +5,6 @@
.text
thumb_func_start sub_81134B8
sub_81134B8: @ 81134B8
push {lr}
ldr r0, _081134C8 @ =0x00004038
bl GetVarPointer
bl sub_81134CC
pop {r0}
bx r0
.align 2, 0
_081134C8: .4byte 0x00004038
thumb_func_end sub_81134B8
thumb_func_start sub_81134CC
sub_81134CC: @ 81134CC
push {r4,lr}
adds r4, r0, 0
ldr r0, _081134F4 @ =0x00004073
bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r0, 0x2
bne _08113502
adds r0, r4, 0
bl sub_8113078
ldr r0, _081134F8 @ =gUnknown_2023E8A
ldrb r0, [r0]
cmp r0, 0x1
bne _081134FC
adds r0, r4, 0
bl sub_8113194
b _08113502
.align 2, 0
_081134F4: .4byte 0x00004073
_081134F8: .4byte gUnknown_2023E8A
_081134FC:
adds r0, r4, 0
bl sub_81131FC
_08113502:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_81134CC
thumb_func_start sub_8113508
sub_8113508: @ 8113508
ldr r0, [r0]
lsls r0, 24
lsrs r0, 31
bx lr
thumb_func_end sub_8113508
thumb_func_start sub_8113510
sub_8113510: @ 8113510
push {lr}
ldr r0, _08113520 @ =0x00004038
bl GetVarPointer
bl sub_8113524
pop {r0}
bx r0
.align 2, 0
_08113520: .4byte 0x00004038
thumb_func_end sub_8113510
thumb_func_start sub_8113524
sub_8113524: @ 8113524
ldrb r1, [r0]
movs r2, 0x80
orrs r1, r2
strb r1, [r0]
bx lr
thumb_func_end sub_8113524
thumb_func_start sub_8113530
sub_8113530: @ 8113530
push {lr}
ldr r0, _08113548 @ =0x00004038
bl GetVarPointer
ldr r1, _0811354C @ =gUnknown_20370C0
ldrb r1, [r1]
bl sub_8113114
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_08113548: .4byte 0x00004038
_0811354C: .4byte gUnknown_20370C0
thumb_func_end sub_8113530
thumb_func_start sub_8113550
sub_8113550: @ 8113550
push {r4,r5,lr}
+2
View File
@@ -977,4 +977,6 @@ extern u8 gBattlersCount;
extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT];
extern s32 gBattleMoveDamage;
extern u8 gUnknown_2023E8A;
#endif // GUARD_BATTLE_H
+41 -2
View File
@@ -21,6 +21,7 @@
#include "map_obj_lock.h"
#include "field_player_avatar.h"
#include "field_control_avatar.h"
#include "battle.h"
#include "item.h"
#include "region_map.h"
#include "map_name_popup.h"
@@ -149,7 +150,8 @@ void sub_81132E0(struct Var4038Struct *);
bool16 sub_811337C(struct Var4038Struct *);
void sub_8113390(struct Var4038Struct *);
void sub_8113414(u8 (*)[16], u8, u8);
bool8 sub_8113508(void);
void sub_81134CC(struct Var4038Struct *);
bool8 sub_8113508(struct Var4038Struct * );
void sub_8113524(struct Var4038Struct *);
void sub_8113A1C(u8);
void sub_811381C(void);
@@ -2262,7 +2264,7 @@ void sub_8113064(void)
void sub_8113078(struct Var4038Struct * varPtr)
{
if (sub_8113508())
if (sub_8113508(varPtr))
{
sub_81132E0(varPtr);
VarSet(VAR_0x4039, gSaveBlock2Ptr->playTimeHours);
@@ -2505,3 +2507,40 @@ void sub_8113414(u8 (* a0)[16], u8 a1, u8 a2)
}
}
}
void sub_81134B8(void)
{
sub_81134CC(VAR_0x4038_STRUCT);
}
void sub_81134CC(struct Var4038Struct * a0)
{
if (VarGet(VAR_0x4073) == 2)
{
sub_8113078(a0);
if (gUnknown_2023E8A == 1)
sub_8113194(a0);
else
sub_81131FC(a0);
}
}
bool8 sub_8113508(struct Var4038Struct * a0)
{
return a0->unk_0_7;
}
void sub_8113510(void)
{
sub_8113524(VAR_0x4038_STRUCT);
}
void sub_8113524(struct Var4038Struct * a0)
{
a0->unk_0_7 = TRUE;
}
u8 sub_8113530(void)
{
return sub_8113114(VAR_0x4038_STRUCT, gUnknown_20370C0);
}