mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-06-07 03:47:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile tvscreenSetImageByNum

Browse Source
This commit is contained in:
Ryan Dwyer
2021-05-27 21:53:05 +10:00
parent 3f326da9e6
commit dfbeb96988
18 changed files with 1166 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/files/setup/setupcave.c
+4 -4
View File
@@ -1734,8 +1734,8 @@ u8 func1007_console_activation[] = {
label(0x02)
set_stage_flag(STAGEFLAG_CONSOLE_ACTIVATED)
set_object_image(OBJ_CONSOLE, 0x00, 0x0f)
set_object_image(OBJ_CONSOLE, 0x01, 0x0f)
set_object_image(OBJ_CONSOLE, 0, TVIMAGE_0F)
set_object_image(OBJ_CONSOLE, 1, TVIMAGE_0F)
set_chr_flag_bankx(0x12, CHRFLAG0_00002000, BANK_0)
show_hudmsg(CHR_P1P2, L_CAVE_035) // "System shutdown initiated..."
mute_channel(CHANNEL_1)
@@ -1752,7 +1752,7 @@ u8 func1007_console_activation[] = {
endloop(0x04)
label(0x02)
set_object_image(OBJ_CONSOLE, 0x00, 0x14)
set_object_image(OBJ_CONSOLE, 0, TVIMAGE_14)
mute_channel(CHANNEL_1)
assign_sound(SFX_0479, CHANNEL_1)
control_sound_from_object(CHANNEL_1, OBJ_CONSOLE, TRUE)
@@ -1766,7 +1766,7 @@ u8 func1007_console_activation[] = {
endloop(0x05)
label(0x31)
set_object_image(OBJ_CONSOLE, 0x01, 0x14)
set_object_image(OBJ_CONSOLE, 1, TVIMAGE_14)
play_x_track(XREASON_DEFAULT, 88, 88)
beginloop(0x06)
src/files/setup/setupdam.c
+31 -31
View File
@@ -1123,9 +1123,9 @@ u8 func100a_reactor_switch[] = {
assign_sound(SFX_8147, CHANNEL_0)
control_sound_from_object(CHANNEL_0, OBJ_REACTOR_SWITCH, TRUE)
set_lights_state(0x007f, LIGHTOP_3, 0xff, 0x06, 0x78)
set_object_image(OBJ_REACTOR_SWITCH, 0x00, 0x12)
set_object_image(OBJ_REACTOR_SWITCH, 0x01, 0x12)
set_object_image(OBJ_REACTOR_SWITCH, 0x02, 0x12)
set_object_image(OBJ_REACTOR_SWITCH, 0, TVIMAGE_12)
set_object_image(OBJ_REACTOR_SWITCH, 1, TVIMAGE_12)
set_object_image(OBJ_REACTOR_SWITCH, 2, TVIMAGE_12)
show_hudmsg(CHR_P1P2, L_DAM_018) // "Reactor has been shut down."
set_stage_flag(STAGEFLAG_REACTOR_SHUT_DOWN)
set_ailist(CHR_SELF, GAILIST_IDLE)
@@ -2292,21 +2292,21 @@ u8 func1015_shuffle_hatchswitches[] = {
shuffle_pelagic_switches
yield
yield
set_object_image(OBJ_BADHATCHSWITCH1, 0x00, 0x12)
set_object_image(OBJ_BADHATCHSWITCH1, 0, TVIMAGE_12)
yield
set_object_image(OBJ_BADHATCHSWITCH2, 0x00, 0x12)
set_object_image(OBJ_BADHATCHSWITCH2, 0, TVIMAGE_12)
yield
set_object_image(OBJ_BADHATCHSWITCH3, 0x00, 0x12)
set_object_image(OBJ_BADHATCHSWITCH3, 0, TVIMAGE_12)
yield
set_object_image(OBJ_BADHATCHSWITCH4, 0x00, 0x12)
set_object_image(OBJ_BADHATCHSWITCH4, 0, TVIMAGE_12)
yield
set_object_image(OBJ_HATCHSWITCH1, 0x00, 0x13)
set_object_image(OBJ_HATCHSWITCH1, 0, TVIMAGE_13)
yield
set_object_image(OBJ_HATCHSWITCH2, 0x00, 0x13)
set_object_image(OBJ_HATCHSWITCH2, 0, TVIMAGE_13)
yield
set_object_image(OBJ_HATCHSWITCH3, 0x00, 0x13)
set_object_image(OBJ_HATCHSWITCH3, 0, TVIMAGE_13)
yield
set_object_image(OBJ_HATCHSWITCH4, 0x00, 0x13)
set_object_image(OBJ_HATCHSWITCH4, 0, TVIMAGE_13)
yield
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
@@ -2324,7 +2324,7 @@ u8 func1015_shuffle_hatchswitches[] = {
label(0x07) \
assign_sound(SFX_043A, CHANNEL_7) \
control_sound_from_object(CHANNEL_7, switch, TRUE) \
set_object_image(switch, 0x00, 0x14) \
set_object_image(switch, 0, TVIMAGE_14) \
set_stage_flag(flag) \
\
beginloop(0x0b) \
@@ -2332,7 +2332,7 @@ u8 func1015_shuffle_hatchswitches[] = {
endloop(0x0b) \
\
label(0x07) \
set_object_image(switch, 0x00, 0x13) \
set_object_image(switch, 0, TVIMAGE_13) \
yield \
yield \
yield \
@@ -2384,7 +2384,7 @@ u8 func101a_badhatchswitches[] = {
yield
assign_sound(SFX_01C0, CHANNEL_6)
control_sound_from_object(CHANNEL_6, OBJ_BADHATCHSWITCH1, FALSE)
set_object_image(OBJ_BADHATCHSWITCH1, 0x00, 0x0f)
set_object_image(OBJ_BADHATCHSWITCH1, 0, TVIMAGE_0F)
goto_next(0x04)
// 2
@@ -2394,7 +2394,7 @@ u8 func101a_badhatchswitches[] = {
yield
assign_sound(SFX_01C0, CHANNEL_6)
control_sound_from_object(CHANNEL_6, OBJ_BADHATCHSWITCH2, FALSE)
set_object_image(OBJ_BADHATCHSWITCH2, 0x00, 0x0f)
set_object_image(OBJ_BADHATCHSWITCH2, 0, TVIMAGE_0F)
goto_next(0x04)
// 3
@@ -2404,7 +2404,7 @@ u8 func101a_badhatchswitches[] = {
yield
assign_sound(SFX_01C0, CHANNEL_6)
control_sound_from_object(CHANNEL_6, OBJ_BADHATCHSWITCH3, FALSE)
set_object_image(OBJ_BADHATCHSWITCH3, 0x00, 0x0f)
set_object_image(OBJ_BADHATCHSWITCH3, 0, TVIMAGE_0F)
goto_next(0x04)
// 4
@@ -2414,7 +2414,7 @@ u8 func101a_badhatchswitches[] = {
yield
assign_sound(SFX_01C0, CHANNEL_6)
control_sound_from_object(CHANNEL_6, OBJ_BADHATCHSWITCH4, FALSE)
set_object_image(OBJ_BADHATCHSWITCH4, 0x00, 0x0f)
set_object_image(OBJ_BADHATCHSWITCH4, 0, TVIMAGE_0F)
goto_next(0x04)
label(0x04)
@@ -2429,10 +2429,10 @@ u8 func101a_badhatchswitches[] = {
label(0x04)
mute_channel(CHANNEL_6)
unset_stage_flag(STAGEFLAG_HATCHSWITCHES_RESETTING)
set_object_image(OBJ_BADHATCHSWITCH1, 0x00, 0x12)
set_object_image(OBJ_BADHATCHSWITCH2, 0x00, 0x12)
set_object_image(OBJ_BADHATCHSWITCH3, 0x00, 0x12)
set_object_image(OBJ_BADHATCHSWITCH4, 0x00, 0x12)
set_object_image(OBJ_BADHATCHSWITCH1, 0, TVIMAGE_12)
set_object_image(OBJ_BADHATCHSWITCH2, 0, TVIMAGE_12)
set_object_image(OBJ_BADHATCHSWITCH3, 0, TVIMAGE_12)
set_object_image(OBJ_BADHATCHSWITCH4, 0, TVIMAGE_12)
goto_first(0x00)
endlist
@@ -2855,11 +2855,11 @@ u8 func101e_alarm_images[] = {
set_object_flag(0x28, OBJFLAG_UNCOLLECTABLE)
set_object_flag2(0x27, OBJFLAG2_INVISIBLE)
set_object_flag2(0x28, OBJFLAG2_INVISIBLE)
set_object_image(0x21, 0x00, 0x0f)
set_object_image(0x22, 0x00, 0x0f)
set_object_image(0x23, 0x00, 0x0f)
set_object_image(0x24, 0x00, 0x0f)
set_object_image(0x25, 0x00, 0x0f)
set_object_image(0x21, 0, TVIMAGE_0F)
set_object_image(0x22, 0, TVIMAGE_0F)
set_object_image(0x23, 0, TVIMAGE_0F)
set_object_image(0x24, 0, TVIMAGE_0F)
set_object_image(0x25, 0, TVIMAGE_0F)
beginloop(0x0b)
if_alarm_active(/*goto*/ 0x07)
@@ -2869,11 +2869,11 @@ u8 func101e_alarm_images[] = {
endloop(0x0b)
label(0x04)
set_object_image(0x21, 0x00, 0x14)
set_object_image(0x22, 0x00, 0x14)
set_object_image(0x23, 0x00, 0x14)
set_object_image(0x24, 0x00, 0x14)
set_object_image(0x25, 0x00, 0x14)
set_object_image(0x21, 0, TVIMAGE_14)
set_object_image(0x22, 0, TVIMAGE_14)
set_object_image(0x23, 0, TVIMAGE_14)
set_object_image(0x24, 0, TVIMAGE_14)
set_object_image(0x25, 0, TVIMAGE_14)
goto_first(0x00)
endlist
src/files/setup/setupdepo.c
+16 -16
View File
@@ -571,8 +571,8 @@ u8 func1008_check_generator[] = {
// Generator activated
label(0x08)
if_stage_flag_eq(STAGEFLAG_GENERATOR_SHUT_DOWN2, TRUE, /*goto*/ 0x09)
set_object_image(OBJ_GENERATOR, 0x00, 0x14)
set_object_image(OBJ_GENERATOR, 0x01, 0x14)
set_object_image(OBJ_GENERATOR, 0, TVIMAGE_14)
set_object_image(OBJ_GENERATOR, 1, TVIMAGE_14)
mute_channel(CHANNEL_4)
mute_channel(CHANNEL_0)
assign_sound(SFX_8147, CHANNEL_0)
@@ -609,7 +609,7 @@ u8 func1003_laser_switch_1[] = {
if_stage_flag_eq(STAGEFLAG_LASERSET1_DISABLED, TRUE, /*goto*/ 0x09)
// Deactivated
set_object_image(OBJ_LASERSWITCH1, 0x00, 0x14)
set_object_image(OBJ_LASERSWITCH1, 0, TVIMAGE_14)
show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down."
set_stage_flag(STAGEFLAG_LASERSET1_DISABLED)
open_door(OBJ_LASER_1A)
@@ -632,7 +632,7 @@ u8 func1003_laser_switch_1[] = {
label(0x09)
show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated."
unset_stage_flag(STAGEFLAG_LASERSET1_DISABLED)
set_object_image(OBJ_LASERSWITCH1, 0x00, 0x13)
set_object_image(OBJ_LASERSWITCH1, 0, TVIMAGE_13)
close_door(OBJ_LASER_1A)
close_door(OBJ_LASER_1B)
close_door(OBJ_LASER_1C)
@@ -676,7 +676,7 @@ u8 func1004_laser_switch_2[] = {
if_stage_flag_eq(STAGEFLAG_LASERSET2_DISABLED, TRUE, /*goto*/ 0x09)
// Deactivated
set_object_image(OBJ_LASERSWITCH2, 0x00, 0x14)
set_object_image(OBJ_LASERSWITCH2, 0, TVIMAGE_14)
show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down."
set_stage_flag(STAGEFLAG_LASERSET2_DISABLED)
open_door(OBJ_LASER_2A)
@@ -697,7 +697,7 @@ u8 func1004_laser_switch_2[] = {
// Activated
label(0x09)
set_object_image(OBJ_LASERSWITCH2, 0x00, 0x13)
set_object_image(OBJ_LASERSWITCH2, 0, TVIMAGE_13)
show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated."
unset_stage_flag(STAGEFLAG_LASERSET2_DISABLED)
close_door(OBJ_LASER_2A)
@@ -742,7 +742,7 @@ u8 func1005_laser_switch_3[] = {
if_stage_flag_eq(STAGEFLAG_LASERSET3_DISABLED, TRUE, /*goto*/ 0x09)
// Deactivated
set_object_image(OBJ_LASERSWITCH3, 0x00, 0x14)
set_object_image(OBJ_LASERSWITCH3, 0, TVIMAGE_14)
show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down."
set_stage_flag(STAGEFLAG_LASERSET3_DISABLED)
open_door(OBJ_LASER_3A)
@@ -763,7 +763,7 @@ u8 func1005_laser_switch_3[] = {
// Activated
label(0x09)
set_object_image(OBJ_LASERSWITCH3, 0x00, 0x13)
set_object_image(OBJ_LASERSWITCH3, 0, TVIMAGE_13)
show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated."
unset_stage_flag(STAGEFLAG_LASERSET3_DISABLED)
close_door(OBJ_LASER_3A)
@@ -808,7 +808,7 @@ u8 func1006_laser_switch_4[] = {
if_stage_flag_eq(STAGEFLAG_LASERSET4_DISABLED, TRUE, /*goto*/ 0x09)
// Deactivated
set_object_image(OBJ_LASERSWITCH4, 0x00, 0x14)
set_object_image(OBJ_LASERSWITCH4, 0, TVIMAGE_14)
show_hudmsg(CHR_P1P2, L_DEPO_027) // "Laser grid unit shut down."
set_stage_flag(STAGEFLAG_LASERSET4_DISABLED)
open_door(OBJ_LASER_4A)
@@ -829,7 +829,7 @@ u8 func1006_laser_switch_4[] = {
// Activated
label(0x09)
set_object_image(OBJ_LASERSWITCH4, 0x00, 0x13)
set_object_image(OBJ_LASERSWITCH4, 0, TVIMAGE_13)
show_hudmsg(CHR_P1P2, L_DEPO_028) // "Laser grid unit activated."
unset_stage_flag(STAGEFLAG_LASERSET4_DISABLED)
close_door(OBJ_LASER_4A)
@@ -899,10 +899,10 @@ u8 func1007_init_lasers[] = {
// Agent - take down lasers
label(0x0d)
set_object_image(OBJ_LASERSWITCH1, 0x00, 0x14)
set_object_image(OBJ_LASERSWITCH2, 0x00, 0x14)
set_object_image(OBJ_LASERSWITCH3, 0x00, 0x14)
set_object_image(OBJ_LASERSWITCH4, 0x00, 0x14)
set_object_image(OBJ_LASERSWITCH1, 0, TVIMAGE_14)
set_object_image(OBJ_LASERSWITCH2, 0, TVIMAGE_14)
set_object_image(OBJ_LASERSWITCH3, 0, TVIMAGE_14)
set_object_image(OBJ_LASERSWITCH4, 0, TVIMAGE_14)
open_door(OBJ_LASER_1A)
open_door(OBJ_LASER_2A)
open_door(OBJ_LASER_3A)
@@ -2727,7 +2727,7 @@ u8 func1022_light_switch[] = {
assign_sound(SFX_043F, CHANNEL_7)
play_sound_from_entity(CHANNEL_7, OBJ_LIGHTSWITCH, 0x012c, 0x0190, 0x00)
yield
set_object_image(OBJ_LIGHTSWITCH, 0x00, 0x14)
set_object_image(OBJ_LIGHTSWITCH, 0, TVIMAGE_14)
play_sound(SFX_8147, -1)
set_lights_state(0x000b, LIGHTOP_3, 0xff, 0x06, 0x78)
set_lights_state(0x000c, LIGHTOP_3, 0xff, 0x06, 0x78)
@@ -2790,7 +2790,7 @@ u8 func1022_light_switch[] = {
play_sound_from_entity(CHANNEL_7, OBJ_LIGHTSWITCH, 0x012c, 0x0190, 0x00)
yield
play_sound(SFX_8148, -1)
set_object_image(0x3d, 0x00, 0x06)
set_object_image(0x3d, 0, TVIMAGE_06)
set_lights_state(0x000b, LIGHTOP_3, 0x06, 0xff, 0x78)
set_lights_state(0x000c, LIGHTOP_3, 0x06, 0xff, 0x78)
set_lights_state(0x000d, LIGHTOP_3, 0x06, 0xff, 0x78)
src/files/setup/setupdish.c
+26 -26
View File
@@ -1314,7 +1314,7 @@ u8 func1005_devicetraining_xray[] = {
if_object_flag2(0x38, OBJFLAG2_00000001, /*goto*/ 0x87)
remove_hudmsgs
show_hudmsg(CHR_BOND, L_DISH_041) // "Laser Grid 1 has been deactivated."
set_object_image(0x38, 0x00, 0x12)
set_object_image(0x38, 0, TVIMAGE_12)
set_object_flag2(0x38, OBJFLAG2_00000001)
open_door(0x3a)
label(0x87)
@@ -1330,7 +1330,7 @@ u8 func1005_devicetraining_xray[] = {
label(0x5c)
if_object_flag2(0x39, OBJFLAG2_00000001, /*goto*/ 0x88)
set_object_image(0x39, 0x00, 0x12)
set_object_image(0x39, 0, TVIMAGE_12)
remove_hudmsgs
show_hudmsg(CHR_BOND, L_DISH_042) // "Laser Grid 2 has been deactivated."
set_object_flag2(0x39, OBJFLAG2_00000001)
@@ -3620,7 +3620,7 @@ u8 func101c_holo1_main[] = {
endloop(0x8f) \
\
label(0x2f) \
set_object_image(object, 0x00, 0x12) \
set_object_image(object, 0, TVIMAGE_12) \
unset_object_flag2(object, OBJFLAG2_00040000) \
\
beginloop(0x04) \
@@ -3632,7 +3632,7 @@ u8 func101c_holo1_main[] = {
endloop(0x04) \
\
label(0x2f) \
set_object_image(object, 0x00, 0x13) \
set_object_image(object, 0, TVIMAGE_13) \
set_object_flag2(object, OBJFLAG2_00040000) \
assign_sound(SFX_043A, CHANNEL_7) \
control_sound_from_object(CHANNEL_7, object, TRUE) \
@@ -3662,7 +3662,7 @@ u8 func1020_holo1_monitor_switches[] = {
endloop(0x8f)
label(0x2f)
set_object_image(0x4f, 0x00, 0x12)
set_object_image(0x4f, 0, TVIMAGE_12)
unset_object_flag2(0x4f, OBJFLAG2_00040000)
beginloop(0x04)
@@ -3674,7 +3674,7 @@ u8 func1020_holo1_monitor_switches[] = {
endloop(0x04)
label(0x2f)
set_object_image(0x4f, 0x00, 0x13)
set_object_image(0x4f, 0, TVIMAGE_13)
set_object_flag2(0x4f, OBJFLAG2_00040000)
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, 0x4f, TRUE)
@@ -3713,8 +3713,8 @@ u8 func1020_holo1_monitor_switches[] = {
goto_first(0x04) \
\
label(0x2f) \
set_object_image(object2, 0x00, 0x12) \
set_object_image(object1, 0x00, 0x13) \
set_object_image(object2, 0, TVIMAGE_12) \
set_object_image(object1, 0, TVIMAGE_13) \
remove_hudmsgs \
show_hudmsg(CHR_BOND, msg) \
assign_sound(SFX_DOOR_81B0, CHANNEL_7) \
@@ -3744,7 +3744,7 @@ u8 func1020_holo1_monitor_switches[] = {
u8 func1021_holo1_code1[] = {
label(0x8f)
set_object_image(0x48, 0x00, 0x12)
set_object_image(0x48, 0, TVIMAGE_12)
unset_object_flag2(0x4c, OBJFLAG2_00000001)
holo1_code_thing_p1(0x48, 0x4c, 0x0240)
@@ -3761,7 +3761,7 @@ u8 func1021_holo1_code1[] = {
u8 func1021_holo1_code2[] = {
label(0x8f)
set_object_image(0x49, 0x00, 0x12)
set_object_image(0x49, 0, TVIMAGE_12)
unset_object_flag2(0x4d, OBJFLAG2_00000001)
holo1_code_thing_p1(0x49, 0x4d, 0x0241)
@@ -3777,7 +3777,7 @@ u8 func1021_holo1_code2[] = {
u8 func1021_holo1_code3[] = {
label(0x8f)
unset_object_flag2(0x4e, OBJFLAG2_00000001)
set_object_image(0x4a, 0x00, 0x12)
set_object_image(0x4a, 0, TVIMAGE_12)
holo1_code_thing_p1(0x4a, 0x4e, 0x0242)
@@ -3792,7 +3792,7 @@ u8 func1021_holo1_code3[] = {
u8 func1021_holo1_code4[] = {
label(0x8f)
unset_object_flag2(0x4f, OBJFLAG2_00000001)
set_object_image(0x4b, 0x00, 0x12)
set_object_image(0x4b, 0, TVIMAGE_12)
holo1_code_thing_p1(0x4b, 0x4f, 0x0243)
@@ -3883,10 +3883,10 @@ u8 func1022_holo2_main[] = {
unset_object_flag2(0x55, OBJFLAG2_00000001)
unset_object_flag2(0x56, OBJFLAG2_00000001)
unset_object_flag2(0x57, OBJFLAG2_00000001)
set_object_image(0x54, 0x00, 0x14)
set_object_image(0x55, 0x00, 0x14)
set_object_image(0x56, 0x00, 0x14)
set_object_image(0x57, 0x00, 0x14)
set_object_image(0x54, 0, TVIMAGE_14)
set_object_image(0x55, 0, TVIMAGE_14)
set_object_image(0x56, 0, TVIMAGE_14)
set_object_image(0x57, 0, TVIMAGE_14)
unset_stage_flag(STAGEFLAG_HOLO_ABORTING)
unset_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS)
unset_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE)
@@ -3974,14 +3974,14 @@ u8 func1022_holo2_main[] = {
reloop(0x04) \
\
label(0x06) \
set_object_image(object, 0x00, 0x14) \
set_object_image(object, 0, TVIMAGE_14) \
unset_object_flag2(object, OBJFLAG2_00000001) \
endloop(0x04) \
\
label(0x2f) \
assign_sound(SFX_043A, CHANNEL_7) \
control_sound_from_object(CHANNEL_7, object, TRUE) \
set_object_image(object, 0x00, 0x13) \
set_object_image(object, 0, TVIMAGE_13) \
set_object_flag2(object, OBJFLAG2_00000001) \
set_returnlist(CHR_SELF, function) \
set_ailist(CHR_SELF, 0x041b)
@@ -4066,10 +4066,10 @@ u8 func042f_holo2_part2[] = {
remove_hudmsgs
show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH_105) // "Training failed - you must face forward."
set_ailist(CHR_SELF, GAILIST_IDLE)
set_object_image(0x54, 0x00, 0x12)
set_object_image(0x55, 0x00, 0x12)
set_object_image(0x56, 0x00, 0x12)
set_object_image(0x57, 0x00, 0x12)
set_object_image(0x54, 0, TVIMAGE_12)
set_object_image(0x55, 0, TVIMAGE_12)
set_object_image(0x56, 0, TVIMAGE_12)
set_object_image(0x57, 0, TVIMAGE_12)
beginloop(0x08)
if_timer_gt(120, /*goto*/ 0x2f)
@@ -4142,8 +4142,8 @@ u8 func1027_holo3_main[] = {
label(0x2f)
unset_object_flag2(0x65, OBJFLAG2_00000001)
unset_object_flag2(0x66, OBJFLAG2_00000001)
set_object_image(0x65, 0x00, 0x14)
set_object_image(0x66, 0x00, 0x14)
set_object_image(0x65, 0, TVIMAGE_14)
set_object_image(0x66, 0, TVIMAGE_14)
unset_stage_flag(STAGEFLAG_HOLO_ABORTING)
unset_stage_flag(STAGEFLAG_TRIGGER_HOLO_SUCCESS)
unset_stage_flag(STAGEFLAG_TRIGGER_HOLO_FAILURE)
@@ -4355,7 +4355,7 @@ u8 func102c_holo3_object1[] = {
label(0x2f)
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, 0x65, TRUE)
set_object_image(0x65, 0x00, 0x13)
set_object_image(0x65, 0, TVIMAGE_13)
set_object_flag2(0x65, OBJFLAG2_00000001)
set_returnlist(CHR_SELF, AILIST_HOLO3_OBJECT1)
set_ailist(CHR_SELF, AILIST_HOLO3_CHECK_DONE)
@@ -4370,7 +4370,7 @@ u8 func102d_holo3_object2[] = {
label(0x2f)
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, 0x65, TRUE)
set_object_image(0x66, 0x00, 0x13)
set_object_image(0x66, 0, TVIMAGE_13)
set_object_flag2(0x66, OBJFLAG2_00000001)
set_returnlist(CHR_SELF, AILIST_HOLO3_OBJECT2)
set_ailist(CHR_SELF, AILIST_HOLO3_CHECK_DONE)
src/files/setup/setuplip.c
+8 -8
View File
@@ -3176,7 +3176,7 @@ u8 func1018_disable_chambers[] = {
assign_sound(SFX_043A, CHANNEL_7) \
control_sound_from_object(CHANNEL_7, switch, TRUE) \
show_hudmsg(CHR_P1P2, 0x2a42) /* "Containment unit raised up." */ \
set_object_image(switch, 0x00, 0x13) \
set_object_image(switch, 0, TVIMAGE_13) \
unset_object_flag(chamber, OBJFLAG_DEACTIVATED) \
set_stage_flag(stageflag) \
restart_timer \
@@ -3200,7 +3200,7 @@ u8 func1018_disable_chambers[] = {
assign_sound(SFX_043A, CHANNEL_7) \
control_sound_from_object(CHANNEL_7, switch, TRUE) \
show_hudmsg(CHR_P1P2, 0x2a43) /* "Containment unit lowered down." */ \
set_object_image(switch, 0x00, 0x12) \
set_object_image(switch, 0, TVIMAGE_12) \
unset_object_flag(chamber, OBJFLAG_DEACTIVATED) \
unset_stage_flag(stageflag) \
restart_timer \
@@ -3237,7 +3237,7 @@ u8 func1019_chamber1[] = {
control_sound_from_object(CHANNEL_0, OBJ_CHAMBER1, TRUE)
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, OBJ_CHAMBER1_SWITCH, TRUE)
set_object_image(OBJ_CHAMBER1_SWITCH, 0x00, 0x13)
set_object_image(OBJ_CHAMBER1_SWITCH, 0, TVIMAGE_13)
show_hudmsg(CHR_P1P2, L_LIP_066) // "Containment unit raised up."
unset_object_flag(OBJ_CHAMBER1, OBJFLAG_DEACTIVATED)
set_stage_flag(STAGEFLAG_CHAMBER1_RAISED)
@@ -3273,7 +3273,7 @@ u8 func1019_chamber1[] = {
set_chr_chrflag(CHR_ALIEN, CHRCFLAG_HIDDEN)
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, OBJ_CHAMBER1_SWITCH, TRUE)
set_object_image(OBJ_CHAMBER1_SWITCH, 0x00, 0x12)
set_object_image(OBJ_CHAMBER1_SWITCH, 0, TVIMAGE_12)
show_hudmsg(CHR_P1P2, L_LIP_067) // "Containment unit lowered down."
unset_object_flag(OBJ_CHAMBER1, OBJFLAG_DEACTIVATED)
unset_stage_flag(STAGEFLAG_CHAMBER1_RAISED)
@@ -3308,7 +3308,7 @@ u8 func101a_chamber2[] = {
control_sound_from_object(CHANNEL_0, OBJ_CHAMBER2, TRUE)
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, OBJ_CHAMBER2_SWITCH, TRUE)
set_object_image(OBJ_CHAMBER2_SWITCH, 0x00, 0x13)
set_object_image(OBJ_CHAMBER2_SWITCH, 0, TVIMAGE_13)
show_hudmsg(CHR_P1P2, L_LIP_066) // "Containment unit raised up."
unset_object_flag(OBJ_CHAMBER2, OBJFLAG_DEACTIVATED)
set_stage_flag(STAGEFLAG_CHAMBER2_RAISED)
@@ -3333,7 +3333,7 @@ u8 func101a_chamber2[] = {
control_sound_from_object(CHANNEL_0, OBJ_CHAMBER2, TRUE)
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, OBJ_CHAMBER2_SWITCH, TRUE)
set_object_image(OBJ_CHAMBER2_SWITCH, 0x00, 0x12)
set_object_image(OBJ_CHAMBER2_SWITCH, 0, TVIMAGE_12)
show_hudmsg(CHR_P1P2, L_LIP_067) // "Containment unit lowered down."
unset_object_flag(OBJ_CHAMBER2, OBJFLAG_DEACTIVATED)
unset_stage_flag(STAGEFLAG_CHAMBER2_RAISED)
@@ -3396,7 +3396,7 @@ u8 func1020_chamber8[] = {
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, OBJ_CHAMBER8_SWITCH, TRUE)
show_hudmsg(CHR_P1P2, L_LIP_066) // "Containment unit raised up."
set_object_image(OBJ_CHAMBER8_SWITCH, 0x00, 0x13)
set_object_image(OBJ_CHAMBER8_SWITCH, 0, TVIMAGE_13)
unset_object_flag(OBJ_CHAMBER8, OBJFLAG_DEACTIVATED)
set_stage_flag(STAGEFLAG_CHAMBER8_RAISED)
restart_timer
@@ -3422,7 +3422,7 @@ u8 func1020_chamber8[] = {
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, OBJ_CHAMBER8_SWITCH, TRUE)
show_hudmsg(CHR_P1P2, L_LIP_067) // "Containment unit lowered down."
set_object_image(OBJ_CHAMBER8_SWITCH, 0x00, 0x12)
set_object_image(OBJ_CHAMBER8_SWITCH, 0, TVIMAGE_12)
unset_object_flag(OBJ_CHAMBER8, OBJFLAG_DEACTIVATED)
unset_stage_flag(STAGEFLAG_CHAMBER8_RAISED)
restart_timer
src/files/setup/setuplue.c
+7 -7
View File
@@ -991,7 +991,7 @@ u8 func100c_maingate_switch[] = {
goto_next(0x06)
label(0x2e)
set_object_image(OBJ_MAINGATE_SWITCH, 0x00, 0x12)
set_object_image(OBJ_MAINGATE_SWITCH, 0, TVIMAGE_12)
label(0x06)
if_chr_activated_object(CHR_P1P2, OBJ_MAINGATE_SWITCH, /*goto*/ 0x2e)
reloop(0x04)
@@ -999,7 +999,7 @@ u8 func100c_maingate_switch[] = {
label(0x2e)
assign_sound(SFX_043F, CHANNEL_7)
play_sound_from_entity(CHANNEL_7, OBJ_MAINGATE_SWITCH, 0x012c, 0x0190, 0x00)
set_object_image(OBJ_MAINGATE_SWITCH, 0x00, 0x13)
set_object_image(OBJ_MAINGATE_SWITCH, 0, TVIMAGE_13)
if_door_state(OBJ_MAINGATE1, (DOORSTATE_OPEN | DOORSTATE_OPENING), /*goto*/ 0x2e)
show_hudmsg(CHR_P1P2, L_LUE_043) // "Main gate has been opened."
open_door(OBJ_MAINGATE1)
@@ -1016,7 +1016,7 @@ u8 func100c_maingate_switch[] = {
label(0x2e)
assign_sound(SFX_043F, CHANNEL_7)
play_sound_from_entity(CHANNEL_7, OBJ_MAINGATE_SWITCH, 0x012c, 0x0190, 0x00)
set_object_image(OBJ_MAINGATE_SWITCH, 0x00, 0x12)
set_object_image(OBJ_MAINGATE_SWITCH, 0, TVIMAGE_12)
show_hudmsg(CHR_P1P2, L_LUE_044) // "Main gate has been closed."
close_door(OBJ_MAINGATE1)
close_door(OBJ_MAINGATE2)
@@ -1137,7 +1137,7 @@ u8 func1405_antenna_switch[] = {
if_stage_flag_eq(STAGEFLAG_ANTENNA_LOWERED, TRUE, /*goto*/ 0x06)
play_sound_from_object2(CHANNEL_9, OBJ_ANTENNA_SWITCH, SFX_DOOR_801E, 0x00, 0x00)
play_sound_from_object2(CHANNEL_1, OBJ_ANTENNA, SFX_00CD, 0x00, 0x02)
set_object_image(OBJ_ANTENNA_SWITCH, 0x00, 0x12)
set_object_image(OBJ_ANTENNA_SWITCH, 0, TVIMAGE_12)
unset_object_flag(OBJ_ANTENNA, OBJFLAG_DEACTIVATED)
show_hudmsg(CHR_P1P2, L_LUE_030) // "Antenna lowered."
set_stage_flag(STAGEFLAG_ANTENNA_LOWERED)
@@ -1160,7 +1160,7 @@ u8 func1405_antenna_switch[] = {
label(0x06)
play_sound_from_object2(CHANNEL_9, OBJ_ANTENNA_SWITCH, SFX_DOOR_801E, 0x00, 0x00)
play_sound_from_object2(CHANNEL_1, OBJ_ANTENNA, SFX_00CD, 0x00, 0x02)
set_object_image(OBJ_ANTENNA_SWITCH, 0x00, 0x13)
set_object_image(OBJ_ANTENNA_SWITCH, 0, TVIMAGE_13)
unset_object_flag(OBJ_ANTENNA, OBJFLAG_DEACTIVATED)
unset_stage_flag(STAGEFLAG_ANTENNA_LOWERED)
show_hudmsg(CHR_P1P2, L_LUE_029) // "Antenna raised."
@@ -1198,7 +1198,7 @@ u8 func1006_lift_switches[] = {
goto_next(0x0b)
label(0x2e)
set_object_image(OBJ_LIFT1_SWITCH, 0x00, 0x13)
set_object_image(OBJ_LIFT1_SWITCH, 0, TVIMAGE_13)
if_stage_flag_eq(STAGEFLAG_LIFT1_CALLED, TRUE, /*goto*/ 0x06)
set_stage_flag(STAGEFLAG_LIFT1_CALLED)
open_door(0x0e)
@@ -1224,7 +1224,7 @@ u8 func1006_lift_switches[] = {
goto_next(0x0b)
label(0x2e)
set_object_image(OBJ_LIFT2_SWITCH, 0x00, 0x13)
set_object_image(OBJ_LIFT2_SWITCH, 0, TVIMAGE_13)
if_stage_flag_eq(STAGEFLAG_LIFT2_CALLED, TRUE, /*goto*/ 0x06)
set_stage_flag(STAGEFLAG_LIFT2_CALLED)
open_door(0x0f)
src/files/setup/setuprit.c
+13 -13
View File
@@ -1147,7 +1147,7 @@ u8 func100a_autopilot_switch[] = {
label(0x06)
assign_sound(SFX_043A, CHANNEL_7)
control_sound_from_object(CHANNEL_7, OBJ_AUTOPILOT_SWITCH, TRUE)
set_object_image(OBJ_AUTOPILOT_SWITCH, 0x00, 0x13)
set_object_image(OBJ_AUTOPILOT_SWITCH, 0, TVIMAGE_13)
set_stage_flag(STAGEFLAG_PLANE_STABILIZED)
yield
show_hudmsg(CHR_P1P2, L_RIT_024) // "Air Force One has been stabilized."
@@ -1879,7 +1879,7 @@ u8 func100c_cockpit[] = {
label(0x06)
label(0x10)
set_stage_flag(STAGEFLAG_PLANE_NOSEDIVING)
set_object_image(OBJ_AUTOPILOT_SWITCH, 0x00, 0x0f)
set_object_image(OBJ_AUTOPILOT_SWITCH, 0, TVIMAGE_0F)
// Wait 10 seconds
label(0x09)
@@ -1929,7 +1929,7 @@ u8 func100c_cockpit[] = {
// Unreachable
label(0x7c)
label(0x2d)
set_object_image(0x03, 0x00, 0x13)
set_object_image(0x03, 0, TVIMAGE_13)
set_stage_flag(STAGEFLAG_PLANE_STABILIZED)
show_hudmsg(CHR_BOND, L_RIT_028) // "Pilots have been saved."
stop_ambient_track
@@ -2209,7 +2209,7 @@ u8 func1002_intro[] = {
u8 func1010_dumbwaiter1[] = {
label(0x03)
set_object_flag(OBJ_DUMBWAITER1, OBJFLAG_DEACTIVATED)
set_object_image(OBJ_DUMBWAITER1_SWITCH, 0x00, 0x12)
set_object_image(OBJ_DUMBWAITER1_SWITCH, 0, TVIMAGE_12)
beginloop(0x04)
chr_toggle_p1p2(CHR_SELF)
@@ -2218,7 +2218,7 @@ u8 func1010_dumbwaiter1[] = {
label(0x2d)
play_sound(SFX_043A, CHANNEL_7)
set_object_image(OBJ_DUMBWAITER1_SWITCH, 0x00, 0x13)
set_object_image(OBJ_DUMBWAITER1_SWITCH, 0, TVIMAGE_13)
unset_object_flag(OBJ_DUMBWAITER1, OBJFLAG_DEACTIVATED)
yield
yield
@@ -2270,7 +2270,7 @@ u8 func1010_dumbwaiter1[] = {
u8 func1011_dumbwaiter2[] = {
label(0x03)
set_object_flag(OBJ_DUMBWAITER2, OBJFLAG_DEACTIVATED)
set_object_image(OBJ_DUMBWAITER2_SWITCH, 0x00, 0x12)
set_object_image(OBJ_DUMBWAITER2_SWITCH, 0, TVIMAGE_12)
beginloop(0x04)
chr_toggle_p1p2(CHR_SELF)
@@ -2279,7 +2279,7 @@ u8 func1011_dumbwaiter2[] = {
label(0x2d)
play_sound(SFX_043A, CHANNEL_7)
set_object_image(OBJ_DUMBWAITER2_SWITCH, 0x00, 0x13)
set_object_image(OBJ_DUMBWAITER2_SWITCH, 0, TVIMAGE_13)
unset_object_flag(OBJ_DUMBWAITER2, OBJFLAG_DEACTIVATED)
yield
yield
@@ -3622,7 +3622,7 @@ u8 func1019_midcutscene_from_menu[] = {
u8 func101a_equipment_switch[] = {
set_object_flag(0x1b, OBJFLAG_DEACTIVATED)
set_object_image(OBJ_EQUIPMENT_SWITCH, 0x00, 0x12)
set_object_image(OBJ_EQUIPMENT_SWITCH, 0, TVIMAGE_12)
beginloop(0x04)
chr_toggle_p1p2(CHR_SELF)
@@ -3644,7 +3644,7 @@ u8 func101a_equipment_switch[] = {
// Switch activated with keycard
label(0x2d)
set_object_image(OBJ_EQUIPMENT_SWITCH, 0x00, 0x13)
set_object_image(OBJ_EQUIPMENT_SWITCH, 0, TVIMAGE_13)
set_stage_flag(STAGEFLAG_EQUIPMENT_RAISED)
open_door(0x1c)
show_hudmsg(CHR_P1P2, L_RIT_061) // "Cargo bay has been raised."
@@ -3665,7 +3665,7 @@ u8 func101a_equipment_switch[] = {
label(0x06)
set_object_flag(0x1b, OBJFLAG_DEACTIVATED)
set_object_image(OBJ_EQUIPMENT_SWITCH, 0x00, 0x12)
set_object_image(OBJ_EQUIPMENT_SWITCH, 0, TVIMAGE_12)
beginloop(0x09)
if_door_state(0x1c, DOORSTATE_CLOSING, /*goto*/ 0x2d)
@@ -3681,7 +3681,7 @@ u8 func101a_equipment_switch[] = {
u8 func101b_hoverbike_switch[] = {
unset_savefile_flag(SAVEFILEFLAG_CRASHSITE_BIKE)
set_object_flag(0x1f, OBJFLAG_DEACTIVATED)
set_object_image(OBJ_HOVERBIKE_SWITCH, 0x00, 0x12)
set_object_image(OBJ_HOVERBIKE_SWITCH, 0, TVIMAGE_12)
label(0x08)
open_door(0x20)
@@ -3709,7 +3709,7 @@ u8 func101b_hoverbike_switch[] = {
// Activated with keycard
label(0x2d)
set_object_image(OBJ_HOVERBIKE_SWITCH, 0x00, 0x13)
set_object_image(OBJ_HOVERBIKE_SWITCH, 0, TVIMAGE_13)
show_hudmsg(CHR_P1P2, L_RIT_060) // "Cargo bay has been lowered."
set_savefile_flag(SAVEFILEFLAG_CRASHSITE_BIKE)
assign_sound(SFX_043A, CHANNEL_7)
@@ -3730,7 +3730,7 @@ u8 func101b_hoverbike_switch[] = {
label(0x06)
set_object_flag(0x1f, OBJFLAG_DEACTIVATED)
set_object_image(OBJ_HOVERBIKE_SWITCH, 0x00, 0x12)
set_object_image(OBJ_HOVERBIKE_SWITCH, 0, TVIMAGE_12)
set_ailist(CHR_SELF, GAILIST_IDLE)
endlist
};
src/files/setup/setupwax.c
+1 -1
View File
@@ -1658,7 +1658,7 @@ u8 func1007_bomb_logic[] = {
assign_sound(SFX_8144, CHANNEL_1)
play_sound_from_object(CHANNEL_1, OBJ_PLANTED_BOMB, 0x0258, 0x04b0)
unset_object_flag2(OBJ_PLANTED_BOMB, OBJFLAG2_INVISIBLE)
set_object_image(OBJ_PLANTED_BOMB, 0x00, 0x0f)
set_object_image(OBJ_PLANTED_BOMB, 0, TVIMAGE_0F)
unset_object_flag(OBJ_PLANTED_BOMB, OBJFLAG_INVINCIBLE)
// Start 4 minute timer
src/game/chr/chraction.c
+1 -1
View File
@@ -6408,7 +6408,7 @@ void chrGoPosChooseAnimation(struct chrdata *chr)
|| chr->hitpart == HITPART_RBICEP) {
anim = 0x1f8;
flip = true;
} else if (stageGetIndex(g_Vars.stagenum) == STAGE_MAIANSOS) {
} else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO) {
anim = 0x5f;
} else if (male) {
if (random() % 2) {
src/game/chr/chraicommands.c
+2 -2
View File
@@ -5221,12 +5221,12 @@ bool aiSetObjImage(void)
if (obj && obj->prop) {
if (obj->type == OBJTYPE_SINGLEMONITOR) {
struct singlemonitorobj *sm = (struct singlemonitorobj *) obj;
imageSlotSetImage(&sm->screen, cmd[4]);
tvscreenSetImageByNum(&sm->screen, cmd[4]);
} else if (obj->type == OBJTYPE_MULTIMONITOR) {
u8 slot = cmd[3];
if (slot < 4) {
struct multimonitorobj *mm = (struct multimonitorobj *) obj;
imageSlotSetImage(&mm->screens[slot], cmd[4]);
tvscreenSetImageByNum(&mm->screens[slot], cmd[4]);
}
}
}
src/game/game_00c490.c
+12 -12
View File
@@ -44,8 +44,8 @@ u32 var8009cc34;
u32 var8009cc38;
u32 var8009cc3c;
struct monitorscreen var80061a80 = {
(u32) &var80069d90,
struct tvscreen var80061a80 = {
(u32) &g_TvImage00,
0x0000ffff,
0x00000000,
0x00000000,
@@ -76,7 +76,7 @@ struct monitorscreen var80061a80 = {
0x00000000,
};
struct monitorscreen var80061af4 = {
struct tvscreen var80061af4 = {
(u32) &var8006aaa0,
0x0000ffff,
0x00000000,
@@ -108,7 +108,7 @@ struct monitorscreen var80061af4 = {
0x00000000,
};
struct monitorscreen var80061b68 = {
struct tvscreen var80061b68 = {
(u32) &var8006aae4,
0x0000ffff,
0x00000000,
@@ -314,9 +314,9 @@ void addBlockedPath(struct blockedpathobj *blockedpath)
void func0f00cc8c(void)
{
struct monitorscreen tmp1;
struct monitorscreen tmp2;
struct monitorscreen tmp3;
struct tvscreen tmp1;
struct tvscreen tmp2;
struct tvscreen tmp3;
tmp1 = var80061a80;
var8009ce98 = tmp1;
@@ -1306,7 +1306,7 @@ void setupSingleMonitor(struct singlemonitorobj *monitor, s32 cmdindex)
u32 stack[2];
monitor->screen = var8009ce98;
imageSlotSetImage(&monitor->screen, monitor->imagenum);
tvscreenSetImageByNum(&monitor->screen, monitor->imagenum);
// The setup files never place any monitors on a -1 pad, so this code is
// unreachable. It appears to allow attaching monitors to other objects.
@@ -1369,16 +1369,16 @@ void setupSingleMonitor(struct singlemonitorobj *monitor, s32 cmdindex)
void setupMultiMonitor(struct multimonitorobj *monitor, s32 cmdindex)
{
monitor->screens[0] = var8009ce98;
imageSlotSetImage(&monitor->screens[0], monitor->imagenums[0]);
tvscreenSetImageByNum(&monitor->screens[0], monitor->imagenums[0]);
monitor->screens[1] = var8009ce98;
imageSlotSetImage(&monitor->screens[1], monitor->imagenums[1]);
tvscreenSetImageByNum(&monitor->screens[1], monitor->imagenums[1]);
monitor->screens[2] = var8009ce98;
imageSlotSetImage(&monitor->screens[2], monitor->imagenums[2]);
tvscreenSetImageByNum(&monitor->screens[2], monitor->imagenums[2]);
monitor->screens[3] = var8009ce98;
imageSlotSetImage(&monitor->screens[3], monitor->imagenums[3]);
tvscreenSetImageByNum(&monitor->screens[3], monitor->imagenums[3]);
setupGenericObject(&monitor->base, cmdindex);
}
src/game/propobj.c
+977 -1206
View File
File diff suppressed because it is too large Load Diff
src/game/propobjbss.c
+3 -3
View File
@@ -7,9 +7,9 @@ u32 var8009ce70;
u32 var8009ce74;
u32 var8009ce78[4];
u32 var8009ce88[4];
struct monitorscreen var8009ce98;
struct tvscreen var8009ce98;
u32 var8009cf0c;
struct monitorscreen var8009cf10;
struct tvscreen var8009cf10;
u32 var8009cf84;
struct monitorscreen var8009cf88;
struct tvscreen var8009cf88;
u32 var8009cffc[12];
src/include/bss.h
+3 -3
View File
@@ -125,9 +125,9 @@ extern u32 var8009ce70;
extern u32 var8009ce74;
extern u32 var8009ce78[4];
extern u32 var8009ce88[4];
extern struct monitorscreen var8009ce98;
extern struct monitorscreen var8009cf10;
extern struct monitorscreen var8009cf88;
extern struct tvscreen var8009ce98;
extern struct tvscreen var8009cf10;
extern struct tvscreen var8009cf88;
extern struct stagesetup g_StageSetup;
extern u8 *g_GeCreditsData;
extern struct objective *g_Objectives[MAX_OBJECTIVES];
src/include/constants.h
+56
View File
@@ -3743,6 +3743,62 @@
#define TRACKTYPE_AMBIENT 5
#define TRACKTYPE_6 6
#define TVIMAGE_00 0x00
#define TVIMAGE_01 0x01
#define TVIMAGE_02 0x02
#define TVIMAGE_03 0x03
#define TVIMAGE_04 0x04
#define TVIMAGE_05 0x05
#define TVIMAGE_06 0x06
#define TVIMAGE_07 0x07
#define TVIMAGE_08 0x08
#define TVIMAGE_09 0x09
#define TVIMAGE_0A 0x0a
#define TVIMAGE_0B 0x0b
#define TVIMAGE_0C 0x0c
#define TVIMAGE_0D 0x0d
#define TVIMAGE_0E 0x0e
#define TVIMAGE_0F 0x0f
#define TVIMAGE_10 0x10
#define TVIMAGE_11 0x11
#define TVIMAGE_12 0x12
#define TVIMAGE_13 0x13
#define TVIMAGE_14 0x14
#define TVIMAGE_15 0x15
#define TVIMAGE_16 0x16
#define TVIMAGE_17 0x17
#define TVIMAGE_18 0x18
#define TVIMAGE_19 0x19
#define TVIMAGE_1A 0x1a
#define TVIMAGE_1B 0x1b
#define TVIMAGE_1C 0x1c
#define TVIMAGE_1D 0x1d
#define TVIMAGE_1E 0x1e
#define TVIMAGE_1F 0x1f
#define TVIMAGE_20 0x20
#define TVIMAGE_21 0x21
#define TVIMAGE_22 0x22
#define TVIMAGE_23 0x23
#define TVIMAGE_24 0x24
#define TVIMAGE_25 0x25
#define TVIMAGE_26 0x26
#define TVIMAGE_27 0x27
#define TVIMAGE_28 0x28
#define TVIMAGE_29 0x29
#define TVIMAGE_2A 0x2a
#define TVIMAGE_2B 0x2b
#define TVIMAGE_2C 0x2c
#define TVIMAGE_2D 0x2d
#define TVIMAGE_2E 0x2e
#define TVIMAGE_2F 0x2f
#define TVIMAGE_30 0x30
#define TVIMAGE_31 0x31
#define TVIMAGE_32 0x32
#define TVIMAGE_33 0x33
#define TVIMAGE_34 0x34
#define TVIMAGE_35 0x35
#define TVIMAGE_36 0x36
#define VEHICLEMODE_OFF 0
#define VEHICLEMODE_ENGINESTART 1
#define VEHICLEMODE_RUNNING 2
src/include/data.h
+1 -1
View File
@@ -257,7 +257,7 @@ extern struct autogunobj *g_ThrownLaptops;
extern struct var8006996c *var8006996c;
extern s32 g_MaxThrownLaptops;
extern struct prop *g_Lifts[MAX_LIFTS];
extern u32 var80069d90;
extern u32 g_TvImage00;
extern u32 var8006aaa0;
extern u32 var8006aae4;
extern struct audiochannel *g_AudioChannels;
src/include/game/propobj.h
+2 -2
View File
@@ -204,8 +204,8 @@ bool propCanRegen(struct prop *prop);
u32 func0f07e474(struct prop *prop);
s32 objTick(struct prop *prop);
Gfx *propsRenderBeams(Gfx *gdl);
u32 func0f07f918(void);
void imageSlotSetImage(struct monitorscreen *screen, u32 arg1);
void tvscreenSetImage(struct tvscreen *screen, void *arg1);
void tvscreenSetImageByNum(struct tvscreen *screen, s32 imagenum);
u32 func0f07fbf0(void);
u32 func0f07fbf8(void);
void func0f0809c4(struct prop *prop, struct modelrenderdata *renderdata, bool withalpha);
src/include/types.h
+3 -3
View File
@@ -1517,7 +1517,7 @@ struct monitorthing {
/*0x044*/ struct projectile *unk044;
};
struct monitorscreen {
struct tvscreen {
/*0x00*/ u32 unk00;
/*0x04*/ u32 unk04;
/*0x08*/ u32 unk08;
@@ -1719,7 +1719,7 @@ struct packedchr { // objtype 0x09
struct singlemonitorobj { // objtype 0x0a
struct defaultobj base;
/*0x5c*/ struct monitorscreen screen;
/*0x5c*/ struct tvscreen screen;
/*0xd0*/ s16 owneroffset;
/*0xd2*/ s8 ownerpart;
/*0xd3*/ u8 imagenum;
@@ -1727,7 +1727,7 @@ struct singlemonitorobj { // objtype 0x0a
struct multimonitorobj { // objtype 0x0b
struct defaultobj base;
struct monitorscreen screens[4];
struct tvscreen screens[4];
u8 imagenums[4];
};