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

Move local IDs to map.json

Browse Source
This commit is contained in:
GriffinR
2024-10-14 23:10:37 -04:00
parent 4dc5c47799
commit 50babdb07f
192 changed files with 863 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+3 -3
View File
@@ -610,10 +610,10 @@
.endm
@ Blocks script execution until the movements being applied to the specified (localId) object finish.
@ If localId is 0, then the id of the last-moved object will be used instead. If the specified object
@ is not currently being manipulated with applymovement, then this command does nothing.
@ If localId is LOCALID_NONE (0), then the id of the last-moved object will be used instead.
@ If the specified object is not currently being manipulated with applymovement, then this command does nothing.
@ If no map is specified, then the current map is used.
.macro waitmovement localId:req, map
.macro waitmovement localId=LOCALID_NONE, map
.ifb \map
.byte 0x51
.2byte \localId
data/maps/BirthIsland_Exterior/map.json
+3 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_BIRTH_ISLAND_EXTERIOR",
"name": "BirthIsland_Exterior",
"layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
"music": "0xFFFF",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_METEORITE",
"x": 15,
@@ -30,6 +31,7 @@
"flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
},
{
"local_id": "LOCALID_BIRTH_ISLAND_DEOXYS",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 15,
data/maps/BirthIsland_Exterior/scripts.inc
+5 -8
View File
@@ -1,6 +1,3 @@
.set LOCALID_DEOXYS_ROCK, 1
.set LOCALID_DEOXYS, 2
BirthIsland_Exterior_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume
@@ -38,7 +35,7 @@ BirthIsland_Exterior_OnResume::
BirthIsland_Exterior_EventScript_TryRemoveDeoxys::
specialvar VAR_RESULT, GetBattleOutcome
goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
removeobject LOCALID_DEOXYS
removeobject LOCALID_BIRTH_ISLAND_DEOXYS
return
BirthIsland_Exterior_EventScript_Triangle::
@@ -68,21 +65,21 @@ BirthIsland_Exterior_EventScript_NotSolved3::
end
BirthIsland_Exterior_EventScript_Deoxys::
addobject LOCALID_DEOXYS
addobject LOCALID_BIRTH_ISLAND_DEOXYS
waitse
setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
setfieldeffectargument 0, LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK
setfieldeffectargument 1, MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR)
setfieldeffectargument 2, MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR)
dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
playbgm MUS_ENCOUNTER_DEOXYS, 0
waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
applymovement LOCALID_DEOXYS, Movement_DeoxysApproach
applymovement LOCALID_BIRTH_ISLAND_DEOXYS, Movement_DeoxysApproach
waitmovement 0
waitse
playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
delay 40
waitmoncry
setvar VAR_LAST_TALKED, LOCALID_DEOXYS
setvar VAR_LAST_TALKED, LOCALID_BIRTH_ISLAND_DEOXYS
seteventmon SPECIES_DEOXYS, 30
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special StartLegendaryBattle
data/maps/BirthIsland_Harbor/map.json
+1 -1
View File
@@ -2,7 +2,7 @@
"id": "MAP_BIRTH_ISLAND_HARBOR",
"name": "BirthIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "0xFFFF",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND",
"requires_flash": false,
"weather": "WEATHER_NONE",
data/maps/CeladonCity/map.json
+3 -1
View File
@@ -41,6 +41,7 @@
"flag": "FLAG_HIDE_CELADON_ROCKETS"
},
{
"local_id": "LOCALID_CELADON_FAT_MAN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 38,
@@ -55,6 +56,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_CELADON_POLIWRATH",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POLIWRATH",
"x": 36,
@@ -407,7 +409,7 @@
"x": 48,
"y": 12,
"respawn_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_CELADON_NURSE"
}
]
}
data/maps/CeladonCity/scripts.inc
+2 -5
View File
@@ -1,6 +1,3 @@
.set LOCALID_FAT_MAN, 2
.set LOCALID_POLIWRATH, 3
CeladonCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition
.byte 0
@@ -36,7 +33,7 @@ CeladonCity_EventScript_FatMan::
faceplayer
msgbox CeladonCity_Text_MyTrustedPalPoliwrath
closemessage
applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CELADON_FAT_MAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -49,7 +46,7 @@ CeladonCity_EventScript_Poliwrath::
msgbox CeladonCity_Text_Poliwrath
closemessage
waitmoncry
applymovement LOCALID_POLIWRATH, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CELADON_POLIWRATH, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+1
View File
@@ -30,6 +30,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_EEVEE_POKEBALL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 7,
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
-2
View File
@@ -1,5 +1,3 @@
.set LOCALID_EEVEE_POKEBALL, 2
CeladonCity_Condominiums_RoofRoom_MapScripts::
.byte 0
data/maps/CeladonCity_GameCorner/map.json
+1
View File
@@ -156,6 +156,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_GAME_CORNER_GRUNT",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 11,
data/maps/CeladonCity_GameCorner/scripts.inc
+3 -5
View File
@@ -1,5 +1,3 @@
.set LOCALID_GRUNT, 11
CeladonCity_GameCorner_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad
.byte 0
@@ -421,17 +419,17 @@ CeladonCity_GameCorner_Text_DefeatedGrunt::
closemessage
call_if_eq VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExitWest
call_if_ne VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExit
removeobject LOCALID_GRUNT
removeobject LOCALID_GAME_CORNER_GRUNT
release
end
CeladonCity_GameCorner_Text_GruntExitWest::
applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest
applymovement LOCALID_GAME_CORNER_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest
waitmovement 0
return
CeladonCity_GameCorner_Text_GruntExit::
applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExit
applymovement LOCALID_GAME_CORNER_GRUNT, CeladonCity_GameCorner_Movement_GruntExit
waitmovement 0
return
data/maps/CeladonCity_PokemonCenter_1F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_CELADON_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
data/maps/CeruleanCity/map.json
+7 -1
View File
@@ -37,6 +37,7 @@
],
"object_events": [
{
"local_id": "LOCALID_CERULEAN_POLICEMAN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
"x": 31,
@@ -51,6 +52,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_CERULEAN_GRUNT",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 33,
@@ -93,6 +95,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_CERULEAN_SLOWBRO",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SLOWBRO",
"x": 32,
@@ -107,6 +110,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_CERULEAN_LASS",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 33,
@@ -135,6 +139,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_CERULEAN_RIVAL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLUE",
"x": 22,
@@ -171,6 +176,7 @@
"target_map": "MAP_ROUTE9"
},
{
"local_id": "LOCALID_CERULEAN_WOMAN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
"x": 12,
@@ -420,7 +426,7 @@
"x": 22,
"y": 20,
"respawn_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_CERULEAN_NURSE"
}
]
}
data/maps/CeruleanCity/scripts.inc
+19 -26
View File
@@ -1,10 +1,3 @@
.set LOCALID_POLICEMAN, 1
.set LOCALID_GRUNT, 2
.set LOCALID_SLOWBRO, 5
.set LOCALID_LASS, 6
.set LOCALID_RIVAL, 8
.set LOCALID_WOMAN, 11
CeruleanCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition
.byte 0
@@ -15,9 +8,9 @@ CeruleanCity_OnTransition::
end
CeruleanCity_EventScript_BlockExits::
setobjectxyperm LOCALID_POLICEMAN, 30, 12
setobjectxyperm LOCALID_SLOWBRO, 26, 31
setobjectxyperm LOCALID_LASS, 27, 31
setobjectxyperm LOCALID_CERULEAN_POLICEMAN, 30, 12
setobjectxyperm LOCALID_CERULEAN_SLOWBRO, 26, 31
setobjectxyperm LOCALID_CERULEAN_LASS, 27, 31
return
CeruleanCity_EventScript_RivalTriggerLeft::
@@ -29,14 +22,14 @@ CeruleanCity_EventScript_RivalTriggerLeft::
CeruleanCity_EventScript_RivalTriggerMid::
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm LOCALID_RIVAL, 23, 0
setobjectxyperm LOCALID_CERULEAN_RIVAL, 23, 0
goto CeruleanCity_EventScript_Rival
end
CeruleanCity_EventScript_RivalTriggerRight::
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm LOCALID_RIVAL, 24, 0
setobjectxyperm LOCALID_CERULEAN_RIVAL, 24, 0
goto CeruleanCity_EventScript_Rival
end
@@ -44,11 +37,11 @@ CeruleanCity_EventScript_Rival::
textcolor NPC_TEXT_COLOR_MALE
setvar VAR_MAP_SCENE_ROUTE22, 2
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter
addobject LOCALID_CERULEAN_RIVAL
applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalEnter
waitmovement 0
msgbox CeruleanCity_Text_RivalIntro
setvar VAR_LAST_TALKED, LOCALID_RIVAL
setvar VAR_LAST_TALKED, LOCALID_CERULEAN_RIVAL
call_if_eq VAR_STARTER_MON, 2, CeruleanCity_EventScript_RivalSquirtle
call_if_eq VAR_STARTER_MON, 1, CeruleanCity_EventScript_RivalBulbasaur
call_if_eq VAR_STARTER_MON, 0, CeruleanCity_EventScript_RivalCharmander
@@ -65,10 +58,10 @@ CeruleanCity_EventScript_Rival::
giveitem ITEM_FAME_CHECKER
msgbox CeruleanCity_Text_ExplainFameCheckerSmellYa
closemessage
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalExit
applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalExit
waitmovement 0
fadedefaultbgm
removeobject LOCALID_RIVAL
removeobject LOCALID_CERULEAN_RIVAL
releaseall
end
@@ -86,13 +79,13 @@ CeruleanCity_EventScript_RivalCharmander::
CeruleanCity_EventScript_RivalStartExit::
applymovement LOCALID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExit
applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalStartExit
waitmovement 0
return
CeruleanCity_EventScript_RivalStartExitRight::
applymovement LOCALID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExitRight
applymovement LOCALID_CERULEAN_RIVAL, CeruleanCity_Movement_RivalStartExitRight
waitmovement 0
return
@@ -189,7 +182,7 @@ CeruleanCity_EventScript_GruntDefeated::
msgbox CeruleanCity_Text_BetterGetMovingBye
closemessage
fadescreen FADE_TO_BLACK
removeobject LOCALID_GRUNT
removeobject LOCALID_CERULEAN_GRUNT
fadescreen FADE_FROM_BLACK
setflag FLAG_GOT_TM28_FROM_ROCKET
release
@@ -204,7 +197,7 @@ CeruleanCity_EventScript_NoRoomForTM28::
CeruleanCity_EventScript_GruntTriggerTop::
lockall
setvar VAR_TEMP_1, 0
applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_CERULEAN_GRUNT, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
@@ -214,7 +207,7 @@ CeruleanCity_EventScript_GruntTriggerTop::
CeruleanCity_EventScript_GruntTriggerBottom::
lockall
setvar VAR_TEMP_1, 1
applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_CERULEAN_GRUNT, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -224,7 +217,7 @@ CeruleanCity_EventScript_GruntTriggerBottom::
CeruleanCity_EventScript_GruntTrigger::
textcolor NPC_TEXT_COLOR_MALE
msgbox CeruleanCity_Text_GruntIntro
setvar VAR_LAST_TALKED, LOCALID_GRUNT
setvar VAR_LAST_TALKED, LOCALID_CERULEAN_GRUNT
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
goto CeruleanCity_EventScript_GruntDefeated
@@ -235,7 +228,7 @@ CeruleanCity_EventScript_Policeman::
faceplayer
msgbox CeruleanCity_Text_PeopleHereWereRobbed
closemessage
applymovement LOCALID_POLICEMAN, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CERULEAN_POLICEMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -270,7 +263,7 @@ CeruleanCity_EventScript_Woman::
faceplayer
msgbox CeruleanCity_Text_WantBrightRedBicycle
closemessage
applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
applymovement LOCALID_CERULEAN_WOMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -285,7 +278,7 @@ CeruleanCity_EventScript_Lass::
waitmessage
delay 40
playse SE_PIN
applymovement LOCALID_SLOWBRO, Common_Movement_QuestionMark
applymovement LOCALID_CERULEAN_SLOWBRO, Common_Movement_QuestionMark
waitmovement 0
delay 30
call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroFailed1
data/maps/CeruleanCity_House4/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_WONDER_NEWS_BERRY_MAN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
"x": 5,
data/maps/CeruleanCity_House4/scripts.inc
-2
View File
@@ -1,5 +1,3 @@
.set LOCALID_WONDER_NEWS_BERRY_MAN, 1
.set REWARD_TYPE, VAR_0x8004
.set REWARD_ITEM, VAR_0x8008
data/maps/CeruleanCity_PokemonCenter_1F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_CERULEAN_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
data/maps/CinnabarIsland/map.json
+3 -1
View File
@@ -55,6 +55,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_CINNABAR_BILL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BILL",
"x": 20,
@@ -69,6 +70,7 @@
"flag": "FLAG_HIDE_CINNABAR_BILL"
},
{
"local_id": "LOCALID_CINNABAR_SEAGALLOP",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SEAGALLOP",
"x": 23,
@@ -171,7 +173,7 @@
"x": 14,
"y": 12,
"respawn_map": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_CINNABAR_NURSE"
}
]
}
data/maps/CinnabarIsland/scripts.inc
+29 -32
View File
@@ -1,6 +1,3 @@
.equ LOCALID_BILL, 3
.equ LOCALID_SEAGALLOP, 4
CinnabarIsland_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame
@@ -17,27 +14,27 @@ CinnabarIsland_OnTransition::
CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter::
savebgm MUS_FOLLOW_ME
setflag FLAG_TEMP_2
setobjectxyperm LOCALID_BILL, 15, 12
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_SEAGALLOP, 30, 12
setobjectxyperm LOCALID_CINNABAR_BILL, 15, 12
setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_CINNABAR_SEAGALLOP, 30, 12
return
CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland::
getplayerxy VAR_0x8004, VAR_0x8005
goto_if_ge VAR_0x8004, 18, CinnabarIsland_EventScript_MoveSeagallopDown
setflag FLAG_TEMP_2
setobjectxyperm LOCALID_BILL, 18, 12
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_SEAGALLOP, 30, 12
setobjectxyperm LOCALID_CINNABAR_BILL, 18, 12
setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_CINNABAR_SEAGALLOP, 30, 12
return
CinnabarIsland_EventScript_MoveSeagallopDown::
setobjectxyperm LOCALID_SEAGALLOP, 30, 8
setobjectxyperm LOCALID_CINNABAR_SEAGALLOP, 30, 8
return
CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands::
setobjectxyperm LOCALID_BILL, 21, 8
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_CINNABAR_BILL, 21, 8
setobjectmovementtype LOCALID_CINNABAR_BILL, MOVEMENT_TYPE_FACE_UP
return
CinnabarIsland_EventScript_CheckUnlockGym::
@@ -70,9 +67,9 @@ CinnabarIsland_EventScript_ReturnFromSeviiIslands::
textcolor NPC_TEXT_COLOR_MALE
msgbox CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain
closemessage
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExit
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillExit
waitmovement 0
removeobject LOCALID_BILL
removeobject LOCALID_CINNABAR_BILL
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4
setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE
clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME
@@ -94,9 +91,9 @@ CinnabarIsland_EventScript_BillScene::
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer2
playse SE_PIN
applymovement LOCALID_BILL, Common_Movement_ExclamationMark
applymovement LOCALID_CINNABAR_BILL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_BILL, Common_Movement_Delay48
applymovement LOCALID_CINNABAR_BILL, Common_Movement_Delay48
waitmovement 0
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer1
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer2
@@ -107,22 +104,22 @@ CinnabarIsland_EventScript_BillScene::
end
CinnabarIsland_EventScript_BillFacePlayer1::
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_CINNABAR_BILL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
CinnabarIsland_EventScript_BillFacePlayer2::
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_CINNABAR_BILL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
CinnabarIsland_EventScript_BillApproachPlayer1::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer1
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillApproachPlayer1
waitmovement 0
return
CinnabarIsland_EventScript_BillApproachPlayer2::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillApproachPlayer2
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
@@ -140,14 +137,14 @@ CinnabarIsland_EventScript_DeclineSailToOneIsland::
closemessage
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillExitToPokeCenter
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillReturnToPokeCenter
removeobject LOCALID_BILL
removeobject LOCALID_CINNABAR_BILL
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
releaseall
end
CinnabarIsland_EventScript_BillExitToPokeCenter::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExitToPokeCenter
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillExitToPokeCenter
waitmovement 0
return
@@ -163,11 +160,11 @@ CinnabarIsland_Movement_BillExitToPokeCenter::
CinnabarIsland_EventScript_BillReturnToPokeCenter::
applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachDoor
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillApproachDoor
waitmovement 0
opendoor 14, 11
waitdooranim
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillReEnterPokeCenter
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillReEnterPokeCenter
waitmovement 0
closedoor 14, 11
waitdooranim
@@ -193,7 +190,7 @@ CinnabarIsland_Movement_BillReEnterPokeCenter::
@ Can be triggered outside, or after talking to Bill in the poke center
CinnabarIsland_EventScript_SailToOneIsland::
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_ApproachShore
addobject LOCALID_SEAGALLOP
addobject LOCALID_CINNABAR_SEAGALLOP
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArrive
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArriveExitedPokeCenter
msgbox CinnabarIsland_Text_MyPalsBoatArrived
@@ -201,7 +198,7 @@ CinnabarIsland_EventScript_SailToOneIsland::
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoat
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BoardBoatExitedPokeCenter
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
removeobject LOCALID_BILL
removeobject LOCALID_CINNABAR_BILL
delay 40
setflag FLAG_HIDE_CINNABAR_SEAGALLOP
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
@@ -211,30 +208,30 @@ CinnabarIsland_EventScript_SailToOneIsland::
end
CinnabarIsland_EventScript_ApproachShore::
applymovement LOCALID_BILL, CinnabarIsland_Movement_ApproachShore
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_ApproachShore
applymovement LOCALID_PLAYER, CinnabarIsland_Movement_ApproachShore
waitmovement 0
return
CinnabarIsland_EventScript_BoatArrive::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillFaceBoat
applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillFaceBoat
applymovement LOCALID_CINNABAR_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
waitmovement 0
return
CinnabarIsland_EventScript_BoatArriveExitedPokeCenter::
applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
applymovement LOCALID_CINNABAR_SEAGALLOP, CinnabarIsland_Movement_BoatArrive
waitmovement 0
return
CinnabarIsland_EventScript_BoardBoat::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoat
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillBoardBoat
applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat
waitmovement 0
return
CinnabarIsland_EventScript_BoardBoatExitedPokeCenter::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore
applymovement LOCALID_CINNABAR_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore
applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore
waitmovement 0
return
data/maps/CinnabarIsland_Gym/map.json
+6
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_QUINN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"x": 25,
@@ -44,6 +45,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_AVERY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 17,
@@ -58,6 +60,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_RAMON",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"x": 16,
@@ -72,6 +75,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_DEREK",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 16,
@@ -86,6 +90,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_DUSTY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"x": 4,
@@ -100,6 +105,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_ZAC",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 4,
data/maps/CinnabarIsland_Gym/scripts.inc
-7
View File
@@ -1,10 +1,3 @@
.set LOCALID_QUINN, 1
.set LOCALID_AVERY, 3
.set LOCALID_RAMON, 4
.set LOCALID_DEREK, 5
.set LOCALID_DUSTY, 6
.set LOCALID_ZAC, 7
CinnabarIsland_Gym_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad
.byte 0
data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+2
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_CINNABAR_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
@@ -100,6 +101,7 @@
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"local_id": "LOCALID_CINNABAR_POKEMON_CENTER_BILL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BILL",
"x": 11,
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+4 -6
View File
@@ -1,5 +1,3 @@
.set LOCALID_BILL, 7
CinnabarIsland_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -43,7 +41,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill::
call_if_eq VAR_FACING, DIR_SOUTH, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth
call_if_eq VAR_FACING, DIR_EAST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast
call_if_eq VAR_FACING, DIR_WEST, CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest
removeobject LOCALID_BILL
removeobject LOCALID_CINNABAR_POKEMON_CENTER_BILL
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
clearflag FLAG_HIDE_CINNABAR_BILL
warp MAP_CINNABAR_ISLAND, 14, 11
@@ -52,19 +50,19 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill::
end
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth::
applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth
waitmovement 0
return
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast::
applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast
applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast
applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast
waitmovement 0
return
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest::
applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_CINNABAR_POKEMON_CENTER_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest
waitmovement 0
return
data/maps/FiveIsland/map.json
+1 -1
View File
@@ -110,7 +110,7 @@
"x": 18,
"y": 7,
"respawn_map": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_FIVE_ISLAND_NURSE"
}
]
}
data/maps/FiveIsland_LostCave_Room10/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_LOST_CAVE_SELPHY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 5,
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+2 -4
View File
@@ -1,5 +1,3 @@
.set LOCALID_SELPHY, 1
FiveIsland_LostCave_Room10_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, FiveIsland_LostCave_Room10_OnResume
map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_LostCave_Room10_OnFrame
@@ -20,10 +18,10 @@ FiveIsland_LostCave_Room10_OnFrame::
FiveIsland_LostCave_Room10_EventScript_FindSelphyScene::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander
applymovement LOCALID_LOST_CAVE_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander
waitmovement 0
delay 100
applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyApproach
applymovement LOCALID_LOST_CAVE_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyApproach
waitmovement 0
msgbox FiveIsland_LostCave_Room10_Text_SelphyIntro
goto_if_questlog FiveIsland_LostCave_Room10_EventScript_SelphyQuestLog
data/maps/FiveIsland_MemorialPillar/map.json
+1
View File
@@ -22,6 +22,7 @@
],
"object_events": [
{
"local_id": "LOCALID_MEMORIAL_MAN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 8,
data/maps/FiveIsland_MemorialPillar/scripts.inc
-2
View File
@@ -1,5 +1,3 @@
.set LOCALID_MEMORIAL_MAN, 1
FiveIsland_MemorialPillar_MapScripts::
.byte 0
data/maps/FiveIsland_PokemonCenter_1F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_FIVE_ISLAND_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
data/maps/FiveIsland_ResortGorgeous/map.json
+1
View File
@@ -120,6 +120,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_RESORT_GORGEOUS_SELPHY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 39,
data/maps/FiveIsland_ResortGorgeous/scripts.inc
+3 -5
View File
@@ -1,5 +1,3 @@
.equ LOCALID_SELPHY, 8
FiveIsland_ResortGorgeous_MapScripts::
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_ResortGorgeous_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_ResortGorgeous_OnFrame
@@ -22,15 +20,15 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene::
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow
closemessage
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_RESORT_GORGEOUS_SELPHY, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
opendoor 39, 8
waitdooranim
applymovement LOCALID_SELPHY, FiveIsland_ResortGorgeous_Movement_SelphyEnterHome
applymovement LOCALID_RESORT_GORGEOUS_SELPHY, FiveIsland_ResortGorgeous_Movement_SelphyEnterHome
waitmovement 0
closedoor 39, 8
waitdooranim
removeobject LOCALID_SELPHY
removeobject LOCALID_RESORT_GORGEOUS_SELPHY
clearflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY
setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2
releaseall
data/maps/FiveIsland_ResortGorgeous_House/map.json
+2
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 4,
@@ -30,6 +31,7 @@
"flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY"
},
{
"local_id": "LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 6,
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+10 -13
View File
@@ -1,6 +1,3 @@
.equ LOCALID_SELPHY, 1
.equ LOCALID_BUTLER, 2
.equ SHOWN_REQUESTED_MON, FLAG_TEMP_2
FiveIsland_ResortGorgeous_House_MapScripts::
@@ -39,12 +36,12 @@ FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon::
FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
special SampleResortGorgeousMonAndReward
msgbox FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou
addobject LOCALID_BUTLER
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter
addobject LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation
@@ -55,7 +52,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
call_if_eq VAR_FACING, DIR_SOUTH, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth
call_if_eq VAR_FACING, DIR_EAST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast
call_if_eq VAR_FACING, DIR_WEST, FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest
copyobjectxytoperm LOCALID_BUTLER
copyobjectxytoperm LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER
msgbox FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks
giveitem VAR_RESORT_GORGEOUS_REWARD
goto_if_eq VAR_RESULT, FALSE, FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward
@@ -65,30 +62,30 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
end
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth::
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth::
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast::
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_SELPHY, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest::
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest
applymovement LOCALID_RESORT_GORGEOUS_HOUSE_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest
waitmovement 0
return
data/maps/FiveIsland_RocketWarehouse/map.json
+4
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_WAREHOUSE_GRUNT2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 15,
@@ -30,6 +31,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"local_id": "LOCALID_WAREHOUSE_GRUNT3",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 17,
@@ -44,6 +46,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"local_id": "LOCALID_WAREHOUSE_ADMIN1",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_F",
"x": 27,
@@ -58,6 +61,7 @@
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"local_id": "LOCALID_WAREHOUSE_ADMIN2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 25,
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+10 -16
View File
@@ -1,9 +1,3 @@
.equ LOCALID_GRUNT1, 5
.equ LOCALID_GRUNT2, 1
.equ LOCALID_GRUNT3, 2
.equ LOCALID_ADMIN1, 3
.equ LOCALID_ADMIN2, 4
.equ PLAYER_X_POS, VAR_0x8004
.equ PLAYER_Y_POS, VAR_0x8005
@@ -43,7 +37,7 @@ FiveIsland_RocketWarehouse_EventScript_Computer::
FiveIsland_RocketWarehouse_EventScript_Admin2Trigger::
lockall
applymovement LOCALID_ADMIN2, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_WAREHOUSE_ADMIN2, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
releaseall
@@ -88,10 +82,10 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2::
msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle
closemessage
fadescreen FADE_TO_BLACK
removeobject LOCALID_GRUNT2
removeobject LOCALID_GRUNT3
removeobject LOCALID_ADMIN2
removeobject LOCALID_ADMIN1
removeobject LOCALID_WAREHOUSE_GRUNT2
removeobject LOCALID_WAREHOUSE_GRUNT3
removeobject LOCALID_WAREHOUSE_ADMIN2
removeobject LOCALID_WAREHOUSE_ADMIN1
setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS
fadescreen FADE_FROM_BLACK
setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
@@ -143,27 +137,27 @@ FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1::
return
FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar::
applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar
applymovement LOCALID_WAREHOUSE_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch::
applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch
applymovement LOCALID_WAREHOUSE_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch::
applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_WAREHOUSE_ADMIN1, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft::
applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_WAREHOUSE_ADMIN1, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown::
applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_WAREHOUSE_ADMIN1, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
data/maps/FourIsland/map.json
+3 -1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_FOUR_ISLAND_DAYCARE_MAN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1",
"x": 16,
@@ -142,6 +143,7 @@
"flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST"
},
{
"local_id": "LOCALID_FOUR_ISLAND_RIVAL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLUE",
"x": 8,
@@ -287,7 +289,7 @@
"x": 18,
"y": 21,
"respawn_map": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_FOUR_ISLAND_NURSE"
}
]
}
data/maps/FourIsland/scripts.inc
+7 -10
View File
@@ -1,6 +1,3 @@
.equ LOCALID_DAYCARE_MAN, 1
.equ LOCALID_RIVAL, 10
FourIsland_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame
@@ -18,7 +15,7 @@ FourIsland_EventScript_ShowRival::
FourIsland_EventScript_TrySetDayCareManPos::
goto_if_unset FLAG_PENDING_DAYCARE_EGG, FourIsland_EventScript_EndSetDayCareManPos
setobjectxyperm LOCALID_DAYCARE_MAN, 16, 14
setobjectxyperm LOCALID_FOUR_ISLAND_DAYCARE_MAN, 16, 14
FourIsland_EventScript_EndSetDayCareManPos::
return
@@ -29,25 +26,25 @@ FourIsland_OnFrame::
FourIsland_EventScript_RivalScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_FOUR_ISLAND_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_FOUR_ISLAND_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_FOUR_ISLAND_RIVAL, Common_Movement_Delay48
waitmovement 0
delay 25
applymovement LOCALID_RIVAL, FourIsland_Movement_RivalApproach
applymovement LOCALID_FOUR_ISLAND_RIVAL, FourIsland_Movement_RivalApproach
waitmovement 0
msgbox FourIsland_Text_RivalAlreadyGotEggBeSmellingYa
closemessage
applymovement LOCALID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit
applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit
applymovement LOCALID_FOUR_ISLAND_RIVAL, FourIsland_Movement_RivalExit
waitmovement 0
fadedefaultbgm
playse SE_EXIT
delay 35
removeobject LOCALID_RIVAL
removeobject LOCALID_FOUR_ISLAND_RIVAL
setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
releaseall
end
data/maps/FourIsland_House2/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_STICKER_MAN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 4,
data/maps/FourIsland_IcefallCave_Back/map.json
+4
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_ICEFALL_ROCKET1",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 11,
@@ -30,6 +31,7 @@
"flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
},
{
"local_id": "LOCALID_ICEFALL_ROCKET2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 13,
@@ -44,6 +46,7 @@
"flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS"
},
{
"local_id": "LOCALID_ICEFALL_LORELEI",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_LORELEI",
"x": 12,
@@ -58,6 +61,7 @@
"flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI"
},
{
"local_id": "LOCALID_ICEFALL_ROCKET3",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 10,
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+20 -25
View File
@@ -1,8 +1,3 @@
.equ LOCALID_ROCKET1, 1
.equ LOCALID_ROCKET2, 2
.equ LOCALID_LORELEI, 3
.equ LOCALID_ROCKET3, 4
FourIsland_IcefallCave_Back_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition
.byte 0
@@ -19,39 +14,39 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons
applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe
closemessage
playse SE_PIN
applymovement LOCALID_LORELEI, Common_Movement_ExclamationMark
applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_LORELEI, Common_Movement_Delay48
applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_Delay48
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut
closemessage
applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 18
applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ICEFALL_LORELEI, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 35
applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets
applymovement LOCALID_ICEFALL_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets
applymovement LOCALID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets
waitmovement 0
applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
applymovement LOCALID_ICEFALL_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
waitmovement 0
playbgm MUS_ENCOUNTER_ROCKET, 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FourIsland_IcefallCave_Back_Text_GruntIntro
setvar VAR_LAST_TALKED, LOCALID_ROCKET3
setvar VAR_LAST_TALKED, LOCALID_ICEFALL_ROCKET3
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp
applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons
@@ -64,22 +59,22 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
playmoncry SPECIES_LAPRAS, CRY_MODE_ENCOUNTER
waitbuttonpress
waitmoncry
applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland
closemessage
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
applymovement LOCALID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit
applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit
applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit
applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit
applymovement LOCALID_ICEFALL_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit
applymovement LOCALID_ICEFALL_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit
applymovement LOCALID_ICEFALL_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit
waitmovement 0
removeobject LOCALID_ROCKET1
removeobject LOCALID_ROCKET2
removeobject LOCALID_ROCKET3
removeobject LOCALID_ICEFALL_ROCKET1
removeobject LOCALID_ICEFALL_ROCKET2
removeobject LOCALID_ICEFALL_ROCKET3
delay 50
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
applymovement LOCALID_ICEFALL_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
data/maps/FourIsland_PokemonCenter_1F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_FOUR_ISLAND_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
data/maps/FourIsland_PokemonDayCare/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_FOUR_ISLAND_DAYCARE_WOMAN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
"x": 2,
data/maps/FourIsland_PokemonDayCare/scripts.inc
+1 -3
View File
@@ -1,5 +1,3 @@
.set LOCALID_DAYCARE_WOMAN, 1
FourIsland_PokemonDayCare_MapScripts::
.byte 0
@@ -113,7 +111,7 @@ FourIsland_PokemonDayCare_CheckEnoughMoney::
end
FourIsland_PokemonDayCare_RetrieveMon::
applymovement LOCALID_DAYCARE_WOMAN, FourIsland_PokemonDayCare_Movement_RetrieveMon
applymovement LOCALID_FOUR_ISLAND_DAYCARE_WOMAN, FourIsland_PokemonDayCare_Movement_RetrieveMon
waitmovement 0
specialvar VAR_RESULT, TakePokemonFromDaycare
special SubtractMoneyFromVar0x8005
data/maps/FuchsiaCity/map.json
+1 -1
View File
@@ -442,7 +442,7 @@
"x": 25,
"y": 32,
"respawn_map": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_FUCHSIA_NURSE"
}
]
}
data/maps/FuchsiaCity_PokemonCenter_1F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_FUCHSIA_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
data/maps/IndigoPlateau_Exterior/map.json
+3 -1
View File
@@ -22,6 +22,7 @@
],
"object_events": [
{
"local_id": "LOCALID_CREDITS_RIVAL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLUE",
"x": 11,
@@ -36,6 +37,7 @@
"flag": "FLAG_HIDE_CREDITS_RIVAL"
},
{
"local_id": "LOCALID_CREDITS_PROF_OAK",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
"x": 11,
@@ -67,7 +69,7 @@
"x": 11,
"y": 7,
"respawn_map": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_1F",
"respawn_npc": 2
"respawn_npc": "LOCALID_LEAGUE_NURSE"
}
]
}
data/maps/IndigoPlateau_Exterior/scripts.inc
+8 -11
View File
@@ -1,6 +1,3 @@
.equ LOCALID_RIVAL, 1
.equ LOCALID_PROF_OAK, 2
IndigoPlateau_Exterior_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame
@@ -32,8 +29,8 @@ IndigoPlateau_Exterior_EventScript_Credits::
opendoor 11, 6
waitdooranim
special SpawnCameraObject
addobject LOCALID_RIVAL
applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding
addobject LOCALID_CREDITS_RIVAL
applymovement LOCALID_CREDITS_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay
waitmovement 0
closedoor 11, 6
@@ -41,15 +38,15 @@ IndigoPlateau_Exterior_EventScript_Credits::
@ Rival runs off
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave
applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave
applymovement LOCALID_CREDITS_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave
waitmovement 0
delay 100
@ Oak exits building
opendoor 11, 6
waitdooranim
addobject LOCALID_PROF_OAK
applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding
addobject LOCALID_CREDITS_PROF_OAK
applymovement LOCALID_CREDITS_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding
waitmovement 0
closedoor 11, 6
waitdooranim
@@ -57,7 +54,7 @@ IndigoPlateau_Exterior_EventScript_Credits::
@ Oak looks at player, then walks off
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave
applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave
applymovement LOCALID_CREDITS_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave
waitmovement 0
delay 100
@@ -78,8 +75,8 @@ IndigoPlateau_Exterior_EventScript_Credits::
@ Reset the map state and roll the credits
special RemoveCameraObject
setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
removeobject LOCALID_RIVAL
removeobject LOCALID_PROF_OAK
removeobject LOCALID_CREDITS_RIVAL
removeobject LOCALID_CREDITS_PROF_OAK
special DoCredits
waitstate
releaseall
data/maps/IndigoPlateau_PokemonCenter_1F/map.json
+2
View File
@@ -30,6 +30,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_LEAGUE_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 13,
@@ -58,6 +59,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_LEAGUE_DOOR_GUARD",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_F",
"x": 5,
data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+1 -3
View File
@@ -1,5 +1,3 @@
.set LOCALID_DOOR_GUARD, 4
IndigoPlateau_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -13,7 +11,7 @@ IndigoPlateau_PokemonCenter_1F_OnTransition::
IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor::
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return
setobjectxyperm LOCALID_DOOR_GUARD, 4, 2
setobjectxyperm LOCALID_LEAGUE_DOOR_GUARD, 4, 2
return
IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard::
data/maps/LavenderTown/map.json
+1 -1
View File
@@ -159,7 +159,7 @@
"x": 6,
"y": 6,
"respawn_map": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_LAVENDER_NURSE"
}
]
}
data/maps/LavenderTown_PokemonCenter_1F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_LAVENDER_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
data/maps/MtEmber_Exterior/map.json
+2
View File
@@ -30,6 +30,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_MT_EMBER_GRUNT1",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 41,
@@ -44,6 +45,7 @@
"flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS"
},
{
"local_id": "LOCALID_MT_EMBER_GRUNT2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 42,
data/maps/MtEmber_Exterior/scripts.inc
+11 -14
View File
@@ -1,6 +1,3 @@
.set LOCALID_GRUNT1, 2
.set LOCALID_GRUNT2, 3
MtEmber_Exterior_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Exterior_OnTransition
map_script MAP_SCRIPT_ON_LOAD, MtEmber_Exterior_OnLoad
@@ -12,8 +9,8 @@ MtEmber_Exterior_OnTransition::
end
MtEmber_Exterior_EventScript_RocketsFaceDown::
setobjectmovementtype LOCALID_GRUNT1, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_GRUNT2, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_MT_EMBER_GRUNT1, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype LOCALID_MT_EMBER_GRUNT2, MOVEMENT_TYPE_FACE_DOWN
return
MtEmber_Exterior_OnLoad::
@@ -38,7 +35,7 @@ MtEmber_Exterior_EventScript_Grunt1Defeated::
end
MtEmber_Exterior_EventScript_BattleGrunt1::
applymovement LOCALID_GRUNT1, Common_Movement_FacePlayer
applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_FacePlayer
waitmovement 0
playbgm MUS_ENCOUNTER_ROCKET, 0
msgbox MtEmber_Exterior_Text_Grunt1Intro
@@ -52,8 +49,8 @@ MtEmber_Exterior_EventScript_DefeatedBothGrunts::
msgbox MtEmber_Exterior_Text_WellRegroupDontStepInsideThere
closemessage
fadescreen FADE_TO_BLACK
removeobject LOCALID_GRUNT1
removeobject LOCALID_GRUNT2
removeobject LOCALID_MT_EMBER_GRUNT1
removeobject LOCALID_MT_EMBER_GRUNT2
fadescreen FADE_FROM_BLACK
release
end
@@ -65,7 +62,7 @@ MtEmber_Exterior_EventScript_Grunt2::
goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4, MtEmber_Exterior_EventScript_BattleGrunt2
msgbox MtEmber_Exterior_Text_YoureInTheWayGetLost
closemessage
applymovement LOCALID_GRUNT2, Common_Movement_FaceOriginalDirection
applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -91,18 +88,18 @@ MtEmber_Exterior_EventScript_RocketPasswordScene::
message MtEmber_Exterior_Text_WhatsPasswordAgain
waitmessage
playse SE_PIN
applymovement LOCALID_GRUNT2, Common_Movement_QuestionMark
applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_QuestionMark
waitmovement 0
waitbuttonpress
msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen
applymovement LOCALID_GRUNT1, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_GRUNT1, Common_Movement_ExclamationMark
applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_GRUNT1, Common_Movement_Delay48
applymovement LOCALID_MT_EMBER_GRUNT1, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_GRUNT2, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_MT_EMBER_GRUNT2, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
call MtEmber_Exterior_EventScript_RocketsFaceDown
msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn
data/maps/MtEmber_RubyPath_B3F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_RUBY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER",
"x": 10,
data/maps/MtEmber_RubyPath_B3F/scripts.inc
-2
View File
@@ -1,5 +1,3 @@
.set LOCALID_RUBY, 1
MtEmber_RubyPath_B3F_MapScripts::
.byte 0
data/maps/MtMoon_B2F/map.json
+3
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_DOME_FOSSIL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_FOSSIL",
"x": 13,
@@ -30,6 +31,7 @@
"flag": "FLAG_HIDE_DOME_FOSSIL"
},
{
"local_id": "LOCALID_HELIX_FOSSIL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_FOSSIL",
"x": 14,
@@ -44,6 +46,7 @@
"flag": "FLAG_HIDE_HELIX_FOSSIL"
},
{
"local_id": "LOCALID_MIGUEL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 13,
data/maps/MtMoon_B2F/scripts.inc
-4
View File
@@ -1,7 +1,3 @@
.equ LOCALID_DOME_FOSSIL, 1
.equ LOCALID_HELIX_FOSSIL, 2
.equ LOCALID_MIGUEL, 3
MtMoon_B2F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition
.byte 0
data/maps/NavelRock_Base/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_NAVEL_ROCK_LUGIA",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_LUGIA",
"x": 10,
data/maps/NavelRock_Base/scripts.inc
+1 -3
View File
@@ -1,5 +1,3 @@
.set LOCALID_LUGIA, 1
NavelRock_Base_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Base_OnTransition
map_script MAP_SCRIPT_ON_RESUME, NavelRock_Base_OnResume
@@ -26,7 +24,7 @@ NavelRock_Base_OnResume::
NavelRock_Base_EventScript_TryRemoveLugia::
specialvar VAR_RESULT, GetBattleOutcome
goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
removeobject LOCALID_LUGIA
removeobject LOCALID_NAVEL_ROCK_LUGIA
return
NavelRock_Base_EventScript_Lugia::
data/maps/NavelRock_Summit/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_NAVEL_ROCK_HO_OH",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_HO_OH",
"x": 9,
data/maps/NavelRock_Summit/scripts.inc
+4 -6
View File
@@ -1,5 +1,3 @@
.set LOCALID_HO_OH, 1
NavelRock_Summit_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Summit_OnTransition
map_script MAP_SCRIPT_ON_RESUME, NavelRock_Summit_OnResume
@@ -29,7 +27,7 @@ NavelRock_Summit_OnResume::
NavelRock_Summit_EventScript_TryRemoveHoOh::
specialvar VAR_RESULT, GetBattleOutcome
goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
removeobject LOCALID_HO_OH
removeobject LOCALID_NAVEL_ROCK_HO_OH
return
NavelRock_Summit_EventScript_HoOh::
@@ -41,7 +39,7 @@ NavelRock_Summit_EventScript_HoOh::
setvar VAR_0x8004, 3 @ Num loops
setvar VAR_0x8005, 35 @ Delay
special LoopWingFlapSound
applymovement LOCALID_HO_OH, Movement_HoOhAppear
applymovement LOCALID_NAVEL_ROCK_HO_OH, Movement_HoOhAppear
applymovement LOCALID_CAMERA, Movement_CameraPanUp
waitmovement 0
delay 50
@@ -56,7 +54,7 @@ NavelRock_Summit_EventScript_HoOh::
setvar VAR_0x8005, 35 @ Delay
special LoopWingFlapSound
applymovement LOCALID_CAMERA, Movement_CameraPanDown
applymovement LOCALID_HO_OH, Movement_HoOhApproach
applymovement LOCALID_NAVEL_ROCK_HO_OH, Movement_HoOhApproach
waitmovement 0
special RemoveCameraObject
seteventmon SPECIES_HO_OH, 70
@@ -64,7 +62,7 @@ NavelRock_Summit_EventScript_HoOh::
special StartLegendaryBattle
waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
setvar VAR_LAST_TALKED, LOCALID_HO_OH
setvar VAR_LAST_TALKED, LOCALID_NAVEL_ROCK_HO_OH
specialvar VAR_RESULT, GetBattleOutcome
goto_if_eq VAR_RESULT, B_OUTCOME_WON, NavelRock_Summit_EventScript_DefeatedHoOh
goto_if_eq VAR_RESULT, B_OUTCOME_RAN, NavelRock_Summit_EventScript_RanFromHoOh
data/maps/OneIsland/map.json
+2 -1
View File
@@ -27,6 +27,7 @@
],
"object_events": [
{
"local_id": "LOCALID_ONE_ISLAND_BILL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BILL",
"x": 12,
@@ -124,7 +125,7 @@
"x": 14,
"y": 6,
"respawn_map": "MAP_ONE_ISLAND_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_ONE_ISLAND_NURSE"
}
]
}
data/maps/OneIsland/scripts.inc
+3 -5
View File
@@ -1,5 +1,3 @@
.equ LOCALID_BILL, 1
OneIsland_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame
@@ -20,17 +18,17 @@ OneIsland_EventScript_EnterOneIslandFirstTime::
waitmovement 0
msgbox OneIsland_Text_BillLetsGoSeeCelio
closemessage
applymovement LOCALID_BILL, OneIsland_Movement_BillWalkToPokeCenter
applymovement LOCALID_ONE_ISLAND_BILL, OneIsland_Movement_BillWalkToPokeCenter
applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter
waitmovement 0
opendoor 14, 5
waitdooranim
applymovement LOCALID_BILL, OneIsland_Movement_BillEnterPokeCenter
applymovement LOCALID_ONE_ISLAND_BILL, OneIsland_Movement_BillEnterPokeCenter
applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter
waitmovement 0
closedoor 14, 5
waitdooranim
removeobject LOCALID_BILL
removeobject LOCALID_ONE_ISLAND_BILL
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 3
warp MAP_ONE_ISLAND_POKEMON_CENTER_1F, 9, 9
waitstate
data/maps/OneIsland_PokemonCenter_1F/map.json
+3
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_ONE_ISLAND_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 5,
@@ -30,6 +31,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BILL",
"x": 14,
@@ -44,6 +46,7 @@
"flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL"
},
{
"local_id": "LOCALID_CELIO",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_CELIO",
"x": 15,
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+16 -19
View File
@@ -1,6 +1,3 @@
.equ LOCALID_BILL, 2
.equ LOCALID_CELIO, 3
OneIsland_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -39,15 +36,15 @@ OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone::
return
OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos::
setobjectxyperm LOCALID_BILL, 9, 8
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 9, 8
setobjectmovementtype LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_CELIO, 15, 6
setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_UP
return
OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos::
setobjectxyperm LOCALID_BILL, 14, 7
setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, 14, 7
setobjectmovementtype LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, MOVEMENT_TYPE_FACE_LEFT
setobjectxyperm LOCALID_CELIO, 14, 8
setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_LEFT
return
@@ -60,7 +57,7 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio
applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
@@ -74,11 +71,11 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut
msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
@@ -92,10 +89,10 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours
closemessage
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -112,7 +109,7 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
setflag FLAG_SYS_SEVII_MAP_123
msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater
closemessage
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -192,7 +189,7 @@ OneIsland_PokemonCenter_1F_EventScript_Bill::
end
OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll::
applymovement LOCALID_BILL, Common_Movement_FacePlayer
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_FacePlayer
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore
release
@@ -440,7 +437,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom::
OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
textcolor NPC_TEXT_COLOR_MALE
playse SE_PIN
applymovement LOCALID_BILL, Common_Movement_ExclamationMark
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_ExclamationMark
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer
closemessage
@@ -453,14 +450,14 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot
msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe
closemessage
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 10
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
@@ -468,7 +465,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
delay 15
msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto
closemessage
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 15
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterLeft
@@ -479,7 +476,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
closemessage
delay 25
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit
applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit
applymovement LOCALID_ONE_ISLAND_POKEMON_CENTER_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit
waitmovement 0
playse SE_EXIT
setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL
data/maps/PalletTown/map.json
+3 -1
View File
@@ -27,6 +27,7 @@
],
"object_events": [
{
"local_id": "LOCALID_PALLET_SIGN_LADY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
"x": 3,
@@ -55,6 +56,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_PALLET_PROF_OAK",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
"x": 10,
@@ -169,7 +171,7 @@
"x": 6,
"y": 8,
"respawn_map": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_MOM"
}
]
}
data/maps/PalletTown/scripts.inc
+29 -32
View File
@@ -1,6 +1,3 @@
.equ LOCALID_SIGN_LADY, 1
.equ LOCALID_PROF_OAK, 3
.equ SIGN_LADY_READY, VAR_TEMP_2
PalletTown_MapScripts::
@@ -27,13 +24,13 @@ PalletTown_EventScript_SetSignLadyDone::
PalletTown_EventScript_SetSignLadyPos::
goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_MoveSignLadyToRouteEntrance
setobjectxyperm LOCALID_SIGN_LADY, 5, 15
setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_PALLET_SIGN_LADY, 5, 15
setobjectmovementtype LOCALID_PALLET_SIGN_LADY, MOVEMENT_TYPE_FACE_UP
return
PalletTown_EventScript_MoveSignLadyToRouteEntrance::
setobjectxyperm LOCALID_SIGN_LADY, 12, 2
setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN
setobjectxyperm LOCALID_PALLET_SIGN_LADY, 12, 2
setobjectmovementtype LOCALID_PALLET_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN
setvar SIGN_LADY_READY, TRUE
return
@@ -45,10 +42,10 @@ PalletTown_OnFrame::
PalletTown_EventScript_OakRatingScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
setobjectxyperm LOCALID_PROF_OAK, 14, 14
setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT
addobject LOCALID_PROF_OAK
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor
setobjectxyperm LOCALID_PALLET_PROF_OAK, 14, 14
setobjectmovementtype LOCALID_PALLET_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT
addobject LOCALID_PALLET_PROF_OAK
applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor
waitmovement 0
goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet
msgbox PalletTown_Text_OakLetMeSeePokedex
@@ -63,11 +60,11 @@ PalletTown_EventScript_OakRatingScene::
closemessage
playbgm MUS_FOLLOW_ME, 0
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse
applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse
waitmovement 0
opendoor 16, 13
waitdooranim
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab
applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterLab
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab
waitmovement 0
closedoor 16, 13
@@ -82,9 +79,9 @@ PalletTown_EventScript_OakRatingScene::
PalletTown_EventScript_EndOakRatingScene::
closemessage
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakExit
applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakExit
waitmovement 0
removeobject LOCALID_PROF_OAK
removeobject LOCALID_PALLET_PROF_OAK
setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3
releaseall
end
@@ -196,7 +193,7 @@ PalletTown_EventScript_OakTrigger::
applymovement LOCALID_PLAYER, Common_Movement_ExclamationMark
waitmovement 0
delay 30
addobject LOCALID_PROF_OAK
addobject LOCALID_PALLET_PROF_OAK
call_if_eq VAR_TEMP_1, 0, PalletTown_EventScript_OakEnterLeft
call_if_eq VAR_TEMP_1, 1, PalletTown_EventScript_OakEnterRight
delay 30
@@ -207,7 +204,7 @@ PalletTown_EventScript_OakTrigger::
call_if_eq VAR_TEMP_1, 1, PalletTown_EventScript_OakLeadPlayerToLabRight
opendoor 16, 13
waitdooranim
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab
applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterLab
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab
waitmovement 0
closedoor 16, 13
@@ -223,23 +220,23 @@ PalletTown_EventScript_OakTrigger::
end
PalletTown_EventScript_OakEnterLeft::
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLeft
applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterLeft
waitmovement 0
return
PalletTown_EventScript_OakEnterRight::
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterRight
applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakEnterRight
waitmovement 0
return
PalletTown_EventScript_OakLeadPlayerToLabLeft::
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft
applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft
waitmovement 0
return
PalletTown_EventScript_OakLeadPlayerToLabRight::
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabRight
applymovement LOCALID_PALLET_PROF_OAK, PalletTown_Movement_OakWalkToLabRight
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight
waitmovement 0
return
@@ -332,48 +329,48 @@ PalletTown_EventScript_SignLady::
goto_if_eq SIGN_LADY_READY, TRUE, PalletTown_EventScript_SignLadyStartShowSign
goto_if_set FLAG_TEMP_2, PalletTown_EventScript_SignLadyGoReadSign
msgbox PalletTown_Text_HmmIsThatRight
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
applymovement LOCALID_SIGN_LADY, Common_Movement_ExclamationMark
applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_SIGN_LADY, Common_Movement_Delay48
applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_Delay48
waitmovement 0
msgbox PalletTown_Text_OhLookLook
closemessage
call_if_eq VAR_FACING, DIR_EAST, PalletTown_EventScript_SignLadyMoveOutOfWayRight
call_if_ne VAR_FACING, DIR_EAST, PalletTown_EventScript_SignLadyMoveOutOfWayLeft
copyobjectxytoperm LOCALID_SIGN_LADY
copyobjectxytoperm LOCALID_PALLET_SIGN_LADY
setflag FLAG_TEMP_2
release
end
PalletTown_EventScript_SignLadyMoveOutOfWayRight::
applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight
applymovement LOCALID_PALLET_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight
waitmovement 0
return
PalletTown_EventScript_SignLadyMoveOutOfWayLeft::
applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft
applymovement LOCALID_PALLET_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft
waitmovement 0
return
PalletTown_EventScript_SignLadyDone::
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
msgbox PalletTown_Text_RaisingMonsToo
release
end
PalletTown_EventScript_SignLadyGoReadSign::
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
msgbox PalletTown_Text_ReadItReadIt
release
end
PalletTown_EventScript_SignLadyJustShowedSign::
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
msgbox PalletTown_Text_SignsAreUsefulArentThey
release
@@ -421,7 +418,7 @@ PalletTown_EventScript_TrainerTips::
PalletTown_EventScript_SignLadyTrigger::
lockall
applymovement LOCALID_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
call PalletTown_EventScript_SignLadyShowSign
@@ -445,7 +442,7 @@ PalletTown_EventScript_SignLadyShowSign::
return
PalletTown_EventScript_SignLadyStartShowSign::
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
applymovement LOCALID_PALLET_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
call PalletTown_EventScript_SignLadyShowSign
release
data/maps/PalletTown_PlayersHouse_1F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_MOM",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_MOM",
"x": 8,
data/maps/PalletTown_PlayersHouse_1F/scripts.inc
-2
View File
@@ -1,5 +1,3 @@
.equ LOCALID_MOM, 1
PalletTown_PlayersHouse_1F_MapScripts::
.byte 0
data/maps/PalletTown_ProfessorOaksLab/map.json
+7
View File
@@ -58,6 +58,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_OAKS_LAB_PROF_OAK",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
"x": 6,
@@ -72,6 +73,7 @@
"flag": "FLAG_HIDE_OAK_IN_HIS_LAB"
},
{
"local_id": "LOCALID_BULBASAUR_BALL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 8,
@@ -86,6 +88,7 @@
"flag": "FLAG_HIDE_BULBASAUR_BALL"
},
{
"local_id": "LOCALID_SQUIRTLE_BALL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 9,
@@ -100,6 +103,7 @@
"flag": "FLAG_HIDE_SQUIRTLE_BALL"
},
{
"local_id": "LOCALID_CHARMANDER_BALL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 10,
@@ -114,6 +118,7 @@
"flag": "FLAG_HIDE_CHARMANDER_BALL"
},
{
"local_id": "LOCALID_OAKS_LAB_RIVAL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLUE",
"x": 5,
@@ -128,6 +133,7 @@
"flag": "FLAG_HIDE_RIVAL_IN_LAB"
},
{
"local_id": "LOCALID_POKEDEX_1",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POKEDEX",
"x": 4,
@@ -142,6 +148,7 @@
"flag": "FLAG_HIDE_POKEDEX"
},
{
"local_id": "LOCALID_POKEDEX_2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POKEDEX",
"x": 5,
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+98 -106
View File
@@ -1,11 +1,3 @@
.equ LOCALID_PROF_OAK, 4
.equ LOCALID_BULBASAUR_BALL, 5
.equ LOCALID_SQUIRTLE_BALL, 6
.equ LOCALID_CHARMANDER_BALL, 7
.equ LOCALID_RIVAL, 8
.equ LOCALID_POKEDEX_1, 9
.equ LOCALID_POKEDEX_2, 10
.equ PLAYER_STARTER_NUM, VAR_TEMP_1
.equ PLAYER_STARTER_SPECIES, VAR_TEMP_2
.equ RIVAL_STARTER_SPECIES, VAR_TEMP_3
@@ -36,14 +28,14 @@ PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished::
return
PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene::
setobjectxyperm LOCALID_PROF_OAK, 6, 11
setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 11
setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_UP
savebgm MUS_OAK
return
PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene::
setobjectxyperm LOCALID_PROF_OAK, 6, 11
setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP
setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 11
setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_UP
return
PalletTown_ProfessorOaksLab_OnWarp::
@@ -63,11 +55,11 @@ PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002
lockall
setvar VAR_FACING, DIR_NORTH
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
waitmovement 0
removeobject LOCALID_PROF_OAK
setobjectxyperm LOCALID_PROF_OAK, 6, 3
setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
removeobject LOCALID_OAKS_LAB_PROF_OAK
setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 3
setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
@@ -121,37 +113,37 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene::
call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_RivalExit
call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
removeobject LOCALID_RIVAL
removeobject LOCALID_OAKS_LAB_RIVAL
fadedefaultbgm
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
releaseall
end
PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth::
setobjectxyperm LOCALID_RIVAL, 5, 10
addobject LOCALID_RIVAL
setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 5, 10
addobject LOCALID_OAKS_LAB_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10
addobject LOCALID_OAKS_LAB_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10
addobject LOCALID_OAKS_LAB_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -166,25 +158,25 @@ PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest::
return
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
waitmovement LOCALID_PROF_OAK
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
waitmovement LOCALID_OAKS_LAB_PROF_OAK
return
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
waitmovement LOCALID_PROF_OAK
waitmovement LOCALID_OAKS_LAB_PROF_OAK
return
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
waitmovement 0
return
@@ -207,15 +199,15 @@ PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth::
PalletTown_ProfessorOaksLab_ChooseStarterScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
waitmovement 0
removeobject LOCALID_PROF_OAK
setobjectxyperm LOCALID_PROF_OAK, 6, 3
setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
removeobject LOCALID_OAKS_LAB_PROF_OAK
setobjectxyperm LOCALID_OAKS_LAB_PROF_OAK, 6, 3
setobjectmovementtype LOCALID_OAKS_LAB_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
clearflag FLAG_DONT_TRANSITION_MUSIC
savebgm MUS_DUMMY
@@ -226,7 +218,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene::
msgbox PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne
closemessage
delay 30
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalReact
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalReact
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe
msgbox PalletTown_ProfessorOaksLab_Text_OakBePatientRival
@@ -262,7 +254,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalReact::
PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FaceDown
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet
closemessage
@@ -296,13 +288,13 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight::
PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
textcolor NPC_TEXT_COLOR_MALE
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons
closemessage
applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FaceDown
waitmovement 0
goto_if_eq VAR_STARTER_MON, 0, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander
goto_if_eq VAR_STARTER_MON, 1, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur
@@ -320,19 +312,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle::
end
PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle
end
PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle
end
PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle
end
@@ -373,19 +365,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander::
end
PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander
end
PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander
end
PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander
end
@@ -429,19 +421,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur::
end
PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur
end
PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur
end
PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur
end
@@ -480,7 +472,7 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle::
call_if_eq VAR_TEMP_2, 1, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft
call_if_eq VAR_TEMP_2, 2, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid
call_if_eq VAR_TEMP_2, 3, PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight
removeobject LOCALID_RIVAL
removeobject LOCALID_OAKS_LAB_RIVAL
playse SE_EXIT
fadedefaultbgm
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
@@ -489,21 +481,21 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle::
end
PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
waitmovement LOCALID_RIVAL
waitmovement LOCALID_OAKS_LAB_RIVAL
return
PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
waitmovement LOCALID_RIVAL
waitmovement LOCALID_OAKS_LAB_RIVAL
return
PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight
waitmovement LOCALID_RIVAL
waitmovement LOCALID_OAKS_LAB_RIVAL
return
PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft::
@@ -625,9 +617,9 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
closemessage
delay 30
playse SE_PIN
applymovement LOCALID_PROF_OAK, Common_Movement_ExclamationMark
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_PROF_OAK, Common_Movement_Delay48
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_Delay48
waitmovement 0
call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth
call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast
@@ -644,7 +636,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
delay 40
msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou
closemessage
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
removeobject LOCALID_POKEDEX_1
delay 10
@@ -681,7 +673,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_RivalExit
call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_RivalExit
removeobject LOCALID_RIVAL
removeobject LOCALID_OAKS_LAB_RIVAL
fadedefaultbgm
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2
@@ -692,23 +684,23 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
end
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
waitmovement 0
return
@@ -729,25 +721,25 @@ PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth::
step_end
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
waitmovement LOCALID_PROF_OAK
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
waitmovement LOCALID_OAKS_LAB_PROF_OAK
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
waitmovement LOCALID_PROF_OAK
waitmovement LOCALID_OAKS_LAB_PROF_OAK
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
waitmovement 0
return
@@ -804,7 +796,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted::
call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth
call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast
call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
closemessage
delay 70
@@ -814,22 +806,22 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted::
end
PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest
applymovement LOCALID_OAKS_LAB_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest
waitmovement 0
return
@@ -956,82 +948,82 @@ PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls::
end
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth::
setobjectxyperm LOCALID_RIVAL, 5, 10
addobject LOCALID_RIVAL
setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 5, 10
addobject LOCALID_OAKS_LAB_RIVAL
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10
addobject LOCALID_OAKS_LAB_RIVAL
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
setobjectxyperm LOCALID_OAKS_LAB_RIVAL, 6, 10
addobject LOCALID_OAKS_LAB_RIVAL
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth::
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest::
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast::
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth::
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_FacePlayer
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth::
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest::
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement LOCALID_OAKS_LAB_RIVAL, Common_Movement_FacePlayer
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth::
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_RivalExit::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
waitmovement 0
return
@@ -1088,7 +1080,7 @@ PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall::
end
PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice::
applymovement LOCALID_PROF_OAK, Common_Movement_FaceRight
applymovement LOCALID_OAKS_LAB_PROF_OAK, Common_Movement_FaceRight
waitmovement 0
showmonpic PLAYER_STARTER_SPECIES, 10, 3
textcolor NPC_TEXT_COLOR_MALE
@@ -1153,19 +1145,19 @@ PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter::
end
PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
end
PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
end
PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur
applymovement LOCALID_OAKS_LAB_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
end
data/maps/PalletTown_RivalsHouse/map.json
+2
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_DAISY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_DAISY",
"x": 10,
@@ -30,6 +31,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_TOWN_MAP",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_TOWN_MAP",
"x": 6,
data/maps/PalletTown_RivalsHouse/scripts.inc
-3
View File
@@ -1,6 +1,3 @@
.equ LOCALID_DAISY, 1
.equ LOCALID_TOWN_MAP, 2
.equ RECEIVED_TOWN_MAP, VAR_TEMP_1
PalletTown_RivalsHouse_MapScripts::
data/maps/PewterCity/map.json
+4 -1
View File
@@ -41,6 +41,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_PEWTER_MUSEUM_GUIDE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 33,
@@ -83,6 +84,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_PEWTER_GYM_GUIDE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BOY",
"x": 42,
@@ -111,6 +113,7 @@
"flag": "FLAG_TEMP_12"
},
{
"local_id": "LOCALID_PEWTER_AIDE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST",
"x": 46,
@@ -299,7 +302,7 @@
"x": 17,
"y": 26,
"respawn_map": "MAP_PEWTER_CITY_POKEMON_CENTER_1F",
"respawn_npc": 3
"respawn_npc": "LOCALID_PEWTER_NURSE"
}
]
}
data/maps/PewterCity/scripts.inc
+34 -38
View File
@@ -1,7 +1,3 @@
.equ LOCALID_MUSEUM_GUIDE, 2
.equ LOCALID_GYM_GUIDE, 5
.equ LOCALID_AIDE, 7
PewterCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_OnTransition
.byte 0
@@ -22,40 +18,40 @@ PewterCity_EventScript_GymGuide::
call_if_eq VAR_FACING, DIR_EAST, PewterCity_EventScript_WalkToGymEast
msgbox PewterCity_Text_GoTakeOnBrock
closemessage
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GymGuideExit
waitmovement 0
fadedefaultbgm
removeobject LOCALID_GYM_GUIDE
removeobject LOCALID_PEWTER_GYM_GUIDE
clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE
release
end
PewterCity_EventScript_WalkToGymEast::
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymEast
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast
waitmovement 0
return
@ Unused
PewterCity_EventScript_WalkToGymWest::
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymWest
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest
waitmovement 0
return
@ Unused
PewterCity_EventScript_WalkToGymNorth::
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymNorth
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth
waitmovement 0
return
@@ -292,44 +288,44 @@ PewterCity_EventScript_GymGuideTrigger::
call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_WalkToGymBottom
msgbox PewterCity_Text_GoTakeOnBrock
closemessage
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GymGuideExit
waitmovement 0
fadedefaultbgm
removeobject LOCALID_GYM_GUIDE
removeobject LOCALID_PEWTER_GYM_GUIDE
clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE
releaseall
end
PewterCity_EventScript_WalkToGymTop::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop
waitmovement 0
return
PewterCity_EventScript_WalkToGymMid::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid
waitmovement 0
return
PewterCity_EventScript_WalkToGymBottom::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom
waitmovement 0
return
@ Unused
PewterCity_EventScript_WalkToGymRight::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight
waitmovement 0
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight
applymovement LOCALID_PEWTER_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight
waitmovement 0
return
@@ -448,34 +444,34 @@ PewterCity_EventScript_MuseumGuide::
msgbox PewterCity_Text_ThisIsTheMuseum
closemessage
delay 10
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_MuseumGuideExit
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_MuseumGuideExit
waitmovement 0
fadedefaultbgm
removeobject LOCALID_MUSEUM_GUIDE
removeobject LOCALID_PEWTER_MUSEUM_GUIDE
clearflag FLAG_HIDE_PEWTER_MUSEUM_GUIDE
release
end
PewterCity_EventScript_LeadToMuseumNorth::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth
waitmovement 0
return
PewterCity_EventScript_LeadToMuseumSouth::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth
waitmovement 0
return
PewterCity_EventScript_LeadToMuseumWest::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest
waitmovement 0
return
PewterCity_EventScript_LeadToMuseumEast::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast
applymovement LOCALID_PEWTER_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast
waitmovement 0
return
@@ -691,9 +687,9 @@ PewterCity_EventScript_AideGiveRunningShoes::
call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideNoticePlayer
waitse
playse SE_PIN
applymovement LOCALID_AIDE, Common_Movement_ExclamationMark
applymovement LOCALID_PEWTER_AIDE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_AIDE, Common_Movement_Delay48
applymovement LOCALID_PEWTER_AIDE, Common_Movement_Delay48
waitmovement 0
msgbox PewterCity_Text_OhPlayer
call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_AideApproachPlayer0
@@ -722,13 +718,13 @@ PewterCity_EventScript_AideGiveRunningShoes::
textcolor NPC_TEXT_COLOR_NEUTRAL
msgbox PewterCity_Text_RunningShoesLetterFromMom
closemessage
removeobject LOCALID_AIDE
removeobject LOCALID_PEWTER_AIDE
setflag FLAG_SYS_B_DASH
setvar VAR_MAP_SCENE_PEWTER_CITY, 2
return
PewterCity_EventScript_AideNoticePlayer::
applymovement LOCALID_AIDE, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PEWTER_AIDE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -746,7 +742,7 @@ PewterCity_EventScript_AideApproachPlayer1::
PewterCity_EventScript_AideApproachPlayer2::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerMid
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -754,29 +750,29 @@ PewterCity_EventScript_AideApproachPlayer2::
PewterCity_EventScript_AideApproachPlayer3::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideApproachPlayerBottom
waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PewterCity_EventScript_AideExit0::
applymovement LOCALID_AIDE, PewterCity_Movement_AideExit0
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit0
waitmovement 0
return
PewterCity_EventScript_AideExit1::
applymovement LOCALID_AIDE, PewterCity_Movement_AideExit1
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit1
waitmovement 0
return
PewterCity_EventScript_AideExit2::
applymovement LOCALID_AIDE, PewterCity_Movement_AideExit2
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit2
waitmovement 0
return
PewterCity_EventScript_AideExit3::
applymovement LOCALID_AIDE, PewterCity_Movement_AideExit3
applymovement LOCALID_PEWTER_AIDE, PewterCity_Movement_AideExit3
waitmovement 0
return
data/maps/PewterCity_House1/map.json
+1
View File
@@ -44,6 +44,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_PEWTER_HOUSE_NIDORAN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NIDORAN_M",
"x": 6,
data/maps/PewterCity_House1/scripts.inc
+1 -3
View File
@@ -1,5 +1,3 @@
.set LOCALID_NIDORAN, 3
PewterCity_House1_MapScripts::
.byte 0
@@ -18,7 +16,7 @@ PewterCity_House1_EventScript_Nidoran::
lock
faceplayer
call PewterCity_House1_EventScript_DoNidoranCry
applymovement LOCALID_NIDORAN, Common_Movement_FaceOriginalDirection
applymovement LOCALID_PEWTER_HOUSE_NIDORAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/PewterCity_Museum_1F/map.json
+2
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_MUSEUM_SCIENTIST1",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_WORKER_M",
"x": 16,
@@ -58,6 +59,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_OLD_AMBER",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_OLD_AMBER",
"x": 22,
data/maps/PewterCity_Museum_1F/scripts.inc
+2 -5
View File
@@ -1,6 +1,3 @@
.set LOCALID_SCIENTIST1, 1
.set LOCALID_OLD_AMBER, 4
PewterCity_Museum_1F_MapScripts::
.byte 0
@@ -22,14 +19,14 @@ PewterCity_Museum_1F_EventScript_Scientist1BehindCounter::
PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter::
msgbox PewterCity_Museum_1F_Text_AmberContainsGeneticMatter
applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection
applymovement LOCALID_MUSEUM_SCIENTIST1, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
PewterCity_Museum_1F_EventScript_ExplainAmber::
msgbox PewterCity_Museum_1F_Text_AmberIsFossilizedSap
applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection
applymovement LOCALID_MUSEUM_SCIENTIST1, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/PewterCity_PokemonCenter_1F/map.json
+1
View File
@@ -44,6 +44,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_PEWTER_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
data/maps/PokemonLeague_BrunosRoom/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_BRUNO",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BRUNO",
"x": 6,
data/maps/PokemonLeague_BrunosRoom/scripts.inc
-2
View File
@@ -1,5 +1,3 @@
.set LOCALID_BRUNO, 1
PokemonLeague_BrunosRoom_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_BrunosRoom_OnResume
map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_BrunosRoom_OnLoad
data/maps/PokemonLeague_ChampionsRoom/map.json
+2
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_CHAMPIONS_ROOM_RIVAL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLUE",
"x": 6,
@@ -30,6 +31,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_CHAMPIONS_ROOM_PROF_OAK",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
"x": 6,
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+7 -10
View File
@@ -1,6 +1,3 @@
.equ LOCALID_RIVAL, 1
.equ LOCALID_PROF_OAK, 2
PokemonLeague_ChampionsRoom_MapScripts::
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp
map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume
@@ -67,29 +64,29 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
setflag FLAG_TEMP_4
msgbox PokemonLeague_ChampionsRoom_Text_PostBattle
playbgm MUS_SLOW_PALLET, 0
addobject LOCALID_PROF_OAK
addobject LOCALID_CHAMPIONS_ROOM_PROF_OAK
msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer
closemessage
applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter
applymovement LOCALID_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter
applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter
applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
waitmovement 0
delay 25
specialvar VAR_RESULT, GetStarterSpecies
bufferspeciesname STR_VAR_1, VAR_RESULT
msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival
closemessage
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 20
msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe
closemessage
delay 13
applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit
applymovement LOCALID_CHAMPIONS_ROOM_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit
applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
waitmovement 0
setvar VAR_TEMP_1, 1
data/maps/PokemonLeague_HallOfFame/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_HALL_OF_FAME_PROF_OAK",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_PROF_OAK",
"x": 6,
data/maps/PokemonLeague_HallOfFame/scripts.inc
+2 -4
View File
@@ -1,5 +1,3 @@
.set LOCALID_PROF_OAK, 1
PokemonLeague_HallOfFame_MapScripts::
map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_HallOfFame_OnFrame
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_HallOfFame_OnWarp
@@ -22,13 +20,13 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
waitmovement 0
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_HALL_OF_FAME_PROF_OAK, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 18
msgbox PokemonLeague_HallOfFame_Text_OakCongratulations
closemessage
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_HALL_OF_FAME_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
data/maps/PokemonLeague_LancesRoom/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_LANCE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_LANCE",
"x": 6,
data/maps/PokemonLeague_LancesRoom/scripts.inc
-2
View File
@@ -1,5 +1,3 @@
.set LOCALID_LANCE, 1
PokemonLeague_LancesRoom_MapScripts::
map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LancesRoom_OnResume
map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LancesRoom_OnLoad
data/maps/PokemonTower_2F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_POKEMON_TOWER_RIVAL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLUE",
"x": 16,
data/maps/PokemonTower_2F/scripts.inc
+8 -10
View File
@@ -1,5 +1,3 @@
.set LOCALID_RIVAL, 1
PokemonTower_2F_MapScripts::
.byte 0
@@ -24,12 +22,12 @@ PokemonTower_2F_EventScript_Rival::
playbgm MUS_ENCOUNTER_RIVAL, 0
call_if_eq VAR_TEMP_1, 0, PokemonTower_2F_EventScript_RivalFacePlayerRight
call_if_eq VAR_TEMP_1, 1, PokemonTower_2F_EventScript_RivalFacePlayerDown
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48
applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_Delay48
waitmovement 0
msgbox PokemonTower_2F_Text_RivalIntro
setvar VAR_LAST_TALKED, LOCALID_RIVAL
setvar VAR_LAST_TALKED, LOCALID_POKEMON_TOWER_RIVAL
call_if_eq VAR_STARTER_MON, 2, PokemonTower_2F_EventScript_RivalSquirtle
call_if_eq VAR_STARTER_MON, 1, PokemonTower_2F_EventScript_RivalBulbasaur
call_if_eq VAR_STARTER_MON, 0, PokemonTower_2F_EventScript_RivalCharmander
@@ -41,19 +39,19 @@ PokemonTower_2F_EventScript_Rival::
playse SE_EXIT
delay 25
fadedefaultbgm
removeobject LOCALID_RIVAL
removeobject LOCALID_POKEMON_TOWER_RIVAL
setvar VAR_MAP_SCENE_POKEMON_TOWER_2F, 1
releaseall
end
PokemonTower_2F_EventScript_RivalFacePlayerRight::
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PokemonTower_2F_EventScript_RivalFacePlayerDown::
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_POKEMON_TOWER_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -71,12 +69,12 @@ PokemonTower_2F_EventScript_RivalCharmander::
return
PokemonTower_2F_EventScript_RivalExitRight::
applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitRight
applymovement LOCALID_POKEMON_TOWER_RIVAL, PokemonTower_2F_Movement_RivalExitRight
waitmovement 0
return
PokemonTower_2F_EventScript_RivalExitDown::
applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitDown
applymovement LOCALID_POKEMON_TOWER_RIVAL, PokemonTower_2F_Movement_RivalExitDown
waitmovement 0
return
data/maps/PokemonTower_7F/map.json
+3
View File
@@ -30,6 +30,7 @@
"flag": "FLAG_HIDE_TOWER_FUJI"
},
{
"local_id": "LOCALID_POKEMON_TOWER_GRUNT1",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 9,
@@ -44,6 +45,7 @@
"flag": "FLAG_HIDE_TOWER_ROCKET_1"
},
{
"local_id": "LOCALID_POKEMON_TOWER_GRUNT2",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 13,
@@ -58,6 +60,7 @@
"flag": "FLAG_HIDE_TOWER_ROCKET_2"
},
{
"local_id": "LOCALID_POKEMON_TOWER_GRUNT3",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
"x": 9,
data/maps/PokemonTower_7F/scripts.inc
+13 -17
View File
@@ -1,7 +1,3 @@
.set LOCALID_GRUNT1, 2
.set LOCALID_GRUNT2, 3
.set LOCALID_GRUNT3, 4
PokemonTower_7F_MapScripts::
.byte 0
@@ -31,25 +27,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt1::
goto_if_eq VAR_0x8004, 10, PokemonTower_7F_EventScript_Grunt1ExitMid
goto_if_eq VAR_0x8004, 11, PokemonTower_7F_EventScript_Grunt1ExitRight
goto_if_eq VAR_0x8004, 9, PokemonTower_7F_EventScript_Grunt1ExitLeft
applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1Exit
applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1Exit
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
PokemonTower_7F_EventScript_Grunt1ExitMid::
applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitMid
applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitMid
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
PokemonTower_7F_EventScript_Grunt1ExitRight::
applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitRight
applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitRight
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt1
end
PokemonTower_7F_EventScript_Grunt1ExitLeft::
applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitLeft
applymovement LOCALID_POKEMON_TOWER_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitLeft
waitmovement 0
playse SE_EXIT
delay 25
@@ -57,7 +53,7 @@ PokemonTower_7F_EventScript_Grunt1ExitLeft::
end
PokemonTower_7F_EventScript_RemoveGrunt1::
removeobject LOCALID_GRUNT1
removeobject LOCALID_POKEMON_TOWER_GRUNT1
release
end
@@ -115,25 +111,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt2::
getplayerxy VAR_0x8004, VAR_0x8005
goto_if_eq VAR_0x8004, 12, PokemonTower_7F_EventScript_Grunt2ExitLeft
goto_if_eq VAR_0x8004, 13, PokemonTower_7F_EventScript_Grunt2ExitRight
applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2Exit
applymovement LOCALID_POKEMON_TOWER_GRUNT2, PokemonTower_7F_Movement_Grunt2Exit
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt2
end
PokemonTower_7F_EventScript_Grunt2ExitLeft::
applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitLeft
applymovement LOCALID_POKEMON_TOWER_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitLeft
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt2
end
PokemonTower_7F_EventScript_Grunt2ExitRight::
applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitRight
applymovement LOCALID_POKEMON_TOWER_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitRight
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt2
end
PokemonTower_7F_EventScript_RemoveGrunt2::
removeobject LOCALID_GRUNT2
removeobject LOCALID_POKEMON_TOWER_GRUNT2
release
end
@@ -178,25 +174,25 @@ PokemonTower_7F_EventScript_DefeatedGrunt3::
getplayerxy VAR_0x8004, VAR_0x8005
goto_if_eq VAR_0x8004, 10, PokemonTower_7F_EventScript_Grunt3ExitRight
goto_if_eq VAR_0x8004, 9, PokemonTower_7F_EventScript_Grunt3ExitLeft
applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3Exit
applymovement LOCALID_POKEMON_TOWER_GRUNT3, PokemonTower_7F_Movement_Grunt3Exit
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt3
end
PokemonTower_7F_EventScript_Grunt3ExitRight::
applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitRight
applymovement LOCALID_POKEMON_TOWER_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitRight
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt3
end
PokemonTower_7F_EventScript_Grunt3ExitLeft::
applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitLeft
applymovement LOCALID_POKEMON_TOWER_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitLeft
waitmovement 0
goto PokemonTower_7F_EventScript_RemoveGrunt3
end
PokemonTower_7F_EventScript_RemoveGrunt3::
removeobject LOCALID_GRUNT3
removeobject LOCALID_POKEMON_TOWER_GRUNT3
release
end
data/maps/RocketHideout_B4F/map.json
+3
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_HIDEOUT_GIOVANNI",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_GIOVANNI",
"x": 19,
@@ -30,6 +31,7 @@
"flag": "FLAG_HIDE_HIDEOUT_GIOVANNI"
},
{
"local_id": "LOCALID_SILPH_SCOPE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 20,
@@ -58,6 +60,7 @@
"flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
},
{
"local_id": "LOCALID_LIFT_KEY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 3,
data/maps/RocketHideout_B4F/scripts.inc
+1 -5
View File
@@ -1,7 +1,3 @@
.equ LOCALID_GIOVANNI, 1
.equ LOCALID_SILPH_SCOPE, 2
.equ LOCALID_LIFT_KEY, 4
.equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1
RocketHideout_B4F_MapScripts::
@@ -31,7 +27,7 @@ RocketHideout_B4F_EventScript_Giovanni::
msgbox RocketHideout_B4F_Text_GiovanniPostBattle
fadescreen FADE_TO_BLACK
closemessage
removeobject LOCALID_GIOVANNI
removeobject LOCALID_HIDEOUT_GIOVANNI
addobject LOCALID_SILPH_SCOPE
clearflag FLAG_HIDE_SILPH_SCOPE
setflag FLAG_HIDE_CELADON_ROCKETS
data/maps/Route10/map.json
+1 -1
View File
@@ -287,7 +287,7 @@
"x": 13,
"y": 21,
"respawn_map": "MAP_ROUTE10_POKEMON_CENTER_1F",
"respawn_npc": 1
"respawn_npc": "LOCALID_ROUTE10_NURSE"
}
]
}
data/maps/Route10_PokemonCenter_1F/map.json
+1
View File
@@ -16,6 +16,7 @@
"connections": null,
"object_events": [
{
"local_id": "LOCALID_ROUTE10_NURSE",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_NURSE",
"x": 7,
data/maps/Route22/map.json
+1
View File
@@ -27,6 +27,7 @@
],
"object_events": [
{
"local_id": "LOCALID_ROUTE22_RIVAL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLUE",
"x": 25,
data/maps/Route22/scripts.inc
+16 -18
View File
@@ -1,5 +1,3 @@
.set LOCALID_RIVAL, 1
Route22_MapScripts::
.byte 0
@@ -12,21 +10,21 @@ Route22_EventScript_EarlyRivalTriggerTop::
Route22_EventScript_EarlyRivalTriggerMid::
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm LOCALID_RIVAL, 25, 5
setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5
goto Route22_EventScript_EarlyRival
end
Route22_EventScript_EarlyRivalTriggerBottom::
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm LOCALID_RIVAL, 25, 5
setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5
goto Route22_EventScript_EarlyRival
end
Route22_EventScript_EarlyRival::
textcolor NPC_TEXT_COLOR_MALE
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
addobject LOCALID_ROUTE22_RIVAL
call_if_eq VAR_TEMP_1, 0, Route22_EventScript_EarlyRivalApproach
call_if_eq VAR_TEMP_1, 1, Route22_EventScript_EarlyRivalApproach
call_if_eq VAR_TEMP_1, 2, Route22_EventScript_EarlyRivalApproachBottom
@@ -43,18 +41,18 @@ Route22_EventScript_EarlyRival::
call_if_eq VAR_TEMP_1, 1, Route22_EventScript_EarlyRivalExit
call_if_eq VAR_TEMP_1, 2, Route22_EventScript_EarlyRivalExitBottom
fadedefaultbgm
removeobject LOCALID_RIVAL
removeobject LOCALID_ROUTE22_RIVAL
setvar VAR_MAP_SCENE_ROUTE22, 2
releaseall
end
Route22_EventScript_EarlyRivalApproach::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach
applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproach
waitmovement 0
return
Route22_EventScript_EarlyRivalApproachBottom::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom
applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproachBottom
applymovement LOCALID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
@@ -72,12 +70,12 @@ Route22_EventScript_EarlyRivalCharmander::
return
Route22_EventScript_EarlyRivalExit::
applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExit
applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_EarlyRivalExit
waitmovement 0
return
Route22_EventScript_EarlyRivalExitBottom::
applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExitBottom
applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_EarlyRivalExitBottom
waitmovement 0
return
@@ -163,26 +161,26 @@ Route22_EventScript_LateRivalTriggerTop::
Route22_EventScript_LateRivalTriggerMid::
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm LOCALID_RIVAL, 25, 5
setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5
goto Route22_EventScript_LateRival
end
Route22_EventScript_LateRivalTriggerBottom::
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm LOCALID_RIVAL, 25, 5
setobjectxyperm LOCALID_ROUTE22_RIVAL, 25, 5
goto Route22_EventScript_LateRival
end
Route22_EventScript_LateRival::
textcolor NPC_TEXT_COLOR_MALE
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
addobject LOCALID_ROUTE22_RIVAL
call_if_eq VAR_TEMP_1, 0, Route22_EventScript_LateRivalApproach
call_if_eq VAR_TEMP_1, 1, Route22_EventScript_LateRivalApproach
call_if_eq VAR_TEMP_1, 2, Route22_EventScript_LateRivalApproachBottom
msgbox Route22_Text_LateRivalIntro
setvar VAR_LAST_TALKED, LOCALID_RIVAL
setvar VAR_LAST_TALKED, LOCALID_ROUTE22_RIVAL
call_if_eq VAR_STARTER_MON, 2, Route22_EventScript_LateRivalSquirtle
call_if_eq VAR_STARTER_MON, 1, Route22_EventScript_LateRivalBulbasaur
call_if_eq VAR_STARTER_MON, 0, Route22_EventScript_LateRivalCharmander
@@ -190,21 +188,21 @@ Route22_EventScript_LateRival::
closemessage
delay 10
playbgm MUS_RIVAL_EXIT, 0
applymovement LOCALID_RIVAL, Route22_Movement_LateRivalExit
applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_LateRivalExit
waitmovement 0
fadedefaultbgm
removeobject LOCALID_RIVAL
removeobject LOCALID_ROUTE22_RIVAL
setvar VAR_MAP_SCENE_ROUTE22, 4
releaseall
end
Route22_EventScript_LateRivalApproach::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach
applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproach
waitmovement 0
return
Route22_EventScript_LateRivalApproachBottom::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom
applymovement LOCALID_ROUTE22_RIVAL, Route22_Movement_RivalApproachBottom
applymovement LOCALID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
data/maps/Route23/map.json
+7
View File
@@ -27,6 +27,7 @@
],
"object_events": [
{
"local_id": "LOCALID_CASCADE_BADGE_GUARD",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
"x": 15,
@@ -41,6 +42,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_THUNDER_BADGE_GUARD",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
"x": 8,
@@ -55,6 +57,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_RAINBOW_BADGE_GUARD",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
"x": 14,
@@ -69,6 +72,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_SOUL_BADGE_GUARD",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
"x": 16,
@@ -83,6 +87,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_MARSH_BADGE_GUARD",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
"x": 10,
@@ -97,6 +102,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_VOLCANO_BADGE_GUARD",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
"x": 14,
@@ -111,6 +117,7 @@
"flag": "0"
},
{
"local_id": "LOCALID_EARTH_BADGE_GUARD",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
"x": 6,
data/maps/Route23/scripts.inc
-8
View File
@@ -1,11 +1,3 @@
.set LOCALID_CASCADE_BADGE_GUARD, 1
.set LOCALID_THUNDER_BADGE_GUARD, 2
.set LOCALID_RAINBOW_BADGE_GUARD, 3
.set LOCALID_SOUL_BADGE_GUARD, 4
.set LOCALID_MARSH_BADGE_GUARD, 5
.set LOCALID_VOLCANO_BADGE_GUARD, 6
.set LOCALID_EARTH_BADGE_GUARD, 7
Route23_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, Route23_OnTransition
.byte 0
data/maps/Route24/map.json
+1
View File
@@ -27,6 +27,7 @@
],
"object_events": [
{
"local_id": "LOCALID_ROUTE24_ROCKET",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_MAN",
"x": 12,

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