dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into constants-fade

Browse Source
This commit is contained in:
GriffinR
2019-12-17 19:11:51 -05:00
committed by GitHub
parent 96ec5e1b84 edb5df1716
commit 4879c1eab2
45 changed files with 2801 additions and 2658 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+81 -64
View File
@@ -1,51 +1,52 @@
SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E5B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_MapScript2_208E31
map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_OnWarp
.byte 0
SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31
map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_208E3B
@ This is Slateport Tent's version of the Battle Factory Pre-Battle Room
SlateportCity_BattleTentCorridor_OnWarp: @ 8208E31
map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_SetUpObjects
.2byte 0
SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B
SlateportCity_BattleTentCorridor_EventScript_SetUpObjects:: @ 8208E3B
setvar VAR_TEMP_1, 1
compare VAR_0x8006, 1
goto_if_ne SlateportCity_BattleTentCorridor_EventScript_208E56
goto_if_ne SlateportCity_BattleTentCorridor_EventScript_TurnPlayerNorth
setobjectxy 1, 2, 2
turnobject 1, DIR_SOUTH
SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56
SlateportCity_BattleTentCorridor_EventScript_TurnPlayerNorth:: @ 8208E56
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
end
SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B
map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_208E65
SlateportCity_BattleTentCorridor_OnFrame: @ 8208E5B
map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_EnterCorridor
.2byte 0
SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
SlateportCity_BattleTentCorridor_EventScript_EnterCorridor:: @ 8208E65
compare VAR_0x8006, 1
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EEE
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle
setvar VAR_TEMP_0, 1
applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059
applymovement 1, SlateportCity_BattleTentCorridor_Movement_AttendantEnter
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_PlayerEnter
waitmovement 0
compare VAR_0x8006, 2
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_ResumeChallenge
slateporttent_generaterentalmons
slateporttent_generateopponentmons
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
slateporttent_rentmons
waitstate
SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom:: @ 8208EB4
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
closemessage
applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
opendoor 2, 1
waitdooranim
applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_20905E
applymovement 1, SlateportCity_BattleTentCorridor_Movement_AttendantExit
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_PlayerExit
waitmovement 0
closedoor 2, 1
waitdooranim
@@ -53,69 +54,69 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
waitstate
end
SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE
SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle:: @ 8208EEE
factory_setopponentmons
factory_resethelditems
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D
SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent:: @ 8208F0D
frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 1
call_if_eq SlateportCity_BattleTentCorridor_EventScript_209014
call_if_eq SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent
compare VAR_RESULT, 2
call_if_eq SlateportCity_BattleTentCorridor_EventScript_20901B
call_if_eq SlateportCity_BattleTentCorridor_EventScript_ReadyFor3rdOpponent
multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, 1
switch VAR_RESULT
case 0, SlateportCity_BattleTentCorridor_EventScript_208FBB
case 1, SlateportCity_BattleTentCorridor_EventScript_208F5B
case 2, SlateportCity_BattleTentCorridor_EventScript_208F89
case 0, SlateportCity_BattleTentCorridor_EventScript_AskSwapMon
case 1, SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge
case 2, SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge
SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B
SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge:: @ 8208F5B
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
switch VAR_RESULT
case NO, SlateportCity_BattleTentCorridor_EventScript_208F0D
case YES, SlateportCity_BattleTentCorridor_EventScript_209022
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D
case NO, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
case YES, SlateportCity_BattleTentCorridor_EventScript_PauseChallenge
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89
SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge:: @ 8208F89
message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT
case 1, SlateportCity_BattleTentCorridor_EventScript_208F0D
case 0, SlateportCity_BattleTentCorridor_EventScript_209A1B
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208F0D
case 1, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
case 0, SlateportCity_BattleTent_EventScript_WarpToLobbyLost
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB
SlateportCity_BattleTentCorridor_EventScript_AskSwapMon:: @ 8208FBB
slateporttent_generateopponentmons
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon, MSGBOX_YESNO
switch VAR_RESULT
case NO, SlateportCity_BattleTentCorridor_EventScript_208EB4
case YES, SlateportCity_BattleTentCorridor_EventScript_208FF1
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_208EB4
case NO, SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
case YES, SlateportCity_BattleTentCorridor_EventScript_SwapMons
case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1
SlateportCity_BattleTentCorridor_EventScript_SwapMons:: @ 8208FF1
fadescreen FADE_TO_BLACK
slateporttent_swapmons
waitstate
compare VAR_RESULT, 1
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EB4
goto_if_eq SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
goto SlateportCity_BattleTentCorridor_EventScript_208EB4
goto SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014
SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent:: @ 8209014
message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent
waitmessage
return
SlateportCity_BattleTentCorridor_EventScript_20901B:: @ 820901B
SlateportCity_BattleTentCorridor_EventScript_ReadyFor3rdOpponent:: @ 820901B
message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent
waitmessage
return
SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
SlateportCity_BattleTentCorridor_EventScript_PauseChallenge:: @ 8209022
message BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait
waitmessage
slateporttent_save CHALLENGE_STATUS_PAUSED
@@ -125,25 +126,25 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
frontier_reset
end
SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
SlateportCity_BattleTentCorridor_EventScript_ResumeChallenge:: @ 8209044
special SavePlayerParty
factory_setparties 0
goto SlateportCity_BattleTentCorridor_EventScript_208F0D
goto SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059
SlateportCity_BattleTentCorridor_Movement_PlayerEnter: @ 8209059
walk_up
walk_up
walk_up
walk_up
step_end
SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E
SlateportCity_BattleTentCorridor_Movement_PlayerExit: @ 820905E
walk_up
walk_up
set_invisible
step_end
SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062
SlateportCity_BattleTentCorridor_Movement_AttendantEnter: @ 8209062
walk_up
walk_up
walk_up
@@ -151,12 +152,14 @@ SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062
walk_in_place_fastest_down
step_end
SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068
SlateportCity_BattleTentCorridor_Movement_AttendantExit: @ 8209068
walk_up
set_invisible
step_end
SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B
@ Leftover text from when this was a Contest Hall in R/S
@ Unused
SlateportCity_ContestHall_Text_AdviceForContests: @ 820906B
.string "Want a tasty little bit of advice\n"
.string "for CONTESTS?\p"
.string "Using a certain move after another\n"
@@ -167,12 +170,14 @@ SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B
.string "Of course, your opponents might try\n"
.string "disrupting your POKéMON's showing.$"
SlateportCity_BattleTentCorridor_Text_20917A: @ 820917A
@ Unused
SlateportCity_ContestHall_Text_MyPapaIsContestJudge: @ 820917A
.string "My papa, he's a CONTEST JUDGE.\p"
.string "I wonder what I should be when I\n"
.string "grow up, a JUDGE or a GYM LEADER?$"
SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC
@ Unused
SlateportCity_ContestHall_Text_ImLikeMajorlyCheesed: @ 82091DC
.string "Hey, man, I'm like majorly cheesed,\n"
.string "you know. Like, you know, I just\l"
.string "wanted to know why my POKéMON\l"
@@ -184,7 +189,8 @@ SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC
.string "Hey, like, you! Zip it, you know?\n"
.string "Just, you know, take this!$"
SlateportCity_BattleTentCorridor_Text_209322: @ 8209322
@ Unused
SlateportCity_ContestHall_Text_ExplainTorment: @ 8209322
.string "That's, like, TM41, you know?\n"
.string "Hey, it's TORMENT, you hearing me?\p"
.string "Like, it won't let the other guy\n"
@@ -192,7 +198,8 @@ SlateportCity_BattleTentCorridor_Text_209322: @ 8209322
.string "Hey, now, you listen here, like,\n"
.string "I'm not laying a torment on you!$"
SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED
@ Unused
SlateportCity_ContestHall_Text_MCStepUpTakePartInContest: @ 82093ED
.string "MC: Oh, my, my!\n"
.string "Now isn't that a dandy of a POKéMON?\p"
.string "Please! Do step right up and take\n"
@@ -200,7 +207,8 @@ SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED
.string "You'll do well! I'm sure of it!\n"
.string "My eyes have never failed me!$"
SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1
@ Unused
SlateportCity_ContestHall_Text_JudgeWouldntDoToMissContest: @ 82094A1
.string "JUDGE: Well, hello there!\n"
.string "I see that you're a TRAINER!\p"
.string "Then, it just wouldn't do for you\n"
@@ -208,17 +216,20 @@ SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1
.string "Get a CONTEST PASS in VERDANTURF\n"
.string "CITY and enter anytime!$"
SlateportCity_BattleTentCorridor_Text_20954E: @ 820954E
@ Unused
SlateportCity_ContestHall_Text_ItsAppealTime: @ 820954E
.string "It's appeal time!\n"
.string "What should I lead with?$"
SlateportCity_BattleTentCorridor_Text_209579: @ 8209579
@ Unused
SlateportCity_ContestHall_Text_DidntPayAttentionToAppeal: @ 8209579
.string "They didn't pay much attention to\n"
.string "my POKéMON's appeal…\p"
.string "Humph, that JUDGE, he doesn't know\n"
.string "a good thing when he sees it.$"
SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1
@ Unused
SlateportCity_ContestHall_Text_RewardWithSageAdvice: @ 82095F1
.string "Oh, hi! You must be a serious fan to get\n"
.string "this close to the action.\p"
.string "I'll reward your enthusiasm with\n"
@@ -230,35 +241,41 @@ SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1
.string "Well, you'd think something good has\n"
.string "to happen!$"
SlateportCity_BattleTentCorridor_Text_209718: @ 8209718
@ Unused
SlateportCity_ContestHall_Text_MoreFreakedOutThanMon: @ 8209718
.string "I can't do this! I'm more freaked out\n"
.string "than my POKéMON.\p"
.string "I'm shivering and my heart is racing!$"
SlateportCity_BattleTentCorridor_Text_209775: @ 8209775
@ Unused
SlateportCity_ContestHall_Text_BattleAndContestAlike: @ 8209775
.string "A battle and a CONTEST aren't the\n"
.string "same, but they are alike, too.\p"
.string "You need to work hard and believe\n"
.string "in the POKéMON you've raised.$"
SlateportCity_BattleTentCorridor_Text_2097F6: @ 82097F6
@ Unused
SlateportCity_ContestHall_Text_MonLooksOnTopOfGame: @ 82097F6
.string "That POKéMON looks like it's on top\n"
.string "of its game, huh?\p"
.string "A POKéMON that does good in the\n"
.string "secondary judging seems to be more\l"
.string "relaxed when it's doing appeals.$"
SlateportCity_BattleTentCorridor_Text_209890: @ 8209890
@ Unused
SlateportCity_ContestHall_Text_MyMonBetterThanThatLot: @ 8209890
.string "Will you look at that sorry sight?\p"
.string "Heh, my POKéMON's absolutely better\n"
.string "than that lot!$"
SlateportCity_BattleTentCorridor_Text_2098E6: @ 82098E6
@ Unused
SlateportCity_ContestHall_Text_GetUrgeToMoveWithMon: @ 82098E6
.string "Don't you get the urge to move with\n"
.string "POKéMON if they're putting on an\l"
.string "energetic appeal?$"
SlateportCity_BattleTentCorridor_Text_20993D: @ 820993D
@ Unused
SlateportCity_ContestHall_Text_HyperRankStage: @ 820993D
.string "POKéMON CONTESTS\n"
.string "HYPER RANK STAGE!$"