diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c index 79bc672f8..279873d5c 100644 --- a/src/files/setup/setupame.c +++ b/src/files/setup/setupame.c @@ -2770,7 +2770,7 @@ u8 func0422_intro[] = { // No yield in this loop! label(0x07) cmd01dd_if_something(0x10, /*goto*/ 0x2c) - set_lighting(0x0000, 0x0b, 0x00) + misc_command(0x0000, 0x0b, 0x00) goto_first(0x07) label(0x2c) @@ -2781,7 +2781,7 @@ u8 func0422_intro[] = { label(0x08) cmd01dd_if_something(0x01, /*goto*/ 0x2c) - set_lighting(0x0000, 0x0b, 0x00) + misc_command(0x0000, 0x0b, 0x00) goto_first(0x08) label(0x2c) @@ -3928,38 +3928,38 @@ u8 func1420_setup_portals[] = { u8 func1421_setup_lighting[] = { yield - set_lighting(0x0000, 0x00, 0x01) - set_lighting(0x0000, 0x01, 0x00) - set_lighting(0x0000, 0x02, 0x00) - set_lighting(0x0000, 0x03, 0x00) - set_lighting(0x0000, 0x04, 0x00) - set_lighting(0x0002, 0x05, 0x01) - set_lighting(0x0002, 0x06, 0x01) - set_lighting(0x0003, 0x05, 0x01) - set_lighting(0x0003, 0x06, 0x01) - set_lighting(0x0004, 0x05, 0x01) - set_lighting(0x0004, 0x06, 0x01) - set_lighting(0x0005, 0x06, 0x01) - set_lighting(0x0006, 0x06, 0x01) - set_lighting(0x0007, 0x06, 0x01) - set_lighting(0x0008, 0x06, 0x01) - set_lighting(0x0009, 0x06, 0x01) - set_lighting(0x000a, 0x06, 0x01) - set_lighting(0x000b, 0x06, 0x01) - set_lighting(0x000c, 0x06, 0x01) - set_lighting(0x000d, 0x06, 0x01) - set_lighting(0x000e, 0x06, 0x01) - set_lighting(0x000f, 0x06, 0x01) - set_lighting(0x0010, 0x06, 0x01) - set_lighting(0x0011, 0x06, 0x01) - set_lighting(0x0012, 0x06, 0x01) - set_lighting(0x0013, 0x06, 0x01) - set_lighting(0x0014, 0x06, 0x01) - set_lighting(0x003a, 0x05, 0x01) - set_lighting(0x00a2, 0x06, 0x01) - set_lighting(0x00a4, 0x06, 0x01) - set_lighting(0x00a5, 0x06, 0x01) - set_lighting(0x00a7, 0x06, 0x01) + misc_command(0x0000, 0x00, 0x01) + misc_command(0x0000, 0x01, 0x00) + misc_command(0x0000, 0x02, 0x00) + misc_command(0x0000, 0x03, 0x00) + misc_command(0x0000, 0x04, 0x00) + misc_command(0x0002, 0x05, 0x01) + misc_command(0x0002, 0x06, 0x01) + misc_command(0x0003, 0x05, 0x01) + misc_command(0x0003, 0x06, 0x01) + misc_command(0x0004, 0x05, 0x01) + misc_command(0x0004, 0x06, 0x01) + misc_command(0x0005, 0x06, 0x01) + misc_command(0x0006, 0x06, 0x01) + misc_command(0x0007, 0x06, 0x01) + misc_command(0x0008, 0x06, 0x01) + misc_command(0x0009, 0x06, 0x01) + misc_command(0x000a, 0x06, 0x01) + misc_command(0x000b, 0x06, 0x01) + misc_command(0x000c, 0x06, 0x01) + misc_command(0x000d, 0x06, 0x01) + misc_command(0x000e, 0x06, 0x01) + misc_command(0x000f, 0x06, 0x01) + misc_command(0x0010, 0x06, 0x01) + misc_command(0x0011, 0x06, 0x01) + misc_command(0x0012, 0x06, 0x01) + misc_command(0x0013, 0x06, 0x01) + misc_command(0x0014, 0x06, 0x01) + misc_command(0x003a, 0x05, 0x01) + misc_command(0x00a2, 0x06, 0x01) + misc_command(0x00a4, 0x06, 0x01) + misc_command(0x00a5, 0x06, 0x01) + misc_command(0x00a7, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c index c8754f816..96bd3016a 100644 --- a/src/files/setup/setupark.c +++ b/src/files/setup/setupark.c @@ -3096,38 +3096,38 @@ u8 func141c_setup_portals[] = { u8 func141e_setup_lighting[] = { yield - set_lighting(0x0000, 0x00, 0x00) - set_lighting(0x0000, 0x01, 0x00) - set_lighting(0x0000, 0x02, 0x01) - set_lighting(0x0000, 0x03, 0x00) - set_lighting(0x0000, 0x04, 0x00) - set_lighting(0x0002, 0x05, 0x01) - set_lighting(0x0002, 0x06, 0x01) - set_lighting(0x0003, 0x05, 0x01) - set_lighting(0x0003, 0x06, 0x01) - set_lighting(0x0004, 0x05, 0x01) - set_lighting(0x0004, 0x06, 0x01) - set_lighting(0x0005, 0x06, 0x01) - set_lighting(0x0006, 0x06, 0x01) - set_lighting(0x0007, 0x06, 0x01) - set_lighting(0x0008, 0x06, 0x01) - set_lighting(0x0009, 0x06, 0x01) - set_lighting(0x000a, 0x06, 0x01) - set_lighting(0x000b, 0x06, 0x01) - set_lighting(0x000c, 0x06, 0x01) - set_lighting(0x000d, 0x06, 0x01) - set_lighting(0x000e, 0x06, 0x01) - set_lighting(0x000f, 0x06, 0x01) - set_lighting(0x0010, 0x06, 0x01) - set_lighting(0x0011, 0x06, 0x01) - set_lighting(0x0012, 0x06, 0x01) - set_lighting(0x0013, 0x06, 0x01) - set_lighting(0x0014, 0x06, 0x01) - set_lighting(0x003a, 0x05, 0x01) - set_lighting(0x00a2, 0x06, 0x01) - set_lighting(0x00a4, 0x06, 0x01) - set_lighting(0x00a5, 0x06, 0x01) - set_lighting(0x00a7, 0x06, 0x01) + misc_command(0x0000, 0x00, 0x00) + misc_command(0x0000, 0x01, 0x00) + misc_command(0x0000, 0x02, 0x01) + misc_command(0x0000, 0x03, 0x00) + misc_command(0x0000, 0x04, 0x00) + misc_command(0x0002, 0x05, 0x01) + misc_command(0x0002, 0x06, 0x01) + misc_command(0x0003, 0x05, 0x01) + misc_command(0x0003, 0x06, 0x01) + misc_command(0x0004, 0x05, 0x01) + misc_command(0x0004, 0x06, 0x01) + misc_command(0x0005, 0x06, 0x01) + misc_command(0x0006, 0x06, 0x01) + misc_command(0x0007, 0x06, 0x01) + misc_command(0x0008, 0x06, 0x01) + misc_command(0x0009, 0x06, 0x01) + misc_command(0x000a, 0x06, 0x01) + misc_command(0x000b, 0x06, 0x01) + misc_command(0x000c, 0x06, 0x01) + misc_command(0x000d, 0x06, 0x01) + misc_command(0x000e, 0x06, 0x01) + misc_command(0x000f, 0x06, 0x01) + misc_command(0x0010, 0x06, 0x01) + misc_command(0x0011, 0x06, 0x01) + misc_command(0x0012, 0x06, 0x01) + misc_command(0x0013, 0x06, 0x01) + misc_command(0x0014, 0x06, 0x01) + misc_command(0x003a, 0x05, 0x01) + misc_command(0x00a2, 0x06, 0x01) + misc_command(0x00a4, 0x06, 0x01) + misc_command(0x00a5, 0x06, 0x01) + misc_command(0x00a7, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupazt.c b/src/files/setup/setupazt.c index e32a79c37..ae3338f53 100644 --- a/src/files/setup/setupazt.c +++ b/src/files/setup/setupazt.c @@ -1942,103 +1942,103 @@ u8 func1014_setup_skedar_shuttle[] = { u8 func1415_setup_lighting[] = { yield - set_lighting(0x0001, 0x05, 0x01) - set_lighting(0x0001, 0x06, 0x01) - set_lighting(0x0002, 0x05, 0x01) - set_lighting(0x0002, 0x06, 0x01) - set_lighting(0x0003, 0x06, 0x01) - set_lighting(0x0004, 0x06, 0x01) - set_lighting(0x0005, 0x06, 0x01) - set_lighting(0x0006, 0x05, 0x01) - set_lighting(0x0006, 0x06, 0x01) - set_lighting(0x0008, 0x06, 0x01) - set_lighting(0x0009, 0x05, 0x01) - set_lighting(0x0009, 0x06, 0x01) - set_lighting(0x000a, 0x05, 0x01) - set_lighting(0x000a, 0x06, 0x01) - set_lighting(0x000b, 0x05, 0x01) - set_lighting(0x000b, 0x06, 0x01) - set_lighting(0x000c, 0x05, 0x01) - set_lighting(0x000c, 0x06, 0x01) - set_lighting(0x000d, 0x05, 0x01) - set_lighting(0x000d, 0x06, 0x01) - set_lighting(0x000e, 0x05, 0x01) - set_lighting(0x000e, 0x06, 0x01) - set_lighting(0x000f, 0x05, 0x01) - set_lighting(0x000f, 0x06, 0x01) - set_lighting(0x0010, 0x05, 0x01) - set_lighting(0x0010, 0x06, 0x01) - set_lighting(0x0011, 0x05, 0x01) - set_lighting(0x0011, 0x06, 0x01) - set_lighting(0x0012, 0x05, 0x01) - set_lighting(0x0012, 0x06, 0x01) - set_lighting(0x0013, 0x05, 0x01) - set_lighting(0x0013, 0x06, 0x01) - set_lighting(0x0014, 0x05, 0x01) - set_lighting(0x0014, 0x06, 0x01) - set_lighting(0x0015, 0x05, 0x01) - set_lighting(0x0015, 0x06, 0x01) - set_lighting(0x0016, 0x05, 0x01) - set_lighting(0x0016, 0x06, 0x01) - set_lighting(0x0018, 0x05, 0x01) - set_lighting(0x0018, 0x06, 0x01) - set_lighting(0x0019, 0x05, 0x01) - set_lighting(0x0019, 0x06, 0x01) - set_lighting(0x001a, 0x06, 0x01) - set_lighting(0x001b, 0x05, 0x01) - set_lighting(0x001b, 0x06, 0x01) - set_lighting(0x001c, 0x05, 0x01) - set_lighting(0x001c, 0x06, 0x01) - set_lighting(0x001d, 0x06, 0x01) - set_lighting(0x001e, 0x05, 0x01) - set_lighting(0x001e, 0x06, 0x01) - set_lighting(0x0025, 0x05, 0x01) - set_lighting(0x0025, 0x06, 0x01) - set_lighting(0x0026, 0x05, 0x01) - set_lighting(0x0026, 0x06, 0x01) - set_lighting(0x0027, 0x05, 0x01) - set_lighting(0x0027, 0x06, 0x01) - set_lighting(0x0028, 0x05, 0x01) - set_lighting(0x0028, 0x06, 0x01) - set_lighting(0x0029, 0x05, 0x01) - set_lighting(0x0029, 0x06, 0x01) - set_lighting(0x002a, 0x05, 0x01) - set_lighting(0x002a, 0x06, 0x01) - set_lighting(0x002b, 0x05, 0x01) - set_lighting(0x002b, 0x06, 0x01) - set_lighting(0x002c, 0x05, 0x01) - set_lighting(0x002c, 0x06, 0x01) - set_lighting(0x002e, 0x05, 0x01) - set_lighting(0x002e, 0x06, 0x01) - set_lighting(0x002f, 0x05, 0x01) - set_lighting(0x002f, 0x06, 0x01) - set_lighting(0x0030, 0x05, 0x01) - set_lighting(0x0030, 0x06, 0x01) - set_lighting(0x0031, 0x05, 0x01) - set_lighting(0x0031, 0x06, 0x01) - set_lighting(0x0032, 0x05, 0x01) - set_lighting(0x0032, 0x06, 0x01) - set_lighting(0x0033, 0x05, 0x01) - set_lighting(0x0033, 0x06, 0x01) - set_lighting(0x0035, 0x05, 0x01) - set_lighting(0x0035, 0x06, 0x01) - set_lighting(0x0036, 0x05, 0x01) - set_lighting(0x0036, 0x06, 0x01) - set_lighting(0x0038, 0x05, 0x01) - set_lighting(0x0038, 0x06, 0x01) - set_lighting(0x003a, 0x05, 0x01) - set_lighting(0x003a, 0x06, 0x01) - set_lighting(0x003b, 0x05, 0x01) - set_lighting(0x003b, 0x06, 0x01) - set_lighting(0x003c, 0x05, 0x01) - set_lighting(0x003c, 0x06, 0x01) - set_lighting(0x003d, 0x05, 0x01) - set_lighting(0x003d, 0x06, 0x01) - set_lighting(0x003e, 0x06, 0x01) - set_lighting(0x003f, 0x05, 0x01) - set_lighting(0x0045, 0x05, 0x01) - set_lighting(0x0065, 0x05, 0x01) - set_lighting(0x0065, 0x06, 0x01) + misc_command(0x0001, 0x05, 0x01) + misc_command(0x0001, 0x06, 0x01) + misc_command(0x0002, 0x05, 0x01) + misc_command(0x0002, 0x06, 0x01) + misc_command(0x0003, 0x06, 0x01) + misc_command(0x0004, 0x06, 0x01) + misc_command(0x0005, 0x06, 0x01) + misc_command(0x0006, 0x05, 0x01) + misc_command(0x0006, 0x06, 0x01) + misc_command(0x0008, 0x06, 0x01) + misc_command(0x0009, 0x05, 0x01) + misc_command(0x0009, 0x06, 0x01) + misc_command(0x000a, 0x05, 0x01) + misc_command(0x000a, 0x06, 0x01) + misc_command(0x000b, 0x05, 0x01) + misc_command(0x000b, 0x06, 0x01) + misc_command(0x000c, 0x05, 0x01) + misc_command(0x000c, 0x06, 0x01) + misc_command(0x000d, 0x05, 0x01) + misc_command(0x000d, 0x06, 0x01) + misc_command(0x000e, 0x05, 0x01) + misc_command(0x000e, 0x06, 0x01) + misc_command(0x000f, 0x05, 0x01) + misc_command(0x000f, 0x06, 0x01) + misc_command(0x0010, 0x05, 0x01) + misc_command(0x0010, 0x06, 0x01) + misc_command(0x0011, 0x05, 0x01) + misc_command(0x0011, 0x06, 0x01) + misc_command(0x0012, 0x05, 0x01) + misc_command(0x0012, 0x06, 0x01) + misc_command(0x0013, 0x05, 0x01) + misc_command(0x0013, 0x06, 0x01) + misc_command(0x0014, 0x05, 0x01) + misc_command(0x0014, 0x06, 0x01) + misc_command(0x0015, 0x05, 0x01) + misc_command(0x0015, 0x06, 0x01) + misc_command(0x0016, 0x05, 0x01) + misc_command(0x0016, 0x06, 0x01) + misc_command(0x0018, 0x05, 0x01) + misc_command(0x0018, 0x06, 0x01) + misc_command(0x0019, 0x05, 0x01) + misc_command(0x0019, 0x06, 0x01) + misc_command(0x001a, 0x06, 0x01) + misc_command(0x001b, 0x05, 0x01) + misc_command(0x001b, 0x06, 0x01) + misc_command(0x001c, 0x05, 0x01) + misc_command(0x001c, 0x06, 0x01) + misc_command(0x001d, 0x06, 0x01) + misc_command(0x001e, 0x05, 0x01) + misc_command(0x001e, 0x06, 0x01) + misc_command(0x0025, 0x05, 0x01) + misc_command(0x0025, 0x06, 0x01) + misc_command(0x0026, 0x05, 0x01) + misc_command(0x0026, 0x06, 0x01) + misc_command(0x0027, 0x05, 0x01) + misc_command(0x0027, 0x06, 0x01) + misc_command(0x0028, 0x05, 0x01) + misc_command(0x0028, 0x06, 0x01) + misc_command(0x0029, 0x05, 0x01) + misc_command(0x0029, 0x06, 0x01) + misc_command(0x002a, 0x05, 0x01) + misc_command(0x002a, 0x06, 0x01) + misc_command(0x002b, 0x05, 0x01) + misc_command(0x002b, 0x06, 0x01) + misc_command(0x002c, 0x05, 0x01) + misc_command(0x002c, 0x06, 0x01) + misc_command(0x002e, 0x05, 0x01) + misc_command(0x002e, 0x06, 0x01) + misc_command(0x002f, 0x05, 0x01) + misc_command(0x002f, 0x06, 0x01) + misc_command(0x0030, 0x05, 0x01) + misc_command(0x0030, 0x06, 0x01) + misc_command(0x0031, 0x05, 0x01) + misc_command(0x0031, 0x06, 0x01) + misc_command(0x0032, 0x05, 0x01) + misc_command(0x0032, 0x06, 0x01) + misc_command(0x0033, 0x05, 0x01) + misc_command(0x0033, 0x06, 0x01) + misc_command(0x0035, 0x05, 0x01) + misc_command(0x0035, 0x06, 0x01) + misc_command(0x0036, 0x05, 0x01) + misc_command(0x0036, 0x06, 0x01) + misc_command(0x0038, 0x05, 0x01) + misc_command(0x0038, 0x06, 0x01) + misc_command(0x003a, 0x05, 0x01) + misc_command(0x003a, 0x06, 0x01) + misc_command(0x003b, 0x05, 0x01) + misc_command(0x003b, 0x06, 0x01) + misc_command(0x003c, 0x05, 0x01) + misc_command(0x003c, 0x06, 0x01) + misc_command(0x003d, 0x05, 0x01) + misc_command(0x003d, 0x06, 0x01) + misc_command(0x003e, 0x06, 0x01) + misc_command(0x003f, 0x05, 0x01) + misc_command(0x0045, 0x05, 0x01) + misc_command(0x0065, 0x05, 0x01) + misc_command(0x0065, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c index 886b0003c..d84ad8299 100644 --- a/src/files/setup/setupcave.c +++ b/src/files/setup/setupcave.c @@ -4270,38 +4270,38 @@ u8 func1030_setup_rtracker[] = { u8 func1031_setup_lighting[] = { yield - set_lighting(0x0000, 0x00, 0x00) - set_lighting(0x0000, 0x01, 0x00) - set_lighting(0x0000, 0x02, 0x00) - set_lighting(0x0000, 0x03, 0x00) - set_lighting(0x0000, 0x04, 0x00) - set_lighting(0x007b, 0x05, 0x01) - set_lighting(0x007b, 0x06, 0x01) - set_lighting(0x007c, 0x05, 0x01) - set_lighting(0x007c, 0x06, 0x01) - set_lighting(0x007d, 0x05, 0x01) - set_lighting(0x007d, 0x06, 0x01) - set_lighting(0x007f, 0x05, 0x01) - set_lighting(0x007f, 0x06, 0x01) - set_lighting(0x0080, 0x06, 0x01) - set_lighting(0x0081, 0x05, 0x01) - set_lighting(0x0081, 0x06, 0x01) - set_lighting(0x0082, 0x05, 0x01) - set_lighting(0x0082, 0x06, 0x01) - set_lighting(0x0083, 0x05, 0x01) - set_lighting(0x0083, 0x06, 0x01) - set_lighting(0x0084, 0x06, 0x01) - set_lighting(0x0085, 0x06, 0x01) - set_lighting(0x0086, 0x05, 0x01) - set_lighting(0x0086, 0x06, 0x01) - set_lighting(0x0087, 0x05, 0x01) - set_lighting(0x0087, 0x06, 0x01) - set_lighting(0x0088, 0x05, 0x01) - set_lighting(0x0088, 0x06, 0x01) - set_lighting(0x0089, 0x05, 0x01) - set_lighting(0x008f, 0x05, 0x01) - set_lighting(0x0090, 0x06, 0x01) - set_lighting(0x0091, 0x06, 0x01) + misc_command(0x0000, 0x00, 0x00) + misc_command(0x0000, 0x01, 0x00) + misc_command(0x0000, 0x02, 0x00) + misc_command(0x0000, 0x03, 0x00) + misc_command(0x0000, 0x04, 0x00) + misc_command(0x007b, 0x05, 0x01) + misc_command(0x007b, 0x06, 0x01) + misc_command(0x007c, 0x05, 0x01) + misc_command(0x007c, 0x06, 0x01) + misc_command(0x007d, 0x05, 0x01) + misc_command(0x007d, 0x06, 0x01) + misc_command(0x007f, 0x05, 0x01) + misc_command(0x007f, 0x06, 0x01) + misc_command(0x0080, 0x06, 0x01) + misc_command(0x0081, 0x05, 0x01) + misc_command(0x0081, 0x06, 0x01) + misc_command(0x0082, 0x05, 0x01) + misc_command(0x0082, 0x06, 0x01) + misc_command(0x0083, 0x05, 0x01) + misc_command(0x0083, 0x06, 0x01) + misc_command(0x0084, 0x06, 0x01) + misc_command(0x0085, 0x06, 0x01) + misc_command(0x0086, 0x05, 0x01) + misc_command(0x0086, 0x06, 0x01) + misc_command(0x0087, 0x05, 0x01) + misc_command(0x0087, 0x06, 0x01) + misc_command(0x0088, 0x05, 0x01) + misc_command(0x0088, 0x06, 0x01) + misc_command(0x0089, 0x05, 0x01) + misc_command(0x008f, 0x05, 0x01) + misc_command(0x0090, 0x06, 0x01) + misc_command(0x0091, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupdam.c b/src/files/setup/setupdam.c index 5d5262a5a..ab8d3970b 100644 --- a/src/files/setup/setupdam.c +++ b/src/files/setup/setupdam.c @@ -2901,36 +2901,36 @@ u8 func1020_setup_rtracker[] = { u8 func1421_setup_lighting[] = { yield - set_lighting(0x0060, 0x06, 0x01) - set_lighting(0x0061, 0x06, 0x01) - set_lighting(0x0063, 0x05, 0x01) - set_lighting(0x0064, 0x05, 0x01) - set_lighting(0x0064, 0x06, 0x01) - set_lighting(0x0065, 0x05, 0x01) - set_lighting(0x0067, 0x05, 0x01) - set_lighting(0x0067, 0x06, 0x01) - set_lighting(0x0068, 0x05, 0x01) - set_lighting(0x0068, 0x06, 0x01) - set_lighting(0x0069, 0x05, 0x01) - set_lighting(0x0069, 0x06, 0x01) - set_lighting(0x006a, 0x05, 0x01) - set_lighting(0x006a, 0x06, 0x01) - set_lighting(0x006b, 0x05, 0x01) - set_lighting(0x006b, 0x06, 0x01) - set_lighting(0x006d, 0x05, 0x01) - set_lighting(0x006d, 0x06, 0x01) - set_lighting(0x006e, 0x05, 0x01) - set_lighting(0x006e, 0x06, 0x01) - set_lighting(0x006f, 0x05, 0x01) - set_lighting(0x006f, 0x06, 0x01) - set_lighting(0x0070, 0x05, 0x01) - set_lighting(0x0070, 0x06, 0x01) - set_lighting(0x0071, 0x05, 0x01) - set_lighting(0x0071, 0x06, 0x01) - set_lighting(0x0072, 0x05, 0x01) - set_lighting(0x0072, 0x06, 0x01) - set_lighting(0x0073, 0x05, 0x01) - set_lighting(0x0077, 0x05, 0x01) + misc_command(0x0060, 0x06, 0x01) + misc_command(0x0061, 0x06, 0x01) + misc_command(0x0063, 0x05, 0x01) + misc_command(0x0064, 0x05, 0x01) + misc_command(0x0064, 0x06, 0x01) + misc_command(0x0065, 0x05, 0x01) + misc_command(0x0067, 0x05, 0x01) + misc_command(0x0067, 0x06, 0x01) + misc_command(0x0068, 0x05, 0x01) + misc_command(0x0068, 0x06, 0x01) + misc_command(0x0069, 0x05, 0x01) + misc_command(0x0069, 0x06, 0x01) + misc_command(0x006a, 0x05, 0x01) + misc_command(0x006a, 0x06, 0x01) + misc_command(0x006b, 0x05, 0x01) + misc_command(0x006b, 0x06, 0x01) + misc_command(0x006d, 0x05, 0x01) + misc_command(0x006d, 0x06, 0x01) + misc_command(0x006e, 0x05, 0x01) + misc_command(0x006e, 0x06, 0x01) + misc_command(0x006f, 0x05, 0x01) + misc_command(0x006f, 0x06, 0x01) + misc_command(0x0070, 0x05, 0x01) + misc_command(0x0070, 0x06, 0x01) + misc_command(0x0071, 0x05, 0x01) + misc_command(0x0071, 0x06, 0x01) + misc_command(0x0072, 0x05, 0x01) + misc_command(0x0072, 0x06, 0x01) + misc_command(0x0073, 0x05, 0x01) + misc_command(0x0077, 0x05, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupdish.c b/src/files/setup/setupdish.c index 9fa01a837..797f0c397 100644 --- a/src/files/setup/setupdish.c +++ b/src/files/setup/setupdish.c @@ -5955,12 +5955,12 @@ u8 func1042_check_jo_in_training_room[] = { u8 func1041_setup_lighting[] = { yield - set_lighting(0x0045, 0x06, 0x01) - set_lighting(0x0046, 0x06, 0x01) - set_lighting(0x0047, 0x06, 0x01) - set_lighting(0x0048, 0x06, 0x01) - set_lighting(0x0055, 0x06, 0x01) - set_lighting(0x0056, 0x06, 0x01) + misc_command(0x0045, 0x06, 0x01) + misc_command(0x0046, 0x06, 0x01) + misc_command(0x0047, 0x06, 0x01) + misc_command(0x0048, 0x06, 0x01) + misc_command(0x0055, 0x06, 0x01) + misc_command(0x0056, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c index 88d42ba45..2378b4384 100644 --- a/src/files/setup/setupear.c +++ b/src/files/setup/setupear.c @@ -3263,49 +3263,49 @@ u8 func1022_setup_rtracker[] = { u8 func1423_setup_lighting[] = { yield - set_lighting(0x0000, 0x00, 0x00) - set_lighting(0x0000, 0x01, 0x00) - set_lighting(0x0000, 0x02, 0x00) - set_lighting(0x0000, 0x03, 0x00) - set_lighting(0x0000, 0x04, 0x00) - set_lighting(0x0001, 0x05, 0x01) - set_lighting(0x0006, 0x05, 0x01) - set_lighting(0x0007, 0x05, 0x01) - set_lighting(0x0014, 0x05, 0x01) - set_lighting(0x0015, 0x05, 0x01) - set_lighting(0x0016, 0x05, 0x01) - set_lighting(0x0017, 0x05, 0x01) - set_lighting(0x0018, 0x05, 0x01) - set_lighting(0x0019, 0x05, 0x01) - set_lighting(0x001a, 0x05, 0x01) - set_lighting(0x0023, 0x05, 0x01) - set_lighting(0x0024, 0x05, 0x01) - set_lighting(0x0025, 0x05, 0x01) - set_lighting(0x0026, 0x05, 0x01) - set_lighting(0x0027, 0x05, 0x01) - set_lighting(0x0028, 0x05, 0x01) - set_lighting(0x0029, 0x05, 0x01) - set_lighting(0x0031, 0x05, 0x01) - set_lighting(0x0032, 0x05, 0x01) - set_lighting(0x0034, 0x05, 0x01) - set_lighting(0x0035, 0x05, 0x01) - set_lighting(0x0036, 0x05, 0x01) - set_lighting(0x003e, 0x05, 0x01) - set_lighting(0x003f, 0x05, 0x01) - set_lighting(0x0042, 0x05, 0x01) - set_lighting(0x0043, 0x05, 0x01) - set_lighting(0x0044, 0x05, 0x01) - set_lighting(0x0045, 0x05, 0x01) - set_lighting(0x0046, 0x05, 0x01) - set_lighting(0x005e, 0x05, 0x01) - set_lighting(0x005f, 0x05, 0x01) - set_lighting(0x0060, 0x05, 0x01) - set_lighting(0x0064, 0x05, 0x01) - set_lighting(0x0065, 0x05, 0x01) - set_lighting(0x0066, 0x05, 0x01) - set_lighting(0x0067, 0x05, 0x01) - set_lighting(0x0069, 0x05, 0x01) - set_lighting(0x006a, 0x05, 0x01) + misc_command(0x0000, 0x00, 0x00) + misc_command(0x0000, 0x01, 0x00) + misc_command(0x0000, 0x02, 0x00) + misc_command(0x0000, 0x03, 0x00) + misc_command(0x0000, 0x04, 0x00) + misc_command(0x0001, 0x05, 0x01) + misc_command(0x0006, 0x05, 0x01) + misc_command(0x0007, 0x05, 0x01) + misc_command(0x0014, 0x05, 0x01) + misc_command(0x0015, 0x05, 0x01) + misc_command(0x0016, 0x05, 0x01) + misc_command(0x0017, 0x05, 0x01) + misc_command(0x0018, 0x05, 0x01) + misc_command(0x0019, 0x05, 0x01) + misc_command(0x001a, 0x05, 0x01) + misc_command(0x0023, 0x05, 0x01) + misc_command(0x0024, 0x05, 0x01) + misc_command(0x0025, 0x05, 0x01) + misc_command(0x0026, 0x05, 0x01) + misc_command(0x0027, 0x05, 0x01) + misc_command(0x0028, 0x05, 0x01) + misc_command(0x0029, 0x05, 0x01) + misc_command(0x0031, 0x05, 0x01) + misc_command(0x0032, 0x05, 0x01) + misc_command(0x0034, 0x05, 0x01) + misc_command(0x0035, 0x05, 0x01) + misc_command(0x0036, 0x05, 0x01) + misc_command(0x003e, 0x05, 0x01) + misc_command(0x003f, 0x05, 0x01) + misc_command(0x0042, 0x05, 0x01) + misc_command(0x0043, 0x05, 0x01) + misc_command(0x0044, 0x05, 0x01) + misc_command(0x0045, 0x05, 0x01) + misc_command(0x0046, 0x05, 0x01) + misc_command(0x005e, 0x05, 0x01) + misc_command(0x005f, 0x05, 0x01) + misc_command(0x0060, 0x05, 0x01) + misc_command(0x0064, 0x05, 0x01) + misc_command(0x0065, 0x05, 0x01) + misc_command(0x0066, 0x05, 0x01) + misc_command(0x0067, 0x05, 0x01) + misc_command(0x0069, 0x05, 0x01) + misc_command(0x006a, 0x05, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupeld.c b/src/files/setup/setupeld.c index ada57f17c..72d2eabc2 100644 --- a/src/files/setup/setupeld.c +++ b/src/files/setup/setupeld.c @@ -3028,90 +3028,90 @@ u8 func1420_setup_portals[] = { u8 func1423_setup_lighting[] = { yield - set_lighting(0x0027, 0x05, 0x01) - set_lighting(0x0027, 0x06, 0x01) - set_lighting(0x000c, 0x05, 0x01) - set_lighting(0x000c, 0x06, 0x01) - set_lighting(0x0029, 0x05, 0x01) - set_lighting(0x0035, 0x05, 0x01) - set_lighting(0x0035, 0x06, 0x01) - set_lighting(0x0036, 0x06, 0x01) - set_lighting(0x0037, 0x05, 0x01) - set_lighting(0x0037, 0x06, 0x01) - set_lighting(0x0038, 0x05, 0x01) - set_lighting(0x0038, 0x06, 0x01) - set_lighting(0x0039, 0x05, 0x01) - set_lighting(0x0039, 0x06, 0x01) - set_lighting(0x003a, 0x05, 0x01) - set_lighting(0x003a, 0x06, 0x01) - set_lighting(0x003b, 0x06, 0x01) - set_lighting(0x003c, 0x06, 0x01) - set_lighting(0x003d, 0x06, 0x01) - set_lighting(0x003e, 0x05, 0x01) - set_lighting(0x003e, 0x06, 0x01) - set_lighting(0x003f, 0x05, 0x01) - set_lighting(0x003f, 0x06, 0x01) - set_lighting(0x0040, 0x05, 0x01) - set_lighting(0x0040, 0x06, 0x01) - set_lighting(0x0041, 0x05, 0x01) - set_lighting(0x0043, 0x05, 0x01) - set_lighting(0x0044, 0x05, 0x01) - set_lighting(0x0045, 0x05, 0x01) - set_lighting(0x0046, 0x05, 0x01) - set_lighting(0x0046, 0x06, 0x01) - set_lighting(0x0047, 0x05, 0x01) - set_lighting(0x0048, 0x05, 0x01) - set_lighting(0x0048, 0x06, 0x01) - set_lighting(0x0049, 0x05, 0x01) - set_lighting(0x004a, 0x05, 0x01) - set_lighting(0x004b, 0x05, 0x01) - set_lighting(0x004b, 0x06, 0x01) - set_lighting(0x004c, 0x05, 0x01) - set_lighting(0x004c, 0x06, 0x01) - set_lighting(0x004e, 0x05, 0x01) - set_lighting(0x004e, 0x06, 0x01) - set_lighting(0x004f, 0x06, 0x01) - set_lighting(0x0050, 0x05, 0x01) - set_lighting(0x0050, 0x06, 0x01) - set_lighting(0x0051, 0x06, 0x01) - set_lighting(0x0053, 0x05, 0x01) - set_lighting(0x0053, 0x06, 0x01) - set_lighting(0x0054, 0x06, 0x01) - set_lighting(0x0056, 0x05, 0x01) - set_lighting(0x0056, 0x06, 0x01) - set_lighting(0x0057, 0x05, 0x01) - set_lighting(0x0059, 0x05, 0x01) - set_lighting(0x0059, 0x06, 0x01) - set_lighting(0x005a, 0x06, 0x01) - set_lighting(0x005b, 0x05, 0x01) - set_lighting(0x005b, 0x06, 0x01) - set_lighting(0x005c, 0x06, 0x01) - set_lighting(0x005d, 0x06, 0x01) - set_lighting(0x005e, 0x06, 0x01) - set_lighting(0x005f, 0x06, 0x01) - set_lighting(0x0060, 0x06, 0x01) - set_lighting(0x0061, 0x05, 0x01) - set_lighting(0x0061, 0x06, 0x01) - set_lighting(0x0062, 0x05, 0x01) - set_lighting(0x0062, 0x06, 0x01) - set_lighting(0x0063, 0x06, 0x01) - set_lighting(0x0064, 0x06, 0x01) - set_lighting(0x0065, 0x06, 0x01) - set_lighting(0x0066, 0x05, 0x01) - set_lighting(0x0066, 0x06, 0x01) - set_lighting(0x0068, 0x05, 0x01) - set_lighting(0x0068, 0x06, 0x01) - set_lighting(0x0069, 0x06, 0x01) - set_lighting(0x006a, 0x06, 0x01) - set_lighting(0x006b, 0x06, 0x01) - set_lighting(0x006c, 0x06, 0x01) - set_lighting(0x006d, 0x06, 0x01) - set_lighting(0x006e, 0x06, 0x01) - set_lighting(0x006f, 0x06, 0x01) - set_lighting(0x0070, 0x05, 0x01) - set_lighting(0x0070, 0x06, 0x01) - set_lighting(0x0071, 0x05, 0x01) - set_lighting(0x0071, 0x06, 0x01) + misc_command(0x0027, 0x05, 0x01) + misc_command(0x0027, 0x06, 0x01) + misc_command(0x000c, 0x05, 0x01) + misc_command(0x000c, 0x06, 0x01) + misc_command(0x0029, 0x05, 0x01) + misc_command(0x0035, 0x05, 0x01) + misc_command(0x0035, 0x06, 0x01) + misc_command(0x0036, 0x06, 0x01) + misc_command(0x0037, 0x05, 0x01) + misc_command(0x0037, 0x06, 0x01) + misc_command(0x0038, 0x05, 0x01) + misc_command(0x0038, 0x06, 0x01) + misc_command(0x0039, 0x05, 0x01) + misc_command(0x0039, 0x06, 0x01) + misc_command(0x003a, 0x05, 0x01) + misc_command(0x003a, 0x06, 0x01) + misc_command(0x003b, 0x06, 0x01) + misc_command(0x003c, 0x06, 0x01) + misc_command(0x003d, 0x06, 0x01) + misc_command(0x003e, 0x05, 0x01) + misc_command(0x003e, 0x06, 0x01) + misc_command(0x003f, 0x05, 0x01) + misc_command(0x003f, 0x06, 0x01) + misc_command(0x0040, 0x05, 0x01) + misc_command(0x0040, 0x06, 0x01) + misc_command(0x0041, 0x05, 0x01) + misc_command(0x0043, 0x05, 0x01) + misc_command(0x0044, 0x05, 0x01) + misc_command(0x0045, 0x05, 0x01) + misc_command(0x0046, 0x05, 0x01) + misc_command(0x0046, 0x06, 0x01) + misc_command(0x0047, 0x05, 0x01) + misc_command(0x0048, 0x05, 0x01) + misc_command(0x0048, 0x06, 0x01) + misc_command(0x0049, 0x05, 0x01) + misc_command(0x004a, 0x05, 0x01) + misc_command(0x004b, 0x05, 0x01) + misc_command(0x004b, 0x06, 0x01) + misc_command(0x004c, 0x05, 0x01) + misc_command(0x004c, 0x06, 0x01) + misc_command(0x004e, 0x05, 0x01) + misc_command(0x004e, 0x06, 0x01) + misc_command(0x004f, 0x06, 0x01) + misc_command(0x0050, 0x05, 0x01) + misc_command(0x0050, 0x06, 0x01) + misc_command(0x0051, 0x06, 0x01) + misc_command(0x0053, 0x05, 0x01) + misc_command(0x0053, 0x06, 0x01) + misc_command(0x0054, 0x06, 0x01) + misc_command(0x0056, 0x05, 0x01) + misc_command(0x0056, 0x06, 0x01) + misc_command(0x0057, 0x05, 0x01) + misc_command(0x0059, 0x05, 0x01) + misc_command(0x0059, 0x06, 0x01) + misc_command(0x005a, 0x06, 0x01) + misc_command(0x005b, 0x05, 0x01) + misc_command(0x005b, 0x06, 0x01) + misc_command(0x005c, 0x06, 0x01) + misc_command(0x005d, 0x06, 0x01) + misc_command(0x005e, 0x06, 0x01) + misc_command(0x005f, 0x06, 0x01) + misc_command(0x0060, 0x06, 0x01) + misc_command(0x0061, 0x05, 0x01) + misc_command(0x0061, 0x06, 0x01) + misc_command(0x0062, 0x05, 0x01) + misc_command(0x0062, 0x06, 0x01) + misc_command(0x0063, 0x06, 0x01) + misc_command(0x0064, 0x06, 0x01) + misc_command(0x0065, 0x06, 0x01) + misc_command(0x0066, 0x05, 0x01) + misc_command(0x0066, 0x06, 0x01) + misc_command(0x0068, 0x05, 0x01) + misc_command(0x0068, 0x06, 0x01) + misc_command(0x0069, 0x06, 0x01) + misc_command(0x006a, 0x06, 0x01) + misc_command(0x006b, 0x06, 0x01) + misc_command(0x006c, 0x06, 0x01) + misc_command(0x006d, 0x06, 0x01) + misc_command(0x006e, 0x06, 0x01) + misc_command(0x006f, 0x06, 0x01) + misc_command(0x0070, 0x05, 0x01) + misc_command(0x0070, 0x06, 0x01) + misc_command(0x0071, 0x05, 0x01) + misc_command(0x0071, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupimp.c b/src/files/setup/setupimp.c index ec648dd2f..1e493a7a1 100644 --- a/src/files/setup/setupimp.c +++ b/src/files/setup/setupimp.c @@ -3823,12 +3823,12 @@ u8 func1029_setup_rtracker[] = { u8 func102a_setup_lighting[] = { yield - set_lighting(0x0045, 0x06, 0x01) - set_lighting(0x0046, 0x06, 0x01) - set_lighting(0x0047, 0x06, 0x01) - set_lighting(0x0048, 0x06, 0x01) - set_lighting(0x0055, 0x06, 0x01) - set_lighting(0x0056, 0x06, 0x01) + misc_command(0x0045, 0x06, 0x01) + misc_command(0x0046, 0x06, 0x01) + misc_command(0x0047, 0x06, 0x01) + misc_command(0x0048, 0x06, 0x01) + misc_command(0x0055, 0x06, 0x01) + misc_command(0x0056, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setuplee.c b/src/files/setup/setuplee.c index 5a1378f62..9921842b8 100644 --- a/src/files/setup/setuplee.c +++ b/src/files/setup/setuplee.c @@ -3606,7 +3606,7 @@ u8 unregistered_function1[] = { u8 func1423_setup_lighting[] = { yield - set_lighting(0x0000, 0x09, 0x01) + misc_command(0x0000, 0x09, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setuplip.c b/src/files/setup/setuplip.c index 628e9a314..c5eb580da 100644 --- a/src/files/setup/setuplip.c +++ b/src/files/setup/setuplip.c @@ -1025,19 +1025,19 @@ u8 func1004_uplink_lights[] = { message(CHR_P1P2, 0x2a17) // "Virus downloaded to console." yield message(CHR_P1P2, 0x2a58) // "Lighting systems overloaded." - set_lighting(0x00c4, 0x0c, 0x6e) - set_lighting(0x00c3, 0x0c, 0x6e) - set_lighting(0x00c8, 0x0c, 0x6e) - set_lighting(0x00c9, 0x0c, 0x6e) - set_lighting(0x00ca, 0x0c, 0x6e) - set_lighting(0x00c7, 0x0c, 0x6e) - set_lighting(0x00c2, 0x0c, 0x6e) - set_lighting(0x00c1, 0x0c, 0x6e) - set_lighting(0x00c0, 0x0c, 0x6e) - set_lighting(0x00bf, 0x0c, 0x6e) - set_lighting(0x00c6, 0x0c, 0x6e) - set_lighting(0x00c5, 0x0c, 0x6e) - set_lighting(0x00a6, 0x0c, 0x6e) + misc_command(0x00c4, 0x0c, 0x6e) + misc_command(0x00c3, 0x0c, 0x6e) + misc_command(0x00c8, 0x0c, 0x6e) + misc_command(0x00c9, 0x0c, 0x6e) + misc_command(0x00ca, 0x0c, 0x6e) + misc_command(0x00c7, 0x0c, 0x6e) + misc_command(0x00c2, 0x0c, 0x6e) + misc_command(0x00c1, 0x0c, 0x6e) + misc_command(0x00c0, 0x0c, 0x6e) + misc_command(0x00bf, 0x0c, 0x6e) + misc_command(0x00c6, 0x0c, 0x6e) + misc_command(0x00c5, 0x0c, 0x6e) + misc_command(0x00a6, 0x0c, 0x6e) set_stage_flag(STAGEFLAG_LIGHT_VIRUS_DONE) reloop(0x04) @@ -4525,97 +4525,97 @@ u8 func1034_setup_rtracker[] = { u8 func1435_setup_lighting[] = { yield - set_lighting(0x007c, 0x05, 0x01) - set_lighting(0x007d, 0x05, 0x01) - set_lighting(0x007e, 0x05, 0x01) - set_lighting(0x007f, 0x05, 0x01) - set_lighting(0x0080, 0x05, 0x01) - set_lighting(0x0081, 0x05, 0x01) - set_lighting(0x0082, 0x05, 0x01) - set_lighting(0x0083, 0x05, 0x01) - set_lighting(0x0084, 0x05, 0x01) - set_lighting(0x0085, 0x05, 0x01) - set_lighting(0x0086, 0x05, 0x01) - set_lighting(0x0087, 0x05, 0x01) - set_lighting(0x0088, 0x05, 0x01) - set_lighting(0x0089, 0x05, 0x01) - set_lighting(0x008a, 0x05, 0x01) - set_lighting(0x008b, 0x05, 0x01) - set_lighting(0x008c, 0x05, 0x01) - set_lighting(0x008d, 0x05, 0x01) - set_lighting(0x008e, 0x05, 0x01) - set_lighting(0x008f, 0x05, 0x01) - set_lighting(0x0090, 0x05, 0x01) - set_lighting(0x0091, 0x05, 0x01) - set_lighting(0x0092, 0x05, 0x01) - set_lighting(0x0093, 0x05, 0x01) - set_lighting(0x0094, 0x05, 0x01) - set_lighting(0x0095, 0x05, 0x01) - set_lighting(0x0096, 0x05, 0x01) - set_lighting(0x0097, 0x05, 0x01) - set_lighting(0x0098, 0x05, 0x01) - set_lighting(0x0099, 0x05, 0x01) - set_lighting(0x009a, 0x05, 0x01) - set_lighting(0x009b, 0x05, 0x01) - set_lighting(0x00a5, 0x05, 0x01) - set_lighting(0x00a6, 0x05, 0x01) - set_lighting(0x00a7, 0x05, 0x01) - set_lighting(0x00a8, 0x05, 0x01) - set_lighting(0x00a9, 0x05, 0x01) - set_lighting(0x00aa, 0x05, 0x01) - set_lighting(0x00ab, 0x05, 0x01) - set_lighting(0x00ac, 0x05, 0x01) - set_lighting(0x00ad, 0x05, 0x01) - set_lighting(0x00ae, 0x05, 0x01) - set_lighting(0x00af, 0x05, 0x01) - set_lighting(0x00b0, 0x05, 0x01) - set_lighting(0x00b1, 0x05, 0x01) - set_lighting(0x00b3, 0x05, 0x01) - set_lighting(0x00b4, 0x05, 0x01) - set_lighting(0x00b5, 0x05, 0x01) - set_lighting(0x00b6, 0x05, 0x01) - set_lighting(0x00b7, 0x05, 0x01) - set_lighting(0x00b8, 0x05, 0x01) - set_lighting(0x00b9, 0x05, 0x01) - set_lighting(0x00ba, 0x05, 0x01) - set_lighting(0x00bb, 0x05, 0x01) - set_lighting(0x00bc, 0x05, 0x01) - set_lighting(0x00be, 0x05, 0x01) - set_lighting(0x00bf, 0x05, 0x01) - set_lighting(0x00c0, 0x05, 0x01) - set_lighting(0x00c1, 0x05, 0x01) - set_lighting(0x00c2, 0x05, 0x01) - set_lighting(0x00c3, 0x05, 0x01) - set_lighting(0x00c4, 0x05, 0x01) - set_lighting(0x00c5, 0x05, 0x01) - set_lighting(0x00c6, 0x05, 0x01) - set_lighting(0x00c7, 0x05, 0x01) - set_lighting(0x00c8, 0x05, 0x01) - set_lighting(0x00c9, 0x05, 0x01) - set_lighting(0x00ca, 0x05, 0x01) - set_lighting(0x00cb, 0x05, 0x01) - set_lighting(0x00f2, 0x05, 0x01) - set_lighting(0x00fa, 0x05, 0x01) - set_lighting(0x00fb, 0x05, 0x01) - set_lighting(0x00fc, 0x05, 0x01) - set_lighting(0x00fd, 0x05, 0x01) - set_lighting(0x00fe, 0x05, 0x01) - set_lighting(0x00ff, 0x05, 0x01) - set_lighting(0x0100, 0x05, 0x01) - set_lighting(0x0101, 0x05, 0x01) - set_lighting(0x0102, 0x05, 0x01) - set_lighting(0x0103, 0x05, 0x01) - set_lighting(0x0104, 0x05, 0x01) - set_lighting(0x0105, 0x05, 0x01) - set_lighting(0x0106, 0x05, 0x01) - set_lighting(0x0107, 0x05, 0x01) - set_lighting(0x0108, 0x05, 0x01) - set_lighting(0x0109, 0x05, 0x01) - set_lighting(0x010a, 0x05, 0x01) - set_lighting(0x010b, 0x05, 0x01) - set_lighting(0x010c, 0x05, 0x01) - set_lighting(0x010d, 0x05, 0x01) - set_lighting(0x010e, 0x05, 0x01) + misc_command(0x007c, 0x05, 0x01) + misc_command(0x007d, 0x05, 0x01) + misc_command(0x007e, 0x05, 0x01) + misc_command(0x007f, 0x05, 0x01) + misc_command(0x0080, 0x05, 0x01) + misc_command(0x0081, 0x05, 0x01) + misc_command(0x0082, 0x05, 0x01) + misc_command(0x0083, 0x05, 0x01) + misc_command(0x0084, 0x05, 0x01) + misc_command(0x0085, 0x05, 0x01) + misc_command(0x0086, 0x05, 0x01) + misc_command(0x0087, 0x05, 0x01) + misc_command(0x0088, 0x05, 0x01) + misc_command(0x0089, 0x05, 0x01) + misc_command(0x008a, 0x05, 0x01) + misc_command(0x008b, 0x05, 0x01) + misc_command(0x008c, 0x05, 0x01) + misc_command(0x008d, 0x05, 0x01) + misc_command(0x008e, 0x05, 0x01) + misc_command(0x008f, 0x05, 0x01) + misc_command(0x0090, 0x05, 0x01) + misc_command(0x0091, 0x05, 0x01) + misc_command(0x0092, 0x05, 0x01) + misc_command(0x0093, 0x05, 0x01) + misc_command(0x0094, 0x05, 0x01) + misc_command(0x0095, 0x05, 0x01) + misc_command(0x0096, 0x05, 0x01) + misc_command(0x0097, 0x05, 0x01) + misc_command(0x0098, 0x05, 0x01) + misc_command(0x0099, 0x05, 0x01) + misc_command(0x009a, 0x05, 0x01) + misc_command(0x009b, 0x05, 0x01) + misc_command(0x00a5, 0x05, 0x01) + misc_command(0x00a6, 0x05, 0x01) + misc_command(0x00a7, 0x05, 0x01) + misc_command(0x00a8, 0x05, 0x01) + misc_command(0x00a9, 0x05, 0x01) + misc_command(0x00aa, 0x05, 0x01) + misc_command(0x00ab, 0x05, 0x01) + misc_command(0x00ac, 0x05, 0x01) + misc_command(0x00ad, 0x05, 0x01) + misc_command(0x00ae, 0x05, 0x01) + misc_command(0x00af, 0x05, 0x01) + misc_command(0x00b0, 0x05, 0x01) + misc_command(0x00b1, 0x05, 0x01) + misc_command(0x00b3, 0x05, 0x01) + misc_command(0x00b4, 0x05, 0x01) + misc_command(0x00b5, 0x05, 0x01) + misc_command(0x00b6, 0x05, 0x01) + misc_command(0x00b7, 0x05, 0x01) + misc_command(0x00b8, 0x05, 0x01) + misc_command(0x00b9, 0x05, 0x01) + misc_command(0x00ba, 0x05, 0x01) + misc_command(0x00bb, 0x05, 0x01) + misc_command(0x00bc, 0x05, 0x01) + misc_command(0x00be, 0x05, 0x01) + misc_command(0x00bf, 0x05, 0x01) + misc_command(0x00c0, 0x05, 0x01) + misc_command(0x00c1, 0x05, 0x01) + misc_command(0x00c2, 0x05, 0x01) + misc_command(0x00c3, 0x05, 0x01) + misc_command(0x00c4, 0x05, 0x01) + misc_command(0x00c5, 0x05, 0x01) + misc_command(0x00c6, 0x05, 0x01) + misc_command(0x00c7, 0x05, 0x01) + misc_command(0x00c8, 0x05, 0x01) + misc_command(0x00c9, 0x05, 0x01) + misc_command(0x00ca, 0x05, 0x01) + misc_command(0x00cb, 0x05, 0x01) + misc_command(0x00f2, 0x05, 0x01) + misc_command(0x00fa, 0x05, 0x01) + misc_command(0x00fb, 0x05, 0x01) + misc_command(0x00fc, 0x05, 0x01) + misc_command(0x00fd, 0x05, 0x01) + misc_command(0x00fe, 0x05, 0x01) + misc_command(0x00ff, 0x05, 0x01) + misc_command(0x0100, 0x05, 0x01) + misc_command(0x0101, 0x05, 0x01) + misc_command(0x0102, 0x05, 0x01) + misc_command(0x0103, 0x05, 0x01) + misc_command(0x0104, 0x05, 0x01) + misc_command(0x0105, 0x05, 0x01) + misc_command(0x0106, 0x05, 0x01) + misc_command(0x0107, 0x05, 0x01) + misc_command(0x0108, 0x05, 0x01) + misc_command(0x0109, 0x05, 0x01) + misc_command(0x010a, 0x05, 0x01) + misc_command(0x010b, 0x05, 0x01) + misc_command(0x010c, 0x05, 0x01) + misc_command(0x010d, 0x05, 0x01) + misc_command(0x010e, 0x05, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c index a8a14c01c..eee611941 100644 --- a/src/files/setup/setuplue.c +++ b/src/files/setup/setuplue.c @@ -3222,50 +3222,50 @@ u8 func102e_setup_rtracker[] = { u8 func142f_setup_lighting[] = { yield - set_lighting(0x0000, 0x00, 0x00) - set_lighting(0x0000, 0x01, 0x00) - set_lighting(0x0000, 0x02, 0x00) - set_lighting(0x0000, 0x03, 0x00) - set_lighting(0x0000, 0x04, 0x00) - set_lighting(0x0001, 0x06, 0x01) - set_lighting(0x0002, 0x05, 0x01) - set_lighting(0x0002, 0x06, 0x01) - set_lighting(0x0003, 0x05, 0x01) - set_lighting(0x0004, 0x05, 0x01) - set_lighting(0x0005, 0x05, 0x01) - set_lighting(0x0005, 0x06, 0x01) - set_lighting(0x0006, 0x05, 0x01) - set_lighting(0x0006, 0x06, 0x01) - set_lighting(0x0007, 0x05, 0x01) - set_lighting(0x0007, 0x06, 0x01) - set_lighting(0x0008, 0x05, 0x01) - set_lighting(0x0008, 0x06, 0x01) - set_lighting(0x000a, 0x05, 0x01) - set_lighting(0x000b, 0x05, 0x01) - set_lighting(0x000e, 0x05, 0x01) - set_lighting(0x0010, 0x05, 0x01) - set_lighting(0x0011, 0x05, 0x01) - set_lighting(0x0012, 0x05, 0x01) - set_lighting(0x0013, 0x05, 0x01) - set_lighting(0x0013, 0x06, 0x01) - set_lighting(0x0014, 0x05, 0x01) - set_lighting(0x0014, 0x06, 0x01) - set_lighting(0x0015, 0x05, 0x01) - set_lighting(0x0015, 0x06, 0x01) - set_lighting(0x0016, 0x05, 0x01) - set_lighting(0x0018, 0x05, 0x01) - set_lighting(0x0019, 0x05, 0x01) - set_lighting(0x001a, 0x05, 0x01) - set_lighting(0x001b, 0x05, 0x01) - set_lighting(0x001c, 0x05, 0x01) - set_lighting(0x001d, 0x05, 0x01) - set_lighting(0x001e, 0x05, 0x01) - set_lighting(0x001e, 0x06, 0x01) - set_lighting(0x001f, 0x05, 0x01) - set_lighting(0x001f, 0x06, 0x01) - set_lighting(0x0020, 0x05, 0x01) - set_lighting(0x0020, 0x06, 0x01) - set_lighting(0x0017, 0x05, 0x01) + misc_command(0x0000, 0x00, 0x00) + misc_command(0x0000, 0x01, 0x00) + misc_command(0x0000, 0x02, 0x00) + misc_command(0x0000, 0x03, 0x00) + misc_command(0x0000, 0x04, 0x00) + misc_command(0x0001, 0x06, 0x01) + misc_command(0x0002, 0x05, 0x01) + misc_command(0x0002, 0x06, 0x01) + misc_command(0x0003, 0x05, 0x01) + misc_command(0x0004, 0x05, 0x01) + misc_command(0x0005, 0x05, 0x01) + misc_command(0x0005, 0x06, 0x01) + misc_command(0x0006, 0x05, 0x01) + misc_command(0x0006, 0x06, 0x01) + misc_command(0x0007, 0x05, 0x01) + misc_command(0x0007, 0x06, 0x01) + misc_command(0x0008, 0x05, 0x01) + misc_command(0x0008, 0x06, 0x01) + misc_command(0x000a, 0x05, 0x01) + misc_command(0x000b, 0x05, 0x01) + misc_command(0x000e, 0x05, 0x01) + misc_command(0x0010, 0x05, 0x01) + misc_command(0x0011, 0x05, 0x01) + misc_command(0x0012, 0x05, 0x01) + misc_command(0x0013, 0x05, 0x01) + misc_command(0x0013, 0x06, 0x01) + misc_command(0x0014, 0x05, 0x01) + misc_command(0x0014, 0x06, 0x01) + misc_command(0x0015, 0x05, 0x01) + misc_command(0x0015, 0x06, 0x01) + misc_command(0x0016, 0x05, 0x01) + misc_command(0x0018, 0x05, 0x01) + misc_command(0x0019, 0x05, 0x01) + misc_command(0x001a, 0x05, 0x01) + misc_command(0x001b, 0x05, 0x01) + misc_command(0x001c, 0x05, 0x01) + misc_command(0x001d, 0x05, 0x01) + misc_command(0x001e, 0x05, 0x01) + misc_command(0x001e, 0x06, 0x01) + misc_command(0x001f, 0x05, 0x01) + misc_command(0x001f, 0x06, 0x01) + misc_command(0x0020, 0x05, 0x01) + misc_command(0x0020, 0x06, 0x01) + misc_command(0x0017, 0x05, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setuppam.c b/src/files/setup/setuppam.c index 10d345436..142606a1b 100644 --- a/src/files/setup/setuppam.c +++ b/src/files/setup/setuppam.c @@ -4673,15 +4673,15 @@ u8 func1032_setup_rtracker[] = { u8 func1433_setup_lighting[] = { yield - set_lighting(0x0000, 0x09, 0x01) - set_lighting(0x0002, 0x05, 0x00) - set_lighting(0x0003, 0x05, 0x00) - set_lighting(0x0004, 0x05, 0x00) - set_lighting(0x0006, 0x05, 0x00) - set_lighting(0x0007, 0x05, 0x00) - set_lighting(0x0008, 0x05, 0x00) - set_lighting(0x000c, 0x05, 0x00) - set_lighting(0x000d, 0x05, 0x00) + misc_command(0x0000, 0x09, 0x01) + misc_command(0x0002, 0x05, 0x00) + misc_command(0x0003, 0x05, 0x00) + misc_command(0x0004, 0x05, 0x00) + misc_command(0x0006, 0x05, 0x00) + misc_command(0x0007, 0x05, 0x00) + misc_command(0x0008, 0x05, 0x00) + misc_command(0x000c, 0x05, 0x00) + misc_command(0x000d, 0x05, 0x00) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c index b48ec89c9..8540ee82b 100644 --- a/src/files/setup/setuppete.c +++ b/src/files/setup/setuppete.c @@ -3126,68 +3126,68 @@ u8 func040d_limo_flags[] = { u8 func1423_setup_lighting[] = { yield - set_lighting(0x0000, 0x00, 0x00) - set_lighting(0x0000, 0x01, 0x00) - set_lighting(0x0000, 0x02, 0x00) - set_lighting(0x0000, 0x03, 0x00) - set_lighting(0x0000, 0x04, 0x00) - set_lighting(0x0002, 0x05, 0x01) - set_lighting(0x0003, 0x05, 0x01) - set_lighting(0x000f, 0x05, 0x01) - set_lighting(0x0010, 0x05, 0x01) - set_lighting(0x0011, 0x05, 0x01) - set_lighting(0x0012, 0x05, 0x01) - set_lighting(0x0013, 0x05, 0x01) - set_lighting(0x0014, 0x05, 0x01) - set_lighting(0x0015, 0x05, 0x01) - set_lighting(0x0017, 0x05, 0x01) - set_lighting(0x0018, 0x05, 0x01) - set_lighting(0x0019, 0x05, 0x01) - set_lighting(0x001a, 0x05, 0x01) - set_lighting(0x001c, 0x05, 0x01) - set_lighting(0x001d, 0x05, 0x01) - set_lighting(0x001f, 0x05, 0x01) - set_lighting(0x0021, 0x05, 0x01) - set_lighting(0x0022, 0x05, 0x01) - set_lighting(0x0025, 0x05, 0x01) - set_lighting(0x0026, 0x05, 0x01) - set_lighting(0x0027, 0x05, 0x01) - set_lighting(0x0028, 0x05, 0x01) - set_lighting(0x002c, 0x05, 0x01) - set_lighting(0x002d, 0x05, 0x01) - set_lighting(0x002e, 0x05, 0x01) - set_lighting(0x0031, 0x05, 0x01) - set_lighting(0x0032, 0x05, 0x01) - set_lighting(0x0037, 0x05, 0x01) - set_lighting(0x0038, 0x05, 0x01) - set_lighting(0x0039, 0x05, 0x01) - set_lighting(0x003a, 0x05, 0x01) - set_lighting(0x003d, 0x05, 0x01) - set_lighting(0x003e, 0x05, 0x01) - set_lighting(0x003f, 0x05, 0x01) - set_lighting(0x0043, 0x05, 0x01) - set_lighting(0x0044, 0x05, 0x01) - set_lighting(0x0045, 0x05, 0x01) - set_lighting(0x004a, 0x05, 0x01) - set_lighting(0x004b, 0x05, 0x01) - set_lighting(0x004c, 0x05, 0x01) - set_lighting(0x004e, 0x05, 0x01) - set_lighting(0x0050, 0x05, 0x01) - set_lighting(0x0051, 0x05, 0x01) - set_lighting(0x0052, 0x05, 0x01) - set_lighting(0x0059, 0x05, 0x01) - set_lighting(0x005a, 0x05, 0x01) - set_lighting(0x005b, 0x05, 0x01) - set_lighting(0x005c, 0x05, 0x01) - set_lighting(0x005d, 0x05, 0x01) - set_lighting(0x005f, 0x05, 0x01) - set_lighting(0x0060, 0x05, 0x01) - set_lighting(0x0061, 0x05, 0x01) - set_lighting(0x0062, 0x05, 0x01) - set_lighting(0x0064, 0x05, 0x01) - set_lighting(0x0066, 0x05, 0x01) - set_lighting(0x0067, 0x05, 0x01) - set_lighting(0x0068, 0x05, 0x01) + misc_command(0x0000, 0x00, 0x00) + misc_command(0x0000, 0x01, 0x00) + misc_command(0x0000, 0x02, 0x00) + misc_command(0x0000, 0x03, 0x00) + misc_command(0x0000, 0x04, 0x00) + misc_command(0x0002, 0x05, 0x01) + misc_command(0x0003, 0x05, 0x01) + misc_command(0x000f, 0x05, 0x01) + misc_command(0x0010, 0x05, 0x01) + misc_command(0x0011, 0x05, 0x01) + misc_command(0x0012, 0x05, 0x01) + misc_command(0x0013, 0x05, 0x01) + misc_command(0x0014, 0x05, 0x01) + misc_command(0x0015, 0x05, 0x01) + misc_command(0x0017, 0x05, 0x01) + misc_command(0x0018, 0x05, 0x01) + misc_command(0x0019, 0x05, 0x01) + misc_command(0x001a, 0x05, 0x01) + misc_command(0x001c, 0x05, 0x01) + misc_command(0x001d, 0x05, 0x01) + misc_command(0x001f, 0x05, 0x01) + misc_command(0x0021, 0x05, 0x01) + misc_command(0x0022, 0x05, 0x01) + misc_command(0x0025, 0x05, 0x01) + misc_command(0x0026, 0x05, 0x01) + misc_command(0x0027, 0x05, 0x01) + misc_command(0x0028, 0x05, 0x01) + misc_command(0x002c, 0x05, 0x01) + misc_command(0x002d, 0x05, 0x01) + misc_command(0x002e, 0x05, 0x01) + misc_command(0x0031, 0x05, 0x01) + misc_command(0x0032, 0x05, 0x01) + misc_command(0x0037, 0x05, 0x01) + misc_command(0x0038, 0x05, 0x01) + misc_command(0x0039, 0x05, 0x01) + misc_command(0x003a, 0x05, 0x01) + misc_command(0x003d, 0x05, 0x01) + misc_command(0x003e, 0x05, 0x01) + misc_command(0x003f, 0x05, 0x01) + misc_command(0x0043, 0x05, 0x01) + misc_command(0x0044, 0x05, 0x01) + misc_command(0x0045, 0x05, 0x01) + misc_command(0x004a, 0x05, 0x01) + misc_command(0x004b, 0x05, 0x01) + misc_command(0x004c, 0x05, 0x01) + misc_command(0x004e, 0x05, 0x01) + misc_command(0x0050, 0x05, 0x01) + misc_command(0x0051, 0x05, 0x01) + misc_command(0x0052, 0x05, 0x01) + misc_command(0x0059, 0x05, 0x01) + misc_command(0x005a, 0x05, 0x01) + misc_command(0x005b, 0x05, 0x01) + misc_command(0x005c, 0x05, 0x01) + misc_command(0x005d, 0x05, 0x01) + misc_command(0x005f, 0x05, 0x01) + misc_command(0x0060, 0x05, 0x01) + misc_command(0x0061, 0x05, 0x01) + misc_command(0x0062, 0x05, 0x01) + misc_command(0x0064, 0x05, 0x01) + misc_command(0x0066, 0x05, 0x01) + misc_command(0x0067, 0x05, 0x01) + misc_command(0x0068, 0x05, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setuprit.c b/src/files/setup/setuprit.c index e98dbc6e1..514f55e93 100644 --- a/src/files/setup/setuprit.c +++ b/src/files/setup/setuprit.c @@ -1151,7 +1151,7 @@ u8 func100a_autopilot_switch[] = { endloop(0x0e) label(0x06) - set_lighting(0x0000, 0x0d, 0x00) + misc_command(0x0000, 0x0d, 0x00) set_function(CHR_SELF, GFUNC_IDLE) // Switch destroyed @@ -1883,7 +1883,7 @@ u8 func100c_cockpit[] = { endloop(0x0f) label(0x2d) - set_lighting(0x0000, 0x0a, 0x3c) + misc_command(0x0000, 0x0a, 0x3c) // Wait 40 seconds or for autopilot restart_timer @@ -3423,7 +3423,7 @@ u8 func0c02_outro_from_menu[] = { }; u8 func0423_outro[] = { - set_lighting(0x0000, 0x0d, 0x00) + misc_command(0x0000, 0x0d, 0x00) if_chr_death_animation_finished(CHR_BOND, /*goto*/ 0x2d) set_target_chr(CHR_BOND) goto_next(0x06) @@ -3432,7 +3432,7 @@ u8 func0423_outro[] = { label(0x06) camera_movement(0x02d8) set_music_track(MUSIC_AIRFORCEONE_OUTRO) - set_lighting(0x0000, 0x0d, 0x00) + misc_command(0x0000, 0x0d, 0x00) set_chr_flag_bank3(CHR_ANTI, CHRFLAG3_HIDDEN) set_chr_flag_bank3(0xf1, CHRFLAG3_HIDDEN) set_chr_flag_bank3(CHR_P1P2, CHRFLAG3_HIDDEN) @@ -3544,7 +3544,7 @@ u8 func0423_outro[] = { mute_channel(CHANNEL_10) label(0x06) restart_default_music - set_lighting(0x0000, 0x0d, 0x00) + misc_command(0x0000, 0x0d, 0x00) hide_object(0x19) hide_object(0x1a) set_chr_hud_visible(CHR_TARGET, FALSE) @@ -3852,31 +3852,31 @@ u8 func101f_setup_rtracker[] = { u8 func1420_setup_lighting[] = { yield - set_lighting(0x001a, 0x05, 0x01) - set_lighting(0x001b, 0x05, 0x01) - set_lighting(0x002b, 0x05, 0x01) - set_lighting(0x002d, 0x05, 0x01) - set_lighting(0x002e, 0x05, 0x01) - set_lighting(0x002f, 0x05, 0x01) - set_lighting(0x0030, 0x05, 0x01) - set_lighting(0x0031, 0x05, 0x01) - set_lighting(0x0032, 0x05, 0x01) - set_lighting(0x0033, 0x05, 0x01) - set_lighting(0x0034, 0x05, 0x01) - set_lighting(0x0035, 0x05, 0x01) - set_lighting(0x0036, 0x05, 0x01) - set_lighting(0x0037, 0x05, 0x01) - set_lighting(0x0038, 0x05, 0x01) - set_lighting(0x0039, 0x05, 0x01) - set_lighting(0x003b, 0x05, 0x01) - set_lighting(0x003c, 0x05, 0x01) - set_lighting(0x003e, 0x05, 0x01) - set_lighting(0x003f, 0x05, 0x01) - set_lighting(0x0040, 0x05, 0x01) - set_lighting(0x0041, 0x05, 0x01) - set_lighting(0x0042, 0x05, 0x01) - set_lighting(0x0043, 0x05, 0x01) - set_lighting(0x0059, 0x05, 0x01) + misc_command(0x001a, 0x05, 0x01) + misc_command(0x001b, 0x05, 0x01) + misc_command(0x002b, 0x05, 0x01) + misc_command(0x002d, 0x05, 0x01) + misc_command(0x002e, 0x05, 0x01) + misc_command(0x002f, 0x05, 0x01) + misc_command(0x0030, 0x05, 0x01) + misc_command(0x0031, 0x05, 0x01) + misc_command(0x0032, 0x05, 0x01) + misc_command(0x0033, 0x05, 0x01) + misc_command(0x0034, 0x05, 0x01) + misc_command(0x0035, 0x05, 0x01) + misc_command(0x0036, 0x05, 0x01) + misc_command(0x0037, 0x05, 0x01) + misc_command(0x0038, 0x05, 0x01) + misc_command(0x0039, 0x05, 0x01) + misc_command(0x003b, 0x05, 0x01) + misc_command(0x003c, 0x05, 0x01) + misc_command(0x003e, 0x05, 0x01) + misc_command(0x003f, 0x05, 0x01) + misc_command(0x0040, 0x05, 0x01) + misc_command(0x0041, 0x05, 0x01) + misc_command(0x0042, 0x05, 0x01) + misc_command(0x0043, 0x05, 0x01) + misc_command(0x0059, 0x05, 0x01) set_function(CHR_SELF, GFUNC_IDLE) set_function(CHR_SELF, GFUNC_IDLE) endfunction diff --git a/src/files/setup/setupsev.c b/src/files/setup/setupsev.c index dbd4865f4..858e64404 100644 --- a/src/files/setup/setupsev.c +++ b/src/files/setup/setupsev.c @@ -1672,162 +1672,162 @@ u8 func100e_break_glass[] = { u8 func100f_init_lighting[] = { yield - set_lighting(0x0000, 0x00, 0x00) - set_lighting(0x0000, 0x01, 0x00) - set_lighting(0x0000, 0x02, 0x00) - set_lighting(0x0000, 0x03, 0x00) - set_lighting(0x0000, 0x04, 0x00) - set_lighting(0x00d3, 0x06, 0x01) - set_lighting(0x00d4, 0x06, 0x01) - set_lighting(0x00d5, 0x06, 0x01) - set_lighting(0x00d6, 0x06, 0x01) - set_lighting(0x00d7, 0x06, 0x01) - set_lighting(0x00d8, 0x06, 0x01) - set_lighting(0x00d9, 0x06, 0x01) - set_lighting(0x00da, 0x06, 0x01) - set_lighting(0x00db, 0x06, 0x01) - set_lighting(0x0024, 0x05, 0x01) - set_lighting(0x0025, 0x05, 0x01) - set_lighting(0x0026, 0x05, 0x01) - set_lighting(0x0027, 0x05, 0x01) - set_lighting(0x0028, 0x05, 0x01) - set_lighting(0x0029, 0x05, 0x01) - set_lighting(0x002a, 0x05, 0x01) - set_lighting(0x002b, 0x05, 0x01) - set_lighting(0x002c, 0x05, 0x01) - set_lighting(0x002d, 0x05, 0x01) - set_lighting(0x002e, 0x05, 0x01) - set_lighting(0x002f, 0x05, 0x01) - set_lighting(0x0030, 0x05, 0x01) - set_lighting(0x0032, 0x05, 0x01) - set_lighting(0x0033, 0x05, 0x01) - set_lighting(0x0034, 0x05, 0x01) - set_lighting(0x0035, 0x05, 0x01) - set_lighting(0x0036, 0x05, 0x01) - set_lighting(0x0037, 0x05, 0x01) - set_lighting(0x0038, 0x05, 0x01) - set_lighting(0x0039, 0x05, 0x01) - set_lighting(0x003a, 0x05, 0x01) - set_lighting(0x003b, 0x05, 0x01) - set_lighting(0x003c, 0x05, 0x01) - set_lighting(0x003d, 0x05, 0x01) - set_lighting(0x003e, 0x05, 0x01) - set_lighting(0x003f, 0x05, 0x01) - set_lighting(0x005b, 0x05, 0x01) - set_lighting(0x005d, 0x05, 0x01) - set_lighting(0x0079, 0x05, 0x01) - set_lighting(0x007a, 0x05, 0x01) - set_lighting(0x007b, 0x05, 0x01) - set_lighting(0x007c, 0x05, 0x01) - set_lighting(0x007d, 0x05, 0x01) - set_lighting(0x007e, 0x05, 0x01) - set_lighting(0x007f, 0x05, 0x01) - set_lighting(0x0080, 0x05, 0x01) - set_lighting(0x0081, 0x05, 0x01) - set_lighting(0x0082, 0x05, 0x01) - set_lighting(0x008b, 0x05, 0x01) - set_lighting(0x008c, 0x05, 0x01) - set_lighting(0x008d, 0x05, 0x01) - set_lighting(0x008e, 0x05, 0x01) - set_lighting(0x008f, 0x05, 0x01) - set_lighting(0x0090, 0x05, 0x01) - set_lighting(0x0091, 0x05, 0x01) - set_lighting(0x0092, 0x05, 0x01) - set_lighting(0x0093, 0x05, 0x01) - set_lighting(0x0094, 0x05, 0x01) - set_lighting(0x0095, 0x05, 0x01) - set_lighting(0x0096, 0x05, 0x01) - set_lighting(0x0097, 0x05, 0x01) - set_lighting(0x0098, 0x05, 0x01) - set_lighting(0x0099, 0x05, 0x01) - set_lighting(0x009a, 0x05, 0x01) - set_lighting(0x009b, 0x05, 0x01) - set_lighting(0x00a5, 0x05, 0x01) - set_lighting(0x00a6, 0x05, 0x01) - set_lighting(0x00a7, 0x05, 0x01) - set_lighting(0x00a8, 0x05, 0x01) - set_lighting(0x00a9, 0x05, 0x01) - set_lighting(0x00aa, 0x05, 0x01) - set_lighting(0x00ab, 0x05, 0x01) - set_lighting(0x00ac, 0x05, 0x01) - set_lighting(0x00ad, 0x05, 0x01) - set_lighting(0x00ae, 0x05, 0x01) - set_lighting(0x00af, 0x05, 0x01) - set_lighting(0x00b0, 0x05, 0x01) - set_lighting(0x00b1, 0x05, 0x01) - set_lighting(0x00b2, 0x05, 0x01) - set_lighting(0x00b3, 0x05, 0x01) - set_lighting(0x00b4, 0x05, 0x01) - set_lighting(0x00b5, 0x05, 0x01) - set_lighting(0x00b6, 0x05, 0x01) - set_lighting(0x00b7, 0x05, 0x01) - set_lighting(0x00b8, 0x05, 0x01) - set_lighting(0x00b9, 0x05, 0x01) - set_lighting(0x00ba, 0x05, 0x01) - set_lighting(0x00bb, 0x05, 0x01) - set_lighting(0x00bc, 0x05, 0x01) - set_lighting(0x00be, 0x05, 0x01) - set_lighting(0x00bf, 0x05, 0x01) - set_lighting(0x00c0, 0x05, 0x01) - set_lighting(0x00c1, 0x05, 0x01) - set_lighting(0x00c2, 0x05, 0x01) - set_lighting(0x00c3, 0x05, 0x01) - set_lighting(0x00c4, 0x05, 0x01) - set_lighting(0x00c5, 0x05, 0x01) - set_lighting(0x00c6, 0x05, 0x01) - set_lighting(0x00c7, 0x05, 0x01) - set_lighting(0x00c8, 0x05, 0x01) - set_lighting(0x00c9, 0x05, 0x01) - set_lighting(0x00ca, 0x05, 0x01) - set_lighting(0x00cc, 0x05, 0x01) - set_lighting(0x00cd, 0x05, 0x01) - set_lighting(0x00ce, 0x05, 0x01) - set_lighting(0x00cf, 0x05, 0x01) - set_lighting(0x00d0, 0x05, 0x01) - set_lighting(0x00d1, 0x05, 0x01) - set_lighting(0x00d2, 0x05, 0x01) - set_lighting(0x00dc, 0x05, 0x01) - set_lighting(0x00dd, 0x05, 0x01) - set_lighting(0x00de, 0x05, 0x01) - set_lighting(0x00df, 0x05, 0x01) - set_lighting(0x00e0, 0x05, 0x01) - set_lighting(0x00e1, 0x05, 0x01) - set_lighting(0x00e2, 0x05, 0x01) - set_lighting(0x00e3, 0x05, 0x01) - set_lighting(0x00e4, 0x05, 0x01) - set_lighting(0x00e5, 0x05, 0x01) - set_lighting(0x00e6, 0x05, 0x01) - set_lighting(0x00f2, 0x05, 0x01) - set_lighting(0x00fa, 0x05, 0x01) - set_lighting(0x00fb, 0x05, 0x01) - set_lighting(0x00fc, 0x05, 0x01) - set_lighting(0x00fd, 0x05, 0x01) - set_lighting(0x00fe, 0x05, 0x01) - set_lighting(0x00ff, 0x05, 0x01) - set_lighting(0x0100, 0x05, 0x01) - set_lighting(0x0101, 0x05, 0x01) - set_lighting(0x0102, 0x05, 0x01) - set_lighting(0x0103, 0x05, 0x01) - set_lighting(0x0104, 0x05, 0x01) - set_lighting(0x0105, 0x05, 0x01) - set_lighting(0x0106, 0x05, 0x01) - set_lighting(0x0107, 0x05, 0x01) - set_lighting(0x0108, 0x05, 0x01) - set_lighting(0x0109, 0x05, 0x01) - set_lighting(0x010a, 0x05, 0x01) - set_lighting(0x010b, 0x05, 0x01) - set_lighting(0x010c, 0x05, 0x01) - set_lighting(0x010d, 0x05, 0x01) - set_lighting(0x010e, 0x05, 0x01) - set_lighting(0x00cb, 0x05, 0x01) - set_lighting(0x0083, 0x05, 0x01) - set_lighting(0x0084, 0x05, 0x01) - set_lighting(0x0085, 0x05, 0x01) - set_lighting(0x0086, 0x05, 0x01) - set_lighting(0x0087, 0x05, 0x01) - set_lighting(0x0088, 0x05, 0x01) - set_lighting(0x0089, 0x05, 0x01) - set_lighting(0x008a, 0x05, 0x01) + misc_command(0x0000, 0x00, 0x00) + misc_command(0x0000, 0x01, 0x00) + misc_command(0x0000, 0x02, 0x00) + misc_command(0x0000, 0x03, 0x00) + misc_command(0x0000, 0x04, 0x00) + misc_command(0x00d3, 0x06, 0x01) + misc_command(0x00d4, 0x06, 0x01) + misc_command(0x00d5, 0x06, 0x01) + misc_command(0x00d6, 0x06, 0x01) + misc_command(0x00d7, 0x06, 0x01) + misc_command(0x00d8, 0x06, 0x01) + misc_command(0x00d9, 0x06, 0x01) + misc_command(0x00da, 0x06, 0x01) + misc_command(0x00db, 0x06, 0x01) + misc_command(0x0024, 0x05, 0x01) + misc_command(0x0025, 0x05, 0x01) + misc_command(0x0026, 0x05, 0x01) + misc_command(0x0027, 0x05, 0x01) + misc_command(0x0028, 0x05, 0x01) + misc_command(0x0029, 0x05, 0x01) + misc_command(0x002a, 0x05, 0x01) + misc_command(0x002b, 0x05, 0x01) + misc_command(0x002c, 0x05, 0x01) + misc_command(0x002d, 0x05, 0x01) + misc_command(0x002e, 0x05, 0x01) + misc_command(0x002f, 0x05, 0x01) + misc_command(0x0030, 0x05, 0x01) + misc_command(0x0032, 0x05, 0x01) + misc_command(0x0033, 0x05, 0x01) + misc_command(0x0034, 0x05, 0x01) + misc_command(0x0035, 0x05, 0x01) + misc_command(0x0036, 0x05, 0x01) + misc_command(0x0037, 0x05, 0x01) + misc_command(0x0038, 0x05, 0x01) + misc_command(0x0039, 0x05, 0x01) + misc_command(0x003a, 0x05, 0x01) + misc_command(0x003b, 0x05, 0x01) + misc_command(0x003c, 0x05, 0x01) + misc_command(0x003d, 0x05, 0x01) + misc_command(0x003e, 0x05, 0x01) + misc_command(0x003f, 0x05, 0x01) + misc_command(0x005b, 0x05, 0x01) + misc_command(0x005d, 0x05, 0x01) + misc_command(0x0079, 0x05, 0x01) + misc_command(0x007a, 0x05, 0x01) + misc_command(0x007b, 0x05, 0x01) + misc_command(0x007c, 0x05, 0x01) + misc_command(0x007d, 0x05, 0x01) + misc_command(0x007e, 0x05, 0x01) + misc_command(0x007f, 0x05, 0x01) + misc_command(0x0080, 0x05, 0x01) + misc_command(0x0081, 0x05, 0x01) + misc_command(0x0082, 0x05, 0x01) + misc_command(0x008b, 0x05, 0x01) + misc_command(0x008c, 0x05, 0x01) + misc_command(0x008d, 0x05, 0x01) + misc_command(0x008e, 0x05, 0x01) + misc_command(0x008f, 0x05, 0x01) + misc_command(0x0090, 0x05, 0x01) + misc_command(0x0091, 0x05, 0x01) + misc_command(0x0092, 0x05, 0x01) + misc_command(0x0093, 0x05, 0x01) + misc_command(0x0094, 0x05, 0x01) + misc_command(0x0095, 0x05, 0x01) + misc_command(0x0096, 0x05, 0x01) + misc_command(0x0097, 0x05, 0x01) + misc_command(0x0098, 0x05, 0x01) + misc_command(0x0099, 0x05, 0x01) + misc_command(0x009a, 0x05, 0x01) + misc_command(0x009b, 0x05, 0x01) + misc_command(0x00a5, 0x05, 0x01) + misc_command(0x00a6, 0x05, 0x01) + misc_command(0x00a7, 0x05, 0x01) + misc_command(0x00a8, 0x05, 0x01) + misc_command(0x00a9, 0x05, 0x01) + misc_command(0x00aa, 0x05, 0x01) + misc_command(0x00ab, 0x05, 0x01) + misc_command(0x00ac, 0x05, 0x01) + misc_command(0x00ad, 0x05, 0x01) + misc_command(0x00ae, 0x05, 0x01) + misc_command(0x00af, 0x05, 0x01) + misc_command(0x00b0, 0x05, 0x01) + misc_command(0x00b1, 0x05, 0x01) + misc_command(0x00b2, 0x05, 0x01) + misc_command(0x00b3, 0x05, 0x01) + misc_command(0x00b4, 0x05, 0x01) + misc_command(0x00b5, 0x05, 0x01) + misc_command(0x00b6, 0x05, 0x01) + misc_command(0x00b7, 0x05, 0x01) + misc_command(0x00b8, 0x05, 0x01) + misc_command(0x00b9, 0x05, 0x01) + misc_command(0x00ba, 0x05, 0x01) + misc_command(0x00bb, 0x05, 0x01) + misc_command(0x00bc, 0x05, 0x01) + misc_command(0x00be, 0x05, 0x01) + misc_command(0x00bf, 0x05, 0x01) + misc_command(0x00c0, 0x05, 0x01) + misc_command(0x00c1, 0x05, 0x01) + misc_command(0x00c2, 0x05, 0x01) + misc_command(0x00c3, 0x05, 0x01) + misc_command(0x00c4, 0x05, 0x01) + misc_command(0x00c5, 0x05, 0x01) + misc_command(0x00c6, 0x05, 0x01) + misc_command(0x00c7, 0x05, 0x01) + misc_command(0x00c8, 0x05, 0x01) + misc_command(0x00c9, 0x05, 0x01) + misc_command(0x00ca, 0x05, 0x01) + misc_command(0x00cc, 0x05, 0x01) + misc_command(0x00cd, 0x05, 0x01) + misc_command(0x00ce, 0x05, 0x01) + misc_command(0x00cf, 0x05, 0x01) + misc_command(0x00d0, 0x05, 0x01) + misc_command(0x00d1, 0x05, 0x01) + misc_command(0x00d2, 0x05, 0x01) + misc_command(0x00dc, 0x05, 0x01) + misc_command(0x00dd, 0x05, 0x01) + misc_command(0x00de, 0x05, 0x01) + misc_command(0x00df, 0x05, 0x01) + misc_command(0x00e0, 0x05, 0x01) + misc_command(0x00e1, 0x05, 0x01) + misc_command(0x00e2, 0x05, 0x01) + misc_command(0x00e3, 0x05, 0x01) + misc_command(0x00e4, 0x05, 0x01) + misc_command(0x00e5, 0x05, 0x01) + misc_command(0x00e6, 0x05, 0x01) + misc_command(0x00f2, 0x05, 0x01) + misc_command(0x00fa, 0x05, 0x01) + misc_command(0x00fb, 0x05, 0x01) + misc_command(0x00fc, 0x05, 0x01) + misc_command(0x00fd, 0x05, 0x01) + misc_command(0x00fe, 0x05, 0x01) + misc_command(0x00ff, 0x05, 0x01) + misc_command(0x0100, 0x05, 0x01) + misc_command(0x0101, 0x05, 0x01) + misc_command(0x0102, 0x05, 0x01) + misc_command(0x0103, 0x05, 0x01) + misc_command(0x0104, 0x05, 0x01) + misc_command(0x0105, 0x05, 0x01) + misc_command(0x0106, 0x05, 0x01) + misc_command(0x0107, 0x05, 0x01) + misc_command(0x0108, 0x05, 0x01) + misc_command(0x0109, 0x05, 0x01) + misc_command(0x010a, 0x05, 0x01) + misc_command(0x010b, 0x05, 0x01) + misc_command(0x010c, 0x05, 0x01) + misc_command(0x010d, 0x05, 0x01) + misc_command(0x010e, 0x05, 0x01) + misc_command(0x00cb, 0x05, 0x01) + misc_command(0x0083, 0x05, 0x01) + misc_command(0x0084, 0x05, 0x01) + misc_command(0x0085, 0x05, 0x01) + misc_command(0x0086, 0x05, 0x01) + misc_command(0x0087, 0x05, 0x01) + misc_command(0x0088, 0x05, 0x01) + misc_command(0x0089, 0x05, 0x01) + misc_command(0x008a, 0x05, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupsho.c b/src/files/setup/setupsho.c index c35c29f00..7afb48c36 100644 --- a/src/files/setup/setupsho.c +++ b/src/files/setup/setupsho.c @@ -3721,141 +3721,141 @@ u8 func1023_setup_rtracker[] = { u8 func1427_setup_lighting[] = { yield - set_lighting(0x0004, 0x05, 0x01) - set_lighting(0x0004, 0x06, 0x01) - set_lighting(0x0005, 0x05, 0x01) - set_lighting(0x0005, 0x06, 0x01) - set_lighting(0x0006, 0x05, 0x01) - set_lighting(0x0006, 0x06, 0x01) - set_lighting(0x0007, 0x05, 0x01) - set_lighting(0x0007, 0x06, 0x01) - set_lighting(0x0008, 0x05, 0x01) - set_lighting(0x0008, 0x06, 0x01) - set_lighting(0x0009, 0x05, 0x01) - set_lighting(0x0009, 0x06, 0x01) - set_lighting(0x000a, 0x05, 0x01) - set_lighting(0x000a, 0x06, 0x01) - set_lighting(0x000b, 0x05, 0x01) - set_lighting(0x000b, 0x06, 0x01) - set_lighting(0x000c, 0x05, 0x01) - set_lighting(0x000c, 0x06, 0x01) - set_lighting(0x000d, 0x05, 0x01) - set_lighting(0x000d, 0x06, 0x01) - set_lighting(0x000e, 0x05, 0x01) - set_lighting(0x000e, 0x06, 0x01) - set_lighting(0x000f, 0x05, 0x01) - set_lighting(0x000f, 0x06, 0x01) - set_lighting(0x0010, 0x05, 0x01) - set_lighting(0x0010, 0x06, 0x01) - set_lighting(0x0011, 0x05, 0x01) - set_lighting(0x0011, 0x06, 0x01) - set_lighting(0x0012, 0x05, 0x01) - set_lighting(0x0012, 0x06, 0x01) - set_lighting(0x0013, 0x05, 0x01) - set_lighting(0x0013, 0x06, 0x01) - set_lighting(0x0014, 0x05, 0x01) - set_lighting(0x0014, 0x06, 0x01) - set_lighting(0x0015, 0x05, 0x01) - set_lighting(0x0015, 0x06, 0x01) - set_lighting(0x0016, 0x05, 0x01) - set_lighting(0x0016, 0x06, 0x01) - set_lighting(0x0017, 0x05, 0x01) - set_lighting(0x0017, 0x06, 0x01) - set_lighting(0x0018, 0x05, 0x01) - set_lighting(0x0018, 0x06, 0x01) - set_lighting(0x0019, 0x05, 0x01) - set_lighting(0x0019, 0x06, 0x01) - set_lighting(0x001a, 0x05, 0x01) - set_lighting(0x001b, 0x05, 0x01) - set_lighting(0x001b, 0x06, 0x01) - set_lighting(0x001d, 0x05, 0x01) - set_lighting(0x001d, 0x06, 0x01) - set_lighting(0x001e, 0x05, 0x01) - set_lighting(0x001e, 0x06, 0x01) - set_lighting(0x001f, 0x05, 0x01) - set_lighting(0x001f, 0x06, 0x01) - set_lighting(0x0020, 0x05, 0x01) - set_lighting(0x0020, 0x06, 0x01) - set_lighting(0x0021, 0x05, 0x01) - set_lighting(0x0021, 0x06, 0x01) - set_lighting(0x0022, 0x05, 0x01) - set_lighting(0x0022, 0x06, 0x01) - set_lighting(0x0023, 0x05, 0x01) - set_lighting(0x0023, 0x06, 0x01) - set_lighting(0x0024, 0x05, 0x01) - set_lighting(0x0024, 0x06, 0x01) - set_lighting(0x0025, 0x05, 0x01) - set_lighting(0x0025, 0x06, 0x01) - set_lighting(0x0026, 0x05, 0x01) - set_lighting(0x0026, 0x06, 0x01) - set_lighting(0x0027, 0x05, 0x01) - set_lighting(0x0027, 0x06, 0x01) - set_lighting(0x0028, 0x05, 0x01) - set_lighting(0x0028, 0x06, 0x01) - set_lighting(0x0029, 0x05, 0x01) - set_lighting(0x0029, 0x06, 0x01) - set_lighting(0x002a, 0x05, 0x01) - set_lighting(0x002a, 0x06, 0x01) - set_lighting(0x002b, 0x05, 0x01) - set_lighting(0x002b, 0x06, 0x01) - set_lighting(0x002c, 0x05, 0x01) - set_lighting(0x002c, 0x06, 0x01) - set_lighting(0x002d, 0x05, 0x01) - set_lighting(0x002d, 0x06, 0x01) - set_lighting(0x002e, 0x05, 0x01) - set_lighting(0x002e, 0x06, 0x01) - set_lighting(0x002f, 0x05, 0x01) - set_lighting(0x002f, 0x06, 0x01) - set_lighting(0x0030, 0x05, 0x01) - set_lighting(0x0030, 0x06, 0x01) - set_lighting(0x0031, 0x05, 0x01) - set_lighting(0x0031, 0x06, 0x01) - set_lighting(0x003b, 0x05, 0x01) - set_lighting(0x003b, 0x06, 0x01) - set_lighting(0x003c, 0x05, 0x01) - set_lighting(0x003c, 0x06, 0x01) - set_lighting(0x003d, 0x05, 0x01) - set_lighting(0x003d, 0x06, 0x01) - set_lighting(0x003e, 0x05, 0x01) - set_lighting(0x003e, 0x06, 0x01) - set_lighting(0x003f, 0x05, 0x01) - set_lighting(0x003f, 0x06, 0x01) - set_lighting(0x0040, 0x05, 0x01) - set_lighting(0x0040, 0x06, 0x01) - set_lighting(0x0041, 0x05, 0x01) - set_lighting(0x0041, 0x06, 0x01) - set_lighting(0x0042, 0x05, 0x01) - set_lighting(0x0042, 0x06, 0x01) - set_lighting(0x0043, 0x05, 0x01) - set_lighting(0x0043, 0x06, 0x01) - set_lighting(0x0044, 0x05, 0x01) - set_lighting(0x0044, 0x06, 0x01) - set_lighting(0x0045, 0x05, 0x01) - set_lighting(0x0046, 0x05, 0x01) - set_lighting(0x0047, 0x05, 0x01) - set_lighting(0x0047, 0x06, 0x01) - set_lighting(0x0049, 0x05, 0x01) - set_lighting(0x0049, 0x06, 0x01) - set_lighting(0x004a, 0x05, 0x01) - set_lighting(0x004a, 0x06, 0x01) - set_lighting(0x004b, 0x06, 0x01) - set_lighting(0x0048, 0x06, 0x01) - set_lighting(0x004f, 0x05, 0x01) - set_lighting(0x0058, 0x05, 0x01) - set_lighting(0x0059, 0x05, 0x01) - set_lighting(0x0059, 0x06, 0x01) - set_lighting(0x0032, 0x05, 0x01) - set_lighting(0x0034, 0x05, 0x01) - set_lighting(0x0035, 0x05, 0x01) - set_lighting(0x0036, 0x05, 0x01) - set_lighting(0x0037, 0x05, 0x01) - set_lighting(0x0038, 0x05, 0x01) - set_lighting(0x0032, 0x06, 0x01) - set_lighting(0x0034, 0x06, 0x01) - set_lighting(0x0035, 0x06, 0x01) - set_lighting(0x0036, 0x06, 0x01) - set_lighting(0x0037, 0x06, 0x01) - set_lighting(0x0038, 0x06, 0x01) + misc_command(0x0004, 0x05, 0x01) + misc_command(0x0004, 0x06, 0x01) + misc_command(0x0005, 0x05, 0x01) + misc_command(0x0005, 0x06, 0x01) + misc_command(0x0006, 0x05, 0x01) + misc_command(0x0006, 0x06, 0x01) + misc_command(0x0007, 0x05, 0x01) + misc_command(0x0007, 0x06, 0x01) + misc_command(0x0008, 0x05, 0x01) + misc_command(0x0008, 0x06, 0x01) + misc_command(0x0009, 0x05, 0x01) + misc_command(0x0009, 0x06, 0x01) + misc_command(0x000a, 0x05, 0x01) + misc_command(0x000a, 0x06, 0x01) + misc_command(0x000b, 0x05, 0x01) + misc_command(0x000b, 0x06, 0x01) + misc_command(0x000c, 0x05, 0x01) + misc_command(0x000c, 0x06, 0x01) + misc_command(0x000d, 0x05, 0x01) + misc_command(0x000d, 0x06, 0x01) + misc_command(0x000e, 0x05, 0x01) + misc_command(0x000e, 0x06, 0x01) + misc_command(0x000f, 0x05, 0x01) + misc_command(0x000f, 0x06, 0x01) + misc_command(0x0010, 0x05, 0x01) + misc_command(0x0010, 0x06, 0x01) + misc_command(0x0011, 0x05, 0x01) + misc_command(0x0011, 0x06, 0x01) + misc_command(0x0012, 0x05, 0x01) + misc_command(0x0012, 0x06, 0x01) + misc_command(0x0013, 0x05, 0x01) + misc_command(0x0013, 0x06, 0x01) + misc_command(0x0014, 0x05, 0x01) + misc_command(0x0014, 0x06, 0x01) + misc_command(0x0015, 0x05, 0x01) + misc_command(0x0015, 0x06, 0x01) + misc_command(0x0016, 0x05, 0x01) + misc_command(0x0016, 0x06, 0x01) + misc_command(0x0017, 0x05, 0x01) + misc_command(0x0017, 0x06, 0x01) + misc_command(0x0018, 0x05, 0x01) + misc_command(0x0018, 0x06, 0x01) + misc_command(0x0019, 0x05, 0x01) + misc_command(0x0019, 0x06, 0x01) + misc_command(0x001a, 0x05, 0x01) + misc_command(0x001b, 0x05, 0x01) + misc_command(0x001b, 0x06, 0x01) + misc_command(0x001d, 0x05, 0x01) + misc_command(0x001d, 0x06, 0x01) + misc_command(0x001e, 0x05, 0x01) + misc_command(0x001e, 0x06, 0x01) + misc_command(0x001f, 0x05, 0x01) + misc_command(0x001f, 0x06, 0x01) + misc_command(0x0020, 0x05, 0x01) + misc_command(0x0020, 0x06, 0x01) + misc_command(0x0021, 0x05, 0x01) + misc_command(0x0021, 0x06, 0x01) + misc_command(0x0022, 0x05, 0x01) + misc_command(0x0022, 0x06, 0x01) + misc_command(0x0023, 0x05, 0x01) + misc_command(0x0023, 0x06, 0x01) + misc_command(0x0024, 0x05, 0x01) + misc_command(0x0024, 0x06, 0x01) + misc_command(0x0025, 0x05, 0x01) + misc_command(0x0025, 0x06, 0x01) + misc_command(0x0026, 0x05, 0x01) + misc_command(0x0026, 0x06, 0x01) + misc_command(0x0027, 0x05, 0x01) + misc_command(0x0027, 0x06, 0x01) + misc_command(0x0028, 0x05, 0x01) + misc_command(0x0028, 0x06, 0x01) + misc_command(0x0029, 0x05, 0x01) + misc_command(0x0029, 0x06, 0x01) + misc_command(0x002a, 0x05, 0x01) + misc_command(0x002a, 0x06, 0x01) + misc_command(0x002b, 0x05, 0x01) + misc_command(0x002b, 0x06, 0x01) + misc_command(0x002c, 0x05, 0x01) + misc_command(0x002c, 0x06, 0x01) + misc_command(0x002d, 0x05, 0x01) + misc_command(0x002d, 0x06, 0x01) + misc_command(0x002e, 0x05, 0x01) + misc_command(0x002e, 0x06, 0x01) + misc_command(0x002f, 0x05, 0x01) + misc_command(0x002f, 0x06, 0x01) + misc_command(0x0030, 0x05, 0x01) + misc_command(0x0030, 0x06, 0x01) + misc_command(0x0031, 0x05, 0x01) + misc_command(0x0031, 0x06, 0x01) + misc_command(0x003b, 0x05, 0x01) + misc_command(0x003b, 0x06, 0x01) + misc_command(0x003c, 0x05, 0x01) + misc_command(0x003c, 0x06, 0x01) + misc_command(0x003d, 0x05, 0x01) + misc_command(0x003d, 0x06, 0x01) + misc_command(0x003e, 0x05, 0x01) + misc_command(0x003e, 0x06, 0x01) + misc_command(0x003f, 0x05, 0x01) + misc_command(0x003f, 0x06, 0x01) + misc_command(0x0040, 0x05, 0x01) + misc_command(0x0040, 0x06, 0x01) + misc_command(0x0041, 0x05, 0x01) + misc_command(0x0041, 0x06, 0x01) + misc_command(0x0042, 0x05, 0x01) + misc_command(0x0042, 0x06, 0x01) + misc_command(0x0043, 0x05, 0x01) + misc_command(0x0043, 0x06, 0x01) + misc_command(0x0044, 0x05, 0x01) + misc_command(0x0044, 0x06, 0x01) + misc_command(0x0045, 0x05, 0x01) + misc_command(0x0046, 0x05, 0x01) + misc_command(0x0047, 0x05, 0x01) + misc_command(0x0047, 0x06, 0x01) + misc_command(0x0049, 0x05, 0x01) + misc_command(0x0049, 0x06, 0x01) + misc_command(0x004a, 0x05, 0x01) + misc_command(0x004a, 0x06, 0x01) + misc_command(0x004b, 0x06, 0x01) + misc_command(0x0048, 0x06, 0x01) + misc_command(0x004f, 0x05, 0x01) + misc_command(0x0058, 0x05, 0x01) + misc_command(0x0059, 0x05, 0x01) + misc_command(0x0059, 0x06, 0x01) + misc_command(0x0032, 0x05, 0x01) + misc_command(0x0034, 0x05, 0x01) + misc_command(0x0035, 0x05, 0x01) + misc_command(0x0036, 0x05, 0x01) + misc_command(0x0037, 0x05, 0x01) + misc_command(0x0038, 0x05, 0x01) + misc_command(0x0032, 0x06, 0x01) + misc_command(0x0034, 0x06, 0x01) + misc_command(0x0035, 0x06, 0x01) + misc_command(0x0036, 0x06, 0x01) + misc_command(0x0037, 0x06, 0x01) + misc_command(0x0038, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupstat.c b/src/files/setup/setupstat.c index 085e064e1..d7fa32d4d 100644 --- a/src/files/setup/setupstat.c +++ b/src/files/setup/setupstat.c @@ -1253,129 +1253,129 @@ u8 func100f_blow_mines[] = { u8 func1010_init_lighting[] = { yield - set_lighting(0x0004, 0x05, 0x01) - set_lighting(0x0004, 0x06, 0x01) - set_lighting(0x0005, 0x05, 0x01) - set_lighting(0x0005, 0x06, 0x01) - set_lighting(0x0006, 0x05, 0x01) - set_lighting(0x0006, 0x06, 0x01) - set_lighting(0x0007, 0x05, 0x01) - set_lighting(0x0007, 0x06, 0x01) - set_lighting(0x0008, 0x05, 0x01) - set_lighting(0x0008, 0x06, 0x01) - set_lighting(0x0009, 0x05, 0x01) - set_lighting(0x0009, 0x06, 0x01) - set_lighting(0x000a, 0x05, 0x01) - set_lighting(0x000a, 0x06, 0x01) - set_lighting(0x000b, 0x05, 0x01) - set_lighting(0x000b, 0x06, 0x01) - set_lighting(0x000c, 0x05, 0x01) - set_lighting(0x000c, 0x06, 0x01) - set_lighting(0x000d, 0x05, 0x01) - set_lighting(0x000d, 0x06, 0x01) - set_lighting(0x000e, 0x05, 0x01) - set_lighting(0x000e, 0x06, 0x01) - set_lighting(0x000f, 0x05, 0x01) - set_lighting(0x000f, 0x06, 0x01) - set_lighting(0x0010, 0x05, 0x01) - set_lighting(0x0010, 0x06, 0x01) - set_lighting(0x0011, 0x05, 0x01) - set_lighting(0x0011, 0x06, 0x01) - set_lighting(0x0012, 0x05, 0x01) - set_lighting(0x0012, 0x06, 0x01) - set_lighting(0x0013, 0x05, 0x01) - set_lighting(0x0013, 0x06, 0x01) - set_lighting(0x0014, 0x05, 0x01) - set_lighting(0x0014, 0x06, 0x01) - set_lighting(0x0015, 0x05, 0x01) - set_lighting(0x0015, 0x06, 0x01) - set_lighting(0x0016, 0x05, 0x01) - set_lighting(0x0016, 0x06, 0x01) - set_lighting(0x0017, 0x05, 0x01) - set_lighting(0x0017, 0x06, 0x01) - set_lighting(0x0018, 0x05, 0x01) - set_lighting(0x0018, 0x06, 0x01) - set_lighting(0x0019, 0x05, 0x01) - set_lighting(0x0019, 0x06, 0x01) - set_lighting(0x001a, 0x05, 0x01) - set_lighting(0x001b, 0x05, 0x01) - set_lighting(0x001b, 0x06, 0x01) - set_lighting(0x001d, 0x05, 0x01) - set_lighting(0x001d, 0x06, 0x01) - set_lighting(0x001e, 0x05, 0x01) - set_lighting(0x001e, 0x06, 0x01) - set_lighting(0x001f, 0x05, 0x01) - set_lighting(0x001f, 0x06, 0x01) - set_lighting(0x0020, 0x05, 0x01) - set_lighting(0x0020, 0x06, 0x01) - set_lighting(0x0021, 0x05, 0x01) - set_lighting(0x0021, 0x06, 0x01) - set_lighting(0x0022, 0x05, 0x01) - set_lighting(0x0022, 0x06, 0x01) - set_lighting(0x0023, 0x05, 0x01) - set_lighting(0x0023, 0x06, 0x01) - set_lighting(0x0024, 0x05, 0x01) - set_lighting(0x0024, 0x06, 0x01) - set_lighting(0x0025, 0x05, 0x01) - set_lighting(0x0025, 0x06, 0x01) - set_lighting(0x0026, 0x05, 0x01) - set_lighting(0x0026, 0x06, 0x01) - set_lighting(0x0027, 0x05, 0x01) - set_lighting(0x0027, 0x06, 0x01) - set_lighting(0x0028, 0x05, 0x01) - set_lighting(0x0028, 0x06, 0x01) - set_lighting(0x0029, 0x05, 0x01) - set_lighting(0x0029, 0x06, 0x01) - set_lighting(0x002a, 0x05, 0x01) - set_lighting(0x002a, 0x06, 0x01) - set_lighting(0x002b, 0x05, 0x01) - set_lighting(0x002b, 0x06, 0x01) - set_lighting(0x002c, 0x05, 0x01) - set_lighting(0x002c, 0x06, 0x01) - set_lighting(0x002d, 0x05, 0x01) - set_lighting(0x002d, 0x06, 0x01) - set_lighting(0x002e, 0x05, 0x01) - set_lighting(0x002e, 0x06, 0x01) - set_lighting(0x002f, 0x05, 0x01) - set_lighting(0x002f, 0x06, 0x01) - set_lighting(0x0030, 0x05, 0x01) - set_lighting(0x0030, 0x06, 0x01) - set_lighting(0x0031, 0x05, 0x01) - set_lighting(0x0031, 0x06, 0x01) - set_lighting(0x003b, 0x05, 0x01) - set_lighting(0x003b, 0x06, 0x01) - set_lighting(0x003c, 0x05, 0x01) - set_lighting(0x003c, 0x06, 0x01) - set_lighting(0x003d, 0x05, 0x01) - set_lighting(0x003d, 0x06, 0x01) - set_lighting(0x003e, 0x05, 0x01) - set_lighting(0x003e, 0x06, 0x01) - set_lighting(0x003f, 0x05, 0x01) - set_lighting(0x003f, 0x06, 0x01) - set_lighting(0x0040, 0x05, 0x01) - set_lighting(0x0040, 0x06, 0x01) - set_lighting(0x0041, 0x05, 0x01) - set_lighting(0x0041, 0x06, 0x01) - set_lighting(0x0042, 0x05, 0x01) - set_lighting(0x0042, 0x06, 0x01) - set_lighting(0x0043, 0x05, 0x01) - set_lighting(0x0043, 0x06, 0x01) - set_lighting(0x0044, 0x05, 0x01) - set_lighting(0x0044, 0x06, 0x01) - set_lighting(0x0045, 0x05, 0x01) - set_lighting(0x0046, 0x05, 0x01) - set_lighting(0x0047, 0x05, 0x01) - set_lighting(0x0047, 0x06, 0x01) - set_lighting(0x0049, 0x05, 0x01) - set_lighting(0x0049, 0x06, 0x01) - set_lighting(0x004a, 0x05, 0x01) - set_lighting(0x004a, 0x06, 0x01) - set_lighting(0x004b, 0x06, 0x01) - set_lighting(0x0048, 0x06, 0x01) - set_lighting(0x004f, 0x05, 0x01) - set_lighting(0x0058, 0x05, 0x01) - set_lighting(0x0059, 0x05, 0x01) - set_lighting(0x0059, 0x06, 0x01) + misc_command(0x0004, 0x05, 0x01) + misc_command(0x0004, 0x06, 0x01) + misc_command(0x0005, 0x05, 0x01) + misc_command(0x0005, 0x06, 0x01) + misc_command(0x0006, 0x05, 0x01) + misc_command(0x0006, 0x06, 0x01) + misc_command(0x0007, 0x05, 0x01) + misc_command(0x0007, 0x06, 0x01) + misc_command(0x0008, 0x05, 0x01) + misc_command(0x0008, 0x06, 0x01) + misc_command(0x0009, 0x05, 0x01) + misc_command(0x0009, 0x06, 0x01) + misc_command(0x000a, 0x05, 0x01) + misc_command(0x000a, 0x06, 0x01) + misc_command(0x000b, 0x05, 0x01) + misc_command(0x000b, 0x06, 0x01) + misc_command(0x000c, 0x05, 0x01) + misc_command(0x000c, 0x06, 0x01) + misc_command(0x000d, 0x05, 0x01) + misc_command(0x000d, 0x06, 0x01) + misc_command(0x000e, 0x05, 0x01) + misc_command(0x000e, 0x06, 0x01) + misc_command(0x000f, 0x05, 0x01) + misc_command(0x000f, 0x06, 0x01) + misc_command(0x0010, 0x05, 0x01) + misc_command(0x0010, 0x06, 0x01) + misc_command(0x0011, 0x05, 0x01) + misc_command(0x0011, 0x06, 0x01) + misc_command(0x0012, 0x05, 0x01) + misc_command(0x0012, 0x06, 0x01) + misc_command(0x0013, 0x05, 0x01) + misc_command(0x0013, 0x06, 0x01) + misc_command(0x0014, 0x05, 0x01) + misc_command(0x0014, 0x06, 0x01) + misc_command(0x0015, 0x05, 0x01) + misc_command(0x0015, 0x06, 0x01) + misc_command(0x0016, 0x05, 0x01) + misc_command(0x0016, 0x06, 0x01) + misc_command(0x0017, 0x05, 0x01) + misc_command(0x0017, 0x06, 0x01) + misc_command(0x0018, 0x05, 0x01) + misc_command(0x0018, 0x06, 0x01) + misc_command(0x0019, 0x05, 0x01) + misc_command(0x0019, 0x06, 0x01) + misc_command(0x001a, 0x05, 0x01) + misc_command(0x001b, 0x05, 0x01) + misc_command(0x001b, 0x06, 0x01) + misc_command(0x001d, 0x05, 0x01) + misc_command(0x001d, 0x06, 0x01) + misc_command(0x001e, 0x05, 0x01) + misc_command(0x001e, 0x06, 0x01) + misc_command(0x001f, 0x05, 0x01) + misc_command(0x001f, 0x06, 0x01) + misc_command(0x0020, 0x05, 0x01) + misc_command(0x0020, 0x06, 0x01) + misc_command(0x0021, 0x05, 0x01) + misc_command(0x0021, 0x06, 0x01) + misc_command(0x0022, 0x05, 0x01) + misc_command(0x0022, 0x06, 0x01) + misc_command(0x0023, 0x05, 0x01) + misc_command(0x0023, 0x06, 0x01) + misc_command(0x0024, 0x05, 0x01) + misc_command(0x0024, 0x06, 0x01) + misc_command(0x0025, 0x05, 0x01) + misc_command(0x0025, 0x06, 0x01) + misc_command(0x0026, 0x05, 0x01) + misc_command(0x0026, 0x06, 0x01) + misc_command(0x0027, 0x05, 0x01) + misc_command(0x0027, 0x06, 0x01) + misc_command(0x0028, 0x05, 0x01) + misc_command(0x0028, 0x06, 0x01) + misc_command(0x0029, 0x05, 0x01) + misc_command(0x0029, 0x06, 0x01) + misc_command(0x002a, 0x05, 0x01) + misc_command(0x002a, 0x06, 0x01) + misc_command(0x002b, 0x05, 0x01) + misc_command(0x002b, 0x06, 0x01) + misc_command(0x002c, 0x05, 0x01) + misc_command(0x002c, 0x06, 0x01) + misc_command(0x002d, 0x05, 0x01) + misc_command(0x002d, 0x06, 0x01) + misc_command(0x002e, 0x05, 0x01) + misc_command(0x002e, 0x06, 0x01) + misc_command(0x002f, 0x05, 0x01) + misc_command(0x002f, 0x06, 0x01) + misc_command(0x0030, 0x05, 0x01) + misc_command(0x0030, 0x06, 0x01) + misc_command(0x0031, 0x05, 0x01) + misc_command(0x0031, 0x06, 0x01) + misc_command(0x003b, 0x05, 0x01) + misc_command(0x003b, 0x06, 0x01) + misc_command(0x003c, 0x05, 0x01) + misc_command(0x003c, 0x06, 0x01) + misc_command(0x003d, 0x05, 0x01) + misc_command(0x003d, 0x06, 0x01) + misc_command(0x003e, 0x05, 0x01) + misc_command(0x003e, 0x06, 0x01) + misc_command(0x003f, 0x05, 0x01) + misc_command(0x003f, 0x06, 0x01) + misc_command(0x0040, 0x05, 0x01) + misc_command(0x0040, 0x06, 0x01) + misc_command(0x0041, 0x05, 0x01) + misc_command(0x0041, 0x06, 0x01) + misc_command(0x0042, 0x05, 0x01) + misc_command(0x0042, 0x06, 0x01) + misc_command(0x0043, 0x05, 0x01) + misc_command(0x0043, 0x06, 0x01) + misc_command(0x0044, 0x05, 0x01) + misc_command(0x0044, 0x06, 0x01) + misc_command(0x0045, 0x05, 0x01) + misc_command(0x0046, 0x05, 0x01) + misc_command(0x0047, 0x05, 0x01) + misc_command(0x0047, 0x06, 0x01) + misc_command(0x0049, 0x05, 0x01) + misc_command(0x0049, 0x06, 0x01) + misc_command(0x004a, 0x05, 0x01) + misc_command(0x004a, 0x06, 0x01) + misc_command(0x004b, 0x06, 0x01) + misc_command(0x0048, 0x06, 0x01) + misc_command(0x004f, 0x05, 0x01) + misc_command(0x0058, 0x05, 0x01) + misc_command(0x0059, 0x05, 0x01) + misc_command(0x0059, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setuptra.c b/src/files/setup/setuptra.c index dc56ddfed..dc8a61513 100644 --- a/src/files/setup/setuptra.c +++ b/src/files/setup/setuptra.c @@ -3088,7 +3088,7 @@ u8 func0c02_outro[] = { * hoverbike. */ u8 func0415_ufo_exit[] = { - set_lighting(0x0000, 0x0e, 0x05) + misc_command(0x0000, 0x0e, 0x05) hide_object(OBJ_UFO2) show_object(OBJ_UFO1) set_object_flag_bank1(OBJ_UFO1, OBJECTFLAG1_04000000) @@ -3108,7 +3108,7 @@ u8 func0415_ufo_exit[] = { endloop(0x08) label(0x06) - set_lighting(0x0000, 0x0f, 0x00) + misc_command(0x0000, 0x0f, 0x00) reset_ambience hide_object(OBJ_UFO1) set_function(CHR_SELF, GFUNC_IDLE) @@ -3646,154 +3646,154 @@ u8 func101c_setup_rtracker[] = { u8 func1434_setup_lighting[] = { yield - set_lighting(0x0000, 0x00, 0x00) - set_lighting(0x0000, 0x01, 0x00) - set_lighting(0x0000, 0x02, 0x00) - set_lighting(0x0000, 0x03, 0x00) - set_lighting(0x0000, 0x04, 0x00) - set_lighting(0x00d3, 0x06, 0x01) - set_lighting(0x00d4, 0x06, 0x01) - set_lighting(0x00d5, 0x06, 0x01) - set_lighting(0x00d6, 0x06, 0x01) - set_lighting(0x00d7, 0x06, 0x01) - set_lighting(0x00d8, 0x06, 0x01) - set_lighting(0x00d9, 0x06, 0x01) - set_lighting(0x00da, 0x06, 0x01) - set_lighting(0x00db, 0x06, 0x01) - set_lighting(0x0024, 0x05, 0x01) - set_lighting(0x0025, 0x05, 0x01) - set_lighting(0x0026, 0x05, 0x01) - set_lighting(0x0027, 0x05, 0x01) - set_lighting(0x0028, 0x05, 0x01) - set_lighting(0x0029, 0x05, 0x01) - set_lighting(0x002a, 0x05, 0x01) - set_lighting(0x002b, 0x05, 0x01) - set_lighting(0x002c, 0x05, 0x01) - set_lighting(0x002d, 0x05, 0x01) - set_lighting(0x002e, 0x05, 0x01) - set_lighting(0x002f, 0x05, 0x01) - set_lighting(0x0030, 0x05, 0x01) - set_lighting(0x0032, 0x05, 0x01) - set_lighting(0x0033, 0x05, 0x01) - set_lighting(0x0034, 0x05, 0x01) - set_lighting(0x0035, 0x05, 0x01) - set_lighting(0x0036, 0x05, 0x01) - set_lighting(0x0037, 0x05, 0x01) - set_lighting(0x0038, 0x05, 0x01) - set_lighting(0x0039, 0x05, 0x01) - set_lighting(0x003a, 0x05, 0x01) - set_lighting(0x003b, 0x05, 0x01) - set_lighting(0x003c, 0x05, 0x01) - set_lighting(0x003d, 0x05, 0x01) - set_lighting(0x003e, 0x05, 0x01) - set_lighting(0x003f, 0x05, 0x01) - set_lighting(0x005b, 0x05, 0x01) - set_lighting(0x005d, 0x05, 0x01) - set_lighting(0x0079, 0x05, 0x01) - set_lighting(0x007a, 0x05, 0x01) - set_lighting(0x007b, 0x05, 0x01) - set_lighting(0x007c, 0x05, 0x01) - set_lighting(0x007d, 0x05, 0x01) - set_lighting(0x007e, 0x05, 0x01) - set_lighting(0x007f, 0x05, 0x01) - set_lighting(0x0080, 0x05, 0x01) - set_lighting(0x0081, 0x05, 0x01) - set_lighting(0x0082, 0x05, 0x01) - set_lighting(0x008b, 0x05, 0x01) - set_lighting(0x008c, 0x05, 0x01) - set_lighting(0x008d, 0x05, 0x01) - set_lighting(0x008e, 0x05, 0x01) - set_lighting(0x008f, 0x05, 0x01) - set_lighting(0x0090, 0x05, 0x01) - set_lighting(0x0091, 0x05, 0x01) - set_lighting(0x0092, 0x05, 0x01) - set_lighting(0x0093, 0x05, 0x01) - set_lighting(0x0094, 0x05, 0x01) - set_lighting(0x0095, 0x05, 0x01) - set_lighting(0x0096, 0x05, 0x01) - set_lighting(0x0097, 0x05, 0x01) - set_lighting(0x0098, 0x05, 0x01) - set_lighting(0x0099, 0x05, 0x01) - set_lighting(0x009a, 0x05, 0x01) - set_lighting(0x009b, 0x05, 0x01) - set_lighting(0x00a5, 0x05, 0x01) - set_lighting(0x00a6, 0x05, 0x01) - set_lighting(0x00a7, 0x05, 0x01) - set_lighting(0x00a8, 0x05, 0x01) - set_lighting(0x00a9, 0x05, 0x01) - set_lighting(0x00aa, 0x05, 0x01) - set_lighting(0x00ab, 0x05, 0x01) - set_lighting(0x00ac, 0x05, 0x01) - set_lighting(0x00ad, 0x05, 0x01) - set_lighting(0x00ae, 0x05, 0x01) - set_lighting(0x00af, 0x05, 0x01) - set_lighting(0x00b0, 0x05, 0x01) - set_lighting(0x00b1, 0x05, 0x01) - set_lighting(0x00b2, 0x05, 0x01) - set_lighting(0x00b3, 0x05, 0x01) - set_lighting(0x00b4, 0x05, 0x01) - set_lighting(0x00b5, 0x05, 0x01) - set_lighting(0x00b6, 0x05, 0x01) - set_lighting(0x00b7, 0x05, 0x01) - set_lighting(0x00b8, 0x05, 0x01) - set_lighting(0x00b9, 0x05, 0x01) - set_lighting(0x00ba, 0x05, 0x01) - set_lighting(0x00bb, 0x05, 0x01) - set_lighting(0x00bc, 0x05, 0x01) - set_lighting(0x00be, 0x05, 0x01) - set_lighting(0x00bf, 0x05, 0x01) - set_lighting(0x00c0, 0x05, 0x01) - set_lighting(0x00c1, 0x05, 0x01) - set_lighting(0x00c2, 0x05, 0x01) - set_lighting(0x00c3, 0x05, 0x01) - set_lighting(0x00c4, 0x05, 0x01) - set_lighting(0x00c5, 0x05, 0x01) - set_lighting(0x00c6, 0x05, 0x01) - set_lighting(0x00c7, 0x05, 0x01) - set_lighting(0x00c8, 0x05, 0x01) - set_lighting(0x00c9, 0x05, 0x01) - set_lighting(0x00ca, 0x05, 0x01) - set_lighting(0x00cc, 0x05, 0x01) - set_lighting(0x00cd, 0x05, 0x01) - set_lighting(0x00ce, 0x05, 0x01) - set_lighting(0x00cf, 0x05, 0x01) - set_lighting(0x00d0, 0x05, 0x01) - set_lighting(0x00d1, 0x05, 0x01) - set_lighting(0x00d2, 0x05, 0x01) - set_lighting(0x00dc, 0x05, 0x01) - set_lighting(0x00dd, 0x05, 0x01) - set_lighting(0x00de, 0x05, 0x01) - set_lighting(0x00df, 0x05, 0x01) - set_lighting(0x00e0, 0x05, 0x01) - set_lighting(0x00e1, 0x05, 0x01) - set_lighting(0x00e2, 0x05, 0x01) - set_lighting(0x00e3, 0x05, 0x01) - set_lighting(0x00e4, 0x05, 0x01) - set_lighting(0x00e5, 0x05, 0x01) - set_lighting(0x00e6, 0x05, 0x01) - set_lighting(0x00f2, 0x05, 0x01) - set_lighting(0x00fa, 0x05, 0x01) - set_lighting(0x00fb, 0x05, 0x01) - set_lighting(0x00fc, 0x05, 0x01) - set_lighting(0x00fd, 0x05, 0x01) - set_lighting(0x00fe, 0x05, 0x01) - set_lighting(0x00ff, 0x05, 0x01) - set_lighting(0x0100, 0x05, 0x01) - set_lighting(0x0101, 0x05, 0x01) - set_lighting(0x0102, 0x05, 0x01) - set_lighting(0x0103, 0x05, 0x01) - set_lighting(0x0104, 0x05, 0x01) - set_lighting(0x0105, 0x05, 0x01) - set_lighting(0x0106, 0x05, 0x01) - set_lighting(0x0107, 0x05, 0x01) - set_lighting(0x0108, 0x05, 0x01) - set_lighting(0x0109, 0x05, 0x01) - set_lighting(0x010a, 0x05, 0x01) - set_lighting(0x010b, 0x05, 0x01) - set_lighting(0x010c, 0x05, 0x01) - set_lighting(0x010d, 0x05, 0x01) - set_lighting(0x010e, 0x05, 0x01) - set_lighting(0x00cb, 0x05, 0x01) + misc_command(0x0000, 0x00, 0x00) + misc_command(0x0000, 0x01, 0x00) + misc_command(0x0000, 0x02, 0x00) + misc_command(0x0000, 0x03, 0x00) + misc_command(0x0000, 0x04, 0x00) + misc_command(0x00d3, 0x06, 0x01) + misc_command(0x00d4, 0x06, 0x01) + misc_command(0x00d5, 0x06, 0x01) + misc_command(0x00d6, 0x06, 0x01) + misc_command(0x00d7, 0x06, 0x01) + misc_command(0x00d8, 0x06, 0x01) + misc_command(0x00d9, 0x06, 0x01) + misc_command(0x00da, 0x06, 0x01) + misc_command(0x00db, 0x06, 0x01) + misc_command(0x0024, 0x05, 0x01) + misc_command(0x0025, 0x05, 0x01) + misc_command(0x0026, 0x05, 0x01) + misc_command(0x0027, 0x05, 0x01) + misc_command(0x0028, 0x05, 0x01) + misc_command(0x0029, 0x05, 0x01) + misc_command(0x002a, 0x05, 0x01) + misc_command(0x002b, 0x05, 0x01) + misc_command(0x002c, 0x05, 0x01) + misc_command(0x002d, 0x05, 0x01) + misc_command(0x002e, 0x05, 0x01) + misc_command(0x002f, 0x05, 0x01) + misc_command(0x0030, 0x05, 0x01) + misc_command(0x0032, 0x05, 0x01) + misc_command(0x0033, 0x05, 0x01) + misc_command(0x0034, 0x05, 0x01) + misc_command(0x0035, 0x05, 0x01) + misc_command(0x0036, 0x05, 0x01) + misc_command(0x0037, 0x05, 0x01) + misc_command(0x0038, 0x05, 0x01) + misc_command(0x0039, 0x05, 0x01) + misc_command(0x003a, 0x05, 0x01) + misc_command(0x003b, 0x05, 0x01) + misc_command(0x003c, 0x05, 0x01) + misc_command(0x003d, 0x05, 0x01) + misc_command(0x003e, 0x05, 0x01) + misc_command(0x003f, 0x05, 0x01) + misc_command(0x005b, 0x05, 0x01) + misc_command(0x005d, 0x05, 0x01) + misc_command(0x0079, 0x05, 0x01) + misc_command(0x007a, 0x05, 0x01) + misc_command(0x007b, 0x05, 0x01) + misc_command(0x007c, 0x05, 0x01) + misc_command(0x007d, 0x05, 0x01) + misc_command(0x007e, 0x05, 0x01) + misc_command(0x007f, 0x05, 0x01) + misc_command(0x0080, 0x05, 0x01) + misc_command(0x0081, 0x05, 0x01) + misc_command(0x0082, 0x05, 0x01) + misc_command(0x008b, 0x05, 0x01) + misc_command(0x008c, 0x05, 0x01) + misc_command(0x008d, 0x05, 0x01) + misc_command(0x008e, 0x05, 0x01) + misc_command(0x008f, 0x05, 0x01) + misc_command(0x0090, 0x05, 0x01) + misc_command(0x0091, 0x05, 0x01) + misc_command(0x0092, 0x05, 0x01) + misc_command(0x0093, 0x05, 0x01) + misc_command(0x0094, 0x05, 0x01) + misc_command(0x0095, 0x05, 0x01) + misc_command(0x0096, 0x05, 0x01) + misc_command(0x0097, 0x05, 0x01) + misc_command(0x0098, 0x05, 0x01) + misc_command(0x0099, 0x05, 0x01) + misc_command(0x009a, 0x05, 0x01) + misc_command(0x009b, 0x05, 0x01) + misc_command(0x00a5, 0x05, 0x01) + misc_command(0x00a6, 0x05, 0x01) + misc_command(0x00a7, 0x05, 0x01) + misc_command(0x00a8, 0x05, 0x01) + misc_command(0x00a9, 0x05, 0x01) + misc_command(0x00aa, 0x05, 0x01) + misc_command(0x00ab, 0x05, 0x01) + misc_command(0x00ac, 0x05, 0x01) + misc_command(0x00ad, 0x05, 0x01) + misc_command(0x00ae, 0x05, 0x01) + misc_command(0x00af, 0x05, 0x01) + misc_command(0x00b0, 0x05, 0x01) + misc_command(0x00b1, 0x05, 0x01) + misc_command(0x00b2, 0x05, 0x01) + misc_command(0x00b3, 0x05, 0x01) + misc_command(0x00b4, 0x05, 0x01) + misc_command(0x00b5, 0x05, 0x01) + misc_command(0x00b6, 0x05, 0x01) + misc_command(0x00b7, 0x05, 0x01) + misc_command(0x00b8, 0x05, 0x01) + misc_command(0x00b9, 0x05, 0x01) + misc_command(0x00ba, 0x05, 0x01) + misc_command(0x00bb, 0x05, 0x01) + misc_command(0x00bc, 0x05, 0x01) + misc_command(0x00be, 0x05, 0x01) + misc_command(0x00bf, 0x05, 0x01) + misc_command(0x00c0, 0x05, 0x01) + misc_command(0x00c1, 0x05, 0x01) + misc_command(0x00c2, 0x05, 0x01) + misc_command(0x00c3, 0x05, 0x01) + misc_command(0x00c4, 0x05, 0x01) + misc_command(0x00c5, 0x05, 0x01) + misc_command(0x00c6, 0x05, 0x01) + misc_command(0x00c7, 0x05, 0x01) + misc_command(0x00c8, 0x05, 0x01) + misc_command(0x00c9, 0x05, 0x01) + misc_command(0x00ca, 0x05, 0x01) + misc_command(0x00cc, 0x05, 0x01) + misc_command(0x00cd, 0x05, 0x01) + misc_command(0x00ce, 0x05, 0x01) + misc_command(0x00cf, 0x05, 0x01) + misc_command(0x00d0, 0x05, 0x01) + misc_command(0x00d1, 0x05, 0x01) + misc_command(0x00d2, 0x05, 0x01) + misc_command(0x00dc, 0x05, 0x01) + misc_command(0x00dd, 0x05, 0x01) + misc_command(0x00de, 0x05, 0x01) + misc_command(0x00df, 0x05, 0x01) + misc_command(0x00e0, 0x05, 0x01) + misc_command(0x00e1, 0x05, 0x01) + misc_command(0x00e2, 0x05, 0x01) + misc_command(0x00e3, 0x05, 0x01) + misc_command(0x00e4, 0x05, 0x01) + misc_command(0x00e5, 0x05, 0x01) + misc_command(0x00e6, 0x05, 0x01) + misc_command(0x00f2, 0x05, 0x01) + misc_command(0x00fa, 0x05, 0x01) + misc_command(0x00fb, 0x05, 0x01) + misc_command(0x00fc, 0x05, 0x01) + misc_command(0x00fd, 0x05, 0x01) + misc_command(0x00fe, 0x05, 0x01) + misc_command(0x00ff, 0x05, 0x01) + misc_command(0x0100, 0x05, 0x01) + misc_command(0x0101, 0x05, 0x01) + misc_command(0x0102, 0x05, 0x01) + misc_command(0x0103, 0x05, 0x01) + misc_command(0x0104, 0x05, 0x01) + misc_command(0x0105, 0x05, 0x01) + misc_command(0x0106, 0x05, 0x01) + misc_command(0x0107, 0x05, 0x01) + misc_command(0x0108, 0x05, 0x01) + misc_command(0x0109, 0x05, 0x01) + misc_command(0x010a, 0x05, 0x01) + misc_command(0x010b, 0x05, 0x01) + misc_command(0x010c, 0x05, 0x01) + misc_command(0x010d, 0x05, 0x01) + misc_command(0x010e, 0x05, 0x01) + misc_command(0x00cb, 0x05, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c index 394ab1b53..0fa9117f2 100644 --- a/src/files/setup/setupwax.c +++ b/src/files/setup/setupwax.c @@ -2076,38 +2076,38 @@ u8 func100e_cass_speech[] = { u8 func1010_init_lighting[] = { yield - set_lighting(0x0000, 0x00, 0x01) - set_lighting(0x0000, 0x01, 0x00) - set_lighting(0x0000, 0x02, 0x00) - set_lighting(0x0000, 0x03, 0x00) - set_lighting(0x0000, 0x04, 0x00) - set_lighting(0x0002, 0x05, 0x01) - set_lighting(0x0002, 0x06, 0x01) - set_lighting(0x0003, 0x05, 0x01) - set_lighting(0x0003, 0x06, 0x01) - set_lighting(0x0004, 0x05, 0x01) - set_lighting(0x0004, 0x06, 0x01) - set_lighting(0x0005, 0x06, 0x01) - set_lighting(0x0006, 0x06, 0x01) - set_lighting(0x0007, 0x06, 0x01) - set_lighting(0x0008, 0x06, 0x01) - set_lighting(0x0009, 0x06, 0x01) - set_lighting(0x000a, 0x06, 0x01) - set_lighting(0x000b, 0x06, 0x01) - set_lighting(0x000c, 0x06, 0x01) - set_lighting(0x000d, 0x06, 0x01) - set_lighting(0x000e, 0x06, 0x01) - set_lighting(0x000f, 0x06, 0x01) - set_lighting(0x0010, 0x06, 0x01) - set_lighting(0x0011, 0x06, 0x01) - set_lighting(0x0012, 0x06, 0x01) - set_lighting(0x0013, 0x06, 0x01) - set_lighting(0x0014, 0x06, 0x01) - set_lighting(0x003a, 0x05, 0x01) - set_lighting(0x00a2, 0x06, 0x01) - set_lighting(0x00a4, 0x06, 0x01) - set_lighting(0x00a5, 0x06, 0x01) - set_lighting(0x00a7, 0x06, 0x01) + misc_command(0x0000, 0x00, 0x01) + misc_command(0x0000, 0x01, 0x00) + misc_command(0x0000, 0x02, 0x00) + misc_command(0x0000, 0x03, 0x00) + misc_command(0x0000, 0x04, 0x00) + misc_command(0x0002, 0x05, 0x01) + misc_command(0x0002, 0x06, 0x01) + misc_command(0x0003, 0x05, 0x01) + misc_command(0x0003, 0x06, 0x01) + misc_command(0x0004, 0x05, 0x01) + misc_command(0x0004, 0x06, 0x01) + misc_command(0x0005, 0x06, 0x01) + misc_command(0x0006, 0x06, 0x01) + misc_command(0x0007, 0x06, 0x01) + misc_command(0x0008, 0x06, 0x01) + misc_command(0x0009, 0x06, 0x01) + misc_command(0x000a, 0x06, 0x01) + misc_command(0x000b, 0x06, 0x01) + misc_command(0x000c, 0x06, 0x01) + misc_command(0x000d, 0x06, 0x01) + misc_command(0x000e, 0x06, 0x01) + misc_command(0x000f, 0x06, 0x01) + misc_command(0x0010, 0x06, 0x01) + misc_command(0x0011, 0x06, 0x01) + misc_command(0x0012, 0x06, 0x01) + misc_command(0x0013, 0x06, 0x01) + misc_command(0x0014, 0x06, 0x01) + misc_command(0x003a, 0x05, 0x01) + misc_command(0x00a2, 0x06, 0x01) + misc_command(0x00a4, 0x06, 0x01) + misc_command(0x00a5, 0x06, 0x01) + misc_command(0x00a7, 0x06, 0x01) set_function(CHR_SELF, GFUNC_IDLE) endfunction }; diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index b930e5f89..501de93c0 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -121,22 +121,6 @@ const u32 var7f1a9dc4[] = {0x7f05f104}; const u32 var7f1a9dc8[] = {0x7f05f104}; const u32 var7f1a9dcc[] = {0x7f05f104}; const u32 var7f1a9dd0[] = {0x7f05f104}; -const u32 var7f1a9dd4[] = {0x7f05fa1c}; -const u32 var7f1a9dd8[] = {0x7f05fa28}; -const u32 var7f1a9ddc[] = {0x7f05fa34}; -const u32 var7f1a9de0[] = {0x7f05fa40}; -const u32 var7f1a9de4[] = {0x7f05fa4c}; -const u32 var7f1a9de8[] = {0x7f05fa58}; -const u32 var7f1a9dec[] = {0x7f05faa8}; -const u32 var7f1a9df0[] = {0x7f05faf8}; -const u32 var7f1a9df4[] = {0x7f05fb38}; -const u32 var7f1a9df8[] = {0x7f05fb68}; -const u32 var7f1a9dfc[] = {0x7f05fbdc}; -const u32 var7f1a9e00[] = {0x7f05fbf4}; -const u32 var7f1a9e04[] = {0x7f05fc0c}; -const u32 var7f1a9e08[] = {0x7f05fc24}; -const u32 var7f1a9e0c[] = {0x7f05fc3c}; -const u32 var7f1a9e10[] = {0x7f05fc54}; /** * @cmd 0000 @@ -15076,191 +15060,80 @@ glabel aiShowCutsceneChrs /** * @cmd 01d6 */ -GLOBAL_ASM( -glabel ai01d6 -/* f05f9c0: 3c08800a */ lui $t0,%hi(g_Vars) -/* f05f9c4: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f05f9c8: 8d030438 */ lw $v1,0x438($t0) -/* f05f9cc: 8d0e0434 */ lw $t6,0x434($t0) -/* f05f9d0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f05f9d4: afbf0014 */ sw $ra,0x14($sp) -/* f05f9d8: 01c31021 */ addu $v0,$t6,$v1 -/* f05f9dc: 904f0002 */ lbu $t7,0x2($v0) -/* f05f9e0: 90590003 */ lbu $t9,0x3($v0) -/* f05f9e4: 904b0004 */ lbu $t3,0x4($v0) -/* f05f9e8: 000fc200 */ sll $t8,$t7,0x8 -/* f05f9ec: 03192025 */ or $a0,$t8,$t9 -/* f05f9f0: 00044c00 */ sll $t1,$a0,0x10 -/* f05f9f4: 2d610010 */ sltiu $at,$t3,0x10 -/* f05f9f8: 00092403 */ sra $a0,$t1,0x10 -/* f05f9fc: 1020009a */ beqz $at,.L0f05fc68 -/* f05fa00: 90470005 */ lbu $a3,0x5($v0) -/* f05fa04: 000b5880 */ sll $t3,$t3,0x2 -/* f05fa08: 3c017f1b */ lui $at,%hi(var7f1a9dd4) -/* f05fa0c: 002b0821 */ addu $at,$at,$t3 -/* f05fa10: 8c2b9dd4 */ lw $t3,%lo(var7f1a9dd4)($at) -/* f05fa14: 01600008 */ jr $t3 -/* f05fa18: 00000000 */ sll $zero,$zero,0x0 -/* f05fa1c: 3c018007 */ lui $at,0x8007 -/* f05fa20: 10000091 */ beqz $zero,.L0f05fc68 -/* f05fa24: a027ae18 */ sb $a3,-0x51e8($at) -/* f05fa28: 3c018007 */ lui $at,0x8007 -/* f05fa2c: 1000008e */ beqz $zero,.L0f05fc68 -/* f05fa30: a027ae1c */ sb $a3,-0x51e4($at) -/* f05fa34: 3c018007 */ lui $at,0x8007 -/* f05fa38: 1000008b */ beqz $zero,.L0f05fc68 -/* f05fa3c: a027ae20 */ sb $a3,-0x51e0($at) -/* f05fa40: 3c018007 */ lui $at,0x8007 -/* f05fa44: 10000088 */ beqz $zero,.L0f05fc68 -/* f05fa48: a027ae24 */ sb $a3,-0x51dc($at) -/* f05fa4c: 3c018007 */ lui $at,0x8007 -/* f05fa50: 10000085 */ beqz $zero,.L0f05fc68 -/* f05fa54: a027ae28 */ sb $a3,-0x51d8($at) -/* f05fa58: 3c05800a */ lui $a1,%hi(g_RoomPtrs) -/* f05fa5c: 000418c0 */ sll $v1,$a0,0x3 -/* f05fa60: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) -/* f05fa64: 00641821 */ addu $v1,$v1,$a0 -/* f05fa68: 8cac0000 */ lw $t4,0x0($a1) -/* f05fa6c: 00031880 */ sll $v1,$v1,0x2 -/* f05fa70: 00641823 */ subu $v1,$v1,$a0 -/* f05fa74: 00031880 */ sll $v1,$v1,0x2 -/* f05fa78: 01831021 */ addu $v0,$t4,$v1 -/* f05fa7c: 944d0000 */ lhu $t5,0x0($v0) -/* f05fa80: 31aebfff */ andi $t6,$t5,0xbfff -/* f05fa84: 10e00006 */ beqz $a3,.L0f05faa0 -/* f05fa88: a44e0000 */ sh $t6,0x0($v0) -/* f05fa8c: 8caf0000 */ lw $t7,0x0($a1) -/* f05fa90: 01e31021 */ addu $v0,$t7,$v1 -/* f05fa94: 94580000 */ lhu $t8,0x0($v0) -/* f05fa98: 37194000 */ ori $t9,$t8,0x4000 -/* f05fa9c: a4590000 */ sh $t9,0x0($v0) -.L0f05faa0: -/* f05faa0: 10000071 */ beqz $zero,.L0f05fc68 -/* f05faa4: 8d030438 */ lw $v1,0x438($t0) -/* f05faa8: 3c05800a */ lui $a1,%hi(g_RoomPtrs) -/* f05faac: 000418c0 */ sll $v1,$a0,0x3 -/* f05fab0: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) -/* f05fab4: 00641821 */ addu $v1,$v1,$a0 -/* f05fab8: 8ca90000 */ lw $t1,0x0($a1) -/* f05fabc: 00031880 */ sll $v1,$v1,0x2 -/* f05fac0: 00641823 */ subu $v1,$v1,$a0 -/* f05fac4: 00031880 */ sll $v1,$v1,0x2 -/* f05fac8: 01231021 */ addu $v0,$t1,$v1 -/* f05facc: 944a0000 */ lhu $t2,0x0($v0) -/* f05fad0: 314b7fff */ andi $t3,$t2,0x7fff -/* f05fad4: 10e00006 */ beqz $a3,.L0f05faf0 -/* f05fad8: a44b0000 */ sh $t3,0x0($v0) -/* f05fadc: 8cac0000 */ lw $t4,0x0($a1) -/* f05fae0: 01831021 */ addu $v0,$t4,$v1 -/* f05fae4: 944d0000 */ lhu $t5,0x0($v0) -/* f05fae8: 35ae8000 */ ori $t6,$t5,0x8000 -/* f05faec: a44e0000 */ sh $t6,0x0($v0) -.L0f05faf0: -/* f05faf0: 1000005d */ beqz $zero,.L0f05fc68 -/* f05faf4: 8d030438 */ lw $v1,0x438($t0) -/* f05faf8: 3c05800a */ lui $a1,%hi(g_RoomPtrs) -/* f05fafc: 0004c0c0 */ sll $t8,$a0,0x3 -/* f05fb00: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) -/* f05fb04: 0304c021 */ addu $t8,$t8,$a0 -/* f05fb08: 8caf0000 */ lw $t7,0x0($a1) -/* f05fb0c: 0018c080 */ sll $t8,$t8,0x2 -/* f05fb10: 0304c023 */ subu $t8,$t8,$a0 -/* f05fb14: 0018c080 */ sll $t8,$t8,0x2 -/* f05fb18: 01f81021 */ addu $v0,$t7,$t8 -/* f05fb1c: 904a004e */ lbu $t2,0x4e($v0) -/* f05fb20: 30e9000f */ andi $t1,$a3,0xf -/* f05fb24: 314bfff0 */ andi $t3,$t2,0xfff0 -/* f05fb28: 012b6025 */ or $t4,$t1,$t3 -/* f05fb2c: a04c004e */ sb $t4,0x4e($v0) -/* f05fb30: 1000004d */ beqz $zero,.L0f05fc68 -/* f05fb34: 8d030438 */ lw $v1,0x438($t0) -/* f05fb38: 3c05800a */ lui $a1,%hi(g_RoomPtrs) -/* f05fb3c: 000470c0 */ sll $t6,$a0,0x3 -/* f05fb40: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) -/* f05fb44: 01c47021 */ addu $t6,$t6,$a0 -/* f05fb48: 8cad0000 */ lw $t5,0x0($a1) -/* f05fb4c: 000e7080 */ sll $t6,$t6,0x2 -/* f05fb50: 01c47023 */ subu $t6,$t6,$a0 -/* f05fb54: 000e7080 */ sll $t6,$t6,0x2 -/* f05fb58: 01ae7821 */ addu $t7,$t5,$t6 -/* f05fb5c: a1e7004d */ sb $a3,0x4d($t7) -/* f05fb60: 10000041 */ beqz $zero,.L0f05fc68 -/* f05fb64: 8d030438 */ lw $v1,0x438($t0) -/* f05fb68: 8d1802bc */ lw $t8,0x2bc($t0) -/* f05fb6c: 24040001 */ addiu $a0,$zero,0x1 -/* f05fb70: 2b010002 */ slti $at,$t8,0x2 -/* f05fb74: 1420003c */ bnez $at,.L0f05fc68 -/* f05fb78: 3c05800a */ lui $a1,%hi(g_RoomPtrs) -/* f05fb7c: 24a54928 */ addiu $a1,$a1,%lo(g_RoomPtrs) -/* f05fb80: 2403008c */ addiu $v1,$zero,0x8c -/* f05fb84: 2406bfff */ addiu $a2,$zero,-16385 -.L0f05fb88: -/* f05fb88: 50e00008 */ beqzl $a3,.L0f05fbac -/* f05fb8c: 8cab0000 */ lw $t3,0x0($a1) -/* f05fb90: 8cb90000 */ lw $t9,0x0($a1) -/* f05fb94: 03231021 */ addu $v0,$t9,$v1 -/* f05fb98: 944a0000 */ lhu $t2,0x0($v0) -/* f05fb9c: 35494000 */ ori $t1,$t2,0x4000 -/* f05fba0: 10000006 */ beqz $zero,.L0f05fbbc -/* f05fba4: a4490000 */ sh $t1,0x0($v0) -/* f05fba8: 8cab0000 */ lw $t3,0x0($a1) -.L0f05fbac: -/* f05fbac: 01631021 */ addu $v0,$t3,$v1 -/* f05fbb0: 944c0000 */ lhu $t4,0x0($v0) -/* f05fbb4: 01866824 */ and $t5,$t4,$a2 -/* f05fbb8: a44d0000 */ sh $t5,0x0($v0) -.L0f05fbbc: -/* f05fbbc: 8d0e02bc */ lw $t6,0x2bc($t0) -/* f05fbc0: 24840001 */ addiu $a0,$a0,0x1 -/* f05fbc4: 2463008c */ addiu $v1,$v1,0x8c -/* f05fbc8: 008e082a */ slt $at,$a0,$t6 -/* f05fbcc: 1420ffee */ bnez $at,.L0f05fb88 -/* f05fbd0: 00000000 */ sll $zero,$zero,0x0 -/* f05fbd4: 10000024 */ beqz $zero,.L0f05fc68 -/* f05fbd8: 8d030438 */ lw $v1,0x438($t0) -/* f05fbdc: 0c00436c */ jal func00010db0 -/* f05fbe0: 00e02025 */ or $a0,$a3,$zero -/* f05fbe4: 3c08800a */ lui $t0,%hi(g_Vars) -/* f05fbe8: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f05fbec: 1000001e */ beqz $zero,.L0f05fc68 -/* f05fbf0: 8d030438 */ lw $v1,0x438($t0) -/* f05fbf4: 0c004643 */ jal func0001190c -/* f05fbf8: 00000000 */ sll $zero,$zero,0x0 -/* f05fbfc: 3c08800a */ lui $t0,%hi(g_Vars) -/* f05fc00: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f05fc04: 10000018 */ beqz $zero,.L0f05fc68 -/* f05fc08: 8d030438 */ lw $v1,0x438($t0) -/* f05fc0c: 0fc00699 */ jal func0f001a64 -/* f05fc10: 00e02825 */ or $a1,$a3,$zero -/* f05fc14: 3c08800a */ lui $t0,%hi(g_Vars) -/* f05fc18: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f05fc1c: 10000012 */ beqz $zero,.L0f05fc68 -/* f05fc20: 8d030438 */ lw $v1,0x438($t0) -/* f05fc24: 0c004378 */ jal func00010de0 -/* f05fc28: 00000000 */ sll $zero,$zero,0x0 -/* f05fc2c: 3c08800a */ lui $t0,%hi(g_Vars) -/* f05fc30: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f05fc34: 1000000c */ beqz $zero,.L0f05fc68 -/* f05fc38: 8d030438 */ lw $v1,0x438($t0) -/* f05fc3c: 0c00442f */ jal func000110bc -/* f05fc40: 00e02025 */ or $a0,$a3,$zero -/* f05fc44: 3c08800a */ lui $t0,%hi(g_Vars) -/* f05fc48: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f05fc4c: 10000006 */ beqz $zero,.L0f05fc68 -/* f05fc50: 8d030438 */ lw $v1,0x438($t0) -/* f05fc54: 0c00443b */ jal func000110ec -/* f05fc58: 00000000 */ sll $zero,$zero,0x0 -/* f05fc5c: 3c08800a */ lui $t0,%hi(g_Vars) -/* f05fc60: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) -/* f05fc64: 8d030438 */ lw $v1,0x438($t0) -.L0f05fc68: -/* f05fc68: 8fbf0014 */ lw $ra,0x14($sp) -/* f05fc6c: 246f0006 */ addiu $t7,$v1,0x6 -/* f05fc70: ad0f0438 */ sw $t7,0x438($t0) -/* f05fc74: 27bd0018 */ addiu $sp,$sp,0x18 -/* f05fc78: 03e00008 */ jr $ra -/* f05fc7c: 00001025 */ or $v0,$zero,$zero -); +bool aiMiscellaneous(void) +{ + u8 *cmd = g_Vars.ailist + g_Vars.aioffset; + s16 room_id = (cmd[3] | (cmd[2] << 8)); + s32 value = cmd[5]; + s32 i; + + switch (cmd[4]) { + case 0: + var8006ae18 = value; + break; + case 1: + var8006ae1c = value; + break; + case 2: + var8006ae20 = value; + break; + case 3: + var8006ae24 = value; + break; + case 4: + var8006ae28 = value; + break; + case 5: + g_RoomPtrs[room_id].flags &= ~0x00004000; + if (value) { + g_RoomPtrs[room_id].flags |= 0x00004000; + } + break; + case 6: + g_RoomPtrs[room_id].flags &= ~0x00008000; + if (value) { + g_RoomPtrs[room_id].flags |= 0x00008000; + } + break; + case 7: + g_RoomPtrs[room_id].bitfield.b = value; + break; + case 8: + g_RoomPtrs[room_id].unk4d = value; + break; + case 9: + for (i = 1; i < g_Vars.roomcount; i++) { + if (value) { + g_RoomPtrs[i].flags |= 0x00004000; + } else { + g_RoomPtrs[i].flags &= ~0x00004000; + } + } + break; + case 10: + func00010db0(value); + break; + case 11: + func0001190c(room_id); + break; + case 12: + func0f001a64(room_id, value); + break; + case 13: + func00010de0(room_id); + break; + case 14: + func000110bc(value); + break; + case 15: + func000110ec(room_id); + break; + } + + g_Vars.aioffset += 6; + + return false; +} /** * @cmd 01d7 diff --git a/src/include/commands.h b/src/include/commands.h index f4d097450..e0c3a3f15 100644 --- a/src/include/commands.h +++ b/src/include/commands.h @@ -1924,11 +1924,40 @@ mkshort(0x01d5), \ bool, -#define set_lighting(room, operation, unknown) \ +/** + * Run a miscellaneous command. + * + * Operations 0 through 4 aren't known yet. They copy the given value to some + * global variables. Value is expected to be 0 or 1. + * + * Operation 5 is unknown but operates on the given room ID. + * + * Operation 6 marks a room as internal or external. External rooms don't light + * up when shots are fired. This operation expects the room ID to be supplied + * and for value to be 0 (for internal) or 1 (for external). + * + * Operations 7 and 8 are unknown. + * + * Operation 9 is the same as operation 5, but applies to all rooms. + * + * Operation 0xa plays the AF1 nosedive noise. In this operation value is the + * duration of the noise in seconds. + * + * Operation 0xb is unknown. + * + * Operation 0xc is related to the Rescue lights being overloaded, but specifics + * are not known. + * + * Operation 0xd is believed to stop the AF1 nosedive noise. + * + * Operation 0xe and 0xf are related to the UFO exit on Escape. They probably + * start and stop the UFO noise but this hasn't been tested. + */ +#define misc_command(room, operation, value) \ mkshort(0x01d6), \ mkshort(room), \ operation, \ - unknown, + value, #define play_sound_from_object2(channel, object, sound, u1, u2) \ mkshort(0x01d9), \ diff --git a/src/include/game/chr/chraicommands.h b/src/include/game/chr/chraicommands.h index f1cfa3e56..6f8e32a5c 100644 --- a/src/include/game/chr/chraicommands.h +++ b/src/include/game/chr/chraicommands.h @@ -433,7 +433,7 @@ /*0x01d3*/ bool ai01d3(void); /*0x01d4*/ bool ai01d4(void); /*0x01d5*/ bool aiShowCutsceneChrs(void); -/*0x01d6*/ bool ai01d6(void); +/*0x01d6*/ bool aiMiscellaneous(void); /*0x01d7*/ bool aiIfDistanceToTarget2LessThan(void); /*0x01d8*/ bool aiIfDistanceToTarget2GreaterThan(void); /*0x01d9*/ bool ai01d9(void); diff --git a/src/include/game/game_000920.h b/src/include/game/game_000920.h index 2504502fc..4850ca6a4 100644 --- a/src/include/game/game_000920.h +++ b/src/include/game/game_000920.h @@ -22,7 +22,7 @@ u32 func0f001138(void); u32 func0f001300(void); u32 func0f0013c8(void); u32 func0f001734(void); -u32 func0f001a64(void); +void func0f001a64(s32, s32 value); u32 func0f001b78(void); u32 func0f001bdc(void); u32 func0f001c0c(void); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index ed5f2e2ad..cc04a3c14 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -59,7 +59,7 @@ struct g_vars { /*0002b0*/ s32 killcount; /*0002b4*/ u32 unk0002b4; /*0002b8*/ u32 unk0002b8; - /*0002bc*/ u32 unk0002bc; + /*0002bc*/ s32 roomcount; /*0002c0*/ u32 unk0002c0; /*0002c4*/ u32 unk0002c4; /*0002c8*/ u32 unk0002c8; diff --git a/src/include/setup/setup_000000.h b/src/include/setup/setup_000000.h index 7cec314c9..7f5d2a48e 100644 --- a/src/include/setup/setup_000000.h +++ b/src/include/setup/setup_000000.h @@ -535,6 +535,11 @@ extern u32 var8006ad90; extern u32 var8006adf8; extern u32 var8006ae10; extern u32 var8006ae14; +extern s8 var8006ae18; +extern s8 var8006ae1c; +extern s8 var8006ae20; +extern s8 var8006ae24; +extern s8 var8006ae28; extern u32 var8006ae3c; extern u32 var8006ae5c; extern u32 var8006ae70; diff --git a/src/include/types.h b/src/include/types.h index cc14a894f..2d2d09333 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -2643,8 +2643,13 @@ struct gvars800a3fc8 { u32 unk20; }; +struct roombitfield { + u8 a : 4; + u8 b : 4; +}; + struct room { - /*0x00*/ u16 unk00; + /*0x00*/ u16 flags; /*0x04*/ u32 unk04; /*0x08*/ u32 unk08; /*0x0c*/ u32 unk0c; @@ -2663,7 +2668,9 @@ struct room { /*0x40*/ u32 unk40; /*0x44*/ u32 unk44; /*0x48*/ u32 unk48; - /*0x4c*/ u32 unk4c; + /*0x4c*/ u8 unk4c; + /*0x4d*/ u8 unk4d; + /*0x4e*/ struct roombitfield bitfield; /*0x50*/ u32 unk50; /*0x54*/ u32 unk54; /*0x58*/ u32 unk58; diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index c5f04b765..bdd0f5fc4 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -14602,7 +14602,7 @@ bool (*g_CommandPointers[])(void) = { /*0x01d3*/ ai01d3, /*0x01d4*/ ai01d4, /*0x01d5*/ aiShowCutsceneChrs, - /*0x01d6*/ ai01d6, + /*0x01d6*/ aiMiscellaneous, /*0x01d7*/ aiIfDistanceToTarget2LessThan, /*0x01d8*/ aiIfDistanceToTarget2GreaterThan, /*0x01d9*/ ai01d9, @@ -16511,11 +16511,11 @@ u32 var8006ae08 = 0x00000000; u32 var8006ae0c = 0x00000000; u32 var8006ae10 = 0x00000000; u32 var8006ae14 = 0x00000000; -u32 var8006ae18 = 0x00000000; -u32 var8006ae1c = 0x00000000; -u32 var8006ae20 = 0x00000000; -u32 var8006ae24 = 0x00000000; -u32 var8006ae28 = 0x00000000; +s8 var8006ae18 = 0; +s8 var8006ae1c = 0; +s8 var8006ae20 = 0; +s8 var8006ae24 = 0; +s8 var8006ae28 = 0; u32 var8006ae2c = 0x00000000; u32 var8006ae30 = 0x00000000; u32 var8006ae34 = 0x00000000;