More enumeration of constants, more annotations of scripts.

1 files changed, 150 insertions, 108 deletions

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 0067ca9ed..75b9b5e76 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -473,110 +473,112 @@ MAP_N_A   EQU -1
 
 ; sprites
 	const_def
-	const SPRITE_NONE
-	const SPRITE_CHRIS
-	const SPRITE_CHRIS_BIKE
-	const SPRITE_GAMEBOY_KID
-	const SPRITE_SILVER
-	const SPRITE_OAK
-	const SPRITE_RED
-	const SPRITE_BLUE
-	const SPRITE_BILL
-	const SPRITE_ELDER
-	const SPRITE_JANINE
-	const SPRITE_KURT
-	const SPRITE_MOM
-	const SPRITE_BLAINE
-	const SPRITE_REDS_MOM
-	const SPRITE_DAISY
-	const SPRITE_ELM
-	const SPRITE_WILL
-	const SPRITE_FALKNER
-	const SPRITE_WHITNEY
-	const SPRITE_BUGSY
-	const SPRITE_MORTY
-	const SPRITE_CHUCK
-	const SPRITE_JASMINE
-	const SPRITE_PRYCE
-	const SPRITE_CLAIR
-	const SPRITE_BROCK
-	const SPRITE_KAREN
-	const SPRITE_BRUNO
-	const SPRITE_MISTY
-	const SPRITE_LANCE
-	const SPRITE_SURGE
-	const SPRITE_ERIKA
-	const SPRITE_KOGA
-	const SPRITE_SABRINA
-	const SPRITE_COOLTRAINER_M
-	const SPRITE_COOLTRAINER_F
-	const SPRITE_BUG_CATCHER
-	const SPRITE_TWIN
-	const SPRITE_YOUNGSTER
-	const SPRITE_LASS
-	const SPRITE_TEACHER
-	const SPRITE_BUENA
-	const SPRITE_SUPER_NERD
-	const SPRITE_ROCKER
-	const SPRITE_POKEFAN_M
-	const SPRITE_POKEFAN_F
-	const SPRITE_GRAMPS
-	const SPRITE_GRANNY
-	const SPRITE_SWIMMER_GUY
-	const SPRITE_SWIMMER_GIRL
-	const SPRITE_BIG_SNORLAX
-	const SPRITE_SURFING_PIKACHU
-	const SPRITE_ROCKET
-	const SPRITE_ROCKET_GIRL
-	const SPRITE_NURSE
-	const SPRITE_LINK_RECEPTIONIST
-	const SPRITE_CLERK
-	const SPRITE_FISHER
-	const SPRITE_FISHING_GURU
-	const SPRITE_SCIENTIST
-	const SPRITE_KIMONO_GIRL
-	const SPRITE_SAGE
-	const SPRITE_UNUSED_GUY
-	const SPRITE_GENTLEMAN
-	const SPRITE_BLACK_BELT
-	const SPRITE_RECEPTIONIST
-	const SPRITE_OFFICER
-	const SPRITE_CAL
-	const SPRITE_SLOWPOKE
-	const SPRITE_CAPTAIN
-	const SPRITE_BIG_LAPRAS
-	const SPRITE_GYM_GUY
-	const SPRITE_SAILOR
-	const SPRITE_BIKER
-	const SPRITE_PHARMACIST
-	const SPRITE_MONSTER
-	const SPRITE_FAIRY
-	const SPRITE_BIRD
-	const SPRITE_DRAGON
-	const SPRITE_BIG_ONIX
-	const SPRITE_N64
-	const SPRITE_SUDOWOODO
-	const SPRITE_SURF
-	const SPRITE_POKE_BALL
-	const SPRITE_POKEDEX
-	const SPRITE_PAPER
-	const SPRITE_VIRTUAL_BOY
-	const SPRITE_OLD_LINK_RECEPTIONIST
-	const SPRITE_ROCK
-	const SPRITE_BOULDER
-	const SPRITE_SNES
-	const SPRITE_FAMICOM
-	const SPRITE_FRUIT_TREE
-	const SPRITE_GOLD_TROPHY
-	const SPRITE_SILVER_TROPHY
-	const SPRITE_KRIS
-	const SPRITE_KRIS_BIKE
-	const SPRITE_KURT_OUTSIDE
-	const SPRITE_SUICUNE
-	const SPRITE_ENTEI
-	const SPRITE_RAIKOU
-	const SPRITE_STANDING_YOUNGSTER
+	const SPRITE_NONE ; 00
+	const SPRITE_CHRIS ; 01
+	const SPRITE_CHRIS_BIKE ; 02
+	const SPRITE_GAMEBOY_KID ; 03
+	const SPRITE_SILVER ; 04
+	const SPRITE_OAK ; 05
+	const SPRITE_RED ; 06
+	const SPRITE_BLUE ; 07
+	const SPRITE_BILL ; 08
+	const SPRITE_ELDER ; 09
+	const SPRITE_JANINE ; 0a
+	const SPRITE_KURT ; 0b
+	const SPRITE_MOM ; 0c
+	const SPRITE_BLAINE ; 0d
+	const SPRITE_REDS_MOM ; 0e
+	const SPRITE_DAISY ; 0f
+	const SPRITE_ELM ; 10
+	const SPRITE_WILL ; 11
+	const SPRITE_FALKNER ; 12
+	const SPRITE_WHITNEY ; 13
+	const SPRITE_BUGSY ; 14
+	const SPRITE_MORTY ; 15
+	const SPRITE_CHUCK ; 16
+	const SPRITE_JASMINE ; 17
+	const SPRITE_PRYCE ; 18
+	const SPRITE_CLAIR ; 19
+	const SPRITE_BROCK ; 1a
+	const SPRITE_KAREN ; 1b
+	const SPRITE_BRUNO ; 1c
+	const SPRITE_MISTY ; 1d
+	const SPRITE_LANCE ; 1e
+	const SPRITE_SURGE ; 1f
+	const SPRITE_ERIKA ; 20
+	const SPRITE_KOGA ; 21
+	const SPRITE_SABRINA ; 22
+	const SPRITE_COOLTRAINER_M ; 23
+	const SPRITE_COOLTRAINER_F ; 24
+	const SPRITE_BUG_CATCHER ; 25
+	const SPRITE_TWIN ; 26
+	const SPRITE_YOUNGSTER ; 27
+	const SPRITE_LASS ; 28
+	const SPRITE_TEACHER ; 29
+	const SPRITE_BUENA ; 2a
+	const SPRITE_SUPER_NERD ; 2b
+	const SPRITE_ROCKER ; 2c
+	const SPRITE_POKEFAN_M ; 2d
+	const SPRITE_POKEFAN_F ; 2e
+	const SPRITE_GRAMPS ; 2f
+	const SPRITE_GRANNY ; 30
+	const SPRITE_SWIMMER_GUY ; 31
+	const SPRITE_SWIMMER_GIRL ; 32
+	const SPRITE_BIG_SNORLAX ; 33
+	const SPRITE_SURFING_PIKACHU ; 34
+	const SPRITE_ROCKET ; 35
+	const SPRITE_ROCKET_GIRL ; 36
+	const SPRITE_NURSE ; 37
+	const SPRITE_LINK_RECEPTIONIST ; 38
+	const SPRITE_CLERK ; 39
+	const SPRITE_FISHER ; 3a
+	const SPRITE_FISHING_GURU ; 3b
+	const SPRITE_SCIENTIST ; 3c
+	const SPRITE_KIMONO_GIRL ; 3d
+	const SPRITE_SAGE ; 3e
+	const SPRITE_UNUSED_GUY ; 3f
+	const SPRITE_GENTLEMAN ; 40
+	const SPRITE_BLACK_BELT ; 41
+	const SPRITE_RECEPTIONIST ; 42
+	const SPRITE_OFFICER ; 43
+	const SPRITE_CAL ; 44
+	const SPRITE_SLOWPOKE ; 45
+	const SPRITE_CAPTAIN ; 46
+	const SPRITE_BIG_LAPRAS ; 47
+	const SPRITE_GYM_GUY ; 48
+	const SPRITE_SAILOR ; 49
+	const SPRITE_BIKER ; 4a
+	const SPRITE_PHARMACIST ; 4b
+	const SPRITE_MONSTER ; 4c
+	const SPRITE_FAIRY ; 4d
+	const SPRITE_BIRD ; 4e
+	const SPRITE_DRAGON ; 4f
+	const SPRITE_BIG_ONIX ; 50
+	const SPRITE_N64 ; 51
+	const SPRITE_SUDOWOODO ; 52
+	const SPRITE_SURF ; 53
+	const SPRITE_POKE_BALL ; 54
+	const SPRITE_POKEDEX ; 55
+	const SPRITE_PAPER ; 56
+	const SPRITE_VIRTUAL_BOY ; 57
+	const SPRITE_OLD_LINK_RECEPTIONIST ; 58
+	const SPRITE_ROCK ; 59
+	const SPRITE_BOULDER ; 5a
+	const SPRITE_SNES ; 5b
+	const SPRITE_FAMICOM ; 5c
+	const SPRITE_FRUIT_TREE ; 5d
+	const SPRITE_GOLD_TROPHY ; 5e
+	const SPRITE_SILVER_TROPHY ; 5f
+	const SPRITE_KRIS ; 60
+	const SPRITE_KRIS_BIKE ; 61
+	const SPRITE_KURT_OUTSIDE ; 62
+	const SPRITE_SUICUNE ; 63
+	const SPRITE_ENTEI ; 64
+	const SPRITE_RAIKOU ; 65
+	const SPRITE_STANDING_YOUNGSTER ; 66
+
 const_value SET $80
+
 SPRITE_POKEMON EQU const_value
 	const SPRITE_UNOWN
 	const SPRITE_GEODUDE
@@ -663,20 +665,20 @@ const_value SET 1
 
 ; object struct
 	const_def
-	const OBJECT_00
-	const OBJECT_01
 	const OBJECT_SPRITE
+	const OBJECT_MAP_OBJECT_INDEX
+	const OBJECT_SPRITE_TILE
 	const OBJECT_03
 	const OBJECT_04
 	const OBJECT_FLAGS
 	const OBJECT_PALETTE
-	const OBJECT_07
-	const OBJECT_08
+	const OBJECT_DIRECTION_WALKING
+	const OBJECT_FACING
 	const OBJECT_09
 	const OBJECT_STEP_DURATION
 	const OBJECT_11
 	const OBJECT_12
-	const OBJECT_FACING
+	const OBJECT_FACING_STEP
 	const OBJECT_STANDING_TILE
 	const OBJECT_NEXT_TILE
 	const OBJECT_MAP_X
@@ -697,3 +699,43 @@ const_value SET 1
 	const OBJECT_31
 	const OBJECT_32
 ; 33-39 are not used
+
+
+	const_def
+	const MAPOBJECT_VRAM_ID ; 0
+	const MAPOBJECT_SPRITE ; 1
+	const MAPOBJECT_Y_COORD ; 2
+	const MAPOBJECT_X_COORD ; 3
+	const MAPOBJECT_FACING ; 4
+	const MAPOBJECT_MOVEMENT ; 5
+	const MAPOBJECT_HOUR ; 6
+	const MAPOBJECT_TIMEOFDAY ; 7
+	const MAPOBJECT_COLOR ; 8
+	const MAPOBJECT_RANGE ; 9
+	const MAPOBJECT_POINTER_LO ; a
+	const MAPOBJECT_POINTER_HI ; b
+	const MAPOBJECT_FLAG_LO ; c
+	const MAPOBJECT_FLAG_HI ; d
+	const MAPOBJECT_E
+	const MAPOBJECT_F
+	
+MAPOBJECT_NOT_VISIBLE EQU -1
+MAPOBJECT_SCREEN_HEIGHT EQU 11
+MAPOBJECT_SCREEN_WIDTH EQU 12
+OBJECT_STRUCT_3_DATA_WIDTH EQU 6
+OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
+
+
+	const_def
+	const EMOTE_SHOCK ; 0
+	const EMOTE_QUESTION ; 1
+	const EMOTE_HAPPY ; 2
+	const EMOTE_SAD ; 3
+	const EMOTE_HEART ; 4
+	const EMOTE_BOLT ; 5
+	const EMOTE_SLEEP ; 6
+	const EMOTE_FISH ; 7
+	const EMOTE_ROD_DOWN ; 8
+	const EMOTE_ROD_UP ; 9
+	const EMOTE_ROD_LEFT ; a
+	const EMOTE_ROD_RIGHT ; b