ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-19 21:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
DizzyEggg 2019-10-19 15:52:21 +02:00
parent 1d10d44a4d
commit 4d407d22ba
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/battle_anim_special.c
View File

@ -427,7 +427,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_LEVELBALL, .tileTag = TAG_PARTICLES_LEVELBALL,
.paletteTag = TAG_PARTICLES_LEVELBALL, .paletteTag = TAG_PARTICLES_LEVELBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -436,7 +436,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_LUREBALL, .tileTag = TAG_PARTICLES_LUREBALL,
.paletteTag = TAG_PARTICLES_LUREBALL, .paletteTag = TAG_PARTICLES_LUREBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -445,7 +445,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_MOONBALL, .tileTag = TAG_PARTICLES_MOONBALL,
.paletteTag = TAG_PARTICLES_MOONBALL, .paletteTag = TAG_PARTICLES_MOONBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -454,7 +454,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_FRIENDBALL, .tileTag = TAG_PARTICLES_FRIENDBALL,
.paletteTag = TAG_PARTICLES_FRIENDBALL, .paletteTag = TAG_PARTICLES_FRIENDBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -463,7 +463,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_LOVEBALL, .tileTag = TAG_PARTICLES_LOVEBALL,
.paletteTag = TAG_PARTICLES_LOVEBALL, .paletteTag = TAG_PARTICLES_LOVEBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -472,7 +472,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_HEAVYBALL, .tileTag = TAG_PARTICLES_HEAVYBALL,
.paletteTag = TAG_PARTICLES_HEAVYBALL, .paletteTag = TAG_PARTICLES_HEAVYBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -481,7 +481,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_FASTBALL, .tileTag = TAG_PARTICLES_FASTBALL,
.paletteTag = TAG_PARTICLES_FASTBALL, .paletteTag = TAG_PARTICLES_FASTBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -490,7 +490,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_SPORTBALL, .tileTag = TAG_PARTICLES_SPORTBALL,
.paletteTag = TAG_PARTICLES_SPORTBALL, .paletteTag = TAG_PARTICLES_SPORTBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -499,7 +499,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_DUSKBALL, .tileTag = TAG_PARTICLES_DUSKBALL,
.paletteTag = TAG_PARTICLES_DUSKBALL, .paletteTag = TAG_PARTICLES_DUSKBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -508,7 +508,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_QUICKBALL, .tileTag = TAG_PARTICLES_QUICKBALL,
.paletteTag = TAG_PARTICLES_QUICKBALL, .paletteTag = TAG_PARTICLES_QUICKBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -517,7 +517,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_HEALBALL, .tileTag = TAG_PARTICLES_HEALBALL,
.paletteTag = TAG_PARTICLES_HEALBALL, .paletteTag = TAG_PARTICLES_HEALBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -526,7 +526,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_CHERISHBALL, .tileTag = TAG_PARTICLES_CHERISHBALL,
.paletteTag = TAG_PARTICLES_CHERISHBALL, .paletteTag = TAG_PARTICLES_CHERISHBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -535,7 +535,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_PARKBALL, .tileTag = TAG_PARTICLES_PARKBALL,
.paletteTag = TAG_PARTICLES_PARKBALL, .paletteTag = TAG_PARTICLES_PARKBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -544,7 +544,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_DREAMBALL, .tileTag = TAG_PARTICLES_DREAMBALL,
.paletteTag = TAG_PARTICLES_DREAMBALL, .paletteTag = TAG_PARTICLES_DREAMBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
@ -553,7 +553,7 @@ const struct SpriteTemplate gBallParticlesSpriteTemplates[] =
{ {
.tileTag = TAG_PARTICLES_BEASTBALL, .tileTag = TAG_PARTICLES_BEASTBALL,
.paletteTag = TAG_PARTICLES_BEASTBALL, .paletteTag = TAG_PARTICLES_BEASTBALL,
.oam = &gUnknown_08524904, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gAnims_BallParticles, .anims = gAnims_BallParticles,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,

10
src/party_menu.c
View File

@ -5506,7 +5506,7 @@ void Task_AbilityCapsule(u8 taskId)
{ {
gUnknown_0203CEE8 = 0; gUnknown_0203CEE8 = 0;
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_81B1B5C(gText_WontHaveEffect, 1); DisplayPartyMenuMessage(gText_WontHaveEffect, 1);
schedule_bg_copy_tilemap_to_vram(2); schedule_bg_copy_tilemap_to_vram(2);
gTasks[taskId].func = sub_81B6794; gTasks[taskId].func = sub_81B6794;
return; return;
@ -5516,7 +5516,7 @@ void Task_AbilityCapsule(u8 taskId)
StringCopy(gStringVar2, gAbilityNames[GetAbilityBySpecies(tSpecies, tAbilityNum)]); StringCopy(gStringVar2, gAbilityNames[GetAbilityBySpecies(tSpecies, tAbilityNum)]);
StringExpandPlaceholders(gStringVar4, askText); StringExpandPlaceholders(gStringVar4, askText);
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_81B1B5C(gStringVar4, 1); DisplayPartyMenuMessage(gStringVar4, 1);
schedule_bg_copy_tilemap_to_vram(2); schedule_bg_copy_tilemap_to_vram(2);
tState++; tState++;
break; break;
@ -5541,7 +5541,7 @@ void Task_AbilityCapsule(u8 taskId)
// Don't exit party selections screen, return to choosing a mon. // Don't exit party selections screen, return to choosing a mon.
ClearStdWindowAndFrameToTransparent(6, 0); ClearStdWindowAndFrameToTransparent(6, 0);
ClearWindowTilemap(6); ClearWindowTilemap(6);
display_pokemon_menu_message(5); DisplayPartyMenuStdMessage(5);
gTasks[taskId].func = (void *)GetWordTaskArg(taskId, tOldFunc); gTasks[taskId].func = (void *)GetWordTaskArg(taskId, tOldFunc);
return; return;
} }
@ -5549,7 +5549,7 @@ void Task_AbilityCapsule(u8 taskId)
case 3: case 3:
PlaySE(SE_KAIFUKU); PlaySE(SE_KAIFUKU);
StringExpandPlaceholders(gStringVar4, doneText); StringExpandPlaceholders(gStringVar4, doneText);
sub_81B1B5C(gStringVar4, 1); DisplayPartyMenuMessage(gStringVar4, 1);
schedule_bg_copy_tilemap_to_vram(2); schedule_bg_copy_tilemap_to_vram(2);
tState++; tState++;
break; break;
@ -5560,7 +5560,7 @@ void Task_AbilityCapsule(u8 taskId)
case 5: case 5:
SetMonData(&gPlayerParty[tMonId], MON_DATA_ABILITY_NUM, &tAbilityNum); SetMonData(&gPlayerParty[tMonId], MON_DATA_ABILITY_NUM, &tAbilityNum);
RemoveBagItem(gSpecialVar_ItemId, 1); RemoveBagItem(gSpecialVar_ItemId, 1);
gTasks[taskId].func = sub_81B12C0; gTasks[taskId].func = Task_ClosePartyMenu;
break; break;
} }
} }