summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/battle_controllers.h2
-rw-r--r--include/battle_interface.h2
-rw-r--r--include/constants/field_effects.h72
-rw-r--r--include/event_scripts.h50
-rw-r--r--include/field_effect.h193
-rw-r--r--include/field_region_map.h6
-rw-r--r--include/main.h2
7 files changed, 122 insertions, 205 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index b449bb501..ff5a629af 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -1,8 +1,6 @@
#ifndef GUARD_BATTLE_CONTROLLERS_H
#define GUARD_BATTLE_CONTROLLERS_H
-#include "battle.h"
-
enum
{
REQUEST_ALL_BATTLE,
diff --git a/include/battle_interface.h b/include/battle_interface.h
index 3145939d0..66a7f9828 100644
--- a/include/battle_interface.h
+++ b/include/battle_interface.h
@@ -1,8 +1,6 @@
#ifndef GUARD_BATTLE_INTERFACE_H
#define GUARD_BATTLE_INTERFACE_H
-#include "battle_controllers.h"
-
enum
{
HP_CURRENT,
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
new file mode 100644
index 000000000..b93b98201
--- /dev/null
+++ b/include/constants/field_effects.h
@@ -0,0 +1,72 @@
+#ifndef GUARD_FIELD_EFFECT_CONSTANTS_H
+#define GUARD_FIELD_EFFECT_CONSTANTS_H
+
+#define FLDEFF_EXCLAMATION_MARK_ICON 0
+#define FLDEFF_USE_CUT_ON_GRASS 1
+#define FLDEFF_USE_CUT_ON_TREE 2
+#define FLDEFF_SHADOW 3
+#define FLDEFF_TALL_GRASS 4
+#define FLDEFF_RIPPLE 5
+#define FLDEFF_FIELD_MOVE_SHOW_MON 6
+#define FLDEFF_ASH 7
+#define FLDEFF_SURF_BLOB 8
+#define FLDEFF_USE_SURF 9
+#define FLDEFF_DUST 10
+#define FLDEFF_USE_SECRET_POWER_CAVE 11
+#define FLDEFF_JUMP_TALL_GRASS 12
+#define FLDEFF_SAND_FOOTPRINTS 13
+#define FLDEFF_JUMP_BIG_SPLASH 14
+#define FLDEFF_SPLASH 15
+#define FLDEFF_JUMP_SMALL_SPLASH 16
+#define FLDEFF_LONG_GRASS 17
+#define FLDEFF_JUMP_LONG_GRASS 18
+#define FLDEFF_UNKNOWN_19 19
+#define FLDEFF_UNKNOWN_20 20
+#define FLDEFF_UNKNOWN_21 21
+#define FLDEFF_UNKNOWN_22 22
+#define FLDEFF_BERRY_TREE_GROWTH_SPARKLE 23
+#define FLDEFF_DEEP_SAND_FOOTPRINTS 24
+#define FLDEFF_POKECENTER_HEAL 25
+#define FLDEFF_USE_SECRET_POWER_TREE 26
+#define FLDEFF_USE_SECRET_POWER_SHRUB 27
+#define FLDEFF_TREE_DISGUISE 28
+#define FLDEFF_MOUNTAIN_DISGUISE 29
+#define FLDEFF_NPCFLY_OUT 30
+#define FLDEFF_USE_FLY 31
+#define FLDEFF_FLY_IN 32
+#define FLDEFF_QUESTION_MARK_ICON 33
+#define FLDEFF_FEET_IN_FLOWING_WATER 34
+#define FLDEFF_BIKE_TIRE_TRACKS 35
+#define FLDEFF_SAND_DISGUISE 36
+#define FLDEFF_USE_ROCK_SMASH 37
+#define FLDEFF_USE_DIG 38
+#define FLDEFF_SAND_PILE 39
+#define FLDEFF_USE_STRENGTH 40
+#define FLDEFF_SHORT_GRASS 41
+#define FLDEFF_HOT_SPRINGS_WATER 42
+#define FLDEFF_USE_WATERFALL 43
+#define FLDEFF_USE_DIVE 44
+#define FLDEFF_POKEBALL 45
+#define FLDEFF_HEART_ICON 46
+#define FLDEFF_NOP_47 47
+#define FLDEFF_NOP_48 48
+#define FLDEFF_POP_OUT_OF_ASH 49
+#define FLDEFF_LAVARIDGE_GYM_WARP 50
+#define FLDEFF_SWEET_SCENT 51
+#define FLDEFF_SAND_PILLAR 52
+#define FLDEFF_BUBBLES 53
+#define FLDEFF_SPARKLE 54
+#define FLDEFF_SECRET_POWER_CAVE 55
+#define FLDEFF_SECRET_POWER_TREE 56
+#define FLDEFF_SECRET_POWER_SHRUB 57
+#define FLDEFF_CUT_GRASS 58
+#define FLDEFF_FIELD_MOVE_SHOW_MON_INIT 59
+#define FLDEFF_USE_FLY_ANCIENT_TOMB 60
+#define FLDEFF_PCTURN_ON 61
+#define FLDEFF_HALL_OF_FAME_RECORD 62
+#define FLDEFF_USE_TELEPORT 63
+#define FLDEFF_64 64
+#define FLDEFF_65 65
+#define FLDEFF_66 66
+
+#endif
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 5b8b74d8b..dd0eca12f 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -528,4 +528,54 @@ extern const u8 MauvilleCity_PokemonCenter_1F_Text_290097[];
extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900B5[];
extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900CB[];
+extern const u8 EventScript_PlayerPCMale[];
+extern const u8 EventScript_PlayerPCFemale[];
+extern const u8 EventScript_SecretBasePC[];
+extern const u8 EventScript_RecordMixingSecretBasePC[];
+extern const u8 EventScript_SecretPower1[];
+extern const u8 EventScript_SecretPower2[];
+extern const u8 EventScript_PC[];
+extern const u8 EventScript_TestSignpostMsg[];
+extern const u8 EventScript_HiddenItemScript[];
+extern const u8 EventScript_2759F1[];
+extern const u8 EventScript_TV[];
+extern const u8 EventScript_ClosedSootopolisDoor[];
+extern const u8 SkyPillar_Outside_EventScript_2393F9[];
+extern const u8 EventScript_CableBoxResults[];
+extern const u8 EventScript_2A4BAC[];
+extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[];
+extern const u8 EventScript_RegionMap[];
+extern const u8 EventScript_RunningShoesManual[];
+extern const u8 EventScript_PictureBookShelf[];
+extern const u8 EventScript_BookShelf[];
+extern const u8 EventScript_PokemonCenterBookshelf[];
+extern const u8 EventScript_Vase[];
+extern const u8 EventScript_TrashCan[];
+extern const u8 EventScript_ShopShelf[];
+extern const u8 EventScript_Blueprint[];
+extern const u8 EventScript_WirelessBoxResults[];
+extern const u8 EventScript_CableBoxResults[];
+extern const u8 EventScript_Questionnaire[];
+extern const u8 EventScript_TrainerHillTimer[];
+extern const u8 EventScript_SecretBaseSandOrnament[];
+extern const u8 EventScript_SecretBaseShieldOrToyTV[];
+extern const u8 EventScript_UseSurf[];
+extern const u8 EventScript_UseWaterfall[];
+extern const u8 EventScript_CannotUseWaterfall[];
+extern const u8 EventScript_UseDive[];
+extern const u8 EventScript_UseDiveUnderwater[];
+extern const u8 EventScript_FallDownHole[];
+extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[];
+extern const u8 EventScript_Poison[];
+extern const u8 EventScript_EggHatch[];
+extern const u8 gUnknown_08273D1F[];
+extern const u8 IslandCave_EventScript_238EAF[];
+extern const u8 MauvilleCity_EventScript_1DF7BA[];
+extern const u8 Route119_EventScript_1F49EC[];
+extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[];
+extern const u8 RustboroCity_Gym_EventScript_21307B[];
+extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[];
+extern const u8 SSTidalCorridor_EventScript_23C050[];
+extern const u8 gUnknown_082A8350[];
+
#endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/field_effect.h b/include/field_effect.h
index 2881a2cd7..7620cedcd 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -1,85 +1,12 @@
#ifndef GUARD_FIELD_EFFECTS_H
#define GUARD_FIELD_EFFECTS_H
-#include "task.h"
-
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[2];
extern const struct SpritePalette gNewGameBirchObjectPaletteInfo;
extern const struct CompressedSpriteSheet gTrainerFrontPicTable[2];
extern const struct SpriteTemplate gNewGameBirchObjectTemplate;
extern const struct OamData gNewGameBirchOamAttributes;
-enum FieldEffectScriptIdx
-{
- FLDEFF_EXCLAMATION_MARK_ICON,
- FLDEFF_USE_CUT_ON_GRASS,
- FLDEFF_USE_CUT_ON_TREE,
- FLDEFF_SHADOW,
- FLDEFF_TALL_GRASS,
- FLDEFF_RIPPLE,
- FLDEFF_FIELD_MOVE_SHOW_MON,
- FLDEFF_ASH,
- FLDEFF_SURF_BLOB,
- FLDEFF_USE_SURF,
- FLDEFF_DUST,
- FLDEFF_USE_SECRET_POWER_CAVE,
- FLDEFF_JUMP_TALL_GRASS,
- FLDEFF_SAND_FOOTPRINTS,
- FLDEFF_JUMP_BIG_SPLASH,
- FLDEFF_SPLASH,
- FLDEFF_JUMP_SMALL_SPLASH,
- FLDEFF_LONG_GRASS,
- FLDEFF_JUMP_LONG_GRASS,
- FLDEFF_UNKNOWN_19,
- FLDEFF_UNKNOWN_20,
- FLDEFF_UNKNOWN_21,
- FLDEFF_UNKNOWN_22,
- FLDEFF_BERRY_TREE_GROWTH_SPARKLE,
- FLDEFF_DEEP_SAND_FOOTPRINTS,
- FLDEFF_POKECENTER_HEAL,
- FLDEFF_USE_SECRET_POWER_TREE,
- FLDEFF_USE_SECRET_POWER_SHRUB,
- FLDEFF_TREE_DISGUISE,
- FLDEFF_MOUNTAIN_DISGUISE,
- FLDEFF_NPCFLY_OUT,
- FLDEFF_USE_FLY,
- FLDEFF_FLY_IN,
- FLDEFF_QUESTION_MARK_ICON,
- FLDEFF_FEET_IN_FLOWING_WATER,
- FLDEFF_BIKE_TIRE_TRACKS,
- FLDEFF_SAND_DISGUISE,
- FLDEFF_USE_ROCK_SMASH,
- FLDEFF_USE_DIG,
- FLDEFF_SAND_PILE,
- FLDEFF_USE_STRENGTH,
- FLDEFF_SHORT_GRASS,
- FLDEFF_HOT_SPRINGS_WATER,
- FLDEFF_USE_WATERFALL,
- FLDEFF_USE_DIVE,
- FLDEFF_POKEBALL,
- FLDEFF_HEART_ICON,
- FLDEFF_NOP_47,
- FLDEFF_NOP_48,
- FLDEFF_POP_OUT_OF_ASH,
- FLDEFF_LAVARIDGE_GYM_WARP,
- FLDEFF_SWEET_SCENT,
- FLDEFF_SAND_PILLAR,
- FLDEFF_BUBBLES,
- FLDEFF_SPARKLE,
- FLDEFF_SECRET_POWER_CAVE,
- FLDEFF_SECRET_POWER_TREE,
- FLDEFF_SECRET_POWER_SHRUB,
- FLDEFF_CUT_GRASS,
- FLDEFF_FIELD_MOVE_SHOW_MON_INIT,
- FLDEFF_USE_FLY_ANCIENT_TOMB,
- FLDEFF_PCTURN_ON,
- FLDEFF_HALL_OF_FAME_RECORD,
- FLDEFF_USE_TELEPORT,
- FLDEFF_64,
- FLDEFF_65,
- FLDEFF_66,
-};
-
extern s32 gFieldEffectArguments[8];
extern void (*gPostMenuFieldCallback)(void);
extern bool8 (*gFieldCallback2)(void);
@@ -109,126 +36,6 @@ bool8 FieldEffectCmd_loadgfx_callnative(u8 **script, u32 *val);
bool8 FieldEffectCmd_loadtiles_callnative(u8 **script, u32 *val);
bool8 FieldEffectCmd_loadfadedpal_callnative(u8 **script, u32 *val);
-void PokecenterHealEffect_0(struct Task *);
-void PokecenterHealEffect_1(struct Task *);
-void PokecenterHealEffect_2(struct Task *);
-void PokecenterHealEffect_3(struct Task *);
-
-void HallOfFameRecordEffect_0(struct Task *);
-void HallOfFameRecordEffect_1(struct Task *);
-void HallOfFameRecordEffect_2(struct Task *);
-void HallOfFameRecordEffect_3(struct Task *);
-
-void PokeballGlowEffect_0(struct Sprite *);
-void PokeballGlowEffect_1(struct Sprite *);
-void PokeballGlowEffect_2(struct Sprite *);
-void PokeballGlowEffect_3(struct Sprite *);
-void PokeballGlowEffect_4(struct Sprite *);
-void PokeballGlowEffect_5(struct Sprite *);
-void PokeballGlowEffect_6(struct Sprite *);
-void PokeballGlowEffect_7(struct Sprite *);
-
-bool8 sub_80B6BCC(struct Task *);
-bool8 sub_80B6C74(struct Task *);
-bool8 sub_80B6C90(struct Task *);
-bool8 sub_80B6D04(struct Task *);
-bool8 sub_80B6DBC(struct Task *);
-bool8 sub_80B6DD8(struct Task *);
-bool8 sub_80B6E18(struct Task *);
-
-bool8 sub_80B6EC0(struct Task *);
-bool8 sub_80B6EE0(struct Task *);
-bool8 sub_80B6F50(struct Task *);
-bool8 sub_80B6F74(struct Task *);
-bool8 sub_80B6F84(struct Task *);
-bool8 sub_80B6FA8(struct Task *);
-
-bool8 sub_80B7114(struct Task *);
-bool8 sub_80B7190(struct Task *);
-bool8 sub_80B71D0(struct Task *);
-bool8 sub_80B7230(struct Task *);
-bool8 sub_80B7270(struct Task *);
-bool8 sub_80B72D0(struct Task *);
-bool8 sub_80B72F4(struct Task *);
-
-bool8 sub_80B73D0(struct Task *, struct EventObject *);
-bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *);
-bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *);
-bool8 sub_80B7450(struct Task *, struct EventObject *);
-bool8 sub_80B7478(struct Task *, struct EventObject *);
-
-bool8 dive_1_lock(struct Task *);
-bool8 dive_2_unknown(struct Task *);
-bool8 dive_3_unknown(struct Task *);
-
-bool8 sub_80B764C(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B7684(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B76B8(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B7704(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B77F8(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B7814(struct Task *, struct EventObject *, struct Sprite *);
-
-bool8 sub_80B78EC(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B791C(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B7968(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B79BC(struct Task *, struct EventObject *, struct Sprite *);
-
-bool8 sub_80B7AE8(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B7B18(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *);
-bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *);
-
-static void EscapeRopeFieldEffect_Step0(struct Task *);
-static void EscapeRopeFieldEffect_Step1(struct Task *);
-
-void sub_80B7EC4(struct Task *);
-void sub_80B7EE8(struct Task *);
-
-void sub_80B8280(struct Task *);
-void sub_80B830C(struct Task *);
-void sub_80B8410(struct Task *);
-
-void sub_80B8584(struct Task *);
-void sub_80B85F8(struct Task *);
-void sub_80B8660(struct Task *);
-void sub_80B86EC(struct Task *);
-void sub_80B871C(struct Task *);
-void sub_80B8770(struct Task *);
-void overworld_bg_setup_2(struct Task *);
-
-void sub_80B88E4(struct Task *);
-void sub_80B8920(struct Task *);
-void sub_80B898C(struct Task *);
-void sub_80B89DC(struct Task *);
-void sub_80B8A0C(struct Task *);
-void sub_80B8A44(struct Task *);
-void sub_80B8A64(struct Task *);
-
-void sub_80B8DB4(struct Task *);
-void sub_80B8E14(struct Task *);
-void sub_80B8E60(struct Task *);
-void sub_80B8EA8(struct Task *);
-void sub_80B8F24(struct Task *);
-
-void sub_80B9204(struct Task *);
-void sub_80B925C(struct Task *);
-void sub_80B92A0(struct Task *);
-void sub_80B92F8(struct Task *);
-void sub_80B933C(struct Task *);
-void sub_80B9390(struct Task *);
-void sub_80B9418(struct Task *);
-void sub_80B9474(struct Task *);
-void sub_80B9494(struct Task *);
-
-void sub_80B9804(struct Task *);
-void sub_80B98B8(struct Task *);
-void sub_80B9924(struct Task *);
-void sub_80B9978(struct Task *);
-void sub_80B99F0(struct Task *);
-void sub_80B9A28(struct Task *);
-void sub_80B9A60(struct Task *);
-
void sub_80B9C28(s16*, u8);
void sub_80B9C54(s16*, u8);
void sub_80B9CDC(s16*, u8);
diff --git a/include/field_region_map.h b/include/field_region_map.h
deleted file mode 100644
index d50f1265c..000000000
--- a/include/field_region_map.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_FIELD_REGION_MAP_H
-#define GUARD_FIELD_REGION_MAP_H
-
-void FieldInitRegionMap(MainCallback callback);
-
-#endif // GUARD_FIELD_REGION_MAP_H
diff --git a/include/main.h b/include/main.h
index 3de34de13..47b26b1c7 100644
--- a/include/main.h
+++ b/include/main.h
@@ -1,8 +1,6 @@
#ifndef GUARD_MAIN_H
#define GUARD_MAIN_H
-#include "global.h"
-
typedef void (*MainCallback)(void);
typedef void (*IntrCallback)(void);
typedef void (*IntrFunc)(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 18:47:53 +0000