diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-02 21:20:13 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-02 21:20:13 -0500 |
| commit | aa8db1632c8826ead8c8d246c8be265839374f7b (patch) | |
| tree | f034e985ed3fa04ce0d950dde32d6e9699fd8329 /maps | |
| parent | 2a53d758079e461e5cd45c2d9a81f9b70b603815 (diff) | |
Remove checkmorn/checkday/checknite macros
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/CeladonMansionRoofHouse.asm | 2 | ||||
| -rw-r--r-- | maps/GoldenrodUnderground.asm | 4 | ||||
| -rw-r--r-- | maps/MountMoonSquare.asm | 2 | ||||
| -rw-r--r-- | maps/PlayersHouse1F.asm | 6 | ||||
| -rw-r--r-- | maps/Route29.asm | 4 | ||||
| -rw-r--r-- | maps/Route34.asm | 2 | ||||
| -rw-r--r-- | maps/Route35.asm | 2 | ||||
| -rw-r--r-- | maps/Route39.asm | 2 | ||||
| -rw-r--r-- | maps/Route45.asm | 4 |
9 files changed, 14 insertions, 14 deletions
diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 3a8bce8d8..61157e619 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -13,7 +13,7 @@ PharmacistScript_0x71afd: iftrue UnknownScript_0x71b21 writetext UnknownText_0x71b27 buttonsound - checknite + checktime NITE iftrue UnknownScript_0x71b14 writetext UnknownText_0x71b4a waitbutton diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index f67282ae0..017d7b23a 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -64,7 +64,7 @@ GoldenrodUnderground_MapScripts: .Monday: disappear GOLDENRODUNDERGROUND_GRAMPS - checkmorn + checktime MORN iffalse .NotMondayMorning appear GOLDENRODUNDERGROUND_GRAMPS .NotMondayMorning: @@ -173,7 +173,7 @@ GrampsScript_0x7c146: jump GoldenrodUndergroundScript_ShopClosed .CheckMorn: - checkmorn + checktime MORN iffalse GoldenrodUndergroundScript_ShopClosed pokemart MARTTYPE_BARGAIN, 0 closetext diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 6ecc722a7..e8c82c961 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -27,7 +27,7 @@ ClefairyDance: iftrue .NoDancing checkcode VAR_WEEKDAY ifnotequal MONDAY, .NoDancing - checknite + checktime NITE iffalse .NoDancing appear MOUNTMOONSQUARE_FAIRY1 appear MOUNTMOONSQUARE_FAIRY2 diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index ad4f5c39d..163bed162 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -153,11 +153,11 @@ UnknownScript_0x7a5b8: NeighborScript: faceplayer opentext - checkmorn + checktime MORN iftrue .MornScript - checkday + checktime DAY iftrue .DayScript - checknite + checktime NITE iftrue .NiteScript .MornScript: diff --git a/maps/Route29.asm b/maps/Route29.asm index 9541e6f85..e3ef95169 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -148,9 +148,9 @@ Route29FisherScript: CooltrainerMScript_0x1a1031: faceplayer opentext - checkday + checktime DAY iftrue .day_morn - checknite + checktime NITE iftrue .nite .day_morn writetext Text_WaitingForNight diff --git a/maps/Route34.asm b/maps/Route34.asm index 82cb27cd4..33ac3ceed 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -351,7 +351,7 @@ TrainerPicnickerGina1: OfficerKeithScript: faceplayer opentext - checknite + checktime NITE iffalse .NoFight checkevent EVENT_BEAT_OFFICER_KEITH iftrue .AfterScript diff --git a/maps/Route35.asm b/maps/Route35.asm index d79be43e9..0b471f25f 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -237,7 +237,7 @@ TrainerFirebreatherWalt: TrainerOfficerDirk: faceplayer opentext - checknite + checktime NITE iffalse .NotNight checkevent EVENT_BEAT_OFFICER_DIRK iftrue .AfterBattle diff --git a/maps/Route39.asm b/maps/Route39.asm index 31ac512d2..2321a7fb1 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -138,7 +138,7 @@ TrainerPsychicNorman: TrainerPokefanfJaime: faceplayer opentext - checknite + checktime NITE iffalse .NotNight checkevent EVENT_BEAT_POKEFANF_JAIME iftrue .Beaten diff --git a/maps/Route45.asm b/maps/Route45.asm index 9a3c873c2..73e392ea2 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -49,9 +49,9 @@ TrainerBlackbeltKenji: .Registered: checkcode VAR_KENJI_BREAK ifnotequal 1, Route45NumberAcceptedM - checkmorn + checktime MORN iftrue .Morning - checknite + checktime NITE iftrue .Night checkevent EVENT_KENJI_ON_BREAK iffalse Route45NumberAcceptedM |