dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove address comments

Browse Source
This commit is contained in:
GriffinR
2022-06-24 21:10:48 -04:00
parent d73f39ae40
commit 9cde4e0f74
802 changed files with 20272 additions and 20272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SevenIsland_House_Room1/scripts.inc
+25 -25
View File
@@ -2,12 +2,12 @@
.equ TRAINER_VISITING, VAR_TEMP_1
SevenIsland_House_Room1_MapScripts:: @ 817088A
SevenIsland_House_Room1_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room1_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room1_OnFrame
.byte 0
SevenIsland_House_Room1_OnTransition:: @ 8170895
SevenIsland_House_Room1_OnTransition::
special ValidateEReaderTrainer
compare VAR_RESULT, 0
call_if_eq SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout
@@ -15,25 +15,25 @@ SevenIsland_House_Room1_OnTransition:: @ 8170895
call_if_ne SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor
end
SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout:: @ 81708AF
SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout::
setvar TRAINER_VISITING, TRUE
setobjectxyperm LOCALID_OLD_WOMAN, 4, 2
setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN
setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN
return
SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor:: @ 81708C3
SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor::
setobjectxyperm LOCALID_OLD_WOMAN, 3, 2
setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_RIGHT
return
SevenIsland_House_Room1_OnFrame:: @ 81708CF
SevenIsland_House_Room1_OnFrame::
map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle
map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle
map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle
.2byte 0
SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: @ 1708E9
SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle::
lockall
textcolor 1
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom
@@ -54,28 +54,28 @@ SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: @ 1708E9
releaseall
end
SevenIsland_House_Room1_EventScript_BattleWonComment:: @ 8170938
SevenIsland_House_Room1_EventScript_BattleWonComment::
msgbox SevenIsland_House_Room1_Text_AstoundingBattle
return
SevenIsland_House_Room1_EventScript_BattleLostComment:: @ 8170941
SevenIsland_House_Room1_EventScript_BattleLostComment::
msgbox SevenIsland_House_Room1_Text_FeelYourDisappointment
return
SevenIsland_House_Room1_EventScript_BattleTiedComment:: @ 817094A
SevenIsland_House_Room1_EventScript_BattleTiedComment::
msgbox SevenIsland_House_Room1_Text_DrawWasIt
return
SevenIsland_House_Room1_Movement_PlayerReEnterRoom:: @ 8170953
SevenIsland_House_Room1_Movement_PlayerReEnterRoom::
walk_down
step_end
SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer:: @ 8170955
SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer::
walk_right
walk_in_place_fastest_down
step_end
SevenIsland_House_Room1_EventScript_OldWoman:: @ 8170958
SevenIsland_House_Room1_EventScript_OldWoman::
lock
faceplayer
special ValidateEReaderTrainer
@@ -87,12 +87,12 @@ SevenIsland_House_Room1_EventScript_OldWoman:: @ 8170958
release
end
SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer:: @ 817097D
SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer::
msgbox SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles
release
end
SevenIsland_House_Room1_EventScript_TrainerVisiting:: @ 8170987
SevenIsland_House_Room1_EventScript_TrainerVisiting::
special SavePlayerParty
special BufferEReaderTrainerName
msgbox SevenIsland_House_Room1_Text_ChallengeVisitingTrainer, MSGBOX_YESNO
@@ -123,65 +123,65 @@ SevenIsland_House_Room1_EventScript_TrainerVisiting:: @ 8170987
release
end
SevenIsland_House_Room1_EventScript_DeclineBattle:: @ 8170A11
SevenIsland_House_Room1_EventScript_DeclineBattle::
special LoadPlayerParty
msgbox SevenIsland_House_Room1_Text_OhYouWontBattle
release
end
SevenIsland_House_Room1_EventScript_ChooseParty:: @ 8170A1E
SevenIsland_House_Room1_EventScript_ChooseParty::
msgbox SevenIsland_House_Room1_Text_LimitThreeMonsPerSide
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
return
SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth:: @ 8170A2D
SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth::
applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth
waitmovement 0
return
SevenIsland_House_Room1_EventScript_EnterBattleRoomEast:: @ 8170A3F
SevenIsland_House_Room1_EventScript_EnterBattleRoomEast::
applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast
waitmovement 0
return
SevenIsland_House_Room1_EventScript_EnterBattleRoomWest:: @ 8170A51
SevenIsland_House_Room1_EventScript_EnterBattleRoomWest::
applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest
waitmovement 0
return
SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth:: @ 8170A63
SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth::
delay_16
walk_up
walk_up
step_end
SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast:: @ 8170A67
SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast::
delay_16
walk_right
walk_up
step_end
SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest:: @ 8170A6B
SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest::
delay_16
walk_left
walk_up
step_end
SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft:: @ 8170A6F
SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft::
walk_left
walk_in_place_fastest_right
step_end
SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight:: @ 8170A72
SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight::
walk_right
walk_in_place_fastest_left
step_end
SevenIsland_House_Room1_EventScript_Box:: @ 8170A75
SevenIsland_House_Room1_EventScript_Box::
msgbox SevenIsland_House_Room1_Text_SlightBreezeAroundBox, MSGBOX_SIGN
end
data/maps/SevenIsland_House_Room1/text.inc
+14 -14
View File
@@ -1,4 +1,4 @@
SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles:: @ 81A049B
SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles::
.string "I may not look like much now,\n"
.string "but when I was younger…\p"
.string "I flew everywhere, challenging\n"
@@ -7,11 +7,11 @@ SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles:: @ 81A049B
.string "is reminiscing about the past while\l"
.string "watching battles.$"
SevenIsland_House_Room1_Text_SlightBreezeAroundBox:: @ 81A0567
SevenIsland_House_Room1_Text_SlightBreezeAroundBox::
.string "There is a slight breeze blowing\n"
.string "around the box.$"
SevenIsland_House_Room1_Text_ChallengeVisitingTrainer:: @ 81A0598
SevenIsland_House_Room1_Text_ChallengeVisitingTrainer::
.string "Ah!\n"
.string "Welcome, my friend!\p"
.string "Let me tell you something. There's\n"
@@ -21,7 +21,7 @@ SevenIsland_House_Room1_Text_ChallengeVisitingTrainer:: @ 81A0598
.string "Tell me, you did come to challenge\n"
.string "{STR_VAR_1}, am I right?$"
SevenIsland_House_Room1_Text_OhYouWontBattle:: @ 81A064E
SevenIsland_House_Room1_Text_OhYouWontBattle::
.string "Oh…\n"
.string "You won't battle…\p"
.string "I see, I see.\n"
@@ -29,7 +29,7 @@ SevenIsland_House_Room1_Text_OhYouWontBattle:: @ 81A064E
.string "Well, perhaps if you change your\n"
.string "mind, do come back.$"
SevenIsland_House_Room1_Text_LimitThreeMonsPerSide:: @ 81A06AB
SevenIsland_House_Room1_Text_LimitThreeMonsPerSide::
.string "Ah!\n"
.string "You will battle for me?\p"
.string "It was worth my time moving the\n"
@@ -41,22 +41,22 @@ SevenIsland_House_Room1_Text_LimitThreeMonsPerSide:: @ 81A06AB
.string "Can I get you to limit it to\n"
.string "battles of three POKéMON per side?$"
SevenIsland_House_Room1_Text_SaveProgressBeforeBattle:: @ 81A0788
SevenIsland_House_Room1_Text_SaveProgressBeforeBattle::
.string "Fine! Before your battle, would\n"
.string "you like to save your game?$"
SevenIsland_House_Room1_Text_DontHoldAnythingBack:: @ 81A07C4
SevenIsland_House_Room1_Text_DontHoldAnythingBack::
.string "All right.\n"
.string "Don't hold anything back!$"
@ Unused
SevenIsland_House_Room1_Text_StrVar1_1:: @ 81A07E9
SevenIsland_House_Room1_Text_StrVar1_1::
.string "{STR_VAR_1}$"
SevenIsland_House_Room2_Text_MatchEndedUpDraw:: @ 81A07EC
SevenIsland_House_Room2_Text_MatchEndedUpDraw::
.string "The match ended up a draw.$"
SevenIsland_House_Room1_Text_DrawWasIt:: @ 81A0807
SevenIsland_House_Room1_Text_DrawWasIt::
.string "A draw, was it?\p"
.string "However, let me say that it was\n"
.string "a worthy spectacle.\p"
@@ -64,10 +64,10 @@ SevenIsland_House_Room1_Text_DrawWasIt:: @ 81A0807
.string "with a real sense of depth!$"
@ Unused
SevenIsland_House_Room1_Text_StrVar1_2:: @ 81A0889
SevenIsland_House_Room1_Text_StrVar1_2::
.string "{STR_VAR_1}$"
SevenIsland_House_Room1_Text_AstoundingBattle:: @ 81A088C
SevenIsland_House_Room1_Text_AstoundingBattle::
.string "Bravo!\p"
.string "Bravo, indeed!\n"
.string "What an astounding battle!\p"
@@ -80,10 +80,10 @@ SevenIsland_House_Room1_Text_AstoundingBattle:: @ 81A088C
.string "It was sheer magnificence!$"
@ Unused
SevenIsland_House_Room1_Text_StrVar1_3:: @ 81A096E
SevenIsland_House_Room1_Text_StrVar1_3::
.string "{STR_VAR_1}$"
SevenIsland_House_Room1_Text_FeelYourDisappointment:: @ 81A0971
SevenIsland_House_Room1_Text_FeelYourDisappointment::
.string "Too bad!\n"
.string "I feel your disappointment.\p"
.string "However, that disappointment is\n"