diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-14 15:54:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 15:54:46 -0400 |
| commit | 543434ea2df1c325487ddec075f937ae0c3c6d2e (patch) | |
| tree | 0f2eb2c6ee86f8be2cb1f9b6f30d1654bd320946 | |
| parent | 7accc78498bed03828fd962159ae1795a72cc722 (diff) | |
| parent | 03ca7d8bb417b1b61f3660895e868a88afc87314 (diff) | |
Merge pull request #329 from GriffinRichards/doc-gcn
Label GCN link flags field
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | src/new_game.c | 2 | ||||
| -rw-r--r-- | src/save_location.c | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/global.h b/include/global.h index 18645efd8..e88cc620b 100644 --- a/include/global.h +++ b/include/global.h @@ -276,7 +276,7 @@ struct SaveBlock2 /*0x090*/ u8 filler_90[0x8]; /*0x098*/ struct Time localTimeOffset; /*0x0A0*/ struct Time lastBerryTreeUpdate; - /*0x0A8*/ u32 field_A8; + /*0x0A8*/ u32 gcnLinkFlags; // Read by Pokemon Colosseum/XD /*0x0AC*/ u8 field_AC; /*0x0AD*/ u8 field_AD; /*0x0B0*/ struct BattleTowerData battleTower; diff --git a/src/new_game.c b/src/new_game.c index bc7763fd9..30508cd9a 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -117,7 +117,7 @@ void NewGameInitData(void) ClearSav1(); ClearMailData(); gSaveBlock2Ptr->specialSaveWarpFlags = 0; - gSaveBlock2Ptr->field_A8 = 0; + gSaveBlock2Ptr->gcnLinkFlags = 0; gSaveBlock2Ptr->field_AC = 1; gSaveBlock2Ptr->field_AD = 0; InitPlayerTrainerId(); diff --git a/src/save_location.c b/src/save_location.c index 1fef9e8cf..3dc58f32e 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -95,16 +95,16 @@ void TrySetMapSaveWarpStatus(void) void SetUnlockedPokedexFlags(void) { - gSaveBlock2Ptr->field_A8 |= 0x1; - gSaveBlock2Ptr->field_A8 |= 0x10; - gSaveBlock2Ptr->field_A8 |= 0x20; + gSaveBlock2Ptr->gcnLinkFlags |= 0x1; + gSaveBlock2Ptr->gcnLinkFlags |= 0x10; + gSaveBlock2Ptr->gcnLinkFlags |= 0x20; } void SetPostgameFlags(void) { gSaveBlock2Ptr->specialSaveWarpFlags |= CHAMPION_SAVEWARP; - gSaveBlock2Ptr->field_A8 |= 0x2; - gSaveBlock2Ptr->field_A8 |= 0x4; - gSaveBlock2Ptr->field_A8 |= 0x8; - gSaveBlock2Ptr->field_A8 |= 0x8000; + gSaveBlock2Ptr->gcnLinkFlags |= 0x2; + gSaveBlock2Ptr->gcnLinkFlags |= 0x4; + gSaveBlock2Ptr->gcnLinkFlags |= 0x8; + gSaveBlock2Ptr->gcnLinkFlags |= 0x8000; } |