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/CeladonCity_GameCorner/scripts.inc
+67 -67
View File
@@ -1,14 +1,14 @@
.set LOCALID_GRUNT, 11
CeladonCity_GameCorner_MapScripts:: @ 816C646
CeladonCity_GameCorner_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad
.byte 0
CeladonCity_GameCorner_OnLoad:: @ 816C64C
CeladonCity_GameCorner_OnLoad::
call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_HideRocketHideout
end
CeladonCity_GameCorner_EventScript_HideRocketHideout:: @ 816C656
CeladonCity_GameCorner_EventScript_HideRocketHideout::
setmetatile 15, 2, METATILE_GameCorner_Floor_ShadeFull, 0
setmetatile 16, 2, METATILE_GameCorner_Floor_ShadeFull, 0
setmetatile 17, 2, METATILE_GameCorner_Floor_ShadeFull, 0
@@ -16,11 +16,11 @@ CeladonCity_GameCorner_EventScript_HideRocketHideout:: @ 816C656
setmetatile 17, 3, METATILE_GameCorner_PurpleWall_Floor, 1
return
CeladonCity_GameCorner_EventScript_InfoClerk:: @ 816C684
CeladonCity_GameCorner_EventScript_InfoClerk::
msgbox CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor, MSGBOX_NPC
end
CeladonCity_GameCorner_EventScript_CoinsClerk:: @ 816C68D
CeladonCity_GameCorner_EventScript_CoinsClerk::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
@@ -37,7 +37,7 @@ CeladonCity_GameCorner_EventScript_CoinsClerk:: @ 816C68D
case 127, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy
end
CeladonCity_GameCorner_EventScript_BuyCoins:: @ 816C6E6
CeladonCity_GameCorner_EventScript_BuyCoins::
goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_ClerkNoCoinCase
compare VAR_0x8009, 0
goto_if_eq CeladonCity_GameCorner_EventScript_Buy50Coins
@@ -45,7 +45,7 @@ CeladonCity_GameCorner_EventScript_BuyCoins:: @ 816C6E6
goto_if_eq CeladonCity_GameCorner_EventScript_Buy500Coins
end
CeladonCity_GameCorner_EventScript_Buy500Coins:: @ 816C706
CeladonCity_GameCorner_EventScript_Buy500Coins::
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, (MAX_COINS + 1) - 500
goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
@@ -57,7 +57,7 @@ CeladonCity_GameCorner_EventScript_Buy500Coins:: @ 816C706
goto CeladonCity_GameCorner_EventScript_BoughtCoins
end
CeladonCity_GameCorner_EventScript_Buy50Coins:: @ 816C734
CeladonCity_GameCorner_EventScript_Buy50Coins::
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, (MAX_COINS + 1) - 50
goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
@@ -69,7 +69,7 @@ CeladonCity_GameCorner_EventScript_Buy50Coins:: @ 816C734
goto CeladonCity_GameCorner_EventScript_BoughtCoins
end
CeladonCity_GameCorner_EventScript_BoughtCoins:: @ 816C762
CeladonCity_GameCorner_EventScript_BoughtCoins::
updatemoneybox 0, 0, 0
updatecoinsbox 0, 5
playse SE_SHOP
@@ -77,54 +77,54 @@ CeladonCity_GameCorner_EventScript_BoughtCoins:: @ 816C762
goto CeladonCity_GameCorner_EventScript_ClerkEnd
end
CeladonCity_GameCorner_EventScript_ClerkEnd:: @ 816C77A
CeladonCity_GameCorner_EventScript_ClerkEnd::
hidemoneybox 0, 0
hidecoinsbox 0, 5
release
end
CeladonCity_GameCorner_EventScript_ClerkDeclineBuy:: @ 816C782
CeladonCity_GameCorner_EventScript_ClerkDeclineBuy::
msgbox CeladonCity_GameCorner_Text_ComePlaySometime
goto CeladonCity_GameCorner_EventScript_ClerkEnd
end
CeladonCity_GameCorner_EventScript_ClerkNoCoinCase:: @ 816C790
CeladonCity_GameCorner_EventScript_ClerkNoCoinCase::
msgbox CeladonCity_GameCorner_Text_SorryDontHaveCoinCase
goto CeladonCity_GameCorner_EventScript_ClerkEnd
end
CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins:: @ 816C79E
CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins::
msgbox CeladonCity_GameCorner_Text_CoinCaseIsFull
goto CeladonCity_GameCorner_EventScript_ClerkEnd
end
CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney:: @ 816C7AC
CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney::
msgbox CeladonCity_GameCorner_Text_CantAffordCoins
goto CeladonCity_GameCorner_EventScript_ClerkEnd
end
CeladonCity_GameCorner_EventScript_BaldingMan:: @ 816C7BA
CeladonCity_GameCorner_EventScript_BaldingMan::
lock
faceplayer
msgbox CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_FaceSlotMachine:: @ 816C7CA
CeladonCity_GameCorner_EventScript_FaceSlotMachine::
closemessage
applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection
waitmovement 0
release
end
CeladonCity_GameCorner_EventScript_Woman1:: @ 816C7D7
CeladonCity_GameCorner_EventScript_Woman1::
lock
faceplayer
msgbox CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_Fisher:: @ 816C7E7
CeladonCity_GameCorner_EventScript_Fisher::
lock
faceplayer
goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins
@@ -142,23 +142,23 @@ CeladonCity_GameCorner_EventScript_Fisher:: @ 816C7E7
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins:: @ 816C82B
CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins::
msgbox CeladonCity_GameCorner_Text_DontNeedMyCoins
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_GamblerNoCoinCase:: @ 816C839
CeladonCity_GameCorner_EventScript_GamblerNoCoinCase::
textcolor 3
msgbox CeladonCity_GameCorner_Text_DontHaveCoinCase
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins:: @ 816C849
CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins::
msgbox CeladonCity_GameCorner_Text_WinsComeAndGo
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_GymGuy:: @ 816C857
CeladonCity_GameCorner_EventScript_GymGuy::
lock
faceplayer
goto_if_set FLAG_DEFEATED_ERIKA, CeladonCity_GameCorner_EventScript_GymGuyPostVictory
@@ -166,26 +166,26 @@ CeladonCity_GameCorner_EventScript_GymGuy:: @ 816C857
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_GymGuyPostVictory:: @ 816C870
CeladonCity_GameCorner_EventScript_GymGuyPostVictory::
msgbox CeladonCity_GameCorner_Text_RareMonsForCoins
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_Woman2:: @ 816C87E
CeladonCity_GameCorner_EventScript_Woman2::
lock
faceplayer
msgbox CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_OldMan:: @ 816C88E
CeladonCity_GameCorner_EventScript_OldMan::
lock
faceplayer
msgbox CeladonCity_GameCorner_Text_SoEasyToGetHooked
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_Scientist:: @ 816C89E
CeladonCity_GameCorner_EventScript_Scientist::
lock
faceplayer
goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins
@@ -203,17 +203,17 @@ CeladonCity_GameCorner_EventScript_Scientist:: @ 816C89E
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins:: @ 816C8E2
CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins::
msgbox CeladonCity_GameCorner_Text_YouHaveLotsOfCoins
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins:: @ 816C8F0
CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins::
msgbox CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_Gentleman:: @ 816C8FE
CeladonCity_GameCorner_EventScript_Gentleman::
lock
faceplayer
goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins
@@ -231,27 +231,27 @@ CeladonCity_GameCorner_EventScript_Gentleman:: @ 816C8FE
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins:: @ 816C942
CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins::
msgbox CeladonCity_GameCorner_Text_YouveGotPlentyCoins
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins:: @ 816C950
CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins::
msgbox CeladonCity_GameCorner_Text_WatchReelsClosely
goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine0:: @ 816C95E
CeladonCity_GameCorner_EventScript_SlotMachine0::
lockall
setvar VAR_0x8004, 0
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_DontPlaySlotMachine:: @ 816C96A
CeladonCity_GameCorner_EventScript_DontPlaySlotMachine::
releaseall
end
CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
CeladonCity_GameCorner_EventScript_SlotMachine::
goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase
msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO
compare VAR_RESULT, NO
@@ -266,145 +266,145 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
releaseall
end
CeladonCity_GameCorner_EventScript_SlotMachine1:: @ 816C9A4
CeladonCity_GameCorner_EventScript_SlotMachine1::
lockall
setvar VAR_0x8004, 1
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine2:: @ 816C9B0
CeladonCity_GameCorner_EventScript_SlotMachine2::
lockall
setvar VAR_0x8004, 2
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine3:: @ 816C9BC
CeladonCity_GameCorner_EventScript_SlotMachine3::
lockall
setvar VAR_0x8004, 3
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine4:: @ 816C9C8
CeladonCity_GameCorner_EventScript_SlotMachine4::
lockall
setvar VAR_0x8004, 4
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine5:: @ 816C9D4
CeladonCity_GameCorner_EventScript_SlotMachine5::
lockall
setvar VAR_0x8004, 5
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine6:: @ 816C9E0
CeladonCity_GameCorner_EventScript_SlotMachine6::
lockall
setvar VAR_0x8004, 6
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine7:: @ 816C9EC
CeladonCity_GameCorner_EventScript_SlotMachine7::
lockall
setvar VAR_0x8004, 7
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine8:: @ 816C9F8
CeladonCity_GameCorner_EventScript_SlotMachine8::
lockall
setvar VAR_0x8004, 8
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine9:: @ 816CA04
CeladonCity_GameCorner_EventScript_SlotMachine9::
lockall
setvar VAR_0x8004, 9
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine10:: @ 816CA10
CeladonCity_GameCorner_EventScript_SlotMachine10::
lockall
setvar VAR_0x8004, 10
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine11:: @ 816CA1C
CeladonCity_GameCorner_EventScript_SlotMachine11::
lockall
setvar VAR_0x8004, 11
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine12:: @ 816CA28
CeladonCity_GameCorner_EventScript_SlotMachine12::
lockall
setvar VAR_0x8004, 12
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine13:: @ 816CA34
CeladonCity_GameCorner_EventScript_SlotMachine13::
lockall
setvar VAR_0x8004, 13
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine14:: @ 816CA40
CeladonCity_GameCorner_EventScript_SlotMachine14::
lockall
setvar VAR_0x8004, 14
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine15:: @ 816CA4C
CeladonCity_GameCorner_EventScript_SlotMachine15::
lockall
setvar VAR_0x8004, 15
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine16:: @ 816CA58
CeladonCity_GameCorner_EventScript_SlotMachine16::
lockall
setvar VAR_0x8004, 16
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine17:: @ 816CA64
CeladonCity_GameCorner_EventScript_SlotMachine17::
lockall
setvar VAR_0x8004, 17
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine18:: @ 816CA70
CeladonCity_GameCorner_EventScript_SlotMachine18::
lockall
setvar VAR_0x8004, 18
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine19:: @ 816CA7C
CeladonCity_GameCorner_EventScript_SlotMachine19::
lockall
setvar VAR_0x8004, 19
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine20:: @ 816CA88
CeladonCity_GameCorner_EventScript_SlotMachine20::
lockall
setvar VAR_0x8004, 20
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachine21:: @ 816CA94
CeladonCity_GameCorner_EventScript_SlotMachine21::
lockall
setvar VAR_0x8004, 21
goto CeladonCity_GameCorner_EventScript_SlotMachine
end
CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase:: @ 816CAA0
CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase::
msgbox CeladonCity_GameCorner_Text_CoinCaseIsRequired
releaseall
end
CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA
CeladonCity_GameCorner_EventScript_Poster::
lockall
msgbox CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt
call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_OpenRocketHideout
releaseall
end
CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE
CeladonCity_GameCorner_EventScript_OpenRocketHideout::
playse SE_UNLOCK
setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0
setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1
@@ -415,12 +415,12 @@ CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE
setflag FLAG_OPENED_ROCKET_HIDEOUT
return
CeladonCity_GameCorner_EventScript_RocketGrunt:: @ 816CAF5
CeladonCity_GameCorner_EventScript_RocketGrunt::
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, CeladonCity_GameCorner_Text_GruntIntro, CeladonCity_GameCorner_Text_GruntDefeat, CeladonCity_GameCorner_Text_DefeatedGrunt
msgbox CeladonCity_GameCorner_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
end
CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10
CeladonCity_GameCorner_Text_DefeatedGrunt::
msgbox CeladonCity_GameCorner_Text_GruntPostBattle
closemessage
compare VAR_FACING, DIR_WEST
@@ -431,17 +431,17 @@ CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10
release
end
CeladonCity_GameCorner_Text_GruntExitWest:: @ 816CB34
CeladonCity_GameCorner_Text_GruntExitWest::
applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest
waitmovement 0
return
CeladonCity_GameCorner_Text_GruntExit:: @ 816CB3F
CeladonCity_GameCorner_Text_GruntExit::
applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExit
waitmovement 0
return
CeladonCity_GameCorner_Movement_GruntExitWest:: @ 816CB4A
CeladonCity_GameCorner_Movement_GruntExitWest::
walk_down
walk_right
walk_right
@@ -452,7 +452,7 @@ CeladonCity_GameCorner_Movement_GruntExitWest:: @ 816CB4A
walk_right
step_end
CeladonCity_GameCorner_Movement_GruntExit:: @ 816CB53
CeladonCity_GameCorner_Movement_GruntExit::
walk_right
walk_right
walk_right
@@ -461,14 +461,14 @@ CeladonCity_GameCorner_Movement_GruntExit:: @ 816CB53
walk_right
step_end
CeladonCity_GameCorner_EventScript_UnusableSlotMachine1:: @ 816CB5A
CeladonCity_GameCorner_EventScript_UnusableSlotMachine1::
msgbox CeladonCity_GameCorner_Text_OutOfOrder, MSGBOX_SIGN
end
CeladonCity_GameCorner_EventScript_UnusableSlotMachine2:: @ 816CB63
CeladonCity_GameCorner_EventScript_UnusableSlotMachine2::
msgbox CeladonCity_GameCorner_Text_OutToLunch, MSGBOX_SIGN
end
CeladonCity_GameCorner_EventScript_UnusableSlotMachine3:: @ 816CB6C
CeladonCity_GameCorner_EventScript_UnusableSlotMachine3::
msgbox CeladonCity_GameCorner_Text_SomeonesKeys, MSGBOX_SIGN
end