diff options
Diffstat (limited to 'data/scripts/berry_tree.inc')
| -rw-r--r-- | data/scripts/berry_tree.inc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 10734411f..1a72316bc 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,6 +1,6 @@ S_BerryTree:: @ 81A14DD - special EventObjectInteractionGetBerryTreeData - switch VAR_SPECIAL_4 + special ObjectEventInteractionGetBerryTreeData + switch VAR_0x8004 case 255, BerryTree_EventScript_1A1533 case 0, BerryTree_EventScript_1A153D case 1, BerryTree_EventScript_1A1595 @@ -21,8 +21,8 @@ BerryTree_EventScript_1A1533:: @ 81A1533 BerryTree_EventScript_1A153D:: @ 81A153D lock faceplayer - specialvar RESULT, PlayerHasBerries - compare RESULT, 1 + specialvar VAR_RESULT, PlayerHasBerries + compare VAR_RESULT, 1 goto_if_eq BerryTree_EventScript_1A1558 message Route102_Text_1A16B6 waitmessage @@ -32,9 +32,9 @@ BerryTree_EventScript_1A153D:: @ 81A153D BerryTree_EventScript_1A1558:: @ 81A1558 msgbox Route102_Text_1A16CD, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_1A1577 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_1A1593 end @@ -43,9 +43,9 @@ BerryTree_EventScript_1A1577:: @ 81A1577 closemessage special Berry_FadeAndGoToBerryBagMenu waitstate - compare ITEM_ID, 0 + compare VAR_ITEM_ID, 0 goto_if_eq BerryTree_EventScript_1A1593 - takeitem ITEM_ID, 1 + takeitem VAR_ITEM_ID, 1 call S_PlantBerryTree BerryTree_EventScript_1A1593:: @ 81A1593 release @@ -81,9 +81,9 @@ BerryTree_EventScript_1A15BC:: @ 81A15BC goto BerryTree_EventScript_1A165F BerryTree_EventScript_1A15CE:: @ 81A15CE - compare VAR_SPECIAL_5, 0 + compare VAR_0x8005, 0 goto_if_eq BerryTree_EventScript_1A15F2 - compare VAR_SPECIAL_5, 4 + compare VAR_0x8005, 4 goto_if_eq BerryTree_EventScript_1A15EB bufferstring 1, Route102_Text_1A17B7 return @@ -97,20 +97,20 @@ BerryTree_EventScript_1A15F2:: @ 81A15F2 return BerryTree_EventScript_1A15F9:: @ 81A15F9 - buffernumberstring 1, VAR_SPECIAL_6 + buffernumberstring 1, VAR_0x8006 lock faceplayer msgbox Route102_Text_1A17C0, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_1A161D - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_1A164B BerryTree_EventScript_1A161D:: @ 81A161D - special EventObjectInteractionPickBerryTree - compare VAR_SPECIAL_4, 0 + special ObjectEventInteractionPickBerryTree + compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_1A1642 - special EventObjectInteractionRemoveBerryTree + special ObjectEventInteractionRemoveBerryTree message Route102_Text_1A17FD playfanfare MUS_ME_KINOMI waitmessage @@ -138,31 +138,31 @@ BerryTree_EventScript_1A164B:: @ 81A164B S_PlantBerryTreeFromBag:: @ 81A1654 lockall - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData call S_PlantBerryTree releaseall end BerryTree_EventScript_1A165F:: @ 81A165F checkitem ITEM_WAILMER_PAIL, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq BerryTree_EventScript_1A168D msgbox Route102_Text_1A18E6, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq S_WaterBerryTree - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq BerryTree_EventScript_1A168D BerryTree_EventScript_1A168D:: @ 81A168D releaseall end S_WaterBerryTreeFromBag:: @ 81A168F - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData lockall S_WaterBerryTree:: @ 81A1693 message Route102_Text_1A1912 waitmessage - special EventObjectInteractionWaterBerryTree + special ObjectEventInteractionWaterBerryTree special DoWateringBerryTreeAnim waitstate message Route102_Text_1A1925 @@ -172,7 +172,7 @@ S_WaterBerryTree:: @ 81A1693 end S_PlantBerryTree:: @ 81A16A9 - special EventObjectInteractionPlantBerryTree + special ObjectEventInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waitmessage |