overworld implementation, overworld tables and entries

data/moves/move_data.S

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

data/overworld/overworld_tables.S

@@ -0,0 +1,790 @@
+.section .rodata
+.thumb
+
+.global ow_main_table
+.global ow_second_table
+.global ow_third_table
+
+ow_main_table:
+    .word ow_maintable_1
+ow_second_table:
+    .word ow_maintable_2
+ow_third_table:
+    .word ow_maintable_3
+
+.align 2
+ow_maintable_1: 
+.word ow_data_0
+.word ow_data_1
+.word ow_data_2
+.word ow_data_3
+.word ow_data_4
+.word ow_data_5
+.word ow_data_6
+.word ow_data_7
+.word ow_data_8
+.word ow_data_9
+.word ow_data_10
+.word ow_data_11
+.word ow_data_12
+.word ow_data_13
+.word ow_data_14
+.word ow_data_15
+.word ow_data_16
+.word ow_data_17
+.word ow_data_18
+.word ow_data_19
+.word ow_data_20
+.word ow_data_21
+.word ow_data_22
+.word ow_data_23
+.word ow_data_24
+.word ow_data_25
+.word ow_data_26
+.word ow_data_27
+.word ow_data_28
+.word ow_data_29
+.word ow_data_30
+.word ow_data_31
+.word ow_data_32
+.word ow_data_33
+.word ow_data_34
+.word ow_data_35
+.word ow_data_36
+.word ow_data_37
+.word ow_data_38
+.word ow_data_39
+.word ow_data_40
+.word ow_data_41
+.word ow_data_42
+.word ow_data_43
+.word ow_data_44
+.word ow_data_45
+.word ow_data_46
+.word ow_data_47
+.word ow_data_48
+.word ow_data_49
+.word ow_data_50
+.word ow_data_51
+.word ow_data_52
+.word ow_data_53
+.word ow_data_54
+.word ow_data_55
+.word ow_data_56
+.word ow_data_57
+.word ow_data_58
+.word ow_data_59
+.word ow_data_60
+.word ow_data_61
+.word ow_data_62
+.word ow_data_63
+.word ow_data_64
+.word ow_data_65
+.word ow_data_66
+.word ow_data_67
+.word ow_data_68
+.word ow_data_69
+.word ow_data_70
+.word ow_data_71
+.word ow_data_72
+.word ow_data_73
+.word ow_data_74
+.word ow_data_75
+.word ow_data_76
+.word ow_data_77
+.word ow_data_78
+.word ow_data_79
+.word ow_data_80
+.word ow_data_81
+.word ow_data_82
+.word ow_data_83
+.word ow_data_84
+.word ow_data_85
+.word ow_data_86
+.word ow_data_87
+.word ow_data_88
+.word ow_data_89
+.word ow_data_90
+.word ow_data_91
+.word ow_data_92
+.word ow_data_93
+.word ow_data_94
+.word ow_data_95
+.word ow_data_96
+.word ow_data_97
+.word ow_data_98
+.word ow_data_99
+.word ow_data_100
+.word ow_data_101
+.word ow_data_102
+.word ow_data_103
+.word ow_data_104
+.word ow_data_105
+.word ow_data_106
+.word ow_data_107
+.word ow_data_108
+.word ow_data_109
+.word ow_data_110
+.word ow_data_111
+.word ow_data_112
+.word ow_data_113
+.word ow_data_114
+.word ow_data_115
+.word ow_data_116
+.word ow_data_117
+.word ow_data_118
+.word ow_data_119
+.word ow_data_120
+.word ow_data_121
+.word ow_data_122
+.word ow_data_123
+.word ow_data_124
+.word ow_data_125
+.word ow_data_126
+.word ow_data_127
+.word ow_data_128
+.word ow_data_129
+.word ow_data_130
+.word ow_data_131
+.word ow_data_132
+.word ow_data_133
+.word ow_data_134
+.word ow_data_135
+.word ow_data_136
+.word ow_data_137
+.word ow_data_138
+.word ow_data_139
+.word ow_data_140
+.word ow_data_141
+.word ow_data_142
+.word ow_data_143
+.word ow_data_144
+.word ow_data_145
+.word ow_data_146
+.word ow_data_147
+.word ow_data_148
+.word ow_data_149
+.word ow_data_150
+.word ow_data_151
+.word ow_data_152
+.word ow_data_153
+.word ow_data_154
+.word ow_data_155
+.word ow_data_156
+.word ow_data_157
+.word ow_data_158
+.word ow_data_159
+.word ow_data_160
+.word ow_data_161
+.word ow_data_162
+.word ow_data_163
+.word ow_data_164
+.word ow_data_165
+.word ow_data_166
+.word ow_data_167
+.word ow_data_168
+.word ow_data_169
+.word ow_data_170
+.word ow_data_171
+.word ow_data_172
+.word ow_data_173
+.word ow_data_174
+.word ow_data_175
+.word ow_data_176
+.word ow_data_177
+.word ow_data_178
+.word ow_data_179
+.word ow_data_180
+.word ow_data_181
+.word ow_data_182
+.word ow_data_183
+.word ow_data_184
+.word ow_data_185
+.word ow_data_186
+.word ow_data_187
+.word ow_data_188
+.word ow_data_189
+.word ow_data_190
+.word ow_data_191
+.word ow_data_192
+.word ow_data_193
+.word ow_data_194
+.word ow_data_195
+.word ow_data_196
+.word ow_data_197
+.word ow_data_198
+.word ow_data_199
+.word ow_data_200
+.word ow_data_201
+.word ow_data_202
+.word ow_data_203
+.word ow_data_204
+.word ow_data_205
+.word ow_data_206
+.word ow_data_207
+.word ow_data_208
+.word ow_data_209
+.word ow_data_210
+.word ow_data_211
+.word ow_data_212
+.word ow_data_213
+.word ow_data_214
+.word ow_data_215
+.word ow_data_216
+.word ow_data_217
+.word ow_data_218
+.word ow_data_219
+.word ow_data_220
+.word ow_data_221
+.word ow_data_222
+.word ow_data_223
+.word ow_data_224
+.word ow_data_225
+.word ow_data_226
+.word ow_data_227
+.word ow_data_228
+.word ow_data_229
+.word ow_data_230
+.word ow_data_231
+.word ow_data_232
+.word ow_data_233
+.word ow_data_234
+.word ow_data_235
+.word ow_data_236
+.word ow_data_237
+.word ow_data_238
+.word ow_data_239
+.word ow_data_240
+.word ow_data_241
+.word ow_data_242
+.word ow_data_243
+.word ow_data_244
+.word ow_data_245
+.word ow_data_246
+.word ow_data_247
+.word ow_data_248
+.word ow_data_249
+.word ow_data_250
+.word ow_data_251
+.word ow_data_252
+.word ow_data_253
+.word ow_data_254
+.word ow_data_255
+
+.global ow_maintable_2
+ow_maintable_2:
+.word ow_data_256
+.word ow_data_257
+.word ow_data_258
+.word ow_data_259
+.word ow_data_260
+.word ow_data_261
+.word ow_data_262
+.word ow_data_263
+.word ow_data_264
+.word ow_data_265
+.word ow_data_266
+.word ow_data_267
+.word ow_data_268
+.word ow_data_269
+.word ow_data_270
+.word ow_data_271
+.word ow_data_272
+.word ow_data_273
+.word ow_data_274
+.word ow_data_275
+.word ow_data_276
+.word ow_data_277
+.word ow_data_278
+.word ow_data_279
+.word ow_data_280
+.word ow_data_281
+.word ow_data_282
+.word ow_data_283
+.word ow_data_284
+.word ow_data_285
+.word ow_data_286
+.word ow_data_287
+.word ow_data_288
+.word ow_data_289
+.word ow_data_290
+.word ow_data_291
+.word ow_data_292
+.word ow_data_293
+.word ow_data_294
+.word ow_data_295
+.word ow_data_296
+.word ow_data_297
+.word ow_data_298
+.word ow_data_299
+.word ow_data_300
+.word ow_data_301
+.word ow_data_302
+.word ow_data_303
+.word ow_data_304
+.word ow_data_305
+.word ow_data_306
+.word ow_data_307
+.word ow_data_308
+.word ow_data_309
+.word ow_data_310
+.word ow_data_311
+.word ow_data_312
+.word ow_data_313
+.word ow_data_314
+.word ow_data_315
+.word ow_data_316
+.word ow_data_317
+.word ow_data_318
+.word ow_data_319
+.word ow_data_320
+.word ow_data_321
+.word ow_data_322
+.word ow_data_323
+.word ow_data_324
+.word ow_data_325
+.word ow_data_326
+.word ow_data_327
+.word ow_data_328
+.word ow_data_329
+.word ow_data_330
+.word ow_data_331
+.word ow_data_332
+.word ow_data_333
+.word ow_data_334
+.word ow_data_335
+.word ow_data_336
+.word ow_data_337
+.word ow_data_338
+.word ow_data_339
+.word ow_data_340
+.word ow_data_341
+.word ow_data_342
+.word ow_data_343
+.word ow_data_344
+.word ow_data_345
+.word ow_data_346
+.word ow_data_347
+.word ow_data_348
+.word ow_data_349
+.word ow_data_350
+.word ow_data_351
+.word ow_data_352
+.word ow_data_353
+.word ow_data_354
+.word ow_data_355
+.word ow_data_356
+.word ow_data_357
+.word ow_data_358
+.word ow_data_359
+.word ow_data_360
+.word ow_data_361
+.word ow_data_362
+.word ow_data_363
+.word ow_data_364
+.word ow_data_365
+.word ow_data_366
+.word ow_data_367
+.word ow_data_368
+.word ow_data_369
+.word ow_data_370
+.word ow_data_371
+.word ow_data_372
+.word ow_data_373
+.word ow_data_374
+.word ow_data_375
+.word ow_data_376
+.word ow_data_377
+.word ow_data_378
+.word ow_data_379
+.word ow_data_380
+.word ow_data_381
+.word ow_data_382
+.word ow_data_383
+.word ow_data_384
+.word ow_data_385
+.word ow_data_386
+.word ow_data_387
+.word ow_data_388
+.word ow_data_389
+.word ow_data_390
+.word ow_data_391
+.word ow_data_392
+.word ow_data_393
+.word ow_data_394
+.word ow_data_395
+.word ow_data_396
+.word ow_data_397
+.word ow_data_398
+.word ow_data_399
+.word ow_data_400
+.word ow_data_401
+.word ow_data_402
+.word ow_data_403
+.word ow_data_404
+.word ow_data_405
+.word ow_data_406
+.word ow_data_407
+.word ow_data_408
+.word ow_data_409
+.word ow_data_410
+.word ow_data_411
+.word ow_data_412
+.word ow_data_413
+.word ow_data_414
+.word ow_data_415
+.word ow_data_416
+.word ow_data_417
+.word ow_data_418
+.word ow_data_419
+.word ow_data_420
+.word ow_data_421
+.word ow_data_422
+.word ow_data_423
+.word ow_data_424
+.word ow_data_425
+.word ow_data_426
+.word ow_data_427
+.word ow_data_428
+.word ow_data_429
+.word ow_data_430
+.word ow_data_431
+.word ow_data_432
+.word ow_data_433
+.word ow_data_434
+.word ow_data_435
+.word ow_data_436
+.word ow_data_437
+.word ow_data_438
+.word ow_data_439
+.word ow_data_440
+.word ow_data_441
+.word ow_data_442
+.word ow_data_443
+.word ow_data_444
+.word ow_data_445
+.word ow_data_446
+.word ow_data_447
+.word ow_data_448
+.word ow_data_449
+.word ow_data_450
+.word ow_data_451
+.word ow_data_452
+.word ow_data_453
+.word ow_data_454
+.word ow_data_455
+.word ow_data_456
+.word ow_data_457
+.word ow_data_458
+.word ow_data_459
+.word ow_data_460
+.word ow_data_461
+.word ow_data_462
+.word ow_data_463
+.word ow_data_464
+.word ow_data_465
+.word ow_data_466
+.word ow_data_467
+.word ow_data_468
+.word ow_data_469
+.word ow_data_470
+.word ow_data_471
+.word ow_data_472
+.word ow_data_473
+.word ow_data_474
+.word ow_data_475
+.word ow_data_476
+.word ow_data_477
+.word ow_data_478
+.word ow_data_479
+.word ow_data_480
+.word ow_data_481
+.word ow_data_482
+.word ow_data_483
+.word ow_data_484
+.word ow_data_485
+.word ow_data_486
+.word ow_data_487
+.word ow_data_488
+.word ow_data_489
+.word ow_data_490
+.word ow_data_491
+.word ow_data_492
+.word ow_data_493
+.word ow_data_494
+.word ow_data_495
+.word ow_data_496
+.word ow_data_497
+.word ow_data_498
+.word ow_data_499
+.word ow_data_500
+.word ow_data_501
+.word ow_data_502
+.word ow_data_503
+.word ow_data_504
+.word ow_data_505
+.word ow_data_506
+.word ow_data_507
+.word ow_data_508
+.word ow_data_509
+.word ow_data_510
+.word ow_data_511
+.word ow_data_512
+
+.global ow_maintable_3
+ow_maintable_3:
+.word ow_data_513
+.word ow_data_514
+.word ow_data_515
+.word ow_data_516
+.word ow_data_517
+.word ow_data_518
+.word ow_data_519
+.word ow_data_520
+.word ow_data_521
+.word ow_data_522
+.word ow_data_523
+.word ow_data_524
+.word ow_data_525
+.word ow_data_526
+.word ow_data_527
+.word ow_data_528
+.word ow_data_529
+.word ow_data_530
+.word ow_data_531
+.word ow_data_532
+.word ow_data_533
+.word ow_data_534
+.word ow_data_535
+.word ow_data_536
+.word ow_data_537
+.word ow_data_538
+.word ow_data_539
+.word ow_data_540
+.word ow_data_541
+.word ow_data_542
+.word ow_data_543
+.word ow_data_544
+.word ow_data_545
+.word ow_data_546
+.word ow_data_547
+.word ow_data_548
+.word ow_data_549
+.word ow_data_550
+.word ow_data_551
+.word ow_data_552
+.word ow_data_553
+.word ow_data_554
+.word ow_data_555
+.word ow_data_556
+.word ow_data_557
+.word ow_data_558
+.word ow_data_559
+.word ow_data_560
+.word ow_data_561
+.word ow_data_562
+.word ow_data_563
+.word ow_data_564
+.word ow_data_565
+.word ow_data_566
+.word ow_data_567
+.word ow_data_568
+.word ow_data_569
+.word ow_data_570
+.word ow_data_571
+.word ow_data_572
+.word ow_data_573
+.word ow_data_574
+.word ow_data_575
+.word ow_data_576
+.word ow_data_577
+.word ow_data_578
+.word ow_data_579
+.word ow_data_580
+.word ow_data_581
+.word ow_data_582
+.word ow_data_583
+.word ow_data_584
+.word ow_data_585
+.word ow_data_586
+.word ow_data_587
+.word ow_data_588
+.word ow_data_589
+.word ow_data_590
+.word ow_data_591
+.word ow_data_592
+.word ow_data_593
+.word ow_data_594
+.word ow_data_595
+.word ow_data_596
+.word ow_data_597
+.word ow_data_598
+.word ow_data_599
+.word ow_data_600
+.word ow_data_601
+.word ow_data_602
+.word ow_data_603
+.word ow_data_604
+.word ow_data_605
+.word ow_data_606
+.word ow_data_607
+.word ow_data_608
+.word ow_data_609
+.word ow_data_610
+.word ow_data_611
+.word ow_data_612
+.word ow_data_613
+.word ow_data_614
+.word ow_data_615
+.word ow_data_616
+.word ow_data_617
+.word ow_data_618
+.word ow_data_619
+.word ow_data_620
+.word ow_data_621
+.word ow_data_622
+.word ow_data_623
+.word ow_data_624
+.word ow_data_625
+.word ow_data_626
+.word ow_data_627
+.word ow_data_628
+.word ow_data_629
+.word ow_data_630
+.word ow_data_631
+.word ow_data_632
+.word ow_data_633
+.word ow_data_634
+.word ow_data_635
+.word ow_data_636
+.word ow_data_637
+.word ow_data_638
+.word ow_data_639
+.word ow_data_640
+.word ow_data_641
+.word ow_data_642
+.word ow_data_643
+.word ow_data_644
+.word ow_data_645
+.word ow_data_646
+.word ow_data_647
+.word ow_data_648
+.word ow_data_649
+.word ow_data_650
+.word ow_data_651
+.word ow_data_652
+.word ow_data_653
+.word ow_data_654
+.word ow_data_655
+.word ow_data_656
+.word ow_data_657
+.word ow_data_658
+.word ow_data_659
+.word ow_data_660
+.word ow_data_661
+.word ow_data_662
+.word ow_data_663
+.word ow_data_664
+.word ow_data_665
+.word ow_data_666
+.word ow_data_667
+.word ow_data_668
+.word ow_data_669
+.word ow_data_670
+.word ow_data_671
+.word ow_data_672
+.word ow_data_673
+.word ow_data_674
+.word ow_data_675
+.word ow_data_676
+.word ow_data_677
+.word ow_data_678
+.word ow_data_679
+.word ow_data_680
+.word ow_data_681
+.word ow_data_682
+.word ow_data_683
+.word ow_data_684
+.word ow_data_685
+.word ow_data_686
+.word ow_data_687
+.word ow_data_688
+.word ow_data_689
+.word ow_data_690
+.word ow_data_691
+.word ow_data_692
+.word ow_data_693
+.word ow_data_694
+.word ow_data_695
+.word ow_data_696
+.word ow_data_697
+.word ow_data_698
+.word ow_data_699
+.word ow_data_700
+.word ow_data_701
+.word ow_data_702
+.word ow_data_703
+.word ow_data_704
+.word ow_data_705
+.word ow_data_706
+.word ow_data_707
+.word ow_data_708
+.word ow_data_709
+.word ow_data_710
+.word ow_data_711
+.word ow_data_712
+.word ow_data_713
+.word ow_data_714
+.word ow_data_715
+.word ow_data_716
+.word ow_data_717
+.word ow_data_718
+.word ow_data_719
+.word ow_data_720
+.word ow_data_721
+.word ow_data_722
+.word ow_data_723
+.word ow_data_724
+.word ow_data_725
+.word ow_data_726
+.word ow_data_727
+.word ow_data_728
+.word ow_data_729
+.word ow_data_730
+.word ow_data_731
+.word ow_data_732
+.word ow_data_733
+.word ow_data_734
+.word ow_data_735
+.word ow_data_736
+.word ow_data_737
+.word ow_data_738
+.word ow_data_739
+.word ow_data_740
+.word ow_data_741
+.word ow_data_742
+.word ow_data_743
+.word ow_data_744
+.word ow_data_745
+.word ow_data_746
+.word ow_data_747
+.word ow_data_748
+.word ow_data_749
+.word ow_data_750
+.word ow_data_751
+.word ow_data_752
+.word ow_data_753
+.word ow_data_754
+.word ow_data_755
+.word ow_data_756
+.word ow_data_757
+.word ow_data_758
+.word ow_data_759
+.word ow_data_760
+.word ow_data_761
+.word ow_data_762
+.word ow_data_763
+.word ow_data_764
+.word ow_data_765
+.word ow_data_766
+.word ow_data_767

nbproject/private/configurations.xml

@@ -26,6 +26,12 @@
           <in>move_data.S</in>
           <in>move_descriptions.S</in>
         </df>
+        <df name="overworld">
+          <in>overworld_data.S</in>
+          <in>overworld_frames.S</in>
+          <in>overworld_pal_table.S</in>
+          <in>overworld_tables.S</in>
+        </df>
         <df name="pkmn_tables">
           <in>icon_sprites.S</in>
           <in>icons_paletten.S</in>
@@ -53,237 +59,474 @@
         <df name="icons">
         </df>
         <df name="overworlds">
-          <in>000_reformed.s</in>
-          <in>000_reformed_g2.s</in>
-          <in>001_reformed.s</in>
-          <in>001_reformed_g2.s</in>
-          <in>002_reformed.s</in>
-          <in>002_reformed_g2.s</in>
-          <in>003_reformed.s</in>
-          <in>003_reformed_g2.s</in>
-          <in>004_reformed.s</in>
-          <in>004_reformed_g2.s</in>
-          <in>005_reformed.s</in>
-          <in>005_reformed_g2.s</in>
-          <in>006_reformed.s</in>
-          <in>006_reformed_g2.s</in>
-          <in>007_reformed.s</in>
-          <in>007_reformed_g2.s</in>
-          <in>008_reformed.s</in>
-          <in>008_reformed_g2.s</in>
-          <in>009_reformed.s</in>
-          <in>009_reformed_g2.s</in>
-          <in>010_reformed.s</in>
-          <in>010_reformed_g2.s</in>
-          <in>011_reformed.s</in>
-          <in>011_reformed_g2.s</in>
-          <in>012_reformed.s</in>
-          <in>012_reformed_g2.s</in>
-          <in>013_reformed.s</in>
-          <in>013_reformed_g2.s</in>
-          <in>014_reformed.s</in>
-          <in>014_reformed_g2.s</in>
-          <in>015_reformed.s</in>
-          <in>015_reformed_g2.s</in>
-          <in>016_reformed.s</in>
-          <in>016_reformed_g2.s</in>
-          <in>017_reformed.s</in>
-          <in>017_reformed_g2.s</in>
-          <in>018_reformed.s</in>
-          <in>018_reformed_g2.s</in>
-          <in>019_reformed.s</in>
-          <in>019_reformed_g2.s</in>
-          <in>020_reformed.s</in>
-          <in>020_reformed_g2.s</in>
-          <in>021_reformed.s</in>
-          <in>021_reformed_g2.s</in>
-          <in>022_reformed.s</in>
-          <in>022_reformed_g2.s</in>
-          <in>023_reformed.s</in>
-          <in>023_reformed_g2.s</in>
-          <in>024_reformed.s</in>
-          <in>024_reformed_g2.s</in>
-          <in>025_reformed.s</in>
-          <in>025_reformed_g2.s</in>
-          <in>026_reformed.s</in>
-          <in>026_reformed_g2.s</in>
-          <in>027_reformed.s</in>
-          <in>027_reformed_g2.s</in>
-          <in>028_reformed.s</in>
-          <in>028_reformed_g2.s</in>
-          <in>029_reformed.s</in>
-          <in>029_reformed_g2.s</in>
-          <in>030_reformed.s</in>
-          <in>030_reformed_g2.s</in>
-          <in>031_reformed.s</in>
-          <in>031_reformed_g2.s</in>
-          <in>032_reformed.s</in>
-          <in>032_reformed_g2.s</in>
-          <in>033_reformed.s</in>
-          <in>033_reformed_g2.s</in>
-          <in>034_reformed.s</in>
-          <in>034_reformed_g2.s</in>
-          <in>035_reformed.s</in>
-          <in>035_reformed_g2.s</in>
-          <in>036_reformed.s</in>
-          <in>036_reformed_g2.s</in>
-          <in>037_reformed.s</in>
-          <in>037_reformed_g2.s</in>
-          <in>038_reformed.s</in>
-          <in>038_reformed_g2.s</in>
-          <in>039_reformed.s</in>
-          <in>039_reformed_g2.s</in>
-          <in>040_reformed.s</in>
-          <in>040_reformed_g2.s</in>
-          <in>041_reformed.s</in>
-          <in>041_reformed_g2.s</in>
-          <in>042_reformed.s</in>
-          <in>042_reformed_g2.s</in>
-          <in>043_reformed.s</in>
-          <in>043_reformed_g2.s</in>
-          <in>044_reformed.s</in>
-          <in>044_reformed_g2.s</in>
-          <in>045_reformed.s</in>
-          <in>045_reformed_g2.s</in>
-          <in>046_reformed.s</in>
-          <in>046_reformed_g2.s</in>
-          <in>047_reformed.s</in>
-          <in>047_reformed_g2.s</in>
-          <in>048_reformed.s</in>
-          <in>048_reformed_g2.s</in>
-          <in>049_reformed.s</in>
-          <in>049_reformed_g2.s</in>
-          <in>050_reformed.s</in>
-          <in>050_reformed_g2.s</in>
-          <in>051_reformed.s</in>
-          <in>051_reformed_g2.s</in>
-          <in>052_reformed.s</in>
-          <in>052_reformed_g2.s</in>
-          <in>053_reformed.s</in>
-          <in>053_reformed_g2.s</in>
-          <in>054_reformed.s</in>
-          <in>054_reformed_g2.s</in>
-          <in>055_reformed.s</in>
-          <in>055_reformed_g2.s</in>
-          <in>056_reformed.s</in>
-          <in>056_reformed_g2.s</in>
-          <in>057_reformed.s</in>
-          <in>057_reformed_g2.s</in>
-          <in>058_reformed.s</in>
-          <in>058_reformed_g2.s</in>
-          <in>059_reformed.s</in>
-          <in>059_reformed_g2.s</in>
-          <in>060_reformed.s</in>
-          <in>060_reformed_g2.s</in>
-          <in>061_reformed.s</in>
-          <in>061_reformed_g2.s</in>
-          <in>062_reformed.s</in>
-          <in>062_reformed_g2.s</in>
-          <in>063_reformed.s</in>
-          <in>063_reformed_g2.s</in>
-          <in>064_reformed.s</in>
-          <in>064_reformed_g2.s</in>
-          <in>065_reformed.s</in>
-          <in>065_reformed_g2.s</in>
-          <in>066_reformed.s</in>
-          <in>066_reformed_g2.s</in>
-          <in>067_reformed.s</in>
-          <in>067_reformed_g2.s</in>
-          <in>068_reformed.s</in>
-          <in>068_reformed_g2.s</in>
-          <in>069_reformed.s</in>
-          <in>069_reformed_g2.s</in>
-          <in>070_reformed.s</in>
-          <in>070_reformed_g2.s</in>
-          <in>071_reformed.s</in>
-          <in>071_reformed_g2.s</in>
-          <in>072_reformed.s</in>
-          <in>072_reformed_g2.s</in>
-          <in>073_reformed.s</in>
-          <in>073_reformed_g2.s</in>
-          <in>074_reformed.s</in>
-          <in>074_reformed_g2.s</in>
-          <in>075_reformed.s</in>
-          <in>075_reformed_g2.s</in>
-          <in>076_reformed.s</in>
-          <in>076_reformed_g2.s</in>
-          <in>077_reformed.s</in>
-          <in>077_reformed_g2.s</in>
-          <in>078_reformed.s</in>
-          <in>078_reformed_g2.s</in>
-          <in>079_reformed.s</in>
-          <in>079_reformed_g2.s</in>
-          <in>080_reformed.s</in>
-          <in>080_reformed_g2.s</in>
-          <in>081_reformed.s</in>
-          <in>081_reformed_g2.s</in>
-          <in>082_reformed.s</in>
-          <in>082_reformed_g2.s</in>
-          <in>083_reformed.s</in>
-          <in>083_reformed_g2.s</in>
-          <in>084_reformed.s</in>
-          <in>084_reformed_g2.s</in>
-          <in>085_reformed.s</in>
-          <in>085_reformed_g2.s</in>
-          <in>086_reformed.s</in>
-          <in>086_reformed_g2.s</in>
-          <in>087_reformed.s</in>
-          <in>087_reformed_g2.s</in>
-          <in>088_reformed.s</in>
-          <in>088_reformed_g2.s</in>
-          <in>089_reformed.s</in>
-          <in>089_reformed_g2.s</in>
-          <in>090_reformed.s</in>
-          <in>090_reformed_g2.s</in>
-          <in>091_reformed.s</in>
-          <in>091_reformed_g2.s</in>
-          <in>092_reformed.s</in>
-          <in>092_reformed_g2.s</in>
-          <in>093_reformed.s</in>
-          <in>093_reformed_g2.s</in>
-          <in>094_reformed.s</in>
-          <in>094_reformed_g2.s</in>
-          <in>095_reformed.s</in>
-          <in>095_reformed_g2.s</in>
-          <in>096_reformed.s</in>
-          <in>096_reformed_g2.s</in>
-          <in>097_reformed.s</in>
-          <in>097_reformed_g2.s</in>
-          <in>098_reformed_g2.s</in>
-          <in>099_reformed_g2.s</in>
-          <in>100_reformed.s</in>
-          <in>100_reformed_g2.s</in>
-          <in>101_reformed.s</in>
-          <in>101_reformed_g2.s</in>
-          <in>102_reformed.s</in>
-          <in>102_reformed_g2.s</in>
-          <in>103_reformed_g2.s</in>
-          <in>104_reformed_g2.s</in>
-          <in>105_reformed_g2.s</in>
-          <in>106_reformed_g2.s</in>
-          <in>107_reformed_g2.s</in>
-          <in>108_reformed_g2.s</in>
-          <in>109_reformed_g2.s</in>
-          <in>110_reformed_g2.s</in>
-          <in>111_reformed_g2.s</in>
-          <in>112_reformed_g2.s</in>
-          <in>113_reformed_g2.s</in>
-          <in>114_reformed_g2.s</in>
-          <in>115_reformed_g2.s</in>
-          <in>116_reformed_g2.s</in>
-          <in>117_reformed_g2.s</in>
-          <in>118_reformed_g2.s</in>
-          <in>119_reformed_g2.s</in>
-          <in>120_reformed_g2.s</in>
-          <in>121_reformed_g2.s</in>
-          <in>122_reformed_g2.s</in>
-          <in>123_reformed_g2.s</in>
-          <in>124_reformed_g2.s</in>
-          <in>125_reformed_g2.s</in>
-          <in>126_reformed_g2.s</in>
-          <in>127_reformed_g2.s</in>
-          <in>98_reformed.s</in>
-          <in>99_reformed.s</in>
+          <in>ow_0000.s</in>
+          <in>ow_00000.s</in>
+          <in>ow_0001.s</in>
+          <in>ow_0002.s</in>
+          <in>ow_0003.s</in>
+          <in>ow_0004.s</in>
+          <in>ow_0006.s</in>
+          <in>ow_0007.s</in>
+          <in>ow_0008.s</in>
+          <in>ow_0009.s</in>
+          <in>ow_0010.s</in>
+          <in>ow_0011.s</in>
+          <in>ow_0013.s</in>
+          <in>ow_0014.s</in>
+          <in>ow_0015.s</in>
+          <in>ow_0016.s</in>
+          <in>ow_0017.s</in>
+          <in>ow_0018.s</in>
+          <in>ow_0019.s</in>
+          <in>ow_0020.s</in>
+          <in>ow_0021.s</in>
+          <in>ow_0022.s</in>
+          <in>ow_0023.s</in>
+          <in>ow_0024.s</in>
+          <in>ow_0025.s</in>
+          <in>ow_0026.s</in>
+          <in>ow_0027.s</in>
+          <in>ow_0028.s</in>
+          <in>ow_0029.s</in>
+          <in>ow_0030.s</in>
+          <in>ow_0031.s</in>
+          <in>ow_0032.s</in>
+          <in>ow_0033.s</in>
+          <in>ow_0034.s</in>
+          <in>ow_0035.s</in>
+          <in>ow_0036.s</in>
+          <in>ow_0037.s</in>
+          <in>ow_0038.s</in>
+          <in>ow_0039.s</in>
+          <in>ow_0040.s</in>
+          <in>ow_0041.s</in>
+          <in>ow_0042.s</in>
+          <in>ow_0043.s</in>
+          <in>ow_0044.s</in>
+          <in>ow_0045.s</in>
+          <in>ow_0046.s</in>
+          <in>ow_0047.s</in>
+          <in>ow_0048.s</in>
+          <in>ow_0049.s</in>
+          <in>ow_0050.s</in>
+          <in>ow_0051.s</in>
+          <in>ow_0052.s</in>
+          <in>ow_0053.s</in>
+          <in>ow_0054.s</in>
+          <in>ow_0055.s</in>
+          <in>ow_0056.s</in>
+          <in>ow_0057.s</in>
+          <in>ow_0058.s</in>
+          <in>ow_0059.s</in>
+          <in>ow_0060.s</in>
+          <in>ow_0061.s</in>
+          <in>ow_0062.s</in>
+          <in>ow_0063.s</in>
+          <in>ow_0064.s</in>
+          <in>ow_0065.s</in>
+          <in>ow_0066.s</in>
+          <in>ow_0067.s</in>
+          <in>ow_0068.s</in>
+          <in>ow_0069.s</in>
+          <in>ow_0070.s</in>
+          <in>ow_0071.s</in>
+          <in>ow_0072.s</in>
+          <in>ow_0073.s</in>
+          <in>ow_0074.s</in>
+          <in>ow_0075.s</in>
+          <in>ow_0076.s</in>
+          <in>ow_0077.s</in>
+          <in>ow_0078.s</in>
+          <in>ow_0079.s</in>
+          <in>ow_0080.s</in>
+          <in>ow_0081.s</in>
+          <in>ow_0082.s</in>
+          <in>ow_0083.s</in>
+          <in>ow_0084.s</in>
+          <in>ow_0085.s</in>
+          <in>ow_0086.s</in>
+          <in>ow_0087.s</in>
+          <in>ow_0088.s</in>
+          <in>ow_0089.s</in>
+          <in>ow_0090.s</in>
+          <in>ow_0091.s</in>
+          <in>ow_0092.s</in>
+          <in>ow_0093.s</in>
+          <in>ow_0094.s</in>
+          <in>ow_0095.s</in>
+          <in>ow_0096.s</in>
+          <in>ow_0097.s</in>
+          <in>ow_0098.s</in>
+          <in>ow_0099.s</in>
+          <in>ow_0100.s</in>
+          <in>ow_0101.s</in>
+          <in>ow_0102.s</in>
+          <in>ow_0103.s</in>
+          <in>ow_0105.s</in>
+          <in>ow_0106.s</in>
+          <in>ow_0107.s</in>
+          <in>ow_0108.s</in>
+          <in>ow_0109.s</in>
+          <in>ow_0110.s</in>
+          <in>ow_0111.s</in>
+          <in>ow_0112.s</in>
+          <in>ow_0113.s</in>
+          <in>ow_0114.s</in>
+          <in>ow_0116.s</in>
+          <in>ow_0117.s</in>
+          <in>ow_0118.s</in>
+          <in>ow_0119.s</in>
+          <in>ow_0120.s</in>
+          <in>ow_0121.s</in>
+          <in>ow_0122.s</in>
+          <in>ow_0123.s</in>
+          <in>ow_0124.s</in>
+          <in>ow_0125.s</in>
+          <in>ow_0126.s</in>
+          <in>ow_0127.s</in>
+          <in>ow_0128.s</in>
+          <in>ow_0129.s</in>
+          <in>ow_0130.s</in>
+          <in>ow_0131.s</in>
+          <in>ow_0132.s</in>
+          <in>ow_0133.s</in>
+          <in>ow_0134.s</in>
+          <in>ow_0135.s</in>
+          <in>ow_0136.s</in>
+          <in>ow_0137.s</in>
+          <in>ow_0138.s</in>
+          <in>ow_0139.s</in>
+          <in>ow_0140.s</in>
+          <in>ow_0141.s</in>
+          <in>ow_0142.s</in>
+          <in>ow_0143.s</in>
+          <in>ow_0144.s</in>
+          <in>ow_0145.s</in>
+          <in>ow_0146.s</in>
+          <in>ow_0147.s</in>
+          <in>ow_0148.s</in>
+          <in>ow_0149.s</in>
+          <in>ow_0150.s</in>
+          <in>ow_0151.s</in>
+          <in>ow_0152.s</in>
+          <in>ow_0153.s</in>
+          <in>ow_0154.s</in>
+          <in>ow_0155.s</in>
+          <in>ow_0156.s</in>
+          <in>ow_0157.s</in>
+          <in>ow_0158.s</in>
+          <in>ow_0159.s</in>
+          <in>ow_0160.s</in>
+          <in>ow_0161.s</in>
+          <in>ow_0162.s</in>
+          <in>ow_0163.s</in>
+          <in>ow_0164.s</in>
+          <in>ow_0165.s</in>
+          <in>ow_0166.s</in>
+          <in>ow_0167.s</in>
+          <in>ow_0168.s</in>
+          <in>ow_0169.s</in>
+          <in>ow_0170.s</in>
+          <in>ow_0171.s</in>
+          <in>ow_0172.s</in>
+          <in>ow_0173.s</in>
+          <in>ow_0174.s</in>
+          <in>ow_0175.s</in>
+          <in>ow_0176.s</in>
+          <in>ow_0177.s</in>
+          <in>ow_0178.s</in>
+          <in>ow_0179.s</in>
+          <in>ow_0180.s</in>
+          <in>ow_0181.s</in>
+          <in>ow_0182.s</in>
+          <in>ow_0183.s</in>
+          <in>ow_0184.s</in>
+          <in>ow_0185.s</in>
+          <in>ow_0186.s</in>
+          <in>ow_0187.s</in>
+          <in>ow_0188.s</in>
+          <in>ow_0189.s</in>
+          <in>ow_0190.s</in>
+          <in>ow_0191.s</in>
+          <in>ow_0192.s</in>
+          <in>ow_0193.s</in>
+          <in>ow_0194.s</in>
+          <in>ow_0195.s</in>
+          <in>ow_0196.s</in>
+          <in>ow_0197.s</in>
+          <in>ow_0198.s</in>
+          <in>ow_0199.s</in>
+          <in>ow_0200.s</in>
+          <in>ow_0201.s</in>
+          <in>ow_0202.s</in>
+          <in>ow_0203.s</in>
+          <in>ow_0204.s</in>
+          <in>ow_0205.s</in>
+          <in>ow_0206.s</in>
+          <in>ow_0207.s</in>
+          <in>ow_0208.s</in>
+          <in>ow_0209.s</in>
+          <in>ow_0210.s</in>
+          <in>ow_0211.s</in>
+          <in>ow_0212.s</in>
+          <in>ow_0256.s</in>
+          <in>ow_0257.s</in>
+          <in>ow_0258.s</in>
+          <in>ow_0259.s</in>
+          <in>ow_0260.s</in>
+          <in>ow_0261.s</in>
+          <in>ow_0262.s</in>
+          <in>ow_0263.s</in>
+          <in>ow_0264.s</in>
+          <in>ow_0265.s</in>
+          <in>ow_0266.s</in>
+          <in>ow_0267.s</in>
+          <in>ow_0268.s</in>
+          <in>ow_0269.s</in>
+          <in>ow_0270.s</in>
+          <in>ow_0271.s</in>
+          <in>ow_0272.s</in>
+          <in>ow_0273.s</in>
+          <in>ow_0274.s</in>
+          <in>ow_0275.s</in>
+          <in>ow_0276.s</in>
+          <in>ow_0277.s</in>
+          <in>ow_0278.s</in>
+          <in>ow_0279.s</in>
+          <in>ow_0280.s</in>
+          <in>ow_0281.s</in>
+          <in>ow_0282.s</in>
+          <in>ow_0283.s</in>
+          <in>ow_0284.s</in>
+          <in>ow_0285.s</in>
+          <in>ow_0286.s</in>
+          <in>ow_0287.s</in>
+          <in>ow_0288.s</in>
+          <in>ow_0289.s</in>
+          <in>ow_0290.s</in>
+          <in>ow_0291.s</in>
+          <in>ow_0292.s</in>
+          <in>ow_0293.s</in>
+          <in>ow_0294.s</in>
+          <in>ow_0295.s</in>
+          <in>ow_0296.s</in>
+          <in>ow_0297.s</in>
+          <in>ow_0298.s</in>
+          <in>ow_0299.s</in>
+          <in>ow_0300.s</in>
+          <in>ow_0301.s</in>
+          <in>ow_0302.s</in>
+          <in>ow_0303.s</in>
+          <in>ow_0304.s</in>
+          <in>ow_0305.s</in>
+          <in>ow_0306.s</in>
+          <in>ow_0307.s</in>
+          <in>ow_0308.s</in>
+          <in>ow_0309.s</in>
+          <in>ow_0315.s</in>
+          <in>ow_0316.s</in>
+          <in>ow_0317.s</in>
+          <in>ow_0318.s</in>
+          <in>ow_0319.s</in>
+          <in>ow_0320.s</in>
+          <in>ow_0321.s</in>
+          <in>ow_0322.s</in>
+          <in>ow_0323.s</in>
+          <in>ow_0324.s</in>
+          <in>ow_0325.s</in>
+          <in>ow_0326.s</in>
+          <in>ow_0327.s</in>
+          <in>ow_0328.s</in>
+          <in>ow_0329.s</in>
+          <in>ow_0330.s</in>
+          <in>ow_0331.s</in>
+          <in>ow_0332.s</in>
+          <in>ow_0333.s</in>
+          <in>ow_0334.s</in>
+          <in>ow_0335.s</in>
+          <in>ow_0336.s</in>
+          <in>ow_0337.s</in>
+          <in>ow_0338.s</in>
+          <in>ow_0339.s</in>
+          <in>ow_0340.s</in>
+          <in>ow_0341.s</in>
+          <in>ow_0342.s</in>
+          <in>ow_0343.s</in>
+          <in>ow_0344.s</in>
+          <in>ow_0345.s</in>
+          <in>ow_0346.s</in>
+          <in>ow_0347.s</in>
+          <in>ow_0348.s</in>
+          <in>ow_0349.s</in>
+          <in>ow_0350.s</in>
+          <in>ow_0351.s</in>
+          <in>ow_0352.s</in>
+          <in>ow_0353.s</in>
+          <in>ow_0354.s</in>
+          <in>ow_0355.s</in>
+          <in>ow_0356.s</in>
+          <in>ow_0357.s</in>
+          <in>ow_0358.s</in>
+          <in>ow_0359.s</in>
+          <in>ow_0360.s</in>
+          <in>ow_0361.s</in>
+          <in>ow_0362.s</in>
+          <in>ow_0363.s</in>
+          <in>ow_0364.s</in>
+          <in>ow_0365.s</in>
+          <in>ow_0366.s</in>
+          <in>ow_0367.s</in>
+          <in>ow_0368.s</in>
+          <in>ow_0369.s</in>
+          <in>ow_0370.s</in>
+          <in>ow_0371.s</in>
+          <in>ow_0372.s</in>
+          <in>ow_0373.s</in>
+          <in>ow_0374.s</in>
+          <in>ow_0375.s</in>
+          <in>ow_0376.s</in>
+          <in>ow_0377.s</in>
+          <in>ow_0378.s</in>
+          <in>ow_0379.s</in>
+          <in>ow_0380.s</in>
+          <in>ow_0381.s</in>
+          <in>ow_0382.s</in>
+          <in>ow_0383.s</in>
+          <in>ow_0384.s</in>
+          <in>ow_0385.s</in>
+          <in>ow_0386.s</in>
+          <in>ow_0387.s</in>
+          <in>ow_0388.s</in>
+          <in>ow_0389.s</in>
+          <in>ow_0390.s</in>
+          <in>ow_0391.s</in>
+          <in>ow_0392.s</in>
+          <in>ow_0393.s</in>
+          <in>ow_0394.s</in>
+          <in>ow_0395.s</in>
+          <in>ow_0396.s</in>
+          <in>ow_0397.s</in>
+          <in>ow_0398.s</in>
+          <in>ow_0399.s</in>
+          <in>ow_0400.s</in>
+          <in>ow_0401.s</in>
+          <in>ow_0402.s</in>
+          <in>ow_0403.s</in>
+          <in>ow_0404.s</in>
+          <in>ow_0405.s</in>
+          <in>ow_0406.s</in>
+          <in>ow_0407.s</in>
+          <in>ow_0408.s</in>
+          <in>ow_0409.s</in>
+          <in>ow_0410.s</in>
+          <in>ow_0411.s</in>
+          <in>ow_0412.s</in>
+          <in>ow_0413.s</in>
+          <in>ow_0414.s</in>
+          <in>ow_0415.s</in>
+          <in>ow_0416.s</in>
+          <in>ow_0417.s</in>
+          <in>ow_0418.s</in>
+          <in>ow_0419.s</in>
+          <in>ow_0420.s</in>
+          <in>ow_0421.s</in>
+          <in>ow_0422.s</in>
+          <in>ow_0423.s</in>
+          <in>ow_0424.s</in>
+          <in>ow_0425.s</in>
+          <in>ow_0426.s</in>
+          <in>ow_0427.s</in>
+          <in>ow_0428.s</in>
+          <in>ow_0429.s</in>
+          <in>ow_0430.s</in>
+          <in>ow_0431.s</in>
+          <in>ow_0432.s</in>
+          <in>ow_0433.s</in>
+          <in>ow_0434.s</in>
+          <in>ow_0435.s</in>
+          <in>ow_0436.s</in>
+          <in>ow_0437.s</in>
+          <in>ow_0438.s</in>
+          <in>ow_0439.s</in>
+          <in>ow_0440.s</in>
+          <in>ow_0441.s</in>
+          <in>ow_0442.s</in>
+          <in>ow_0443.s</in>
+          <in>ow_0444.s</in>
+          <in>ow_0445.s</in>
+          <in>ow_0446.s</in>
+          <in>ow_0447.s</in>
+          <in>ow_0448.s</in>
+          <in>ow_0449.s</in>
+          <in>ow_0450.s</in>
+          <in>ow_0451.s</in>
+          <in>ow_0452.s</in>
+          <in>ow_0453.s</in>
+          <in>ow_0454.s</in>
+          <in>ow_0455.s</in>
+          <in>ow_0456.s</in>
+          <in>ow_0457.s</in>
+          <in>ow_0458.s</in>
+          <in>ow_0459.s</in>
+          <in>ow_0460.s</in>
+          <in>ow_0461.s</in>
+          <in>ow_0462.s</in>
+          <in>ow_0463.s</in>
+          <in>ow_0464.s</in>
+          <in>ow_0465.s</in>
+          <in>ow_0466.s</in>
+          <in>ow_0467.s</in>
+          <in>ow_0468.s</in>
+          <in>ow_0469.s</in>
+          <in>ow_0470.s</in>
+          <in>ow_0471.s</in>
+          <in>ow_0472.s</in>
+          <in>ow_0473.s</in>
+          <in>ow_0474.s</in>
+          <in>ow_0475.s</in>
+          <in>ow_0476.s</in>
+          <in>ow_0477.s</in>
+          <in>ow_0478.s</in>
+          <in>ow_0479.s</in>
+          <in>ow_0480.s</in>
+          <in>ow_0481.s</in>
+          <in>ow_0482.s</in>
+          <in>ow_0483.s</in>
+          <in>ow_0484.s</in>
+          <in>ow_0485.s</in>
+          <in>ow_0486.s</in>
+          <in>ow_0487.s</in>
+          <in>ow_0488.s</in>
+          <in>ow_0489.s</in>
+          <in>ow_0490.s</in>
+          <in>ow_0491.s</in>
+          <in>ow_0492.s</in>
+          <in>ow_0493.s</in>
+          <in>ow_0494.s</in>
+          <in>ow_0495.s</in>
+          <in>ow_0496.s</in>
+          <in>ow_0497.s</in>
+          <in>ow_0498.s</in>
+          <in>ow_0499.s</in>
+          <in>ow_0513.s</in>
+          <in>ow_0514.s</in>
+          <in>ow_0515.s</in>
+          <in>ow_0516.s</in>
+          <in>ow_0517.s</in>
+          <in>ow_0518.s</in>
+          <in>ow_0519.s</in>
+          <in>ow_0520.s</in>
+          <in>ow_0521.s</in>
+          <in>ow_0522.s</in>
+          <in>ow_0523.s</in>
+          <in>ow_0524.s</in>
+          <in>ow_0525.s</in>
+          <in>ow_0526.s</in>
+          <in>ow_0527.s</in>
+          <in>ow_0528.s</in>
+          <in>ow_0529.s</in>
+          <in>ow_0530.s</in>
+          <in>ow_0531.s</in>
         </df>
         <df name="sprites">
           <df name="back_sprites">
@@ -4018,6 +4261,8 @@
           </df>
           <df name="moves">
           </df>
+          <df name="overworld">
+          </df>
           <df name="pkmn_tables">
           </df>
         </df>

patches/overworlds/overworld.asm

@@ -58,4 +58,35 @@ strb r0, [r4, #0x1A]
 .org 0x08067F92
     ldr r5, =overworld_h_six+1
     bx r5
-    .pool
+    .pool
+
+.org 0x0805F4D8
+    .word ow_pal_table
+
+.org 0x0805F570
+    .word ow_pal_table
+
+.org 0x0805F2F4
+    .word ow_pal_table
+
+.org 0x0805F5C8
+    .word ow_pal_table
+
+.org 0x0805F4D4
+    .halfword 0x13FF
+
+.org 0x0805F5CC
+    .halfword 0x13FF
+
+.org 0x0805F5D2
+    lsl r0, r0, #0x10
+    lsr r2, r0, #0x10
+
+.org 0x0805F548
+    lsl r0, r0, #0x10
+.org 0x0805F54C
+    lsr r0, r0, #0xD
+
+.org 0x0805F4BA
+    lsl r0, #0x10
+    lsr r1, r0, #0x10

sots-private

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

sprites.makefile

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

src/overworld/overworld.c

@@ -24,10 +24,15 @@ struct npc_type {
     u32 rot_scale_anims;
 };
 
-struct npc_type** npc_tables[] = {(struct npc_type**)0x0839FDB0, (struct npc_type**)0x09E00000};
+extern struct npc_type* ow_main_table;
+extern struct npc_type* ow_second_table;
+extern struct npc_type* ow_third_table;
+
+
 
 struct npc_type* npc_get_type(u16 npc_id)
 {
+    struct npc_type** npc_tables[] = {ow_main_table, ow_second_table, ow_third_table};
     u16* replace_ow = var_access(OW_REPLACE_VAR);
     if(*replace_ow > 0 && *replace_ow - 1 == npc_id)
     {