Remove address comments
This commit is contained in:
GriffinR
@@ -3,27 +3,27 @@
|
||||
|
||||
.equ RECEIVED_TOWN_MAP, VAR_TEMP_1
|
||||
|
||||
PalletTown_RivalsHouse_MapScripts:: @ 8168D27
|
||||
PalletTown_RivalsHouse_MapScripts::
|
||||
map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_RivalsHouse_OnTransition
|
||||
.byte 0
|
||||
|
||||
PalletTown_RivalsHouse_OnTransition:: @ 8168D2D
|
||||
PalletTown_RivalsHouse_OnTransition::
|
||||
compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
|
||||
call_if_lt PalletTown_RivalsHouse_EventScript_MoveDaisyToTable
|
||||
compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
|
||||
call_if_ge PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_MoveDaisyToTable:: @ 8168D44
|
||||
PalletTown_RivalsHouse_EventScript_MoveDaisyToTable::
|
||||
setobjectmovementtype LOCALID_DAISY, MOVEMENT_TYPE_FACE_RIGHT
|
||||
setobjectxyperm LOCALID_DAISY, 5, 4
|
||||
return
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap:: @ 8168D50
|
||||
PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap::
|
||||
setvar RECEIVED_TOWN_MAP, TRUE
|
||||
return
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_Daisy:: @ 8168D56
|
||||
PalletTown_RivalsHouse_EventScript_Daisy::
|
||||
lock
|
||||
faceplayer
|
||||
famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
|
||||
@@ -43,12 +43,12 @@ PalletTown_RivalsHouse_EventScript_Daisy:: @ 8168D56
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_HeardBattledRival:: @ 8168DAF
|
||||
PalletTown_RivalsHouse_EventScript_HeardBattledRival::
|
||||
msgbox PalletTown_RivalsHouse_Text_HeardYouBattledRival
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_GroomMon:: @ 8168DB9
|
||||
PalletTown_RivalsHouse_EventScript_GroomMon::
|
||||
goto_if_questlog EventScript_ReleaseEnd
|
||||
special QuestLog_CutRecording
|
||||
compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
|
||||
@@ -78,17 +78,17 @@ PalletTown_RivalsHouse_EventScript_GroomMon:: @ 8168DB9
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_CantGroomEgg:: @ 8168E32
|
||||
PalletTown_RivalsHouse_EventScript_CantGroomEgg::
|
||||
msgbox PalletTown_RivalsHouse_Text_CantGroomAnEgg
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_DeclineGrooming:: @ 8168E3C
|
||||
PalletTown_RivalsHouse_EventScript_DeclineGrooming::
|
||||
msgbox PalletTown_RivalsHouse_Text_DontNeedAnyGrooming
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_RateMonFriendship:: @ 8168E46
|
||||
PalletTown_RivalsHouse_EventScript_RateMonFriendship::
|
||||
msgbox PalletTown_RivalsHouse_Text_MayISeeFirstMon
|
||||
specialvar VAR_RESULT, GetLeadMonFriendship
|
||||
switch VAR_RESULT
|
||||
@@ -101,47 +101,47 @@ PalletTown_RivalsHouse_EventScript_RateMonFriendship:: @ 8168E46
|
||||
case 6, PalletTown_RivalsHouse_EventScript_MonFriendshipHighest
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipLowest:: @ 8168EA6
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipLowest::
|
||||
msgbox PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipLower:: @ 8168EB0
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipLower::
|
||||
msgbox PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipLow:: @ 8168EBA
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipLow::
|
||||
msgbox PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipMid:: @ 8168EC4
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipMid::
|
||||
msgbox PalletTown_RivalsHouse_Text_ItsWarmingUpToYou
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipHigh:: @ 8168ECE
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipHigh::
|
||||
msgbox PalletTown_RivalsHouse_Text_ItsQuiteFriendly
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipHigher:: @ 8168ED8
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipHigher::
|
||||
msgbox PalletTown_RivalsHouse_Text_ItLooksVeryHappy
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipHighest:: @ 8168EE2
|
||||
PalletTown_RivalsHouse_EventScript_MonFriendshipHighest::
|
||||
msgbox PalletTown_RivalsHouse_Text_CouldntLoveYouMore
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest:: @ 8168EEC
|
||||
PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest::
|
||||
msgbox PalletTown_RivalsHouse_Text_PleaseGiveMonsRest
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_GiveTownMap:: @ 8168EF6
|
||||
PalletTown_RivalsHouse_EventScript_GiveTownMap::
|
||||
msgbox PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp
|
||||
closemessage
|
||||
checkitemspace ITEM_TOWN_MAP, 1
|
||||
@@ -159,24 +159,24 @@ PalletTown_RivalsHouse_EventScript_GiveTownMap:: @ 8168EF6
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_NoRoomForTownMap:: @ 8168F4F
|
||||
PalletTown_RivalsHouse_EventScript_NoRoomForTownMap::
|
||||
msgbox PalletTown_RivalsHouse_Text_DontHaveSpaceForThis
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_ExplainTownMap:: @ 8168F59
|
||||
PalletTown_RivalsHouse_EventScript_ExplainTownMap::
|
||||
msgbox PalletTown_RivalsHouse_Text_ExplainTownMap
|
||||
release
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_TownMap:: @ 8168F63
|
||||
PalletTown_RivalsHouse_EventScript_TownMap::
|
||||
msgbox PalletTown_RivalsHouse_Text_ItsBigMapOfKanto, MSGBOX_NPC
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_Bookshelf:: @ 8168F6C
|
||||
PalletTown_RivalsHouse_EventScript_Bookshelf::
|
||||
msgbox PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
PalletTown_RivalsHouse_EventScript_Picture:: @ 8168F75
|
||||
PalletTown_RivalsHouse_EventScript_Picture::
|
||||
msgbox PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy, MSGBOX_SIGN
|
||||
end
|
||||
|
||||
@@ -1,47 +1,47 @@
|
||||
PalletTown_RivalsHouse_Text_HiBrothersAtLab:: @ 818D58C
|
||||
PalletTown_RivalsHouse_Text_HiBrothersAtLab::
|
||||
.string "DAISY: Hi, {PLAYER}!\p"
|
||||
.string "My brother, {RIVAL}, is out at\n"
|
||||
.string "Grandpa's LAB.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_HeardYouBattledRival:: @ 818D5C4
|
||||
PalletTown_RivalsHouse_Text_HeardYouBattledRival::
|
||||
.string "DAISY: {PLAYER}, I heard you had\n"
|
||||
.string "a battle against {RIVAL}.\p"
|
||||
.string "I wish I'd seen that!$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp:: @ 818D60A
|
||||
PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp::
|
||||
.string "Grandpa asked you to run an\n"
|
||||
.string "errand?\p"
|
||||
.string "Gee, that's lazy of him.\n"
|
||||
.string "Here, this will help you.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy:: @ 818D661
|
||||
PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy::
|
||||
.string "{PLAYER} received a TOWN MAP\n"
|
||||
.string "from DAISY.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_DontHaveSpaceForThis:: @ 818D684
|
||||
PalletTown_RivalsHouse_Text_DontHaveSpaceForThis::
|
||||
.string "You don't have space for this in\n"
|
||||
.string "your BAG.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_ExplainTownMap:: @ 818D6AF
|
||||
PalletTown_RivalsHouse_Text_ExplainTownMap::
|
||||
.string "You can use the TOWN MAP to find\n"
|
||||
.string "out where you are, or check the\l"
|
||||
.string "names of places.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_PleaseGiveMonsRest:: @ 818D701
|
||||
PalletTown_RivalsHouse_Text_PleaseGiveMonsRest::
|
||||
.string "DAISY: Just like people, POKéMON\n"
|
||||
.string "are living things.\p"
|
||||
.string "When they get tired, please give\n"
|
||||
.string "them a rest.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_ItsBigMapOfKanto:: @ 818D763
|
||||
PalletTown_RivalsHouse_Text_ItsBigMapOfKanto::
|
||||
.string "It's a big map of the KANTO region.\n"
|
||||
.string "Now this would be useful!$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks:: @ 818D7A1
|
||||
PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks::
|
||||
.string "The shelves are crammed full of\n"
|
||||
.string "books on POKéMON.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_LikeMeToGroomMon:: @ 818D7D3
|
||||
PalletTown_RivalsHouse_Text_LikeMeToGroomMon::
|
||||
.string "DAISY: Hi, {PLAYER}!\n"
|
||||
.string "Good timing.\p"
|
||||
.string "I'm about to have some tea.\n"
|
||||
@@ -50,72 +50,72 @@ PalletTown_RivalsHouse_Text_LikeMeToGroomMon:: @ 818D7D3
|
||||
.string "Your POKéMON are a little dirty.\p"
|
||||
.string "Would you like me to groom one?$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_DontNeedAnyGrooming:: @ 818D875
|
||||
PalletTown_RivalsHouse_Text_DontNeedAnyGrooming::
|
||||
.string "You don't need any grooming done?\n"
|
||||
.string "Okay, we'll just have tea.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_GroomWhichOne:: @ 818D8B2
|
||||
PalletTown_RivalsHouse_Text_GroomWhichOne::
|
||||
.string "Which one should I groom?$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_LookingNiceInNoTime:: @ 818D8CC
|
||||
PalletTown_RivalsHouse_Text_LookingNiceInNoTime::
|
||||
.string "DAISY: Okay, I'll get it looking\n"
|
||||
.string "nice in no time.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: @ 818D8FE
|
||||
PalletTown_RivalsHouse_Text_ThereYouGoAllDone::
|
||||
.string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p"
|
||||
.string "{SIZE}ÈDAISY: There you go! All done.\n"
|
||||
.string "See? Doesn't it look nice?\p"
|
||||
.string "Giggle…\n"
|
||||
.string "It's such a cute POKéMON.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_CantGroomAnEgg:: @ 818D97B
|
||||
PalletTown_RivalsHouse_Text_CantGroomAnEgg::
|
||||
.string "Oh, sorry. I honestly can't\n"
|
||||
.string "groom an EGG.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_MayISeeFirstMon:: @ 818D9A5
|
||||
PalletTown_RivalsHouse_Text_MayISeeFirstMon::
|
||||
.string "DAISY: Your POKéMON grow to love\n"
|
||||
.string "you if you raise them with love.\p"
|
||||
.string "For example, {PLAYER}, may I see\n"
|
||||
.string "your first POKéMON?$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_CouldntLoveYouMore:: @ 818DA16
|
||||
PalletTown_RivalsHouse_Text_CouldntLoveYouMore::
|
||||
.string "It couldn't possibly love you\n"
|
||||
.string "any more than it does now.\p"
|
||||
.string "Your POKéMON is happy beyond\n"
|
||||
.string "words.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_ItLooksVeryHappy:: @ 818DA73
|
||||
PalletTown_RivalsHouse_Text_ItLooksVeryHappy::
|
||||
.string "It looks very happy.\p"
|
||||
.string "I wish {RIVAL} could see this and\n"
|
||||
.string "learn something from it.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_ItsQuiteFriendly:: @ 818DABE
|
||||
PalletTown_RivalsHouse_Text_ItsQuiteFriendly::
|
||||
.string "It's quite friendly with you.\n"
|
||||
.string "Keep being good to it!$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_ItsWarmingUpToYou:: @ 818DAF3
|
||||
PalletTown_RivalsHouse_Text_ItsWarmingUpToYou::
|
||||
.string "It's warming up to you.\n"
|
||||
.string "Trust must be growing between you.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet:: @ 818DB2E
|
||||
PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet::
|
||||
.string "It's not quite familiar with you\n"
|
||||
.string "yet.\p"
|
||||
.string "POKéMON are all quite wary when\n"
|
||||
.string "you first get them.$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou:: @ 818DB88
|
||||
PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou::
|
||||
.string "{PLAYER}, I don't like the way it\n"
|
||||
.string "glares at you.\p"
|
||||
.string "Could you try being a little nicer\n"
|
||||
.string "to it?$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch:: @ 818DBDD
|
||||
PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch::
|
||||
.string "…Um, it's not easy for me to say\n"
|
||||
.string "this, but…\p"
|
||||
.string "Is there some reason why your\n"
|
||||
.string "POKéMON would hate you so much?$"
|
||||
|
||||
PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy:: @ 818DC47
|
||||
PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy::
|
||||
.string "“The lovely and sweet\n"
|
||||
.string "CLEFAIRY”$"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user