From 21d8c8e9c5059507767d0ca5c130795e82cb4f04 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 13 May 2022 21:03:03 -0400 Subject: [PATCH 1/5] Using follower's nickname instead of ther species name. --- data/scripts/follower.inc | 8 ++++---- src/scrcmd.c | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/data/scripts/follower.inc b/data/scripts/follower.inc index 3e9dc45e69..a8303e5ba3 100644 --- a/data/scripts/follower.inc +++ b/data/scripts/follower.inc @@ -14,8 +14,8 @@ gText_WantsToFly:: callfunc ScrFunc_playfirstmoncry .endm -.macro bufferlivemonspeciesname out:req -callfunc ScrFunc_bufferlivemonspeciesname +.macro bufferlivemonnickname out:req +callfunc ScrFunc_bufferlivemonnickname .byte \out .endm @@ -27,13 +27,13 @@ callfunc ScrFunc_emote EventScript_Follower:: lock - bufferlivemonspeciesname 0 + bufferlivemonnickname 0 playfirstmoncry callfunc ScrFunc_getfolloweraction checkpartymove MOVE_FLY compare VAR_RESULT 6 goto_if_eq EventScript_FollowerEnd - bufferlivemonspeciesname 0 + bufferlivemonnickname 0 msgbox gText_WantsToFly, MSGBOX_YESNO switch VAR_RESULT case NO, EventScript_FollowerEnd diff --git a/src/scrcmd.c b/src/scrcmd.c index b53ae95b90..2461b0d960 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1606,13 +1606,12 @@ bool8 ScrCmd_bufferleadmonspeciesname(struct ScriptContext *ctx) return FALSE; } -bool8 ScrFunc_bufferlivemonspeciesname(struct ScriptContext *ctx) +bool8 ScrFunc_bufferlivemonnickname(struct ScriptContext *ctx) { u8 stringVarIndex = ScriptReadByte(ctx); - u8 *dest = sScriptStringVars[stringVarIndex]; - u32 species = GetMonData(GetFirstLiveMon(), MON_DATA_SPECIES); - StringCopy(dest, gSpeciesNames[species]); + GetMonData(GetFirstLiveMon(), MON_DATA_NICKNAME, sScriptStringVars[stringVarIndex]); + StringGet_Nickname(sScriptStringVars[stringVarIndex]); return FALSE; } From 8672530f10486e3398acb9defa7940a18c11041e Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Fri, 13 May 2022 22:15:08 -0400 Subject: [PATCH 2/5] Fixed missing include in event_object_movement. Fixed Lombre follower palette. Credit: Jaizu --- graphics/object_events/pics/pokemon/lombre.png | Bin 554 -> 7876 bytes src/event_object_movement.c | 1 + 2 files changed, 1 insertion(+) diff --git a/graphics/object_events/pics/pokemon/lombre.png b/graphics/object_events/pics/pokemon/lombre.png index 0cedb8d1e53be3cc4fb4d8bf4bcbdc607a215df8..5543070f67ddd44c324db7a79369756ce9913821 100644 GIT binary patch literal 7876 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 delta 473 zcmV;~0Ve*$J*otdBa>+yJbwYTNkl14#K|JzEN=jYh8rS$&A%*c-i)8&# z1S*I^#?0(8R^mkzwzg?Nhs`Olm5>k%_LgExf`P7>h)M??ClnX#Jb&_LA`X=`2AKm> zX$4vB<9KBL?8q&Dz~sivsnyK_q1TL znB^uL<5!8lEb$w?=y_#hk>vpKUao(sUau1=h4nV;MQZ(je0%&+;=hewy~L)0;K_mv P00000NkvXXu0mjfTMz5D diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 446034d299..eee5f20116 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -32,6 +32,7 @@ #include "trainer_hill.h" #include "util.h" #include "constants/event_object_movement.h" +#include "constants/abilities.h" #include "constants/battle.h" #include "constants/event_objects.h" #include "constants/field_effects.h" From ec756d3d12c59ed82aa12a7d7155752a69184292 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Mon, 16 May 2022 22:02:04 -0400 Subject: [PATCH 3/5] Fixed object events not being unfrozen after using Flash. --- data/scripts/flash.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc index dbfec2314d..7444dcd5ea 100644 --- a/data/scripts/flash.inc +++ b/data/scripts/flash.inc @@ -1,4 +1,5 @@ EventScript_UseFlash:: animateflash 1 setflashlevel 1 + releaseall end From 01f73f54e1567e4045ed8664306eddb82f3aa0b0 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Tue, 17 May 2022 00:54:08 -0400 Subject: [PATCH 4/5] Added follower transform effect and Castform forms. Credit: larryturbo Castform forms from https://www.deviantart.com/larryturbo/art/351-Castform-Froms-830190053 --- .../pics/pokemon/castform_rainy.png | Bin 0 -> 8049 bytes .../pics/pokemon/castform_snowy.png | Bin 0 -> 8615 bytes .../pics/pokemon/castform_sunny.png | Bin 0 -> 8332 bytes .../castform/anim_front_sunny_form.png | Bin 656 -> 11155 bytes .../pokemon/castform/normal_sunny_form.pal | 2 +- include/event_object_movement.h | 7 + spritesheet_rules.mk | 9 + .../object_events/object_event_graphics.h | 6 + .../object_event_graphics_info_followers.h | 8 + .../object_events/object_event_pic_tables.h | 24 +++ src/event_object_movement.c | 156 ++++++++++++++++-- src/field_effect.c | 6 +- src/field_screen_effect.c | 6 +- 13 files changed, 202 insertions(+), 22 deletions(-) create mode 100644 graphics/object_events/pics/pokemon/castform_rainy.png create mode 100644 graphics/object_events/pics/pokemon/castform_snowy.png create mode 100644 graphics/object_events/pics/pokemon/castform_sunny.png diff --git a/graphics/object_events/pics/pokemon/castform_rainy.png b/graphics/object_events/pics/pokemon/castform_rainy.png new file mode 100644 index 0000000000000000000000000000000000000000..b2d279c212019346f1fb668152aa9b3c87506e4c GIT binary patch literal 8049 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 literal 0 HcmV?d00001 diff --git a/graphics/object_events/pics/pokemon/castform_snowy.png b/graphics/object_events/pics/pokemon/castform_snowy.png new file mode 100644 index 0000000000000000000000000000000000000000..9cf4ca0026a998fe7aaf0a0733a1cb4cb82fddde GIT binary patch literal 8615 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 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/castform/anim_front_sunny_form.png b/graphics/pokemon/castform/anim_front_sunny_form.png index 7e14f9892e79d668cfb1f273db8ebe363c6c69a1..399e6eeb8698be276778e05ba55f140ccdaedde4 100644 GIT binary patch literal 11155 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 delta 607 zcmV-l0-*hqSC9peBNzZMP)t-s#l@6jF)7VjO743~|C~Vp005IADIR|WSg|4i0004W zQchCmVCE7JqQGckM)_sVeO z$w5pP7xlFthOc=A7y@8|_tED_^nBBpge#dC@P7a?DxZlw5BVVH{g)(wJ1BC_^Mbz( zdPGPZlz5Nzi{jlS0>mtzGjVnq@WIbv5cJ?hbCxU?=Rt5b99ls5<^AC#*%)R&g2MVi zhR54jr#pq&c@ck9%GjoPQl7sPwT%(*w35a?-5t#K1*(&2F1!O`UjSn2VjO1&%KG@f z8T;~q06LH;rM}4t+;vLAcTRrET2y(f^=(Z|A8G%@nA;Nl^0)rp25fa%mRc`vNMdbn zkg&pE6tOmIW3|;QqvuqMxwRJtUA=715ywyii-lg2zT-PQ+Shu!rQh2gHsBn;7Toam.paletteNum); sprite->inUse = TRUE; sprite->oam.paletteNum = LoadDynamicFollowerPalette(species, form, shiny); - } + } else if (gWeatherPtr->currWeather != WEATHER_FOG_HORIZONTAL) // don't want to weather blend in fog + UpdateSpritePaletteWithWeather(gSprites[objEvent->spriteId].oam.paletteNum); +} + +// Like FollowerSetGraphics, but does not reposition sprite; intended to be used for mid-movement form changes, etc. +// TODO: Reposition sprite if size changes +static void RefreshFollowerGraphics(struct ObjectEvent *objEvent) { + u16 species = objEvent->extra.mon.species; + u8 form = objEvent->extra.mon.form; + u8 shiny = objEvent->extra.mon.shiny; + const struct ObjectEventGraphicsInfo *graphicsInfo = SpeciesToGraphicsInfo(species, form); + struct Sprite *sprite = &gSprites[objEvent->spriteId]; + u8 i = FindObjectEventPaletteIndexByTag(graphicsInfo->paletteTag); + + sprite->oam.shape = graphicsInfo->oam->shape; + sprite->oam.size = graphicsInfo->oam->size; + sprite->images = graphicsInfo->images; + sprite->anims = graphicsInfo->anims; + sprite->subspriteTables = graphicsInfo->subspriteTables; + objEvent->inanimate = graphicsInfo->inanimate; + sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); + sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); + + if (graphicsInfo->paletteTag == OBJ_EVENT_PAL_TAG_DYNAMIC) { + sprite->inUse = FALSE; + FieldEffectFreePaletteIfUnused(sprite->oam.paletteNum); + sprite->inUse = TRUE; + sprite->oam.paletteNum = LoadDynamicFollowerPalette(species, form, shiny); + } else if (i != 0xFF) { + UpdateSpritePalette(&sObjectEventSpritePalettes[i], sprite); + if (gWeatherPtr->currWeather != WEATHER_FOG_HORIZONTAL) // don't want to weather blend in fog + UpdateSpritePaletteWithWeather(sprite->oam.paletteNum); + } +} + +// Like CastformDataTypeChange, but for overworld weather +static u8 GetOverworldCastformForm(void) { + switch (GetCurrentWeather()) + { + case WEATHER_SUNNY_CLOUDS: + case WEATHER_DROUGHT: + return CASTFORM_FIRE; + case WEATHER_RAIN: + case WEATHER_RAIN_THUNDERSTORM: + case WEATHER_DOWNPOUR: + return CASTFORM_WATER; + case WEATHER_SNOW: + return CASTFORM_ICE; + } + return CASTFORM_NORMAL; } // Retrieve graphic information about the following pokemon, if any @@ -1753,7 +1813,16 @@ static bool8 GetFollowerInfo(u16 *species, u8 *form, u8 *shiny) { } *species = GetMonData(mon, MON_DATA_SPECIES); *shiny = IsMonShiny(mon); - *form = *species == SPECIES_UNOWN ? GET_UNOWN_LETTER(mon->box.personality) : 0; + *form = 0; // default + switch (*species) + { + case SPECIES_UNOWN: + *form = GET_UNOWN_LETTER(mon->box.personality); + break; + case SPECIES_CASTFORM: // form is based on overworld weather + *form = GetOverworldCastformForm(); + break; + } return TRUE; } @@ -1764,7 +1833,7 @@ void UpdateFollowingPokemon(void) { // Update following pokemon if any bool8 shiny; u8 form; // Avoid spawning large (64x64) follower pokemon inside buildings - if (GetFollowerInfo(&species, &form, &shiny) && !(gMapHeader.mapType == MAP_TYPE_INDOOR && SpeciesToGraphicsInfo(species, 0)->width == 64)) { + if (GetFollowerInfo(&species, &form, &shiny) && !(gMapHeader.mapType == MAP_TYPE_INDOOR && SpeciesToGraphicsInfo(species, 0)->height == 64)) { if (objEvent == NULL) { // Spawn follower struct ObjectEventTemplate template = { .localId = OBJ_EVENT_ID_FOLLOWER, @@ -2242,13 +2311,7 @@ static u8 UpdateSpritePalette(const struct SpritePalette * spritePalette, struct sprite->inUse = FALSE; FieldEffectFreePaletteIfUnused(sprite->oam.paletteNum); sprite->inUse = TRUE; - if (IndexOfSpritePaletteTag(spritePalette->tag) == 0xFF) { - sprite->oam.paletteNum = LoadSpritePalette(spritePalette); - } else { - sprite->oam.paletteNum = LoadSpritePalette(spritePalette); - } - - return sprite->oam.paletteNum; + return sprite->oam.paletteNum = LoadSpritePalette(spritePalette); } // Find and update based on template's paletteTag @@ -4803,6 +4866,73 @@ bool8 CopyablePlayerMovement_Jump2(struct ObjectEvent *objectEvent, struct Sprit return TRUE; } +static bool8 EndFollowerTransformEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { + if (!sprite) + return FALSE; + SetGpuReg(REG_OFFSET_MOSAIC, 0); + if (!sprite->data[7]) + return FALSE; + sprite->oam.mosaic = FALSE; + sprite->data[7] = 0; + return FALSE; +} + +static bool8 TryStartFollowerTransformEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { + u32 multi; + if (objectEvent->extra.mon.species == SPECIES_CASTFORM && objectEvent->extra.mon.form != (multi = GetOverworldCastformForm())) { + sprite->data[7] = TRANSFORM_TYPE_PERMANENT << 8; + objectEvent->extra.mon.form = multi; + return TRUE; + } else if ((gRngValue >> 16) < 18 && GetLocalWildMon(FALSE) + && (objectEvent->extra.mon.species == SPECIES_MEW || objectEvent->extra.mon.species == SPECIES_DITTO)) { + sprite->data[7] = TRANSFORM_TYPE_RANDOM_WILD << 8; + PlaySE(SE_M_MINIMIZE); + return TRUE; + } + return FALSE; +} + +static bool8 UpdateFollowerTransformEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { + u8 type = sprite->data[7] >> 8; + u8 frames = sprite->data[7] & 0xFF; + u8 stretch; + u32 multi; + if (!type) + return TryStartFollowerTransformEffect(objectEvent, sprite); + sprite->oam.mosaic = TRUE; + if (frames < 8) + stretch = frames >> 1; + else if (frames < 16) + stretch = (16 - frames) >> 1; + else { + return EndFollowerTransformEffect(objectEvent, sprite); + } + if (frames == 8) { + switch (type) + { + case TRANSFORM_TYPE_PERMANENT: + RefreshFollowerGraphics(objectEvent); + break; + case TRANSFORM_TYPE_RANDOM_WILD: + multi = objectEvent->extra.asU16; + objectEvent->extra.mon.species = GetLocalWildMon(FALSE); + if (!objectEvent->extra.mon.species) { + objectEvent->extra.asU16 = multi; + break; + } + objectEvent->extra.mon.form = 0; + RefreshFollowerGraphics(objectEvent); + objectEvent->extra.asU16 = multi; + break; + } + } + + SetGpuReg(REG_OFFSET_MOSAIC, (stretch << 12) | (stretch << 8)); + frames++; + sprite->data[7] = (sprite->data[7] & 0xFF00) | frames; + return TRUE; +} + movement_type_def(MovementType_FollowPlayer, gMovementTypeFuncs_FollowPlayer) bool8 MovementType_FollowPlayer_Shadow(struct ObjectEvent *objectEvent, struct Sprite *sprite) @@ -4859,6 +4989,8 @@ bool8 MovementType_FollowPlayer_Moving(struct ObjectEvent *objectEvent, struct S if (sprite->data[1]) { // restore nonzero state sprite->data[1] = 1; } + } else if (objectEvent->movementActionId != MOVEMENT_ACTION_EXIT_POKEBALL) { + UpdateFollowerTransformEffect(objectEvent, sprite); } return FALSE; } @@ -4874,6 +5006,7 @@ bool8 FollowablePlayerMovement_Idle(struct ObjectEvent *objectEvent, struct Spri } else if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { // finish movement action objectEvent->singleMovementActive = 0; } + UpdateFollowerTransformEffect(objectEvent, sprite); return FALSE; } @@ -6542,6 +6675,7 @@ bool8 MovementAction_EnterPokeball_Step0(struct ObjectEvent *objectEvent, struct u8 direction = objectEvent->facingDirection; InitMoveInPlace(objectEvent, sprite, direction, GetMoveDirectionFasterAnimNum(direction), 16); sprite->data[6] = direction == DIR_EAST ? 3 : 2; // affine animation number + EndFollowerTransformEffect(objectEvent, sprite); return MovementAction_EnterPokeball_Step1(objectEvent, sprite); } diff --git a/src/field_effect.c b/src/field_effect.c index 021aca6df3..46491db268 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2998,12 +2998,8 @@ static void SurfFieldEffect_Init(struct Task *task) FreezeObjectEvents(); // Put follower into pokeball before using Surf if (followerObject && !followerObject->invisible) { - // TODO: ClearObjectEventMovement ( - followerObject->singleMovementActive = 0; - ObjectEventClearHeldMovement(followerObject); - gSprites[followerObject->spriteId].data[1] = 0; + ClearObjectEventMovement(followerObject, &gSprites[followerObject->spriteId]); gSprites[followerObject->spriteId].animCmdIndex = 0; // Needed because of weird animCmdIndex stuff - // ) ObjectEventSetHeldMovement(followerObject, MOVEMENT_ACTION_ENTER_POKEBALL); } gPlayerAvatar.preventStep = TRUE; diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index dc792f2ddb..4eb861c8c1 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -688,12 +688,8 @@ static void Task_DoDoorWarp(u8 taskId) PlayerGetDestCoords(x, y); PlaySE(GetDoorSoundEffect(*x, *y - 1)); if (followerObject) { // Put follower into pokeball - // TODO: ClearObjectEventMovement ( - followerObject->singleMovementActive = 0; - ObjectEventClearHeldMovement(followerObject); - gSprites[followerObject->spriteId].data[1] = 0; + ClearObjectEventMovement(followerObject, &gSprites[followerObject->spriteId]); gSprites[followerObject->spriteId].animCmdIndex = 0; // Needed because of weird animCmdIndex stuff - // ) ObjectEventSetHeldMovement(followerObject, MOVEMENT_ACTION_ENTER_POKEBALL); } task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); From 5727a467c4a13cea02b885140e1922154f97b45c Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Wed, 18 May 2022 19:45:55 -0400 Subject: [PATCH 5/5] Updated Chansey, Espeon, Gyarados and Magikarp sprites. Credit: Jaizu --- .../object_events/pics/pokemon/chansey.png | Bin 627 -> 7614 bytes .../object_events/pics/pokemon/espeon.png | Bin 751 -> 8553 bytes .../object_events/pics/pokemon/gyarados.png | Bin 1310 -> 11806 bytes .../object_events/pics/pokemon/magikarp.png | Bin 685 -> 8491 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/object_events/pics/pokemon/chansey.png b/graphics/object_events/pics/pokemon/chansey.png index a2915ad0a62faa14958702846909939d9490250a..b8237d18c7365b61fca6f80c08b024ae3ac70ace 100644 GIT binary patch literal 7614 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 Ik;nP}0bG(S8vpUt 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 Us;#iE__Z-=tKU?sR<(`zADdQ^5C8xG delta 1251 zcmV<91RVRGT%HP$BMAU7P)t-s)z#IL(CS z(0PWQGb72e?@dZ6RFK7IX@1|)nLkPt{V$jM2lf}M;Ynus^Mc#@F!Y#1$awq|=L;8q z)p0$zcO<;kIgFoS8Ui53PcVbD(O+Kd1;;|I#@U68o@B~UNvgyX%oZ}4jL!P1kA-n| zGD@7tS*;IvC~&$-1g}5Ln3rVJz5ZBeCTEMpn4D#c`hZ&@D&f}ZCgu4Dnaw2jOYNup zSf~=U;F*kifpg7}G2)X8Y4xlha>y)yg#-(lcJFsAj8h7n*@(StY)&1TCDL;c*f?kA zOi0c979H{;Nu=Xi+x$@2aT{oA_R=UE5}R4Vjb{?ZlO|V=tHhen5)>YAthh4@Y<|%O zcEY=^qdqXhau#P)6XQvf3gjRpfj$#SicRr(L#AKutvls{OEC&B)CoIo1LeklMv4bP zmZef4laT4`G&c^CnbbhDPJ)(|rL}xteS0#?z-4@#(+2B=$ekbrKIV+m0O#43k2wir zAy0EGV3CGEFYK5)8nG+j+I-w(Qzz($UO07;pXdY+4&r3*ZK1m8HL1(Lo^61YefZsQCC;r zD_fLa7_k-gTokqqB%x=2CEDZkzFI1APFa3mAhWqBaDjop-v{1Ac!J`-7Tf!l3=g@LfL{w&SopRcN|L4NQ9aE%KNMcoCW&@pqvUUVNxoOI8k9YYmgQ=slguFue?DCL(k6^j7^`2J; zOl8^i%`w})fZ7f3y~nr^*BTG2!4qqDz?672=9r(q;`eI!cjN!V^*4%tsVc8x&{Y5c N002ovPDHLkV1iV@U3~xm diff --git a/graphics/object_events/pics/pokemon/magikarp.png b/graphics/object_events/pics/pokemon/magikarp.png index 4d4a2be6c6eea640fb6b1d264b22c16ba96b158b..9442339d107ff10a1d478779c012529d1fc6051a 100644 GIT binary patch literal 8491 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