Trainer data structure and field move functions

Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.

macros/movement.asm

@@ -292,7 +292,11 @@ fix_facing: macro
 	db movement_fix_facing ; $3b
 	endm
 
-__enum__ = $3d
+	enum movement_return_dig
+return_dig: macro
+	db movement_return_dig
+	db \1
+	endm
 
 	enum movement_hide_person
 hide_person: macro
@@ -351,7 +355,17 @@ step_wait5: macro
 	db movement_step_wait5 ; $4f
 	endm
 
-__enum__ = $53
+__enum__ = $51
+
+	enum movement_fish_got_bite
+fish_got_bite: macro
+	db movement_fish_got_bite
+	endm
+
+	enum movement_fish_got_bite_2
+fish_got_bite_2: macro
+	db movement_fish_got_bite_2
+	endm
 
 	enum movement_hide_emote
 hide_emote: macro

macros/trainer.asm

@@ -2,3 +2,10 @@ trainerclass: MACRO
 	enum \1
 const_value = 1
 ENDM
+
+trainer: MACRO
+	; flag, group, id, seen text, win text, lost text, talk-again text
+	dw \1
+	db \2, \3
+	dw \4, \5, \6, \7
+ENDM