pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove checkmorn/checkday/checknite macros

Browse Source
This commit is contained in:
Rangi
2018-02-02 21:20:13 -05:00
parent 2a53d75807
commit aa8db1632c
16 changed files with 57 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/event_commands.md
View File

@@ -93,10 +93,6 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$2B`: <code>checktime <i>time</i></code> ## `$2B`: <code>checktime <i>time</i></code>
- **`checkmorn`:** `checktime MORN`
- **`checkday`:** `checktime DAY`
- **`checknite`:** `checktime NITE`
## `$2C`: <code>checkpoke <i>mon_id</i></code> ## `$2C`: <code>checkpoke <i>mon_id</i></code>
## `$2D`: <code>givepoke <i>mon_id</i>, <i>level</i>[, <i>item</i>=0[, <i>trainer</i>=0, <i>ot_name</i>, <i>nickname</i>]]</code> ## `$2D`: <code>givepoke <i>mon_id</i>, <i>level</i>[, <i>item</i>=0[, <i>trainer</i>=0, <i>ot_name</i>, <i>nickname</i>]]</code>

6
engine/events/std_scripts.asm
View File

@@ -57,11 +57,11 @@ PokecenterNurseScript:
; EVENT_WELCOMED_TO_POKECOM_CENTER is never set ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set
opentext opentext
checkmorn checktime MORN
iftrue .morn iftrue .morn
checkday checktime DAY
iftrue .day iftrue .day
checknite checktime NITE
iftrue .nite iftrue .nite
jump .ok jump .ok

8
engine/phone/buenas_password.asm
View File

@@ -13,9 +13,9 @@ BuenaPhoneScript2:
jump BuenaPhoneScript_Random2 jump BuenaPhoneScript_Random2
BuenaPhoneScript_CheckTimeOfDay1: BuenaPhoneScript_CheckTimeOfDay1:
checkmorn checktime MORN
iftrue .morn iftrue .morn
checkday checktime DAY
iftrue .day iftrue .day
writetext UnknownText_0xa0d42 writetext UnknownText_0xa0d42
buttonsound buttonsound
@@ -38,9 +38,9 @@ BuenaPhoneScript_AfterMidnight1:
BuenaPhoneScript_CheckTimeOfDay2: BuenaPhoneScript_CheckTimeOfDay2:
checkcode VAR_HOUR checkcode VAR_HOUR
ifgreater 17, BuenaPhoneScript_AfterMidnight2 ifgreater 17, BuenaPhoneScript_AfterMidnight2
checkmorn checktime MORN
iftrue .morn iftrue .morn
checkday checktime DAY
iftrue .day iftrue .day
writetext UnknownText_0xa0e29 writetext UnknownText_0xa0e29
buttonsound buttonsound

16
engine/phone/generic_calls.asm
View File

@@ -19,9 +19,9 @@ PhoneScript_Random11:
end end
PhoneScript_AnswerPhone_Male: PhoneScript_AnswerPhone_Male:
checkday checktime DAY
iftrue PhoneScript_AnswerPhone_Male_Day iftrue PhoneScript_AnswerPhone_Male_Day
checknite checktime NITE
iftrue PhoneScript_AnswerPhone_Male_Nite iftrue PhoneScript_AnswerPhone_Male_Nite
checkcode VAR_CALLERID checkcode VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SCHOOLBOY_JACK, .Jack
@@ -392,9 +392,9 @@ PhoneScript_AnswerPhone_Male_Nite:
end end
PhoneScript_AnswerPhone_Female: PhoneScript_AnswerPhone_Female:
checkday checktime DAY
iftrue PhoneScript_AnswerPhone_Female_Day iftrue PhoneScript_AnswerPhone_Female_Day
checknite checktime NITE
iftrue PhoneScript_AnswerPhone_Female_Nite iftrue PhoneScript_AnswerPhone_Female_Nite
checkcode VAR_CALLERID checkcode VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_POKEFAN_BEVERLY, .Beverly
@@ -549,9 +549,9 @@ PhoneScript_AnswerPhone_Female_Nite:
end end
PhoneScript_GreetPhone_Male: PhoneScript_GreetPhone_Male:
checkday checktime DAY
iftrue PhoneScript_GreetPhone_Male_Day iftrue PhoneScript_GreetPhone_Male_Day
checknite checktime NITE
iftrue PhoneScript_GreetPhone_Male_Nite iftrue PhoneScript_GreetPhone_Male_Nite
checkcode VAR_CALLERID checkcode VAR_CALLERID
ifequal PHONE_SCHOOLBOY_JACK, .Jack ifequal PHONE_SCHOOLBOY_JACK, .Jack
@@ -922,9 +922,9 @@ PhoneScript_GreetPhone_Male_Nite:
end end
PhoneScript_GreetPhone_Female: PhoneScript_GreetPhone_Female:
checkday checktime DAY
iftrue PhoneScript_GreetPhone_Female_Day iftrue PhoneScript_GreetPhone_Female_Day
checknite checktime NITE
iftrue PhoneScript_GreetPhone_Female_Nite iftrue PhoneScript_GreetPhone_Female_Nite
checkcode VAR_CALLERID checkcode VAR_CALLERID
ifequal PHONE_POKEFAN_BEVERLY, .Beverly ifequal PHONE_POKEFAN_BEVERLY, .Beverly

4
engine/phone/phone_gossip.asm
View File

@@ -510,9 +510,9 @@ KenjiAnswerPhoneScript:
jump PhoneScript_HangupText_Male jump PhoneScript_HangupText_Male
.OnBreak: .OnBreak:
checkmorn checktime MORN
iftrue .Morning iftrue .Morning
checknite checktime NITE
iftrue .Night iftrue .Night
setevent EVENT_KENJI_ON_BREAK setevent EVENT_KENJI_ON_BREAK
farwritetext KenjiBreakText farwritetext KenjiBreakText

52
engine/phone/phone_scripts.asm
View File

@@ -150,9 +150,9 @@ MomPhoneLectureScript: ; 0xbcfb1
; Bill ; Bill
BillPhoneScript1: ; 0xbcfc5 BillPhoneScript1: ; 0xbcfc5
checkday checktime DAY
iftrue .daygreet iftrue .daygreet
checknite checktime NITE
iftrue .nitegreet iftrue .nitegreet
farwritetext BillPhoneMornGreetingText farwritetext BillPhoneMornGreetingText
buttonsound buttonsound
@@ -307,7 +307,7 @@ JackPhoneScript1:
iftrue .NotMonday iftrue .NotMonday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal MONDAY, .NotMonday ifnotequal MONDAY, .NotMonday
checkmorn checktime MORN
iftrue JackMondayMorning iftrue JackMondayMorning
.NotMonday: .NotMonday:
@@ -388,7 +388,7 @@ HueyPhoneScript1:
iftrue .NotWednesday iftrue .NotWednesday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal WEDNESDAY, .NotWednesday ifnotequal WEDNESDAY, .NotWednesday
checknite checktime NITE
iftrue HueyWednesdayNight iftrue HueyWednesdayNight
.NotWednesday: .NotWednesday:
@@ -432,7 +432,7 @@ GavenPhoneScript1:
iftrue .NotThursday iftrue .NotThursday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal THURSDAY, .NotThursday ifnotequal THURSDAY, .NotThursday
checkmorn checktime MORN
iftrue GavenThursdayMorning iftrue GavenThursdayMorning
.NotThursday: .NotThursday:
@@ -479,7 +479,7 @@ BethPhoneScript1:
iftrue .NotFriday iftrue .NotFriday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday ifnotequal FRIDAY, .NotFriday
checkday checktime DAY
iftrue BethFridayAfternoon iftrue BethFridayAfternoon
.NotFriday: .NotFriday:
@@ -523,7 +523,7 @@ JosePhoneScript1:
iftrue .HasItem iftrue .HasItem
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal SATURDAY, .NotSaturday ifnotequal SATURDAY, .NotSaturday
checknite checktime NITE
iftrue JoseSaturdayNight iftrue JoseSaturdayNight
.NotSaturday: .NotSaturday:
@@ -583,7 +583,7 @@ ReenaPhoneScript1:
iftrue .NotSunday iftrue .NotSunday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal SUNDAY, .NotSunday ifnotequal SUNDAY, .NotSunday
checkmorn checktime MORN
iftrue ReenaSundayMorning iftrue ReenaSundayMorning
.NotSunday: .NotSunday:
@@ -625,7 +625,7 @@ JoeyPhoneScript1:
iftrue .NotMonday iftrue .NotMonday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal MONDAY, .NotMonday ifnotequal MONDAY, .NotMonday
checkday checktime DAY
iftrue JoeyMondayAfternoon iftrue JoeyMondayAfternoon
.NotMonday: .NotMonday:
@@ -671,7 +671,7 @@ WadePhoneScript1:
iftrue WadeHasItem iftrue WadeHasItem
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal TUESDAY, .NotTuesday ifnotequal TUESDAY, .NotTuesday
checknite checktime NITE
iftrue WadeTuesdayNight iftrue WadeTuesdayNight
.NotTuesday: .NotTuesday:
@@ -785,7 +785,7 @@ RalphPhoneScript1:
iftrue Ralph_CheckSwarm iftrue Ralph_CheckSwarm
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal WEDNESDAY, Ralph_CheckSwarm ifnotequal WEDNESDAY, Ralph_CheckSwarm
checkmorn checktime MORN
iftrue Ralph_WednesdayMorning iftrue Ralph_WednesdayMorning
Ralph_CheckSwarm: Ralph_CheckSwarm:
checkflag ENGINE_FISH_SWARM checkflag ENGINE_FISH_SWARM
@@ -847,7 +847,7 @@ LizPhoneScript1:
iftrue .NotThursday iftrue .NotThursday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal THURSDAY, .NotThursday ifnotequal THURSDAY, .NotThursday
checkday checktime DAY
iftrue LizThursdayAfternoon iftrue LizThursdayAfternoon
.NotThursday: .NotThursday:
@@ -952,7 +952,7 @@ AnthonyPhoneScript1:
iftrue .NotFriday iftrue .NotFriday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday ifnotequal FRIDAY, .NotFriday
checknite checktime NITE
iftrue AnthonyFridayNight iftrue AnthonyFridayNight
.NotFriday: .NotFriday:
@@ -1016,7 +1016,7 @@ ToddPhoneScript1:
iftrue .NotSaturday iftrue .NotSaturday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal SATURDAY, .NotSaturday ifnotequal SATURDAY, .NotSaturday
checkmorn checktime MORN
iftrue ToddSaturdayMorning iftrue ToddSaturdayMorning
.NotSaturday: .NotSaturday:
@@ -1080,7 +1080,7 @@ GinaPhoneScript1:
iftrue .HasLeafStone iftrue .HasLeafStone
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal SUNDAY, .NotSunday ifnotequal SUNDAY, .NotSunday
checkday checktime DAY
iftrue GinaSundayDay iftrue GinaSundayDay
.NotSunday: .NotSunday:
@@ -1175,7 +1175,7 @@ ArniePhoneScript1:
iftrue .NotTuesday iftrue .NotTuesday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal TUESDAY, .NotTuesday ifnotequal TUESDAY, .NotTuesday
checkmorn checktime MORN
iftrue ArnieTuesdayMorning iftrue ArnieTuesdayMorning
.NotTuesday: .NotTuesday:
@@ -1244,7 +1244,7 @@ AlanPhoneScript1:
iftrue .FireStone iftrue .FireStone
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal WEDNESDAY, .NotWednesday ifnotequal WEDNESDAY, .NotWednesday
checkday checktime DAY
iftrue AlanWednesdayDay iftrue AlanWednesdayDay
.NotWednesday: .NotWednesday:
@@ -1307,7 +1307,7 @@ DanaPhoneScript1:
iftrue .HasThunderstone iftrue .HasThunderstone
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal THURSDAY, .NotThursday ifnotequal THURSDAY, .NotThursday
checknite checktime NITE
iftrue DanaThursdayNight iftrue DanaThursdayNight
.NotThursday: .NotThursday:
@@ -1373,7 +1373,7 @@ ChadPhoneScript1:
iftrue .NotFriday iftrue .NotFriday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday ifnotequal FRIDAY, .NotFriday
checkmorn checktime MORN
iftrue ChadFridayMorning iftrue ChadFridayMorning
.NotFriday: .NotFriday:
@@ -1474,7 +1474,7 @@ TullyPhoneScript1:
iftrue TullyHasWaterStone iftrue TullyHasWaterStone
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal SUNDAY, .NotSunday ifnotequal SUNDAY, .NotSunday
checknite checktime NITE
iftrue TullySundayNight iftrue TullySundayNight
.NotSunday: .NotSunday:
@@ -1533,7 +1533,7 @@ BrentPhoneScript1:
iftrue .NotMonday iftrue .NotMonday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal MONDAY, .NotMonday ifnotequal MONDAY, .NotMonday
checkmorn checktime MORN
iftrue BrentMondayMorning iftrue BrentMondayMorning
.NotMonday: .NotMonday:
@@ -1580,7 +1580,7 @@ TiffanyPhoneScript1:
iftrue .HasItem iftrue .HasItem
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal TUESDAY, .NotTuesday ifnotequal TUESDAY, .NotTuesday
checkday checktime DAY
iftrue TiffanyTuesdayAfternoon iftrue TiffanyTuesdayAfternoon
.NotTuesday: .NotTuesday:
@@ -1679,7 +1679,7 @@ VancePhoneScript1:
iftrue .NotWednesday iftrue .NotWednesday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal WEDNESDAY, .NotWednesday ifnotequal WEDNESDAY, .NotWednesday
checknite checktime NITE
iftrue VanceWednesdayNight iftrue VanceWednesdayNight
.NotWednesday: .NotWednesday:
@@ -1722,7 +1722,7 @@ WiltonPhoneScript1:
iftrue .HasItem iftrue .HasItem
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal THURSDAY, .NotThursday ifnotequal THURSDAY, .NotThursday
checkmorn checktime MORN
iftrue WiltonThursdayMorning iftrue WiltonThursdayMorning
.NotThursday: .NotThursday:
@@ -1810,7 +1810,7 @@ ParryPhoneScript1:
iftrue .WantsRematch iftrue .WantsRematch
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal FRIDAY, .WantsRematch ifnotequal FRIDAY, .WantsRematch
checkday checktime DAY
iftrue ParryFridayDay iftrue ParryFridayDay
.WantsRematch: .WantsRematch:
@@ -1853,7 +1853,7 @@ ErinPhoneScript1:
iftrue .NotSaturday iftrue .NotSaturday
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal SATURDAY, .NotSaturday ifnotequal SATURDAY, .NotSaturday
checknite checktime NITE
iftrue ErinSaturdayNight iftrue ErinSaturdayNight
.NotSaturday: .NotSaturday:

4
macros/scripts/events.asm
View File

@@ -283,10 +283,6 @@ checktime: MACRO
db \1 ; time db \1 ; time
ENDM ENDM
checkmorn EQUS "checktime MORN"
checkday EQUS "checktime DAY"
checknite EQUS "checktime NITE"
enum checkpoke_command ; $2c enum checkpoke_command ; $2c
checkpoke: MACRO checkpoke: MACRO
db checkpoke_command db checkpoke_command

2
maps/CeladonMansionRoofHouse.asm
View File

@@ -13,7 +13,7 @@ PharmacistScript_0x71afd:
iftrue UnknownScript_0x71b21 iftrue UnknownScript_0x71b21
writetext UnknownText_0x71b27 writetext UnknownText_0x71b27
buttonsound buttonsound
checknite checktime NITE
iftrue UnknownScript_0x71b14 iftrue UnknownScript_0x71b14
writetext UnknownText_0x71b4a writetext UnknownText_0x71b4a
waitbutton waitbutton

4
maps/GoldenrodUnderground.asm
View File

@@ -64,7 +64,7 @@ GoldenrodUnderground_MapScripts:
.Monday: .Monday:
disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
checkmorn checktime MORN
iffalse .NotMondayMorning iffalse .NotMondayMorning
appear GOLDENRODUNDERGROUND_GRAMPS appear GOLDENRODUNDERGROUND_GRAMPS
.NotMondayMorning: .NotMondayMorning:
@@ -173,7 +173,7 @@ GrampsScript_0x7c146:
jump GoldenrodUndergroundScript_ShopClosed jump GoldenrodUndergroundScript_ShopClosed
.CheckMorn: .CheckMorn:
checkmorn checktime MORN
iffalse GoldenrodUndergroundScript_ShopClosed iffalse GoldenrodUndergroundScript_ShopClosed
pokemart MARTTYPE_BARGAIN, 0 pokemart MARTTYPE_BARGAIN, 0
closetext closetext

2
maps/MountMoonSquare.asm
View File

@@ -27,7 +27,7 @@ ClefairyDance:
iftrue .NoDancing iftrue .NoDancing
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
ifnotequal MONDAY, .NoDancing ifnotequal MONDAY, .NoDancing
checknite checktime NITE
iffalse .NoDancing iffalse .NoDancing
appear MOUNTMOONSQUARE_FAIRY1 appear MOUNTMOONSQUARE_FAIRY1
appear MOUNTMOONSQUARE_FAIRY2 appear MOUNTMOONSQUARE_FAIRY2

6
maps/PlayersHouse1F.asm
View File

@@ -153,11 +153,11 @@ UnknownScript_0x7a5b8:
NeighborScript: NeighborScript:
faceplayer faceplayer
opentext opentext
checkmorn checktime MORN
iftrue .MornScript iftrue .MornScript
checkday checktime DAY
iftrue .DayScript iftrue .DayScript
checknite checktime NITE
iftrue .NiteScript iftrue .NiteScript
.MornScript: .MornScript:

4
maps/Route29.asm
View File

@@ -148,9 +148,9 @@ Route29FisherScript:
CooltrainerMScript_0x1a1031: CooltrainerMScript_0x1a1031:
faceplayer faceplayer
opentext opentext
checkday checktime DAY
iftrue .day_morn iftrue .day_morn
checknite checktime NITE
iftrue .nite iftrue .nite
.day_morn .day_morn
writetext Text_WaitingForNight writetext Text_WaitingForNight

2
maps/Route34.asm
View File

@@ -351,7 +351,7 @@ TrainerPicnickerGina1:
OfficerKeithScript: OfficerKeithScript:
faceplayer faceplayer
opentext opentext
checknite checktime NITE
iffalse .NoFight iffalse .NoFight
checkevent EVENT_BEAT_OFFICER_KEITH checkevent EVENT_BEAT_OFFICER_KEITH
iftrue .AfterScript iftrue .AfterScript

2
maps/Route35.asm
View File

@@ -237,7 +237,7 @@ TrainerFirebreatherWalt:
TrainerOfficerDirk: TrainerOfficerDirk:
faceplayer faceplayer
opentext opentext
checknite checktime NITE
iffalse .NotNight iffalse .NotNight
checkevent EVENT_BEAT_OFFICER_DIRK checkevent EVENT_BEAT_OFFICER_DIRK
iftrue .AfterBattle iftrue .AfterBattle

2
maps/Route39.asm
View File

@@ -138,7 +138,7 @@ TrainerPsychicNorman:
TrainerPokefanfJaime: TrainerPokefanfJaime:
faceplayer faceplayer
opentext opentext
checknite checktime NITE
iffalse .NotNight iffalse .NotNight
checkevent EVENT_BEAT_POKEFANF_JAIME checkevent EVENT_BEAT_POKEFANF_JAIME
iftrue .Beaten iftrue .Beaten

4
maps/Route45.asm
View File

@@ -49,9 +49,9 @@ TrainerBlackbeltKenji:
.Registered: .Registered:
checkcode VAR_KENJI_BREAK checkcode VAR_KENJI_BREAK
ifnotequal 1, Route45NumberAcceptedM ifnotequal 1, Route45NumberAcceptedM
checkmorn checktime MORN
iftrue .Morning iftrue .Morning
checknite checktime NITE
iftrue .Night iftrue .Night
checkevent EVENT_KENJI_ON_BREAK checkevent EVENT_KENJI_ON_BREAK
iffalse Route45NumberAcceptedM iffalse Route45NumberAcceptedM