Skip to content

Commit

Permalink
Making character animation data layout consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
@Clownacy
Clownacy committed Mar 8, 2015
1 parent eb0d1a1 commit 1fa29a3
Showing 1 changed file with 55 additions and 50 deletions.
105 changes: 55 additions & 50 deletions s2.asm
View file
Expand Up @@ -35091,41 +35091,42 @@ SAnim_Push:
; Animation script - Sonic
; ---------------------------------------------------------------------------
; off_1B618:
SonicAniData: offsetTable
SonAni_Walk_ptr: offsetTableEntry.w SonAni_Walk ; 0 ; 0
SonAni_Run_ptr: offsetTableEntry.w SonAni_Run ; 1 ; 1
SonAni_Roll_ptr: offsetTableEntry.w SonAni_Roll ; 2 ; 2
SonAni_Roll2_ptr: offsetTableEntry.w SonAni_Roll2 ; 3 ; 3
SonAni_Push_ptr: offsetTableEntry.w SonAni_Push ; 4 ; 4
SonAni_Wait_ptr: offsetTableEntry.w SonAni_Wait ; 5 ; 5
SonAni_Balance_ptr: offsetTableEntry.w SonAni_Balance ; 6 ; 6
SonAni_LookUp_ptr: offsetTableEntry.w SonAni_LookUp ; 7 ; 7
SonAni_Duck_ptr: offsetTableEntry.w SonAni_Duck ; 8 ; 8
SonicAniData: offsetTable
SonAni_Walk_ptr: offsetTableEntry.w SonAni_Walk ; 0 ; 0
SonAni_Run_ptr: offsetTableEntry.w SonAni_Run ; 1 ; 1
SonAni_Roll_ptr: offsetTableEntry.w SonAni_Roll ; 2 ; 2
SonAni_Roll2_ptr: offsetTableEntry.w SonAni_Roll2 ; 3 ; 3
SonAni_Push_ptr: offsetTableEntry.w SonAni_Push ; 4 ; 4
SonAni_Wait_ptr: offsetTableEntry.w SonAni_Wait ; 5 ; 5
SonAni_Balance_ptr: offsetTableEntry.w SonAni_Balance ; 6 ; 6
SonAni_LookUp_ptr: offsetTableEntry.w SonAni_LookUp ; 7 ; 7
SonAni_Duck_ptr: offsetTableEntry.w SonAni_Duck ; 8 ; 8
SonAni_Spindash_ptr: offsetTableEntry.w SonAni_Spindash ; 9 ; 9
SonAni_Blink_ptr: offsetTableEntry.w SonAni_Blink ; 10 ; $A
SonAni_GetUp_ptr: offsetTableEntry.w SonAni_GetUp ; 11 ; $B
SonAni_Blink_ptr: offsetTableEntry.w SonAni_Blink ; 10 ; $A
SonAni_GetUp_ptr: offsetTableEntry.w SonAni_GetUp ; 11 ; $B
SonAni_Balance2_ptr: offsetTableEntry.w SonAni_Balance2 ; 12 ; $C
SonAni_Stop_ptr: offsetTableEntry.w SonAni_Stop ; 13 ; $D
SonAni_Float_ptr: offsetTableEntry.w SonAni_Float ; 14 ; $E
SonAni_Float2_ptr: offsetTableEntry.w SonAni_Float2 ; 15 ; $F
SonAni_Spring_ptr: offsetTableEntry.w SonAni_Spring ; 16 ; $10
SonAni_Hang_ptr: offsetTableEntry.w SonAni_Hang ; 17 ; $11
SonAni_Dash2_ptr: offsetTableEntry.w SonAni_Dash2 ; 18 ; $12
SonAni_Dash3_ptr: offsetTableEntry.w SonAni_Dash3 ; 19 ; $13
SonAni_Hang2_ptr: offsetTableEntry.w SonAni_Hang2 ; 20 ; $14
SonAni_Bubble_ptr: offsetTableEntry.w SonAni_Bubble ; 21 ; $15
SonAni_DeathBW_ptr: offsetTableEntry.w SonAni_DeathBW ; 22 ; $16
SonAni_Drown_ptr: offsetTableEntry.w SonAni_Drown ; 23 ; $17
SonAni_Death_ptr: offsetTableEntry.w SonAni_Death ; 24 ; $18
SonAni_Hurt_ptr: offsetTableEntry.w SonAni_Hurt ; 25 ; $19
SonAni_Hurt2_ptr: offsetTableEntry.w SonAni_Hurt ; 26 ; $1A
SonAni_Slide_ptr: offsetTableEntry.w SonAni_Slide ; 27 ; $1B
SonAni_Blank_ptr: offsetTableEntry.w SonAni_Blank ; 28 ; $1C
SonAni_Stop_ptr: offsetTableEntry.w SonAni_Stop ; 13 ; $D
SonAni_Float_ptr: offsetTableEntry.w SonAni_Float ; 14 ; $E
SonAni_Float2_ptr: offsetTableEntry.w SonAni_Float2 ; 15 ; $F
SonAni_Spring_ptr: offsetTableEntry.w SonAni_Spring ; 16 ; $10
SonAni_Hang_ptr: offsetTableEntry.w SonAni_Hang ; 17 ; $11
SonAni_Dash2_ptr: offsetTableEntry.w SonAni_Dash2 ; 18 ; $12
SonAni_Dash3_ptr: offsetTableEntry.w SonAni_Dash3 ; 19 ; $13
SonAni_Hang2_ptr: offsetTableEntry.w SonAni_Hang2 ; 20 ; $14
SonAni_Bubble_ptr: offsetTableEntry.w SonAni_Bubble ; 21 ; $15
SonAni_DeathBW_ptr: offsetTableEntry.w SonAni_DeathBW ; 22 ; $16
SonAni_Drown_ptr: offsetTableEntry.w SonAni_Drown ; 23 ; $17
SonAni_Death_ptr: offsetTableEntry.w SonAni_Death ; 24 ; $18
SonAni_Hurt_ptr: offsetTableEntry.w SonAni_Hurt ; 25 ; $19
SonAni_Hurt2_ptr: offsetTableEntry.w SonAni_Hurt ; 26 ; $1A
SonAni_Slide_ptr: offsetTableEntry.w SonAni_Slide ; 27 ; $1B
SonAni_Blank_ptr: offsetTableEntry.w SonAni_Blank ; 28 ; $1C
SonAni_Balance3_ptr: offsetTableEntry.w SonAni_Balance3 ; 29 ; $1D
SonAni_Balance4_ptr: offsetTableEntry.w SonAni_Balance4 ; 30 ; $1E
SupSonAni_Transform_ptr: offsetTableEntry.w SupSonAni_Transform ; 31 ; $1F
SonAni_Lying_ptr: offsetTableEntry.w SonAni_Lying ; 32 ; $20
SonAni_LieDown_ptr: offsetTableEntry.w SonAni_LieDown ; 33 ; $21
SonAni_Lying_ptr: offsetTableEntry.w SonAni_Lying ; 32 ; $20
SonAni_LieDown_ptr: offsetTableEntry.w SonAni_LieDown ; 33 ; $21

SonAni_Walk: dc.b $FF, $F,$10,$11,$12,$13,$14, $D, $E,$FF
rev02even
SonAni_Run: dc.b $FF,$2D,$2E,$2F,$30,$FF,$FF,$FF,$FF,$FF
Expand Down Expand Up @@ -37815,40 +37816,41 @@ loc_1D006:
; Animation script - Tails
; ---------------------------------------------------------------------------
; off_1D038:
TailsAniData: offsetTable
TailsAni_Walk_ptr: offsetTableEntry.w TailsAni_Walk ; 0 ; 0
TailsAni_Run_ptr: offsetTableEntry.w TailsAni_Run ; 1 ; 1
TailsAni_Roll_ptr: offsetTableEntry.w TailsAni_Roll ; 2 ; 2
TailsAni_Roll2_ptr: offsetTableEntry.w TailsAni_Roll2 ; 3 ; 3
TailsAni_Push_ptr: offsetTableEntry.w TailsAni_Push ; 4 ; 4
TailsAni_Wait_ptr: offsetTableEntry.w TailsAni_Wait ; 5 ; 5
TailsAniData: offsetTable
TailsAni_Walk_ptr: offsetTableEntry.w TailsAni_Walk ; 0 ; 0
TailsAni_Run_ptr: offsetTableEntry.w TailsAni_Run ; 1 ; 1
TailsAni_Roll_ptr: offsetTableEntry.w TailsAni_Roll ; 2 ; 2
TailsAni_Roll2_ptr: offsetTableEntry.w TailsAni_Roll2 ; 3 ; 3
TailsAni_Push_ptr: offsetTableEntry.w TailsAni_Push ; 4 ; 4
TailsAni_Wait_ptr: offsetTableEntry.w TailsAni_Wait ; 5 ; 5
TailsAni_Balance_ptr: offsetTableEntry.w TailsAni_Balance ; 6 ; 6
TailsAni_LookUp_ptr: offsetTableEntry.w TailsAni_LookUp ; 7 ; 7
TailsAni_Duck_ptr: offsetTableEntry.w TailsAni_Duck ; 8 ; 8
TailsAni_Duck_ptr: offsetTableEntry.w TailsAni_Duck ; 8 ; 8
TailsAni_Spindash_ptr: offsetTableEntry.w TailsAni_Spindash ; 9 ; 9
TailsAni_Dummy1_ptr: offsetTableEntry.w TailsAni_Dummy1 ; 10 ; $A
TailsAni_Dummy2_ptr: offsetTableEntry.w TailsAni_Dummy2 ; 11 ; $B
TailsAni_Dummy3_ptr: offsetTableEntry.w TailsAni_Dummy3 ; 12 ; $C
TailsAni_Stop_ptr: offsetTableEntry.w TailsAni_Stop ; 13 ; $D
TailsAni_Float_ptr: offsetTableEntry.w TailsAni_Float ; 14 ; $E
TailsAni_Stop_ptr: offsetTableEntry.w TailsAni_Stop ; 13 ; $D
TailsAni_Float_ptr: offsetTableEntry.w TailsAni_Float ; 14 ; $E
TailsAni_Float2_ptr: offsetTableEntry.w TailsAni_Float2 ; 15 ; $F
TailsAni_Spring_ptr: offsetTableEntry.w TailsAni_Spring ; 16 ; $10
TailsAni_Hang_ptr: offsetTableEntry.w TailsAni_Hang ; 17 ; $11
TailsAni_Blink_ptr: offsetTableEntry.w TailsAni_Blink ; 18 ; $12
TailsAni_Hang_ptr: offsetTableEntry.w TailsAni_Hang ; 17 ; $11
TailsAni_Blink_ptr: offsetTableEntry.w TailsAni_Blink ; 18 ; $12
TailsAni_Blink2_ptr: offsetTableEntry.w TailsAni_Blink2 ; 19 ; $13
TailsAni_Hang2_ptr: offsetTableEntry.w TailsAni_Hang2 ; 20 ; $14
TailsAni_Hang2_ptr: offsetTableEntry.w TailsAni_Hang2 ; 20 ; $14
TailsAni_Bubble_ptr: offsetTableEntry.w TailsAni_Bubble ; 21 ; $15
TailsAni_DeathBW_ptr: offsetTableEntry.w TailsAni_DeathBW ; 22 ; $16
TailsAni_Drown_ptr: offsetTableEntry.w TailsAni_Drown ; 23 ; $17
TailsAni_Death_ptr: offsetTableEntry.w TailsAni_Death ; 24 ; $18
TailsAni_Hurt_ptr: offsetTableEntry.w TailsAni_Hurt ; 25 ; $19
TailsAni_Hurt2_ptr: offsetTableEntry.w TailsAni_Hurt2 ; 26 ; $1A
TailsAni_Slide_ptr: offsetTableEntry.w TailsAni_Slide ; 27 ; $1B
TailsAni_Blank_ptr: offsetTableEntry.w TailsAni_Blank ; 28 ; $1C
TailsAni_Drown_ptr: offsetTableEntry.w TailsAni_Drown ; 23 ; $17
TailsAni_Death_ptr: offsetTableEntry.w TailsAni_Death ; 24 ; $18
TailsAni_Hurt_ptr: offsetTableEntry.w TailsAni_Hurt ; 25 ; $19
TailsAni_Hurt2_ptr: offsetTableEntry.w TailsAni_Hurt2 ; 26 ; $1A
TailsAni_Slide_ptr: offsetTableEntry.w TailsAni_Slide ; 27 ; $1B
TailsAni_Blank_ptr: offsetTableEntry.w TailsAni_Blank ; 28 ; $1C
TailsAni_Dummy4_ptr: offsetTableEntry.w TailsAni_Dummy4 ; 29 ; $1D
TailsAni_Dummy5_ptr: offsetTableEntry.w TailsAni_Dummy5 ; 30 ; $1E
TailsAni_HaulAss_ptr: offsetTableEntry.w TailsAni_HaulAss ; 31 ; $1F
TailsAni_Fly_ptr: offsetTableEntry.w TailsAni_Fly ; 32 ; $20
TailsAni_Fly_ptr: offsetTableEntry.w TailsAni_Fly ; 32 ; $20

TailsAni_Walk: dc.b $FF,$10,$11,$12,$13,$14,$15, $E, $F,$FF
rev02even
TailsAni_Run: dc.b $FF,$2E,$2F,$30,$31,$FF,$FF,$FF,$FF,$FF
Expand Down Expand Up @@ -37920,6 +37922,7 @@ TailsAni_HaulAss: dc.b $FF,$32,$33,$FF
rev02even
TailsAni_Fly: dc.b 1,$5E,$5F,$FF
even

; ===========================================================================

; ---------------------------------------------------------------------------
Expand Down Expand Up @@ -38086,6 +38089,7 @@ Obj05AniData: offsetTable
offsetTableEntry.w Obj05Ani_Skidding ; 8
offsetTableEntry.w Obj05Ani_Pushing ; 9
offsetTableEntry.w Obj05Ani_Hanging ; $A

Obj05Ani_Blank: dc.b $20, 0,$FF
rev02even
Obj05Ani_Swish: dc.b 7, 9, $A, $B, $C, $D,$FF
Expand All @@ -38108,6 +38112,7 @@ Obj05Ani_Pushing: dc.b 9,$87,$88,$89,$8A,$FF
rev02even
Obj05Ani_Hanging: dc.b 9,$81,$82,$83,$84,$FF
even

; ===========================================================================

JmpTo2_KillCharacter
Expand Down

0 comments on commit 1fa29a3

Please sign in to comment.