From 1e858b683fde4c1b33fe1b68fdf4b76b591c1196 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 15 Jun 2021 22:53:34 +1000 Subject: [PATCH] Replace animnum literals with constants --- src/assets/jpn-final/animations.json | 4 +- src/assets/ntsc-1.0/animations.json | 4 +- src/assets/ntsc-beta/animations.json | 4 +- src/assets/ntsc-final/animations.json | 4 +- src/assets/pal-beta/animations.json | 4 +- src/assets/pal-final/animations.json | 4 +- src/files/setup/setupame.c | 146 ++-- src/files/setup/setupark.c | 40 +- src/files/setup/setupate.c | 6 +- src/files/setup/setupazt.c | 26 +- src/files/setup/setupcave.c | 58 +- src/files/setup/setupdam.c | 30 +- src/files/setup/setupdepo.c | 26 +- src/files/setup/setupdish.c | 8 +- src/files/setup/setupear.c | 52 +- src/files/setup/setupeld.c | 78 +- src/files/setup/setupimp.c | 70 +- src/files/setup/setuplee.c | 26 +- src/files/setup/setuplip.c | 54 +- src/files/setup/setuplue.c | 36 +- src/files/setup/setupold.c | 24 +- src/files/setup/setuppam.c | 34 +- src/files/setup/setuppete.c | 34 +- src/files/setup/setuprit.c | 46 +- src/files/setup/setupsev.c | 16 +- src/files/setup/setupsho.c | 110 +-- src/files/setup/setupstat.c | 22 +- src/files/setup/setuptra.c | 66 +- src/files/setup/setupwax.c | 22 +- src/game/bondgun.c | 2 +- src/game/bondhead.c | 4 +- src/game/chr/chraction.c | 1055 ++++++++++++------------- src/game/chr/chraicommands.c | 34 +- src/game/data/ailists.c | 10 +- src/game/game_005fd0.c | 118 +-- src/game/inventory/items.c | 202 ++--- src/game/lv.c | 2 +- src/include/game/game_005fd0.h | 2 +- 38 files changed, 1241 insertions(+), 1242 deletions(-) diff --git a/src/assets/jpn-final/animations.json b/src/assets/jpn-final/animations.json index fed0e6146..cab4571d1 100644 --- a/src/assets/jpn-final/animations.json +++ b/src/assets/jpn-final/animations.json @@ -492,7 +492,7 @@ "flag08": false }, { - "id": "ANIM_29", + "id": "ANIM_0029", "file": "0029.bin", "numframes": 19, "bytesperframe": 42, @@ -516,7 +516,7 @@ "flag08": false }, { - "id": "ANIM_2B", + "id": "ANIM_002B", "file": "002b.bin", "numframes": 35, "bytesperframe": 38, diff --git a/src/assets/ntsc-1.0/animations.json b/src/assets/ntsc-1.0/animations.json index fed0e6146..cab4571d1 100644 --- a/src/assets/ntsc-1.0/animations.json +++ b/src/assets/ntsc-1.0/animations.json @@ -492,7 +492,7 @@ "flag08": false }, { - "id": "ANIM_29", + "id": "ANIM_0029", "file": "0029.bin", "numframes": 19, "bytesperframe": 42, @@ -516,7 +516,7 @@ "flag08": false }, { - "id": "ANIM_2B", + "id": "ANIM_002B", "file": "002b.bin", "numframes": 35, "bytesperframe": 38, diff --git a/src/assets/ntsc-beta/animations.json b/src/assets/ntsc-beta/animations.json index fed0e6146..cab4571d1 100644 --- a/src/assets/ntsc-beta/animations.json +++ b/src/assets/ntsc-beta/animations.json @@ -492,7 +492,7 @@ "flag08": false }, { - "id": "ANIM_29", + "id": "ANIM_0029", "file": "0029.bin", "numframes": 19, "bytesperframe": 42, @@ -516,7 +516,7 @@ "flag08": false }, { - "id": "ANIM_2B", + "id": "ANIM_002B", "file": "002b.bin", "numframes": 35, "bytesperframe": 38, diff --git a/src/assets/ntsc-final/animations.json b/src/assets/ntsc-final/animations.json index fed0e6146..cab4571d1 100644 --- a/src/assets/ntsc-final/animations.json +++ b/src/assets/ntsc-final/animations.json @@ -492,7 +492,7 @@ "flag08": false }, { - "id": "ANIM_29", + "id": "ANIM_0029", "file": "0029.bin", "numframes": 19, "bytesperframe": 42, @@ -516,7 +516,7 @@ "flag08": false }, { - "id": "ANIM_2B", + "id": "ANIM_002B", "file": "002b.bin", "numframes": 35, "bytesperframe": 38, diff --git a/src/assets/pal-beta/animations.json b/src/assets/pal-beta/animations.json index fed0e6146..cab4571d1 100644 --- a/src/assets/pal-beta/animations.json +++ b/src/assets/pal-beta/animations.json @@ -492,7 +492,7 @@ "flag08": false }, { - "id": "ANIM_29", + "id": "ANIM_0029", "file": "0029.bin", "numframes": 19, "bytesperframe": 42, @@ -516,7 +516,7 @@ "flag08": false }, { - "id": "ANIM_2B", + "id": "ANIM_002B", "file": "002b.bin", "numframes": 35, "bytesperframe": 38, diff --git a/src/assets/pal-final/animations.json b/src/assets/pal-final/animations.json index fed0e6146..cab4571d1 100644 --- a/src/assets/pal-final/animations.json +++ b/src/assets/pal-final/animations.json @@ -492,7 +492,7 @@ "flag08": false }, { - "id": "ANIM_29", + "id": "ANIM_0029", "file": "0029.bin", "numframes": 19, "bytesperframe": 42, @@ -516,7 +516,7 @@ "flag08": false }, { - "id": "ANIM_2B", + "id": "ANIM_002B", "file": "002b.bin", "numframes": 35, "bytesperframe": 38, diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c index f0c0f7715..8ac9e54b9 100644 --- a/src/files/setup/setupame.c +++ b/src/files/setup/setupame.c @@ -1039,14 +1039,14 @@ s32 path29[] = { u8 func0401_do_some_animation[] = { // Do some animation restart_timer - chr_do_animation(0x0066, 0, 1, CHRANIMFLAG_PAUSEATEND, 16, CHR_SELF, 2) + chr_do_animation(ANIM_0066, 0, 1, CHRANIMFLAG_PAUSEATEND, 16, CHR_SELF, 2) beginloop(0x08) if_timer_gt(0, /*goto*/ 0x2c) endloop(0x08) label(0x2c) - chr_do_animation(0x0066, 1, -1, CHRANIMFLAG_PAUSEATEND, 16, CHR_SELF, 2) + chr_do_animation(ANIM_0066, 1, -1, CHRANIMFLAG_PAUSEATEND, 16, CHR_SELF, 2) beginloop(0x85) endloop(0x85) @@ -1457,7 +1457,7 @@ u8 func0411_secretary[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) - chr_do_animation(0x00a1, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_00A1, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x72) set_target_chr(CHR_BOND) @@ -2542,28 +2542,28 @@ u8 func1002_objectives_failed_msg[] = { u8 func041b_intro_041b[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x00c9) + camera_movement(ANIM_00C9) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP2) set_object_flag3(OBJ_JUMPSHIP2, OBJFLAG3_00000010) - object_do_animation(0x00ca, OBJ_JUMPSHIP2, 0x04, 0xffff) + object_do_animation(ANIM_00CA, OBJ_JUMPSHIP2, 0x04, 0xffff) enable_object(OBJ_POLICECAR) set_object_flag3(OBJ_POLICECAR, OBJFLAG3_00000010) - object_do_animation(0x0122, OBJ_POLICECAR, 0x04, 0xffff) + object_do_animation(ANIM_0122, OBJ_POLICECAR, 0x04, 0xffff) enable_object(OBJ_HOVERCOP3) set_object_flag3(OBJ_HOVERCOP3, OBJFLAG3_00000010) - object_do_animation(0x0123, OBJ_HOVERCOP3, 0x04, 0xffff) + object_do_animation(ANIM_0123, OBJ_HOVERCOP3, 0x04, 0xffff) enable_object(OBJ_HOVERCAR3) set_object_flag3(OBJ_HOVERCAR3, OBJFLAG3_00000010) - object_do_animation(0x0124, OBJ_HOVERCAR3, 0x04, 0xffff) + object_do_animation(ANIM_0124, OBJ_HOVERCAR3, 0x04, 0xffff) enable_object(OBJ_HOVERMOTO3) set_object_flag3(OBJ_HOVERMOTO3, OBJFLAG3_00000010) - object_do_animation(0x0125, OBJ_HOVERMOTO3, 0x04, 0xffff) + object_do_animation(ANIM_0125, OBJ_HOVERMOTO3, 0x04, 0xffff) enable_object(OBJ_HOVERCAB3) set_object_flag3(OBJ_HOVERCAB3, OBJFLAG3_00000010) - object_do_animation(0x0126, OBJ_HOVERCAB3, 0x04, 0xffff) + object_do_animation(ANIM_0126, OBJ_HOVERCAB3, 0x04, 0xffff) fade_to_color(0x000000ff, 0) fade_to_color(0x00000000, 90) set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) @@ -2589,31 +2589,31 @@ u8 func041b_intro_041b[] = { u8 func041a_intro_041a[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x00c7) + camera_movement(ANIM_00C7) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP2) set_object_flag3(OBJ_JUMPSHIP2, OBJFLAG3_00000010) - object_do_animation(0x00c8, OBJ_JUMPSHIP2, 0x04, 0xffff) + object_do_animation(ANIM_00C8, OBJ_JUMPSHIP2, 0x04, 0xffff) enable_object(OBJ_HOVERTAXI2) set_object_flag3(OBJ_HOVERTAXI2, OBJFLAG3_00000010) - object_do_animation(0x011c, OBJ_HOVERTAXI2, 0x04, 0xffff) + object_do_animation(ANIM_011C, OBJ_HOVERTAXI2, 0x04, 0xffff) enable_object(OBJ_HOVERCOP3) set_object_flag3(OBJ_HOVERCOP3, OBJFLAG3_00000010) - object_do_animation(0x011d, OBJ_HOVERCOP3, 0x04, 0xffff) + object_do_animation(ANIM_011D, OBJ_HOVERCOP3, 0x04, 0xffff) enable_object(OBJ_HOVERCAR3) set_object_flag3(OBJ_HOVERCAR3, OBJFLAG3_00000010) - object_do_animation(0x011e, OBJ_HOVERCAR3, 0x04, 0xffff) + object_do_animation(ANIM_011E, OBJ_HOVERCAR3, 0x04, 0xffff) enable_object(OBJ_HOVERMOTO3) set_object_flag3(OBJ_HOVERMOTO3, OBJFLAG3_00000010) - object_do_animation(0x011f, OBJ_HOVERMOTO3, 0x04, 0xffff) + object_do_animation(ANIM_011F, OBJ_HOVERMOTO3, 0x04, 0xffff) enable_object(OBJ_HOVERCAB3) set_object_flag3(OBJ_HOVERCAB3, OBJFLAG3_00000010) - object_do_animation(0x0120, OBJ_HOVERCAB3, 0x04, 0xffff) + object_do_animation(ANIM_0120, OBJ_HOVERCAB3, 0x04, 0xffff) enable_object(OBJ_HOVERTRUCK3) set_object_flag3(OBJ_HOVERTRUCK3, OBJFLAG3_00000010) - object_do_animation(0x0121, OBJ_HOVERTRUCK3, 0x04, 0xffff) + object_do_animation(ANIM_0121, OBJ_HOVERTRUCK3, 0x04, 0xffff) wait_for_camera_finished @@ -2635,22 +2635,22 @@ u8 func041a_intro_041a[] = { u8 func0419_intro_0419[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x00c5) + camera_movement(ANIM_00C5) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP2) set_object_flag3(OBJ_JUMPSHIP2, OBJFLAG3_00000010) - object_do_animation(0x00c6, OBJ_JUMPSHIP2, 0x04, 0xffff) + object_do_animation(ANIM_00C6, OBJ_JUMPSHIP2, 0x04, 0xffff) enable_object(OBJ_HOVERTAXI1) set_object_flag3(OBJ_HOVERTAXI1, OBJFLAG3_00000010) - object_do_animation(0x0119, OBJ_HOVERTAXI1, 0x04, 0xffff) + object_do_animation(ANIM_0119, OBJ_HOVERTAXI1, 0x04, 0xffff) enable_object(OBJ_HOVERCOP3) set_object_flag3(OBJ_HOVERCOP3, OBJFLAG3_00000010) - object_do_animation(0x011a, OBJ_HOVERCOP3, 0x04, 0xffff) + object_do_animation(ANIM_011A, OBJ_HOVERCOP3, 0x04, 0xffff) enable_object(OBJ_HOVERCAR3) set_object_flag3(OBJ_HOVERCAR3, OBJFLAG3_00000010) - object_do_animation(0x011b, OBJ_HOVERCAR3, 0x04, 0xffff) + object_do_animation(ANIM_011B, OBJ_HOVERCAR3, 0x04, 0xffff) wait_for_camera_finished @@ -2669,31 +2669,31 @@ u8 func0419_intro_0419[] = { u8 func041c_intro_041c[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x00cb) + camera_movement(ANIM_00CB) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP2) set_object_flag3(OBJ_JUMPSHIP2, OBJFLAG3_00000010) - object_do_animation(0x00cc, OBJ_JUMPSHIP2, 0x04, 0xffff) + object_do_animation(ANIM_00CC, OBJ_JUMPSHIP2, 0x04, 0xffff) enable_object(OBJ_HOVERTAXI1) set_object_flag3(OBJ_HOVERTAXI1, OBJFLAG3_00000010) - object_do_animation(0x0127, OBJ_HOVERTAXI1, 0x04, 0xffff) + object_do_animation(ANIM_0127, OBJ_HOVERTAXI1, 0x04, 0xffff) // Invalid object enable_object(0x1d) set_object_flag3(0x1d, OBJFLAG3_00000010) - object_do_animation(0x0128, 0x1d, 0x04, 0xffff) + object_do_animation(ANIM_0128, 0x1d, 0x04, 0xffff) enable_object(OBJ_HOVERCOP3) set_object_flag3(OBJ_HOVERCOP3, OBJFLAG3_00000010) - object_do_animation(0x0129, OBJ_HOVERCOP3, 0x04, 0xffff) + object_do_animation(ANIM_0129, OBJ_HOVERCOP3, 0x04, 0xffff) enable_object(OBJ_HOVERCAR3) set_object_flag3(OBJ_HOVERCAR3, OBJFLAG3_00000010) - object_do_animation(0x012a, OBJ_HOVERCAR3, 0x04, 0xffff) + object_do_animation(ANIM_012A, OBJ_HOVERCAR3, 0x04, 0xffff) enable_object(OBJ_HOVERMOTO3) set_object_flag3(OBJ_HOVERMOTO3, OBJFLAG3_00000010) - object_do_animation(0x012b, OBJ_HOVERMOTO3, 0x04, 0xffff) + object_do_animation(ANIM_012B, OBJ_HOVERMOTO3, 0x04, 0xffff) wait_for_camera_finished @@ -2717,19 +2717,19 @@ u8 func041c_intro_041c[] = { */ u8 func041d_intro_041d[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x00cd) + camera_movement(ANIM_00CD) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP2) set_object_flag3(OBJ_JUMPSHIP2, OBJFLAG3_00000010) - object_do_animation(0x00ce, OBJ_JUMPSHIP2, 0x01, 0xffff) + object_do_animation(ANIM_00CE, OBJ_JUMPSHIP2, 0x01, 0xffff) enable_object(OBJ_HOVERTAXI1) set_object_flag3(OBJ_HOVERTAXI1, OBJFLAG3_00000010) - object_do_animation(0x012c, OBJ_HOVERTAXI1, 0x04, 0xffff) + object_do_animation(ANIM_012C, OBJ_HOVERTAXI1, 0x04, 0xffff) enable_object(0x1d) set_object_flag3(0x1d, OBJFLAG3_00000010) - object_do_animation(0x012d, 0x1d, 0x04, 0xffff) + object_do_animation(ANIM_012D, 0x1d, 0x04, 0xffff) wait_for_camera_finished @@ -2872,13 +2872,13 @@ u8 func0421_intro_0421[] = { u8 func0422_intro_0423[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x00ee) + camera_movement(ANIM_00EE) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP1) set_object_flag3(OBJ_JUMPSHIP1, OBJFLAG3_00000010) - object_do_animation(0x00ef, OBJ_JUMPSHIP1, 0x04, 0xffff) + object_do_animation(ANIM_00EF, OBJ_JUMPSHIP1, 0x04, 0xffff) set_tinted_glass_enabled(TRUE) wait_for_camera_finished @@ -2896,20 +2896,20 @@ u8 func0422_intro_0423[] = { u8 func0422_intro_0424[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x00fc) + camera_movement(ANIM_00FC) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP1) set_object_flag3(OBJ_JUMPSHIP1, OBJFLAG3_00000010) - object_do_animation(0x00fd, OBJ_JUMPSHIP1, 0x04, 0xffff) + object_do_animation(ANIM_00FD, OBJ_JUMPSHIP1, 0x04, 0xffff) set_chr_chrflag(CHR_CASS, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_SECRETARY, CHRCFLAG_UNPLAYABLE) #if VERSION >= VERSION_NTSC_1_0 unset_chr_chrflag(CHR_SECRETARY, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_SECRETARY, CHRHFLAG_00020000) - chr_do_animation(0x00fe, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SECRETARY, 4) + chr_do_animation(ANIM_00FE, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SECRETARY, 4) wait_for_camera_finished @@ -2927,15 +2927,15 @@ u8 func0422_intro_0424[] = { u8 func0422_intro_0425[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x00ff) + camera_movement(ANIM_00FF) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP1) set_object_flag3(OBJ_JUMPSHIP1, OBJFLAG3_00000010) - object_do_animation(0x0100, OBJ_JUMPSHIP1, 0x04, 0xffff) - object_do_animation(0x0102, OBJ_BANNER1, 0x04, 0xffff) - object_do_animation(0x0117, OBJ_BANNER2, 0x04, 0xffff) + object_do_animation(ANIM_0100, OBJ_JUMPSHIP1, 0x04, 0xffff) + object_do_animation(ANIM_0102, OBJ_BANNER1, 0x04, 0xffff) + object_do_animation(ANIM_0117, OBJ_BANNER2, 0x04, 0xffff) wait_for_camera_finished @@ -2953,19 +2953,19 @@ u8 func0422_intro_0425[] = { u8 func0422_intro_0426[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x012e) + camera_movement(ANIM_012E) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP1) set_object_flag3(OBJ_JUMPSHIP1, OBJFLAG3_00000010) - object_do_animation(0x012f, OBJ_JUMPSHIP1, 0x04, 0xffff) + object_do_animation(ANIM_012F, OBJ_JUMPSHIP1, 0x04, 0xffff) enable_object(OBJ_BANNER1) set_object_flag3(OBJ_BANNER1, OBJFLAG3_00000010) - object_do_animation(0x0131, OBJ_BANNER1, 0x04, 0xffff) + object_do_animation(ANIM_0131, OBJ_BANNER1, 0x04, 0xffff) enable_object(OBJ_BANNER2) set_object_flag3(OBJ_BANNER1, OBJFLAG3_00000010) - object_do_animation(0x0132, OBJ_BANNER2, 0x04, 0xffff) + object_do_animation(ANIM_0132, OBJ_BANNER2, 0x04, 0xffff) wait_for_camera_finished @@ -2983,22 +2983,22 @@ u8 func0422_intro_0426[] = { u8 func0422_intro_0427[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x0133) + camera_movement(ANIM_0133) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP1) set_object_flag3(OBJ_JUMPSHIP1, OBJFLAG3_00000010) - object_do_animation(0x0134, OBJ_JUMPSHIP1, 0x04, 0xffff) + object_do_animation(ANIM_0134, OBJ_JUMPSHIP1, 0x04, 0xffff) enable_object(OBJ_ROPE) set_object_flag3(OBJ_ROPE, OBJFLAG3_00000010) - object_do_animation(0x0135, OBJ_ROPE, 0x04, 0xffff) + object_do_animation(ANIM_0135, OBJ_ROPE, 0x04, 0xffff) enable_object(OBJ_BANNER1) set_object_flag3(OBJ_BANNER1, OBJFLAG3_00000010) - object_do_animation(0x0136, OBJ_BANNER1, 0x04, 0xffff) + object_do_animation(ANIM_0136, OBJ_BANNER1, 0x04, 0xffff) enable_object(OBJ_BANNER2) set_object_flag3(OBJ_BANNER1, OBJFLAG3_00000010) - object_do_animation(0x0137, OBJ_BANNER2, 0x04, 0xffff) + object_do_animation(ANIM_0137, OBJ_BANNER2, 0x04, 0xffff) wait_for_camera_finished @@ -3017,13 +3017,13 @@ u8 func0422_intro_0427[] = { u8 func0422_intro_0428[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x0103) + camera_movement(ANIM_0103) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP1) set_object_flag3(OBJ_JUMPSHIP1, OBJFLAG3_00000010) - object_do_animation(0x0104, OBJ_JUMPSHIP1, 0x04, 0xffff) + object_do_animation(ANIM_0104, OBJ_JUMPSHIP1, 0x04, 0xffff) set_object_flag2(OBJ_HOVERCOP1, OBJFLAG2_INVISIBLE) set_object_flag2(OBJ_HOVERCOP2, OBJFLAG2_INVISIBLE) set_object_flag2(OBJ_HOVERCAR1, OBJFLAG2_INVISIBLE) @@ -3059,13 +3059,13 @@ u8 func0422_intro_0428[] = { u8 func0422_intro_0429[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x0105) + camera_movement(ANIM_0105) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP1) set_object_flag3(OBJ_JUMPSHIP1, OBJFLAG3_00000010) - object_do_animation(0x0106, OBJ_JUMPSHIP1, 0x04, 0xffff) + object_do_animation(ANIM_0106, OBJ_JUMPSHIP1, 0x04, 0xffff) set_tinted_glass_enabled(TRUE) wait_for_camera_finished @@ -3083,19 +3083,19 @@ u8 func0422_intro_0429[] = { u8 func0422_intro_042a[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x0107) + camera_movement(ANIM_0107) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP1) set_object_flag3(OBJ_JUMPSHIP1, OBJFLAG3_00000010) - object_do_animation(0x0108, OBJ_JUMPSHIP1, 0x04, 0xffff) + object_do_animation(ANIM_0108, OBJ_JUMPSHIP1, 0x04, 0xffff) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0109, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0109, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_hudpiece_visible(CHR_BOND, TRUE) enable_object(OBJ_ROPE) set_object_flag3(OBJ_ROPE, OBJFLAG3_00000010) - object_do_animation(0x010a, OBJ_ROPE, 0x04, 0xffff) + object_do_animation(ANIM_010A, OBJ_ROPE, 0x04, 0xffff) wait_for_camera_finished @@ -3111,25 +3111,25 @@ u8 func0422_intro_042a[] = { u8 func0422_intro_042b[] = { if_controller_button_pressed(/*goto*/ 0x36) - camera_movement(0x010b) + camera_movement(ANIM_010B) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enable_object(OBJ_JUMPSHIP1) set_object_flag3(OBJ_JUMPSHIP1, OBJFLAG3_00000010) - object_do_animation(0x010c, OBJ_JUMPSHIP1, 0x04, 0xffff) + object_do_animation(ANIM_010C, OBJ_JUMPSHIP1, 0x04, 0xffff) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x010d, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_010D, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_hudpiece_visible(CHR_BOND, TRUE) enable_object(OBJ_ROPE) set_object_flag3(OBJ_ROPE, OBJFLAG3_00000010) - object_do_animation(0x010e, OBJ_ROPE, 0x04, 0xffff) + object_do_animation(ANIM_010E, OBJ_ROPE, 0x04, 0xffff) enable_object(OBJ_BANNER1) set_object_flag3(OBJ_BANNER1, OBJFLAG3_00000010) - object_do_animation(0x010f, OBJ_BANNER1, 0x04, 0xffff) + object_do_animation(ANIM_010F, OBJ_BANNER1, 0x04, 0xffff) enable_object(OBJ_BANNER2) set_object_flag3(OBJ_BANNER1, OBJFLAG3_00000010) - object_do_animation(0x0118, OBJ_BANNER2, 0x04, 0xffff) + object_do_animation(ANIM_0118, OBJ_BANNER2, 0x04, 0xffff) wait_for_camera_finished @@ -3151,14 +3151,14 @@ u8 func0422_intro_042c[] = { }; u8 func0422_intro_042d[] = { - camera_movement(0x0155) + camera_movement(ANIM_0155) cmd0175(60) if_controller_button_pressed(/*goto*/ 0x36) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0156, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0156, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_hudpiece_visible(CHR_BOND, FALSE) wait_for_camera_finished @@ -3168,16 +3168,16 @@ u8 func0422_intro_042d[] = { enable_object(OBJ_BANNER1) enable_object(OBJ_BANNER2) set_object_flag3(OBJ_BANNER1, OBJFLAG3_00000010) - object_do_animation(0x0161, OBJ_BANNER1, 0x08, 0xffff) + object_do_animation(ANIM_0161, OBJ_BANNER1, 0x08, 0xffff) // @bug: Copy/paste error - should be banner 2 set_object_flag3(OBJ_BANNER1, OBJFLAG3_00000010) - object_do_animation(0x0162, OBJ_BANNER2, 0x08, 0xffff) + object_do_animation(ANIM_0162, OBJ_BANNER2, 0x08, 0xffff) unset_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0156, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_0156, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) set_chr_hudpiece_visible(CHR_BOND, FALSE) mute_channel(CHANNEL_7) mute_channel(CHANNEL_6) @@ -3205,7 +3205,7 @@ u8 func0416_outro_from_menu[] = { }; u8 func0416_outro[] = { - camera_movement(0x00f2) + camera_movement(ANIM_00F2) play_cutscene_track(MUSIC_DEFECTION_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -3215,7 +3215,7 @@ u8 func0416_outro[] = { unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x00f3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_00F3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) restart_timer unset_stage_flag(STAGEFLAG_LAB_ELEVATOR_CLOSED) set_door_open(OBJ_LABLIFTDOOR1) diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c index 2ed40918f..23a4a5232 100644 --- a/src/files/setup/setupark.c +++ b/src/files/setup/setupark.c @@ -1698,7 +1698,7 @@ u8 func0409_tech_conversation[] = { unset_chr_chrflag(CHR_RLSHOCK, CHRCFLAG_INVINCIBLE) set_ailist(CHR_RLSHOCK, GAILIST_UNALERTED) restart_timer - chr_do_animation(0x0204, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 20, 0x10, 2) + chr_do_animation(ANIM_OPERATE_0204, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 20, 0x10, 2) beginloop(0x28) if_saw_injury(0x00, /*goto*/ 0x33) @@ -1751,7 +1751,7 @@ u8 func0409_tech_conversation[] = { label(0x20) chr_do_animation(ANIM_TALKING_00A0, 0, -1, CHRANIMFLAG_SLOWUPDATE, 20, CHR_SELF, 2) - chr_do_animation(0x0205, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 20, 0x10, 2) + chr_do_animation(ANIM_OPERATE_0205, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 20, 0x10, 2) speak(CHR_PRESET, L_ARK_039, SFX_811E, CHANNEL_7, COLOR_06_WHITE) // "Give it to me - you're doing it wrong." beginloop(0x23) @@ -1794,7 +1794,7 @@ u8 func0409_tech_conversation[] = { label(0x20) chr_do_animation(ANIM_TWO_GUN_HOLD, 0, -1, CHRANIMFLAG_SLOWUPDATE, 20, CHR_SELF, 2) chr_do_animation(ANIM_TALKING_00A0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 20, CHR_RLSHOCK, 2) - chr_do_animation(0x0206, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 20, 0x10, 2) + chr_do_animation(ANIM_OPERATE_0206, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 20, 0x10, 2) speak(CHR_PRESET, L_ARK_041, SFX_8123, CHANNEL_7, COLOR_09_BLUE) // "Will you just hurry up!" beginloop(0x25) @@ -1917,7 +1917,7 @@ u8 func040a_tech2[] = { open_door(0x04) yield restart_timer - chr_do_animation(0x0205, 0, -1, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) + chr_do_animation(ANIM_OPERATE_0205, 0, -1, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) // @bug: Duplicate label. I suspect the goto first 0x21 below is // supposed to go here. The only possible side effect is the tech may @@ -2355,19 +2355,19 @@ u8 func1400_setup_counterop[] = { u8 func100d_intro[] = { play_cutscene_track(MUSIC_EXTRACTION_INTRO) - camera_movement(0x0138) + camera_movement(ANIM_0138) cmd0175(60) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0139, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0139, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(0x00, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(0x00, CHRHFLAG_00020000) - chr_do_animation(0x013d, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 4) + chr_do_animation(ANIM_013D, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 4) set_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_INTRO_GUARD, CHRHFLAG_00020000) - chr_do_animation(0x013a, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 4) + chr_do_animation(ANIM_013A, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 4) unset_stage_flag(STAGEFLAG_00800000) restart_timer fade_to_color(0x000000ff, 0) @@ -2439,23 +2439,23 @@ u8 func100d_intro[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0139, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_0139, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_DRCAROLL, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_DRCAROLL, CHRHFLAG_00020000) - chr_do_animation(0x013d, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) + chr_do_animation(ANIM_013D, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) unset_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_UNPLAYABLE) set_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_INVINCIBLE) set_chr_hiddenflag(CHR_INTRO_GUARD, CHRHFLAG_00020000) set_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_00010000) - chr_do_animation(0x013a, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 2) + chr_do_animation(ANIM_013A, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 2) stop_cutscene_track stop_ambient_track enter_firstperson yield - chr_do_animation(0x020c, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 2) + chr_do_animation(ANIM_020C, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 2) set_ailist(CHR_DRCAROLL, 0x0402) yield kill(CHR_INTRO_GUARD) @@ -2466,7 +2466,7 @@ u8 func100d_intro[] = { u8 func0412_outro[] = { play_cutscene_track(MUSIC_EXTRACTION_OUTRO) play_temporary_track(MUSIC_EXTRACTION_OUTRO_SFX) - camera_movement(0x0157) + camera_movement(ANIM_0157) set_object_flag2(OBJ_HOVERCOPTER, OBJFLAG2_INVISIBLE) disable_object(OBJ_HOVERCOPTER) set_ailist(CHR_P1P2, GAILIST_IDLE) @@ -2487,7 +2487,7 @@ u8 func0412_outro[] = { unset_chr_chrflag(CHR_DRCAROLL, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_DRCAROLL, CHRHFLAG_00020000) - chr_do_animation(0x015d, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 4) + chr_do_animation(ANIM_015D, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 4) set_ailist(CHR_CASS, AILIST_CASS_OUTRO) set_chr_chrflag(CHR_CASS, CHRCFLAG_UNPLAYABLE) @@ -2495,7 +2495,7 @@ u8 func0412_outro[] = { unset_chr_chrflag(CHR_CASS, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_CASS, CHRHFLAG_00020000) - chr_do_animation(0x0159, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CASS, 4) + chr_do_animation(ANIM_0159, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CASS, 4) set_ailist(CHR_MRBLONDE, GAILIST_IDLE) set_chr_chrflag(CHR_MRBLONDE, CHRCFLAG_UNPLAYABLE) @@ -2503,7 +2503,7 @@ u8 func0412_outro[] = { unset_chr_chrflag(CHR_MRBLONDE, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_MRBLONDE, CHRHFLAG_00020000) - chr_do_animation(0x015a, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MRBLONDE, 4) + chr_do_animation(ANIM_015A, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MRBLONDE, 4) set_ailist(CHR_OUTRO_GUARD1, GAILIST_IDLE) set_chr_chrflag(CHR_OUTRO_GUARD1, CHRCFLAG_UNPLAYABLE) @@ -2511,7 +2511,7 @@ u8 func0412_outro[] = { unset_chr_chrflag(CHR_OUTRO_GUARD1, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_OUTRO_GUARD1, CHRHFLAG_00020000) - chr_do_animation(0x015b, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_GUARD1, 4) + chr_do_animation(ANIM_015B, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_GUARD1, 4) set_ailist(CHR_OUTRO_GUARD2, GAILIST_IDLE) set_chr_chrflag(CHR_OUTRO_GUARD2, CHRCFLAG_UNPLAYABLE) @@ -2519,19 +2519,19 @@ u8 func0412_outro[] = { unset_chr_chrflag(CHR_OUTRO_GUARD2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_OUTRO_GUARD2, CHRHFLAG_00020000) - chr_do_animation(0x015c, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_GUARD2, 4) + chr_do_animation(ANIM_015C, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_GUARD2, 4) enable_object(OBJ_JUMPSHIP) set_object_flag3(OBJ_JUMPSHIP, OBJFLAG3_00000010) set_object_flag2(OBJ_JUMPSHIP, OBJFLAG2_04000000) - object_do_animation(0x015e, OBJ_JUMPSHIP, 0x04, 0xffff) + object_do_animation(ANIM_015E, OBJ_JUMPSHIP, 0x04, 0xffff) set_ailist(CHR_P1P2, GAILIST_IDLE) set_chr_chrflag(CHR_P1P2, CHRCFLAG_UNPLAYABLE) #if VERSION >= VERSION_NTSC_1_0 unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x0158, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_0158, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) show_nonessential_chrs(FALSE) restart_timer set_cutscene_weapon(CHR_P1P2, -1, -1) diff --git a/src/files/setup/setupate.c b/src/files/setup/setupate.c index 94fb56dde..033ef064b 100644 --- a/src/files/setup/setupate.c +++ b/src/files/setup/setupate.c @@ -98,7 +98,7 @@ u8 func1001_objectives_failed[] = { u8 func1002_first_walk[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) - camera_movement(0x0488) + camera_movement(ANIM_0488) unset_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) @@ -149,7 +149,7 @@ u8 func1007_second_walk[] = { set_ailist(CHR_SELF, GAILIST_IDLE) label(0x06) revoke_control(CHR_BOND, 0) - camera_movement(0x0488) + camera_movement(ANIM_0488) // Place chrs label(0x8f) @@ -231,7 +231,7 @@ u8 func1008_third_walk[] = { // Do cutscene label(0x06) revoke_control(CHR_BOND, 0) - camera_movement(0x0488) + camera_movement(ANIM_0488) label(0x8f) set_ailist(CHR_P1P2, AILIST_MOVE_TO_PAD) diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c index 6dcff1349..a30a9f6ed 100644 --- a/src/files/setup/setupazt.c +++ b/src/files/setup/setupazt.c @@ -473,12 +473,12 @@ u8 func1002_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_CRASHSITE_INTRO) - camera_movement(0x01b5) + camera_movement(ANIM_01B5) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01b6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01B6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_hudpiece_visible(CHR_BOND, TRUE) restart_timer @@ -583,7 +583,7 @@ u8 func1002_intro[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01b6, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_01B6, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) stop_cutscene_track stop_ambient_track set_chr_hudpiece_visible(CHR_BOND, FALSE) @@ -618,7 +618,7 @@ u8 func0402_outro[] = { label(0x31) set_target_chr(CHR_COOP) label(0x08) - camera_movement(0x01d9) + camera_movement(ANIM_01D9) play_cutscene_track(MUSIC_CRASHSITE_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -638,49 +638,49 @@ u8 func0402_outro[] = { unset_chr_chrflag(CHR_TARGET, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_TARGET, CHRHFLAG_00020000) - chr_do_animation(0x01df, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) + chr_do_animation(ANIM_01DF, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) set_chr_chrflag(CHR_SKEDAR, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_SKEDAR, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_SKEDAR, CHRHFLAG_00020000) - chr_do_animation(0x01da, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR, 4) + chr_do_animation(ANIM_01DA, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR, 4) set_chr_chrflag(CHR_ELVIS_OUTRO, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_ELVIS_OUTRO, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS_OUTRO, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS_OUTRO, CHRHFLAG_00020000) - chr_do_animation(0x01db, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS_OUTRO, 4) + chr_do_animation(ANIM_01DB, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS_OUTRO, 4) #if VERSION >= VERSION_NTSC_1_0 set_chr_chrflag(CHR_TRENT_OUTRO, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_TRENT_OUTRO, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TRENT_OUTRO, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TRENT_OUTRO, CHRHFLAG_00020000) - chr_do_animation(0x01dc, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TRENT_OUTRO, 4) + chr_do_animation(ANIM_01DC, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TRENT_OUTRO, 4) #else set_chr_chrflag(CHR_TRENT, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_TRENT, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TRENT, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TRENT, CHRHFLAG_00020000) - chr_do_animation(0x01dc, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TRENT, 4) + chr_do_animation(ANIM_01DC, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TRENT, 4) #endif set_chr_chrflag(CHR_MRBLONDE, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_MRBLONDE, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_MRBLONDE, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_MRBLONDE, CHRHFLAG_00020000) - chr_do_animation(0x01dd, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MRBLONDE, 4) + chr_do_animation(ANIM_01DD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MRBLONDE, 4) set_chr_chrflag(CHR_PRESIDENT_OUTRO, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_PRESIDENT_OUTRO, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_PRESIDENT_OUTRO, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_PRESIDENT_OUTRO, CHRHFLAG_00020000) - chr_do_animation(0x01de, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_PRESIDENT_OUTRO, 4) + chr_do_animation(ANIM_01DE, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_PRESIDENT_OUTRO, 4) enable_object(0x00) set_object_flag2(OBJ_CRATE, OBJFLAG2_04000000) set_object_flag3(OBJ_CRATE, OBJFLAG3_00000010) - object_do_animation(0x01e0, OBJ_CRATE, 0x04, 0xffff) + object_do_animation(ANIM_01E0, OBJ_CRATE, 0x04, 0xffff) restart_timer set_cutscene_weapon(CHR_TARGET, WEAPON_NONE, WEAPON_NONE) yield @@ -2033,7 +2033,7 @@ u8 func1014_setup_skedar_shuttle[] = { enable_object(OBJ_SKEDAR_SHUTTLE) set_object_flag3(OBJ_SKEDAR_SHUTTLE, OBJFLAG3_00000010) object_set_modelpart_visible(OBJ_SKEDAR_SHUTTLE, MODELPART_SKSHUTTLE_GANGWAY, FALSE) - object_do_animation(0x0486, OBJ_SKEDAR_SHUTTLE, 0x01, 0xffff) + object_do_animation(ANIM_0486, OBJ_SKEDAR_SHUTTLE, 0x01, 0xffff) set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c index 137971814..1d57c6e20 100644 --- a/src/files/setup/setupcave.c +++ b/src/files/setup/setupcave.c @@ -793,28 +793,28 @@ u8 func0401_unused_cutscene[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_AIRBASE_OUTRO_LONG) - camera_movement(0x016b) + camera_movement(ANIM_016B) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0170, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0170, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_hudpiece_visible(CHR_BOND, TRUE) set_chr_chrflag(0x00, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x00, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x00, CHRHFLAG_00020000) - chr_do_animation(0x016c, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x00, 4) + chr_do_animation(ANIM_016C, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x00, 4) set_chr_chrflag(0x01, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x01, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x01, CHRHFLAG_00020000) - chr_do_animation(0x016d, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x01, 4) + chr_do_animation(ANIM_016D, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x01, 4) set_chr_chrflag(0x02, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x02, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x02, CHRHFLAG_00020000) - chr_do_animation(0x016e, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x02, 4) + chr_do_animation(ANIM_016E, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x02, 4) set_chr_chrflag(CHR_STEWARDESS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_STEWARDESS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_STEWARDESS, CHRHFLAG_00020000) - chr_do_animation(0x016f, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_STEWARDESS, 4) + chr_do_animation(ANIM_016F, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_STEWARDESS, 4) fade_to_color(0x000000ff, 0) fade_to_color(0x00000000, 90) set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) @@ -847,7 +847,7 @@ u8 func0401_unused_cutscene[] = { u8 func0425_outro[] = { fade_to_color(0x000000ff, 0) fade_to_color(0x00000000, 110) - camera_movement(0x031a) + camera_movement(ANIM_031A) play_cutscene_track(MUSIC_AIRBASE_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -857,12 +857,12 @@ u8 func0425_outro[] = { set_chr_chrflag(CHR_OUTRO_NSA, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_OUTRO_NSA, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_OUTRO_NSA, CHRHFLAG_00020000) - chr_do_animation(0x031b, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_NSA, 4) + chr_do_animation(ANIM_031B, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_NSA, 4) enable_object(OBJ_PLANE) set_object_flag2(OBJ_PLANE, OBJFLAG2_04000000) set_object_flag3(OBJ_PLANE, OBJFLAG3_00000010) - object_do_animation(0x031c, OBJ_PLANE, 0x04, 0xffff) + object_do_animation(ANIM_031C, OBJ_PLANE, 0x04, 0xffff) set_cutscene_weapon(CHR_P1P2, WEAPON_NONE, WEAPON_NONE) yield @@ -1699,7 +1699,7 @@ u8 func0408_secretary[] = { // label(0x31) speak(CHR_TARGET, L_CAVE_030, MP3_0272, CHANNEL_4, COLOR_06_WHITE) // "OK, you know the way from here." - chr_do_animation(0x0232, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_TALKING_0232, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) unlock_door(0x18, 0x02) beginloop(0x0e) @@ -2154,7 +2154,7 @@ u8 func0409_office1[] = { // Not disguised, or disguised with weapon equipped label(0x07) - object_do_animation(0x025a, 0xff, 0x02, 0xffff) + object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) restart_timer try_face_entity(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0x05) @@ -2235,7 +2235,7 @@ u8 func040a_office2[] = { label(0x72) label(0x02) - object_do_animation(0x025a, 0xff, 0x02, 0xffff) + object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) restart_timer try_face_entity(ATTACKFLAG_AIMATTARGET, 0, /*goto*/ 0x05) @@ -2770,7 +2770,7 @@ u8 func0414_officeworker[] = { endloop(0x05) label(0x79) - chr_do_animation(0x0229, -1, 60, CHRANIMFLAG_PAUSEATEND | CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) + chr_do_animation(ANIM_COWER_0229, -1, 60, CHRANIMFLAG_PAUSEATEND | CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) beginloop(0x06) if_chr_idle(/*goto*/ 0x02) @@ -3434,7 +3434,7 @@ u8 func0419_ba8c[] = { label(0x4f) restart_timer - chr_do_animation(0x025f, 0, 193, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_LOOK_AROUND_FRANTIC, 0, 193, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) label(0x0f) yield if_timer_gt(90, /*goto*/ 0x0b) @@ -3442,7 +3442,7 @@ u8 func0419_ba8c[] = { label(0x02) say_quip(CHR_BOND, 0x24, 0xff, 0x00, 0xff, 0x81, 0x00, 0x00) - chr_do_animation(0x002e, 0, 193, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_SURRENDER_002E, 0, 193, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) label(0x09) yield if_timer_gt(120, /*goto*/ 0x0b) @@ -3465,7 +3465,7 @@ u8 func0419_ba8c[] = { increase_squadron_alertness(100) say_quip(CHR_BOND, 0x25, 0xff, 0x00, 0xff, 0x81, 0x00, 0x00) label(0x0e) - chr_do_animation(0x0229, -1, -1, CHRANIMFLAG_SLOWUPDATE, 20, CHR_SELF, 2) + chr_do_animation(ANIM_COWER_0229, -1, -1, CHRANIMFLAG_SLOWUPDATE, 20, CHR_SELF, 2) label(0x0a) yield if_chr_stopped(/*goto*/ 0x31) @@ -3603,44 +3603,44 @@ u8 func1003_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_AIRBASE_INTRO) - camera_movement(0x01e5) + camera_movement(ANIM_01E5) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01e6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01E6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_hudpiece_visible(CHR_BOND, TRUE) set_chr_chrflag(CHR_TRENT, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TRENT, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TRENT, CHRHFLAG_00020000) - chr_do_animation(0x01e7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TRENT, 4) + chr_do_animation(ANIM_01E7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TRENT, 4) set_chr_chrflag(0x48, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x48, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x48, CHRHFLAG_00020000) - chr_do_animation(0x01e8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x48, 4) + chr_do_animation(ANIM_01E8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x48, 4) set_chr_chrflag(0x49, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x49, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x49, CHRHFLAG_00020000) - chr_do_animation(0x01e9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x49, 4) + chr_do_animation(ANIM_01E9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x49, 4) set_chr_chrflag(0x4a, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x4a, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x4a, CHRHFLAG_00020000) - chr_do_animation(0x01ea, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x4a, 4) + chr_do_animation(ANIM_01EA, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x4a, 4) set_chr_chrflag(0x4b, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x4b, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x4b, CHRHFLAG_00020000) - chr_do_animation(0x01eb, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x4b, 4) + chr_do_animation(ANIM_01EB, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x4b, 4) set_chr_chrflag(0x4c, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x4c, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x4c, CHRHFLAG_00020000) - chr_do_animation(0x01ec, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x4c, 4) + chr_do_animation(ANIM_01EC, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x4c, 4) enable_object(0x22) set_object_flag2(0x22, OBJFLAG2_04000000) set_object_flag3(0x22, OBJFLAG3_00000010) - object_do_animation(0x01ed, 0x22, 0x04, 0xffff) + object_do_animation(ANIM_01ED, 0x22, 0x04, 0xffff) enable_object(0x2f) set_object_flag2(0x2f, OBJFLAG2_04000000) set_object_flag3(0x2f, OBJFLAG3_00000010) - object_do_animation(0x01ee, 0x2f, 0x04, 0xffff) + object_do_animation(ANIM_01EE, 0x2f, 0x04, 0xffff) restart_timer fade_to_color(0x000000ff, 0x0000) fade_to_color(0x00000000, 0x006e) @@ -3850,14 +3850,14 @@ u8 func1003_intro[] = { set_chr_chrflag(0x49, CHRCFLAG_INVINCIBLE) set_chr_chrflag(0x49, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x49, CHRHFLAG_00020000) - chr_do_animation(0x01e9, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x49, 2) + chr_do_animation(ANIM_01E9, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x49, 2) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01e6, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_01E6, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) set_chr_hudpiece_visible(CHR_BOND, FALSE) unset_object_flag2(0x22, OBJFLAG2_04000000) set_object_flag3(0x22, OBJFLAG3_00000010) - object_do_animation(0x01ed, 0x22, 0x01, 0xfffe) + object_do_animation(ANIM_01ED, 0x22, 0x01, 0xfffe) set_ailist(0x00, 0x0405) set_ailist(0x01, 0x0405) set_ailist(CHR_STEWARDESS, AILIST_STEWARDESS) diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c index 9dbb477c2..3b7df70cc 100644 --- a/src/files/setup/setupdam.c +++ b/src/files/setup/setupdam.c @@ -689,19 +689,19 @@ u8 func1002_intro[] = { play_cutscene_track(MUSIC_PELAGIC_INTRO) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) - camera_movement(0x02ce) + camera_movement(ANIM_02CE) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x02cf, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_02CF, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x02d0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_02D0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) set_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_INTRO_GUARD, CHRHFLAG_00020000) - chr_do_animation(0x02d1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 4) + chr_do_animation(ANIM_02D1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 4) restart_timer set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) yield @@ -815,10 +815,10 @@ u8 func1002_intro[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x02cf, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_02CF, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x02d0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) + chr_do_animation(ANIM_02D0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) unset_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_UNPLAYABLE) disable_chr(CHR_INTRO_GUARD) enter_firstperson @@ -838,7 +838,7 @@ u8 func1002_intro[] = { }; u8 func0c01_outro[] = { - camera_movement(0x02e2) + camera_movement(ANIM_02E2) play_cutscene_track(MUSIC_PELAGIC_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -848,33 +848,33 @@ u8 func0c01_outro[] = { unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x02e3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_02E3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) set_ailist(CHR_ELVIS, GAILIST_IDLE) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x02e4, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_02E4, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) enable_object(OBJ_OUTRO_SUBMARINE) set_object_flag2(OBJ_OUTRO_SUBMARINE, OBJFLAG2_04000000) set_object_flag3(OBJ_OUTRO_SUBMARINE, OBJFLAG3_00000010) - object_do_animation(0x02e5, OBJ_OUTRO_SUBMARINE, 0x04, 0xffff) + object_do_animation(ANIM_02E5, OBJ_OUTRO_SUBMARINE, 0x04, 0xffff) enable_object(OBJ_OUTRO_GRATE) set_object_flag2(OBJ_OUTRO_GRATE, OBJFLAG2_04000000) set_object_flag3(OBJ_OUTRO_GRATE, OBJFLAG3_00000010) - object_do_animation(0x02e6, OBJ_OUTRO_GRATE, 0x04, 0xffff) + object_do_animation(ANIM_02E6, OBJ_OUTRO_GRATE, 0x04, 0xffff) enable_object(OBJ_OUTRO_CRATE1) set_object_flag2(OBJ_OUTRO_CRATE1, OBJFLAG2_04000000) set_object_flag3(OBJ_OUTRO_CRATE1, OBJFLAG3_00000010) - object_do_animation(0x02e7, OBJ_OUTRO_CRATE1, 0x04, 0xffff) + object_do_animation(ANIM_02E7, OBJ_OUTRO_CRATE1, 0x04, 0xffff) enable_object(OBJ_OUTRO_CRATE2) set_object_flag2(OBJ_OUTRO_CRATE2, OBJFLAG2_04000000) set_object_flag3(OBJ_OUTRO_CRATE2, OBJFLAG3_00000010) - object_do_animation(0x02e8, OBJ_OUTRO_CRATE2, 0x04, 0xffff) + object_do_animation(ANIM_02E8, OBJ_OUTRO_CRATE2, 0x04, 0xffff) set_cutscene_weapon(CHR_P1P2, WEAPON_NONE, WEAPON_NONE) yield @@ -1006,10 +1006,10 @@ u8 func0c01_outro[] = { label(0x39) unset_chr_chrflag(CHR_P1P2, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x02cf, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + chr_do_animation(ANIM_02CF, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x02d0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) + chr_do_animation(ANIM_02D0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) end_level set_ailist(CHR_SELF, GAILIST_IDLE) endlist diff --git a/src/files/setup/setupdepo.c b/src/files/setup/setupdepo.c index b04f1cf85..a2ec1f56e 100644 --- a/src/files/setup/setupdepo.c +++ b/src/files/setup/setupdepo.c @@ -1588,17 +1588,17 @@ u8 func040d_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_G5_INTRO) - camera_movement(0x0165) + camera_movement(ANIM_0165) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0166, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0166, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_INTRO_VICTIM, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_INTRO_VICTIM, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_INTRO_VICTIM, CHRHFLAG_00020000) - chr_do_animation(0x0167, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_VICTIM, 4) + chr_do_animation(ANIM_0167, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_VICTIM, 4) restart_timer set_cutscene_weapon(CHR_BOND, WEAPON_FALCON2_SILENCER, WEAPON_NONE) @@ -1803,18 +1803,18 @@ u8 func040d_intro[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0166, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_0166, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_INTRO_VICTIM, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_INTRO_VICTIM, CHRHFLAG_00020000) set_chr_chrflag(CHR_INTRO_VICTIM, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_INTRO_VICTIM, CHRCFLAG_00010000) - chr_do_animation(0x0167, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_VICTIM, 2) + chr_do_animation(ANIM_0167, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_VICTIM, 2) stop_cutscene_track stop_ambient_track enter_firstperson - chr_do_animation(0x022a, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_VICTIM, 2) + chr_do_animation(ANIM_022A, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_VICTIM, 2) chr_drop_weapon(CHR_INTRO_VICTIM) yield set_ailist(CHR_CLOAK_1A, AILIST_INIT_CLOAK1_GUARD) @@ -1841,7 +1841,7 @@ u8 func040e_meeting_cutscene[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_G5_MIDCUTSCENE) - camera_movement(0x0191) + camera_movement(ANIM_0191) set_stage_flag(STAGEFLAG_MEETING_STARTED) set_ailist(CHR_BLONDE, GAILIST_IDLE) set_ailist(CHR_CASS, GAILIST_IDLE) @@ -1851,22 +1851,22 @@ u8 func040e_meeting_cutscene[] = { set_chr_chrflag(CHR_BLONDE, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_BLONDE, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_BLONDE, CHRHFLAG_00020000) - chr_do_animation(0x0192, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BLONDE, 4) + chr_do_animation(ANIM_0192, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BLONDE, 4) set_chr_chrflag(CHR_CASS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_CASS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_CASS, CHRHFLAG_00020000) - chr_do_animation(0x0193, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CASS, 4) + chr_do_animation(ANIM_0193, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CASS, 4) set_chr_chrflag(CHR_TRENT, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TRENT, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TRENT, CHRHFLAG_00020000) - chr_do_animation(0x0194, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TRENT, 4) + chr_do_animation(ANIM_0194, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TRENT, 4) set_chr_chrflag(CHR_STRIPES, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_STRIPES, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_STRIPES, CHRHFLAG_00020000) - chr_do_animation(0x0195, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_STRIPES, 4) + chr_do_animation(ANIM_0195, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_STRIPES, 4) restart_timer beginloop(0x55) @@ -2106,7 +2106,7 @@ u8 func040f_outro_from_menu[] = { }; u8 func040f_outro[] = { - camera_movement(0x0196) + camera_movement(ANIM_0196) play_cutscene_track(MUSIC_G5_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -2116,7 +2116,7 @@ u8 func040f_outro[] = { unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x0197, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_0197, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) set_chr_hudpiece_visible(CHR_P1P2, TRUE) restart_timer deactivate_alarm diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c index c965d5b68..595ebd032 100644 --- a/src/files/setup/setupdish.c +++ b/src/files/setup/setupdish.c @@ -606,7 +606,7 @@ u8 func041e_colleague[] = { if_target_in_sight(/*goto*/ 0x2f) if_chr_idle(/*goto*/ 0x06) if_self_flag_bankx_eq(CHRFLAG1_DOINGIDLEANIMATION, FALSE, BANK_1, /*goto*/ 0x7f) - chr_do_animation(0x0227, 0, -1, CHRANIMFLAG_PAUSEATEND | CHRANIMFLAG_SLOWUPDATE, 0, CHR_SELF, 2) + chr_do_animation(ANIM_SITTING_DORMANT, 0, -1, CHRANIMFLAG_PAUSEATEND | CHRANIMFLAG_SLOWUPDATE, 0, CHR_SELF, 2) reloop(0x04) // Player not in sight - 2 in 255 chance of doing a bored animation @@ -5951,14 +5951,14 @@ u8 func103f_msg_fnp90[] = { u8 func1000_jo_typing[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) - camera_movement(0x0484) + camera_movement(ANIM_0484) cmd0175(60) if_controller_button_pressed(/*goto*/ 0x7b) play_cutscene_track(MUSIC_CI_INTRO) unset_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0485, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0485, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) restart_timer fade_to_color(0x000000ff, 0) fade_to_color(0x00000000, 110) @@ -5991,7 +5991,7 @@ u8 func1000_jo_typing[] = { label(0x7b) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0485, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_0485, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) enter_firstperson diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c index 0aab8a74b..79c5e0c3b 100644 --- a/src/files/setup/setupear.c +++ b/src/files/setup/setupear.c @@ -2241,7 +2241,7 @@ u8 func100e_experiment_terminals_destroyed[] = { u8 func0416_intro[] = { play_cutscene_track(MUSIC_INVESTIGATION_INTRO) - camera_movement(0x00f5) + camera_movement(ANIM_00F5) cmd0175(60) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) @@ -2249,13 +2249,13 @@ u8 func0416_intro[] = { set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_chrflag(CHR_BOND, CHRCFLAG_00010000) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x00f6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_00F6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_UNPLAYABLE) set_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_00010000) unset_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_INTRO_GUARD, CHRHFLAG_00020000) - chr_do_animation(0x00f7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 4) + chr_do_animation(ANIM_00F7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 4) restart_timer fade_to_color(0x000000ff, 0) @@ -2343,12 +2343,12 @@ u8 func0416_intro[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_BOND, CHRCFLAG_00010000) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x00f6, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_00F6, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_UNPLAYABLE) set_chr_chrflag(CHR_INTRO_GUARD, CHRCFLAG_INVINCIBLE) set_chr_hiddenflag(CHR_INTRO_GUARD, CHRHFLAG_00020000) - chr_do_animation(0x00f7, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 2) + chr_do_animation(ANIM_00F7, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 2) unset_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) @@ -2356,7 +2356,7 @@ u8 func0416_intro[] = { stop_ambient_track enter_firstperson yield - chr_do_animation(0x020b, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 2) + chr_do_animation(ANIM_020B, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_GUARD, 2) yield kill(CHR_INTRO_GUARD) set_ailist(CHR_SELF, GAILIST_IDLE) @@ -2377,8 +2377,8 @@ u8 func0417_outro[] = { set_ailist(CHR_K7_GUARD, GAILIST_IDLE) restart_timer dprint 's','h','o','t',' ','1',0, - camera_movement(0x00f9) - chr_do_animation(0x00fa, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + camera_movement(ANIM_00F9) + chr_do_animation(ANIM_00FA, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) set_cutscene_weapon(CHR_P1P2, -1, -1) yield set_cutscene_weapon(CHR_P1P2, -1, WEAPON_FALCON2) @@ -2399,22 +2399,22 @@ u8 func0417_outro[] = { dprint 's','h','o','t',' ','2',0, if_controller_button_pressed(/*goto*/ 0x06) - camera_movement(0x0140) - chr_do_animation(0x0141, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + camera_movement(ANIM_0140) + chr_do_animation(ANIM_0141, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) wait_for_camera(0x09) dprint 's','h','o','t',' ','3',0, if_controller_button_pressed(/*goto*/ 0x06) - camera_movement(0x0143) - chr_do_animation(0x0144, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + camera_movement(ANIM_0143) + chr_do_animation(ANIM_0144, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) wait_for_camera(0x0a) dprint 's','h','o','t',' ','4',0, if_controller_button_pressed(/*goto*/ 0x06) - camera_movement(0x0146) - chr_do_animation(0x0147, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + camera_movement(ANIM_0146) + chr_do_animation(ANIM_0147, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) restart_timer beginloop(0x0b) @@ -2442,32 +2442,32 @@ u8 func0417_outro[] = { unset_chr_chrflag(CHR_DRCAROLL, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_DRCAROLL, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_DRCAROLL, CHRHFLAG_00020000) - camera_movement(0x0149) - chr_do_animation(0x014a, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) - chr_do_animation(0x014b, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) + camera_movement(ANIM_0149) + chr_do_animation(ANIM_014A, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + chr_do_animation(ANIM_014B, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) wait_for_camera(0x0c) dprint 's','h','o','t',' ','6',0, if_controller_button_pressed(/*goto*/ 0x06) - camera_movement(0x014c) - chr_do_animation(0x014d, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) - chr_do_animation(0x014e, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) + camera_movement(ANIM_014C) + chr_do_animation(ANIM_014D, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + chr_do_animation(ANIM_014E, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) wait_for_camera(0x0d) dprint 's','h','o','t',' ','7',0, if_controller_button_pressed(/*goto*/ 0x06) - camera_movement(0x014f) - chr_do_animation(0x0150, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) - chr_do_animation(0x0151, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) + camera_movement(ANIM_014F) + chr_do_animation(ANIM_0150, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + chr_do_animation(ANIM_0151, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) wait_for_camera(0x0e) dprint 's','h','o','t',' ','8',0, - camera_movement(0x0152) - chr_do_animation(0x0153, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) - chr_do_animation(0x0154, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) + camera_movement(ANIM_0152) + chr_do_animation(ANIM_0153, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + chr_do_animation(ANIM_0154, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) wait_for_camera(0x0f) diff --git a/src/files/setup/setupeld.c b/src/files/setup/setupeld.c index 1f79e3b9f..1d728822f 100644 --- a/src/files/setup/setupeld.c +++ b/src/files/setup/setupeld.c @@ -777,32 +777,32 @@ u8 func1002_intro_from_menu[] = { u8 func1002_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) - camera_movement(0x0171) + camera_movement(ANIM_0171) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) if_stage_flag_eq(STAGEFLAG_PLAYING_INTRO_FROM_MENU, TRUE, /*goto*/ 0x2e) if_difficulty_lt(DIFF_PA, /*goto*/ 0x2d) label(0x2e) - chr_do_animation(0x0172, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0172, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) remove_chr(CHR_NEGOTIATOR) play_cutscene_track(MUSIC_VILLA_INTRO3) goto_next(0x06) label(0x2d) play_cutscene_track(MUSIC_VILLA_INTRO2) - chr_do_animation(0x0172, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_NEGOTIATOR, 4) + chr_do_animation(ANIM_0172, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_NEGOTIATOR, 4) label(0x06) set_chr_chrflag(CHR_TAKER1, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TAKER1, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TAKER1, CHRHFLAG_00020000) - chr_do_animation(0x0173, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 4) + chr_do_animation(ANIM_0173, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 4) set_chr_chrflag(CHR_TAKER2, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TAKER2, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TAKER2, CHRHFLAG_00020000) - chr_do_animation(0x0174, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 4) + chr_do_animation(ANIM_0174, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 4) enable_object(OBJ_DROPSHIP) set_object_flag2(OBJ_DROPSHIP, OBJFLAG2_04000000) set_object_flag3(OBJ_DROPSHIP, OBJFLAG3_00000010) - object_do_animation(0x0175, OBJ_DROPSHIP, 0x04, 0xffff) + object_do_animation(ANIM_0175, OBJ_DROPSHIP, 0x04, 0xffff) restart_timer fade_to_color(0x000000ff, 0) fade_to_color(0x00000000, 110) @@ -938,27 +938,27 @@ u8 func1002_intro[] = { label(0x56) if_controller_button_pressed(/*goto*/ 0x56) - camera_movement(0x01b7) + camera_movement(ANIM_01B7) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) if_stage_flag_eq(STAGEFLAG_PLAYING_INTRO_FROM_MENU, TRUE, /*goto*/ 0x2e) if_difficulty_lt(DIFF_PA, /*goto*/ 0x2d) label(0x2e) - chr_do_animation(0x01b8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01B8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) goto_next(0x06) label(0x2d) - chr_do_animation(0x01b8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_NEGOTIATOR, 4) + chr_do_animation(ANIM_01B8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_NEGOTIATOR, 4) label(0x06) set_chr_chrflag(CHR_TAKER1, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TAKER1, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TAKER1, CHRHFLAG_00020000) - chr_do_animation(0x01b9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 4) + chr_do_animation(ANIM_01B9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 4) set_chr_chrflag(CHR_TAKER2, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TAKER2, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TAKER2, CHRHFLAG_00020000) - chr_do_animation(0x01ba, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 4) + chr_do_animation(ANIM_01BA, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 4) restart_timer @@ -1028,32 +1028,32 @@ u8 func1002_intro[] = { if_difficulty_lt(DIFF_PA, /*goto*/ 0x4e) goto_next(0x4f) label(0x4e) - camera_movement(0x01bb) + camera_movement(ANIM_01BB) cmd0175(60) if_controller_button_pressed(/*goto*/ 0x56) set_chr_chrflag(CHR_NEGOTIATOR, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_NEGOTIATOR, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_NEGOTIATOR, CHRHFLAG_00020000) - chr_do_animation(0x0001, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_NEGOTIATOR, 4) + chr_do_animation(ANIM_TWO_GUN_HOLD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_NEGOTIATOR, 4) set_chr_chrflag(CHR_TAKER1, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TAKER1, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TAKER1, CHRHFLAG_00020000) - chr_do_animation(0x0001, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 4) + chr_do_animation(ANIM_TWO_GUN_HOLD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 4) set_chr_chrflag(CHR_TAKER2, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TAKER2, CHRCFLAG_HIDDEN) - chr_do_animation(0x0001, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 4) + chr_do_animation(ANIM_TWO_GUN_HOLD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 4) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01bc, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01BC, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) enable_object(OBJ_DROPSHIP) set_object_flag2(OBJ_DROPSHIP, OBJFLAG2_04000000) set_object_flag3(OBJ_DROPSHIP, OBJFLAG3_00000010) - object_do_animation(0x01bd, OBJ_DROPSHIP, 0x04, 0xffff) + object_do_animation(ANIM_01BD, OBJ_DROPSHIP, 0x04, 0xffff) restart_timer @@ -1103,19 +1103,19 @@ u8 func1002_intro[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01bc, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_01BC, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_NEGOTIATOR, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_NEGOTIATOR, CHRHFLAG_00020000) - chr_do_animation(0x01b8, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_NEGOTIATOR, 2) + chr_do_animation(ANIM_01B8, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_NEGOTIATOR, 2) unset_chr_chrflag(CHR_TAKER1, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_TAKER1, CHRHFLAG_00020000) - chr_do_animation(0x01b9, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 2) + chr_do_animation(ANIM_01B9, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 2) unset_chr_chrflag(CHR_TAKER2, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_TAKER2, CHRHFLAG_00020000) - chr_do_animation(0x01ba, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 2) + chr_do_animation(ANIM_01BA, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 2) disable_object(OBJ_DROPSHIP) stop_cutscene_track @@ -1124,9 +1124,9 @@ u8 func1002_intro[] = { unset_stage_flag(STAGEFLAG_PLAYING_INTRO_FROM_MENU) enter_firstperson yield - chr_do_animation(0x0001, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_NEGOTIATOR, 2) - chr_do_animation(0x0001, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_TAKER1, 2) - chr_do_animation(0x0001, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_TAKER2, 2) + chr_do_animation(ANIM_TWO_GUN_HOLD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_NEGOTIATOR, 2) + chr_do_animation(ANIM_TWO_GUN_HOLD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_TAKER1, 2) + chr_do_animation(ANIM_TWO_GUN_HOLD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_TAKER2, 2) set_ailist(CHR_TAKER1, AILIST_INIT_TAKER) set_ailist(CHR_TAKER2, AILIST_INIT_TAKER) set_ailist(CHR_NEGOTIATOR, AILIST_NEGOTIATOR) @@ -1134,21 +1134,21 @@ u8 func1002_intro[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x4f) - camera_movement(0x01be) + camera_movement(ANIM_01BE) cmd0175(60) disable_object(OBJ_DROPSHIP) if_controller_button_pressed(/*goto*/ 0x56) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01bf, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01BF, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_TAKER1, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TAKER1, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TAKER1, CHRHFLAG_00020000) - chr_do_animation(0x01c0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 4) + chr_do_animation(ANIM_01C0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 4) set_chr_chrflag(CHR_TAKER2, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TAKER2, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TAKER2, CHRHFLAG_00020000) - chr_do_animation(0x01c1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 4) + chr_do_animation(ANIM_01C1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 4) restart_timer label(0xa6) yield @@ -1204,15 +1204,15 @@ u8 func1002_intro[] = { mute_channel(CHANNEL_7) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01bf, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_01BF, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_TAKER1, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_TAKER1, CHRHFLAG_00020000) set_chr_chrflag(CHR_TAKER1, CHRCFLAG_00000001) - chr_do_animation(0x01c0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 2) + chr_do_animation(ANIM_01C0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER1, 2) unset_chr_chrflag(CHR_TAKER2, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_TAKER2, CHRHFLAG_00020000) set_chr_chrflag(CHR_TAKER2, CHRCFLAG_00000001) - chr_do_animation(0x01c1, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 2) + chr_do_animation(ANIM_01C1, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TAKER2, 2) disable_object(OBJ_DROPSHIP) stop_cutscene_track stop_ambient_track @@ -1234,7 +1234,7 @@ u8 func0c02_outro_from_menu[] = { }; u8 func0408_outro[] = { - camera_movement(0x017a) + camera_movement(ANIM_017A) play_cutscene_track(MUSIC_VILLA_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -1247,12 +1247,12 @@ u8 func0408_outro[] = { unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x017c, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_017C, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) set_chr_chrflag(CHR_CARRINGTON, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_CARRINGTON, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_CARRINGTON, CHRHFLAG_00020000) - chr_do_animation(0x017b, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CARRINGTON, 4) + chr_do_animation(ANIM_017B, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CARRINGTON, 4) show_nonessential_chrs(FALSE) restart_timer @@ -1537,7 +1537,7 @@ u8 func0402_taker[] = { set_self_flag_bankx(CHRFLAG0_00002000, BANK_0) say_quip(CHR_BOND, QUIP_SURPRISED, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) restart_timer - chr_do_animation(0x0202, 0, -1, CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) + chr_do_animation(ANIM_SURPRISED_0202, 0, -1, CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) beginloop(0x5f) if_timer_gt(180, /*goto*/ 0x5e) @@ -1616,10 +1616,10 @@ u8 func0402_taker[] = { label(0x2d) if_self_flag_bankx_eq(CHRFLAG0_NOHEAR, TRUE, BANK_0, /*goto*/ 0x06) - chr_do_animation(0x01fd, 0, -1, 0, 10, CHR_SELF, 2) + chr_do_animation(ANIM_01FD, 0, -1, 0, 10, CHR_SELF, 2) goto_next(0x0e) label(0x06) - chr_do_animation(0x0232, 0, -1, 0, 10, CHR_SELF, 2) + chr_do_animation(ANIM_TALKING_0232, 0, -1, 0, 10, CHR_SELF, 2) beginloop(0x0e) if_saw_injury(0x00, /*goto*/ 0x2e) @@ -2963,7 +2963,7 @@ u8 func0410_carrington[] = { set_self_chrflag(CHRCFLAG_INVINCIBLE) set_self_chrflag(CHRCFLAG_UNEXPLODABLE) set_chr_maxdamage(CHR_SELF, 1) - chr_do_animation(0x017b, 1, 1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CARRINGTON, 2) + chr_do_animation(ANIM_017B, 1, 1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CARRINGTON, 2) set_ailist(CHR_SELF, GAILIST_IDLE) endlist }; @@ -3175,7 +3175,7 @@ u8 func0411_cisoldier[] = { chr_drop_weapon(CHR_SELF) label(0x08) yield - chr_do_animation(0x0487, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CISOLDIER, 2) + chr_do_animation(ANIM_0487, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CISOLDIER, 2) yield yield yield diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c index 88f60f21b..549e0b7f8 100644 --- a/src/files/setup/setupimp.c +++ b/src/files/setup/setupimp.c @@ -877,7 +877,7 @@ u8 func1009_autogun_switch3[] = { }; u8 func0c01_outro[] = { - camera_movement(0x01a2) + camera_movement(ANIM_01A2) play_cutscene_track(MUSIC_DEFENSE_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -888,7 +888,7 @@ u8 func0c01_outro[] = { unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x01a3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_01A3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) #define show_object_with_animation(object, animation) \ enable_object(object) \ @@ -908,7 +908,7 @@ u8 func0c01_outro[] = { unset_object_flag(0x0d, OBJFLAG_DEACTIVATED) set_object_flag2(0x0d, OBJFLAG2_04000000) set_object_flag3(0x0d, OBJFLAG3_00000010) - object_do_animation(0x01b4, 0x0d, 0x01, 0xffff) + object_do_animation(ANIM_01B4, 0x0d, 0x01, 0xffff) show_nonessential_chrs(FALSE) open_door(0x51) @@ -955,19 +955,19 @@ u8 func0c01_outro[] = { label(0xb8) mute_channel(CHANNEL_10) disable_object(0x0d) - camera_movement(0x01ac) + camera_movement(ANIM_01AC) unset_chr_chrflag(CHR_SKEDAR1, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_SKEDAR2, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_SKEDAR1, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_SKEDAR1, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_SKEDAR1, CHRHFLAG_00020000) - chr_do_animation(0x01ad, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR1, 4) + chr_do_animation(ANIM_01AD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR1, 4) set_chr_chrflag(CHR_SKEDAR2, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_SKEDAR2, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_SKEDAR2, CHRHFLAG_00020000) - chr_do_animation(0x01ae, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR2, 4) + chr_do_animation(ANIM_01AE, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR2, 4) wait_until(16, 0x78) play_sound(SFX_SKEDAR_ROAR_0530, CHANNEL_10) @@ -986,13 +986,13 @@ u8 func0c01_outro[] = { label(0xb8) mute_channel(CHANNEL_10) - camera_movement(0x0305) + camera_movement(ANIM_0305) set_chr_chrflag(CHR_P1P2, CHRCFLAG_UNPLAYABLE) #if VERSION >= VERSION_NTSC_1_0 unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x0306, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_0306, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) show_object_with_animation(0x0e, 0x0307) show_object_with_animation(0x0f, 0x0308) @@ -1006,7 +1006,7 @@ u8 func0c01_outro[] = { enable_object(0x16) set_object_flag2(0x16, OBJFLAG2_04000000) set_object_flag3(0x16, OBJFLAG3_00000010) - object_do_animation(0x01b1, 0x16, 0x02, 0xffff) + object_do_animation(ANIM_01B1, 0x16, 0x02, 0xffff) wait_until(372, 0x7a) play_sound(SFX_0506, CHANNEL_10) @@ -1101,18 +1101,18 @@ u8 func0c01_outro[] = { label(0xb8) mute_channel(CHANNEL_10) - camera_movement(0x0310) + camera_movement(ANIM_0310) set_chr_chrflag(CHR_P1P2, CHRCFLAG_UNPLAYABLE) #if VERSION >= VERSION_NTSC_1_0 unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x0311, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_0311, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) set_chr_chrflag(CHR_SKEDAR1, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_SKEDAR1, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_SKEDAR1, CHRHFLAG_00020000) - chr_do_animation(0x0312, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR1, 4) + chr_do_animation(ANIM_0312, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR1, 4) show_object_with_animation(0x0e, 0x0313) show_object_with_animation(0x0f, 0x0314) @@ -1172,7 +1172,7 @@ u8 func0c01_outro[] = { u8 func1002_intro[] = { play_cutscene_track(MUSIC_DEFENSE_INTRO) - camera_movement(0x02bc) + camera_movement(ANIM_02BC) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_ailist(CHR_CARRINGTON, GAILIST_IDLE) @@ -1182,23 +1182,23 @@ u8 func1002_intro[] = { set_chr_chrflag(CHR_JONATHAN, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x02bd, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_02BD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_CARRINGTON, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_CARRINGTON, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_CARRINGTON, CHRHFLAG_00020000) - chr_do_animation(0x02be, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CARRINGTON, 4) + chr_do_animation(ANIM_02BE, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CARRINGTON, 4) set_chr_chrflag(0x19, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x19, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x19, CHRHFLAG_00020000) - chr_do_animation(0x02bf, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x19, 4) + chr_do_animation(ANIM_02BF, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x19, 4) set_chr_chrflag(0x1a, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x1a, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x1a, CHRHFLAG_00020000) - chr_do_animation(0x02c0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x1a, 4) + chr_do_animation(ANIM_02C0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x1a, 4) enable_object(0x0d) set_object_flag2(0x0d, OBJFLAG2_04000000) set_object_flag3(0x0d, OBJFLAG3_00000010) - object_do_animation(0x02c1, 0x0d, 0x04, 0xffff) + object_do_animation(ANIM_02C1, 0x0d, 0x04, 0xffff) restart_timer set_cutscene_weapon(0x1a, WEAPON_NONE, WEAPON_NONE) yield @@ -1419,25 +1419,25 @@ u8 func1002_intro[] = { label(0xb8) mute_channel(CHANNEL_10) - camera_movement(0x02c2) + camera_movement(ANIM_02C2) cmd0175(60) unset_object_flag2(0x0d, OBJFLAG2_04000000) if_controller_button_pressed(/*goto*/ 0xcc) unset_chr_chrflag(CHR_SKEDAR4, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_SKEDAR4, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_SKEDAR4, CHRHFLAG_00020000) - chr_do_animation(0x02c3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR4, 4) + chr_do_animation(ANIM_02C3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR4, 4) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x02c4, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_02C4, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) enable_object(0x52) set_object_flag2(0x52, OBJFLAG2_04000000) set_object_flag3(0x52, OBJFLAG3_00000010) - object_do_animation(0x02c5, 0x52, 0x04, 0xffff) + object_do_animation(ANIM_02C5, 0x52, 0x04, 0xffff) enable_object(0x53) set_object_flag2(0x53, OBJFLAG2_04000000) set_object_flag3(0x53, OBJFLAG3_00000010) - object_do_animation(0x02c6, 0x53, 0x04, 0xffff) + object_do_animation(ANIM_02C6, 0x53, 0x04, 0xffff) restart_timer #define wait_until2(time, loopid) \ @@ -1511,32 +1511,32 @@ u8 func1002_intro[] = { set_cutscene_weapon(CHR_BOND, WEAPON_AR34, WEAPON_NONE) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x02c4, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_02C4, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_CARRINGTON, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_CARRINGTON, CHRHFLAG_00020000) - chr_do_animation(0x02be, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CARRINGTON, 2) + chr_do_animation(ANIM_02BE, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CARRINGTON, 2) unset_chr_chrflag(0x19, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(0x19, CHRHFLAG_00020000) - chr_do_animation(0x02bf, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x19, 2) + chr_do_animation(ANIM_02BF, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x19, 2) unset_chr_chrflag(0x1a, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(0x1a, CHRHFLAG_00020000) - chr_do_animation(0x02c0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x1a, 2) + chr_do_animation(ANIM_02C0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x1a, 2) unset_chr_chrflag(CHR_SKEDAR4, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_SKEDAR4, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_SKEDAR4, CHRHFLAG_00020000) - chr_do_animation(0x02c3, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR4, 2) + chr_do_animation(ANIM_02C3, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SKEDAR4, 2) unset_object_flag2(0x0d, OBJFLAG2_04000000) set_object_flag(0x0d, OBJFLAG_DEACTIVATED) set_object_flag3(0x0d, OBJFLAG3_00000010) - object_do_animation(0x01b4, 0x0d, 0x01, 0xffff) + object_do_animation(ANIM_01B4, 0x0d, 0x01, 0xffff) enable_object(0x52) set_object_flag2(0x52, OBJFLAG2_04000000) set_object_flag3(0x52, OBJFLAG3_00000010) - object_do_animation(0x02c5, 0x52, 0x04, 0xfffe) + object_do_animation(ANIM_02C5, 0x52, 0x04, 0xfffe) enable_object(0x53) set_object_flag2(0x53, OBJFLAG2_04000000) set_object_flag3(0x53, OBJFLAG3_00000010) - object_do_animation(0x02c6, 0x53, 0x04, 0xfffe) + object_do_animation(ANIM_02C6, 0x53, 0x04, 0xfffe) set_stage_flag(STAGEFLAG_INTRO_FINISHED) stop_cutscene_track stop_ambient_track @@ -3256,7 +3256,7 @@ u8 func1022_skedar_shuttle[] = { enable_object(OBJ_SKEDAR_SHUTTLE) set_object_flag2(OBJ_SKEDAR_SHUTTLE, OBJFLAG2_04000000) set_object_flag3(OBJ_SKEDAR_SHUTTLE, OBJFLAG3_00000010) - object_do_animation(0x045a, OBJ_SKEDAR_SHUTTLE, 0x04, 0xffff) + object_do_animation(ANIM_045A, OBJ_SKEDAR_SHUTTLE, 0x04, 0xffff) object_set_modelpart_visible(OBJ_SKEDAR_SHUTTLE, MODELPART_SKSHUTTLE_GANGWAY, FALSE) set_object_flag(OBJ_SKEDAR_SHUTTLE, OBJFLAG_00000100) @@ -3282,7 +3282,7 @@ u8 func1022_skedar_shuttle[] = { beginloop(0x04) if_stage_flag_eq(STAGEFLAG_BOMB_EXPLODING_ON_GROUND, TRUE, /*goto*/ 0x2e) if_stage_flag_eq(STAGEFLAG_TRIGGER_SHUTTLE_TAKEOFF, TRUE, /*goto*/ 0x0a) - object_do_animation(0x045a, OBJ_SKEDAR_SHUTTLE, 0x04, 0xffff) + object_do_animation(ANIM_045A, OBJ_SKEDAR_SHUTTLE, 0x04, 0xffff) endloop(0x04) // Bomb exploding while on ground @@ -3321,7 +3321,7 @@ u8 func1022_skedar_shuttle[] = { label(0x0a) hide_countdown_timer stop_countdown_timer - object_do_animation(0x045b, OBJ_SKEDAR_SHUTTLE, 0x08, 0xffff) + object_do_animation(ANIM_045B, OBJ_SKEDAR_SHUTTLE, 0x08, 0xffff) assign_sound(SFX_810A, CHANNEL_3) play_sound_from_object(CHANNEL_3, OBJ_SKEDAR_SHUTTLE, 1, 1800, 3000) restart_timer @@ -4014,7 +4014,7 @@ u8 unregistered_function2[] = { endloop(0x0a) label(0x2e) - chr_do_animation(0x02c3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x34, 4) + chr_do_animation(ANIM_02C3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x34, 4) endloop(0x03) endlist diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c index 23fdcfd22..1e47cc099 100644 --- a/src/files/setup/setuplee.c +++ b/src/files/setup/setuplee.c @@ -2686,22 +2686,22 @@ u8 func1003_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_ATTACKSHIP_INTRO) - camera_movement(0x01c2) + camera_movement(ANIM_01C2) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01c3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01C3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_CASS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_CASS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_CASS, CHRHFLAG_00020000) - chr_do_animation(0x01c4, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CASS, 4) + chr_do_animation(ANIM_01C4, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CASS, 4) set_chr_chrflag(CHR_INTRO_SKEDAR, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_INTRO_SKEDAR, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_INTRO_SKEDAR, CHRHFLAG_00020000) - chr_do_animation(0x01c5, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_SKEDAR, 4) + chr_do_animation(ANIM_01C5, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_SKEDAR, 4) restart_timer set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) @@ -2916,17 +2916,17 @@ u8 func1003_intro[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01c3, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_01C3, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_CASS, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_CASS, CHRHFLAG_00020000) set_chr_chrflag(CHR_CASS, CHRCFLAG_00000001) - chr_do_animation(0x01c4, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CASS, 2) + chr_do_animation(ANIM_01C4, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_CASS, 2) unset_chr_chrflag(CHR_INTRO_SKEDAR, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_INTRO_SKEDAR, CHRHFLAG_00020000) set_chr_chrflag(CHR_INTRO_SKEDAR, CHRCFLAG_00000001) - chr_do_animation(0x01c5, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_SKEDAR, 2) + chr_do_animation(ANIM_01C5, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_SKEDAR, 2) remove_chr(CHR_INTRO_SKEDAR) set_ailist(CHR_SHY_SKEDAR, AILIST_SHY_SKEDAR_WAIT) @@ -2950,7 +2950,7 @@ u8 func0c01_outro[] = { set_target_chr(CHR_COOP) label(0x06) disable_object(0x2c) - camera_movement(0x01e1) + camera_movement(ANIM_01E1) play_cutscene_track(MUSIC_ATTACKSHIP_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -2959,19 +2959,19 @@ u8 func0c01_outro[] = { set_chr_chrflag(CHR_TARGET, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TARGET, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TARGET, CHRHFLAG_00020000) - chr_do_animation(0x01e2, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) + chr_do_animation(ANIM_01E2, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_INVINCIBLE) set_ailist(CHR_ELVIS, GAILIST_IDLE) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x01e3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_01E3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) enable_object(OBJ_OUTRO_SHUTTLE) set_object_flag2(OBJ_OUTRO_SHUTTLE, OBJFLAG2_04000000) set_object_flag3(OBJ_OUTRO_SHUTTLE, OBJFLAG3_00000010) - object_do_animation(0x01e4, OBJ_OUTRO_SHUTTLE, 0x04, 0xffff) + object_do_animation(ANIM_01E4, OBJ_OUTRO_SHUTTLE, 0x04, 0xffff) object_set_modelpart_visible(OBJ_OUTRO_SHUTTLE, MODELPART_SKSHUTTLE_GANGWAY, FALSE) show_nonessential_chrs(FALSE) @@ -3535,9 +3535,9 @@ u8 func1002_hangar_shuttle[] = { if_stage_flag_eq(STAGEFLAG_BRIDGE_CAPTURED, TRUE, /*goto*/ 0x06) if_objective_complete(4, /*goto*/ 0x06) #if VERSION >= VERSION_NTSC_1_0 - object_do_animation(0x045c, OBJ_HANGAR_SHUTTLE, 0x08, 0xffff) + object_do_animation(ANIM_045C, OBJ_HANGAR_SHUTTLE, 0x08, 0xffff) #else - object_do_animation(0x045c, OBJ_HANGAR_SHUTTLE, 0x01, 0xffff) + object_do_animation(ANIM_045C, OBJ_HANGAR_SHUTTLE, 0x01, 0xffff) #endif endloop(0x08) diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c index 45afb6003..d0fca0ed3 100644 --- a/src/files/setup/setuplip.c +++ b/src/files/setup/setuplip.c @@ -2216,7 +2216,7 @@ u8 func041a_labtech_harrysmate[] = { speak(CHR_TARGET, L_LIP_058, MP3_02BB, CHANNEL_4, COLOR_08_RED) // "Hey, that's not Harry. It's an intruder." increase_squadron_alertness(120) restart_timer - chr_do_animation(0x002e, 0, -1, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_SURRENDER_002E, 0, -1, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x0a) if_timer_gt(120, /*goto*/ 0x06) @@ -2880,7 +2880,7 @@ u8 func041f_labtech_lights[] = { // Jo in sight label(0x03) - object_do_animation(0x025a, 0xff, 0x02, 0xffff) + object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) dprint 'T','A','L','K',' ','0','\n',0, if_self_flag_bankx_eq(CHRFLAG0_00002000, TRUE, BANK_0, /*goto*/ LABEL_53) restart_timer @@ -2897,7 +2897,7 @@ u8 func041f_labtech_lights[] = { if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISE_UNCOVERED, /*goto*/ 0x06) if_chr_has_hiddenflag(CHR_TARGET, CHRHFLAG_DISGUISED, /*goto*/ LABEL_2D) label(0x06) - object_do_animation(0x025a, 0xff, 0x02, 0xffff) + object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) speak(CHR_TARGET, L_LIP_037, SFX_SCI_WHO_THE_HELL_ARE_YOU, CHANNEL_4, COLOR_08_RED) // "Who are you?" #if VERSION >= VERSION_JPN_FINAL @@ -3298,28 +3298,28 @@ u8 func0422_labtech_records[] = { if_rand_lt(160, /*goto*/ LABEL_6A) if_rand_lt(192, /*goto*/ LABEL_6B) if_rand_lt(224, /*goto*/ LABEL_6C) - chr_do_animation(0x0221, -1, -1, CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_OPERATE_0221, -1, -1, CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) goto_next(0x04) label(LABEL_64) - chr_do_animation(0x0221, -1, -1, CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_OPERATE_0221, -1, -1, CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) goto_next(0x04) label(LABEL_66) - chr_do_animation(0x0223, -1, -1, CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_OPERATE_0223, -1, -1, CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) goto_next(0x04) label(LABEL_68) - chr_do_animation(0x0221, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_OPERATE_0221, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) goto_next(0x04) label(LABEL_69) - chr_do_animation(0x0221, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_OPERATE_0221, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) goto_next(0x04) label(LABEL_6A) - chr_do_animation(0x0223, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_OPERATE_0223, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) goto_next(0x04) label(LABEL_6B) - chr_do_animation(0x023a, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_023A, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) goto_next(0x04) label(LABEL_6C) - chr_do_animation(0x023b, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_HEAD_ROLL, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) beginloop(0x04) if_chr_idle(/*goto*/ LABEL_2D) @@ -3361,7 +3361,7 @@ u8 func0422_labtech_records[] = { if_alertness(99, OPERATOR_GREATER_THAN, /*goto*/ LABEL_2D) increase_squadron_alertness(100) speak(CHR_TARGET, L_LIP_087, MP3_M0_IMPOSTER, CHANNEL_4, COLOR_08_RED) // "Imposter!" - chr_do_animation(0x0202, -1, -1, CHRANIMFLAG_PAUSEATEND | CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) + chr_do_animation(ANIM_SURPRISED_0202, -1, -1, CHRANIMFLAG_PAUSEATEND | CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) restart_timer beginloop(LABEL_79) @@ -3382,7 +3382,7 @@ u8 func0422_labtech_records[] = { label(0x06) dprint 'F','L','A','G',' ','S','E','T','\n',0, label(0x10) - chr_do_animation(0x0229, -1, -1, CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) + chr_do_animation(ANIM_COWER_0229, -1, -1, CHRANIMFLAG_SLOWUPDATE, 10, CHR_SELF, 2) beginloop(0x0e) if_chr_stopped(/*goto*/ LABEL_2D) @@ -3900,7 +3900,7 @@ u8 func1023_setup_door_locks[] = { u8 func0c01_outro[] = { set_invincible(CHR_BOND) - camera_movement(0x0198) + camera_movement(ANIM_0198) play_cutscene_track(MUSIC_RESCUE_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -3914,21 +3914,21 @@ u8 func0c01_outro[] = { unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x0199, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_0199, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) set_chr_chrflag(CHR_BIOTECH1, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_BIOTECH1, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_BIOTECH1, CHRHFLAG_00020000) - chr_do_animation(0x019a, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BIOTECH1, 4) + chr_do_animation(ANIM_019A, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BIOTECH1, 4) set_chr_chrflag(CHR_BIOTECH2, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_BIOTECH2, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_BIOTECH2, CHRHFLAG_00020000) - chr_do_animation(0x019b, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BIOTECH2, 4) + chr_do_animation(ANIM_019B, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BIOTECH2, 4) set_object_flag2(0x2f, OBJFLAG2_04000000) set_object_flag3(0x2f, OBJFLAG3_00000010) - object_do_animation(0x01a1, 0x2f, 0x04, 0xffff) + object_do_animation(ANIM_01A1, 0x2f, 0x04, 0xffff) show_nonessential_chrs(FALSE) restart_timer set_cutscene_weapon(CHR_P1P2, WEAPON_NONE, WEAPON_NONE) @@ -4011,26 +4011,26 @@ u8 func1002_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_RESCUE_INTRO) - camera_movement(0x01c6) + camera_movement(ANIM_01C6) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01c8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01C8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_JONATHAN, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_JONATHAN, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_JONATHAN, CHRHFLAG_00020000) - chr_do_animation(0x01c7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_JONATHAN, 4) + chr_do_animation(ANIM_01C7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_JONATHAN, 4) set_chr_chrflag(CHR_INTRO_DEAD_GUARD, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_INTRO_DEAD_GUARD, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_INTRO_DEAD_GUARD, CHRHFLAG_00020000) - chr_do_animation(0x01c9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_DEAD_GUARD, 4) + chr_do_animation(ANIM_01C9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_DEAD_GUARD, 4) set_object_flag2(OBJ_CRATE, OBJFLAG2_04000000) set_object_flag3(OBJ_CRATE, OBJFLAG3_00000010) - object_do_animation(0x01ca, OBJ_CRATE, 0x04, 0xffff) + object_do_animation(ANIM_01CA, OBJ_CRATE, 0x04, 0xffff) restart_timer fade_to_color(0x000000ff, 0) @@ -4169,7 +4169,7 @@ u8 func1002_intro[] = { control_sound_from_object(CHANNEL_1, OBJ_CRATE, TRUE) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01c8, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_01C8, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_JONATHAN, CHRCFLAG_UNPLAYABLE) @@ -4177,11 +4177,11 @@ u8 func1002_intro[] = { unset_chr_chrflag(CHR_INTRO_DEAD_GUARD, CHRCFLAG_UNPLAYABLE) set_chr_chrflag(CHR_INTRO_DEAD_GUARD, CHRCFLAG_INVINCIBLE) set_chr_hiddenflag(CHR_INTRO_DEAD_GUARD, CHRHFLAG_00020000) - chr_do_animation(0x01c9, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_DEAD_GUARD, 2) + chr_do_animation(ANIM_01C9, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_DEAD_GUARD, 2) mute_channel(CHANNEL_10) unset_object_flag2(OBJ_CRATE, OBJFLAG2_04000000) set_object_flag3(OBJ_CRATE, OBJFLAG3_00000010) - object_do_animation(0x01ca, OBJ_CRATE, 0x01, 0xfffe) + object_do_animation(ANIM_01CA, OBJ_CRATE, 0x01, 0xfffe) close_door(0x33) close_door(0x34) stop_cutscene_track @@ -4189,7 +4189,7 @@ u8 func1002_intro[] = { enter_firstperson yield set_chr_chrflag(CHR_INTRO_DEAD_GUARD, CHRCFLAG_00010000) - chr_do_animation(0x01c9, 2, 3, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_DEAD_GUARD, 2) + chr_do_animation(ANIM_01C9, 2, 3, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_INTRO_DEAD_GUARD, 2) set_ailist(CHR_INTRO_DEAD_GUARD, GAILIST_IDLE) yield kill(CHR_INTRO_DEAD_GUARD) diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c index 757f51c8c..2f0d8d305 100644 --- a/src/files/setup/setuplue.c +++ b/src/files/setup/setuplue.c @@ -1815,7 +1815,7 @@ u8 func040d_90c8[] = { u8 func040e_outro[] = { open_door(0x11) disable_object(OBJ_HOVERBIKE) - camera_movement(0x017d) + camera_movement(ANIM_017D) play_cutscene_track(MUSIC_INFILTRATION_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -1826,18 +1826,18 @@ u8 func040e_outro[] = { unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_P1P2, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x017f, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_017F, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) set_chr_hudpiece_visible(CHR_P1P2, TRUE) set_chr_chrflag(CHR_JONATHAN, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_JONATHAN, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_JONATHAN, CHRHFLAG_00020000) - chr_do_animation(0x017e, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_JONATHAN, 4) + chr_do_animation(ANIM_017E, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_JONATHAN, 4) set_chr_chrflag(CHR_OUTRO_GUARD, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_OUTRO_GUARD, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_OUTRO_GUARD, CHRHFLAG_00020000) - chr_do_animation(0x0180, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_GUARD, 4) + chr_do_animation(ANIM_0180, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_GUARD, 4) restart_timer show_nonessential_chrs(FALSE) @@ -1961,13 +1961,13 @@ u8 func0410_intro[] = { set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) if_controller_button_pressed(/*goto*/ 0x54) play_cutscene_track(MUSIC_INFILTRATION_INTRO) - camera_movement(0x0181) + camera_movement(ANIM_0181) set_chr_chrflag(0x0c, CHRCFLAG_HIDDEN) set_chr_chrflag(0x0d, CHRCFLAG_HIDDEN) set_chr_chrflag(0x32, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x32, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x32, CHRHFLAG_00020000) - chr_do_animation(0x0182, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x32, 4) + chr_do_animation(ANIM_0182, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x32, 4) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) restart_timer fade_to_color(0x000000ff, 0) @@ -2005,27 +2005,27 @@ u8 func0410_intro[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) label(0x54) if_controller_button_pressed(/*goto*/ 0x54) - camera_movement(0x0183) + camera_movement(ANIM_0183) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(0x29, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x29, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x29, CHRHFLAG_00020000) - chr_do_animation(0x0184, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x29, 4) + chr_do_animation(ANIM_0184, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x29, 4) set_chr_chrflag(0x2a, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x2a, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x2a, CHRHFLAG_00020000) - chr_do_animation(0x0185, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2a, 4) + chr_do_animation(ANIM_0185, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2a, 4) set_chr_chrflag(0x2b, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x2b, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x2b, CHRHFLAG_00020000) - chr_do_animation(0x0186, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2b, 4) + chr_do_animation(ANIM_0186, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2b, 4) set_object_flag2(0x2f, OBJFLAG2_04000000) set_object_flag3(0x2f, OBJFLAG3_00000010) - object_do_animation(0x0187, 0x2f, 0x04, 0xffff) + object_do_animation(ANIM_0187, 0x2f, 0x04, 0xffff) restart_timer wait_until(186, 0x65) @@ -2051,22 +2051,22 @@ u8 func0410_intro[] = { unset_object_flag2(0x2f, OBJFLAG2_04000000) label(0x54) if_controller_button_pressed(/*goto*/ 0x54) - camera_movement(0x0188) + camera_movement(ANIM_0188) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(0x2a, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x2a, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x2a, CHRHFLAG_00020000) - chr_do_animation(0x0189, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2a, 4) + chr_do_animation(ANIM_0189, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2a, 4) set_chr_chrflag(0x2b, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x2b, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x2b, CHRHFLAG_00020000) - chr_do_animation(0x018a, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2b, 4) + chr_do_animation(ANIM_018A, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2b, 4) set_object_flag2(0x2f, OBJFLAG2_04000000) set_object_flag3(0x2f, OBJFLAG3_00000010) - object_do_animation(0x018b, 0x2f, 0x04, 0xffff) + object_do_animation(ANIM_018B, 0x2f, 0x04, 0xffff) restart_timer wait_until(416, 0x67) @@ -2090,12 +2090,12 @@ u8 func0410_intro[] = { unset_chr_chrflag(0x2b, CHRCFLAG_UNPLAYABLE) unset_object_flag2(0x2f, OBJFLAG2_04000000) label(0x54) - camera_movement(0x00f0) + camera_movement(ANIM_00F0) cmd0175(60) if_controller_button_pressed(/*goto*/ 0x54) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x00f1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_00F1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(0x03, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(0x03, CHRHFLAG_00020000) unset_chr_chrflag(0x03, CHRCFLAG_HIDDEN) @@ -2163,7 +2163,7 @@ u8 func0410_intro[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x00f1, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_00F1, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(0x03, CHRCFLAG_UNPLAYABLE) set_ailist(0x02, 0x0426) set_ailist(0x03, 0x0426) diff --git a/src/files/setup/setupold.c b/src/files/setup/setupold.c index 26ee47154..4430fa7bf 100644 --- a/src/files/setup/setupold.c +++ b/src/files/setup/setupold.c @@ -46,7 +46,7 @@ u8 func0c00_017c[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_G5_INTRO) - camera_movement(0x045d) + camera_movement(ANIM_045D) title_init_mode(TITLEAIMODE_RARELOGO) beginloop(0x12) @@ -61,11 +61,11 @@ u8 func0c00_017c[] = { endloop(0x13) label(0x59) - camera_movement(0x045d) + camera_movement(ANIM_045D) enable_object(0x00) set_object_flag2(0x00, OBJFLAG2_04000000) set_object_flag3(0x00, OBJFLAG3_00000010) - object_do_animation(0x045e, 0x00, 0x04, 0xffff) + object_do_animation(ANIM_045E, 0x00, 0x04, 0xffff) beginloop(0x08) if_camera_animating(/*goto*/ 0x31) @@ -78,11 +78,11 @@ u8 func0c00_017c[] = { label(0x59) disable_object(0x00) - camera_movement(0x0464) + camera_movement(ANIM_0464) enable_object(0x01) set_object_flag2(0x01, OBJFLAG2_04000000) set_object_flag3(0x01, OBJFLAG3_00000010) - object_do_animation(0x0465, 0x01, 0x04, 0xffff) + object_do_animation(ANIM_0465, 0x01, 0x04, 0xffff) beginloop(0x0b) if_camera_animating(/*goto*/ 0x31) @@ -95,17 +95,17 @@ u8 func0c00_017c[] = { label(0x59) disable_object(0x01) - camera_movement(0x0461) + camera_movement(ANIM_0461) enable_object(0x00) set_object_flag2(0x00, OBJFLAG2_04000000) set_object_flag3(0x00, OBJFLAG3_00000010) - object_do_animation(0x0462, 0x00, 0x04, 0xffff) + object_do_animation(ANIM_0462, 0x00, 0x04, 0xffff) enable_object(0x01) set_object_flag2(0x01, OBJFLAG2_04000000) set_object_flag3(0x01, OBJFLAG3_00000010) - object_do_animation(0x0463, 0x01, 0x04, 0xffff) + object_do_animation(ANIM_0463, 0x01, 0x04, 0xffff) beginloop(0x0a) if_camera_animating(/*goto*/ 0x31) @@ -119,22 +119,22 @@ u8 func0c00_017c[] = { label(0x59) disable_object(0x01) disable_object(0x00) - camera_movement(0x046c) + camera_movement(ANIM_046C) enable_object(0x01) unset_object_flag2(0x01, OBJFLAG2_04000000) set_object_flag3(0x01, OBJFLAG3_00000010) - object_do_animation(0x046e, 0x01, 0x04, 0xffff) + object_do_animation(ANIM_046E, 0x01, 0x04, 0xffff) enable_object(0x00) set_object_flag2(0x00, OBJFLAG2_04000000) set_object_flag3(0x00, OBJFLAG3_00000010) - object_do_animation(0x046d, 0x00, 0x04, 0xffff) + object_do_animation(ANIM_046D, 0x00, 0x04, 0xffff) enable_object(0x02) set_object_flag2(0x02, OBJFLAG2_04000000) set_object_flag3(0x02, OBJFLAG3_00000010) - object_do_animation(0x046f, 0x02, 0x04, 0xffff) + object_do_animation(ANIM_046F, 0x02, 0x04, 0xffff) beginloop(0x0e) if_camera_animating(/*goto*/ 0x31) diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c index 4eee135f1..c054399ae 100644 --- a/src/files/setup/setuppam.c +++ b/src/files/setup/setuppam.c @@ -1492,25 +1492,25 @@ u8 func0c01_midcutscene[] = { set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_ailist(CHR_ELVIS, GAILIST_IDLE) play_cutscene_track(MUSIC_DEEPSEA_MIDCUTSCENE) - camera_movement(0x01d4) + camera_movement(ANIM_01D4) set_chr_chrflag(CHR_P1P2, CHRCFLAG_UNPLAYABLE) #if VERSION >= VERSION_NTSC_1_0 unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x01d5, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_01D5, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x01d6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_01D6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) set_chr_chrflag(CHR_DRCAROLL, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_DRCAROLL, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_DRCAROLL, CHRHFLAG_00020000) - chr_do_animation(0x01d7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 4) + chr_do_animation(ANIM_01D7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 4) enable_object(0xbb) set_object_flag2(0xbb, OBJFLAG2_04000000) set_object_flag3(0xbb, OBJFLAG3_00000010) - object_do_animation(0x01d8, 0xbb, 0x04, 0xffff) + object_do_animation(ANIM_01D8, 0xbb, 0x04, 0xffff) restart_timer set_cutscene_weapon(CHR_P1P2, WEAPON_NONE, WEAPON_NONE) yield @@ -1826,13 +1826,13 @@ u8 func0c01_midcutscene[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_P1P2, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x01d5, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) + chr_do_animation(ANIM_01D5, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 2) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x01d6, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) + chr_do_animation(ANIM_01D6, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) unset_chr_chrflag(CHR_DRCAROLL, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_DRCAROLL, CHRHFLAG_00020000) - chr_do_animation(0x01d7, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) + chr_do_animation(ANIM_01D7, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_DRCAROLL, 2) set_cutscene_weapon(CHR_ELVIS, WEAPON_NONE, WEAPON_NONE) yield set_cutscene_weapon(CHR_ELVIS, WEAPON_PHOENIX, WEAPON_NONE) @@ -1880,7 +1880,7 @@ u8 func0c02_outro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_DEEPSEA_OUTRO) - camera_movement(0x02d7) + camera_movement(ANIM_02D7) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_BOND, CHRCFLAG_INVINCIBLE) set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) @@ -2031,23 +2031,23 @@ u8 func1002_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_DEEPSEA_INTRO) - camera_movement(0x01ef) + camera_movement(ANIM_01EF) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01f0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01F0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x01f1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_01F1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) set_object_flag(0x07, OBJFLAG_DEACTIVATED) set_object_flag2(0x07, OBJFLAG2_04000000) set_object_flag3(0x07, OBJFLAG3_00000010) - object_do_animation(0x01f2, 0x07, 0x04, 0xffff) + object_do_animation(ANIM_01F2, 0x07, 0x04, 0xffff) set_chr_chrflag(0x40, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x40, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x40, CHRHFLAG_00020000) - chr_do_animation(0x0471, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x40, 4) + chr_do_animation(ANIM_0471, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x40, 4) restart_timer set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) yield @@ -2193,15 +2193,15 @@ u8 func1002_intro[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01f0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_01F0, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x01f1, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) + chr_do_animation(ANIM_01F1, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) if_coop_mode(/*goto*/ 0x45) unset_object_flag(0x07, OBJFLAG_DEACTIVATED) unset_object_flag2(0x07, OBJFLAG2_04000000) set_object_flag3(0x07, OBJFLAG3_00000010) - object_do_animation(0x01f2, 0x07, 0x01, 0xfffe) + object_do_animation(ANIM_01F2, 0x07, 0x01, 0xfffe) goto_next(0x46) label(0x45) diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c index 466a00b5a..c656dfb39 100644 --- a/src/files/setup/setuppete.c +++ b/src/files/setup/setuppete.c @@ -504,7 +504,7 @@ s32 path13[] = { u8 func0401_3ae8[] = { set_stage_flag(STAGEFLAG_TRIGGER_INTRO) if_controller_button_pressed(/*goto*/ 0x00) - camera_movement(0x00cf) + camera_movement(ANIM_00CF) play_cutscene_track(MUSIC_CHICAGO_INTRO) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) @@ -534,7 +534,7 @@ u8 func0402_3bb4[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) if_controller_button_pressed(/*goto*/ 0x00) - camera_movement(0x00d0) + camera_movement(ANIM_00D0) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) chicago_car_do_animation(OBJ_CAR1, 0x00dc) @@ -559,12 +559,12 @@ u8 func0402_3bb4[] = { u8 func0403_3c74[] = { if_controller_button_pressed(/*goto*/ 0x00) - camera_movement(0x00d1) + camera_movement(ANIM_00D1) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) enable_object(OBJ_CAR4) set_object_flag2(OBJ_CAR4, OBJFLAG2_04000000) set_object_flag3(OBJ_CAR4, OBJFLAG3_00000010) - object_do_animation(0x00de, OBJ_CAR4, 0x04, 0xffff) + object_do_animation(ANIM_00DE, OBJ_CAR4, 0x04, 0xffff) set_chr_chrflag(CHR_CIA1, CHRCFLAG_HIDDEN) set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) @@ -585,13 +585,13 @@ u8 func0404_3ce0[] = { enable_object(OBJ_WIREFENCE) set_object_flag2(OBJ_WIREFENCE, OBJFLAG2_04000000) set_object_flag3(OBJ_WIREFENCE, OBJFLAG3_00000010) - object_do_animation(0x0470, OBJ_WIREFENCE, 0x01, 0xffff) + object_do_animation(ANIM_0470, OBJ_WIREFENCE, 0x01, 0xffff) if_controller_button_pressed(/*goto*/ 0x00) - camera_movement(0x00e0) + camera_movement(ANIM_00E0) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x00e1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_00E1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_CIA1, CHRCFLAG_HIDDEN) chicago_wait_for_camera @@ -604,12 +604,12 @@ u8 func0404_3ce0[] = { }; u8 func0405_3d50[] = { - camera_movement(0x00d2) + camera_movement(ANIM_00D2) cmd0175(60) if_controller_button_pressed(/*goto*/ 0x00) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x00df, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_00DF, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_CIA1, CHRCFLAG_HIDDEN) restart_timer @@ -640,7 +640,7 @@ u8 func0405_3d50[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x00df, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_00DF, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) stop_cutscene_track stop_ambient_track @@ -903,7 +903,7 @@ u8 func040d_limo[] = { label(0x04) set_object_flag2(OBJ_LIMO, OBJFLAG2_04000000) set_object_flag3(OBJ_LIMO, OBJFLAG3_00000010) - object_do_animation(0x02d6, OBJ_LIMO, 0x04, 0xffff) + object_do_animation(ANIM_02D6, OBJ_LIMO, 0x04, 0xffff) assign_sound(SFX_BIKE_ENGINE, CHANNEL_1) play_sound_from_object(CHANNEL_1, OBJ_LIMO, 1, 2400, 3200) @@ -946,7 +946,7 @@ u8 func040c_taxi[] = { label(0x03) assign_sound(SFX_8000, CHANNEL_0) play_sound_from_object(CHANNEL_0, OBJ_TAXI, 1, 2400, 3200) - object_do_animation(0x0168, OBJ_TAXI, 0x04, 0xffff) + object_do_animation(ANIM_0168, OBJ_TAXI, 0x04, 0xffff) set_object_flag2(OBJ_TAXI, OBJFLAG2_04000000) // Wait for flag @@ -973,7 +973,7 @@ u8 func040c_taxi[] = { set_stage_flag(STAGEFLAG_TRIGGER_CRASH) yield mute_channel(CHANNEL_0) - object_do_animation(0x0169, OBJ_TAXI, 0x04, 0xffff) + object_do_animation(ANIM_0169, OBJ_TAXI, 0x04, 0xffff) label(0x0a) set_ailist(CHR_SELF, GAILIST_IDLE) endlist @@ -1881,7 +1881,7 @@ u8 func041d_fbi[] = { label(0x04) say_quip(CHR_BOND, 0x1b, 0xff, 0x00, 0xff, 0x81, 0x00, 0x00) - chr_do_animation(0x0266, 0, 193, 0, 16, CHR_SELF, 2) + chr_do_animation(ANIM_0266, 0, 193, 0, 16, CHR_SELF, 2) beginloop(0x0e) if_difficulty_lt(DIFF_SA, /*goto*/ 0x03) @@ -2077,7 +2077,7 @@ u8 func041a_robot[] = { set_ailist(CHR_ROBOT, GAILIST_IDLE) #endif set_shield(0) - chr_do_animation(0x016a, 0, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SELF, 4) + chr_do_animation(ANIM_016A, 0, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_SELF, 4) beginloop(0x2d) dprint 'P','A','R','T',' ','4','\n',0, @@ -2684,7 +2684,7 @@ u8 func040a_intro_sfx[] = { }; u8 func040b_outro[] = { - camera_movement(0x0178) + camera_movement(ANIM_0178) play_cutscene_track(MUSIC_CHICAGO_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -2705,7 +2705,7 @@ u8 func040b_outro[] = { unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) #endif set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x0179, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_0179, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) restart_timer set_cutscene_weapon(CHR_P1P2, -1, -1) diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c index bd88b6f40..26685f62b 100644 --- a/src/files/setup/setuprit.c +++ b/src/files/setup/setuprit.c @@ -1314,7 +1314,7 @@ u8 func0405_president_in_room[] = { set_chr_hiddenflag(CHR_COOP, CHRHFLAG_DISGUISE_UNCOVERED) speak(CHR_TARGET, L_RIT_036, MP3_02C4, CHANNEL_6, COLOR_08_RED) // "Security, SECURITY!!" restart_timer - chr_do_animation(0x0231, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_TALKING_0231, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x77) if_timer_gt(120, /*goto*/ 0x06) @@ -2042,19 +2042,19 @@ u8 func1002_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_AIRFORCEONE_INTRO) - camera_movement(0x018c) + camera_movement(ANIM_018C) set_chr_chrflag(0x30, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x30, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x30, CHRHFLAG_00020000) - chr_do_animation(0x018f, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x30, 4) + chr_do_animation(ANIM_018F, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x30, 4) set_chr_chrflag(0x31, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x31, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x31, CHRHFLAG_00020000) - chr_do_animation(0x018d, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x31, 4) + chr_do_animation(ANIM_018D, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x31, 4) set_chr_chrflag(CHR_PRESIDENT, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_PRESIDENT, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_PRESIDENT, CHRHFLAG_00020000) - chr_do_animation(0x018e, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_PRESIDENT, 4) + chr_do_animation(ANIM_018E, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_PRESIDENT, 4) set_chr_chrflag(0x13, CHRCFLAG_HIDDEN) set_chr_chrflag(0x14, CHRCFLAG_HIDDEN) restart_timer @@ -2150,7 +2150,7 @@ u8 func1002_intro[] = { if_savefile_flag_is_set(SAVEFILEFLAG_AF1_ENTRY, /*goto*/ 0x06) goto_next(0x7e) label(0x06) - camera_movement(0x01d0) + camera_movement(ANIM_01D0) cmd0175(60) if_chr_death_animation_finished(CHR_COOP, /*goto*/ 0x2d) chr_move_to_pad(CHR_COOP, PAD_RIT_008A, 0x01, /*goto*/ 0x2d) @@ -2158,7 +2158,7 @@ u8 func1002_intro[] = { if_controller_button_pressed(/*goto*/ 0x5f) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01d1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01D1, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) beginloop(0x09) if_camera_animating(/*goto*/ 0x2d) @@ -2174,7 +2174,7 @@ u8 func1002_intro[] = { set_chr_hiddenflag(CHR_COOP, CHRHFLAG_DISGUISED) label(0x2d) dprint 'D','I','S','G','U','I','S','E','D','\n',0, - camera_movement(0x01d2) + camera_movement(ANIM_01D2) cmd0175(60) if_chr_death_animation_finished(CHR_COOP, /*goto*/ 0x2d) chr_move_to_pad(CHR_COOP, PAD_RIT_00B2, 0x01, /*goto*/ 0x2d) @@ -2182,7 +2182,7 @@ u8 func1002_intro[] = { if_controller_button_pressed(/*goto*/ 0x5f) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01d3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_01D3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) beginloop(0x0a) if_camera_animating(/*goto*/ 0x2d) @@ -2200,10 +2200,10 @@ u8 func1002_intro[] = { set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) if_savefile_flag_is_set(SAVEFILEFLAG_AF1_ENTRY, /*goto*/ 0x06) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_TRIGGER_BUDDY_WARP) - chr_do_animation(0x01d3, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_01D3, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) goto_next(0x2d) label(0x06) - chr_do_animation(0x01d1, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_01D1, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) label(0x2d) stop_cutscene_track stop_ambient_track @@ -3198,11 +3198,11 @@ u8 func0407_steward[] = { goto_next(0x2d) label(0x8f) - chr_do_animation(0x023a, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_023A, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) goto_next(0x2d) label(0x90) - chr_do_animation(0x023b, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) + chr_do_animation(ANIM_HEAD_ROLL, -1, -1, CHRANIMFLAG_FLIP | CHRANIMFLAG_SLOWUPDATE, 1, CHR_SELF, 2) goto_next(0x2d) label(0x0f) @@ -3462,7 +3462,7 @@ u8 func0423_outro[] = { label(0x2d) set_target_chr(CHR_COOP) label(0x06) - camera_movement(0x02d8) + camera_movement(ANIM_02D8) play_cutscene_track(MUSIC_AIRFORCEONE_OUTRO) configure_environment(0x0000, AIENVCMD_STOPNOSEDIVE, 0) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) @@ -3472,28 +3472,28 @@ u8 func0423_outro[] = { set_chr_chrflag(CHR_TARGET, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TARGET, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TARGET, CHRHFLAG_00020000) - chr_do_animation(0x02da, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) + chr_do_animation(ANIM_02DA, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) set_chr_hudpiece_visible(CHR_TARGET, TRUE) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x02d9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_02D9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) enable_object(0x19) set_object_flag2(0x19, OBJFLAG2_04000000) set_object_flag3(0x19, OBJFLAG3_00000010) - object_do_animation(0x02db, 0x19, 0x04, 0xffff) + object_do_animation(ANIM_02DB, 0x19, 0x04, 0xffff) enable_object(0x1a) set_object_flag2(0x1a, OBJFLAG2_04000000) set_object_flag3(0x1a, OBJFLAG3_00000010) - object_do_animation(0x02dc, 0x1a, 0x04, 0xffff) + object_do_animation(ANIM_02DC, 0x1a, 0x04, 0xffff) enable_object(0x23) set_object_flag2(0x23, OBJFLAG2_04000000) set_object_flag3(0x23, OBJFLAG3_00000010) - object_do_animation(0x02dd, 0x23, 0x04, 0xffff) + object_do_animation(ANIM_02DD, 0x23, 0x04, 0xffff) enable_object(0x37) set_object_flag2(0x37, OBJFLAG2_04000000) set_object_flag3(0x37, OBJFLAG3_00000010) - object_do_animation(0x02de, 0x37, 0x04, 0xffff) + object_do_animation(ANIM_02DE, 0x37, 0x04, 0xffff) restart_timer set_cutscene_weapon(CHR_TARGET, WEAPON_NONE, WEAPON_NONE) yield @@ -3598,18 +3598,18 @@ u8 func1019_midcutscene[] = { dprint 'm','i','d',' ','c','u','t','s','c','e','n','e','\n',0, play_cutscene_track(MUSIC_AIRFORCEONE_MIDCUTSCENE) label(0x2d) - camera_movement(0x02df) + camera_movement(ANIM_02DF) enable_object(0x19) set_object_flag2(0x19, OBJFLAG2_04000000) set_object_flag3(0x19, OBJFLAG3_00000010) - object_do_animation(0x02e0, 0x19, 0x04, 0xffff) + object_do_animation(ANIM_02E0, 0x19, 0x04, 0xffff) object_set_modelpart_visible(0x19, MODELPART_SKSHUTTLE_GANGWAY, TRUE) enable_object(0x37) set_object_flag2(0x37, OBJFLAG2_04000000) set_object_flag3(0x37, OBJFLAG3_00000010) - object_do_animation(0x02e1, 0x37, 0x04, 0xffff) + object_do_animation(ANIM_02E1, 0x37, 0x04, 0xffff) restart_timer diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c index 556c013e0..2fb127ed5 100644 --- a/src/files/setup/setupsev.c +++ b/src/files/setup/setupsev.c @@ -1540,14 +1540,14 @@ u8 func1002_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_G5_INTRO) - camera_movement(0x0476) + camera_movement(ANIM_0476) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0477, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0477, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_object_flag2(OBJ_TROLLEY, OBJFLAG2_04000000) set_object_flag3(OBJ_TROLLEY, OBJFLAG3_00000010) - object_do_animation(0x0478, OBJ_TROLLEY, 0x04, 0xffff) + object_do_animation(ANIM_0478, OBJ_TROLLEY, 0x04, 0xffff) restart_timer fade_to_color(0x000000ff, 0) fade_to_color(0x00000000, 110) @@ -1588,10 +1588,10 @@ u8 func1002_intro[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0477, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_0477, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_object_flag2(OBJ_TROLLEY, OBJFLAG2_04000000) set_object_flag3(OBJ_TROLLEY, OBJFLAG3_00000010) - object_do_animation(0x0478, OBJ_TROLLEY, 0x04, 0xfffe) + object_do_animation(ANIM_0478, OBJ_TROLLEY, 0x04, 0xfffe) stop_cutscene_track stop_ambient_track enter_firstperson @@ -1604,16 +1604,16 @@ u8 func041b_outro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_G5_OUTRO) - camera_movement(0x0479) + camera_movement(ANIM_0479) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x047a, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_047A, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) unset_chr_chrflag(CHR_OUTRO_GUARD, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_OUTRO_GUARD, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_OUTRO_GUARD, CHRHFLAG_00020000) - chr_do_animation(0x047b, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_GUARD, 4) + chr_do_animation(ANIM_047B, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_OUTRO_GUARD, 4) show_nonessential_chrs(FALSE) restart_timer diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c index 4bad619d2..83eb7c7fe 100644 --- a/src/files/setup/setupsho.c +++ b/src/files/setup/setupsho.c @@ -953,10 +953,10 @@ u8 func0404_miniskedar_spawner[] = { }; u8 unregistered_function3[] = { - camera_movement(0x00c3) + camera_movement(ANIM_00C3) yield set_chr_hiddenflag(0x00, CHRHFLAG_00020000) - chr_do_animation(0x00c4, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x00, 4) + chr_do_animation(ANIM_00C4, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x00, 4) beginloop(0x08) if_camera_animating(/*goto*/ 0x2d) @@ -2085,7 +2085,7 @@ u8 func040d_king_combat[] = { say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) set_morale(0) restart_timer - chr_do_animation(0x0350, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_0350, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x66) if_chr_death_animation_finished(CHR_P1P2, /*goto*/ LABEL_PLAYER_DEAD) @@ -2104,7 +2104,7 @@ u8 func040d_king_combat[] = { say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) set_morale(0) restart_timer - chr_do_animation(0x0350, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_0350, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x67) if_chr_death_animation_finished(CHR_P1P2, /*goto*/ LABEL_PLAYER_DEAD) @@ -2123,7 +2123,7 @@ u8 func040d_king_combat[] = { say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) set_morale(0) restart_timer - chr_do_animation(0x0350, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_0350, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) set_chr_cloaked(CHR_SELF, TRUE, TRUE) beginloop(0x68) @@ -2229,7 +2229,7 @@ u8 func040d_king_combat[] = { say_quip(CHR_BOND, QUIP_ATTACK2, 0xff, 0x03, 0xff, BANK_0, 0x00, 0x00) set_morale(0) restart_timer - chr_do_animation(0x0350, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_0350, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x69) if_chr_shield_lt(CHR_SELF, 20, /*goto*/ LABEL_LOW_SHIELD) @@ -2251,7 +2251,7 @@ u8 func040d_king_combat[] = { label(0x06) restart_timer set_stage_flag(STAGEFLAG_SPIKES_VULNERABLE) - chr_do_animation(0x0351, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_0351, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x7e) if_stage_flag_eq(STAGEFLAG_SPIKE_DESTROYED, TRUE, /*goto*/ 0x06) @@ -2575,7 +2575,7 @@ u8 func0c00_intro[] = { set_stage_flag(STAGEFLAG_IN_INTRO) set_chr_chrflag(CHR_BOND, CHRCFLAG_RUNFASTER) set_chr_chrflag(CHR_KING2, CHRCFLAG_HIDDEN) - camera_movement(0x02e9) + camera_movement(ANIM_02E9) beginloop(0x08) if_camera_animating(/*goto*/ 0x2d) @@ -2588,16 +2588,16 @@ u8 func0c00_intro[] = { label(0x86) if_controller_button_pressed(/*goto*/ 0x86) - camera_movement(0x02ea) + camera_movement(ANIM_02EA) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x02eb, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_02EB, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x02ec, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_02EC, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) yield @@ -2616,22 +2616,22 @@ u8 func0c00_intro[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) if_controller_button_pressed(/*goto*/ 0x86) - camera_movement(0x02ed) + camera_movement(ANIM_02ED) set_chr_chrflag(0x37, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x37, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x37, CHRHFLAG_00020000) - chr_do_animation(0x02ee, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x37, 4) + chr_do_animation(ANIM_02EE, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x37, 4) set_chr_chrflag(0x38, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x38, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x38, CHRHFLAG_00020000) - chr_do_animation(0x02ef, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x38, 4) + chr_do_animation(ANIM_02EF, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x38, 4) set_chr_chrflag(0x39, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x39, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x39, CHRHFLAG_00020000) - chr_do_animation(0x02f0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x39, 4) + chr_do_animation(ANIM_02F0, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x39, 4) beginloop(0x0b) if_camera_animating(/*goto*/ 0x2d) @@ -2647,16 +2647,16 @@ u8 func0c00_intro[] = { unset_chr_chrflag(0x38, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x39, CHRCFLAG_UNPLAYABLE) if_controller_button_pressed(/*goto*/ 0x86) - camera_movement(0x02f1) + camera_movement(ANIM_02F1) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x02f2, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_02F2, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x02f3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_02F3, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) yield @@ -2675,27 +2675,27 @@ u8 func0c00_intro[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) if_controller_button_pressed(/*goto*/ 0x86) - camera_movement(0x02f4) + camera_movement(ANIM_02F4) set_chr_chrflag(0x37, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x37, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x37, CHRHFLAG_00020000) - chr_do_animation(0x02f5, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x37, 4) + chr_do_animation(ANIM_02F5, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x37, 4) set_chr_chrflag(0x38, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x38, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x38, CHRHFLAG_00020000) - chr_do_animation(0x02f6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x38, 4) + chr_do_animation(ANIM_02F6, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x38, 4) set_chr_chrflag(0x39, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x39, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x39, CHRHFLAG_00020000) - chr_do_animation(0x02f7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x39, 4) + chr_do_animation(ANIM_02F7, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x39, 4) set_chr_chrflag(0x3a, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x3a, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x3a, CHRHFLAG_00020000) - chr_do_animation(0x02f8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x3a, 4) + chr_do_animation(ANIM_02F8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x3a, 4) beginloop(0x0d) if_camera_animating(/*goto*/ 0x2d) @@ -2712,12 +2712,12 @@ u8 func0c00_intro[] = { unset_chr_chrflag(0x39, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x3a, CHRCFLAG_UNPLAYABLE) if_controller_button_pressed(/*goto*/ 0x86) - camera_movement(0x02f9) + camera_movement(ANIM_02F9) enable_object(0x36) set_object_flag2(0x36, OBJFLAG2_04000000) set_object_flag3(0x36, OBJFLAG3_00000010) - object_do_animation(0x02fa, 0x36, 0x01, 0xffff) + object_do_animation(ANIM_02FA, 0x36, 0x01, 0xffff) object_set_modelpart_visible(0x36, MODELPART_SKSHUTTLE_GANGWAY, FALSE) beginloop(0x0e) @@ -2732,33 +2732,33 @@ u8 func0c00_intro[] = { label(0x86) disable_object(0x36) if_controller_button_pressed(/*goto*/ 0x86) - camera_movement(0x02fb) + camera_movement(ANIM_02FB) set_chr_chrflag(0x37, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x37, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x37, CHRHFLAG_00020000) - chr_do_animation(0x02fc, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x37, 4) + chr_do_animation(ANIM_02FC, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x37, 4) set_chr_chrflag(0x38, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x38, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x38, CHRHFLAG_00020000) - chr_do_animation(0x02fd, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x38, 4) + chr_do_animation(ANIM_02FD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x38, 4) set_chr_chrflag(0x39, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x39, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x39, CHRHFLAG_00020000) - chr_do_animation(0x02fe, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x39, 4) + chr_do_animation(ANIM_02FE, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x39, 4) set_chr_chrflag(0x3a, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x3a, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x3a, CHRHFLAG_00020000) - chr_do_animation(0x02ff, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x3a, 4) + chr_do_animation(ANIM_02FF, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x3a, 4) unset_chr_chrflag(CHR_KING2, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_KING2, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_KING2, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_KING2, CHRHFLAG_00020000) - chr_do_animation(0x0300, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_KING2, 4) + chr_do_animation(ANIM_0300, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_KING2, 4) set_cutscene_weapon(CHR_BOND, WEAPON_NONE, WEAPON_NONE) yield @@ -2779,19 +2779,19 @@ u8 func0c00_intro[] = { unset_chr_chrflag(0x39, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x3a, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_KING2, CHRCFLAG_UNPLAYABLE) - camera_movement(0x0301) + camera_movement(ANIM_0301) cmd0175(60) if_controller_button_pressed(/*goto*/ 0x86) enable_object(0x36) set_object_flag2(0x36, OBJFLAG2_04000000) set_object_flag3(0x36, OBJFLAG3_00000010) - object_do_animation(0x0302, 0x36, 0x04, 0xffff) + object_do_animation(ANIM_0302, 0x36, 0x04, 0xffff) object_set_modelpart_visible(0x36, MODELPART_SKSHUTTLE_GANGWAY, FALSE) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0303, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0303, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) beginloop(0x10) if_camera_animating(/*goto*/ 0x2d) @@ -2809,7 +2809,7 @@ u8 func0c00_intro[] = { label(0x06) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0303, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_0303, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) disable_object(0x36) remove_chr(0x37) remove_chr(0x38) @@ -2854,7 +2854,7 @@ u8 func0414_outro[] = { label(0x06) set_chr_chrflag(CHR_TARGET, CHRCFLAG_KILLCOUNTABLE) - camera_movement(0x044c) + camera_movement(ANIM_044C) play_cutscene_track(MUSIC_SKEDARRUINS_OUTRO) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) @@ -2894,9 +2894,9 @@ u8 func0414_outro[] = { set_chr_chrflag(CHR_KING1, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_KING1, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_KING1, CHRHFLAG_00020000) - chr_do_animation(0x044d, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_KING1, 4) + chr_do_animation(ANIM_044D, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_KING1, 4) - object_do_animation(0x044e, OBJ_SPIKE_T, 0x04, 0xffff) + object_do_animation(ANIM_044E, OBJ_SPIKE_T, 0x04, 0xffff) set_stage_flag(STAGEFLAG_IN_OUTRO) show_nonessential_chrs(FALSE) @@ -2910,49 +2910,49 @@ u8 func0414_outro[] = { endloop(0x08) label(0x86) - camera_movement(0x044f) + camera_movement(ANIM_044F) set_chr_chrflag(CHR_KING1, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_KING1, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_KING1, CHRHFLAG_00020000) - chr_do_animation(0x0450, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_KING1, 4) + chr_do_animation(ANIM_0450, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_KING1, 4) set_chr_chrflag(CHR_TARGET, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TARGET, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TARGET, CHRHFLAG_00020000) - chr_do_animation(0x0451, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) + chr_do_animation(ANIM_0451, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) - object_do_animation(0x0452, OBJ_SPIKE_T, 0x04, 0xffff) + object_do_animation(ANIM_0452, OBJ_SPIKE_T, 0x04, 0xffff) enable_object(0x37) set_object_flag2(0x37, OBJFLAG2_04000000) set_object_flag3(0x37, OBJFLAG3_00000010) - object_do_animation(0x0453, 0x37, 0x04, 0xffff) + object_do_animation(ANIM_0453, 0x37, 0x04, 0xffff) enable_object(0x38) set_object_flag2(0x38, OBJFLAG2_04000000) set_object_flag3(0x38, OBJFLAG3_00000010) - object_do_animation(0x0454, 0x38, 0x04, 0xffff) + object_do_animation(ANIM_0454, 0x38, 0x04, 0xffff) enable_object(0x39) set_object_flag2(0x39, OBJFLAG2_04000000) set_object_flag3(0x39, OBJFLAG3_00000010) - object_do_animation(0x0455, 0x39, 0x04, 0xffff) + object_do_animation(ANIM_0455, 0x39, 0x04, 0xffff) enable_object(0x3a) set_object_flag2(0x3a, OBJFLAG2_04000000) set_object_flag3(0x3a, OBJFLAG3_00000010) - object_do_animation(0x0456, 0x3a, 0x04, 0xffff) + object_do_animation(ANIM_0456, 0x3a, 0x04, 0xffff) enable_object(0x3b) set_object_flag2(0x3b, OBJFLAG2_04000000) set_object_flag3(0x3b, OBJFLAG3_00000010) - object_do_animation(0x0457, 0x3b, 0x04, 0xffff) + object_do_animation(ANIM_0457, 0x3b, 0x04, 0xffff) enable_object(0x3c) set_object_flag2(0x3c, OBJFLAG2_04000000) set_object_flag3(0x3c, OBJFLAG3_00000010) - object_do_animation(0x0458, 0x3c, 0x04, 0xffff) + object_do_animation(ANIM_0458, 0x3c, 0x04, 0xffff) beginloop(0x09) if_camera_animating(/*goto*/ 0x2d) @@ -2965,37 +2965,37 @@ u8 func0414_outro[] = { label(0x86) disable_object(0x3c) - camera_movement(0x02c7) + camera_movement(ANIM_02C7) set_chr_chrflag(CHR_TARGET, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_TARGET, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_TARGET, CHRHFLAG_00020000) - chr_do_animation(0x02c8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) + chr_do_animation(ANIM_02C8, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_TARGET, 4) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x02c9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_02C9, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) enable_object(0x23) set_object_flag2(0x23, OBJFLAG2_04000000) set_object_flag3(0x23, OBJFLAG3_00000010) - object_do_animation(0x02ca, 0x23, 0x04, 0xffff) + object_do_animation(ANIM_02CA, 0x23, 0x04, 0xffff) enable_object(0x24) set_object_flag2(0x24, OBJFLAG2_04000000) set_object_flag3(0x24, OBJFLAG3_00000010) - object_do_animation(0x02cb, 0x24, 0x04, 0xffff) + object_do_animation(ANIM_02CB, 0x24, 0x04, 0xffff) enable_object(0x25) set_object_flag2(0x25, OBJFLAG2_04000000) set_object_flag3(0x25, OBJFLAG3_00000010) - object_do_animation(0x02cc, 0x25, 0x04, 0xffff) + object_do_animation(ANIM_02CC, 0x25, 0x04, 0xffff) enable_object(0x26) set_object_flag2(0x26, OBJFLAG2_04000000) set_object_flag3(0x26, OBJFLAG3_00000010) - object_do_animation(0x02cd, 0x26, 0x04, 0xffff) + object_do_animation(ANIM_02CD, 0x26, 0x04, 0xffff) beginloop(0x0b) if_camera_animating(/*goto*/ 0x2d) diff --git a/src/files/setup/setupstat.c b/src/files/setup/setupstat.c index f82097ec1..7c6c5d645 100644 --- a/src/files/setup/setupstat.c +++ b/src/files/setup/setupstat.c @@ -1082,22 +1082,22 @@ u8 func1002_intro[] = { play_cutscene_track(MUSIC_G5_INTRO) set_chr_hiddenflag(CHR_ANTI, CHRHFLAG_00020000) set_chr_hiddenflag(CHR_BLONDE, CHRHFLAG_00020000) - camera_movement(0x047c) + camera_movement(ANIM_047C) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x047d, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_047D, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) unset_chr_chrflag(CHR_MAIAN1, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_MAIAN1, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_MAIAN1, CHRHFLAG_00020000) - chr_do_animation(0x047e, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN1, 4) + chr_do_animation(ANIM_047E, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN1, 4) unset_chr_chrflag(CHR_MAIAN2, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_MAIAN2, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_MAIAN2, CHRHFLAG_00020000) - chr_do_animation(0x047f, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN2, 4) + chr_do_animation(ANIM_047F, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN2, 4) restart_timer fade_to_color(0x000000ff, 0) @@ -1134,15 +1134,15 @@ u8 func1002_intro[] = { unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x047d, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_047D, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(CHR_MAIAN3, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_MAIAN3, CHRHFLAG_00020000) - chr_do_animation(0x047e, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN3, 2) + chr_do_animation(ANIM_047E, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN3, 2) unset_chr_chrflag(CHR_MAIAN4, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_MAIAN4, CHRHFLAG_00020000) - chr_do_animation(0x047f, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN4, 2) + chr_do_animation(ANIM_047F, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN4, 2) set_ailist(CHR_MAIAN1, AILIST_INIT_MAIAN) set_ailist(CHR_MAIAN2, AILIST_INIT_MAIAN) @@ -1160,7 +1160,7 @@ u8 func040b_outro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_G5_OUTRO) - camera_movement(0x0480) + camera_movement(ANIM_0480) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) @@ -1168,17 +1168,17 @@ u8 func040b_outro[] = { unset_chr_chrflag(CHR_MAIAN3, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_MAIAN3, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_MAIAN3, CHRHFLAG_00020000) - chr_do_animation(0x0481, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN3, 4) + chr_do_animation(ANIM_0481, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN3, 4) unset_chr_chrflag(CHR_MAIAN4, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_MAIAN4, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_MAIAN4, CHRHFLAG_00020000) - chr_do_animation(0x0482, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN4, 4) + chr_do_animation(ANIM_0482, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN4, 4) unset_chr_chrflag(CHR_MAIAN5, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_MAIAN5, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_MAIAN5, CHRHFLAG_00020000) - chr_do_animation(0x0483, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN5, 4) + chr_do_animation(ANIM_0483, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_MAIAN5, 4) show_nonessential_chrs(FALSE) diff --git a/src/files/setup/setuptra.c b/src/files/setup/setuptra.c index ce8f6e583..cec382da9 100644 --- a/src/files/setup/setuptra.c +++ b/src/files/setup/setuptra.c @@ -1144,7 +1144,7 @@ u8 func0413_jonathan_hangar[] = { if_chr_dead(CHR_ELVIS, /*goto*/ 0xc3) if_chr_knockedout(CHR_ELVIS, /*goto*/ 0xc3) restart_timer - chr_do_animation(0x0232, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_ELVIS, 2) + chr_do_animation(ANIM_TALKING_0232, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_ELVIS, 2) speak(CHR_P1P2, L_TRA_059, MP3_029A, CHANNEL_5, COLOR_06_WHITE) // "Oh, no! We have a problem. It's a single seater!" beginloop(0x7d) @@ -1160,7 +1160,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer - chr_do_animation(0x0233, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_ELVIS, 2) + chr_do_animation(ANIM_TALKING_0233, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_ELVIS, 2) speak(CHR_P1P2, L_TRA_060, MP3_029B, CHANNEL_5, COLOR_06_WHITE) // "Two can get in but no more." beginloop(0x7e) @@ -1191,7 +1191,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer - chr_do_animation(0x0232, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_ELVIS, 2) + chr_do_animation(ANIM_TALKING_0232, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_ELVIS, 2) speak(CHR_P1P2, L_TRA_061, MP3_029C, CHANNEL_5, COLOR_06_WHITE) // "Plus, it's got no style, you know what I'm saying?" beginloop(0x7f) @@ -1222,7 +1222,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer - chr_do_animation(0x0231, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_JONATHAN, 2) + chr_do_animation(ANIM_TALKING_0231, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_JONATHAN, 2) speak(CHR_P1P2, L_TRA_045, MP3_02B9, CHANNEL_5, COLOR_03_RED) // "One of us will have to stay behind and open the ha..." beginloop(0x1a) @@ -1268,7 +1268,7 @@ u8 func0413_jonathan_hangar[] = { label(0x06) restart_timer - chr_do_animation(0x0232, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_JONATHAN, 2) + chr_do_animation(ANIM_TALKING_0232, -1, 200, CHRANIMFLAG_MOVEWHENINVIS, 0, CHR_JONATHAN, 2) speak(CHR_P1P2, L_TRA_046, MP3_02BA, CHANNEL_5, COLOR_03_RED) // "I'll get out on that hoverbike. Cover me while I o..." beginloop(0x1b) @@ -2541,28 +2541,28 @@ u8 func1002_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_ESCAPE_INTRO) - camera_movement(0x019c) + camera_movement(ANIM_019C) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x019d, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_019D, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) set_chr_chrflag(0x23, CHRCFLAG_INVINCIBLE) set_chr_chrflag(0x23, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x23, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x23, CHRHFLAG_00020000) - chr_do_animation(0x019e, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x23, 4) + chr_do_animation(ANIM_019E, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x23, 4) set_chr_chrflag(0x24, CHRCFLAG_INVINCIBLE) set_chr_chrflag(0x24, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x24, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x24, CHRHFLAG_00020000) - chr_do_animation(0x019f, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x24, 4) + chr_do_animation(ANIM_019F, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x24, 4) set_object_flag2(0x00, OBJFLAG2_04000000) set_object_flag3(0x00, OBJFLAG3_00000010) - object_do_animation(0x01a0, 0x00, 0x04, 0xffff) + object_do_animation(ANIM_01A0, 0x00, 0x04, 0xffff) restart_timer fade_to_color(0x000000ff, 0) fade_to_color(0x00000000, 90) @@ -2839,19 +2839,19 @@ u8 func1002_intro[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x019d, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_019D, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) unset_chr_chrflag(0x23, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(0x23, CHRHFLAG_00020000) - chr_do_animation(0x019e, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x23, 2) + chr_do_animation(ANIM_019E, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x23, 2) unset_chr_chrflag(0x24, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(0x24, CHRHFLAG_00020000) - chr_do_animation(0x019f, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x24, 2) + chr_do_animation(ANIM_019F, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x24, 2) unset_object_flag2(OBJ_HOVERBED, OBJFLAG2_04000000) set_object_flag3(OBJ_HOVERBED, OBJFLAG3_00000010) - object_do_animation(0x01a0, OBJ_HOVERBED, 0x04, 0xfffe) + object_do_animation(ANIM_01A0, OBJ_HOVERBED, 0x04, 0xfffe) drop_concealed_items(0x23) drop_concealed_items(0x24) @@ -2873,7 +2873,7 @@ u8 func0c01_midcutscene[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_ESCAPE_MIDCUTSCENE) - camera_movement(0x01cb) + camera_movement(ANIM_01CB) cmd0175(60) disable_object(OBJ_HOVERBED) #if VERSION >= VERSION_NTSC_1_0 @@ -2904,21 +2904,21 @@ u8 func0c01_midcutscene[] = { set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) #endif - chr_do_animation(0x01ce, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, VERSION >= VERSION_NTSC_1_0 ? CHR_TARGET : CHR_BOND, 4) + chr_do_animation(ANIM_01CE, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, VERSION >= VERSION_NTSC_1_0 ? CHR_TARGET : CHR_BOND, 4) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x01cc, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) + chr_do_animation(ANIM_01CC, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 4) set_chr_chrflag(CHR_JONATHAN, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_JONATHAN, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_JONATHAN, CHRHFLAG_00020000) - chr_do_animation(0x01cd, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_JONATHAN, 4) + chr_do_animation(ANIM_01CD, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_JONATHAN, 4) set_object_flag2(0x11, OBJFLAG2_04000000) set_object_flag3(0x11, OBJFLAG3_00000010) - object_do_animation(0x01cf, 0x11, 0x04, 0xffff) + object_do_animation(ANIM_01CF, 0x11, 0x04, 0xffff) show_nonessential_chrs(FALSE) if_object_in_room(OBJ_HOVERBIKE, 0x00df, /*goto*/ 0x06) @@ -3046,19 +3046,19 @@ u8 func0c01_midcutscene[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(VERSION >= VERSION_NTSC_1_0 ? CHR_TARGET : CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(VERSION >= VERSION_NTSC_1_0 ? CHR_TARGET : CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x01ce, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, VERSION >= VERSION_NTSC_1_0 ? CHR_TARGET : CHR_BOND, 2) + chr_do_animation(ANIM_01CE, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, VERSION >= VERSION_NTSC_1_0 ? CHR_TARGET : CHR_BOND, 2) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_ELVIS, CHRHFLAG_00020000) - chr_do_animation(0x01cc, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) + chr_do_animation(ANIM_01CC, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_ELVIS, 2) unset_chr_chrflag(CHR_JONATHAN, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_JONATHAN, CHRHFLAG_00020000) - chr_do_animation(0x01cd, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_JONATHAN, 2) + chr_do_animation(ANIM_01CD, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_JONATHAN, 2) unset_object_flag2(0x11, OBJFLAG2_04000000) set_object_flag3(0x11, OBJFLAG3_00000010) - object_do_animation(0x01cf, 0x11, 0x04, 0xfffe) + object_do_animation(ANIM_01CF, 0x11, 0x04, 0xfffe) unset_object_flag2(0x0a, OBJFLAG2_AICANNOTUSE) unset_chr_chrflag(CHR_ELVIS, CHRCFLAG_INVINCIBLE) @@ -3096,14 +3096,14 @@ u8 func0c02_outro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_ESCAPE_OUTRO_LONG) - camera_movement(0x02d2) + camera_movement(ANIM_02D2) label(0x32) disable_object(OBJ_UFO2) enable_object(OBJ_UFO1) set_object_flag2(OBJ_UFO1, OBJFLAG2_04000000) set_object_flag3(OBJ_UFO1, OBJFLAG3_00000010) - object_do_animation(0x02d3, OBJ_UFO1, 0x04, 0xffff) + object_do_animation(ANIM_02D3, OBJ_UFO1, 0x04, 0xffff) set_stage_flag(STAGEFLAG_STARTED_OUTRO) remove_chr(CHR_ELVIS) @@ -3123,17 +3123,17 @@ u8 func0c02_outro[] = { label(0x68) label(0x32) - camera_movement(0x02d4) + camera_movement(ANIM_02D4) enable_object(OBJ_UFO1) set_object_flag2(OBJ_UFO1, OBJFLAG2_04000000) set_object_flag3(OBJ_UFO1, OBJFLAG3_00000010) - object_do_animation(0x02d5, OBJ_UFO1, 0x04, 0xffff) + object_do_animation(ANIM_02D5, OBJ_UFO1, 0x04, 0xffff) set_chr_chrflag(0x2b, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(0x2b, CHRCFLAG_HIDDEN) set_chr_hiddenflag(0x2b, CHRHFLAG_00020000) - chr_do_animation(0x0304, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2b, 4) + chr_do_animation(ANIM_0304, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, 0x2b, 4) open_door(0x2c) open_door(0x2e) @@ -3186,7 +3186,7 @@ u8 func0415_ufo_exit[] = { enable_object(OBJ_UFO1) set_object_flag2(OBJ_UFO1, OBJFLAG2_04000000) set_object_flag3(OBJ_UFO1, OBJFLAG3_00000010) - object_do_animation(0x02d3, OBJ_UFO1, 0x04, 0xffff) + object_do_animation(ANIM_02D3, OBJ_UFO1, 0x04, 0xffff) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_JONATHAN, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ELVIS, CHRCFLAG_INVINCIBLE) @@ -3241,7 +3241,7 @@ u8 func1021_jo_escaping[] = { label(0x62) set_savefile_flag(SAVEFILEFLAG_DEFENSE_JON) play_cutscene_track(MUSIC_ESCAPE_OUTRO_LONG) - camera_movement(0x02d4) + camera_movement(ANIM_02D4) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) set_chr_chrflag(0xf1, CHRCFLAG_HIDDEN) set_ailist(CHR_P1P2, GAILIST_IDLE) @@ -3249,12 +3249,12 @@ u8 func1021_jo_escaping[] = { enable_object(OBJ_UFO1) set_object_flag2(OBJ_UFO1, OBJFLAG2_04000000) set_object_flag3(OBJ_UFO1, OBJFLAG3_00000010) - object_do_animation(0x02d5, OBJ_UFO1, 0x04, 0xffff) + object_do_animation(ANIM_02D5, OBJ_UFO1, 0x04, 0xffff) set_chr_chrflag(CHR_P1P2, CHRCFLAG_UNPLAYABLE) unset_chr_chrflag(CHR_P1P2, CHRCFLAG_HIDDEN) set_chr_hiddenflag(CHR_P1P2, CHRHFLAG_00020000) - chr_do_animation(0x0304, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) + chr_do_animation(ANIM_0304, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_P1P2, 4) beginloop(0x09) if_camera_animating(/*goto*/ 0x32) @@ -3606,7 +3606,7 @@ u8 func1026_ufo_spinning[] = { set_object_flag3(OBJ_UFO2, OBJFLAG3_00000010) label(0x03) - object_do_animation(0x0459, OBJ_UFO2, 0x04, 0xffff) + object_do_animation(ANIM_0459, OBJ_UFO2, 0x04, 0xffff) restart_timer beginloop(0x08) diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c index fc5145e4c..b9578cda4 100644 --- a/src/files/setup/setupwax.c +++ b/src/files/setup/setupwax.c @@ -1316,7 +1316,7 @@ u8 func0411_cass_in_office[] = { #else speak(CHR_TARGET, L_WAX_008, 0x1523, CHANNEL_6, COLOR_06_WHITE) // "Go to the helipad if you want to live." #endif - chr_do_animation(0x0226, -1, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_WALK_BACKWARDS, -1, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) yield // Wait 3 seconds @@ -1339,7 +1339,7 @@ u8 func0411_cass_in_office[] = { label(0x06) set_ailist(CHR_SELF, GAILIST_IDLE) label(0x2c) - chr_do_animation(0x00a0, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_TALKING_00A0, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x54) chr_toggle_p1p2(CHR_SELF) @@ -1361,7 +1361,7 @@ u8 func0411_cass_in_office[] = { // Draw weapon label(0x57) set_self_flag_bankx(CHRFLAG0_00002000, BANK_0) - chr_do_animation(0x0245, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_DRAW_PISTOL_0245, 0, -1, CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) try_equip_weapon(MODEL_CHRFALCON2, WEAPON_FALCON2, 0x00000000, /*goto*/ 0x2c) label(0x2c) speak(CHR_TARGET, L_WAX_007, SFX_81A3, CHANNEL_6, COLOR_04_ORANGE) // "Get the hell out of my office..." @@ -1978,11 +1978,11 @@ u8 func0416_intro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_G5_INTRO) - camera_movement(0x0472) + camera_movement(ANIM_0472) cmd0175(60) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0473, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) + chr_do_animation(ANIM_0473, -1, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 4) restart_timer fade_to_color(0x000000ff, 0) fade_to_color(0x00000000, 110) @@ -2043,7 +2043,7 @@ u8 func0416_intro[] = { unset_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) unset_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) - chr_do_animation(0x0473, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) + chr_do_animation(ANIM_0473, -2, -1, CHRANIMFLAG_MOVEWHENINVIS | CHRANIMFLAG_PAUSEATEND, 0, CHR_BOND, 2) stop_cutscene_track stop_ambient_track enter_firstperson @@ -2057,7 +2057,7 @@ u8 func0417_outro[] = { set_chr_chrflag(CHR_COOP, CHRCFLAG_HIDDEN) set_chr_chrflag(CHR_ANTI, CHRCFLAG_HIDDEN) play_cutscene_track(MUSIC_G5_OUTRO) - camera_movement(0x0474) + camera_movement(ANIM_0474) set_chr_chrflag(CHR_BOND, CHRCFLAG_UNPLAYABLE) set_chr_hiddenflag(CHR_BOND, CHRHFLAG_00020000) set_chr_chrflag(CHR_BOND, CHRCFLAG_HIDDEN) @@ -2066,7 +2066,7 @@ u8 func0417_outro[] = { enable_object(OBJ_SHUTTLE2) set_object_flag2(OBJ_SHUTTLE2, OBJFLAG2_04000000) set_object_flag3(OBJ_SHUTTLE2, OBJFLAG3_00000010) - object_do_animation(0x0475, OBJ_SHUTTLE2, 0x04, 0xffff) + object_do_animation(ANIM_0475, OBJ_SHUTTLE2, 0x04, 0xffff) show_nonessential_chrs(FALSE) restart_timer object_set_modelpart_visible(OBJ_SHUTTLE2, MODELPART_SKSHUTTLE_GANGWAY, FALSE) @@ -2110,7 +2110,7 @@ u8 func100e_cass_speech[] = { #else speak(CHR_TARGET, L_WAX_013, MP3_02F5, CHANNEL_6, COLOR_04_ORANGE) // "You won't shoot me!" #endif - chr_do_animation(0x00a0, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) + chr_do_animation(ANIM_TALKING_00A0, 0, 193, CHRANIMFLAG_COMPLETED | CHRANIMFLAG_SLOWUPDATE, 16, CHR_SELF, 2) beginloop(0x09) if_timer_gt(80, /*goto*/ 0x06) @@ -2171,10 +2171,10 @@ u8 func1011_shuttle_animation[] = { // Some kind of animation on repeat beginloop(0x08) #if VERSION >= VERSION_NTSC_1_0 - object_do_animation(0x0489, OBJ_SHUTTLE1, 0x08, 0xffff) + object_do_animation(ANIM_0489, OBJ_SHUTTLE1, 0x08, 0xffff) #else if_all_objectives_complete(/*goto*/ 0x06) - object_do_animation(0x0489, OBJ_SHUTTLE1, 0x04, 0xffff) + object_do_animation(ANIM_0489, OBJ_SHUTTLE1, 0x04, 0xffff) #endif endloop(0x08) diff --git a/src/game/bondgun.c b/src/game/bondgun.c index fd047d145..ad2f36d92 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -7609,7 +7609,7 @@ u32 var800701f8 = 0x00000000; u32 var800701fc = 0x00000000; struct guncmd var80070200[2] = { - { GUNCMD_PLAYANIMATION, 0, 0x0434, 10000 }, + { GUNCMD_PLAYANIMATION, 0, ANIM_0434, 10000 }, { GUNCMD_END }, }; diff --git a/src/game/bondhead.c b/src/game/bondhead.c index 9a99ec472..4cc484cd4 100644 --- a/src/game/bondhead.c +++ b/src/game/bondhead.c @@ -12,8 +12,8 @@ #include "types.h" struct var80075c00 var80075c00[] = { - { ANIM_2B, 9.5, 27, 0, 0, 1.5 }, - { ANIM_29, 7.5, 17, 0, 1.5, 100 }, + { ANIM_002B, 9.5, 27, 0, 0, 1.5 }, + { ANIM_0029, 7.5, 17, 0, 1.5, 100 }, }; struct coord var80075c30 = {0, 0, 0}; diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 1ba43f9c6..060daf011 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -218,508 +218,508 @@ u32 var80062cb8 = 0x00000000; s32 var80062cbc = 0; struct animtablerow g_DeathAnimsHumanLfoot[] = { - { 0x0020, 0, -1, 0.5, 0, 26, -1 }, + { ANIM_DEATH_0020, 0, -1, 0.5, 0, 26, -1 }, { 0, 0, 0, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanLshin[] = { - { 0x0020, 0, -1, 0.5, 0, 26, -1 }, + { ANIM_DEATH_0020, 0, -1, 0.5, 0, 26, -1 }, { 0, 0, 0, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanLthigh[] = { - { 0x0020, 0, -1, 0.5, 1, 26, -1 }, - { 0x0039, 1, -1, 0.5, 0, -1, -1 }, - { 0x0092, 1, -1, 0.4, 0, 42, 103 }, - { 0x0258, 1, -1, 0.5, 0, 43, 100 }, + { ANIM_DEATH_0020, 0, -1, 0.5, 1, 26, -1 }, + { ANIM_DEATH_STOMACH_LONG, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0092, 1, -1, 0.4, 0, 42, 103 }, + { ANIM_0258, 1, -1, 0.5, 0, 43, 100 }, { 0, 0, 0, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanRfoot[] = { - { 0x0020, 1, -1, 0.5, 0, 26, -1 }, + { ANIM_DEATH_0020, 1, -1, 0.5, 0, 26, -1 }, { 0, 0, 0, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanRshin[] = { - { 0x0020, 1, -1, 0.5, 0, 26, -1 }, + { ANIM_DEATH_0020, 1, -1, 0.5, 0, 26, -1 }, { 0, 0, 0, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanRthigh[] = { - { 0x0020, 1, -1, 0.5, 1, 26, -1 }, - { 0x0039, 0, -1, 0.5, 0, -1, -1 }, - { 0x0092, 0, -1, 0.4, 0, 42, 103 }, - { 0x0258, 0, -1, 0.5, 0, 43, 100 }, + { ANIM_DEATH_0020, 1, -1, 0.5, 1, 26, -1 }, + { ANIM_DEATH_STOMACH_LONG, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0092, 0, -1, 0.4, 0, 42, 103 }, + { ANIM_0258, 0, -1, 0.5, 0, 43, 100 }, { 0, 0, 0, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanPelvis[] = { - { 0x001a, 0, -1, 0.5, 0, 55, 39 }, - { 0x001a, 1, -1, 0.5, 0, 55, 39 }, - { 0x001c, 0, -1, 0.5, 1, 29, -1 }, - { 0x001c, 1, -1, 0.5, 1, 29, -1 }, - { 0x0021, 0, -1, 0.5, 0, 97, 64 }, - { 0x0021, 1, -1, 0.5, 0, 97, 64 }, - { 0x0023, 0, -1, 0.5, 0, 31, -1 }, - { 0x0023, 1, -1, 0.5, 0, 31, -1 }, - { 0x0024, 0, -1, 0.5, 0, 36, -1 }, - { 0x0024, 1, -1, 0.5, 0, 36, -1 }, - { 0x0025, 0, -1, 0.5, 0, 28, -1 }, - { 0x0025, 1, -1, 0.5, 0, 28, -1 }, - { 0x0090, 0, -1, 0.6, 0, 157, 234 }, - { 0x0090, 1, -1, 0.6, 0, 157, 234 }, - { 0x0091, 0, -1, 0.6, 0, 75, 265 }, - { 0x0091, 1, -1, 0.6, 0, 75, 265 }, - { 0x0250, 0, -1, 0.5, 0, 65, 105 }, - { 0x0250, 1, -1, 0.5, 0, 65, 105 }, + { ANIM_DEATH_001A, 0, -1, 0.5, 0, 55, 39 }, + { ANIM_DEATH_001A, 1, -1, 0.5, 0, 55, 39 }, + { ANIM_DEATH_001C, 0, -1, 0.5, 1, 29, -1 }, + { ANIM_DEATH_001C, 1, -1, 0.5, 1, 29, -1 }, + { ANIM_DEATH_0021, 0, -1, 0.5, 0, 97, 64 }, + { ANIM_DEATH_0021, 1, -1, 0.5, 0, 97, 64 }, + { ANIM_DEATH_0023, 0, -1, 0.5, 0, 31, -1 }, + { ANIM_DEATH_0023, 1, -1, 0.5, 0, 31, -1 }, + { ANIM_DEATH_0024, 0, -1, 0.5, 0, 36, -1 }, + { ANIM_DEATH_0024, 1, -1, 0.5, 0, 36, -1 }, + { ANIM_DEATH_0025, 0, -1, 0.5, 0, 28, -1 }, + { ANIM_DEATH_0025, 1, -1, 0.5, 0, 28, -1 }, + { ANIM_0090, 0, -1, 0.6, 0, 157, 234 }, + { ANIM_0090, 1, -1, 0.6, 0, 157, 234 }, + { ANIM_0091, 0, -1, 0.6, 0, 75, 265 }, + { ANIM_0091, 1, -1, 0.6, 0, 75, 265 }, + { ANIM_0250, 0, -1, 0.5, 0, 65, 105 }, + { ANIM_0250, 1, -1, 0.5, 0, 65, 105 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanHead[] = { - { 0x001a, 0, -1, 0.5, 0, 55, 39 }, - { 0x001a, 1, -1, 0.5, 0, 55, 39 }, - { 0x001c, 0, -1, 0.5, 1, 29, -1 }, - { 0x001c, 1, -1, 0.5, 1, 29, -1 }, - { 0x0020, 0, -1, 0.5, 1, 26, -1 }, - { 0x0020, 1, -1, 0.5, 1, 26, -1 }, - { 0x0021, 0, -1, 0.5, 0, 97, 64 }, - { 0x0021, 1, -1, 0.5, 0, 97, 64 }, - { 0x0022, 0, -1, 0.5, 0, 94, 66 }, - { 0x0022, 1, -1, 0.5, 0, 94, 66 }, - { 0x0023, 0, -1, 0.5, 0, 31, -1 }, - { 0x0023, 1, -1, 0.5, 0, 31, -1 }, - { 0x0024, 0, -1, 0.5, 0, 36, -1 }, - { 0x0024, 1, -1, 0.5, 0, 36, -1 }, - { 0x0025, 0, -1, 0.5, 0, 28, -1 }, - { 0x0025, 1, -1, 0.5, 0, 28, -1 }, - { 0x0038, 0, -1, 0.5, 0, -1, -1 }, - { 0x0038, 1, -1, 0.5, 0, -1, -1 }, - { 0x0251, 0, -1, 0.5, 0, 132, 201 }, - { 0x0251, 1, -1, 0.5, 0, 132, 201 }, - { 0x0252, 0, -1, 0.5, 0, 83, 150 }, - { 0x0252, 1, -1, 0.5, 0, 83, 150 }, - { 0x0256, 0, -1, 0.5, 0, 63, -1 }, - { 0x0256, 1, -1, 0.5, 0, 63, -1 }, + { ANIM_DEATH_001A, 0, -1, 0.5, 0, 55, 39 }, + { ANIM_DEATH_001A, 1, -1, 0.5, 0, 55, 39 }, + { ANIM_DEATH_001C, 0, -1, 0.5, 1, 29, -1 }, + { ANIM_DEATH_001C, 1, -1, 0.5, 1, 29, -1 }, + { ANIM_DEATH_0020, 0, -1, 0.5, 1, 26, -1 }, + { ANIM_DEATH_0020, 1, -1, 0.5, 1, 26, -1 }, + { ANIM_DEATH_0021, 0, -1, 0.5, 0, 97, 64 }, + { ANIM_DEATH_0021, 1, -1, 0.5, 0, 97, 64 }, + { ANIM_DEATH_0022, 0, -1, 0.5, 0, 94, 66 }, + { ANIM_DEATH_0022, 1, -1, 0.5, 0, 94, 66 }, + { ANIM_DEATH_0023, 0, -1, 0.5, 0, 31, -1 }, + { ANIM_DEATH_0023, 1, -1, 0.5, 0, 31, -1 }, + { ANIM_DEATH_0024, 0, -1, 0.5, 0, 36, -1 }, + { ANIM_DEATH_0024, 1, -1, 0.5, 0, 36, -1 }, + { ANIM_DEATH_0025, 0, -1, 0.5, 0, 28, -1 }, + { ANIM_DEATH_0025, 1, -1, 0.5, 0, 28, -1 }, + { ANIM_0038, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0038, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0251, 0, -1, 0.5, 0, 132, 201 }, + { ANIM_0251, 1, -1, 0.5, 0, 132, 201 }, + { ANIM_0252, 0, -1, 0.5, 0, 83, 150 }, + { ANIM_0252, 1, -1, 0.5, 0, 83, 150 }, + { ANIM_0256, 0, -1, 0.5, 0, 63, -1 }, + { ANIM_0256, 1, -1, 0.5, 0, 63, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanLhand[] = { - { 0x0020, 0, -1, 0.5, 0, 26, -1 }, + { ANIM_DEATH_0020, 0, -1, 0.5, 0, 26, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanForearm[] = { - { 0x0020, 0, -1, 0.5, 0, 26, -1 }, + { ANIM_DEATH_0020, 0, -1, 0.5, 0, 26, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanLbicep[] = { - { 0x0020, 0, -1, 0.5, 1, 26, -1 }, - { 0x008f, 1, -1, 0.45, 1, 52, -1 }, + { ANIM_DEATH_0020, 0, -1, 0.5, 1, 26, -1 }, + { ANIM_008F, 1, -1, 0.45, 1, 52, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanRhand[] = { - { 0x0020, 1, -1, 0.5, 0, 26, -1 }, + { ANIM_DEATH_0020, 1, -1, 0.5, 0, 26, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanRforearm[] = { - { 0x0020, 1, -1, 0.5, 0, 26, -1 }, + { ANIM_DEATH_0020, 1, -1, 0.5, 0, 26, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanRbicep[] = { - { 0x0020, 1, -1, 0.5, 1, 26, -1 }, - { 0x008f, 0, -1, 0.45, 1, 52, -1 }, + { ANIM_DEATH_0020, 1, -1, 0.5, 1, 26, -1 }, + { ANIM_008F, 0, -1, 0.45, 1, 52, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanTorso[] = { - { 0x001a, 0, -1, 0.5, 0, 55, 39 }, - { 0x001a, 1, -1, 0.5, 0, 55, 39 }, - { 0x001c, 0, -1, 0.5, 1, 29, -1 }, - { 0x001c, 1, -1, 0.5, 1, 29, -1 }, - { 0x0020, 0, -1, 0.5, 1, 26, -1 }, - { 0x0020, 1, -1, 0.5, 1, 26, -1 }, - { 0x0021, 0, -1, 0.5, 0, 97, 64 }, - { 0x0021, 1, -1, 0.5, 0, 97, 64 }, - { 0x0022, 0, -1, 0.5, 0, 94, 66 }, - { 0x0022, 1, -1, 0.5, 0, 94, 66 }, - { 0x0023, 0, -1, 0.5, 0, 31, -1 }, - { 0x0023, 1, -1, 0.5, 0, 31, -1 }, - { 0x0024, 0, -1, 0.5, 0, 36, -1 }, - { 0x0024, 1, -1, 0.5, 0, 36, -1 }, - { 0x0025, 0, -1, 0.5, 0, 28, -1 }, - { 0x0025, 1, -1, 0.5, 0, 28, -1 }, - { 0x024e, 0, -1, 0.4, 0, 60, -1 }, - { 0x024e, 1, -1, 0.4, 0, 60, -1 }, - { 0x024f, 0, -1, 0.5, 0, 49, 80 }, - { 0x024f, 1, -1, 0.5, 0, 49, 80 }, - { 0x0253, 0, -1, 0.5, 1, 22, -1 }, - { 0x0253, 1, -1, 0.5, 1, 22, -1 }, - { 0x0254, 0, -1, 0.5, 0, 52, 75 }, - { 0x0254, 1, -1, 0.5, 0, 52, 75 }, + { ANIM_DEATH_001A, 0, -1, 0.5, 0, 55, 39 }, + { ANIM_DEATH_001A, 1, -1, 0.5, 0, 55, 39 }, + { ANIM_DEATH_001C, 0, -1, 0.5, 1, 29, -1 }, + { ANIM_DEATH_001C, 1, -1, 0.5, 1, 29, -1 }, + { ANIM_DEATH_0020, 0, -1, 0.5, 1, 26, -1 }, + { ANIM_DEATH_0020, 1, -1, 0.5, 1, 26, -1 }, + { ANIM_DEATH_0021, 0, -1, 0.5, 0, 97, 64 }, + { ANIM_DEATH_0021, 1, -1, 0.5, 0, 97, 64 }, + { ANIM_DEATH_0022, 0, -1, 0.5, 0, 94, 66 }, + { ANIM_DEATH_0022, 1, -1, 0.5, 0, 94, 66 }, + { ANIM_DEATH_0023, 0, -1, 0.5, 0, 31, -1 }, + { ANIM_DEATH_0023, 1, -1, 0.5, 0, 31, -1 }, + { ANIM_DEATH_0024, 0, -1, 0.5, 0, 36, -1 }, + { ANIM_DEATH_0024, 1, -1, 0.5, 0, 36, -1 }, + { ANIM_DEATH_0025, 0, -1, 0.5, 0, 28, -1 }, + { ANIM_DEATH_0025, 1, -1, 0.5, 0, 28, -1 }, + { ANIM_024E, 0, -1, 0.4, 0, 60, -1 }, + { ANIM_024E, 1, -1, 0.4, 0, 60, -1 }, + { ANIM_024F, 0, -1, 0.5, 0, 49, 80 }, + { ANIM_024F, 1, -1, 0.5, 0, 49, 80 }, + { ANIM_0253, 0, -1, 0.5, 1, 22, -1 }, + { ANIM_0253, 1, -1, 0.5, 1, 22, -1 }, + { ANIM_0254, 0, -1, 0.5, 0, 52, 75 }, + { ANIM_0254, 1, -1, 0.5, 0, 52, 75 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsHumanGun[] = { - { 0x001a, 0, -1, 0.5, 0, 55, 39 }, - { 0x001a, 1, -1, 0.5, 0, 55, 39 }, - { 0x001c, 0, -1, 0.5, 1, 29, -1 }, - { 0x001c, 1, -1, 0.5, 1, 29, -1 }, - { 0x0021, 0, -1, 0.5, 0, 97, 64 }, - { 0x0021, 1, -1, 0.5, 0, 97, 64 }, - { 0x0022, 0, -1, 0.5, 0, 94, 66 }, - { 0x0022, 1, -1, 0.5, 0, 94, 66 }, - { 0x0023, 0, -1, 0.5, 0, 31, -1 }, - { 0x0023, 1, -1, 0.5, 0, 31, -1 }, - { 0x0024, 0, -1, 0.5, 0, 36, -1 }, - { 0x0024, 1, -1, 0.5, 0, 36, -1 }, - { 0x0025, 0, -1, 0.5, 0, 28, -1 }, - { 0x0025, 1, -1, 0.5, 0, 28, -1 }, + { ANIM_DEATH_001A, 0, -1, 0.5, 0, 55, 39 }, + { ANIM_DEATH_001A, 1, -1, 0.5, 0, 55, 39 }, + { ANIM_DEATH_001C, 0, -1, 0.5, 1, 29, -1 }, + { ANIM_DEATH_001C, 1, -1, 0.5, 1, 29, -1 }, + { ANIM_DEATH_0021, 0, -1, 0.5, 0, 97, 64 }, + { ANIM_DEATH_0021, 1, -1, 0.5, 0, 97, 64 }, + { ANIM_DEATH_0022, 0, -1, 0.5, 0, 94, 66 }, + { ANIM_DEATH_0022, 1, -1, 0.5, 0, 94, 66 }, + { ANIM_DEATH_0023, 0, -1, 0.5, 0, 31, -1 }, + { ANIM_DEATH_0023, 1, -1, 0.5, 0, 31, -1 }, + { ANIM_DEATH_0024, 0, -1, 0.5, 0, 36, -1 }, + { ANIM_DEATH_0024, 1, -1, 0.5, 0, 36, -1 }, + { ANIM_DEATH_0025, 0, -1, 0.5, 0, 28, -1 }, + { ANIM_DEATH_0025, 1, -1, 0.5, 0, 28, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_AnimTableHumanSlumped[] = { - { 0x0019, 0, -1, 0.5, 0, 67, 54 }, - { 0x0019, 1, -1, 0.5, 0, 67, 54 }, - { 0x0257, 0, -1, 0.5, 0, 15, 80 }, - { 0x0257, 1, -1, 0.5, 0, 15, 80 }, + { ANIM_0019, 0, -1, 0.5, 0, 67, 54 }, + { ANIM_0019, 1, -1, 0.5, 0, 67, 54 }, + { ANIM_0257, 0, -1, 0.5, 0, 15, 80 }, + { ANIM_0257, 1, -1, 0.5, 0, 15, 80 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanLfoot[] = { - { 0x0014, 0, -1, 0.5, 0, -1, -1 }, - { 0x0015, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0014, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0015, 1, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanLshin[] = { - { 0x0014, 0, -1, 0.5, 0, -1, -1 }, - { 0x0015, 1, -1, 0.5, 0, -1, -1 }, - { 0x00bc, 0, -1, 0.5, 0, -1, -1 }, - { 0x00bd, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0014, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0015, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_00BC, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_00BD, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanLthigh[] = { - { 0x0014, 0, -1, 0.5, 0, -1, -1 }, - { 0x0015, 1, -1, 0.5, 0, -1, -1 }, - { 0x0039, 1, 20, 0.4, 0, -1, -1 }, - { 0x00ba, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0014, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0015, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_DEATH_STOMACH_LONG, 1, 20, 0.4, 0, -1, -1 }, + { ANIM_00BA, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanRfoot[] = { - { 0x0015, 0, -1, 0.5, 0, -1, -1 }, - { 0x0014, 1, -1, 0.5, 0, -1, -1 }, - { 0x0236, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0015, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0014, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0236, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanRshin[] = { - { 0x0015, 0, -1, 0.5, 0, -1, -1 }, - { 0x0014, 1, -1, 0.5, 0, -1, -1 }, - { 0x00be, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0015, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0014, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_00BE, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanRthigh[] = { - { 0x0015, 0, -1, 0.5, 0, -1, -1 }, - { 0x0014, 1, -1, 0.5, 0, -1, -1 }, - { 0x0039, 0, 20, 0.4, 0, -1, -1 }, - { 0x00bf, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0015, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0014, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_DEATH_STOMACH_LONG, 0, 20, 0.4, 0, -1, -1 }, + { ANIM_00BF, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanPelvis[] = { - { 0x0022, 0, 20, 0.5, 0, -1, -1 }, - { 0x0022, 1, 20, 0.5, 0, -1, -1 }, - { 0x001a, 0, 15, 0.5, 0, -1, -1 }, - { 0x001a, 1, 15, 0.5, 0, -1, -1 }, - { 0x0023, 0, 10, 0.25, 0, -1, -1 }, - { 0x0023, 1, 10, 0.25, 0, -1, -1 }, - { 0x00da, 0, -1, 0.5, 0, -1, -1 }, - { 0x00f4, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 0, 20, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 1, 20, 0.5, 0, -1, -1 }, + { ANIM_DEATH_001A, 0, 15, 0.5, 0, -1, -1 }, + { ANIM_DEATH_001A, 1, 15, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0023, 0, 10, 0.25, 0, -1, -1 }, + { ANIM_DEATH_0023, 1, 10, 0.25, 0, -1, -1 }, + { ANIM_00DA, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_00F4, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanHead[] = { - { 0x0022, 0, 20, 0.5, 0, -1, -1 }, - { 0x0022, 1, 20, 0.5, 0, -1, -1 }, - { 0x001a, 0, 15, 0.5, 0, -1, -1 }, - { 0x001a, 1, 15, 0.5, 0, -1, -1 }, - { 0x00f8, 0, -1, 0.5, 0, -1, -1 }, - { 0x00fb, 0, -1, 0.5, 0, -1, -1 }, - { 0x0101, 0, -1, 0.5, 0, -1, -1 }, - { 0x0113, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 0, 20, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 1, 20, 0.5, 0, -1, -1 }, + { ANIM_DEATH_001A, 0, 15, 0.5, 0, -1, -1 }, + { ANIM_DEATH_001A, 1, 15, 0.5, 0, -1, -1 }, + { ANIM_00F8, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_00FB, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0101, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0113, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanLhand[] = { - { 0x0012, 0, -1, 0.5, 0, -1, -1 }, - { 0x0013, 1, -1, 0.5, 0, -1, -1 }, - { 0x00b8, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0012, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0013, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_00B8, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanForearm[] = { - { 0x0010, 0, -1, 0.5, 0, -1, -1 }, - { 0x0011, 1, -1, 0.5, 0, -1, -1 }, - { 0x00b4, 0, -1, 0.5, 0, -1, -1 }, - { 0x021b, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0010, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0011, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_00B4, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_021B, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanLbicep[] = { - { 0x000e, 0, -1, 0.5, 0, -1, -1 }, - { 0x000f, 1, -1, 0.5, 0, -1, -1 }, - { 0x0022, 0, 20, 0.5, 0, -1, -1 }, - { 0x00b0, 0, -1, 0.5, 0, -1, -1 }, - { 0x00b1, 0, -1, 0.5, 0, -1, -1 }, - { 0x021c, 0, -1, 0.5, 0, -1, -1 }, - { 0x00b5, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_000E, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_000F, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 0, 20, 0.5, 0, -1, -1 }, + { ANIM_00B0, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_00B1, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_021C, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_00B5, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanRhand[] = { - { 0x0013, 0, -1, 0.5, 0, -1, -1 }, - { 0x0012, 1, -1, 0.5, 0, -1, -1 }, - { 0x00b9, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0013, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0012, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_00B9, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanRforearm[] = { - { 0x0011, 0, -1, 0.5, 0, -1, -1 }, - { 0x0010, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0011, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0010, 1, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanRbicep[] = { - { 0x000f, 0, -1, 0.5, 0, -1, -1 }, - { 0x000e, 1, -1, 0.5, 0, -1, -1 }, - { 0x0022, 1, 20, 0.5, 0, -1, -1 }, - { 0x0190, 0, -1, 0.5, 0, -1, -1 }, - { 0x00b2, 0, -1, 0.5, 0, -1, -1 }, - { 0x00b3, 0, -1, 0.5, 0, -1, -1 }, - { 0x00b6, 0, -1, 0.5, 0, -1, -1 }, - { 0x00b7, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_000F, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_000E, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 1, 20, 0.5, 0, -1, -1 }, + { ANIM_0190, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_00B2, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_00B3, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_00B6, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_00B7, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanTorso[] = { - { 0x0022, 0, 20, 0.5, 0, -1, -1 }, - { 0x0022, 1, 20, 0.5, 0, -1, -1 }, - { 0x001a, 0, 15, 0.5, 0, -1, -1 }, - { 0x001a, 1, 15, 0.5, 0, -1, -1 }, - { 0x0114, 1, -1, 0.5, 0, -1, -1 }, - { 0x0130, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 0, 20, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 1, 20, 0.5, 0, -1, -1 }, + { ANIM_DEATH_001A, 0, 15, 0.5, 0, -1, -1 }, + { ANIM_DEATH_001A, 1, 15, 0.5, 0, -1, -1 }, + { ANIM_0114, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0130, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsHumanGun[] = { - { 0x0022, 0, 20, 0.5, 0, -1, -1 }, - { 0x0022, 1, 20, 0.5, 0, -1, -1 }, - { 0x001a, 0, 15, 0.5, 0, -1, -1 }, - { 0x001a, 1, 15, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 0, 20, 0.5, 0, -1, -1 }, + { ANIM_DEATH_0022, 1, 20, 0.5, 0, -1, -1 }, + { ANIM_DEATH_001A, 0, 15, 0.5, 0, -1, -1 }, + { ANIM_DEATH_001A, 1, 15, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarLfoot[] = { - { 0x0337, 1, -1, 0.5, 0, -1, -1 }, - { 0x033c, 1, -1, 0.5, 0, -1, -1 }, - { 0x033b, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0337, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_033C, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_033B, 1, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarLshin[] = { - { 0x0337, 1, -1, 0.5, 0, -1, -1 }, - { 0x033c, 1, -1, 0.5, 0, -1, -1 }, - { 0x033b, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0337, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_033C, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_033B, 1, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarLthigh[] = { - { 0x0337, 1, -1, 0.5, 0, -1, -1 }, - { 0x033c, 1, -1, 0.5, 0, -1, -1 }, - { 0x033b, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0337, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_033C, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_033B, 1, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarRfoot[] = { - { 0x0337, 0, -1, 0.5, 0, -1, -1 }, - { 0x033c, 0, -1, 0.5, 0, -1, -1 }, - { 0x033b, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0337, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033C, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033B, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarRshin[] = { - { 0x0337, 0, -1, 0.5, 0, -1, -1 }, - { 0x033c, 0, -1, 0.5, 0, -1, -1 }, - { 0x033b, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0337, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033C, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033B, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarRthigh[] = { - { 0x0337, 0, -1, 0.5, 0, -1, -1 }, - { 0x033c, 0, -1, 0.5, 0, -1, -1 }, - { 0x033b, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0337, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033C, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033B, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarPelvis[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarHead[] = { - { 0x0339, 0, -1, 0.5, 0, -1, -1 }, - { 0x0338, 0, -1, 0.5, 0, -1, -1 }, - { 0x033a, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0339, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0338, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033A, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarLhand[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, - { 0x033d, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033D, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarLforearm[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, - { 0x033d, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033D, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarLbicep[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, - { 0x033d, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033D, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarRhand[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, - { 0x033d, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033D, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarRforearm[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, - { 0x033d, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033D, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarRbicep[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, - { 0x033d, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033D, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarTorso[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, - { 0x033d, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033D, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarGun[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, - { 0x033d, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033D, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_DeathAnimsSkedarTail[] = { - { 0x0336, 0, -1, 0.5, 0, -1, -1 }, - { 0x033d, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0336, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_033D, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarLfoot[] = { - { 0x038e, 0, -1, 1, 0, -1, -1 }, + { ANIM_038E, 0, -1, 1, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarLshin[] = { - { 0x0390, 0, -1, 0.9, 0, -1, -1 }, + { ANIM_0390, 0, -1, 0.9, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarLthigh[] = { - { 0x0390, 0, -1, 0.9, 0, -1, -1 }, + { ANIM_0390, 0, -1, 0.9, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarRfoot[] = { - { 0x038e, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_038E, 1, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarRshin[] = { - { 0x0390, 1, -1, 0.9, 0, -1, -1 }, + { ANIM_0390, 1, -1, 0.9, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarRthigh[] = { - { 0x0390, 1, -1, 0.9, 0, -1, -1 }, + { ANIM_0390, 1, -1, 0.9, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarPelvis[] = { - { 0x038c, 0, -1, 0.9, 0, -1, -1 }, - { 0x038c, 1, -1, 0.9, 0, -1, -1 }, - { 0x0341, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_038C, 0, -1, 0.9, 0, -1, -1 }, + { ANIM_038C, 1, -1, 0.9, 0, -1, -1 }, + { ANIM_0341, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarHead[] = { - { 0x0341, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0341, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarLhand[] = { - { 0x0343, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0343, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarLforearm[] = { - { 0x038b, 0, -1, 0.9, 0, -1, -1 }, + { ANIM_038B, 0, -1, 0.9, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarLbicep[] = { - { 0x038b, 0, -1, 0.9, 0, -1, -1 }, + { ANIM_038B, 0, -1, 0.9, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarRhand[] = { - { 0x0343, 1, -1, 0.5, 0, -1, -1 }, + { ANIM_0343, 1, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarRforearm[] = { - { 0x038b, 1, -1, 0.9, 0, -1, -1 }, + { ANIM_038B, 1, -1, 0.9, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarRbicep[] = { - { 0x038b, 1, -1, 0.9, 0, -1, -1 }, + { ANIM_038B, 1, -1, 0.9, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarTorso[] = { - { 0x038c, 0, -1, 0.9, 0, -1, -1 }, - { 0x038c, 1, -1, 0.9, 0, -1, -1 }, - { 0x0341, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_038C, 0, -1, 0.9, 0, -1, -1 }, + { ANIM_038C, 1, -1, 0.9, 0, -1, -1 }, + { ANIM_0341, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarGun[] = { - { 0x0343, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0343, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtablerow g_InjuryAnimsSkedarTail[] = { - { 0x0341, 0, -1, 0.5, 0, -1, -1 }, + { ANIM_0341, 0, -1, 0.5, 0, -1, -1 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; @@ -729,15 +729,15 @@ struct animtablerow g_SpecialDieAnims[] = { { ANIM_SPECIALDIE_ROLL2, 0, -1, 0.5, 0, 115, 152 }, { ANIM_SPECIALDIE_ROLL3, 0, -1, 0.5, 0, 115, 152 }, { ANIM_SPECIALDIE_OVERRAILING, 0, -1, 0.5, 0, 83, 99 }, - { 0x022b, 0, -1, 0.5, 0, 0, 0 }, - { 0x022c, 0, -1, 0.5, 0, 0, 0 }, - { 0x022d, 0, -1, 0.5, 0, 0, 0 }, - { 0x022e, 0, -1, 0.5, 0, 0, 0 }, + { ANIM_022B, 0, -1, 0.5, 0, 0, 0 }, + { ANIM_022C, 0, -1, 0.5, 0, 0, 0 }, + { ANIM_022D, 0, -1, 0.5, 0, 0, 0 }, + { ANIM_022E, 0, -1, 0.5, 0, 0, 0 }, { 0, 0, -1, 0.5, 0, -1, -1 }, }; struct animtable g_AnimTablesHuman[] = { - { 0, NULL, NULL, 0, 0 }, + { 0, NULL, NULL, 0, 0 }, { HITPART_LFOOT, g_DeathAnimsHumanLfoot, g_InjuryAnimsHumanLfoot, 0, 0 }, { HITPART_LSHIN, g_DeathAnimsHumanLshin, g_InjuryAnimsHumanLshin, 0, 0 }, { HITPART_LTHIGH, g_DeathAnimsHumanLthigh, g_InjuryAnimsHumanLthigh, 0, 0 }, @@ -755,11 +755,11 @@ struct animtable g_AnimTablesHuman[] = { { HITPART_TORSO, g_DeathAnimsHumanTorso, g_InjuryAnimsHumanTorso, 0, 0 }, { HITPART_GUN, g_DeathAnimsHumanGun, g_InjuryAnimsHumanGun, 0, 0 }, { HITPART_HAT, NULL, NULL, 0, 0 }, - { -1, NULL, NULL, 0, 0 }, + { -1, NULL, NULL, 0, 0 }, }; struct animtable g_AnimTablesSkedar[] = { - { 0, NULL, NULL, 0, 0 }, + { 0, NULL, NULL, 0, 0 }, { HITPART_LFOOT, g_DeathAnimsSkedarLfoot, g_InjuryAnimsSkedarLfoot, 0, 0 }, { HITPART_LSHIN, g_DeathAnimsSkedarLshin, g_InjuryAnimsSkedarLshin, 0, 0 }, { HITPART_LTHIGH, g_DeathAnimsSkedarLthigh, g_InjuryAnimsSkedarLthigh, 0, 0 }, @@ -778,7 +778,7 @@ struct animtable g_AnimTablesSkedar[] = { { HITPART_GUN, g_DeathAnimsSkedarGun, g_InjuryAnimsSkedarGun, 0, 0 }, { HITPART_HAT, g_DeathAnimsSkedarHead, g_InjuryAnimsSkedarHead, 0, 0 }, { HITPART_TAIL, g_DeathAnimsSkedarTail, g_InjuryAnimsSkedarTail, 0, 0 }, - { -1, NULL, NULL, 0, 0 }, + { -1, NULL, NULL, 0, 0 }, }; struct animtable g_AnimTablesDrCaroll[] = { @@ -817,31 +817,31 @@ struct yeetanim { }; struct yeetanim g_YeetAnimsHuman[] = { - /* 0*/ { 0x0082, 0, 0.5, 9, 29, -1 }, - /* 1*/ { 0x0082, 1, 0.5, 9, 29, -1 }, - /* 2*/ { 0x008a, 0, 0.5, 11, 31, -1 }, - /* 3*/ { 0x008a, 1, 0.5, 11, 31, -1 }, - /* 4*/ { 0x0089, 0, 0.5, 6, 27, -1 }, - /* 5*/ { 0x0089, 1, 0.5, 6, 27, -1 }, - /* 6*/ { 0x008c, 0, 0.5, 29, 48, -1 }, - /* 7*/ { 0x008c, 1, 0.5, 29, 48, -1 }, - /* 8*/ { 0x008d, 0, 0.5, 29, 49, -1 }, - /* 9*/ { 0x008d, 1, 0.5, 29, 49, -1 }, - /*10*/ { 0x008e, 0, 0.5, 19, 42, -1 }, - /*11*/ { 0x008e, 1, 0.5, 19, 42, -1 }, - /*12*/ { 0x0086, 0, 0.5, 0, 60, -1 }, - /*13*/ { 0x0086, 1, 0.5, 0, 60, -1 }, - /*14*/ { 0x0087, 0, 0.5, 6, 29, -1 }, - /*15*/ { 0x0087, 1, 0.5, 6, 29, -1 }, - /*16*/ { 0x0084, 0, 0.5, 8, 25, -1 }, - /*17*/ { 0x0084, 1, 0.5, 8, 25, -1 }, - /*18*/ { 0x0085, 0, 0.5, 8, 25, -1 }, - /*19*/ { 0x0085, 1, 0.5, 8, 25, -1 }, - /*20*/ { 0x0088, 0, 0.5, 12, 29, -1 }, - /*21*/ { 0x0088, 1, 0.5, 12, 29, -1 }, - /*22*/ { 0x008b, 0, 0.5, 22, 41, -1 }, - /*23*/ { 0x008b, 1, 0.5, 22, 41, -1 }, - /*24*/ { 0x0000, 0, 0.5, 0, 0, -1 }, + /* 0*/ { ANIM_0082, 0, 0.5, 9, 29, -1 }, + /* 1*/ { ANIM_0082, 1, 0.5, 9, 29, -1 }, + /* 2*/ { ANIM_008A, 0, 0.5, 11, 31, -1 }, + /* 3*/ { ANIM_008A, 1, 0.5, 11, 31, -1 }, + /* 4*/ { ANIM_0089, 0, 0.5, 6, 27, -1 }, + /* 5*/ { ANIM_0089, 1, 0.5, 6, 27, -1 }, + /* 6*/ { ANIM_008C, 0, 0.5, 29, 48, -1 }, + /* 7*/ { ANIM_008C, 1, 0.5, 29, 48, -1 }, + /* 8*/ { ANIM_008D, 0, 0.5, 29, 49, -1 }, + /* 9*/ { ANIM_008D, 1, 0.5, 29, 49, -1 }, + /*10*/ { ANIM_008E, 0, 0.5, 19, 42, -1 }, + /*11*/ { ANIM_008E, 1, 0.5, 19, 42, -1 }, + /*12*/ { ANIM_0086, 0, 0.5, 0, 60, -1 }, + /*13*/ { ANIM_0086, 1, 0.5, 0, 60, -1 }, + /*14*/ { ANIM_0087, 0, 0.5, 6, 29, -1 }, + /*15*/ { ANIM_0087, 1, 0.5, 6, 29, -1 }, + /*16*/ { ANIM_0084, 0, 0.5, 8, 25, -1 }, + /*17*/ { ANIM_0084, 1, 0.5, 8, 25, -1 }, + /*18*/ { ANIM_0085, 0, 0.5, 8, 25, -1 }, + /*19*/ { ANIM_0085, 1, 0.5, 8, 25, -1 }, + /*20*/ { ANIM_0088, 0, 0.5, 12, 29, -1 }, + /*21*/ { ANIM_0088, 1, 0.5, 12, 29, -1 }, + /*22*/ { ANIM_008B, 0, 0.5, 22, 41, -1 }, + /*23*/ { ANIM_008B, 1, 0.5, 22, 41, -1 }, + /*24*/ { 0, 0, 0.5, 0, 0, -1 }, }; s8 g_YeetAnimIndexesHumanAngle0[] = { 0, 1, 2, 3, 4, 5 }; @@ -854,15 +854,15 @@ s8 g_YeetAnimIndexesHumanAngle6[] = { 16, 22 }; s8 g_YeetAnimIndexesHumanAngle7[] = { 17, 23 }; struct yeetanim g_YeetAnimsSkedar[] = { - /* 0*/ { 0x033f, 0, 0.5, 0, -1, -1 }, - /* 1*/ { 0x033f, 0, 0.5, 0, -1, -1 }, - /* 2*/ { 0x033f, 0, 0.5, 0, -1, -1 }, - /* 3*/ { 0x033f, 0, 0.5, 0, -1, -1 }, - /* 4*/ { 0x033f, 0, 0.5, 0, -1, -1 }, - /* 5*/ { 0x033f, 0, 0.5, 0, -1, -1 }, - /* 6*/ { 0x033f, 0, 0.5, 0, -1, -1 }, - /* 7*/ { 0x033f, 0, 0.5, 0, -1, -1 }, - /* 8*/ { 0x0000, 0, 0.5, 0, 0, -1 }, + /* 0*/ { ANIM_033F, 0, 0.5, 0, -1, -1 }, + /* 1*/ { ANIM_033F, 0, 0.5, 0, -1, -1 }, + /* 2*/ { ANIM_033F, 0, 0.5, 0, -1, -1 }, + /* 3*/ { ANIM_033F, 0, 0.5, 0, -1, -1 }, + /* 4*/ { ANIM_033F, 0, 0.5, 0, -1, -1 }, + /* 5*/ { ANIM_033F, 0, 0.5, 0, -1, -1 }, + /* 6*/ { ANIM_033F, 0, 0.5, 0, -1, -1 }, + /* 7*/ { ANIM_033F, 0, 0.5, 0, -1, -1 }, + /* 8*/ { 0, 0, 0.5, 0, 0, -1 }, }; s8 g_YeetAnimIndexesSkedarAngle0[] = { 0 }; @@ -902,45 +902,45 @@ struct yeetanimindexlist g_YeetAnimIndexesByRaceAngle[][8] = { }; struct attackanimconfig var800656c0[] = { - { 0x0002, 28, 0, 0, 0, -1, 23, 54, -1, -1, 18, 54, 0.87252569198608, -0.52351540327072, 1.0470308065414, -0.34901028871536, 1.6000000238419, 1.7999999523163 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0002, 28, 0, 0, 0, -1, 23, 54, -1, -1, 18, 54, 0.87252569198608, -0.52351540327072, 1.0470308065414, -0.34901028871536, 1.6000000238419, 1.7999999523163 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80065750 = { var800656c0, 0xffffffff }; struct attackanimconfig var80065758[] = { - { 0x0032, 37, 0, 0, 0, -1, 30, 81, -1, -1, 25, 81, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 1.6000000238419, 1.75 }, - { 0x0003, 27, 0, 0, 0, -1, 22, 61, -1, -1, 17, 61, 0.87252569198608, -0.26175770163536, 0.69802057743073, -0.69802057743073, 2, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0032, 37, 0, 0, 0, -1, 30, 81, -1, -1, 25, 81, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 1.6000000238419, 1.75 }, + { ANIM_0003, 27, 0, 0, 0, -1, 22, 61, -1, -1, 17, 61, 0.87252569198608, -0.26175770163536, 0.69802057743073, -0.69802057743073, 2, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80065830 = { var80065758, 0xffffffff }; struct attackanimconfig var80065838[] = { - { 0x0032, 37, 0, 0, 0, -1, 30, 81, -1, -1, 25, 81, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 1.6000000238419, 1.75 }, - { 0x0003, 27, 0, 0, 0, -1, 22, 61, -1, -1, 17, 61, 0.87252569198608, -0.26175770163536, 0.69802057743073, -0.69802057743073, 2, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0032, 37, 0, 0, 0, -1, 30, 81, -1, -1, 25, 81, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 1.6000000238419, 1.75 }, + { ANIM_0003, 27, 0, 0, 0, -1, 22, 61, -1, -1, 17, 61, 0.87252569198608, -0.26175770163536, 0.69802057743073, -0.69802057743073, 2, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80065910 = { var80065838, 0xffffffff }; struct attackanimconfig var80065918[] = { - { 0x0004, 19, 0, 1.5707963705063, 0, -1, 19, 61, -1, -1, 14, 61, 0.87252569198608, -0.34901028871536, 0.43626284599304, -1.0470308065414, 2.5, 2.5 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0004, 19, 0, 1.5707963705063, 0, -1, 19, 61, -1, -1, 14, 61, 0.87252569198608, -0.34901028871536, 0.43626284599304, -1.0470308065414, 2.5, 2.5 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var800659a8 = { var80065918, 0xffffffff }; struct attackanimconfig var800659b0[] = { - { 0x0006, 27, 0, 0, 0, -1, 39, 74, -1, -1, 34, 74, 0.87252569198608, -0.69802057743073, 0.7852731347084, -0.69802057743073, 1.5, 1.5 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0006, 27, 0, 0, 0, -1, 39, 74, -1, -1, 34, 74, 0.87252569198608, -0.69802057743073, 0.7852731347084, -0.69802057743073, 1.5, 1.5 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80065a40 = { var800659b0, 0xffffffff }; struct attackanimconfig var80065a48[] = { - { 0x034a, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_034A, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80065ad8 = { var80065a48, 0xffffffff }; @@ -970,60 +970,60 @@ struct attackanimgroup *g_StandHeavyAttackAnims[][32] = { }; struct attackanimconfig var80065be0[] = { - { 0x0041, 26, 0, 0, 12, 140, 58, 92, 60, 79, 20, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, - { 0x0044, 0, 0, 0, 17, 100, 25, 87, 30, 55, 20, 93, 0.87252569198608, -0.69802057743073, 0.69802057743073, -1.0470308065414, 0, 0 }, - { 0x0045, 0, 0, 0, 12, 64, 19, 51, 24, 46, 14, 58, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, - { 0x0046, 22, 0, 0, 4, 69, 22, 49, 22, 33, 8, 58, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.7852731347084, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0041, 26, 0, 0, 12, 140, 58, 92, 60, 79, 20, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, + { ANIM_0044, 0, 0, 0, 17, 100, 25, 87, 30, 55, 20, 93, 0.87252569198608, -0.69802057743073, 0.69802057743073, -1.0470308065414, 0, 0 }, + { ANIM_0045, 0, 0, 0, 12, 64, 19, 51, 24, 46, 14, 58, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, + { ANIM_0046, 22, 0, 0, 4, 69, 22, 49, 22, 33, 8, 58, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.7852731347084, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80065d48 = { var80065be0, 0xffffffff }; struct attackanimconfig var80065d50[] = { - { 0x0041, 26, 0, 0, 12, 140, 58, 92, 60, 79, 20, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, - { 0x0046, 22, 0, 0, 4, 69, 22, 49, 22, 33, 8, 58, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.7852731347084, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0041, 26, 0, 0, 12, 140, 58, 92, 60, 79, 20, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, + { ANIM_0046, 22, 0, 0, 4, 69, 22, 49, 22, 33, 8, 58, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.7852731347084, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80065e28 = { var80065d50, 0xffffffff }; struct attackanimconfig var80065e30[] = { - { 0x0041, 26, 0, 0, 12, 140, 58, 92, 60, 79, 20, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, - { 0x0046, 22, 0, 0, 4, 69, 22, 49, 22, 33, 8, 58, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.7852731347084, 0, 0 }, - { 0x0049, 0, 0, 1.5707963705063, 7, 130, 45, 93, 56, 73, 26, 107, 0.87252569198608, -0.69802057743073, 0.34901028871536, -0.52351540327072, 0, 0 }, - { 0x004a, 15, 0, 1.5707963705063, 5, 76, 20, 31, 31, 38, 15, 49, 0.87252569198608, -0.69802057743073, 0.52351540327072, -1.0470308065414, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0041, 26, 0, 0, 12, 140, 58, 92, 60, 79, 20, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, + { ANIM_0046, 22, 0, 0, 4, 69, 22, 49, 22, 33, 8, 58, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.7852731347084, 0, 0 }, + { ANIM_0049, 0, 0, 1.5707963705063, 7, 130, 45, 93, 56, 73, 26, 107, 0.87252569198608, -0.69802057743073, 0.34901028871536, -0.52351540327072, 0, 0 }, + { ANIM_004A, 15, 0, 1.5707963705063, 5, 76, 20, 31, 31, 38, 15, 49, 0.87252569198608, -0.69802057743073, 0.52351540327072, -1.0470308065414, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80065f98 = { var80065e30, 0xffffffff }; struct attackanimconfig var80065fa0[] = { - { 0x0041, 26, 0, 0, 12, 140, 58, 92, 60, 79, 20, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, - { 0x0046, 22, 0, 0, 4, 69, 22, 49, 22, 33, 8, 58, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.7852731347084, 0, 0 }, - { 0x0047, 0, 0, 4.7123889923096, 7, 139, 54, 105, 61, 88, 26, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.61076802015305, 0, 0 }, - { 0x0048, 19, 0, 4.7123889923096, 4, 79, 21, 50, 26, 42, 10, 64, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.61076802015305, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0041, 26, 0, 0, 12, 140, 58, 92, 60, 79, 20, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, + { ANIM_0046, 22, 0, 0, 4, 69, 22, 49, 22, 33, 8, 58, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.7852731347084, 0, 0 }, + { ANIM_0047, 0, 0, 4.7123889923096, 7, 139, 54, 105, 61, 88, 26, 120, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.61076802015305, 0, 0 }, + { ANIM_0048, 19, 0, 4.7123889923096, 4, 79, 21, 50, 26, 42, 10, 64, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.61076802015305, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066108 = { var80065fa0, 0xffffffff }; struct attackanimconfig var80066110[] = { - { 0x004a, 19, 0, 1.5707963705063, 5, 76, 20, 31, 31, 38, 15, 49, 0.87252569198608, -0.69802057743073, 0.52351540327072, -1.0470308065414, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_004A, 19, 0, 1.5707963705063, 5, 76, 20, 31, 31, 38, 15, 49, 0.87252569198608, -0.69802057743073, 0.52351540327072, -1.0470308065414, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var800661a0 = { var80066110, 0xffffffff }; struct attackanimconfig var800661a8[] = { - { 0x0048, 19, 0, 4.7123889923096, 4, 79, 21, 50, 26, 42, 10, 64, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.61076802015305, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0048, 19, 0, 4.7123889923096, 4, 79, 21, 50, 26, 42, 10, 64, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.61076802015305, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066238 = { var800661a8, 0xffffffff }; struct attackanimconfig var80066240[] = { - { 0x034a, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_034A, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var800662d0 = { var80066240, 0xffffffff }; @@ -1054,31 +1054,31 @@ struct attackanimgroup *g_StandLightAttackAnims[][32] = { struct attackanimconfig var800663d8[] = { - { 0x007a, 26, 0, 0, 7, 92, 28, 68, -1, -1, 11, 73, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_007A, 26, 0, 0, 7, 92, 28, 68, -1, -1, 11, 73, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066468 = { var800663d8, 0xffffffff }; struct attackanimconfig var80066470[] = { - { 0x007b, 26, 0, 1.5707963705063, 9, 112, 38, 87, -1, -1, 19, 98, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, - { 0x007d, 25, 0, 1.5707963705063, 10, 112, 32, 86, -1, -1, 19, 97, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_007B, 26, 0, 1.5707963705063, 9, 112, 38, 87, -1, -1, 19, 98, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, + { ANIM_007D, 25, 0, 1.5707963705063, 10, 112, 32, 86, -1, -1, 19, 97, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066548 = { var80066470, 0xffffffff }; struct attackanimconfig var80066550[] = { - { 0x007c, 39, 0, 4.7123889923096, 22, 127, 44, 102, -1, -1, 28, 112, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, - { 0x007e, 39, 0, 4.7123889923096, 23, 130, 46, 100, -1, -1, 30, 110, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_007C, 39, 0, 4.7123889923096, 22, 127, 44, 102, -1, -1, 28, 112, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, + { ANIM_007E, 39, 0, 4.7123889923096, 23, 130, 46, 100, -1, -1, 30, 110, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066628 = { var80066550, 0xffffffff }; struct attackanimconfig var80066630[] = { - { 0x034a, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_034A, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var800666c0 = { var80066630, 0xffffffff }; @@ -1108,30 +1108,30 @@ struct attackanimgroup *g_StandDualAttackAnims[][32] = { }; struct attackanimconfig var800667c8[] = { - { 0x0007, 27, 0, 0, 0, -1, 35, 75, -1, -1, 31, 75, 0.87252569198608, -0.69802057743073, 0.90742671489716, -0.69802057743073, 1.5, 1.5 }, - { 0x0008, 24, 0, 0, 0, -1, 46, 98, -1, -1, 41, 98, 0.87252569198608, -0.52351540327072, 1.1342834234238, -0.69802057743073, 1.6000000238419, 1.6000000238419 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0007, 27, 0, 0, 0, -1, 35, 75, -1, -1, 31, 75, 0.87252569198608, -0.69802057743073, 0.90742671489716, -0.69802057743073, 1.5, 1.5 }, + { ANIM_KNEEL_TWO_HANDED_GUN, 24, 0, 0, 0, -1, 46, 98, -1, -1, 41, 98, 0.87252569198608, -0.52351540327072, 1.1342834234238, -0.69802057743073, 1.6000000238419, 1.6000000238419 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var800668a0 = { var800667c8, 0xffffffff }; struct attackanimconfig var800668a8[] = { - { 0x0009, 26, 0, 0, 0, -1, 34, 87, -1, -1, 29, 87, 0.87252569198608, -0.52351540327072, 0.69802057743073, -0.95977824926376, 1.6000000238419, 2 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0009, 26, 0, 0, 0, -1, 34, 87, -1, -1, 29, 87, 0.87252569198608, -0.52351540327072, 0.69802057743073, -0.95977824926376, 1.6000000238419, 2 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066938 = { var800668a8, 0xffffffff }; struct attackanimconfig var80066940[] = { - { 0x000a, 28, 0, 0, 0, -1, 36, 88, -1, -1, 31, 88, 0.87252569198608, -0.69802057743073, 0.87252569198608, -0.43626284599304, 1.6000000238419, 1.5 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_000A, 28, 0, 0, 0, -1, 36, 88, -1, -1, 31, 88, 0.87252569198608, -0.69802057743073, 0.87252569198608, -0.43626284599304, 1.6000000238419, 1.5 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var800669d0 = { var80066940, 0xffffffff }; struct attackanimconfig var800669d8[] = { - { 0x034a, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_034A, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066a68 = { var800669d8, 0xffffffff }; @@ -1159,33 +1159,33 @@ struct attackanimgroup *g_KneelHeavyAttackAnims[][32] = { }; struct attackanimconfig var80066b70[] = { - { 0x004b, 25, 0, 0, 12, 132, 55, 87, 67, 87, 26, 111, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, - { 0x004c, 26, 0, 0, 8, 89, 31, 63, 41, 51, 21, 80, 0.87252569198608, -0.69802057743073, 0.34901028871536, -1.1342834234238, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_KNEEL_SHOOT_RIGHT_HAND, 25, 0, 0, 12, 132, 55, 87, 67, 87, 26, 111, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, + { ANIM_004C, 26, 0, 0, 8, 89, 31, 63, 41, 51, 21, 80, 0.87252569198608, -0.69802057743073, 0.34901028871536, -1.1342834234238, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066c48 = { var80066b70, 0xffffffff }; struct attackanimconfig var80066c50[] = { - { 0x004f, 47, 0, 1.5707963705063, 7, 128, 33, 86, 47, 74, 23, 106, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.7852731347084, 0, 0 }, - { 0x0050, 18, 0, 1.5707963705063, 7, 78, 28, 52, 35, 45, 15, 66, 0.87252569198608, -0.087252572178841, 0.69802057743073, -0.7852731347084, 1.5, 1 }, - { 0x0051, 20, 0, 1.5707963705063, 13, 92, 37, 67, 42, 55, 25, 84, 0.87252569198608, -0.52351540327072, 0.34901028871536, -0.69802057743073, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_004F, 47, 0, 1.5707963705063, 7, 128, 33, 86, 47, 74, 23, 106, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.7852731347084, 0, 0 }, + { ANIM_0050, 18, 0, 1.5707963705063, 7, 78, 28, 52, 35, 45, 15, 66, 0.87252569198608, -0.087252572178841, 0.69802057743073, -0.7852731347084, 1.5, 1 }, + { ANIM_0051, 20, 0, 1.5707963705063, 13, 92, 37, 67, 42, 55, 25, 84, 0.87252569198608, -0.52351540327072, 0.34901028871536, -0.69802057743073, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066d70 = { var80066c50, 0xffffffff }; struct attackanimconfig var80066d78[] = { - { 0x004d, 28, 0, 4.7123889923096, 15, 124, 38, 97, 60, 84, 20, 106, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.87252569198608, 0, 0 }, - { 0x004e, 23, 0, 4.7123889923096, 0, 85, 32, 38, 38, 60, 14, 71, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.95977824926376, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_004D, 28, 0, 4.7123889923096, 15, 124, 38, 97, 60, 84, 20, 106, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.87252569198608, 0, 0 }, + { ANIM_004E, 23, 0, 4.7123889923096, 0, 85, 32, 38, 38, 60, 14, 71, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.95977824926376, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066e50 = { var80066d78, 0xffffffff }; struct attackanimconfig var80066e58[] = { - { 0x034a, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_034A, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80066ee8 = { var80066e58, 0xffffffff }; @@ -1213,32 +1213,32 @@ struct attackanimgroup *g_KneelLightAttackAnims[][32] = { }; struct attackanimconfig var80066ff0[] = { - { 0x0074, 22, 0, 0, 10, 111, 34, 87, -1, -1, 17, 104, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, - { 0x0077, 25, 0, 0, 9, 92, 33, 62, -1, -1, 18, 69, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0074, 22, 0, 0, 10, 111, 34, 87, -1, -1, 17, 104, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, + { ANIM_0077, 25, 0, 0, 9, 92, 33, 62, -1, -1, 18, 69, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var800670c8 = { var80066ff0, 0xffffffff }; struct attackanimconfig var800670d0[] = { - { 0x0075, 28, 0, 1.5707963705063, 15, 108, 34, 73, -1, -1, 17, 93, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, - { 0x0078, 19, 0, 1.5707963705063, 3, 95, 30, 64, -1, -1, 14, 71, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 1.5, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0075, 28, 0, 1.5707963705063, 15, 108, 34, 73, -1, -1, 17, 93, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, + { ANIM_0078, 19, 0, 1.5707963705063, 3, 95, 30, 64, -1, -1, 14, 71, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 1.5, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var800671a8 = { var800670d0, 0xffffffff }; struct attackanimconfig var800671b0[] = { - { 0x0076, 31, 0, 4.7123889923096, 14, 111, 40, 83, -1, -1, 21, 94, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, - { 0x0079, 26, 0, 4.7123889923096, 7, 89, 34, 60, -1, -1, 20, 68, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0076, 31, 0, 4.7123889923096, 14, 111, 40, 83, -1, -1, 21, 94, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, + { ANIM_0079, 26, 0, 4.7123889923096, 7, 89, 34, 60, -1, -1, 20, 68, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80067288 = { var800671b0, 0xffffffff }; struct attackanimconfig var80067290[] = { - { 0x034a, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_034A, 20, 0, 0, 0, -1, 25, 50, -1, -1, 10, 50, 0.34901028871536, -0.34901028871536, 0.52351540327072, -0.52351540327072, 1, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80067320 = { var80067290, 0xffffffff }; @@ -1266,50 +1266,50 @@ struct attackanimgroup *g_KneelDualAttackAnims[][32] = { }; struct attackanimconfig g_RollAttackAnims[] = { - { 0x000b, 76, 0, 0, 20, -1, 98, 161, -1, -1, 93, 161, 0.87252569198608, -0.52351540327072, 0.69802057743073, -0.69802057743073, 1.7000000476837, 2 }, - { 0x000c, 58, 0, 0, 10, -1, 77, 104, -1, -1, 72, 104, 0.87252569198608, -0.34901028871536, 0.61076802015305, -0.69802057743073, 1.5499999523163, 1.5 }, - { 0x000d, 61, 0, 0, 10, -1, 83, 128, -1, -1, 78, 128, 0.87252569198608, -0.52351540327072, 0.87252569198608, -0.52351540327072, 1.2000000476837, 1.2999999523163 }, - { 0x0027, 63, 0, 0, 10, -1, 73, 114, -1, -1, 68, 114, 0.87252569198608, -0.52351540327072, 0.61076802015305, -0.61076802015305, 1.6499999761581, 1.5 }, - { 0x000b, 76, 0, 0, 20, 76, 98, 161, -1, -1, 93, 161, 0.87252569198608, -0.52351540327072, 0.69802057743073, -0.69802057743073, 1.7000000476837, 2 }, - { 0x000c, 58, 0, 0, 10, 63, 77, 104, -1, -1, 72, 104, 0.87252569198608, -0.34901028871536, 0.61076802015305, -0.69802057743073, 1.5499999523163, 1.5 }, - { 0x000d, 61, 0, 0, 10, 56, 83, 128, -1, -1, 78, 128, 0.87252569198608, -0.52351540327072, 0.87252569198608, -0.52351540327072, 1.2000000476837, 1.2999999523163 }, - { 0x0027, 63, 0, 0, 10, 50, 73, 114, -1, -1, 68, 114, 0.87252569198608, -0.52351540327072, 0.61076802015305, -0.61076802015305, 1.6499999761581, 1.5 }, - { 0x0045, 0, 0, 0, 7, 64, 19, 51, 24, 46, 14, 58, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, - { 0x004a, 0, 0, 1.5707963705063, 14, 76, 26, 31, 31, 38, 15, 49, 0.87252569198608, -0.69802057743073, 0.52351540327072, -1.0470308065414, 0, 0 }, - { 0x004c, 26, 0, 0, 25, 89, 41, 63, 41, 51, 21, 80, 0.87252569198608, -0.69802057743073, 0.34901028871536, -1.1342834234238, 0, 0 }, - { 0x0050, 18, 0, 1.5707963705063, 11, 78, 33, 52, 35, 45, 15, 66, 0.87252569198608, -0.087252572178841, 0.69802057743073, -0.7852731347084, 1.5, 1 }, - { 0x007a, 26, 0, 0, 7, 92, 28, 68, -1, -1, 11, 73, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, - { 0x007b, 26, 0, 1.5707963705063, 9, 112, 38, 87, -1, -1, 19, 98, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, - { 0x0074, 22, 0, 0, 10, 11, 34, 87, -1, -1, 17, 104, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, - { 0x0075, 28, 0, 1.5707963705063, 15, 108, 34, 73, -1, -1, 17, 93, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, - { 0x007a, 26, 0, 0, 7, 92, 28, 68, -1, -1, 11, 73, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, - { 0x007d, 25, 0, 1.5707963705063, 10, 112, 32, 86, -1, -1, 19, 97, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, - { 0x0077, 25, 0, 0, 9, 92, 33, 62, -1, -1, 18, 69, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, - { 0x0078, 19, 0, 1.5707963705063, 3, 95, 30, 64, -1, -1, 14, 71, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 1.5, 1 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_000B, 76, 0, 0, 20, -1, 98, 161, -1, -1, 93, 161, 0.87252569198608, -0.52351540327072, 0.69802057743073, -0.69802057743073, 1.7000000476837, 2 }, + { ANIM_000C, 58, 0, 0, 10, -1, 77, 104, -1, -1, 72, 104, 0.87252569198608, -0.34901028871536, 0.61076802015305, -0.69802057743073, 1.5499999523163, 1.5 }, + { ANIM_000D, 61, 0, 0, 10, -1, 83, 128, -1, -1, 78, 128, 0.87252569198608, -0.52351540327072, 0.87252569198608, -0.52351540327072, 1.2000000476837, 1.2999999523163 }, + { ANIM_0027, 63, 0, 0, 10, -1, 73, 114, -1, -1, 68, 114, 0.87252569198608, -0.52351540327072, 0.61076802015305, -0.61076802015305, 1.6499999761581, 1.5 }, + { ANIM_000B, 76, 0, 0, 20, 76, 98, 161, -1, -1, 93, 161, 0.87252569198608, -0.52351540327072, 0.69802057743073, -0.69802057743073, 1.7000000476837, 2 }, + { ANIM_000C, 58, 0, 0, 10, 63, 77, 104, -1, -1, 72, 104, 0.87252569198608, -0.34901028871536, 0.61076802015305, -0.69802057743073, 1.5499999523163, 1.5 }, + { ANIM_000D, 61, 0, 0, 10, 56, 83, 128, -1, -1, 78, 128, 0.87252569198608, -0.52351540327072, 0.87252569198608, -0.52351540327072, 1.2000000476837, 1.2999999523163 }, + { ANIM_0027, 63, 0, 0, 10, 50, 73, 114, -1, -1, 68, 114, 0.87252569198608, -0.52351540327072, 0.61076802015305, -0.61076802015305, 1.6499999761581, 1.5 }, + { ANIM_0045, 0, 0, 0, 7, 64, 19, 51, 24, 46, 14, 58, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, + { ANIM_004A, 0, 0, 1.5707963705063, 14, 76, 26, 31, 31, 38, 15, 49, 0.87252569198608, -0.69802057743073, 0.52351540327072, -1.0470308065414, 0, 0 }, + { ANIM_004C, 26, 0, 0, 25, 89, 41, 63, 41, 51, 21, 80, 0.87252569198608, -0.69802057743073, 0.34901028871536, -1.1342834234238, 0, 0 }, + { ANIM_0050, 18, 0, 1.5707963705063, 11, 78, 33, 52, 35, 45, 15, 66, 0.87252569198608, -0.087252572178841, 0.69802057743073, -0.7852731347084, 1.5, 1 }, + { ANIM_007A, 26, 0, 0, 7, 92, 28, 68, -1, -1, 11, 73, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, + { ANIM_007B, 26, 0, 1.5707963705063, 9, 112, 38, 87, -1, -1, 19, 98, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, + { ANIM_0074, 22, 0, 0, 10, 11, 34, 87, -1, -1, 17, 104, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, + { ANIM_0075, 28, 0, 1.5707963705063, 15, 108, 34, 73, -1, -1, 17, 93, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 0, 0 }, + { ANIM_007A, 26, 0, 0, 7, 92, 28, 68, -1, -1, 11, 73, 0.87252569198608, -0.69802057743073, 0.69802057743073, -0.69802057743073, 0, 0 }, + { ANIM_007D, 25, 0, 1.5707963705063, 10, 112, 32, 86, -1, -1, 19, 97, 0.87252569198608, -0.69802057743073, 0.43626284599304, -0.43626284599304, 0, 0 }, + { ANIM_0077, 25, 0, 0, 9, 92, 33, 62, -1, -1, 18, 69, 0.87252569198608, -0.69802057743073, 0.61076802015305, -0.7852731347084, 0, 0 }, + { ANIM_0078, 19, 0, 1.5707963705063, 3, 95, 30, 64, -1, -1, 14, 71, 0.87252569198608, -0.69802057743073, 0.52351540327072, -0.7852731347084, 1.5, 1 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; -struct attackanimconfig g_AttackAnimHeavyWalk = { 0x0030, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 1.3999999761581, 1.2999999523163 }; -struct attackanimconfig g_AttackAnimHeavyRun = { 0x0031, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 1.1000000238419, 1.2000000476837 }; -struct attackanimconfig g_AttackAnimLightWalk = { 0x0052, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; -struct attackanimconfig g_AttackAnimLightRun = { 0x0055, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; -struct attackanimconfig g_AttackAnimDualWalk = { 0x006c, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; -struct attackanimconfig g_AttackAnimDualRun = { 0x006e, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; -struct attackanimconfig g_AttackAnimDualCrossedWalk = { 0x006d, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; -struct attackanimconfig g_AttackAnimDualCrossedRun = { 0x006f, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; +struct attackanimconfig g_AttackAnimHeavyWalk = { ANIM_0030, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 1.3999999761581, 1.2999999523163 }; +struct attackanimconfig g_AttackAnimHeavyRun = { ANIM_0031, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 1.1000000238419, 1.2000000476837 }; +struct attackanimconfig g_AttackAnimLightWalk = { ANIM_0052, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; +struct attackanimconfig g_AttackAnimLightRun = { ANIM_0055, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; +struct attackanimconfig g_AttackAnimDualWalk = { ANIM_006C, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; +struct attackanimconfig g_AttackAnimDualRun = { ANIM_006E, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; +struct attackanimconfig g_AttackAnimDualCrossedWalk = { ANIM_006D, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; +struct attackanimconfig g_AttackAnimDualCrossedRun = { ANIM_006F, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; struct attackanimconfig var80067c50[] = { - { 0x0057, 0, 0, 1.5707963705063, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, - { 0x0056, 0, 0, 4.7123889923096, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_0057, 0, 0, 1.5707963705063, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, + { ANIM_0056, 0, 0, 4.7123889923096, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; -struct attackanimconfig var80067d28[] = { 0x0269, 0, 0, 0, 0, 236, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; +struct attackanimconfig var80067d28[] = { ANIM_SNIPING_GETDOWN, 0, 0, 0, 0, 236, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }; struct attackanimconfig var80067d70[] = { - { 0x026a, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, - { 0x026b, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, - { 0x0000, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { ANIM_SNIPING_ONGROUND, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, + { ANIM_SNIPING_GETUP, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; struct attackanimgroup var80067e48 = { var80067d28, 0xffffffff }; @@ -1326,63 +1326,63 @@ s16 *g_TeamList = NULL; s16 *g_SquadronList = NULL; struct var80067e6c var80067e6c[] = { - { 0x0028, 0 }, - { 0x002a, 0 }, - { 0x0029, 0 }, - { 0x006b, 0 }, - { 0x0059, 0 }, - { 0x005a, 0 }, - { 0x0072, 0 }, - { 0x0073, 0 }, - { 0x005a, 0 }, - { 0x006c, 0 }, - { 0x0030, 0 }, - { 0x0031, 0 }, - { 0x0052, 0 }, - { 0x0055, 0 }, - { 0x006e, 0 }, - { 0x006f, 0 }, - { 0x0057, 0 }, - { 0x0056, 0 }, - { 0x006d, 0 }, - { 0x0059, 0 }, - { 0x020a, 0 }, - { 0x020d, 0 }, - { 0x01f9, 0 }, - { 0x01f8, 0 }, - { 0x021d, 0 }, - { 0x0016, 0 }, - { 0x0018, 0 }, - { 0x001b, 0 }, - { 0x001d, 0 }, - { 0x001e, 0 }, - { 0x005c, 0 }, - { 0x005d, 0 }, - { 0x005e, 0 }, - { 0x005f, 0 }, + { ANIM_0028, 0 }, + { ANIM_RUNNING_TWOHANDGUN, 0 }, + { ANIM_0029, 0 }, + { ANIM_006B, 0 }, + { ANIM_RUNNING_ONEHANDGUN, 0 }, + { ANIM_005A, 0 }, + { ANIM_0072, 0 }, + { ANIM_0073, 0 }, + { ANIM_005A, 0 }, + { ANIM_006C, 0 }, + { ANIM_0030, 0 }, + { ANIM_0031, 0 }, + { ANIM_0052, 0 }, + { ANIM_0055, 0 }, + { ANIM_006E, 0 }, + { ANIM_006F, 0 }, + { ANIM_0057, 0 }, + { ANIM_0056, 0 }, + { ANIM_006D, 0 }, + { ANIM_RUNNING_ONEHANDGUN, 0 }, + { ANIM_020A, 0 }, + { ANIM_020D, 0 }, + { ANIM_01F9, 0 }, + { ANIM_01F8, 0 }, + { ANIM_021D, 0 }, + { ANIM_0016, 0 }, + { ANIM_0018, 0 }, + { ANIM_001B, 0 }, + { ANIM_001D, 0 }, + { ANIM_001E, 0 }, + { ANIM_005C, 0 }, + { ANIM_005D, 0 }, + { ANIM_005E, 0 }, + { ANIM_005F, 0 }, { -1 }, }; struct var80067e6c var80067f84[] = { - { 0x0392, 0 }, - { 0x0393, 0 }, - { 0x0394, 0 }, + { ANIM_0392, 0 }, + { ANIM_0393, 0 }, + { ANIM_SKEDAR_RUNNING, 0 }, { -1 }, }; struct var80067e6c var80067fa4[] = { - { 0x015f, 0 }, - { 0x0160, 0 }, + { ANIM_015F, 0 }, + { ANIM_0160, 0 }, { -1 }, }; struct var80067e6c var80067fbc[] = { - { 0x015f, 0 }, + { ANIM_015F, 0 }, { -1 }, }; struct var80067e6c var80067fcc[] = { - { 0x0238, 0 }, + { ANIM_0238, 0 }, { -1 }, }; @@ -1394,12 +1394,11 @@ struct var80067e6c *var80067fdc[] = { var80067fcc, }; -// These are animation numbers -s16 var80067ff0[] = { 0x0001, 0x006a, -1 }; -s16 var80067ff8[] = { 0x00c0, -1 }; -s16 var80067ffc[] = { 0x013e, -1 }; -s16 var80068000[] = { 0x013e, -1 }; -s16 var80068004[] = { 0x0237, -1 }; +s16 var80067ff0[] = { ANIM_TWO_GUN_HOLD, ANIM_006A, -1 }; +s16 var80067ff8[] = { ANIM_00C0, -1 }; +s16 var80067ffc[] = { ANIM_013E, -1 }; +s16 var80068000[] = { ANIM_013E, -1 }; +s16 var80068004[] = { ANIM_0237, -1 }; s16 *var80068008[] = { var80067ff0, @@ -1434,7 +1433,7 @@ bool func0f02e064(struct chrdata *chr) { if (chr->aibot) { if (chr->actiontype == ACT_STAND - || (chr->actiontype == ACT_GOPOS && (chr->act_gopos.flags & 0x20))) { + || (chr->actiontype == ACT_GOPOS && (chr->act_gopos.flags & GOPOSFLAG_20))) { return true; } } else { @@ -1660,7 +1659,7 @@ void chrStandChooseAnimation(struct chrdata *chr, f32 mergetime) } if (race == RACE_EYESPY) { - modelSetAnimation(chr->model, 0x13e, 0, 0, 0, mergetime); + modelSetAnimation(chr->model, ANIM_013E, 0, 0, 0, mergetime); } else if (race == RACE_HUMAN) { if (prevanimnum == ANIM_SNIPING_GETDOWN || prevanimnum == ANIM_SNIPING_GETUP @@ -1669,19 +1668,19 @@ void chrStandChooseAnimation(struct chrdata *chr, f32 mergetime) } else if ((gun1 && gun2) || (!gun1 && !gun2) || weaponIsOneHanded(gun1) || weaponIsOneHanded(gun2)) { - modelSetAnimation(chr->model, 0x6a, random() % 2, 0, 0.25, mergetime); + modelSetAnimation(chr->model, ANIM_006A, random() % 2, 0, 0.25, mergetime); modelSetAnimLooping(chr->model, 0, 16); } else if (gun2 || gun1) { - modelSetAnimation(chr->model, 0x01, gun1 != NULL, 0, 0.25, mergetime); + modelSetAnimation(chr->model, ANIM_TWO_GUN_HOLD, gun1 != NULL, 0, 0.25, mergetime); modelSetAnimLooping(chr->model, 0, 16); modelSetAnimEndFrame(chr->model, 120); } } else if (race == RACE_SKEDAR) { - modelSetAnimation(chr->model, 0xc0, random() % 2, 0, 0.5, mergetime); + modelSetAnimation(chr->model, ANIM_00C0, random() % 2, 0, 0.5, mergetime); } else if (race == RACE_DRCAROLL) { - modelSetAnimation(chr->model, 0x13e, 0, 0, 0.5, mergetime); + modelSetAnimation(chr->model, ANIM_013E, 0, 0, 0.5, mergetime); } else if (race == RACE_ROBOT) { - modelSetAnimation(chr->model, 0x237, 0, 0, 0.5, mergetime); + modelSetAnimation(chr->model, ANIM_0237, 0, 0, 0.5, mergetime); } } @@ -1819,10 +1818,10 @@ void chrKneelChooseAnimation(struct chrdata *chr) || weaponIsOneHanded(gun1) || weaponIsOneHanded(gun2)) { bool flip = random() % 2; - modelSetAnimation(chr->model, 0x4b, flip, 0, chrGetRangedSpeed(chr, 0.5, 0.8), 16); + modelSetAnimation(chr->model, ANIM_KNEEL_SHOOT_RIGHT_HAND, flip, 0, chrGetRangedSpeed(chr, 0.5, 0.8), 16); modelSetAnimEndFrame(chr->model, 28); } else if (gun2 || gun1) { - modelSetAnimation(chr->model, 0x08, gun1 != NULL, 0, chrGetRangedSpeed(chr, 0.5, 0.8), 16); + modelSetAnimation(chr->model, ANIM_KNEEL_TWO_HANDED_GUN, gun1 != NULL, 0, chrGetRangedSpeed(chr, 0.5, 0.8), 16); modelSetAnimEndFrame(chr->model, 27); } } @@ -1854,7 +1853,7 @@ void chrStartAlarmChooseAnimation(struct chrdata *chr) flip = random() % 2; } - modelSetAnimation(chr->model, 0x3d, flip, 40, 1, 16); + modelSetAnimation(chr->model, ANIM_TALKING_003D, flip, 40, 1, 16); modelSetAnimEndFrame(chr->model, 82); } @@ -1878,19 +1877,19 @@ void chrThrowGrenadeChooseAnimation(struct chrdata *chr) if (chr->act_throwgrenade.needsequip) { if (rand % 3 == 0) { - modelSetAnimation(chr->model, 0x244, chr->act_throwgrenade.hand != 0, 0, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + modelSetAnimation(chr->model, ANIM_THROWGRENADE_CROUCHING, chr->act_throwgrenade.hand != 0, 0, chrGetRangedSpeed(chr, 0.5, 1.2), 16); } else if (rand % 3 == 1) { - modelSetAnimation(chr->model, 0x242, chr->act_throwgrenade.hand != 0, 0, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + modelSetAnimation(chr->model, ANIM_THROWGRENADE_NOPIN, chr->act_throwgrenade.hand != 0, 0, chrGetRangedSpeed(chr, 0.5, 1.2), 16); } else { - modelSetAnimation(chr->model, 0x3e, chr->act_throwgrenade.hand != 0, 0, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + modelSetAnimation(chr->model, ANIM_THROWGRENADE_STANDING, chr->act_throwgrenade.hand != 0, 0, chrGetRangedSpeed(chr, 0.5, 1.2), 16); } } else { if (rand % 3 == 0) { - modelSetAnimation(chr->model, 0x244, chr->act_throwgrenade.hand != 0, 5, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + modelSetAnimation(chr->model, ANIM_THROWGRENADE_CROUCHING, chr->act_throwgrenade.hand != 0, 5, chrGetRangedSpeed(chr, 0.5, 1.2), 16); } else if (rand % 3 == 1) { - modelSetAnimation(chr->model, 0x242, chr->act_throwgrenade.hand != 0, 6, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + modelSetAnimation(chr->model, ANIM_THROWGRENADE_NOPIN, chr->act_throwgrenade.hand != 0, 6, chrGetRangedSpeed(chr, 0.5, 1.2), 16); } else { - modelSetAnimation(chr->model, 0x3e, chr->act_throwgrenade.hand != 0, 84, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + modelSetAnimation(chr->model, ANIM_THROWGRENADE_STANDING, chr->act_throwgrenade.hand != 0, 84, chrGetRangedSpeed(chr, 0.5, 1.2), 16); } } @@ -1926,14 +1925,14 @@ void chrSurprisedChooseAnimation(struct chrdata *chr) flip = random() & 1; } - modelSetAnimation(chr->model, 0x3f, flip, 10, chrGetRangedSpeed(chr, 0.6f, 0.96000003f), 16); + modelSetAnimation(chr->model, ANIM_003F, flip, 10, chrGetRangedSpeed(chr, 0.6f, 0.96000003f), 16); modelSetAnimEndFrame(chr->model, 52); } else if (chr->act_surprised.type == 2) { modelSetAnimation(chr->model, ANIM_SURRENDER_002E, random() & 1, 0, chrGetRangedSpeed(chr, 0.35f, 0.56f), 16); modelSetAnimEndFrame(chr->model, 7); } else { u32 part = random() % 3; - modelSetAnimation(chr->model, 0x40, random() & 1, 17, 0.6f, 16); + modelSetAnimation(chr->model, ANIM_0040, random() & 1, 17, 0.6f, 16); if (part == 0) { modelSetAnimEndFrame(chr->model, chrGetRangedSpeed(chr, 38, 8)); @@ -2065,27 +2064,27 @@ void chrSidestepChooseAnimation(struct chrdata *chr) if (race == RACE_HUMAN) { if (allowflip == false) { if (chr->act_sidestep.side) { - modelSetAnimation(chr->model, 0x68, true, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); + modelSetAnimation(chr->model, ANIM_0068, true, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); modelSetAnimEndFrame(chr->model, 36); } else { - modelSetAnimation(chr->model, 0x68, false, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); + modelSetAnimation(chr->model, ANIM_0068, false, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); modelSetAnimEndFrame(chr->model, 36); } } else { if ((chr->act_sidestep.side && !flip) || (chr->act_sidestep.side == 0 && flip)) { - modelSetAnimation(chr->model, 0x3b, flip, 5, chrGetRangedSpeed(chr, 0.7, 1.12), 16); + modelSetAnimation(chr->model, ANIM_003B, flip, 5, chrGetRangedSpeed(chr, 0.7, 1.12), 16); modelSetAnimEndFrame(chr->model, 34); } else { - modelSetAnimation(chr->model, 0x3a, flip, 5, chrGetRangedSpeed(chr, 0.7, 1.12), 16); + modelSetAnimation(chr->model, ANIM_003A, flip, 5, chrGetRangedSpeed(chr, 0.7, 1.12), 16); modelSetAnimEndFrame(chr->model, 32); } } } else if (race == RACE_SKEDAR) { if (chr->act_sidestep.side) { - modelSetAnimation(chr->model, 0x328, false, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); + modelSetAnimation(chr->model, ANIM_0328, false, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); modelSetAnimEndFrame(chr->model, 27); } else { - modelSetAnimation(chr->model, 0x328, true, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); + modelSetAnimation(chr->model, ANIM_0328, true, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); modelSetAnimEndFrame(chr->model, 27); } } @@ -2120,10 +2119,10 @@ void chrJumpOutChooseAnimation(struct chrdata *chr) } if ((chr->act_jumpout.side && !flip) || (chr->act_jumpout.side == 0 && flip)) { - modelSetAnimation(chr->model, 0x68, true, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); + modelSetAnimation(chr->model, ANIM_0068, true, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); modelSetAnimEndFrame(chr->model, 36); } else { - modelSetAnimation(chr->model, 0x68, false, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); + modelSetAnimation(chr->model, ANIM_0068, false, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); modelSetAnimEndFrame(chr->model, 36); } } @@ -2173,7 +2172,7 @@ void chrRunPosChooseAnimation(struct chrdata *chr) #else chr->act_runpos.eta60 = 1.0f / (func0f02dff0(0x2a) * mult) * distance; #endif - modelSetAnimation(chr->model, 0x2a, flip, 0, mult, 16); + modelSetAnimation(chr->model, ANIM_RUNNING_TWOHANDGUN, flip, 0, mult, 16); } else { f32 mult = 0.5; #if PAL @@ -2181,7 +2180,7 @@ void chrRunPosChooseAnimation(struct chrdata *chr) #else chr->act_runpos.eta60 = 1.0f / (func0f02dff0(0x59) * mult) * distance; #endif - modelSetAnimation(chr->model, 0x59, flip, 0, mult, 16); + modelSetAnimation(chr->model, ANIM_RUNNING_ONEHANDGUN, flip, 0, mult, 16); } } else if (race == RACE_SKEDAR) { f32 mult = 0.5; @@ -2190,7 +2189,7 @@ void chrRunPosChooseAnimation(struct chrdata *chr) #else chr->act_runpos.eta60 = 1.0f / (func0f02dff0(0x394) * mult) * distance; #endif - modelSetAnimation(chr->model, 0x394, flip, 0, mult, 16); + modelSetAnimation(chr->model, ANIM_SKEDAR_RUNNING, flip, 0, mult, 16); } } @@ -3187,7 +3186,7 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit chr->soundtimer = 0; chr->voicebox = VOICEBOX_MALE1; - modelSetAnimation(chr->model, 0x164, false, 0, 0.5f, 16); + modelSetAnimation(chr->model, ANIM_0164, false, 0, 0.5f, 16); } return; @@ -3468,7 +3467,7 @@ void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart) chr->sleep = 0; - modelSetAnimation(chr->model, 0x163, false, 0, 0.5f, 16); + modelSetAnimation(chr->model, ANIM_0163, false, 0, 0.5f, 16); chr->drcarollimage_left = DRCAROLLIMAGE_X; chr->drcarollimage_right = DRCAROLLIMAGE_X; @@ -6252,11 +6251,11 @@ void chrGoPosChooseAnimation(struct chrdata *chr) if (race == RACE_SKEDAR) { if (gospeed == SPEED_RUN) { - anim = 0x394; + anim = ANIM_SKEDAR_RUNNING; } else if (gospeed == SPEED_JOG) { - anim = 0x393; + anim = ANIM_0393; } else if (gospeed == SPEED_WALK) { - anim = 0x392; + anim = ANIM_0392; } } else { if (heavy) { @@ -6268,7 +6267,7 @@ void chrGoPosChooseAnimation(struct chrdata *chr) || chr->hitpart == HITPART_RFOOT || chr->hitpart == HITPART_RSHIN || chr->hitpart == HITPART_RTHIGH) { - anim = 0x20a; + anim = ANIM_020A; speed = 0.4; } else if (chr->hitpart == HITPART_LHAND || chr->hitpart == HITPART_LFOREARM @@ -6276,10 +6275,10 @@ void chrGoPosChooseAnimation(struct chrdata *chr) || chr->hitpart == HITPART_RHAND || chr->hitpart == HITPART_RFOREARM || chr->hitpart == HITPART_RBICEP) { - anim = 0x20d; + anim = ANIM_020D; speed = 0.4; } else { - anim = 0x29; + anim = ANIM_0029; speed = 0.25; } @@ -6298,16 +6297,16 @@ void chrGoPosChooseAnimation(struct chrdata *chr) || chr->hitpart == HITPART_RFOOT || chr->hitpart == HITPART_RSHIN || chr->hitpart == HITPART_RTHIGH) { - anim = 0x1f9; + anim = ANIM_01F9; } else if (chr->hitpart == HITPART_LHAND || chr->hitpart == HITPART_LFOREARM || chr->hitpart == HITPART_LBICEP || chr->hitpart == HITPART_RHAND || chr->hitpart == HITPART_RFOREARM || chr->hitpart == HITPART_RBICEP) { - anim = 0x1f8; + anim = ANIM_01F8; } else { - anim = 0x2a; + anim = ANIM_RUNNING_TWOHANDGUN; } } else { // Human, heavy weapon, walking @@ -6317,19 +6316,19 @@ void chrGoPosChooseAnimation(struct chrdata *chr) || chr->hitpart == HITPART_RFOOT || chr->hitpart == HITPART_RSHIN || chr->hitpart == HITPART_RTHIGH) { - anim = 0x1f9; + anim = ANIM_01F9; } else if (chr->hitpart == HITPART_LHAND || chr->hitpart == HITPART_LFOREARM || chr->hitpart == HITPART_LBICEP || chr->hitpart == HITPART_RHAND || chr->hitpart == HITPART_RFOREARM || chr->hitpart == HITPART_RBICEP) { - anim = 0x1f8; + anim = ANIM_01F8; } else { if (random() % 2) { - anim = 0x18; + anim = ANIM_0018; } else { - anim = 0x28; + anim = ANIM_0028; } } } @@ -6339,41 +6338,41 @@ void chrGoPosChooseAnimation(struct chrdata *chr) if (chr->hitpart == HITPART_LFOOT || chr->hitpart == HITPART_LSHIN || chr->hitpart == HITPART_LTHIGH) { - anim = 0x20a; + anim = ANIM_020A; flip = true; speed = 0.4; } else if (chr->hitpart == HITPART_RFOOT || chr->hitpart == HITPART_RSHIN || chr->hitpart == HITPART_RTHIGH) { - anim = 0x20a; + anim = ANIM_020A; speed = 0.4; flip = false; } else if (chr->hitpart == HITPART_LHAND || chr->hitpart == HITPART_LFOREARM || chr->hitpart == HITPART_LBICEP) { - anim = 0x20d; + anim = ANIM_020D; speed = 0.4; flip = true; } else if (chr->hitpart == HITPART_RHAND || chr->hitpart == HITPART_RFOREARM || chr->hitpart == HITPART_RBICEP) { - anim = 0x20d; + anim = ANIM_020D; speed = 0.4; flip = false; } else if (male) { if (random() % 4 == 0) { speed = 0.25; - anim = 0x1e; + anim = ANIM_001E; } else { speed = 0.25; - anim = 0x5a; + anim = ANIM_005A; sp60 = 24; } } else { if (random() % 2) { - anim = 0x5e; + anim = ANIM_005E; } else { - anim = 0x5a; + anim = ANIM_005A; } speed = 0.25; @@ -6391,73 +6390,73 @@ void chrGoPosChooseAnimation(struct chrdata *chr) if (chr->hitpart == HITPART_LFOOT || chr->hitpart == HITPART_LSHIN || chr->hitpart == HITPART_LTHIGH) { - anim = 0x1f9; + anim = ANIM_01F9; flip = false; } else if (chr->hitpart == HITPART_RFOOT || chr->hitpart == HITPART_RSHIN || chr->hitpart == HITPART_RTHIGH) { - anim = 0x1f9; + anim = ANIM_01F9; flip = true; } else if (chr->hitpart == HITPART_LHAND || chr->hitpart == HITPART_LFOREARM || chr->hitpart == HITPART_LBICEP) { - anim = 0x1f8; + anim = ANIM_01F8; flip = false; } else if (chr->hitpart == HITPART_RHAND || chr->hitpart == HITPART_RFOREARM || chr->hitpart == HITPART_RBICEP) { - anim = 0x1f8; + anim = ANIM_01F8; flip = true; } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO) { - anim = 0x5f; + anim = ANIM_005F; } else if (male) { if (random() % 2) { - anim = 0x1d; + anim = ANIM_001D; } else { - anim = 0x59; + anim = ANIM_RUNNING_ONEHANDGUN; } } else { if (chr->myaction != MA_PANIC) { if (random() % 2) { - anim = 0x5d; + anim = ANIM_005D; } else { - anim = 0x73; + anim = ANIM_0073; } } else { - anim = 0x21d; + anim = ANIM_021D; } } } else { // Human, light weapon, walking - s32 anims[] = {0x6b, 0x1b, 0x16}; + s32 anims[] = {ANIM_006B, ANIM_001B, ANIM_0016}; if (chr->hitpart == HITPART_LFOOT || chr->hitpart == HITPART_LSHIN || chr->hitpart == HITPART_LTHIGH) { - anim = 0x1f9; + anim = ANIM_01F9; flip = false; } else if (chr->hitpart == HITPART_RFOOT || chr->hitpart == HITPART_RSHIN || chr->hitpart == HITPART_RTHIGH) { - anim = 0x1f9; + anim = ANIM_01F9; flip = true; } else if (chr->hitpart == HITPART_LHAND || chr->hitpart == HITPART_LFOREARM || chr->hitpart == HITPART_LBICEP) { - anim = 0x1f8; + anim = ANIM_01F8; flip = false; } else if (chr->hitpart == HITPART_RHAND || chr->hitpart == HITPART_RFOREARM || chr->hitpart == HITPART_RBICEP) { - anim = 0x1f8; + anim = ANIM_01F8; flip = true; } else if (male) { anim = anims[random() % 3]; } else { if (random() % 2) { - anim = 0x5c; + anim = ANIM_005C; } else { - anim = 0x72; + anim = ANIM_0072; } } } @@ -6465,14 +6464,14 @@ void chrGoPosChooseAnimation(struct chrdata *chr) } } else if (race == RACE_DRCAROLL) { if (gospeed == SPEED_RUN) { - anim = 0x160; + anim = ANIM_0160; } else if (gospeed == SPEED_WALK) { - anim = 0x15f; + anim = ANIM_015F; } else { - anim = 0x15f; + anim = ANIM_015F; } } else if (race == RACE_ROBOT) { - anim = 0x238; + anim = ANIM_0238; } if (anim >= 0) { @@ -6631,23 +6630,23 @@ void chrPatrolChooseAnimation(struct chrdata *chr) } if (race == RACE_SKEDAR) { - modelSetAnimation(chr->model, 0x392, flip, 0, 0.25f, 16); + modelSetAnimation(chr->model, ANIM_0392, flip, 0, 0.25f, 16); } else { speed = 0.5f * func0f02dff0(0x28) / func0f02dff0(0x6b); if (heavy) { - modelSetAnimation(chr->model, random() % 2 ? 0x18 : 0x28, flip, 0, speed, 16); + modelSetAnimation(chr->model, random() % 2 ? ANIM_0018 : ANIM_0028, flip, 0, speed, 16); } else if (ismale) { - s32 anims[] = { 0x6b, 0x1b, 0x16 }; + s32 anims[] = { ANIM_006B, ANIM_001B, ANIM_0016 }; modelSetAnimation(chr->model, anims[random() % 3], flip, 0, speed, 16); } else { - modelSetAnimation(chr->model, random() % 2 ? 0x5c : 0x72, flip, 0, speed, 16); + modelSetAnimation(chr->model, random() % 2 ? ANIM_005C : ANIM_0072, flip, 0, speed, 16); } } } else if (race == RACE_DRCAROLL) { - modelSetAnimation(chr->model, 0x15f, false, 0, 0.5f, 16); + modelSetAnimation(chr->model, ANIM_015F, false, 0, 0.5f, 16); } else if (race == RACE_ROBOT) { - modelSetAnimation(chr->model, 0x238, false, 0, 0.5f, 16); + modelSetAnimation(chr->model, ANIM_0238, false, 0, 0.5f, 16); } } @@ -10195,9 +10194,9 @@ void chrTickSurprised(struct chrdata *chr) struct model *model = chr->model; if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { - if (modelGetAnimNum(model) == 0x2e) { + if (modelGetAnimNum(model) == ANIM_SURRENDER_002E) { func0f02ed28(chr, 26); - } else if (modelGetAnimNum(model) == 0x3f) { + } else if (modelGetAnimNum(model) == ANIM_003F) { func0f02ed28(chr, 26); } else { chrStop(chr); @@ -28662,10 +28661,10 @@ bool chrIsAvoiding(struct chrdata *chr) // Possible @bug or just sloppy code: The flag check below can never pass // because that flag was just turned off above. - if (anim == 0x64 - || anim == 0x65 - || anim == 0x66 - || anim == 0x67 + if (anim == ANIM_0064 + || anim == ANIM_0065 + || anim == ANIM_0066 + || anim == ANIM_0067 || (chr->chrflags & CHRCFLAG_10000000)) { return true; } diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 7f27a9d95..fd1c3fd66 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -11525,26 +11525,26 @@ bool aiDoPresetAnimation(void) u8 *cmd = g_Vars.ailist + g_Vars.aioffset; // These all appear to be talking animations - u16 anims[15] = { - /* 0*/ 0x0296, - /* 1*/ 0x0297, - /* 2*/ 0x0298, - /* 3*/ 0x028a, // when value is 3 (1/2 chance) - /* 4*/ 0x028c, // when value is 3 (1/2 chance) - /* 5*/ 0x0290, - /* 6*/ 0x0291, - /* 7*/ 0x00a3, // when value is 255 (1/8 chance) - /* 8*/ 0x028e, // when value is 255 (1/8 chance) - /* 9*/ 0x028f, // when value is 255 (1/8 chance) - /*10*/ 0x0231, // when value is 255 (1/8 chance) - /*11*/ 0x0232, // when value is 255 (1/8 chance) - /*12*/ 0x0233, // when value is 255 (1/8 chance) - /*13*/ 0x0234, // when value is 255 (1/8 chance) - /*14*/ 0x028d, // when value is 255 (1/8 chance) + u16 anims[] = { + /* 0*/ ANIM_0296, + /* 1*/ ANIM_0297, + /* 2*/ ANIM_0298, + /* 3*/ ANIM_028A, // when value is 3 (1/2 chance) + /* 4*/ ANIM_028C, // when value is 3 (1/2 chance) + /* 5*/ ANIM_0290, + /* 6*/ ANIM_0291, + /* 7*/ ANIM_TALKING_00A3, // when value is 255 (1/8 chance) + /* 8*/ ANIM_028E, // when value is 255 (1/8 chance) + /* 9*/ ANIM_028F, // when value is 255 (1/8 chance) + /*10*/ ANIM_TALKING_0231, // when value is 255 (1/8 chance) + /*11*/ ANIM_TALKING_0232, // when value is 255 (1/8 chance) + /*12*/ ANIM_TALKING_0233, // when value is 255 (1/8 chance) + /*13*/ ANIM_TALKING_0234, // when value is 255 (1/8 chance) + /*14*/ ANIM_028D, // when value is 255 (1/8 chance) }; if (cmd[2] == 255) { - chrTryStartAnim(g_Vars.chrdata, anims[7 + (random() & 7)], 0, -1, 0, 15, 0.5); + chrTryStartAnim(g_Vars.chrdata, anims[7 + (random() % 8)], 0, -1, 0, 15, 0.5); } else if (cmd[2] == 254) { struct prop *prop0 = chrGetEquippedWeaponProp(g_Vars.chrdata, 1); struct prop *prop1 = chrGetEquippedWeaponProp(g_Vars.chrdata, 0); diff --git a/src/game/data/ailists.c b/src/game/data/ailists.c index 35993b15a..722bbc0da 100644 --- a/src/game/data/ailists.c +++ b/src/game/data/ailists.c @@ -95,7 +95,7 @@ u8 func0006_unalerted[] = { dprint 'N','O','G','U','N','2','\n',0, dprint 'A','N','I','M',' ','O','B','J','E','C','T',' ','N','O','W','\n',0, set_chr_maxdamage(CHR_SELF, 40) - object_do_animation(0x025a, 0xff, 0x02, 0xffff) + object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) chr_do_animation(ANIM_STAND_UP_FROM_SITTING, 0, -1, CHRANIMFLAG_MOVEWHENINVIS, 16, CHR_SELF, 2) unset_self_flag_bankx(CHRFLAG1_DOINGIDLEANIMATION, BANK_1) set_chr_special_death_animation(CHR_SELF, SPECIALDIE_NONE) @@ -821,12 +821,12 @@ u8 func0008_wakeup[] = { label(0x15) set_chr_maxdamage(CHR_SELF, 40) chr_do_animation(ANIM_STAND_UP_FROM_SITTING, 0, -1, CHRANIMFLAG_MOVEWHENINVIS, 16, CHR_SELF, 2) - object_do_animation(0x025a, 0xff, 0x02, 0xffff) + object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) goto_next(0x0c) // Unreachable - nothing jumps here label(0x16) - object_do_animation(0x027b, 0xff, 0x02, 0xffff) + object_do_animation(ANIM_027B, 0xff, 0x02, 0xffff) // Wait for stand up animation to finish label(0x0c) @@ -2710,7 +2710,7 @@ u8 func000a_do_idle_animation[] = { // Stand up label(0x13) chr_do_animation(ANIM_STAND_UP_FROM_SITTING, 0, -1, CHRANIMFLAG_MOVEWHENINVIS, 16, CHR_SELF, 2) - object_do_animation(0x025a, 0xff, 0x02, 0xffff) + object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) beginloop(0x06) if_chr_stopped(/*goto*/ 0x13) @@ -2822,7 +2822,7 @@ u8 func000d_init_combat[] = { label(0x05) set_chr_maxdamage(CHR_SELF, 40) chr_do_animation(ANIM_STAND_UP_FROM_SITTING, 0, -1, CHRANIMFLAG_MOVEWHENINVIS, 16, CHR_SELF, 2) - object_do_animation(0x025a, 0xff, 0x02, 0xffff) + object_do_animation(ANIM_025A, 0xff, 0x02, 0xffff) beginloop(0x0c) if_chr_stopped(/*goto*/ 0x13) diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index 2bb487bd4..64ed6e0c5 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -30,67 +30,67 @@ struct footstepframe { }; struct footstepframe g_FootstepFrames[] = { - { 0x002b, 0x08, 0x19 }, - { 0x0029, 0x05, 0x0e }, - { 0x006b, 0x08, 0x19 }, - { 0x0028, 0x1b, 0x08 }, - { 0x002a, 0x12, 0x06 }, - { 0x0052, 0x08, 0x19 }, - { 0x0053, 0x19, 0x08 }, - { 0x0054, 0x19, 0x08 }, - { 0x0055, 0x07, 0x12 }, - { 0x0056, 0x07, 0x12 }, - { 0x0057, 0x12, 0x07 }, - { 0x0058, 0x0f, 0x05 }, - { 0x0059, 0x08, 0x14 }, - { 0x005a, 0x06, 0x0f }, - { 0x006c, 0x19, 0x08 }, - { 0x006d, 0x19, 0x08 }, - { 0x006e, 0x08, 0x13 }, - { 0x006f, 0x15, 0x08 }, - { 0x0070, 0x0f, 0x05 }, - { 0x0071, 0x0f, 0x05 }, - { 0x0072, 0x17, 0x08 }, - { 0x0073, 0x08, 0x13 }, - { 0x0093, 0x17, 0x0a }, - { 0x0094, 0x0f, 0x05 }, - { 0x005f, 0x0e, 0x01 }, - { 0x0016, 0x1d, 0x0a }, - { 0x0018, 0x18, 0x2e }, - { 0x001b, 0x0a, 0x1c }, - { 0x001d, 0x0d, 0x02 }, - { 0x001e, 0x0c, 0x01 }, - { 0x005c, 0x13, 0x2a }, - { 0x005d, 0x0f, 0x05 }, - { 0x005e, 0x04, 0x0c }, - { 0x0392, 0x05, 0x14 }, - { 0x0394, 0x00, 0x00 }, + { ANIM_002B, 0x08, 0x19 }, + { ANIM_0029, 0x05, 0x0e }, + { ANIM_006B, 0x08, 0x19 }, + { ANIM_0028, 0x1b, 0x08 }, + { ANIM_RUNNING_TWOHANDGUN, 0x12, 0x06 }, + { ANIM_0052, 0x08, 0x19 }, + { ANIM_0053, 0x19, 0x08 }, + { ANIM_0054, 0x19, 0x08 }, + { ANIM_0055, 0x07, 0x12 }, + { ANIM_0056, 0x07, 0x12 }, + { ANIM_0057, 0x12, 0x07 }, + { ANIM_0058, 0x0f, 0x05 }, + { ANIM_RUNNING_ONEHANDGUN, 0x08, 0x14 }, + { ANIM_005A, 0x06, 0x0f }, + { ANIM_006C, 0x19, 0x08 }, + { ANIM_006D, 0x19, 0x08 }, + { ANIM_006E, 0x08, 0x13 }, + { ANIM_006F, 0x15, 0x08 }, + { ANIM_0070, 0x0f, 0x05 }, + { ANIM_0071, 0x0f, 0x05 }, + { ANIM_0072, 0x17, 0x08 }, + { ANIM_0073, 0x08, 0x13 }, + { ANIM_0093, 0x17, 0x0a }, + { ANIM_0094, 0x0f, 0x05 }, + { ANIM_005F, 0x0e, 0x01 }, + { ANIM_0016, 0x1d, 0x0a }, + { ANIM_0018, 0x18, 0x2e }, + { ANIM_001B, 0x0a, 0x1c }, + { ANIM_001D, 0x0d, 0x02 }, + { ANIM_001E, 0x0c, 0x01 }, + { ANIM_005C, 0x13, 0x2a }, + { ANIM_005D, 0x0f, 0x05 }, + { ANIM_005E, 0x04, 0x0c }, + { ANIM_0392, 0x05, 0x14 }, + { ANIM_SKEDAR_RUNNING, 0x00, 0x00 }, }; -bool func0f005fd0(s32 arg0) +bool func0f005fd0(s32 animnum) { - switch (arg0) { - case 29: - case 30: - case 41: - case 42: - case 85: - case 86: - case 87: - case 88: - case 89: - case 90: - case 93: - case 94: - case 95: - case 110: - case 111: - case 112: - case 113: - case 115: - case 147: - case 148: - case 916: + switch (animnum) { + case ANIM_001D: + case ANIM_001E: + case ANIM_0029: + case ANIM_RUNNING_TWOHANDGUN: + case ANIM_0055: + case ANIM_0056: + case ANIM_0057: + case ANIM_0058: + case ANIM_RUNNING_ONEHANDGUN: + case ANIM_005A: + case ANIM_005D: + case ANIM_005E: + case ANIM_005F: + case ANIM_006E: + case ANIM_006F: + case ANIM_0070: + case ANIM_0071: + case ANIM_0073: + case ANIM_0093: + case ANIM_0094: + case ANIM_SKEDAR_RUNNING: return true; } @@ -871,7 +871,7 @@ glabel func0f0061dc // // for (i = 0; i < ARRAYCOUNT(g_FootstepFrames); i++) { // if (modelGetAnimNum(chr->model) == g_FootstepFrames[i].animnum) { -// if (CHRRACE(chr) == RACE_SKEDAR && g_FootstepFrames[i].animnum == 0x394) { +// if (CHRRACE(chr) == RACE_SKEDAR && g_FootstepFrames[i].animnum == ANIM_SKEDAR_RUNNING) { // if ((frame >= 2 && prevframe < 2) || (frame >= 17 && prevframe < 17)) { // chr->footstep = 1; // } else if ((frame >= 10 && prevframe < 10) || (frame >= 25 && prevframe < 25)) { diff --git a/src/game/inventory/items.c b/src/game/inventory/items.c index 2ccf40655..68ad1055b 100644 --- a/src/game/inventory/items.c +++ b/src/game/inventory/items.c @@ -193,25 +193,25 @@ struct weapon invitem_nothing = { }; struct guncmd invanim_punch_type3[] = { - gunscript_playanimation(0x03e9, 0, 10000) + gunscript_playanimation(ANIM_03E9, 0, 10000) gunscript_waittime(7, 2) gunscript_end }; struct guncmd invanim_punch_type1[] = { - gunscript_playanimation(0x03ea, 0, 10000) + gunscript_playanimation(ANIM_03EA, 0, 10000) gunscript_waittime(8, 2) gunscript_end }; struct guncmd invanim_punch_type2[] = { - gunscript_playanimation(0x041f, 0, 10000) + gunscript_playanimation(ANIM_041F, 0, 10000) gunscript_waittime(7, 2) gunscript_end }; struct guncmd invanim_punch_type4[] = { - gunscript_playanimation(0x0425, 0, 10000) + gunscript_playanimation(ANIM_0425, 0, 10000) gunscript_waittime(8, 2) gunscript_waittime(18, 3) gunscript_end @@ -359,7 +359,7 @@ struct inventory_typef invf_0001148c[] = { }; struct guncmd invanim_falcon2_reload_0[] = { - gunscript_playanimation(0x00ed, 0, 10000) + gunscript_playanimation(ANIM_00ED, 0, 10000) gunscript_showpart(1, 53) gunscript_showpart(1, 43) gunscript_showpart(1, 42) @@ -374,7 +374,7 @@ struct guncmd invanim_falcon2_reload_0[] = { }; struct guncmd invanim_falcon2scope_reload_0[] = { - gunscript_playanimation(0x0417, 0, 10000) + gunscript_playanimation(ANIM_0417, 0, 10000) gunscript_showpart(1, 53) gunscript_showpart(1, 43) gunscript_showpart(1, 42) @@ -389,7 +389,7 @@ struct guncmd invanim_falcon2scope_reload_0[] = { }; struct guncmd invanim_falcon2_reload_1[] = { - gunscript_playanimation(0x03f1, 0, 10000) + gunscript_playanimation(ANIM_03F1, 0, 10000) gunscript_hidepart(1, 43) gunscript_showpart(1, 42) gunscript_playsound(6, 0x01d8) @@ -412,23 +412,23 @@ struct guncmd invanim_falcon2scope_reload[] = { }; struct guncmd invanim_falcon2_pistolwhip[] = { - gunscript_playanimation(0x03f2, 0, 10000) + gunscript_playanimation(ANIM_03F2, 0, 10000) gunscript_waittime(23, 2) gunscript_end }; struct guncmd invanim_falcon2_equip[] = { - gunscript_playanimation(0x00ea, 0, 10000) + gunscript_playanimation(ANIM_00EA, 0, 10000) gunscript_end }; struct guncmd invanim_falcon2_unequip[] = { - gunscript_playanimation(0x00eb, 0, 10000) + gunscript_playanimation(ANIM_00EB, 0, 10000) gunscript_end }; struct guncmd invanim_falcon2_shoot[] = { - gunscript_playanimation(0x00ec, 0, 10000) + gunscript_playanimation(ANIM_00EC, 0, 10000) gunscript_waittime(9, 5) gunscript_end }; @@ -607,7 +607,7 @@ struct inventory_typef invf_00011840[] = { }; struct guncmd invanim_magsec_reload_0[] = { - gunscript_playanimation(0x0409, 0, 10000) + gunscript_playanimation(ANIM_0409, 0, 10000) gunscript_showpart(1, 53) gunscript_showpart(1, 41) gunscript_setsoundspeed(3, 1300) @@ -626,7 +626,7 @@ struct guncmd invanim_magsec_reload_0[] = { }; struct guncmd invanim_magsec_reload_1[] = { - gunscript_playanimation(0x040a, 0, 10000) + gunscript_playanimation(ANIM_040A, 0, 10000) gunscript_showpart(1, 41) gunscript_setsoundspeed(5, 1300) gunscript_playsound(5, 0x01d8) @@ -646,7 +646,7 @@ struct guncmd invanim_magsec_reload[] = { }; struct guncmd invanim_magsec_equiporshoot[] = { - gunscript_playanimation(0x040b, 0, 10000) + gunscript_playanimation(ANIM_040B, 0, 10000) gunscript_waittime(12, 5) gunscript_end }; @@ -762,14 +762,14 @@ struct inventory_typef invf_00011a84[] = { }; struct guncmd invanim_dy357_equiporshoot[] = { - gunscript_playanimation(0x0406, 0, 10000) + gunscript_playanimation(ANIM_0406, 0, 10000) gunscript_waittime(12, 5) gunscript_waittime(12, 2) gunscript_end }; struct guncmd invanim_dy357_reload_0[] = { - gunscript_playanimation(0x0408, 0, 10000) + gunscript_playanimation(ANIM_0408, 0, 10000) gunscript_playsound(50, 0x05cf) gunscript_setsoundspeed(80, 1830) gunscript_playsound(80, 0x01d8) @@ -800,7 +800,7 @@ struct guncmd invanim_dy357_reload_0[] = { }; struct guncmd invanim_dy357_reload_1[] = { - gunscript_playanimation(0x0420, 0, 10000) + gunscript_playanimation(ANIM_0420, 0, 10000) gunscript_playsound(50, 0x05cf) gunscript_setsoundspeed(80, 1830) gunscript_playsound(80, 0x01d8) @@ -824,7 +824,7 @@ struct guncmd invanim_dy357_reload[] = { }; struct guncmd invanim_dy357_pistolwhip[] = { - gunscript_playanimation(0x0407, 0, 10000) + gunscript_playanimation(ANIM_0407, 0, 10000) gunscript_waittime(23, 2) gunscript_end }; @@ -967,7 +967,7 @@ struct inventory_typef invf_00011e00[] = { }; struct guncmd invanim_equiporreload_0[] = { - gunscript_playanimation(0x0415, 0, 10000) + gunscript_playanimation(ANIM_0415, 0, 10000) gunscript_showpart(1, 53) gunscript_showpart(1, 40) gunscript_setsoundspeed(44, 1510) @@ -977,7 +977,7 @@ struct guncmd invanim_equiporreload_0[] = { }; struct guncmd invanim_phoenix_equiporreload_1[] = { - gunscript_playanimation(0x0423, 0, 10000) + gunscript_playanimation(ANIM_0423, 0, 10000) gunscript_showpart(1, 53) gunscript_showpart(1, 40) gunscript_setsoundspeed(44, 1510) @@ -993,7 +993,7 @@ struct guncmd invanim_phoenix_equiporreload[] = { }; struct guncmd invanim_phoenix_shoot[] = { - gunscript_playanimation(0x043e, 0, 10000) + gunscript_playanimation(ANIM_043E, 0, 10000) gunscript_waittime(9, 5) gunscript_end }; @@ -1088,13 +1088,13 @@ struct inventory_typef invf_00011fac[] = { }; struct guncmd invanim_mauler_equiporshoot[] = { - gunscript_playanimation(0x03f3, 0, 10000) + gunscript_playanimation(ANIM_03F3, 0, 10000) gunscript_waittime(9, 5) gunscript_end }; struct guncmd invanim_mauler_reload_0[] = { - gunscript_playanimation(0x03f4, 0, 10000) + gunscript_playanimation(ANIM_03F4, 0, 10000) gunscript_showpart(0, 53) gunscript_setsoundspeed(4, 1200) gunscript_playsound(4, 0x0053) @@ -1114,7 +1114,7 @@ struct guncmd invanim_mauler_reload_0[] = { }; struct guncmd invanim_mauler_reload_1[] = { - gunscript_playanimation(0x03f5, 0, 10000) + gunscript_playanimation(ANIM_03F5, 0, 10000) gunscript_setsoundspeed(14, 1200) gunscript_playsound(14, 0x0053) gunscript_setsoundspeed(40, 2500) @@ -1134,7 +1134,7 @@ struct guncmd invanim_mauler_reload[] = { }; struct guncmd invanim_unused_8007c0bc[] = { - gunscript_playanimation(0x03f6, 0, 10000) + gunscript_playanimation(ANIM_03F6, 0, 10000) gunscript_end }; @@ -1229,7 +1229,7 @@ struct inventory_typef invf_000121d8[] = { }; struct guncmd invanim_cmp150_reload_0[] = { - gunscript_playanimation(0x0115, 0, 10000) + gunscript_playanimation(ANIM_0115, 0, 10000) gunscript_hidepart(23, 42) gunscript_showpart(33, 53) gunscript_showpart(33, 43) @@ -1245,7 +1245,7 @@ struct guncmd invanim_cmp150_reload_0[] = { }; struct guncmd invanim_cmp150_reload_1[] = { - gunscript_playanimation(0x0422, 0, 10000) + gunscript_playanimation(ANIM_0422, 0, 10000) gunscript_hidepart(23, 42) gunscript_showpart(33, 53) gunscript_showpart(33, 43) @@ -1267,7 +1267,7 @@ struct guncmd invanim_cmp150_reload[] = { }; struct guncmd invanim_cmp150_equiporshoot[] = { - gunscript_playanimation(0x0116, 0, 10000) + gunscript_playanimation(ANIM_0116, 0, 10000) gunscript_waittime(14, 5) gunscript_waitforzreleased(14) gunscript_end @@ -1384,7 +1384,7 @@ struct inventory_typef invf_0001243c[] = { }; struct guncmd invanim_cyclone_equiporreload_0[] = { - gunscript_playanimation(0x040e, 0, 10000) + gunscript_playanimation(ANIM_040E, 0, 10000) gunscript_showpart(1, 53) gunscript_showpart(1, 40) gunscript_playsound(60, 0x05d3) @@ -1392,7 +1392,7 @@ struct guncmd invanim_cyclone_equiporreload_0[] = { }; struct guncmd invanim_cyclone_equiporreload_1[] = { - gunscript_playanimation(0x0421, 0, 10000) + gunscript_playanimation(ANIM_0421, 0, 10000) gunscript_playsound(60, 0x05d3) gunscript_end }; @@ -1404,7 +1404,7 @@ struct guncmd invanim_cyclone_equiporreload[] = { }; struct guncmd invanim_cyclone_shoot[] = { - gunscript_playanimation(0x043d, 0, 10000) + gunscript_playanimation(ANIM_043D, 0, 10000) gunscript_waittime(5, 5) gunscript_waitforzreleased(5) gunscript_end @@ -1498,7 +1498,7 @@ struct weapon invitem_cyclone = { }; struct guncmd invanim_rcp120_reload[] = { - gunscript_playanimation(0x041a, 0, 10000) + gunscript_playanimation(ANIM_041A, 0, 10000) gunscript_setsoundspeed(18, 1100) gunscript_playsound(18, 0x0053) gunscript_showpart(25, 40) @@ -1511,7 +1511,7 @@ struct guncmd invanim_rcp120_reload[] = { }; struct guncmd invanim_rcp120_equiporshoot[] = { - gunscript_playanimation(0x0424, 0, 10000) + gunscript_playanimation(ANIM_0424, 0, 10000) gunscript_waittime(10, 5) gunscript_waitforzreleased(10) gunscript_end @@ -1602,7 +1602,7 @@ struct weapon invitem_rcp120 = { }; struct guncmd invanim_callisto_equiporreload[] = { - gunscript_playanimation(0x0418, 0, 10000) + gunscript_playanimation(ANIM_0418, 0, 10000) gunscript_showpart(30, 40) gunscript_setsoundspeed(58, 933) gunscript_playsound(58, 0x0433) @@ -1611,7 +1611,7 @@ struct guncmd invanim_callisto_equiporreload[] = { }; struct guncmd invanim_callisto_shoot[] = { - gunscript_playanimation(0x043c, 0, 10000) + gunscript_playanimation(ANIM_043C, 0, 10000) gunscript_waittime(8, 5) gunscript_waitforzreleased(8) gunscript_end @@ -1726,12 +1726,12 @@ struct modelpartvisibility invpartvisibility_dragon[] = { }; struct guncmd invanim_dragon_equiporshoot[] = { - gunscript_playanimation(0x03f9, 0, 10000) + gunscript_playanimation(ANIM_03F9, 0, 10000) gunscript_end }; struct guncmd invanim_dragon_reload[] = { - gunscript_playanimation(0x03fa, 0, 10000) + gunscript_playanimation(ANIM_03FA, 0, 10000) gunscript_playsound(8, 0x0053) gunscript_hidepart(17, 42) gunscript_showpart(17, 40) @@ -1830,7 +1830,7 @@ struct modelpartvisibility invpartvisibility_superdragon[] = { }; struct guncmd invanim_superdragon_reload[] = { - gunscript_playanimation(0x03fb, 0, 10000) + gunscript_playanimation(ANIM_03FB, 0, 10000) gunscript_playsound(8, 0x0053) gunscript_hidepart(16, 42) gunscript_showpart(16, 40) @@ -1842,7 +1842,7 @@ struct guncmd invanim_superdragon_reload[] = { }; struct guncmd invanim_superdragon_grenadereload[] = { - gunscript_playanimation(0x03fc, 0, 10000) + gunscript_playanimation(ANIM_03FC, 0, 10000) gunscript_setsoundspeed(6, 700) gunscript_playsound(6, 0x0053) gunscript_showpart(30, 41) @@ -1856,22 +1856,22 @@ struct guncmd invanim_superdragon_grenadereload[] = { }; struct guncmd invanim_superdragon_equiporshoot[] = { - gunscript_playanimation(0x03fe, 0, 10000) + gunscript_playanimation(ANIM_03FE, 0, 10000) gunscript_end }; struct guncmd invanim_superdragon_shootgrenade[] = { - gunscript_playanimation(0x03ff, 0, 10000) + gunscript_playanimation(ANIM_03FF, 0, 10000) gunscript_end }; struct guncmd invanim_superdragon_pritosec[] = { - gunscript_playanimation(0x03fd, 0, 10000) + gunscript_playanimation(ANIM_03FD, 0, 10000) gunscript_end }; struct guncmd invanim_superdragon_sectopri[] = { - gunscript_playanimation(0x03fd, 65535, 55536) + gunscript_playanimation(ANIM_03FD, 65535, 55536) gunscript_end }; @@ -1986,7 +1986,7 @@ struct modelpartvisibility invpartvisibility_ar34[] = { }; struct guncmd invanim_ar34_equiporreload[] = { - gunscript_playanimation(0x0419, 0, 10000) + gunscript_playanimation(ANIM_0419, 0, 10000) gunscript_setsoundspeed(16, 900) gunscript_playsound(16, 0x0053) gunscript_hidepart(21, 41) @@ -2111,7 +2111,7 @@ struct modelpartvisibility invpartvisibility_k7avenger[] = { }; struct guncmd invanim_k7avenger_reload[] = { - gunscript_playanimation(0x00e9, 0, 10000) + gunscript_playanimation(ANIM_00E9, 0, 10000) gunscript_setsoundspeed(15, 1200) gunscript_playsound(15, 0x0053) gunscript_hidepart(22, 41) @@ -2126,17 +2126,17 @@ struct guncmd invanim_k7avenger_reload[] = { }; struct guncmd invanim_k7avenger_equip[] = { - gunscript_playanimation(0x00e6, 0, 10000) + gunscript_playanimation(ANIM_00E6, 0, 10000) gunscript_end }; struct guncmd invanim_k7avenger_unequip[] = { - gunscript_playanimation(0x00e7, 0, 10000) + gunscript_playanimation(ANIM_00E7, 0, 10000) gunscript_end }; struct guncmd invanim_unused_8007ce6c[] = { - gunscript_playanimation(0x00e8, 0, 10000) + gunscript_playanimation(ANIM_00E8, 0, 10000) gunscript_end }; @@ -2252,7 +2252,7 @@ struct modelpartvisibility invpartvisibility_laptopgun[] = { }; struct guncmd invanim_laptopgun_reload[] = { - gunscript_playanimation(0x00e4, 0, 10000) + gunscript_playanimation(ANIM_00E4, 0, 10000) gunscript_setsoundspeed(4, 1630) gunscript_playsound(4, 0x04fb) gunscript_setsoundspeed(15, 1436) @@ -2273,14 +2273,14 @@ struct guncmd invanim_laptopgun_reload[] = { }; struct guncmd invanim_laptopgun_shoot[] = { - gunscript_playanimation(0x00e5, 0, 10000) + gunscript_playanimation(ANIM_00E5, 0, 10000) gunscript_waittime(10, 5) gunscript_waitforzreleased(10) gunscript_end }; struct guncmd invanim_laptopgun_equip[] = { - gunscript_playanimation(0x00e2, 0, 10000) + gunscript_playanimation(ANIM_00E2, 0, 10000) gunscript_setsoundspeed(15, 720) gunscript_playsound(15, 0x04f7) gunscript_playsound(35, 0x04f7) @@ -2289,7 +2289,7 @@ struct guncmd invanim_laptopgun_equip[] = { }; struct guncmd invanim_laptopgun_unequip[] = { - gunscript_playanimation(0x00e3, 0, 10000) + gunscript_playanimation(ANIM_00E3, 0, 10000) gunscript_playsound(1, 0x04f7) gunscript_setsoundspeed(25, 720) gunscript_playsound(25, 0x04f7) @@ -2383,7 +2383,7 @@ struct modelpartvisibility invpartvisibility_shotgun[] = { }; struct guncmd invanim_shotgun_reload[] = { - gunscript_playanimation(0x03ed, 0, 10000) + gunscript_playanimation(ANIM_03ED, 0, 10000) gunscript_showpart(1, 43) gunscript_playsound(67, 0x01d8) gunscript_waittime(74, 1) @@ -2394,14 +2394,14 @@ struct guncmd invanim_shotgun_reload[] = { }; struct guncmd invanim_shotgun_equiporsingleshot[] = { - gunscript_playanimation(0x03ee, 0, 10000) + gunscript_playanimation(ANIM_03EE, 0, 10000) gunscript_waittime(9, 2) gunscript_playsound(34, 0x04fb) gunscript_end }; struct guncmd invanim_shotgun_doubleshot[] = { - gunscript_playanimation(0x042c, 0, 10000) + gunscript_playanimation(ANIM_042C, 0, 10000) gunscript_waittime(9, 2) gunscript_playsound(54, 0x04fb) gunscript_end @@ -2501,13 +2501,13 @@ struct inventory_typef invf_000133c8[] = { }; struct guncmd invanim_reaper_shoot[] = { - gunscript_playanimation(0x0400, 0, 10000) + gunscript_playanimation(ANIM_0400, 0, 10000) gunscript_waittime(12, 5) gunscript_end }; struct guncmd invanim_reaper_reload[] = { - gunscript_playanimation(0x0401, 0, 10000) + gunscript_playanimation(ANIM_0401, 0, 10000) gunscript_playsound(49, 0x05c7) gunscript_hidepart(70, 42) gunscript_showpart(90, 43) @@ -2519,12 +2519,12 @@ struct guncmd invanim_reaper_reload[] = { }; struct guncmd invanim_reaper_equip[] = { - gunscript_playanimation(0x0427, 0, 10000) + gunscript_playanimation(ANIM_0427, 0, 10000) gunscript_end }; struct guncmd invanim_reaper_unequip[] = { - gunscript_playanimation(0x0428, 0, 10000) + gunscript_playanimation(ANIM_0428, 0, 10000) gunscript_end }; @@ -2623,7 +2623,7 @@ struct inventory_typef invf_00013564[] = { }; struct guncmd invanim_rocketlauncher_reload[] = { - gunscript_playanimation(0x03ef, 0, 10000) + gunscript_playanimation(ANIM_03EF, 0, 10000) gunscript_setsoundspeed(16, 900) gunscript_playsound(16, 0x04f9) gunscript_playsound(40, 0x0053) @@ -2639,7 +2639,7 @@ struct guncmd invanim_rocketlauncher_reload[] = { }; struct guncmd invanim_rockerlauncher_equiporshoot[] = { - gunscript_playanimation(0x03f0, 0, 10000) + gunscript_playanimation(ANIM_03F0, 0, 10000) gunscript_end }; @@ -2750,12 +2750,12 @@ struct weapon invitem_rocketlauncher = { }; struct guncmd invanim_slayer_equiporshoot[] = { - gunscript_playanimation(0x042a, 0, 10000) + gunscript_playanimation(ANIM_042A, 0, 10000) gunscript_end }; struct guncmd invanim_slayer_reload[] = { - gunscript_playanimation(0x0429, 0, 10000) + gunscript_playanimation(ANIM_0429, 0, 10000) gunscript_setsoundspeed(52, 800) gunscript_playsound(52, 0x0053) gunscript_playsound(79, 0x808c) @@ -2865,12 +2865,12 @@ struct inventory_typef invf_unused_8006d890[] = { }; struct guncmd invanim_devastator_equiporshoot[] = { - gunscript_playanimation(0x03f7, 0, 10000) + gunscript_playanimation(ANIM_03F7, 0, 10000) gunscript_end }; struct guncmd invanim_devastator_reload[] = { - gunscript_playanimation(0x03f8, 0, 10000) + gunscript_playanimation(ANIM_03F8, 0, 10000) gunscript_setsoundspeed(15, 600) gunscript_playsound(15, 0x0053) gunscript_hidepart(22, 42) @@ -2995,17 +2995,17 @@ struct weaponfunc invfunc_mine_threatdetector = { }; struct guncmd invanim_mine_equiporreload[] = { - gunscript_playanimation(0x0430, 0, 10000) + gunscript_playanimation(ANIM_0430, 0, 10000) gunscript_end }; struct guncmd invanim_mine_unequip[] = { - gunscript_playanimation(0x0431, 0, 10000) + gunscript_playanimation(ANIM_0431, 0, 10000) gunscript_end }; struct guncmd invanim_mine_throw[] = { - gunscript_playanimation(0x0435, 0, 10000) + gunscript_playanimation(ANIM_0435, 0, 10000) gunscript_waitforzreleased(10) gunscript_waittime(13, 2) gunscript_end @@ -3067,17 +3067,17 @@ struct inventory_typef invf_00013b40[] = { }; struct guncmd invanim_remotemine_equiporreload[] = { - gunscript_playanimation(0x0432, 0, 10000) + gunscript_playanimation(ANIM_0432, 0, 10000) gunscript_end }; struct guncmd invanim_remotemine_unequip[] = { - gunscript_playanimation(0x0433, 0, 10000) + gunscript_playanimation(ANIM_0433, 0, 10000) gunscript_end }; struct guncmd invanim_remotemine_throw[] = { - gunscript_playanimation(0x0436, 0, 10000) + gunscript_playanimation(ANIM_0436, 0, 10000) gunscript_waitforzreleased(10) gunscript_waittime(11, 2) gunscript_end @@ -3196,17 +3196,17 @@ struct weapon invitem_proximitymine = { }; struct guncmd invanim_ecmmine_equiporreload[] = { - gunscript_playanimation(0x0437, 0, 10000) + gunscript_playanimation(ANIM_0437, 0, 10000) gunscript_end }; struct guncmd invanim_ecmmine_unequip[] = { - gunscript_playanimation(0x0438, 0, 10000) + gunscript_playanimation(ANIM_0438, 0, 10000) gunscript_end }; struct guncmd invanim_ecmmine_throw[] = { - gunscript_playanimation(0x0438, 0, 10000) + gunscript_playanimation(ANIM_0438, 0, 10000) gunscript_waittime(23, 2) gunscript_end }; @@ -3291,7 +3291,7 @@ struct inventory_typef invf_00013df8[] = { }; struct guncmd invanim_grenade_throw[] = { - gunscript_playanimation(0x0426, 0, 10000) + gunscript_playanimation(ANIM_0426, 0, 10000) gunscript_popoutsackofpills(0x0006) gunscript_playsound(6, 0x05c1) gunscript_waitforzreleased(43) @@ -3300,7 +3300,7 @@ struct guncmd invanim_grenade_throw[] = { }; struct guncmd invanim_grenade_equiporreload[] = { - gunscript_playanimation(0x042b, 0, 10000) + gunscript_playanimation(ANIM_042B, 0, 10000) gunscript_end }; @@ -3432,7 +3432,7 @@ struct inventory_typef invf_00013fa4[] = { }; struct guncmd invanim_farsight_reload[] = { - gunscript_playanimation(0x03eb, 0, 10000) + gunscript_playanimation(ANIM_03EB, 0, 10000) gunscript_showpart(1, 40) gunscript_playsound(72, 0x0433) gunscript_waittime(76, 1) @@ -3441,7 +3441,7 @@ struct guncmd invanim_farsight_reload[] = { }; struct guncmd invanim_farsight_equiporshoot[] = { - gunscript_playanimation(0x03ec, 0, 10000) + gunscript_playanimation(ANIM_03EC, 0, 10000) gunscript_end }; @@ -3545,7 +3545,7 @@ struct inventory_typef invf_00014100[] = { }; struct guncmd invanim_crossbow_reload[] = { - gunscript_playanimation(0x00d4, 0, 10000) + gunscript_playanimation(ANIM_00D4, 0, 10000) gunscript_hidepart(1, 40) gunscript_showpart(1, 41) gunscript_showpart(1, 53) @@ -3560,21 +3560,21 @@ struct guncmd invanim_crossbow_reload[] = { }; struct guncmd invanim_crossbow_shoot[] = { - gunscript_playanimation(0x00c2, 0, 10000) + gunscript_playanimation(ANIM_00C2, 0, 10000) gunscript_hidepart(20, 40) gunscript_playsound(37, 0x04f8) gunscript_end }; struct guncmd invanim_crossbow_unequip[] = { - gunscript_playanimation(0x00d3, 0, 10000) + gunscript_playanimation(ANIM_00D3, 0, 10000) gunscript_hidepart(1, 40) gunscript_playsound(37, 0x04f8) gunscript_end }; struct guncmd invanim_crosbow_equip[] = { - gunscript_playanimation(0x00c1, 0, 10000) + gunscript_playanimation(ANIM_00C1, 0, 10000) gunscript_playsound(32, 0x04fc) gunscript_playsound(75, 0x04f8) gunscript_end @@ -3689,19 +3689,19 @@ struct inventory_typef invf_00014314[] = { }; struct guncmd invanim_tranquilizer_lethalinject[] = { - gunscript_playanimation(0x0411, 0, 10000) + gunscript_playanimation(ANIM_0411, 0, 10000) gunscript_waittime(18, 2) gunscript_end }; struct guncmd invanim_tranquilizer_equiporshoot[] = { - gunscript_playanimation(0x042d, 0, 10000) + gunscript_playanimation(ANIM_042D, 0, 10000) gunscript_waittime(7, 5) gunscript_end }; struct guncmd invanim_tranquilizer_reload[] = { - gunscript_playanimation(0x0410, 0, 10000) + gunscript_playanimation(ANIM_0410, 0, 10000) gunscript_showpart(1, 53) gunscript_showpart(1, 40) gunscript_showpart(1, 42) @@ -3868,12 +3868,12 @@ struct inventory_typef invf_00014590[] = { }; struct guncmd invanim_sniperrifle_equip[] = { - gunscript_playanimation(0x040c, 0, 10000) + gunscript_playanimation(ANIM_040C, 0, 10000) gunscript_end }; struct guncmd invanim_sniperrifle_reload[] = { - gunscript_playanimation(0x040f, 0, 10000) + gunscript_playanimation(ANIM_040F, 0, 10000) gunscript_setsoundspeed(22, 850) gunscript_playsound(22, 0x01d8) gunscript_showpart(42, 41) @@ -3971,12 +3971,12 @@ struct weapon invitem_sniperrifle = { }; struct guncmd invanim_laser_equip[] = { - gunscript_playanimation(0x042e, 0, 10000) + gunscript_playanimation(ANIM_042E, 0, 10000) gunscript_end }; struct guncmd invanim_laser_unequip[] = { - gunscript_playanimation(0x042f, 0, 10000) + gunscript_playanimation(ANIM_042F, 0, 10000) gunscript_end }; @@ -4065,7 +4065,7 @@ struct inventory_typef invf_000147fc[] = { }; struct guncmd invanim_pp9i_equiporshoot[] = { - gunscript_playanimation(0x0440, 0, 10000) + gunscript_playanimation(ANIM_0440, 0, 10000) gunscript_waittime(10, 5) gunscript_end }; @@ -4126,7 +4126,7 @@ struct weapon invitem_pp9i = { }; struct guncmd invanim_cc13_equiporshoot[] = { - gunscript_playanimation(0x043f, 0, 10000) + gunscript_playanimation(ANIM_043F, 0, 10000) gunscript_waittime(10, 5) gunscript_end }; @@ -4712,13 +4712,13 @@ struct inventory_typef invf_00014fc0[] = { }; struct guncmd invanim_combatknife_equip[] = { - gunscript_playanimation(0x0403, 0, 10000) + gunscript_playanimation(ANIM_0403, 0, 10000) gunscript_waittime(24, 2) gunscript_end }; struct guncmd invanim_combatknife_slash2[] = { - gunscript_playanimation(0x0404, 0, 10000) + gunscript_playanimation(ANIM_0404, 0, 10000) gunscript_waittime(24, 2) gunscript_end }; @@ -4730,28 +4730,28 @@ struct guncmd invanim_combatknife_slash[] = { }; struct guncmd invanim_combatknife_pritosec[] = { - gunscript_playanimation(0x0405, 0, 10000) + gunscript_playanimation(ANIM_0405, 0, 10000) gunscript_playsound(30, 0x80a7) gunscript_playsound(40, 0x80a6) gunscript_end }; struct guncmd invanim_combatknife_sectopri[] = { - gunscript_playanimation(0x0405, 65535, 55536) + gunscript_playanimation(ANIM_0405, 65535, 55536) gunscript_playsound(10, 0x80a8) gunscript_playsound(20, 0x80a6) gunscript_end }; struct guncmd invanim_combatknife_throw[] = { - gunscript_playanimation(0x041b, 0, 10000) + gunscript_playanimation(ANIM_041B, 0, 10000) gunscript_waitforzreleased(12) gunscript_waittime(16, 2) gunscript_end }; struct guncmd invanim_unused_8007f05c[] = { - gunscript_playanimation(0x041c, 0, 10000) + gunscript_playanimation(ANIM_041C, 0, 10000) gunscript_waittime(22, 1) gunscript_end }; @@ -5370,17 +5370,17 @@ struct weapon invitem_xrayscanner = { }; struct guncmd invanim_datauplink_equip[] = { - gunscript_playanimation(0x0439, 0, 10000) + gunscript_playanimation(ANIM_0439, 0, 10000) gunscript_end }; struct guncmd invanim_datauplink_unequip[] = { - gunscript_playanimation(0x043a, 0, 10000) + gunscript_playanimation(ANIM_043A, 0, 10000) gunscript_end }; struct guncmd invanim_unused_8007f794[] = { - gunscript_playanimation(0x043b, 0, 10000) + gunscript_playanimation(ANIM_043B, 0, 10000) gunscript_end }; @@ -5957,7 +5957,7 @@ struct weapon invitem_rocketlauncher_34 = { }; struct guncmd invanim_tester_shoot[] = { - gunscript_playanimation(0x0112, 0, 10000) + gunscript_playanimation(ANIM_0112, 0, 10000) gunscript_end }; diff --git a/src/game/lv.c b/src/game/lv.c index 4bc9902f3..32cb4bcd5 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -4040,7 +4040,7 @@ Gfx *lvRender(Gfx *gdl) frac = 1.0f - (f32)g_CutsceneCurAnimFrame60 / 90.0f; } - if (g_CutsceneAnimNum != 0x46c) { + if (g_CutsceneAnimNum != ANIM_046C) { if (g_CutsceneCurAnimFrame60 > endframe - 90) { frac = (g_CutsceneCurAnimFrame60 - endframe + 90) / 90.0f; } diff --git a/src/include/game/game_005fd0.h b/src/include/game/game_005fd0.h index 92ac21482..feaa33d92 100644 --- a/src/include/game/game_005fd0.h +++ b/src/include/game/game_005fd0.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -bool func0f005fd0(s32 arg0); +bool func0f005fd0(s32 animnum); s32 chrChooseFootstepSound(struct chrdata *chr, u32 arg1); void func0f0061dc(struct chrdata *chr); void func0f006520(struct chrdata *chr);