summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/map_event_scripts.inc24
-rw-r--r--include/constants/field_effects.h72
-rw-r--r--include/field_effect.h71
4 files changed, 86 insertions, 83 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 7f03adfc2..3eac22a79 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -10,9 +10,9 @@
#include "constants/vars.h"
#include "constants/battle.h"
#include "constants/spawn_points.h"
+#include "constants/field_effects.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
-@ .include "constants/constants.inc"
.section script_data, "aw", %progbits
diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc
index 8145c6935..5a64cd6c2 100644
--- a/data/map_event_scripts.inc
+++ b/data/map_event_scripts.inc
@@ -1552,7 +1552,7 @@ EventScript_1A65B8:: @ 81A65B8
EventScript_1A65CE:: @ 81A65CE
applymovement VAR_LAST_TALKED, Movement_1A75E7
waitmovement 0
- dofieldeffect 25
+ dofieldeffect FLDEFF_POKEBALL
waitfieldeffect 25
applymovement VAR_LAST_TALKED, Movement_1A75ED
waitmovement 0
@@ -1989,7 +1989,7 @@ EventScript_1A6AC8:: @ 81A6AC8
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_1A6AC8_Release
msgbox Text_1A55A5
- dofieldeffect 9
+ dofieldeffect FLDEFF_USE_SURF
EventScript_1A6AC8_Release:@ 81A6B0B
releaseall
EventScript_1A6AC8_End: @ 81A6B0C
@@ -8029,7 +8029,7 @@ EventScript_1B2907:: @ 81B2907
message gUnknown_81B1E42
waitmessage
playse MUS_ME_PHOTO
- dofieldeffect 69
+ FLDEFF_UNK_45 69
delay 60
special sub_80CC2BC
msgbox gUnknown_81B1E7D
@@ -10546,14 +10546,14 @@ ViridianCity_EventScript_1BDF13:: @ 81BDF13
goto_if 1, EventScript_1BDF91
msgbox gUnknown_81BDFD7
closemessage
- dofieldeffect 2
+ dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
goto EventScript_1BDF76
end
gUnknown_81BDF6B:: @ 81BDF6B
lockall
- dofieldeffect 2
+ dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
goto EventScript_1BDF76
end
@@ -10624,14 +10624,14 @@ CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C
goto_if 1, EventScript_1BE09A
msgbox gUnknown_81BDFD7
closemessage
- dofieldeffect 37
+ dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
goto EventScript_1BE06F
end
EventScript_FldEffRockSmash:: @ 81BE064
lockall
- dofieldeffect 37
+ dofieldeffect FLDEFF_USE_ROCK_SMASH
waitstate
goto EventScript_1BE06F
end
@@ -10704,14 +10704,14 @@ VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_1BE197
closemessage
- dofieldeffect 40
+ dofieldeffect FLDEFF_USE_STRENGTH
waitstate
goto EventScript_1BE179
end
EventScript_FldEffStrength:: @ 81BE16E
lockall
- dofieldeffect 40
+ dofieldeffect FLDEFF_USE_STRENGTH
waitstate
goto EventScript_1BE179
end
@@ -10766,7 +10766,7 @@ gUnknown_81BE2B7:: @ 81BE2B7
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_1BE308
msgbox gUnknown_81BE378
- dofieldeffect 43
+ dofieldeffect FLDEFF_USE_WATERFALL
goto EventScript_1BE308
EventScript_81BE2FF:: @ 81BE2FF
@@ -10800,7 +10800,7 @@ EventScript_1BE38B:: @ 81BE38B
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_1BE3D2
msgbox gUnknown_81BE49B
- dofieldeffect 44
+ dofieldeffect FLDEFF_USE_DIVE
goto EventScript_1BE3D2
EventScript_1BE3C9:: @ 81BE3C9
@@ -10823,7 +10823,7 @@ EventScript_1BE3D4:: @ 81BE3D4
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_1BE429
msgbox gUnknown_81BE49B
- dofieldeffect 44
+ dofieldeffect FLDEFF_USE_DIVE
goto EventScript_1BE429
EventScript_1BE412:: @ 81BE412
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
new file mode 100644
index 000000000..62ab5af0c
--- /dev/null
+++ b/include/constants/field_effects.h
@@ -0,0 +1,72 @@
+#ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H
+#define GUARD_CONSTANTS_FIELD_EFFECTS_H
+
+#define FLDEFF_EXCLAMATION_MARK_ICON_1 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_EXCLAMATION_MARK_ICON_2 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_UNK_40 64
+#define FLDEFF_UNK_41 65 // TODO: related to vs_seeker
+#define FLDEFF_UNK_45 69 // TODO: related to fame checker photos
+
+#endif // GUARD_CONSTANTS_FIELD_EFFECTS_H
diff --git a/include/field_effect.h b/include/field_effect.h
index 8c89f8c9c..fa66929ea 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -2,76 +2,7 @@
#define GUARD_FIELD_EFFECTS_H
#include "global.h"
-
-enum FieldEffectScriptIdx
-{
- FLDEFF_EXCLAMATION_MARK_ICON_1,
- 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_EXCLAMATION_MARK_ICON_2,
- 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_UNK_40,
- FLDEFF_UNK_41 // TODO: related to vs_seeker
-};
+#include "constants/field_effects.h"
extern u32 gFieldEffectArguments[8];
extern void (*gPostMenuFieldCallback)(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 07:53:20 +0000