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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SevenIsland_House_Room2/scripts.inc
+9 -9
View File
@@ -1,17 +1,17 @@
SevenIsland_House_Room2_MapScripts:: @ 8170A7E
SevenIsland_House_Room2_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room2_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room2_OnFrame
.byte 0
SevenIsland_House_Room2_OnTransition:: @ 8170A89
SevenIsland_House_Room2_OnTransition::
special SetEReaderTrainerGfxId
end
SevenIsland_House_Room2_OnFrame:: @ 8170A8D
SevenIsland_House_Room2_OnFrame::
map_script_2 VAR_TEMP_1, 0, SevenIsland_House_Room2_EventScript_BattleVisitingTrainer
.2byte 0
SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: @ 8170A97
SevenIsland_House_Room2_EventScript_BattleVisitingTrainer::
lockall
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerEnterRoom
waitmovement 0
@@ -39,26 +39,26 @@ SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: @ 8170A97
releaseall
end
SevenIsland_House_Room2_EventScript_BattleTie:: @ 8170AFE
SevenIsland_House_Room2_EventScript_BattleTie::
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3
msgbox SevenIsland_House_Room2_Text_MatchEndedUpDraw
return
SevenIsland_House_Room2_EventScript_BattleWon:: @ 8170B0C
SevenIsland_House_Room2_EventScript_BattleWon::
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
return
SevenIsland_House_Room2_EventScript_BattleLost:: @ 8170B17
SevenIsland_House_Room2_EventScript_BattleLost::
setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
special ShowFieldMessageStringVar4
waitmessage
waitbuttonpress
return
SevenIsland_House_Room2_Movement_PlayerEnterRoom:: @ 8170B22
SevenIsland_House_Room2_Movement_PlayerEnterRoom::
walk_down
walk_down
walk_down
@@ -66,7 +66,7 @@ SevenIsland_House_Room2_Movement_PlayerEnterRoom:: @ 8170B22
walk_right
step_end
SevenIsland_House_Room2_Movement_PlayerExitRoom:: @ 8170B28
SevenIsland_House_Room2_Movement_PlayerExitRoom::
walk_left
walk_left
walk_up