diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
| commit | 4df728666e55b47480467fbea86f48dadcb81c97 (patch) | |
| tree | 6a8413c90ec9d68c54389e1a54f6de9f12bb686c /src/field/secret_base.c | |
| parent | 9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/field/secret_base.c')
| -rw-r--r-- | src/field/secret_base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 400074604..2e4138a3b 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -575,7 +575,7 @@ u8 *GetSecretBaseMapName(u8 *dest) { return sub_80BC190(dest, VarGet(VAR_CURRENT_SECRET_BASE)); } -void sub_80BC224(void) { +void BufferSecretBaseOwnerName(void) { u8 *var0 = gSaveBlock1.secretBases[(u8)VarGet(VAR_CURRENT_SECRET_BASE)].playerName; u8 *var1 = gStringVar1; u8 var2 = sub_80BB8A8(var0); @@ -830,7 +830,7 @@ void sub_80BC474(void) } } -void sub_80BC50C(void) +void MoveSecretBase(void) { u16 backupValue; sub_80BC474(); @@ -1197,7 +1197,7 @@ u8 sub_80BCCA4(u8 secretBaseIndex) + gSaveBlock1.secretBases[secretBaseIndex].gender * 5; } -const u8 *sub_80BCCE8(void) +const u8 *GetSecretBaseTrainerLoseText(void) { u8 param = sub_80BCCA4(VarGet(VAR_CURRENT_SECRET_BASE)); if (param == 0) return UnknownString_81A1BB2; |