diff options
Diffstat (limited to 'data/scripts/maps')
36 files changed, 60 insertions, 60 deletions
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 7cdf3dd6a..596f2c77f 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -118,7 +118,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 - giveitem_std ITEM_TM08 + giveitem_std ITEM_TM08_BULK_UP 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 84334068e..45d389b28 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -254,7 +254,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D call DewfordTown_Hall_EventScript_1A0102 goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 - giveitem_std ITEM_TM36 + giveitem_std ITEM_TM36_SLUDGE_BOMB compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag FLAG_RECEIVED_TM36 diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index f62a2da37..f16b6e828 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -22,7 +22,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA compare RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 - giveitem_std ITEM_TM27 + giveitem_std ITEM_TM27_RETURN compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar VAR_SPECIAL_4, 280 diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 94df378f8..c0de6bfee 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -35,7 +35,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E - giveitem_std ITEM_TM40 + giveitem_std ITEM_TM40_AERIAL_ACE compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index 107c3708c..365646d81 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -19,7 +19,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 switch RESULT case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 - giveitem_std ITEM_TM10 + giveitem_std ITEM_TM10_HIDDEN_POWER compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM10 diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 7419b5866..b9d89f93c 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -6,7 +6,7 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 faceplayer goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 - giveitem_std ITEM_HM05 + giveitem_std ITEM_HM05_FLASH setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 9c69e649e..d33813680 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_std ITEM_TM47 + giveitem_std ITEM_TM47_STEEL_WING compare RESULT, 0 call_if_eq GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index c0604400e..27655127a 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -83,7 +83,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 end LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 - giveitem_std ITEM_TM50 + giveitem_std ITEM_TM50_OVERHEAT compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc index d922d9181..907b79847 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc @@ -25,10 +25,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019 .align 2 LilycoveCity_DepartmentStore_4F_Items1:: @ 815A030 - .2byte ITEM_TM38 - .2byte ITEM_TM25 - .2byte ITEM_TM14 - .2byte ITEM_TM15 + .2byte ITEM_TM38_FIRE_BLAST + .2byte ITEM_TM25_THUNDER + .2byte ITEM_TM14_BLIZZARD + .2byte ITEM_TM15_HYPER_BEAM .2byte ITEM_NONE release end @@ -45,10 +45,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C .align 2 LilycoveCity_DepartmentStore_4F_Items2:: @ 815A054 - .2byte ITEM_TM17 - .2byte ITEM_TM20 - .2byte ITEM_TM33 - .2byte ITEM_TM16 + .2byte ITEM_TM17_PROTECT + .2byte ITEM_TM20_SAFEGUARD + .2byte ITEM_TM33_REFLECT + .2byte ITEM_TM16_LIGHT_SCREEN .2byte ITEM_NONE release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index 0572c23cc..797c8f203 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -6,7 +6,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 faceplayer goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 - giveitem_std ITEM_TM44 + giveitem_std ITEM_TM44_REST compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM44 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 03974ddae..852f24f2a 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -298,7 +298,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 - giveitem_std ITEM_TM24 + giveitem_std ITEM_TM24_THUNDERBOLT compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag FLAG_RECEIVED_TM24 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 2b784aeb9..b9f8e5ad1 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar VAR_TEMP_1, 1 - bufferitemname 0, ITEM_TM32 + bufferitemname 0, ITEM_TM32_DOUBLE_TEAM goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar VAR_TEMP_1, 2 - bufferitemname 0, ITEM_TM29 + bufferitemname 0, ITEM_TM29_PSYCHIC goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar VAR_TEMP_1, 3 - bufferitemname 0, ITEM_TM35 + bufferitemname 0, ITEM_TM35_FLAMETHROWER goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar VAR_TEMP_1, 4 - bufferitemname 0, ITEM_TM24 + bufferitemname 0, ITEM_TM24_THUNDERBOLT goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar VAR_TEMP_1, 5 - bufferitemname 0, ITEM_TM13 + bufferitemname 0, ITEM_TM13_ICE_BEAM goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC @@ -291,11 +291,11 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1500 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM32, 1 + checkitemspace ITEM_TM32_DOUBLE_TEAM, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 1500 - giveitem ITEM_TM32, 1 + giveitem ITEM_TM32_DOUBLE_TEAM, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -306,11 +306,11 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 3500 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM29, 1 + checkitemspace ITEM_TM29_PSYCHIC, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 3500 - giveitem ITEM_TM29, 1 + giveitem ITEM_TM29_PSYCHIC, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -321,11 +321,11 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM35, 1 + checkitemspace ITEM_TM35_FLAMETHROWER, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - giveitem ITEM_TM35, 1 + giveitem ITEM_TM35_FLAMETHROWER, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -336,11 +336,11 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM24, 1 + checkitemspace ITEM_TM24_THUNDERBOLT, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - giveitem ITEM_TM24, 1 + giveitem ITEM_TM24_THUNDERBOLT, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -351,11 +351,11 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E - checkitemspace ITEM_TM13, 1 + checkitemspace ITEM_TM13_ICE_BEAM, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - giveitem ITEM_TM13, 1 + giveitem ITEM_TM13_ICE_BEAM, 1 updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 1dc7fc0c7..d9b8aced7 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -93,7 +93,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB end MauvilleCity_Gym_EventScript_15661D:: @ 815661D - giveitem_std ITEM_TM34 + giveitem_std ITEM_TM34_SHOCK_WAVE 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 eb21a49e9..4caaef545 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -6,7 +6,7 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD faceplayer goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 - giveitem_std ITEM_HM06 + giveitem_std ITEM_HM06_ROCK_SMASH setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 341962431..0ae02fba4 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -67,7 +67,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 end MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 - giveitem_std ITEM_TM04 + giveitem_std ITEM_TM04_CALM_MIND compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index d9ad70f70..0f1aace1d 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -38,7 +38,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 - giveitem_std ITEM_HM08 + giveitem_std ITEM_HM08_DIVE setflag FLAG_RECEIVED_HM08 setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 @@ -123,6 +123,6 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 end MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 - giveitem_std ITEM_HM08, 1, 1 + giveitem_std ITEM_HM08_DIVE, 1, 1 setflag FLAG_RECEIVED_HM08 end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index 8ad949bf2..110bdcbe6 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -41,7 +41,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 - giveitem_std ITEM_TM27 + giveitem_std ITEM_TM27_RETURN compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -57,7 +57,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 - giveitem_std ITEM_TM21 + giveitem_std ITEM_TM21_FRUSTRATION compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1199b3571..1dc1a77ec 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -402,7 +402,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 end PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C - giveitem_std ITEM_TM42 + giveitem_std ITEM_TM42_FACADE compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM42 diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index d642d70ed..1a1605817 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -20,7 +20,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 - giveitem_std ITEM_HM03 + giveitem_std ITEM_HM03_SURF setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a3824efcf..2d44d4dfd 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -102,7 +102,7 @@ Route104_EventScript_14EF93:: @ 814EF93 faceplayer goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 - giveitem_std ITEM_TM09 + giveitem_std ITEM_TM09_BULLET_SEED compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_TM09 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 020c61258..2c2215a42 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 - giveitem_std ITEM_TM12 + giveitem_std ITEM_TM12_TAUNT compare RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 527f09d27..3fceeb8d1 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -401,7 +401,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 end Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E - giveitem_std ITEM_TM12 + giveitem_std ITEM_TM12_TAUNT compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 30ab8c572..54a4ee59a 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -28,7 +28,7 @@ Route114_EventScript_150782:: @ 8150782 faceplayer goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem_std ITEM_TM05 + giveitem_std ITEM_TM05_ROAR compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_RECEIVED_TM05 diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index b191db5f6..c93584561 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -11,7 +11,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 faceplayer goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 - giveitem_std ITEM_TM28 + giveitem_std ITEM_TM28_DIG compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag FLAG_RECEIVED_TM28 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 4b9f3ce5f..30eed9cc0 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -147,7 +147,7 @@ Route119_EventScript_151337:: @ 8151337 end Route119_EventScript_151352:: @ 8151352 - giveitem_std ITEM_HM02 + giveitem_std ITEM_HM02_FLY setflag FLAG_RECEIVED_HM02 return diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 5f77ea023..d954bec1a 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -15,7 +15,7 @@ Route123_EventScript_151C5D:: @ 8151C5D compare RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 - giveitem_std ITEM_TM19 + giveitem_std ITEM_TM19_GIGA_DRAIN compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag FLAG_RECEIVED_TM19 diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index e18a1e029..b43e0aafe 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -6,7 +6,7 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 faceplayer goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 - giveitem_std ITEM_HM01 + giveitem_std ITEM_HM01_CUT setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index bcd597541..307617e50 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -25,7 +25,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE end RustboroCity_Gym_EventScript_15793C:: @ 815793C - giveitem_std ITEM_TM39 + giveitem_std ITEM_TM39_ROCK_TOMB compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM39 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 7c715b6c2..06f2dfa82 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -63,7 +63,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 call_if_eq RusturfTunnel_EventScript_15C8EB compare VAR_TEMP_1, 3 call_if_eq RusturfTunnel_EventScript_15C8EB - giveitem_std ITEM_HM04 + giveitem_std ITEM_HM04_STRENGTH setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 58e7c3235..89372bd84 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -6,7 +6,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 faceplayer goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 - giveitem_std ITEM_TM49 + giveitem_std ITEM_TM49_SNATCH compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag FLAG_RECEIVED_TM49 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 4af912ed3..213fc3163 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -473,8 +473,8 @@ SlateportCity_EventScript_14BE9A:: @ 814BE9A .align 2 SlateportCity_Items2:: @ 814BEB4 - .2byte ITEM_TM10 - .2byte ITEM_TM43 + .2byte ITEM_TM10_HIDDEN_POWER + .2byte ITEM_TM43_SECRET_POWER .2byte ITEM_NONE release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 4151579a2..5f6a3c15d 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -14,7 +14,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E faceplayer goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 - giveitem_std ITEM_TM41 + giveitem_std ITEM_TM41_TORMENT compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag FLAG_RECEIVED_TM41 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index c8ece697d..45ca62167 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -163,7 +163,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 - giveitem_std ITEM_TM46 + giveitem_std ITEM_TM46_THIEF compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag FLAG_RECEIVED_TM46 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 44bcda12f..0ad6aa027 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -106,7 +106,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 - giveitem_std ITEM_TM03 + giveitem_std ITEM_TM03_WATER_PULSE 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 67be3738b..d1b842f7b 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -6,7 +6,7 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B faceplayer goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 - giveitem_std ITEM_TM31 + giveitem_std ITEM_TM31_BRICK_BREAK setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 85b524c99..3aef08e94 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -103,7 +103,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 faceplayer goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 - giveitem_std ITEM_TM45 + giveitem_std ITEM_TM45_ATTRACT compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag FLAG_RECEIVED_TM45 |