diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-08 03:07:19 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-08 03:07:19 -0500 |
| commit | e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e (patch) | |
| tree | 52fa8c6866b4a4fa745ef74b11490b1efe29dd17 /src | |
| parent | bef24a45f0249ba867a5a11f34e04c35c64cd9fa (diff) | |
Resolve Littleroot merge conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_specials.c | 2 | ||||
| -rw-r--r-- | src/save_location.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 65bc3a095..b84e4dde9 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -4033,7 +4033,7 @@ void sub_813BA30(void) } } -void sub_813BA60(void) +void UpdateTrainerFanClubGameClear(void) { if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1)) { diff --git a/src/save_location.c b/src/save_location.c index 7a9b08a09..b31d1ac9e 100644 --- a/src/save_location.c +++ b/src/save_location.c @@ -131,7 +131,7 @@ void sub_81AFDA0(void) gSaveBlock2Ptr->field_A8 |= 0x8; } -void sub_81AFDD0(void) +void SetChampionSaveWarp(void) { gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80; } |