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

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
+95
View File
@@ -0,0 +1,95 @@
{
"id": "MAP_VIRIDIAN_CITY_HOUSE",
"name": "ViridianCity_House",
"layout": "LAYOUT_VIRIDIAN_CITY_HOUSE",
"music": "MUS_PEWTER",
"region_map_section": "MAPSEC_VIRIDIAN_CITY",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_INDOOR",
"allow_cycling": false,
"allow_escaping": false,
"allow_running": false,
"show_map_name": false,
"floor_number": 0,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BALDING_MAN",
"x": 7,
"y": 4,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ViridianCity_House_EventScript_BaldingMan",
"flag": "0"
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 2,
"y": 5,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN",
"movement_range_x": 1,
"movement_range_y": 2,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ViridianCity_House_EventScript_LittleGirl",
"flag": "0"
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SPEAROW",
"x": 6,
"y": 6,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT",
"movement_range_x": 4,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ViridianCity_House_EventScript_Speary",
"flag": "0"
}
],
"warp_events": [
{
"x": 3,
"y": 7,
"elevation": 0,
"dest_map": "MAP_VIRIDIAN_CITY",
"dest_warp_id": 1
},
{
"x": 4,
"y": 7,
"elevation": 0,
"dest_map": "MAP_VIRIDIAN_CITY",
"dest_warp_id": 1
},
{
"x": 5,
"y": 7,
"elevation": 3,
"dest_map": "MAP_VIRIDIAN_CITY",
"dest_warp_id": 1
}
],
"coord_events": [],
"bg_events": [
{
"type": "sign",
"x": 7,
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "ViridianCity_House_EventScript_NicknameSign"
}
]
}
+24
View File
@@ -0,0 +1,24 @@
ViridianCity_House_MapScripts::
.byte 0
ViridianCity_House_EventScript_BaldingMan::
msgbox ViridianCity_House_Text_NicknamingIsFun, MSGBOX_NPC
end
ViridianCity_House_EventScript_LittleGirl::
msgbox ViridianCity_House_Text_MyDaddyLovesMonsToo, MSGBOX_NPC
end
ViridianCity_House_EventScript_Speary::
lock
faceplayer
waitse
playmoncry SPECIES_SPEAROW, CRY_MODE_NORMAL
msgbox ViridianCity_House_Text_Speary
waitmoncry
release
end
ViridianCity_House_EventScript_NicknameSign::
msgbox ViridianCity_House_Text_SpearowNameSpeary, MSGBOX_SIGN
end
+16
View File
@@ -0,0 +1,16 @@
ViridianCity_House_Text_NicknamingIsFun::
.string "Coming up with nicknames is fun,\n"
.string "but it's not so easy to do.\p"
.string "Clever names are nice, but simple\n"
.string "names are easier to remember.$"
ViridianCity_House_Text_MyDaddyLovesMonsToo::
.string "My daddy loves POKéMON, too.$"
ViridianCity_House_Text_Speary::
.string "SPEARY: Tetweet!$"
ViridianCity_House_Text_SpearowNameSpeary::
.string "SPEAROW\n"
.string "Name: SPEARY$"