diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-25 17:50:27 -0500 |
| commit | 605f8ac1141daf66d3428923e004f82f5a5e1594 (patch) | |
| tree | a3e5fae5d271175c7f10b6b455fcdc7f0fdd553e /src/mystery_event_script.c | |
| parent | e88e39d5fda1644f77e41fd652d4310612da7532 (diff) | |
| parent | 659437f07a44b6f560bb58d6c12d141ed8ba7643 (diff) | |
Merge branch 'master' into contest_link_80C2020
Diffstat (limited to 'src/mystery_event_script.c')
| -rw-r--r-- | src/mystery_event_script.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index 6fcad66ac..58f7f8627 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -114,8 +114,9 @@ static void SetWord(u8 *ptr, u32 val) ptr[3] = val >> 24; } -bool8 unref_sub_81261B4(u8 *a1, int a2) +bool8 debug_sub_81261B4(u8 *a1, const u8 * _a2) { + int a2 = (int)_a2; if (a1[0x0] == 1 && a1[0x11] == 15 && !GetWord(a1 + 0x12)) { int v4 = GetWord(a1 + 0x16) - a2 + (int)a1; @@ -128,8 +129,9 @@ bool8 unref_sub_81261B4(u8 *a1, int a2) return FALSE; } -bool8 unref_sub_812620C(u8 *a1, int a2) +bool8 debug_sub_812620C(u8 *a1, const u8 * _a2) { + int a2 = (int)_a2; if (a1[0x0] == 1 && a1[0x11] == 16 && !GetWord(a1 + 0x12)) { int v4 = GetWord(a1 + 0x16) - a2 + (int)a1; |