diff --git a/internal/erf/erf.go b/internal/erf/erf.go index 671a5b4..1f95df5 100644 --- a/internal/erf/erf.go +++ b/internal/erf/erf.go @@ -75,9 +75,9 @@ var extensionTypes = map[string]uint16{ "set": 0x07DD, "ifo": 0x07DE, "bic": 0x07DF, - "wok": 0x07E1, - "2da": 0x07E2, - "tlk": 0x07E3, + "wok": 0x07E0, + "2da": 0x07E1, + "tlk": 0x07E2, "txi": 0x07E6, "git": 0x07E7, "uti": 0x07E9, @@ -130,9 +130,9 @@ var typeExtensions = map[uint16]string{ 0x07DD: "set", 0x07DE: "ifo", 0x07DF: "bic", - 0x07E1: "wok", - 0x07E2: "2da", - 0x07E3: "tlk", + 0x07E0: "wok", + 0x07E1: "2da", + 0x07E2: "tlk", 0x07E6: "txi", 0x07E7: "git", 0x07E9: "uti", diff --git a/internal/erf/erf_test.go b/internal/erf/erf_test.go index ebdec57..e9a2833 100644 --- a/internal/erf/erf_test.go +++ b/internal/erf/erf_test.go @@ -34,8 +34,8 @@ func TestExtensionMappingsKeep2DAAndTLKDistinct(t *testing.T) { if !ok { t.Fatal("expected 2da resource type") } - if resourceType != 0x07E2 { - t.Fatalf("expected 2da type 0x07E2, got 0x%04X", resourceType) + if resourceType != 0x07E1 { + t.Fatalf("expected 2da type 0x07E1, got 0x%04X", resourceType) } extension, ok := ExtensionForResourceType(resourceType) if !ok { @@ -49,8 +49,8 @@ func TestExtensionMappingsKeep2DAAndTLKDistinct(t *testing.T) { if !ok { t.Fatal("expected tlk resource type") } - if tlkType != 0x07E3 { - t.Fatalf("expected tlk type 0x07E3, got 0x%04X", tlkType) + if tlkType != 0x07E2 { + t.Fatalf("expected tlk type 0x07E2, got 0x%04X", tlkType) } if tlkType == resourceType { t.Fatal("expected 2da and tlk resource types to stay distinct") diff --git a/internal/topdata/topdata_test.go b/internal/topdata/topdata_test.go index a846abf..01230da 100644 --- a/internal/topdata/topdata_test.go +++ b/internal/topdata/topdata_test.go @@ -8308,8 +8308,8 @@ func TestBuildAndPackageIncludesCompiled2DAAndTopAssets(t *testing.T) { ext, _ := erf.ExtensionForResourceType(resource.Type) key := strings.ToLower(resource.Name) + "." + ext if key == "repadjust.2da" { - if resource.Type != 0x07E2 { - t.Fatalf("expected repadjust.2da to keep resource type 0x07E2, got 0x%04X", resource.Type) + if resource.Type != 0x07E1 { + t.Fatalf("expected repadjust.2da to keep resource type 0x07E1, got 0x%04X", resource.Type) } found2DA = true }