diff --git a/data/layouts/Route104/map.bin b/data/layouts/Route104/map.bin index dc2dd0117..b4cc0fd51 100644 Binary files a/data/layouts/Route104/map.bin and b/data/layouts/Route104/map.bin differ diff --git a/data/maps/GraniteCave_B3F/scripts.inc b/data/maps/GraniteCave_B3F/scripts.inc index a01f189ad..5c7bb3fd5 100644 --- a/data/maps/GraniteCave_B3F/scripts.inc +++ b/data/maps/GraniteCave_B3F/scripts.inc @@ -14,7 +14,7 @@ GraniteCave_B3F_EventScript_WhatDidHeFind:: end GraniteCave_B3F_Text_WhatDidHeFind: - .string "I should see what STEVEN found$" + .string "I should see what STEVEN found.$" GraniteCave_B3F_Text_CheckOnSteven: .string "STEVEN: Just a second, we should come up\n" @@ -274,8 +274,6 @@ GraniteCave_B3F_EventScript_ShinyRock:: waitmovement 0 msgbox GraniteCave_B3F_Text_MetangFlash, MSGBOX_DEFAULT delay 32 - animateflash 1 - delay 32 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark waitmovement 0 @@ -290,7 +288,7 @@ GraniteCave_B3F_Text_StayAndStudy: .string "STEVEN: Look at that brilliant shimmer.\n" .string "I wonder if this could be...\p" .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 "Oh! You had a letter for me?$" diff --git a/data/maps/Route116Ext/scripts.inc b/data/maps/Route116Ext/scripts.inc index ec52f329f..9ce43b3df 100644 --- a/data/maps/Route116Ext/scripts.inc +++ b/data/maps/Route116Ext/scripts.inc @@ -35,7 +35,6 @@ Route116Ext_EventScript_Kate:: end Route116Ext_EventScript_BayLeaf:: - faceplayer playmoncry SPECIES_BAYLEEF, 0 waitmoncry delay 32 diff --git a/src/data/items.h b/src/data/items.h index 82e41901c..e2bbe0c83 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1603,14 +1603,8 @@ const struct Item gItems[] = .name = _("Escape Rope"), .itemId = ITEM_ESCAPE_ROPE, .description = sEscapeRopeDesc, - #if I_KEY_ESCAPE_ROPE >= GEN_8 - .price = 0, - .importance = 1, - .pocket = POCKET_KEY_ITEMS, - #else - .price = 1000, - .pocket = POCKET_ITEMS, - #endif + .price = 1000, + .pocket = POCKET_ITEMS, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_EscapeRope, .flingPower = 30, diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index 84d74934d..a495c892a 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -3638,7 +3638,7 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = { }, { .iv = 100, - .lvl = 23, + .lvl = 20, .species = SPECIES_BRELOOM, .heldItem = ITEM_SITRUS_BERRY, .moves = {MOVE_BULLET_SEED, MOVE_THUNDER_PUNCH, MOVE_MACH_PUNCH, MOVE_BULK_UP} diff --git a/src/follow_me.c b/src/follow_me.c index 00b24087c..8d3c04b7b 100644 --- a/src/follow_me.c +++ b/src/follow_me.c @@ -1528,7 +1528,6 @@ void ShowFollower(void) gObjectEvents[gSaveBlock2Ptr->follower.objId].invisible = FALSE; } - void SetFollowerWarpPosition(void) { gSaveBlock2Ptr->follower.createSurfBlob = 1;