Pulled updated Follow Me Code

This commit is contained in:
Suppai_Neko committed 2023-04-22 08:33:55 -07:00
commit 9379107d15
6 files changed
+5 -15

No files matched your search

Binary file not shown.
+2 -4
View File
@@ -14,7 +14,7 @@ GraniteCave_B3F_EventScript_WhatDidHeFind::
end end
GraniteCave_B3F_Text_WhatDidHeFind: GraniteCave_B3F_Text_WhatDidHeFind:
.string "I should see what STEVEN found$" .string "I should see what STEVEN found.$"
GraniteCave_B3F_Text_CheckOnSteven: GraniteCave_B3F_Text_CheckOnSteven:
.string "STEVEN: Just a second, we should come up\n" .string "STEVEN: Just a second, we should come up\n"
@@ -274,8 +274,6 @@ GraniteCave_B3F_EventScript_ShinyRock::
waitmovement 0 waitmovement 0
msgbox GraniteCave_B3F_Text_MetangFlash, MSGBOX_DEFAULT msgbox GraniteCave_B3F_Text_MetangFlash, MSGBOX_DEFAULT
delay 32 delay 32
animateflash 1
delay 32
playse SE_PIN playse SE_PIN
applymovement 1, Common_Movement_ExclamationMark applymovement 1, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
@@ -290,7 +288,7 @@ GraniteCave_B3F_Text_StayAndStudy:
.string "STEVEN: Look at that brilliant shimmer.\n" .string "STEVEN: Look at that brilliant shimmer.\n"
.string "I wonder if this could be...\p" .string "I wonder if this could be...\p"
.string "Thank you for you help {PLAYER}.\n" .string "Thank you for you help {PLAYER}.\n"
.string "I will stay here and investiage this\l" .string "I will stay here and investigate this\l"
.string "odd stone.\p" .string "odd stone.\p"
.string "Oh! You had a letter for me?$" .string "Oh! You had a letter for me?$"
-1
View File
@@ -35,7 +35,6 @@ Route116Ext_EventScript_Kate::
end end
Route116Ext_EventScript_BayLeaf:: Route116Ext_EventScript_BayLeaf::
faceplayer
playmoncry SPECIES_BAYLEEF, 0 playmoncry SPECIES_BAYLEEF, 0
waitmoncry waitmoncry
delay 32 delay 32
+2 -8
View File
@@ -1603,14 +1603,8 @@ const struct Item gItems[] =
.name = _("Escape Rope"), .name = _("Escape Rope"),
.itemId = ITEM_ESCAPE_ROPE, .itemId = ITEM_ESCAPE_ROPE,
.description = sEscapeRopeDesc, .description = sEscapeRopeDesc,
#if I_KEY_ESCAPE_ROPE >= GEN_8 .price = 1000,
.price = 0, .pocket = POCKET_ITEMS,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
#else
.price = 1000,
.pocket = POCKET_ITEMS,
#endif
.type = ITEM_USE_FIELD, .type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_EscapeRope, .fieldUseFunc = ItemUseOutOfBattle_EscapeRope,
.flingPower = 30, .flingPower = 30,
+1 -1
View File
@@ -3638,7 +3638,7 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = {
}, },
{ {
.iv = 100, .iv = 100,
.lvl = 23, .lvl = 20,
.species = SPECIES_BRELOOM, .species = SPECIES_BRELOOM,
.heldItem = ITEM_SITRUS_BERRY, .heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_BULLET_SEED, MOVE_THUNDER_PUNCH, MOVE_MACH_PUNCH, MOVE_BULK_UP} .moves = {MOVE_BULLET_SEED, MOVE_THUNDER_PUNCH, MOVE_MACH_PUNCH, MOVE_BULK_UP}
-1
View File
@@ -1528,7 +1528,6 @@ void ShowFollower(void)
gObjectEvents[gSaveBlock2Ptr->follower.objId].invisible = FALSE; gObjectEvents[gSaveBlock2Ptr->follower.objId].invisible = FALSE;
} }
void SetFollowerWarpPosition(void) void SetFollowerWarpPosition(void)
{ {
gSaveBlock2Ptr->follower.createSurfBlob = 1; gSaveBlock2Ptr->follower.createSurfBlob = 1;