From 9b6469a7a3876334e0235202c417c7f1735f18ee Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sat, 10 Apr 2021 18:43:10 +0100 Subject: Fix Record Corner labels --- data/event_scripts.s | 2 +- data/layouts/RecordCenter/border.bin | 1 - data/layouts/RecordCenter/map.bin | 1 - data/layouts/RecordCorner/border.bin | 1 + data/layouts/RecordCorner/map.bin | 1 + data/layouts/layouts.json | 8 +-- data/maps/RecordCenter/map.json | 101 ----------------------------------- data/maps/RecordCenter/scripts.inc | 2 - data/maps/RecordCorner/map.json | 101 +++++++++++++++++++++++++++++++++++ data/maps/RecordCorner/scripts.inc | 2 + data/maps/map_groups.json | 2 +- data/scripts/cable_club.inc | 10 ++-- include/constants/layouts.h | 2 +- include/constants/map_groups.h | 2 +- include/event_scripts.h | 8 +-- src/overworld.c | 8 +-- 16 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 data/layouts/RecordCenter/border.bin delete mode 100644 data/layouts/RecordCenter/map.bin create mode 100644 data/layouts/RecordCorner/border.bin create mode 100644 data/layouts/RecordCorner/map.bin delete mode 100644 data/maps/RecordCenter/map.json delete mode 100644 data/maps/RecordCenter/scripts.inc create mode 100644 data/maps/RecordCorner/map.json create mode 100644 data/maps/RecordCorner/scripts.inc 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/RecordCenter/border.bin deleted file mode 100644 index efef023e6..000000000 --- a/data/layouts/RecordCenter/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/RecordCenter/map.bin b/data/layouts/RecordCenter/map.bin deleted file mode 100644 index 08209eaca..000000000 --- a/data/layouts/RecordCenter/map.bin +++ /dev/null @@ -1 +0,0 @@ - !3'3'3'3$3%3%3&3'3'3'3"3#()3D3D343D3D3D3D363D3D3*3+()3D3,3<89:;>.3D3*3+()3D3D353@ABC73D3D3*3+()3D3-3=HIJK?/3D3*3+()3D3D3F3F3F3F3F3F3D3D3*3+013D3D3D3D3D3D3D3D3D3D32332222 \ No newline at end of file diff --git a/data/layouts/RecordCorner/border.bin b/data/layouts/RecordCorner/border.bin new file mode 100644 index 000000000..efef023e6 --- /dev/null +++ b/data/layouts/RecordCorner/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/RecordCorner/map.bin b/data/layouts/RecordCorner/map.bin new file mode 100644 index 000000000..08209eaca --- /dev/null +++ b/data/layouts/RecordCorner/map.bin @@ -0,0 +1 @@ + !3'3'3'3$3%3%3&3'3'3'3"3#()3D3D343D3D3D3D363D3D3*3+()3D3,3<89:;>.3D3*3+()3D3D353@ABC73D3D3*3+()3D3-3=HIJK?/3D3*3+()3D3D3F3F3F3F3F3F3D3D3*3+013D3D3D3D3D3D3D3D3D3D32332222 \ No newline at end of file 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/map.json b/data/maps/RecordCenter/map.json deleted file mode 100644 index 710a91832..000000000 --- a/data/maps/RecordCenter/map.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "id": "MAP_RECORD_CENTER", - "name": "RecordCenter", - "layout": "LAYOUT_RECORD_CENTER", - "music": "MUS_POKE_CENTER", - "region_map_section": "MAPSEC_SPECIAL_AREA", - "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": [ - { - "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", - "x": 10, - "y": 5, - "elevation": 0, - "movement_type": "MOVEMENT_TYPE_FACE_DOWN", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "TRAINER_TYPE_NONE", - "trainer_sight_or_berry_tree_id": "0", - "script": "RecordCenter_EventScript_Attendant", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 8, - "y": 9, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 9, - "y": 9, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 11, - "y": 9, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 10, - "y": 9, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 6, - "y": 4, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "RecordCenter_EventScript_Spot0" - }, - { - "type": "trigger", - "x": 6, - "y": 6, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "RecordCenter_EventScript_Spot1" - }, - { - "type": "trigger", - "x": 13, - "y": 4, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "RecordCenter_EventScript_Spot2" - }, - { - "type": "trigger", - "x": 13, - "y": 6, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "RecordCenter_EventScript_Spot3" - } - ], - "bg_events": [] -} 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/RecordCorner/map.json b/data/maps/RecordCorner/map.json new file mode 100644 index 000000000..67d6be4a5 --- /dev/null +++ b/data/maps/RecordCorner/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_RECORD_CORNER", + "name": "RecordCorner", + "layout": "LAYOUT_RECORD_CORNER", + "music": "MUS_POKE_CENTER", + "region_map_section": "MAPSEC_SPECIAL_AREA", + "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": [ + { + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST", + "x": 10, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "TRAINER_TYPE_NONE", + "trainer_sight_or_berry_tree_id": "0", + "script": "RecordCorner_EventScript_Attendant", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 9, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "script": "RecordCorner_EventScript_Spot0" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "script": "RecordCorner_EventScript_Spot1" + }, + { + "type": "trigger", + "x": 13, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "script": "RecordCorner_EventScript_Spot2" + }, + { + "type": "trigger", + "x": 13, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "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 diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 01a452970..b64f29809 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -42,7 +42,7 @@ #define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46 #define LAYOUT_BATTLE_COLOSSEUM_2P 47 #define LAYOUT_TRADE_CENTER 48 -#define LAYOUT_RECORD_CENTER 49 +#define LAYOUT_RECORD_CORNER 49 #define LAYOUT_BATTLE_COLOSSEUM_4P 50 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51 #define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index b087b2c33..a219613aa 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -8,7 +8,7 @@ // Map Group 0 #define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8)) #define MAP_TRADE_CENTER (1 | (0 << 8)) -#define MAP_RECORD_CENTER (2 | (0 << 8)) +#define MAP_RECORD_CORNER (2 | (0 << 8)) #define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8)) #define MAP_UNION_ROOM (4 | (0 << 8)) diff --git a/include/event_scripts.h b/include/event_scripts.h index 437b6dcee..3a25a5fc9 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1270,10 +1270,10 @@ extern const u8 BattleColosseum_4P_EventScript_PlayerSpot0[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot1[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot2[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot3[]; -extern const u8 RecordCenter_EventScript_Spot0[]; -extern const u8 RecordCenter_EventScript_Spot1[]; -extern const u8 RecordCenter_EventScript_Spot2[]; -extern const u8 RecordCenter_EventScript_Spot3[]; +extern const u8 RecordCorner_EventScript_Spot0[]; +extern const u8 RecordCorner_EventScript_Spot1[]; +extern const u8 RecordCorner_EventScript_Spot2[]; +extern const u8 RecordCorner_EventScript_Spot3[]; extern const u8 BattleColosseum_2P_EventScript_PlayerSpot0[]; extern const u8 BattleColosseum_2P_EventScript_PlayerSpot1[]; extern const u8 TradeCenter_EventScript_Chair0[]; diff --git a/src/overworld.c b/src/overworld.c index 10a700e1f..2083b7578 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -3117,13 +3117,13 @@ static u16 GetDirectionForEventScript(const u8 *script) return FACING_FORCED_RIGHT; else if (script == BattleColosseum_4P_EventScript_PlayerSpot3) return FACING_FORCED_LEFT; - else if (script == RecordCenter_EventScript_Spot0) + else if (script == RecordCorner_EventScript_Spot0) return FACING_FORCED_RIGHT; - else if (script == RecordCenter_EventScript_Spot1) + else if (script == RecordCorner_EventScript_Spot1) return FACING_FORCED_LEFT; - else if (script == RecordCenter_EventScript_Spot2) + else if (script == RecordCorner_EventScript_Spot2) return FACING_FORCED_RIGHT; - else if (script == RecordCenter_EventScript_Spot3) + else if (script == RecordCorner_EventScript_Spot3) return FACING_FORCED_LEFT; else if (script == BattleColosseum_2P_EventScript_PlayerSpot0) return FACING_FORCED_RIGHT; -- cgit v1.2.3