diff options
Diffstat (limited to 'data')
188 files changed, 1602 insertions, 1602 deletions
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index 24881ab7c..ba5d9f533 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -2091,7 +2091,7 @@ gSpriteAnimTable_83D912C:: @ 83D912C .align 2 gSpriteTemplate_83D9130:: @ 83D9130 - spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, sub_80D3184 + spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, SetAnimRaindropCallback .align 2 gSpriteAffineAnim_83D9148:: @ 83D9148 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index de3d354ce..e0d11637d 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1416,11 +1416,11 @@ Move_FURY_CUTTER: @ 81C914A monbg 1 setalpha 12, 8 panse_19 SE_W013, 63 - createtask sub_80D30AC, 2 + createtask UpdateFuryCutterAnimDirection, 2 jumpvareq 7, 0, _81C91A7 jump _81C91B9 _81C916A: - createtask update_fury_cutter_counter_copy, 2 + createtask UpdateFuryCutterAnimCount, 2 jumpvareq 7, 1, _81C918E jumpvareq 7, 2, _81C91CB jumpvareq 7, 3, _81C91E5 @@ -5271,8 +5271,8 @@ Move_RAIN_DANCE: @ 81CE997 panse_19 SE_W240, 192 createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 wait - createtask sub_80D30F0, 2, 0, 3, 120 - createtask sub_80D30F0, 2, 0, 3, 120 + createtask CreateAnimRaindrops, 2, 0, 3, 120 + createtask CreateAnimRaindrops, 2, 0, 3, 120 pause 120 pause 30 wait @@ -10497,8 +10497,8 @@ General_Rain: @ 81D67BB panse_19 SE_W240, 192 createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 wait - createtask sub_80D30F0, 2, 0, 3, 60 - createtask sub_80D30F0, 2, 0, 3, 60 + createtask CreateAnimRaindrops, 2, 0, 3, 60 + createtask CreateAnimRaindrops, 2, 0, 3, 60 pause 50 wait createtask sub_80E2A38, 10, 1921, 2, 4, 0, 0 diff --git a/data/contest_opponents.inc b/data/contest_opponents.inc index 2c502285e..8c9c76f1b 100644 --- a/data/contest_opponents.inc +++ b/data/contest_opponents.inc @@ -1,5 +1,5 @@ .align 2 -gUnknown_083C9408:: @ 83C9408 +gContestOpponents:: @ 83C9408 .2byte 286 @ SPECIES_ID .string "POOCHY$", 11 @ POKE_NICKNAME .string "JIMMY$", 8 @ TRAINER_NAME diff --git a/data/event_scripts.s b/data/event_scripts.s index bbeac074c..76b080a5b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -32,12 +32,12 @@ gSpecialVars:: .4byte gSpecialVar_0x8009 .4byte gSpecialVar_0x800A .4byte gSpecialVar_0x800B - .4byte gScriptFacing - .4byte gScriptResult - .4byte gScriptItemId - .4byte gScriptLastTalked - .4byte gScriptContestRank - .4byte gScriptContestCategory + .4byte gSpecialVar_Facing + .4byte gSpecialVar_Result + .4byte gSpecialVar_ItemId + .4byte gSpecialVar_LastTalked + .4byte gSpecialVar_ContestRank + .4byte gSpecialVar_ContestCategory .include "data/specials.inc" @@ -401,7 +401,7 @@ gUnknown_0815F36C:: @ 815F36C dofieldeffect 61 waitstate waitmessage - waitbutton + waitbuttonpress playse 5 goto EventScript_15F384 end @@ -462,7 +462,7 @@ gUnknown_0815F43A:: @ 815F43A dofieldeffect 61 waitstate waitmessage - waitbutton + waitbuttonpress playse 5 goto EventScript_15F452 end @@ -901,7 +901,7 @@ Std_2: faceplayer message 0x0 waitmessage - waitbutton + waitbuttonpress release return @@ -909,14 +909,14 @@ Std_3: lockall message 0x0 waitmessage - waitbutton + waitbuttonpress releaseall return Std_4: message 0x0 waitmessage - waitbutton + waitbuttonpress return Std_5: @@ -953,7 +953,7 @@ gUnknown_0819F818:: @ 819F818 goto EventScript_19F8F2 EventScript_19F83F: - ontrainerbattleend + gotopostbattlescript gUnknown_0819F840:: @ 819F840 lock @@ -972,19 +972,19 @@ gUnknown_0819F840:: @ 819F840 EventScript_19F870: special ScrSpecial_ShowTrainerNonBattlingSpeech waitmessage - waitbutton + waitbuttonpress release end EventScript_19F877: - ontrainerbattleend + gotopostbattlescript gUnknown_0819F878:: @ 819F878 applymovement LAST_TALKED, Movement_19F8F0 waitmovement 0 special PlayTrainerEncounterMusic - battlebegin - ontrainerbattleend + trainerbattlebegin + gotopostbattlescript gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 @@ -995,14 +995,14 @@ gUnknown_0819F887:: @ 819F887 special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech waitmessage - waitbutton + waitbuttonpress special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end EventScript_19F8AD: - ontrainerbattleend + gotopostbattlescript gUnknown_0819F8AE:: @ 819F8AE specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag @@ -1015,19 +1015,19 @@ gUnknown_0819F8AE:: @ 819F8AE special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech waitmessage - waitbutton + waitbuttonpress special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end EventScript_19F8DD: - ontrainerbattleend + gotopostbattlescript EventScript_19F8DE: special ScrSpecial_ShowTrainerNonBattlingSpeech waitmessage - waitbutton + waitbuttonpress release end @@ -1043,8 +1043,8 @@ Movement_19F8F0:: EventScript_19F8F2: special ScrSpecial_ShowTrainerIntroSpeech waitmessage - waitbutton - battlebegin + waitbuttonpress + trainerbattlebegin specialvar RESULT, ScrSpecial_GetTrainerBattleMode compare RESULT, 0 goto_if_eq EventScript_19F934 @@ -1062,96 +1062,96 @@ EventScript_19F934: end EventScript_19F936: - ontrainerbattleendgoto + gotobeatenscript Std_6:: message 0x0 waitmessage - waitbutton + waitbuttonpress release return Event_ResetBerryTrees: @ 19F940 - plantberrytree 2, 7, 5 - plantberrytree 1, 3, 5 - plantberrytree 11, 7, 5 - plantberrytree 13, 3, 5 - plantberrytree 4, 7, 5 - plantberrytree 76, 1, 5 - plantberrytree 8, 1, 5 - plantberrytree 10, 6, 5 - plantberrytree 25, 20, 5 - plantberrytree 26, 2, 5 - plantberrytree 66, 2, 5 - plantberrytree 67, 20, 5 - plantberrytree 69, 22, 5 - plantberrytree 70, 22, 5 - plantberrytree 71, 22, 5 - plantberrytree 55, 17, 5 - plantberrytree 56, 17, 5 - plantberrytree 5, 1, 5 - plantberrytree 6, 6, 5 - plantberrytree 7, 1, 5 - plantberrytree 16, 18, 5 - plantberrytree 17, 18, 5 - plantberrytree 18, 18, 5 - plantberrytree 29, 19, 5 - plantberrytree 28, 19, 5 - plantberrytree 27, 19, 5 - plantberrytree 24, 4, 5 - plantberrytree 23, 3, 5 - plantberrytree 22, 3, 5 - plantberrytree 21, 4, 5 - plantberrytree 19, 16, 5 - plantberrytree 20, 16, 5 - plantberrytree 80, 7, 5 - plantberrytree 81, 7, 5 - plantberrytree 77, 8, 5 - plantberrytree 78, 8, 5 - plantberrytree 68, 8, 5 - plantberrytree 31, 10, 5 - plantberrytree 33, 10, 5 - plantberrytree 34, 21, 5 - plantberrytree 35, 21, 5 - plantberrytree 36, 21, 5 - plantberrytree 83, 24, 5 - plantberrytree 84, 24, 5 - plantberrytree 85, 10, 5 - plantberrytree 86, 6, 5 - plantberrytree 37, 5, 5 - plantberrytree 38, 5, 5 - plantberrytree 39, 5, 5 - plantberrytree 40, 3, 5 - plantberrytree 41, 3, 5 - plantberrytree 42, 3, 5 - plantberrytree 46, 19, 5 - plantberrytree 45, 20, 5 - plantberrytree 44, 18, 5 - plantberrytree 43, 16, 5 - plantberrytree 47, 8, 5 - plantberrytree 48, 5, 5 - plantberrytree 49, 4, 5 - plantberrytree 50, 2, 5 - plantberrytree 52, 18, 5 - plantberrytree 53, 18, 5 - plantberrytree 62, 6, 5 - plantberrytree 64, 6, 5 - plantberrytree 58, 21, 5 - plantberrytree 59, 21, 5 - plantberrytree 60, 25, 5 - plantberrytree 61, 25, 5 - plantberrytree 79, 23, 5 - plantberrytree 14, 23, 5 - plantberrytree 15, 21, 5 - plantberrytree 30, 21, 5 - plantberrytree 65, 25, 5 - plantberrytree 72, 25, 5 - plantberrytree 73, 23, 5 - plantberrytree 74, 23, 5 - plantberrytree 87, 3, 5 - plantberrytree 88, 10, 5 - plantberrytree 89, 4, 5 - plantberrytree 82, 36, 5 + setberrytree 2, 7, 5 + setberrytree 1, 3, 5 + setberrytree 11, 7, 5 + setberrytree 13, 3, 5 + setberrytree 4, 7, 5 + setberrytree 76, 1, 5 + setberrytree 8, 1, 5 + setberrytree 10, 6, 5 + setberrytree 25, 20, 5 + setberrytree 26, 2, 5 + setberrytree 66, 2, 5 + setberrytree 67, 20, 5 + setberrytree 69, 22, 5 + setberrytree 70, 22, 5 + setberrytree 71, 22, 5 + setberrytree 55, 17, 5 + setberrytree 56, 17, 5 + setberrytree 5, 1, 5 + setberrytree 6, 6, 5 + setberrytree 7, 1, 5 + setberrytree 16, 18, 5 + setberrytree 17, 18, 5 + setberrytree 18, 18, 5 + setberrytree 29, 19, 5 + setberrytree 28, 19, 5 + setberrytree 27, 19, 5 + setberrytree 24, 4, 5 + setberrytree 23, 3, 5 + setberrytree 22, 3, 5 + setberrytree 21, 4, 5 + setberrytree 19, 16, 5 + setberrytree 20, 16, 5 + setberrytree 80, 7, 5 + setberrytree 81, 7, 5 + setberrytree 77, 8, 5 + setberrytree 78, 8, 5 + setberrytree 68, 8, 5 + setberrytree 31, 10, 5 + setberrytree 33, 10, 5 + setberrytree 34, 21, 5 + setberrytree 35, 21, 5 + setberrytree 36, 21, 5 + setberrytree 83, 24, 5 + setberrytree 84, 24, 5 + setberrytree 85, 10, 5 + setberrytree 86, 6, 5 + setberrytree 37, 5, 5 + setberrytree 38, 5, 5 + setberrytree 39, 5, 5 + setberrytree 40, 3, 5 + setberrytree 41, 3, 5 + setberrytree 42, 3, 5 + setberrytree 46, 19, 5 + setberrytree 45, 20, 5 + setberrytree 44, 18, 5 + setberrytree 43, 16, 5 + setberrytree 47, 8, 5 + setberrytree 48, 5, 5 + setberrytree 49, 4, 5 + setberrytree 50, 2, 5 + setberrytree 52, 18, 5 + setberrytree 53, 18, 5 + setberrytree 62, 6, 5 + setberrytree 64, 6, 5 + setberrytree 58, 21, 5 + setberrytree 59, 21, 5 + setberrytree 60, 25, 5 + setberrytree 61, 25, 5 + setberrytree 79, 23, 5 + setberrytree 14, 23, 5 + setberrytree 15, 21, 5 + setberrytree 30, 21, 5 + setberrytree 65, 25, 5 + setberrytree 72, 25, 5 + setberrytree 73, 23, 5 + setberrytree 74, 23, 5 + setberrytree 87, 3, 5 + setberrytree 88, 10, 5 + setberrytree 89, 4, 5 + setberrytree 82, 36, 5 return gUnknown_0819FA81:: @ 819FA81 @@ -1499,13 +1499,13 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 step_end Std_ObtainItem: @ 819FDF7 - additem 0x8000, 0x8001 + giveitem 0x8000, 0x8001 copyvar 0x8007, RESULT call Std_ObtainItem_ return Std_ObtainItem_: @ 819FE07 - getitemname 1, 0x8000 + bufferitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 0x1 @@ -1524,31 +1524,31 @@ GetItem_HandlePocket: end GetItem_HandlePocket_Items: - getstdstring 2, 0xE + bufferstdstring 2, 0xE compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: - getstdstring 2, 0xF + bufferstdstring 2, 0xF compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: - getstdstring 2, 0x10 + bufferstdstring 2, 0x10 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: - getstdstring 2, 0x11 + bufferstdstring 2, 0x11 compare 0x8007, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: - getstdstring 2, 0x12 + bufferstdstring 2, 0x12 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return @@ -1574,13 +1574,13 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - adddecor 0x8000 + givedecoration 0x8000 copyvar 0x8007, RESULT call Std_ObtainDecoration_ return Std_ObtainDecoration_: @ 819FEE8 - getdecorname 1, 0x8000 + bufferdecorationname 1, 0x8000 compare 0x8007, 1 call_if 1, Std_ObtainDecoration_Success compare 0x8007, 0 @@ -1604,9 +1604,9 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - additem 0x8000, 0x8001 + giveitem 0x8000, 0x8001 copyvar 0x8007, RESULT - getitemname 1, 0x8000 + bufferitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 1 @@ -1633,9 +1633,9 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - additem 0x8005, 1 + giveitem 0x8005, 1 copyvar 0x8007, RESULT - getitemname 0x1, 0x8005 + bufferitemname 0x1, 0x8005 checkitemtype 0x8005 call GetItem_HandlePocket compare 0x8007, 1 @@ -1677,7 +1677,7 @@ UnusedMixRecordsScript_Yes: @ 819FFFA UnusedMixRecordsScript_Done: @ 81A0000 message UnusedMixRecordsSeeYouAgainText waitmessage - waitbutton + waitbuttonpress release end @@ -1820,11 +1820,11 @@ Route109_EventScript_1A010C:: @ 81A010C return UseSurfScript:: @ 81A0117 - checkpokemove MOVE_SURF + checkpartymove MOVE_SURF compare RESULT, 6 goto_if_eq UseSurfScript_NoMon - getpartypokename 0, RESULT - setfieldeffect 0, RESULT + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT lockall msgbox UseSurfPromptText, 5 compare RESULT, 0 @@ -2208,7 +2208,7 @@ Route101_EventScript_1A03A5:: @ 81A03A5 copyvar 0x8004, 0x8009 special ShowPokedexRatingMessage waitmessage - waitbutton + waitbuttonpress return EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 @@ -2218,8 +2218,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 copyvar 0x800a, RESULT - getnumberstring 0, 0x8008 - getnumberstring 1, 0x8009 + buffernumberstring 0, 0x8008 + buffernumberstring 1, 0x8009 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 compare 0x800a, 0 @@ -2228,8 +2228,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 specialvar RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 - getnumberstring 0, 0x8008 - getnumberstring 1, 0x8009 + buffernumberstring 0, 0x8008 + buffernumberstring 1, 0x8009 msgbox Route101_Text_1C4B05, 4 return @@ -2276,7 +2276,7 @@ EventScript_1A0457: @ unreferenced? delay 30 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 waitmovement 0 - showobject 255, 0, 0 + showobjectat 255, MAP_PETALBURG_CITY delay 30 applymovement 255, Movement_1A047A waitmovement 0 @@ -2294,15 +2294,15 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY call BattleTower_Outside_EventScript_1A040E return CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0 lockall waitse - playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 - waitpokecry + playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 + waitmoncry setvar 0x4005, 1 releaseall end @@ -2356,9 +2356,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE waitse - playpokecry SPECIES_ELECTRODE, 2 + playmoncry SPECIES_ELECTRODE, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -2372,9 +2372,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE waitse - playpokecry SPECIES_ELECTRODE, 2 + playmoncry SPECIES_ELECTRODE, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -2455,9 +2455,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3 applymovement LAST_TALKED, Route119_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE compare 0x8004, 1 call_if 1, Route119_EventScript_1A0646 @@ -2546,12 +2546,12 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F - getitemname 0, 0x8004 + bufferitemname 0, 0x8004 playfanfare 372 message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - removeitem 0x8004, 1 + takeitem 0x8004, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 @@ -2561,18 +2561,18 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 waitmovement 0 playse 8 - setmaptile 6, 1, 836, 0 - setmaptile 6, 2, 837, 0 - setmaptile 0, 2, 734, 1 - setmaptile 1, 2, 733, 1 - setmaptile 2, 2, 734, 1 - setmaptile 3, 2, 733, 1 - setmaptile 4, 2, 734, 1 - setmaptile 8, 2, 733, 1 - setmaptile 9, 2, 734, 1 - setmaptile 10, 2, 733, 1 - setmaptile 11, 2, 734, 1 - setmaptile 12, 2, 733, 1 + setmetatile 6, 1, 836, 0 + setmetatile 6, 2, 837, 0 + setmetatile 0, 2, 734, 1 + setmetatile 1, 2, 733, 1 + setmetatile 2, 2, 734, 1 + setmetatile 3, 2, 733, 1 + setmetatile 4, 2, 734, 1 + setmetatile 8, 2, 733, 1 + setmetatile 9, 2, 734, 1 + setmetatile 10, 2, 733, 1 + setmetatile 11, 2, 734, 1 + setmetatile 12, 2, 733, 1 special DrawWholeMapView return @@ -2583,12 +2583,12 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 waitmovement 0 playse 52 - setmaptile 5, 12, 518, 1 - setmaptile 6, 12, 518, 1 - setmaptile 7, 12, 518, 1 - setmaptile 5, 13, 526, 1 - setmaptile 6, 13, 526, 1 - setmaptile 7, 13, 526, 1 + setmetatile 5, 12, 518, 1 + setmetatile 6, 12, 518, 1 + setmetatile 7, 12, 518, 1 + setmetatile 5, 13, 526, 1 + setmetatile 6, 13, 526, 1 + setmetatile 7, 13, 526, 1 special DrawWholeMapView return @@ -2596,36 +2596,36 @@ EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757 - setmaptile 6, 1, 836, 0 - setmaptile 6, 2, 837, 0 - setmaptile 5, 12, 518, 1 - setmaptile 6, 12, 518, 1 - setmaptile 7, 12, 518, 1 - setmaptile 5, 13, 526, 1 - setmaptile 6, 13, 526, 1 - setmaptile 7, 13, 526, 1 - setmaptile 0, 2, 734, 1 - setmaptile 1, 2, 733, 1 - setmaptile 2, 2, 734, 1 - setmaptile 3, 2, 733, 1 - setmaptile 4, 2, 734, 1 - setmaptile 8, 2, 733, 1 - setmaptile 9, 2, 734, 1 - setmaptile 10, 2, 733, 1 - setmaptile 11, 2, 734, 1 - setmaptile 12, 2, 733, 1 + setmetatile 6, 1, 836, 0 + setmetatile 6, 2, 837, 0 + setmetatile 5, 12, 518, 1 + setmetatile 6, 12, 518, 1 + setmetatile 7, 12, 518, 1 + setmetatile 5, 13, 526, 1 + setmetatile 6, 13, 526, 1 + setmetatile 7, 13, 526, 1 + setmetatile 0, 2, 734, 1 + setmetatile 1, 2, 733, 1 + setmetatile 2, 2, 734, 1 + setmetatile 3, 2, 733, 1 + setmetatile 4, 2, 734, 1 + setmetatile 8, 2, 733, 1 + setmetatile 9, 2, 734, 1 + setmetatile 10, 2, 733, 1 + setmetatile 11, 2, 734, 1 + setmetatile 12, 2, 733, 1 return EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA - setmaptile 5, 12, 518, 1 - setmaptile 6, 12, 518, 1 - setmaptile 7, 12, 518, 1 - setmaptile 5, 13, 526, 1 - setmaptile 6, 13, 526, 1 - setmaptile 7, 13, 526, 1 + setmetatile 5, 12, 518, 1 + setmetatile 6, 12, 518, 1 + setmetatile 7, 12, 518, 1 + setmetatile 5, 13, 526, 1 + setmetatile 6, 13, 526, 1 + setmetatile 7, 13, 526, 1 return SlateportCity_Movement_1A0831:: @ 81A0831 @@ -3271,7 +3271,7 @@ gUnknown_081A14B8:: @ 81A14B8 EventScript_1A14CA:: message UnknownString_81A1141 waitmessage - waitbutton + waitbuttonpress special sub_8081924 waitstate fadescreen 1 @@ -3609,9 +3609,9 @@ gUnknown_081A2C51:: @ 81A2C51 special sub_80BB63C compare RESULT, 1 goto_if_eq EventScript_1A2E45 - checkpokemove MOVE_SECRET_POWER - setfieldeffect 0, RESULT - getmovename 1, MOVE_SECRET_POWER + checkpartymove MOVE_SECRET_POWER + setfieldeffectargument 0, RESULT + buffermovename 1, MOVE_SECRET_POWER compare 0x8007, 1 goto_if_eq EventScript_1A2CB0 compare 0x8007, 2 @@ -3630,7 +3630,7 @@ EventScript_1A2CB0: lockall compare RESULT, 6 goto_if_eq EventScript_1A2CF1 - getpartypokename 0, RESULT + bufferpartymonnick 0, RESULT msgbox UnknownString_8198F34, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3661,7 +3661,7 @@ EventScript_1A2D08: lockall compare RESULT, 6 goto_if_eq EventScript_1A2D49 - getpartypokename 0, RESULT + bufferpartymonnick 0, RESULT msgbox UnknownString_81A197B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3692,7 +3692,7 @@ EventScript_1A2D60: lockall compare RESULT, 6 goto_if_eq EventScript_1A2DA1 - getpartypokename 0, RESULT + bufferpartymonnick 0, RESULT msgbox UnknownString_81A1A4B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3778,10 +3778,10 @@ EventScript_1A2E38: end EventScript_1A2E45: - checkpokemove MOVE_SECRET_POWER + checkpartymove MOVE_SECRET_POWER compare RESULT, 6 goto_if_eq EventScript_1A2EF7 - setfieldeffect 0, RESULT + setfieldeffectargument 0, RESULT setorcopyvar 0x8004, RESULT lockall special GetSecretBaseNearbyMapName @@ -3798,8 +3798,8 @@ EventScript_1A2E45: msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A - getpartypokename 0, 0x8004 - getmovename 1, MOVE_SECRET_POWER + bufferpartymonnick 0, 0x8004 + buffermovename 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closemessage closemessage @@ -4773,8 +4773,8 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F .include "data/text/magma_summit.inc" gUnknown_081B694A:: @ 81B694A - animdarklevel 1 - setdarklevel 1 + animateflash 1 + setflashradius 1 end .include "data/scripts/players_house.inc" @@ -4928,7 +4928,7 @@ gUnknown_081C6C02:: @ 81C6C02 @ 81C6C1D lockall braillemessage Underwater_SealedChamber_Braille_1C533D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 86b81dd01..0a0eeaa73 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -2,12 +2,12 @@ S_CuttableTree:: @ 81B0DCC lockall checkflag FLAG_BADGE01_GET goto_if 0, CannotUseCut - checkpokemove MOVE_CUT + checkpartymove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut - setfieldeffect 0, RESULT - getpartypokename 0, RESULT - getmovename 1, MOVE_CUT + setfieldeffectargument 0, RESULT + bufferpartymonnick 0, RESULT + buffermovename 1, MOVE_CUT msgbox UseCutPromptText, 5 compare RESULT, 0 goto_if_eq Cut_ChoseNo @@ -60,12 +60,12 @@ S_BreakableRock:: @ 81B0EB7 lockall checkflag FLAG_BADGE03_GET goto_if 0, CannotUseRockSmash - checkpokemove MOVE_ROCK_SMASH + checkpartymove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash - setfieldeffect 0, RESULT - getpartypokename 0, RESULT - getmovename 1, MOVE_ROCK_SMASH + setfieldeffectargument 0, RESULT + bufferpartymonnick 0, RESULT + buffermovename 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 compare RESULT, 0 goto_if_eq RockSmash_ChoseNo @@ -129,10 +129,10 @@ S_PushableBoulder:: @ 81B0FCB goto_if 0, CannotUseStrength checkflag FLAG_SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength - checkpokemove 70 + checkpartymove 70 compare RESULT, 6 goto_if_eq CannotUseStrength - setfieldeffect 0, RESULT + setfieldeffectargument 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 goto_if_eq Strength_ChoseNo @@ -190,11 +190,11 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall - checkpokemove MOVE_WATERFALL + checkpartymove MOVE_WATERFALL compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows - getpartypokename 0, RESULT - setfieldeffect 0, RESULT + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 goto_if_eq Waterfall_Done @@ -223,12 +223,12 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall - checkpokemove MOVE_DIVE + checkpartymove MOVE_DIVE compare RESULT, 6 goto_if_eq CannotUseDive - getpartypokename 0, RESULT - setfieldeffect 0, RESULT - setfieldeffect 1, 1 + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT + setfieldeffectargument 1, 1 msgbox UseDivePromptText, 5 compare RESULT, 0 goto_if_eq Dive_Done @@ -246,12 +246,12 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall - checkpokemove MOVE_DIVE + checkpartymove MOVE_DIVE compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive - getpartypokename 0, RESULT - setfieldeffect 0, RESULT - setfieldeffect 1, 1 + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT + setfieldeffectargument 1, 1 msgbox UnderwaterUseDivePromptText, 5 compare RESULT, 0 goto_if_eq UnderwaterDive_Done diff --git a/data/item_ball_scripts.inc b/data/item_ball_scripts.inc index ad4386990..aae704ab2 100644 --- a/data/item_ball_scripts.inc +++ b/data/item_ball_scripts.inc @@ -1,539 +1,539 @@ Route102_EventScript_1B1439:: @ 81B1439 - giveitem ITEM_POTION, 1, 1 + giveitem_std ITEM_POTION, 1, 1 end Route103_EventScript_1B1446:: @ 81B1446 - giveitem ITEM_GUARD_SPEC, 1, 1 + giveitem_std ITEM_GUARD_SPEC, 1, 1 end Route104_EventScript_1B1453:: @ 81B1453 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end Route104_EventScript_1B1460:: @ 81B1460 - giveitem ITEM_POKE_BALL, 1, 1 + giveitem_std ITEM_POKE_BALL, 1, 1 end Route104_EventScript_1B146D:: @ 81B146D - giveitem ITEM_X_ACCURACY, 1, 1 + giveitem_std ITEM_X_ACCURACY, 1, 1 end Route104_EventScript_1B147A:: @ 81B147A - giveitem ITEM_POTION, 1, 1 + giveitem_std ITEM_POTION, 1, 1 end Route105_EventScript_1B1487:: @ 81B1487 - giveitem ITEM_IRON, 1, 1 + giveitem_std ITEM_IRON, 1, 1 end Route106_EventScript_1B1494:: @ 81B1494 - giveitem ITEM_PROTEIN, 1, 1 + giveitem_std ITEM_PROTEIN, 1, 1 end Route109_EventScript_1B14A1:: @ 81B14A1 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end Route110_EventScript_1B14AE:: @ 81B14AE - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route110_EventScript_1B14BB:: @ 81B14BB - giveitem ITEM_DIRE_HIT, 1, 1 + giveitem_std ITEM_DIRE_HIT, 1, 1 end Route111_EventScript_1B14C8:: @ 81B14C8 - giveitem ITEM_TM37, 1, 1 + giveitem_std ITEM_TM37, 1, 1 end Route111_EventScript_1B14D5:: @ 81B14D5 - giveitem ITEM_STARDUST, 1, 1 + giveitem_std ITEM_STARDUST, 1, 1 end Route111_EventScript_1B14E2:: @ 81B14E2 - giveitem ITEM_HP_UP, 1, 1 + giveitem_std ITEM_HP_UP, 1, 1 end Route112_EventScript_1B14EF:: @ 81B14EF - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end Route113_EventScript_1B14FC:: @ 81B14FC - giveitem ITEM_MAX_ETHER, 1, 1 + giveitem_std ITEM_MAX_ETHER, 1, 1 end Route113_EventScript_1B1509:: @ 81B1509 - giveitem ITEM_SUPER_REPEL, 1, 1 + giveitem_std ITEM_SUPER_REPEL, 1, 1 end Route114_EventScript_1B1516:: @ 81B1516 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route114_EventScript_1B1523:: @ 81B1523 - giveitem ITEM_PROTEIN, 1, 1 + giveitem_std ITEM_PROTEIN, 1, 1 end Route115_EventScript_1B1530:: @ 81B1530 - giveitem ITEM_SUPER_POTION, 1, 1 + giveitem_std ITEM_SUPER_POTION, 1, 1 end Route115_EventScript_1B153D:: @ 81B153D - giveitem ITEM_TM01, 1, 1 + giveitem_std ITEM_TM01, 1, 1 end Route115_EventScript_1B154A:: @ 81B154A - giveitem ITEM_IRON, 1, 1 + giveitem_std ITEM_IRON, 1, 1 end Route115_EventScript_1B1557:: @ 81B1557 - giveitem ITEM_GREAT_BALL, 1, 1 + giveitem_std ITEM_GREAT_BALL, 1, 1 end Route116_EventScript_1B1564:: @ 81B1564 - giveitem ITEM_X_SPECIAL, 1, 1 + giveitem_std ITEM_X_SPECIAL, 1, 1 end Route116_EventScript_1B1571:: @ 81B1571 - giveitem ITEM_ETHER, 1, 1 + giveitem_std ITEM_ETHER, 1, 1 end Route116_EventScript_1B157E:: @ 81B157E - giveitem ITEM_REPEL, 1, 1 + giveitem_std ITEM_REPEL, 1, 1 end Route116_EventScript_1B158B:: @ 81B158B - giveitem ITEM_HP_UP, 1, 1 + giveitem_std ITEM_HP_UP, 1, 1 end Route117_EventScript_1B1598:: @ 81B1598 - giveitem ITEM_GREAT_BALL, 1, 1 + giveitem_std ITEM_GREAT_BALL, 1, 1 end Route117_EventScript_1B15A5:: @ 81B15A5 - giveitem ITEM_REVIVE, 1, 1 + giveitem_std ITEM_REVIVE, 1, 1 end Route118_EventScript_1B15B2:: @ 81B15B2 - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route119_EventScript_1B15BF:: @ 81B15BF - giveitem ITEM_SUPER_REPEL, 1, 1 + giveitem_std ITEM_SUPER_REPEL, 1, 1 end Route119_EventScript_1B15CC:: @ 81B15CC - giveitem ITEM_ZINC, 1, 1 + giveitem_std ITEM_ZINC, 1, 1 end Route119_EventScript_1B15D9:: @ 81B15D9 - giveitem ITEM_ELIXIR, 1, 1 + giveitem_std ITEM_ELIXIR, 1, 1 end Route119_EventScript_1B15E6:: @ 81B15E6 - giveitem ITEM_LEAF_STONE, 1, 1 + giveitem_std ITEM_LEAF_STONE, 1, 1 end Route119_EventScript_1B15F3:: @ 81B15F3 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route119_EventScript_1B1600:: @ 81B1600 - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route119_EventScript_1B160D:: @ 81B160D - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route120_EventScript_1B161A:: @ 81B161A - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end Route120_EventScript_1B1627:: @ 81B1627 - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end Route120_EventScript_1B1634:: @ 81B1634 - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route120_EventScript_1B1641:: @ 81B1641 - giveitem ITEM_NEST_BALL, 1, 1 + giveitem_std ITEM_NEST_BALL, 1, 1 end Route121_EventScript_1B164E:: @ 81B164E - giveitem ITEM_CARBOS, 1, 1 + giveitem_std ITEM_CARBOS, 1, 1 end Route123_EventScript_1B165B:: @ 81B165B - giveitem ITEM_CALCIUM, 1, 1 + giveitem_std ITEM_CALCIUM, 1, 1 end Route123_EventScript_1B1668:: @ 81B1668 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route123_EventScript_1B1675:: @ 81B1675 - giveitem ITEM_ULTRA_BALL, 1, 1 + giveitem_std ITEM_ULTRA_BALL, 1, 1 end Route123_EventScript_1B1682:: @ 81B1682 - giveitem ITEM_ELIXIR, 1, 1 + giveitem_std ITEM_ELIXIR, 1, 1 end Route124_EventScript_1B168F:: @ 81B168F - giveitem ITEM_RED_SHARD, 1, 1 + giveitem_std ITEM_RED_SHARD, 1, 1 end Route124_EventScript_1B169C:: @ 81B169C - giveitem ITEM_BLUE_SHARD, 1, 1 + giveitem_std ITEM_BLUE_SHARD, 1, 1 end Route124_EventScript_1B16A9:: @ 81B16A9 - giveitem ITEM_YELLOW_SHARD, 1, 1 + giveitem_std ITEM_YELLOW_SHARD, 1, 1 end Route126_EventScript_1B16B6:: @ 81B16B6 - giveitem ITEM_GREEN_SHARD, 1, 1 + giveitem_std ITEM_GREEN_SHARD, 1, 1 end Route127_EventScript_1B16C3:: @ 81B16C3 - giveitem ITEM_ZINC, 1, 1 + giveitem_std ITEM_ZINC, 1, 1 end Route127_EventScript_1B16D0:: @ 81B16D0 - giveitem ITEM_CARBOS, 1, 1 + giveitem_std ITEM_CARBOS, 1, 1 end Route132_EventScript_1B16DD:: @ 81B16DD - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route133_EventScript_1B16EA:: @ 81B16EA - giveitem ITEM_BIG_PEARL, 1, 1 + giveitem_std ITEM_BIG_PEARL, 1, 1 end Route133_EventScript_1B16F7:: @ 81B16F7 - giveitem ITEM_STAR_PIECE, 1, 1 + giveitem_std ITEM_STAR_PIECE, 1, 1 end PetalburgCity_EventScript_1B1704:: @ 81B1704 - giveitem ITEM_MAX_REVIVE, 1, 1 + giveitem_std ITEM_MAX_REVIVE, 1, 1 end PetalburgCity_EventScript_1B1711:: @ 81B1711 - giveitem ITEM_ETHER, 1, 1 + giveitem_std ITEM_ETHER, 1, 1 end MauvilleCity_EventScript_1B171E:: @ 81B171E - giveitem ITEM_X_SPEED, 1, 1 + giveitem_std ITEM_X_SPEED, 1, 1 end RustboroCity_EventScript_1B172B:: @ 81B172B - giveitem ITEM_X_DEFEND, 1, 1 + giveitem_std ITEM_X_DEFEND, 1, 1 end LilycoveCity_EventScript_1B1738:: @ 81B1738 - giveitem ITEM_MAX_REPEL, 1, 1 + giveitem_std ITEM_MAX_REPEL, 1, 1 end MossdeepCity_EventScript_1B1745:: @ 81B1745 - giveitem ITEM_NET_BALL, 1, 1 + giveitem_std ITEM_NET_BALL, 1, 1 end PetalburgWoods_EventScript_1B1752:: @ 81B1752 - giveitem ITEM_X_ATTACK, 1, 1 + giveitem_std ITEM_X_ATTACK, 1, 1 end PetalburgWoods_EventScript_1B175F:: @ 81B175F - giveitem ITEM_GREAT_BALL, 1, 1 + giveitem_std ITEM_GREAT_BALL, 1, 1 end PetalburgWoods_EventScript_1B176C:: @ 81B176C - giveitem ITEM_ETHER, 1, 1 + giveitem_std ITEM_ETHER, 1, 1 end PetalburgWoods_EventScript_1B1779:: @ 81B1779 - giveitem ITEM_PARALYZE_HEAL, 1, 1 + giveitem_std ITEM_PARALYZE_HEAL, 1, 1 end RusturfTunnel_EventScript_1B1786:: @ 81B1786 - giveitem ITEM_POKE_BALL, 1, 1 + giveitem_std ITEM_POKE_BALL, 1, 1 end RusturfTunnel_EventScript_1B1793:: @ 81B1793 - giveitem ITEM_MAX_ETHER, 1, 1 + giveitem_std ITEM_MAX_ETHER, 1, 1 end GraniteCave_1F_EventScript_1B17A0:: @ 81B17A0 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + giveitem_std ITEM_ESCAPE_ROPE, 1, 1 end GraniteCave_B1F_EventScript_1B17AD:: @ 81B17AD - giveitem ITEM_POKE_BALL, 1, 1 + giveitem_std ITEM_POKE_BALL, 1, 1 end GraniteCave_B2F_EventScript_1B17BA:: @ 81B17BA - giveitem ITEM_REPEL, 1, 1 + giveitem_std ITEM_REPEL, 1, 1 end GraniteCave_B2F_EventScript_1B17C7:: @ 81B17C7 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end JaggedPass_EventScript_1B17D4:: @ 81B17D4 - giveitem ITEM_BURN_HEAL, 1, 1 + giveitem_std ITEM_BURN_HEAL, 1, 1 end FieryPath_EventScript_1B17E1:: @ 81B17E1 - giveitem ITEM_FIRE_STONE, 1, 1 + giveitem_std ITEM_FIRE_STONE, 1, 1 end FieryPath_EventScript_1B17EE:: @ 81B17EE - giveitem ITEM_TM06, 1, 1 + giveitem_std ITEM_TM06, 1, 1 end MeteorFalls_1F_1R_EventScript_1B17FB:: @ 81B17FB - giveitem ITEM_TM23, 1, 1 + giveitem_std ITEM_TM23, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1808:: @ 81B1808 - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1815:: @ 81B1815 - giveitem ITEM_MOON_STONE, 1, 1 + giveitem_std ITEM_MOON_STONE, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1822:: @ 81B1822 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end MeteorFalls_B1F_2R_EventScript_1B182F:: @ 81B182F - giveitem ITEM_TM02, 1, 1 + giveitem_std ITEM_TM02, 1, 1 end NewMauville_Inside_EventScript_1B183C:: @ 81B183C - giveitem ITEM_ULTRA_BALL, 1, 1 + giveitem_std ITEM_ULTRA_BALL, 1, 1 end NewMauville_Inside_EventScript_1B1849:: @ 81B1849 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + giveitem_std ITEM_ESCAPE_ROPE, 1, 1 end NewMauville_Inside_EventScript_1B1856:: @ 81B1856 - giveitem ITEM_THUNDER_STONE, 1, 1 + giveitem_std ITEM_THUNDER_STONE, 1, 1 end NewMauville_Inside_EventScript_1B1863:: @ 81B1863 - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end NewMauville_Inside_EventScript_1B1870:: @ 81B1870 - giveitem ITEM_PARALYZE_HEAL, 1, 1 + giveitem_std ITEM_PARALYZE_HEAL, 1, 1 end AbandonedShip_Rooms_1F_EventScript_1B187D:: @ 81B187D - giveitem ITEM_HARBOR_MAIL, 1, 1 + giveitem_std ITEM_HARBOR_MAIL, 1, 1 end AbandonedShip_Rooms_B1F_EventScript_1B188A:: @ 81B188A - giveitem ITEM_ESCAPE_ROPE, 1, 1 + giveitem_std ITEM_ESCAPE_ROPE, 1, 1 end AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897 - giveitem ITEM_DIVE_BALL, 1, 1 + giveitem_std ITEM_DIVE_BALL, 1, 1 end AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4 - giveitem ITEM_TM13, 1, 1 + giveitem_std ITEM_TM13, 1, 1 end AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1 - giveitem ITEM_REVIVE, 1, 1 + giveitem_std ITEM_REVIVE, 1, 1 end AbandonedShip_CaptainsOffice_EventScript_1B18BE:: @ 81B18BE - giveitem ITEM_STORAGE_KEY, 1, 1 + giveitem_std ITEM_STORAGE_KEY, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18CB:: @ 81B18CB - giveitem ITEM_LUXURY_BALL, 1, 1 + giveitem_std ITEM_LUXURY_BALL, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18D8:: @ 81B18D8 - giveitem ITEM_SCANNER, 1, 1 + giveitem_std ITEM_SCANNER, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5 - giveitem ITEM_WATER_STONE, 1, 1 + giveitem_std ITEM_WATER_STONE, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2 - giveitem ITEM_TM18, 1, 1 + giveitem_std ITEM_TM18, 1, 1 end ScorchedSlab_EventScript_1B18FF:: @ 81B18FF - giveitem ITEM_TM11, 1, 1 + giveitem_std ITEM_TM11, 1, 1 end SafariZone_Northwest_EventScript_1B190C:: @ 81B190C - giveitem ITEM_TM22, 1, 1 + giveitem_std ITEM_TM22, 1, 1 end SafariZone_Northeast_EventScript_1B1919:: @ 81B1919 - giveitem ITEM_CALCIUM, 1, 1 + giveitem_std ITEM_CALCIUM, 1, 1 end SafariZone_Southwest_EventScript_1B1926:: @ 81B1926 - giveitem ITEM_MAX_REVIVE, 1, 1 + giveitem_std ITEM_MAX_REVIVE, 1, 1 end MtPyre_2F_EventScript_1B1933:: @ 81B1933 - giveitem ITEM_ULTRA_BALL, 1, 1 + giveitem_std ITEM_ULTRA_BALL, 1, 1 end MtPyre_3F_EventScript_1B1940:: @ 81B1940 - giveitem ITEM_SUPER_REPEL, 1, 1 + giveitem_std ITEM_SUPER_REPEL, 1, 1 end MtPyre_4F_EventScript_1B194D:: @ 81B194D - giveitem ITEM_SEA_INCENSE, 1, 1 + giveitem_std ITEM_SEA_INCENSE, 1, 1 end MtPyre_5F_EventScript_1B195A:: @ 81B195A - giveitem ITEM_LAX_INCENSE, 1, 1 + giveitem_std ITEM_LAX_INCENSE, 1, 1 end MtPyre_6F_EventScript_1B1967:: @ 81B1967 - giveitem ITEM_TM30, 1, 1 + giveitem_std ITEM_TM30, 1, 1 end MtPyre_Exterior_EventScript_1B1974:: @ 81B1974 - giveitem ITEM_MAX_POTION, 1, 1 + giveitem_std ITEM_MAX_POTION, 1, 1 end MtPyre_Exterior_EventScript_1B1981:: @ 81B1981 - giveitem ITEM_TM48, 1, 1 + giveitem_std ITEM_TM48, 1, 1 end AquaHideout_B1F_EventScript_1B198E:: @ 81B198E - giveitem ITEM_MASTER_BALL, 1, 1 + giveitem_std ITEM_MASTER_BALL, 1, 1 end AquaHideout_B1F_EventScript_1B199B:: @ 81B199B - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end AquaHideout_B1F_EventScript_1B19A8:: @ 81B19A8 - giveitem ITEM_MAX_ELIXIR, 1, 1 + giveitem_std ITEM_MAX_ELIXIR, 1, 1 end AquaHideout_B2F_EventScript_1B19B5:: @ 81B19B5 - giveitem ITEM_NEST_BALL, 1, 1 + giveitem_std ITEM_NEST_BALL, 1, 1 end MagmaHideout_B1F_EventScript_1B19C2:: @ 81B19C2 - giveitem ITEM_MASTER_BALL, 1, 1 + giveitem_std ITEM_MASTER_BALL, 1, 1 end MagmaHideout_B1F_EventScript_1B19CF:: @ 81B19CF - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end MagmaHideout_B1F_EventScript_1B19DC:: @ 81B19DC - giveitem ITEM_MAX_ELIXIR, 1, 1 + giveitem_std ITEM_MAX_ELIXIR, 1, 1 end MagmaHideout_B2F_EventScript_1B19E9:: @ 81B19E9 - giveitem ITEM_NEST_BALL, 1, 1 + giveitem_std ITEM_NEST_BALL, 1, 1 end ShoalCave_LowTideEntranceRoom_EventScript_1B19F6:: @ 81B19F6 - giveitem ITEM_BIG_PEARL, 1, 1 + giveitem_std ITEM_BIG_PEARL, 1, 1 end ShoalCave_LowTideInnerRoom_EventScript_1B1A03:: @ 81B1A03 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end ShoalCave_LowTideStairsRoom_EventScript_1B1A10:: @ 81B1A10 - giveitem ITEM_ICE_HEAL, 1, 1 + giveitem_std ITEM_ICE_HEAL, 1, 1 end ShoalCave_LowTideIceRoom_EventScript_1B1A1D:: @ 81B1A1D - giveitem ITEM_TM07, 1, 1 + giveitem_std ITEM_TM07, 1, 1 end ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A - giveitem ITEM_NEVER_MELT_ICE, 1, 1 + giveitem_std ITEM_NEVER_MELT_ICE, 1, 1 end SeafloorCavern_Room9_EventScript_1B1A37:: @ 81B1A37 - giveitem ITEM_TM26, 1, 1 + giveitem_std ITEM_TM26, 1, 1 end CaveOfOrigin_B3F_EventScript_1B1A44:: @ 81B1A44 - giveitem ITEM_HM07, 1, 1 + giveitem_std ITEM_HM07, 1, 1 end Route110_TrickHousePuzzle1_EventScript_1B1A51:: @ 81B1A51 - giveitem ITEM_ORANGE_MAIL, 1, 1 + giveitem_std ITEM_ORANGE_MAIL, 1, 1 end Route110_TrickHousePuzzle2_EventScript_1B1A5E:: @ 81B1A5E - giveitem ITEM_HARBOR_MAIL, 1, 1 + giveitem_std ITEM_HARBOR_MAIL, 1, 1 end Route110_TrickHousePuzzle2_EventScript_1B1A6B:: @ 81B1A6B - giveitem ITEM_WAVE_MAIL, 1, 1 + giveitem_std ITEM_WAVE_MAIL, 1, 1 end Route110_TrickHousePuzzle3_EventScript_1B1A78:: @ 81B1A78 - giveitem ITEM_SHADOW_MAIL, 1, 1 + giveitem_std ITEM_SHADOW_MAIL, 1, 1 end Route110_TrickHousePuzzle3_EventScript_1B1A85:: @ 81B1A85 - giveitem ITEM_WOOD_MAIL, 1, 1 + giveitem_std ITEM_WOOD_MAIL, 1, 1 end Route110_TrickHousePuzzle4_EventScript_1B1A92:: @ 81B1A92 - giveitem ITEM_MECH_MAIL, 1, 1 + giveitem_std ITEM_MECH_MAIL, 1, 1 end Route110_TrickHousePuzzle6_EventScript_1B1A9F:: @ 81B1A9F - giveitem ITEM_GLITTER_MAIL, 1, 1 + giveitem_std ITEM_GLITTER_MAIL, 1, 1 end Route110_TrickHousePuzzle7_EventScript_1B1AAC:: @ 81B1AAC - giveitem ITEM_TROPIC_MAIL, 1, 1 + giveitem_std ITEM_TROPIC_MAIL, 1, 1 end Route110_TrickHousePuzzle8_EventScript_1B1AB9:: @ 81B1AB9 - giveitem ITEM_BEAD_MAIL, 1, 1 + giveitem_std ITEM_BEAD_MAIL, 1, 1 end VictoryRoad_1F_EventScript_1B1AC6:: @ 81B1AC6 - giveitem ITEM_MAX_ELIXIR, 1, 1 + giveitem_std ITEM_MAX_ELIXIR, 1, 1 end VictoryRoad_1F_EventScript_1B1AD3:: @ 81B1AD3 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end VictoryRoad_B1F_EventScript_1B1AE0:: @ 81B1AE0 - giveitem ITEM_TM29, 1, 1 + giveitem_std ITEM_TM29, 1, 1 end VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED - giveitem ITEM_FULL_RESTORE, 1, 1 + giveitem_std ITEM_FULL_RESTORE, 1, 1 end VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end @ 81B1B07 - giveitem ITEM_HM08, 1, 1 + giveitem_std ITEM_HM08, 1, 1 end diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index b6b7401f3..3f47da1da 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -67,18 +67,18 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_setdivewarp @ 0x40 .4byte ScrCmd_setholewarp @ 0x41 .4byte ScrCmd_getplayerxy @ 0x42 - .4byte ScrCmd_countpokemon @ 0x43 - .4byte ScrCmd_additem @ 0x44 - .4byte ScrCmd_removeitem @ 0x45 + .4byte ScrCmd_getpartysize @ 0x43 + .4byte ScrCmd_giveitem @ 0x44 + .4byte ScrCmd_takeitem @ 0x45 .4byte ScrCmd_checkitemspace @ 0x46 .4byte ScrCmd_checkitem @ 0x47 .4byte ScrCmd_checkitemtype @ 0x48 - .4byte ScrCmd_addpcitem @ 0x49 + .4byte ScrCmd_givepcitem @ 0x49 .4byte ScrCmd_checkpcitem @ 0x4A - .4byte ScrCmd_adddecor @ 0x4B - .4byte ScrCmd_removedecor @ 0x4C - .4byte ScrCmd_hasdecor @ 0x4D - .4byte ScrCmd_checkdecor @ 0x4E + .4byte ScrCmd_givedecoration @ 0x4B + .4byte ScrCmd_takedecoration @ 0x4C + .4byte ScrCmd_checkdecor @ 0x4D + .4byte ScrCmd_checkdecorspace @ 0x4E .4byte ScrCmd_applymovement @ 0x4F .4byte ScrCmd_applymovement_at @ 0x50 .4byte ScrCmd_waitmovement @ 0x51 @@ -88,14 +88,14 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_addobject @ 0x55 .4byte ScrCmd_addobject_at @ 0x56 .4byte ScrCmd_setobjectxy @ 0x57 - .4byte ScrCmd_showobject @ 0x58 - .4byte ScrCmd_hideobject @ 0x59 + .4byte ScrCmd_showobjectat @ 0x58 + .4byte ScrCmd_hideobjectat @ 0x59 .4byte ScrCmd_faceplayer @ 0x5A .4byte ScrCmd_turnobject @ 0x5B .4byte ScrCmd_trainerbattle @ 0x5C - .4byte ScrCmd_battlebegin @ 0x5D - .4byte ScrCmd_ontrainerbattleend @ 0x5E - .4byte ScrCmd_ontrainerbattleendgoto @ 0x5F + .4byte ScrCmd_trainerbattlebegin @ 0x5D + .4byte ScrCmd_gotopostbattlescript @ 0x5E + .4byte ScrCmd_gotobeatenscript @ 0x5F .4byte ScrCmd_checktrainerflag @ 0x60 .4byte ScrCmd_settrainerflag @ 0x61 .4byte ScrCmd_cleartrainerflag @ 0x62 @@ -109,7 +109,7 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_lock @ 0x6A .4byte ScrCmd_releaseall @ 0x6B .4byte ScrCmd_release @ 0x6C - .4byte ScrCmd_waitbutton @ 0x6D + .4byte ScrCmd_waitbuttonpress @ 0x6D .4byte ScrCmd_yesnobox @ 0x6E .4byte ScrCmd_multichoice @ 0x6F .4byte ScrCmd_multichoicedefault @ 0x70 @@ -117,29 +117,29 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_drawbox @ 0x72 .4byte ScrCmd_erasebox @ 0x73 .4byte ScrCmd_drawboxtext @ 0x74 - .4byte ScrCmd_drawpokepic @ 0x75 - .4byte ScrCmd_erasepokepic @ 0x76 + .4byte ScrCmd_drawmonpic @ 0x75 + .4byte ScrCmd_erasemonpic @ 0x76 .4byte ScrCmd_drawcontestwinner @ 0x77 .4byte ScrCmd_braillemessage @ 0x78 - .4byte ScrCmd_givepoke @ 0x79 + .4byte ScrCmd_givemon @ 0x79 .4byte ScrCmd_giveegg @ 0x7A - .4byte ScrCmd_setpokemove @ 0x7B - .4byte ScrCmd_checkpokemove @ 0x7C - .4byte ScrCmd_getspeciesname @ 0x7D - .4byte ScrCmd_getfirstpartypokename @ 0x7E - .4byte ScrCmd_getpartypokename @ 0x7F - .4byte ScrCmd_getitemname @ 0x80 - .4byte ScrCmd_getdecorname @ 0x81 - .4byte ScrCmd_getmovename @ 0x82 - .4byte ScrCmd_getnumberstring @ 0x83 - .4byte ScrCmd_getstdstring @ 0x84 - .4byte ScrCmd_getstring @ 0x85 + .4byte ScrCmd_setmonmove @ 0x7B + .4byte ScrCmd_checkpartymove @ 0x7C + .4byte ScrCmd_bufferspeciesname @ 0x7D + .4byte ScrCmd_bufferleadmonspeciesname @ 0x7E + .4byte ScrCmd_bufferpartymonnick @ 0x7F + .4byte ScrCmd_bufferitemname @ 0x80 + .4byte ScrCmd_bufferdecorationname @ 0x81 + .4byte ScrCmd_buffermovename @ 0x82 + .4byte ScrCmd_buffernumberstring @ 0x83 + .4byte ScrCmd_bufferstdstring @ 0x84 + .4byte ScrCmd_bufferstring @ 0x85 .4byte ScrCmd_pokemart @ 0x86 - .4byte ScrCmd_pokemartdecor @ 0x87 - .4byte ScrCmd_pokemartbp @ 0x88 + .4byte ScrCmd_pokemartdecoration @ 0x87 + .4byte ScrCmd_pokemartdecoration2 @ 0x88 .4byte ScrCmd_playslotmachine @ 0x89 - .4byte ScrCmd_plantberrytree @ 0x8A - .4byte ScrCmd_choosecontestpkmn @ 0x8B + .4byte ScrCmd_setberrytree @ 0x8A + .4byte ScrCmd_choosecontestmon @ 0x8B .4byte ScrCmd_startcontest @ 0x8C .4byte ScrCmd_showcontestresults @ 0x8D .4byte ScrCmd_contestlinktransfer @ 0x8E @@ -152,21 +152,21 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_updatemoneybox @ 0x95 .4byte ScrCmd_getpricereduction @ 0x96 .4byte ScrCmd_fadescreen @ 0x97 - .4byte ScrCmd_fadescreendelay @ 0x98 - .4byte ScrCmd_setdarklevel @ 0x99 - .4byte ScrCmd_animdarklevel @ 0x9A + .4byte ScrCmd_fadescreenspeed @ 0x98 + .4byte ScrCmd_setflashradius @ 0x99 + .4byte ScrCmd_animateflash @ 0x9A .4byte ScrCmd_messageautoscroll @ 0x9B .4byte ScrCmd_dofieldeffect @ 0x9C - .4byte ScrCmd_setfieldeffect @ 0x9D + .4byte ScrCmd_setfieldeffectargument @ 0x9D .4byte ScrCmd_waitfieldeffect @ 0x9E - .4byte ScrCmd_sethealplace @ 0x9F + .4byte ScrCmd_setrespawn @ 0x9F .4byte ScrCmd_checkplayergender @ 0xA0 - .4byte ScrCmd_playpokecry @ 0xA1 - .4byte ScrCmd_setmaptile @ 0xA2 + .4byte ScrCmd_playmoncry @ 0xA1 + .4byte ScrCmd_setmetatile @ 0xA2 .4byte ScrCmd_resetweather @ 0xA3 .4byte ScrCmd_setweather @ 0xA4 .4byte ScrCmd_doweather @ 0xA5 - .4byte ScrCmd_tileeffect @ 0xA6 + .4byte ScrCmd_setstepcallback @ 0xA6 .4byte ScrCmd_setmaplayoutindex @ 0xA7 .4byte ScrCmd_setobjectpriority @ 0xA8 .4byte ScrCmd_resetobjectpriority @ 0xA9 @@ -190,14 +190,14 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_vgoto_if @ 0xBB .4byte ScrCmd_vcall_if @ 0xBC .4byte ScrCmd_vmessage @ 0xBD - .4byte ScrCmd_vloadword @ 0xBE - .4byte ScrCmd_vgetstring @ 0xBF + .4byte ScrCmd_vloadptr @ 0xBE + .4byte ScrCmd_vbufferstring @ 0xBF .4byte ScrCmd_showcoinsbox @ 0xC0 .4byte ScrCmd_hidecoinsbox @ 0xC1 .4byte ScrCmd_updatecoinsbox @ 0xC2 .4byte ScrCmd_incrementgamestat @ 0xC3 .4byte ScrCmd_setescapewarp @ 0xC4 - .4byte ScrCmd_waitpokecry @ 0xC5 + .4byte ScrCmd_waitmoncry @ 0xC5 gScriptCmdTableEnd:: .4byte ScrCmd_nop diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index be1cafbdd..ab700cbc3 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -14,7 +14,7 @@ Route102_EventScript_1A1533:: @ 81A1533 lockall message Route102_Text_1A1946 waitmessage - waitbutton + waitbuttonpress releaseall end @@ -26,7 +26,7 @@ Route102_EventScript_1A153D:: @ 81A153D goto_if_eq Route102_EventScript_1A1558 message Route102_Text_1A16B6 waitmessage - waitbutton + waitbuttonpress release end @@ -45,7 +45,7 @@ Route102_EventScript_1A1577:: @ 81A1577 waitstate compare ITEM_ID, 0 goto_if_eq Route102_EventScript_1A1593 - removeitem ITEM_ID, 1 + takeitem ITEM_ID, 1 call Route102_EventScript_1A16A9 Route102_EventScript_1A1593:: @ 81A1593 @@ -56,21 +56,21 @@ Route102_EventScript_1A1595:: @ 81A1595 lockall message Route102_Text_1A172C waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15A2:: @ 81A15A2 lockall message Route102_Text_1A174B waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15AF:: @ 81A15AF lockall message Route102_Text_1A175C waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15BC:: @ 81A15BC @@ -78,7 +78,7 @@ Route102_EventScript_1A15BC:: @ 81A15BC lockall message Route102_Text_1A177D waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE @@ -86,19 +86,19 @@ Route102_EventScript_1A15CE:: @ 81A15CE goto_if_eq Route102_EventScript_1A15F2 compare 0x8005, 4 goto_if_eq Route102_EventScript_1A15EB - getstring 1, Route102_Text_1A17B7 + bufferstring 1, Route102_Text_1A17B7 return Route102_EventScript_1A15EB:: @ 81A15EB - getstring 1, Route102_Text_1A179F + bufferstring 1, Route102_Text_1A179F return Route102_EventScript_1A15F2:: @ 81A15F2 - getstring 1, Route102_Text_1A17B0 + bufferstring 1, Route102_Text_1A17B0 return Route102_EventScript_1A15F9:: @ 81A15F9 - getnumberstring 1, 0x8006 + buffernumberstring 1, 0x8006 lock faceplayer msgbox Route102_Text_1A17C0, 5 @@ -116,24 +116,24 @@ Route102_EventScript_1A161D:: @ 81A161D playfanfare 387 waitmessage waitfanfare - waitbutton + waitbuttonpress message Route102_Text_1A181A waitmessage - waitbutton + waitbuttonpress release end Route102_EventScript_1A1642:: @ 81A1642 message Route102_Text_1A1881 waitmessage - waitbutton + waitbuttonpress release end Route102_EventScript_1A164B:: @ 81A164B message Route102_Text_1A18C5 waitmessage - waitbutton + waitbuttonpress release end @@ -170,7 +170,7 @@ Route102_EventScript_1A1693:: @ 81A1693 waitstate message Route102_Text_1A1925 waitmessage - waitbutton + waitbuttonpress releaseall end @@ -179,5 +179,5 @@ Route102_EventScript_1A16A9:: @ 81A16A9 incrementgamestat GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waitmessage - waitbutton + waitbuttonpress return diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 60ce36e43..0cedcd0d5 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -52,15 +52,15 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 end OldaleTown_PokemonCenter_2F_EventScript_1A3D6A:: @ 81A3D6A - setmaptile 5, 3, 514, 0 + setmetatile 5, 3, 514, 0 end OldaleTown_PokemonCenter_2F_EventScript_1A3D74:: @ 81A3D74 - setmaptile 8, 3, 514, 0 + setmetatile 8, 3, 514, 0 end OldaleTown_PokemonCenter_2F_EventScript_1A3D7E:: @ 81A3D7E - setmaptile 11, 3, 514, 0 + setmetatile 11, 3, 514, 0 end DewfordTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 @@ -119,7 +119,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3E30 - setmaptile 8, 3, 605, 1 + setmetatile 8, 3, 605, 1 special DrawWholeMapView erasebox 0, 0, 29, 19 releaseall @@ -147,14 +147,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 OldaleTown_PokemonCenter_2F_EventScript_1A3E7B:: @ 81A3E7B call OldaleTown_PokemonCenter_2F_EventScript_1A3DB2 - setmaptile 11, 3, 605, 1 + setmetatile 11, 3, 605, 1 special DrawWholeMapView end OldaleTown_PokemonCenter_2F_EventScript_1A3E8D:: @ 81A3E8D lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3DDA - setmaptile 5, 3, 605, 1 + setmetatile 5, 3, 605, 1 special DrawWholeMapView erasebox 0, 0, 29, 19 releaseall @@ -221,7 +221,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E copyvar 0x4087, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmaptile 5, 3, 514, 0 + setmetatile 5, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -233,7 +233,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim release @@ -255,7 +255,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD OldaleTown_PokemonCenter_2F_EventScript_1A3FDD:: @ 81A3FDD message OldaleTown_PokemonCenter_2F_Text_1A4696 waitmessage - waitbutton + waitbuttonpress message OldaleTown_PokemonCenter_2F_Text_1A4826 waitmessage goto OldaleTown_PokemonCenter_2F_EventScript_1A3EBC @@ -289,7 +289,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 message OldaleTown_PokemonCenter_2F_Text_1A486A waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF OldaleTown_PokemonCenter_2F_EventScript_1A4062:: @ 81A4062 @@ -307,28 +307,28 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4093:: @ 81A4093 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C03 waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40A2:: @ 81A40A2 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4BCC waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40B1:: @ 81A40B1 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B95 waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40C0:: @ 81A40C0 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C38 waitmessage - waitbutton + waitbuttonpress release end @@ -386,7 +386,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 copyvar 0x4087, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmaptile 8, 3, 514, 0 + setmetatile 8, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -398,7 +398,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 8, 1 waitdooranim release @@ -417,14 +417,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB OldaleTown_PokemonCenter_2F_EventScript_1A41E1:: @ 81A41E1 message OldaleTown_PokemonCenter_2F_Text_1A48A3 waitmessage - waitbutton + waitbuttonpress setvar RESULT, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A41EE:: @ 81A41EE message OldaleTown_PokemonCenter_2F_Text_1A48DD waitmessage - waitbutton + waitbuttonpress setvar RESULT, 0 return @@ -484,7 +484,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 copyvar 0x4087, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmaptile 11, 3, 514, 0 + setmetatile 11, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -496,7 +496,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 11, 1 waitdooranim release @@ -506,7 +506,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4AC8 waitmessage - waitbutton + waitbuttonpress release end @@ -514,7 +514,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A85 waitmessage - waitbutton + waitbuttonpress release end @@ -522,7 +522,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A30 waitmessage - waitbutton + waitbuttonpress release end @@ -530,7 +530,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B1D waitmessage - waitbutton + waitbuttonpress release end @@ -538,7 +538,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B59 waitmessage - waitbutton + waitbuttonpress release end @@ -552,7 +552,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B6C waitmessage - waitbutton + waitbuttonpress release end @@ -598,7 +598,7 @@ OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361 gUnknown_081A4363:: @ 81A4363 lockall special ShowLinkBattleRecords - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -719,17 +719,17 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 end RecordCorner_EventScript_1A446C:: @ 81A446C - getitemname 1, 0x4001 + bufferitemname 1, 0x4001 message RecordCorner_Text_1A4E3B waitmessage - waitbutton + waitbuttonpress releaseall end TradeRoom_ReadTrainerCard1:: @ 81A4479 message CableClub_LookAtTrainerCard1 waitmessage - waitbutton + waitbuttonpress fadescreen 1 special sub_8083BDC waitstate @@ -738,7 +738,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479 TradeRoom_ReadTrainerCard2:: @ 81A4487 message CableClub_LookAtTrainerCard2 waitmessage - waitbutton + waitbuttonpress fadescreen 1 special sub_8083BDC waitstate @@ -747,7 +747,7 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487 TradeRoom_TooBusyToNotice:: @ 81A4495 message CableClub_TooBusyToNotice waitmessage - waitbutton + waitbuttonpress closemessage end @@ -755,7 +755,7 @@ SingleBattleColosseum_EventScript_1A449E:: @ 81A449E special sub_8064EAC message SingleBattleColosseum_Text_1A4D7E waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end @@ -764,7 +764,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD special sub_8064EAC message TradeCenter_Text_1A4DAB waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end @@ -775,7 +775,7 @@ RecordCorner_EventScript_1A44BC:: @ 81A44BC special sub_8064EAC message RecordCorner_Text_1A4DD7 waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end @@ -784,7 +784,7 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 special sub_8064EAC message RecordCorner_Text_1A4DF7 waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index bc87b9a4e..50202c7d6 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F - getstdstring 0, 0x800b + bufferstdstring 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 @@ -43,7 +43,7 @@ FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 checkflag FLAG_RECEIVED_CONTEST_PASS goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 - giveitem ITEM_CONTEST_PASS + giveitem_std ITEM_CONTEST_PASS setflag FLAG_RECEIVED_CONTEST_PASS setflag FLAG_TEMP_1 msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 @@ -62,7 +62,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E end FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 - giveitem ITEM_LUXURY_BALL + giveitem_std ITEM_LUXURY_BALL compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar 0x408a, 0 @@ -119,7 +119,7 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 - choosecontestpkmn + choosecontestmon compare 0x8004, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 @@ -260,8 +260,8 @@ LinkContestRoom1_EventScript_1A523F:: @ 81A523F return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - getstdstring 1, 0x8008 - getstdstring 2, 0x8009 + bufferstdstring 1, 0x8008 + bufferstdstring 2, 0x8009 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -339,7 +339,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 addvar 0x8006, 1 - getnumberstring 1, 0x8006 + buffernumberstring 1, 0x8006 lockall applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C waitmovement 0 @@ -885,7 +885,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special sub_80C47F0 special sub_80C4858 addvar 0x8005, 1 - getnumberstring 1, 0x8005 + buffernumberstring 1, 0x8005 addvar 0x8005, -1 call LinkContestRoom1_EventScript_1A5A75 applymovement 0x4003, LinkContestRoom1_Movement_1A5D99 @@ -1134,7 +1134,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D return LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B - giveitem ITEM_LUXURY_BALL + giveitem_std ITEM_LUXURY_BALL compare RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D2D msgbox LinkContestRoom1_Text_1A6DF1, 3 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index a09e47810..fd3273c78 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -39,7 +39,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 playfanfare 367 waitfanfare waitmessage - waitbutton + waitbuttonpress msgbox Route117_Text_1B27CD, 4 special GiveEggFromDaycare clearflag FLAG_PENDING_DAYCARE_EGG @@ -70,7 +70,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE special SetDaycareCompatibilityString special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress setvar 0x8004, 0 call Route117_EventScript_1B22CD setvar 0x8004, 1 @@ -110,9 +110,9 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialvar 0x8005, GetSelectedDaycareMonNickname waitse - playpokecry 0x8005, 0 + playmoncry 0x8005, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 - waitpokecry + waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE specialvar RESULT, GetDaycareState @@ -211,9 +211,9 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse - playpokecry RESULT, 0 + playmoncry RESULT, 0 msgbox Route117_PokemonDayCare_Text_1B2B93, 4 - waitpokecry + waitmoncry specialvar RESULT, GetDaycareState compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 1bc38a099..c27951abb 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -15,11 +15,11 @@ AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 - setmaptile 11, 4, 563, 1 + setmetatile 11, 4, 563, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9C0:: @ 815E9C0 - setmaptile 11, 4, 555, 1 + setmetatile 11, 4, 555, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA @@ -35,7 +35,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse 21 - removeitem ITEM_STORAGE_KEY, 1 + takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 special DrawWholeMapView diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index b09a6e5f1..35e86543b 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -27,35 +27,35 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 - setmaptile 3, 8, 555, 1 + setmetatile 3, 8, 555, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD:: @ 815EBAD - setmaptile 6, 8, 555, 1 + setmetatile 6, 8, 555, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7:: @ 815EBB7 - setmaptile 3, 3, 538, 0 + setmetatile 3, 3, 538, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1:: @ 815EBC1 - setmaptile 9, 3, 538, 0 + setmetatile 9, 3, 538, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB:: @ 815EBCB - setmaptile 3, 8, 563, 1 + setmetatile 3, 8, 563, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5:: @ 815EBD5 - setmaptile 6, 8, 563, 1 + setmetatile 6, 8, 563, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF:: @ 815EBDF - setmaptile 3, 3, 564, 0 + setmetatile 3, 3, 564, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 - setmaptile 9, 3, 564, 0 + setmetatile 9, 3, 564, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 @@ -67,7 +67,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_1_KEY, 1 + takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 special DrawWholeMapView @@ -83,7 +83,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_2_KEY, 1 + takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD special DrawWholeMapView @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_4_KEY, 1 + takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 special DrawWholeMapView @@ -115,7 +115,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_6_KEY, 1 + takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 special DrawWholeMapView diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index eb5c1dccd..c1e77a8c7 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -39,9 +39,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B delay 20 - setfieldeffect 0, 10 - setfieldeffect 1, 10 - setfieldeffect 2, 0 + setfieldeffectargument 0, 10 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4D4 compare RESULT, 0 @@ -69,13 +69,13 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB delay 20 - setfieldeffect 0, 8 - setfieldeffect 1, 5 - setfieldeffect 2, 0 + setfieldeffectargument 0, 8 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 11 - setfieldeffect 1, 3 - setfieldeffect 2, 0 + setfieldeffectargument 0, 11 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4FC compare RESULT, 0 @@ -86,17 +86,17 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 delay 20 - setfieldeffect 0, 16 - setfieldeffect 1, 3 - setfieldeffect 2, 0 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 25 - setfieldeffect 1, 2 - setfieldeffect 2, 0 + setfieldeffectargument 0, 25 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 24 - setfieldeffect 1, 6 - setfieldeffect 2, 0 + setfieldeffectargument 0, 24 + setfieldeffectargument 1, 6 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4B0 compare RESULT, 0 @@ -109,30 +109,30 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A end AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B - setfieldeffect 0, 42 - setfieldeffect 1, 10 - setfieldeffect 2, 0 + setfieldeffectargument 0, 42 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B - setfieldeffect 0, 20 - setfieldeffect 1, 5 - setfieldeffect 2, 0 + setfieldeffectargument 0, 20 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B - setfieldeffect 0, 1 - setfieldeffect 1, 12 - setfieldeffect 2, 0 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 12 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B - setfieldeffect 0, 1 - setfieldeffect 1, 2 - setfieldeffect 2, 0 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 dofieldeffect 54 return diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 268563660..b849f41ba 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -23,12 +23,12 @@ AncientTomb_MapScript1_15EFE0:: @ 815EFE0 end AncientTomb_EventScript_15EFEA:: @ 815EFEA - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return AncientTomb_EventScript_15F021:: @ 815F021 @@ -36,7 +36,7 @@ AncientTomb_EventScript_15F021:: @ 815F021 checkflag FLAG_SYS_BRAILLE_FLY goto_if_eq AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -49,7 +49,7 @@ AncientTomb_EventScript_15F038:: @ 815F038 AncientTomb_EventScript_15F042:: @ 815F042 lockall braillemessage AncientTomb_Braille_1C552E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,9 +58,9 @@ AncientTomb_EventScript_15F050:: @ 815F050 lock faceplayer waitse - playpokecry SPECIES_REGISTEEL, 2 + playmoncry SPECIES_REGISTEEL, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag FLAG_HIDE_REGISTEEL setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index ac97aa14b..828d975fc 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -6,13 +6,13 @@ BattleTower_Corridor_MapScripts:: @ 8160845 BattleTower_Corridor_MapScript1_160850:: @ 8160850 compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E - setmaptile 12, 0, 519, 0 - setmaptile 12, 1, 527, 0 + setmetatile 12, 0, 519, 0 + setmetatile 12, 1, 527, 0 end BattleTower_Corridor_EventScript_16086E:: @ 816086E - setmaptile 15, 0, 519, 0 - setmaptile 15, 1, 527, 0 + setmetatile 15, 0, 519, 0 + setmetatile 15, 1, 527, 0 end BattleTower_Corridor_MapScript2_160881:: @ 8160881 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 2186c8534..69db45ede 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -379,7 +379,7 @@ BattleTower_Lobby_EventScript_16071E:: @ 816071E BattleTower_Lobby_EventScript_160727:: @ 8160727 lockall special ShowBattleTowerRecords - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -393,7 +393,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, DECOR_SILVER_SHIELD - givedecoration DECOR_SILVER_SHIELD + givedecoration_std DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_SILVER_SHIELD @@ -407,7 +407,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, DECOR_GOLD_SHIELD - givedecoration DECOR_GOLD_SHIELD + givedecoration_std DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_GOLD_SHIELD @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - getdecorname 1, 0x8008 + bufferdecorationname 1, 0x8008 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 1a254f7df..e0aba0b9c 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -67,7 +67,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 - hideobject 5, 26, 4 + hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE setvar 0x8004, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index a2067fe60..1b5146760 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -38,9 +38,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special WaitWeather waitstate playse 209 - setfieldeffect 0, 9 - setfieldeffect 1, 13 - setfieldeffect 2, 0 + setfieldeffectargument 0, 9 + setfieldeffectargument 1, 13 + setfieldeffectargument 2, 0 dofieldeffect 54 waitfieldeffect 54 .ifdef SAPPHIRE @@ -58,9 +58,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE waitse - playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 + playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartGroudonKyogreBattle waitstate diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index c767dd7e7..7aa56a82d 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -19,12 +19,12 @@ DesertRuins_MapScript1_15CB11:: @ 815CB11 end DesertRuins_EventScript_15CB1B:: @ 815CB1B - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return DesertRuins_MapScript1_15CB52:: @ 815CB52 @@ -36,7 +36,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56 checkflag FLAG_SYS_BRAILLE_STRENGTH goto_if_eq DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -49,7 +49,7 @@ DesertRuins_EventScript_15CB6D:: @ 815CB6D DesertRuins_EventScript_15CB77:: @ 815CB77 lockall braillemessage DesertRuins_Braille_1C54C8 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,9 +58,9 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 lock faceplayer waitse - playpokecry SPECIES_REGIROCK, 2 + playmoncry SPECIES_REGIROCK, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_HIDE_REGIROCK setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 3d3240e81..bb1fdeda4 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -85,7 +85,7 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 DewfordTown_EventScript_14E0F0:: @ 814E0F0 msgbox DewfordTown_Text_16B6A8, 4 - giveitem ITEM_OLD_ROD + giveitem_std ITEM_OLD_ROD setflag FLAG_RECEIVED_OLD_ROD msgbox DewfordTown_Text_16B6F9, 4 release @@ -118,30 +118,30 @@ DewfordTown_EventScript_14E147:: @ 814E147 DewfordTown_EventScript_14E151:: @ 814E151 call DewfordTown_EventScript_1A010C - setobjectpriority 2, 0, 11, 0 - setobjectpriority 255, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - hideobject 255, 0, 11 + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E293 applymovement 255, DewfordTown_Movement_14E293 waitmovement 0 - showobject 255, 0, 19 + showobjectat 255, MAP_ROUTE104 call DewfordTown_EventScript_1A02EF applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 - showobject 255, 0, 19 + showobjectat 255, MAP_ROUTE104 clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - hideobject 4, 0, 11 + hideobjectat 4, MAP_DEWFORD_TOWN setvar 0x408e, 2 - resetobjectpriority 255, 0, 11 + resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar 0x4096, 0x8008 waitstate @@ -150,40 +150,40 @@ DewfordTown_EventScript_14E151:: @ 814E151 DewfordTown_EventScript_14E1D8:: @ 814E1D8 call DewfordTown_EventScript_1A010C - setobjectpriority 2, 0, 11, 0 - setobjectpriority 255, 0, 11, 1 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - hideobject 255, 0, 11 + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E356 applymovement 255, DewfordTown_Movement_14E356 waitmovement 0 call DewfordTown_EventScript_1A02EF - showobject 255, 0, 24 + showobjectat 255, MAP_ROUTE109 applymovement 255, DewfordTown_Movement_14E409 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 - setobjectpriority 2, 0, 24, 0 + setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 addobject 1 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - hideobject 4, 0, 11 + hideobjectat 4, MAP_DEWFORD_TOWN checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 11 - resetobjectpriority 2, 0, 24 + resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index cbcb4d5eb..afd918a96 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -20,23 +20,23 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA - setdarklevel 0 + setflashradius 0 return DewfordTown_Gym_EventScript_1530AE:: @ 81530AE - setdarklevel 1 + setflashradius 1 return DewfordTown_Gym_EventScript_1530B2:: @ 81530B2 - setdarklevel 2 + setflashradius 2 return DewfordTown_Gym_EventScript_1530B6:: @ 81530B6 - setdarklevel 3 + setflashradius 3 return DewfordTown_Gym_EventScript_1530BA:: @ 81530BA - setdarklevel 4 + setflashradius 4 return DewfordTown_Gym_EventScript_1530BE:: @ 81530BE @@ -57,25 +57,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 playse 35 - animdarklevel 3 + animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 playse 35 - animdarklevel 2 + animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C playse 35 - animdarklevel 1 + animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 playse 35 - animdarklevel 0 + animateflash 0 call DewfordTown_Gym_EventScript_153071 return @@ -123,7 +123,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 - giveitem ITEM_TM08 + giveitem_std ITEM_TM08 compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 3c0565678..a3830ebb8 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -255,7 +255,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D checkflag FLAG_RECEIVED_TM36 goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 - giveitem ITEM_TM36 + giveitem_std ITEM_TM36 compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag FLAG_RECEIVED_TM36 diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc index e8897b974..4a112eea2 100644 --- a/data/scripts/maps/DewfordTown_House1.inc +++ b/data/scripts/maps/DewfordTown_House1.inc @@ -13,8 +13,8 @@ DewfordTown_House1_EventScript_153001:: @ 8153001 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox DewfordTown_House1_Text_174CC8, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index 29ae58a22..e704efa50 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -7,7 +7,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC checkflag FLAG_RECEIVED_SILK_SCARF goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 - giveitem ITEM_SILK_SCARF + giveitem_std ITEM_SILK_SCARF compare RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag FLAG_RECEIVED_SILK_SCARF diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index 70e75492e..c1288078f 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A - sethealplace 15 + setrespawn 15 call DewfordTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 setvar 0x800b, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index ae3cbd4ad..d59476417 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -46,8 +46,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playse 8 - setmaptile 6, 1, 838, 0 - setmaptile 6, 2, 839, 0 + setmetatile 6, 1, 838, 0 + setmetatile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index d9baaee89..904dc7531 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -51,16 +51,16 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 end EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 - sethealplace 1 - fadescreendelay 1, 24 + setrespawn 1 + fadescreenspeed 1, 24 special GameClear waitstate releaseall end EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D - sethealplace 2 - fadescreendelay 1, 24 + setrespawn 2 + fadescreenspeed 1, 24 special GameClear waitstate releaseall diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 57262b211..018658416 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C - sethealplace 11 + setrespawn 11 end EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 @@ -11,7 +11,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 setvar 0x800b, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index a78338808..4a8919b98 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 .byte 0 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B - sethealplace 20 + setrespawn 20 setflag FLAG_SYS_POKEMON_LEAGUE_FLY checkflag FLAG_ENTERED_ELITE_FOUR call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B @@ -18,7 +18,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A setvar 0x800b, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 70f3cbc3b..8ea580e28 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -35,9 +35,9 @@ FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 0 + playmoncry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index b483b0259..72da4cd40 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -23,14 +23,14 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, FallarborTown_ContestLobby_Movement_153A8C @@ -115,7 +115,7 @@ FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 6c7509508..17267f926 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -25,7 +25,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 - giveitem ITEM_TM27 + giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index c827eea7b..001863d5c 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -43,7 +43,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A compare 0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 - removeitem ITEM_HEART_SCALE, 1 + takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_153D60 end diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index e6f715697..cfd239e8a 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -41,8 +41,8 @@ FallarborTown_Mart_EventScript_1539AE:: @ 81539AE lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox FallarborTown_Mart_Text_1770D3, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 1e50c2fd6..dd6e83be3 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 - sethealplace 17 + setrespawn 17 call FallarborTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 setvar 0x800b, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index dd947d0e5..239c1410d 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -8,7 +8,7 @@ FortreeCity_MapScript1_14C94E:: @ 814C94E end FortreeCity_MapScript1_14C952:: @ 814C952 - tileeffect 2 + setstepcallback 2 end FortreeCity_EventScript_14C955:: @ 814C955 @@ -76,9 +76,9 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 applymovement LAST_TALKED, FortreeCity_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry applymovement LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 removeobject LAST_TALKED diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/scripts/maps/FortreeCity_DecorationShop.inc index fca20b866..56a360708 100644 --- a/data/scripts/maps/FortreeCity_DecorationShop.inc +++ b/data/scripts/maps/FortreeCity_DecorationShop.inc @@ -14,7 +14,7 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waitmessage - pokemartdecor FortreeCity_DecorationShop_Decorations1 + pokemartdecoration FortreeCity_DecorationShop_Decorations1 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end @@ -38,7 +38,7 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waitmessage - pokemartdecor FortreeCity_DecorationShop_Decorations2 + pokemartdecoration FortreeCity_DecorationShop_Decorations2 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index d3f7be155..a0eb6186a 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -36,7 +36,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E - giveitem ITEM_TM40 + giveitem_std ITEM_TM40 compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 9ce96effe..14b9b2c31 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -28,7 +28,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 special sub_804DB68 special sub_804E174 waitstate - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_185737, 4 release end @@ -58,8 +58,8 @@ FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House1_Text_185888, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index 4d935e841..ae70b8644 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 switch RESULT case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 - giveitem ITEM_TM10 + giveitem_std ITEM_TM10 compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM10 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 23a96af51..1b1b41877 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -34,7 +34,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 - giveitem ITEM_MENTAL_HERB + giveitem_std ITEM_MENTAL_HERB compare RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag FLAG_RECEIVED_MENTAL_HERB @@ -60,8 +60,8 @@ FortreeCity_House4_EventScript_15821E:: @ 815821E lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox FortreeCity_House4_Text_18695C, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc index fe10b53b0..888ebe0e2 100644 --- a/data/scripts/maps/FortreeCity_House5.inc +++ b/data/scripts/maps/FortreeCity_House5.inc @@ -13,8 +13,8 @@ FortreeCity_House5_EventScript_158244:: @ 8158244 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House5_Text_186A4F, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index 5268cbeed..b82927be1 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 - sethealplace 7 + setrespawn 7 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B setvar 0x800b, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 1932940c4..33296e510 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -7,7 +7,7 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 checkflag FLAG_RECEIVED_HM05 goto_if_eq GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 - giveitem ITEM_HM05 + giveitem_std ITEM_HM05 setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index 07a95c3f1..c6be3feca 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -5,6 +5,6 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD .byte 0 GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED - tileeffect 7 + setstepcallback 7 setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index dc61a77bf..344ccd479 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -9,7 +9,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 - giveitem ITEM_TM47 + giveitem_std ITEM_TM47 compare RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 6cf2d630b..18cfb904d 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -4,13 +4,13 @@ InsideOfTruck_MapScripts:: @ 815FBFF .byte 0 InsideOfTruck_MapScript1_15FC0A:: @ 815FC0A - setmaptile 4, 1, 520, 0 - setmaptile 4, 2, 528, 0 - setmaptile 4, 3, 536, 0 + setmetatile 4, 1, 520, 0 + setmetatile 4, 2, 528, 0 + setmetatile 4, 3, 536, 0 end InsideOfTruck_MapScript1_15FC26:: @ 815FC26 - tileeffect 5 + setstepcallback 5 end InsideOfTruck_EventScript_15FC29:: @ 815FC29 @@ -24,7 +24,7 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 end InsideOfTruck_EventScript_15FC45:: @ 815FC45 - sethealplace 1 + setrespawn 1 setvar 0x4092, 1 setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_MAY @@ -36,7 +36,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 end InsideOfTruck_EventScript_15FC68:: @ 815FC68 - sethealplace 2 + setrespawn 2 setvar 0x4092, 2 setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index e8489eb8a..dbc71b6bb 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -19,12 +19,12 @@ IslandCave_MapScript1_15EED4:: @ 815EED4 end IslandCave_EventScript_15EEDE:: @ 815EEDE - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return IslandCave_MapScript1_15EF15:: @ 815EF15 @@ -32,12 +32,12 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 end S_OpenRegiceChamber:: @ 815EF19 - setmaptile 7, 19, 554, 1 - setmaptile 8, 19, 555, 1 - setmaptile 9, 19, 556, 1 - setmaptile 7, 20, 562, 1 - setmaptile 8, 20, 563, 0 - setmaptile 9, 20, 564, 1 + setmetatile 7, 19, 554, 1 + setmetatile 8, 19, 555, 1 + setmetatile 9, 19, 556, 1 + setmetatile 7, 20, 562, 1 + setmetatile 8, 20, 563, 0 + setmetatile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN setflag FLAG_SYS_BRAILLE_WAIT @@ -69,7 +69,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C end IslandCave_EventScript_15EF95:: @ 815EF95 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -78,9 +78,9 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D lock faceplayer waitse - playpokecry SPECIES_REGICE, 2 + playmoncry SPECIES_REGICE, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag FLAG_HIDE_REGICE setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 6f910d0ad..c7efee318 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -4,7 +4,7 @@ JaggedPass_MapScripts:: @ 815D266 .byte 0 JaggedPass_MapScript1_15D271:: @ 815D271 - tileeffect 1 + setstepcallback 1 end JaggedPass_MapScript1_15D274:: @ 815D274 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 29b5ef2b9..8b4384ed8 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -83,7 +83,7 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB msgbox LavaridgeTown_Text_16BDA4, 4 - giveitem ITEM_GO_GOGGLES + giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16BE7D, 4 goto LavaridgeTown_EventScript_14E5F5 @@ -91,7 +91,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 msgbox LavaridgeTown_Text_16BF92, 4 - giveitem ITEM_GO_GOGGLES + giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16C020, 4 goto LavaridgeTown_EventScript_14E5F5 @@ -277,7 +277,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A msgbox LavaridgeTown_Text_16C174, 5 compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E7B2 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index a44368925..9dd1ae59d 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -94,7 +94,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 end LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 - giveitem ITEM_TM50 + giveitem_std ITEM_TM50 compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index c5e033422..913734dd5 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -31,7 +31,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 checkflag FLAG_RECEIVED_CHARCOAL goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 - giveitem ITEM_CHARCOAL + giveitem_std ITEM_CHARCOAL compare RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag FLAG_RECEIVED_CHARCOAL diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc index c75cb9e4b..6fc14e0b6 100644 --- a/data/scripts/maps/LavaridgeTown_House.inc +++ b/data/scripts/maps/LavaridgeTown_House.inc @@ -9,8 +9,8 @@ LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox LavaridgeTown_House_Text_176D94, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index 9d0f31059..0efda9c1e 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 - sethealplace 16 + setrespawn 16 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B setvar 0x800b, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 30f0ff36e..6494f2a6f 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -15,18 +15,18 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .ifndef SAPPHIRE - setmaptile 69, 4, 169, 1 - setmaptile 70, 4, 680, 1 - setmaptile 71, 4, 681, 1 - setmaptile 72, 4, 682, 1 - setmaptile 69, 5, 145, 1 - setmaptile 70, 5, 688, 1 - setmaptile 71, 5, 689, 0 - setmaptile 72, 5, 690, 1 - setmaptile 69, 6, 446, 0 - setmaptile 70, 6, 447, 0 - setmaptile 71, 6, 368, 0 - setmaptile 72, 6, 445, 0 + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 680, 1 + setmetatile 71, 4, 681, 1 + setmetatile 72, 4, 682, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 688, 1 + setmetatile 71, 5, 689, 0 + setmetatile 72, 5, 690, 1 + setmetatile 69, 6, 446, 0 + setmetatile 70, 6, 447, 0 + setmetatile 71, 6, 368, 0 + setmetatile 72, 6, 445, 0 .endif checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE @@ -35,29 +35,29 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F end LilycoveCity_EventScript_14CABE:: @ 814CABE - setmaptile 76, 12, 656, 1 - setmaptile 77, 12, 657, 1 - setmaptile 76, 13, 672, 1 - setmaptile 77, 13, 673, 1 - setmaptile 76, 14, 664, 1 - setmaptile 77, 14, 665, 1 - setmaptile 76, 15, 672, 1 - setmaptile 77, 15, 673, 1 - setmaptile 77, 16, 664, 1 - setmaptile 78, 16, 665, 1 - setmaptile 77, 17, 672, 1 - setmaptile 78, 17, 673, 1 + setmetatile 76, 12, 656, 1 + setmetatile 77, 12, 657, 1 + setmetatile 76, 13, 672, 1 + setmetatile 77, 13, 673, 1 + setmetatile 76, 14, 664, 1 + setmetatile 77, 14, 665, 1 + setmetatile 76, 15, 672, 1 + setmetatile 77, 15, 673, 1 + setmetatile 77, 16, 664, 1 + setmetatile 78, 16, 665, 1 + setmetatile 77, 17, 672, 1 + setmetatile 78, 17, 673, 1 return LilycoveCity_EventScript_14CB2B:: @ 814CB2B - setmaptile 69, 4, 169, 1 - setmaptile 70, 4, 169, 1 - setmaptile 71, 4, 169, 1 - setmaptile 72, 4, 169, 1 - setmaptile 69, 5, 145, 1 - setmaptile 70, 5, 145, 1 - setmaptile 71, 5, 145, 1 - setmaptile 72, 5, 145, 1 + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 169, 1 + setmetatile 71, 4, 169, 1 + setmetatile 72, 4, 169, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 145, 1 + setmetatile 71, 5, 145, 1 + setmetatile 72, 5, 145, 1 return LilycoveCity_EventScript_14CB74:: @ 814CB74 @@ -69,7 +69,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE @@ -415,7 +415,7 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject LAST_TALKED diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 6a1bc09e8..c97a01989 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -360,7 +360,7 @@ LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 - choosecontestpkmn + choosecontestmon compare 0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 @@ -472,7 +472,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C addvar 0x8004, 1 - getnumberstring 1, 32772 + buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage addvar 0x8004, 65535 @@ -497,14 +497,14 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 playse 71 - setmaptile 9, 2, 545, 1 - setmaptile 9, 3, 609, 1 + setmetatile 9, 2, 545, 1 + setmetatile 9, 3, 609, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 playse 71 - setmaptile 9, 2, 721, 1 - setmaptile 9, 3, 729, 1 + setmetatile 9, 2, 721, 1 + setmetatile 9, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE @@ -585,7 +585,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar 0x4094, 0x1 - additem ITEM_CONTEST_PASS, 1 + giveitem ITEM_CONTEST_PASS, 1 setvar 0x800b, 8 setvar CONTEST_RANK, 3 setvar 0x4099, 1 @@ -636,14 +636,14 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, LilycoveCity_ContestLobby_Movement_15901C @@ -765,7 +765,7 @@ LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 7078a83ca..2806b6125 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -23,7 +23,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 faceplayer message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4 waitmessage - pokemartdecor LilycoveCity_DepartmentStoreRooftop_Decorations + pokemartdecoration LilycoveCity_DepartmentStoreRooftop_Decorations msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4 release end @@ -146,12 +146,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop - getitemname 0, 0x4000 + bufferitemname 0, 0x4000 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -161,9 +161,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -173,9 +173,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index cfcca25fb..dbfd79e98 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - getitemname 0, 0x8005 + bufferitemname 0, 0x8005 compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare 0x8004, 2 @@ -49,7 +49,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare 0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem 0x8005 + giveitem_std 0x8005 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -111,7 +111,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 - giveitem 0x4045 + giveitem_std 0x4045 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 @@ -134,9 +134,9 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc index 835a0f48d..184d3b816 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items1 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items1 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -34,7 +34,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items2 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items2 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -59,7 +59,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items3 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items3 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -84,7 +84,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items4 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items4 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 7385f8c72..9687c73fe 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -79,13 +79,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 13, 10 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -117,7 +117,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 13, 10 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 @@ -134,7 +134,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc index 4defe37b8..15535a122 100644 --- a/data/scripts/maps/LilycoveCity_House1.inc +++ b/data/scripts/maps/LilycoveCity_House1.inc @@ -9,8 +9,8 @@ LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F lock faceplayer waitse - playpokecry SPECIES_KECLEON, 0 + playmoncry SPECIES_KECLEON, 0 msgbox LilycoveCity_House1_Text_18B82B, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index bbca8aa6d..d0065c9e8 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -7,7 +7,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 checkflag FLAG_RECEIVED_TM44 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 - giveitem ITEM_TM44 + giveitem_std ITEM_TM44 compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM44 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index db9855211..577805fb2 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -33,32 +33,32 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD - setmaptile 10, 6, 606, 1 - setmaptile 11, 6, 607, 1 + setmetatile 10, 6, 606, 1 + setmetatile 11, 6, 607, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615 - setmaptile 18, 6, 604, 1 - setmaptile 19, 6, 605, 1 + setmetatile 18, 6, 604, 1 + setmetatile 19, 6, 605, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D - setmaptile 14, 10, 608, 1 - setmaptile 15, 10, 609, 1 + setmetatile 14, 10, 608, 1 + setmetatile 15, 10, 609, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645 - setmaptile 6, 10, 602, 1 - setmaptile 7, 10, 603, 1 + setmetatile 6, 10, 602, 1 + setmetatile 7, 10, 603, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D - setmaptile 2, 6, 610, 1 - setmaptile 3, 6, 611, 1 + setmetatile 2, 6, 610, 1 + setmetatile 3, 6, 611, 1 end LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 @@ -124,7 +124,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 - givedecoration DECOR_GLASS_ORNAMENT + givedecoration_std DECOR_GLASS_ORNAMENT compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag FLAG_RECEIVED_GLASS_ORNAMENT diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index d1be7b704..38428311b 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D - sethealplace 8 + setrespawn 8 end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 setvar 0x800b, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 52c52b798..13c18d51e 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -124,7 +124,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmovement 0 setflag FLAG_HIDE_MOM_LITTLEROOT setvar 0x4092, 3 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 0x8004, 0x8005 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT @@ -599,7 +599,7 @@ LittlerootTown_EventScript_14DB46:: @ 814DB46 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -611,7 +611,7 @@ LittlerootTown_EventScript_14DB6C:: @ 814DB6C waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -623,7 +623,7 @@ LittlerootTown_EventScript_14DB92:: @ 814DB92 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -635,7 +635,7 @@ LittlerootTown_EventScript_14DBB8:: @ 814DBB8 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -647,7 +647,7 @@ LittlerootTown_EventScript_14DBDE:: @ 814DBDE waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -659,7 +659,7 @@ LittlerootTown_EventScript_14DC04:: @ 814DC04 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -671,7 +671,7 @@ LittlerootTown_EventScript_14DC2A:: @ 814DC2A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -683,7 +683,7 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -853,7 +853,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim goto LittlerootTown_EventScript_14DD2B diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 731e6fb5f..d4dd94aae 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -12,8 +12,8 @@ LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 - setmaptile 5, 4, 624, 1 - setmaptile 5, 2, 616, 1 + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 return LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 @@ -23,7 +23,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 return LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 - setmaptile 3, 7, 659, 1 + setmetatile 3, 7, 659, 1 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index d65e943fd..e23a05243 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -12,8 +12,8 @@ LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E - setmaptile 5, 4, 624, 1 - setmaptile 5, 2, 616, 1 + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 return LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 @@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 return LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE - setmaptile 6, 7, 659, 1 + setmetatile 6, 7, 659, 1 return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index f78d30ec2..6792c5932 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -24,7 +24,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE lockall - getfirstpartypokename 0 + bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage playfanfare 370 @@ -138,7 +138,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 - giveitem ITEM_POKE_BALL, 5 + giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 @@ -147,7 +147,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 - giveitem ITEM_POKE_BALL, 5 + giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index ae00ca369..6a7e02848 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -291,7 +291,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 checkflag FLAG_RECEIVED_BASEMENT_KEY goto_if_eq MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 - giveitem ITEM_BASEMENT_KEY + giveitem_std ITEM_BASEMENT_KEY setflag FLAG_RECEIVED_BASEMENT_KEY msgbox MauvilleCity_Text_166331, 4 release @@ -304,7 +304,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 - giveitem ITEM_TM24 + giveitem_std ITEM_TM24 compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag FLAG_RECEIVED_TM24 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index ef44a20bb..6c2dc57e1 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -46,13 +46,13 @@ MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D msgbox MauvilleCity_BikeShop_Text_181332, 4 - giveitem ITEM_MACH_BIKE + giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 msgbox MauvilleCity_BikeShop_Text_18134A, 4 - giveitem ITEM_ACRO_BIKE + giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end @@ -90,16 +90,16 @@ MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181439, 4 - removeitem ITEM_ACRO_BIKE, 1 - giveitem ITEM_MACH_BIKE + takeitem ITEM_ACRO_BIKE, 1 + giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181408, 4 - removeitem ITEM_MACH_BIKE, 1 - giveitem ITEM_ACRO_BIKE + takeitem ITEM_MACH_BIKE, 1 + giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 646546dc7..8228238f3 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -129,17 +129,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 setvar 0x4001, 1 - getdecorname 0, 88 + bufferdecorationname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 setvar 0x4001, 2 - getdecorname 0, 89 + bufferdecorationname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE setvar 0x4001, 3 - getdecorname 0, 90 + bufferdecorationname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C @@ -156,12 +156,12 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 88 - checkdecor 88 + bufferdecorationname 1, 88 + checkdecorspace 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 88 + givedecoration 88 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -172,12 +172,12 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 89 - checkdecor 89 + bufferdecorationname 1, 89 + checkdecorspace 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 89 + givedecoration 89 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -188,12 +188,12 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 90 - checkdecor 90 + bufferdecorationname 1, 90 + checkdecorspace 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 90 + givedecoration 90 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar 0x4001, 1 - getitemname 0, ITEM_TM32 + bufferitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar 0x4001, 2 - getitemname 0, ITEM_TM29 + bufferitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar 0x4001, 3 - getitemname 0, ITEM_TM35 + bufferitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar 0x4001, 4 - getitemname 0, ITEM_TM24 + bufferitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar 0x4001, 5 - getitemname 0, ITEM_TM13 + bufferitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC @@ -295,7 +295,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 1500 - additem ITEM_TM32, 1 + giveitem ITEM_TM32, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -310,7 +310,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 3500 - additem ITEM_TM29, 1 + giveitem ITEM_TM29, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -325,7 +325,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM35, 1 + giveitem ITEM_TM35, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -340,7 +340,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM24, 1 + giveitem ITEM_TM24, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -355,7 +355,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM13, 1 + giveitem ITEM_TM13, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -401,34 +401,34 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 end MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB - getdecorname 1, DECOR_TREECKO_DOLL - checkdecor DECOR_TREECKO_DOLL + bufferdecorationname 1, DECOR_TREECKO_DOLL + checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration DECOR_TREECKO_DOLL + givedecoration_std DECOR_TREECKO_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 - getdecorname 1, DECOR_TORCHIC_DOLL - checkdecor DECOR_TORCHIC_DOLL + bufferdecorationname 1, DECOR_TORCHIC_DOLL + checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration DECOR_TORCHIC_DOLL + givedecoration_std DECOR_TORCHIC_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F - getdecorname 1, DECOR_MUDKIP_DOLL - checkdecor DECOR_MUDKIP_DOLL + bufferdecorationname 1, DECOR_MUDKIP_DOLL + checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration DECOR_MUDKIP_DOLL + givedecoration_std DECOR_MUDKIP_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index d94436973..799fb0992 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -18,31 +18,31 @@ MauvilleCity_Gym_EventScript_156491:: @ 8156491 end MauvilleCity_Gym_EventScript_15649B:: @ 815649B - setmaptile 4, 7, 560, 0 - setmaptile 4, 8, 568, 0 - setmaptile 5, 7, 561, 0 - setmaptile 5, 8, 569, 0 - setmaptile 3, 8, 578, 1 - setmaptile 3, 9, 538, 0 - setmaptile 3, 10, 593, 0 - setmaptile 1, 10, 546, 0 - setmaptile 1, 11, 554, 1 - setmaptile 2, 10, 547, 0 - setmaptile 2, 11, 555, 1 - setmaptile 4, 10, 546, 0 - setmaptile 4, 11, 554, 1 - setmaptile 5, 10, 547, 0 - setmaptile 5, 11, 555, 1 - setmaptile 6, 11, 578, 1 - setmaptile 6, 12, 538, 0 - setmaptile 6, 13, 593, 0 - setmaptile 3, 11, 577, 1 - setmaptile 3, 12, 585, 1 - setmaptile 3, 13, 592, 1 - setmaptile 4, 13, 560, 0 - setmaptile 4, 14, 568, 0 - setmaptile 5, 13, 561, 0 - setmaptile 5, 14, 569, 0 + setmetatile 4, 7, 560, 0 + setmetatile 4, 8, 568, 0 + setmetatile 5, 7, 561, 0 + setmetatile 5, 8, 569, 0 + setmetatile 3, 8, 578, 1 + setmetatile 3, 9, 538, 0 + setmetatile 3, 10, 593, 0 + setmetatile 1, 10, 546, 0 + setmetatile 1, 11, 554, 1 + setmetatile 2, 10, 547, 0 + setmetatile 2, 11, 555, 1 + setmetatile 4, 10, 546, 0 + setmetatile 4, 11, 554, 1 + setmetatile 5, 10, 547, 0 + setmetatile 5, 11, 555, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 12, 538, 0 + setmetatile 6, 13, 593, 0 + setmetatile 3, 11, 577, 1 + setmetatile 3, 12, 585, 1 + setmetatile 3, 13, 592, 1 + setmetatile 4, 13, 560, 0 + setmetatile 4, 14, 568, 0 + setmetatile 5, 13, 561, 0 + setmetatile 5, 14, 569, 0 end MauvilleCity_Gym_EventScript_15657D:: @ 815657D @@ -96,7 +96,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB end MauvilleCity_Gym_EventScript_15661D:: @ 815661D - giveitem ITEM_TM34 + giveitem_std ITEM_TM34 compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index acb9f39fa..210288517 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -7,7 +7,7 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD checkflag FLAG_RECEIVED_HM06 goto_if_eq MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 - giveitem ITEM_HM06 + giveitem_std ITEM_HM06 setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 7104ebee7..a058003bc 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -28,8 +28,8 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 MauvilleCity_House2_EventScript_15731B:: @ 815731B msgbox MauvilleCity_House2_Text_182515, 4 - removeitem ITEM_HARBOR_MAIL, 1 - giveitem ITEM_COIN_CASE + takeitem ITEM_HARBOR_MAIL, 1 + giveitem_std ITEM_COIN_CASE setflag FLAG_RECEIVED_COIN_CASE goto MauvilleCity_House2_EventScript_15733D end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index 7122b8c3c..de30e21cd 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 - sethealplace 5 + setrespawn 5 call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B goto MauvilleCity_PokemonCenter_1F_EventScript_157365 end @@ -16,7 +16,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 setvar 0x800b, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 31ed83b2a..f165bd3ef 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -74,7 +74,7 @@ MossdeepCity_EventScript_14D027:: @ 814D027 compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 - giveitem ITEM_KINGS_ROCK + giveitem_std ITEM_KINGS_ROCK compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag FLAG_RECEIVED_KINGS_ROCK diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index afc02e82c..75fc3c6b8 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -11,8 +11,8 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 - setmaptile 3, 0, 653, 1 - setmaptile 3, 1, 661, 1 + setmetatile 3, 0, 653, 1 + setmetatile 3, 1, 661, 1 return MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 94f44e311..12a94154b 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -48,14 +48,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 setvar 0x40c0, 1 special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE setvar 0x40c0, 2 special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress return MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 0c27c28f7..b1550a4c1 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -26,26 +26,26 @@ MossdeepCity_Gym_EventScript_15A506:: @ 815A506 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 - setmaptile 5, 5, 516, 0 - setmaptile 2, 7, 569, 1 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A528:: @ 815A528 - setmaptile 8, 14, 516, 0 - setmaptile 8, 10, 569, 1 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A540:: @ 815A540 - setmaptile 15, 17, 524, 0 - setmaptile 17, 15, 569, 1 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A558:: @ 815A558 - setmaptile 1, 23, 525, 0 - setmaptile 5, 24, 569, 1 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B @@ -72,7 +72,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 end MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 - giveitem ITEM_TM04 + giveitem_std ITEM_TM04 compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 @@ -87,8 +87,8 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 5, 5, 516, 0 - setmaptile 2, 7, 569, 1 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -102,8 +102,8 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 5, 5, 524, 0 - setmaptile 2, 7, 568, 1 + setmetatile 5, 5, 524, 0 + setmetatile 2, 7, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -114,8 +114,8 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 8, 14, 516, 0 - setmaptile 8, 10, 569, 1 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -123,8 +123,8 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 8, 14, 517, 0 - setmaptile 8, 10, 568, 1 + setmetatile 8, 14, 517, 0 + setmetatile 8, 10, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -135,8 +135,8 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 15, 17, 524, 0 - setmaptile 17, 15, 569, 1 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -144,8 +144,8 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 15, 17, 516, 0 - setmaptile 17, 15, 568, 1 + setmetatile 15, 17, 516, 0 + setmetatile 17, 15, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -156,8 +156,8 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 1, 23, 525, 0 - setmaptile 5, 24, 569, 1 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -165,8 +165,8 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 1, 23, 516, 0 - setmaptile 5, 24, 568, 1 + setmetatile 1, 23, 516, 0 + setmetatile 5, 24, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 62edffc8b..97a5fc452 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -4,7 +4,7 @@ MossdeepCity_House1_MapScripts:: @ 815A82E MossdeepCity_House1_EventScript_15A82F:: @ 815A82F lock faceplayer - getfirstpartypokename 0 + bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f90fc9350..1da204ff0 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -13,9 +13,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 - waitpokecry + waitmoncry closemessage setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 63054a60c..6632ac793 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -10,7 +10,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 - giveitem ITEM_SUPER_ROD + giveitem_std ITEM_SUPER_ROD setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_18D9E3, 4 release diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index fd400ad16..856ee1287 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -35,8 +35,8 @@ MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox MossdeepCity_House4_Text_18E1E1, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index 4ed3ea57e..c26238102 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 - sethealplace 9 + setrespawn 9 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA setvar 0x800b, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 165742145..884124567 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B faceplayer dodailyevents specialvar RESULT, GetWeekCount - getnumberstring 0, RESULT + buffernumberstring 0, RESULT compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 @@ -35,7 +35,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 - giveitem ITEM_SUN_STONE + giveitem_std ITEM_SUN_STONE compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 55ee9ebac..7e08cfa69 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -10,7 +10,7 @@ MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF - setmaptile 6, 4, 753, 1 + setmetatile 6, 4, 753, 1 return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 @@ -39,7 +39,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 - giveitem ITEM_HM08 + giveitem_std ITEM_HM08 setflag FLAG_RECEIVED_HM08 setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 @@ -74,7 +74,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 compare RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT @@ -83,8 +83,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage - givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - getspeciesname 1, SPECIES_BELDUM + givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 + bufferspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 @@ -125,6 +125,6 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 end MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 - giveitem ITEM_HM08, 1, 1 + giveitem_std ITEM_HM08, 1, 1 setflag FLAG_RECEIVED_HM08 end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 0a3570d6d..a51695b59 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -9,7 +9,7 @@ MtChimney_MapScript1_15CF87:: @ 815CF87 end MtChimney_MapScript1_15CF92:: @ 815CF92 - tileeffect 1 + setstepcallback 1 end MtChimney_EventScript_15CF95:: @ 815CF95 @@ -27,7 +27,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 call_if 1, MtChimney_EventScript_15D000 - giveitem ITEM_LAVA_COOKIE + giveitem_std ITEM_LAVA_COOKIE compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoneybox 0, 0 @@ -414,7 +414,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 - giveitem ITEM_METEORITE + giveitem_std ITEM_METEORITE setflag FLAG_RECEIVED_METEORITE releaseall end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 5d6e42874..7073000d5 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -7,7 +7,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 checkflag FLAG_RECEIVED_CLEANSE_TAG goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 - giveitem ITEM_CLEANSE_TAG + giveitem_std ITEM_CLEANSE_TAG compare RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag FLAG_RECEIVED_CLEANSE_TAG diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 90ad1d9cc..1d2368597 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -5,7 +5,7 @@ MtPyre_2F_MapScripts:: @ 815D36E .byte 0 MtPyre_2F_MapScript1_15D37E:: @ 815D37E - tileeffect 7 + setstepcallback 7 setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 47a842b56..73e2e4d97 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -63,7 +63,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .else msgbox MtPyre_Summit_Text_1B5FE6, 4 .endif - giveitem ITEM_RED_OR_BLUE_ORB + giveitem_std ITEM_RED_OR_BLUE_ORB setflag FLAG_RECEIVED_RED_OR_BLUE_ORB releaseall end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 1234f5653..a88b35087 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -9,12 +9,12 @@ NewMauville_Entrance_MapScript1_15E495:: @ 815E495 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 - setmaptile 3, 0, 788, 1 - setmaptile 4, 0, 789, 1 - setmaptile 5, 0, 790, 1 - setmaptile 3, 1, 796, 1 - setmaptile 4, 1, 797, 1 - setmaptile 5, 1, 798, 1 + setmetatile 3, 0, 788, 1 + setmetatile 4, 0, 789, 1 + setmetatile 5, 0, 790, 1 + setmetatile 3, 1, 796, 1 + setmetatile 4, 1, 797, 1 + setmetatile 5, 1, 798, 1 return NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 @@ -33,12 +33,12 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 - setmaptile 3, 0, 707, 0 - setmaptile 4, 0, 708, 0 - setmaptile 5, 0, 709, 0 - setmaptile 3, 1, 715, 1 - setmaptile 4, 1, 716, 0 - setmaptile 5, 1, 717, 1 + setmetatile 3, 0, 707, 0 + setmetatile 4, 0, 708, 0 + setmetatile 5, 0, 709, 0 + setmetatile 3, 1, 715, 1 + setmetatile 4, 1, 716, 0 + setmetatile 5, 1, 717, 1 special DrawWholeMapView playse 20 setvar 0x40ba, 1 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index aa6cf6310..aefb23c61 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -48,83 +48,83 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 end NewMauville_Inside_EventScript_15E5DA:: @ 815E5DA - setmaptile 23, 34, 617, 1 - setmaptile 23, 35, 625, 1 - setmaptile 23, 36, 621, 0 - setmaptile 23, 37, 641, 0 - setmaptile 10, 16, 617, 1 - setmaptile 10, 17, 625, 1 - setmaptile 10, 18, 621, 0 - setmaptile 10, 19, 641, 0 - setmaptile 10, 0, 617, 1 - setmaptile 10, 1, 625, 1 - setmaptile 10, 2, 621, 0 - setmaptile 10, 3, 641, 0 - setmaptile 37, 33, 694, 1 - setmaptile 37, 34, 702, 1 - setmaptile 37, 35, 710, 1 - setmaptile 37, 36, 718, 1 - setmaptile 28, 22, 694, 1 - setmaptile 28, 23, 702, 1 - setmaptile 28, 24, 710, 1 - setmaptile 28, 25, 718, 1 - setmaptile 10, 24, 694, 1 - setmaptile 10, 25, 702, 1 - setmaptile 10, 26, 710, 1 - setmaptile 10, 27, 718, 1 - setmaptile 21, 2, 694, 1 - setmaptile 21, 3, 702, 1 - setmaptile 21, 4, 710, 1 - setmaptile 21, 5, 718, 1 - setmaptile 6, 11, 591, 0 - setmaptile 13, 10, 591, 0 - setmaptile 16, 22, 591, 0 - setmaptile 4, 26, 591, 0 - setmaptile 30, 38, 591, 0 - setmaptile 2, 11, 558, 0 - setmaptile 17, 10, 558, 0 - setmaptile 25, 18, 558, 0 - setmaptile 18, 36, 558, 0 + setmetatile 23, 34, 617, 1 + setmetatile 23, 35, 625, 1 + setmetatile 23, 36, 621, 0 + setmetatile 23, 37, 641, 0 + setmetatile 10, 16, 617, 1 + setmetatile 10, 17, 625, 1 + setmetatile 10, 18, 621, 0 + setmetatile 10, 19, 641, 0 + setmetatile 10, 0, 617, 1 + setmetatile 10, 1, 625, 1 + setmetatile 10, 2, 621, 0 + setmetatile 10, 3, 641, 0 + setmetatile 37, 33, 694, 1 + setmetatile 37, 34, 702, 1 + setmetatile 37, 35, 710, 1 + setmetatile 37, 36, 718, 1 + setmetatile 28, 22, 694, 1 + setmetatile 28, 23, 702, 1 + setmetatile 28, 24, 710, 1 + setmetatile 28, 25, 718, 1 + setmetatile 10, 24, 694, 1 + setmetatile 10, 25, 702, 1 + setmetatile 10, 26, 710, 1 + setmetatile 10, 27, 718, 1 + setmetatile 21, 2, 694, 1 + setmetatile 21, 3, 702, 1 + setmetatile 21, 4, 710, 1 + setmetatile 21, 5, 718, 1 + setmetatile 6, 11, 591, 0 + setmetatile 13, 10, 591, 0 + setmetatile 16, 22, 591, 0 + setmetatile 4, 26, 591, 0 + setmetatile 30, 38, 591, 0 + setmetatile 2, 11, 558, 0 + setmetatile 17, 10, 558, 0 + setmetatile 25, 18, 558, 0 + setmetatile 18, 36, 558, 0 return NewMauville_Inside_EventScript_15E728:: @ 815E728 - setmaptile 23, 34, 695, 1 - setmaptile 23, 35, 703, 1 - setmaptile 23, 36, 711, 1 - setmaptile 23, 37, 719, 1 - setmaptile 10, 16, 695, 1 - setmaptile 10, 17, 703, 1 - setmaptile 10, 18, 711, 1 - setmaptile 10, 19, 719, 1 - setmaptile 10, 0, 695, 1 - setmaptile 10, 1, 703, 1 - setmaptile 10, 2, 711, 1 - setmaptile 10, 3, 719, 1 - setmaptile 37, 33, 617, 1 - setmaptile 37, 34, 625, 1 - setmaptile 37, 35, 621, 0 - setmaptile 37, 36, 641, 0 - setmaptile 28, 22, 617, 1 - setmaptile 28, 23, 625, 1 - setmaptile 28, 24, 621, 0 - setmaptile 28, 25, 641, 0 - setmaptile 10, 24, 617, 1 - setmaptile 10, 25, 625, 1 - setmaptile 10, 26, 621, 0 - setmaptile 10, 27, 641, 0 - setmaptile 21, 2, 617, 1 - setmaptile 21, 3, 625, 1 - setmaptile 21, 4, 621, 0 - setmaptile 21, 5, 641, 0 - setmaptile 2, 11, 591, 0 - setmaptile 17, 10, 591, 0 - setmaptile 25, 18, 591, 0 - setmaptile 18, 36, 591, 0 - setmaptile 6, 11, 566, 0 - setmaptile 13, 10, 566, 0 - setmaptile 16, 22, 566, 0 - setmaptile 4, 26, 566, 0 - setmaptile 30, 38, 566, 0 + setmetatile 23, 34, 695, 1 + setmetatile 23, 35, 703, 1 + setmetatile 23, 36, 711, 1 + setmetatile 23, 37, 719, 1 + setmetatile 10, 16, 695, 1 + setmetatile 10, 17, 703, 1 + setmetatile 10, 18, 711, 1 + setmetatile 10, 19, 719, 1 + setmetatile 10, 0, 695, 1 + setmetatile 10, 1, 703, 1 + setmetatile 10, 2, 711, 1 + setmetatile 10, 3, 719, 1 + setmetatile 37, 33, 617, 1 + setmetatile 37, 34, 625, 1 + setmetatile 37, 35, 621, 0 + setmetatile 37, 36, 641, 0 + setmetatile 28, 22, 617, 1 + setmetatile 28, 23, 625, 1 + setmetatile 28, 24, 621, 0 + setmetatile 28, 25, 641, 0 + setmetatile 10, 24, 617, 1 + setmetatile 10, 25, 625, 1 + setmetatile 10, 26, 621, 0 + setmetatile 10, 27, 641, 0 + setmetatile 21, 2, 617, 1 + setmetatile 21, 3, 625, 1 + setmetatile 21, 4, 621, 0 + setmetatile 21, 5, 641, 0 + setmetatile 2, 11, 591, 0 + setmetatile 17, 10, 591, 0 + setmetatile 25, 18, 591, 0 + setmetatile 18, 36, 591, 0 + setmetatile 6, 11, 566, 0 + setmetatile 13, 10, 566, 0 + setmetatile 16, 22, 566, 0 + setmetatile 4, 26, 566, 0 + setmetatile 30, 38, 566, 0 return NewMauville_Inside_EventScript_15E876:: @ 815E876 @@ -136,15 +136,15 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876 end NewMauville_Inside_EventScript_15E88B:: @ 815E88B - setmaptile 33, 6, 591, 0 - setmaptile 32, 2, 752, 1 - setmaptile 33, 2, 753, 1 - setmaptile 34, 2, 754, 1 - setmaptile 35, 2, 755, 1 - setmaptile 32, 3, 756, 1 - setmaptile 33, 3, 757, 1 - setmaptile 34, 3, 758, 1 - setmaptile 35, 3, 759, 1 + setmetatile 33, 6, 591, 0 + setmetatile 32, 2, 752, 1 + setmetatile 33, 2, 753, 1 + setmetatile 34, 2, 754, 1 + setmetatile 35, 2, 755, 1 + setmetatile 32, 3, 756, 1 + setmetatile 33, 3, 757, 1 + setmetatile 34, 3, 758, 1 + setmetatile 35, 3, 759, 1 special DrawWholeMapView return @@ -166,9 +166,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -181,9 +181,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -196,9 +196,9 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 64928f840..465cbcfc6 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -75,7 +75,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 - giveitem ITEM_POTION + giveitem_std ITEM_POTION compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 69503908a..cbf3acd27 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E - sethealplace 14 + setrespawn 14 call OldaleTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 setvar 0x800b, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/scripts/maps/PacifidlogTown.inc index 085d083d8..d7ac80a0a 100644 --- a/data/scripts/maps/PacifidlogTown.inc +++ b/data/scripts/maps/PacifidlogTown.inc @@ -8,7 +8,7 @@ PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9 end PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD - tileeffect 3 + setstepcallback 3 end PacifidlogTown_EventScript_14E900:: @ 814E900 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index 942f5626b..f073201ca 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -45,7 +45,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 - giveitem ITEM_TM27 + giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -61,7 +61,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 - giveitem ITEM_TM21 + giveitem_std ITEM_TM21 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 PacifidlogTown_House2_EventScript_154254:: @ 8154254 specialvar RESULT, sub_810F908 - getnumberstring 0, RESULT + buffernumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end @@ -81,9 +81,9 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 0 + playmoncry SPECIES_AZURILL, 0 msgbox PacifidlogTown_House2_Text_17938B, 4 - waitpokecry + waitmoncry msgbox PacifidlogTown_House2_Text_17939B, 4 release end @@ -92,9 +92,9 @@ PacifidlogTown_House2_EventScript_154282:: @ 8154282 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 2 + playmoncry SPECIES_AZURILL, 2 msgbox PacifidlogTown_House2_Text_1793CC, 4 - waitpokecry + waitmoncry msgbox PacifidlogTown_House2_Text_1793DD, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index a2e033a24..624a221d5 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -28,7 +28,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E special sub_804DB68 special sub_804E174 waitstate - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index 64dd5008c..95d5448e8 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 - sethealplace 19 + setrespawn 19 end @ 8154109 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index e2967169f..add786bf0 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -383,7 +383,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 return PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 - giveitem ITEM_ENIGMA_BERRY + giveitem_std ITEM_ENIGMA_BERRY compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 @@ -412,7 +412,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 end PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C - giveitem ITEM_TM42 + giveitem_std ITEM_TM42 compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM42 @@ -962,51 +962,51 @@ PetalburgCity_Gym_EventScript_155081:: @ 8155081 return PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2 - setmaptile 6, 85, 528, 0 - setmaptile 7, 85, 529, 0 - setmaptile 1, 98, 528, 0 - setmaptile 2, 98, 529, 0 + setmetatile 6, 85, 528, 0 + setmetatile 7, 85, 529, 0 + setmetatile 1, 98, 528, 0 + setmetatile 2, 98, 529, 0 return PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7 - setmaptile 6, 46, 528, 0 - setmaptile 7, 46, 529, 0 - setmaptile 1, 59, 528, 0 - setmaptile 2, 59, 529, 0 + setmetatile 6, 46, 528, 0 + setmetatile 7, 46, 529, 0 + setmetatile 1, 59, 528, 0 + setmetatile 2, 59, 529, 0 return PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC - setmaptile 6, 59, 528, 0 - setmaptile 7, 59, 529, 0 - setmaptile 1, 72, 528, 0 - setmaptile 2, 72, 529, 0 + setmetatile 6, 59, 528, 0 + setmetatile 7, 59, 529, 0 + setmetatile 1, 72, 528, 0 + setmetatile 2, 72, 529, 0 return PetalburgCity_Gym_EventScript_155111:: @ 8155111 - setmaptile 1, 20, 528, 0 - setmaptile 2, 20, 529, 0 + setmetatile 1, 20, 528, 0 + setmetatile 2, 20, 529, 0 return PetalburgCity_Gym_EventScript_155124:: @ 8155124 - setmaptile 6, 20, 528, 0 - setmaptile 7, 20, 529, 0 - setmaptile 1, 33, 528, 0 - setmaptile 2, 33, 529, 0 + setmetatile 6, 20, 528, 0 + setmetatile 7, 20, 529, 0 + setmetatile 1, 33, 528, 0 + setmetatile 2, 33, 529, 0 return PetalburgCity_Gym_EventScript_155149:: @ 8155149 - setmaptile 6, 33, 528, 0 - setmaptile 7, 33, 529, 0 + setmetatile 6, 33, 528, 0 + setmetatile 7, 33, 529, 0 return PetalburgCity_Gym_EventScript_15515C:: @ 815515C - setmaptile 1, 7, 528, 0 - setmaptile 2, 7, 529, 0 + setmetatile 1, 7, 528, 0 + setmetatile 2, 7, 529, 0 return PetalburgCity_Gym_EventScript_15516F:: @ 815516F - setmaptile 6, 7, 528, 0 - setmaptile 7, 7, 529, 0 + setmetatile 6, 7, 528, 0 + setmetatile 7, 7, 529, 0 return PetalburgCity_Gym_EventScript_155182:: @ 8155182 diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index e2013a1d6..1dc99159a 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A - sethealplace 3 + setrespawn 3 call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 setvar 0x800b, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index 110b798b7..08bbcb0c7 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -25,7 +25,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 - giveitem ITEM_HM03 + giveitem_std ITEM_HM03 setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index c38d4d559..be74cbf4c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -90,7 +90,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA applymovement 255, PetalburgWoods_Movement_1A0845 waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 - giveitem ITEM_GREAT_BALL + giveitem_std ITEM_GREAT_BALL compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D @@ -244,7 +244,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC checkflag FLAG_RECEIVED_MIRACLE_SEED goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 - giveitem ITEM_MIRACLE_SEED + giveitem_std ITEM_MIRACLE_SEED compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag FLAG_RECEIVED_MIRACLE_SEED diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 92f5d5593..a04dcd86d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -34,7 +34,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 - giveitem ITEM_CHESTO_BERRY + giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 @@ -53,7 +53,7 @@ Route104_EventScript_14EF09:: @ 814EF09 checkflag FLAG_RECEIVED_WHITE_HERB goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 - giveitem ITEM_WHITE_HERB + giveitem_std ITEM_WHITE_HERB compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_WHITE_HERB @@ -107,7 +107,7 @@ Route104_EventScript_14EF93:: @ 814EF93 checkflag FLAG_RECEIVED_TM09 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 - giveitem ITEM_TM09 + giveitem_std ITEM_TM09 compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_TM09 @@ -124,14 +124,14 @@ Route104_EventScript_14EFCC:: @ 814EFCC end Route104_EventScript_14EFD5:: @ 814EFD5 - setobjectpriority 8, 0, 19, 0 - setobjectpriority 255, 0, 19, 0 + setobjectpriority 8, MAP_ROUTE104, 0 + setobjectpriority 255, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 removeobject 8 applymovement 255, Route104_Movement_14F162 waitmovement 0 - hideobject 255, 0, 19 + hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F applymovement 255, Route104_Movement_14F09F @@ -139,12 +139,12 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 255, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - showobject 255, 0, 11 + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route104_Movement_14F168 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_14F16F waitmovement 0 @@ -152,10 +152,10 @@ Route104_EventScript_14EFD5:: @ 814EFD5 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - hideobject 7, 0, 19 + hideobjectat 7, MAP_ROUTE104 copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 19 - resetobjectpriority 2, 0, 11 + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar 0x408e, 0 checkflag FLAG_DELIVERED_STEVEN_LETTER diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 9369f7573..4eb1d9705 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -92,8 +92,8 @@ Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox Route104_MrBrineysHouse_Text_191FB9, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 07abd21bc..2de6bf51f 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -52,7 +52,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C message Route104_PrettyPetalFlowerShop_Text_1A0C42 waitmessage - pokemartbp Route104_PrettyPetalFlowerShop_Items + pokemartdecoration2 Route104_PrettyPetalFlowerShop_Items msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4 release end @@ -80,7 +80,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4 - giveitem ITEM_WAILMER_PAIL + giveitem_std ITEM_WAILMER_PAIL msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 setflag FLAG_RECEIVED_WAILMER_PAIL release @@ -95,7 +95,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index de7188aae..30157e52f 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -8,8 +8,8 @@ Route105_MapScript1_14F29E:: @ 814F29E end Route105_EventScript_14F2A8:: @ 814F2A8 - setmaptile 9, 19, 124, 1 - setmaptile 9, 20, 145, 1 + setmetatile 9, 19, 124, 1 + setmetatile 9, 20, 145, 1 return Route105_EventScript_14F2BB:: @ 814F2BB diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 1277168e0..a9fa7d906 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -3,8 +3,8 @@ Route109_MapScripts:: @ 814F4D2 Route109_EventScript_14F4D3:: @ 814F4D3 call Route109_EventScript_1A010C - setobjectpriority 2, 0, 24, 0 - setobjectpriority 255, 0, 24, 0 + setobjectpriority 2, MAP_ROUTE109, 0 + setobjectpriority 255, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_14F67B waitmovement 0 removeobject 2 @@ -33,30 +33,30 @@ Route109_EventScript_14F538:: @ 814F538 end Route109_EventScript_14F548:: @ 814F548 - hideobject 255, 0, 24 + hideobjectat 255, MAP_ROUTE109 call Route109_EventScript_1A02E7 applymovement 1, Route109_Movement_14F5BF applymovement 255, Route109_Movement_14F5BF waitmovement 0 call Route109_EventScript_1A02EF - showobject 255, 0, 11 + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route109_Movement_14F670 waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 - hideobject 1, 0, 24 + hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 24 - resetobjectpriority 2, 0, 11 + resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release end @@ -331,7 +331,7 @@ Route109_EventScript_14F725:: @ 814F725 checkflag FLAG_RECEIVED_SOFT_SAND goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 - giveitem ITEM_SOFT_SAND + giveitem_std ITEM_SOFT_SAND compare RESULT, 0 goto_if_eq Route109_EventScript_1A029B closemessage @@ -360,9 +360,9 @@ Route109_EventScript_14F788:: @ 814F788 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox Route109_Text_16E5CA, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index f60413d81..7a12f5850 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -27,7 +27,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 - giveitem ITEM_SODA_POP, 6 + giveitem_std ITEM_SODA_POP, 6 compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag FLAG_RECEIVED_6_SODA_POP @@ -61,7 +61,7 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A takemoney 0x12c, 0 updatemoneybox 0, 0 nop - giveitem ITEM_SODA_POP + giveitem_std ITEM_SODA_POP hidemoneybox 0, 0 release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 146be5959..5e10782e9 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -420,7 +420,7 @@ Route110_EventScript_14FE8A:: @ 814FE8A end Route110_EventScript_14FEA5:: @ 814FEA5 - giveitem ITEM_ITEMFINDER + giveitem_std ITEM_ITEMFINDER return Route110_EventScript_14FEB2:: @ 814FEB2 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 12309207c..813cbb9e9 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -22,7 +22,7 @@ Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F addobject 1 - showobject 1, 29, 1 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END turnobject 1, 4 end @@ -37,7 +37,7 @@ Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 end Route110_TrickHouseEnd_EventScript_161994:: @ 8161994 - setmaptile 10, 1, 539, 1 + setmetatile 10, 1, 539, 1 return Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E @@ -60,7 +60,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C2B2, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_RARE_CANDY + giveitem_std ITEM_RARE_CANDY compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -73,7 +73,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C333, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_TIMER_BALL + giveitem_std ITEM_TIMER_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -86,7 +86,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C3A7, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_HARD_STONE + giveitem_std ITEM_HARD_STONE compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -99,7 +99,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C41F, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_SMOKE_BALL + giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_TM12 + giveitem_std ITEM_TM12 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -125,7 +125,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C515, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_MAGNET + giveitem_std ITEM_MAGNET compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -138,7 +138,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C567, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_PP_MAX + giveitem_std ITEM_PP_MAX compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -167,9 +167,9 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar 0x40c1, 0 .ifdef SAPPHIRE - givedecoration 32 + givedecoration_std 32 .else - givedecoration 31 + givedecoration_std 31 .endc compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index bf0c36ff3..b9582b64c 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -139,14 +139,14 @@ Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 addobject 1 - showobject 1, 29, 0 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 addobject 1 - hideobject 1, 29, 0 + hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE switch 0x4044 case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 @@ -368,7 +368,7 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE - giveitem ITEM_RARE_CANDY + giveitem_std ITEM_RARE_CANDY compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -378,7 +378,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE end Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA - giveitem ITEM_TIMER_BALL + giveitem_std ITEM_TIMER_BALL compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -388,7 +388,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA end Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 - giveitem ITEM_HARD_STONE + giveitem_std ITEM_HARD_STONE compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -398,7 +398,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 end Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 - giveitem ITEM_SMOKE_BALL + giveitem_std ITEM_SMOKE_BALL compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -408,7 +408,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 end Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E - giveitem ITEM_TM12 + giveitem_std ITEM_TM12 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -418,7 +418,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E end Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA - giveitem ITEM_MAGNET + giveitem_std ITEM_MAGNET compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -428,7 +428,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA end Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 - giveitem ITEM_PP_MAX + giveitem_std ITEM_PP_MAX compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -450,9 +450,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE - givedecoration 32 + givedecoration_std 32 .else - givedecoration 31 + givedecoration_std 31 .endif compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 @@ -501,7 +501,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 end Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD - setmaptile 5, 1, 537, 0 + setmetatile 5, 1, 537, 0 special DrawWholeMapView delay 20 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856 @@ -607,7 +607,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 msgbox UnknownString_819CAD1, 4 playse SE_PIN setvar 0x40AB, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -618,7 +618,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 msgbox UnknownString_819CCCB, 4 playse SE_PIN setvar 0x40AC, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -629,7 +629,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 msgbox UnknownString_819CEF9, 4 playse SE_PIN setvar 0x40AD, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -640,7 +640,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB msgbox UnknownString_819D164, 4 playse SE_PIN setvar 0x40AE, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -651,7 +651,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 msgbox UnknownString_819D3A5, 4 playse SE_PIN setvar 0x40AF, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -662,7 +662,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D msgbox UnknownString_819DC0A, 4 playse SE_PIN setvar 0x40B0, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -673,7 +673,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 msgbox UnknownString_819DE8D, 4 playse SE_PIN setvar 0x40B1, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -684,7 +684,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F msgbox UnknownString_819E0FF, 4 playse SE_PIN setvar 0x40B2, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -757,9 +757,9 @@ Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B return Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 - setfieldeffect 0, 32772 - setfieldeffect 1, 32773 - setfieldeffect 2, 32774 + setfieldeffectargument 0, 32772 + setfieldeffectargument 1, 32773 + setfieldeffectargument 2, 32774 dofieldeffect 54 waitfieldeffect 54 delay 10 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 3a89c2db1..4fffd9914 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE end Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 end Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index f71a9611a..6425d05cb 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -70,23 +70,23 @@ Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 end Route110_TrickHousePuzzle2_EventScript_161E2C:: @ 8161E2C - setmaptile 14, 21, 601, 0 - setmaptile 1, 12, 618, 0 + setmetatile 14, 21, 601, 0 + setmetatile 1, 12, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E3F:: @ 8161E3F - setmaptile 8, 17, 601, 0 - setmaptile 12, 13, 618, 0 + setmetatile 8, 17, 601, 0 + setmetatile 12, 13, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E52:: @ 8161E52 - setmaptile 4, 10, 601, 0 - setmaptile 8, 4, 618, 0 + setmetatile 4, 10, 601, 0 + setmetatile 8, 4, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 - setmaptile 5, 2, 601, 0 - setmaptile 12, 5, 618, 0 + setmetatile 5, 2, 601, 0 + setmetatile 12, 5, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index a50ecd3ce..54cea16c9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -24,13 +24,13 @@ Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 end Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 - setmaptile 5, 20, 600, 0 - setmaptile 4, 12, 600, 0 - setmaptile 11, 10, 600, 0 - setmaptile 3, 8, 600, 0 - setmaptile 13, 7, 600, 0 - setmaptile 1, 3, 600, 0 - setmaptile 10, 2, 600, 0 + setmetatile 5, 20, 600, 0 + setmetatile 4, 12, 600, 0 + setmetatile 11, 10, 600, 0 + setmetatile 3, 8, 600, 0 + setmetatile 13, 7, 600, 0 + setmetatile 1, 3, 600, 0 + setmetatile 10, 2, 600, 0 compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F compare 0x4008, 2 @@ -48,201 +48,201 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F - setmaptile 5, 20, 601, 0 + setmetatile 5, 20, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FA9:: @ 8161FA9 - setmaptile 4, 12, 601, 0 + setmetatile 4, 12, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FB3:: @ 8161FB3 - setmaptile 11, 10, 601, 0 + setmetatile 11, 10, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FBD:: @ 8161FBD - setmaptile 3, 8, 601, 0 + setmetatile 3, 8, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FC7:: @ 8161FC7 - setmaptile 13, 7, 601, 0 + setmetatile 13, 7, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FD1:: @ 8161FD1 - setmaptile 1, 3, 601, 0 + setmetatile 1, 3, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FDB:: @ 8161FDB - setmaptile 10, 2, 601, 0 + setmetatile 10, 2, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FE5:: @ 8161FE5 - setmaptile 1, 6, 587, 0 - setmaptile 2, 6, 588, 0 - setmaptile 1, 7, 595, 0 - setmaptile 2, 7, 596, 0 - setmaptile 4, 9, 587, 0 - setmaptile 5, 9, 588, 0 - setmaptile 4, 10, 595, 0 - setmaptile 5, 10, 596, 0 - setmaptile 4, 18, 587, 0 - setmaptile 5, 18, 588, 0 - setmaptile 4, 19, 595, 0 - setmaptile 5, 19, 596, 0 - setmaptile 7, 3, 587, 0 - setmaptile 8, 3, 588, 0 - setmaptile 7, 4, 595, 0 - setmaptile 8, 4, 596, 0 - setmaptile 7, 9, 587, 0 - setmaptile 8, 9, 588, 0 - setmaptile 7, 10, 595, 0 - setmaptile 8, 10, 596, 0 - setmaptile 7, 18, 587, 0 - setmaptile 8, 18, 588, 0 - setmaptile 7, 19, 595, 0 - setmaptile 8, 19, 596, 0 - setmaptile 13, 3, 587, 0 - setmaptile 14, 3, 588, 0 - setmaptile 13, 4, 595, 0 - setmaptile 14, 4, 596, 0 - setmaptile 13, 9, 587, 0 - setmaptile 14, 9, 588, 0 - setmaptile 13, 10, 595, 0 - setmaptile 14, 10, 596, 0 - setmaptile 13, 15, 587, 0 - setmaptile 14, 15, 588, 0 - setmaptile 13, 16, 595, 0 - setmaptile 14, 16, 596, 0 - setmaptile 3, 13, 589, 1 - setmaptile 3, 14, 597, 0 - setmaptile 6, 7, 589, 1 - setmaptile 6, 8, 597, 0 - setmaptile 9, 16, 589, 1 - setmaptile 9, 17, 597, 0 - setmaptile 12, 4, 589, 1 - setmaptile 12, 5, 597, 0 - setmaptile 12, 10, 589, 1 - setmaptile 12, 11, 597, 0 - setmaptile 1, 15, 568, 0 - setmaptile 2, 15, 569, 0 - setmaptile 1, 16, 576, 1 - setmaptile 2, 16, 577, 1 - setmaptile 4, 6, 568, 0 - setmaptile 5, 6, 569, 0 - setmaptile 4, 7, 576, 1 - setmaptile 5, 7, 577, 1 - setmaptile 7, 12, 568, 0 - setmaptile 8, 12, 569, 0 - setmaptile 7, 13, 576, 1 - setmaptile 8, 13, 577, 1 - setmaptile 10, 12, 568, 0 - setmaptile 11, 12, 569, 0 - setmaptile 10, 13, 576, 1 - setmaptile 11, 13, 577, 1 - setmaptile 10, 18, 568, 0 - setmaptile 11, 18, 569, 0 - setmaptile 10, 19, 576, 1 - setmaptile 11, 19, 577, 1 - setmaptile 3, 4, 570, 1 - setmaptile 3, 5, 578, 1 - setmaptile 6, 10, 570, 1 - setmaptile 6, 11, 578, 1 - setmaptile 6, 13, 570, 1 - setmaptile 6, 14, 578, 1 - setmaptile 6, 16, 570, 1 - setmaptile 6, 17, 578, 1 - setmaptile 9, 4, 570, 1 - setmaptile 9, 5, 578, 1 - setmaptile 9, 7, 570, 1 - setmaptile 9, 8, 578, 1 - setmaptile 12, 13, 570, 1 - setmaptile 12, 14, 578, 1 - setmaptile 12, 16, 570, 1 - setmaptile 12, 17, 578, 1 + setmetatile 1, 6, 587, 0 + setmetatile 2, 6, 588, 0 + setmetatile 1, 7, 595, 0 + setmetatile 2, 7, 596, 0 + setmetatile 4, 9, 587, 0 + setmetatile 5, 9, 588, 0 + setmetatile 4, 10, 595, 0 + setmetatile 5, 10, 596, 0 + setmetatile 4, 18, 587, 0 + setmetatile 5, 18, 588, 0 + setmetatile 4, 19, 595, 0 + setmetatile 5, 19, 596, 0 + setmetatile 7, 3, 587, 0 + setmetatile 8, 3, 588, 0 + setmetatile 7, 4, 595, 0 + setmetatile 8, 4, 596, 0 + setmetatile 7, 9, 587, 0 + setmetatile 8, 9, 588, 0 + setmetatile 7, 10, 595, 0 + setmetatile 8, 10, 596, 0 + setmetatile 7, 18, 587, 0 + setmetatile 8, 18, 588, 0 + setmetatile 7, 19, 595, 0 + setmetatile 8, 19, 596, 0 + setmetatile 13, 3, 587, 0 + setmetatile 14, 3, 588, 0 + setmetatile 13, 4, 595, 0 + setmetatile 14, 4, 596, 0 + setmetatile 13, 9, 587, 0 + setmetatile 14, 9, 588, 0 + setmetatile 13, 10, 595, 0 + setmetatile 14, 10, 596, 0 + setmetatile 13, 15, 587, 0 + setmetatile 14, 15, 588, 0 + setmetatile 13, 16, 595, 0 + setmetatile 14, 16, 596, 0 + setmetatile 3, 13, 589, 1 + setmetatile 3, 14, 597, 0 + setmetatile 6, 7, 589, 1 + setmetatile 6, 8, 597, 0 + setmetatile 9, 16, 589, 1 + setmetatile 9, 17, 597, 0 + setmetatile 12, 4, 589, 1 + setmetatile 12, 5, 597, 0 + setmetatile 12, 10, 589, 1 + setmetatile 12, 11, 597, 0 + setmetatile 1, 15, 568, 0 + setmetatile 2, 15, 569, 0 + setmetatile 1, 16, 576, 1 + setmetatile 2, 16, 577, 1 + setmetatile 4, 6, 568, 0 + setmetatile 5, 6, 569, 0 + setmetatile 4, 7, 576, 1 + setmetatile 5, 7, 577, 1 + setmetatile 7, 12, 568, 0 + setmetatile 8, 12, 569, 0 + setmetatile 7, 13, 576, 1 + setmetatile 8, 13, 577, 1 + setmetatile 10, 12, 568, 0 + setmetatile 11, 12, 569, 0 + setmetatile 10, 13, 576, 1 + setmetatile 11, 13, 577, 1 + setmetatile 10, 18, 568, 0 + setmetatile 11, 18, 569, 0 + setmetatile 10, 19, 576, 1 + setmetatile 11, 19, 577, 1 + setmetatile 3, 4, 570, 1 + setmetatile 3, 5, 578, 1 + setmetatile 6, 10, 570, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 13, 570, 1 + setmetatile 6, 14, 578, 1 + setmetatile 6, 16, 570, 1 + setmetatile 6, 17, 578, 1 + setmetatile 9, 4, 570, 1 + setmetatile 9, 5, 578, 1 + setmetatile 9, 7, 570, 1 + setmetatile 9, 8, 578, 1 + setmetatile 12, 13, 570, 1 + setmetatile 12, 14, 578, 1 + setmetatile 12, 16, 570, 1 + setmetatile 12, 17, 578, 1 return Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 - setmaptile 1, 6, 571, 0 - setmaptile 2, 6, 572, 0 - setmaptile 1, 7, 579, 1 - setmaptile 2, 7, 580, 1 - setmaptile 4, 9, 571, 0 - setmaptile 5, 9, 572, 0 - setmaptile 4, 10, 579, 1 - setmaptile 5, 10, 580, 1 - setmaptile 4, 18, 571, 0 - setmaptile 5, 18, 572, 0 - setmaptile 4, 19, 579, 1 - setmaptile 5, 19, 580, 1 - setmaptile 7, 3, 571, 0 - setmaptile 8, 3, 572, 0 - setmaptile 7, 4, 579, 1 - setmaptile 8, 4, 580, 1 - setmaptile 7, 9, 571, 0 - setmaptile 8, 9, 572, 0 - setmaptile 7, 10, 579, 1 - setmaptile 8, 10, 580, 1 - setmaptile 7, 18, 571, 0 - setmaptile 8, 18, 572, 0 - setmaptile 7, 19, 579, 1 - setmaptile 8, 19, 580, 1 - setmaptile 13, 3, 571, 0 - setmaptile 14, 3, 572, 0 - setmaptile 13, 4, 579, 1 - setmaptile 14, 4, 580, 1 - setmaptile 13, 9, 571, 0 - setmaptile 14, 9, 572, 0 - setmaptile 13, 10, 579, 1 - setmaptile 14, 10, 580, 1 - setmaptile 13, 15, 571, 0 - setmaptile 14, 15, 572, 0 - setmaptile 13, 16, 579, 1 - setmaptile 14, 16, 580, 1 - setmaptile 3, 13, 573, 1 - setmaptile 3, 14, 581, 1 - setmaptile 6, 7, 573, 1 - setmaptile 6, 8, 581, 1 - setmaptile 9, 16, 573, 1 - setmaptile 9, 17, 581, 1 - setmaptile 12, 4, 573, 1 - setmaptile 12, 5, 581, 1 - setmaptile 12, 10, 573, 1 - setmaptile 12, 11, 581, 1 - setmaptile 1, 15, 584, 0 - setmaptile 2, 15, 585, 0 - setmaptile 1, 16, 592, 0 - setmaptile 2, 16, 593, 0 - setmaptile 4, 6, 584, 0 - setmaptile 5, 6, 585, 0 - setmaptile 4, 7, 592, 0 - setmaptile 5, 7, 593, 0 - setmaptile 7, 12, 584, 0 - setmaptile 8, 12, 585, 0 - setmaptile 7, 13, 592, 0 - setmaptile 8, 13, 593, 0 - setmaptile 10, 12, 584, 0 - setmaptile 11, 12, 585, 0 - setmaptile 10, 13, 592, 0 - setmaptile 11, 13, 593, 0 - setmaptile 10, 18, 584, 0 - setmaptile 11, 18, 585, 0 - setmaptile 10, 19, 592, 0 - setmaptile 11, 19, 593, 0 - setmaptile 3, 4, 586, 1 - setmaptile 3, 5, 594, 0 - setmaptile 6, 10, 586, 1 - setmaptile 6, 11, 594, 0 - setmaptile 6, 13, 586, 1 - setmaptile 6, 14, 594, 0 - setmaptile 6, 16, 586, 1 - setmaptile 6, 17, 594, 0 - setmaptile 9, 4, 586, 1 - setmaptile 9, 5, 594, 0 - setmaptile 9, 7, 586, 1 - setmaptile 9, 8, 594, 0 - setmaptile 12, 13, 586, 1 - setmaptile 12, 14, 594, 0 - setmaptile 12, 16, 586, 1 - setmaptile 12, 17, 594, 0 + setmetatile 1, 6, 571, 0 + setmetatile 2, 6, 572, 0 + setmetatile 1, 7, 579, 1 + setmetatile 2, 7, 580, 1 + setmetatile 4, 9, 571, 0 + setmetatile 5, 9, 572, 0 + setmetatile 4, 10, 579, 1 + setmetatile 5, 10, 580, 1 + setmetatile 4, 18, 571, 0 + setmetatile 5, 18, 572, 0 + setmetatile 4, 19, 579, 1 + setmetatile 5, 19, 580, 1 + setmetatile 7, 3, 571, 0 + setmetatile 8, 3, 572, 0 + setmetatile 7, 4, 579, 1 + setmetatile 8, 4, 580, 1 + setmetatile 7, 9, 571, 0 + setmetatile 8, 9, 572, 0 + setmetatile 7, 10, 579, 1 + setmetatile 8, 10, 580, 1 + setmetatile 7, 18, 571, 0 + setmetatile 8, 18, 572, 0 + setmetatile 7, 19, 579, 1 + setmetatile 8, 19, 580, 1 + setmetatile 13, 3, 571, 0 + setmetatile 14, 3, 572, 0 + setmetatile 13, 4, 579, 1 + setmetatile 14, 4, 580, 1 + setmetatile 13, 9, 571, 0 + setmetatile 14, 9, 572, 0 + setmetatile 13, 10, 579, 1 + setmetatile 14, 10, 580, 1 + setmetatile 13, 15, 571, 0 + setmetatile 14, 15, 572, 0 + setmetatile 13, 16, 579, 1 + setmetatile 14, 16, 580, 1 + setmetatile 3, 13, 573, 1 + setmetatile 3, 14, 581, 1 + setmetatile 6, 7, 573, 1 + setmetatile 6, 8, 581, 1 + setmetatile 9, 16, 573, 1 + setmetatile 9, 17, 581, 1 + setmetatile 12, 4, 573, 1 + setmetatile 12, 5, 581, 1 + setmetatile 12, 10, 573, 1 + setmetatile 12, 11, 581, 1 + setmetatile 1, 15, 584, 0 + setmetatile 2, 15, 585, 0 + setmetatile 1, 16, 592, 0 + setmetatile 2, 16, 593, 0 + setmetatile 4, 6, 584, 0 + setmetatile 5, 6, 585, 0 + setmetatile 4, 7, 592, 0 + setmetatile 5, 7, 593, 0 + setmetatile 7, 12, 584, 0 + setmetatile 8, 12, 585, 0 + setmetatile 7, 13, 592, 0 + setmetatile 8, 13, 593, 0 + setmetatile 10, 12, 584, 0 + setmetatile 11, 12, 585, 0 + setmetatile 10, 13, 592, 0 + setmetatile 11, 13, 593, 0 + setmetatile 10, 18, 584, 0 + setmetatile 11, 18, 585, 0 + setmetatile 10, 19, 592, 0 + setmetatile 11, 19, 593, 0 + setmetatile 3, 4, 586, 1 + setmetatile 3, 5, 594, 0 + setmetatile 6, 10, 586, 1 + setmetatile 6, 11, 594, 0 + setmetatile 6, 13, 586, 1 + setmetatile 6, 14, 594, 0 + setmetatile 6, 16, 586, 1 + setmetatile 6, 17, 594, 0 + setmetatile 9, 4, 586, 1 + setmetatile 9, 5, 594, 0 + setmetatile 9, 7, 586, 1 + setmetatile 9, 8, 594, 0 + setmetatile 12, 13, 586, 1 + setmetatile 12, 14, 594, 0 + setmetatile 12, 16, 586, 1 + setmetatile 12, 17, 594, 0 return Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 6756cd055..4ff925639 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -23,53 +23,53 @@ Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 - setmaptile 13, 17, 610, 0 - setmaptile 12, 16, 575, 1 + setmetatile 13, 17, 610, 0 + setmetatile 12, 16, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631A8:: @ 81631A8 - setmaptile 12, 13, 610, 0 - setmaptile 12, 11, 575, 1 + setmetatile 12, 13, 610, 0 + setmetatile 12, 11, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631BB:: @ 81631BB - setmaptile 7, 12, 610, 0 - setmaptile 5, 10, 575, 1 + setmetatile 7, 12, 610, 0 + setmetatile 5, 10, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631CE:: @ 81631CE - setmaptile 6, 6, 636, 0 - setmaptile 4, 4, 575, 1 + setmetatile 6, 6, 636, 0 + setmetatile 4, 4, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631E1:: @ 81631E1 - setmaptile 8, 4, 609, 0 - setmaptile 7, 5, 575, 1 + setmetatile 8, 4, 609, 0 + setmetatile 7, 5, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631F4:: @ 81631F4 - setmaptile 13, 17, 611, 0 - setmaptile 12, 16, 574, 1 + setmetatile 13, 17, 611, 0 + setmetatile 12, 16, 574, 1 return Route110_TrickHousePuzzle7_EventScript_163207:: @ 8163207 - setmaptile 12, 13, 609, 0 - setmaptile 12, 11, 574, 1 + setmetatile 12, 13, 609, 0 + setmetatile 12, 11, 574, 1 return Route110_TrickHousePuzzle7_EventScript_16321A:: @ 816321A - setmaptile 7, 12, 611, 0 - setmaptile 5, 10, 574, 1 + setmetatile 7, 12, 611, 0 + setmetatile 5, 10, 574, 1 return Route110_TrickHousePuzzle7_EventScript_16322D:: @ 816322D - setmaptile 6, 6, 635, 0 - setmaptile 4, 4, 574, 1 + setmetatile 6, 6, 635, 0 + setmetatile 4, 4, 574, 1 return Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 - setmaptile 8, 4, 608, 0 - setmaptile 7, 5, 574, 1 + setmetatile 8, 4, 608, 0 + setmetatile 7, 5, 574, 1 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 3e089e354..0a7e6befc 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -9,8 +9,8 @@ Route111_MapScript1_14FF9C:: @ 814FF9C end Route111_EventScript_14FFA6:: @ 814FFA6 - setmaptile 29, 86, 124, 1 - setmaptile 29, 87, 145, 1 + setmetatile 29, 86, 124, 1 + setmetatile 29, 87, 145, 1 return Route111_MapScript1_14FFB9:: @ 814FFB9 @@ -54,7 +54,7 @@ Route111_EventScript_150023:: @ 8150023 msgbox Route111_Text_16FA54, 5 compare RESULT, 0 goto_if_eq Route111_EventScript_15005F - giveitem ITEM_ROOT_FOSSIL + giveitem_std ITEM_ROOT_FOSSIL closemessage setflag FLAG_HIDE_ROOT_FOSSIL setflag FLAG_HIDE_CLAW_FOSSIL @@ -76,7 +76,7 @@ Route111_EventScript_150069:: @ 8150069 msgbox Route111_Text_16FAED, 5 compare RESULT, 0 goto_if_eq Route111_EventScript_1500A5 - giveitem ITEM_CLAW_FOSSIL + giveitem_std ITEM_CLAW_FOSSIL closemessage setflag FLAG_HIDE_CLAW_FOSSIL setflag FLAG_HIDE_ROOT_FOSSIL @@ -124,7 +124,7 @@ Route111_EventScript_1500C5:: @ 81500C5 checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 - giveitem ITEM_RAZZ_BERRY + giveitem_std ITEM_RAZZ_BERRY compare RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 9896af5ae..981971e41 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -16,7 +16,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 - giveitem ITEM_MACHO_BRACE + giveitem_std ITEM_MACHO_BRACE compare RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag FLAG_RECEIVED_MACHO_BRACE diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 2eb34cdf3..37fd0ed3f 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81505CC .byte 0 Route113_MapScript1_1505D7:: @ 81505D7 - tileeffect 1 + setstepcallback 1 end Route113_MapScript1_1505DA:: @ 81505DA diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 078ac1006..8d853b88d 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -22,7 +22,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 compare 0x40be, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 - giveitem ITEM_SOOT_SACK + giveitem_std ITEM_SOOT_SACK setvar 0x40be, 1 msgbox Route113_GlassWorkshop_Text_19E59B, 4 release @@ -68,7 +68,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 250 compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8009, 1 setvar 0x8008, 13 - getdecorname 0, 0x8008 + bufferdecorationname 0, 0x8008 setvar 0x800a, 6000 compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8009, 1 setvar 0x8008, 6 - getdecorname 0, 0x8008 + bufferdecorationname 0, 0x8008 setvar 0x800a, 8000 compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E Route113_GlassWorkshop_EventScript_163818:: @ 8163818 setvar 0x800a, 250 subvar 0x800a, 16456 - getnumberstring 0, 32778 + buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 subvar 0x800a, 16456 - getnumberstring 1, 32778 + buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -210,13 +210,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem 0x8008 + giveitem_std 0x8008 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration 0x8008 + givedecoration_std 0x8008 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -247,49 +247,49 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar 0x8009, 0 setvar 0x8008, 39 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar 0x8009, 0 setvar 0x8008, 40 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar 0x8009, 0 setvar 0x8008, 41 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar 0x8009, 0 setvar 0x8008, 43 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar 0x8009, 0 setvar 0x8008, 42 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar 0x8009, 1 setvar 0x8008, 13 - getdecorname 0, 13 + bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar 0x8009, 1 setvar 0x8008, 6 - getdecorname 0, 6 + bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 3d1da2014..302c162b0 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -11,7 +11,7 @@ Route114_EventScript_150733:: @ 8150733 random 5 addvar RESULT, 15 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 @@ -30,7 +30,7 @@ Route114_EventScript_150782:: @ 8150782 checkflag FLAG_RECEIVED_TM05 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem ITEM_TM05 + giveitem_std ITEM_TM05 compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_RECEIVED_TM05 @@ -47,9 +47,9 @@ Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer waitse - playpokecry SPECIES_POOCHYENA, 2 + playmoncry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index abf9ac883..1a1445fde 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -12,7 +12,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 checkflag FLAG_RECEIVED_TM28 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 - giveitem ITEM_TM28 + giveitem_std ITEM_TM28 compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag FLAG_RECEIVED_TM28 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 87b0f2cd6..f8ff5de73 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -14,9 +14,9 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE - givedecoration DECOR_LOTAD_DOLL + givedecoration_std DECOR_LOTAD_DOLL .else - givedecoration DECOR_SEEDOT_DOLL + givedecoration_std DECOR_SEEDOT_DOLL .endif compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 34c685196..9aadedb32 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -43,7 +43,7 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag FLAG_MET_DEVON_EMPLOYEE - giveitem ITEM_REPEAT_BALL + giveitem_std ITEM_REPEAT_BALL compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index bf34b5426..ca69e01c4 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -20,7 +20,7 @@ Route118_EventScript_150F34:: @ 8150F34 Route118_EventScript_150F5E:: @ 8150F5E msgbox Route118_Text_170F46, 4 - giveitem ITEM_GOOD_ROD + giveitem_std ITEM_GOOD_ROD setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_170F7E, 4 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index fb3d75660..aff1254a9 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -148,7 +148,7 @@ Route119_EventScript_151337:: @ 8151337 end Route119_EventScript_151352:: @ 8151352 - giveitem ITEM_HM02 + giveitem_std ITEM_HM02 setflag FLAG_RECEIVED_HM02 return diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc index 42cc89068..76763c68e 100644 --- a/data/scripts/maps/Route119_House.inc +++ b/data/scripts/maps/Route119_House.inc @@ -9,8 +9,8 @@ Route119_House_EventScript_163DE7:: @ 8163DE7 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox Route119_House_Text_19F406, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 4ee12fe93..991725b8c 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -55,14 +55,14 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage - givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 setflag FLAG_RECEIVED_CASTFORM msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 209291a3a..cd84f95af 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -59,15 +59,15 @@ Route120_MapScript1_151686:: @ 8151686 end Route120_EventScript_1516A2:: @ 81516A2 - setmaptile 7, 54, 124, 1 - setmaptile 7, 55, 145, 1 + setmetatile 7, 54, 124, 1 + setmetatile 7, 55, 145, 1 return Route120_EventScript_1516B5:: @ 81516B5 - setmaptile 13, 15, 663, 0 - setmaptile 12, 16, 671, 0 - setmaptile 12, 17, 161, 0 - setmaptile 13, 17, 161, 0 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 return Route120_EventScript_1516DA:: @ 81516DA @@ -160,7 +160,7 @@ Route120_EventScript_151808:: @ 8151808 end Route120_EventScript_151813:: @ 8151813 - giveitem 0x8004 + giveitem_std 0x8004 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -222,9 +222,9 @@ Route120_EventScript_15189D:: @ 815189D applymovement 30, Route120_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE @@ -238,22 +238,22 @@ Route120_EventScript_151908:: @ 8151908 applymovement 255, Route120_Movement_1A0841 waitmovement 0 msgbox Route120_Text_171A40, 4 - giveitem ITEM_DEVON_SCOPE + giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_171B0E, 4 closemessage applymovement 31, Route120_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject 31 waitfieldeffect 30 - setmaptile 13, 15, 663, 0 - setmaptile 12, 16, 671, 0 - setmaptile 12, 17, 161, 0 - setmaptile 13, 17, 161, 0 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 special DrawWholeMapView release end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 9f8753b76..431444dae 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -87,7 +87,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 end Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 - countpokemon + getpartysize compare RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 9ad0220bd..adfebfe08 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -16,7 +16,7 @@ Route123_EventScript_151C5D:: @ 8151C5D compare RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 - giveitem ITEM_TM19 + giveitem_std ITEM_TM19 compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag FLAG_RECEIVED_TM19 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index dab303345..6948bff87 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -16,7 +16,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 random 10 addvar RESULT, 20 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER @@ -24,7 +24,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 random 10 addvar RESULT, 20 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 @@ -78,7 +78,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 random 10 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D @@ -89,7 +89,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E checkflag FLAG_RECEIVED_SPELON_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_SPELON_BERRY + giveitem_std ITEM_SPELON_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_SPELON_BERRY @@ -100,7 +100,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F checkflag FLAG_RECEIVED_PAMTRE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_PAMTRE_BERRY + giveitem_std ITEM_PAMTRE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_PAMTRE_BERRY @@ -111,7 +111,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 checkflag FLAG_RECEIVED_WATMEL_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_WATMEL_BERRY + giveitem_std ITEM_WATMEL_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_WATMEL_BERRY @@ -122,7 +122,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 checkflag FLAG_RECEIVED_DURIN_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_DURIN_BERRY + giveitem_std ITEM_DURIN_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_DURIN_BERRY @@ -133,7 +133,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 checkflag FLAG_RECEIVED_BELUE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_BELUE_BERRY + giveitem_std ITEM_BELUE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_BELUE_BERRY diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 55f3141fd..4902d9f08 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -244,8 +244,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - getitemname 0, 0x8008 - getitemname 1, 0x8009 + bufferitemname 0, 0x8008 + bufferitemname 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -259,8 +259,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - removeitem 0x8008, 1 - giveitem 0x8009 + takeitem 0x8008, 1 + giveitem_std 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index b0e295db6..a81e73c3e 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -52,7 +52,7 @@ Route128_EventScript_15213F:: @ 815213F removeobject 5 removeobject 4 delay 100 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 waitfieldeffect 30 addobject 3 @@ -77,7 +77,7 @@ Route128_EventScript_15213F:: @ 815213F applymovement 3, Route128_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject 3 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 7e3a0e191..c45389b9f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -468,7 +468,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D compare 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 - giveitem ITEM_GREAT_BALL + giveitem_std ITEM_GREAT_BALL compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 77f2ee0a4..3371005c0 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -7,7 +7,7 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 checkflag FLAG_RECEIVED_HM01 goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 - giveitem ITEM_HM01 + giveitem_std ITEM_HM01 setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 097fee3fb..89d59258d 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -88,9 +88,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - getitemname 0, ITEM_ROOT_FOSSIL + bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - removeitem ITEM_ROOT_FOSSIL, 1 + takeitem ITEM_ROOT_FOSSIL, 1 setvar 0x40c4, 1 setvar 0x40c5, 1 release @@ -106,9 +106,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - getitemname 0, ITEM_CLAW_FOSSIL + bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - removeitem ITEM_CLAW_FOSSIL, 1 + takeitem ITEM_CLAW_FOSSIL, 1 setvar 0x40c4, 1 setvar 0x40c5, 2 release @@ -132,9 +132,9 @@ RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A end RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 - getspeciesname 1, SPECIES_LILEEP + bufferspeciesname 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT @@ -144,7 +144,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givepoke SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 @@ -152,9 +152,9 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 end RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 - getspeciesname 1, SPECIES_ANORITH + bufferspeciesname 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT @@ -164,7 +164,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givepoke SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 0e9786760..e2e70d4c0 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -48,7 +48,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 - giveitem ITEM_LETTER + giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 playfanfare 370 message RustboroCity_DevonCorp_3F_Text_183422 @@ -159,7 +159,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 - giveitem ITEM_EXP_SHARE + giveitem_std ITEM_EXP_SHARE compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag FLAG_RECEIVED_EXP_SHARE diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc index b6b8b41b1..a6ba54ce7 100644 --- a/data/scripts/maps/RustboroCity_Flat2_1F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc @@ -9,8 +9,8 @@ RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox RustboroCity_Flat2_1F_Text_185410, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 5be59b14e..3a2242c7a 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -11,7 +11,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 - giveitem ITEM_PREMIER_BALL + giveitem_std ITEM_PREMIER_BALL compare RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 427be433d..0dc403ec7 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -26,7 +26,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE end RustboroCity_Gym_EventScript_15793C:: @ 815793C - giveitem ITEM_TM39 + giveitem_std ITEM_TM39 compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM39 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 53a845648..0cad33204 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc index a5088175e..86d77c18e 100644 --- a/data/scripts/maps/RustboroCity_House3.inc +++ b/data/scripts/maps/RustboroCity_House3.inc @@ -13,8 +13,8 @@ RustboroCity_House3_EventScript_157DFF:: @ 8157DFF lock faceplayer waitse - playpokecry SPECIES_PIKACHU, 0 + playmoncry SPECIES_PIKACHU, 0 msgbox RustboroCity_House3_Text_18567D, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index 53b481832..a1c0ac31b 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F - sethealplace 6 + setrespawn 6 call RustboroCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar 0x800b, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 9fd77bd6b..21fdf3d3b 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -84,7 +84,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE compare FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 - giveitem ITEM_QUICK_CLAW + giveitem_std ITEM_QUICK_CLAW compare RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closemessage diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 04364b661..64fce8118 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -64,7 +64,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 call_if 1, RusturfTunnel_EventScript_15C8EB compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB - giveitem ITEM_HM04 + giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage @@ -300,9 +300,9 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox RusturfTunnel_Text_194188, 4 - waitpokecry + waitmoncry release end @@ -313,7 +313,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 - giveitem ITEM_DEVON_GOODS + giveitem_std ITEM_DEVON_GOODS closemessage applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 @@ -332,9 +332,9 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA message RusturfTunnel_Text_19434F waitmessage waitse - playpokecry SPECIES_WINGULL, 0 - waitbutton - waitpokecry + playmoncry SPECIES_WINGULL, 0 + waitbuttonpress + waitmoncry closemessage applymovement 5, RusturfTunnel_Movement_15CAB4 applymovement 7, RusturfTunnel_Movement_15CAC3 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 18cff8320..8e9a404a2 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -88,9 +88,9 @@ SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox SSTidalCorridor_Text_199388, 4 - waitpokecry + waitmoncry release end @@ -122,7 +122,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 end SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 - sethealplace 8 + setrespawn 8 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 @@ -132,7 +132,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 end SSTidalCorridor_EventScript_15FE17:: @ 815FE17 - sethealplace 4 + setrespawn 4 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 0a48ae453..0390177de 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -7,7 +7,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 checkflag FLAG_RECEIVED_TM49 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 - giveitem ITEM_TM49 + giveitem_std ITEM_TM49 compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag FLAG_RECEIVED_TM49 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 6a4d9af02..b31e8fc25 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -79,9 +79,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar RESULT, 0 .endif playse 209 - setfieldeffect 0, 16 - setfieldeffect 1, 42 - setfieldeffect 2, 0 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 42 + setfieldeffectargument 2, 0 dofieldeffect 54 waitfieldeffect 54 .ifdef SAPPHIRE diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index a0c6314cc..cd778202c 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -4,7 +4,7 @@ SealedChamber_InnerRoom_MapScripts:: @ 815F1E7 SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall braillemessage SealedChamber_InnerRoom_Braille_1C53C1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 checkflag FLAG_REGI_DOORS_OPENED goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 @@ -42,7 +42,7 @@ SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247 SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall braillemessage SealedChamber_InnerRoom_Braille_1C53F2 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -50,7 +50,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5414 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,7 +58,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5435 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -66,7 +66,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall braillemessage SealedChamber_InnerRoom_Braille_1C545C - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -74,7 +74,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5470 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -82,7 +82,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F lockall braillemessage SealedChamber_InnerRoom_Braille_1C549B - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 7add1e6f3..ad17819c2 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -19,18 +19,18 @@ SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 - setmaptile 9, 1, 553, 1 - setmaptile 10, 1, 553, 1 - setmaptile 11, 1, 553, 1 - setmaptile 9, 2, 565, 1 - setmaptile 10, 2, 565, 1 - setmaptile 11, 2, 565, 1 + setmetatile 9, 1, 553, 1 + setmetatile 10, 1, 553, 1 + setmetatile 11, 1, 553, 1 + setmetatile 9, 2, 565, 1 + setmetatile 10, 2, 565, 1 + setmetatile 11, 2, 565, 1 return SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall braillemessage SealedChamber_OuterRoom_Braille_1C534F - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -38,7 +38,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall braillemessage SealedChamber_OuterRoom_Braille_1C5359 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -46,7 +46,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5363 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -54,7 +54,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall braillemessage SealedChamber_OuterRoom_Braille_1C536D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -62,7 +62,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5377 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -70,7 +70,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5381 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -78,7 +78,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall braillemessage SealedChamber_OuterRoom_Braille_1C538B - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -86,7 +86,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall braillemessage SealedChamber_OuterRoom_Braille_1C5396 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -94,7 +94,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall braillemessage SealedChamber_OuterRoom_Braille_1C539E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -102,7 +102,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall braillemessage SealedChamber_OuterRoom_Braille_1C53A9 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -112,7 +112,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 checkflag FLAG_SYS_BRAILLE_DIG goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -125,7 +125,7 @@ SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall braillemessage SealedChamber_OuterRoom_Braille_1C53B1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc index 302bc3930..f72c3d76e 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ b/data/scripts/maps/SecretBase_YellowCave4.inc @@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 815F337 .byte 0 SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C - tileeffect 6 + setstepcallback 6 end SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index fcff20944..533c46850 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -37,9 +37,9 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 - removeitem ITEM_SHOAL_SALT, 4 - removeitem ITEM_SHOAL_SHELL, 4 - giveitem ITEM_SHELL_BELL + takeitem ITEM_SHOAL_SALT, 4 + takeitem ITEM_SHOAL_SHELL, 4 + giveitem_std ITEM_SHELL_BELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 43dfa8afa..b6aba9523 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -25,7 +25,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - setmaptile 31, 8, 856, 1 + setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end @@ -34,35 +34,35 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - setmaptile 14, 26, 856, 1 + setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 - setmaptile 41, 20, 857, 1 + setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B - setmaptile 41, 10, 857, 1 + setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 - setmaptile 6, 9, 857, 1 + setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 - setmaptile 16, 13, 857, 1 + setmetatile 16, 13, 857, 1 return ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 @@ -72,10 +72,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 41, 20, 859, 0 + setmetatile 41, 20, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 releaseall @@ -90,10 +90,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 41, 10, 859, 0 + setmetatile 41, 10, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 releaseall @@ -103,10 +103,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 6, 9, 859, 0 + setmetatile 6, 9, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 releaseall @@ -116,10 +116,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 16, 13, 859, 0 + setmetatile 16, 13, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 releaseall @@ -129,10 +129,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 31, 8, 858, 0 + setmetatile 31, 8, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_1 releaseall @@ -147,10 +147,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 14, 26, 858, 0 + setmetatile 14, 26, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_2 releaseall diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index adf7d5d9e..c7cb08a9b 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 - setmaptile 18, 2, 856, 1 + setmetatile 18, 2, 856, 1 return ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 @@ -19,10 +19,10 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B - setmaptile 18, 2, 858, 0 + setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_4 releaseall @@ -39,7 +39,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F checkflag FLAG_RECEIVED_FOCUS_BAND goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 - giveitem ITEM_FOCUS_BAND + giveitem_std ITEM_FOCUS_BAND compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag FLAG_RECEIVED_FOCUS_BAND diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index d6858bc15..efcad59d3 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 - setmaptile 11, 11, 856, 1 + setmetatile 11, 11, 856, 1 return ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 @@ -19,10 +19,10 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B - setmaptile 11, 11, 858, 0 + setmetatile 11, 11, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_3 releaseall diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index 3f388127b..bd87e8562 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -5,6 +5,6 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 .byte 0 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 - tileeffect 7 + setstepcallback 7 setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index f0b9a6f85..860f35b48 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -5,6 +5,6 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 .byte 0 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 - tileeffect 7 + setstepcallback 7 setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 37da10220..07a78d2c4 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -16,9 +16,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 faceplayer setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE waitse - playpokecry SPECIES_RAYQUAZA, 2 + playmoncry SPECIES_RAYQUAZA, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_RAYQUAZA setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index c163685b2..56fc0e59b 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -64,7 +64,7 @@ SlateportCity_Items1:: @ 814BAD0 SlateportCity_EventScript_14BAE0:: @ 814BAE0 lock faceplayer - getfirstpartypokename 0 + bufferleadmonspeciesname 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 @@ -388,7 +388,7 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2 faceplayer message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations1 + pokemartdecoration SlateportCity_Decorations1 msgbox SlateportCity_Text_1A0C02, 4 release end @@ -414,7 +414,7 @@ SlateportCity_EventScript_14BE20:: @ 814BE20 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations2 + pokemartdecoration SlateportCity_Decorations2 msgbox SlateportCity_Text_1A0C02, 4 release end @@ -446,7 +446,7 @@ SlateportCity_Decorations2:: @ 814BE40 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations3 + pokemartdecoration SlateportCity_Decorations3 msgbox SlateportCity_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 220ca3374..0a6f40c75 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -15,7 +15,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E checkflag FLAG_RECEIVED_TM41 goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 - giveitem ITEM_TM41 + giveitem_std ITEM_TM41 compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag FLAG_RECEIVED_TM41 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 5a00f4830..c4a44d9c9 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -23,14 +23,14 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, SlateportCity_ContestLobby_Movement_1554DC @@ -106,7 +106,7 @@ SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 - giveitem ITEM_POKEBLOCK_CASE + giveitem_std ITEM_POKEBLOCK_CASE setflag FLAG_RECEIVED_POKEBLOCK_CASE releaseall end @@ -129,7 +129,7 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536 @ 815553F lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index ae19d0326..304013b08 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -222,13 +222,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 9, 8 + hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY setvar 0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E return @@ -335,10 +335,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem ITEM_DEEP_SEA_TOOTH + giveitem_std ITEM_DEEP_SEA_TOOTH compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - removeitem ITEM_SCANNER, 1 + takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 @@ -348,10 +348,10 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem ITEM_DEEP_SEA_SCALE + giveitem_std ITEM_DEEP_SEA_SCALE compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - removeitem ITEM_SCANNER, 1 + takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 0cb7b397e..9e002e61e 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -164,7 +164,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 - giveitem ITEM_TM46 + giveitem_std ITEM_TM46 compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag FLAG_RECEIVED_TM46 diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index 9aa326f70..ac4e8f240 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 - sethealplace 4 + setrespawn 4 call SlateportCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE setvar 0x800b, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 7f3c331bd..593e18fee 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 - getfirstpartypokename 0 + bufferleadmonspeciesname 0 switch 0x4001 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 @@ -89,7 +89,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_RED_SCARF - giveitem ITEM_RED_SCARF + giveitem_std ITEM_RED_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4 release end @@ -100,7 +100,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_BLUE_SCARF - giveitem ITEM_BLUE_SCARF + giveitem_std ITEM_BLUE_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4 release end @@ -111,7 +111,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_PINK_SCARF - giveitem ITEM_PINK_SCARF + giveitem_std ITEM_PINK_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4 release end @@ -122,7 +122,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_GREEN_SCARF - giveitem ITEM_GREEN_SCARF + giveitem_std ITEM_GREEN_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4 release end @@ -133,7 +133,7 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_YELLOW_SCARF - giveitem ITEM_YELLOW_SCARF + giveitem_std ITEM_YELLOW_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4 release end @@ -212,7 +212,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 - giveitem ITEM_SOOTHE_BELL + giveitem_std ITEM_SOOTHE_BELL compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag FLAG_RECEIVED_SOOTHE_BELL @@ -236,9 +236,9 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4 - waitpokecry + waitmoncry release end @@ -246,9 +246,9 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox SlateportCity_PokemonFanClub_Text_17E164, 4 - waitpokecry + waitmoncry release end @@ -256,8 +256,8 @@ SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox SlateportCity_PokemonFanClub_Text_17E178, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 748dbe898..f4842bd40 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -13,7 +13,7 @@ SootopolisCity_MapScript1_14D08D:: @ 814D08D SootopolisCity_EventScript_14D0A0:: @ 814D0A0 setobjectxyperm 3, 31, 18 - setmaptile 31, 32, 592, 1 + setmetatile 31, 32, 592, 1 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 @@ -22,15 +22,15 @@ SootopolisCity_EventScript_14D0B1:: @ 814D0B1 return SootopolisCity_EventScript_14D0BB:: @ 814D0BB - setmaptile 9, 6, 584, 1 - setmaptile 9, 17, 584, 1 - setmaptile 9, 26, 584, 1 - setmaptile 44, 17, 584, 1 - setmaptile 8, 35, 584, 1 - setmaptile 53, 28, 584, 1 - setmaptile 45, 6, 584, 1 - setmaptile 48, 25, 584, 1 - setmaptile 31, 32, 592, 1 + setmetatile 9, 6, 584, 1 + setmetatile 9, 17, 584, 1 + setmetatile 9, 26, 584, 1 + setmetatile 44, 17, 584, 1 + setmetatile 8, 35, 584, 1 + setmetatile 53, 28, 584, 1 + setmetatile 45, 6, 584, 1 + setmetatile 48, 25, 584, 1 + setmetatile 31, 32, 592, 1 return SootopolisCity_MapScript1_14D10D:: @ 814D10D @@ -98,7 +98,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F random 10 addvar RESULT, 20 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS @@ -111,7 +111,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F end SootopolisCity_EventScript_14D1FF:: @ 814D1FF - giveitem ITEM_FIGY_BERRY + giveitem_std ITEM_FIGY_BERRY compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 @@ -119,7 +119,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF end SootopolisCity_EventScript_14D220:: @ 814D220 - giveitem ITEM_IAPAPA_BERRY + giveitem_std ITEM_IAPAPA_BERRY compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 @@ -461,7 +461,7 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject LAST_TALKED diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 6f99ba8a5..65ed13d87 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -10,7 +10,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C end SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 - tileeffect 4 + setstepcallback 4 end SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 @@ -25,16 +25,16 @@ SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 compare 0x4022, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 - setmaptile 8, 4, 519, 0 - setmaptile 8, 5, 519, 0 + setmetatile 8, 4, 519, 0 + setmetatile 8, 5, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61 - setmaptile 8, 10, 519, 0 - setmaptile 8, 11, 519, 0 + setmetatile 8, 10, 519, 0 + setmetatile 8, 11, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73 - setmaptile 8, 15, 519, 0 - setmaptile 8, 16, 519, 0 + setmetatile 8, 15, 519, 0 + setmetatile 8, 16, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 return @@ -108,7 +108,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 - giveitem ITEM_TM03 + giveitem_std ITEM_TM03 compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 9a7b63c82..074c9a179 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -7,7 +7,7 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B checkflag FLAG_RECEIVED_TM31 goto_if_eq SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 - giveitem ITEM_TM31 + giveitem_std ITEM_TM31 setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release @@ -22,8 +22,8 @@ SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 lock faceplayer waitse - playpokecry SPECIES_KECLEON, 0 + playmoncry SPECIES_KECLEON, 0 msgbox SootopolisCity_House1_Text_18FA50, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc index c192a0340..b552cc6d6 100644 --- a/data/scripts/maps/SootopolisCity_House4.inc +++ b/data/scripts/maps/SootopolisCity_House4.inc @@ -13,8 +13,8 @@ SootopolisCity_House4_EventScript_15B35F:: @ 815B35F lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox SootopolisCity_House4_Text_18FDD8, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 1adf05991..fb91202f3 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -10,7 +10,7 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 compare RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 - givedecoration DECOR_WAILMER_DOLL + givedecoration_std DECOR_WAILMER_DOLL compare RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag FLAG_RECEIVED_WAILMER_DOLL @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD end SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 - getdecorname 1, DECOR_WAILMER_DOLL + bufferdecorationname 1, DECOR_WAILMER_DOLL msgbox SootopolisCity_House6_Text_1A0CEF, 4 msgbox SootopolisCity_House6_Text_18FF28, 4 release diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index df536004e..bdff79375 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -38,7 +38,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 - giveitem ITEM_ELIXIR + giveitem_std ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closemessage @@ -87,7 +87,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 - giveitem ITEM_ELIXIR + giveitem_std ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closemessage diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 8bbb06575..7b87bc7fc 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 - sethealplace 10 + setrespawn 10 end @ 815B19A setvar 0x800B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 81c50559e..f62becf08 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -17,7 +17,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 - hideobject 1, 26, 9 + hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 0a9ca6b89..ea2f852f4 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -54,9 +54,9 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 waitmovement 0 delay 50 waitse - playpokecry SPECIES_LATIAS_OR_LATIOS, 0 + playmoncry SPECIES_LATIAS_OR_LATIOS, 0 delay 30 - waitpokecry + waitmoncry addobject 2 delay 30 applymovement 127, SouthernIsland_Interior_Movement_160C16 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 665cbf4af..d991a7096 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -20,18 +20,18 @@ Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 - setmaptile 5, 3, 542, 1 - setmaptile 6, 3, 542, 1 - setmaptile 7, 3, 542, 1 - setmaptile 8, 3, 542, 1 - setmaptile 5, 4, 552, 0 - setmaptile 6, 4, 552, 0 - setmaptile 7, 4, 552, 0 - setmaptile 8, 4, 552, 0 - setmaptile 5, 5, 552, 0 - setmaptile 6, 5, 552, 0 - setmaptile 7, 5, 552, 0 - setmaptile 8, 5, 552, 0 + setmetatile 5, 3, 542, 1 + setmetatile 6, 3, 542, 1 + setmetatile 7, 3, 542, 1 + setmetatile 8, 3, 542, 1 + setmetatile 5, 4, 552, 0 + setmetatile 6, 4, 552, 0 + setmetatile 7, 4, 552, 0 + setmetatile 8, 4, 552, 0 + setmetatile 5, 5, 552, 0 + setmetatile 6, 5, 552, 0 + setmetatile 7, 5, 552, 0 + setmetatile 8, 5, 552, 0 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 733a060c3..cb5c713ee 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -21,7 +21,7 @@ Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall braillemessage Underwater_SealedChamber_Braille_1C533D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 213a3609a..1e0f14728 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A end LinkContestRoom1_EventScript_15F625:: @ 815F625 - hideobject 255, 0, 9 + hideobjectat 255, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_15F919 end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 9726038d4..3694f089d 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -23,14 +23,14 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35 @@ -104,7 +104,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 checkflag FLAG_RECEIVED_TM45 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 - giveitem ITEM_TM45 + giveitem_std ITEM_TM45 compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag FLAG_RECEIVED_TM45 @@ -123,7 +123,7 @@ VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80 VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89 lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index 1cfa785d3..ed60ec1c7 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -56,8 +56,8 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 lock faceplayer waitse - playpokecry SPECIES_PIKACHU, 0 + playmoncry SPECIES_PIKACHU, 0 msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index a0b1f87de..598c3f60b 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F - sethealplace 18 + setrespawn 18 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B end @@ -12,7 +12,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 933de6769..3ccfbeb29 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -233,7 +233,7 @@ choose_story: setvar 0x8008, 1 special ScrSpecial_StorytellerDisplayStory waitmessage - waitbutton + waitbuttonpress specialvar RESULT, ScrSpecial_StorytellerUpdateStat compare RESULT, FALSE goto_if_eq no_stat_update diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index a553ae379..ea8128ee3 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -277,7 +277,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D checkflag FLAG_RECEIVED_AMULET_COIN goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 - giveitem ITEM_AMULET_COIN + giveitem_std ITEM_AMULET_COIN compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 @@ -313,9 +313,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6 lock faceplayer waitse - playpokecry SPECIES_MACHOKE, 0 + playmoncry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, 4 - waitpokecry + waitmoncry release end @@ -324,9 +324,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 lock faceplayer waitse - playpokecry SPECIES_MACHOKE, 0 + playmoncry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172831, 4 - waitpokecry + waitmoncry release end @@ -383,7 +383,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 - giveitem ITEM_SS_TICKET + giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closemessage compare 0x8008, 0 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 6934ffe57..42e73e17c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -106,7 +106,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 - giveitem ITEM_PECHA_BERRY + giveitem_std ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto FallarborTown_ContestLobby_EventScript_1B76EF end @@ -174,7 +174,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800 msgbox FallarborTown_ContestLobby_Text_1B74B4, 4 - giveitem ITEM_PECHA_BERRY + giveitem_std ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR msgbox FallarborTown_ContestLobby_Text_1B753A, 4 release diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 385f93d22..892630ac8 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -27,7 +27,7 @@ gUnknown_081C3448:: @ 81C3448 playse 73 message UnknownString_81C34E4 waitmessage - waitbutton + waitbuttonpress releaseall goto EventScript_1C341B @@ -36,7 +36,7 @@ gUnknown_081C3459:: @ 81C3459 playse 73 message UnknownString_81C3514 waitmessage - waitbutton + waitbuttonpress releaseall goto EventScript_1C341B @@ -62,13 +62,13 @@ EventScript_1C348E: EventScript_1C34A0: message UnknownString_81C35A9 waitmessage - waitbutton + waitbuttonpress releaseall end EventScript_1C34A9: message UnknownString_81C3583 waitmessage - waitbutton + waitbuttonpress releaseall end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index f5506bfec..deb30187f 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -9,7 +9,7 @@ Route111_EventScript_1A3858:: @ 81A3858 end Route111_EventScript_1A3877:: @ 81A3877 - giveitem ITEM_TM43 + giveitem_std ITEM_TM43 compare RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index a74eba551..cf5fb26c5 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -58,7 +58,7 @@ EventScript_1A6F0B: EventScript_1A6F21: special DoTVShow waitmessage - waitbutton + waitbuttonpress compare RESULT, 1 goto_if 5, EventScript_1A6F21 goto EventScript_1A6F37 @@ -81,14 +81,14 @@ EventScript_1A6F50: compare RESULT, 0 goto_if_eq EventScript_1A6EBB waitmessage - waitbutton + waitbuttonpress goto EventScript_1A6F37 end EventScript_1A6F66: special DoTVShowInSearchOfTrainers waitmessage - waitbutton + waitbuttonpress compare RESULT, 0 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F37 diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 94366cc41..5c9fdf0db 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -208,10 +208,10 @@ gUnknown_083CAF70:: @ 83CAF70 .4byte ContestString_Smart .4byte ContestString_Tough -gUnknown_083CAF84:: @ 83CAF84 +gText_Contest_WhichMoveWillBePlayed:: @ 83CAF84 .string "Appeal no. {NAME_END}!\nWhich move will be played?$" -gUnknown_083CAFAE:: @ 83CAFAE +gText_Contest_ButItCantParticipate:: @ 83CAFAE .string "Appeal no. {NAME_END}!\nBut it can’t participate!$" gUnknown_083CAFD7:: @ 83CAFD7 @@ -280,7 +280,7 @@ ContestString_StandOutDidnt: .string "{STR_VAR_1} hasn’t made\nits appeal.{PAUSE_UNTIL_PRESS}$" .align 2 -gUnknown_083CB2F0:: @ 83CB2F0 +gContestStandOutStrings:: @ 83CB2F0 .4byte ContestString_StandOutNone .4byte ContestString_StandOutNotMuch .4byte ContestString_StandOutLittle @@ -450,19 +450,19 @@ ContestString_ScrambleOrder: .string "It scrambled up the\norder for the next turn.{PAUSE 60}$" gUnknown_083CBD52:: @ 83CBD52 -ContestString_JudgeExpectantly2: +ContestString_JudgeExpectantly2:: .string "The JUDGE looked at\n{STR_VAR_1} expectantly.{PAUSE 60}$" gUnknown_083CBD79:: @ 83CBD79 -ContestString_WentOverWell: +ContestString_WentOverWell:: .string "The appeal combo went\nover well.{PAUSE 60}$" gUnknown_083CBD9D:: @ 83CBD9D -ContestString_WentOverVeryWell: +ContestString_WentOverVeryWell:: .string "The appeal combo went\nover very well.{PAUSE 60}$" gUnknown_083CBDC6:: @ 83CBDC6 -ContestString_AppealComboExcellently: +ContestString_AppealComboExcellently:: .string "The appeal combo went\nover excellently.{PAUSE 60}$" ContestString_AvertGaze: .string "{STR_VAR_1} managed to\navert its gaze.{PAUSE 60}$" @@ -504,33 +504,33 @@ ContestString_Unaffected: .string "{STR_VAR_1} was\nunaffected.{PAUSE 60}$" gUnknown_083CC075:: @ 83CC075 -ContestString_DissapointedRepeat: +ContestString_DissapointedRepeat:: .string "{STR_VAR_1} disappointed\nby repeating an appeal.{PAUSE 60}$" gUnknown_083CC0A0:: @ 83CC0A0 -ContestString_WentOverGreat: +ContestString_WentOverGreat:: .string "{STR_VAR_1}’s {STR_VAR_3}\nwent over great.{PAUSE 60}$" gUnknown_083CC0BC:: @ 83CC0BC -ContestString_DidntGoWell: +ContestString_DidntGoWell:: .string "{STR_VAR_1}’s {STR_VAR_3}\ndidn’t go over well here...{PAUSE 60}$" gUnknown_083CC0E3:: @ 83CC0E3 -ContestString_GotCrowdGoing: +ContestString_GotCrowdGoing:: .string "{STR_VAR_1}’s {STR_VAR_3}\ngot the crowd going.{PAUSE 60}$" gUnknown_083CC103:: @ 83CC103 -ContestString_CantAppealNextTurn: +ContestString_CantAppealNextTurn:: .string "{STR_VAR_1} can’t appeal\nnext turn...{PAUSE 60}$" -ContestString_AttractedAttention: +ContestString_AttractedAttention:: .string "It attracted the crowd’s\nattention.{PAUSE 60}$" gUnknown_083CC14A:: @ 83CC14A -ContestString_CrowdWatches: +ContestString_CrowdWatches:: .string "The crowd continues to\nwatch {STR_VAR_3}.{PAUSE 60}$" gUnknown_083CC16E:: @ 83CC16E -ContestString_Ignored2: +ContestString_Ignored2:: .string "{STR_VAR_1}’s\n{STR_VAR_2} is ignored.{PAUSE 60}$" .align 2 @@ -598,19 +598,19 @@ gUnknown_083CC188:: @ 83CC188 .4byte ContestString_Unaffected .4byte ContestString_AttractedAttention -gUnknown_083CC280:: @ 83CC280 +gText_Contest_Shyness:: @ 83CC280 .string "shyness$" -gUnknown_083CC288:: @ 83CC288 +gText_Contest_Anxiety:: @ 83CC288 .string "anxiety$" -gUnknown_083CC290:: @ 83CC290 +gText_Contest_Laziness:: @ 83CC290 .string "laziness$" -gUnknown_083CC299:: @ 83CC299 +gText_Contest_Hesitancy:: @ 83CC299 .string "hesitancy$" -gUnknown_083CC2A3:: @ 83CC2A3 +gText_Contest_Fear:: @ 83CC2A3 .string "fear$" ContestString_Coolness: @@ -625,7 +625,7 @@ ContestString_Toughness: .string "toughness$" .align 2 -gUnknown_083CC2D8:: @ 83CC2D8 +gContestCategoryStrings:: @ 83CC2D8 .4byte ContestString_Coolness .4byte ContestString_Beauty2 .4byte ContestString_Cuteness |