ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-26 13:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up players_house doc

Browse Source
This commit is contained in:
GriffinR 2019-10-28 09:28:08 -04:00 committed by huderlem
parent 93e2851fc1
commit 67ce8c9cc2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
View File

@ -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

8
data/scripts/tv.inc
View File

@ -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