diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 24 | ||||
| -rw-r--r-- | data/scripts/day_care.inc | 2 | ||||
| -rw-r--r-- | data/scripts/move_tutors.inc | 8 | ||||
| -rw-r--r-- | data/scripts/seagallop.inc | 2 | ||||
| -rw-r--r-- | data/scripts/static_pokemon.inc | 8 |
5 files changed, 22 insertions, 22 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index ea1bbfdcf..db0982a29 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -608,7 +608,7 @@ gUnknown_81BB8A7:: @ 81BB8A7 compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8004, 0 special Special_BattleRecords waitstate @@ -633,7 +633,7 @@ UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF gUnknown_81BB8DB:: @ 81BB8DB UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80A0334 waitstate compare VAR_RESULT, 0 @@ -646,7 +646,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB gUnknown_81BB8F8:: @ 81BB8F8 UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80A0334 waitstate compare VAR_RESULT, 0 @@ -659,7 +659,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 gUnknown_81BB915:: @ 81BB915 UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80A0334 waitstate compare VAR_RESULT, 0 @@ -672,7 +672,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 gUnknown_81BB932:: @ 81BB932 UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_80A0334 waitstate compare VAR_RESULT, 0 @@ -723,7 +723,7 @@ UnknownMap_00_02_EventScript_1BB980:: @ 81BB980 gUnknown_81BB981:: @ 81BB981 textcolor 3 msgbox Text_LookedAtPlayersTrainerCard - fadescreen 1 + fadescreen FADE_TO_BLACK special sp02A_crash_sound waitstate end @@ -731,7 +731,7 @@ gUnknown_81BB981:: @ 81BB981 gUnknown_81BB992:: @ 81BB992 textcolor 3 msgbox Text_LookedAtPlayersTrainerCardColored - fadescreen 1 + fadescreen FADE_TO_BLACK special sp02A_crash_sound waitstate end @@ -796,7 +796,7 @@ EventScript_1BBA04:: @ 81BBA04 goto_if_eq EventScript_1BB867 copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1BBB60 message Text_1BD65B waitmessage @@ -915,7 +915,7 @@ EventScript_1BBB9C:: @ 81BBB9C compare VAR_RESULT, 1 goto_if_eq EventScript_1BB867 specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1BB44A message Text_1BD28D waitmessage @@ -1191,10 +1191,10 @@ gUnknown_81BBFD8:: @ 81BBFD8 lockall goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_1BB881 specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1BC016 special HelpSystem_Disable - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_814F1D4 waitstate msgbox gUnknown_81BCA43 @@ -1295,7 +1295,7 @@ EventScript_1BC0CE:: @ 81BC0CE message Text_1BCF69 waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq EventScript_1BC29C delay 60 special HelpSystem_Disable diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index c089472cb..e96f52e20 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -20,7 +20,7 @@ EventScript_1BF3DD:: @ 81BF3DD compare VAR_RESULT, 1 goto_if_eq EventScript_1BF452 msgbox Text_19DDBE - fadescreen 1 + fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChooseSendDaycareMon waitstate diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 0552b6bb3..9b3c86d8f 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -402,9 +402,9 @@ EventScript_1C4D4F:: @ 81C4D4F EventScript_1C4D59:: @ 81C4D59 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq EventScript_1C4D72 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq EventScript_1C4D7B release end @@ -477,11 +477,11 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC goto_if_eq EventScript_1C4F1C msgbox Text_1A4814 closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK goto EventScript_1C4EDA EventScript_1C4E8F:: @ 81C4E8F - fadescreen 0 + fadescreen FADE_FROM_BLACK goto EventScript_1C4EAB end diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index 8aac0bcb4..75f0e4707 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -113,7 +113,7 @@ EventScript_1A90DA:: @ 81A90DA compare VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 - fadescreen 1 + fadescreen FADE_TO_BLACK special ScrSpecial_SeagallopFerry waitstate end diff --git a/data/scripts/static_pokemon.inc b/data/scripts/static_pokemon.inc index ef57cf36d..9b738ea19 100644 --- a/data/scripts/static_pokemon.inc +++ b/data/scripts/static_pokemon.inc @@ -1,14 +1,14 @@ EventScript_1A922D:: @ 81A922D - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject VAR_LAST_TALKED - fadescreen 0 + fadescreen FADE_FROM_BLACK release end EventScript_1A9236:: @ 81A9236 - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject VAR_LAST_TALKED - fadescreen 0 + fadescreen FADE_FROM_BLACK getspeciesname 0, VAR_0x8004 msgbox Text_1A63C4 release |