mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-02 18:12:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Create enums for Vvvs and MetaTiles

Browse Source
This commit is contained in:
octorock
2023-06-24 00:19:33 +02:00
parent f9da634427
commit f89bb66911
168 changed files with 5007 additions and 1629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/worldEvent/worldEvent17.c
+8 -7
View File
@@ -12,6 +12,7 @@
#include "script.h"
#include "subtask.h"
#include "manager/bombableWallManager.h"
#include "tiles.h"
// Called Goron Kinstone Fusion Script
void sub_08054EB8(Entity* this, ScriptExecutionContext* context) {
@@ -21,11 +22,11 @@ void sub_08054EB8(Entity* this, ScriptExecutionContext* context) {
manager->base.id = BOMBABLE_WALL_MANAGER;
manager->x = this->x.HALF.HI - gRoomControls.origin_x;
manager->y = (this->y.HALF.HI - gRoomControls.origin_y) - 0x10;
manager->field_0x35 = 1;
manager->layer = LAYER_BOTTOM;
#if defined(EU) || defined(JP) || defined(DEMO_JP)
manager->field_0x3e = 0x77;
manager->flag = 0x77;
#else
manager->field_0x3e = 0x79;
manager->flag = 0x79;
#endif
AppendEntityToList((Entity*)manager, 6);
}
@@ -33,9 +34,9 @@ void sub_08054EB8(Entity* this, ScriptExecutionContext* context) {
void sub_08054EFC(Entity* this, ScriptExecutionContext* context) {
Entity* effect;
u32 tmp = COORD_TO_TILE(this) - 0x40;
SetTile(0x4074, tmp, 1);
this->collisionLayer = 2;
u32 metaTilePos = COORD_TO_TILE(this) - 0x40;
SetMetaTile(SPECIAL_META_TILE_116, metaTilePos, LAYER_BOTTOM);
this->collisionLayer = LAYER_TOP;
UpdateSpriteForCollisionLayer(this);
effect = CreateFx(this, FX_BIG_EXPLOSION, 0);
if (effect != NULL) {
@@ -156,6 +157,6 @@ void WorldEvent_17_0(void) {
void WorldEvent_17_1(void) {
if (gMenu.field_0xa != 0) {
gMenu.field_0xa = 0;
SetTileType(0x74, 0x407, 1);
SetMetaTileType(0x74, 0x407, 1);
}
}
src/worldEvent/worldEvent2.c
+1 -1
View File
@@ -58,7 +58,7 @@ void sub_08055994(void) {
} else {
layer = 1;
}
SetTileType(0x73, (*(u16*)(gMenu.field_0xc + 8) >> 4 & 0x3f) | (*(u16*)(gMenu.field_0xc + 10) >> 4 & 0x3f) << 6,
SetMetaTileType(0x73, (*(u16*)(gMenu.field_0xc + 8) >> 4 & 0x3f) | (*(u16*)(gMenu.field_0xc + 10) >> 4 & 0x3f) << 6,
layer);
sub_080553E0((u32)gMenu.field_0x4);
SoundReq(SFX_SECRET_BIG);