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

dungeon stuff

Browse Source
This commit is contained in:
theo3
2021-12-27 18:19:47 -08:00
parent 24750a6bb5
commit dc8bcb32e0
26 changed files with 114 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/npc4E.c
+2 -2
View File
@@ -206,8 +206,8 @@ void sub_0806DCA0() {
}
void sub_0806DCC0() {
gScreenTransition.player_status.field_0x20 = 0x7c8;
gScreenTransition.player_status.field_0x22 = 0xf8;
gScreenTransition.player_status.overworld_map_x = 0x7c8;
gScreenTransition.player_status.overworld_map_y = 0xf8;
}
void NPC4E_Fusion(Entity* this) {
src/npc/picolyteBottle.c
+2 -1
View File
@@ -3,6 +3,7 @@
#include "structures.h"
#include "functions.h"
#include "textbox.h"
#include "object.h"
extern ScreenTransitionData gUnk_0813AD4C;
@@ -60,7 +61,7 @@ void sub_0806DFB4(Entity* this) {
} else {
if (this->actionDelay != 0) {
this->actionDelay = 0;
obj = CreateObject(0x35, 2, this->field_0xf);
obj = CreateObject(OBJECT_35, 2, this->field_0xf);
if (obj != NULL) {
obj->parent = this;
this->child = obj;
src/npc/postman.c
+1 -1
View File
@@ -99,7 +99,7 @@ void sub_080604DC(Entity* this) {
if (this->spriteSettings.draw == 1 && CheckOnScreen(this)) {
if ((this->frame & 1) != 0) {
this->frame &= 0xfe;
ent = CreateFx(this, 17, 0x40);
ent = CreateFx(this, FX_DASH, 0x40);
if (ent != NULL) {
ent->y.HALF.HI++;
SetDefaultPriority(ent, 3);