pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Renaming: (fix #412)

Browse Source 
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
This commit is contained in:
Remy Oukaour 2017-12-24 13:46:34 -05:00
parent 20d6c1d876
commit c05b7f41dd
427 changed files with 5206 additions and 5206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/event_flags.asm
View File

@ -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

36
constants/map_constants.asm
View File

@ -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 SIGNPOST_UP
const SIGNPOST_DOWN
const SIGNPOST_RIGHT
const SIGNPOST_LEFT
const SIGNPOST_IFSET
const SIGNPOST_IFNOTSET
const SIGNPOST_ITEM
const SIGNPOST_COPY
const BGEVENT_READ
const BGEVENT_UP
const BGEVENT_DOWN
const BGEVENT_RIGHT
const BGEVENT_LEFT
const BGEVENT_IFSET
const BGEVENT_IFNOTSET
const BGEVENT_ITEM
const BGEVENT_COPY
; person_event types
; object_event types
; TryObjectEvent arguments (see engine/events.asm)
const_def
const PERSONTYPE_SCRIPT
const PERSONTYPE_ITEMBALL
const PERSONTYPE_TRAINER
const PERSONTYPE_3
const PERSONTYPE_4
const PERSONTYPE_5
const PERSONTYPE_6
const OBJECTTYPE_SCRIPT
const OBJECTTYPE_ITEMBALL
const OBJECTTYPE_TRAINER
const OBJECTTYPE_3
const OBJECTTYPE_4
const OBJECTTYPE_5
const OBJECTTYPE_6
; EmotesPointers indexes (see engine/overworld.asm)

38
constants/sprite_data_constants.asm
View File

@ -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 PERSON_ACTION_STAND ; 01
const PERSON_ACTION_STEP ; 02
const PERSON_ACTION_BUMP ; 03
const PERSON_ACTION_SPIN ; 04
const PERSON_ACTION_SPIN_FLICKER ; 05
const PERSON_ACTION_FISHING ; 06
const PERSON_ACTION_SHADOW ; 07
const PERSON_ACTION_EMOTE ; 08
const PERSON_ACTION_BIG_SNORLAX ; 09
const PERSON_ACTION_BOUNCE ; 0a
const PERSON_ACTION_WEIRD_TREE ; 0b
const PERSON_ACTION_BIG_LAPRAS ; 0c
const PERSON_ACTION_BIG_DOLL ; 0d
const PERSON_ACTION_BOULDER_DUST ; 0e
const PERSON_ACTION_GRASS_SHAKE ; 0f
const PERSON_ACTION_SKYFALL ; 10
const OBJECT_ACTION_00 ; 00
const OBJECT_ACTION_STAND ; 01
const OBJECT_ACTION_STEP ; 02
const OBJECT_ACTION_BUMP ; 03
const OBJECT_ACTION_SPIN ; 04
const OBJECT_ACTION_SPIN_FLICKER ; 05
const OBJECT_ACTION_FISHING ; 06
const OBJECT_ACTION_SHADOW ; 07
const OBJECT_ACTION_EMOTE ; 08
const OBJECT_ACTION_BIG_SNORLAX ; 09
const OBJECT_ACTION_BOUNCE ; 0a
const OBJECT_ACTION_WEIRD_TREE ; 0b
const OBJECT_ACTION_BIG_LAPRAS ; 0c
const OBJECT_ACTION_BIG_DOLL ; 0d
const OBJECT_ACTION_BOULDER_DUST ; 0e
const OBJECT_ACTION_GRASS_SHAKE ; 0f
const OBJECT_ACTION_SKYFALL ; 10
; Facings indexes (see data/facings.asm)
const_def

2
data/engine_flags.asm
View File

@ -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

76
data/map_objects.asm
View File

@ -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_STANDING, DOWN, PERSON_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_SLOW_RANDOM_SPIN, DOWN, PERSON_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_X, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 05
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 06
sprite_movement_data SPRITEMOVEFN_STANDING, UP, PERSON_ACTION_STAND, $00, $00, %0000 ; 07
sprite_movement_data SPRITEMOVEFN_STANDING, LEFT, PERSON_ACTION_STAND, $00, $00, %0000 ; 08
sprite_movement_data SPRITEMOVEFN_STANDING, RIGHT, PERSON_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_OBEY_DPAD, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 0b
sprite_movement_data SPRITEMOVEFN_08, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0c
sprite_movement_data SPRITEMOVEFN_09, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0d
sprite_movement_data SPRITEMOVEFN_0A, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0e
sprite_movement_data SPRITEMOVEFN_0B, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 0f
sprite_movement_data SPRITEMOVEFN_0C, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 10
sprite_movement_data SPRITEMOVEFN_0D, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 11
sprite_movement_data SPRITEMOVEFN_0E, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 12
sprite_movement_data SPRITEMOVEFN_FOLLOW, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 13
sprite_movement_data SPRITEMOVEFN_SCRIPTED, DOWN, PERSON_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_BOUNCE, DOWN, PERSON_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, PERSON_ACTION_STAND, $2e, $10, %0000 ; 18
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, PERSON_ACTION_STAND, $2e, $00, %0100 ; 19
sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 1a
sprite_movement_data SPRITEMOVEFN_SHADOW, DOWN, PERSON_ACTION_00, $8e, $01, %0000 ; 1b
sprite_movement_data SPRITEMOVEFN_EMOTE, DOWN, PERSON_ACTION_EMOTE, $8e, $02, %0000 ; 1c
sprite_movement_data SPRITEMOVEFN_SCREENSHAKE, DOWN, PERSON_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_CLOCKWISE, RIGHT, PERSON_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, PERSON_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_GRASS, DOWN, PERSON_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_00, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 25
sprite_movement_data SPRITEMOVEFN_00, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 00
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $0c, $00, %0000 ; 01
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 02
sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 03
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 04
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 05
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 06
sprite_movement_data SPRITEMOVEFN_STANDING, UP, OBJECT_ACTION_STAND, $00, $00, %0000 ; 07
sprite_movement_data SPRITEMOVEFN_STANDING, LEFT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 08
sprite_movement_data SPRITEMOVEFN_STANDING, RIGHT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 09
sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0a
sprite_movement_data SPRITEMOVEFN_OBEY_DPAD, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 0b
sprite_movement_data SPRITEMOVEFN_08, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0c
sprite_movement_data SPRITEMOVEFN_09, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0d
sprite_movement_data SPRITEMOVEFN_0A, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0e
sprite_movement_data SPRITEMOVEFN_0B, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 0f
sprite_movement_data SPRITEMOVEFN_0C, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 10
sprite_movement_data SPRITEMOVEFN_0D, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 11
sprite_movement_data SPRITEMOVEFN_0E, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 12
sprite_movement_data SPRITEMOVEFN_FOLLOW, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 13
sprite_movement_data SPRITEMOVEFN_SCRIPTED, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 14
sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX, DOWN, OBJECT_ACTION_BIG_SNORLAX, $2e, $01, %1100 ; 15
sprite_movement_data SPRITEMOVEFN_BOUNCE, DOWN, OBJECT_ACTION_BOUNCE, $2e, $00, %0000 ; 16
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $0c, $00, %0000 ; 17
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $2e, $10, %0000 ; 18
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_STAND, $2e, $00, %0100 ; 19
sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; 1a
sprite_movement_data SPRITEMOVEFN_SHADOW, DOWN, OBJECT_ACTION_00, $8e, $01, %0000 ; 1b
sprite_movement_data SPRITEMOVEFN_EMOTE, DOWN, OBJECT_ACTION_EMOTE, $8e, $02, %0000 ; 1c
sprite_movement_data SPRITEMOVEFN_SCREENSHAKE, DOWN, OBJECT_ACTION_00, $82, $00, %0000 ; 1d
sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 1e
sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE, RIGHT, OBJECT_ACTION_STAND, $00, $00, %0000 ; 1f
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_LAPRAS, $2e, $01, %1100 ; 20
sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_DOLL, $2e, $01, %1100 ; 21
sprite_movement_data SPRITEMOVEFN_BOULDERDUST, DOWN, OBJECT_ACTION_BOULDER_DUST, $8e, $01, %0000 ; 22
sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, OBJECT_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; 23
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0010 ; 24
sprite_movement_data SPRITEMOVEFN_00, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 25
; 4357

89
data/maps/map_scenes.asm Normal file
View File

@ -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

89
data/maps/map_triggers.asm
View File

@ -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

4
docs/event_commands.md
View File

@ -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*

38
docs/map_scripts.md
View File

@ -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***

6
docs/movement_commands.md
View File

@ -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`

54
engine/events.asm
View File

@ -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
ld a, [wCurrMapTriggerCount]
RunSceneScript: ; 968ec
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 PERSONTYPE_ITEMBALL, .itemball
dbw PERSONTYPE_TRAINER, .trainer
dbw OBJECTTYPE_SCRIPT, .script
dbw OBJECTTYPE_ITEMBALL, .itemball
dbw OBJECTTYPE_TRAINER, .trainer
; the remaining four are dummy events
dbw PERSONTYPE_3, .three
dbw PERSONTYPE_4, .four
dbw PERSONTYPE_5, .five
dbw PERSONTYPE_6, .six
dbw OBJECTTYPE_3, .three
dbw OBJECTTYPE_4, .four
dbw OBJECTTYPE_5, .five
dbw OBJECTTYPE_6, .six
db -1
; 96a04
@ -681,19 +681,19 @@ TryObjectEvent: ; 969b5
ret
; 96a38
TryReadSign: ; 96a38
call CheckFacingSign
jr c, .IsSign
TryBGEvent: ; 96a38
call CheckFacingBGEvent
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]

4
engine/events_2.asm
View File

@ -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

30
engine/events_3.asm
View File

@ -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...
ld hl, wCurrentMapSignpostHeaderPointer
; Get the pointer for the first BG event header in the map...
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.
ld a, [wCurrentMapSignpostCount]
; ... before even checking to see if there are any BG events on this map.
ld a, [wCurrMapBGEventCount]
and a
jr z, .nosignpostitems
; For i = 1:wCurrentMapSignpostCount...
jr z, .nobgeventitems
; 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

4
engine/map_object_action.asm
View File

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

70
engine/map_objects.asm
View File

@ -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
ld hl, GetMovementPerson
_GetMovementObject: ; 5037
ld hl, GetMovementObject
jp HandleMovementData
; 503d
GetMovementPerson: ; 503d
ld a, [wMovementPerson]
GetMovementObject: ; 503d
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

40
engine/movement.asm
View File

@ -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_hide_person ; 3d
dw Movement_show_object ; 3c
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

12
engine/npc_movement.asm
View File

@ -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]

10
engine/player_object.asm
View File

@ -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]

122
engine/scripting.asm
View File

@ -82,10 +82,10 @@ ScriptCommandTable:
dw Script_callasm ; 0e
dw Script_special ; 0f
dw Script_ptcallasm ; 10
dw Script_checkmaptriggers ; 11
dw Script_domaptrigger ; 12
dw Script_checktriggers ; 13
dw Script_dotrigger ; 14
dw Script_checkmapscene ; 11
dw Script_setmapscene ; 12
dw Script_checkscene ; 13
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_writepersonxy ; 73
dw Script_moveobject ; 72
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)
; person2 (SingleByteParam)
; object1 (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)
; person1 (SingleByteParam)
; object2 (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)
; person1 (SingleByteParam)
; object2 (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
jr z, .no_triggers
call CheckScenes
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:
call GetMapTrigger
DoScene:
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:

6
engine/std_scripts.asm
View File

@ -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
domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0
setscene $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

4
engine/trainer_scripts.asm
View File

@ -12,8 +12,8 @@ SeenByTrainerScript:: ; 0xbe675
showemote EMOTE_SHOCK, LAST_TALKED, 30
callasm TrainerWalkToPlayer
applymovement2 MovementBuffer
writepersonxy LAST_TALKED
faceperson PLAYER, LAST_TALKED
writeobjectxy LAST_TALKED
faceobject PLAYER, LAST_TALKED
jump StartBattleWithMapTrainerScript
StartBattleWithMapTrainerScript: ; 0xbe68a

2
engine/warp_connection.asm
View File

@ -3,7 +3,7 @@ HandleNewMap: ; 1045b0
call Clearwc7e8
call ResetMapBufferEventFlags
call ResetFlashIfOutOfCave
call GetCurrentMapTrigger
call GetCurrentMapSceneID
call ResetBikeFlags
ld a, MAPCALLBACK_NEWMAP
call RunMapCallback

32
event/bug_contest/judging.asm
View File

@ -2,21 +2,21 @@ _BugContestJudging: ; 1369d
call ContestScore
farcall TrainerRankings_BugContestScore
call BugContest_JudgeContestants
ld a, [wBugContestThirdPlacePersonID]
ld a, [wBugContestThirdPlaceWinnerID]
call LoadContestantName
ld a, [wBugContestThirdPlaceMon]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, BugContest_ThirdPlaceText
call PrintText
ld a, [wBugContestSecondPlacePersonID]
ld a, [wBugContestSecondPlaceWinnerID]
call LoadContestantName
ld a, [wBugContestSecondPlaceMon]
ld [wNamedObjectIndexBuffer], a
call GetPokemonName
ld hl, BugContest_SecondPlaceText
call PrintText
ld a, [wBugContestFirstPlacePersonID]
ld a, [wBugContestFirstPlaceWinnerID]
call LoadContestantName
ld a, [wBugContestFirstPlaceMon]
ld [wNamedObjectIndexBuffer], a
@ -140,7 +140,7 @@ INCLUDE "data/bug_contest_winners.asm"
BugContest_GetPlayersResult: ; 13807
ld hl, wBugContestThirdPlacePersonID
ld hl, wBugContestThirdPlaceWinnerID
ld de, -4
ld b, 3
.loop
@ -158,7 +158,7 @@ BugContest_GetPlayersResult: ; 13807
BugContest_JudgeContestants: ; 13819
call ClearContestResults
call ComputeAIContestantScores
ld hl, wBugContestTempPersonID
ld hl, wBugContestTempWinnerID
ld a, 1 ; Player
ld [hli], a
ld a, [wContestMon]
@ -188,15 +188,15 @@ DetermineContestWinners: ; 1383e
ld c, 2
call StringCmp
jr c, .not_first_place
ld hl, wBugContestSecondPlacePersonID
ld de, wBugContestThirdPlacePersonID
ld hl, wBugContestSecondPlaceWinnerID
ld de, wBugContestThirdPlaceWinnerID
ld bc, 4
call CopyBytes
ld hl, wBugContestFirstPlacePersonID
ld de, wBugContestSecondPlacePersonID
ld hl, wBugContestFirstPlaceWinnerID
ld de, wBugContestSecondPlaceWinnerID
ld bc, 4
call CopyBytes
ld hl, wBugContestFirstPlacePersonID
ld hl, wBugContestFirstPlaceWinnerID
call CopyTempContestant
jr .done
@ -206,11 +206,11 @@ DetermineContestWinners: ; 1383e
ld c, 2
call StringCmp
jr c, .not_second_place
ld hl, wBugContestSecondPlacePersonID
ld de, wBugContestThirdPlacePersonID
ld hl, wBugContestSecondPlaceWinnerID
ld de, wBugContestThirdPlaceWinnerID
ld bc, 4
call CopyBytes
ld hl, wBugContestSecondPlacePersonID
ld hl, wBugContestSecondPlaceWinnerID
call CopyTempContestant
jr .done
@ -220,7 +220,7 @@ DetermineContestWinners: ; 1383e
ld c, 2
call StringCmp
jr c, .done
ld hl, wBugContestThirdPlacePersonID
ld hl, wBugContestThirdPlaceWinnerID
call CopyTempContestant
.done
@ -229,7 +229,7 @@ DetermineContestWinners: ; 1383e
CopyTempContestant: ; 138a0
; Could've just called CopyBytes.
ld de, wBugContestTempPersonID
ld de, wBugContestTempWinnerID
rept 3
ld a, [de]
inc de
@ -251,7 +251,7 @@ ComputeAIContestantScores: ; 138b0
ld a, e
inc a
inc a
ld [wBugContestTempPersonID], a
ld [wBugContestTempWinnerID], a
dec a
ld c, a
ld b, 0

4
event/overworld.asm
View File

@ -881,11 +881,11 @@ dig_incave
.DigOut: ; 0xcc59
step_dig 32
hide_person
hide_object
step_end
.DigReturn: ; 0xcc5d
show_person
show_object
return_dig 32
step_end

2
event/std_collision.asm
View File

@ -1,4 +1,4 @@
CheckFacingTileForStd:: ; 1365b
CheckFacingTileForStdScript:: ; 1365b
; Checks to see if the tile you're facing has a std script associated with it. If so, executes the script and returns carry.
ld a, c
ld de, 3

4
home.asm
View File

@ -861,7 +861,7 @@ HandleStoneQueue:: ; 3567
ld l, a
push hl
call .IsPersonOnWarp
call .IsObjectOnWarp
pop hl
jr nc, .nope
ld d, a
@ -878,7 +878,7 @@ HandleStoneQueue:: ; 3567
ret
; 3599
.IsPersonOnWarp: ; 3599
.IsObjectOnWarp: ; 3599
push de
ld hl, OBJECT_NEXT_MAP_X

144
home/map.asm
View File

@ -8,61 +8,61 @@ Clearwc7e8:: ; 210f
ret
; 211b
CheckTriggers:: ; 211b
; Checks wCurrentMapTriggerPointer. If it's empty, returns -1 in a. Otherwise, returns the active trigger ID in a.
CheckScenes:: ; 211b
; Checks wCurrMapSceneScriptPointer. If it's empty, returns -1 in a. Otherwise, returns the active scene ID in a.
push hl
ld hl, wCurrentMapTriggerPointer
ld hl, wCurrMapSceneScriptPointer
ld a, [hli]
ld h, [hl]
ld l, a
or h
ld a, [hl]
jr nz, .triggerexists
jr nz, .scene_exists
ld a, -1
.triggerexists
.scene_exists
pop hl
ret
; 212a
GetCurrentMapTrigger:: ; 212a
; Grabs the wram map trigger pointer for the current map and loads it into wCurrentMapTriggerPointer.
; If there are no triggers, both bytes of wCurrentMapTriggerPointer are wiped clean.
; Copy the current map group and number into bc. This is needed for GetMapTrigger.
GetCurrentMapSceneID:: ; 212a
; Grabs the wram map scene script pointer for the current map and loads it into wCurrMapSceneScriptPointer.
; If there is no scene, both bytes of wCurrMapSceneScriptPointer are wiped clean.
; Copy the current map group and number into bc. This is needed for GetMapSceneID.
ld a, [MapGroup]
ld b, a
ld a, [MapNumber]
ld c, a
; Blank out wCurrentMapTriggerPointer; this is the default scenario.
; Blank out wCurrMapSceneScriptPointer; this is the default scenario.
xor a
ld [wCurrentMapTriggerPointer], a
ld [wCurrentMapTriggerPointer + 1], a
call GetMapTrigger
ret c ; The map is not in the trigger table
; Load the trigger table pointer from de into wCurrentMapTriggerPointer
ld [wCurrMapSceneScriptPointer], a
ld [wCurrMapSceneScriptPointer + 1], a
call GetMapSceneID
ret c ; The map is not in the scene script table
; Load the scene script pointer from de into wCurrMapSceneScriptPointer
ld a, e
ld [wCurrentMapTriggerPointer], a
ld [wCurrMapSceneScriptPointer], a
ld a, d
ld [wCurrentMapTriggerPointer + 1], a
ld [wCurrMapSceneScriptPointer + 1], a
xor a
ret
; 2147
GetMapTrigger:: ; 2147
; Searches the trigger table for the map group and number loaded in bc, and returns the wram pointer in de.
; If the map is not in the trigger table, returns carry.
GetMapSceneID:: ; 2147
; Searches the scene script table for the map group and number loaded in bc, and returns the wram pointer in de.
; If the map is not in the scene script table, returns carry.
push bc
ld a, [hROMBank]
push af
ld a, BANK(MapTriggers)
ld a, BANK(MapScenes)
rst Bankswitch
ld hl, MapTriggers
ld hl, MapScenes
.loop
push hl
ld a, [hli] ; map group, or terminator
cp -1
jr z, .end ; the current map is not in the trigger table
jr z, .end ; the current map is not in the scene script table
cp b
jr nz, .next ; map group did not match
ld a, [hli] ; map number
@ -72,7 +72,7 @@ GetMapTrigger:: ; 2147
.next
pop hl
ld de, 4 ; size of an entry in the trigger table
ld de, 4 ; size of an entry in the scene script table
add hl, de
jr .loop
@ -430,7 +430,7 @@ ReadMapEventHeader:: ; 2336
inc hl
call ReadWarps
call ReadCoordEvents
call ReadSignposts
call ReadBGEvents
pop af
and a
@ -445,7 +445,7 @@ ReadMapScripts:: ; 234f
ld a, [hli]
ld h, [hl]
ld l, a
call ReadMapTriggers
call ReadMapSceneScripts
call ReadMapCallbacks
ret
; 235c
@ -511,19 +511,19 @@ GetMapConnection:: ; 23a3
ret
; 23ac
ReadMapTriggers:: ; 23ac
ld a, [hli] ; trigger count
ReadMapSceneScripts:: ; 23ac
ld a, [hli] ; scene script count
ld c, a
ld [wCurrMapTriggerCount], a ; current map trigger count
ld [wCurrMapSceneScriptCount], a ; current map scene script count
ld a, l
ld [wCurrMapTriggerHeaderPointer], a ; map trigger pointer
ld [wCurrMapSceneScriptHeaderPointer], a ; map scene script pointer
ld a, h
ld [wCurrMapTriggerHeaderPointer + 1], a
ld [wCurrMapSceneScriptHeaderPointer + 1], a
ld a, c
and a
ret z
ld bc, 4 ; size of a map trigger header entry
ld bc, 4 ; size of a map scene script header entry
call AddNTimes
ret
; 23c3
@ -564,11 +564,11 @@ ReadWarps:: ; 23da
ReadCoordEvents:: ; 23f1
ld a, [hli]
ld c, a
ld [wCurrentMapXYTriggerCount], a
ld [wCurrMapCoordEventCount], a
ld a, l
ld [wCurrentMapXYTriggerHeaderPointer], a
ld [wCurrMapCoordEventHeaderPointer], a
ld a, h
ld [wCurrentMapXYTriggerHeaderPointer + 1], a
ld [wCurrMapCoordEventHeaderPointer + 1], a
ld a, c
and a
@ -579,14 +579,14 @@ ReadCoordEvents:: ; 23f1
ret
; 2408
ReadSignposts:: ; 2408
ReadBGEvents:: ; 2408
ld a, [hli]
ld c, a
ld [wCurrentMapSignpostCount], a
ld [wCurrMapBGEventCount], a
ld a, l
ld [wCurrentMapSignpostHeaderPointer], a
ld [wCurrMapBGEventHeaderPointer], a
ld a, h
ld [wCurrentMapSignpostHeaderPointer + 1], a
ld [wCurrMapBGEventHeaderPointer + 1], a
ld a, c
and a
@ -604,17 +604,17 @@ ReadObjectEvents:: ; 241f
ld hl, Map1Object
ld a, [de]
inc de
ld [wCurrentMapPersonEventCount], a
ld [wCurrMapObjectEventCount], a
ld a, e
ld [wCurrentMapPersonEventHeaderPointer], a
ld [wCurrMapObjectEventHeaderPointer], a
ld a, d
ld [wCurrentMapPersonEventHeaderPointer + 1], a
ld [wCurrMapObjectEventHeaderPointer + 1], a
ld a, [wCurrentMapPersonEventCount]
ld a, [wCurrMapObjectEventCount]
call CopyMapObjectHeaders
; get NUM_OBJECTS - [wCurrentMapPersonEventCount]
ld a, [wCurrentMapPersonEventCount]
; get NUM_OBJECTS - [wCurrMapObjectEventCount]
ld a, [wCurrMapObjectEventCount]
ld c, a
ld a, NUM_OBJECTS ; - 1
sub c
@ -1110,7 +1110,7 @@ Call_a_de:: ; 26b7
; 26c7
GetMovementData:: ; 26c7
; Initialize the movement data for person c at b:hl
; Initialize the movement data for object c at b:hl
ld a, [hROMBank]
push af
ld a, b
@ -1840,7 +1840,7 @@ GetBlockLocation:: ; 2a66
ret
; 2a8b
CheckFacingSign:: ; 2a8b
CheckFacingBGEvent:: ; 2a8b
call GetFacingTileCoord
; Load facing into b.
ld b, a
@ -1851,8 +1851,8 @@ CheckFacingSign:: ; 2a8b
ld a, e
sub 4
ld e, a
; If there are no signposts, we don't need to be here.
ld a, [wCurrentMapSignpostCount]
; If there are no BG events, we don't need to be here.
ld a, [wCurrMapBGEventCount]
and a
ret z
@ -1860,16 +1860,16 @@ CheckFacingSign:: ; 2a8b
ld a, [hROMBank]
push af
call SwitchToMapScriptHeaderBank
call CheckIfFacingTileCoordIsSign
call CheckIfFacingTileCoordIsBGEvent
pop hl
ld a, h
rst Bankswitch
ret
; 2aaa
CheckIfFacingTileCoordIsSign:: ; 2aaa
; Checks to see if you are facing a signpost. If so, copies it into EngineBuffer1 and sets carry.
ld hl, wCurrentMapSignpostHeaderPointer
CheckIfFacingTileCoordIsBGEvent:: ; 2aaa
; Checks to see if you are facing a BG event. If so, copies it into EngineBuffer1 and sets carry.
ld hl, wCurrMapBGEventHeaderPointer
ld a, [hli]
ld h, [hl]
ld l, a
@ -1885,7 +1885,7 @@ CheckIfFacingTileCoordIsSign:: ; 2aaa
.next
pop hl
ld a, 5 ; signpost event length
ld a, 5 ; BG event event length
add l
ld l, a
jr nc, .nocarry
@ -1899,39 +1899,39 @@ CheckIfFacingTileCoordIsSign:: ; 2aaa
.copysign
pop hl
ld de, wCurSignpostYCoord
ld bc, 5 ; signpost event length
ld de, wCurBGEventYCoord
ld bc, 5 ; BG event event length
call CopyBytes
scf
ret
; 2ad4
CheckCurrentMapXYTriggers:: ; 2ad4
; If there are no xy triggers, we don't need to be here.
ld a, [wCurrentMapXYTriggerCount]
CheckCurrentMapCoordEvents:: ; 2ad4
; If there are no coord events, we don't need to be here.
ld a, [wCurrMapCoordEventCount]
and a
ret z
; Copy the trigger count into c.
; Copy the coord event count into c.
ld c, a
ld a, [hROMBank]
push af
call SwitchToMapScriptHeaderBank
call .TriggerCheck
call .CoordEventCheck
pop hl
ld a, h
rst Bankswitch
ret
.TriggerCheck:
; Checks to see if you are standing on an xy-trigger. If yes, copies the trigger to EngineBuffer1 and sets carry.
ld hl, wCurrentMapXYTriggerHeaderPointer
.CoordEventCheck:
; Checks to see if you are standing on a coord event. If yes, copies the event to EngineBuffer1 and sets carry.
ld hl, wCurrMapCoordEventHeaderPointer
ld a, [hli]
ld h, [hl]
ld l, a
; Load the active trigger ID into b
call CheckTriggers
; Load the active scene ID into b
call CheckScenes
ld b, a
; Load your current coordinates into de. This will be used to check if your position is in the xy-trigger table for the current map.
; Load your current coordinates into de. This will be used to check if your position is in the coord event table for the current map.
ld a, [PlayerStandingMapX]
sub 4
ld d, a
@ -1954,11 +1954,11 @@ CheckCurrentMapXYTriggers:: ; 2ad4
ld a, [hli]
cp d
jr nz, .next
jr .copytrigger
jr .copy_coord_event
.next
pop hl
ld a, $8 ; xy-trigger size
ld a, $8 ; coord event size
add l
ld l, a
jr nc, .nocarry
@ -1970,10 +1970,10 @@ CheckCurrentMapXYTriggers:: ; 2ad4
xor a
ret
.copytrigger
.copy_coord_event
pop hl
ld de, wCurCoordEventTriggerID
ld bc, 8 ; xy-trigger size
ld de, wCurCoordEventSceneID
ld bc, 8 ; coord event size
call CopyBytes
scf
ret

6
home/map_objects.asm
View File

@ -414,15 +414,15 @@ CopyPlayerObjectTemplate:: ; 19a6
; 19e9
LoadMovementDataPointer:: ; 19e9
; Load the movement data pointer for person a.
ld [wMovementPerson], a
; Load the movement data pointer for object a.
ld [wMovementObject], a
ld a, [hROMBank]
ld [wMovementDataPointer], a
ld a, l
ld [wMovementDataPointer + 1], a
ld a, h
ld [wMovementDataPointer + 2], a
ld a, [wMovementPerson]
ld a, [wMovementObject]
call CheckObjectVisibility
ret c

2
home/movement.asm
View File

@ -1,5 +1,5 @@
InitMovementBuffer:: ; 1b1e
ld [wMovementBufferPerson], a
ld [wMovementBufferObject], a
xor a
ld [wMovementBufferCount], a
ld a, $0 ; useless

74
macros/scripts/event.asm
View File

@ -112,28 +112,28 @@ ptcallasm: macro
dw \1 ; asm
endm
enum checkmaptriggers_command ; $11
checkmaptriggers: macro
db checkmaptriggers_command
enum checkmapscene_command ; $11
checkmapscene: macro
db checkmapscene_command
map \1 ; map
endm
enum domaptrigger_command ; $12
domaptrigger: macro
db domaptrigger_command
enum setmapscene_command ; $12
setmapscene: macro
db setmapscene_command
map \1 ; map
db \2 ; trigger_id
db \2 ; scene_id
endm
enum checktriggers_command ; $13
checktriggers: macro
db checktriggers_command
enum checkscene_command ; $13
checkscene: macro
db checkscene_command
endm
enum dotrigger_command ; $14
dotrigger: macro
db dotrigger_command
db \1 ; trigger_id
enum setscene_command ; $14
setscene: macro
db setscene_command
db \1 ; scene_id
endm
enum writebyte_command ; $15
@ -665,13 +665,13 @@ check_just_battled: macro
enum setlasttalked_command ; $68
setlasttalked: macro
db setlasttalked_command
db \1 ; person
db \1 ; object id
endm
enum applymovement_command ; $69
applymovement: macro
db applymovement_command
db \1 ; person
db \1 ; object id
dw \2 ; data
endm
@ -686,11 +686,11 @@ faceplayer: macro
db faceplayer_command
endm
enum faceperson_command ; $6c
faceperson: macro
db faceperson_command
db \1 ; person1
db \2 ; person2
enum faceobject_command ; $6c
faceobject: macro
db faceobject_command
db \1 ; object1
db \2 ; object2
endm
enum variablesprite_command ; $6d
@ -703,20 +703,20 @@ variablesprite: macro
enum disappear_command ; $6e
disappear: macro
db disappear_command
db \1 ; person
db \1 ; object id
endm
enum appear_command ; $6f
appear: macro
db appear_command
db \1 ; person
db \1 ; object id
endm
enum follow_command ; $70
follow: macro
db follow_command
db \1 ; person2
db \2 ; person1
db \1 ; object2
db \2 ; object1
endm
enum stopfollow_command ; $71
@ -724,18 +724,18 @@ stopfollow: macro
db stopfollow_command
endm
enum moveperson_command ; $72
moveperson: macro
db moveperson_command
db \1 ; person
enum moveobject_command ; $72
moveobject: macro
db moveobject_command
db \1 ; object id
db \2 ; x
db \3 ; y
endm
enum writepersonxy_command ; $73
writepersonxy: macro
db writepersonxy_command
db \1 ; person
enum writeobjectxy_command ; $73
writeobjectxy: macro
db writeobjectxy_command
db \1 ; object id
endm
enum loademote_command ; $74
@ -748,22 +748,22 @@ loademote: macro
showemote: macro
db showemote_command
db \1 ; bubble
db \2 ; person
db \2 ; object id
db \3 ; time
endm
enum spriteface_command ; $76
spriteface: macro
db spriteface_command
db \1 ; person
db \1 ; object id
db \2 ; facing
endm
enum follownotexact_command ; $77
follownotexact: macro
db follownotexact_command
db \1 ; person2
db \2 ; person1
db \1 ; object2
db \2 ; object1
endm
enum earthquake_command ; $78

28
macros/scripts/maps.asm
View File

@ -4,7 +4,7 @@ map: macro
endm
maptrigger: macro
scene_script: macro
;\1: script pointer
dw \1, 0
endm
@ -18,8 +18,8 @@ warp_def: macro
map \4
endm
xy_trigger: macro
;\1: number: controlled by dotrigger/domaptrigger
coord_event: macro
;\1: number: controlled by setscene/setmapscene
;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0
;\4: script pointer
@ -28,32 +28,32 @@ xy_trigger: macro
db $0, $0
endm
signpost: macro
bg_event: macro
;\1: y: top to bottom, starts at 0
;\2: x: left to right, starts at 0
;\3: function: a SIGNPOST_* constant
;\3: function: a BGEVENT_* constant
;\4: script pointer
db \1, \2, \3
dw \4
endm
person_event: macro
object_event: macro
;\1: sprite: a SPRITE_* constant
;\2: y: top to bottom, starts at 0
;\3: x: left to right, starts at 0
;\4: movement function: a SPRITEMOVEDATA_* constant
;\5, \6: movement radius: y, x
;\7, \8: hour1 and hour2: control the hours a person_event is visible (0-23)
; * if hour1 < hour2, the person_event will only appear from hour1 to hour2
; * if hour1 > hour2, the person_event will not appear from hour2 to hour1
; * if hour1 == hour2, the person_event will always appear
;\7, \8: hour1 and hour2: control the hours an object_event is visible (0-23)
; * if hour1 < hour2, the object_event will only appear from hour1 to hour2
; * if hour1 > hour2, the object_event will not appear from hour2 to hour1
; * if hour1 == hour2, the object_event will always appear
; * if hour1 == -1, hour2 is treated as a time-of-day value:
; a combo of MORN, DAY, and/or NITE, or -1 to always appear
;\9: color: a PAL_NPC_* constant, or 0 for sprite default
;\10: function: a PERSONTYPE_* constant
;\11: sight range: applies to PERSONTYPE_TRAINER
;\10: function: a OBJECTTYPE_* constant
;\11: sight range: applies to OBJECTTYPE_TRAINER
;\12: script pointer
;\13: event flag: an EVENT_* constant, or 0 for always
;\13: event flag: an EVENT_* constant, or 0 to always appear
db \1, \2 + 4, \3 + 4, \4
dn \5, \6
db \7, \8
@ -101,7 +101,7 @@ ENDM
stonetable: macro
;\1: warp id
;\2: person_event id
;\2: object_event id
;\3: script pointer
db \1, \2
dw \3

18
macros/scripts/movement.asm
View File

@ -122,14 +122,14 @@ fix_facing: macro
db movement_fix_facing
endm
enum movement_show_person ; $3c
show_person: macro
db movement_show_person
enum movement_show_object ; $3c
show_object: macro
db movement_show_object
endm
enum movement_hide_person ; $3d
hide_person: macro
db movement_hide_person
enum movement_hide_object ; $3d
hide_object: macro
db movement_hide_object
endm
; Sleep
@ -156,9 +156,9 @@ step_48: macro
db \1 ; ???
endm
enum movement_remove_person ; $49
remove_person: macro
db movement_remove_person
enum movement_remove_object ; $49
remove_object: macro
db movement_remove_object
endm
enum movement_step_loop ; $4a

2
macros/wram.asm
View File

@ -212,7 +212,7 @@ roam_struct: MACRO
ENDM
bugcontestwinner: macro
\1PersonID:: db
\1WinnerID:: db
\1Mon:: db
\1Score:: dw
endm

2
main.asm
View File

@ -408,7 +408,7 @@ CheckSave:: ; 4cffe
ld c, $0
ret
INCLUDE "data/maps/map_triggers.asm"
INCLUDE "data/maps/map_scenes.asm"
_LoadMapPart:: ; 4d15b
ld hl, wMisc

30
maps/AzaleaGym.asm
View File

@ -8,7 +8,7 @@ const_value set 2
const AZALEAGYM_GYM_GUY
AzaleaGym_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -33,7 +33,7 @@ AzaleaGymBugsyScript:
waitsfx
setflag ENGINE_HIVEBADGE
checkcode VAR_BADGES
scall AzaleaGymTriggerRockets
scall AzaleaGymActivateRockets
.FightDone:
checkevent EVENT_GOT_TM49_FURY_CUTTER
iftrue .GotFuryCutter
@ -58,7 +58,7 @@ AzaleaGymBugsyScript:
closetext
end
AzaleaGymTriggerRockets:
AzaleaGymActivateRockets:
if_equal 7, .RadioTowerRockets
if_equal 6, .GoldenrodRockets
end
@ -370,20 +370,20 @@ AzaleaGym_MapEventHeader:
warp_def $f, $4, 5, AZALEA_TOWN
warp_def $f, $5, 5, AZALEA_TOWN
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 13, 3, SIGNPOST_READ, AzaleaGymStatue
signpost 13, 6, SIGNPOST_READ, AzaleaGymStatue
bg_event 13, 3, BGEVENT_READ, AzaleaGymStatue
bg_event 13, 6, BGEVENT_READ, AzaleaGymStatue
.PersonEvents:
.ObjectEvents:
db 7
person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1
person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1
person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1
person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
object_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1
object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherAl, -1
object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1
object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1

14
maps/AzaleaMart.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const AZALEAMART_BUG_CATCHER
AzaleaMart_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -54,14 +54,14 @@ AzaleaMart_MapEventHeader:
warp_def $7, $2, 3, AZALEA_TOWN
warp_def $7, $3, 3, AZALEA_TOWN
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
person_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
person_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1
object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1
object_event SPRITE_COOLTRAINER_M, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1
object_event SPRITE_BUG_CATCHER, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1

20
maps/AzaleaPokecenter1F.asm
View File

@ -5,14 +5,14 @@ const_value set 2
const AZALEAPOKECENTER1F_POKEFAN_F
AzaleaPokecenter1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 1
maptrigger .DummyTrigger
scene_script .DummyScene
.MapCallbacks:
db 0
.DummyTrigger:
.DummyScene:
end
AzaleaPokecenter1FNurseScript:
@ -86,15 +86,15 @@ AzaleaPokecenter1F_MapEventHeader:
warp_def $7, $4, 1, AZALEA_TOWN
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 4
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
person_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
person_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
person_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1
object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FNurseScript, -1
object_event SPRITE_GENTLEMAN, 6, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FGentlemanScript, -1
object_event SPRITE_FISHING_GURU, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FFishingGuruScript, -1
object_event SPRITE_POKEFAN_F, 4, 1, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaPokecenter1FPokefanFScript, -1

80
maps/AzaleaTown.asm
View File

@ -13,31 +13,31 @@ const_value set 2
const AZALEATOWN_KURT_OUTSIDE
AzaleaTown_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 3
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
maptrigger .DummyTrigger2
scene_script .DummyScene0
scene_script .DummyScene1
scene_script .DummyScene2
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .Flypoint
.DummyTrigger0:
.DummyScene0:
end
.DummyTrigger1:
.DummyScene1:
end
.DummyTrigger2:
.DummyScene2:
end
.Flypoint:
setflag ENGINE_FLYPOINT_AZALEA
return
AzaleaTownRivalBattleTrigger1:
moveperson AZALEATOWN_SILVER, $b, $b
AzaleaTownRivalBattleScene1:
moveobject AZALEATOWN_SILVER, $b, $b
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
@ -47,7 +47,7 @@ AzaleaTownRivalBattleTrigger1:
spriteface PLAYER, DOWN
jump AzaleaTownRivalBattleScript
AzaleaTownRivalBattleTrigger2:
AzaleaTownRivalBattleScene2:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
@ -102,7 +102,7 @@ AzaleaTownRivalBattleScript:
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER
dotrigger $0
setscene $0
waitsfx
playmapmusic
end
@ -155,7 +155,7 @@ WoosterScript:
closetext
end
AzaleaTownCelebiTrigger:
AzaleaTownCelebiScene:
applymovement PLAYER, AzaleaTownPlayerLeavesKurtsHouseMovement
opentext
writetext AzaleaTownKurtText1
@ -170,7 +170,7 @@ AzaleaTownCelebiTrigger:
setflag ENGINE_HAVE_EXAMINED_GS_BALL
clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
dotrigger $0
setscene $0
closetext
end
@ -470,35 +470,35 @@ AzaleaTown_MapEventHeader:
warp_def $a, $2, 3, ILEX_FOREST_AZALEA_GATE
warp_def $b, $2, 4, ILEX_FOREST_AZALEA_GATE
.XYTriggers:
.CoordEvents:
db 3
xy_trigger 1, $a, $5, AzaleaTownRivalBattleTrigger1
xy_trigger 1, $b, $5, AzaleaTownRivalBattleTrigger2
xy_trigger 2, $6, $9, AzaleaTownCelebiTrigger
coord_event 1, $a, $5, AzaleaTownRivalBattleScene1
coord_event 1, $b, $5, AzaleaTownRivalBattleScene2
coord_event 2, $6, $9, AzaleaTownCelebiScene
.Signposts:
.BGEvents:
db 9
signpost 9, 19, SIGNPOST_READ, AzaleaTownSign
signpost 9, 10, SIGNPOST_READ, KurtsHouseSign
signpost 15, 14, SIGNPOST_READ, AzaleaGymSign
signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign
signpost 13, 19, SIGNPOST_READ, CharcoalKilnSign
signpost 9, 16, SIGNPOST_READ, AzaleaTownPokecenterSign
signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign
signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign
signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal
bg_event 9, 19, BGEVENT_READ, AzaleaTownSign
bg_event 9, 10, BGEVENT_READ, KurtsHouseSign
bg_event 15, 14, BGEVENT_READ, AzaleaGymSign
bg_event 7, 29, BGEVENT_READ, SlowpokeWellSign
bg_event 13, 19, BGEVENT_READ, CharcoalKilnSign
bg_event 9, 16, BGEVENT_READ, AzaleaTownPokecenterSign
bg_event 5, 22, BGEVENT_READ, AzaleaTownMartSign
bg_event 9, 3, BGEVENT_READ, AzaleaTownIlextForestSign
bg_event 6, 31, BGEVENT_ITEM, AzaleaTownHiddenFullHeal
.PersonEvents:
.ObjectEvents:
db 12
person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhiteApricornTree, -1
person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS
person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT
object_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
object_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1
object_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1
object_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1
object_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES
object_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1
object_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN
object_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS
object_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT

44
maps/BattleTower1F.asm
View File

@ -6,15 +6,15 @@ const_value set 2
const BATTLETOWER1F_GRANNY
BattleTower1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 2
maptrigger .Trigger0
maptrigger .Trigger1
scene_script .Scene0
scene_script .Scene1
.MapCallbacks:
db 0
.Trigger0:
.Scene0:
writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction
iffalse .SkipEverything
@ -38,8 +38,8 @@ BattleTower1F_MapScriptHeader:
writebyte BATTLETOWERACTION_06
special BattleTowerAction
.SkipEverything:
dotrigger $1
.Trigger1:
setscene $1
.Scene1:
end
MapBattleTower1FSignpost0Script:
@ -81,10 +81,10 @@ Script_ChooseChallenge: ; 0x9e40f
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $0
setscene $0
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1
setscene $1
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
@ -105,9 +105,9 @@ Script_ResumeBattleTowerChallenge:
special BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0
domaptrigger BATTLE_TOWER_ELEVATOR, $0
domaptrigger BATTLE_TOWER_HALLWAY, $0
setmapscene BATTLE_TOWER_BATTLE_ROOM, $0
setmapscene BATTLE_TOWER_ELEVATOR, $0
setmapscene BATTLE_TOWER_HALLWAY, $0
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A
@ -208,10 +208,10 @@ continue:
writetext Text_SaveBeforeReentry
yesorno
iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $0
setscene $0
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1
setscene $1
writebyte BATTLETOWERACTION_06
special BattleTowerAction
writebyte BATTLETOWERACTION_12
@ -803,17 +803,17 @@ BattleTower1F_MapEventHeader:
warp_def $9, $8, 4, BATTLE_TOWER_OUTSIDE
warp_def $0, $7, 1, BATTLE_TOWER_ELEVATOR
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 1
signpost 6, 6, SIGNPOST_READ, MapBattleTower1FSignpost0Script
bg_event 6, 6, BGEVENT_READ, MapBattleTower1FSignpost0Script
.PersonEvents:
.ObjectEvents:
db 5
person_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
person_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
person_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
person_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
person_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1
object_event SPRITE_RECEPTIONIST, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ReceptionistScript_0x9e3e2, -1
object_event SPRITE_YOUNGSTER, 9, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x9e55d, -1
object_event SPRITE_COOLTRAINER_F, 9, 4, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x9e568, -1
object_event SPRITE_BUG_CATCHER, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BugCatcherScript_0x9e56b, -1
object_event SPRITE_GRANNY, 3, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x9e56e, -1

20
maps/BattleTowerBattleRoom.asm
View File

@ -3,10 +3,10 @@ const_value set 2
const BATTLETOWERBATTLEROOM_RECEPTIONIST
BattleTowerBattleRoom_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 2
maptrigger .EnterBattleRoom
maptrigger .DummyTrigger
scene_script .EnterBattleRoom
scene_script .DummyScene
.MapCallbacks:
db 0
@ -14,8 +14,8 @@ BattleTowerBattleRoom_MapScriptHeader:
.EnterBattleRoom: ; 0x9f419
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom
dotrigger $1
.DummyTrigger:
setscene $1
.DummyScene:
end
Script_BattleRoom: ; 0x9f421
@ -149,13 +149,13 @@ BattleTowerBattleRoom_MapEventHeader:
warp_def $7, $3, 4, BATTLE_TOWER_HALLWAY
warp_def $7, $4, 4, BATTLE_TOWER_HALLWAY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 2
person_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
person_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1
object_event SPRITE_YOUNGSTER, 0, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
object_event SPRITE_RECEPTIONIST, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1

20
maps/BattleTowerElevator.asm
View File

@ -2,19 +2,19 @@ const_value set 2
const BATTLETOWERELEVATOR_RECEPTIONIST
BattleTowerElevator_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 2
maptrigger .Trigger0
maptrigger .Trigger1
scene_script .Scene0
scene_script .Scene1
.MapCallbacks:
db 0
.Trigger0:
.Scene0:
priorityjump .RideElevator
dotrigger $1
setscene $1
.Trigger1:
.Scene1:
end
.RideElevator:
@ -53,12 +53,12 @@ BattleTowerElevator_MapEventHeader:
warp_def $3, $1, 1, BATTLE_TOWER_HALLWAY
warp_def $3, $2, 1, BATTLE_TOWER_HALLWAY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1
object_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1

22
maps/BattleTowerHallway.asm
View File

@ -2,18 +2,18 @@ const_value set 2
const BATTLETOWERHALLWAY_RECEPTIONIST
BattleTowerHallway_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 2
maptrigger .Trigger0
maptrigger .Trigger1
scene_script .Scene0
scene_script .Scene1
.MapCallbacks:
db 0
.Trigger0:
.Scene0:
priorityjump .ChooseBattleRoom
dotrigger $1
.Trigger1:
setscene $1
.Scene1:
end
.ChooseBattleRoom:
@ -68,7 +68,7 @@ BattleTowerHallway_MapScriptHeader:
jump .EnterBattleRoom
.EnterBattleRoom: ; 0x9f61f
faceperson PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST
faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST
opentext
writetext Text_PleaseStepThisWay
waitbutton
@ -91,12 +91,12 @@ BattleTowerHallway_MapEventHeader:
warp_def $0, $d, 1, BATTLE_TOWER_BATTLE_ROOM
warp_def $0, $f, 1, BATTLE_TOWER_BATTLE_ROOM
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1
object_event SPRITE_RECEPTIONIST, 2, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerHallway_MapEventHeader, -1

18
maps/BattleTowerOutside.asm
View File

@ -5,7 +5,7 @@ const_value set 2
const BATTLETOWEROUTSIDE_LASS
BattleTowerOutside_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -137,16 +137,16 @@ BattleTowerOutside_MapEventHeader:
warp_def $9, $8, 1, BATTLE_TOWER_1F
warp_def $9, $9, 2, BATTLE_TOWER_1F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 1
signpost 10, 10, SIGNPOST_READ, MapBattleTowerOutsideSignpost0Script
bg_event 10, 10, BGEVENT_READ, MapBattleTowerOutsideSignpost0Script
.PersonEvents:
.ObjectEvents:
db 4
person_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
person_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
person_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
person_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1
object_event SPRITE_STANDING_YOUNGSTER, 12, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
object_event SPRITE_BUENA, 11, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBuenaScript, -1
object_event SPRITE_SAILOR, 18, 12, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
object_event SPRITE_LASS, 24, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1

10
maps/BillsHouse.asm
View File

@ -2,7 +2,7 @@ const_value set 2
const BILLSHOUSE_GRAMPS
BillsHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -362,12 +362,12 @@ BillsHouse_MapEventHeader:
warp_def $7, $2, 1, ROUTE_25
warp_def $7, $3, 1, ROUTE_25
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BillsGrandpa, -1
object_event SPRITE_GRAMPS, 3, 2, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BillsGrandpa, -1

40
maps/BlackthornCity.asm
View File

@ -10,7 +10,7 @@ const_value set 2
const BLACKTHORNCITY_COOLTRAINER_F2
BlackthornCity_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -327,27 +327,27 @@ BlackthornCity_MapEventHeader:
warp_def $9, $24, 2, ICE_PATH_1F
warp_def $1, $14, 1, DRAGONS_DEN_1F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 7
signpost 24, 34, SIGNPOST_READ, BlackthornCitySign
signpost 13, 17, SIGNPOST_READ, BlackthornGymSign
signpost 31, 7, SIGNPOST_READ, MoveDeletersHouseSign
signpost 3, 21, SIGNPOST_READ, DragonDensSign
signpost 25, 5, SIGNPOST_READ, BlackthornCityTrainerTips
signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign
signpost 29, 22, SIGNPOST_READ, BlackthornCityPokecenterSign
bg_event 24, 34, BGEVENT_READ, BlackthornCitySign
bg_event 13, 17, BGEVENT_READ, BlackthornGymSign
bg_event 31, 7, BGEVENT_READ, MoveDeletersHouseSign
bg_event 3, 21, BGEVENT_READ, DragonDensSign
bg_event 25, 5, BGEVENT_READ, BlackthornCityTrainerTips
bg_event 29, 16, BGEVENT_READ, BlackthornCityMartSign
bg_event 29, 22, BGEVENT_READ, BlackthornCityPokecenterSign
.PersonEvents:
.ObjectEvents:
db 9
person_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
person_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
person_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
person_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
person_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1
person_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
person_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1
person_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
person_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1
object_event SPRITE_SUPER_NERD, 12, 18, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM
object_event SPRITE_SUPER_NERD, 12, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornSuperNerdScript, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
object_event SPRITE_GRAMPS, 2, 20, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps1Script, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
object_event SPRITE_GRAMPS, 2, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGramps2Script, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
object_event SPRITE_BLACK_BELT, 31, 24, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornBlackBeltScript, -1
object_event SPRITE_COOLTRAINER_F, 25, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF1Script, -1
object_event SPRITE_YOUNGSTER, 15, 13, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornYoungsterScript, -1
object_event SPRITE_YOUNGSTER, 20, 22, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
object_event SPRITE_COOLTRAINER_F, 19, 35, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornCooltrainerF2Script, -1

12
maps/BlackthornDragonSpeechHouse.asm
View File

@ -3,7 +3,7 @@ const_value set 2
const BLACKTHORNDRAGONSPEECHHOUSE_EKANS
BlackthornDragonSpeechHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -56,13 +56,13 @@ BlackthornDragonSpeechHouse_MapEventHeader:
warp_def $7, $2, 2, BLACKTHORN_CITY
warp_def $7, $3, 2, BLACKTHORN_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 2
person_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
person_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1
object_event SPRITE_GRANNY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseGrannyScript, -1
object_event SPRITE_EKANS, 5, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornDragonSpeechHouseDratiniScript, -1

14
maps/BlackthornEmysHouse.asm
View File

@ -2,7 +2,7 @@ const_value set 2
const BLACKTHORNEMYSHOUSE_EMY
BlackthornEmysHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -28,14 +28,14 @@ BlackthornEmysHouse_MapEventHeader:
warp_def $7, $2, 3, BLACKTHORN_CITY
warp_def $7, $3, 3, BLACKTHORN_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 1, 0, SIGNPOST_READ, EmysHouseBookshelf
signpost 1, 1, SIGNPOST_READ, EmysHouseBookshelf
bg_event 1, 0, BGEVENT_READ, EmysHouseBookshelf
bg_event 1, 1, BGEVENT_READ, EmysHouseBookshelf
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, Emy, -1
object_event SPRITE_LASS, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Emy, -1

22
maps/BlackthornGym1F.asm
View File

@ -6,7 +6,7 @@ const_value set 2
const BLACKTHORNGYM1F_GYM_GUY
BlackthornGym1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -400,18 +400,18 @@ BlackthornGym1F_MapEventHeader:
warp_def $7, $7, 4, BLACKTHORN_GYM_2F
warp_def $6, $7, 5, BLACKTHORN_GYM_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 15, 3, SIGNPOST_READ, BlackthornGymStatue
signpost 15, 6, SIGNPOST_READ, BlackthornGymStatue
bg_event 15, 3, BGEVENT_READ, BlackthornGymStatue
bg_event 15, 6, BGEVENT_READ, BlackthornGymStatue
.PersonEvents:
.ObjectEvents:
db 5
person_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
person_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
person_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
person_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
person_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1
object_event SPRITE_CLAIR, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BlackthornGymClairScript, -1
object_event SPRITE_COOLTRAINER_M, 6, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
object_event SPRITE_COOLTRAINER_M, 14, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
object_event SPRITE_COOLTRAINER_F, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
object_event SPRITE_GYM_GUY, 15, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1

24
maps/BlackthornGym2F.asm
View File

@ -9,7 +9,7 @@ const_value set 2
const BLACKTHORNGYM2F_BOULDER6
BlackthornGym2F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -139,19 +139,19 @@ BlackthornGym2F_MapEventHeader:
warp_def $7, $8, 6, BLACKTHORN_GYM_1F ; hole
warp_def $3, $8, 7, BLACKTHORN_GYM_1F ; hole
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 8
person_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
person_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
person_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
person_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
person_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
person_event SPRITE_BOULDER, 3, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 1, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
person_event SPRITE_BOULDER, 14, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
object_event SPRITE_COOLTRAINER_M, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermCody, -1
object_event SPRITE_COOLTRAINER_F, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfFran, -1
object_event SPRITE_BOULDER, 2, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1
object_event SPRITE_BOULDER, 3, 2, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2
object_event SPRITE_BOULDER, 16, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3
object_event SPRITE_BOULDER, 3, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
object_event SPRITE_BOULDER, 1, 6, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1
object_event SPRITE_BOULDER, 14, 8, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornGymBoulder, -1

14
maps/BlackthornMart.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const BLACKTHORNMART_BLACK_BELT
BlackthornMart_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -55,14 +55,14 @@ BlackthornMart_MapEventHeader:
warp_def $7, $2, 4, BLACKTHORN_CITY
warp_def $7, $3, 4, BLACKTHORN_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
person_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1
object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartClerkScript, -1
object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1
object_event SPRITE_BLACK_BELT, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1

16
maps/BlackthornPokecenter1F.asm
View File

@ -5,7 +5,7 @@ const_value set 2
const BLACKTHORNPOKECENTER1F_COOLTRAINER_M
BlackthornPokecenter1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -59,15 +59,15 @@ BlackthornPokecenter1F_MapEventHeader:
warp_def $7, $4, 5, BLACKTHORN_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 4
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
person_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
person_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1
object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FNurseScript, -1
object_event SPRITE_GENTLEMAN, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FGentlemanScript, -1
object_event SPRITE_TWIN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FTwinScript, -1
object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornPokecenter1FCooltrainerMScript, -1

10
maps/BluesHouse.asm
View File

@ -2,7 +2,7 @@ const_value set 2
const BLUESHOUSE_DAISY
BluesHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -153,12 +153,12 @@ BluesHouse_MapEventHeader:
warp_def $7, $2, 2, PALLET_TOWN
warp_def $7, $3, 2, PALLET_TOWN
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DaisyScript, -1
object_event SPRITE_DAISY, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DaisyScript, -1

18
maps/BrunosRoom.asm
View File

@ -2,10 +2,10 @@ const_value set 2
const BRUNOSROOM_BRUNO
BrunosRoom_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 2
maptrigger .LockDoor
maptrigger .DummyTrigger
scene_script .LockDoor
scene_script .DummyScene
.MapCallbacks:
db 1
@ -15,7 +15,7 @@ BrunosRoom_MapScriptHeader:
priorityjump .BrunosDoorLocksBehindYou
end
.DummyTrigger:
.DummyScene:
end
.BrunosRoomDoors:
@ -37,7 +37,7 @@ BrunosRoom_MapScriptHeader:
changeblock $4, $e, $2a
reloadmappart
closetext
dotrigger $1
setscene $1
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
waitsfx
end
@ -135,12 +135,12 @@ BrunosRoom_MapEventHeader:
warp_def $2, $4, 1, KARENS_ROOM
warp_def $2, $5, 2, KARENS_ROOM
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1
object_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1

42
maps/BurnedTower1F.asm
View File

@ -6,24 +6,24 @@ const_value set 2
const BURNEDTOWER1F_POKE_BALL
BurnedTower1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 3
maptrigger .EusineTrigger
maptrigger .DummyTrigger1
maptrigger .DummyTrigger2
scene_script .EusineScene
scene_script .DummyScene1
scene_script .DummyScene2
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .HoleAndLadder
.EusineTrigger:
.EusineScene:
priorityjump .MeetEusine
end
.DummyTrigger1:
.DummyScene1:
end
.DummyTrigger2:
.DummyScene2:
end
.HoleAndLadder:
@ -45,8 +45,8 @@ BurnedTower1F_MapScriptHeader:
writetext BurnedTower1FEusineIntroText
waitbutton
closetext
moveperson BURNEDTOWER1F_EUSINE, $9, $e
dotrigger $1
moveobject BURNEDTOWER1F_EUSINE, $9, $e
setscene $1
end
BurnedTowerRivalBattleScript:
@ -98,7 +98,7 @@ BurnedTowerRivalBattleScript:
writetext BurnedTowerSilver_AfterText1
waitbutton
closetext
dotrigger $2
setscene $2
setevent EVENT_RIVAL_BURNED_TOWER
special Special_FadeOutMusic
pause 15
@ -300,19 +300,19 @@ BurnedTower1F_MapEventHeader:
warp_def $e, $f, 5, BURNED_TOWER_B1F
warp_def $f, $7, 6, BURNED_TOWER_B1F
.XYTriggers:
.CoordEvents:
db 1
xy_trigger 1, $9, $b, BurnedTowerRivalBattleScript
coord_event 1, $9, $b, BurnedTowerRivalBattleScript
.Signposts:
.BGEvents:
db 2
signpost 7, 8, SIGNPOST_ITEM, BurnedTower1FHiddenEther
signpost 11, 13, SIGNPOST_ITEM, BurnedTower1FHiddenUltraBall
bg_event 7, 8, BGEVENT_ITEM, BurnedTower1FHiddenEther
bg_event 11, 13, BGEVENT_ITEM, BurnedTower1FHiddenUltraBall
.PersonEvents:
.ObjectEvents:
db 5
person_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTower1FRock, -1
person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY
person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
object_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
object_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
object_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
object_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY
object_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP

44
maps/BurnedTowerB1F.asm
View File

@ -10,19 +10,19 @@ const_value set 2
const BURNEDTOWERB1F_EUSINE
BurnedTowerB1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 2
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
scene_script .DummyScene0
scene_script .DummyScene1
.MapCallbacks:
db 1
dbw MAPCALLBACK_TILES, .LadderCallback
.DummyTrigger0:
.DummyScene0:
end
.DummyTrigger1:
.DummyScene1:
end
.LadderCallback:
@ -81,11 +81,11 @@ ReleaseTheBeasts:
disappear BURNEDTOWERB1F_SUICUNE1
waitsfx
special RestartMapMusic
dotrigger $1
setscene $1
setevent EVENT_RELEASED_THE_BEASTS
special InitRoamMons
domaptrigger ECRUTEAK_GYM, $1
domaptrigger CIANWOOD_CITY, $1
setmapscene ECRUTEAK_GYM, $1
setmapscene CIANWOOD_CITY, $1
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_ECRUTEAK_GYM_GRAMPS
clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@ -96,7 +96,7 @@ ReleaseTheBeasts:
changeblock $6, $e, $1b
reloadmappart
closetext
dotrigger $1
setscene $1
end
BurnedTowerB1FEusine:
@ -248,21 +248,21 @@ BurnedTowerB1F_MapEventHeader:
warp_def $e, $11, 12, BURNED_TOWER_1F
warp_def $f, $7, 14, BURNED_TOWER_1F
.XYTriggers:
.CoordEvents:
db 1
xy_trigger 0, $6, $a, ReleaseTheBeasts
coord_event 0, $6, $a, ReleaseTheBeasts
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 9
person_event SPRITE_BOULDER, 8, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
person_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
person_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
person_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER
object_event SPRITE_BOULDER, 8, 17, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FBoulder, -1
object_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
object_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
object_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1
object_event SPRITE_RAIKOU, 3, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
object_event SPRITE_ENTEI, 3, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
object_event SPRITE_SUICUNE, 4, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_SILVER, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2
object_event SPRITE_POKE_BALL, 4, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTowerB1FTMEndure, EVENT_BURNED_TOWER_B1F_TM_ENDURE
object_event SPRITE_SUPER_NERD, 12, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTowerB1FEusine, EVENT_EUSINE_IN_BURNED_TOWER

22
maps/CeladonCafe.asm
View File

@ -6,7 +6,7 @@ const_value set 2
const CELADONCAFE_TEACHER
CeladonCafe_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -216,18 +216,18 @@ CeladonCafe_MapEventHeader:
warp_def $7, $6, 9, CELADON_CITY
warp_def $7, $7, 9, CELADON_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 0, 5, SIGNPOST_READ, EatathonContestPoster
signpost 1, 7, SIGNPOST_READ, CeladonCafeTrashcan
bg_event 0, 5, BGEVENT_READ, EatathonContestPoster
bg_event 1, 7, BGEVENT_READ, CeladonCafeTrashcan
.PersonEvents:
.ObjectEvents:
db 5
person_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCafeChef, -1
person_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
person_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher2, -1
person_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeFisher3, -1
person_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonCafeTeacher, -1
object_event SPRITE_SUPER_NERD, 3, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1
object_event SPRITE_FISHER, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1
object_event SPRITE_FISHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1
object_event SPRITE_FISHER, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher3, -1
object_event SPRITE_TEACHER, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeTeacher, -1

42
maps/CeladonCity.asm
View File

@ -10,7 +10,7 @@ const_value set 2
const CELADONCITY_LASS
CeladonCity_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -250,28 +250,28 @@ CeladonCity_MapEventHeader:
warp_def $1d, $a, 1, CELADON_GYM
warp_def $1d, $19, 1, CELADON_CAFE
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 8
signpost 21, 23, SIGNPOST_READ, CeladonCitySign
signpost 31, 11, SIGNPOST_READ, CeladonGymSign
signpost 9, 6, SIGNPOST_READ, CeladonCityDeptStoreSign
signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign
signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign
signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips
signpost 9, 30, SIGNPOST_READ, CeladonCityPokecenterSign
signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp
bg_event 21, 23, BGEVENT_READ, CeladonCitySign
bg_event 31, 11, BGEVENT_READ, CeladonGymSign
bg_event 9, 6, BGEVENT_READ, CeladonCityDeptStoreSign
bg_event 9, 13, BGEVENT_READ, CeladonCityMansionSign
bg_event 21, 19, BGEVENT_READ, CeladonCityGameCornerSign
bg_event 21, 29, BGEVENT_READ, CeladonCityTrainerTips
bg_event 9, 30, BGEVENT_READ, CeladonCityPokecenterSign
bg_event 21, 37, BGEVENT_ITEM, CeladonCityHiddenPpUp
.PersonEvents:
.ObjectEvents:
db 9
person_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityFisherScript, -1
person_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1
person_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1
person_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1
person_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1
person_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1
person_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1
person_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1
person_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonCityLassScript, -1
object_event SPRITE_FISHER, 11, 26, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityFisherScript, -1
object_event SPRITE_POLIWAG, 11, 27, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityPoliwrath, -1
object_event SPRITE_TEACHER, 24, 20, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher1Script, -1
object_event SPRITE_GRAMPS, 16, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps1Script, -1
object_event SPRITE_GRAMPS, 31, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityGramps2Script, -1
object_event SPRITE_YOUNGSTER, 13, 18, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster1Script, -1
object_event SPRITE_YOUNGSTER, 33, 24, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityYoungster2Script, -1
object_event SPRITE_TEACHER, 14, 6, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCityTeacher2Script, -1
object_event SPRITE_LASS, 22, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonCityLassScript, -1

18
maps/CeladonDeptStore1F.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const CELADONDEPTSTORE1F_TEACHER
CeladonDeptStore1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -84,16 +84,16 @@ CeladonDeptStore1F_MapEventHeader:
warp_def $0, $f, 2, CELADON_DEPT_STORE_2F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 0, 14, SIGNPOST_READ, CeladonDeptStore1FDirectory
signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton
bg_event 0, 14, BGEVENT_READ, CeladonDeptStore1FDirectory
bg_event 0, 3, BGEVENT_READ, CeladonDeptStore1FElevatorButton
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
person_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1
object_event SPRITE_RECEPTIONIST, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FReceptionistScript, -1
object_event SPRITE_GENTLEMAN, 4, 11, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FGentlemanScript, -1
object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore1FTeacherScript, -1

20
maps/CeladonDeptStore2F.asm
View File

@ -5,7 +5,7 @@ const_value set 2
const CELADONDEPTSTORE2F_YOUNGSTER
CeladonDeptStore2F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -78,17 +78,17 @@ CeladonDeptStore2F_MapEventHeader:
warp_def $0, $f, 3, CELADON_DEPT_STORE_1F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 0, 14, SIGNPOST_READ, CeladonDeptStore2FDirectory
signpost 0, 3, SIGNPOST_READ, CeladonDeptStore2FElevatorButton
bg_event 0, 14, BGEVENT_READ, CeladonDeptStore2FDirectory
bg_event 0, 3, BGEVENT_READ, CeladonDeptStore2FElevatorButton
.PersonEvents:
.ObjectEvents:
db 4
person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
person_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
person_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
person_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1
object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bad, -1
object_event SPRITE_CLERK, 5, 14, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70bb5, -1
object_event SPRITE_POKEFAN_M, 2, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FPokefanMScript, -1
object_event SPRITE_YOUNGSTER, 2, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore2FYoungsterScript, -1

22
maps/CeladonDeptStore3F.asm
View File

@ -6,7 +6,7 @@ const_value set 2
const CELADONDEPTSTORE3F_SUPER_NERD
CeladonDeptStore3F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -104,18 +104,18 @@ CeladonDeptStore3F_MapEventHeader:
warp_def $0, $f, 2, CELADON_DEPT_STORE_4F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 0, 14, SIGNPOST_READ, CeladonDeptStore3FDirectory
signpost 0, 3, SIGNPOST_READ, CeladonDeptStore3FElevatorButton
bg_event 0, 14, BGEVENT_READ, CeladonDeptStore3FDirectory
bg_event 0, 3, BGEVENT_READ, CeladonDeptStore3FElevatorButton
.PersonEvents:
.ObjectEvents:
db 5
person_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1
object_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
object_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
object_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
object_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1

18
maps/CeladonDeptStore4F.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const CELADONDEPTSTORE4F_YOUNGSTER
CeladonDeptStore4F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -60,16 +60,16 @@ CeladonDeptStore4F_MapEventHeader:
warp_def $0, $f, 2, CELADON_DEPT_STORE_3F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 0, 14, SIGNPOST_READ, CeladonDeptStore4FDirectory
signpost 0, 3, SIGNPOST_READ, CeladonDeptStore4FElevatorButton
bg_event 0, 14, BGEVENT_READ, CeladonDeptStore4FDirectory
bg_event 0, 3, BGEVENT_READ, CeladonDeptStore4FElevatorButton
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
person_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
person_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1
object_event SPRITE_CLERK, 5, 13, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x70f0d, -1
object_event SPRITE_SUPER_NERD, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FSuperNerdScript, -1
object_event SPRITE_YOUNGSTER, 2, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore4FYoungsterScript, -1

22
maps/CeladonDeptStore5F.asm
View File

@ -6,7 +6,7 @@ const_value set 2
const CELADONDEPTSTORE5F_TEACHER
CeladonDeptStore5F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -81,18 +81,18 @@ CeladonDeptStore5F_MapEventHeader:
warp_def $0, $f, 1, CELADON_DEPT_STORE_6F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 0, 14, SIGNPOST_READ, CeladonDeptStore5FDirectory
signpost 0, 3, SIGNPOST_READ, CeladonDeptStore5FElevatorButton
bg_event 0, 14, BGEVENT_READ, CeladonDeptStore5FDirectory
bg_event 0, 3, BGEVENT_READ, CeladonDeptStore5FElevatorButton
.PersonEvents:
.ObjectEvents:
db 5
person_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
person_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
person_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
person_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
person_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1
object_event SPRITE_CLERK, 5, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x71004, -1
object_event SPRITE_CLERK, 5, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x7100c, -1
object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FGentlemanScript, -1
object_event SPRITE_SAILOR, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FSailorScript, -1
object_event SPRITE_TEACHER, 7, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore5FTeacherScript, -1

24
maps/CeladonDeptStore6F.asm
View File

@ -3,7 +3,7 @@ const_value set 2
const CELADONDEPTSTORE6F_YOUNGSTER
CeladonDeptStore6F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -156,19 +156,19 @@ CeladonDeptStore6F_MapEventHeader:
warp_def $0, $f, 2, CELADON_DEPT_STORE_5F
warp_def $0, $2, 1, CELADON_DEPT_STORE_ELEVATOR
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 6
signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory
signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton
signpost 1, 8, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
signpost 1, 9, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
signpost 1, 10, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
signpost 1, 11, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
bg_event 0, 14, BGEVENT_READ, CeladonDeptStore6FDirectory
bg_event 0, 3, BGEVENT_READ, CeladonDeptStore1FElevatorButton
bg_event 1, 8, BGEVENT_UP, CeladonDeptStore6FVendingMachine
bg_event 1, 9, BGEVENT_UP, CeladonDeptStore6FVendingMachine
bg_event 1, 10, BGEVENT_UP, CeladonDeptStore6FVendingMachine
bg_event 1, 11, BGEVENT_UP, CeladonDeptStore6FVendingMachine
.PersonEvents:
.ObjectEvents:
db 2
person_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
person_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1
object_event SPRITE_SUPER_NERD, 2, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1
object_event SPRITE_YOUNGSTER, 5, 12, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1

10
maps/CeladonDeptStoreElevator.asm
View File

@ -1,5 +1,5 @@
CeladonDeptStoreElevator_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -36,12 +36,12 @@ CeladonDeptStoreElevator_MapEventHeader:
warp_def $3, $1, -1, CELADON_DEPT_STORE_1F
warp_def $3, $2, -1, CELADON_DEPT_STORE_1F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 1
signpost 0, 3, SIGNPOST_READ, CeladonDeptStoreElevatorScript
bg_event 0, 3, BGEVENT_READ, CeladonDeptStoreElevatorScript
.PersonEvents:
.ObjectEvents:
db 0

102
maps/CeladonGameCorner.asm
View File

@ -10,7 +10,7 @@ const_value set 2
const CELADONGAMECORNER_GRAMPS
CeladonGameCorner_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -290,58 +290,58 @@ CeladonGameCorner_MapEventHeader:
warp_def $d, $e, 6, CELADON_CITY
warp_def $d, $f, 6, CELADON_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 38
signpost 6, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 7, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 8, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 9, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 10, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 11, 1, SIGNPOST_LEFT, CeladonGameCornerCardFlipScript
signpost 6, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 7, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 8, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script
signpost 10, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 11, 6, SIGNPOST_RIGHT, CeladonGameCornerCardFlipScript
signpost 6, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 7, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 8, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 9, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 10, 7, SIGNPOST_READ, CeladonGameCornerSlotMachineScript
signpost 11, 7, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript
signpost 6, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 7, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 8, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 9, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 10, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 11, 12, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript
signpost 6, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 7, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 8, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 9, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 10, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 11, 13, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript
signpost 6, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 7, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 8, 18, SIGNPOST_READ, CeladonGameCornerLighterScript
signpost 9, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 10, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 11, 18, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript
signpost 0, 15, SIGNPOST_READ, CeladonGameCornerPoster1Script
signpost 0, 9, SIGNPOST_READ, CeladonGameCornerPoster2Script
bg_event 6, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 7, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 8, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 9, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 10, 1, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 11, 1, BGEVENT_LEFT, CeladonGameCornerCardFlipScript
bg_event 6, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 7, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 8, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 9, 6, BGEVENT_READ, MapCeladonGameCornerSignpost9Script
bg_event 10, 6, BGEVENT_READ, CeladonGameCornerCardFlipScript
bg_event 11, 6, BGEVENT_RIGHT, CeladonGameCornerCardFlipScript
bg_event 6, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 7, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 8, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 9, 7, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 10, 7, BGEVENT_READ, CeladonGameCornerSlotMachineScript
bg_event 11, 7, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
bg_event 6, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 7, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 8, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 9, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 10, 12, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 11, 12, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
bg_event 6, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 7, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 8, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 9, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 10, 13, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 11, 13, BGEVENT_LEFT, CeladonGameCornerLuckySlotMachineScript
bg_event 6, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 7, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 8, 18, BGEVENT_READ, CeladonGameCornerLighterScript
bg_event 9, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 10, 18, BGEVENT_READ, CeladonGameCornerLuckySlotMachineScript
bg_event 11, 18, BGEVENT_RIGHT, CeladonGameCornerLuckySlotMachineScript
bg_event 0, 15, BGEVENT_READ, CeladonGameCornerPoster1Script
bg_event 0, 9, BGEVENT_READ, CeladonGameCornerPoster2Script
.PersonEvents:
.ObjectEvents:
db 9
person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1
person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1
person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1
object_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
object_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
object_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1
object_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1
object_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
object_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
object_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
object_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
object_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1

16
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -3,7 +3,7 @@ const_value set 2
const CELADONGAMECORNERPRIZEROOM_PHARMACIST
CeladonGameCornerPrizeRoom_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -278,15 +278,15 @@ CeladonGameCornerPrizeRoom_MapEventHeader:
warp_def $5, $2, 7, CELADON_CITY
warp_def $5, $3, 7, CELADON_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 1, 2, SIGNPOST_READ, GoldenrodGameCornerTMVendor
signpost 1, 4, SIGNPOST_READ, GoldenrodGameCornerPokemonVendor
bg_event 1, 2, BGEVENT_READ, GoldenrodGameCornerTMVendor
bg_event 1, 4, BGEVENT_READ, GoldenrodGameCornerPokemonVendor
.PersonEvents:
.ObjectEvents:
db 2
person_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
person_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1
object_event SPRITE_GENTLEMAN, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomGentlemanScript, -1
object_event SPRITE_PHARMACIST, 4, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerPrizeRoomPharmacistScript, -1

24
maps/CeladonGym.asm
View File

@ -7,7 +7,7 @@ const_value set 2
const CELADONGYM_TWIN2
CeladonGym_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -276,19 +276,19 @@ CeladonGym_MapEventHeader:
warp_def $11, $4, 8, CELADON_CITY
warp_def $11, $5, 8, CELADON_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 15, 3, SIGNPOST_READ, CeladonGymStatue
signpost 15, 6, SIGNPOST_READ, CeladonGymStatue
bg_event 15, 3, BGEVENT_READ, CeladonGymStatue
bg_event 15, 6, BGEVENT_READ, CeladonGymStatue
.PersonEvents:
.ObjectEvents:
db 6
person_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
person_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerLassMichelle, -1
person_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
person_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerBeautyJulia, -1
person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1
person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1
object_event SPRITE_ERIKA, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ErikaScript_0x72a6a, -1
object_event SPRITE_LASS, 8, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
object_event SPRITE_LASS, 8, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
object_event SPRITE_BUENA, 5, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1
object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1

22
maps/CeladonMansion1F.asm
View File

@ -5,7 +5,7 @@ const_value set 2
const CELADONMANSION1F_GROWLITHE2
CeladonMansion1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -86,18 +86,18 @@ CeladonMansion1F_MapEventHeader:
warp_def $0, $0, 1, CELADON_MANSION_2F
warp_def $0, $7, 4, CELADON_MANSION_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 3
signpost 8, 5, SIGNPOST_UP, CeladonMansionManagersSuiteSign
signpost 3, 0, SIGNPOST_READ, CeladonMansion1fBookshelf
signpost 3, 2, SIGNPOST_READ, CeladonMansion1fBookshelf
bg_event 8, 5, BGEVENT_UP, CeladonMansionManagersSuiteSign
bg_event 3, 0, BGEVENT_READ, CeladonMansion1fBookshelf
bg_event 3, 2, BGEVENT_READ, CeladonMansion1fBookshelf
.PersonEvents:
.ObjectEvents:
db 4
person_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansionManager, -1
person_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
person_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
person_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1
object_event SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
object_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
object_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
object_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1

14
maps/CeladonMansion2F.asm
View File

@ -1,5 +1,5 @@
CeladonMansion2F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -60,14 +60,14 @@ CeladonMansion2F_MapEventHeader:
warp_def $0, $6, 3, CELADON_MANSION_3F
warp_def $0, $7, 5, CELADON_MANSION_1F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 3
signpost 3, 0, SIGNPOST_READ, CeladonMansion2FComputer
signpost 8, 5, SIGNPOST_UP, CeladonMansion2FSign
signpost 3, 2, SIGNPOST_READ, CeladonMansion2FBookshelf
bg_event 3, 0, BGEVENT_READ, CeladonMansion2FComputer
bg_event 8, 5, BGEVENT_UP, CeladonMansion2FSign
bg_event 3, 2, BGEVENT_READ, CeladonMansion2FBookshelf
.PersonEvents:
.ObjectEvents:
db 0

24
maps/CeladonMansion3F.asm
View File

@ -5,7 +5,7 @@ const_value set 2
const CELADONMANSION3F_FISHER
CeladonMansion3F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -200,19 +200,19 @@ CeladonMansion3F_MapEventHeader:
warp_def $0, $6, 3, CELADON_MANSION_2F
warp_def $0, $7, 2, CELADON_MANSION_ROOF
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 4
signpost 8, 5, SIGNPOST_UP, MapCeladonMansion3FSignpost0Script
signpost 3, 4, SIGNPOST_UP, MapCeladonMansion3FSignpost1Script
signpost 6, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost2Script
signpost 3, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost3Script
bg_event 8, 5, BGEVENT_UP, MapCeladonMansion3FSignpost0Script
bg_event 3, 4, BGEVENT_UP, MapCeladonMansion3FSignpost1Script
bg_event 6, 1, BGEVENT_UP, MapCeladonMansion3FSignpost2Script
bg_event 3, 1, BGEVENT_UP, MapCeladonMansion3FSignpost3Script
.PersonEvents:
.ObjectEvents:
db 4
person_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
person_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
person_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
person_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1
object_event SPRITE_COOLTRAINER_M, 6, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x71670, -1
object_event SPRITE_GYM_GUY, 4, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x71696, -1
object_event SPRITE_SUPER_NERD, 7, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FSuperNerdScript, -1
object_event SPRITE_FISHER, 4, 0, SPRITEMOVEDATA_STANDING_UP, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonMansion3FFisherScript, -1

12
maps/CeladonMansionRoof.asm
View File

@ -2,7 +2,7 @@ const_value set 2
const CELADONMANSIONROOF_FISHER
CeladonMansionRoof_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -43,13 +43,13 @@ CeladonMansionRoof_MapEventHeader:
warp_def $1, $6, 4, CELADON_MANSION_3F
warp_def $5, $2, 1, CELADON_MANSION_ROOF_HOUSE
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 1
signpost 1, 6, SIGNPOST_LEFT, MapCeladonMansionRoofSignpost0Script
bg_event 1, 6, BGEVENT_LEFT, MapCeladonMansionRoofSignpost0Script
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1
object_event SPRITE_FISHER, 5, 7, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansionRoofFisherScript, -1

10
maps/CeladonMansionRoofHouse.asm
View File

@ -2,7 +2,7 @@ const_value set 2
const CELADONMANSIONROOFHOUSE_PHARMACIST
CeladonMansionRoofHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -125,12 +125,12 @@ CeladonMansionRoofHouse_MapEventHeader:
warp_def $7, $2, 3, CELADON_MANSION_ROOF
warp_def $7, $3, 3, CELADON_MANSION_ROOF
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1
object_event SPRITE_PHARMACIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PharmacistScript_0x71afd, -1

18
maps/CeladonPokecenter1F.asm
View File

@ -6,7 +6,7 @@ const_value set 2
const CELADONPOKECENTER1F_EUSINE
CeladonPokecenter1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -155,16 +155,16 @@ CeladonPokecenter1F_MapEventHeader:
warp_def $7, $4, 5, CELADON_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 5
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
person_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
person_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
person_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1
person_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH
object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x71e22, -1
object_event SPRITE_GENTLEMAN, 5, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x71e25, -1
object_event SPRITE_PHARMACIST, 3, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FPharmacistScript, -1
object_event SPRITE_COOLTRAINER_F, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonPokecenter1FCooltrainerFScript, -1
object_event SPRITE_SUPER_NERD, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonEusine, EVENT_SET_WHEN_FOUGHT_HO_OH

8
maps/CeladonPokecenter2FBeta.asm
View File

@ -1,5 +1,5 @@
CeladonPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -13,11 +13,11 @@ CeladonPokecenter2FBeta_MapEventHeader:
db 1
warp_def $7, $0, 3, CELADON_POKECENTER_1F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 0

38
maps/CeruleanCity.asm
View File

@ -7,7 +7,7 @@ const_value set 2
const CERULEANCITY_YOUNGSTER
CeruleanCity_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -288,26 +288,26 @@ CeruleanCity_MapEventHeader:
warp_def $17, $1e, 1, CERULEAN_GYM
warp_def $1d, $19, 2, CERULEAN_MART
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 9
signpost 23, 23, SIGNPOST_READ, CeruleanCitySign
signpost 25, 27, SIGNPOST_READ, CeruleanGymSign
signpost 29, 11, SIGNPOST_READ, CeruleanBikeShopSign
signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign
signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign
signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor
signpost 21, 20, SIGNPOST_READ, CeruleanCityPokecenterSign
signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign
signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene
bg_event 23, 23, BGEVENT_READ, CeruleanCitySign
bg_event 25, 27, BGEVENT_READ, CeruleanGymSign
bg_event 29, 11, BGEVENT_READ, CeruleanBikeShopSign
bg_event 17, 25, BGEVENT_READ, CeruleanPoliceSign
bg_event 7, 23, BGEVENT_READ, CeruleanCapeSign
bg_event 29, 14, BGEVENT_READ, CeruleanLockedDoor
bg_event 21, 20, BGEVENT_READ, CeruleanCityPokecenterSign
bg_event 29, 26, BGEVENT_READ, CeruleanCityMartSign
bg_event 12, 2, BGEVENT_ITEM, CeruleanCityHiddenBerserkGene
.PersonEvents:
.ObjectEvents:
db 6
person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1
person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1
person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1
person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1
object_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
object_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1
object_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
object_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1
object_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1
object_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1

38
maps/CeruleanGym.asm
View File

@ -7,15 +7,15 @@ const_value set 2
const CERULEANGYM_GYM_GUY
CeruleanGym_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 2
maptrigger .DummyTrigger0
maptrigger .GruntRunsOut
scene_script .DummyScene0
scene_script .GruntRunsOut
.MapCallbacks:
db 0
.DummyTrigger0:
.DummyScene0:
end
.GruntRunsOut:
@ -48,9 +48,9 @@ CeruleanGym_MapScriptHeader:
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearevent EVENT_ROUTE_24_ROCKET
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
dotrigger $0
domaptrigger ROUTE_25, $1
domaptrigger POWER_PLANT, $0
setscene $0
setmapscene ROUTE_25, $1
setmapscene POWER_PLANT, $0
waitsfx
special RestartMapMusic
pause 15
@ -372,20 +372,20 @@ CeruleanGym_MapEventHeader:
warp_def $f, $4, 5, CERULEAN_CITY
warp_def $f, $5, 5, CERULEAN_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 3
signpost 8, 3, SIGNPOST_ITEM, CeruleanGymHiddenMachinePart
signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1
signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2
bg_event 8, 3, BGEVENT_ITEM, CeruleanGymHiddenMachinePart
bg_event 13, 2, BGEVENT_READ, CeruleanGymStatue1
bg_event 13, 6, BGEVENT_READ, CeruleanGymStatue2
.PersonEvents:
.ObjectEvents:
db 6
person_event SPRITE_ROCKET, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
person_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event SPRITE_ROCKET, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET
object_event SPRITE_MISTY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event SPRITE_SWIMMER_GIRL, 6, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event SPRITE_SWIMMER_GIRL, 9, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event SPRITE_SWIMMER_GUY, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM

10
maps/CeruleanGymBadgeSpeechHouse.asm
View File

@ -2,7 +2,7 @@ const_value set 2
const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M
CeruleanGymBadgeSpeechHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -25,12 +25,12 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader:
warp_def $7, $2, 1, CERULEAN_CITY
warp_def $7, $3, 1, CERULEAN_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1
object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanGymBadgeSpeechHousePokefanMScript, -1

14
maps/CeruleanMart.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const CERULEANMART_COOLTRAINER_F
CeruleanMart_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -54,14 +54,14 @@ CeruleanMart_MapEventHeader:
warp_def $7, $2, 6, CERULEAN_CITY
warp_def $7, $3, 6, CERULEAN_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
person_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
person_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1
object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanMart_Clerk, -1
object_event SPRITE_COOLTRAINER_M, 6, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1
object_event SPRITE_COOLTRAINER_F, 2, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1

14
maps/CeruleanPokecenter1F.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const CERULEANPOKECENTER1F_GYM_GUY
CeruleanPokecenter1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -72,14 +72,14 @@ CeruleanPokecenter1F_MapEventHeader:
warp_def $7, $4, 4, CERULEAN_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
person_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
person_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18820f, -1
object_event SPRITE_SUPER_NERD, 4, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x188212, -1
object_event SPRITE_GYM_GUY, 5, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1

8
maps/CeruleanPokecenter2FBeta.asm
View File

@ -1,5 +1,5 @@
CeruleanPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -13,11 +13,11 @@ CeruleanPokecenter2FBeta_MapEventHeader:
db 1
warp_def $7, $0, 1, CERULEAN_POKECENTER_1F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 0

14
maps/CeruleanPoliceStation.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const CERULEANPOLICESTATION_DIGLETT
CeruleanPoliceStation_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -52,14 +52,14 @@ CeruleanPoliceStation_MapEventHeader:
warp_def $7, $2, 2, CERULEAN_CITY
warp_def $7, $3, 2, CERULEAN_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
person_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CeruleanDiglett, -1
object_event SPRITE_FISHING_GURU, 1, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationFishingGuruScript, -1
object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanPoliceStationPokefanFScript, -1
object_event SPRITE_DIGLETT, 5, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanDiglett, -1

16
maps/CeruleanTradeSpeechHouse.asm
View File

@ -5,7 +5,7 @@ const_value set 2
const CERULEANTRADESPEECHHOUSE_ZUBAT
CeruleanTradeSpeechHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -62,15 +62,15 @@ CeruleanTradeSpeechHouse_MapEventHeader:
warp_def $7, $2, 3, CERULEAN_CITY
warp_def $7, $3, 3, CERULEAN_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 4
person_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
person_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
person_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, RhydonScript_0x188139, -1
person_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ZubatScript_0x188143, -1
object_event SPRITE_GRANNY, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1
object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1
object_event SPRITE_RHYDON, 2, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, RhydonScript_0x188139, -1
object_event SPRITE_ZUBAT, 6, 5, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ZubatScript_0x188143, -1

20
maps/CharcoalKiln.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const CHARCOALKILN_MOLTRES
CharcoalKiln_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -157,17 +157,17 @@ CharcoalKiln_MapEventHeader:
warp_def $7, $2, 2, AZALEA_TOWN
warp_def $7, $3, 2, AZALEA_TOWN
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 3
signpost 1, 0, SIGNPOST_READ, CharcoalKilnBookshelf
signpost 1, 1, SIGNPOST_READ, CharcoalKilnBookshelf
signpost 1, 7, SIGNPOST_READ, CharcoalKilnRadio
bg_event 1, 0, BGEVENT_READ, CharcoalKilnBookshelf
bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf
bg_event 1, 7, BGEVENT_READ, CharcoalKilnRadio
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
person_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
person_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D
object_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
object_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
object_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D

46
maps/CherrygroveCity.asm
View File

@ -6,19 +6,19 @@ const_value set 2
const CHERRYGROVECITY_FISHER
CherrygroveCity_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 2
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
scene_script .DummyScene0
scene_script .DummyScene1
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.DummyTrigger0:
.DummyScene0:
end
.DummyTrigger1:
.DummyScene1:
end
.FlyPoint:
@ -100,9 +100,9 @@ CherrygroveCityGuideGent:
closetext
end
CherrygroveSilverTriggerSouth:
moveperson CHERRYGROVECITY_SILVER, $27, $7
CherrygroveSilverTriggerNorth:
CherrygroveSilverSceneSouth:
moveobject CHERRYGROVECITY_SILVER, $27, $7
CherrygroveSilverSceneNorth:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
@ -171,7 +171,7 @@ CherrygroveSilverTriggerNorth:
spriteface PLAYER, LEFT
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
disappear CHERRYGROVECITY_SILVER
dotrigger $0
setscene $0
special HealParty
playmapmusic
end
@ -558,22 +558,22 @@ CherrygroveCity_MapEventHeader:
warp_def $9, $19, 1, GUIDE_GENTS_HOUSE
warp_def $b, $1f, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
.XYTriggers:
.CoordEvents:
db 2
xy_trigger 1, $6, $21, CherrygroveSilverTriggerNorth
xy_trigger 1, $7, $21, CherrygroveSilverTriggerSouth
coord_event 1, $6, $21, CherrygroveSilverSceneNorth
coord_event 1, $7, $21, CherrygroveSilverSceneSouth
.Signposts:
.BGEvents:
db 4
signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign
signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign
signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign
signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokecenterSign
bg_event 8, 30, BGEVENT_READ, CherrygroveCitySign
bg_event 9, 23, BGEVENT_READ, GuideGentsHouseSign
bg_event 3, 24, BGEVENT_READ, CherrygroveCityMartSign
bg_event 3, 30, BGEVENT_READ, CherrygroveCityPokecenterSign
.PersonEvents:
.ObjectEvents:
db 5
person_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
person_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
person_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1
person_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
person_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, MysticWaterGuy, -1
object_event SPRITE_GRAMPS, 6, 32, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
object_event SPRITE_SILVER, 6, 39, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
object_event SPRITE_TEACHER, 12, 27, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1
object_event SPRITE_YOUNGSTER, 7, 23, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
object_event SPRITE_FISHER, 12, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1

16
maps/CherrygroveEvolutionSpeechHouse.asm
View File

@ -3,7 +3,7 @@ const_value set 2
const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER
CherrygroveEvolutionSpeechHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -50,15 +50,15 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader:
warp_def $7, $2, 5, CHERRYGROVE_CITY
warp_def $7, $3, 5, CHERRYGROVE_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 1, 0, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf
signpost 1, 1, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf
bg_event 1, 0, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, CherrygroveEvolutionSpeechHouseBookshelf
.PersonEvents:
.ObjectEvents:
db 2
person_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1
object_event SPRITE_LASS, 5, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LassScript_0x196cb9, -1
object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x196cb2, -1

16
maps/CherrygroveGymSpeechHouse.asm
View File

@ -3,7 +3,7 @@ const_value set 2
const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER
CherrygroveGymSpeechHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -53,15 +53,15 @@ CherrygroveGymSpeechHouse_MapEventHeader:
warp_def $7, $2, 3, CHERRYGROVE_CITY
warp_def $7, $3, 3, CHERRYGROVE_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 1, 0, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf
signpost 1, 1, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf
bg_event 1, 0, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, CherrygroveGymSpeechHouseBookshelf
.PersonEvents:
.ObjectEvents:
db 2
person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
person_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1
object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHousePokefanMScript, -1
object_event SPRITE_BUG_CATCHER, 5, 5, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveGymSpeechHouseBugCatcherScript, -1

14
maps/CherrygroveMart.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const CHERRYGROVEMART_YOUNGSTER
CherrygroveMart_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -80,14 +80,14 @@ CherrygroveMart_MapEventHeader:
warp_def $7, $2, 1, CHERRYGROVE_CITY
warp_def $7, $3, 1, CHERRYGROVE_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
person_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1
object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x19680a, -1
object_event SPRITE_COOLTRAINER_M, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19681d, -1
object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1

16
maps/CherrygrovePokecenter1F.asm
View File

@ -5,7 +5,7 @@ const_value set 2
const CHERRYGROVEPOKECENTER1F_TEACHER
CherrygrovePokecenter1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -78,15 +78,15 @@ CherrygrovePokecenter1F_MapEventHeader:
warp_def $7, $4, 2, CHERRYGROVE_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 4
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
person_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
person_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
person_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x196976, -1
object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x19696d, -1
object_event SPRITE_FISHER, 3, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FFisherScript, -1
object_event SPRITE_GENTLEMAN, 6, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygrovePokecenter1FGentlemanScript, -1
object_event SPRITE_TEACHER, 6, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x196976, -1

62
maps/CianwoodCity.asm
View File

@ -13,19 +13,19 @@ const_value set 2
const CIANWOODCITY_SUICUNE
CianwoodCity_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 2
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
scene_script .DummyScene0
scene_script .DummyScene1
.MapCallbacks:
db 1
dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
.DummyTrigger0:
.DummyScene0:
end
.DummyTrigger1:
.DummyScene1:
end
.FlyPointAndSuicune:
@ -49,9 +49,9 @@ CianwoodCitySuicuneAndEusine:
applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
disappear CIANWOODCITY_SUICUNE
pause 10
dotrigger $0
setscene $0
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
domaptrigger ROUTE_42, $1
setmapscene ROUTE_42, $1
checkevent EVENT_FOUGHT_EUSINE
iftrue .Done
setevent EVENT_FOUGHT_EUSINE
@ -394,32 +394,32 @@ CianwoodCity_MapEventHeader:
warp_def $25, $f, 1, CIANWOOD_LUGIA_SPEECH_HOUSE
warp_def $11, $5, 1, POKE_SEERS_HOUSE
.XYTriggers:
.CoordEvents:
db 1
xy_trigger 1, $10, $b, CianwoodCitySuicuneAndEusine
coord_event 1, $10, $b, CianwoodCitySuicuneAndEusine
.Signposts:
.BGEvents:
db 8
signpost 34, 20, SIGNPOST_READ, CianwoodCitySign
signpost 45, 7, SIGNPOST_READ, CianwoodGymSign
signpost 43, 24, SIGNPOST_READ, CianwoodPokecenterSign
signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign
signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign
signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign
signpost 19, 4, SIGNPOST_ITEM, CianwoodCityHiddenRevive
signpost 29, 5, SIGNPOST_ITEM, CianwoodCityHiddenMaxEther
bg_event 34, 20, BGEVENT_READ, CianwoodCitySign
bg_event 45, 7, BGEVENT_READ, CianwoodGymSign
bg_event 43, 24, BGEVENT_READ, CianwoodPokecenterSign
bg_event 47, 19, BGEVENT_READ, CianwoodPharmacySign
bg_event 32, 8, BGEVENT_READ, CianwoodPhotoStudioSign
bg_event 24, 8, BGEVENT_READ, CianwoodPokeSeerSign
bg_event 19, 4, BGEVENT_ITEM, CianwoodCityHiddenRevive
bg_event 29, 5, BGEVENT_ITEM, CianwoodCityHiddenMaxEther
.PersonEvents:
.ObjectEvents:
db 12
person_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodCityYoungster, -1
person_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1
person_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityLass, -1
person_event SPRITE_ROCK, 16, 8, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 17, 9, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 25, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 29, 5, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 27, 10, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1
person_event SPRITE_ROCK, 19, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityRock, -1
person_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1
person_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
person_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
object_event SPRITE_STANDING_YOUNGSTER, 37, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1
object_event SPRITE_POKEFAN_M, 33, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1
object_event SPRITE_LASS, 42, 14, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1
object_event SPRITE_ROCK, 16, 8, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
object_event SPRITE_ROCK, 17, 9, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
object_event SPRITE_ROCK, 25, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
object_event SPRITE_ROCK, 29, 5, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
object_event SPRITE_ROCK, 27, 10, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
object_event SPRITE_ROCK, 19, 4, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1
object_event SPRITE_POKEFAN_F, 46, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1
object_event SPRITE_SUPER_NERD, 21, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE
object_event SPRITE_SUICUNE, 14, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY

10
maps/CianwoodCityPhotoStudio.asm
View File

@ -2,7 +2,7 @@ const_value set 2
const CIANWOODCITYPHOTOSTUDIO_FISHING_GURU
CianwoodCityPhotoStudio_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -57,12 +57,12 @@ CianwoodCityPhotoStudio_MapEventHeader:
warp_def $7, $2, 5, CIANWOOD_CITY
warp_def $7, $3, 5, CIANWOOD_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1
object_event SPRITE_FISHING_GURU, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x9e0e0, -1

34
maps/CianwoodGym.asm
View File

@ -10,7 +10,7 @@ const_value set 2
const CIANWOODGYM_BOULDER4
CianwoodGym_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -50,7 +50,7 @@ ChuckScript_0x9d60f:
waitsfx
setflag ENGINE_STORMBADGE
checkcode VAR_BADGES
scall CianwoodGymTriggerRockets
scall CianwoodGymActivateRockets
.FightDone:
checkevent EVENT_GOT_TM01_DYNAMICPUNCH
iftrue .AlreadyGotTM
@ -75,7 +75,7 @@ ChuckScript_0x9d60f:
closetext
end
CianwoodGymTriggerRockets:
CianwoodGymActivateRockets:
if_equal 7, .RadioTowerRockets
if_equal 6, .GoldenrodRockets
end
@ -314,22 +314,22 @@ CianwoodGym_MapEventHeader:
warp_def $11, $4, 2, CIANWOOD_CITY
warp_def $11, $5, 2, CIANWOOD_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 15, 3, SIGNPOST_READ, CianwoodGymStatue
signpost 15, 6, SIGNPOST_READ, CianwoodGymStatue
bg_event 15, 3, BGEVENT_READ, CianwoodGymStatue
bg_event 15, 6, BGEVENT_READ, CianwoodGymStatue
.PersonEvents:
.ObjectEvents:
db 9
person_event SPRITE_CHUCK, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
person_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
person_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
person_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 2, TrainerBlackbeltNob, -1
person_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerBlackbeltLung, -1
person_event SPRITE_BOULDER, 1, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 7, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
person_event SPRITE_BOULDER, 7, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
object_event SPRITE_CHUCK, 1, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ChuckScript_0x9d60f, -1
object_event SPRITE_BLACK_BELT, 12, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltYoshi, -1
object_event SPRITE_BLACK_BELT, 12, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBlackbeltLao, -1
object_event SPRITE_BLACK_BELT, 9, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBlackbeltNob, -1
object_event SPRITE_BLACK_BELT, 5, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBlackbeltLung, -1
object_event SPRITE_BOULDER, 1, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
object_event SPRITE_BOULDER, 7, 3, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
object_event SPRITE_BOULDER, 7, 4, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1
object_event SPRITE_BOULDER, 7, 5, SPRITEMOVEDATA_STRENGTH_BOULDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodGymBoulder, -1

18
maps/CianwoodLugiaSpeechHouse.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const CIANWOODLUGIASPEECHHOUSE_TWIN
CianwoodLugiaSpeechHouse_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -70,16 +70,16 @@ CianwoodLugiaSpeechHouse_MapEventHeader:
warp_def $7, $2, 6, CIANWOOD_CITY
warp_def $7, $3, 6, CIANWOOD_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 1, 0, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf
signpost 1, 1, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf
bg_event 1, 0, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
bg_event 1, 1, BGEVENT_READ, CianwoodLugiaSpeechHouseBookshelf
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
person_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
person_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1
object_event SPRITE_TEACHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTeacherScript, -1
object_event SPRITE_LASS, 5, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseLassScript, -1
object_event SPRITE_TWIN, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodLugiaSpeechHouseTwinScript, -1

18
maps/CianwoodPharmacy.asm
View File

@ -2,14 +2,14 @@ const_value set 2
const CIANWOODPHARMACY_PHARMACIST
CianwoodPharmacy_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 1
maptrigger .DummyTrigger
scene_script .DummyScene
.MapCallbacks:
db 0
.DummyTrigger:
.DummyScene:
end
CianwoodPharmacist:
@ -81,14 +81,14 @@ CianwoodPharmacy_MapEventHeader:
warp_def $7, $2, 4, CIANWOOD_CITY
warp_def $7, $3, 4, CIANWOOD_CITY
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 1, 0, SIGNPOST_READ, CianwoodPharmacyBookshelf
signpost 1, 1, SIGNPOST_READ, CianwoodPharmacyBookshelf
bg_event 1, 0, BGEVENT_READ, CianwoodPharmacyBookshelf
bg_event 1, 1, BGEVENT_READ, CianwoodPharmacyBookshelf
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CianwoodPharmacist, -1
object_event SPRITE_PHARMACIST, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodPharmacist, -1

16
maps/CianwoodPokecenter1F.asm
View File

@ -5,7 +5,7 @@ const_value set 2
const CIANWOODPOKECENTER1F_SUPER_NERD
CianwoodPokecenter1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -141,15 +141,15 @@ CianwoodPokecenter1F_MapEventHeader:
warp_def $7, $4, 3, CIANWOOD_CITY
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 4
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
person_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
person_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
person_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1
object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x9dbcf, -1
object_event SPRITE_LASS, 5, 1, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
object_event SPRITE_GYM_GUY, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
object_event SPRITE_SUPER_NERD, 6, 8, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1

18
maps/CinnabarIsland.asm
View File

@ -2,7 +2,7 @@ const_value set 2
const CINNABARISLAND_BLUE
CinnabarIsland_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -135,16 +135,16 @@ CinnabarIsland_MapEventHeader:
db 1
warp_def $b, $b, 1, CINNABAR_POKECENTER_1F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 4
signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokecenterSign
signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign
signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign
signpost 1, 9, SIGNPOST_ITEM, CinnabarIslandHiddenRareCandy
bg_event 11, 12, BGEVENT_READ, CinnabarIslandPokecenterSign
bg_event 11, 9, BGEVENT_READ, CinnabarIslandGymSign
bg_event 7, 7, BGEVENT_READ, CinnabarIslandSign
bg_event 1, 9, BGEVENT_ITEM, CinnabarIslandHiddenRareCandy
.PersonEvents:
.ObjectEvents:
db 1
person_event SPRITE_BLUE, 6, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR
object_event SPRITE_BLUE, 6, 9, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR

14
maps/CinnabarPokecenter1F.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const CINNABARPOKECENTER1F_FISHER
CinnabarPokecenter1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -44,14 +44,14 @@ CinnabarPokecenter1F_MapEventHeader:
warp_def $7, $4, 1, CINNABAR_ISLAND
warp_def $7, $0, 1, POKECENTER_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
person_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
person_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1
object_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x1ab32c, -1
object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FCooltrainerFScript, -1
object_event SPRITE_FISHER, 4, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CinnabarPokecenter1FFisherScript, -1

8
maps/CinnabarPokecenter2FBeta.asm
View File

@ -1,5 +1,5 @@
CinnabarPokecenter2FBeta_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -13,11 +13,11 @@ CinnabarPokecenter2FBeta_MapEventHeader:
db 1
warp_def $7, $0, 3, CINNABAR_POKECENTER_1F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 0

32
maps/Colosseum.asm
View File

@ -3,11 +3,11 @@ const_value set 2
const COLOSSEUM_CHRIS2
Colosseum_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 3
maptrigger .InitializeColosseum
maptrigger .DummyTrigger1
maptrigger .DummyTrigger2
scene_script .InitializeColosseum
scene_script .DummyScene1
scene_script .DummyScene2
.MapCallbacks:
db 2
@ -18,10 +18,10 @@ Colosseum_MapScriptHeader:
priorityjump .InitializeAndPreparePokecenter2F
end
.DummyTrigger1:
.DummyScene1:
end
.DummyTrigger2:
.DummyScene2:
end
.SetWhichChris:
@ -37,12 +37,12 @@ Colosseum_MapScriptHeader:
return
.PreparePokecenter2F:
domaptrigger POKECENTER_2F, $2
setmapscene POKECENTER_2F, $2
return
.InitializeAndPreparePokecenter2F:
dotrigger $1
domaptrigger POKECENTER_2F, $2
setscene $1
setmapscene POKECENTER_2F, $2
end
MapColosseumSignpost1Script:
@ -71,15 +71,15 @@ Colosseum_MapEventHeader:
warp_def $7, $4, 3, POKECENTER_2F
warp_def $7, $5, 3, POKECENTER_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 4, 4, SIGNPOST_RIGHT, MapColosseumSignpost1Script
signpost 4, 5, SIGNPOST_LEFT, MapColosseumSignpost1Script
bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script
bg_event 4, 5, BGEVENT_LEFT, MapColosseumSignpost1Script
.PersonEvents:
.ObjectEvents:
db 2
person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT

14
maps/CopycatsHouse1F.asm
View File

@ -4,7 +4,7 @@ const_value set 2
const COPYCATSHOUSE1F_CLEFAIRY
CopycatsHouse1F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -82,14 +82,14 @@ CopycatsHouse1F_MapEventHeader:
warp_def $7, $3, 8, SAFFRON_CITY
warp_def $0, $2, 1, COPYCATS_HOUSE_2F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 0
.PersonEvents:
.ObjectEvents:
db 3
person_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
person_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
person_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1
object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CopycatsHouse1FPokefanMScript, -1
object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x18ad16, -1
object_event SPRITE_CLEFAIRY, 6, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClefairyScript_0x18ad2a, -1

24
maps/CopycatsHouse2F.asm
View File

@ -7,7 +7,7 @@ const_value set 2
const COPYCATSHOUSE2F_COPYCAT2 ; if player is female
CopycatsHouse2F_MapScriptHeader:
.MapTriggers:
.SceneScripts:
db 0
.MapCallbacks:
@ -368,19 +368,19 @@ CopycatsHouse2F_MapEventHeader:
db 1
warp_def $0, $3, 3, COPYCATS_HOUSE_1F
.XYTriggers:
.CoordEvents:
db 0
.Signposts:
.BGEvents:
db 2
signpost 1, 0, SIGNPOST_READ, CopycatsHouse2FBookshelf
signpost 1, 1, SIGNPOST_READ, CopycatsHouse2FBookshelf
bg_event 1, 0, BGEVENT_READ, CopycatsHouse2FBookshelf
bg_event 1, 1, BGEVENT_READ, CopycatsHouse2FBookshelf
.PersonEvents:
.ObjectEvents:
db 6
person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
person_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 0, CopycatsDodrio, -1
person_event SPRITE_FAIRY, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
person_event SPRITE_MONSTER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
person_event SPRITE_BIRD, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
person_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2
object_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_1
object_event SPRITE_MOLTRES, 4, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CopycatsDodrio, -1
object_event SPRITE_FAIRY, 1, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL
object_event SPRITE_MONSTER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
object_event SPRITE_BIRD, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
object_event SPRITE_COPYCAT, 3, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2

Some files were not shown because too many files have changed in this diff Show More