dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed enum name for Oak speech trainer pics

Browse Source
This commit is contained in:
colonelsalt
2021-09-02 11:17:38 +01:00
parent 7ba40824f5
commit 54377a43f5
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/oak_speech.c
+17 -17
View File
@@ -465,10 +465,10 @@ static const u8 *const sRivalNameChoices[] = {
enum enum
{ {
MALE_PLAYER_ID, MALE_PLAYER_PIC,
FEMALE_PLAYER_ID, FEMALE_PLAYER_PIC,
RIVAL_ID, RIVAL_PIC,
OAK_ID OAK_PIC
}; };
static void VBlankCB_NewGameOaksSpeech(void) static void VBlankCB_NewGameOaksSpeech(void)
@@ -891,7 +891,7 @@ static void Task_OakSpeech9(u8 taskId)
CopyToBgTilemapBuffer(1, sOakSpeech_BackgroundTilemap, 0, 0); CopyToBgTilemapBuffer(1, sOakSpeech_BackgroundTilemap, 0, 0);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
CreateNidoranFSprite(taskId); CreateNidoranFSprite(taskId);
LoadOaksSpeechTrainerPic(OAK_ID, 0); LoadOaksSpeechTrainerPic(OAK_PIC, 0);
CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1); CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1);
PlayBGM(MUS_ROUTE24); PlayBGM(MUS_ROUTE24);
BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK);
@@ -1121,9 +1121,9 @@ static void Task_OakSpeech21(u8 taskId)
static void Task_OakSpeech22(u8 taskId) static void Task_OakSpeech22(u8 taskId)
{ {
if (gSaveBlock2Ptr->playerGender == MALE) if (gSaveBlock2Ptr->playerGender == MALE)
LoadOaksSpeechTrainerPic(MALE_PLAYER_ID, 0); LoadOaksSpeechTrainerPic(MALE_PLAYER_PIC, 0);
else else
LoadOaksSpeechTrainerPic(FEMALE_PLAYER_ID, 0); LoadOaksSpeechTrainerPic(FEMALE_PLAYER_PIC, 0);
CreateFadeOutTask(taskId, 2); CreateFadeOutTask(taskId, 2);
gTasks[taskId].data[3] = 32; gTasks[taskId].data[3] = 32;
gTasks[taskId].func = Task_OakSpeech23; gTasks[taskId].func = Task_OakSpeech23;
@@ -1331,7 +1331,7 @@ static void Task_OakSpeech32(u8 taskId)
ChangeBgX(2, 0, 0); ChangeBgX(2, 0, 0);
gTasks[taskId].tTrainerPicPosX = 0; gTasks[taskId].tTrainerPicPosX = 0;
gSpriteCoordOffsetX = 0; gSpriteCoordOffsetX = 0;
LoadOaksSpeechTrainerPic(RIVAL_ID, 0); LoadOaksSpeechTrainerPic(RIVAL_PIC, 0);
CreateFadeOutTask(taskId, 2); CreateFadeOutTask(taskId, 2);
gTasks[taskId].func = Task_OakSpeech34; gTasks[taskId].func = Task_OakSpeech34;
} }
@@ -1360,9 +1360,9 @@ static void Task_OakSpeech33(u8 taskId)
else else
{ {
if (gSaveBlock2Ptr->playerGender == MALE) if (gSaveBlock2Ptr->playerGender == MALE)
LoadOaksSpeechTrainerPic(MALE_PLAYER_ID, 0); LoadOaksSpeechTrainerPic(MALE_PLAYER_PIC, 0);
else else
LoadOaksSpeechTrainerPic(FEMALE_PLAYER_ID, 0); LoadOaksSpeechTrainerPic(FEMALE_PLAYER_PIC, 0);
gTasks[taskId].tTrainerPicPosX = 0; gTasks[taskId].tTrainerPicPosX = 0;
gSpriteCoordOffsetX = 0; gSpriteCoordOffsetX = 0;
ChangeBgX(2, 0, 0); ChangeBgX(2, 0, 0);
@@ -1597,12 +1597,12 @@ static void CB2_ReturnFromNamingScreen(void)
if (sOakSpeechResources->hasPlayerBeenNamed == FALSE) if (sOakSpeechResources->hasPlayerBeenNamed == FALSE)
{ {
if (gSaveBlock2Ptr->playerGender == MALE) if (gSaveBlock2Ptr->playerGender == MALE)
LoadOaksSpeechTrainerPic(MALE_PLAYER_ID, 0); LoadOaksSpeechTrainerPic(MALE_PLAYER_PIC, 0);
else else
LoadOaksSpeechTrainerPic(FEMALE_PLAYER_ID, 0); LoadOaksSpeechTrainerPic(FEMALE_PLAYER_PIC, 0);
} }
else else
LoadOaksSpeechTrainerPic(RIVAL_ID, 0); LoadOaksSpeechTrainerPic(RIVAL_PIC, 0);
gTasks[taskId].tTrainerPicPosX = -60; gTasks[taskId].tTrainerPicPosX = -60;
gSpriteCoordOffsetX += 60; gSpriteCoordOffsetX += 60;
ChangeBgX(2, -0x3C00, 0); ChangeBgX(2, -0x3C00, 0);
@@ -1715,19 +1715,19 @@ static void LoadOaksSpeechTrainerPic(u16 whichPic, u16 tileOffset)
switch (whichPic) switch (whichPic)
{ {
case MALE_PLAYER_ID: case MALE_PLAYER_PIC:
LoadPalette(sOakSpeechGfx_RedPal, 0x40, 0x40); LoadPalette(sOakSpeechGfx_RedPal, 0x40, 0x40);
LZ77UnCompVram(sOakSpeechGfx_RedPic, (void *)0x06000600 + tileOffset); LZ77UnCompVram(sOakSpeechGfx_RedPic, (void *)0x06000600 + tileOffset);
break; break;
case FEMALE_PLAYER_ID: case FEMALE_PLAYER_PIC:
LoadPalette(sOakSpeechGfx_LeafPal, 0x40, 0x40); LoadPalette(sOakSpeechGfx_LeafPal, 0x40, 0x40);
LZ77UnCompVram(sOakSpeechGfx_LeafPic, (void *)0x06000600 + tileOffset); LZ77UnCompVram(sOakSpeechGfx_LeafPic, (void *)0x06000600 + tileOffset);
break; break;
case RIVAL_ID: case RIVAL_PIC:
LoadPalette(sOakSpeechGfx_RivalPal, 0x60, 0x40); LoadPalette(sOakSpeechGfx_RivalPal, 0x60, 0x40);
LZ77UnCompVram(sOakSpeechGfx_RivalPic, (void *)0x06000600 + tileOffset); LZ77UnCompVram(sOakSpeechGfx_RivalPic, (void *)0x06000600 + tileOffset);
break; break;
case OAK_ID: case OAK_PIC:
LoadPalette(sOakSpeechGfx_OakPal, 0x60, 0x40); LoadPalette(sOakSpeechGfx_OakPal, 0x60, 0x40);
LZ77UnCompVram(sOakSpeechGfx_OakPic, (void *)0x06000600 + tileOffset); LZ77UnCompVram(sOakSpeechGfx_OakPic, (void *)0x06000600 + tileOffset);
break; break;