falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #268 from nonmatch/patch-9 

Match sub_08062634
This commit is contained in:
notyourav 2022-01-09 20:57:29 -08:00 committed by GitHub
parent 8413785bd4 dc30b65569
commit 326c6be536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
asm/non_matching/kid/sub_08062634.inc
View File

@ -1,22 +0,0 @@
.syntax unified
.text
push {r4, r5, lr}
adds r5, r0, #0
ldrb r4, [r5, #0xb]
bl Random
movs r1, #1
ands r1, r0
ldr r0, _08062658 @ =gUnk_0810BDE8
lsls r1, r1, #1
lsls r4, r4, #2
adds r1, r1, r4
adds r1, r1, r0
ldrh r0, [r1]
adds r1, r5, #0
bl MessageNoOverlap
pop {r4, r5, pc}
.align 2, 0
_08062658: .4byte gUnk_0810BDE8
.syntax divided

7
src/npc/kid.c
View File

@ -20,7 +20,7 @@ typedef struct {
u8 unk_7;
} KidHeap;
extern u16 gUnk_0810BDE8[];
extern u16 gUnk_0810BDE8[][2];
extern Dialog gUnk_0810BE10[];
@ -193,12 +193,11 @@ NONMATCH("asm/non_matching/kid/sub_0806252C.inc", void sub_0806252C(Entity* this
}
END_NONMATCH
NONMATCH("asm/non_matching/kid/sub_08062634.inc", void sub_08062634(Entity* this)) {
void sub_08062634(Entity* this) {
u32 a = this->type2;
u32 b = (Random() & 1);
MessageNoOverlap(*((u16*)gUnk_0810BDE8 + b + a * 2), this);
MessageNoOverlap(gUnk_0810BDE8[a][b], this);
}
END_NONMATCH
NONMATCH("asm/non_matching/kid/sub_0806265C.inc", void sub_0806265C(Entity* this, ScriptExecutionContext* context)) {
if (gSave.global_progress == 0) {