fixed tb 9

nbproject/private/configurations.xml

@@ -4272,6 +4272,159 @@
           </df>
         </df>
         <df name="trainer_sprites">
+          <in>ts_0000.s</in>
+          <in>ts_0001.s</in>
+          <in>ts_0002.s</in>
+          <in>ts_0003.s</in>
+          <in>ts_0004.s</in>
+          <in>ts_0005.s</in>
+          <in>ts_0006.s</in>
+          <in>ts_0007.s</in>
+          <in>ts_0008.s</in>
+          <in>ts_0009.s</in>
+          <in>ts_0010.s</in>
+          <in>ts_0011.s</in>
+          <in>ts_0012.s</in>
+          <in>ts_0013.s</in>
+          <in>ts_0014.s</in>
+          <in>ts_0015.s</in>
+          <in>ts_0016.s</in>
+          <in>ts_0017.s</in>
+          <in>ts_0018.s</in>
+          <in>ts_0019.s</in>
+          <in>ts_0020.s</in>
+          <in>ts_0021.s</in>
+          <in>ts_0022.s</in>
+          <in>ts_0023.s</in>
+          <in>ts_0024.s</in>
+          <in>ts_0025.s</in>
+          <in>ts_0026.s</in>
+          <in>ts_0027.s</in>
+          <in>ts_0028.s</in>
+          <in>ts_0029.s</in>
+          <in>ts_0030.s</in>
+          <in>ts_0031.s</in>
+          <in>ts_0032.s</in>
+          <in>ts_0033.s</in>
+          <in>ts_0034.s</in>
+          <in>ts_0035.s</in>
+          <in>ts_0036.s</in>
+          <in>ts_0037.s</in>
+          <in>ts_0038.s</in>
+          <in>ts_0039.s</in>
+          <in>ts_0040.s</in>
+          <in>ts_0041.s</in>
+          <in>ts_0042.s</in>
+          <in>ts_0043.s</in>
+          <in>ts_0044.s</in>
+          <in>ts_0045.s</in>
+          <in>ts_0046.s</in>
+          <in>ts_0047.s</in>
+          <in>ts_0048.s</in>
+          <in>ts_0049.s</in>
+          <in>ts_0050.s</in>
+          <in>ts_0051.s</in>
+          <in>ts_0052.s</in>
+          <in>ts_0053.s</in>
+          <in>ts_0054.s</in>
+          <in>ts_0055.s</in>
+          <in>ts_0056.s</in>
+          <in>ts_0057.s</in>
+          <in>ts_0058.s</in>
+          <in>ts_0059.s</in>
+          <in>ts_0060.s</in>
+          <in>ts_0061.s</in>
+          <in>ts_0062.s</in>
+          <in>ts_0063.s</in>
+          <in>ts_0064.s</in>
+          <in>ts_0065.s</in>
+          <in>ts_0066.s</in>
+          <in>ts_0067.s</in>
+          <in>ts_0068.s</in>
+          <in>ts_0069.s</in>
+          <in>ts_0070.s</in>
+          <in>ts_0071.s</in>
+          <in>ts_0072.s</in>
+          <in>ts_0073.s</in>
+          <in>ts_0074.s</in>
+          <in>ts_0075.s</in>
+          <in>ts_0076.s</in>
+          <in>ts_0077.s</in>
+          <in>ts_0078.s</in>
+          <in>ts_0079.s</in>
+          <in>ts_0080.s</in>
+          <in>ts_0081.s</in>
+          <in>ts_0082.s</in>
+          <in>ts_0083.s</in>
+          <in>ts_0084.s</in>
+          <in>ts_0085.s</in>
+          <in>ts_0086.s</in>
+          <in>ts_0087.s</in>
+          <in>ts_0088.s</in>
+          <in>ts_0089.s</in>
+          <in>ts_0090.s</in>
+          <in>ts_0091.s</in>
+          <in>ts_0092.s</in>
+          <in>ts_0093.s</in>
+          <in>ts_0094.s</in>
+          <in>ts_0095.s</in>
+          <in>ts_0096.s</in>
+          <in>ts_0097.s</in>
+          <in>ts_0098.s</in>
+          <in>ts_0099.s</in>
+          <in>ts_0100.s</in>
+          <in>ts_0101.s</in>
+          <in>ts_0102.s</in>
+          <in>ts_0103.s</in>
+          <in>ts_0104.s</in>
+          <in>ts_0105.s</in>
+          <in>ts_0106.s</in>
+          <in>ts_0107.s</in>
+          <in>ts_0108.s</in>
+          <in>ts_0109.s</in>
+          <in>ts_0110.s</in>
+          <in>ts_0111.s</in>
+          <in>ts_0112.s</in>
+          <in>ts_0113.s</in>
+          <in>ts_0114.s</in>
+          <in>ts_0115.s</in>
+          <in>ts_0116.s</in>
+          <in>ts_0117.s</in>
+          <in>ts_0118.s</in>
+          <in>ts_0119.s</in>
+          <in>ts_0120.s</in>
+          <in>ts_0121.s</in>
+          <in>ts_0122.s</in>
+          <in>ts_0123.s</in>
+          <in>ts_0124.s</in>
+          <in>ts_0125.s</in>
+          <in>ts_0126.s</in>
+          <in>ts_0127.s</in>
+          <in>ts_0128.s</in>
+          <in>ts_0129.s</in>
+          <in>ts_0130.s</in>
+          <in>ts_0131.s</in>
+          <in>ts_0132.s</in>
+          <in>ts_0133.s</in>
+          <in>ts_0134.s</in>
+          <in>ts_0135.s</in>
+          <in>ts_0136.s</in>
+          <in>ts_0137.s</in>
+          <in>ts_0138.s</in>
+          <in>ts_0139.s</in>
+          <in>ts_0140.s</in>
+          <in>ts_0141.s</in>
+          <in>ts_0142.s</in>
+          <in>ts_0143.s</in>
+          <in>ts_0144.s</in>
+          <in>ts_0145.s</in>
+          <in>ts_0146.s</in>
+          <in>ts_0147.s</in>
+          <in>ts_0148.s</in>
+          <in>ts_0149.s</in>
+          <in>ts_0150.s</in>
+          <in>ts_0151.s</in>
+          <in>ts_0152.s</in>
         </df>
       </df>
       <df name="object">
@@ -5576,6 +5729,7 @@
           <in>var_hook.S</in>
         </df>
         <df name="specials">
+          <in>.#trainer_battle.c</in>
           <in>camera_move.c</in>
           <in>camera_move.h</in>
           <in>custom_specials.c</in>

src/specials/trainer_battle.c

@@ -114,7 +114,6 @@ u16 tb_modify_flag_id(u16 flag)
         case 2:
             return flag + 2;
     }
-    assert(0);
     return 0;
 }
 
@@ -229,9 +228,8 @@ void* tb_configure_by_script(void* ptr_script)
             trainerbattle_next_scr_cmd = ptr_script;
             battle_80801F0_something();
             return (void*) (0x081A4EE9); /* some script to execute */
-        case 5:
-            assert(0);
-            return NULL;
+            
+            //this will merge case 5 with default which might not be as intended
         case 6:
         case 8:
             trainerbattle_battle_type = load_byte(ptr_script);
@@ -258,11 +256,14 @@ void* tb_configure_by_script(void* ptr_script)
             trainerbattle_next_scr_cmd = ptr_script;
             battle_80801F0_something();
             return (void*) (0x081A4EE9); /* some script to execute */
-        case 7:
-            assert(0);
-            return NULL;
+            
+            //this will merge case 7 with default
         case 9:
             /* WIN / LOSE resume script */
+            
+            trainerbattle_battle_type = load_byte(ptr_script);
+            ptr_script++;
+            
             trainerbattle_flag_id = tb_modify_flag_id(load_hword(ptr_script));
             ptr_script += 2;
             
@@ -282,7 +283,12 @@ void* tb_configure_by_script(void* ptr_script)
             trainerbattle_message_4 = NULL;
             
             trainerbattle_next_scr_cmd = ptr_script;
-            return (void*) 0x081A4F21; /* some script to execute */
+            
+            battle_80801F0_something();
+            
+            /* one method call is missing here */
+            
+            return (void*) (0x081A4EC1); /* some script to execute */
         default:
             trainerbattle_battle_type = load_byte(ptr_script);
             ptr_script++;