summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-04-10 13:59:31 -0400
committerGitHub <noreply@github.com>2021-04-10 13:59:31 -0400
commitb54bd2e387feb7ece4f34f50f17519e329419716 (patch)
treece35b9b5ae3e5b91de7ebf5ab81861cdc2baf28a /data
parent37634072b1400180b1243d2d99c47b109ab56ae3 (diff)
parent9b6469a7a3876334e0235202c417c7f1735f18ee (diff)
Merge pull request #414 from SatoMew/record-corner
Fix Record Corner labels
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/layouts/RecordCorner/border.bin (renamed from data/layouts/RecordCenter/border.bin)0
-rw-r--r--data/layouts/RecordCorner/map.bin (renamed from data/layouts/RecordCenter/map.bin)0
-rw-r--r--data/layouts/layouts.json8
-rw-r--r--data/maps/RecordCenter/scripts.inc2
-rw-r--r--data/maps/RecordCorner/map.json (renamed from data/maps/RecordCenter/map.json)16
-rw-r--r--data/maps/RecordCorner/scripts.inc2
-rw-r--r--data/maps/map_groups.json2
-rw-r--r--data/scripts/cable_club.inc10
9 files changed, 21 insertions, 21 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index e9d49cc15..26fddad77 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -87,7 +87,7 @@ gStdScriptsEnd::
.include "data/maps/BattleColosseum_2P/scripts.inc"
.include "data/maps/TradeCenter/scripts.inc"
- .include "data/maps/RecordCenter/scripts.inc"
+ .include "data/maps/RecordCorner/scripts.inc"
.include "data/maps/BattleColosseum_4P/scripts.inc"
.include "data/maps/UnionRoom/scripts.inc"
.include "data/maps/ViridianForest/scripts.inc"
diff --git a/data/layouts/RecordCenter/border.bin b/data/layouts/RecordCorner/border.bin
index efef023e6..efef023e6 100644
--- a/data/layouts/RecordCenter/border.bin
+++ b/data/layouts/RecordCorner/border.bin
diff --git a/data/layouts/RecordCenter/map.bin b/data/layouts/RecordCorner/map.bin
index 08209eaca..08209eaca 100644
--- a/data/layouts/RecordCenter/map.bin
+++ b/data/layouts/RecordCorner/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index a9911aed4..1083cd406 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -457,16 +457,16 @@
"blockdata_filepath": "data/layouts/TradeCenter/map.bin"
},
{
- "id": "LAYOUT_RECORD_CENTER",
- "name": "RecordCenter_Layout",
+ "id": "LAYOUT_RECORD_CORNER",
+ "name": "RecordCorner_Layout",
"width": 20,
"height": 10,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_CableClub",
- "border_filepath": "data/layouts/RecordCenter/border.bin",
- "blockdata_filepath": "data/layouts/RecordCenter/map.bin"
+ "border_filepath": "data/layouts/RecordCorner/border.bin",
+ "blockdata_filepath": "data/layouts/RecordCorner/map.bin"
},
{
"id": "LAYOUT_BATTLE_COLOSSEUM_4P",
diff --git a/data/maps/RecordCenter/scripts.inc b/data/maps/RecordCenter/scripts.inc
deleted file mode 100644
index 873fc2826..000000000
--- a/data/maps/RecordCenter/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-RecordCenter_MapScripts:: @ 816047A
- .byte 0
diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCorner/map.json
index 710a91832..67d6be4a5 100644
--- a/data/maps/RecordCenter/map.json
+++ b/data/maps/RecordCorner/map.json
@@ -1,7 +1,7 @@
{
- "id": "MAP_RECORD_CENTER",
- "name": "RecordCenter",
- "layout": "LAYOUT_RECORD_CENTER",
+ "id": "MAP_RECORD_CORNER",
+ "name": "RecordCorner",
+ "layout": "LAYOUT_RECORD_CORNER",
"music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false,
@@ -25,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
- "script": "RecordCenter_EventScript_Attendant",
+ "script": "RecordCorner_EventScript_Attendant",
"flag": "0"
}
],
@@ -67,7 +67,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "RecordCenter_EventScript_Spot0"
+ "script": "RecordCorner_EventScript_Spot0"
},
{
"type": "trigger",
@@ -76,7 +76,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "RecordCenter_EventScript_Spot1"
+ "script": "RecordCorner_EventScript_Spot1"
},
{
"type": "trigger",
@@ -85,7 +85,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "RecordCenter_EventScript_Spot2"
+ "script": "RecordCorner_EventScript_Spot2"
},
{
"type": "trigger",
@@ -94,7 +94,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "RecordCenter_EventScript_Spot3"
+ "script": "RecordCorner_EventScript_Spot3"
}
],
"bg_events": []
diff --git a/data/maps/RecordCorner/scripts.inc b/data/maps/RecordCorner/scripts.inc
new file mode 100644
index 000000000..979b17ac2
--- /dev/null
+++ b/data/maps/RecordCorner/scripts.inc
@@ -0,0 +1,2 @@
+RecordCorner_MapScripts:: @ 816047A
+ .byte 0
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index a7a468351..e8a346f5a 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -47,7 +47,7 @@
"gMapGroup0": [
"BattleColosseum_2P",
"TradeCenter",
- "RecordCenter",
+ "RecordCorner",
"BattleColosseum_4P",
"UnionRoom"
],
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index f25409e05..66cf634e9 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -703,10 +703,10 @@ TradeCenter_EventScript_Chair3:: @ 81BB974
@ Nop in FRLG
@ Separate labels to match GetDirectionForEventScript
-RecordCenter_EventScript_Spot0:: @ 81BB980
-RecordCenter_EventScript_Spot1:: @ 81BB980
-RecordCenter_EventScript_Spot2:: @ 81BB980
-RecordCenter_EventScript_Spot3:: @ 81BB980
+RecordCorner_EventScript_Spot0:: @ 81BB980
+RecordCorner_EventScript_Spot1:: @ 81BB980
+RecordCorner_EventScript_Spot2:: @ 81BB980
+RecordCorner_EventScript_Spot3:: @ 81BB980
end
CableClub_EventScript_ReadTrainerCard:: @ 81BB981
@@ -748,7 +748,7 @@ TradeCenter_EventScript_Attendant:: @ 81BB9C1
end
@ Nop in FRLG
-RecordCenter_EventScript_Attendant:: @ 81BB9D3
+RecordCorner_EventScript_Attendant:: @ 81BB9D3
end
TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4