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

Merge branch 'master' into doc-caves

Browse Source
This commit is contained in:
GriffinR
2020-02-16 11:08:43 -05:00
committed by GitHub
parent 30f01c7df6 04130a97d9
commit 533df93dc1
252 changed files with 11583 additions and 12191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
lockall
setvar VAR_0x8004, 3
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor
data/maps/RocketHideout_Elevator/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
lockall
goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B
setvar VAR_0x8004, 2
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor
data/maps/SevenIsland_TrainerTower/map.json
+1 -1
View File
@@ -51,7 +51,7 @@
"x": 58,
"y": 7,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
"dest_map": "MAP_TRAINER_TOWER_LOBBY",
"dest_warp_id": 1
}
],
data/maps/SevenIsland_TrainerTower_1F/scripts.inc
-60
View File
@@ -1,60 +0,0 @@
SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_1F_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_1F_MapScript2_1C4F62
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_1F_MapScript3_1C5046
.byte 0
SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_6F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_8F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8
SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8
call EventScript_1C52F4
end
SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_6F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_8F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE
SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE
call EventScript_1C533B
end
SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_6F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_8F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4
SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4
call EventScript_1C5382
end
SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_6F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_8F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA
SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA
call EventScript_1C538C
end
SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_6F_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_8F_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0
SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0
call EventScript_1C53AA
end
data/maps/SevenIsland_TrainerTower_2F/scripts.inc
-25
View File
@@ -1,25 +0,0 @@
SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_2F_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_2F_MapScript2_1C4F62
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_2F_MapScript3_1C5046
.byte 0
SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6
call EventScript_1C52F4
end
EventScript_1646FC:: @ 81646FC
call EventScript_1C533B
end
EventScript_164702:: @ 8164702
call EventScript_1C5382
end
EventScript_164708:: @ 8164708
call EventScript_1C538C
end
EventScript_16470E:: @ 816470E
call EventScript_1C53AA
end
data/maps/SevenIsland_TrainerTower_3F/scripts.inc
-25
View File
@@ -1,25 +0,0 @@
SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_3F_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_3F_MapScript2_1C4F62
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_3F_MapScript3_1C5046
.byte 0
SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724
call EventScript_1C52F4
end
EventScript_16472A:: @ 816472A
call EventScript_1C533B
end
EventScript_164730:: @ 8164730
call EventScript_1C5382
end
EventScript_164736:: @ 8164736
call EventScript_1C538C
end
EventScript_16473C:: @ 816473C
call EventScript_1C53AA
end
data/maps/SevenIsland_TrainerTower_4F/scripts.inc
-25
View File
@@ -1,25 +0,0 @@
SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_4F_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_4F_MapScript2_1C4F62
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_4F_MapScript3_1C5046
.byte 0
SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752
call EventScript_1C52F4
end
EventScript_164758:: @ 8164758
call EventScript_1C533B
end
EventScript_16475E:: @ 816475E
call EventScript_1C5382
end
EventScript_164764:: @ 8164764
call EventScript_1C538C
end
EventScript_16476A:: @ 816476A
call EventScript_1C53AA
end
data/maps/SevenIsland_TrainerTower_5F/scripts.inc
-25
View File
@@ -1,25 +0,0 @@
SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_5F_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_5F_MapScript2_1C4F62
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_5F_MapScript3_1C5046
.byte 0
SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780
call EventScript_1C52F4
end
EventScript_164786:: @ 8164786
call EventScript_1C533B
end
EventScript_16478C:: @ 816478C
call EventScript_1C5382
end
EventScript_164792:: @ 8164792
call EventScript_1C538C
end
EventScript_164798:: @ 8164798
call EventScript_1C53AA
end
data/maps/SevenIsland_TrainerTower_6F/map.json
-135
View File
@@ -1,135 +0,0 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
"name": "SevenIsland_TrainerTower_6F",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 2,
"elevator_flag": 0,
"battle_scene": "BATTLE_SCENE_0",
"connections": null,
"object_events": [
{
"graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_6F_EventScript_1646E0",
"flag": "FLAG_TEMP_6"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_6F_EventScript_1646C8",
"flag": "FLAG_TEMP_2"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_6F_EventScript_1646CE",
"flag": "FLAG_TEMP_3"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_6F_EventScript_1646D4",
"flag": "FLAG_TEMP_4"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_6F_EventScript_1646DA",
"flag": "FLAG_TEMP_5"
}
],
"warp_events": [
{
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
"coord_events": [
{
"type": "trigger",
"x": 10,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF"
},
{
"type": "trigger",
"x": 9,
"y": 12,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4"
},
{
"type": "trigger",
"x": 9,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA"
}
],
"bg_events": []
}
data/maps/SevenIsland_TrainerTower_6F/scripts.inc
-25
View File
@@ -1,25 +0,0 @@
SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_6F_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_6F_MapScript2_1C4F62
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_6F_MapScript3_1C5046
.byte 0
SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE
call EventScript_1C52F4
end
EventScript_1647B4:: @ 81647B4
call EventScript_1C533B
end
EventScript_1647BA:: @ 81647BA
call EventScript_1C5382
end
EventScript_1647C0:: @ 81647C0
call EventScript_1C538C
end
EventScript_1647C6:: @ 81647C6
call EventScript_1C53AA
end
data/maps/SevenIsland_TrainerTower_7F/map.json
-135
View File
@@ -1,135 +0,0 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
"name": "SevenIsland_TrainerTower_7F",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 2,
"elevator_flag": 0,
"battle_scene": "BATTLE_SCENE_0",
"connections": null,
"object_events": [
{
"graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_7F_EventScript_1646E0",
"flag": "FLAG_TEMP_6"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_7F_EventScript_1646C8",
"flag": "FLAG_TEMP_2"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_7F_EventScript_1646CE",
"flag": "FLAG_TEMP_3"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_7F_EventScript_1646D4",
"flag": "FLAG_TEMP_4"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_7F_EventScript_1646DA",
"flag": "FLAG_TEMP_5"
}
],
"warp_events": [
{
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
"coord_events": [
{
"type": "trigger",
"x": 10,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF"
},
{
"type": "trigger",
"x": 9,
"y": 12,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4"
},
{
"type": "trigger",
"x": 9,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA"
}
],
"bg_events": []
}
data/maps/SevenIsland_TrainerTower_7F/scripts.inc
-25
View File
@@ -1,25 +0,0 @@
SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_7F_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_7F_MapScript2_1C4F62
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_7F_MapScript3_1C5046
.byte 0
SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC
call EventScript_1C52F4
end
EventScript_1647E2:: @ 81647E2
call EventScript_1C533B
end
EventScript_1647E8:: @ 81647E8
call EventScript_1C5382
end
EventScript_1647EE:: @ 81647EE
call EventScript_1C538C
end
EventScript_1647F4:: @ 81647F4
call EventScript_1C53AA
end
data/maps/SevenIsland_TrainerTower_8F/map.json
-135
View File
@@ -1,135 +0,0 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
"name": "SevenIsland_TrainerTower_8F",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 2,
"elevator_flag": 0,
"battle_scene": "BATTLE_SCENE_0",
"connections": null,
"object_events": [
{
"graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_8F_EventScript_1646E0",
"flag": "FLAG_TEMP_6"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_8F_EventScript_1646C8",
"flag": "FLAG_TEMP_2"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_8F_EventScript_1646CE",
"flag": "FLAG_TEMP_3"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_8F_EventScript_1646D4",
"flag": "FLAG_TEMP_4"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_8F_EventScript_1646DA",
"flag": "FLAG_TEMP_5"
}
],
"warp_events": [
{
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
"coord_events": [
{
"type": "trigger",
"x": 10,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF"
},
{
"type": "trigger",
"x": 9,
"y": 12,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4"
},
{
"type": "trigger",
"x": 9,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA"
}
],
"bg_events": []
}
data/maps/SevenIsland_TrainerTower_8F/scripts.inc
-25
View File
@@ -1,25 +0,0 @@
SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_8F_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_8F_MapScript2_1C4F62
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_8F_MapScript3_1C5046
.byte 0
SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A
call EventScript_1C52F4
end
EventScript_164810:: @ 8164810
call EventScript_1C533B
end
EventScript_164816:: @ 8164816
call EventScript_1C5382
end
EventScript_16481C:: @ 816481C
call EventScript_1C538C
end
EventScript_164822:: @ 8164822
call EventScript_1C53AA
end
data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
-80
View File
@@ -1,80 +0,0 @@
SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046
.byte 0
SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
lockall
setvar VAR_0x8004, 6
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 6
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, EventScript_164B46
case 1, EventScript_164B52
end
EventScript_164B46:: @ 8164B46
multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE
goto EventScript_164B5E
end
EventScript_164B52:: @ 8164B52
multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE
goto EventScript_164B5E
end
EventScript_164B5E:: @ 8164B5E
switch VAR_RESULT
case 0, EventScript_164BCD
case 1, EventScript_164B90
case 2, EventScript_164BD3
case 127, EventScript_164BD3
end
EventScript_164B90:: @ 8164B90
setvar VAR_0x8006, 3
setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
compare VAR_ELEVATOR_FLOOR, 3
goto_if_eq EventScript_164BD3
call EventScript_164BD8
setvar VAR_ELEVATOR_FLOOR, 3
special Special_CloseElevatorCurrentFloorWindow
delay 25
applymovement OBJ_EVENT_ID_PLAYER, Movement_164BE5
waitmovement 0
warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
waitstate
releaseall
end
EventScript_164BCD:: @ 8164BCD
goto EventScript_164BD3
end
EventScript_164BD3:: @ 8164BD3
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
EventScript_164BD8:: @ 8164BD8
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
Movement_164BE5:: @ 8164BE5
walk_in_place_fastest_down
delay_16
walk_down
walk_right
walk_right
walk_down
step_end
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
-235
View File
@@ -1,235 +0,0 @@
SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Lobby_OnResume
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, SevenIsland_TrainerTower_Lobby_OnReturnToField
map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_Lobby_OnTransition
map_script MAP_SCRIPT_ON_LOAD, SevenIsland_TrainerTower_Lobby_OnLoad
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Lobby_OnFrame
.byte 0
SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853
setvar VAR_TEMP_2, 0
setvar VAR_0x8004, 10
special sub_815D9E8
setvar VAR_0x8004, 18
special sub_815D9E8
compare VAR_RESULT, 0
goto_if_eq EventScript_164886
setvar VAR_TEMP_0, 0
setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
EventScript_164886:: @ 8164886
end
SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887
addobject 1
addobject 2
addobject 3
addobject 4
addobject 5
end
SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897
compare VAR_TEMP_D, 17
call_if_eq EventScript_1648A3
end
EventScript_1648A3:: @ 81648A3
setmetatile 17, 10, 647, 0
return
SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD
setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY
getplayerxy VAR_TEMP_D, VAR_RESULT
end
SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6
map_script_2 VAR_TEMP_0, 0, EventScript_1648ED
map_script_2 VAR_TEMP_D, 0x11, EventScript_1648C8
.2byte 0
EventScript_1648C8:: @ 81648C8
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_1648EA
waitmovement 0
setmetatile 17, 10, 692, 1
special DrawWholeMapView
playse SE_TK_KASYA
waitse
setvar VAR_TEMP_D, 0
releaseall
end
Movement_1648EA:: @ 81648EA
walk_down
walk_down
step_end
EventScript_1648ED:: @ 81648ED
setvar VAR_TEMP_0, 1
setvar VAR_0x8004, 12
special sub_815D9E8
switch VAR_RESULT
case 0, EventScript_164920
case 1, EventScript_164938
case 2, EventScript_16495C
EventScript_164920:: @ 8164920
lock
faceplayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
textcolor 1
msgbox gUnknown_817C937
goto EventScript_16494B
EventScript_164938:: @ 8164938
lock
faceplayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
textcolor 1
msgbox gUnknown_817C9C0
EventScript_16494B:: @ 816494B
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6
waitmovement 0
setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
release
EventScript_16495C:: @ 816495C
end
SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966
lock
faceplayer
setvar VAR_0x8004, 20
special sub_815D9E8
compare VAR_RESULT, 1
goto_if_eq EventScript_164988
msgbox gUnknown_817C9A2
goto EventScript_164990
EventScript_164988:: @ 8164988
msgbox gUnknown_817CE1F
EventScript_164990:: @ 8164990
release
end
SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
waitmessage
pokemart Items_1649B8
msgbox Text_PleaseComeAgain
release
end
.align 2
Items_1649B8:: @ 81649B8
.2byte ITEM_ULTRA_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_FULL_RESTORE
.2byte ITEM_MAX_POTION
.2byte ITEM_HYPER_POTION
.2byte ITEM_REVIVE
.2byte ITEM_FULL_HEAL
.2byte ITEM_ESCAPE_ROPE
.2byte ITEM_MAX_REPEL
.2byte ITEM_NONE
release
end
SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
textcolor 1
msgbox gUnknown_817C794
setvar VAR_0x8004, 17
special sub_815D9E8
compare VAR_RESULT, 0
goto_if_eq EventScript_164A00
msgbox gUnknown_817C7D9
goto EventScript_164A08
EventScript_164A00:: @ 8164A00
msgbox gUnknown_817C850
EventScript_164A08:: @ 8164A08
message Text_17C88D
waitmessage
multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE
switch VAR_RESULT
case 0, EventScript_164A53
case 1, EventScript_164ABF
case 2, EventScript_164A45
case 127, EventScript_164ABF
end
EventScript_164A45:: @ 8164A45
msgbox gUnknown_817CCC9
goto EventScript_164A08
end
EventScript_164A53:: @ 8164A53
multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE
switch VAR_RESULT
case 0, EventScript_164AA0
case 1, EventScript_164AA0
case 2, EventScript_164AA0
case 3, EventScript_164AA0
case 4, EventScript_164ABF
case 127, EventScript_164ABF
end
EventScript_164AA0:: @ 8164AA0
copyvar VAR_0x8005, VAR_RESULT
setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
special HealPlayerParty
msgbox gUnknown_817C8BF
setvar VAR_0x8004, 6
special sub_815D9E8
releaseall
end
EventScript_164ABF:: @ 8164ABF
msgbox gUnknown_817C91D
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6
waitmovement 0
releaseall
end
Movement_164AD4:: @ 8164AD4
face_right
step_end
Movement_164AD6:: @ 8164AD6
walk_down
step_end
SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8
lockall
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 1
special Special_BattleRecords
waitstate
releaseall
end
SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6
msgbox gUnknown_817CE38, MSGBOX_NPC
end
SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF
msgbox gUnknown_817CE9F, MSGBOX_NPC
end
data/maps/SevenIsland_TrainerTower_Roof/scripts.inc
-8
View File
@@ -1,8 +0,0 @@
SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828
map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54
map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Roof_MapScript2_1C5046
.byte 0
SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833
call EventScript_1C53AA
end
data/maps/SilphCo_Elevator/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E
SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
lockall
setvar VAR_0x8004, 1
call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor
data/maps/SevenIsland_TrainerTower_1F/map.json → data/maps/TrainerTower_1F/map.json
+12 -12
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
"name": "SevenIsland_TrainerTower_1F",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F",
"id": "MAP_TRAINER_TOWER_1F",
"name": "TrainerTower_1F",
"layout": "LAYOUT_TRAINER_TOWER_1F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_1F_EventScript_1646C8",
"script": "TrainerTower_EventScript_DoublesTrainer1",
"flag": "FLAG_TEMP_2"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_1F_EventScript_1646CE",
"script": "TrainerTower_EventScript_SinglesTrainer",
"flag": "FLAG_TEMP_3"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_1F_EventScript_1646D4",
"script": "TrainerTower_EventScript_KnockoutTrainer",
"flag": "FLAG_TEMP_4"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_1F_EventScript_1646DA",
"script": "TrainerTower_EventScript_DoublesTrainer2",
"flag": "FLAG_TEMP_5"
}
],
@@ -84,14 +84,14 @@
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
"dest_map": "MAP_TRAINER_TOWER_2F",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
"dest_map": "MAP_TRAINER_TOWER_LOBBY",
"dest_warp_id": 0
}
],
@@ -103,7 +103,7 @@
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF"
"script": "TrainerTower_EventScript_SingleBattleTrigger"
},
{
"type": "trigger",
@@ -112,7 +112,7 @@
"elevation": 0,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4"
"script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
},
{
"type": "trigger",
@@ -121,7 +121,7 @@
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA"
"script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
}
],
"bg_events": []
data/maps/TrainerTower_1F/scripts.inc
+27
View File
@@ -0,0 +1,27 @@
TrainerTower_1F_MapScripts:: @ 81646B8
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ All Trainer Tower floors/roof share these scripts for their object events
TrainerTower_EventScript_DoublesTrainer1:: @ 81646C8
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_EventScript_SinglesTrainer:: @ 81646CE
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_EventScript_KnockoutTrainer:: @ 81646D4
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_EventScript_DoublesTrainer2:: @ 81646DA
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_EventScript_Owner:: @ 81646E0
call TrainerTower_EventScript_SpeakToOwner
end
data/maps/SevenIsland_TrainerTower_5F/map.json → data/maps/TrainerTower_2F/map.json
+14 -14
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
"name": "SevenIsland_TrainerTower_5F",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F",
"id": "MAP_TRAINER_TOWER_2F",
"name": "TrainerTower_2F",
"layout": "LAYOUT_TRAINER_TOWER_2F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_5F_EventScript_1646E0",
"script": "TrainerTower_EventScript_Owner",
"flag": "FLAG_TEMP_6"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_5F_EventScript_1646C8",
"script": "TrainerTower_EventScript_DoublesTrainer1",
"flag": "FLAG_TEMP_2"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_5F_EventScript_1646CE",
"script": "TrainerTower_EventScript_SinglesTrainer",
"flag": "FLAG_TEMP_3"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_5F_EventScript_1646D4",
"script": "TrainerTower_EventScript_KnockoutTrainer",
"flag": "FLAG_TEMP_4"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_5F_EventScript_1646DA",
"script": "TrainerTower_EventScript_DoublesTrainer2",
"flag": "FLAG_TEMP_5"
}
],
@@ -84,21 +84,21 @@
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
"dest_map": "MAP_TRAINER_TOWER_3F",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
"dest_map": "MAP_TRAINER_TOWER_1F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
@@ -110,7 +110,7 @@
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF"
"script": "TrainerTower_EventScript_SingleBattleTrigger"
},
{
"type": "trigger",
@@ -119,7 +119,7 @@
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4"
"script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
},
{
"type": "trigger",
@@ -128,7 +128,7 @@
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA"
"script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
}
],
"bg_events": []
data/maps/TrainerTower_2F/scripts.inc
+27
View File
@@ -0,0 +1,27 @@
TrainerTower_2F_MapScripts:: @ 81646E6
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ Below scripts are unused, the identical versions in the 1F script are used instead
TrainerTower_2F_EventScript_DoublesTrainer1:: @ 81646F6
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_2F_EventScript_SinglesTrainer:: @ 81646FC
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_2F_EventScript_KnockoutTrainer:: @ 8164702
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_2F_EventScript_DoublesTrainer2:: @ 8164708
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_2F_EventScript_Owner:: @ 816470E
call TrainerTower_EventScript_SpeakToOwner
end
data/maps/SevenIsland_TrainerTower_3F/map.json → data/maps/TrainerTower_3F/map.json
+14 -14
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
"name": "SevenIsland_TrainerTower_3F",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F",
"id": "MAP_TRAINER_TOWER_3F",
"name": "TrainerTower_3F",
"layout": "LAYOUT_TRAINER_TOWER_3F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_3F_EventScript_1646E0",
"script": "TrainerTower_EventScript_Owner",
"flag": "FLAG_TEMP_6"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_3F_EventScript_1646C8",
"script": "TrainerTower_EventScript_DoublesTrainer1",
"flag": "FLAG_TEMP_2"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_3F_EventScript_1646CE",
"script": "TrainerTower_EventScript_SinglesTrainer",
"flag": "FLAG_TEMP_3"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_3F_EventScript_1646D4",
"script": "TrainerTower_EventScript_KnockoutTrainer",
"flag": "FLAG_TEMP_4"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_3F_EventScript_1646DA",
"script": "TrainerTower_EventScript_DoublesTrainer2",
"flag": "FLAG_TEMP_5"
}
],
@@ -84,21 +84,21 @@
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
"dest_map": "MAP_TRAINER_TOWER_4F",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
"dest_map": "MAP_TRAINER_TOWER_2F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
@@ -110,7 +110,7 @@
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF"
"script": "TrainerTower_EventScript_SingleBattleTrigger"
},
{
"type": "trigger",
@@ -119,7 +119,7 @@
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4"
"script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
},
{
"type": "trigger",
@@ -128,7 +128,7 @@
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA"
"script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
}
],
"bg_events": []
data/maps/TrainerTower_3F/scripts.inc
+27
View File
@@ -0,0 +1,27 @@
TrainerTower_3F_MapScripts:: @ 8164714
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ Below scripts are unused, the identical versions in the 1F script are used instead
TrainerTower_3F_EventScript_DoublesTrainer1:: @ 8164724
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_3F_EventScript_SinglesTrainer:: @ 816472A
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_3F_EventScript_KnockoutTrainer:: @ 8164730
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_3F_EventScript_DoublesTrainer2:: @ 8164736
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_3F_EventScript_Owner:: @ 816473C
call TrainerTower_EventScript_SpeakToOwner
end
data/maps/SevenIsland_TrainerTower_2F/map.json → data/maps/TrainerTower_4F/map.json
+14 -14
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
"name": "SevenIsland_TrainerTower_2F",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F",
"id": "MAP_TRAINER_TOWER_4F",
"name": "TrainerTower_4F",
"layout": "LAYOUT_TRAINER_TOWER_4F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_2F_EventScript_1646E0",
"script": "TrainerTower_EventScript_Owner",
"flag": "FLAG_TEMP_6"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_2F_EventScript_1646C8",
"script": "TrainerTower_EventScript_DoublesTrainer1",
"flag": "FLAG_TEMP_2"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_2F_EventScript_1646CE",
"script": "TrainerTower_EventScript_SinglesTrainer",
"flag": "FLAG_TEMP_3"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_2F_EventScript_1646D4",
"script": "TrainerTower_EventScript_KnockoutTrainer",
"flag": "FLAG_TEMP_4"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_2F_EventScript_1646DA",
"script": "TrainerTower_EventScript_DoublesTrainer2",
"flag": "FLAG_TEMP_5"
}
],
@@ -84,21 +84,21 @@
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
"dest_map": "MAP_TRAINER_TOWER_5F",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
"dest_map": "MAP_TRAINER_TOWER_3F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
@@ -110,7 +110,7 @@
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF"
"script": "TrainerTower_EventScript_SingleBattleTrigger"
},
{
"type": "trigger",
@@ -119,7 +119,7 @@
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4"
"script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
},
{
"type": "trigger",
@@ -128,7 +128,7 @@
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA"
"script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
}
],
"bg_events": []
data/maps/TrainerTower_4F/scripts.inc
+27
View File
@@ -0,0 +1,27 @@
TrainerTower_4F_MapScripts:: @ 8164742
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ Below scripts are unused, the identical versions in the 1F script are used instead
TrainerTower_4F_EventScript_DoublesTrainer1:: @ 8164752
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_4F_EventScript_SinglesTrainer:: @ 8164758
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_4F_EventScript_KnockoutTrainer:: @ 816475E
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_4F_EventScript_DoublesTrainer2:: @ 8164764
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_4F_EventScript_Owner:: @ 816476A
call TrainerTower_EventScript_SpeakToOwner
end
data/maps/SevenIsland_TrainerTower_4F/map.json → data/maps/TrainerTower_5F/map.json
+14 -14
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
"name": "SevenIsland_TrainerTower_4F",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F",
"id": "MAP_TRAINER_TOWER_5F",
"name": "TrainerTower_5F",
"layout": "LAYOUT_TRAINER_TOWER_5F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_4F_EventScript_1646E0",
"script": "TrainerTower_EventScript_Owner",
"flag": "FLAG_TEMP_6"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_4F_EventScript_1646C8",
"script": "TrainerTower_EventScript_DoublesTrainer1",
"flag": "FLAG_TEMP_2"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_4F_EventScript_1646CE",
"script": "TrainerTower_EventScript_SinglesTrainer",
"flag": "FLAG_TEMP_3"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_4F_EventScript_1646D4",
"script": "TrainerTower_EventScript_KnockoutTrainer",
"flag": "FLAG_TEMP_4"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_4F_EventScript_1646DA",
"script": "TrainerTower_EventScript_DoublesTrainer2",
"flag": "FLAG_TEMP_5"
}
],
@@ -84,21 +84,21 @@
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
"dest_map": "MAP_TRAINER_TOWER_6F",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
"dest_map": "MAP_TRAINER_TOWER_4F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
@@ -110,7 +110,7 @@
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF"
"script": "TrainerTower_EventScript_SingleBattleTrigger"
},
{
"type": "trigger",
@@ -119,7 +119,7 @@
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4"
"script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
},
{
"type": "trigger",
@@ -128,7 +128,7 @@
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA"
"script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
}
],
"bg_events": []
data/maps/TrainerTower_5F/scripts.inc
+27
View File
@@ -0,0 +1,27 @@
TrainerTower_5F_MapScripts:: @ 8164770
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ Below scripts are unused, the identical versions in the 1F script are used instead
TrainerTower_5F_EventScript_DoublesTrainer1:: @ 8164780
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_5F_EventScript_SinglesTrainer:: @ 8164786
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_5F_EventScript_KnockoutTrainer:: @ 816478C
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_5F_EventScript_DoublesTrainer2:: @ 8164792
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_5F_EventScript_Owner:: @ 8164798
call TrainerTower_EventScript_SpeakToOwner
end
data/maps/TrainerTower_6F/map.json
+135
View File
@@ -0,0 +1,135 @@
{
"id": "MAP_TRAINER_TOWER_6F",
"name": "TrainerTower_6F",
"layout": "LAYOUT_TRAINER_TOWER_6F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 2,
"elevator_flag": 0,
"battle_scene": "BATTLE_SCENE_0",
"connections": null,
"object_events": [
{
"graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_Owner",
"flag": "FLAG_TEMP_6"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_DoublesTrainer1",
"flag": "FLAG_TEMP_2"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_SinglesTrainer",
"flag": "FLAG_TEMP_3"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_KnockoutTrainer",
"flag": "FLAG_TEMP_4"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_DoublesTrainer2",
"flag": "FLAG_TEMP_5"
}
],
"warp_events": [
{
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_TRAINER_TOWER_7F",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_TRAINER_TOWER_5F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
"coord_events": [
{
"type": "trigger",
"x": 10,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "TrainerTower_EventScript_SingleBattleTrigger"
},
{
"type": "trigger",
"x": 9,
"y": 12,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
},
{
"type": "trigger",
"x": 9,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
}
],
"bg_events": []
}
data/maps/TrainerTower_6F/scripts.inc
+27
View File
@@ -0,0 +1,27 @@
TrainerTower_6F_MapScripts:: @ 816479E
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ Below scripts are unused, the identical versions in the 1F script are used instead
TrainerTower_6F_EventScript_DoublesTrainer1:: @ 81647AE
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_6F_EventScript_SinglesTrainer:: @ 81647B4
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_6F_EventScript_KnockoutTrainer:: @ 81647BA
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_6F_EventScript_DoublesTrainer2:: @ 81647C0
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_6F_EventScript_Owner:: @ 81647C6
call TrainerTower_EventScript_SpeakToOwner
end
data/maps/TrainerTower_7F/map.json
+135
View File
@@ -0,0 +1,135 @@
{
"id": "MAP_TRAINER_TOWER_7F",
"name": "TrainerTower_7F",
"layout": "LAYOUT_TRAINER_TOWER_7F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 2,
"elevator_flag": 0,
"battle_scene": "BATTLE_SCENE_0",
"connections": null,
"object_events": [
{
"graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_Owner",
"flag": "FLAG_TEMP_6"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_DoublesTrainer1",
"flag": "FLAG_TEMP_2"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_SinglesTrainer",
"flag": "FLAG_TEMP_3"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_KnockoutTrainer",
"flag": "FLAG_TEMP_4"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_DoublesTrainer2",
"flag": "FLAG_TEMP_5"
}
],
"warp_events": [
{
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_TRAINER_TOWER_8F",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_TRAINER_TOWER_6F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
"coord_events": [
{
"type": "trigger",
"x": 10,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "TrainerTower_EventScript_SingleBattleTrigger"
},
{
"type": "trigger",
"x": 9,
"y": 12,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
},
{
"type": "trigger",
"x": 9,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
}
],
"bg_events": []
}
data/maps/TrainerTower_7F/scripts.inc
+27
View File
@@ -0,0 +1,27 @@
TrainerTower_7F_MapScripts:: @ 81647CC
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ Below scripts are unused, the identical versions in the 1F script are used instead
TrainerTower_7F_EventScript_DoublesTrainer1:: @ 81647DC
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_7F_EventScript_SinglesTrainer:: @ 81647E2
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_7F_EventScript_KnockoutTrainer:: @ 81647E8
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_7F_EventScript_DoublesTrainer2:: @ 81647EE
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_7F_EventScript_Owner:: @ 81647F4
call TrainerTower_EventScript_SpeakToOwner
end
data/maps/TrainerTower_8F/map.json
+135
View File
@@ -0,0 +1,135 @@
{
"id": "MAP_TRAINER_TOWER_8F",
"name": "TrainerTower_8F",
"layout": "LAYOUT_TRAINER_TOWER_8F",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
"weather": "WEATHER_NONE",
"map_type": "MAP_TYPE_8",
"unknown_18": 0,
"unknown_19": 2,
"elevator_flag": 0,
"battle_scene": "BATTLE_SCENE_0",
"connections": null,
"object_events": [
{
"graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
"x": 9,
"y": 7,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_Owner",
"flag": "FLAG_TEMP_6"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_0",
"x": 10,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_DoublesTrainer1",
"flag": "FLAG_TEMP_2"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_1",
"x": 15,
"y": 13,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_SinglesTrainer",
"flag": "FLAG_TEMP_3"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_2",
"x": 10,
"y": 16,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_UP",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_KnockoutTrainer",
"flag": "FLAG_TEMP_4"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_3",
"x": 11,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "TrainerTower_EventScript_DoublesTrainer2",
"flag": "FLAG_TEMP_5"
}
],
"warp_events": [
{
"x": 15,
"y": 6,
"elevation": 3,
"dest_map": "MAP_TRAINER_TOWER_ROOF",
"dest_warp_id": 1
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_TRAINER_TOWER_7F",
"dest_warp_id": 0
},
{
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
"coord_events": [
{
"type": "trigger",
"x": 10,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_E",
"var_value": 0,
"script": "TrainerTower_EventScript_SingleBattleTrigger"
},
{
"type": "trigger",
"x": 9,
"y": 12,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
},
{
"type": "trigger",
"x": 9,
"y": 13,
"elevation": 3,
"var": "VAR_TEMP_F",
"var_value": 0,
"script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
}
],
"bg_events": []
}
data/maps/TrainerTower_8F/scripts.inc
+27
View File
@@ -0,0 +1,27 @@
TrainerTower_8F_MapScripts:: @ 81647FA
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ Below scripts are unused, the identical versions in the 1F script are used instead
TrainerTower_8F_EventScript_DoublesTrainer1:: @ 816480A
call TrainerTower_EventScript_SpeakToDoublesTrainer1
end
TrainerTower_8F_EventScript_SinglesTrainer:: @ 8164810
call TrainerTower_EventScript_SpeakToSinglesTrainer
end
TrainerTower_8F_EventScript_KnockoutTrainer:: @ 8164816
call TrainerTower_EventScript_SpeakToKnockoutTrainer
end
TrainerTower_8F_EventScript_DoublesTrainer2:: @ 816481C
call TrainerTower_EventScript_SpeakToDoublesTrainer2
end
TrainerTower_8F_EventScript_Owner:: @ 8164822
call TrainerTower_EventScript_SpeakToOwner
end
data/maps/SevenIsland_TrainerTower_Elevator/map.json → data/maps/TrainerTower_Elevator/map.json
+4 -4
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"name": "SevenIsland_TrainerTower_Elevator",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"id": "MAP_TRAINER_TOWER_ELEVATOR",
"name": "TrainerTower_Elevator",
"layout": "LAYOUT_TRAINER_TOWER_ELEVATOR",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
@@ -29,7 +29,7 @@
"x": 0,
"y": 2,
"elevation": 0,
"script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03"
"script": "TrainerTower_Elevator_EventScript_FloorSelect"
}
]
}
data/maps/TrainerTower_Elevator/scripts.inc
+80
View File
@@ -0,0 +1,80 @@
TrainerTower_Elevator_MapScripts:: @ 8164AF8
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03
lockall
setvar VAR_0x8004, 6
call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special Special_DrawElevatorCurrentFloorWindow
message Text_WantWhichFloor
waitmessage
setvar VAR_0x8004, 6
specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
switch VAR_RESULT
case 0, TrainerTower_Elevator_EventScript_FloorSelectFromRoof
case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby
end
TrainerTower_Elevator_EventScript_FloorSelectFromRoof:: @ 8164B46
multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE
goto TrainerTower_Elevator_EventScript_ChooseFloor
end
TrainerTower_Elevator_EventScript_FloorSelectFromLobby:: @ 8164B52
multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE
goto TrainerTower_Elevator_EventScript_ChooseFloor
end
TrainerTower_Elevator_EventScript_ChooseFloor:: @ 8164B5E
switch VAR_RESULT
case 0, TrainerTower_Elevator_EventScript_SelectRoof
case 1, TrainerTower_Elevator_EventScript_SelectLobby
case 2, TrainerTower_Elevator_EventScript_CloseFloorSelect
case SCR_MENU_CANCEL, TrainerTower_Elevator_EventScript_CloseFloorSelect
end
TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90
setvar VAR_0x8006, 3
setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8
compare VAR_ELEVATOR_FLOOR, 3
goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect
call TrainerTower_Elevator_EventScript_MoveElevator
setvar VAR_ELEVATOR_FLOOR, 3
special Special_CloseElevatorCurrentFloorWindow
delay 25
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator
waitmovement 0
warp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8
waitstate
releaseall
end
TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD
goto TrainerTower_Elevator_EventScript_CloseFloorSelect
end
TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3
special Special_CloseElevatorCurrentFloorWindow
releaseall
end
TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8
special Special_CloseElevatorCurrentFloorWindow
closemessage
waitse
special Special_AnimateElevator
waitstate
setflag FLAG_TEMP_2
return
TrainerTower_Elevator_Movement_ExitElevator:: @ 8164BE5
walk_in_place_fastest_down
delay_16
walk_down
walk_right
walk_right
walk_down
step_end
data/maps/SevenIsland_TrainerTower_Lobby/map.json → data/maps/TrainerTower_Lobby/map.json
+12 -12
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
"name": "SevenIsland_TrainerTower_Lobby",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
"id": "MAP_TRAINER_TOWER_LOBBY",
"name": "TrainerTower_Lobby",
"layout": "LAYOUT_TRAINER_TOWER_LOBBY",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_Lobby_EventScript_16495D",
"script": "TrainerTower_Lobby_EventScript_Nurse",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_Lobby_EventScript_164992",
"script": "TrainerTower_Lobby_EventScript_MartClerk",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_Lobby_EventScript_164966",
"script": "TrainerTower_Lobby_EventScript_Receptionist",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_Lobby_EventScript_164AE6",
"script": "TrainerTower_Lobby_EventScript_CooltrainerF",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_Lobby_EventScript_164AEF",
"script": "TrainerTower_Lobby_EventScript_BaldingMan",
"flag": "0"
}
],
@@ -84,7 +84,7 @@
"x": 9,
"y": 2,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
"dest_map": "MAP_TRAINER_TOWER_1F",
"dest_warp_id": 1
},
{
@@ -98,7 +98,7 @@
"x": 17,
"y": 8,
"elevation": 0,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
}
],
@@ -110,7 +110,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_TRAINER_TOWER",
"var_value": 0,
"script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE"
"script": "TrainerTower_Lobby_EventScript_EntryTrigger"
}
],
"bg_events": [
@@ -119,7 +119,7 @@
"x": 8,
"y": 10,
"elevation": 0,
"script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8"
"script": "TrainerTower_Lobby_EventScript_ShowRecords"
}
]
}
data/maps/TrainerTower_Lobby/scripts.inc
+226
View File
@@ -0,0 +1,226 @@
TrainerTower_Lobby_MapScripts:: @ 8164839
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField
map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_Lobby_OnTransition
map_script MAP_SCRIPT_ON_LOAD, TrainerTower_Lobby_OnLoad
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_Lobby_OnFrame
.byte 0
TrainerTower_Lobby_OnResume:: @ 8164853
setvar VAR_TEMP_2, 0
ttower_resumetimer
ttower_shouldexit
compare VAR_RESULT, FALSE
goto_if_eq TrainerTower_Lobby_OnResumeEnd
@ Never reached, above always FALSE
setvar VAR_TEMP_0, 0
setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
TrainerTower_Lobby_OnResumeEnd:: @ 8164886
end
TrainerTower_Lobby_OnReturnToField:: @ 8164887
addobject 1
addobject 2
addobject 3
addobject 4
addobject 5
end
TrainerTower_Lobby_OnLoad:: @ 8164897
compare VAR_TEMP_D, 17
call_if_eq TrainerTower_Lobby_OpenCounterBarrier
end
TrainerTower_Lobby_OpenCounterBarrier:: @ 81648A3
setmetatile 17, 10, METATILE_TrainerTower_Floor_ShadeBottomLeft, 0
return
TrainerTower_Lobby_OnTransition:: @ 81648AD
setworldmapflag FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY
getplayerxy VAR_TEMP_D, VAR_RESULT
end
TrainerTower_Lobby_OnFrame:: @ 81648B6
map_script_2 VAR_TEMP_0, 0, TrainerTower_Lobby_EventScript_Enter
map_script_2 VAR_TEMP_D, 17, TrainerTower_Lobby_EventScript_ExitElevator
.2byte 0
TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator
waitmovement 0
setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1
special DrawWholeMapView
playse SE_TK_KASYA
waitse
setvar VAR_TEMP_D, 0
releaseall
end
TrainerTower_Lobby_Movement_ExitElevator:: @ 81648EA
walk_down
walk_down
step_end
TrainerTower_Lobby_EventScript_Enter:: @ 81648ED
setvar VAR_TEMP_0, 1
ttower_getchallengestatus
switch VAR_RESULT
case CHALLENGE_STATUS_LOST, TrainerTower_Lobby_EventScript_LostChallenge
case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938
case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd
TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920
lock
faceplayer
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
textcolor 1
msgbox TrainerTower_Lobby_Text_TooBadComeBackTryAgain
goto TrainerTower_Lobby_EventScript_ExitChallenge
@ Presumably E-Reader related
TrainerTower_Lobby_EventScript_164938:: @ 8164938
lock
faceplayer
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
textcolor 1
msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch
TrainerTower_Lobby_EventScript_ExitChallenge:: @ 816494B
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
waitmovement 0
setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
release
TrainerTower_Lobby_EventScript_EnterEnd:: @ 816495C
end
TrainerTower_Lobby_EventScript_Nurse:: @ 816495D
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966
lock
faceplayer
ttower_getbeatchallenge
compare VAR_RESULT, TRUE
goto_if_eq TrainerTower_Lobby_EventScript_ThanksForCompeting
msgbox TrainerTower_Lobby_Text_GiveItYourBest
goto TrainerTower_Lobby_EventScript_ReceptionistEnd
TrainerTower_Lobby_EventScript_ThanksForCompeting:: @ 8164988
msgbox TrainerTower_Lobby_Text_ThanksForCompeting
TrainerTower_Lobby_EventScript_ReceptionistEnd:: @ 8164990
release
end
TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
waitmessage
pokemart TrainerTower_Lobby_Mart_Items
msgbox Text_PleaseComeAgain
release
end
.align 2
TrainerTower_Lobby_Mart_Items:: @ 81649B8
.2byte ITEM_ULTRA_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_FULL_RESTORE
.2byte ITEM_MAX_POTION
.2byte ITEM_HYPER_POTION
.2byte ITEM_REVIVE
.2byte ITEM_FULL_HEAL
.2byte ITEM_ESCAPE_ROPE
.2byte ITEM_MAX_REPEL
.2byte ITEM_NONE
release
end
TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
textcolor 1
msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower
ttower_getnumfloors
compare VAR_RESULT, FALSE
goto_if_eq TrainerTower_Lobby_EventScript_AllFloorsUsed
msgbox TrainerTower_Lobby_Text_TrainersUpToFloorNum
goto TrainerTower_Lobby_EventScript_AskEnterChallenge
TrainerTower_Lobby_EventScript_AllFloorsUsed:: @ 8164A00
msgbox TrainerTower_Lobby_Text_TrainersUpEighthFloor
TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08
message TrainerTower_Lobby_Text_LikeToChallengeTrainers
waitmessage
multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE
switch VAR_RESULT
case 0, TrainerTower_Lobby_EventScript_ChooseChallenge
case 1, TrainerTower_Lobby_EventScript_DeclineChallenge
case 2, TrainerTower_Lobby_EventScript_ChallengeInfo
case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge
end
TrainerTower_Lobby_EventScript_ChallengeInfo:: @ 8164A45
msgbox TrainerTower_Lobby_Text_ExplainTrainerTower
goto TrainerTower_Lobby_EventScript_AskEnterChallenge
end
TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53
multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE
switch VAR_RESULT
case 0, TrainerTower_Lobby_EventScript_BeginChallenge
case 1, TrainerTower_Lobby_EventScript_BeginChallenge
case 2, TrainerTower_Lobby_EventScript_BeginChallenge
case 3, TrainerTower_Lobby_EventScript_BeginChallenge
case 4, TrainerTower_Lobby_EventScript_DeclineChallenge
case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge
end
TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0
copyvar VAR_0x8005, VAR_RESULT
setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
special HealPlayerParty
msgbox TrainerTower_Lobby_Text_StartClockGetSetGo
ttower_startchallenge
releaseall
end
TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF
msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
waitmovement 0
releaseall
end
TrainerTower_Lobby_Movement_FaceReceptionist:: @ 8164AD4
face_right
step_end
TrainerTower_Lobby_Movement_WalkDown:: @ 8164AD6
walk_down
step_end
TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8
lockall
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 1
special Special_BattleRecords
waitstate
releaseall
end
TrainerTower_Lobby_EventScript_CooltrainerF:: @ 8164AE6
msgbox TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers, MSGBOX_NPC
end
TrainerTower_Lobby_EventScript_BaldingMan:: @ 8164AEF
msgbox TrainerTower_Lobby_Text_StairsTougherThanAnyBattle, MSGBOX_NPC
end
data/maps/SevenIsland_TrainerTower_Lobby/text.inc → data/maps/TrainerTower_Lobby/text.inc
+23 -21
View File
@@ -1,50 +1,52 @@
gUnknown_817C794:: @ 817C794
@ All Trainer Tower text (Lobby and Roof) is interleaved here
TrainerTower_Lobby_Text_WelcomeToTrainerTower:: @ 817C794
.string "Hello!\p"
.string "Welcome to TRAINER TOWER where\n"
.string "TRAINERS gather from all over!$"
gUnknown_817C7D9:: @ 817C7D9
TrainerTower_Lobby_Text_TrainersUpToFloorNum:: @ 817C7D9
.string "TRAINERS from all over the world\n"
.string "gather here to battle.\p"
.string "Let me see…\p"
.string "Right now, there are TRAINERS only\n"
.string "up to Floor {STR_VAR_1}.$"
gUnknown_817C850:: @ 817C850
TrainerTower_Lobby_Text_TrainersUpEighthFloor:: @ 817C850
.string "TRAINERS are awaiting your\n"
.string "challenge up to the eighth floor.$"
Text_17C88D:: @ 817C88D
TrainerTower_Lobby_Text_LikeToChallengeTrainers:: @ 817C88D
.string "Would you like to challenge the\n"
.string "waiting TRAINERS?$"
gUnknown_817C8BF:: @ 817C8BF
TrainerTower_Lobby_Text_StartClockGetSetGo:: @ 817C8BF
.string "Okay, I'll get the clock started,\n"
.string "so give it everything you have.\p"
.string "On your marks…\p"
.string "Get set…\p"
.string "Go!$"
gUnknown_817C91D:: @ 817C91D
TrainerTower_Lobby_Text_PleaseVisitUsAgain:: @ 817C91D
.string "Please do visit us again!$"
gUnknown_817C937:: @ 817C937
TrainerTower_Lobby_Text_TooBadComeBackTryAgain:: @ 817C937
.string "That was too bad.\p"
.string "I think you put in a tremendous\n"
.string "effort in your battling.\p"
.string "Please come back and try again!$"
gUnknown_817C9A2:: @ 817C9A2
TrainerTower_Lobby_Text_GiveItYourBest:: @ 817C9A2
.string "I hope you give it your best.$"
gUnknown_817C9C0:: @ 817C9C0
TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch:: @ 817C9C0
.string "When the TRAINERS switch places,\n"
.string "the movement can be hectic.\p"
.string "To avoid the stampede, we moved\n"
.string "the reception counter here.\p"
.string "I'm sorry for the inconvenience.$"
Text_17CA5A:: @ 817CA5A
TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A
.string "Hello…\p"
.string "I am the owner of this TOWER…\p"
.string "How the sky soars above this\n"
@@ -54,10 +56,10 @@ Text_17CA5A:: @ 817CA5A
.string "The way you battled…\n"
.string "It, too, was perfection…$"
Text_17CB09:: @ 817CB09
TrainerTower_Roof_Text_ThisIsForYou:: @ 817CB09
.string "This is for you…$"
Text_17CB1A:: @ 817CB1A
TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A
.string "Oh!\n"
.string "Stupendous!\p"
.string "It's marvelous how you've come up\n"
@@ -67,28 +69,28 @@ Text_17CB1A:: @ 817CB1A
.string "I'll have your record posted at\n"
.string "the reception counter.$"
Text_17CBC0:: @ 817CBC0
TrainerTower_Roof_Text_TookSweetTimeGettingHere:: @ 817CBC0
.string "You seem to have taken your sweet\n"
.string "time getting here…$"
Text_17CBF5:: @ 817CBF5
TrainerTower_Roof_Text_IdLikeToSeeBetterTime:: @ 817CBF5
.string "What I would like to see is a\n"
.string "better time out of you…\p"
.string "I'm counting on you.\p"
.string "Until then, farewell…$"
Text_17CC56:: @ 817CC56
TrainerTower_Text_XMinYZSec:: @ 817CC56
.string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
Text_17CC69:: @ 817CC69
TrainerTower_Lobby_Text_HereAreTheResults:: @ 817CC69
.string "せいせきひょうです$"
Text_17CC73:: @ 817CC73
TrainerTower_Lobby_Text_NeedTwoMonsForDouble:: @ 817CC73
.string "This is a two-on-two battle.\p"
.string "You may not battle unless you have\n"
.string "at least two POKéMON.$"
gUnknown_817CCC9:: @ 817CCC9
TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9
.string "Here at TRAINER TOWER, there is an\n"
.string "event called TIME ATTACK.\p"
.string "You will be timed on how quickly\n"
@@ -101,16 +103,16 @@ gUnknown_817CCC9:: @ 817CCC9
.string "You will not earn any EXP. Points\n"
.string "or money by beating TRAINERS here.$"
gUnknown_817CE1F:: @ 817CE1F
TrainerTower_Lobby_Text_ThanksForCompeting:: @ 817CE1F
.string "Thank you for competing!$"
gUnknown_817CE38:: @ 817CE38
TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers:: @ 817CE38
.string "I'm here to see how good I am.\p"
.string "I wonder what kinds of TRAINERS\n"
.string "are waiting for me?\p"
.string "It's nerve-racking!$"
gUnknown_817CE9F:: @ 817CE9F
TrainerTower_Lobby_Text_StairsTougherThanAnyBattle:: @ 817CE9F
.string "Gasp, gasp…\n"
.string "Gasp…\p"
.string "Never mind battling! These stairs…\n"
data/maps/SevenIsland_TrainerTower_Roof/map.json → data/maps/TrainerTower_Roof/map.json
+6 -6
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
"name": "SevenIsland_TrainerTower_Roof",
"layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
"id": "MAP_TRAINER_TOWER_ROOF",
"name": "TrainerTower_Roof",
"layout": "LAYOUT_TRAINER_TOWER_ROOF",
"music": "MUS_T_TOWER",
"region_map_section": "MAPSEC_TRAINER_TOWER_2",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0",
"script": "TrainerTower_EventScript_Owner",
"flag": "FLAG_TEMP_6"
}
],
@@ -32,14 +32,14 @@
"x": 13,
"y": 5,
"elevation": 0,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
"dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
"dest_warp_id": 0
},
{
"x": 4,
"y": 6,
"elevation": 3,
"dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
"dest_map": "MAP_TRAINER_TOWER_8F",
"dest_warp_id": 0
}
],
data/maps/TrainerTower_Roof/scripts.inc
+10
View File
@@ -0,0 +1,10 @@
TrainerTower_Roof_MapScripts:: @ 8164828
map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
.byte 0
@ Below script is unused, the identical version in the 1F script is used instead
TrainerTower_Roof_EventScript_Owner:: @ 8164833
call TrainerTower_EventScript_SpeakToOwner
end
data/maps/map_groups.json
+11 -11
View File
@@ -178,17 +178,17 @@
],
"gMapGroup2": [
"NavelRock_Exterior",
"SevenIsland_TrainerTower_1F",
"SevenIsland_TrainerTower_2F",
"SevenIsland_TrainerTower_3F",
"SevenIsland_TrainerTower_4F",
"SevenIsland_TrainerTower_5F",
"SevenIsland_TrainerTower_6F",
"SevenIsland_TrainerTower_7F",
"SevenIsland_TrainerTower_8F",
"SevenIsland_TrainerTower_Roof",
"SevenIsland_TrainerTower_Lobby",
"SevenIsland_TrainerTower_Elevator",
"TrainerTower_1F",
"TrainerTower_2F",
"TrainerTower_3F",
"TrainerTower_4F",
"TrainerTower_5F",
"TrainerTower_6F",
"TrainerTower_7F",
"TrainerTower_8F",
"TrainerTower_Roof",
"TrainerTower_Lobby",
"TrainerTower_Elevator",
"FiveIsland_LostCave_Entrance",
"FiveIsland_LostCave_Room1",
"FiveIsland_LostCave_Room2",