Merge pull request #514 from Rangi42/master

[Ready to merge] Named constants for sprite movement data bit flags + other minor fixes

3 files changed, 81 insertions, 34 deletions

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 3efc8e30b..7c07c9e9e 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -5,8 +5,8 @@ ENDM
 
 map_const: MACRO
 ;\1: map id
-;\2: height: in blocks
-;\3: width: in blocks
+;\2: width: in blocks
+;\3: height: in blocks
 GROUP_\1 EQU const_value
 	enum MAP_\1
 \1_WIDTH EQU \2
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm
index 73685d4ec..ee0b21356 100644
--- a/constants/map_object_constants.asm
+++ b/constants/map_object_constants.asm
@@ -44,16 +44,54 @@ OW_LEFT  EQU LEFT  << 2
 OW_RIGHT EQU RIGHT << 2
 
 ; object_struct OBJECT_FLAGS1 bit flags
-INVISIBLE    EQU 0
-FIXED_FACING EQU 2
-SLIDING      EQU 3
-EMOTE_OBJECT EQU 7
+	const_def
+	const INVISIBLE_F     ; 0
+	const WONT_DELETE_F   ; 1
+	const FIXED_FACING_F  ; 2
+	const SLIDING_F       ; 3
+	const NOCLIP_TILES_F  ; 4
+	const MOVE_ANYWHERE_F ; 5
+	const NOCLIP_OBJS_F   ; 6
+	const EMOTE_OBJECT_F  ; 7
+
+INVISIBLE     EQU 1 << INVISIBLE_F
+WONT_DELETE   EQU 1 << WONT_DELETE_F
+FIXED_FACING  EQU 1 << FIXED_FACING_F
+SLIDING       EQU 1 << SLIDING_F
+NOCLIP_TILES  EQU 1 << NOCLIP_TILES_F
+MOVE_ANYWHERE EQU 1 << MOVE_ANYWHERE_F
+NOCLIP_OBJS   EQU 1 << NOCLIP_OBJS_F
+EMOTE_OBJECT  EQU 1 << EMOTE_OBJECT_F
 
 ; object_struct OBJECT_FLAGS2 bit flags
-LOW_PRIORITY  EQU 0
-HIGH_PRIORITY EQU 1
-OVERHEAD      EQU 3
+	const_def
+	const LOW_PRIORITY_F  ; 0
+	const HIGH_PRIORITY_F ; 1
+	const OBJ_FLAGS2_2    ; 2
+	const OVERHEAD_F      ; 3
+	const USE_OBP1_F      ; 4
+
+LOW_PRIORITY  EQU 1 << LOW_PRIORITY_F
+HIGH_PRIORITY EQU 1 << HIGH_PRIORITY_F
+OVERHEAD      EQU 1 << OVERHEAD_F
+USE_OBP1      EQU 1 << USE_OBP1_F
+
+; object_struct OBJECT_PALETTE bit flags
+	const_def 5
+	const SWIMMING_F         ; 5
+	const STRENGTH_BOULDER_F ; 6
+	const BIG_OBJECT_F       ; 7
 
+SWIMMING         EQU 1 << SWIMMING_F
+STRENGTH_BOULDER EQU 1 << STRENGTH_BOULDER_F
+BIG_OBJECT       EQU 1 << BIG_OBJECT_F
+
+; facing attribute bit flags
+RELATIVE_ATTRIBUTES_F EQU 1
+ABSOLUTE_TILE_ID_F    EQU 2
+
+RELATIVE_ATTRIBUTES EQU 1 << RELATIVE_ATTRIBUTES_F
+ABSOLUTE_TILE_ID    EQU 1 << ABSOLUTE_TILE_ID_F
 
 ; map_object struct members (see macros/wram.asm)
 	const_def
@@ -75,8 +113,18 @@ OVERHEAD      EQU 3
 	const MAPOBJECT_F ; unused
 OBJECT_LENGTH EQU const_value
 
-MAPOBJECT_SCREEN_HEIGHT EQU 11
-MAPOBJECT_SCREEN_WIDTH EQU 12
+; SpriteMovementData struct members (see data/sprites/map_objects.asm)
+	const_def
+	const SPRITEMOVEATTR_MOVEMENT ; 0
+	const SPRITEMOVEATTR_FACING   ; 1
+	const SPRITEMOVEATTR_ACTION   ; 2
+	const SPRITEMOVEATTR_FLAGS1   ; 3
+	const SPRITEMOVEATTR_FLAGS2   ; 4
+	const SPRITEMOVEATTR_PALFLAGS ; 5
+NUM_SPRITEMOVEDATA_FIELDS EQU const_value
+
+MAPOBJECT_SCREEN_WIDTH  EQU (SCREEN_WIDTH / 2) + 2
+MAPOBJECT_SCREEN_HEIGHT EQU (SCREEN_HEIGHT / 2) + 2
 
 
 ; SpriteMovementData indexes (see data/sprites/map_objects.asm)
@@ -119,7 +167,6 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
 	const SPRITEMOVEDATA_GRASS                ; 23
 	const SPRITEMOVEDATA_SWIM_WANDER          ; 24
 NUM_SPRITEMOVEDATA EQU const_value
-SPRITEMOVEDATA_FIELDS EQU 6
 
 ; MapObjectMovementPattern.Pointers indexes (see engine/overworld/map_objects.asm)
 	const_def
diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm
index e7d987113..807b5003c 100644
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -15,9 +15,9 @@
 	const SCGB_GS_TITLE_SCREEN
 	const SCGB_0D
 	const SCGB_MOVE_LIST
-	const SCGB_0F
+	const SCGB_BETA_PIKACHU_MINIGAME
 	const SCGB_POKEDEX_SEARCH_OPTION
-	const SCGB_11
+	const SCGB_BETA_POKER
 	const SCGB_POKEPIC
 	const SCGB_13
 	const SCGB_PACKPALS
@@ -75,40 +75,40 @@ SCGB_RAM EQU -1
 	const PREDEFPAL_RB_PINKMON
 	const PREDEFPAL_RB_YELLOWMON
 	const PREDEFPAL_CGB_BADGE ; RB_GREYMON
-	const PREDEFPAL_MEWMON_NITE
-	const PREDEFPAL_BLUEMON_NITE
-	const PREDEFPAL_REDMON_NITE
-	const PREDEFPAL_CYANMON_NITE
-	const PREDEFPAL_PURPLEMON_NITE
-	const PREDEFPAL_BROWNMON_NITE
-	const PREDEFPAL_GREENMON_NITE
-	const PREDEFPAL_PINKMON_NITE
-	const PREDEFPAL_YELLOWMON_NITE
-	const PREDEFPAL_PARTY_ICON ; GREYMON_NITE
+	const PREDEFPAL_BETA_SHINY_MEWMON
+	const PREDEFPAL_BETA_SHINY_BLUEMON
+	const PREDEFPAL_BETA_SHINY_REDMON
+	const PREDEFPAL_BETA_SHINY_CYANMON
+	const PREDEFPAL_BETA_SHINY_PURPLEMON
+	const PREDEFPAL_BETA_SHINY_BROWNMON
+	const PREDEFPAL_BETA_SHINY_GREENMON
+	const PREDEFPAL_BETA_SHINY_PINKMON
+	const PREDEFPAL_BETA_SHINY_YELLOWMON
+	const PREDEFPAL_PARTY_ICON ; BETA_SHINY_GREYMON
 	const PREDEFPAL_HP_GREEN
 	const PREDEFPAL_HP_YELLOW
 	const PREDEFPAL_HP_RED
 	const PREDEFPAL_POKEGEAR
-	const PREDEFPAL_33
-	const PREDEFPAL_34
+	const PREDEFPAL_BETA_LOGO_1
+	const PREDEFPAL_BETA_LOGO_2
 	const PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
 	const PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS
-	const PREDEFPAL_37
+	const PREDEFPAL_BETA_INTRO_LAPRAS
 	const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
 	const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
 	const PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
-	const PREDEFPAL_3B
+	const PREDEFPAL_BETA_INTRO_VENUSAUR
 	const PREDEFPAL_PACK ; GS_INTRO_CHARIZARD
 	const PREDEFPAL_SLOT_MACHINE_0
 	const PREDEFPAL_SLOT_MACHINE_1
 	const PREDEFPAL_SLOT_MACHINE_2
 	const PREDEFPAL_SLOT_MACHINE_3
-	const PREDEFPAL_SCGB_11_0
-	const PREDEFPAL_SCGB_11_1
-	const PREDEFPAL_SCGB_11_2
-	const PREDEFPAL_SCGB_11_3
-	const PREDEFPAL_45
-	const PREDEFPAL_46
+	const PREDEFPAL_BETA_POKER_0
+	const PREDEFPAL_BETA_POKER_1
+	const PREDEFPAL_BETA_POKER_2
+	const PREDEFPAL_BETA_POKER_3
+	const PREDEFPAL_BETA_RADIO
+	const PREDEFPAL_BETA_POKEGEAR
 	const PREDEFPAL_47
 	const PREDEFPAL_GS_TITLE_SCREEN_0
 	const PREDEFPAL_GS_TITLE_SCREEN_1