浏览代码

fix bugs: fix #25, fix #24, fix #4

DragonflySotS 6 年前
父节点
当前提交
439f8477d2
共有 3 个文件被更改,包括 18065 次插入1203 次删除
  1. 72
    73
      data/overworld/overworld_data.s
  2. 17992
    1129
      data/overworld/overworld_frames.s
  3. 1
    1
      sots-private

+ 72
- 73
data/overworld/overworld_data.s 查看文件

@@ -1026,7 +1026,6 @@
1026 1026
 .global ow_data_objekt_0254
1027 1027
 .global ow_data_objekt_0255
1028 1028
 
1029
-
1030 1029
 .align 2
1031 1030
 ow_data_npcs_0000:
1032 1031
 .hword 0xFFFF, 0xC000, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
@@ -1099,87 +1098,87 @@ ow_data_npcs_0013:
1099 1098
 
1100 1099
 .align 2
1101 1100
 ow_data_npcs_0014:
1102
-.hword 0xFFFF, 0xC002, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1101
+.hword 0xFFFF, 0xC002, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1103 1102
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0014, 0x8231CFC
1104 1103
 
1105 1104
 .align 2
1106 1105
 ow_data_npcs_0015:
1107
-.hword 0xFFFF, 0xC002, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1106
+.hword 0xFFFF, 0xC002, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1108 1107
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0015, 0x8231CFC
1109 1108
 
1110 1109
 .align 2
1111 1110
 ow_data_npcs_0016:
1112
-.hword 0xFFFF, 0xC003, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1111
+.hword 0xFFFF, 0xC003, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1113 1112
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0016, 0x8231CFC
1114 1113
 
1115 1114
 .align 2
1116 1115
 ow_data_npcs_0017:
1117
-.hword 0xFFFF, 0xC003, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1116
+.hword 0xFFFF, 0xC003, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1118 1117
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0017, 0x8231CFC
1119 1118
 
1120 1119
 .align 2
1121 1120
 ow_data_npcs_0018:
1122
-.hword 0xFFFF, 0xC004, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1121
+.hword 0xFFFF, 0xC004, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1123 1122
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0018, 0x8231CFC
1124 1123
 
1125 1124
 .align 2
1126 1125
 ow_data_npcs_0019:
1127
-.hword 0xFFFF, 0xC004, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1126
+.hword 0xFFFF, 0xC004, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1128 1127
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0019, 0x8231CFC
1129 1128
 
1130 1129
 .align 2
1131 1130
 ow_data_npcs_0020:
1132
-.hword 0xFFFF, 0xC005, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1131
+.hword 0xFFFF, 0xC005, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1133 1132
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0020, 0x8231CFC
1134 1133
 
1135 1134
 .align 2
1136 1135
 ow_data_npcs_0021:
1137
-.hword 0xFFFF, 0xC005, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1136
+.hword 0xFFFF, 0xC005, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1138 1137
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0021, 0x8231CFC
1139 1138
 
1140 1139
 .align 2
1141 1140
 ow_data_npcs_0022:
1142
-.hword 0xFFFF, 0xC006, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1141
+.hword 0xFFFF, 0xC006, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1143 1142
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0022, 0x8231CFC
1144 1143
 
1145 1144
 .align 2
1146 1145
 ow_data_npcs_0023:
1147
-.hword 0xFFFF, 0xC006, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1146
+.hword 0xFFFF, 0xC006, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1148 1147
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0023, 0x8231CFC
1149 1148
 
1150 1149
 .align 2
1151 1150
 ow_data_npcs_0024:
1152
-.hword 0xFFFF, 0xC007, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1151
+.hword 0xFFFF, 0xC007, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1153 1152
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0024, 0x8231CFC
1154 1153
 
1155 1154
 .align 2
1156 1155
 ow_data_npcs_0025:
1157
-.hword 0xFFFF, 0xC008, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1156
+.hword 0xFFFF, 0xC008, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1158 1157
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0025, 0x8231CFC
1159 1158
 
1160 1159
 .align 2
1161 1160
 ow_data_npcs_0026:
1162
-.hword 0xFFFF, 0xC009, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1161
+.hword 0xFFFF, 0xC009, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1163 1162
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0026, 0x8231CFC
1164 1163
 
1165 1164
 .align 2
1166 1165
 ow_data_npcs_0027:
1167
-.hword 0xFFFF, 0xC00A, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1166
+.hword 0xFFFF, 0xC00A, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1168 1167
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0027, 0x8231CFC
1169 1168
 
1170 1169
 .align 2
1171 1170
 ow_data_npcs_0028:
1172
-.hword 0xFFFF, 0xC00B, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1171
+.hword 0xFFFF, 0xC00B, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1173 1172
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0028, 0x8231CFC
1174 1173
 
1175 1174
 .align 2
1176 1175
 ow_data_npcs_0029:
1177
-.hword 0xFFFF, 0xC00C, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1176
+.hword 0xFFFF, 0xC00C, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1178 1177
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0029, 0x8231CFC
1179 1178
 
1180 1179
 .align 2
1181 1180
 ow_data_npcs_0030:
1182
-.hword 0xFFFF, 0xC00D, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
1181
+.hword 0xFFFF, 0xC00D, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
1183 1182
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_npcs_0030, 0x8231CFC
1184 1183
 
1185 1184
 .align 2
@@ -2309,72 +2308,72 @@ ow_data_npcs_0255:
2309 2308
 
2310 2309
 .align 2
2311 2310
 ow_data_poke_0000:
2312
-.hword 0xFFFF, 0xC100, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
2311
+.hword 0xFFFF, 0xC100, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
2313 2312
 .word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_0000, 0x8231CFC
2314 2313
 
2315 2314
 .align 2
2316 2315
 ow_data_poke_0001:
2317
-.hword 0xFFFF, 0xC101, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2316
+.hword 0xFFFF, 0xC101, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2318 2317
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0001, 0x8231CFC
2319 2318
 
2320 2319
 .align 2
2321 2320
 ow_data_poke_0002:
2322
-.hword 0xFFFF, 0xC102, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2321
+.hword 0xFFFF, 0xC102, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2323 2322
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0002, 0x8231CFC
2324 2323
 
2325 2324
 .align 2
2326 2325
 ow_data_poke_0003:
2327
-.hword 0xFFFF, 0xC103, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2326
+.hword 0xFFFF, 0xC103, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2328 2327
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0003, 0x8231CFC
2329 2328
 
2330 2329
 .align 2
2331 2330
 ow_data_poke_0004:
2332
-.hword 0xFFFF, 0xC104, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2331
+.hword 0xFFFF, 0xC104, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2333 2332
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0004, 0x8231CFC
2334 2333
 
2335 2334
 .align 2
2336 2335
 ow_data_poke_0005:
2337
-.hword 0xFFFF, 0xC105, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2336
+.hword 0xFFFF, 0xC105, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2338 2337
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0005, 0x8231CFC
2339 2338
 
2340 2339
 .align 2
2341 2340
 ow_data_poke_0006:
2342
-.hword 0xFFFF, 0xC106, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2341
+.hword 0xFFFF, 0xC106, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2343 2342
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0006, 0x8231CFC
2344 2343
 
2345 2344
 .align 2
2346 2345
 ow_data_poke_0007:
2347
-.hword 0xFFFF, 0xC107, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2346
+.hword 0xFFFF, 0xC107, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2348 2347
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0007, 0x8231CFC
2349 2348
 
2350 2349
 .align 2
2351 2350
 ow_data_poke_0008:
2352
-.hword 0xFFFF, 0xC108, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2351
+.hword 0xFFFF, 0xC108, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2353 2352
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0008, 0x8231CFC
2354 2353
 
2355 2354
 .align 2
2356 2355
 ow_data_poke_0009:
2357
-.hword 0xFFFF, 0xC109, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2356
+.hword 0xFFFF, 0xC109, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2358 2357
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0009, 0x8231CFC
2359 2358
 
2360 2359
 .align 2
2361 2360
 ow_data_poke_0010:
2362
-.hword 0xFFFF, 0xC10A, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2361
+.hword 0xFFFF, 0xC10A, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2363 2362
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0010, 0x8231CFC
2364 2363
 
2365 2364
 .align 2
2366 2365
 ow_data_poke_0011:
2367
-.hword 0xFFFF, 0xC10B, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2366
+.hword 0xFFFF, 0xC10B, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2368 2367
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0011, 0x8231CFC
2369 2368
 
2370 2369
 .align 2
2371 2370
 ow_data_poke_0012:
2372
-.hword 0xFFFF, 0xC10C, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2371
+.hword 0xFFFF, 0xC10C, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2373 2372
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0012, 0x8231CFC
2374 2373
 
2375 2374
 .align 2
2376 2375
 ow_data_poke_0013:
2377
-.hword 0xFFFF, 0xC10D, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
2376
+.hword 0xFFFF, 0xC10D, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2378 2377
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0013, 0x8231CFC
2379 2378
 
2380 2379
 .align 2
@@ -2389,8 +2388,8 @@ ow_data_poke_0015:
2389 2388
 
2390 2389
 .align 2
2391 2390
 ow_data_poke_0016:
2392
-.hword 0xFFFF, 0xC110, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2393
-.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0016, 0x8231CFC
2391
+.hword 0xFFFF, 0xC110, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
2392
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_0016, 0x8231CFC
2394 2393
 
2395 2394
 .align 2
2396 2395
 ow_data_poke_0017:
@@ -2644,8 +2643,8 @@ ow_data_poke_0066:
2644 2643
 
2645 2644
 .align 2
2646 2645
 ow_data_poke_0067:
2647
-.hword 0xFFFF, 0xC143, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2648
-.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0067, 0x8231CFC
2646
+.hword 0xFFFF, 0xC143, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
2647
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_0067, 0x8231CFC
2649 2648
 
2650 2649
 .align 2
2651 2650
 ow_data_poke_0068:
@@ -2754,7 +2753,7 @@ ow_data_poke_0088:
2754 2753
 
2755 2754
 .align 2
2756 2755
 ow_data_poke_0089:
2757
-.hword 0xFFFF, 0xC159, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
2756
+.hword 0xFFFF, 0xC159, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2758 2757
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0089, 0x8231CFC
2759 2758
 
2760 2759
 .align 2
@@ -2784,8 +2783,8 @@ ow_data_poke_0094:
2784 2783
 
2785 2784
 .align 2
2786 2785
 ow_data_poke_0095:
2787
-.hword 0xFFFF, 0xC15F, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2788
-.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0095, 0x8231CFC
2786
+.hword 0xFFFF, 0xC15F, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
2787
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_0095, 0x8231CFC
2789 2788
 
2790 2789
 .align 2
2791 2790
 ow_data_poke_0096:
@@ -2829,8 +2828,8 @@ ow_data_poke_0103:
2829 2828
 
2830 2829
 .align 2
2831 2830
 ow_data_poke_0104:
2832
-.hword 0xFFFF, 0xC168, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2833
-.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0104, 0x8231CFC
2831
+.hword 0xFFFF, 0xC168, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
2832
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_0104, 0x8231CFC
2834 2833
 
2835 2834
 .align 2
2836 2835
 ow_data_poke_0105:
@@ -2949,8 +2948,8 @@ ow_data_poke_0127:
2949 2948
 
2950 2949
 .align 2
2951 2950
 ow_data_poke_0128:
2952
-.hword 0xFFFF, 0xC180, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2953
-.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0128, 0x8231CFC
2951
+.hword 0xFFFF, 0xC180, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
2952
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_0128, 0x8231CFC
2954 2953
 
2955 2954
 .align 2
2956 2955
 ow_data_poke_0129:
@@ -3114,8 +3113,8 @@ ow_data_poke_0160:
3114 3113
 
3115 3114
 .align 2
3116 3115
 ow_data_poke_0161:
3117
-.hword 0xFFFF, 0xC1A1, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
3118
-.word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0161, 0x8231CFC
3116
+.hword 0xFFFF, 0xC1A1, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
3117
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_0161, 0x8231CFC
3119 3118
 
3120 3119
 .align 2
3121 3120
 ow_data_poke_0162:
@@ -3589,72 +3588,72 @@ ow_data_poke_0255:
3589 3588
 
3590 3589
 .align 2
3591 3590
 ow_data_poke_leg_0000:
3592
-.hword 0xFFFF, 0xC200, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
3591
+.hword 0xFFFF, 0xC200, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
3593 3592
 .word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_leg_0000, 0x8231CFC
3594 3593
 
3595 3594
 .align 2
3596 3595
 ow_data_poke_leg_0001:
3597
-.hword 0xFFFF, 0xC201, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
3596
+.hword 0xFFFF, 0xC201, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
3598 3597
 .word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_leg_0001, 0x8231CFC
3599 3598
 
3600 3599
 .align 2
3601 3600
 ow_data_poke_leg_0002:
3602
-.hword 0xFFFF, 0xC202, 0x1102, 0x1000, 0x80, 0x40, 0x0110, 0x0
3601
+.hword 0xFFFF, 0xC202, 0x1102, 0x1000, 0x80, 0x40, 0x0, 0x0
3603 3602
 .word 0x83A36E0, 0x83A3A50, 0x83A3368, ow_frames_poke_leg_0002, 0x8231CFC
3604 3603
 
3605 3604
 .align 2
3606 3605
 ow_data_poke_leg_0003:
3607
-.hword 0xFFFF, 0xC203, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
3606
+.hword 0xFFFF, 0xC203, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
3608 3607
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_leg_0003, 0x8231CFC
3609 3608
 
3610 3609
 .align 2
3611 3610
 ow_data_poke_leg_0004:
3612
-.hword 0xFFFF, 0xC204, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
3611
+.hword 0xFFFF, 0xC204, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
3613 3612
 .word 0x83A3718, 0x83A37F0, 0x83A35E4, ow_frames_poke_leg_0004, 0x8231CFC
3614 3613
 
3615 3614
 .align 2
3616 3615
 ow_data_poke_leg_0005:
3617
-.hword 0xFFFF, 0xC205, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
3616
+.hword 0xFFFF, 0xC205, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
3618 3617
 .word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_leg_0005, 0x8231CFC
3619 3618
 
3620 3619
 .align 2
3621 3620
 ow_data_poke_leg_0006:
3622
-.hword 0xFFFF, 0xC206, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
3621
+.hword 0xFFFF, 0xC206, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
3623 3622
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_leg_0006, 0x8231CFC
3624 3623
 
3625 3624
 .align 2
3626 3625
 ow_data_poke_leg_0007:
3627
-.hword 0xFFFF, 0xC207, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
3626
+.hword 0xFFFF, 0xC207, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
3628 3627
 .word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_poke_leg_0007, 0x8231CFC
3629 3628
 
3630 3629
 .align 2
3631 3630
 ow_data_poke_leg_0008:
3632
-.hword 0xFFFF, 0xC208, 0x1102, 0x1000, 0x80, 0x40, 0x0110, 0x0
3631
+.hword 0xFFFF, 0xC208, 0x1102, 0x1000, 0x80, 0x40, 0x0, 0x0
3633 3632
 .word 0x83A36E0, 0x83A3A50, 0x83A3368, ow_frames_poke_leg_0008, 0x8231CFC
3634 3633
 
3635 3634
 .align 2
3636 3635
 ow_data_poke_leg_0009:
3637
-.hword 0xFFFF, 0xC209, 0x1102, 0x1000, 0x80, 0x40, 0x0110, 0x0
3636
+.hword 0xFFFF, 0xC209, 0x1102, 0x1000, 0x80, 0x40, 0x0, 0x0
3638 3637
 .word 0x83A36E0, 0x83A3A50, 0x83A3368, ow_frames_poke_leg_0009, 0x8231CFC
3639 3638
 
3640 3639
 .align 2
3641 3640
 ow_data_poke_leg_0010:
3642
-.hword 0xFFFF, 0xC20A, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
3641
+.hword 0xFFFF, 0xC20A, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
3643 3642
 .word 0x83A3718, 0x83A37F0, 0x83A35E4, ow_frames_poke_leg_0010, 0x8231CFC
3644 3643
 
3645 3644
 .align 2
3646 3645
 ow_data_poke_leg_0011:
3647
-.hword 0xFFFF, 0xC20B, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
3646
+.hword 0xFFFF, 0xC20B, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
3648 3647
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_leg_0011, 0x8231CFC
3649 3648
 
3650 3649
 .align 2
3651 3650
 ow_data_poke_leg_0012:
3652
-.hword 0xFFFF, 0xC20C, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
3651
+.hword 0xFFFF, 0xC20C, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
3653 3652
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_leg_0012, 0x8231CFC
3654 3653
 
3655 3654
 .align 2
3656 3655
 ow_data_poke_leg_0013:
3657
-.hword 0xFFFF, 0xC20D, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
3656
+.hword 0xFFFF, 0xC20D, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
3658 3657
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_leg_0013, 0x8231CFC
3659 3658
 
3660 3659
 .align 2
@@ -4869,72 +4868,72 @@ ow_data_poke_leg_0255:
4869 4868
 
4870 4869
 .align 2
4871 4870
 ow_data_objekt_0000:
4872
-.hword 0xFFFF, 0xC300, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
4871
+.hword 0xFFFF, 0xC300, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
4873 4872
 .word 0x83A3718, 0x83A37F0, 0x83A3660, ow_frames_objekt_0000, 0x8231CFC
4874 4873
 
4875 4874
 .align 2
4876 4875
 ow_data_objekt_0001:
4877
-.hword 0xFFFF, 0xC301, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
4876
+.hword 0xFFFF, 0xC301, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
4878 4877
 .word 0x83A3718, 0x83A37F0, 0x83A3658, ow_frames_objekt_0001, 0x8231CFC
4879 4878
 
4880 4879
 .align 2
4881 4880
 ow_data_objekt_0002:
4882
-.hword 0xFFFF, 0xC302, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
4881
+.hword 0xFFFF, 0xC302, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
4883 4882
 .word 0x83A3718, 0x83A37F0, 0x83A3658, ow_frames_objekt_0002, 0x8231CFC
4884 4883
 
4885 4884
 .align 2
4886 4885
 ow_data_objekt_0003:
4887
-.hword 0xFFFF, 0xC303, 0x1102, 0x100, 0x10, 0x20, 0x0110, 0x0
4886
+.hword 0xFFFF, 0xC303, 0x1102, 0x100, 0x10, 0x20, 0x0, 0x0
4888 4887
 .word 0x83A3710, 0x83A379C, 0x83A3314, ow_frames_objekt_0003, 0x8231CFC
4889 4888
 
4890 4889
 .align 2
4891 4890
 ow_data_objekt_0004:
4892
-.hword 0xFFFF, 0xC304, 0x1102, 0x100, 0x10, 0x20, 0x0110, 0x0
4891
+.hword 0xFFFF, 0xC304, 0x1102, 0x100, 0x10, 0x20, 0x0, 0x0
4893 4892
 .word 0x83A3710, 0x83A379C, 0x83A3314, ow_frames_objekt_0004, 0x8231CFC
4894 4893
 
4895 4894
 .align 2
4896 4895
 ow_data_objekt_0005:
4897
-.hword 0xFFFF, 0xC305, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
4896
+.hword 0xFFFF, 0xC305, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
4898 4897
 .word 0x83A3720, 0x83A38D0, 0x83A3658, ow_frames_objekt_0005, 0x8231CFC
4899 4898
 
4900 4899
 .align 2
4901 4900
 ow_data_objekt_0006:
4902
-.hword 0xFFFF, 0xC306, 0x1102, 0x80, 0x10, 0x10, 0x0110, 0x0
4901
+.hword 0xFFFF, 0xC306, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
4903 4902
 .word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0006, 0x8231CFC
4904 4903
 
4905 4904
 .align 2
4906 4905
 ow_data_objekt_0007:
4907
-.hword 0xFFFF, 0xC307, 0x1102, 0x200, 0x20, 0x20, 0x0110, 0x0
4906
+.hword 0xFFFF, 0xC307, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
4908 4907
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_objekt_0007, 0x8231CFC
4909 4908
 
4910 4909
 .align 2
4911 4910
 ow_data_objekt_0008:
4912
-.hword 0xFFFF, 0xC308, 0x1102, 0x80, 0x10, 0x10, 0x0110, 0x0
4911
+.hword 0xFFFF, 0xC308, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
4913 4912
 .word 0x83A36F0, 0x83A3748, 0x83A3368, ow_frames_objekt_0008, 0x8231CFC
4914 4913
 
4915 4914
 .align 2
4916 4915
 ow_data_objekt_0009:
4917
-.hword 0xFFFF, 0xC309, 0x1102, 0x80, 0x10, 0x10, 0x0110, 0x0
4916
+.hword 0xFFFF, 0xC309, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
4918 4917
 .word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0009, 0x8231CFC
4919 4918
 
4920 4919
 .align 2
4921 4920
 ow_data_objekt_0010:
4922
-.hword 0xFFFF, 0xC30A, 0x1102, 0x80, 0x10, 0x10, 0x0110, 0x0
4921
+.hword 0xFFFF, 0xC30A, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
4923 4922
 .word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0010, 0x8231CFC
4924 4923
 
4925 4924
 .align 2
4926 4925
 ow_data_objekt_0011:
4927
-.hword 0xFFFF, 0xC30B, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
4926
+.hword 0xFFFF, 0xC30B, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
4928 4927
 .word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0011, 0x8231CFC
4929 4928
 
4930 4929
 .align 2
4931 4930
 ow_data_objekt_0012:
4932
-.hword 0xFFFF, 0xC30C, 0x1102, 0x1000, 0x80, 0x40, 0x0110, 0x0
4931
+.hword 0xFFFF, 0xC30C, 0x1102, 0x1000, 0x80, 0x40, 0x0, 0x0
4933 4932
 .word 0x83A36E0, 0x83A3A50, 0x83A3368, ow_frames_objekt_0012, 0x8231CFC
4934 4933
 
4935 4934
 .align 2
4936 4935
 ow_data_objekt_0013:
4937
-.hword 0xFFFF, 0xC30D, 0x1102, 0x800, 0x40, 0x40, 0x0110, 0x0
4936
+.hword 0xFFFF, 0xC30D, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
4938 4937
 .word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0013, 0x8231CFC
4939 4938
 
4940 4939
 .align 2

+ 17992
- 1129
data/overworld/overworld_frames.s
文件差异内容过多而无法显示
查看文件


+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit a62fe65e951ad5a563755d48d628f0607ab09d39
1
+Subproject commit 3073eea406897be00850a94af1ed5f6bda589fd1