falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Goron Merchant adjustments

This commit is contained in:
Catobat 2023-01-08 18:07:37 +01:00
parent c88f5cf280
commit c9e3f39e56
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/manager/goronMerchantShopManager.c
View File

@ -8,16 +8,17 @@
#include "asm.h" #include "asm.h"
#include "flags.h" #include "flags.h"
#include "object.h" #include "object.h"
#include "item.h"
typedef struct { typedef struct {
u16 minType; u16 minType;
u16 maxType; u16 numTypes;
u16 x; u16 x;
u16 y; u16 y;
} GoronShopSpawnData; } GoronShopSpawnData;
void GoronMerchantShopManager_Main(GoronMerchantShopManager* this) { void GoronMerchantShopManager_Main(GoronMerchantShopManager* this) {
static const GoronShopSpawnData gUnk_08108D5C[3] = { { 0x6e, 0x3, 0x210, 0x210 }, static const GoronShopSpawnData shopSpawnData[3] = { { 0x6e, 0x3, 0x210, 0x210 },
{ 0x71, 0x2, 0x220, 0x210 }, { 0x71, 0x2, 0x220, 0x210 },
{ 0x73, 0x3, 0x230, 0x210 } }; { 0x73, 0x3, 0x230, 0x210 } };
s32 uVar2; s32 uVar2;
@ -54,12 +55,12 @@ void GoronMerchantShopManager_Main(GoronMerchantShopManager* this) {
this->itemActive[2] = 0; this->itemActive[2] = 0;
this->itemActive[1] = 0; this->itemActive[1] = 0;
this->itemActive[0] = 0; this->itemActive[0] = 0;
spawnData = gUnk_08108D5C; spawnData = shopSpawnData;
count = 0; count = 0;
for (count = 0; count < 3;) { for (count = 0; count < 3;) {
if (CheckGlobalFlag(GORON_KAKERA_L + count) == 0) { if (CheckGlobalFlag(GORON_KAKERA_L + count) == 0) {
Entity* object = Entity* object =
CreateObject(SHOP_ITEM, 0x5c, ((s32)Random() % spawnData->maxType) + spawnData->minType); CreateObject(SHOP_ITEM, ITEM_KINSTONE, ((s32)Random() % spawnData->numTypes) + spawnData->minType);
if (object != NULL) { if (object != NULL) {
object->timer = 1; object->timer = 1;
object->subtimer = count; object->subtimer = count;

3
src/npc/goronMerchant.c
View File

@ -5,6 +5,7 @@
#include "flags.h" #include "flags.h"
#include "save.h" #include "save.h"
#include "npc.h" #include "npc.h"
#include "item.h"
static u32 GoronMerchant_GetSalePrice(Entity*); static u32 GoronMerchant_GetSalePrice(Entity*);
@ -134,7 +135,7 @@ void GoronMerchant_TryToBuyKinstone(Entity* this, ScriptExecutionContext* contex
if (salePrice <= gSave.stats.rupees) { if (salePrice <= gSave.stats.rupees) {
if (GetAmountInKinstoneBag(gRoomVars.shopItemType2) < 99) { if (GetAmountInKinstoneBag(gRoomVars.shopItemType2) < 99) {
ModRupees(-salePrice); ModRupees(-salePrice);
InitItemGetSequence(0x5c, gRoomVars.shopItemType2, 0); InitItemGetSequence(ITEM_KINSTONE, gRoomVars.shopItemType2, 0);
gRoomVars.shopItemType = 0; gRoomVars.shopItemType = 0;
gRoomVars.shopItemType2 = 0; gRoomVars.shopItemType2 = 0;
context->condition = 1; context->condition = 1;