diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-01-09 20:57:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-09 20:57:29 -0800 |
| commit | 326c6be5360c4c8a5837b2b8d32e6f691a2eca02 (patch) | |
| tree | ba3df1b9d8d509425d474d867244d47d2458bbaa /src | |
| parent | 8413785bd43648f3e8ee8d77efff45e1f6dd1b64 (diff) | |
| parent | dc30b65569a4ca34952c4c594d61b4c64f693e77 (diff) | |
Merge pull request #268 from nonmatch/patch-9
Match sub_08062634
Diffstat (limited to 'src')
| -rw-r--r-- | src/npc/kid.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/npc/kid.c b/src/npc/kid.c index 18f9bb7d..9b116b0a 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -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) { |