diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 17:48:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 17:48:21 -0400 |
| commit | 124e2eb02c4adc46265e5b34b47ac0c625a24ec3 (patch) | |
| tree | 5c0af98d9e49a767f455fff1ceec5d07cb8539b8 /src/mystery_event_script.c | |
| parent | 123d5cc8b26d2a93fa3981beaccb84377c6ae20f (diff) | |
| parent | 813c1846c94fa14b55bf75cf4c14465f1fb26635 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/mystery_event_script.c')
| -rw-r--r-- | src/mystery_event_script.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index e3d533d28..45ef719da 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -4,10 +4,16 @@ #include "string_util.h" #include "text.h" +#if ENGLISH +#define UNK_MASK_1 0x2 +#elif GERMAN +#define UNK_MASK_1 0x4 +#endif + #ifdef SAPPHIRE -#define UNK_MASK 0x100 +#define UNK_MASK_2 0x100 #else -#define UNK_MASK 0x80 +#define UNK_MASK_2 0x80 #endif extern struct ScriptContext gUnknown_02039288; @@ -19,16 +25,16 @@ extern u8 gOtherText_DataCannotUseVersion[]; bool32 sub_8126098(u16 a1, u32 a2, u16 a3, u32 a4) { - if (!(a1 & 0x2)) + if (!(a1 & UNK_MASK_1)) return FALSE; - if (!(a2 & 0x2)) + if (!(a2 & UNK_MASK_1)) return FALSE; if (!(a3 & 0x4)) return FALSE; - if (!(a4 & UNK_MASK)) + if (!(a4 & UNK_MASK_2)) return FALSE; return TRUE; |