summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/metatile_labels.h65
-rw-r--r--include/constants/vars.h2
-rw-r--r--include/event_object_movement.h4
-rw-r--r--include/event_scripts.h3
-rw-r--r--include/field_specials.h2
-rw-r--r--include/fieldmap.h5
-rw-r--r--include/fldeff.h2
-rw-r--r--include/global.fieldmap.h4
-rw-r--r--include/metatile_behavior.h2
-rw-r--r--include/sea_cottage_special_anim.h12
-rw-r--r--include/special_field_anim.h10
11 files changed, 93 insertions, 18 deletions
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index b71e7d08f..01140a160 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -2,11 +2,46 @@
#define GUARD_METATILE_LABELS_H
// gTileset_General
+#define METATILE_General_Plain_Mowed 0x001
+#define METATILE_General_ThinTreeTop_Grass 0x00A
+#define METATILE_General_WideTreeTopLeft_Grass 0x00B
+#define METATILE_General_WideTreeTopRight_Grass 0x00C
+#define METATILE_General_Plain_Grass 0x00D
+#define METATILE_General_WideTreeTopLeft_Mowed 0x00E
+#define METATILE_General_WideTreeTopRight_Mowed 0x00F
+#define METATILE_General_ThinTreeTop_Mowed 0x013
#define METATILE_General_CalmWater 0x12B
// gTileset_Mart
#define METATILE_Mart_CounterMid_Top 0x2BF
-#define METATILE_Mart_CounterMid_Bottom 0x2C0
+#define METATILE_Mart_CounterMid_Bottom 0x2C0
+
+// gTileset_PokemonCenter
+#define METATILE_PokemonCenter_NetworkMachine_ScreenLeft_On 0x35A
+#define METATILE_PokemonCenter_NetworkMachine_ScreenRight_On 0x35B
+#define METATILE_PokemonCenter_NetworkMachine_Ruby 0x35D
+#define METATILE_PokemonCenter_NetworkMachine_Sapphire 0x35F
+#define METATILE_PokemonCenter_Escalator_Top_Normal 0x2E4
+#define METATILE_PokemonCenter_Escalator_Top_Transition1 0x317
+#define METATILE_PokemonCenter_Escalator_Top_Transition2 0x315
+#define METATILE_PokemonCenter_Escalator_TopNext_Normal 0x2E3
+#define METATILE_PokemonCenter_Escalator_TopNext_Transition1 0x316
+#define METATILE_PokemonCenter_Escalator_TopNext_Transition2 0x314
+#define METATILE_PokemonCenter_Escalator_TopNextRail_Normal 0x2EB
+#define METATILE_PokemonCenter_Escalator_TopNextRail_Transition1 0x31E
+#define METATILE_PokemonCenter_Escalator_TopNextRail_Transition2 0x31C
+#define METATILE_PokemonCenter_Escalator_Bottom_Normal 0x2D9
+#define METATILE_PokemonCenter_Escalator_Bottom_Transition1 0x313
+#define METATILE_PokemonCenter_Escalator_Bottom_Transition2 0x311
+#define METATILE_PokemonCenter_Escalator_BottomRail_Normal 0x2D1
+#define METATILE_PokemonCenter_Escalator_BottomRail_Transition1 0x30B
+#define METATILE_PokemonCenter_Escalator_BottomRail_Transition2 0x309
+#define METATILE_PokemonCenter_Escalator_BottomNext_Normal 0x2D8
+#define METATILE_PokemonCenter_Escalator_BottomNext_Transition1 0x312
+#define METATILE_PokemonCenter_Escalator_BottomNext_Transition2 0x310
+#define METATILE_PokemonCenter_Escalator_BottomNextRail_Normal 0x2D0
+#define METATILE_PokemonCenter_Escalator_BottomNextRail_Transition1 0x30A
+#define METATILE_PokemonCenter_Escalator_BottomNextRail_Transition2 0x308
// gTileset_VermilionGym
#define METATILE_VermilionGym_Floor 0x281
@@ -39,6 +74,18 @@
#define METATILE_VermilionGym_Beam_Node_BottomRight_Edge_HalfOn 0x2C6
#define METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn 0x2C7
+// gTileset_SeaCottage
+#define METATILE_SeaCottage_Teleporter_Light_Green 0x28A
+#define METATILE_SeaCottage_Teleporter_Light_Yellow 0x2B5
+#define METATILE_SeaCottage_Teleporter_Light_Red 0x2B6
+#define METATILE_SeaCottage_Teleporter_Cable_Top 0x285
+#define METATILE_SeaCottage_Teleporter_Cable_Bottom 0x2B4
+#define METATILE_SeaCottage_Teleporter_CableBall_Top 0x2B9
+#define METATILE_SeaCottage_Teleporter_CableBall_Bottom 0x2BA
+#define METATILE_SeaCottage_Teleporter_Door 0x296
+#define METATILE_SeaCottage_Teleporter_Door_HalfGlowing 0x2B7
+#define METATILE_SeaCottage_Teleporter_Door_FullGlowing 0x2B8
+
// gTileset_GameCorner
#define METATILE_GameCorner_Floor_ShadeFull 0x292
#define METATILE_GameCorner_Floor_StairsTop 0x29D
@@ -127,4 +174,20 @@
#define METATILE_TrainerTower_Floor_ShadeBottomLeft 0x287
#define METATILE_TrainerTower_CounterBarrier 0x2B4
+// gTileset_ViridianForest
+#define METATILE_ViridianForest_HugeTreeTopMiddle_Grass 0x284
+#define METATILE_ViridianForest_HugeTreeTopMiddle_Mowed 0x281
+
+// gTileset_CeladonCity
+#define METATILE_CeladonCity_CyclingRoad_Grass 0x352
+#define METATILE_CeladonCity_CyclingRoad_Mowed 0x33E
+
+// gTileset_FuchsiaCity
+#define METATILE_FuchsiaCity_SafariZoneTreeTopLeft_Grass 0x300
+#define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Grass 0x301
+#define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Grass 0x302
+#define METATILE_FuchsiaCity_SafariZoneTreeTopLeft_Mowed 0x310
+#define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Mowed 0x311
+#define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Mowed 0x312
+
#endif // GUARD_METATILE_LABELS_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 043f5bc39..ca3642ca3 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -90,7 +90,7 @@
#define VAR_0x402F 0x402F
#define VAR_ICE_STEP_COUNT 0x4030
-#define VAR_STARTER_MON 0x4031
+#define VAR_STARTER_MON 0x4031 // 0: Bulbasaur, 1: Squirtle, 2: Charmander
#define VAR_0x4032 0x4032
#define VAR_ENIGMA_BERRY_AVAILABLE 0x4033
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index b713dbd7d..baf66d737 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -117,6 +117,8 @@ bool32 RfuUnionObjectIsInvisible(u8 objectEventId);
void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
bool32 RfuUnionObjectIsWarping(u8 objectEventId);
+void sub_805F378(s16 x, s16 y);
+
// Exported data declarations
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
@@ -124,5 +126,7 @@ extern const struct SpritePalette gUnknown_83A5348;
extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[];
extern const struct OamData gObjectEventBaseOam_32x32;
extern const struct UCoords16 gUnknown_83A64C8[];
+extern const u16 gUnknown_8398648[];
+extern const u16 gUnknown_8398688[];
#endif // GUARD_EVENT_OBJECT_MOVEMENT_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index f026cb57a..bf16ed2ec 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1201,4 +1201,7 @@ extern const u8 Text_MonSentToBoxBillsBoxFull[];
extern const u8 EventScript_BagItemCanBeRegistered[];
+// fldeff_cut
+extern const u8 EventScript_FldEffCut[];
+
#endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/field_specials.h b/include/field_specials.h
index 02069ff84..9653a9169 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -25,5 +25,7 @@ bool8 ShouldShowBoxWasFullMessage(void);
u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr);
u8 GetUnlockedSeviiAreas(void);
u32 GetPlayerTrainerId(void);
+bool8 CutMoveRuinValleyCheck(void);
+void CutMoveOpenDottedHoleDoor(void);
#endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 406ec2959..a8e31685f 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -19,6 +19,7 @@ u32 MapGridGetMetatileBehaviorAt(int, int);
u8 MapGridGetMetatileLayerTypeAt(s16 x, s16 y);
void MapGridSetMetatileIdAt(int, int, u16);
void MapGridSetMetatileEntryAt(int, int, u16);
+u8 MapGridGetZCoordAt(s32 x, s32 y);
void GetCameraCoords(u16*, u16*);
bool8 MapGridIsImpassableAt(s32, s32);
s32 GetMapBorderIdAt(s32, s32);
@@ -29,8 +30,8 @@ struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y);
void sub_8059948(u8 a0, u8 a1);
void save_serialize_map(void);
-u32 sub_8058F1C(u32 original, u8 bit);
-u32 sub_8058F48(s16 x, s16 y, u8 z);
+u32 GetMetatileAttributeFromRawMetatileBehavior(u32 original, u8 bit);
+u32 MapGridGetMetatileAttributeAt(s16 x, s16 y, u8 attr);
void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2);
#endif //GUARD_FIELDMAP_H
diff --git a/include/fldeff.h b/include/fldeff.h
index 51287f400..56e2dfbd9 100644
--- a/include/fldeff.h
+++ b/include/fldeff.h
@@ -10,7 +10,7 @@ gTasks[taskId].data[9] = (u32)func;
extern struct MapPosition gPlayerFacingPosition;
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
-u8 oei_task_add(void);
+u8 CreateFieldEffectShowMon(void);
// flash
u8 sub_80C9DCC(u8 lightLevel, u8 mapType);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index c599b68ab..57d8d0a35 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -3,6 +3,8 @@
#define OBJECT_EVENTS_COUNT 16
+#define METATILE_COLLISION_MASK 0x0C00
+
enum
{
CONNECTION_SOUTH = 1,
@@ -15,6 +17,8 @@ enum
typedef void (*TilesetCB)(void);
+#define METATILE_ID(tileset, name) (METATILE_##tileset##_##name)
+
struct Tileset
{
/*0x00*/ bool8 isCompressed;
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index d567ab77c..f3195e6c9 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -114,7 +114,7 @@ bool8 MetatileBehavior_UnusedReturnFalse_10(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior);
-bool8 sub_805A2BC(u8 metatileBehavior, u8 playerDirection);
+bool8 TestMetatileAttributeBit(u8 attr, u8 bitmask);
bool8 MetatileBehavior_UnusedIsSpinRight(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedIsSpinLeft(u8 metatileBehavior);
bool8 MetatileBehavior_UnusedIsSpinUp(u8 metatileBehavior);
diff --git a/include/sea_cottage_special_anim.h b/include/sea_cottage_special_anim.h
deleted file mode 100644
index 5c939df12..000000000
--- a/include/sea_cottage_special_anim.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef GUARD_SEA_COTTAGE_SPECIAL_ANIM_H
-#define GUARD_SEA_COTTAGE_SPECIAL_ANIM_H
-
-#include "global.h"
-
-void sub_809C448(u8 a0);
-void sub_809C460(void);
-bool8 sub_809C474(void);
-void sub_809C4A8(void);
-void sub_809C5FC(void);
-
-#endif // GUARD_SEA_COTTAGE_SPECIAL_ANIM_H
diff --git a/include/special_field_anim.h b/include/special_field_anim.h
new file mode 100644
index 000000000..d21c932bf
--- /dev/null
+++ b/include/special_field_anim.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_SPECIAL_FIELD_ANIM_H
+#define GUARD_SPECIAL_FIELD_ANIM_H
+
+#include "global.h"
+
+void StartEscalator(u8 a0);
+void StopEscalator(void);
+bool8 IsEscalatorMoving(void);
+
+#endif // GUARD_SPECIAL_FIELD_ANIM_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 05:25:55 +0000