Renaming: (fix #412)

- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event

constants/event_flags.asm

@@ -130,7 +130,7 @@
 	const EVENT_GOT_TM12_SWEET_SCENT
 	const EVENT_RELEASED_THE_BEASTS
 	const EVENT_GOT_MASTER_BALL_FROM_ELM
-; Johto signpost items
+; Johto hidden items
 	const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
 	const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
 	const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
@@ -236,7 +236,7 @@
 	const EVENT_TALKED_TO_OAK_IN_KANTO
 	const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
 	const EVENT_GOT_TM29_PSYCHIC
-; Kanto signpost items
+; Kanto hidden items
 	const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
 	const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE
 	const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL

constants/map_constants.asm

@@ -176,28 +176,28 @@ const_value = -1
 NUM_SPAWNS EQU const_value
 
 
-; TryReadSign arguments (see engine/events.asm)
+; TryBGEvent arguments (see engine/events.asm)
 	const_def
-	const SIGNPOST_READ
+	const BGEVENT_READ
-	const SIGNPOST_UP
+	const BGEVENT_UP
-	const SIGNPOST_DOWN
+	const BGEVENT_DOWN
-	const SIGNPOST_RIGHT
+	const BGEVENT_RIGHT
-	const SIGNPOST_LEFT
+	const BGEVENT_LEFT
-	const SIGNPOST_IFSET
+	const BGEVENT_IFSET
-	const SIGNPOST_IFNOTSET
+	const BGEVENT_IFNOTSET
-	const SIGNPOST_ITEM
+	const BGEVENT_ITEM
-	const SIGNPOST_COPY
+	const BGEVENT_COPY
 
-; person_event types
+; object_event types
 ; TryObjectEvent arguments (see engine/events.asm)
 	const_def
-	const PERSONTYPE_SCRIPT
+	const OBJECTTYPE_SCRIPT
-	const PERSONTYPE_ITEMBALL
+	const OBJECTTYPE_ITEMBALL
-	const PERSONTYPE_TRAINER
+	const OBJECTTYPE_TRAINER
-	const PERSONTYPE_3
+	const OBJECTTYPE_3
-	const PERSONTYPE_4
+	const OBJECTTYPE_4
-	const PERSONTYPE_5
+	const OBJECTTYPE_5
-	const PERSONTYPE_6
+	const OBJECTTYPE_6
 
 
 ; EmotesPointers indexes (see engine/overworld.asm)

constants/sprite_data_constants.asm

@@ -25,7 +25,7 @@ const_value SET 1
 	const PAL_OW_TREE   ; 6
 	const PAL_OW_ROCK   ; 7
 
-; person_events set bit 3 so as not to use the sprite's default palette
+; object_events set bit 3 so as not to use the sprite's default palette
 const_value set (1 << 3)
 	const PAL_NPC_RED    ; 8
 	const PAL_NPC_BLUE   ; 9
@@ -138,25 +138,25 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const STEP_TYPE_18              ; 18
 	const STEP_TYPE_SKYFALL_TOP     ; 19
 
-; PersonActionPairPointers indexes (see engine/map_object_action.asm)
+; ObjectActionPairPointers indexes (see engine/map_object_action.asm)
 	const_def
-	const PERSON_ACTION_00           ; 00
+	const OBJECT_ACTION_00           ; 00
-	const PERSON_ACTION_STAND        ; 01
+	const OBJECT_ACTION_STAND        ; 01
-	const PERSON_ACTION_STEP         ; 02
+	const OBJECT_ACTION_STEP         ; 02
-	const PERSON_ACTION_BUMP         ; 03
+	const OBJECT_ACTION_BUMP         ; 03
-	const PERSON_ACTION_SPIN         ; 04
+	const OBJECT_ACTION_SPIN         ; 04
-	const PERSON_ACTION_SPIN_FLICKER ; 05
+	const OBJECT_ACTION_SPIN_FLICKER ; 05
-	const PERSON_ACTION_FISHING      ; 06
+	const OBJECT_ACTION_FISHING      ; 06
-	const PERSON_ACTION_SHADOW       ; 07
+	const OBJECT_ACTION_SHADOW       ; 07
-	const PERSON_ACTION_EMOTE        ; 08
+	const OBJECT_ACTION_EMOTE        ; 08
-	const PERSON_ACTION_BIG_SNORLAX  ; 09
+	const OBJECT_ACTION_BIG_SNORLAX  ; 09
-	const PERSON_ACTION_BOUNCE       ; 0a
+	const OBJECT_ACTION_BOUNCE       ; 0a
-	const PERSON_ACTION_WEIRD_TREE   ; 0b
+	const OBJECT_ACTION_WEIRD_TREE   ; 0b
-	const PERSON_ACTION_BIG_LAPRAS   ; 0c
+	const OBJECT_ACTION_BIG_LAPRAS   ; 0c
-	const PERSON_ACTION_BIG_DOLL     ; 0d
+	const OBJECT_ACTION_BIG_DOLL     ; 0d
-	const PERSON_ACTION_BOULDER_DUST ; 0e
+	const OBJECT_ACTION_BOULDER_DUST ; 0e
-	const PERSON_ACTION_GRASS_SHAKE  ; 0f
+	const OBJECT_ACTION_GRASS_SHAKE  ; 0f
-	const PERSON_ACTION_SKYFALL      ; 10
+	const OBJECT_ACTION_SKYFALL      ; 10
 
 ; Facings indexes (see data/facings.asm)
 	const_def

data/engine_flags.asm

@@ -118,7 +118,7 @@ EngineFlags: ; 80462
 	engine_flag WeeklyFlags, 0 ; mt moon square clefairy  ; $58
 	engine_flag WeeklyFlags, 1 ; union cave lapras
 	engine_flag WeeklyFlags, 2 ; goldenrod underground haircut used
-	engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 person07
+	engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07
 	engine_flag WeeklyFlags, 4 ; tea in blues house
 	engine_flag WeeklyFlags, 5 ; indigo plateau rival fight
 	engine_flag WeeklyFlags, 6 ; move tutor

data/map_objects.asm

@@ -6,42 +6,42 @@ endm
 SpriteMovementData:: ; 4273
 ; entries correspond to SPRITEMOVEDATA_* constants
 	; function,                                              facing, action,                  flags1, flags2, palette flags
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 00
+	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 00
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,        $0c,    $00,    %0000 ; 01
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; 01
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 02
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 02
-	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 03
+	sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 03
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 04
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 04
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 05
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X,         DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 05
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 06
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 06
-	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 07
+	sprite_movement_data SPRITEMOVEFN_STANDING,              UP,     OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 07
-	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 08
+	sprite_movement_data SPRITEMOVEFN_STANDING,              LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 08
-	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 09
+	sprite_movement_data SPRITEMOVEFN_STANDING,              RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 09
-	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0a
+	sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN,      DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0a
-	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 0b
+	sprite_movement_data SPRITEMOVEFN_OBEY_DPAD,             DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 0b
-	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0c
+	sprite_movement_data SPRITEMOVEFN_08,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0c
-	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0d
+	sprite_movement_data SPRITEMOVEFN_09,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0d
-	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0e
+	sprite_movement_data SPRITEMOVEFN_0A,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0e
-	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 0f
+	sprite_movement_data SPRITEMOVEFN_0B,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 0f
-	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 10
+	sprite_movement_data SPRITEMOVEFN_0C,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 10
-	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 11
+	sprite_movement_data SPRITEMOVEFN_0D,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 11
-	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 12
+	sprite_movement_data SPRITEMOVEFN_0E,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 12
-	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 13
+	sprite_movement_data SPRITEMOVEFN_FOLLOW,                DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 13
-	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 14
+	sprite_movement_data SPRITEMOVEFN_SCRIPTED,              DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 14
-	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   PERSON_ACTION_BIG_SNORLAX,  $2e,    $01,    %1100 ; 15
+	sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX,           DOWN,   OBJECT_ACTION_BIG_SNORLAX,  $2e,    $01,    %1100 ; 15
-	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   PERSON_ACTION_BOUNCE,       $2e,    $00,    %0000 ; 16
+	sprite_movement_data SPRITEMOVEFN_BOUNCE,                DOWN,   OBJECT_ACTION_BOUNCE,       $2e,    $00,    %0000 ; 16
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,        $0c,    $00,    %0000 ; 17
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $0c,    $00,    %0000 ; 17
-	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   PERSON_ACTION_STAND,        $2e,    $10,    %0000 ; 18
+	sprite_movement_data SPRITEMOVEFN_STANDING,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $10,    %0000 ; 18
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   PERSON_ACTION_STAND,        $2e,    $00,    %0100 ; 19
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_STAND,        $2e,    $00,    %0100 ; 19
-	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   PERSON_ACTION_STAND,        $02,    $00,    %0000 ; 1a
+	sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT,        DOWN,   OBJECT_ACTION_STAND,        $02,    $00,    %0000 ; 1a
-	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   PERSON_ACTION_00,           $8e,    $01,    %0000 ; 1b
+	sprite_movement_data SPRITEMOVEFN_SHADOW,                DOWN,   OBJECT_ACTION_00,           $8e,    $01,    %0000 ; 1b
-	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   PERSON_ACTION_EMOTE,        $8e,    $02,    %0000 ; 1c
+	sprite_movement_data SPRITEMOVEFN_EMOTE,                 DOWN,   OBJECT_ACTION_EMOTE,        $8e,    $02,    %0000 ; 1c
-	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   PERSON_ACTION_00,           $82,    $00,    %0000 ; 1d
+	sprite_movement_data SPRITEMOVEFN_SCREENSHAKE,           DOWN,   OBJECT_ACTION_00,           $82,    $00,    %0000 ; 1d
-	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 1e
+	sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 1e
-	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 1f
+	sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE,        RIGHT,  OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 1f
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   PERSON_ACTION_BIG_LAPRAS,   $2e,    $01,    %1100 ; 20
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_LAPRAS,   $2e,    $01,    %1100 ; 20
-	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   PERSON_ACTION_BIG_DOLL,     $2e,    $01,    %1100 ; 21
+	sprite_movement_data SPRITEMOVEFN_STRENGTH,              DOWN,   OBJECT_ACTION_BIG_DOLL,     $2e,    $01,    %1100 ; 21
-	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   PERSON_ACTION_BOULDER_DUST, $8e,    $01,    %0000 ; 22
+	sprite_movement_data SPRITEMOVEFN_BOULDERDUST,           DOWN,   OBJECT_ACTION_BOULDER_DUST, $8e,    $01,    %0000 ; 22
-	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   PERSON_ACTION_GRASS_SHAKE,  $8e,    $02,    %0000 ; 23
+	sprite_movement_data SPRITEMOVEFN_GRASS,                 DOWN,   OBJECT_ACTION_GRASS_SHAKE,  $8e,    $02,    %0000 ; 23
-	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0010 ; 24
+	sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY,        DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0010 ; 24
-	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   PERSON_ACTION_STAND,        $00,    $00,    %0000 ; 25
+	sprite_movement_data SPRITEMOVEFN_00,                    DOWN,   OBJECT_ACTION_STAND,        $00,    $00,    %0000 ; 25
 ; 4357

data/maps/map_scenes.asm

@@ -0,0 +1,89 @@
+scene_def: MACRO
+; db group, map
+; dw address
+	map \1
+	dw \2
+ENDM
+
+MapScenes:: ; 4d01e
+	scene_def POKECENTER_2F,                          wPokecenter2FSceneID
+	scene_def TRADE_CENTER,                           wTradeCenterSceneID
+	scene_def COLOSSEUM,                              wColosseumSceneID
+	scene_def TIME_CAPSULE,                           wTimeCapsuleSceneID
+	scene_def POWER_PLANT,                            wPowerPlantSceneID
+	scene_def CERULEAN_GYM,                           wCeruleanGymSceneID
+	scene_def ROUTE_25,                               wRoute25SceneID
+	scene_def TRAINER_HOUSE_B1F,                      wTrainerHouseB1FSceneID
+	scene_def VICTORY_ROAD_GATE,                      wVictoryRoadGateSceneID
+	scene_def SAFFRON_TRAIN_STATION,                  wSaffronTrainStationSceneID
+	scene_def ROUTE_16_GATE,                          wRoute16GateSceneID
+	scene_def ROUTE_17_18_GATE,                       wRoute1718GateSceneID
+	scene_def INDIGO_PLATEAU_POKECENTER_1F,           wIndigoPlateauPokecenter1FSceneID
+	scene_def WILLS_ROOM,                             wWillsRoomSceneID
+	scene_def KOGAS_ROOM,                             wKogasRoomSceneID
+	scene_def BRUNOS_ROOM,                            wBrunosRoomSceneID
+	scene_def KARENS_ROOM,                            wKarensRoomSceneID
+	scene_def LANCES_ROOM,                            wLancesRoomSceneID
+	scene_def HALL_OF_FAME,                           wHallOfFameSceneID
+	scene_def ROUTE_27,                               wRoute27SceneID
+	scene_def NEW_BARK_TOWN,                          wNewBarkTownSceneID
+	scene_def ELMS_LAB,                               wElmsLabSceneID
+	scene_def KRISS_HOUSE_1F,                         wKrissHouse1FSceneID
+	scene_def ROUTE_29,                               wRoute29SceneID
+	scene_def CHERRYGROVE_CITY,                       wCherrygroveCitySceneID
+	scene_def MR_POKEMONS_HOUSE,                      wMrPokemonsHouseSceneID
+	scene_def ROUTE_32,                               wRoute32SceneID
+	scene_def ROUTE_35_NATIONAL_PARK_GATE,            wRoute35NationalParkGateSceneID
+	scene_def ROUTE_36,                               wRoute36SceneID
+	scene_def ROUTE_36_NATIONAL_PARK_GATE,            wRoute36NationalParkGateSceneID
+	scene_def AZALEA_TOWN,                            wAzaleaTownSceneID
+	scene_def GOLDENROD_GYM,                          wGoldenrodGymSceneID
+	scene_def GOLDENROD_MAGNET_TRAIN_STATION,         wGoldenrodMagnetTrainStationSceneID
+	scene_def GOLDENROD_POKECENTER_1F,                wGoldenrodPokecenter1FSceneID
+	scene_def OLIVINE_CITY,                           wOlivineCitySceneID
+	scene_def ROUTE_34,                               wRoute34SceneID
+	scene_def ROUTE_34_ILEX_FOREST_GATE,              wRoute34IlexForestGateSceneID
+	scene_def ECRUTEAK_HOUSE,                         wEcruteakHouseSceneID
+	scene_def WISE_TRIOS_ROOM,                        wWiseTriosRoomSceneID
+	scene_def ECRUTEAK_POKECENTER_1F,                 wEcruteakPokecenter1FSceneID
+	scene_def ECRUTEAK_GYM,                           wEcruteakGymSceneID
+	scene_def MAHOGANY_TOWN,                          wMahoganyTownSceneID
+	scene_def ROUTE_42,                               wRoute42SceneID
+	scene_def CIANWOOD_CITY,                          wCianwoodCitySceneID
+	scene_def BATTLE_TOWER_1F,                        wBattleTower1FSceneID
+	scene_def BATTLE_TOWER_BATTLE_ROOM,               wBattleTowerBattleRoomSceneID
+	scene_def BATTLE_TOWER_ELEVATOR,                  wBattleTowerElevatorSceneID
+	scene_def BATTLE_TOWER_HALLWAY,                   wBattleTowerHallwaySceneID
+	scene_def BATTLE_TOWER_OUTSIDE,                   wBattleTowerOutsideSceneID
+	scene_def ROUTE_43_GATE,                          wRoute43GateSceneID
+	scene_def MOUNT_MOON,                             wMountMoonSceneID
+	scene_def SPROUT_TOWER_3F,                        wSproutTower3FSceneID
+	scene_def TIN_TOWER_1F,                           wTinTower1FSceneID
+	scene_def BURNED_TOWER_1F,                        wBurnedTower1FSceneID
+	scene_def BURNED_TOWER_B1F,                       wBurnedTowerB1FSceneID
+	scene_def RADIO_TOWER_5F,                         wRadioTower5FSceneID
+	scene_def RUINS_OF_ALPH_OUTSIDE,                  wRuinsOfAlphOutsideSceneID
+	scene_def RUINS_OF_ALPH_RESEARCH_CENTER,          wRuinsOfAlphResearchCenterSceneID
+	scene_def RUINS_OF_ALPH_HO_OH_CHAMBER,            wRuinsOfAlphHoOhChamberSceneID
+	scene_def RUINS_OF_ALPH_KABUTO_CHAMBER,           wRuinsOfAlphKabutoChamberSceneID
+	scene_def RUINS_OF_ALPH_OMANYTE_CHAMBER,          wRuinsOfAlphOmanyteChamberSceneID
+	scene_def RUINS_OF_ALPH_AERODACTYL_CHAMBER,       wRuinsOfAlphAerodactylChamberSceneID
+	scene_def RUINS_OF_ALPH_INNER_CHAMBER,            wRuinsOfAlphInnerChamberSceneID
+	scene_def MAHOGANY_MART_1F,                       wMahoganyMart1FSceneID
+	scene_def TEAM_ROCKET_BASE_B1F,                   wTeamRocketBaseB1FSceneID
+	scene_def TEAM_ROCKET_BASE_B2F,                   wTeamRocketBaseB2FSceneID
+	scene_def TEAM_ROCKET_BASE_B3F,                   wTeamRocketBaseB3FSceneID
+	scene_def UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, wUndergroundPathSwitchRoomEntrancesSceneID
+	scene_def SILVER_CAVE_ROOM_3,                     wSilverCaveRoom3SceneID
+	scene_def VICTORY_ROAD,                           wVictoryRoadSceneID
+	scene_def DRAGONS_DEN_B1F,                        wDragonsDenB1FSceneID
+	scene_def DRAGON_SHRINE,                          wDragonShrineSceneID
+	scene_def OLIVINE_PORT,                           wOlivinePortSceneID
+	scene_def VERMILION_PORT,                         wVermilionPortSceneID
+	scene_def FAST_SHIP_1F,                           wFastShip1FSceneID
+	scene_def FAST_SHIP_B1F,                          wFastShipB1FSceneID
+	scene_def MOUNT_MOON_SQUARE,                      wMountMoonSquareSceneID
+	scene_def MOBILE_TRADE_ROOM_MOBILE,               wMobileTradeRoomMobileSceneID
+	scene_def MOBILE_BATTLE_ROOM,                     wMobileBattleRoomSceneID
+	db -1
+; 4d15b

data/maps/map_triggers.asm

@@ -1,89 +0,0 @@
-trigger_def: MACRO
-; db group, map
-; dw address
-	map \1
-	dw \2
-ENDM
-
-MapTriggers:: ; 4d01e
-	trigger_def POKECENTER_2F,                          wPokecenter2FTrigger
-	trigger_def TRADE_CENTER,                           wTradeCenterTrigger
-	trigger_def COLOSSEUM,                              wColosseumTrigger
-	trigger_def TIME_CAPSULE,                           wTimeCapsuleTrigger
-	trigger_def POWER_PLANT,                            wPowerPlantTrigger
-	trigger_def CERULEAN_GYM,                           wCeruleanGymTrigger
-	trigger_def ROUTE_25,                               wRoute25Trigger
-	trigger_def TRAINER_HOUSE_B1F,                      wTrainerHouseB1FTrigger
-	trigger_def VICTORY_ROAD_GATE,                      wVictoryRoadGateTrigger
-	trigger_def SAFFRON_TRAIN_STATION,                  wSaffronTrainStationTrigger
-	trigger_def ROUTE_16_GATE,                          wRoute16GateTrigger
-	trigger_def ROUTE_17_18_GATE,                       wRoute1718GateTrigger
-	trigger_def INDIGO_PLATEAU_POKECENTER_1F,           wIndigoPlateauPokecenter1FTrigger
-	trigger_def WILLS_ROOM,                             wWillsRoomTrigger
-	trigger_def KOGAS_ROOM,                             wKogasRoomTrigger
-	trigger_def BRUNOS_ROOM,                            wBrunosRoomTrigger
-	trigger_def KARENS_ROOM,                            wKarensRoomTrigger
-	trigger_def LANCES_ROOM,                            wLancesRoomTrigger
-	trigger_def HALL_OF_FAME,                           wHallOfFameTrigger
-	trigger_def ROUTE_27,                               wRoute27Trigger
-	trigger_def NEW_BARK_TOWN,                          wNewBarkTownTrigger
-	trigger_def ELMS_LAB,                               wElmsLabTrigger
-	trigger_def KRISS_HOUSE_1F,                         wKrissHouse1FTrigger
-	trigger_def ROUTE_29,                               wRoute29Trigger
-	trigger_def CHERRYGROVE_CITY,                       wCherrygroveCityTrigger
-	trigger_def MR_POKEMONS_HOUSE,                      wMrPokemonsHouseTrigger
-	trigger_def ROUTE_32,                               wRoute32Trigger
-	trigger_def ROUTE_35_NATIONAL_PARK_GATE,            wRoute35NationalParkGateTrigger
-	trigger_def ROUTE_36,                               wRoute36Trigger
-	trigger_def ROUTE_36_NATIONAL_PARK_GATE,            wRoute36NationalParkGateTrigger
-	trigger_def AZALEA_TOWN,                            wAzaleaTownTrigger
-	trigger_def GOLDENROD_GYM,                          wGoldenrodGymTrigger
-	trigger_def GOLDENROD_MAGNET_TRAIN_STATION,         wGoldenrodMagnetTrainStationTrigger
-	trigger_def GOLDENROD_POKECENTER_1F,                wGoldenrodPokecenter1FTrigger
-	trigger_def OLIVINE_CITY,                           wOlivineCityTrigger
-	trigger_def ROUTE_34,                               wRoute34Trigger
-	trigger_def ROUTE_34_ILEX_FOREST_GATE,              wRoute34IlexForestGateTrigger
-	trigger_def ECRUTEAK_HOUSE,                         wEcruteakHouseTrigger
-	trigger_def WISE_TRIOS_ROOM,                        wWiseTriosRoomTrigger
-	trigger_def ECRUTEAK_POKECENTER_1F,                 wEcruteakPokecenter1FTrigger
-	trigger_def ECRUTEAK_GYM,                           wEcruteakGymTrigger
-	trigger_def MAHOGANY_TOWN,                          wMahoganyTownTrigger
-	trigger_def ROUTE_42,                               wRoute42Trigger
-	trigger_def CIANWOOD_CITY,                          wCianwoodCityTrigger
-	trigger_def BATTLE_TOWER_1F,                        wBattleTower1FTrigger
-	trigger_def BATTLE_TOWER_BATTLE_ROOM,               wBattleTowerBattleRoomTrigger
-	trigger_def BATTLE_TOWER_ELEVATOR,                  wBattleTowerElevatorTrigger
-	trigger_def BATTLE_TOWER_HALLWAY,                   wBattleTowerHallwayTrigger
-	trigger_def BATTLE_TOWER_OUTSIDE,                   wBattleTowerOutsideTrigger
-	trigger_def ROUTE_43_GATE,                          wRoute43GateTrigger
-	trigger_def MOUNT_MOON,                             wMountMoonTrigger
-	trigger_def SPROUT_TOWER_3F,                        wSproutTower3FTrigger
-	trigger_def TIN_TOWER_1F,                           wTinTower1FTrigger
-	trigger_def BURNED_TOWER_1F,                        wBurnedTower1FTrigger
-	trigger_def BURNED_TOWER_B1F,                       wBurnedTowerB1FTrigger
-	trigger_def RADIO_TOWER_5F,                         wRadioTower5FTrigger
-	trigger_def RUINS_OF_ALPH_OUTSIDE,                  wRuinsOfAlphOutsideTrigger
-	trigger_def RUINS_OF_ALPH_RESEARCH_CENTER,          wRuinsOfAlphResearchCenterTrigger
-	trigger_def RUINS_OF_ALPH_HO_OH_CHAMBER,            wRuinsOfAlphHoOhChamberTrigger
-	trigger_def RUINS_OF_ALPH_KABUTO_CHAMBER,           wRuinsOfAlphKabutoChamberTrigger
-	trigger_def RUINS_OF_ALPH_OMANYTE_CHAMBER,          wRuinsOfAlphOmanyteChamberTrigger
-	trigger_def RUINS_OF_ALPH_AERODACTYL_CHAMBER,       wRuinsOfAlphAerodactylChamberTrigger
-	trigger_def RUINS_OF_ALPH_INNER_CHAMBER,            wRuinsOfAlphInnerChamberTrigger
-	trigger_def MAHOGANY_MART_1F,                       wMahoganyMart1FTrigger
-	trigger_def TEAM_ROCKET_BASE_B1F,                   wTeamRocketBaseB1FTrigger
-	trigger_def TEAM_ROCKET_BASE_B2F,                   wTeamRocketBaseB2FTrigger
-	trigger_def TEAM_ROCKET_BASE_B3F,                   wTeamRocketBaseB3FTrigger
-	trigger_def UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, wUndergroundPathSwitchRoomEntrancesTrigger
-	trigger_def SILVER_CAVE_ROOM_3,                     wSilverCaveRoom3Trigger
-	trigger_def VICTORY_ROAD,                           wVictoryRoadTrigger
-	trigger_def DRAGONS_DEN_B1F,                        wDragonsDenB1FTrigger
-	trigger_def DRAGON_SHRINE,                          wDragonShrineTrigger
-	trigger_def OLIVINE_PORT,                           wOlivinePortTrigger
-	trigger_def VERMILION_PORT,                         wVermilionPortTrigger
-	trigger_def FAST_SHIP_1F,                           wFastShip1FTrigger
-	trigger_def FAST_SHIP_B1F,                          wFastShipB1FTrigger
-	trigger_def MOUNT_MOON_SQUARE,                      wMountMoonSquareTrigger
-	trigger_def MOBILE_TRADE_ROOM_MOBILE,               wMobileTradeRoomMobileTrigger
-	trigger_def MOBILE_BATTLE_ROOM,                     wMobileBattleRoomTrigger
-	db -1
-; 4d15b

docs/event_commands.md

@@ -39,11 +39,11 @@ Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scr
 
 ## `$11`: `checkmaptriggers` *map*
 
-## `$12`: `domaptrigger` *map*, *trigger_id*
+## `$12`: `setmapscene` *map*, *scene_id*
 
 ## `$13`: `checktriggers`
 
-## `$14`: `dotrigger` *trigger_id*
+## `$14`: `setscene` *scene_id*
 
 ## `$15`: `writebyte` *value*
 

docs/map_scripts.md

@@ -3,15 +3,15 @@
 
 ## `const_value set 2`
 
-- **`const` *`MAPNAME_PERSONNAME`***
+- **`const` *`MAPNAME_OBJECTNAME`***
 
 
 ## `MapName_MapScriptHeader:`
 
 
-## `.MapTriggers: db` *N*
+## `.SceneScripts: db` *N*
 
-- **`maptrigger` *script***
+- **`scene_script` *script***
 
 
 ## `.MapCallbacks: db` *N*
@@ -63,34 +63,34 @@ Callback types:
 - **`warp_def` *y*, *x*, *warp_id*, *map***
 
 
-## `.XYTriggers: db` *N*
+## `.CoordEvents: db` *N*
 
-- **`xy_trigger` *id*, *y*, *x*, `$0`, *script*, `$0`, `$0`**
+- **`coord_event` *id*, *y*, *x*, `$0`, *script*, `$0`, `$0`**
 
 
-## `.Signposts: db` *N*
+## `.BGEvents: db` *N*
 
-- **`signpost` *y*, *x*, *type*, *script***
+- **`bg_event` *y*, *x*, *type*, *script***
 
-Signpost types:
+BG event types:
 
-- **`SIGNPOST_READ`**
+- **`BGEVENT_READ`**
 
-- **`SIGNPOST_UP/DOWN/LEFT/RIGHT`**
+- **`BGEVENT_UP/DOWN/LEFT/RIGHT`**
 
-- **`SIGNPOST_IFSET/IFNOTSET`**
+- **`BGEVENT_IFSET/IFNOTSET`**
 
   **`dw` *event_flag*, *script***
 
-- **`SIGNPOST_ITEM`**
+- **`BGEVENT_ITEM`**
 
   **`dwb` *event_flag*, *item_id***
 
-- **`SIGNPOST_COPY`**
+- **`BGEVENT_COPY`**
 
-## `.PersonEvents: db` *N*
+## `.ObjectEvents: db` *N*
 
-- **`person_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *hour*, *daytime*, *palette*, *type*, *range*, *script*, *event_flag***
+- **`object_event` *sprite*, *y*, *x*, *movement*, *ry*, *rx*, *hour*, *daytime*, *palette*, *type*, *range*, *script*, *event_flag***
 
 Movement types:
 
@@ -126,14 +126,14 @@ Movement types:
 
 - **`SPRITEMOVEDATA_LAPRAS`**
 
-Person types:
+Object types:
 
-- **`PERSONTYPE_SCRIPT`**
+- **`OBJECTTYPE_SCRIPT`**
 
-- **`PERSONTYPE_ITEMBALL`**
+- **`OBJECTTYPE_ITEMBALL`**
 
   **`itemball` *item_id***
 
-- **`PERSONTYPE_TRAINER`**
+- **`OBJECTTYPE_TRAINER`**
 
   **`trainer` *event_flag*, *group_id*, *trainer_id*, *seen_text*, *beaten_text*, *loss_text*, *script***

docs/movement_commands.md

@@ -39,9 +39,9 @@ Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engi
 
 ## `$3B`: `fix_facing`
 
-## `$3C`: `show_person`
+## `$3C`: `show_object`
 
-## `$3D`: `hide_person`
+## `$3D`: `hide_object`
 
 ## `$3E`−`$46`: `step_sleep` *length*
 
@@ -49,7 +49,7 @@ Defined in [macros/scripts/movement.asm](/macros/scripts/movement.asm) and [engi
 
 ## `$48`: `step_48` *param*
 
-## `$49`: `remove_person`
+## `$49`: `remove_object`
 
 ## `$4A`: `step_loop`
 

engine/events.asm

@@ -286,7 +286,7 @@ PlayerEvents: ; 9681f
 	call RunMemScript
 	jr c, .ok
 
-	call DoMapTrigger
+	call RunSceneScript
 	jr c, .ok
 
 	call CheckTimeEvents
@@ -335,7 +335,7 @@ CheckTrainerBattle3: ; 96867
 ; 96874
 
 CheckTileEvent: ; 96874
-; Check for warps, tile triggers or wild battles.
+; Check for warps, coord events, or wild battles.
 
 	call CheckWarpConnxnScriptFlag
 	jr z, .connections_disabled
@@ -350,7 +350,7 @@ CheckTileEvent: ; 96874
 	call CheckCoordEventScriptFlag
 	jr z, .coord_events_disabled
 
-	call CheckCurrentMapXYTriggers
+	call CheckCurrentMapCoordEvents
 	jr c, .coord_event
 
 .coord_events_disabled
@@ -437,19 +437,19 @@ Dummy_CheckScriptFlags3Bit5: ; 968e4
 	ret
 ; 968ec
 
-DoMapTrigger: ; 968ec
+RunSceneScript: ; 968ec
-	ld a, [wCurrMapTriggerCount]
+	ld a, [wCurrMapSceneScriptCount]
 	and a
 	jr z, .nope
 
 	ld c, a
-	call CheckTriggers
+	call CheckScenes
 	cp c
 	jr nc, .nope
 
 	ld e, a
 	ld d, 0
-	ld hl, wCurrMapTriggerHeaderPointer
+	ld hl, wCurrMapSceneScriptHeaderPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -559,9 +559,9 @@ CheckAPressOW: ; 96999
 	ret z
 	call TryObjectEvent
 	ret c
-	call TryReadSign
+	call TryBGEvent
 	ret c
-	call CheckFacingTileEvent
+	call TryTileCollisionEvent
 	ret c
 	xor a
 	ret
@@ -617,14 +617,14 @@ TryObjectEvent: ; 969b5
 	ret
 
 .pointers
-	dbw PERSONTYPE_SCRIPT, .script
+	dbw OBJECTTYPE_SCRIPT, .script
-	dbw PERSONTYPE_ITEMBALL, .itemball
+	dbw OBJECTTYPE_ITEMBALL, .itemball
-	dbw PERSONTYPE_TRAINER, .trainer
+	dbw OBJECTTYPE_TRAINER, .trainer
 	; the remaining four are dummy events
-	dbw PERSONTYPE_3, .three
+	dbw OBJECTTYPE_3, .three
-	dbw PERSONTYPE_4, .four
+	dbw OBJECTTYPE_4, .four
-	dbw PERSONTYPE_5, .five
+	dbw OBJECTTYPE_5, .five
-	dbw PERSONTYPE_6, .six
+	dbw OBJECTTYPE_6, .six
 	db -1
 ; 96a04
 
@@ -681,19 +681,19 @@ TryObjectEvent: ; 969b5
 	ret
 ; 96a38
 
-TryReadSign: ; 96a38
+TryBGEvent: ; 96a38
-	call CheckFacingSign
+	call CheckFacingBGEvent
-	jr c, .IsSign
+	jr c, .is_bg_event
 	xor a
 	ret
 
-.IsSign:
+.is_bg_event:
 	ld a, [EngineBuffer3]
-	ld hl, .signs
+	ld hl, .bg_events
 	rst JumpTable
 	ret
 
-.signs
+.bg_events
 	dw .read
 	dw .up
 	dw .down
@@ -736,7 +736,7 @@ TryReadSign: ; 96a38
 	ret
 
 .itemifset
-	call CheckSignFlag
+	call CheckBGEventFlag
 	jp nz, .dontread
 	call PlayTalkObject
 	call GetMapScriptHeaderBank
@@ -750,7 +750,7 @@ TryReadSign: ; 96a38
 	ret
 
 .copy
-	call CheckSignFlag
+	call CheckBGEventFlag
 	jr nz, .dontread
 	call GetMapScriptHeaderBank
 	ld de, EngineBuffer1
@@ -759,12 +759,12 @@ TryReadSign: ; 96a38
 	jr .dontread
 
 .ifset
-	call CheckSignFlag
+	call CheckBGEventFlag
 	jr z, .dontread
 	jr .thenread
 
 .ifnotset
-	call CheckSignFlag
+	call CheckBGEventFlag
 	jr nz, .dontread
 
 .thenread
@@ -785,7 +785,7 @@ TryReadSign: ; 96a38
 	ret
 ; 96ad8
 
-CheckSignFlag: ; 96ad8
+CheckBGEventFlag: ; 96ad8
 	ld hl, EngineBuffer4
 	ld a, [hli]
 	ld h, [hl]

engine/events_2.asm

@@ -50,11 +50,11 @@ LoadScriptBDE:: ; 97c4f
 	ret
 ; 97c5f
 
-CheckFacingTileEvent:: ; 97c5f
+TryTileCollisionEvent:: ; 97c5f
 	call GetFacingTileCoord
 	ld [EngineBuffer1], a
 	ld c, a
-	farcall CheckFacingTileForStd
+	farcall CheckFacingTileForStdScript
 	jr c, .done
 
 	call CheckCutTreeTile

engine/events_3.asm

@@ -283,30 +283,30 @@ CheckForHiddenItems: ; b8172
 	ld a, [YCoord]
 	add SCREEN_HEIGHT / 4
 	ld [Buffer3], a
-; Get the pointer for the first signpost header in the map...
+; Get the pointer for the first BG event header in the map...
-	ld hl, wCurrentMapSignpostHeaderPointer
+	ld hl, wCurrMapBGEventHeaderPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-; ... before even checking to see if there are any signposts on this map.
+; ... before even checking to see if there are any BG events on this map.
-	ld a, [wCurrentMapSignpostCount]
+	ld a, [wCurrMapBGEventCount]
 	and a
-	jr z, .nosignpostitems
+	jr z, .nobgeventitems
-; For i = 1:wCurrentMapSignpostCount...
+; For i = 1:wCurrMapBGEventCount...
 .loop
-; Store the counter in Buffer2, and store the signpost header pointer in the stack.
+; Store the counter in Buffer2, and store the BG event header pointer in the stack.
 	ld [Buffer2], a
 	push hl
-; Get the Y coordinate of the signpost.
+; Get the Y coordinate of the BG event.
 	call .GetFarByte
 	ld e, a
-; Is the Y coordinate of the signpost on the screen?  If not, go to the next signpost.
+; Is the Y coordinate of the BG event on the screen?  If not, go to the next BG event.
 	ld a, [Buffer3]
 	sub e
 	jr c, .next
 	cp SCREEN_HEIGHT / 2
 	jr nc, .next
-; Is the X coordinate of the signpost on the screen?  If not, go to the next signpost.
+; Is the X coordinate of the BG event on the screen?  If not, go to the next BG event.
 	call .GetFarByte
 	ld d, a
 	ld a, [Buffer4]
@@ -314,9 +314,9 @@ CheckForHiddenItems: ; b8172
 	jr c, .next
 	cp SCREEN_WIDTH / 2
 	jr nc, .next
-; Is this signpost a hidden item?  If not, go to the next signpost.
+; Is this BG event a hidden item?  If not, go to the next BG event.
 	call .GetFarByte
-	cp SIGNPOST_ITEM
+	cp BGEVENT_ITEM
 	jr nz, .next
 ; Has this item already been found?  If not, set off the Itemfinder.
 	ld a, [Buffer1]
@@ -332,16 +332,16 @@ CheckForHiddenItems: ; b8172
 	jr z, .itemnearby
 
 .next
-; Restore the signpost header pointer and increment it by the length of a signpost header.
+; Restore the BG event header pointer and increment it by the length of a BG event header.
 	pop hl
 	ld bc, 5
 	add hl, bc
-; Restore the signpost counter and decrement it.  If it hits zero, there are no hidden items in range.
+; Restore the BG event counter and decrement it.  If it hits zero, there are no hidden items in range.
 	ld a, [Buffer2]
 	dec a
 	jr nz, .loop
 
-.nosignpostitems
+.nobgeventitems
 	xor a
 	ret
 

engine/map_object_action.asm

@@ -1,5 +1,5 @@
-PersonActionPairPointers: ; 445f
+ObjectActionPairPointers: ; 445f
-; entries correspond to PERSON_ACTION_* constants
+; entries correspond to OBJECT_ACTION_* constants
 	dw SetFacingStanding,              SetFacingStanding
 	dw SetFacingStandAction,           SetFacingCurrent
 	dw SetFacingStepAction,            SetFacingCurrent

engine/map_objects.asm

@@ -154,7 +154,7 @@ Function437b: ; 437b
 	jr nz, SetFacingStanding
 	bit 5, [hl]
 	jr nz, asm_4448
-	ld de, PersonActionPairPointers ; use first column
+	ld de, ObjectActionPairPointers ; use first column
 	jr _HandleObjectAction
 ; 4440
 
@@ -164,7 +164,7 @@ Function4440: ; 4440
 	bit INVISIBLE, [hl]
 	jr nz, SetFacingStanding
 asm_4448
-	ld de, PersonActionPairPointers + 2 ; use second column
+	ld de, ObjectActionPairPointers + 2 ; use second column
 	jr _HandleObjectAction
 ; 444d
 
@@ -631,7 +631,7 @@ MapObjectMovementPattern: ; 47dd
 	call EndSpriteMovement
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STAND
+	ld [hl], OBJECT_ACTION_STAND
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_05
@@ -650,20 +650,20 @@ MapObjectMovementPattern: ; 47dd
 	jp HandleMovementData
 
 .Movement0a:
-	jp _GetMovementPerson
+	jp _GetMovementObject
 
 .Movement0b:
-	jp _GetMovementPerson
+	jp _GetMovementObject
 
 .Movement0c:
-	jp _GetMovementPerson
+	jp _GetMovementObject
 
 .Movement0d:
 	ld hl, Function5000
 	jp HandleMovementData
 
 .Movement0e:
-	jp _GetMovementPerson
+	jp _GetMovementObject
 
 .Follow:
 	ld hl, GetFollowerNextMovementByte
@@ -781,7 +781,7 @@ MapObjectMovementPattern: ; 47dd
 	ld [hl], STANDING
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STAND
+	ld [hl], OBJECT_ACTION_STAND
 	ret
 
 .MovementBigStanding:
@@ -791,7 +791,7 @@ MapObjectMovementPattern: ; 47dd
 	ld [hl], STANDING
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_BIG_SNORLAX
+	ld [hl], OBJECT_ACTION_BIG_SNORLAX
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_04
@@ -804,7 +804,7 @@ MapObjectMovementPattern: ; 47dd
 	ld [hl], STANDING
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_BOUNCE
+	ld [hl], OBJECT_ACTION_BOUNCE
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_04
@@ -828,7 +828,7 @@ MapObjectMovementPattern: ; 47dd
 .MovementSpinRepeat:
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STAND
+	ld [hl], OBJECT_ACTION_STAND
 	ld hl, OBJECT_RANGE
 	add hl, bc
 	ld a, [hl]
@@ -879,7 +879,7 @@ MapObjectMovementPattern: ; 47dd
 	call ._MovementShadow_Grass_Emote_BoulderDust
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_SHADOW
+	ld [hl], OBJECT_ACTION_SHADOW
 	ld hl, OBJECT_STEP_DURATION
 	add hl, de
 	ld a, [hl]
@@ -916,7 +916,7 @@ MapObjectMovementPattern: ; 47dd
 	call ._MovementShadow_Grass_Emote_BoulderDust
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_EMOTE
+	ld [hl], OBJECT_ACTION_EMOTE
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], 0
@@ -936,7 +936,7 @@ MapObjectMovementPattern: ; 47dd
 	call ._MovementShadow_Grass_Emote_BoulderDust
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_BOULDER_DUST
+	ld [hl], OBJECT_ACTION_BOULDER_DUST
 	ld hl, OBJECT_STEP_DURATION
 	add hl, de
 	ld a, [hl]
@@ -980,7 +980,7 @@ MapObjectMovementPattern: ; 47dd
 	call ._MovementShadow_Grass_Emote_BoulderDust
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_GRASS_SHAKE
+	ld [hl], OBJECT_ACTION_GRASS_SHAKE
 	ld hl, OBJECT_STEP_DURATION
 	add hl, de
 	ld a, [hl]
@@ -1013,7 +1013,7 @@ MapObjectMovementPattern: ; 47dd
 	call EndSpriteMovement
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_00
+	ld [hl], OBJECT_ACTION_00
 	ld hl, OBJECT_RANGE
 	add hl, bc
 	ld a, [hl]
@@ -1053,7 +1053,7 @@ MapObjectMovementPattern: ; 47dd
 	call UpdateTallGrassFlags
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STEP
+	ld [hl], OBJECT_ACTION_STEP
 	ld hl, wCenteredObject
 	ld a, [hMapObjectIndexBuffer]
 	cp [hl]
@@ -1092,7 +1092,7 @@ SetRandomStepDuration: ; 4b2d
 	ld [hl], STANDING
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STAND
+	ld [hl], OBJECT_ACTION_STAND
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_03
@@ -1245,7 +1245,7 @@ TeleportFrom: ; 4c18
 .DoSpin:
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_SPIN
+	ld [hl], OBJECT_ACTION_SPIN
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	dec [hl]
@@ -1270,7 +1270,7 @@ TeleportFrom: ; 4c18
 .DoSpinRise:
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_SPIN
+	ld [hl], OBJECT_ACTION_SPIN
 	ld hl, OBJECT_31
 	add hl, bc
 	inc [hl]
@@ -1310,7 +1310,7 @@ TeleportTo: ; 4c89
 .InitWait:
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_00
+	ld [hl], OBJECT_ACTION_00
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], 16
@@ -1341,7 +1341,7 @@ TeleportTo: ; 4c89
 .DoDescent:
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_SPIN
+	ld [hl], OBJECT_ACTION_SPIN
 	ld hl, OBJECT_31
 	add hl, bc
 	inc [hl]
@@ -1369,7 +1369,7 @@ TeleportTo: ; 4c89
 .DoFinalSpin:
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_SPIN
+	ld [hl], OBJECT_ACTION_SPIN
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	dec [hl]
@@ -1399,7 +1399,7 @@ Skyfall: ; 4d14
 .Init:
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_00
+	ld [hl], OBJECT_ACTION_00
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], 16
@@ -1411,7 +1411,7 @@ Skyfall: ; 4d14
 	ret nz
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STEP
+	ld [hl], OBJECT_ACTION_STEP
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	ld [hl], 0
@@ -1496,9 +1496,9 @@ RockSmashStep: ; 4daf
 	add hl, bc
 	ld a, [hl]
 	and %00000001
-	ld a, PERSON_ACTION_STAND
+	ld a, OBJECT_ACTION_STAND
 	jr z, .yes
-	ld a, PERSON_ACTION_00
+	ld a, OBJECT_ACTION_00
 .yes
 	ld hl, OBJECT_ACTION
 	add hl, bc
@@ -1511,9 +1511,9 @@ ReturnDigStep: ; 4dc8
 	add hl, bc
 	ld a, [hl]
 	and %00000001
-	ld a, PERSON_ACTION_SPIN
+	ld a, OBJECT_ACTION_SPIN
 	jr z, .yes
-	ld a, PERSON_ACTION_SPIN_FLICKER
+	ld a, OBJECT_ACTION_SPIN_FLICKER
 .yes
 	ld hl, OBJECT_ACTION
 	add hl, bc
@@ -1819,7 +1819,7 @@ SkyfallTop: ; 4f83
 .Init:
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_SKYFALL
+	ld [hl], OBJECT_ACTION_SKYFALL
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], 16
@@ -1935,13 +1935,13 @@ Function5026: ; 5026
 	ret
 ; 5037
 
-_GetMovementPerson: ; 5037
+_GetMovementObject: ; 5037
-	ld hl, GetMovementPerson
+	ld hl, GetMovementObject
 	jp HandleMovementData
 ; 503d
 
-GetMovementPerson: ; 503d
+GetMovementObject: ; 503d
-	ld a, [wMovementPerson]
+	ld a, [wMovementObject]
 	ret
 ; 5041
 
@@ -2540,7 +2540,7 @@ RefreshPlayerSprite: ; 579d
 	ret
 
 .ok
-	ld a, PERSON_ACTION_00
+	ld a, OBJECT_ACTION_00
 	ld [PlayerAction], a
 	ret
 ; 57ca

engine/movement.asm

@@ -60,8 +60,8 @@ MovementPointers: ; 5075
 	dw Movement_set_sliding           ; 39
 	dw Movement_remove_fixed_facing   ; 3a
 	dw Movement_fix_facing            ; 3b
-	dw Movement_show_person           ; 3c
+	dw Movement_show_object           ; 3c
-	dw Movement_hide_person           ; 3d
+	dw Movement_hide_object           ; 3d
 	dw Movement_step_sleep_1          ; 3e
 	dw Movement_step_sleep_2          ; 3f
 	dw Movement_step_sleep_3          ; 40
@@ -73,7 +73,7 @@ MovementPointers: ; 5075
 	dw Movement_step_sleep            ; 46
 	dw Movement_step_end              ; 47
 	dw Movement_48                    ; 48
-	dw Movement_remove_person         ; 49
+	dw Movement_remove_object         ; 49
 	dw Movement_step_loop             ; 4a
 	dw Movement_4b                    ; 4b
 	dw Movement_teleport_from         ; 4c
@@ -130,7 +130,7 @@ Movement_step_dig: ; 5145
 	ld [hl], a
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_SPIN
+	ld [hl], OBJECT_ACTION_SPIN
 	call JumpMovementPointer
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
@@ -167,7 +167,7 @@ Movement_return_dig: ; 516a
 Movement_fish_got_bite: ; 5189
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_FISHING
+	ld [hl], OBJECT_ACTION_FISHING
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_GOT_BITE
@@ -181,7 +181,7 @@ Movement_rock_smash: ; 5196
 	ld [hl], a
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STAND
+	ld [hl], OBJECT_ACTION_STAND
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_ROCK_SMASH
@@ -191,7 +191,7 @@ Movement_rock_smash: ; 5196
 Movement_fish_cast_rod: ; 51ab
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_FISHING
+	ld [hl], OBJECT_ACTION_FISHING
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
 	ld [hl], STEP_TYPE_SLEEP
@@ -248,7 +248,7 @@ Movement_48: ; 51db
 	ret
 ; 51fd
 
-Movement_remove_person: ; 51fd
+Movement_remove_object: ; 51fd
 	call DeleteMapObject
 	ld hl, wObjectFollow_Leader
 	ld a, [hMapObjectIndexBuffer]
@@ -265,7 +265,7 @@ Movement_remove_person: ; 51fd
 Movement_4b: ; 5210
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STAND
+	ld [hl], OBJECT_ACTION_STAND
 
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
@@ -326,7 +326,7 @@ Movement_step_sleep_common: ; 5247
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STAND
+	ld [hl], OBJECT_ACTION_STAND
 
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
@@ -346,7 +346,7 @@ Movement_step_bump: ; 525f
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_BUMP
+	ld [hl], OBJECT_ACTION_BUMP
 
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
@@ -366,7 +366,7 @@ Movement_tree_shake: ; 5279
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_WEIRD_TREE
+	ld [hl], OBJECT_ACTION_WEIRD_TREE
 
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
@@ -402,14 +402,14 @@ Movement_fix_facing: ; 52ae
 	jp ContinueReadingMovement
 ; 52b7
 
-Movement_show_person: ; 52b7
+Movement_show_object: ; 52b7
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	res INVISIBLE, [hl]
 	jp ContinueReadingMovement
 ; 52c0
 
-Movement_hide_person: ; 52c0
+Movement_hide_object: ; 52c0
 	ld hl, OBJECT_FLAGS1
 	add hl, bc
 	set INVISIBLE, [hl]
@@ -458,7 +458,7 @@ TurnHead: ; 52ee
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STAND
+	ld [hl], OBJECT_ACTION_STAND
 
 	ld hl, OBJECT_DIRECTION_WALKING
 	add hl, bc
@@ -733,7 +733,7 @@ TurnStep: ; 5400
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STEP
+	ld [hl], OBJECT_ACTION_STEP
 
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
@@ -746,7 +746,7 @@ NormalStep: ; 5412
 	call UpdateTallGrassFlags
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STEP
+	ld [hl], OBJECT_ACTION_STEP
 
 	ld hl, OBJECT_NEXT_TILE
 	add hl, bc
@@ -784,7 +784,7 @@ TurningStep: ; 5446
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_SPIN
+	ld [hl], OBJECT_ACTION_SPIN
 
 	ld hl, wCenteredObject
 	ld a, [hMapObjectIndexBuffer]
@@ -810,7 +810,7 @@ SlideStep: ; 5468
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STAND
+	ld [hl], OBJECT_ACTION_STAND
 
 	ld hl, wCenteredObject
 	ld a, [hMapObjectIndexBuffer]
@@ -842,7 +842,7 @@ JumpStep: ; 548a
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
-	ld [hl], PERSON_ACTION_STEP
+	ld [hl], OBJECT_ACTION_STEP
 
 	call SpawnShadow
 

engine/npc_movement.asm

@@ -35,7 +35,7 @@ Function6ec1: ; 6ec1
 
 	push hl
 	push bc
-	call WillPersonBumpIntoSomeoneElse
+	call WillObjectBumpIntoSomeoneElse
 	pop bc
 	pop hl
 	ret c
@@ -44,12 +44,12 @@ Function6ec1: ; 6ec1
 	bit 5, [hl]
 	jr nz, .bit_5
 	push hl
-	call HasPersonReachedMovementLimit
+	call HasObjectReachedMovementLimit
 	pop hl
 	ret c
 
 	push hl
-	call IsPersonMovingOffEdgeOfScreen
+	call IsObjectMovingOffEdgeOfScreen
 	pop hl
 	ret c
 
@@ -269,7 +269,7 @@ CheckFacingObject:: ; 6fd9
 ; 7009
 
 
-WillPersonBumpIntoSomeoneElse: ; 7009
+WillObjectBumpIntoSomeoneElse: ; 7009
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld d, [hl]
@@ -391,7 +391,7 @@ IsNPCAtCoord: ; 7041
 	ret
 ; 70a4
 
-HasPersonReachedMovementLimit: ; 70a4
+HasObjectReachedMovementLimit: ; 70a4
 	ld hl, OBJECT_RADIUS
 	add hl, bc
 	ld a, [hl]
@@ -451,7 +451,7 @@ HasPersonReachedMovementLimit: ; 70a4
 	ret
 ; 70ed
 
-IsPersonMovingOffEdgeOfScreen: ; 70ed
+IsObjectMovingOffEdgeOfScreen: ; 70ed
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld a, [XCoord]

engine/player_object.asm

@@ -29,14 +29,14 @@ SpawnPlayer: ; 8029
 	call GetMapObject
 	ld hl, MAPOBJECT_COLOR
 	add hl, bc
-	ln e, PAL_NPC_RED, PERSONTYPE_SCRIPT
+	ln e, PAL_NPC_RED, OBJECTTYPE_SCRIPT
 	ld a, [wPlayerSpriteSetupFlags]
 	bit 2, a
 	jr nz, .ok
 	ld a, [PlayerGender]
 	bit 0, a
 	jr z, .ok
-	ln e, PAL_NPC_BLUE, PERSONTYPE_SCRIPT
+	ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT
 
 .ok
 	ld [hl], e
@@ -55,7 +55,7 @@ PlayerObjectTemplate: ; 8071
 ; A dummy map object used to initialize the player object.
 ; Shorter than the actual amount copied by two bytes.
 ; Said bytes seem to be unused.
-	person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, PERSONTYPE_SCRIPT, 0, 0, -1
+	object_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1
 
 CopyDECoordsToMapObject:: ; 807e
 	push de
@@ -82,7 +82,7 @@ PlayerSpawn_ConvertCoords: ; 808f
 	call CopyDECoordsToMapObject
 	ret
 
-WritePersonXY:: ; 80a1
+WriteObjectXY:: ; 80a1
 	ld a, b
 	call CheckObjectVisibility
 	ret c
@@ -616,7 +616,7 @@ FollowNotExact:: ; 839e
 	call CheckObjectVisibility
 	ret c
 
-; Person 2 is now in bc, person 1 is now in de
+; object 2 is now in bc, object 1 is now in de
 	ld hl, OBJECT_NEXT_MAP_X
 	add hl, bc
 	ld a, [hl]

engine/scripting.asm

@@ -82,10 +82,10 @@ ScriptCommandTable:
 	dw Script_callasm                    ; 0e
 	dw Script_special                    ; 0f
 	dw Script_ptcallasm                  ; 10
-	dw Script_checkmaptriggers           ; 11
+	dw Script_checkmapscene              ; 11
-	dw Script_domaptrigger               ; 12
+	dw Script_setmapscene                ; 12
-	dw Script_checktriggers              ; 13
+	dw Script_checkscene                 ; 13
-	dw Script_dotrigger                  ; 14
+	dw Script_setscene                   ; 14
 	dw Script_writebyte                  ; 15
 	dw Script_addvar                     ; 16
 	dw Script_random                     ; 17
@@ -175,14 +175,14 @@ ENDC
 	dw Script_applymovement              ; 69
 	dw Script_applymovement2             ; 6a
 	dw Script_faceplayer                 ; 6b
-	dw Script_faceperson                 ; 6c
+	dw Script_faceobject                 ; 6c
 	dw Script_variablesprite             ; 6d
 	dw Script_disappear                  ; 6e
 	dw Script_appear                     ; 6f
 	dw Script_follow                     ; 70
 	dw Script_stopfollow                 ; 71
-	dw Script_moveperson                 ; 72
+	dw Script_moveobject                 ; 72
-	dw Script_writepersonxy              ; 73
+	dw Script_writeobjectxy              ; 73
 	dw Script_loademote                  ; 74
 	dw Script_showemote                  ; 75
 	dw Script_spriteface                 ; 76
@@ -979,7 +979,7 @@ Script_cry:
 	call PlayCry
 	ret
 
-GetScriptPerson:
+GetScriptObject:
 	and a ; PLAYER?
 	ret z
 	cp LAST_TALKED
@@ -990,21 +990,21 @@ GetScriptPerson:
 Script_setlasttalked:
 ; script command 0x68
 ; parameters:
-;     person (SingleByteParam)
+;     object id (SingleByteParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	ld [hLastTalked], a
 	ret
 
 Script_applymovement:
 ; script command 0x69
 ; parameters:
-;     person (SingleByteParam)
+;     object id (SingleByteParam)
 ;     data (MovementPointerLabelParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	ld c, a
 
 ApplyMovement:
@@ -1061,24 +1061,24 @@ Script_faceplayer:
 	ld e, a
 	ld a, [hLastTalked]
 	ld d, a
-	call ApplyPersonFacing
+	call ApplyObjectFacing
 	ret
 
-Script_faceperson:
+Script_faceobject:
 ; script command 0x6c
 ; parameters:
-;     person1 (SingleByteParam)
+;     object1 (SingleByteParam)
-;     person2 (SingleByteParam)
+;     object2 (SingleByteParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	cp LAST_TALKED
 	jr c, .ok
 	ld a, [hLastTalked]
 .ok
 	ld e, a
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	cp LAST_TALKED
 	jr nz, .ok2
 	ld a, [hLastTalked]
@@ -1093,17 +1093,17 @@ Script_faceperson:
 	add a
 	ld e, a
 	ld d, c
-	call ApplyPersonFacing
+	call ApplyObjectFacing
 	ret
 
 Script_spriteface:
 ; script command 0x76
 ; parameters:
-;     person (SingleByteParam)
+;     object id (SingleByteParam)
 ;     facing (SingleByteParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	cp LAST_TALKED
 	jr nz, .ok
 	ld a, [hLastTalked]
@@ -1113,10 +1113,10 @@ Script_spriteface:
 	add a
 	add a
 	ld e, a
-	call ApplyPersonFacing
+	call ApplyObjectFacing
 	ret
 
-ApplyPersonFacing:
+ApplyObjectFacing:
 	ld a, d
 	push de
 	call CheckObjectVisibility
@@ -1179,10 +1179,10 @@ Script_variablesprite:
 Script_appear:
 ; script command 0x6f
 ; parameters:
-;     person (SingleByteParam)
+;     object id (SingleByteParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	call _CopyObjectStruct
 	ld a, [hMapObjectIndexBuffer]
 	ld b, 0 ; clear
@@ -1192,10 +1192,10 @@ Script_appear:
 Script_disappear:
 ; script command 0x6e
 ; parameters:
-;     person (SingleByteParam)
+;     object id (SingleByteParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	cp LAST_TALKED
 	jr nz, .ok
 	ld a, [hLastTalked]
@@ -1230,14 +1230,14 @@ ApplyEventActionAppearDisappear:
 Script_follow:
 ; script command 0x70
 ; parameters:
-;     person2 (SingleByteParam)
+;     object2 (SingleByteParam)
-;     person1 (SingleByteParam)
+;     object1 (SingleByteParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	ld b, a
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	ld c, a
 	farcall StartFollow
 	ret
@@ -1248,15 +1248,15 @@ Script_stopfollow:
 	farcall StopFollow
 	ret
 
-Script_moveperson:
+Script_moveobject:
 ; script command 0x72
 ; parameters:
-;     person (SingleByteParam)
+;     object id (SingleByteParam)
 ;     x (SingleByteParam)
 ;     y (SingleByteParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	ld b, a
 	call GetScriptByte
 	add 4
@@ -1267,32 +1267,32 @@ Script_moveperson:
 	farcall CopyDECoordsToMapObject
 	ret
 
-Script_writepersonxy:
+Script_writeobjectxy:
 ; script command 0x73
 ; parameters:
-;     person (SingleByteParam)
+;     object id (SingleByteParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	cp LAST_TALKED
 	jr nz, .ok
 	ld a, [hLastTalked]
 .ok
 	ld b, a
-	farcall WritePersonXY
+	farcall WriteObjectXY
 	ret
 
 Script_follownotexact:
 ; script command 0x77
 ; parameters:
-;     person2 (SingleByteParam)
+;     object2 (SingleByteParam)
-;     person1 (SingleByteParam)
+;     object1 (SingleByteParam)
 
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	ld b, a
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	ld c, a
 	farcall FollowNotExact
 	ret
@@ -1315,13 +1315,13 @@ Script_showemote:
 ; script command 0x75
 ; parameters:
 ;     bubble (SingleByteParam)
-;     person (SingleByteParam)
+;     object id (SingleByteParam)
 ;     time (DecimalParam)
 
 	call GetScriptByte
 	ld [ScriptVar], a
 	call GetScriptByte
-	call GetScriptPerson
+	call GetScriptObject
 	cp LAST_TALKED
 	jr z, .ok
 	ld [hLastTalked], a
@@ -1751,20 +1751,20 @@ Script_priorityjump:
 	set 3, [hl]
 	ret
 
-Script_checktriggers:
+Script_checkscene:
 ; script command 0x13
 
-	call CheckTriggers
+	call CheckScenes
-	jr z, .no_triggers
+	jr z, .no_scene
 	ld [ScriptVar], a
 	ret
 
-.no_triggers
+.no_scene
 	ld a, $ff
 	ld [ScriptVar], a
 	ret
 
-Script_checkmaptriggers:
+Script_checkmapscene:
 ; script command 0x11
 ; parameters:
 ;     map_group (SingleByteParam)
@@ -1774,49 +1774,49 @@ Script_checkmaptriggers:
 	ld b, a
 	call GetScriptByte
 	ld c, a
-	call GetMapTrigger
+	call GetMapSceneID
 	ld a, d
 	or e
-	jr z, .no_triggers
+	jr z, .no_scene
 	ld a, [de]
 	ld [ScriptVar], a
 	ret
 
-.no_triggers
+.no_scene
 	ld a, $ff
 	ld [ScriptVar], a
 	ret
 
-Script_dotrigger:
+Script_setscene:
 ; script command 0x14
 ; parameters:
-;     trigger_id (SingleByteParam)
+;     scene_id (SingleByteParam)
 
 	ld a, [MapGroup]
 	ld b, a
 	ld a, [MapNumber]
 	ld c, a
-	jr DoTrigger
+	jr DoScene
 
-Script_domaptrigger:
+Script_setmapscene:
 ; script command 0x12
 ; parameters:
 ;     map_group (MapGroupParam)
 ;     map_id (MapIdParam)
-;     trigger_id (SingleByteParam)
+;     scene_id (SingleByteParam)
 
 	call GetScriptByte
 	ld b, a
 	call GetScriptByte
 	ld c, a
-DoTrigger:
+DoScene:
-	call GetMapTrigger
+	call GetMapSceneID
 	ld a, d
 	or e
-	jr z, .no_trigger
+	jr z, .no_scene
 	call GetScriptByte
 	ld [de], a
-.no_trigger
+.no_scene
 	ret
 
 Script_copybytetovar:

engine/std_scripts.asm

@@ -297,7 +297,7 @@ RadioTowerRocketsScript:
 	clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
 	specialphonecall SPECIALCALL_WEIRDBROADCAST
-	domaptrigger MAHOGANY_TOWN, $1
+	setmapscene MAHOGANY_TOWN, $1
 	end
 
 BugContestResultsWarpScript:
@@ -354,8 +354,8 @@ BugContestResults_DidNotLeaveMons
 	waitbutton
 BugContestResults_CleanUp
 	closetext
-	dotrigger $0
+	setscene $0
-	domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0
+	setmapscene ROUTE_35_NATIONAL_PARK_GATE, $0
 	setevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_2A
 	setevent EVENT_BUG_CATCHING_CONTESTANT_3A