Merge pull request #133 from James-Makoto/pr

amiidb update
solosky · Nov 9, 2023 · 34aabed · 34aabed
2 parents 9de9ea9 + c6b6255
commit 34aabed
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/fw/application/src/amiidb/db_amiibo.c b/fw/application/src/amiidb/db_amiibo.c
@@ -97,7 +97,7 @@ const db_amiibo_t amiibo_list[] = {
 {0x00030000, 0x00020002, "Yoshi", "耀西"}, 
 {0x06400100, 0x001e0002, "Olimar", "欧力玛"}, 
 {0x06420000, 0x035f1102, "Pikmin", "皮克敏"}, 
-{0x01880000, 0x02410502, "Mabel", "Mabel"}, 
+{0x01880000, 0x02410502, "Mabel", "绢儿"}, 
 {0x01940001, 0x00aa0502, "[AC] 103 - Kicks", "[AC] 103 - Kicks"}, 
 {0x019c0001, 0x01730502, "[AC] 304 - Phineas", "[AC] 304 - Phineas"}, 
 {0x01800000, 0x00080002, "Villager", "村民"}, 

diff --git a/fw/application/src/amiidb/db_game.c b/fw/application/src/amiidb/db_game.c
@@ -25,7 +25,7 @@ const db_game_t game_list[] = {
 {23, 0, "Kirby's Return to Dream Land DELUXE", "星之卡比：重返梦幻岛豪华版", 1, 5}, 
 {24, 0, "Kirby: Star Allies", "星之卡比：新星同盟", 1, 5}, 
 {25, 0, "Little Nightmares Complete Edition", "小小梦魇完全版", 1, 1}, 
-{26, 0, "Mario Kart 8 Deluxe", "马里奥赛车8豪华版", 60, 29}, 
+{26, 0, "Mario Kart 8 Deluxe", "马里奥赛车8豪华版", 60, 31}, 
 {27, 0, "Mario + Rabbids Kingdom Battle", "马里奥+疯兔:王国之战", 1, 4}, 
 {28, 0, "Megabyte Punch", "兆字节重击", 1, 1}, 
 {29, 0, "Mega Man 11", "洛克人11", 1, 1}, 

diff --git a/fw/application/src/amiidb/db_link.c b/fw/application/src/amiidb/db_link.c
@@ -4,8 +4,8 @@ const db_link_t link_list[] = {
 {1, 0x01410000, 0x035c0902, "Dragon Bone Boko-related equipment/Meat/Paraglider Skin Material", "龙骨波克相关装备/肉/滑翔伞皮肤布料"}, 
 {1, 0x01050000, 0x03580902, "Rudania's Divine Helm Set/Paraglider Skin Material/Boulder Breaker/Diamond", "鲁达尼亚*神兽兵装/滑翔伞皮肤布料/劈石剑/钻石"}, 
 {1, 0x01020100, 0x001b0002, "Twilight Sword/Rupee/Gem/Star Fragment Bomb", "黄昏剑/卢比/宝石/星星碎片炸药桶"}, 
-{1, 0x01020100, 0x041a0902, "Gerudo-King Fabric", "格鲁德王滑翔伞布料"}, 
-{1, 0x01400000, 0x03550902, "Guardian Weapons/Shields/Spears/Core/Treasure/Arrow", "守护者枪 盾 剑/古代兵装 核心/宝石 箭"}, 
+{1, 0x01020100, 0x041a0902, "Gerudo-King Fabric", "沼气之枪/滑翔伞皮肤布料"}, 
+{1, 0x01400000, 0x03550902, "Dragonbone Boko related gear/Meat/Paraglider Skin Material", "龙骨波克相关装备/肉/滑翔伞皮肤布料"}, 
 {1, 0x01000000, 0x00040002, "Twilight Dress Set/Traveler's Sword & Shield/Paraglider Skin Material/Fruit/Horse", "黄昏服套装/旅人剑&盾/滑翔伞皮肤布料/水果/马"}, 
 {1, 0x01000000, 0x03530902, "Falcon Bow/Paraglider Skin Material/Fish & Meat/Knight's & Royal Bow/Various Arrows", "游隼弓/滑翔伞皮肤布料/鱼&肉/骑士&王族之弓/各种箭"}, 
 {1, 0x01000000, 0x03990902, "Dream Weaver Dress Set/Paraglider Skin Material/Knight's & Royal Spear/Sword & Two-handed Sword/Fish", "织梦勇者服套装/滑翔伞皮肤布料/骑士&王族枪 剑 双手剑/鱼"}, 
@@ -39,7 +39,7 @@ const db_link_t link_list[] = {
 {4, 0x01410000, 0x035c0902, "Champion's Tunic Fabric/Paraglider Skin Material/Mushroom", "新式英杰服布料/滑翔伞皮肤布料/蘑菇"}, 
 {4, 0x01050000, 0x03580902, "Rudania's Divine Helm/Boulder Breaker/Diamond", "鲁达尼亚*神兽兵装/劈石剑/钻石"}, 
 {4, 0x01020100, 0x001b0002, "Twilight Sword/Rupee/Gem/Star Fragment Bomb Barrel", "黄昏剑/卢比/宝石/星星碎片炸药桶"}, 
-{4, 0x01400000, 0x03550902, "Dragonbone Boko related gear/Meat/Paraglider Skin Material", "龙骨波克相关装备/肉/滑翔伞皮肤布料"}, 
+{4, 0x01400000, 0x03550902, "Guardian Weapons/Shields/Spears/Core/Treasure/Arrow", "守护者枪 盾 剑/古代兵装 核心/宝石 箭"}, 
 {4, 0x01000000, 0x00040002, "Twilight Set/Traveler's Sword & Shield/Fruit/Horse", "黄昏服套装/旅人剑&盾/水果/马"}, 
 {4, 0x01000000, 0x03530902, "Falcon Bow/Fish & Meat/Knight's and Royal Bow/Various Arrows", "游隼弓/鱼&肉/骑士&王族之弓/各种箭"}, 
 {4, 0x01000000, 0x03990902, "Dreamweaver Set/Knight's and Royal Spear/Sword/and Claymore/Fish", "织梦勇者服套装/骑士&王族枪 剑 双手剑/鱼"}, 
@@ -253,6 +253,8 @@ const db_link_t link_list[] = {
 {26, 0x06400100, 0x001e0002, "", "暂无简介"}, 
 {26, 0x33400000, 0x00320002, "", "暂无简介"}, 
 {26, 0x00020000, 0x03720102, "", "暂无简介"}, 
+{26, 0x00020000, 0x00010002, "", "暂无简介"}, 
+{26, 0x00130000, 0x037a0002, "", "暂无简介"}, 
 {26, 0x06420000, 0x035f1102, "", "暂无简介"}, 
 {26, 0x00040000, 0x02620102, "", "暂无简介"}, 
 {26, 0x05c00000, 0x00060002, "", "暂无简介"}, 

diff --git a/fw/data/amiidb_amiibo.csv b/fw/data/amiidb_amiibo.csv
@@ -95,7 +95,7 @@
 0003000000020002,Yoshi,耀西
 06400100001e0002,Olimar,欧力玛
 06420000035f1102,Pikmin,皮克敏
-0188000002410502,Mabel,Mabel
+0188000002410502,Mabel,绢儿
 0194000100aa0502,[AC] 103 - Kicks,[AC] 103 - Kicks
 019c000101730502,[AC] 304 - Phineas,[AC] 304 - Phineas
 0180000000080002,Villager,村民

diff --git a/fw/data/amiidb_link.csv b/fw/data/amiidb_link.csv
@@ -2,8 +2,8 @@
 1,01410000035c0902,Dragon Bone Boko-related equipment/Meat/Paraglider Skin Material,龙骨波克相关装备/肉/滑翔伞皮肤布料
 1,0105000003580902,Rudania's Divine Helm Set/Paraglider Skin Material/Boulder Breaker/Diamond,鲁达尼亚*神兽兵装/滑翔伞皮肤布料/劈石剑/钻石
 1,01020100001b0002,Twilight Sword/Rupee/Gem/Star Fragment Bomb,黄昏剑/卢比/宝石/星星碎片炸药桶
-1,01020100041a0902,Gerudo-King Fabric,格鲁德王滑翔伞布料
-1,0140000003550902,Guardian Weapons/Shields/Spears/Core/Treasure/Arrow,守护者枪 盾 剑/古代兵装 核心/宝石 箭
+1,01020100041a0902,Gerudo-King Fabric,沼气之枪/滑翔伞皮肤布料
+1,0140000003550902,Dragonbone Boko related gear/Meat/Paraglider Skin Material,龙骨波克相关装备/肉/滑翔伞皮肤布料
 1,0100000000040002,Twilight Dress Set/Traveler's Sword & Shield/Paraglider Skin Material/Fruit/Horse,黄昏服套装/旅人剑&盾/滑翔伞皮肤布料/水果/马
 1,0100000003530902,Falcon Bow/Paraglider Skin Material/Fish & Meat/Knight's & Royal Bow/Various Arrows,游隼弓/滑翔伞皮肤布料/鱼&肉/骑士&王族之弓/各种箭
 1,0100000003990902,Dream Weaver Dress Set/Paraglider Skin Material/Knight's & Royal Spear/Sword & Two-handed Sword/Fish,织梦勇者服套装/滑翔伞皮肤布料/骑士&王族枪 剑 双手剑/鱼
@@ -37,7 +37,7 @@
 4,01410000035c0902,Champion's Tunic Fabric/Paraglider Skin Material/Mushroom,新式英杰服布料/滑翔伞皮肤布料/蘑菇
 4,0105000003580902,Rudania's Divine Helm/Boulder Breaker/Diamond,鲁达尼亚*神兽兵装/劈石剑/钻石
 4,01020100001b0002,Twilight Sword/Rupee/Gem/Star Fragment Bomb Barrel,黄昏剑/卢比/宝石/星星碎片炸药桶
-4,0140000003550902,Dragonbone Boko related gear/Meat/Paraglider Skin Material,龙骨波克相关装备/肉/滑翔伞皮肤布料
+4,0140000003550902,Guardian Weapons/Shields/Spears/Core/Treasure/Arrow,守护者枪 盾 剑/古代兵装 核心/宝石 箭
 4,0100000000040002,Twilight Set/Traveler's Sword & Shield/Fruit/Horse,黄昏服套装/旅人剑&盾/水果/马
 4,0100000003530902,Falcon Bow/Fish & Meat/Knight's and Royal Bow/Various Arrows,游隼弓/鱼&肉/骑士&王族之弓/各种箭
 4,0100000003990902,Dreamweaver Set/Knight's and Royal Spear/Sword/and Claymore/Fish,织梦勇者服套装/骑士&王族枪 剑 双手剑/鱼
@@ -251,6 +251,8 @@
 26,06400100001e0002,,暂无简介
 26,3340000000320002,,暂无简介
 26,0002000003720102,,暂无简介
+26,0002000000010002,,暂无简介
+26,00130000037a0002,,暂无简介
 26,06420000035f1102,,暂无简介
 26,0004000002620102,,暂无简介
 26,05c0000000060002,,暂无简介