Skip to content

Commit 1524b98

Browse files
PsiLupanPsiLupan
authored
Match grtclink (#1283)
* Match grtclink * Fix missing includes
1 parent bc9d014 commit 1524b98

File tree

10 files changed

+251
-324
lines changed

10 files changed

+251
-324
lines changed

‎asm/melee/gr/ground.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -7061,7 +7061,7 @@
70617061
.4byte grPushOn_803E7B10
70627062
.4byte grTMr_803E85A4
70637063
.4byte grTCa_803E8664
7064-
.4byte grTCl_803E872C
7064+
.4byte grTCLink_803E872C
70657065
.4byte grTDk_803E87EC
70667066
.4byte grTDr_803E88AC
70677067
.4byte grTFc_803E8974

‎asm/melee/gr/grtclink.s

-282
This file was deleted.

‎config/GALE01/symbols.txt

+22-22
Original file line numberDiff line numberDiff line change
@@ -12132,26 +12132,26 @@ grTCaptain_8021FF10 = .text:0x8021FF10; // type:function size:0x20 scope:local
1213212132
grTCaptain_8021FF30 = .text:0x8021FF30; // type:function size:0x4 scope:local
1213312133
grTCaptain_8021FF34 = .text:0x8021FF34; // type:function size:0x8 scope:local
1213412134
grTCaptain_8021FF3C = .text:0x8021FF3C; // type:function size:0x8 scope:local
12135-
grTCaptain_8021FF44 = .text:0x8021FF44; // type:function size:0x4 scope:global
12136-
grTCaptain_8021FF48 = .text:0x8021FF48; // type:function size:0x70 scope:global
12137-
grTCaptain_8021FFB8 = .text:0x8021FFB8; // type:function size:0x4 scope:global
12138-
grTCaptain_8021FFBC = .text:0x8021FFBC; // type:function size:0x24 scope:global
12139-
grTCaptain_8021FFE0 = .text:0x8021FFE0; // type:function size:0x8 scope:global
12140-
grTCaptain_8021FFE8 = .text:0x8021FFE8; // type:function size:0xE8 scope:global
12141-
grTCaptain_802200D0 = .text:0x802200D0; // type:function size:0x2C scope:global
12142-
grTCaptain_802200FC = .text:0x802200FC; // type:function size:0x8 scope:global
12143-
grTCaptain_80220104 = .text:0x80220104; // type:function size:0x4 scope:global
12144-
grTCaptain_80220108 = .text:0x80220108; // type:function size:0x4 scope:global
12145-
grTCaptain_8022010C = .text:0x8022010C; // type:function size:0x50 scope:global
12146-
grTCaptain_8022015C = .text:0x8022015C; // type:function size:0x8 scope:global
12147-
grTCaptain_80220164 = .text:0x80220164; // type:function size:0x34 scope:global
12148-
grTCaptain_80220198 = .text:0x80220198; // type:function size:0x4 scope:global
12149-
grTCaptain_8022019C = .text:0x8022019C; // type:function size:0x50 scope:global
12150-
grTCaptain_802201EC = .text:0x802201EC; // type:function size:0x8 scope:global
12151-
grTCaptain_802201F4 = .text:0x802201F4; // type:function size:0x20 scope:global
12152-
grTCaptain_80220214 = .text:0x80220214; // type:function size:0x4 scope:global
12153-
grTCaptain_80220218 = .text:0x80220218; // type:function size:0x8 scope:global
12154-
grTCaptain_80220220 = .text:0x80220220; // type:function size:0x8 scope:global
12135+
grTCLink_8021FF44 = .text:0x8021FF44; // type:function size:0x4 scope:global
12136+
grTCLink_8021FF48 = .text:0x8021FF48; // type:function size:0x70 scope:global
12137+
grTCLink_8021FFB8 = .text:0x8021FFB8; // type:function size:0x4 scope:global
12138+
grTCLink_8021FFBC = .text:0x8021FFBC; // type:function size:0x24 scope:global
12139+
grTCLink_8021FFE0 = .text:0x8021FFE0; // type:function size:0x8 scope:global
12140+
grTCLink_8021FFE8 = .text:0x8021FFE8; // type:function size:0xE8 scope:global
12141+
grTCLink_802200D0 = .text:0x802200D0; // type:function size:0x2C scope:global
12142+
grTCLink_802200FC = .text:0x802200FC; // type:function size:0x8 scope:global
12143+
grTCLink_80220104 = .text:0x80220104; // type:function size:0x4 scope:global
12144+
grTCLink_80220108 = .text:0x80220108; // type:function size:0x4 scope:global
12145+
grTCLink_8022010C = .text:0x8022010C; // type:function size:0x50 scope:global
12146+
grTCLink_8022015C = .text:0x8022015C; // type:function size:0x8 scope:global
12147+
grTCLink_80220164 = .text:0x80220164; // type:function size:0x34 scope:global
12148+
grTCLink_80220198 = .text:0x80220198; // type:function size:0x4 scope:global
12149+
grTCLink_8022019C = .text:0x8022019C; // type:function size:0x50 scope:global
12150+
grTCLink_802201EC = .text:0x802201EC; // type:function size:0x8 scope:global
12151+
grTCLink_802201F4 = .text:0x802201F4; // type:function size:0x20 scope:global
12152+
grTCLink_80220214 = .text:0x80220214; // type:function size:0x4 scope:global
12153+
grTCLink_80220218 = .text:0x80220218; // type:function size:0x8 scope:global
12154+
grTCLink_80220220 = .text:0x80220220; // type:function size:0x8 scope:global
1215512155
grTDonkey_80220228 = .text:0x80220228; // type:function size:0x4 scope:local
1215612156
grTDonkey_8022022C = .text:0x8022022C; // type:function size:0x70 scope:local
1215712157
grTDonkey_8022029C = .text:0x8022029C; // type:function size:0x4 scope:local
@@ -22809,9 +22809,9 @@ grTCa_803E8608 = .data:0x803E8608; // type:object size:0x50 scope:local
2280922809
grTCa_803E8664 = .data:0x803E8664; // type:object size:0x34 scope:global
2281022810
@189 = .data:0x803E8698; // type:object size:0x21 scope:local data:string
2281122811
@190 = .data:0x803E86BC; // type:object size:0xD scope:local data:string
22812-
grTCl_803E86D0 = .data:0x803E86D0; // type:object size:0x50 scope:global
22812+
grTCLink_803E86D0 = .data:0x803E86D0; // type:object size:0x50 scope:global
2281322813
grTCl_803E8720 = .data:0x803E8720; // type:object size:0xC scope:global
22814-
grTCl_803E872C = .data:0x803E872C; // type:object size:0x64 scope:global
22814+
grTCLink_803E872C = .data:0x803E872C; // type:object size:0x64 scope:global
2281522815
grTDk_803E8790 = .data:0x803E8790; // type:object size:0x50 scope:local
2281622816
@169 = .data:0x803E87E0; // type:object size:0xB scope:local data:string
2281722817
grTDk_803E87EC = .data:0x803E87EC; // type:object size:0x34 scope:global

‎configure.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
796796
# Break the Targets stages
797797
Object(Matching, "melee/gr/grtmario.c"),
798798
Object(Matching, "melee/gr/grtcaptain.c"),
799-
Object(NonMatching, "melee/gr/grtclink.c"),
799+
Object(Matching, "melee/gr/grtclink.c"),
800800
Object(Matching, "melee/gr/grtdonkey.c"),
801801
Object(Matching, "melee/gr/grtdrmario.c"),
802802
Object(Matching, "melee/gr/grtfalco.c"),

‎obj_files.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ TEXT_O_FILES +=\
497497
$(BUILD_DIR)/asm/melee/gr/grheal.s.o\
498498
$(BUILD_DIR)/src/melee/gr/grtmario.c.o\
499499
$(BUILD_DIR)/src/melee/gr/grtcaptain.c.o\
500-
$(BUILD_DIR)/asm/melee/gr/grtclink.s.o\
500+
$(BUILD_DIR)/src/melee/gr/grtclink.c.o\
501501
$(BUILD_DIR)/src/melee/gr/grtdonkey.c.o\
502502
$(BUILD_DIR)/src/melee/gr/grtdrmario.c.o\
503503
$(BUILD_DIR)/src/melee/gr/grtfalco.c.o\

‎src/melee/gr/ground.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ extern StageData Ground_803DFEA8, grTe_803E5764, grCs_803E11A4, grRc_803E4ECC,
9393
grNKr_803E584C, grSh_Route_803E5988, grZe_Route_803E5E0C,
9494
grBb_Route_803E617C, grTe_803E5764, grNBa_803E7E38, grNLa_803E7F90,
9595
grFigureGet_803E7D34, grPushOn_803E7B10, grTMr_803E85A4, grTCa_803E8664,
96-
grTCl_803E872C, grTDk_803E87EC, grTDr_803E88AC, grTFc_803E8974,
96+
grTCLink_803E872C, grTDk_803E87EC, grTDr_803E88AC, grTFc_803E8974,
9797
grTFx_803E8A34, grTIc_803E8AF4, grTKb_803E8C0C, grTKp_803E8CCC,
9898
grTLk_803E8D8C, grTLg_803E8E4C, grTMs_803E8F0C, grTMewtwo_803E8FCC,
9999
grTNs_803E908C, grTPe_803E914C, grTPc_803E920C, grTPk_803E92CC,
@@ -117,7 +117,7 @@ static StageData* Ground_803DFEDC[] = {
117117
&grZe_Route_803E5E0C, &grBb_Route_803E617C, &grTe_803E5764,
118118
&grNBa_803E7E38, &grNLa_803E7F90, &grFigureGet_803E7D34,
119119
&grPushOn_803E7B10, &grTMr_803E85A4, &grTCa_803E8664,
120-
&grTCl_803E872C, &grTDk_803E87EC, &grTDr_803E88AC,
120+
&grTCLink_803E872C, &grTDk_803E87EC, &grTDr_803E88AC,
121121
&grTFc_803E8974, &grTFx_803E8A34, &grTIc_803E8AF4,
122122
&grTKb_803E8C0C, &grTKp_803E8CCC, &grTLk_803E8D8C,
123123
&grTLg_803E8E4C, &grTMs_803E8F0C, &grTMewtwo_803E8FCC,

0 commit comments

Comments
 (0)