v37a release

- Some bugs have been fixed.
Raskulk · Oct 1, 2023 · ef7e763 · ef7e763
1 parent 6c179d1
commit ef7e763
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 40 deletions.
diff --git a/Mobile/Optional (PS2)/mainV1.txt b/Mobile/Optional (PS2)/mainV1.txt
@@ -10373,7 +10373,7 @@ TIMERA = 0
 wait 0 
 if 
 83D0:   not wav 1 loaded 
-jf @ROBBING_130 
+jf @ROBBING_1562 
 jump @ROBBING_503 
 
 :ROBBING_529
@@ -11479,7 +11479,7 @@ if
    not $451 == 9 
 jf @GREEN_CL_319 
 if or
-0500:   player $PLAYER_CHAR skin == "HOODYAGREEN_CL" on_bodypart 0 
+0500:   player $PLAYER_CHAR skin == "HOODYAGREEN" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "SHIRTBGANG" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "COACH" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "BANDGANG" on_bodypart 16 
@@ -11491,7 +11491,7 @@ if
 jf @GREEN_CL_310 
 0746: set_acquaintance 0 of_actors_pedtype 8 to_actors_pedtype 0 
 0746: set_acquaintance 4 of_actors_pedtype 7 to_actors_pedtype 0 
-0746: set_acquaintance 4 of_actors_pedtype 9 to_actors_pedtype 0 
+0746: set_acquaintance 4 of_actors_pedtype 9 to_actors_pedtype 0  
 2@ = 1 
 1@ = 0 
 jump @GREEN_CL_310 
@@ -11500,11 +11500,11 @@ jump @GREEN_CL_310
 if 
   1@ == 0 
 jf @GREEN_CL_310 
-0746: set_acquaintance 3 of_actors_pedtype 8 to_actors_pedtype 0 
+0746: set_acquaintance 2 of_actors_pedtype 8 to_actors_pedtype 0 
 0746: set_acquaintance 3 of_actors_pedtype 7 to_actors_pedtype 0 
-0746: set_acquaintance 3 of_actors_pedtype 9 to_actors_pedtype 0 
+0746: set_acquaintance 3 of_actors_pedtype 9 to_actors_pedtype 0  
 1@ = 1 
-2@ = 0 
+2@ = 0  
 
 :GREEN_CL_310
 jump @GREEN_CL_33 
@@ -26916,7 +26916,7 @@ return
 :MOB_GF_3516
 $1445 = 0 
 
-:MOB_GF_3523
+:MOB_GF_3523  
 03CF: load_wav $1448($1445,20i) as 1 
 $1445 += 1 
 if 
@@ -62966,8 +62966,8 @@ wait 0
 53@ = 0 
 $7841 = 0 
 $7840 = 180000 
-TIMERA = -2205.44 
-TIMERB = 128.99 
+32@ = -2205.44 
+33@ = 128.99 
 42@ = 57.33 
 43@ = 90.0 
 44@ = -2227.0 
@@ -63044,8 +63044,8 @@ jf @ZERO5_585
 :ZERO5_585
 select_interior 0 
 08AD: link_actor $PLAYER_ACTOR to_enex_marker_at -2240.854 129.3346 radius 1.5 
-03CB: set_rendering_origin_at TIMERA TIMERB 42@ 
-046E: put_player $PLAYER_CHAR in_RC_mode_at TIMERA TIMERB 42@ angle 40.09 RC_model #RCBARON 
+03CB: set_rendering_origin_at 32@ 33@ 42@ 
+046E: put_player $PLAYER_CHAR in_RC_mode_at 32@ 33@ 42@ angle 40.09 RC_model #RCBARON 
 0484: 34@ = player $PLAYER_CHAR RC_car 
 0175: set_car 34@ Z_angle_to 90.0 
 04D6: enable_RC_car_detonation 0 
@@ -70275,6 +70275,7 @@ jf @SWEET1_2202
 0647: AS_actor $130 clear_look_task 
 05BF: AS_actor $PLAYER_ACTOR look_at_actor $130 8000 ms 
 05BF: AS_actor $130 look_at_actor $PLAYER_ACTOR 8000 ms 
+0967: actor $130 move_mouth 5000 ms 
 
 :SWEET1_2202
 $7916 = 1 
@@ -70286,6 +70287,7 @@ jump @SWEET1_2089
 if 
 8118:   not actor $130 dead 
 jf @SWEET1_2240 
+0968: actor $130 stop_mouth 
 0639: AS_actor $PLAYER_ACTOR rotate_to_actor $130 
 
 :SWEET1_2240
@@ -404274,7 +404276,7 @@ select_interior 0
 08F6: restore_player_group 
 0169: set_fade_color_RGB 0 0 0 
 wait 0 
-023C: load_special_actor 'CESAR2' as 1 // models 290-299 
+023C: load_special_actor 'CESAR' as 1 // models 290-299 
 023C: load_special_actor 'SUNNY' as 2 // models 290-299 
 023C: load_special_actor 'GAL' as 3 // models 290-299 
 023C: load_special_actor 'HAZER' as 4 // models 290-299 
@@ -525526,7 +525528,7 @@ jump @HMLES_4224
 
 :HMLES_156
 03FE: set_actor 0@ money 0 
-07FE: set_actor 0@ fighting_style_to 16 moves 6 
+//07FE: set_actor 0@ fighting_style_to 16 moves 6 
 0209: 22@ = random_int_in_ranges 0 4 
 if 
    not $3173 == 0 

diff --git a/Mobile/Standart/mainV1.txt b/Mobile/Standart/mainV1.txt
@@ -10377,7 +10377,7 @@ TIMERA = 0
 wait 0 
 if 
 83D0:   not wav 1 loaded 
-jf @ROBBING_130 
+jf @ROBBING_1562  
 jump @ROBBING_503 
 
 :ROBBING_529
@@ -11483,7 +11483,7 @@ if
    not $451 == 9 
 jf @GREEN_CL_319 
 if or
-0500:   player $PLAYER_CHAR skin == "HOODYAGREEN_CL" on_bodypart 0 
+0500:   player $PLAYER_CHAR skin == "HOODYAGREEN" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "SHIRTBGANG" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "COACH" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "BANDGANG" on_bodypart 16 
@@ -11504,7 +11504,7 @@ jump @GREEN_CL_310
 if 
   1@ == 0 
 jf @GREEN_CL_310 
-0746: set_acquaintance 3 of_actors_pedtype 8 to_actors_pedtype 0 
+0746: set_acquaintance 2 of_actors_pedtype 8 to_actors_pedtype 0 
 0746: set_acquaintance 3 of_actors_pedtype 7 to_actors_pedtype 0 
 0746: set_acquaintance 3 of_actors_pedtype 9 to_actors_pedtype 0 
 1@ = 1 
@@ -62969,8 +62969,8 @@ wait 0
 53@ = 0 
 $7841 = 0 
 $7840 = 180000 
-TIMERA = -2205.44 
-TIMERB = 128.99 
+32@ = -2205.44 
+33@ = 128.99 
 42@ = 57.33 
 43@ = 90.0 
 44@ = -2227.0 
@@ -63047,8 +63047,8 @@ jf @ZERO5_585
 :ZERO5_585
 select_interior 0 
 08AD: link_actor $PLAYER_ACTOR to_enex_marker_at -2240.854 129.3346 radius 1.5 
-03CB: set_rendering_origin_at TIMERA TIMERB 42@ 
-046E: put_player $PLAYER_CHAR in_RC_mode_at TIMERA TIMERB 42@ angle 40.09 RC_model #RCBARON 
+03CB: set_rendering_origin_at 32@ 33@ 42@ 
+046E: put_player $PLAYER_CHAR in_RC_mode_at 32@ 33@ 42@ angle 40.09 RC_model #RCBARON 
 0484: 34@ = player $PLAYER_CHAR RC_car 
 0175: set_car 34@ Z_angle_to 90.0 
 04D6: enable_RC_car_detonation 0 
@@ -70279,6 +70279,7 @@ jf @SWEET1_2202
 0647: AS_actor $130 clear_look_task 
 05BF: AS_actor $PLAYER_ACTOR look_at_actor $130 8000 ms 
 05BF: AS_actor $130 look_at_actor $PLAYER_ACTOR 8000 ms 
+0967: actor $130 move_mouth 5000 ms 
 
 :SWEET1_2202
 $7916 = 1 
@@ -70290,6 +70291,7 @@ jump @SWEET1_2089
 if 
 8118:   not actor $130 dead 
 jf @SWEET1_2240 
+0968: actor $130 stop_mouth 
 0639: AS_actor $PLAYER_ACTOR rotate_to_actor $130 
 
 :SWEET1_2240
@@ -404388,7 +404390,7 @@ select_interior 0
 08F6: restore_player_group 
 0169: set_fade_color_RGB 0 0 0 
 wait 0 
-023C: load_special_actor 'CESAR2' as 1 // models 290-299 
+023C: load_special_actor 'CESAR' as 1 // models 290-299 
 023C: load_special_actor 'SUNNY' as 2 // models 290-299 
 023C: load_special_actor 'GAL' as 3 // models 290-299 
 023C: load_special_actor 'HAZER' as 4 // models 290-299 
@@ -525655,7 +525657,7 @@ jump @HMLES_4224
 
 :HMLES_156
 03FE: set_actor 0@ money 0 
-07FE: set_actor 0@ fighting_style_to 16 moves 6 
+//07FE: set_actor 0@ fighting_style_to 16 moves 6 
 0209: 22@ = random_int_in_ranges 0 4 
 if 
    not $3173 == 0 

diff --git a/PS Vita/Optional (PS2)/mainV1.txt b/PS Vita/Optional (PS2)/mainV1.txt
@@ -10373,7 +10373,7 @@ TIMERA = 0
 wait 0 
 if 
 83D0:   not wav 1 loaded 
-jf @ROBBING_130 
+jf @ROBBING_1562 
 jump @ROBBING_503 
 
 :ROBBING_529
@@ -11479,7 +11479,7 @@ if
    not $451 == 9 
 jf @GREEN_CL_319 
 if or
-0500:   player $PLAYER_CHAR skin == "HOODYAGREEN_CL" on_bodypart 0 
+0500:   player $PLAYER_CHAR skin == "HOODYAGREEN" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "SHIRTBGANG" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "COACH" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "BANDGANG" on_bodypart 16 
@@ -11500,7 +11500,7 @@ jump @GREEN_CL_310
 if 
   1@ == 0 
 jf @GREEN_CL_310 
-0746: set_acquaintance 3 of_actors_pedtype 8 to_actors_pedtype 0 
+0746: set_acquaintance 2 of_actors_pedtype 8 to_actors_pedtype 0 
 0746: set_acquaintance 3 of_actors_pedtype 7 to_actors_pedtype 0 
 0746: set_acquaintance 3 of_actors_pedtype 9 to_actors_pedtype 0 
 1@ = 1 
@@ -62963,8 +62963,8 @@ wait 0
 53@ = 0 
 $7841 = 0 
 $7840 = 180000 
-TIMERA = -2205.44 
-TIMERB = 128.99 
+32@ = -2205.44 
+33@ = 128.99 
 42@ = 57.33 
 43@ = 90.0 
 44@ = -2227.0 
@@ -63041,8 +63041,8 @@ jf @ZERO5_585
 :ZERO5_585
 select_interior 0 
 08AD: link_actor $PLAYER_ACTOR to_enex_marker_at -2240.854 129.3346 radius 1.5 
-03CB: set_rendering_origin_at TIMERA TIMERB 42@ 
-046E: put_player $PLAYER_CHAR in_RC_mode_at TIMERA TIMERB 42@ angle 40.09 RC_model #RCBARON 
+03CB: set_rendering_origin_at 32@ 33@ 42@ 
+046E: put_player $PLAYER_CHAR in_RC_mode_at 32@ 33@ 42@ angle 40.09 RC_model #RCBARON 
 0484: 34@ = player $PLAYER_CHAR RC_car 
 0175: set_car 34@ Z_angle_to 90.0 
 04D6: enable_RC_car_detonation 0 
@@ -70271,6 +70271,7 @@ jf @SWEET1_2202
 0647: AS_actor $130 clear_look_task 
 05BF: AS_actor $PLAYER_ACTOR look_at_actor $130 8000 ms 
 05BF: AS_actor $130 look_at_actor $PLAYER_ACTOR 8000 ms 
+0967: actor $130 move_mouth 5000 ms 
 
 :SWEET1_2202
 $7916 = 1 
@@ -70282,6 +70283,7 @@ jump @SWEET1_2089
 if 
 8118:   not actor $130 dead 
 jf @SWEET1_2240 
+0968: actor $130 stop_mouth 
 0639: AS_actor $PLAYER_ACTOR rotate_to_actor $130 
 
 :SWEET1_2240
@@ -404273,7 +404275,7 @@ select_interior 0
 08F6: restore_player_group 
 0169: set_fade_color_RGB 0 0 0 
 wait 0 
-023C: load_special_actor 'CESAR2' as 1 // models 290-299 
+023C: load_special_actor 'CESAR' as 1 // models 290-299 
 023C: load_special_actor 'SUNNY' as 2 // models 290-299 
 023C: load_special_actor 'GAL' as 3 // models 290-299 
 023C: load_special_actor 'HAZER' as 4 // models 290-299 
@@ -525523,7 +525525,7 @@ jump @HMLES_4224
 
 :HMLES_156
 03FE: set_actor 0@ money 0 
-07FE: set_actor 0@ fighting_style_to 16 moves 6 
+//07FE: set_actor 0@ fighting_style_to 16 moves 6 
 0209: 22@ = random_int_in_ranges 0 4 
 if 
    not $3173 == 0 

diff --git a/PS Vita/Standart/mainV1.txt b/PS Vita/Standart/mainV1.txt
@@ -10377,7 +10377,7 @@ TIMERA = 0
 wait 0 
 if 
 83D0:   not wav 1 loaded 
-jf @ROBBING_130 
+jf @ROBBING_1562 
 jump @ROBBING_503 
 
 :ROBBING_529
@@ -11483,7 +11483,7 @@ if
    not $451 == 9 
 jf @GREEN_CL_319 
 if or
-0500:   player $PLAYER_CHAR skin == "HOODYAGREEN_CL" on_bodypart 0 
+0500:   player $PLAYER_CHAR skin == "HOODYAGREEN" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "SHIRTBGANG" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "COACH" on_bodypart 0 
 0500:   player $PLAYER_CHAR skin == "BANDGANG" on_bodypart 16 
@@ -11504,7 +11504,7 @@ jump @GREEN_CL_310
 if 
   1@ == 0 
 jf @GREEN_CL_310 
-0746: set_acquaintance 3 of_actors_pedtype 8 to_actors_pedtype 0 
+0746: set_acquaintance 2 of_actors_pedtype 8 to_actors_pedtype 0 
 0746: set_acquaintance 3 of_actors_pedtype 7 to_actors_pedtype 0 
 0746: set_acquaintance 3 of_actors_pedtype 9 to_actors_pedtype 0 
 1@ = 1 
@@ -62969,8 +62969,8 @@ wait 0
 53@ = 0 
 $7841 = 0 
 $7840 = 180000 
-TIMERA = -2205.44 
-TIMERB = 128.99 
+32@ = -2205.44 
+33@ = 128.99  
 42@ = 57.33 
 43@ = 90.0 
 44@ = -2227.0 
@@ -63047,8 +63047,8 @@ jf @ZERO5_585
 :ZERO5_585
 select_interior 0 
 08AD: link_actor $PLAYER_ACTOR to_enex_marker_at -2240.854 129.3346 radius 1.5 
-03CB: set_rendering_origin_at TIMERA TIMERB 42@ 
-046E: put_player $PLAYER_CHAR in_RC_mode_at TIMERA TIMERB 42@ angle 40.09 RC_model #RCBARON 
+03CB: set_rendering_origin_at 32@ 33@ 42@ 
+046E: put_player $PLAYER_CHAR in_RC_mode_at 32@ 33@ 42@ angle 40.09 RC_model #RCBARON 
 0484: 34@ = player $PLAYER_CHAR RC_car 
 0175: set_car 34@ Z_angle_to 90.0 
 04D6: enable_RC_car_detonation 0 
@@ -70279,6 +70279,7 @@ jf @SWEET1_2202
 0647: AS_actor $130 clear_look_task 
 05BF: AS_actor $PLAYER_ACTOR look_at_actor $130 8000 ms 
 05BF: AS_actor $130 look_at_actor $PLAYER_ACTOR 8000 ms 
+0967: actor $130 move_mouth 5000 ms 
 
 :SWEET1_2202
 $7916 = 1 
@@ -70290,6 +70291,7 @@ jump @SWEET1_2089
 if 
 8118:   not actor $130 dead 
 jf @SWEET1_2240 
+0968: actor $130 stop_mouth 
 0639: AS_actor $PLAYER_ACTOR rotate_to_actor $130 
 
 :SWEET1_2240
@@ -404393,7 +404395,7 @@ select_interior 0
 08F6: restore_player_group 
 0169: set_fade_color_RGB 0 0 0 
 wait 0 
-023C: load_special_actor 'CESAR2' as 1 // models 290-299 
+023C: load_special_actor 'CESAR' as 1 // models 290-299 
 023C: load_special_actor 'SUNNY' as 2 // models 290-299 
 023C: load_special_actor 'GAL' as 3 // models 290-299 
 023C: load_special_actor 'HAZER' as 4 // models 290-299 
@@ -525661,7 +525663,7 @@ jump @HMLES_4224
 
 :HMLES_156
 03FE: set_actor 0@ money 0 
-07FE: set_actor 0@ fighting_style_to 16 moves 6 
+//07FE: set_actor 0@ fighting_style_to 16 moves 6 
 0209: 22@ = random_int_in_ranges 0 4 
 if 
    not $3173 == 0