diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_object_constants.asm | 4 | ||||
| -rw-r--r-- | constants/script_constants.asm | 11 | ||||
| -rw-r--r-- | constants/text_constants.asm | 4 | ||||
| -rw-r--r-- | constants/tileset_constants.asm | 2 |
4 files changed, 16 insertions, 5 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 00ddb772a..f1f81d64c 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -34,7 +34,7 @@ const OBJECT_1F ; 1f const OBJECT_RANGE ; 20 ; 21-27 are not used -OBJECT_STRUCT_LENGTH EQU 40 +OBJECT_LENGTH EQU 40 NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs ; object_struct OBJECT_FACING values @@ -114,7 +114,7 @@ ABSOLUTE_TILE_ID EQU 1 << ABSOLUTE_TILE_ID_F const MAPOBJECT_FLAG_HI ; d const MAPOBJECT_E ; unused const MAPOBJECT_F ; unused -OBJECT_LENGTH EQU const_value +MAPOBJECT_LENGTH EQU const_value ; SpriteMovementData struct members (see data/sprites/map_objects.asm) const_def diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 99275efe3..cfcbfbb52 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -92,6 +92,17 @@ RETVAR_EXECUTE EQU (2 << 6) const PLAYEREVENT_JOYCHANGEFACING NUM_PLAYER_EVENTS EQU const_value +; PlayerMovement.pointers indexes (see engine/overworld/events.asm) + const_def + const PLAYERMOVEMENT_NORMAL + const PLAYERMOVEMENT_WARP + const PLAYERMOVEMENT_TURN + const PLAYERMOVEMENT_FORCE_TURN + const PLAYERMOVEMENT_FINISH + const PLAYERMOVEMENT_CONTINUE + const PLAYERMOVEMENT_EXIT_WATER + const PLAYERMOVEMENT_JUMP + ; script data sizes (see macros/scripts/maps.asm) SCENE_SCRIPT_SIZE EQU 4 ; scene_script CALLBACK_SIZE EQU 3 ; callback diff --git a/constants/text_constants.asm b/constants/text_constants.asm index ee5589561..f1c3a0bf7 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -33,12 +33,12 @@ TEXTBOX_INNERY EQU TEXTBOX_Y + 2 ; PrintNum bit flags const_def 5 const PRINTNUM_MONEY_F ; 5 - const PRINTNUM_RIGHTALIGN_F ; 6 + const PRINTNUM_LEFTALIGN_F ; 6 const PRINTNUM_LEADINGZEROS_F ; 7 ; PrintNum arguments (see engine/math/print_num.asm) PRINTNUM_MONEY EQU 1 << PRINTNUM_MONEY_F -PRINTNUM_RIGHTALIGN EQU 1 << PRINTNUM_RIGHTALIGN_F +PRINTNUM_LEFTALIGN EQU 1 << PRINTNUM_LEFTALIGN_F PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F ; character sets (see charmap.asm) diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index e89714fee..79be4ad57 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -21,7 +21,7 @@ const TILESET_LIGHTHOUSE ; 13 const TILESET_PLAYERS_ROOM ; 14 const TILESET_POKECOM_CENTER ; 15 - const TILESET_BATTLE_TOWER ; 16 + const TILESET_BATTLE_TOWER_INSIDE ; 16 const TILESET_TOWER ; 17 const TILESET_CAVE ; 18 const TILESET_PARK ; 19 |