From a70624adfb0b960bd02e88c379179fb09e776339 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 13 Jul 2018 17:18:19 -0400 Subject: [PATCH] Correct wTradeFlags length --- constants/npc_trade_constants.asm | 1 + wram.asm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/constants/npc_trade_constants.asm b/constants/npc_trade_constants.asm index 653ce3555..f84db5df4 100644 --- a/constants/npc_trade_constants.asm +++ b/constants/npc_trade_constants.asm @@ -19,6 +19,7 @@ NPCTRADE_PADDING EQU 31 ; db const NPC_TRADE_CHRIS ; 4 const NPC_TRADE_KIM ; 5 const NPC_TRADE_FOREST ; 6 +NUM_NPC_TRADES EQU const_value ; trade gender limits const_def diff --git a/wram.asm b/wram.asm index 186c528a0..e85c69da8 100644 --- a/wram.asm +++ b/wram.asm @@ -2507,7 +2507,7 @@ wRegisteredItem:: db ; d95c wPlayerState:: db ; d95d wHallOfFameCount:: dw -wTradeFlags:: flag_array PARTY_LENGTH ; d960 +wTradeFlags:: flag_array NUM_NPC_TRADES ; d960 ds 1 wMooMooBerries:: db ; d962 wUndergroundSwitchPositions:: db ; d963