2 files changed, 19 insertions, 39 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index d115cfd0e..22609ef71 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -1771,10 +1771,19 @@ GATE EQU 6
 DUNGEON EQU 7
 
 ; object struct
+OBJECT_00 EQU $0
+OBJECT_01 EQU $1
 OBJECT_SPRITE EQU $2
+OBJECT_03 EQU $3
+OBJECT_04 EQU $4
 OBJECT_FLAGS EQU $5
 OBJECT_PALETTE EQU $6
+OBJECT_07 EQU $7
+OBJECT_08 EQU $8
+OBJECT_09 EQU $9
 OBJECT_STEP_DURATION EQU $a
+OBJECT_11 EQU $b
+OBJECT_12 EQU $c
 OBJECT_FACING EQU $d
 OBJECT_STANDING_TILE EQU $e
 OBJECT_NEXT_TILE EQU $f
@@ -1782,8 +1791,18 @@ OBJECT_MAP_X EQU $10
 OBJECT_MAP_Y EQU $11
 OBJECT_NEXT_MAP_X EQU $12
 OBJECT_NEXT_MAP_Y EQU $13
+OBJECT_20 EQU $14
+OBJECT_21 EQU $15
+OBJECT_22 EQU $16
 OBJECT_SPRITE_X EQU $17
 OBJECT_SPRITE_Y EQU $18
 OBJECT_SPRITE_X_OFFSET EQU $19
 OBJECT_SPRITE_Y_OFFSET EQU $1a
+OBJECT_27 EQU $1b
+OBJECT_28 EQU $1c
+OBJECT_29 EQU $1d
+OBJECT_30 EQU $1e
+OBJECT_31 EQU $1f
+OBJECT_32 EQU $20
+; 33-39 are not used
 
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 540612441..2aefa69c7 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -1,42 +1,3 @@
-; specials
-NUM_SPECIALS EQU $a8
-
-SPECIAL_UPDATESPRITETILES EQU $0038
-
-SPECIAL_WAITSFX           EQU $003b
-SPECIAL_BIKESURFMUSIC     EQU $003c
-
-SPECIAL_LOADFACESTEP      EQU $003f
-
-SPECIAL_GIVESHUCKLE       EQU $004b
-
-SPECIAL_SNORLAXAWAKE      EQU $0060
-
-SPECIAL_GAMEBOYCHECK      EQU $0066
-SPECIAL_TRAINERHOUSE      EQU $0067
-
-SPECIAL_RUSTLETREE        EQU $006a
-
-SPECIAL_ODDEGG            EQU $007d
-
-SPECIAL_MOVETUTOR         EQU $0083
-SPECIAL_OMANYTECHAMBER    EQU $0084
-
-SPECIAL_RUINCHAMBERWALL   EQU $0087
-
-SPECIAL_HOOHCHAMBER       EQU $008d
-
-SPECIAL_CELEBI            EQU $008f
-SPECIAL_AFTERCELEBI       EQU $0090
-SPECIAL_POKESEER          EQU $0091
-SPECIAL_BUENAS_PASSWORD   EQU $0092
-SPECIAL_BUENA_PRIZE       EQU $0093
-SPECIAL_DRATINI           EQU $0094
-
-SPECIAL_BEASTSCHECK       EQU $0096
-SPECIAL_MONCHECK          EQU $0097
-
-
 ; script vars
 NUM_VARS EQU $1b
 VAR_MOVEMENT EQU $08