Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add macros for map script terminators #1876

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+640 −630
Open

Add macros for map script terminators #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9789386
Add macros for map script terminators
GriffinRichards Mar 24, 2023
91868a5
Merge branch 'master' into map-script-end
GriffinRichards Aug 9, 2023
adfeb7e
Merge branch 'master' into map-script-end
GriffinRichards Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions asm/macros/map.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,23 @@
.4byte \script
.endm

@ Terminates a list of map_script entries
.macro end_map_scripts
.byte 0
.endm

@ Defines an entry in a map script table (for either ON_WARP_INTO_MAP_TABLE or ON_FRAME_TABLE)
.macro map_script_2 var:req, compare:req, script:req
.2byte \var
.2byte \compare
.4byte \script
.endm

@ Terminates a list of map_script_2 entries
.macro end_map_script_table
.2byte 0
.endm

@ Defines an object event template for map data, to be used by a normal object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
.macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
.byte \index
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_CaptainsOffice/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AbandonedShip_CaptainsOffice_MapScripts::
.byte 0
end_map_scripts

AbandonedShip_CaptainsOffice_EventScript_CaptSternAide::
lock
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Corridors_1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AbandonedShip_Corridors_1F_MapScripts::
.byte 0
end_map_scripts

AbandonedShip_Corridors_1F_EventScript_Youngster::
msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Corridors_B1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AbandonedShip_Corridors_B1F_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_OnResume
map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_OnLoad
.byte 0
end_map_scripts

AbandonedShip_Corridors_B1F_OnResume:
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 5, 4
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Deck/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AbandonedShip_Deck_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition
.byte 0
end_map_scripts

AbandonedShip_Deck_OnTransition:
setflag FLAG_LANDMARK_ABANDONED_SHIP
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AbandonedShip_HiddenFloorCorridors_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_OnResume
map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_OnLoad
.byte 0
end_map_scripts

AbandonedShip_HiddenFloorCorridors_OnResume:
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 5, 4
Expand Down
4 changes: 2 additions & 2 deletions data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
AbandonedShip_HiddenFloorRooms_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_OnFrame
.byte 0
end_map_scripts

AbandonedShip_HiddenFloorRooms_OnFrame:
map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle
.2byte 0
end_map_script_table

@ After the below calculation, VAR_TEMP_4 is the room number of the door the player entered
@ Bottom row, left column (Rm 1)
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Room_B1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
AbandonedShip_Room_B1F_MapScripts::
.byte 0
end_map_scripts

2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Rooms2_1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AbandonedShip_Rooms2_1F_MapScripts::
.byte 0
end_map_scripts

AbandonedShip_Rooms2_1F_EventScript_Dan::
trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanIntro, AbandonedShip_Rooms2_1F_Text_DanDefeat, AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterDan
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AbandonedShip_Rooms2_B1F_MapScripts::
.byte 0
end_map_scripts

AbandonedShip_Rooms2_B1F_EventScript_Camper::
msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Rooms_1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AbandonedShip_Rooms_1F_MapScripts::
.byte 0
end_map_scripts

AbandonedShip_Rooms_1F_EventScript_Gentleman::
msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Rooms_B1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AbandonedShip_Rooms_B1F_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_OnResume
.byte 0
end_map_scripts

AbandonedShip_Rooms_B1F_OnResume:
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 17, 4
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Underwater1/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AbandonedShip_Underwater1_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_OnResume
.byte 0
end_map_scripts

AbandonedShip_Underwater1_OnResume:
setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 0, 10
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Underwater2/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AbandonedShip_Underwater2_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_OnResume
.byte 0
end_map_scripts

AbandonedShip_Underwater2_OnResume:
setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 13, 7
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AlteringCave/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AlteringCave_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_OnTransition
.byte 0
end_map_scripts

AlteringCave_OnTransition:
setflag FLAG_LANDMARK_ALTERING_CAVE
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AncientTomb/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AncientTomb_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, AncientTomb_OnResume
map_script MAP_SCRIPT_ON_LOAD, AncientTomb_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
.byte 0
end_map_scripts

AncientTomb_OnResume:
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_TryRemoveRegisteel
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AquaHideout_1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AquaHideout_1F_MapScripts::
.byte 0
end_map_scripts

@ The below two entrance guards give hints about what to do to progress the story
AquaHideout_1F_EventScript_HideoutEntranceGrunt1::
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AquaHideout_B1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AquaHideout_B1F_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition
.byte 0
end_map_scripts

AquaHideout_B1F_OnResume:
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_TryRemoveElectrode
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AquaHideout_B2F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

AquaHideout_B2F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_OnTransition
.byte 0
end_map_scripts

AquaHideout_B2F_OnTransition:
call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_PreventMattNoticing
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AquaHideout_UnusedRubyMap1/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
AquaHideout_UnusedRubyMap1_MapScripts::
.byte 0
end_map_scripts

2 changes: 1 addition & 1 deletion data/maps/AquaHideout_UnusedRubyMap2/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
AquaHideout_UnusedRubyMap2_MapScripts::
.byte 0
end_map_scripts

2 changes: 1 addition & 1 deletion data/maps/AquaHideout_UnusedRubyMap3/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
AquaHideout_UnusedRubyMap3_MapScripts::
.byte 0
end_map_scripts

2 changes: 1 addition & 1 deletion data/maps/ArtisanCave_1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ArtisanCave_1F_MapScripts::
.byte 0
end_map_scripts

2 changes: 1 addition & 1 deletion data/maps/ArtisanCave_B1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ArtisanCave_B1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_OnTransition
.byte 0
end_map_scripts

ArtisanCave_B1F_OnTransition:
setflag FLAG_LANDMARK_ARTISAN_CAVE
Expand Down
2 changes: 1 addition & 1 deletion data/maps/BattleColosseum_2P/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BattleColosseum_2P_MapScripts::
.byte 0
end_map_scripts

2 changes: 1 addition & 1 deletion data/maps/BattleColosseum_4P/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
BattleColosseum_4P_MapScripts::
.byte 0
end_map_scripts

6 changes: 3 additions & 3 deletions data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_OnWarp
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_OnResume
.byte 0
end_map_scripts

@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_1
Expand Down Expand Up @@ -42,7 +42,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale::

BattleFrontier_BattleArenaBattleRoom_OnFrame:
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom
.2byte 0
end_map_script_table

BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom::
lockall
Expand Down Expand Up @@ -466,7 +466,7 @@ BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight2:

BattleFrontier_BattleArenaBattleRoom_OnWarp:
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects
.2byte 0
end_map_script_table

BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects::
hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
Expand Down
4 changes: 2 additions & 2 deletions data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

BattleFrontier_BattleArenaCorridor_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_OnFrame
.byte 0
end_map_scripts

BattleFrontier_BattleArenaCorridor_OnFrame:
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom
.2byte 0
end_map_script_table

BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom::
delay 16
Expand Down
6 changes: 3 additions & 3 deletions data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
BattleFrontier_BattleArenaLobby_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_OnWarp
.byte 0
end_map_scripts

BattleFrontier_BattleArenaLobby_OnWarp:
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth
.2byte 0
end_map_script_table

BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth::
setvar VAR_TEMP_1, 1
Expand All @@ -20,7 +20,7 @@ BattleFrontier_BattleArenaLobby_OnFrame:
map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge
map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_WON, BattleFrontier_BattleArenaLobby_EventScript_WonChallenge
map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST, BattleFrontier_BattleArenaLobby_EventScript_LostChallenge
.2byte 0
end_map_script_table

BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus::
frontier_getstatus
Expand Down
6 changes: 3 additions & 3 deletions data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_OnWarp
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_OnResume
.byte 0
end_map_scripts

BattleFrontier_BattleDomeBattleRoom_OnTransition:
dome_setopponentgfx
Expand All @@ -40,7 +40,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale::

BattleFrontier_BattleDomeBattleRoom_OnFrame:
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom
.2byte 0
end_map_script_table

BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom::
lockall
Expand Down Expand Up @@ -459,7 +459,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle::

BattleFrontier_BattleDomeBattleRoom_OnWarp:
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects
.2byte 0
end_map_script_table

BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects::
hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
Expand Down
4 changes: 2 additions & 2 deletions data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

BattleFrontier_BattleDomeCorridor_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_OnFrame
.byte 0
end_map_scripts

BattleFrontier_BattleDomeCorridor_OnFrame:
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor
.2byte 0
end_map_script_table

BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor::
delay 16
Expand Down
6 changes: 3 additions & 3 deletions data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ BattleFrontier_BattleDomeLobby_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_OnResume
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
.byte 0
end_map_scripts

BattleFrontier_BattleDomeLobby_OnResume:
dome_initresultstree
end

BattleFrontier_BattleDomeLobby_OnWarp:
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth
.2byte 0
end_map_script_table

BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth::
setvar VAR_TEMP_1, 1
Expand All @@ -26,7 +26,7 @@ BattleFrontier_BattleDomeLobby_OnFrame:
map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge
map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_WON, BattleFrontier_BattleDomeLobby_EventScript_WonChallenge
map_script_2 VAR_TEMP_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST, BattleFrontier_BattleDomeLobby_EventScript_LostChallenge
.2byte 0
end_map_script_table

BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus::
frontier_getstatus
Expand Down
6 changes: 3 additions & 3 deletions data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
BattleFrontier_BattleDomePreBattleRoom_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnWarp
.byte 0
end_map_scripts

BattleFrontier_BattleDomePreBattleRoom_OnWarp:
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth
.2byte 0
end_map_script_table

BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth::
setvar VAR_TEMP_1, 1
Expand All @@ -16,7 +16,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth::

BattleFrontier_BattleDomePreBattleRoom_OnFrame:
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom
.2byte 0
end_map_script_table

BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom::
goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
Expand Down
6 changes: 3 additions & 3 deletions data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnFrame
.byte 0
end_map_scripts

@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_F
Expand All @@ -33,7 +33,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj::

BattleFrontier_BattleFactoryBattleRoom_OnWarp:
map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects
.2byte 0
end_map_script_table

BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects::
setvar VAR_TEMP_1, 1
Expand All @@ -53,7 +53,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale::

BattleFrontier_BattleFactoryBattleRoom_OnFrame:
map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom
.2byte 0
end_map_script_table

BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle::
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn, MSGBOX_DEFAULT
Expand Down
Loading