summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/CeladonMansionRoofHouse.asm2
-rw-r--r--maps/KrissHouse1F.asm6
-rw-r--r--maps/MountMoonSquare.asm2
-rw-r--r--maps/Route29.asm4
-rw-r--r--maps/Route34.asm2
-rw-r--r--maps/Route35.asm2
-rw-r--r--maps/Route39.asm2
-rw-r--r--maps/Route45.asm4
-rw-r--r--maps/WarehouseEntrance.asm4
9 files changed, 14 insertions, 14 deletions
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
index 6820266cb..2553a7134 100644
--- a/maps/CeladonMansionRoofHouse.asm
+++ b/maps/CeladonMansionRoofHouse.asm
@@ -13,7 +13,7 @@ PharmacistScript_0x71afd: ; 0x71afd
iftrue UnknownScript_0x71b21
writetext UnknownText_0x71b27
keeptextopen
- checktime $4
+ checknite
iftrue UnknownScript_0x71b14
writetext UnknownText_0x71b4a
closetext
diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm
index 4f248b163..f91fed524 100644
--- a/maps/KrissHouse1F.asm
+++ b/maps/KrissHouse1F.asm
@@ -170,11 +170,11 @@ UnknownScript_0x7a5b8: ; 0x7a5b8
NeighborScript:
faceplayer
loadfont
- checktime $1
+ checkmorn
iftrue .MornScript
- checktime $2
+ checkday
iftrue .DayScript
- checktime $4
+ checknite
iftrue .NiteScript
.MornScript
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index aff776684..cb0ea25c1 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -34,7 +34,7 @@ UnknownScript_0x7709a: ; 0x7709a
iftrue UnknownScript_0x77117
checkcode $b
if_not_equal MONDAY, UnknownScript_0x77117
- checktime $4
+ checknite
iffalse UnknownScript_0x77117
appear $2
appear $3
diff --git a/maps/Route29.asm b/maps/Route29.asm
index 0fbc35aa6..ec769ecc3 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -157,9 +157,9 @@ FisherScript_0x1a102e: ; 0x1a102e
CooltrainerMScript_0x1a1031: ; 0x1a1031
faceplayer
loadfont
- checktime $2
+ checkday
iftrue UnknownScript_0x1a103d
- checktime $4
+ checknite
iftrue UnknownScript_0x1a1043
UnknownScript_0x1a103d: ; 0x1a103d
writetext UnknownText_0x1a134c
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 805c1826c..f41d6664f 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -419,7 +419,7 @@ UnknownScript_0x78248: ; 0x78248
OfficerScript_0x7824c: ; 0x7824c
faceplayer
loadfont
- checktime $4
+ checknite
iffalse UnknownScript_0x78276
checkevent $0546
iftrue UnknownScript_0x78270
diff --git a/maps/Route35.asm b/maps/Route35.asm
index ed124d3e3..099e73471 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -386,7 +386,7 @@ FirebreatherWaltScript: ; 0x19ca41
OfficerScript_0x19ca49: ; 0x19ca49
faceplayer
loadfont
- checktime $4
+ checknite
iffalse UnknownScript_0x19ca73
checkevent $0547
iftrue UnknownScript_0x19ca6d
diff --git a/maps/Route39.asm b/maps/Route39.asm
index be8cd4834..4e22632d8 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -214,7 +214,7 @@ PsychicNormanScript: ; 0x1a5bb6
PokefanFScript_0x1a5bbe: ; 0x1a5bbe
faceplayer
loadfont
- checktime $4
+ checknite
iffalse UnknownScript_0x1a5be5
checkevent $05c2
iftrue UnknownScript_0x1a5bdf
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 22343401c..4c3674fee 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -56,9 +56,9 @@ UnknownScript_0x19e0d0: ; 0x19e0d0
UnknownScript_0x19e0e4: ; 0x19e0e4
checkcode $1a
if_not_equal $1, UnknownScript_0x19e127
- checktime $1
+ checkmorn
iftrue UnknownScript_0x19e10c
- checktime $4
+ checknite
iftrue UnknownScript_0x19e112
checkevent $026a
iffalse UnknownScript_0x19e127
diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm
index ae28d0f22..64b8e99cd 100644
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -63,7 +63,7 @@ UnknownScript_0x7c082: ; 0x7c082
UnknownScript_0x7c0a5: ; 0x7c0a5
disappear $7
- checktime $1
+ checkmorn
iffalse UnknownScript_0x7c0ae
appear $7
UnknownScript_0x7c0ae: ; 0x7c0ae
@@ -253,7 +253,7 @@ GrampsScript_0x7c146: ; 0x7c146
; 0x7c156
UnknownScript_0x7c156: ; 0x7c156
- checktime $1
+ checkmorn
iffalse UnknownScript_0x7c300
pokemart $2, $0000
loadmovesprites