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

Merge pull request #414 from SatoMew/record-corner

Browse Source 
Fix Record Corner labels
This commit is contained in:
GriffinR
2021-04-10 13:59:31 -04:00
committed by GitHub
parent 37634072b1 9b6469a7a3
commit b54bd2e387
13 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+1 -1
View File
@@ -87,7 +87,7 @@ gStdScriptsEnd::
.include "data/maps/BattleColosseum_2P/scripts.inc" .include "data/maps/BattleColosseum_2P/scripts.inc"
.include "data/maps/TradeCenter/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/BattleColosseum_4P/scripts.inc"
.include "data/maps/UnionRoom/scripts.inc" .include "data/maps/UnionRoom/scripts.inc"
.include "data/maps/ViridianForest/scripts.inc" .include "data/maps/ViridianForest/scripts.inc"
data/layouts/RecordCenter/border.bin → data/layouts/RecordCorner/border.bin
View File
data/layouts/RecordCenter/map.bin → data/layouts/RecordCorner/map.bin
View File
data/layouts/layouts.json
+4 -4
View File
@@ -457,16 +457,16 @@
"blockdata_filepath": "data/layouts/TradeCenter/map.bin" "blockdata_filepath": "data/layouts/TradeCenter/map.bin"
}, },
{ {
"id": "LAYOUT_RECORD_CENTER", "id": "LAYOUT_RECORD_CORNER",
"name": "RecordCenter_Layout", "name": "RecordCorner_Layout",
"width": 20, "width": 20,
"height": 10, "height": 10,
"border_width": 2, "border_width": 2,
"border_height": 2, "border_height": 2,
"primary_tileset": "gTileset_Building", "primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_CableClub", "secondary_tileset": "gTileset_CableClub",
"border_filepath": "data/layouts/RecordCenter/border.bin", "border_filepath": "data/layouts/RecordCorner/border.bin",
"blockdata_filepath": "data/layouts/RecordCenter/map.bin" "blockdata_filepath": "data/layouts/RecordCorner/map.bin"
}, },
{ {
"id": "LAYOUT_BATTLE_COLOSSEUM_4P", "id": "LAYOUT_BATTLE_COLOSSEUM_4P",
data/maps/RecordCenter/scripts.inc
-2
View File
@@ -1,2 +0,0 @@
RecordCenter_MapScripts:: @ 816047A
.byte 0
data/maps/RecordCenter/map.json → data/maps/RecordCorner/map.json
+8 -8
View File
@@ -1,7 +1,7 @@
{ {
"id": "MAP_RECORD_CENTER", "id": "MAP_RECORD_CORNER",
"name": "RecordCenter", "name": "RecordCorner",
"layout": "LAYOUT_RECORD_CENTER", "layout": "LAYOUT_RECORD_CORNER",
"music": "MUS_POKE_CENTER", "music": "MUS_POKE_CENTER",
"region_map_section": "MAPSEC_SPECIAL_AREA", "region_map_section": "MAPSEC_SPECIAL_AREA",
"requires_flash": false, "requires_flash": false,
@@ -25,7 +25,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RecordCenter_EventScript_Attendant", "script": "RecordCorner_EventScript_Attendant",
"flag": "0" "flag": "0"
} }
], ],
@@ -67,7 +67,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "RecordCenter_EventScript_Spot0" "script": "RecordCorner_EventScript_Spot0"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -76,7 +76,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "RecordCenter_EventScript_Spot1" "script": "RecordCorner_EventScript_Spot1"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -85,7 +85,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "RecordCenter_EventScript_Spot2" "script": "RecordCorner_EventScript_Spot2"
}, },
{ {
"type": "trigger", "type": "trigger",
@@ -94,7 +94,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_TEMP_0", "var": "VAR_TEMP_0",
"var_value": "0", "var_value": "0",
"script": "RecordCenter_EventScript_Spot3" "script": "RecordCorner_EventScript_Spot3"
} }
], ],
"bg_events": [] "bg_events": []
data/maps/RecordCorner/scripts.inc
+2
View File
@@ -0,0 +1,2 @@
RecordCorner_MapScripts:: @ 816047A
.byte 0
data/maps/map_groups.json
+1 -1
View File
@@ -47,7 +47,7 @@
"gMapGroup0": [ "gMapGroup0": [
"BattleColosseum_2P", "BattleColosseum_2P",
"TradeCenter", "TradeCenter",
"RecordCenter", "RecordCorner",
"BattleColosseum_4P", "BattleColosseum_4P",
"UnionRoom" "UnionRoom"
], ],
data/scripts/cable_club.inc
+5 -5
View File
@@ -703,10 +703,10 @@ TradeCenter_EventScript_Chair3:: @ 81BB974
@ Nop in FRLG @ Nop in FRLG
@ Separate labels to match GetDirectionForEventScript @ Separate labels to match GetDirectionForEventScript
RecordCenter_EventScript_Spot0:: @ 81BB980 RecordCorner_EventScript_Spot0:: @ 81BB980
RecordCenter_EventScript_Spot1:: @ 81BB980 RecordCorner_EventScript_Spot1:: @ 81BB980
RecordCenter_EventScript_Spot2:: @ 81BB980 RecordCorner_EventScript_Spot2:: @ 81BB980
RecordCenter_EventScript_Spot3:: @ 81BB980 RecordCorner_EventScript_Spot3:: @ 81BB980
end end
CableClub_EventScript_ReadTrainerCard:: @ 81BB981 CableClub_EventScript_ReadTrainerCard:: @ 81BB981
@@ -748,7 +748,7 @@ TradeCenter_EventScript_Attendant:: @ 81BB9C1
end end
@ Nop in FRLG @ Nop in FRLG
RecordCenter_EventScript_Attendant:: @ 81BB9D3 RecordCorner_EventScript_Attendant:: @ 81BB9D3
end end
TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4 TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4
include/constants/layouts.h
+1 -1
View File
@@ -42,7 +42,7 @@
#define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46 #define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46
#define LAYOUT_BATTLE_COLOSSEUM_2P 47 #define LAYOUT_BATTLE_COLOSSEUM_2P 47
#define LAYOUT_TRADE_CENTER 48 #define LAYOUT_TRADE_CENTER 48
#define LAYOUT_RECORD_CENTER 49 #define LAYOUT_RECORD_CORNER 49
#define LAYOUT_BATTLE_COLOSSEUM_4P 50 #define LAYOUT_BATTLE_COLOSSEUM_4P 50
#define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51
#define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52 #define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52
include/constants/map_groups.h
+1 -1
View File
@@ -8,7 +8,7 @@
// Map Group 0 // Map Group 0
#define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8)) #define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8))
#define MAP_TRADE_CENTER (1 | (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_BATTLE_COLOSSEUM_4P (3 | (0 << 8))
#define MAP_UNION_ROOM (4 | (0 << 8)) #define MAP_UNION_ROOM (4 | (0 << 8))
include/event_scripts.h
+4 -4
View File
@@ -1270,10 +1270,10 @@ extern const u8 BattleColosseum_4P_EventScript_PlayerSpot0[];
extern const u8 BattleColosseum_4P_EventScript_PlayerSpot1[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot1[];
extern const u8 BattleColosseum_4P_EventScript_PlayerSpot2[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot2[];
extern const u8 BattleColosseum_4P_EventScript_PlayerSpot3[]; extern const u8 BattleColosseum_4P_EventScript_PlayerSpot3[];
extern const u8 RecordCenter_EventScript_Spot0[]; extern const u8 RecordCorner_EventScript_Spot0[];
extern const u8 RecordCenter_EventScript_Spot1[]; extern const u8 RecordCorner_EventScript_Spot1[];
extern const u8 RecordCenter_EventScript_Spot2[]; extern const u8 RecordCorner_EventScript_Spot2[];
extern const u8 RecordCenter_EventScript_Spot3[]; extern const u8 RecordCorner_EventScript_Spot3[];
extern const u8 BattleColosseum_2P_EventScript_PlayerSpot0[]; extern const u8 BattleColosseum_2P_EventScript_PlayerSpot0[];
extern const u8 BattleColosseum_2P_EventScript_PlayerSpot1[]; extern const u8 BattleColosseum_2P_EventScript_PlayerSpot1[];
extern const u8 TradeCenter_EventScript_Chair0[]; extern const u8 TradeCenter_EventScript_Chair0[];
src/overworld.c
+4 -4
View File
@@ -3117,13 +3117,13 @@ static u16 GetDirectionForEventScript(const u8 *script)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == BattleColosseum_4P_EventScript_PlayerSpot3) else if (script == BattleColosseum_4P_EventScript_PlayerSpot3)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == RecordCenter_EventScript_Spot0) else if (script == RecordCorner_EventScript_Spot0)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == RecordCenter_EventScript_Spot1) else if (script == RecordCorner_EventScript_Spot1)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == RecordCenter_EventScript_Spot2) else if (script == RecordCorner_EventScript_Spot2)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;
else if (script == RecordCenter_EventScript_Spot3) else if (script == RecordCorner_EventScript_Spot3)
return FACING_FORCED_LEFT; return FACING_FORCED_LEFT;
else if (script == BattleColosseum_2P_EventScript_PlayerSpot0) else if (script == BattleColosseum_2P_EventScript_PlayerSpot0)
return FACING_FORCED_RIGHT; return FACING_FORCED_RIGHT;