diff options
| author | drifloony <drifloony@users.noreply.github.com> | 2017-07-21 15:34:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-21 15:34:05 -0700 |
| commit | 8ed167339c52b32e5149077e9e2c91f981268af9 (patch) | |
| tree | 765873e0da27644ad94fcf0eee9a8f76f95e96c6 /src/field_specials.c | |
| parent | 95d3a7848ca07ad7035d1a717b489c4ea303a3ba (diff) | |
| parent | 68e47a6fa0b56451223c22dc9a759534c988db5b (diff) | |
Merge branch 'master' into mon_markings
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 2b505bbfe..454bd8d96 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -41,8 +41,26 @@ #elif GERMAN #define CHAR_DECIMAL_SEPARATOR CHAR_COMMA #endif + +extern struct WarpData gUnknown_020297F0; +extern u8 gBattleOutcome; +extern u16 gSpecialVar_0x8004; +extern u16 gSpecialVar_0x8005; +extern u16 gScriptResult; + +EWRAM_DATA u8 gUnknown_02039250 = 0; +EWRAM_DATA u8 gUnknown_02039251 = 0; +EWRAM_DATA u32 gUnknown_02039254 = 0; +EWRAM_DATA u8 gUnknown_02039258 = 0; +EWRAM_DATA u8 gUnknown_02039259 = 0; +EWRAM_DATA u8 gUnknown_0203925A = 0; +EWRAM_DATA u8 gUnknown_0203925B = 0; +EWRAM_DATA u8 gUnknown_0203925C = 0; + static void RecordCyclingRoadResults(u32, u8); +static struct ElevatorMenu gUnknown_03000760[20]; + void sub_810D6A4(void) { SetMainCallback2(sub_8145D88); ScriptContext2_Enable(); @@ -1761,7 +1779,7 @@ u8 GetPokeblockNameByMonNature(void) void GetSecretBaseNearbyMapName(void) { - sub_80FBFB4(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0); + GetMapSectionName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0); } u16 sub_810F404(void) |