Browse Source

overworld implementation, overworld tables and entries

SBird1337 8 years ago
parent
commit
c62fb5d739

+ 1
- 0
data/moves/move_data.S View File

@@ -496,6 +496,7 @@ move_data_psychoschock:		.byte	MOVE_EFFECT_NONE,	80,		14,		100,		10,		0,		0,		0,
496 496
 move_data_giftschock:		.byte	231,            	65,		3,		100,		10,		0,		0,		0,		50,		0,		1,		0
497 497
 move_data_autotomie:		.byte	MOVE_EFFECT_NONE,	0,		8,		0,		15,		0,		0,		0,		4,		0,		2,		0
498 498
 move_data_wutpulver:		.byte	172,			0,		6,		0,		20,		0,		16,		2,		0,		0,		2,		0
499
+@TODO also substitute
499 500
 move_data_telekinese:		.byte	MOVE_EFFECT_NONE,	0,		14,		0,		15,		0,		0,		0,		26,		0,		2,		0
500 501
 move_data_magieraum:		.byte	228,                	0,		14,		0,		10,		0,		16,		0,		0,		0,		2,		0
501 502
 move_data_katapult:		.byte	MOVE_EFFECT_NONE,	50,		5,		100,		15,		0,		0,		0,		50,		0,		0,		0

+ 6147
- 0
data/overworld/overworld_data.S
File diff suppressed because it is too large
View File


+ 16681
- 0
data/overworld/overworld_frames.S
File diff suppressed because it is too large
View File


+ 1542
- 0
data/overworld/overworld_pal_table.S
File diff suppressed because it is too large
View File


+ 790
- 0
data/overworld/overworld_tables.S View File

@@ -0,0 +1,790 @@
1
+.section .rodata
2
+.thumb
3
+
4
+.global ow_main_table
5
+.global ow_second_table
6
+.global ow_third_table
7
+
8
+ow_main_table:
9
+    .word ow_maintable_1
10
+ow_second_table:
11
+    .word ow_maintable_2
12
+ow_third_table:
13
+    .word ow_maintable_3
14
+
15
+.align 2
16
+ow_maintable_1: 
17
+.word ow_data_0
18
+.word ow_data_1
19
+.word ow_data_2
20
+.word ow_data_3
21
+.word ow_data_4
22
+.word ow_data_5
23
+.word ow_data_6
24
+.word ow_data_7
25
+.word ow_data_8
26
+.word ow_data_9
27
+.word ow_data_10
28
+.word ow_data_11
29
+.word ow_data_12
30
+.word ow_data_13
31
+.word ow_data_14
32
+.word ow_data_15
33
+.word ow_data_16
34
+.word ow_data_17
35
+.word ow_data_18
36
+.word ow_data_19
37
+.word ow_data_20
38
+.word ow_data_21
39
+.word ow_data_22
40
+.word ow_data_23
41
+.word ow_data_24
42
+.word ow_data_25
43
+.word ow_data_26
44
+.word ow_data_27
45
+.word ow_data_28
46
+.word ow_data_29
47
+.word ow_data_30
48
+.word ow_data_31
49
+.word ow_data_32
50
+.word ow_data_33
51
+.word ow_data_34
52
+.word ow_data_35
53
+.word ow_data_36
54
+.word ow_data_37
55
+.word ow_data_38
56
+.word ow_data_39
57
+.word ow_data_40
58
+.word ow_data_41
59
+.word ow_data_42
60
+.word ow_data_43
61
+.word ow_data_44
62
+.word ow_data_45
63
+.word ow_data_46
64
+.word ow_data_47
65
+.word ow_data_48
66
+.word ow_data_49
67
+.word ow_data_50
68
+.word ow_data_51
69
+.word ow_data_52
70
+.word ow_data_53
71
+.word ow_data_54
72
+.word ow_data_55
73
+.word ow_data_56
74
+.word ow_data_57
75
+.word ow_data_58
76
+.word ow_data_59
77
+.word ow_data_60
78
+.word ow_data_61
79
+.word ow_data_62
80
+.word ow_data_63
81
+.word ow_data_64
82
+.word ow_data_65
83
+.word ow_data_66
84
+.word ow_data_67
85
+.word ow_data_68
86
+.word ow_data_69
87
+.word ow_data_70
88
+.word ow_data_71
89
+.word ow_data_72
90
+.word ow_data_73
91
+.word ow_data_74
92
+.word ow_data_75
93
+.word ow_data_76
94
+.word ow_data_77
95
+.word ow_data_78
96
+.word ow_data_79
97
+.word ow_data_80
98
+.word ow_data_81
99
+.word ow_data_82
100
+.word ow_data_83
101
+.word ow_data_84
102
+.word ow_data_85
103
+.word ow_data_86
104
+.word ow_data_87
105
+.word ow_data_88
106
+.word ow_data_89
107
+.word ow_data_90
108
+.word ow_data_91
109
+.word ow_data_92
110
+.word ow_data_93
111
+.word ow_data_94
112
+.word ow_data_95
113
+.word ow_data_96
114
+.word ow_data_97
115
+.word ow_data_98
116
+.word ow_data_99
117
+.word ow_data_100
118
+.word ow_data_101
119
+.word ow_data_102
120
+.word ow_data_103
121
+.word ow_data_104
122
+.word ow_data_105
123
+.word ow_data_106
124
+.word ow_data_107
125
+.word ow_data_108
126
+.word ow_data_109
127
+.word ow_data_110
128
+.word ow_data_111
129
+.word ow_data_112
130
+.word ow_data_113
131
+.word ow_data_114
132
+.word ow_data_115
133
+.word ow_data_116
134
+.word ow_data_117
135
+.word ow_data_118
136
+.word ow_data_119
137
+.word ow_data_120
138
+.word ow_data_121
139
+.word ow_data_122
140
+.word ow_data_123
141
+.word ow_data_124
142
+.word ow_data_125
143
+.word ow_data_126
144
+.word ow_data_127
145
+.word ow_data_128
146
+.word ow_data_129
147
+.word ow_data_130
148
+.word ow_data_131
149
+.word ow_data_132
150
+.word ow_data_133
151
+.word ow_data_134
152
+.word ow_data_135
153
+.word ow_data_136
154
+.word ow_data_137
155
+.word ow_data_138
156
+.word ow_data_139
157
+.word ow_data_140
158
+.word ow_data_141
159
+.word ow_data_142
160
+.word ow_data_143
161
+.word ow_data_144
162
+.word ow_data_145
163
+.word ow_data_146
164
+.word ow_data_147
165
+.word ow_data_148
166
+.word ow_data_149
167
+.word ow_data_150
168
+.word ow_data_151
169
+.word ow_data_152
170
+.word ow_data_153
171
+.word ow_data_154
172
+.word ow_data_155
173
+.word ow_data_156
174
+.word ow_data_157
175
+.word ow_data_158
176
+.word ow_data_159
177
+.word ow_data_160
178
+.word ow_data_161
179
+.word ow_data_162
180
+.word ow_data_163
181
+.word ow_data_164
182
+.word ow_data_165
183
+.word ow_data_166
184
+.word ow_data_167
185
+.word ow_data_168
186
+.word ow_data_169
187
+.word ow_data_170
188
+.word ow_data_171
189
+.word ow_data_172
190
+.word ow_data_173
191
+.word ow_data_174
192
+.word ow_data_175
193
+.word ow_data_176
194
+.word ow_data_177
195
+.word ow_data_178
196
+.word ow_data_179
197
+.word ow_data_180
198
+.word ow_data_181
199
+.word ow_data_182
200
+.word ow_data_183
201
+.word ow_data_184
202
+.word ow_data_185
203
+.word ow_data_186
204
+.word ow_data_187
205
+.word ow_data_188
206
+.word ow_data_189
207
+.word ow_data_190
208
+.word ow_data_191
209
+.word ow_data_192
210
+.word ow_data_193
211
+.word ow_data_194
212
+.word ow_data_195
213
+.word ow_data_196
214
+.word ow_data_197
215
+.word ow_data_198
216
+.word ow_data_199
217
+.word ow_data_200
218
+.word ow_data_201
219
+.word ow_data_202
220
+.word ow_data_203
221
+.word ow_data_204
222
+.word ow_data_205
223
+.word ow_data_206
224
+.word ow_data_207
225
+.word ow_data_208
226
+.word ow_data_209
227
+.word ow_data_210
228
+.word ow_data_211
229
+.word ow_data_212
230
+.word ow_data_213
231
+.word ow_data_214
232
+.word ow_data_215
233
+.word ow_data_216
234
+.word ow_data_217
235
+.word ow_data_218
236
+.word ow_data_219
237
+.word ow_data_220
238
+.word ow_data_221
239
+.word ow_data_222
240
+.word ow_data_223
241
+.word ow_data_224
242
+.word ow_data_225
243
+.word ow_data_226
244
+.word ow_data_227
245
+.word ow_data_228
246
+.word ow_data_229
247
+.word ow_data_230
248
+.word ow_data_231
249
+.word ow_data_232
250
+.word ow_data_233
251
+.word ow_data_234
252
+.word ow_data_235
253
+.word ow_data_236
254
+.word ow_data_237
255
+.word ow_data_238
256
+.word ow_data_239
257
+.word ow_data_240
258
+.word ow_data_241
259
+.word ow_data_242
260
+.word ow_data_243
261
+.word ow_data_244
262
+.word ow_data_245
263
+.word ow_data_246
264
+.word ow_data_247
265
+.word ow_data_248
266
+.word ow_data_249
267
+.word ow_data_250
268
+.word ow_data_251
269
+.word ow_data_252
270
+.word ow_data_253
271
+.word ow_data_254
272
+.word ow_data_255
273
+
274
+.global ow_maintable_2
275
+ow_maintable_2:
276
+.word ow_data_256
277
+.word ow_data_257
278
+.word ow_data_258
279
+.word ow_data_259
280
+.word ow_data_260
281
+.word ow_data_261
282
+.word ow_data_262
283
+.word ow_data_263
284
+.word ow_data_264
285
+.word ow_data_265
286
+.word ow_data_266
287
+.word ow_data_267
288
+.word ow_data_268
289
+.word ow_data_269
290
+.word ow_data_270
291
+.word ow_data_271
292
+.word ow_data_272
293
+.word ow_data_273
294
+.word ow_data_274
295
+.word ow_data_275
296
+.word ow_data_276
297
+.word ow_data_277
298
+.word ow_data_278
299
+.word ow_data_279
300
+.word ow_data_280
301
+.word ow_data_281
302
+.word ow_data_282
303
+.word ow_data_283
304
+.word ow_data_284
305
+.word ow_data_285
306
+.word ow_data_286
307
+.word ow_data_287
308
+.word ow_data_288
309
+.word ow_data_289
310
+.word ow_data_290
311
+.word ow_data_291
312
+.word ow_data_292
313
+.word ow_data_293
314
+.word ow_data_294
315
+.word ow_data_295
316
+.word ow_data_296
317
+.word ow_data_297
318
+.word ow_data_298
319
+.word ow_data_299
320
+.word ow_data_300
321
+.word ow_data_301
322
+.word ow_data_302
323
+.word ow_data_303
324
+.word ow_data_304
325
+.word ow_data_305
326
+.word ow_data_306
327
+.word ow_data_307
328
+.word ow_data_308
329
+.word ow_data_309
330
+.word ow_data_310
331
+.word ow_data_311
332
+.word ow_data_312
333
+.word ow_data_313
334
+.word ow_data_314
335
+.word ow_data_315
336
+.word ow_data_316
337
+.word ow_data_317
338
+.word ow_data_318
339
+.word ow_data_319
340
+.word ow_data_320
341
+.word ow_data_321
342
+.word ow_data_322
343
+.word ow_data_323
344
+.word ow_data_324
345
+.word ow_data_325
346
+.word ow_data_326
347
+.word ow_data_327
348
+.word ow_data_328
349
+.word ow_data_329
350
+.word ow_data_330
351
+.word ow_data_331
352
+.word ow_data_332
353
+.word ow_data_333
354
+.word ow_data_334
355
+.word ow_data_335
356
+.word ow_data_336
357
+.word ow_data_337
358
+.word ow_data_338
359
+.word ow_data_339
360
+.word ow_data_340
361
+.word ow_data_341
362
+.word ow_data_342
363
+.word ow_data_343
364
+.word ow_data_344
365
+.word ow_data_345
366
+.word ow_data_346
367
+.word ow_data_347
368
+.word ow_data_348
369
+.word ow_data_349
370
+.word ow_data_350
371
+.word ow_data_351
372
+.word ow_data_352
373
+.word ow_data_353
374
+.word ow_data_354
375
+.word ow_data_355
376
+.word ow_data_356
377
+.word ow_data_357
378
+.word ow_data_358
379
+.word ow_data_359
380
+.word ow_data_360
381
+.word ow_data_361
382
+.word ow_data_362
383
+.word ow_data_363
384
+.word ow_data_364
385
+.word ow_data_365
386
+.word ow_data_366
387
+.word ow_data_367
388
+.word ow_data_368
389
+.word ow_data_369
390
+.word ow_data_370
391
+.word ow_data_371
392
+.word ow_data_372
393
+.word ow_data_373
394
+.word ow_data_374
395
+.word ow_data_375
396
+.word ow_data_376
397
+.word ow_data_377
398
+.word ow_data_378
399
+.word ow_data_379
400
+.word ow_data_380
401
+.word ow_data_381
402
+.word ow_data_382
403
+.word ow_data_383
404
+.word ow_data_384
405
+.word ow_data_385
406
+.word ow_data_386
407
+.word ow_data_387
408
+.word ow_data_388
409
+.word ow_data_389
410
+.word ow_data_390
411
+.word ow_data_391
412
+.word ow_data_392
413
+.word ow_data_393
414
+.word ow_data_394
415
+.word ow_data_395
416
+.word ow_data_396
417
+.word ow_data_397
418
+.word ow_data_398
419
+.word ow_data_399
420
+.word ow_data_400
421
+.word ow_data_401
422
+.word ow_data_402
423
+.word ow_data_403
424
+.word ow_data_404
425
+.word ow_data_405
426
+.word ow_data_406
427
+.word ow_data_407
428
+.word ow_data_408
429
+.word ow_data_409
430
+.word ow_data_410
431
+.word ow_data_411
432
+.word ow_data_412
433
+.word ow_data_413
434
+.word ow_data_414
435
+.word ow_data_415
436
+.word ow_data_416
437
+.word ow_data_417
438
+.word ow_data_418
439
+.word ow_data_419
440
+.word ow_data_420
441
+.word ow_data_421
442
+.word ow_data_422
443
+.word ow_data_423
444
+.word ow_data_424
445
+.word ow_data_425
446
+.word ow_data_426
447
+.word ow_data_427
448
+.word ow_data_428
449
+.word ow_data_429
450
+.word ow_data_430
451
+.word ow_data_431
452
+.word ow_data_432
453
+.word ow_data_433
454
+.word ow_data_434
455
+.word ow_data_435
456
+.word ow_data_436
457
+.word ow_data_437
458
+.word ow_data_438
459
+.word ow_data_439
460
+.word ow_data_440
461
+.word ow_data_441
462
+.word ow_data_442
463
+.word ow_data_443
464
+.word ow_data_444
465
+.word ow_data_445
466
+.word ow_data_446
467
+.word ow_data_447
468
+.word ow_data_448
469
+.word ow_data_449
470
+.word ow_data_450
471
+.word ow_data_451
472
+.word ow_data_452
473
+.word ow_data_453
474
+.word ow_data_454
475
+.word ow_data_455
476
+.word ow_data_456
477
+.word ow_data_457
478
+.word ow_data_458
479
+.word ow_data_459
480
+.word ow_data_460
481
+.word ow_data_461
482
+.word ow_data_462
483
+.word ow_data_463
484
+.word ow_data_464
485
+.word ow_data_465
486
+.word ow_data_466
487
+.word ow_data_467
488
+.word ow_data_468
489
+.word ow_data_469
490
+.word ow_data_470
491
+.word ow_data_471
492
+.word ow_data_472
493
+.word ow_data_473
494
+.word ow_data_474
495
+.word ow_data_475
496
+.word ow_data_476
497
+.word ow_data_477
498
+.word ow_data_478
499
+.word ow_data_479
500
+.word ow_data_480
501
+.word ow_data_481
502
+.word ow_data_482
503
+.word ow_data_483
504
+.word ow_data_484
505
+.word ow_data_485
506
+.word ow_data_486
507
+.word ow_data_487
508
+.word ow_data_488
509
+.word ow_data_489
510
+.word ow_data_490
511
+.word ow_data_491
512
+.word ow_data_492
513
+.word ow_data_493
514
+.word ow_data_494
515
+.word ow_data_495
516
+.word ow_data_496
517
+.word ow_data_497
518
+.word ow_data_498
519
+.word ow_data_499
520
+.word ow_data_500
521
+.word ow_data_501
522
+.word ow_data_502
523
+.word ow_data_503
524
+.word ow_data_504
525
+.word ow_data_505
526
+.word ow_data_506
527
+.word ow_data_507
528
+.word ow_data_508
529
+.word ow_data_509
530
+.word ow_data_510
531
+.word ow_data_511
532
+.word ow_data_512
533
+
534
+.global ow_maintable_3
535
+ow_maintable_3:
536
+.word ow_data_513
537
+.word ow_data_514
538
+.word ow_data_515
539
+.word ow_data_516
540
+.word ow_data_517
541
+.word ow_data_518
542
+.word ow_data_519
543
+.word ow_data_520
544
+.word ow_data_521
545
+.word ow_data_522
546
+.word ow_data_523
547
+.word ow_data_524
548
+.word ow_data_525
549
+.word ow_data_526
550
+.word ow_data_527
551
+.word ow_data_528
552
+.word ow_data_529
553
+.word ow_data_530
554
+.word ow_data_531
555
+.word ow_data_532
556
+.word ow_data_533
557
+.word ow_data_534
558
+.word ow_data_535
559
+.word ow_data_536
560
+.word ow_data_537
561
+.word ow_data_538
562
+.word ow_data_539
563
+.word ow_data_540
564
+.word ow_data_541
565
+.word ow_data_542
566
+.word ow_data_543
567
+.word ow_data_544
568
+.word ow_data_545
569
+.word ow_data_546
570
+.word ow_data_547
571
+.word ow_data_548
572
+.word ow_data_549
573
+.word ow_data_550
574
+.word ow_data_551
575
+.word ow_data_552
576
+.word ow_data_553
577
+.word ow_data_554
578
+.word ow_data_555
579
+.word ow_data_556
580
+.word ow_data_557
581
+.word ow_data_558
582
+.word ow_data_559
583
+.word ow_data_560
584
+.word ow_data_561
585
+.word ow_data_562
586
+.word ow_data_563
587
+.word ow_data_564
588
+.word ow_data_565
589
+.word ow_data_566
590
+.word ow_data_567
591
+.word ow_data_568
592
+.word ow_data_569
593
+.word ow_data_570
594
+.word ow_data_571
595
+.word ow_data_572
596
+.word ow_data_573
597
+.word ow_data_574
598
+.word ow_data_575
599
+.word ow_data_576
600
+.word ow_data_577
601
+.word ow_data_578
602
+.word ow_data_579
603
+.word ow_data_580
604
+.word ow_data_581
605
+.word ow_data_582
606
+.word ow_data_583
607
+.word ow_data_584
608
+.word ow_data_585
609
+.word ow_data_586
610
+.word ow_data_587
611
+.word ow_data_588
612
+.word ow_data_589
613
+.word ow_data_590
614
+.word ow_data_591
615
+.word ow_data_592
616
+.word ow_data_593
617
+.word ow_data_594
618
+.word ow_data_595
619
+.word ow_data_596
620
+.word ow_data_597
621
+.word ow_data_598
622
+.word ow_data_599
623
+.word ow_data_600
624
+.word ow_data_601
625
+.word ow_data_602
626
+.word ow_data_603
627
+.word ow_data_604
628
+.word ow_data_605
629
+.word ow_data_606
630
+.word ow_data_607
631
+.word ow_data_608
632
+.word ow_data_609
633
+.word ow_data_610
634
+.word ow_data_611
635
+.word ow_data_612
636
+.word ow_data_613
637
+.word ow_data_614
638
+.word ow_data_615
639
+.word ow_data_616
640
+.word ow_data_617
641
+.word ow_data_618
642
+.word ow_data_619
643
+.word ow_data_620
644
+.word ow_data_621
645
+.word ow_data_622
646
+.word ow_data_623
647
+.word ow_data_624
648
+.word ow_data_625
649
+.word ow_data_626
650
+.word ow_data_627
651
+.word ow_data_628
652
+.word ow_data_629
653
+.word ow_data_630
654
+.word ow_data_631
655
+.word ow_data_632
656
+.word ow_data_633
657
+.word ow_data_634
658
+.word ow_data_635
659
+.word ow_data_636
660
+.word ow_data_637
661
+.word ow_data_638
662
+.word ow_data_639
663
+.word ow_data_640
664
+.word ow_data_641
665
+.word ow_data_642
666
+.word ow_data_643
667
+.word ow_data_644
668
+.word ow_data_645
669
+.word ow_data_646
670
+.word ow_data_647
671
+.word ow_data_648
672
+.word ow_data_649
673
+.word ow_data_650
674
+.word ow_data_651
675
+.word ow_data_652
676
+.word ow_data_653
677
+.word ow_data_654
678
+.word ow_data_655
679
+.word ow_data_656
680
+.word ow_data_657
681
+.word ow_data_658
682
+.word ow_data_659
683
+.word ow_data_660
684
+.word ow_data_661
685
+.word ow_data_662
686
+.word ow_data_663
687
+.word ow_data_664
688
+.word ow_data_665
689
+.word ow_data_666
690
+.word ow_data_667
691
+.word ow_data_668
692
+.word ow_data_669
693
+.word ow_data_670
694
+.word ow_data_671
695
+.word ow_data_672
696
+.word ow_data_673
697
+.word ow_data_674
698
+.word ow_data_675
699
+.word ow_data_676
700
+.word ow_data_677
701
+.word ow_data_678
702
+.word ow_data_679
703
+.word ow_data_680
704
+.word ow_data_681
705
+.word ow_data_682
706
+.word ow_data_683
707
+.word ow_data_684
708
+.word ow_data_685
709
+.word ow_data_686
710
+.word ow_data_687
711
+.word ow_data_688
712
+.word ow_data_689
713
+.word ow_data_690
714
+.word ow_data_691
715
+.word ow_data_692
716
+.word ow_data_693
717
+.word ow_data_694
718
+.word ow_data_695
719
+.word ow_data_696
720
+.word ow_data_697
721
+.word ow_data_698
722
+.word ow_data_699
723
+.word ow_data_700
724
+.word ow_data_701
725
+.word ow_data_702
726
+.word ow_data_703
727
+.word ow_data_704
728
+.word ow_data_705
729
+.word ow_data_706
730
+.word ow_data_707
731
+.word ow_data_708
732
+.word ow_data_709
733
+.word ow_data_710
734
+.word ow_data_711
735
+.word ow_data_712
736
+.word ow_data_713
737
+.word ow_data_714
738
+.word ow_data_715
739
+.word ow_data_716
740
+.word ow_data_717
741
+.word ow_data_718
742
+.word ow_data_719
743
+.word ow_data_720
744
+.word ow_data_721
745
+.word ow_data_722
746
+.word ow_data_723
747
+.word ow_data_724
748
+.word ow_data_725
749
+.word ow_data_726
750
+.word ow_data_727
751
+.word ow_data_728
752
+.word ow_data_729
753
+.word ow_data_730
754
+.word ow_data_731
755
+.word ow_data_732
756
+.word ow_data_733
757
+.word ow_data_734
758
+.word ow_data_735
759
+.word ow_data_736
760
+.word ow_data_737
761
+.word ow_data_738
762
+.word ow_data_739
763
+.word ow_data_740
764
+.word ow_data_741
765
+.word ow_data_742
766
+.word ow_data_743
767
+.word ow_data_744
768
+.word ow_data_745
769
+.word ow_data_746
770
+.word ow_data_747
771
+.word ow_data_748
772
+.word ow_data_749
773
+.word ow_data_750
774
+.word ow_data_751
775
+.word ow_data_752
776
+.word ow_data_753
777
+.word ow_data_754
778
+.word ow_data_755
779
+.word ow_data_756
780
+.word ow_data_757
781
+.word ow_data_758
782
+.word ow_data_759
783
+.word ow_data_760
784
+.word ow_data_761
785
+.word ow_data_762
786
+.word ow_data_763
787
+.word ow_data_764
788
+.word ow_data_765
789
+.word ow_data_766
790
+.word ow_data_767

+ 476
- 231
nbproject/private/configurations.xml View File

@@ -26,6 +26,12 @@
26 26
           <in>move_data.S</in>
27 27
           <in>move_descriptions.S</in>
28 28
         </df>
29
+        <df name="overworld">
30
+          <in>overworld_data.S</in>
31
+          <in>overworld_frames.S</in>
32
+          <in>overworld_pal_table.S</in>
33
+          <in>overworld_tables.S</in>
34
+        </df>
29 35
         <df name="pkmn_tables">
30 36
           <in>icon_sprites.S</in>
31 37
           <in>icons_paletten.S</in>
@@ -53,237 +59,474 @@
53 59
         <df name="icons">
54 60
         </df>
55 61
         <df name="overworlds">
56
-          <in>000_reformed.s</in>
57
-          <in>000_reformed_g2.s</in>
58
-          <in>001_reformed.s</in>
59
-          <in>001_reformed_g2.s</in>
60
-          <in>002_reformed.s</in>
61
-          <in>002_reformed_g2.s</in>
62
-          <in>003_reformed.s</in>
63
-          <in>003_reformed_g2.s</in>
64
-          <in>004_reformed.s</in>
65
-          <in>004_reformed_g2.s</in>
66
-          <in>005_reformed.s</in>
67
-          <in>005_reformed_g2.s</in>
68
-          <in>006_reformed.s</in>
69
-          <in>006_reformed_g2.s</in>
70
-          <in>007_reformed.s</in>
71
-          <in>007_reformed_g2.s</in>
72
-          <in>008_reformed.s</in>
73
-          <in>008_reformed_g2.s</in>
74
-          <in>009_reformed.s</in>
75
-          <in>009_reformed_g2.s</in>
76
-          <in>010_reformed.s</in>
77
-          <in>010_reformed_g2.s</in>
78
-          <in>011_reformed.s</in>
79
-          <in>011_reformed_g2.s</in>
80
-          <in>012_reformed.s</in>
81
-          <in>012_reformed_g2.s</in>
82
-          <in>013_reformed.s</in>
83
-          <in>013_reformed_g2.s</in>
84
-          <in>014_reformed.s</in>
85
-          <in>014_reformed_g2.s</in>
86
-          <in>015_reformed.s</in>
87
-          <in>015_reformed_g2.s</in>
88
-          <in>016_reformed.s</in>
89
-          <in>016_reformed_g2.s</in>
90
-          <in>017_reformed.s</in>
91
-          <in>017_reformed_g2.s</in>
92
-          <in>018_reformed.s</in>
93
-          <in>018_reformed_g2.s</in>
94
-          <in>019_reformed.s</in>
95
-          <in>019_reformed_g2.s</in>
96
-          <in>020_reformed.s</in>
97
-          <in>020_reformed_g2.s</in>
98
-          <in>021_reformed.s</in>
99
-          <in>021_reformed_g2.s</in>
100
-          <in>022_reformed.s</in>
101
-          <in>022_reformed_g2.s</in>
102
-          <in>023_reformed.s</in>
103
-          <in>023_reformed_g2.s</in>
104
-          <in>024_reformed.s</in>
105
-          <in>024_reformed_g2.s</in>
106
-          <in>025_reformed.s</in>
107
-          <in>025_reformed_g2.s</in>
108
-          <in>026_reformed.s</in>
109
-          <in>026_reformed_g2.s</in>
110
-          <in>027_reformed.s</in>
111
-          <in>027_reformed_g2.s</in>
112
-          <in>028_reformed.s</in>
113
-          <in>028_reformed_g2.s</in>
114
-          <in>029_reformed.s</in>
115
-          <in>029_reformed_g2.s</in>
116
-          <in>030_reformed.s</in>
117
-          <in>030_reformed_g2.s</in>
118
-          <in>031_reformed.s</in>
119
-          <in>031_reformed_g2.s</in>
120
-          <in>032_reformed.s</in>
121
-          <in>032_reformed_g2.s</in>
122
-          <in>033_reformed.s</in>
123
-          <in>033_reformed_g2.s</in>
124
-          <in>034_reformed.s</in>
125
-          <in>034_reformed_g2.s</in>
126
-          <in>035_reformed.s</in>
127
-          <in>035_reformed_g2.s</in>
128
-          <in>036_reformed.s</in>
129
-          <in>036_reformed_g2.s</in>
130
-          <in>037_reformed.s</in>
131
-          <in>037_reformed_g2.s</in>
132
-          <in>038_reformed.s</in>
133
-          <in>038_reformed_g2.s</in>
134
-          <in>039_reformed.s</in>
135
-          <in>039_reformed_g2.s</in>
136
-          <in>040_reformed.s</in>
137
-          <in>040_reformed_g2.s</in>
138
-          <in>041_reformed.s</in>
139
-          <in>041_reformed_g2.s</in>
140
-          <in>042_reformed.s</in>
141
-          <in>042_reformed_g2.s</in>
142
-          <in>043_reformed.s</in>
143
-          <in>043_reformed_g2.s</in>
144
-          <in>044_reformed.s</in>
145
-          <in>044_reformed_g2.s</in>
146
-          <in>045_reformed.s</in>
147
-          <in>045_reformed_g2.s</in>
148
-          <in>046_reformed.s</in>
149
-          <in>046_reformed_g2.s</in>
150
-          <in>047_reformed.s</in>
151
-          <in>047_reformed_g2.s</in>
152
-          <in>048_reformed.s</in>
153
-          <in>048_reformed_g2.s</in>
154
-          <in>049_reformed.s</in>
155
-          <in>049_reformed_g2.s</in>
156
-          <in>050_reformed.s</in>
157
-          <in>050_reformed_g2.s</in>
158
-          <in>051_reformed.s</in>
159
-          <in>051_reformed_g2.s</in>
160
-          <in>052_reformed.s</in>
161
-          <in>052_reformed_g2.s</in>
162
-          <in>053_reformed.s</in>
163
-          <in>053_reformed_g2.s</in>
164
-          <in>054_reformed.s</in>
165
-          <in>054_reformed_g2.s</in>
166
-          <in>055_reformed.s</in>
167
-          <in>055_reformed_g2.s</in>
168
-          <in>056_reformed.s</in>
169
-          <in>056_reformed_g2.s</in>
170
-          <in>057_reformed.s</in>
171
-          <in>057_reformed_g2.s</in>
172
-          <in>058_reformed.s</in>
173
-          <in>058_reformed_g2.s</in>
174
-          <in>059_reformed.s</in>
175
-          <in>059_reformed_g2.s</in>
176
-          <in>060_reformed.s</in>
177
-          <in>060_reformed_g2.s</in>
178
-          <in>061_reformed.s</in>
179
-          <in>061_reformed_g2.s</in>
180
-          <in>062_reformed.s</in>
181
-          <in>062_reformed_g2.s</in>
182
-          <in>063_reformed.s</in>
183
-          <in>063_reformed_g2.s</in>
184
-          <in>064_reformed.s</in>
185
-          <in>064_reformed_g2.s</in>
186
-          <in>065_reformed.s</in>
187
-          <in>065_reformed_g2.s</in>
188
-          <in>066_reformed.s</in>
189
-          <in>066_reformed_g2.s</in>
190
-          <in>067_reformed.s</in>
191
-          <in>067_reformed_g2.s</in>
192
-          <in>068_reformed.s</in>
193
-          <in>068_reformed_g2.s</in>
194
-          <in>069_reformed.s</in>
195
-          <in>069_reformed_g2.s</in>
196
-          <in>070_reformed.s</in>
197
-          <in>070_reformed_g2.s</in>
198
-          <in>071_reformed.s</in>
199
-          <in>071_reformed_g2.s</in>
200
-          <in>072_reformed.s</in>
201
-          <in>072_reformed_g2.s</in>
202
-          <in>073_reformed.s</in>
203
-          <in>073_reformed_g2.s</in>
204
-          <in>074_reformed.s</in>
205
-          <in>074_reformed_g2.s</in>
206
-          <in>075_reformed.s</in>
207
-          <in>075_reformed_g2.s</in>
208
-          <in>076_reformed.s</in>
209
-          <in>076_reformed_g2.s</in>
210
-          <in>077_reformed.s</in>
211
-          <in>077_reformed_g2.s</in>
212
-          <in>078_reformed.s</in>
213
-          <in>078_reformed_g2.s</in>
214
-          <in>079_reformed.s</in>
215
-          <in>079_reformed_g2.s</in>
216
-          <in>080_reformed.s</in>
217
-          <in>080_reformed_g2.s</in>
218
-          <in>081_reformed.s</in>
219
-          <in>081_reformed_g2.s</in>
220
-          <in>082_reformed.s</in>
221
-          <in>082_reformed_g2.s</in>
222
-          <in>083_reformed.s</in>
223
-          <in>083_reformed_g2.s</in>
224
-          <in>084_reformed.s</in>
225
-          <in>084_reformed_g2.s</in>
226
-          <in>085_reformed.s</in>
227
-          <in>085_reformed_g2.s</in>
228
-          <in>086_reformed.s</in>
229
-          <in>086_reformed_g2.s</in>
230
-          <in>087_reformed.s</in>
231
-          <in>087_reformed_g2.s</in>
232
-          <in>088_reformed.s</in>
233
-          <in>088_reformed_g2.s</in>
234
-          <in>089_reformed.s</in>
235
-          <in>089_reformed_g2.s</in>
236
-          <in>090_reformed.s</in>
237
-          <in>090_reformed_g2.s</in>
238
-          <in>091_reformed.s</in>
239
-          <in>091_reformed_g2.s</in>
240
-          <in>092_reformed.s</in>
241
-          <in>092_reformed_g2.s</in>
242
-          <in>093_reformed.s</in>
243
-          <in>093_reformed_g2.s</in>
244
-          <in>094_reformed.s</in>
245
-          <in>094_reformed_g2.s</in>
246
-          <in>095_reformed.s</in>
247
-          <in>095_reformed_g2.s</in>
248
-          <in>096_reformed.s</in>
249
-          <in>096_reformed_g2.s</in>
250
-          <in>097_reformed.s</in>
251
-          <in>097_reformed_g2.s</in>
252
-          <in>098_reformed_g2.s</in>
253
-          <in>099_reformed_g2.s</in>
254
-          <in>100_reformed.s</in>
255
-          <in>100_reformed_g2.s</in>
256
-          <in>101_reformed.s</in>
257
-          <in>101_reformed_g2.s</in>
258
-          <in>102_reformed.s</in>
259
-          <in>102_reformed_g2.s</in>
260
-          <in>103_reformed_g2.s</in>
261
-          <in>104_reformed_g2.s</in>
262
-          <in>105_reformed_g2.s</in>
263
-          <in>106_reformed_g2.s</in>
264
-          <in>107_reformed_g2.s</in>
265
-          <in>108_reformed_g2.s</in>
266
-          <in>109_reformed_g2.s</in>
267
-          <in>110_reformed_g2.s</in>
268
-          <in>111_reformed_g2.s</in>
269
-          <in>112_reformed_g2.s</in>
270
-          <in>113_reformed_g2.s</in>
271
-          <in>114_reformed_g2.s</in>
272
-          <in>115_reformed_g2.s</in>
273
-          <in>116_reformed_g2.s</in>
274
-          <in>117_reformed_g2.s</in>
275
-          <in>118_reformed_g2.s</in>
276
-          <in>119_reformed_g2.s</in>
277
-          <in>120_reformed_g2.s</in>
278
-          <in>121_reformed_g2.s</in>
279
-          <in>122_reformed_g2.s</in>
280
-          <in>123_reformed_g2.s</in>
281
-          <in>124_reformed_g2.s</in>
282
-          <in>125_reformed_g2.s</in>
283
-          <in>126_reformed_g2.s</in>
284
-          <in>127_reformed_g2.s</in>
285
-          <in>98_reformed.s</in>
286
-          <in>99_reformed.s</in>
62
+          <in>ow_0000.s</in>
63
+          <in>ow_00000.s</in>
64
+          <in>ow_0001.s</in>
65
+          <in>ow_0002.s</in>
66
+          <in>ow_0003.s</in>
67
+          <in>ow_0004.s</in>
68
+          <in>ow_0006.s</in>
69
+          <in>ow_0007.s</in>
70
+          <in>ow_0008.s</in>
71
+          <in>ow_0009.s</in>
72
+          <in>ow_0010.s</in>
73
+          <in>ow_0011.s</in>
74
+          <in>ow_0013.s</in>
75
+          <in>ow_0014.s</in>
76
+          <in>ow_0015.s</in>
77
+          <in>ow_0016.s</in>
78
+          <in>ow_0017.s</in>
79
+          <in>ow_0018.s</in>
80
+          <in>ow_0019.s</in>
81
+          <in>ow_0020.s</in>
82
+          <in>ow_0021.s</in>
83
+          <in>ow_0022.s</in>
84
+          <in>ow_0023.s</in>
85
+          <in>ow_0024.s</in>
86
+          <in>ow_0025.s</in>
87
+          <in>ow_0026.s</in>
88
+          <in>ow_0027.s</in>
89
+          <in>ow_0028.s</in>
90
+          <in>ow_0029.s</in>
91
+          <in>ow_0030.s</in>
92
+          <in>ow_0031.s</in>
93
+          <in>ow_0032.s</in>
94
+          <in>ow_0033.s</in>
95
+          <in>ow_0034.s</in>
96
+          <in>ow_0035.s</in>
97
+          <in>ow_0036.s</in>
98
+          <in>ow_0037.s</in>
99
+          <in>ow_0038.s</in>
100
+          <in>ow_0039.s</in>
101
+          <in>ow_0040.s</in>
102
+          <in>ow_0041.s</in>
103
+          <in>ow_0042.s</in>
104
+          <in>ow_0043.s</in>
105
+          <in>ow_0044.s</in>
106
+          <in>ow_0045.s</in>
107
+          <in>ow_0046.s</in>
108
+          <in>ow_0047.s</in>
109
+          <in>ow_0048.s</in>
110
+          <in>ow_0049.s</in>
111
+          <in>ow_0050.s</in>
112
+          <in>ow_0051.s</in>
113
+          <in>ow_0052.s</in>
114
+          <in>ow_0053.s</in>
115
+          <in>ow_0054.s</in>
116
+          <in>ow_0055.s</in>
117
+          <in>ow_0056.s</in>
118
+          <in>ow_0057.s</in>
119
+          <in>ow_0058.s</in>
120
+          <in>ow_0059.s</in>
121
+          <in>ow_0060.s</in>
122
+          <in>ow_0061.s</in>
123
+          <in>ow_0062.s</in>
124
+          <in>ow_0063.s</in>
125
+          <in>ow_0064.s</in>
126
+          <in>ow_0065.s</in>
127
+          <in>ow_0066.s</in>
128
+          <in>ow_0067.s</in>
129
+          <in>ow_0068.s</in>
130
+          <in>ow_0069.s</in>
131
+          <in>ow_0070.s</in>
132
+          <in>ow_0071.s</in>
133
+          <in>ow_0072.s</in>
134
+          <in>ow_0073.s</in>
135
+          <in>ow_0074.s</in>
136
+          <in>ow_0075.s</in>
137
+          <in>ow_0076.s</in>
138
+          <in>ow_0077.s</in>
139
+          <in>ow_0078.s</in>
140
+          <in>ow_0079.s</in>
141
+          <in>ow_0080.s</in>
142
+          <in>ow_0081.s</in>
143
+          <in>ow_0082.s</in>
144
+          <in>ow_0083.s</in>
145
+          <in>ow_0084.s</in>
146
+          <in>ow_0085.s</in>
147
+          <in>ow_0086.s</in>
148
+          <in>ow_0087.s</in>
149
+          <in>ow_0088.s</in>
150
+          <in>ow_0089.s</in>
151
+          <in>ow_0090.s</in>
152
+          <in>ow_0091.s</in>
153
+          <in>ow_0092.s</in>
154
+          <in>ow_0093.s</in>
155
+          <in>ow_0094.s</in>
156
+          <in>ow_0095.s</in>
157
+          <in>ow_0096.s</in>
158
+          <in>ow_0097.s</in>
159
+          <in>ow_0098.s</in>
160
+          <in>ow_0099.s</in>
161
+          <in>ow_0100.s</in>
162
+          <in>ow_0101.s</in>
163
+          <in>ow_0102.s</in>
164
+          <in>ow_0103.s</in>
165
+          <in>ow_0105.s</in>
166
+          <in>ow_0106.s</in>
167
+          <in>ow_0107.s</in>
168
+          <in>ow_0108.s</in>
169
+          <in>ow_0109.s</in>
170
+          <in>ow_0110.s</in>
171
+          <in>ow_0111.s</in>
172
+          <in>ow_0112.s</in>
173
+          <in>ow_0113.s</in>
174
+          <in>ow_0114.s</in>
175
+          <in>ow_0116.s</in>
176
+          <in>ow_0117.s</in>
177
+          <in>ow_0118.s</in>
178
+          <in>ow_0119.s</in>
179
+          <in>ow_0120.s</in>
180
+          <in>ow_0121.s</in>
181
+          <in>ow_0122.s</in>
182
+          <in>ow_0123.s</in>
183
+          <in>ow_0124.s</in>
184
+          <in>ow_0125.s</in>
185
+          <in>ow_0126.s</in>
186
+          <in>ow_0127.s</in>
187
+          <in>ow_0128.s</in>
188
+          <in>ow_0129.s</in>
189
+          <in>ow_0130.s</in>
190
+          <in>ow_0131.s</in>
191
+          <in>ow_0132.s</in>
192
+          <in>ow_0133.s</in>
193
+          <in>ow_0134.s</in>
194
+          <in>ow_0135.s</in>
195
+          <in>ow_0136.s</in>
196
+          <in>ow_0137.s</in>
197
+          <in>ow_0138.s</in>
198
+          <in>ow_0139.s</in>
199
+          <in>ow_0140.s</in>
200
+          <in>ow_0141.s</in>
201
+          <in>ow_0142.s</in>
202
+          <in>ow_0143.s</in>
203
+          <in>ow_0144.s</in>
204
+          <in>ow_0145.s</in>
205
+          <in>ow_0146.s</in>
206
+          <in>ow_0147.s</in>
207
+          <in>ow_0148.s</in>
208
+          <in>ow_0149.s</in>
209
+          <in>ow_0150.s</in>
210
+          <in>ow_0151.s</in>
211
+          <in>ow_0152.s</in>
212
+          <in>ow_0153.s</in>
213
+          <in>ow_0154.s</in>
214
+          <in>ow_0155.s</in>
215
+          <in>ow_0156.s</in>
216
+          <in>ow_0157.s</in>
217
+          <in>ow_0158.s</in>
218
+          <in>ow_0159.s</in>
219
+          <in>ow_0160.s</in>
220
+          <in>ow_0161.s</in>
221
+          <in>ow_0162.s</in>
222
+          <in>ow_0163.s</in>
223
+          <in>ow_0164.s</in>
224
+          <in>ow_0165.s</in>
225
+          <in>ow_0166.s</in>
226
+          <in>ow_0167.s</in>
227
+          <in>ow_0168.s</in>
228
+          <in>ow_0169.s</in>
229
+          <in>ow_0170.s</in>
230
+          <in>ow_0171.s</in>
231
+          <in>ow_0172.s</in>
232
+          <in>ow_0173.s</in>
233
+          <in>ow_0174.s</in>
234
+          <in>ow_0175.s</in>
235
+          <in>ow_0176.s</in>
236
+          <in>ow_0177.s</in>
237
+          <in>ow_0178.s</in>
238
+          <in>ow_0179.s</in>
239
+          <in>ow_0180.s</in>
240
+          <in>ow_0181.s</in>
241
+          <in>ow_0182.s</in>
242
+          <in>ow_0183.s</in>
243
+          <in>ow_0184.s</in>
244
+          <in>ow_0185.s</in>
245
+          <in>ow_0186.s</in>
246
+          <in>ow_0187.s</in>
247
+          <in>ow_0188.s</in>
248
+          <in>ow_0189.s</in>
249
+          <in>ow_0190.s</in>
250
+          <in>ow_0191.s</in>
251
+          <in>ow_0192.s</in>
252
+          <in>ow_0193.s</in>
253
+          <in>ow_0194.s</in>
254
+          <in>ow_0195.s</in>
255
+          <in>ow_0196.s</in>
256
+          <in>ow_0197.s</in>
257
+          <in>ow_0198.s</in>
258
+          <in>ow_0199.s</in>
259
+          <in>ow_0200.s</in>
260
+          <in>ow_0201.s</in>
261
+          <in>ow_0202.s</in>
262
+          <in>ow_0203.s</in>
263
+          <in>ow_0204.s</in>
264
+          <in>ow_0205.s</in>
265
+          <in>ow_0206.s</in>
266
+          <in>ow_0207.s</in>
267
+          <in>ow_0208.s</in>
268
+          <in>ow_0209.s</in>
269
+          <in>ow_0210.s</in>
270
+          <in>ow_0211.s</in>
271
+          <in>ow_0212.s</in>
272
+          <in>ow_0256.s</in>
273
+          <in>ow_0257.s</in>
274
+          <in>ow_0258.s</in>
275
+          <in>ow_0259.s</in>
276
+          <in>ow_0260.s</in>
277
+          <in>ow_0261.s</in>
278
+          <in>ow_0262.s</in>
279
+          <in>ow_0263.s</in>
280
+          <in>ow_0264.s</in>
281
+          <in>ow_0265.s</in>
282
+          <in>ow_0266.s</in>
283
+          <in>ow_0267.s</in>
284
+          <in>ow_0268.s</in>
285
+          <in>ow_0269.s</in>
286
+          <in>ow_0270.s</in>
287
+          <in>ow_0271.s</in>
288
+          <in>ow_0272.s</in>
289
+          <in>ow_0273.s</in>
290
+          <in>ow_0274.s</in>
291
+          <in>ow_0275.s</in>
292
+          <in>ow_0276.s</in>
293
+          <in>ow_0277.s</in>
294
+          <in>ow_0278.s</in>
295
+          <in>ow_0279.s</in>
296
+          <in>ow_0280.s</in>
297
+          <in>ow_0281.s</in>
298
+          <in>ow_0282.s</in>
299
+          <in>ow_0283.s</in>
300
+          <in>ow_0284.s</in>
301
+          <in>ow_0285.s</in>
302
+          <in>ow_0286.s</in>
303
+          <in>ow_0287.s</in>
304
+          <in>ow_0288.s</in>
305
+          <in>ow_0289.s</in>
306
+          <in>ow_0290.s</in>
307
+          <in>ow_0291.s</in>
308
+          <in>ow_0292.s</in>
309
+          <in>ow_0293.s</in>
310
+          <in>ow_0294.s</in>
311
+          <in>ow_0295.s</in>
312
+          <in>ow_0296.s</in>
313
+          <in>ow_0297.s</in>
314
+          <in>ow_0298.s</in>
315
+          <in>ow_0299.s</in>
316
+          <in>ow_0300.s</in>
317
+          <in>ow_0301.s</in>
318
+          <in>ow_0302.s</in>
319
+          <in>ow_0303.s</in>
320
+          <in>ow_0304.s</in>
321
+          <in>ow_0305.s</in>
322
+          <in>ow_0306.s</in>
323
+          <in>ow_0307.s</in>
324
+          <in>ow_0308.s</in>
325
+          <in>ow_0309.s</in>
326
+          <in>ow_0315.s</in>
327
+          <in>ow_0316.s</in>
328
+          <in>ow_0317.s</in>
329
+          <in>ow_0318.s</in>
330
+          <in>ow_0319.s</in>
331
+          <in>ow_0320.s</in>
332
+          <in>ow_0321.s</in>
333
+          <in>ow_0322.s</in>
334
+          <in>ow_0323.s</in>
335
+          <in>ow_0324.s</in>
336
+          <in>ow_0325.s</in>
337
+          <in>ow_0326.s</in>
338
+          <in>ow_0327.s</in>
339
+          <in>ow_0328.s</in>
340
+          <in>ow_0329.s</in>
341
+          <in>ow_0330.s</in>
342
+          <in>ow_0331.s</in>
343
+          <in>ow_0332.s</in>
344
+          <in>ow_0333.s</in>
345
+          <in>ow_0334.s</in>
346
+          <in>ow_0335.s</in>
347
+          <in>ow_0336.s</in>
348
+          <in>ow_0337.s</in>
349
+          <in>ow_0338.s</in>
350
+          <in>ow_0339.s</in>
351
+          <in>ow_0340.s</in>
352
+          <in>ow_0341.s</in>
353
+          <in>ow_0342.s</in>
354
+          <in>ow_0343.s</in>
355
+          <in>ow_0344.s</in>
356
+          <in>ow_0345.s</in>
357
+          <in>ow_0346.s</in>
358
+          <in>ow_0347.s</in>
359
+          <in>ow_0348.s</in>
360
+          <in>ow_0349.s</in>
361
+          <in>ow_0350.s</in>
362
+          <in>ow_0351.s</in>
363
+          <in>ow_0352.s</in>
364
+          <in>ow_0353.s</in>
365
+          <in>ow_0354.s</in>
366
+          <in>ow_0355.s</in>
367
+          <in>ow_0356.s</in>
368
+          <in>ow_0357.s</in>
369
+          <in>ow_0358.s</in>
370
+          <in>ow_0359.s</in>
371
+          <in>ow_0360.s</in>
372
+          <in>ow_0361.s</in>
373
+          <in>ow_0362.s</in>
374
+          <in>ow_0363.s</in>
375
+          <in>ow_0364.s</in>
376
+          <in>ow_0365.s</in>
377
+          <in>ow_0366.s</in>
378
+          <in>ow_0367.s</in>
379
+          <in>ow_0368.s</in>
380
+          <in>ow_0369.s</in>
381
+          <in>ow_0370.s</in>
382
+          <in>ow_0371.s</in>
383
+          <in>ow_0372.s</in>
384
+          <in>ow_0373.s</in>
385
+          <in>ow_0374.s</in>
386
+          <in>ow_0375.s</in>
387
+          <in>ow_0376.s</in>
388
+          <in>ow_0377.s</in>
389
+          <in>ow_0378.s</in>
390
+          <in>ow_0379.s</in>
391
+          <in>ow_0380.s</in>
392
+          <in>ow_0381.s</in>
393
+          <in>ow_0382.s</in>
394
+          <in>ow_0383.s</in>
395
+          <in>ow_0384.s</in>
396
+          <in>ow_0385.s</in>
397
+          <in>ow_0386.s</in>
398
+          <in>ow_0387.s</in>
399
+          <in>ow_0388.s</in>
400
+          <in>ow_0389.s</in>
401
+          <in>ow_0390.s</in>
402
+          <in>ow_0391.s</in>
403
+          <in>ow_0392.s</in>
404
+          <in>ow_0393.s</in>
405
+          <in>ow_0394.s</in>
406
+          <in>ow_0395.s</in>
407
+          <in>ow_0396.s</in>
408
+          <in>ow_0397.s</in>
409
+          <in>ow_0398.s</in>
410
+          <in>ow_0399.s</in>
411
+          <in>ow_0400.s</in>
412
+          <in>ow_0401.s</in>
413
+          <in>ow_0402.s</in>
414
+          <in>ow_0403.s</in>
415
+          <in>ow_0404.s</in>
416
+          <in>ow_0405.s</in>
417
+          <in>ow_0406.s</in>
418
+          <in>ow_0407.s</in>
419
+          <in>ow_0408.s</in>
420
+          <in>ow_0409.s</in>
421
+          <in>ow_0410.s</in>
422
+          <in>ow_0411.s</in>
423
+          <in>ow_0412.s</in>
424
+          <in>ow_0413.s</in>
425
+          <in>ow_0414.s</in>
426
+          <in>ow_0415.s</in>
427
+          <in>ow_0416.s</in>
428
+          <in>ow_0417.s</in>
429
+          <in>ow_0418.s</in>
430
+          <in>ow_0419.s</in>
431
+          <in>ow_0420.s</in>
432
+          <in>ow_0421.s</in>
433
+          <in>ow_0422.s</in>
434
+          <in>ow_0423.s</in>
435
+          <in>ow_0424.s</in>
436
+          <in>ow_0425.s</in>
437
+          <in>ow_0426.s</in>
438
+          <in>ow_0427.s</in>
439
+          <in>ow_0428.s</in>
440
+          <in>ow_0429.s</in>
441
+          <in>ow_0430.s</in>
442
+          <in>ow_0431.s</in>
443
+          <in>ow_0432.s</in>
444
+          <in>ow_0433.s</in>
445
+          <in>ow_0434.s</in>
446
+          <in>ow_0435.s</in>
447
+          <in>ow_0436.s</in>
448
+          <in>ow_0437.s</in>
449
+          <in>ow_0438.s</in>
450
+          <in>ow_0439.s</in>
451
+          <in>ow_0440.s</in>
452
+          <in>ow_0441.s</in>
453
+          <in>ow_0442.s</in>
454
+          <in>ow_0443.s</in>
455
+          <in>ow_0444.s</in>
456
+          <in>ow_0445.s</in>
457
+          <in>ow_0446.s</in>
458
+          <in>ow_0447.s</in>
459
+          <in>ow_0448.s</in>
460
+          <in>ow_0449.s</in>
461
+          <in>ow_0450.s</in>
462
+          <in>ow_0451.s</in>
463
+          <in>ow_0452.s</in>
464
+          <in>ow_0453.s</in>
465
+          <in>ow_0454.s</in>
466
+          <in>ow_0455.s</in>
467
+          <in>ow_0456.s</in>
468
+          <in>ow_0457.s</in>
469
+          <in>ow_0458.s</in>
470
+          <in>ow_0459.s</in>
471
+          <in>ow_0460.s</in>
472
+          <in>ow_0461.s</in>
473
+          <in>ow_0462.s</in>
474
+          <in>ow_0463.s</in>
475
+          <in>ow_0464.s</in>
476
+          <in>ow_0465.s</in>
477
+          <in>ow_0466.s</in>
478
+          <in>ow_0467.s</in>
479
+          <in>ow_0468.s</in>
480
+          <in>ow_0469.s</in>
481
+          <in>ow_0470.s</in>
482
+          <in>ow_0471.s</in>
483
+          <in>ow_0472.s</in>
484
+          <in>ow_0473.s</in>
485
+          <in>ow_0474.s</in>
486
+          <in>ow_0475.s</in>
487
+          <in>ow_0476.s</in>
488
+          <in>ow_0477.s</in>
489
+          <in>ow_0478.s</in>
490
+          <in>ow_0479.s</in>
491
+          <in>ow_0480.s</in>
492
+          <in>ow_0481.s</in>
493
+          <in>ow_0482.s</in>
494
+          <in>ow_0483.s</in>
495
+          <in>ow_0484.s</in>
496
+          <in>ow_0485.s</in>
497
+          <in>ow_0486.s</in>
498
+          <in>ow_0487.s</in>
499
+          <in>ow_0488.s</in>
500
+          <in>ow_0489.s</in>
501
+          <in>ow_0490.s</in>
502
+          <in>ow_0491.s</in>
503
+          <in>ow_0492.s</in>
504
+          <in>ow_0493.s</in>
505
+          <in>ow_0494.s</in>
506
+          <in>ow_0495.s</in>
507
+          <in>ow_0496.s</in>
508
+          <in>ow_0497.s</in>
509
+          <in>ow_0498.s</in>
510
+          <in>ow_0499.s</in>
511
+          <in>ow_0513.s</in>
512
+          <in>ow_0514.s</in>
513
+          <in>ow_0515.s</in>
514
+          <in>ow_0516.s</in>
515
+          <in>ow_0517.s</in>
516
+          <in>ow_0518.s</in>
517
+          <in>ow_0519.s</in>
518
+          <in>ow_0520.s</in>
519
+          <in>ow_0521.s</in>
520
+          <in>ow_0522.s</in>
521
+          <in>ow_0523.s</in>
522
+          <in>ow_0524.s</in>
523
+          <in>ow_0525.s</in>
524
+          <in>ow_0526.s</in>
525
+          <in>ow_0527.s</in>
526
+          <in>ow_0528.s</in>
527
+          <in>ow_0529.s</in>
528
+          <in>ow_0530.s</in>
529
+          <in>ow_0531.s</in>
287 530
         </df>
288 531
         <df name="sprites">
289 532
           <df name="back_sprites">
@@ -4018,6 +4261,8 @@
4018 4261
           </df>
4019 4262
           <df name="moves">
4020 4263
           </df>
4264
+          <df name="overworld">
4265
+          </df>
4021 4266
           <df name="pkmn_tables">
4022 4267
           </df>
4023 4268
         </df>

+ 32
- 1
patches/overworlds/overworld.asm View File

@@ -58,4 +58,35 @@ strb r0, [r4, #0x1A]
58 58
 .org 0x08067F92
59 59
     ldr r5, =overworld_h_six+1
60 60
     bx r5
61
-    .pool
61
+    .pool
62
+
63
+.org 0x0805F4D8
64
+    .word ow_pal_table
65
+
66
+.org 0x0805F570
67
+    .word ow_pal_table
68
+
69
+.org 0x0805F2F4
70
+    .word ow_pal_table
71
+
72
+.org 0x0805F5C8
73
+    .word ow_pal_table
74
+
75
+.org 0x0805F4D4
76
+    .halfword 0x13FF
77
+
78
+.org 0x0805F5CC
79
+    .halfword 0x13FF
80
+
81
+.org 0x0805F5D2
82
+    lsl r0, r0, #0x10
83
+    lsr r2, r0, #0x10
84
+
85
+.org 0x0805F548
86
+    lsl r0, r0, #0x10
87
+.org 0x0805F54C
88
+    lsr r0, r0, #0xD
89
+
90
+.org 0x0805F4BA
91
+    lsl r0, #0x10
92
+    lsr r1, r0, #0x10

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit bc6b528506c83d298653f9d6a0c0b613aafd90bb
1
+Subproject commit e128f15de09d33a4c3e450a4280307ae89f0eb84

+ 1
- 1
sprites.makefile View File

@@ -60,7 +60,7 @@ $(GFX_BUILD_DIR)/overworlds/%.o: $(GFX_BUILD_DIR)/overworlds/%.s
60 60
 
61 61
 .PRECIOUS: $(GFX_BUILD_DIR)/overworlds/%.s
62 62
 $(GFX_BUILD_DIR)/overworlds/%.s: $(ASSET_ROOT)/overworld/%.png
63
-	grit $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16 -o $@
63
+	grit $< -fts -fh! -gt -gB4 -gz! -p -pz! -m! -pu16 -o $@
64 64
 
65 65
 # Normal Palette Targets
66 66
 $(GFX_BUILD_DIR)/sprites/normal_pal/%.o: $(GFX_BUILD_DIR)/sprites/normal_pal/%.s

+ 6
- 1
src/overworld/overworld.c View File

@@ -24,10 +24,15 @@ struct npc_type {
24 24
     u32 rot_scale_anims;
25 25
 };
26 26
 
27
-struct npc_type** npc_tables[] = {(struct npc_type**)0x0839FDB0, (struct npc_type**)0x09E00000};
27
+extern struct npc_type* ow_main_table;
28
+extern struct npc_type* ow_second_table;
29
+extern struct npc_type* ow_third_table;
30
+
31
+
28 32
 
29 33
 struct npc_type* npc_get_type(u16 npc_id)
30 34
 {
35
+    struct npc_type** npc_tables[] = {ow_main_table, ow_second_table, ow_third_table};
31 36
     u16* replace_ow = var_access(OW_REPLACE_VAR);
32 37
     if(*replace_ow > 0 && *replace_ow - 1 == npc_id)
33 38
     {