diff options
author | PikalaxALT <pikalax1@gmail.com> | 2017-05-16 09:26:27 -0400 |
---|---|---|
committer | PikalaxALT <pikalax1@gmail.com> | 2017-05-16 09:26:27 -0400 |
commit | 79a12d0c0430c71e428ce0eb153ec45342a051ee (patch) | |
tree | 192308b48b6ac3d5f4119ec43cd70d957b578f1a /src/secret_base.c | |
parent | ee8b239921d1cf3d9ddba1a18acaa812f2a30b6b (diff) | |
parent | 65b86af74a82cf741caa497c695865504a2cbe49 (diff) |
Merge github.com:pikalaxalt/pokeruby
Diffstat (limited to 'src/secret_base.c')
-rw-r--r-- | src/secret_base.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index ccedcfe0c..be1bfb026 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -3,6 +3,7 @@ #include "strings.h" #include "text.h" #include "event_data.h" +#include "vars.h" extern u8 gUnknown_020387DC; @@ -20,13 +21,13 @@ u8 *sub_80BC190(u8 *dest, u8 arg1) { // 80bc190 return StringAppend(dest, gOtherText_PlayersBase); } -u8 *GetSecretBaseMapName(u8 *dest) { // 80bc1d0 - gUnknown_020387DC = gSaveBlock1.secretBases[VarGet(0x4054)].sbr_field_0; - return sub_80BC190(dest, VarGet(0x4054)); +u8 *GetSecretBaseMapName(u8 *dest) { + gUnknown_020387DC = gSaveBlock1.secretBases[VarGet(VAR_0x4054)].sbr_field_0; + return sub_80BC190(dest, VarGet(VAR_0x4054)); } -void sub_80BC224(void) { // 80bc224 - u8 *var0 = gSaveBlock1.secretBases[(u8)VarGet(0x4054)].sbr_field_2; +void sub_80BC224(void) { + u8 *var0 = gSaveBlock1.secretBases[(u8)VarGet(VAR_0x4054)].sbr_field_2; u8 *var1 = gStringVar1; u8 var2 = sub_80BB8A8(var0); u8 *var3 = StringCopyN(var1, var0, var2); |