mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-31 00:05:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into tilemap-docs

Browse Source
This commit is contained in:
octorock
2023-05-31 23:51:20 +02:00
parent 134f39a0bd 79bbd540a8
commit bbac5ace3f
254 changed files with 4013 additions and 4939 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/enterRoomTextboxManager.c
+2 -4
View File
@@ -13,8 +13,6 @@
#include "message.h"
#include "screen.h"
extern u8 gUnk_02034DF0[0x2F2];
const u16 gUnk_08108DE8[] = { 0, 0x70b, 0x70c, 0x70d, 0x70e, 0x70f, 0x710, 0x711, 0x712, 0x713, 0x714,
0x715, 0x716, 0x717, 0x718, 0x719, 0x71a, 0x71b, 0x71c, 0x71d, 0x71e, 0x71f,
0x726, 0x720, 0x720, 0x721, 0x722, 0x723, 0x725, 0x727, 0x724, 0x728 };
@@ -67,7 +65,7 @@ void sub_0805E18C(EnterRoomTextboxManager* this) {
}
void sub_0805E1D8(EnterRoomTextboxManager* this) {
MemClear(&gUnk_02034DF0, 0x80);
MemClear(&gBG0Buffer[0xa0], 0x80);
gScreen.bg0.updated = 1;
DeleteThisEntity();
}
@@ -80,7 +78,7 @@ void sub_0805E1F8(u32 unk0, bool32 isDungeon) {
u8 unk_06[3];
} PACKED tmp;
const Font* font;
MemClear(&gUnk_02034DF0, 0x80);
MemClear(&gBG0Buffer[0xa0], 0x80);
MemCopy(gUnk_08108E60, &tmp, sizeof(tmp));
tmp.unk_04 = unk0 >> 8;
tmp.unk_05 = unk0;
src/manager/goronMerchantShopManager.c
+5 -4
View File
@@ -8,16 +8,17 @@
#include "asm.h"
#include "flags.h"
#include "object.h"
#include "item.h"
typedef struct {
u16 minType;
u16 maxType;
u16 numTypes;
u16 x;
u16 y;
} GoronShopSpawnData;
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 },
{ 0x73, 0x3, 0x230, 0x210 } };
s32 uVar2;
@@ -54,12 +55,12 @@ void GoronMerchantShopManager_Main(GoronMerchantShopManager* this) {
this->itemActive[2] = 0;
this->itemActive[1] = 0;
this->itemActive[0] = 0;
spawnData = gUnk_08108D5C;
spawnData = shopSpawnData;
count = 0;
for (count = 0; count < 3;) {
if (CheckGlobalFlag(GORON_KAKERA_L + count) == 0) {
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) {
object->timer = 1;
object->subtimer = count;