summaryrefslogtreecommitdiff
path: root/data/maps/PalletTown/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/PalletTown/scripts.inc')
-rw-r--r--data/maps/PalletTown/scripts.inc26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index a93511b60..860b6e508 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -6,18 +6,18 @@ PalletTown_MapScripts:: @ 816545A
PalletTown_MapScript1_165465:: @ 8165465
setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN
checkflag FLAG_0x291
- call_if 1, EventScript_165488
+ call_if eq, EventScript_165488
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0
- call_if 1, EventScript_1654A8
+ call_if eq, EventScript_1654A8
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
- call_if 1, EventScript_1654A2
+ call_if eq, EventScript_1654A2
end
EventScript_165488:: @ 8165488
checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN
- goto_if 0, EventScript_1A77A9
+ goto_if lt, EventScript_1A77A9
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
- goto_if 4, EventScript_1A77A9
+ goto_if ge, EventScript_1A77A9
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
return
@@ -51,7 +51,7 @@ EventScript_1654D8:: @ 81654D8
applymovement 3, Movement_1655AF
waitmovement 0
checkflag FLAG_WORLD_MAP_ONE_ISLAND
- goto_if 0, EventScript_1655A1
+ goto_if lt, EventScript_1655A1
msgbox gUnknown_817D8BF
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
@@ -60,7 +60,7 @@ EventScript_1654D8:: @ 81654D8
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
compare_var_to_value VAR_0x8009, 60
- goto_if 0, EventScript_165593
+ goto_if lt, EventScript_165593
msgbox gUnknown_817D9AA
closemessage
playbgm MUS_ANNAI, 0
@@ -200,17 +200,17 @@ EventScript_165605:: @ 8165605
delay 30
addobject 3
compare_var_to_value VAR_0x4001, 0
- call_if 1, EventScript_1656B8
+ call_if eq, EventScript_1656B8
compare_var_to_value VAR_0x4001, 1
- call_if 1, EventScript_1656C3
+ call_if eq, EventScript_1656C3
delay 30
msgbox gUnknown_817D74A
closemessage
delay 30
compare_var_to_value VAR_0x4001, 0
- call_if 1, EventScript_1656CE
+ call_if eq, EventScript_1656CE
compare_var_to_value VAR_0x4001, 1
- call_if 1, EventScript_1656E0
+ call_if eq, EventScript_1656E0
opendoor 16, 13
waitdooranim
applymovement 3, Movement_16572E
@@ -393,9 +393,9 @@ PalletTown_EventScript_16575C:: @ 816575C
msgbox gUnknown_81B1C9F
closemessage
compare_var_to_value VAR_FACING, 4
- call_if 1, EventScript_1657D7
+ call_if eq, EventScript_1657D7
compare_var_to_value VAR_FACING, 4
- call_if 5, EventScript_1657E2
+ call_if ne, EventScript_1657E2
moveobjectoffscreen 1
setflag FLAG_TEMP_2
release