summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_anims/object_gfx.asm2
-rw-r--r--data/events/collision_stdscripts.asm2
-rw-r--r--data/items/attributes.asm2
-rw-r--r--data/items/catch_rate_items.asm2
-rw-r--r--data/predef_pointers.asm2
-rw-r--r--data/sprites/facings.asm100
-rw-r--r--data/sprites/map_objects.asm228
-rw-r--r--data/types/type_matchups.asm4
-rw-r--r--data/wild/treemon_maps.asm2
9 files changed, 172 insertions, 172 deletions
diff --git a/data/battle_anims/object_gfx.asm b/data/battle_anims/object_gfx.asm
index 133298d13..441692b03 100644
--- a/data/battle_anims/object_gfx.asm
+++ b/data/battle_anims/object_gfx.asm
@@ -1,6 +1,6 @@
anim_obj_gfx: MACRO
; # tiles, label
- db \1
+ db \1
dba \2
ENDM
diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm
index 8156d039d..dff26dd85 100644
--- a/data/events/collision_stdscripts.asm
+++ b/data/events/collision_stdscripts.asm
@@ -10,4 +10,4 @@ TileCollisionStdScripts:
dbw COLL_TV, tv
dbw COLL_WINDOW, window
dbw COLL_INCENSE_BURNER, incenseburner
- db -1 ; end
+ db -1 ; end
diff --git a/data/items/attributes.asm b/data/items/attributes.asm
index 9f669e979..e0198e3ad 100644
--- a/data/items/attributes.asm
+++ b/data/items/attributes.asm
@@ -269,7 +269,7 @@ ItemAttributes: ; 67c1
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; STARDUST
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
-; STAR PIECE
+; STAR_PIECE
item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BASEMENT_KEY
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
diff --git a/data/items/catch_rate_items.asm b/data/items/catch_rate_items.asm
index fbab7d434..d7ef4cf2b 100644
--- a/data/items/catch_rate_items.asm
+++ b/data/items/catch_rate_items.asm
@@ -15,5 +15,5 @@ TimeCapsule_CatchRateItems: ; 28785
db ITEM_DC, BERRY
db ITEM_FA, BERRY
db -1, BERRY
- db 0 ; end
+ db 0 ; end
; 2879e
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
index 3a14a19ee..87906597a 100644
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -58,7 +58,7 @@ PredefPointers:: ; 856b
add_predef InitSGBBorder ; $30
add_predef LoadSGBLayout
add_predef Pokedex_GetArea
- add_predef Unused_CheckContestMon
+ add_predef Unused_CheckShininess
add_predef DoBattleTransition
add_predef DummyPredef35
add_predef DummyPredef36
diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm
index 166455707..c321ca462 100644
--- a/data/sprites/facings.asm
+++ b/data/sprites/facings.asm
@@ -50,24 +50,24 @@ FacingWeirdTree2: ; standing down
db 4 ; #
db 0, 0, 0, $00
db 0, 8, 0, $01
- db 8, 0, 2, $02
- db 8, 8, 2, $03
+ db 8, 0, RELATIVE_ATTRIBUTES, $02
+ db 8, 8, RELATIVE_ATTRIBUTES, $03
; 409c
FacingStepDown1: ; walking down 1
db 4 ; #
db 0, 0, 0, $80
db 0, 8, 0, $81
- db 8, 0, 2, $82
- db 8, 8, 2, $83
+ db 8, 0, RELATIVE_ATTRIBUTES, $82
+ db 8, 8, RELATIVE_ATTRIBUTES, $83
; 40ad
FacingStepDown3: ; walking down 2
db 4 ; #
db 0, 8, X_FLIP, $80
db 0, 0, X_FLIP, $81
- db 8, 8, 2 | X_FLIP, $82
- db 8, 0, 2 | X_FLIP, $83
+ db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $82
+ db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $83
; 40be
FacingStepUp0:
@@ -75,24 +75,24 @@ FacingStepUp2: ; standing up
db 4 ; #
db 0, 0, 0, $04
db 0, 8, 0, $05
- db 8, 0, 2, $06
- db 8, 8, 2, $07
+ db 8, 0, RELATIVE_ATTRIBUTES, $06
+ db 8, 8, RELATIVE_ATTRIBUTES, $07
; 40cf
FacingStepUp1: ; walking up 1
db 4 ; #
db 0, 0, 0, $84
db 0, 8, 0, $85
- db 8, 0, 2, $86
- db 8, 8, 2, $87
+ db 8, 0, RELATIVE_ATTRIBUTES, $86
+ db 8, 8, RELATIVE_ATTRIBUTES, $87
; 40e0
FacingStepUp3: ; walking up 2
db 4 ; #
db 0, 8, X_FLIP, $84
db 0, 0, X_FLIP, $85
- db 8, 8, 2 | X_FLIP, $86
- db 8, 0, 2 | X_FLIP, $87
+ db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $86
+ db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $87
; 40f1
FacingStepLeft0:
@@ -100,8 +100,8 @@ FacingStepLeft2: ; standing left
db 4 ; #
db 0, 0, 0, $08
db 0, 8, 0, $09
- db 8, 0, 2, $0a
- db 8, 8, 2, $0b
+ db 8, 0, RELATIVE_ATTRIBUTES, $0a
+ db 8, 8, RELATIVE_ATTRIBUTES, $0b
; 4102
FacingStepRight0:
@@ -109,8 +109,8 @@ FacingStepRight2: ; standing right
db 4 ; #
db 0, 8, X_FLIP, $08
db 0, 0, X_FLIP, $09
- db 8, 8, 2 | X_FLIP, $0a
- db 8, 0, 2 | X_FLIP, $0b
+ db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
+ db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
; 4113
FacingStepLeft1:
@@ -118,8 +118,8 @@ FacingStepLeft3: ; walking left
db 4 ; #
db 0, 0, 0, $88
db 0, 8, 0, $89
- db 8, 0, 2, $8a
- db 8, 8, 2, $8b
+ db 8, 0, RELATIVE_ATTRIBUTES, $8a
+ db 8, 8, RELATIVE_ATTRIBUTES, $8b
; 4124
FacingStepRight1:
@@ -127,58 +127,58 @@ FacingStepRight3: ; walking right
db 4 ; #
db 0, 8, X_FLIP, $88
db 0, 0, X_FLIP, $89
- db 8, 8, 2 | X_FLIP, $8a
- db 8, 0, 2 | X_FLIP, $8b
+ db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $8a
+ db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $8b
; 4135
FacingFishDown: ; fishing down
db 5 ; #
db 0, 0, 0, $00
db 0, 8, 0, $01
- db 8, 0, 2, $02
- db 8, 8, 2, $03
- db 16, 0, 4, $fc
+ db 8, 0, RELATIVE_ATTRIBUTES, $02
+ db 8, 8, RELATIVE_ATTRIBUTES, $03
+ db 16, 0, ABSOLUTE_TILE_ID, $fc
; 414a
FacingFishUp: ; fishing up
db 5 ; #
db 0, 0, 0, $04
db 0, 8, 0, $05
- db 8, 0, 2, $06
- db 8, 8, 2, $07
- db -8, 0, 4, $fc
+ db 8, 0, RELATIVE_ATTRIBUTES, $06
+ db 8, 8, RELATIVE_ATTRIBUTES, $07
+ db -8, 0, ABSOLUTE_TILE_ID, $fc
; 415f
FacingFishLeft: ; fishing left
db 5 ; #
db 0, 0, 0, $08
db 0, 8, 0, $09
- db 8, 0, 2, $0a
- db 8, 8, 2, $0b
- db 5, -8, 4 | X_FLIP, $fd
+ db 8, 0, RELATIVE_ATTRIBUTES, $0a
+ db 8, 8, RELATIVE_ATTRIBUTES, $0b
+ db 5, -8, ABSOLUTE_TILE_ID | X_FLIP, $fd
; 4174
FacingFishRight: ; fishing right
db 5 ; #
db 0, 8, X_FLIP, $08
db 0, 0, X_FLIP, $09
- db 8, 8, 2 | X_FLIP, $0a
- db 8, 0, 2 | X_FLIP, $0b
- db 5, 16, 4, $fd
+ db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $0a
+ db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $0b
+ db 5, 16, ABSOLUTE_TILE_ID, $fd
; 4189
FacingEmote: ; emote
db 4 ; #
- db 0, 0, 4, $f8
- db 0, 8, 4, $f9
- db 8, 0, 4, $fa
- db 8, 8, 4, $fb
+ db 0, 0, ABSOLUTE_TILE_ID, $f8
+ db 0, 8, ABSOLUTE_TILE_ID, $f9
+ db 8, 0, ABSOLUTE_TILE_ID, $fa
+ db 8, 8, ABSOLUTE_TILE_ID, $fb
; 419a
FacingShadow: ; shadow
db 2 ; #
- db 0, 0, 4, $fc
- db 0, 8, 4 | X_FLIP, $fc
+ db 0, 0, ABSOLUTE_TILE_ID, $fc
+ db 0, 8, ABSOLUTE_TILE_ID | X_FLIP, $fc
; 41a3
FacingBigDollSymmetric: ; big snorlax or lapras doll
@@ -237,28 +237,28 @@ FacingBigDollAsymmetric: ; big doll other than snorlax or lapras
FacingBoulderDust1: ; boulder dust 1
db 4 ; #
- db 0, 0, 4, $fe
- db 0, 8, 4, $fe
- db 8, 0, 4, $fe
- db 8, 8, 4, $fe
+ db 0, 0, ABSOLUTE_TILE_ID, $fe
+ db 0, 8, ABSOLUTE_TILE_ID, $fe
+ db 8, 0, ABSOLUTE_TILE_ID, $fe
+ db 8, 8, ABSOLUTE_TILE_ID, $fe
; 4250
FacingBoulderDust2: ; boulder dust 2
db 4 ; #
- db 0, 0, 4, $ff
- db 0, 8, 4, $ff
- db 8, 0, 4, $ff
- db 8, 8, 4, $ff
+ db 0, 0, ABSOLUTE_TILE_ID, $ff
+ db 0, 8, ABSOLUTE_TILE_ID, $ff
+ db 8, 0, ABSOLUTE_TILE_ID, $ff
+ db 8, 8, ABSOLUTE_TILE_ID, $ff
; 4261
FacingGrass1: ; 4261
db 2 ; #
- db 8, 0, 4, $fe
- db 8, 8, 4 | X_FLIP, $fe
+ db 8, 0, ABSOLUTE_TILE_ID, $fe
+ db 8, 8, ABSOLUTE_TILE_ID | X_FLIP, $fe
; 426a
FacingGrass2: ; 426a
db 2 ; #
- db 9, -1, 4, $fe
- db 9, 9, 4 | X_FLIP, $fe
+ db 9, -1, ABSOLUTE_TILE_ID, $fe
+ db 9, 9, ABSOLUTE_TILE_ID | X_FLIP, $fe
; 4273
diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm
index 8821f8a1b..cf577869a 100644
--- a/data/sprites/map_objects.asm
+++ b/data/sprites/map_objects.asm
@@ -5,304 +5,304 @@ SpriteMovementData:: ; 4273
db SPRITEMOVEFN_00 ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000010 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_STILL
db SPRITEMOVEFN_STANDING ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00001100 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db FIXED_FACING | SLIDING ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_WANDER
db SPRITEMOVEFN_RANDOM_WALK_XY ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SPINRANDOM_SLOW
db SPRITEMOVEFN_SLOW_RANDOM_SPIN ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_WALK_UP_DOWN
db SPRITEMOVEFN_RANDOM_WALK_Y ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_WALK_LEFT_RIGHT
db SPRITEMOVEFN_RANDOM_WALK_X ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_STANDING_DOWN
db SPRITEMOVEFN_STANDING ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_STANDING_UP
db SPRITEMOVEFN_STANDING ; movement function
db UP ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_STANDING_LEFT
db SPRITEMOVEFN_STANDING ; movement function
db LEFT ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_STANDING_RIGHT
db SPRITEMOVEFN_STANDING ; movement function
db RIGHT ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SPINRANDOM_FAST
db SPRITEMOVEFN_FAST_RANDOM_SPIN ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_PLAYER
db SPRITEMOVEFN_OBEY_DPAD ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000010 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_0C
db SPRITEMOVEFN_08 ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_0D
db SPRITEMOVEFN_09 ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_0E
db SPRITEMOVEFN_0A ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_0F
db SPRITEMOVEFN_0B ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_10
db SPRITEMOVEFN_0C ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_11
db SPRITEMOVEFN_0D ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_12
db SPRITEMOVEFN_0E ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_FOLLOWING
db SPRITEMOVEFN_FOLLOW ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000010 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SCRIPTED
db SPRITEMOVEFN_SCRIPTED ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000010 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_BIGDOLLSYM
db SPRITEMOVEFN_BIG_SNORLAX ; movement function
db DOWN ; facing
db OBJECT_ACTION_BIG_DOLL_SYM ; action
- db %00101110 ; flags1
- db %00000001 ; flags2
- db %11000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+ db LOW_PRIORITY ; flags2
+ db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
; SPRITEMOVEDATA_POKEMON
db SPRITEMOVEFN_BOUNCE ; movement function
db DOWN ; facing
db OBJECT_ACTION_BOUNCE ; action
- db %00101110 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SUDOWOODO
db SPRITEMOVEFN_STANDING ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00001100 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db FIXED_FACING | SLIDING ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SMASHABLE_ROCK
db SPRITEMOVEFN_STANDING ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00101110 ; flags1
- db %00010000 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+ db USE_OBP1 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_STRENGTH_BOULDER
db SPRITEMOVEFN_STRENGTH ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00101110 ; flags1
- db %00000000 ; flags2
- db %01000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+ db 0 ; flags2
+ db STRENGTH_BOULDER ; palette flags
; SPRITEMOVEDATA_FOLLOWNOTEXACT
db SPRITEMOVEFN_FOLLOWNOTEXACT ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000010 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SHADOW
db SPRITEMOVEFN_SHADOW ; movement function
db DOWN ; facing
db OBJECT_ACTION_00 ; action
- db %10001110 ; flags1
- db %00000001 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+ db LOW_PRIORITY ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_EMOTE
db SPRITEMOVEFN_EMOTE ; movement function
db DOWN ; facing
db OBJECT_ACTION_EMOTE ; action
- db %10001110 ; flags1
- db %00000010 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+ db HIGH_PRIORITY ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SCREENSHAKE
db SPRITEMOVEFN_SCREENSHAKE ; movement function
db DOWN ; facing
db OBJECT_ACTION_00 ; action
- db %10000010 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE | EMOTE_OBJECT ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
db SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; movement function
db LEFT ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SPINCLOCKWISE
db SPRITEMOVEFN_SPIN_CLOCKWISE ; movement function
db RIGHT ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_BIGDOLLASYM
db SPRITEMOVEFN_STRENGTH ; movement function
db DOWN ; facing
db OBJECT_ACTION_BIG_DOLL_ASYM ; action
- db %00101110 ; flags1
- db %00000001 ; flags2
- db %11000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+ db LOW_PRIORITY ; flags2
+ db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
; SPRITEMOVEDATA_BIGDOLL
db SPRITEMOVEFN_STRENGTH ; movement function
db DOWN ; facing
db OBJECT_ACTION_BIG_DOLL ; action
- db %00101110 ; flags1
- db %00000001 ; flags2
- db %11000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1
+ db LOW_PRIORITY ; flags2
+ db STRENGTH_BOULDER | BIG_OBJECT ; palette flags
; SPRITEMOVEDATA_BOULDERDUST
db SPRITEMOVEFN_BOULDERDUST ; movement function
db DOWN ; facing
db OBJECT_ACTION_BOULDER_DUST ; action
- db %10001110 ; flags1
- db %00000001 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+ db LOW_PRIORITY ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_GRASS
db SPRITEMOVEFN_GRASS ; movement function
db DOWN ; facing
db OBJECT_ACTION_GRASS_SHAKE ; action
- db %10001110 ; flags1
- db %00000010 ; flags2
- db %00000000 ; palette flags
+ db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1
+ db HIGH_PRIORITY ; flags2
+ db 0 ; palette flags
; SPRITEMOVEDATA_SWIM_WANDER
db SPRITEMOVEFN_RANDOM_WALK_XY ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00100000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db SWIMMING ; palette flags
; 25
db SPRITEMOVEFN_00 ; movement function
db DOWN ; facing
db OBJECT_ACTION_STAND ; action
- db %00000000 ; flags1
- db %00000000 ; flags2
- db %00000000 ; palette flags
+ db 0 ; flags1
+ db 0 ; flags2
+ db 0 ; palette flags
; 4357
diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm
index 90e38ae2c..3cd0f609b 100644
--- a/data/types/type_matchups.asm
+++ b/data/types/type_matchups.asm
@@ -109,11 +109,11 @@ TypeMatchups: ; 34bb1
db STEEL, ROCK, SUPER_EFFECTIVE
db STEEL, STEEL, NOT_VERY_EFFECTIVE
- db -2 ; end
+ db -2 ; end (with Foresight)
; Foresight removes Ghost's immunities.
db NORMAL, GHOST, NO_EFFECT
db FIGHTING, GHOST, NO_EFFECT
- db -1 ; end (with Foresight)
+ db -1 ; end
; 34cfd
diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm
index 59eba43cc..8bc742a3e 100644
--- a/data/wild/treemon_maps.asm
+++ b/data/wild/treemon_maps.asm
@@ -1,6 +1,6 @@
treemon_map: MACRO
map_id \1
- db \2 ; treemon set
+ db \2 ; treemon set
ENDM
TreeMonMaps: ; b825e
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 05:21:14 +0000