diff --git a/generated/meson.build b/generated/meson.build
index 0f40cec4c2..3438238a77 100644
--- a/generated/meson.build
+++ b/generated/meson.build
@@ -114,6 +114,7 @@ foreach gen_key : metang_generators.keys()
)
endforeach
+npc_trades_txt = files('npc_trades.txt')
species_txt = files('species.txt')
text_banks_txt = files('text_banks.txt')
trainers_txt = files('trainers.txt')
diff --git a/include/overlay006/npc_trade.h b/include/overlay006/npc_trade.h
index 1c217976f8..4bb5a92629 100644
--- a/include/overlay006/npc_trade.h
+++ b/include/overlay006/npc_trade.h
@@ -41,7 +41,7 @@ NpcTradeData *NpcTrade_Init(u32 heapID, u32 entryID);
void NpcTrade_Free(NpcTradeData *data);
u32 NpcTrade_GetSpecies(const NpcTradeData *data);
u32 NpcTrade_GetRequestedSpecies(const NpcTradeData *data);
-void ov6_02246234(FieldSystem *fieldSystem, NpcTradeData *data, int slot);
+void NpcTrade_ReceiveMon(FieldSystem *fieldSystem, NpcTradeData *data, int slot);
void ov6_02246254(FieldSystem *fieldSystem, NpcTradeData *data, int slot, UnkStruct_ov6_02246254 *param3, Pokemon *givingMon, Pokemon *receivingMon);
#endif // POKEPLATINUM_NPC_TRADE_H
diff --git a/res/field/trades/meson.build b/res/field/trades/meson.build
index 27828ce51b..0b0ea5aad9 100644
--- a/res/field/trades/meson.build
+++ b/res/field/trades/meson.build
@@ -4,24 +4,22 @@ npc_trades_bin_gen = generator(
output: '@BASENAME@'
)
-npc_trades_files = files(
- 'npc_trade_kazza_abra.json',
- 'npc_trade_charap_chatot.json',
- 'npc_trade_gaspar_haunter.json',
- 'npc_trade_foopa_magikarp.json',
-)
+npc_trades_consts = fs.read(npc_trades_txt).splitlines()
+npc_trades_files = []
+foreach npc_trade: npc_trades_consts
+ if npc_trade.startswith('MAX_')
+ continue
+ endif
+ npc_trades_files += files(npc_trade.to_lower() + '.json')
+endforeach
npc_trades_order = files('npc_trades.order')
npc_trades_narc = custom_target('fld_trade.narc',
- output: [
- 'fld_trade.narc',
- 'fld_trade.naix',
- ],
+ output: 'fld_trade.narc',
input: npc_trades_bin_gen.process(npc_trades_files, env: json2bin_env),
depends: [ py_consts_generators ],
command: [
narc_exe, 'create',
- '--naix',
'--order', npc_trades_order,
'--output', '@OUTPUT0@',
'@PRIVATE_DIR@',
@@ -29,4 +27,3 @@ npc_trades_narc = custom_target('fld_trade.narc',
)
nitrofs_files += npc_trades_narc
-naix_headers += npc_trades_narc[1]
diff --git a/res/text/npc_trade_names.gmm b/res/text/npc_trade_names.gmm
index 1286910ca7..433eaf0320 100644
--- a/res/text/npc_trade_names.gmm
+++ b/res/text/npc_trade_names.gmm
@@ -1,35 +1,35 @@
-
+
used
Kazza
-
+
used
Charap
-
+
used
Gaspar
-
+
used
Foppa
-
+
used
Hilary
-
+
used
Norton
-
+
used
Mindy
-
+
used
Meister
diff --git a/src/overlay006/npc_trade.c b/src/overlay006/npc_trade.c
index 78cce9b212..92a8f44861 100644
--- a/src/overlay006/npc_trade.c
+++ b/src/overlay006/npc_trade.c
@@ -69,7 +69,7 @@ u32 NpcTrade_GetRequestedSpecies(const NpcTradeData *data)
return data->npcTradeMon->requestedSpecies;
}
-void ov6_02246234(FieldSystem *fieldSystem, NpcTradeData *data, int slot)
+void NpcTrade_ReceiveMon(FieldSystem *fieldSystem, NpcTradeData *data, int slot)
{
sub_0207A128(Party_GetFromSavedata(fieldSystem->saveData), slot, data->mon);
sub_0202F180(fieldSystem->saveData, data->mon);
diff --git a/src/unk_0206C660.c b/src/unk_0206C660.c
index 1997b57d9e..b3727b7c7b 100644
--- a/src/unk_0206C660.c
+++ b/src/unk_0206C660.c
@@ -54,7 +54,7 @@ static BOOL sub_0206C680(FieldTask *param0)
switch (v1->unk_04) {
case 0:
ov6_02246254(fieldSystem, v1->unk_00, v1->unk_08, &v1->unk_0C, v1->unk_24, v1->unk_28);
- ov6_02246234(fieldSystem, v1->unk_00, v1->unk_08);
+ NpcTrade_ReceiveMon(fieldSystem, v1->unk_00, v1->unk_08);
v1->unk_04++;
break;
case 1: