diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-03 17:56:36 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-03 17:56:36 +0100 |
| commit | 0d122bc8311857329745c03d924e80ffe3853ff8 (patch) | |
| tree | e35a6bbb2b00db51da182d71e3f21471ffd16aa1 /src/main_menu.c | |
| parent | e1829c40abf547830d72b857db19de135be77e67 (diff) | |
| parent | ffa8655f4cd2cb8d6b1bdacc0a5568259eb60a72 (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index a8383cd0c..ee777d106 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1772,12 +1772,12 @@ static void AddBirchSpeechObjects(u8 taskId) gSprites[lotadSpriteId].oam.priority = 0; gSprites[lotadSpriteId].invisible = TRUE; gTasks[taskId].tLotadSpriteId = lotadSpriteId; - brendanSpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_BRENDAN), 120, 60, 0, &gDecompressionBuffer[0]); + brendanSpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_BRENDAN), 120, 60, 0, &gDecompressionBuffer[0]); gSprites[brendanSpriteId].callback = nullsub_11; gSprites[brendanSpriteId].invisible = TRUE; gSprites[brendanSpriteId].oam.priority = 0; gTasks[taskId].tBrendanSpriteId = brendanSpriteId; - maySpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_PKMN_TRAINER_MAY), 120, 60, 0, &gDecompressionBuffer[0x800]); + maySpriteId = CreateTrainerSprite(FacilityClassToPicIndex(FACILITY_CLASS_MAY), 120, 60, 0, &gDecompressionBuffer[0x800]); gSprites[maySpriteId].callback = nullsub_11; gSprites[maySpriteId].invisible = TRUE; gSprites[maySpriteId].oam.priority = 0; |