Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added more follower messages.

Browse Source
This commit is contained in:
Ariel Antonitis 2020-06-26 00:30:01 -04:00
parent 418cab092c
commit b5c8b0f494
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/scripts/follower.inc
View File

@ -1,5 +1,5 @@
gText_FollowerLovesYou:: gText_FollowerLovesYou::
.string "{STR_VAR_1} loves you!$" .string "{STR_VAR_1} jumps and grins at you.\pIts expression is welling up with love!$"
gText_FollowerLostInThought:: gText_FollowerLostInThought::
.string "{STR_VAR_1} seems lost in thought.$" .string "{STR_VAR_1} seems lost in thought.$"
@ -28,6 +28,12 @@ gText_FollowerMetLocation::
gText_FollowerSkeptical:: gText_FollowerSkeptical::
.string "{STR_VAR_1} gives you a skeptical look...\pWhat could it mean?$" .string "{STR_VAR_1} gives you a skeptical look...\pWhat could it mean?$"
gText_FollowerAppraising::
.string "{STR_VAR_1} looks you up and down...\pIt carefully follows\nbehind you.$"
gText_FollowerHappyWalk::
.string "{STR_VAR_1} skips happily behind you!$"
.macro playfirstmoncry .macro playfirstmoncry
callfunc ScrFunc_playfirstmoncry callfunc ScrFunc_playfirstmoncry
.endm .endm
@ -56,6 +62,20 @@ EventScript_FollowerEnd::
release release
end end
EventScript_FollowerHappyWalk::
bufferlivemonspeciesname 0
playfirstmoncry
msgbox gText_FollowerHappyWalk, MSGBOX_DEFAULT
waitmoncry
return
EventScript_FollowerAppraising::
bufferlivemonspeciesname 0
playfirstmoncry
msgbox gText_FollowerAppraising, MSGBOX_DEFAULT
waitmoncry
return
EventScript_FollowerSkeptical:: EventScript_FollowerSkeptical::
bufferlivemonspeciesname 0 bufferlivemonspeciesname 0
playfirstmoncry playfirstmoncry

2
include/event_scripts.h
View File

@ -10,6 +10,8 @@ extern const u8 EventScript_FollowerHappyRain[];
extern const u8 EventScript_FollowerMetLocation[]; extern const u8 EventScript_FollowerMetLocation[];
extern const u8 EventScript_FollowerEnd[]; extern const u8 EventScript_FollowerEnd[];
extern const u8 EventScript_FollowerSkeptical[]; extern const u8 EventScript_FollowerSkeptical[];
extern const u8 EventScript_FollowerAppraising[];
extern const u8 EventScript_FollowerHappyWalk[];
extern const u8 EnterPokeballMovement[]; extern const u8 EnterPokeballMovement[];
extern const u8 EventScript_TestSignpostMsg[]; extern const u8 EventScript_TestSignpostMsg[];

8
src/event_object_movement.c
View File

@ -1737,9 +1737,13 @@ bool8 ScrFunc_getfolloweraction(struct ScriptContext *ctx) // Essentially a big
return FALSE; return FALSE;
} }
friendship = GetMonData(mon, MON_DATA_FRIENDSHIP); friendship = GetMonData(mon, MON_DATA_FRIENDSHIP);
if (friendship < 25) if (friendship <= 80)
ScriptCall(ctx, EventScript_FollowerSkeptical); ScriptCall(ctx, EventScript_FollowerSkeptical);
else if (friendship == 255) else if (friendship <= 170)
ScriptCall(ctx, EventScript_FollowerAppraising);
else if (friendship < 255)
ScriptCall(ctx, EventScript_FollowerHappyWalk);
else // Max friendship
ScriptCall(ctx, EventScript_FollowerLovesYou); ScriptCall(ctx, EventScript_FollowerLovesYou);
return FALSE; return FALSE;
} }