diff options
Diffstat (limited to 'data/scripts/berry_blender.inc')
| -rw-r--r-- | data/scripts/berry_blender.inc | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index 28c3d6de7..d98add74d 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -1,3 +1,11 @@ +@ Note: local IDs shared with scripts.inc for LilycoveCity_ContestLobby +.set LOCALID_MAN, 3 +.set LOCALID_BOY, 9 +.set LOCALID_TWIN, 10 +.set LOCALID_POKEFAN_F, 15 +.set LOCALID_EXPERT_M, 16 +.set LOCALID_GIRL, 17 + BerryBlender_Text_WantToMakePokeblocks: @ 8292DEE .string "Oh? Did you want to make some {POKEBLOCK}S\n" .string "with this old-timer?$" @@ -236,7 +244,7 @@ BerryBlender_EventScript_BerryBlender1:: @ 8293C3E lockall goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent setvar VAR_0x8009, 1 - applymovement 16, BerryBlender_Movement_BlendLeaderWalkInPlace + applymovement LOCALID_EXPERT_M, BerryBlender_Movement_BlendLeaderWalkInPlace waitmovement 0 msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO compare VAR_RESULT, YES @@ -321,8 +329,8 @@ BerryBlender_EventScript_Blender1NoCase: @ 8293D43 BerryBlender_EventScript_BerryBlender2:: @ 8293D4D lockall setvar VAR_0x8009, 2 - applymovement 10, Common_Movement_FaceOriginalDirection - applymovement 3, BerryBlender_Movement_BlendLeaderWalkInPlace + applymovement LOCALID_TWIN, Common_Movement_FaceOriginalDirection + applymovement LOCALID_MAN, BerryBlender_Movement_BlendLeaderWalkInPlace waitmovement 0 msgbox BerryBlender_Text_WantToBlendPokeblocksWithUs, MSGBOX_YESNO compare VAR_RESULT, YES @@ -384,10 +392,10 @@ BerryBlender_EventScript_Blender2NoCase: @ 8293E14 BerryBlender_EventScript_BerryBlender3:: @ 8293E1E lockall - setvar VAR_0x8008, 15 + setvar VAR_0x8008, LOCALID_POKEFAN_F setvar VAR_0x8009, 3 - applymovement 9, Common_Movement_FaceOriginalDirection - applymovement 17, Common_Movement_FaceOriginalDirection + applymovement LOCALID_BOY, Common_Movement_FaceOriginalDirection + applymovement LOCALID_GIRL, Common_Movement_FaceOriginalDirection applymovement VAR_0x8008, BerryBlender_Movement_BlendLeaderWalkInPlace waitmovement 0 msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_YESNO @@ -630,9 +638,9 @@ BerryBlender_EventScript_FourPlayerLink: @ 8294139 BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147 setvar VAR_0x8004, 0 fadescreen FADE_TO_BLACK - removeobject 240 - removeobject 239 - removeobject 238 + removeobject 240 @ Unclear where these local IDs come from, + removeobject 239 @ but presumably they'd be the 4 link players + removeobject 238 removeobject 237 special DoBerryBlending waitstate |