Don't pass redundant label names to table_width
and list_start
(#1160)
This commit is contained in:
@@ -49,7 +49,7 @@ _PlayerDecorationMenu:
|
||||
dw .category_pointers
|
||||
|
||||
.category_pointers:
|
||||
table_width 2 + 2, _PlayerDecorationMenu.category_pointers
|
||||
table_width 2 + 2
|
||||
dw DecoBedMenu, .bed
|
||||
dw DecoCarpetMenu, .carpet
|
||||
dw DecoPlantMenu, .plant
|
||||
@@ -124,7 +124,7 @@ _PlayerDecorationMenu:
|
||||
ret
|
||||
|
||||
.owned_pointers:
|
||||
table_width 3, _PlayerDecorationMenu.owned_pointers
|
||||
table_width 3
|
||||
dwb FindOwnedBeds, 0 ; bed
|
||||
dwb FindOwnedCarpets, 1 ; carpet
|
||||
dwb FindOwnedPlants, 2 ; plant
|
||||
@@ -455,7 +455,7 @@ DoDecorationAction2:
|
||||
ret
|
||||
|
||||
.DecoActions:
|
||||
table_width 2, DoDecorationAction2.DecoActions
|
||||
table_width 2
|
||||
dw DecoAction_nothing
|
||||
dw DecoAction_setupbed
|
||||
dw DecoAction_putawaybed
|
||||
@@ -513,7 +513,7 @@ GetDecoName:
|
||||
ret
|
||||
|
||||
.NameFunctions:
|
||||
table_width 2, GetDecoName.NameFunctions
|
||||
table_width 2
|
||||
dw .invalid
|
||||
dw .plant
|
||||
dw .bed
|
||||
@@ -976,7 +976,7 @@ DescribeDecoration::
|
||||
|
||||
.Jumptable:
|
||||
; entries correspond to DECODESC_* constants
|
||||
table_width 2, DescribeDecoration.Jumptable
|
||||
table_width 2
|
||||
dw DecorationDesc_Poster
|
||||
dw DecorationDesc_LeftOrnament
|
||||
dw DecorationDesc_RightOrnament
|
||||
|
@@ -570,7 +570,7 @@ TryObjectEvent:
|
||||
ret
|
||||
|
||||
ObjectEventTypeArray:
|
||||
table_width 3, ObjectEventTypeArray
|
||||
table_width 3
|
||||
dbw OBJECTTYPE_SCRIPT, .script
|
||||
dbw OBJECTTYPE_ITEMBALL, .itemball
|
||||
dbw OBJECTTYPE_TRAINER, .trainer
|
||||
@@ -641,7 +641,7 @@ TryBGEvent:
|
||||
ret
|
||||
|
||||
BGEventJumptable:
|
||||
table_width 2, BGEventJumptable
|
||||
table_width 2
|
||||
dw .read
|
||||
dw .up
|
||||
dw .down
|
||||
@@ -760,7 +760,7 @@ PlayerMovement:
|
||||
|
||||
PlayerMovementPointers:
|
||||
; entries correspond to PLAYERMOVEMENT_* constants
|
||||
table_width 2, PlayerMovementPointers
|
||||
table_width 2
|
||||
dw .normal
|
||||
dw .warp
|
||||
dw .turn
|
||||
@@ -976,7 +976,7 @@ DoPlayerEvent:
|
||||
|
||||
PlayerEventScriptPointers:
|
||||
; entries correspond to PLAYEREVENT_* constants
|
||||
table_width 3, PlayerEventScriptPointers
|
||||
table_width 3
|
||||
dba InvalidEventScript ; PLAYEREVENT_NONE
|
||||
dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER
|
||||
dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER
|
||||
|
@@ -1,6 +1,6 @@
|
||||
ObjectActionPairPointers:
|
||||
; entries correspond to OBJECT_ACTION_* constants (see constants/map_object_constants.asm)
|
||||
table_width 2 + 2, ObjectActionPairPointers
|
||||
table_width 2 + 2
|
||||
; normal action, frozen action
|
||||
dw SetFacingStanding, SetFacingStanding
|
||||
dw SetFacingStandAction, SetFacingCurrent
|
||||
|
@@ -524,7 +524,7 @@ StepFunction_FromMovement:
|
||||
|
||||
.Pointers:
|
||||
; entries correspond to SPRITEMOVEFN_* constants (see constants/map_object_constants.asm)
|
||||
table_width 2, StepFunction_FromMovement.Pointers
|
||||
table_width 2
|
||||
dw MovementFunction_Null ; 00
|
||||
dw MovementFunction_RandomWalkY ; 01
|
||||
dw MovementFunction_RandomWalkX ; 02
|
||||
@@ -1088,7 +1088,7 @@ _SetRandomStepDuration:
|
||||
|
||||
StepTypesJumptable:
|
||||
; entries correspond to STEP_TYPE_* constants (see constants/map_object_constants.asm)
|
||||
table_width 2, StepTypesJumptable
|
||||
table_width 2
|
||||
dw StepFunction_Reset ; 00
|
||||
dw StepFunction_FromMovement ; 01
|
||||
dw StepFunction_NPCWalk ; 02
|
||||
|
@@ -1,6 +1,6 @@
|
||||
MovementPointers:
|
||||
; entries correspond to movement_* constants (see macros/scripts/movement.asm)
|
||||
table_width 2, MovementPointers
|
||||
table_width 2
|
||||
dw Movement_turn_head_down ; 00
|
||||
dw Movement_turn_head_up ; 01
|
||||
dw Movement_turn_head_left ; 02
|
||||
|
@@ -462,7 +462,7 @@ DoPlayerMovement::
|
||||
|
||||
.Steps:
|
||||
; entries correspond to STEP_* constants (see constants/map_object_constants.asm)
|
||||
table_width 2, DoPlayerMovement.Steps
|
||||
table_width 2
|
||||
dw .SlowStep
|
||||
dw .NormalStep
|
||||
dw .FastStep
|
||||
|
@@ -63,7 +63,7 @@ RunScriptCommand:
|
||||
|
||||
ScriptCommandTable:
|
||||
; entries correspond to *_command constants (see macros/scripts/events.asm)
|
||||
table_width 2, ScriptCommandTable
|
||||
table_width 2
|
||||
dw Script_scall ; 00
|
||||
dw Script_farscall ; 01
|
||||
dw Script_memcall ; 02
|
||||
|
Reference in New Issue
Block a user