diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
| commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
| tree | fa83e9a7105769c66e3a66b3c6871984293db329 /src/mystery_event_script.c | |
| parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into use_pokeblock
Diffstat (limited to 'src/mystery_event_script.c')
| -rw-r--r-- | src/mystery_event_script.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c index 515a0722f..45ef719da 100644 --- a/src/mystery_event_script.c +++ b/src/mystery_event_script.c @@ -1,12 +1,19 @@ #include "global.h" +#include "mystery_event_script.h" #include "script.h" #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; @@ -16,20 +23,18 @@ extern ScrCmdFunc gScriptFuncs_End[]; extern u8 gOtherText_DataCannotUseVersion[]; -void sub_8126160(u32 val); - 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; |