diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
| commit | eff6795887cc27f2c5139df9a6da70f4f02338b4 (patch) | |
| tree | f91be2b0b7194b4ddff13f4935a0edafc4284a43 /data/scripts/berry_tree.inc | |
| parent | 3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff) | |
| parent | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff) | |
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'data/scripts/berry_tree.inc')
| -rw-r--r-- | data/scripts/berry_tree.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index ab700cbc3..55b8e2439 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,6 +1,6 @@ S_BerryTree:: @ 81A14DD special FieldObjectInteractionGetBerryTreeData - switch 0x8004 + switch VAR_SPECIAL_4 case 255, Route102_EventScript_1A1533 case 0, Route102_EventScript_1A153D case 1, Route102_EventScript_1A1595 @@ -82,9 +82,9 @@ Route102_EventScript_1A15BC:: @ 81A15BC goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE - compare 0x8005, 0 + compare VAR_SPECIAL_5, 0 goto_if_eq Route102_EventScript_1A15F2 - compare 0x8005, 4 + compare VAR_SPECIAL_5, 4 goto_if_eq Route102_EventScript_1A15EB bufferstring 1, Route102_Text_1A17B7 return @@ -98,7 +98,7 @@ Route102_EventScript_1A15F2:: @ 81A15F2 return Route102_EventScript_1A15F9:: @ 81A15F9 - buffernumberstring 1, 0x8006 + buffernumberstring 1, VAR_SPECIAL_6 lock faceplayer msgbox Route102_Text_1A17C0, 5 @@ -109,7 +109,7 @@ Route102_EventScript_1A15F9:: @ 81A15F9 Route102_EventScript_1A161D:: @ 81A161D special FieldObjectInteractionPickBerryTree - compare 0x8004, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD |