Merge pull request #184 from notyourav/dd

effects.h and handwritten asm notes

7 files changed, 145 insertions, 6 deletions

diff --git a/include/audio.h b/include/audio.h
index 4f8ecb84..99ccf298 100644
--- a/include/audio.h
+++ b/include/audio.h
@@ -346,7 +346,7 @@ typedef enum {
     SFX_14F,
     SFX_150,
     SFX_151,
-    SFX_152,
+    SFX_NEAR_PORTAL,
     SFX_153,
     SFX_154,
     SFX_155,
diff --git a/include/effects.h b/include/effects.h
new file mode 100644
index 00000000..696ab9ab
--- /dev/null
+++ b/include/effects.h
@@ -0,0 +1,118 @@
+#ifndef EFFECTS_H
+#define EFFECTS_H
+
+#include "entity.h"
+
+typedef enum {
+    FX_FALL_DOWN,
+    FX_EXPLOSION,
+    FX_DEATH,
+    FX_BUSH,
+    FX_ROCK,
+    FX_POT_SHATTER,
+    FX_6,
+    FX_SPARKLE,
+    FX_8,
+    FX_9,
+    FX_A,
+    FX_WATER_SPLASH,
+    FX_LAVA_SPLASH,
+    FX_ICE,
+    FX_ROCK_HUGE,
+    FX_ROCK_SMALL,
+    FX_REFLECT,
+    FX_DASH,
+    FX_BLUE_SPARKLE,
+    FX_RED_BUSH,
+    FX_SPARKLE2,
+    FX_ROCK2,
+    FX_FIRE,
+    FX_GRASS_CUT,
+    FX_18,
+    FX_SWORD_MAGIC,
+    FX_LIGHTNING,
+    FX_LIGHTNING_STRIKE,
+    FX_STARS,
+    FX_STARS_STRIKE,
+    FX_STARS_STRIKE2,
+    FX_REFLECT2,
+    FX_RIPPLE,
+    FX_RIPPLE_LARGE,
+    FX_BROWN_SMOKE,
+    FX_BROWN_SMOKE_LARGE,
+    FX_BROWN_SMOKE2,
+    FX_SWEAT,
+    FX_26,
+    FX_27,
+    FX_SLOW_EXPLOSION,
+    FX_CONFETTI,
+    FX_CONFETTI_LARGE,
+    FX_GREEN_SPLASH2,
+    FX_REFECT3,
+    FX_SIGN,
+    FX_SLOW_SMOKE2,
+    FX_SLOW_SMOKE_SMALL,
+    FX_SPARKLE_SECRET,
+    FX_MAILBOX_UNUSED,
+    FX_32,
+    FX_33,
+    FX_34,
+    FX_BIG_EXPLOSION,
+    FX_LAVA_SPLASH_HUGE,
+    FX_GRASS_CUT2,
+    FX_BUSH_CUT2,
+    FX_BUSH_CUT3,
+    FX_EGG,
+    FX_WOOD,
+    FX_BONE,
+    FX_STARS2,
+    FX_GRASS_CUT3,
+    FX_GRASS_CUT4,
+    FX_GRASS_CUT5,
+    FX_REFLECT4,
+    FX_STEAM_EFC,
+    FX_BIG_EXPLOSION2,
+    FX_WHITE_SPLASH,
+    FX_WHITE_ROCK,
+    FX_GIANT_EXPLOSION,
+    FX_GIANT_EXPLOSION2,
+    FX_GIANT_EXPLOSION3,
+    FX_GREEN_ORB,
+    FX_GREEN_ORB_SLOW,
+    FX_WHITE_AURA,
+    FX_WOOD2,
+    FX_SPARKLE3,
+    FX_MAGIC_STORM,
+    FX_BLUE_EFC,
+    FX_REFLECT5,
+    FX_GIANT_EXPLOSION4,
+    FX_GREEN_SPLASH,
+    FX_BLUE_PUFF,
+    FX_WHITE_PUFF,
+    FX_AURA_BASE,
+    FX_RED_AURA,
+    FX_BLUE_AURA,
+    FX_58,
+    FX_59,
+    FX_5A,
+    FX_5B,
+    FX_BARREL_BEAM,
+    FX_BARREL,
+    FX_5E,
+    FX_5F,
+    FX_60,
+    FX_STONE_BLOCK,
+    FX_62,
+    FX_63,
+    FX_64,
+    FX_65,
+    FX_66,
+    FX_67,
+    FX_68,
+    FX_69,
+    FX_6A,
+    FX_6B,
+    FX_6C,
+} Effect;
+
+#endif // EFFECTS_H
\ No newline at end of file
diff --git a/include/functions.h b/include/functions.h
index ad271fa5..662227a4 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -58,6 +58,7 @@ extern void DoExitTransition(ScreenTransitionData*);
 extern void CreateDustAt(u32, u32, u32);
 extern void PutItemOnSlot(u32 itemID);
 extern void CreateSpeechBubbleSleep(Entity*, u32, u32);
+extern u32 CheckPlayerProximity(u32, u32, u32, u32);
 
 // Unidentified
 extern u32 sub_0806ED78(Entity*);
diff --git a/include/main.h b/include/main.h
index 679fd35f..0d3643ae 100644
--- a/include/main.h
+++ b/include/main.h
@@ -89,7 +89,7 @@ extern void DoSoftReset(void);
 extern void sub_08056260(void);
 extern void VBlankIntrWait();
 extern void MessageUpdate(void);
-extern void sub_08050154(void);
+extern void UpdateFade(void);
 
 extern u8 gUnk_03003DE4;
 
diff --git a/include/room.h b/include/room.h
index f34f7297..b030d8e0 100644
--- a/include/room.h
+++ b/include/room.h
@@ -24,7 +24,9 @@ typedef struct {
     /*0x0E*/ u8 unk5;
     /*0x0F*/ u8 unk6;
     /*0x10*/ u8 unk_10;
-    /*0x11*/ u8 filler[3];
+    /*0x11*/ s8 oam_offset_x;
+    /*0x12*/ s8 oam_offset_y;
+    /*0x13*/ u8 unk13;
     /*0x14*/ u8 screenShakeMagnitude;
     /*0x15*/ u8 unk7;
     /*0x16*/ u16 screenShakeTime;
diff --git a/include/structures.h b/include/structures.h
index 86962b43..5298e1f5 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -93,7 +93,7 @@ typedef struct {
     u8 field_0x1;
     u8 field_0x2;
     u8 field_0x3;
-    u32 field_0x4;
+    u32 mask;
     u16 fadeType;  // fade in or out, are there others?
     u16 fadeSpeed; // subtracted from duration
     u16 fadeDuration;
@@ -103,9 +103,9 @@ typedef struct {
     s16 field_0x14;
     u16 field_0x16;
     u16 field_0x18;
-} struct_03000FD0;
+} FadeControl;
 
-extern struct_03000FD0 gFadeControl;
+extern FadeControl gFadeControl;
 
 typedef struct {
     u8 filler0[0x1A];
diff --git a/include/tiles.h b/include/tiles.h
new file mode 100644
index 00000000..9915face
--- /dev/null
+++ b/include/tiles.h
@@ -0,0 +1,18 @@
+#ifndef TILES_H
+#define TILES_H
+
+typedef enum {
+    CUT_BUSH = 0x1C,
+    CUT_GRASS = 0x1D,
+    CUT_SIGNPOST = 0x1E,
+    CUT_TREE = 0x1F,
+    ROCK = 0x55,
+    CHEST = 0x73,
+    SIGNPOST = 0x176,
+    PERMA_ROCK = 0x1D3,
+    PERMA_ROCK2 = 0x1D4,
+    PERMA_ROCK3 = 0x1D5,
+    PERMA_ROCK4 = 0x1D6,
+} Tile;
+
+#endif // TILES_H