diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-28 09:28:08 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-10-30 17:51:35 -0500 |
| commit | 67ce8c9cc2dc9d018cae17e71b46c2c999cb048a (patch) | |
| tree | d91c5526d86e896c8e0fd2c4c832f0349806cfff | |
| parent | 93e2851fc187499259affb1ee32c845a7e9f9023 (diff) | |
Clean up players_house doc
| -rw-r--r-- | data/maps/LittlerootTown_MaysHouse_2F/scripts.inc | 4 | ||||
| -rw-r--r-- | data/scripts/tv.inc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 9fe74a344..5bfbfbbcd 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -284,7 +284,7 @@ RivalsHouse_2F_EventScript_MayPostLilycove:: @ 81F951D return RivalsHouse_2F_EventScript_BrendanPostLilycove:: @ 81F952F - goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, PlayersHouse_2F_EventScript_BrendanWhereShouldIGoNext + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext msgbox RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex, MSGBOX_DEFAULT return @@ -292,7 +292,7 @@ RivalsHouse_2F_EventScript_MayWhereShouldIGoNext:: @ 81F9541 msgbox RivalsHouse_2F_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT return -PlayersHouse_2F_EventScript_BrendanWhereShouldIGoNext:: @ 81F954A +RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext:: @ 81F954A msgbox RivalsHouse_2F_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT return diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 67141d7a1..427775a76 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -4,9 +4,9 @@ EventScript_TV:: @ 827EE0B special ResetTVShowState specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare VAR_RESULT, 2 - goto_if_eq EventScript_27EE9A + goto_if_eq EventScript_PlayersHouseMovie compare VAR_RESULT, 1 - goto_if_eq EventScript_27EEA4 + goto_if_eq EventScript_PlayersHouseLatiNewsFlash goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring @@ -35,12 +35,12 @@ EventScript_27EE8A:: @ 827EE8A releaseall end -EventScript_27EE9A:: @ 827EE9A +EventScript_PlayersHouseMovie:: @ 827EE9A msgbox PlayersHouse_1F_Text_TheresAMovieOnTV, MSGBOX_DEFAULT releaseall end -EventScript_27EEA4:: @ 827EEA4 +EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4 msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT @ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and @ It's called again when Mom actually asks for the color, overwriting |