Merge branch 'master' into trainers

asm/battle_setup.s

@@ -1999,13 +1999,13 @@ BattleSetup_GetScriptAddrAfterBattle: @ 80805E8
 	ldr r0, [r0]
 	cmp r0, 0
 	bne _080805F4
-	ldr r0, _080805FC @ =gUnknown_81C555B
+	ldr r0, _080805FC @ =EventScript_1C555B
 _080805F4:
 	pop {r1}
 	bx r1
 	.align 2, 0
 _080805F8: .4byte gUnknown_20386C4
-_080805FC: .4byte gUnknown_81C555B
+_080805FC: .4byte EventScript_1C555B
 	thumb_func_end BattleSetup_GetScriptAddrAfterBattle
 
 	thumb_func_start BattleSetup_GetTrainerPostBattleScript
@@ -2015,13 +2015,13 @@ BattleSetup_GetTrainerPostBattleScript: @ 8080600
 	ldr r0, [r0]
 	cmp r0, 0
 	bne _0808060C
-	ldr r0, _08080614 @ =gUnknown_81C555B
+	ldr r0, _08080614 @ =EventScript_1C555B
 _0808060C:
 	pop {r1}
 	bx r1
 	.align 2, 0
 _08080610: .4byte gUnknown_20386C8
-_08080614: .4byte gUnknown_81C555B
+_08080614: .4byte EventScript_1C555B
 	thumb_func_end BattleSetup_GetTrainerPostBattleScript
 
 	thumb_func_start sub_8080618

asm/field_control_avatar.s

@@ -1100,11 +1100,11 @@ sub_806D0E4: @ 806D0E4
 	ldr r0, [r5, 0x8]
 	cmp r0, 0
 	bne _0806D120
-	ldr r0, _0806D11C @ =gUnknown_81C555B
+	ldr r0, _0806D11C @ =EventScript_1C555B
 	b _0806D1E6
 	.align 2, 0
 _0806D118: .4byte gMapHeader
-_0806D11C: .4byte gUnknown_81C555B
+_0806D11C: .4byte EventScript_1C555B
 _0806D120:
 	adds r0, r7, 0
 	adds r1, r6, 0
@@ -1330,10 +1330,10 @@ _0806D2F0:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D308
-	ldr r0, _0806D304 @ =gUnknown_81C549C
+	ldr r0, _0806D304 @ =EventScript_1C549C
 	b _0806D53E
 	.align 2, 0
-_0806D304: .4byte gUnknown_81C549C
+_0806D304: .4byte EventScript_1C549C
 _0806D308:
 	adds r0, r4, 0
 	adds r1, r5, 0
@@ -1641,11 +1641,11 @@ _0806D570:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D5A4
-	ldr r0, _0806D5A0 @ =gUnknown_81A6AC8
+	ldr r0, _0806D5A0 @ =EventScript_1A6AC8
 	b _0806D5E2
 	.align 2, 0
 _0806D59C: .4byte 0x00000824
-_0806D5A0: .4byte gUnknown_81A6AC8
+_0806D5A0: .4byte EventScript_1A6AC8
 _0806D5A4:
 	adds r0, r4, 0
 	bl MetatileBehavior_IsWaterfall
@@ -1670,10 +1670,10 @@ _0806D5A4:
 _0806D5D0: .4byte 0x00000826
 _0806D5D4: .4byte gUnknown_81BE2B7
 _0806D5D8:
-	ldr r0, _0806D5DC @ =gUnknown_81BE2FF
+	ldr r0, _0806D5DC @ =EventScript_81BE2FF
 	b _0806D5E2
 	.align 2, 0
-_0806D5DC: .4byte gUnknown_81BE2FF
+_0806D5DC: .4byte EventScript_81BE2FF
 _0806D5E0:
 	movs r0, 0
 _0806D5E2:
@@ -1834,11 +1834,11 @@ _0806D704:
 	beq _0806D720
 	movs r0, 0xD
 	bl IncrementGameStat
-	ldr r0, _0806D71C @ =gUnknown_81BF546
+	ldr r0, _0806D71C @ =EventScript_81BF546
 	bl ScriptContext1_SetupScript
 	b _0806D730
 	.align 2, 0
-_0806D71C: .4byte gUnknown_81BF546
+_0806D71C: .4byte EventScript_81BF546
 _0806D720:
 	bl SafariZoneTakeStep
 	lsls r0, 24
@@ -2150,13 +2150,13 @@ _0806D950:
 	ldr r0, [r0, 0x8]
 	cmp r0, 0
 	bne _0806D958
-	ldr r0, _0806D960 @ =gUnknown_81C555B
+	ldr r0, _0806D960 @ =EventScript_1C555B
 _0806D958:
 	pop {r4}
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0806D960: .4byte gUnknown_81C555B
+_0806D960: .4byte EventScript_1C555B
 	thumb_func_end sub_806D928
 
 	thumb_func_start mapheader_run_first_tag2_script_list_match_conditionally
@@ -2332,12 +2332,12 @@ _0806DAC4:
 	cmp r0, 0x1
 	bne _0806DAE4
 	bl ResetInitialPlayerAvatarState
-	ldr r0, _0806DAE0 @ =gUnknown_81C1361
+	ldr r0, _0806DAE0 @ =EventScript_1C1361
 	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 	b _0806DAEE
 	.align 2, 0
-_0806DAE0: .4byte gUnknown_81C1361
+_0806DAE0: .4byte EventScript_1C1361
 _0806DAE4:
 	bl DoWarp
 	movs r0, 0x1

asm/fldeff_flash.s

@@ -76,13 +76,13 @@ sub_80C9BB0: @ 80C9BB0
 	bl PlaySE
 	ldr r0, _080C9BC8 @ =0x00000806
 	bl FlagSet
-	ldr r0, _080C9BCC @ =gUnknown_81BFB5F
+	ldr r0, _080C9BCC @ =EventScript_81BFB5F
 	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080C9BC8: .4byte 0x00000806
-_080C9BCC: .4byte gUnknown_81BFB5F
+_080C9BCC: .4byte EventScript_81BFB5F
 	thumb_func_end sub_80C9BB0
 
 	thumb_func_start sub_80C9BD0

asm/macros/movement.inc

@@ -110,6 +110,8 @@
 	create_movement step_65
 	create_movement step_66
 	create_movement step_67
+	create_movement step_68
+	create_movement step_69
 
 	enum_start 0x91
 	create_movement step_91

asm/overworld.s

@@ -6964,13 +6964,13 @@ sub_8058214: @ 8058214
 	thumb_func_start sub_8058230
 sub_8058230: @ 8058230
 	push {lr}
-	ldr r0, _08058240 @ =gUnknown_81BB9F0
+	ldr r0, _08058240 @ =EventScript_1BB9F0
 	bl ScriptContext1_SetupScript
 	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08058240: .4byte gUnknown_81BB9F0
+_08058240: .4byte EventScript_1BB9F0
 	thumb_func_end sub_8058230
 
 	thumb_func_start sub_8058244

asm/wild_encounter.s

@@ -1302,14 +1302,14 @@ sub_80830B8: @ 80830B8
 	bl VarSet
 	cmp r4, 0
 	bne _08083104
-	ldr r0, _08083100 @ =gUnknown_81BFB65
+	ldr r0, _08083100 @ =EventScript_1BFB65
 	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 	b _08083106
 	.align 2, 0
 _080830F8: .4byte gUnknown_203ADFA
 _080830FC: .4byte 0x00004020
-_08083100: .4byte gUnknown_81BFB65
+_08083100: .4byte EventScript_1BFB65
 _08083104:
 	movs r0, 0
 _08083106:

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

include/field_effect.h

@@ -2,76 +2,7 @@
 #define GUARD_FIELD_EFFECTS_H
 
 #include "global.h"
-
+#include "constants/field_effects.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
-};
 
 extern u32 gFieldEffectArguments[8];
 extern void (*gPostMenuFieldCallback)(void);