diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-19 16:15:36 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-19 17:11:01 -0400 |
| commit | b0db4cab2ec010386a5619687944bdf7a5321ed4 (patch) | |
| tree | 66ae8f0ffeea9a8418d1a559df6ba278a437acb9 /narc/data | |
| parent | 97448e3eff5a63add4cc3a465b7ebcdba81d7112 (diff) | |
| parent | d470c7669e15e4edac1795b662e71dc2e8310e56 (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into finish_header
Diffstat (limited to 'narc/data')
117 files changed, 566 insertions, 449 deletions
diff --git a/narc/data/UTF16.dat.s b/narc/data/UTF16.dat.s index 2af70fdb..363c973d 100644 --- a/narc/data/UTF16.dat.s +++ b/narc/data/UTF16.dat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x339000, 0x1EA diff --git a/narc/data/battle_win.NSCR.s b/narc/data/battle_win.NSCR.s index 6b8f7f9a..efb3e042 100644 --- a/narc/data/battle_win.NSCR.s +++ b/narc/data/battle_win.NSCR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33AE00, 0x824 diff --git a/narc/data/btower_canm.resdat.s b/narc/data/btower_canm.resdat.s index d6e38a4a..09e427d3 100644 --- a/narc/data/btower_canm.resdat.s +++ b/narc/data/btower_canm.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33B800, 0x34 diff --git a/narc/data/btower_celact.cldat.s b/narc/data/btower_celact.cldat.s index 4800ccef..610b1c47 100644 --- a/narc/data/btower_celact.cldat.s +++ b/narc/data/btower_celact.cldat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33BA00, 0x40 diff --git a/narc/data/btower_cell.resdat.s b/narc/data/btower_cell.resdat.s index 8f374be9..8839d723 100644 --- a/narc/data/btower_cell.resdat.s +++ b/narc/data/btower_cell.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33BC00, 0x34 diff --git a/narc/data/btower_chr.resdat.s b/narc/data/btower_chr.resdat.s index 96cb9cb3..a990846e 100644 --- a/narc/data/btower_chr.resdat.s +++ b/narc/data/btower_chr.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33BE00, 0x34 diff --git a/narc/data/btower_pal.resdat.s b/narc/data/btower_pal.resdat.s index f43da4f5..7d5741c7 100644 --- a/narc/data/btower_pal.resdat.s +++ b/narc/data/btower_pal.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33C000, 0x34 diff --git a/narc/data/cell0.NCGR.s b/narc/data/cell0.NCGR.s index 7e0f860a..2b48b86e 100644 --- a/narc/data/cell0.NCGR.s +++ b/narc/data/cell0.NCGR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33C200, 0x2030 diff --git a/narc/data/cell0.NCLR.s b/narc/data/cell0.NCLR.s index 0181756d..27ef28a3 100644 --- a/narc/data/cell0.NCLR.s +++ b/narc/data/cell0.NCLR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33E400, 0x228 diff --git a/narc/data/clact_default.NANR.s b/narc/data/clact_default.NANR.s index b6734ff0..173cc622 100644 --- a/narc/data/clact_default.NANR.s +++ b/narc/data/clact_default.NANR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33E800, 0x6F diff --git a/narc/data/contest_data.narc.s b/narc/data/contest_data.narc.s index 188f6c3a..c70c3b7a 100644 --- a/narc/data/contest_data.narc.s +++ b/narc/data/contest_data.narc.s @@ -38,18 +38,19 @@ ; GMIF header .ascii "GMIF" .word 0x00003698 ; chunk size - .incbin "baserom.nds", 0x37A0CAC, 0x1200 - .incbin "baserom.nds", 0x37A1EAC, 0x60 - .incbin "baserom.nds", 0x37A1F0C, 0x1F80 - .incbin "baserom.nds", 0x37A3E8C, 0x64 - .incbin "baserom.nds", 0x37A3EF0, 0x64 - .incbin "baserom.nds", 0x37A3F54, 0x64 - .incbin "baserom.nds", 0x37A3FB8, 0x64 - .incbin "baserom.nds", 0x37A401C, 0x64 - .incbin "baserom.nds", 0x37A4080, 0x64 - .incbin "baserom.nds", 0x37A40E4, 0x64 - .incbin "baserom.nds", 0x37A4148, 0x64 - .incbin "baserom.nds", 0x37A41AC, 0x64 - .incbin "baserom.nds", 0x37A4210, 0x64 - .incbin "baserom.nds", 0x37A4274, 0x64 - .incbin "baserom.nds", 0x37A42D8, 0x64 + .incbin "baserom.nds", 0x0, 0x1200 + .incbin "baserom.nds", 0x1200, 0x60 + .incbin "baserom.nds", 0x1260, 0x1F80 + .incbin "baserom.nds", 0x31E0, 0x64 + .incbin "baserom.nds", 0x3244, 0x64 + .incbin "baserom.nds", 0x32A8, 0x64 + .incbin "baserom.nds", 0x330C, 0x64 + .incbin "baserom.nds", 0x3370, 0x64 + .incbin "baserom.nds", 0x33D4, 0x64 + .incbin "baserom.nds", 0x3438, 0x64 + .incbin "baserom.nds", 0x349C, 0x64 + .incbin "baserom.nds", 0x3500, 0x64 + .incbin "baserom.nds", 0x3564, 0x64 + .incbin "baserom.nds", 0x35C8, 0x64 + .incbin "baserom.nds", 0x362C, 0x64 + .balign 4, 255 diff --git a/narc/data/crystal.nsbmd.s b/narc/data/crystal.nsbmd.s index e18f8673..aae93f35 100644 --- a/narc/data/crystal.nsbmd.s +++ b/narc/data/crystal.nsbmd.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x33EA00, 0xD04 diff --git a/narc/data/demo_climax.narc.s b/narc/data/demo_climax.narc.s index 2ba50f02..2ac6c209 100644 --- a/narc/data/demo_climax.narc.s +++ b/narc/data/demo_climax.narc.s @@ -43,23 +43,24 @@ ; GMIF header .ascii "GMIF" .word 0x00073560 ; chunk size - .incbin "baserom.nds", 0x33F8D4, 0x118D8 - .incbin "baserom.nds", 0x3511AC, 0x91C - .incbin "baserom.nds", 0x351AC8, 0x2E60 - .incbin "baserom.nds", 0x354928, 0x628 - .incbin "baserom.nds", 0x354F50, 0x5A4 - .incbin "baserom.nds", 0x3554F4, 0x5A4 - .incbin "baserom.nds", 0x355A98, 0x5A4 - .incbin "baserom.nds", 0x35603C, 0x4878 - .incbin "baserom.nds", 0x35A8B4, 0x2B9F4 - .incbin "baserom.nds", 0x3862A8, 0x7E0 - .incbin "baserom.nds", 0x386A88, 0x2B7C - .incbin "baserom.nds", 0x389604, 0xCA4 - .incbin "baserom.nds", 0x38A2A8, 0x114E4 - .incbin "baserom.nds", 0x39B78C, 0x7BA0 - .incbin "baserom.nds", 0x3A332C, 0x23D4 - .incbin "baserom.nds", 0x3A5700, 0xBF44 - .incbin "baserom.nds", 0x3B1644, 0x84C - .incbin "baserom.nds", 0x3B1E90, 0x9B4 - .incbin "baserom.nds", 0x3B2844, 0x494 - .incbin "baserom.nds", 0x3B2CD8, 0x154 + .incbin "baserom.nds", 0x0, 0x118D8 + .incbin "baserom.nds", 0x118D8, 0x91C + .incbin "baserom.nds", 0x121F4, 0x2E60 + .incbin "baserom.nds", 0x15054, 0x628 + .incbin "baserom.nds", 0x1567C, 0x5A4 + .incbin "baserom.nds", 0x15C20, 0x5A4 + .incbin "baserom.nds", 0x161C4, 0x5A4 + .incbin "baserom.nds", 0x16768, 0x4878 + .incbin "baserom.nds", 0x1AFE0, 0x2B9F4 + .incbin "baserom.nds", 0x469D4, 0x7E0 + .incbin "baserom.nds", 0x471B4, 0x2B7C + .incbin "baserom.nds", 0x49D30, 0xCA4 + .incbin "baserom.nds", 0x4A9D4, 0x114E4 + .incbin "baserom.nds", 0x5BEB8, 0x7BA0 + .incbin "baserom.nds", 0x63A58, 0x23D4 + .incbin "baserom.nds", 0x65E2C, 0xBF44 + .incbin "baserom.nds", 0x71D70, 0x84C + .incbin "baserom.nds", 0x725BC, 0x9B4 + .incbin "baserom.nds", 0x72F70, 0x494 + .incbin "baserom.nds", 0x73404, 0x154 + .balign 4, 255 diff --git a/narc/data/dp_areawindow.NCGR.s b/narc/data/dp_areawindow.NCGR.s index 66490b23..d5f7c998 100644 --- a/narc/data/dp_areawindow.NCGR.s +++ b/narc/data/dp_areawindow.NCGR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x3B3000, 0x170 diff --git a/narc/data/dp_areawindow.NCLR.s b/narc/data/dp_areawindow.NCLR.s index 5ee0e30b..e45661c8 100644 --- a/narc/data/dp_areawindow.NCLR.s +++ b/narc/data/dp_areawindow.NCLR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x3B3200, 0x228 diff --git a/narc/data/dun_sea.nsbtx.s b/narc/data/dun_sea.nsbtx.s index 6f81e8cc..d08e4dd0 100644 --- a/narc/data/dun_sea.nsbtx.s +++ b/narc/data/dun_sea.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x3B4400, 0x578 diff --git a/narc/data/eoo.dat.s b/narc/data/eoo.dat.s index 7ac794ed..9d4ccf5a 100644 --- a/narc/data/eoo.dat.s +++ b/narc/data/eoo.dat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x3B4A00, 0x46000 diff --git a/narc/data/exdata.dat.s b/narc/data/exdata.dat.s index fec6ebb9..a0b85931 100644 --- a/narc/data/exdata.dat.s +++ b/narc/data/exdata.dat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x3FAA00, 0x124 diff --git a/narc/data/field_cutin.narc.s b/narc/data/field_cutin.narc.s index 3cb4c963..bfaf13ea 100644 --- a/narc/data/field_cutin.narc.s +++ b/narc/data/field_cutin.narc.s @@ -42,22 +42,23 @@ ; GMIF header .ascii "GMIF" .word 0x0000D15C ; chunk size - .incbin "baserom.nds", 0x3FACCC, 0x8040 - .incbin "baserom.nds", 0x402D0C, 0x824 - .incbin "baserom.nds", 0x403530, 0x228 - .incbin "baserom.nds", 0x403758, 0x228 - .incbin "baserom.nds", 0x403980, 0x228 - .incbin "baserom.nds", 0x403BA8, 0xCB0 - .incbin "baserom.nds", 0x404858, 0x7F - .incbin "baserom.nds", 0x4048D8, 0x430 - .incbin "baserom.nds", 0x404D08, 0x63 - .incbin "baserom.nds", 0x404D6C, 0x6F - .incbin "baserom.nds", 0x404DDC, 0x130 - .incbin "baserom.nds", 0x404F0C, 0x7E - .incbin "baserom.nds", 0x404F8C, 0x9A - .incbin "baserom.nds", 0x405028, 0x1430 - .incbin "baserom.nds", 0x406458, 0x139 - .incbin "baserom.nds", 0x406594, 0x18D - .incbin "baserom.nds", 0x406724, 0x1430 - .incbin "baserom.nds", 0x407B54, 0x139 - .incbin "baserom.nds", 0x407C90, 0x18D + .incbin "baserom.nds", 0x0, 0x8040 + .incbin "baserom.nds", 0x8040, 0x824 + .incbin "baserom.nds", 0x8864, 0x228 + .incbin "baserom.nds", 0x8A8C, 0x228 + .incbin "baserom.nds", 0x8CB4, 0x228 + .incbin "baserom.nds", 0x8EDC, 0xCB0 + .incbin "baserom.nds", 0x9B8C, 0x7F + .incbin "baserom.nds", 0x9C0C, 0x430 + .incbin "baserom.nds", 0xA03C, 0x63 + .incbin "baserom.nds", 0xA0A0, 0x6F + .incbin "baserom.nds", 0xA110, 0x130 + .incbin "baserom.nds", 0xA240, 0x7E + .incbin "baserom.nds", 0xA2C0, 0x9A + .incbin "baserom.nds", 0xA35C, 0x1430 + .incbin "baserom.nds", 0xB78C, 0x139 + .incbin "baserom.nds", 0xB8C8, 0x18D + .incbin "baserom.nds", 0xBA58, 0x1430 + .incbin "baserom.nds", 0xCE88, 0x139 + .incbin "baserom.nds", 0xCFC4, 0x18D + .balign 4, 255 diff --git a/narc/data/fld_anime0.bin.s b/narc/data/fld_anime0.bin.s index 2cbb6c30..11f7aa36 100644 --- a/narc/data/fld_anime0.bin.s +++ b/narc/data/fld_anime0.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x408000, 0x48 diff --git a/narc/data/fld_anime1.bin.s b/narc/data/fld_anime1.bin.s index ea6f7b1d..5837ee6e 100644 --- a/narc/data/fld_anime1.bin.s +++ b/narc/data/fld_anime1.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x408200, 0x48 diff --git a/narc/data/fld_anime10.bin.s b/narc/data/fld_anime10.bin.s index 325acdc5..7411d7e2 100644 --- a/narc/data/fld_anime10.bin.s +++ b/narc/data/fld_anime10.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x408400, 0x48 diff --git a/narc/data/fld_anime2.bin.s b/narc/data/fld_anime2.bin.s index e25e6af5..8c430540 100644 --- a/narc/data/fld_anime2.bin.s +++ b/narc/data/fld_anime2.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x408600, 0x48 diff --git a/narc/data/fld_anime3.bin.s b/narc/data/fld_anime3.bin.s index 211d126c..4d25c855 100644 --- a/narc/data/fld_anime3.bin.s +++ b/narc/data/fld_anime3.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x408800, 0x48 diff --git a/narc/data/fld_anime4.bin.s b/narc/data/fld_anime4.bin.s index 65b0b84c..18cd152d 100644 --- a/narc/data/fld_anime4.bin.s +++ b/narc/data/fld_anime4.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x408A00, 0x48 diff --git a/narc/data/fld_anime5.bin.s b/narc/data/fld_anime5.bin.s index ecc7da65..aead578d 100644 --- a/narc/data/fld_anime5.bin.s +++ b/narc/data/fld_anime5.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x408C00, 0x48 diff --git a/narc/data/fld_anime6.bin.s b/narc/data/fld_anime6.bin.s index 5ffa3265..878b0506 100644 --- a/narc/data/fld_anime6.bin.s +++ b/narc/data/fld_anime6.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x408E00, 0x48 diff --git a/narc/data/fld_anime7.bin.s b/narc/data/fld_anime7.bin.s index 6c858f68..aace6753 100644 --- a/narc/data/fld_anime7.bin.s +++ b/narc/data/fld_anime7.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x409000, 0x48 diff --git a/narc/data/fld_anime8.bin.s b/narc/data/fld_anime8.bin.s index faff1ef9..31328137 100644 --- a/narc/data/fld_anime8.bin.s +++ b/narc/data/fld_anime8.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x409200, 0x48 diff --git a/narc/data/fld_anime9.bin.s b/narc/data/fld_anime9.bin.s index 0f93bffe..e0f518dc 100644 --- a/narc/data/fld_anime9.bin.s +++ b/narc/data/fld_anime9.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x409400, 0x48 diff --git a/narc/data/fs_kanban.nsbca.s b/narc/data/fs_kanban.nsbca.s index eac9ba52..eaf4d772 100644 --- a/narc/data/fs_kanban.nsbca.s +++ b/narc/data/fs_kanban.nsbca.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x409600, 0x7F4 diff --git a/narc/data/ground0.NCGR.s b/narc/data/ground0.NCGR.s index 43733242..7eff2a8c 100644 --- a/narc/data/ground0.NCGR.s +++ b/narc/data/ground0.NCGR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x409E00, 0x8030 diff --git a/narc/data/ground0.NCLR.s b/narc/data/ground0.NCLR.s index cdfb6afa..43d59e8b 100644 --- a/narc/data/ground0.NCLR.s +++ b/narc/data/ground0.NCLR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x412000, 0x228 diff --git a/narc/data/ground0.NSCR.s b/narc/data/ground0.NSCR.s index b4bda5d5..e5ff1b1c 100644 --- a/narc/data/ground0.NSCR.s +++ b/narc/data/ground0.NSCR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x412400, 0x824 diff --git a/narc/data/kemu_itpconv.dat.s b/narc/data/kemu_itpconv.dat.s index f44cef82..954f4f93 100644 --- a/narc/data/kemu_itpconv.dat.s +++ b/narc/data/kemu_itpconv.dat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x412E00, 0x14 diff --git a/narc/data/lake_anim.nsbtx.s b/narc/data/lake_anim.nsbtx.s index 97bd4a61..49f80fa4 100644 --- a/narc/data/lake_anim.nsbtx.s +++ b/narc/data/lake_anim.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x413000, 0x1150 diff --git a/narc/data/miniasahamabe.nsbtx.s b/narc/data/miniasahamabe.nsbtx.s index d76a2c1a..972b2b81 100644 --- a/narc/data/miniasahamabe.nsbtx.s +++ b/narc/data/miniasahamabe.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x414200, 0x1188 diff --git a/narc/data/miniasasea.nsbtx.s b/narc/data/miniasasea.nsbtx.s index 48676429..c8bfa863 100644 --- a/narc/data/miniasasea.nsbtx.s +++ b/narc/data/miniasasea.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x415400, 0x578 diff --git a/narc/data/minihamabe.nsbtx.s b/narc/data/minihamabe.nsbtx.s index 01c5a053..e5a6f839 100644 --- a/narc/data/minihamabe.nsbtx.s +++ b/narc/data/minihamabe.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x415A00, 0x1188 diff --git a/narc/data/minimum.nsbtx.s b/narc/data/minimum.nsbtx.s index 04ea1730..f58778b5 100644 --- a/narc/data/minimum.nsbtx.s +++ b/narc/data/minimum.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x416C00, 0x578 diff --git a/narc/data/minirhana.nsbtx.s b/narc/data/minirhana.nsbtx.s index c24eb765..fe267cf2 100644 --- a/narc/data/minirhana.nsbtx.s +++ b/narc/data/minirhana.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x417200, 0x2C8 diff --git a/narc/data/namein.narc.s b/narc/data/namein.narc.s index 42a217cf..ddd708b9 100644 --- a/narc/data/namein.narc.s +++ b/narc/data/namein.narc.s @@ -42,22 +42,23 @@ ; GMIF header .ascii "GMIF" .word 0x00003E94 ; chunk size - .incbin "baserom.nds", 0x4176CC, 0x228 - .incbin "baserom.nds", 0x4178F4, 0x228 - .incbin "baserom.nds", 0x417B1C, 0x6D9 - .incbin "baserom.nds", 0x4181F8, 0x257 - .incbin "baserom.nds", 0x418450, 0x11E - .incbin "baserom.nds", 0x418570, 0x13D - .incbin "baserom.nds", 0x4186B0, 0xCF - .incbin "baserom.nds", 0x418780, 0xD0 - .incbin "baserom.nds", 0x418850, 0xD0 - .incbin "baserom.nds", 0x418920, 0xD0 - .incbin "baserom.nds", 0x4189F0, 0x19F1 - .incbin "baserom.nds", 0x41A3E4, 0x282 - .incbin "baserom.nds", 0x41A668, 0x465 - .incbin "baserom.nds", 0x41AAD0, 0x147 - .incbin "baserom.nds", 0x41AC18, 0x528 - .incbin "baserom.nds", 0x41B140, 0x9F - .incbin "baserom.nds", 0x41B1E0, 0x10B - .incbin "baserom.nds", 0x41B2EC, 0x12F - .incbin "baserom.nds", 0x41B41C, 0x13A + .incbin "baserom.nds", 0x0, 0x228 + .incbin "baserom.nds", 0x228, 0x228 + .incbin "baserom.nds", 0x450, 0x6D9 + .incbin "baserom.nds", 0xB2C, 0x257 + .incbin "baserom.nds", 0xD84, 0x11E + .incbin "baserom.nds", 0xEA4, 0x13D + .incbin "baserom.nds", 0xFE4, 0xCF + .incbin "baserom.nds", 0x10B4, 0xD0 + .incbin "baserom.nds", 0x1184, 0xD0 + .incbin "baserom.nds", 0x1254, 0xD0 + .incbin "baserom.nds", 0x1324, 0x19F1 + .incbin "baserom.nds", 0x2D18, 0x282 + .incbin "baserom.nds", 0x2F9C, 0x465 + .incbin "baserom.nds", 0x3404, 0x147 + .incbin "baserom.nds", 0x354C, 0x528 + .incbin "baserom.nds", 0x3A74, 0x9F + .incbin "baserom.nds", 0x3B14, 0x10B + .incbin "baserom.nds", 0x3C20, 0x12F + .incbin "baserom.nds", 0x3D50, 0x13A + .balign 4, 255 diff --git a/narc/data/nfont.NCGR.s b/narc/data/nfont.NCGR.s index 9127d747..312c3e8d 100644 --- a/narc/data/nfont.NCGR.s +++ b/narc/data/nfont.NCGR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x41B600, 0x8030 diff --git a/narc/data/nfont.NCLR.s b/narc/data/nfont.NCLR.s index e6886027..e99e22d8 100644 --- a/narc/data/nfont.NCLR.s +++ b/narc/data/nfont.NCLR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x423800, 0x228 diff --git a/narc/data/pc.nsbca.s b/narc/data/pc.nsbca.s index 68a0fa20..c771a861 100644 --- a/narc/data/pc.nsbca.s +++ b/narc/data/pc.nsbca.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x423C00, 0x18C diff --git a/narc/data/plist_canm.resdat.s b/narc/data/plist_canm.resdat.s index bf82ee8f..90b4a1db 100644 --- a/narc/data/plist_canm.resdat.s +++ b/narc/data/plist_canm.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x423E00, 0xC4 diff --git a/narc/data/plist_cell.resdat.s b/narc/data/plist_cell.resdat.s index 9b96bd4b..d39d160c 100644 --- a/narc/data/plist_cell.resdat.s +++ b/narc/data/plist_cell.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x424000, 0xC4 diff --git a/narc/data/plist_chr.resdat.s b/narc/data/plist_chr.resdat.s index 4c823e84..75400ca7 100644 --- a/narc/data/plist_chr.resdat.s +++ b/narc/data/plist_chr.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x424200, 0x13C diff --git a/narc/data/plist_h.cldat.s b/narc/data/plist_h.cldat.s index 91de75ed..b9650f44 100644 --- a/narc/data/plist_h.cldat.s +++ b/narc/data/plist_h.cldat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x424400, 0x1A0 diff --git a/narc/data/plist_pal.resdat.s b/narc/data/plist_pal.resdat.s index 7ab6a025..4b50a305 100644 --- a/narc/data/plist_pal.resdat.s +++ b/narc/data/plist_pal.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x424600, 0x94 diff --git a/narc/data/porucase_canm.resdat.s b/narc/data/porucase_canm.resdat.s index b9f2d06c..3dbbe6f6 100644 --- a/narc/data/porucase_canm.resdat.s +++ b/narc/data/porucase_canm.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x424800, 0x4C diff --git a/narc/data/porucase_celact.cldat.s b/narc/data/porucase_celact.cldat.s index e3f805e0..8857473b 100644 --- a/narc/data/porucase_celact.cldat.s +++ b/narc/data/porucase_celact.cldat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x424A00, 0x60 diff --git a/narc/data/porucase_cell.resdat.s b/narc/data/porucase_cell.resdat.s index a40025d2..44613536 100644 --- a/narc/data/porucase_cell.resdat.s +++ b/narc/data/porucase_cell.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x424C00, 0x4C diff --git a/narc/data/porucase_chr.resdat.s b/narc/data/porucase_chr.resdat.s index 58c01fdf..61183e1e 100644 --- a/narc/data/porucase_chr.resdat.s +++ b/narc/data/porucase_chr.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x424E00, 0x4C diff --git a/narc/data/porucase_pal.resdat.s b/narc/data/porucase_pal.resdat.s index 1f6c49fa..72b52414 100644 --- a/narc/data/porucase_pal.resdat.s +++ b/narc/data/porucase_pal.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x425000, 0x34 diff --git a/narc/data/pst_canm.resdat.s b/narc/data/pst_canm.resdat.s index bd8fa107..b4825398 100644 --- a/narc/data/pst_canm.resdat.s +++ b/narc/data/pst_canm.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x425200, 0x1B4 diff --git a/narc/data/pst_cell.resdat.s b/narc/data/pst_cell.resdat.s index 24c10254..1d307fdd 100644 --- a/narc/data/pst_cell.resdat.s +++ b/narc/data/pst_cell.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x425400, 0x1B4 diff --git a/narc/data/pst_chr.resdat.s b/narc/data/pst_chr.resdat.s index 24fd37ae..f2851160 100644 --- a/narc/data/pst_chr.resdat.s +++ b/narc/data/pst_chr.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x425600, 0x424 diff --git a/narc/data/pst_h.cldat.s b/narc/data/pst_h.cldat.s index ebb0fe05..e830e900 100644 --- a/narc/data/pst_h.cldat.s +++ b/narc/data/pst_h.cldat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x425C00, 0x580 diff --git a/narc/data/pst_pal.resdat.s b/narc/data/pst_pal.resdat.s index dc4401d2..1e790154 100644 --- a/narc/data/pst_pal.resdat.s +++ b/narc/data/pst_pal.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x426200, 0xAC diff --git a/narc/data/shop_canm.resdat.s b/narc/data/shop_canm.resdat.s index ef976d7b..91187065 100644 --- a/narc/data/shop_canm.resdat.s +++ b/narc/data/shop_canm.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x426400, 0x64 diff --git a/narc/data/shop_cell.resdat.s b/narc/data/shop_cell.resdat.s index 13c033ea..3f0dd2e5 100644 --- a/narc/data/shop_cell.resdat.s +++ b/narc/data/shop_cell.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x426600, 0x64 diff --git a/narc/data/shop_chr.resdat.s b/narc/data/shop_chr.resdat.s index d1cfaa56..f6a5a4fa 100644 --- a/narc/data/shop_chr.resdat.s +++ b/narc/data/shop_chr.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x426800, 0x64 diff --git a/narc/data/shop_h.cldat.s b/narc/data/shop_h.cldat.s index 307fe0b4..ce4fbb56 100644 --- a/narc/data/shop_h.cldat.s +++ b/narc/data/shop_h.cldat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x426A00, 0x80 diff --git a/narc/data/shop_pal.resdat.s b/narc/data/shop_pal.resdat.s index 2a6d1721..05b615b7 100644 --- a/narc/data/shop_pal.resdat.s +++ b/narc/data/shop_pal.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x426C00, 0x4C diff --git a/narc/data/slot.narc.s b/narc/data/slot.narc.s index 35913c92..b00ef8b3 100644 --- a/narc/data/slot.narc.s +++ b/narc/data/slot.narc.s @@ -100,80 +100,81 @@ ; GMIF header .ascii "GMIF" .word 0x000156B0 ; chunk size - .incbin "baserom.nds", 0x42709C, 0x1840 - .incbin "baserom.nds", 0x4288DC, 0x824 - .incbin "baserom.nds", 0x429100, 0x1580 - .incbin "baserom.nds", 0x42A680, 0x228 - .incbin "baserom.nds", 0x42A8A8, 0x824 - .incbin "baserom.nds", 0x42B0CC, 0x228 - .incbin "baserom.nds", 0x42B2F4, 0x228 - .incbin "baserom.nds", 0x42B51C, 0x228 - .incbin "baserom.nds", 0x42B744, 0x140 - .incbin "baserom.nds", 0x42B884, 0x824 - .incbin "baserom.nds", 0x42C0A8, 0x228 - .incbin "baserom.nds", 0x42C2D0, 0x1830 - .incbin "baserom.nds", 0x42DB00, 0xF2 - .incbin "baserom.nds", 0x42DBF4, 0x146 - .incbin "baserom.nds", 0x42DD3C, 0x430 - .incbin "baserom.nds", 0x42E16C, 0x63 - .incbin "baserom.nds", 0x42E1D0, 0x6F - .incbin "baserom.nds", 0x42E240, 0x430 - .incbin "baserom.nds", 0x42E670, 0x63 - .incbin "baserom.nds", 0x42E6D4, 0x6F - .incbin "baserom.nds", 0x42E744, 0x228 - .incbin "baserom.nds", 0x42E96C, 0x530 - .incbin "baserom.nds", 0x42EE9C, 0x166 - .incbin "baserom.nds", 0x42F004, 0x1F2 - .incbin "baserom.nds", 0x42F1F8, 0x5B0 - .incbin "baserom.nds", 0x42F7A8, 0x17B - .incbin "baserom.nds", 0x42F924, 0x1C7 - .incbin "baserom.nds", 0x42FAEC, 0x228 - .incbin "baserom.nds", 0x42FD14, 0x5B0 - .incbin "baserom.nds", 0x4302C4, 0x17B - .incbin "baserom.nds", 0x430440, 0x1C7 - .incbin "baserom.nds", 0x430608, 0x228 - .incbin "baserom.nds", 0x430830, 0x5B0 - .incbin "baserom.nds", 0x430DE0, 0x17B - .incbin "baserom.nds", 0x430F5C, 0x1C7 - .incbin "baserom.nds", 0x431124, 0x228 - .incbin "baserom.nds", 0x43134C, 0x5B0 - .incbin "baserom.nds", 0x4318FC, 0x17B - .incbin "baserom.nds", 0x431A78, 0x1C7 - .incbin "baserom.nds", 0x431C40, 0x228 - .incbin "baserom.nds", 0x431E68, 0x5B0 - .incbin "baserom.nds", 0x432418, 0x17B - .incbin "baserom.nds", 0x432594, 0x1C7 - .incbin "baserom.nds", 0x43275C, 0x228 - .incbin "baserom.nds", 0x432984, 0x1030 - .incbin "baserom.nds", 0x4339B4, 0x87 - .incbin "baserom.nds", 0x433A3C, 0x77 - .incbin "baserom.nds", 0x433AB4, 0x228 - .incbin "baserom.nds", 0x433CDC, 0x2830 - .incbin "baserom.nds", 0x43650C, 0x116 - .incbin "baserom.nds", 0x436624, 0x16E - .incbin "baserom.nds", 0x436794, 0x228 - .incbin "baserom.nds", 0x4369BC, 0x2830 - .incbin "baserom.nds", 0x4391EC, 0x116 - .incbin "baserom.nds", 0x439304, 0x16E - .incbin "baserom.nds", 0x439474, 0x228 - .incbin "baserom.nds", 0x43969C, 0x830 - .incbin "baserom.nds", 0x439ECC, 0x73 - .incbin "baserom.nds", 0x439F40, 0x6F - .incbin "baserom.nds", 0x439FB0, 0x228 - .incbin "baserom.nds", 0x43A1D8, 0xA30 - .incbin "baserom.nds", 0x43AC08, 0x166 - .incbin "baserom.nds", 0x43AD70, 0x1F2 - .incbin "baserom.nds", 0x43AF64, 0x228 - .incbin "baserom.nds", 0x43B18C, 0x530 - .incbin "baserom.nds", 0x43B6BC, 0x166 - .incbin "baserom.nds", 0x43B824, 0x1F2 - .incbin "baserom.nds", 0x43BA18, 0x228 - .incbin "baserom.nds", 0x43BC40, 0x1B0 - .incbin "baserom.nds", 0x43BDF0, 0x67 - .incbin "baserom.nds", 0x43BE58, 0x6F - .incbin "baserom.nds", 0x43BEC8, 0x130 - .incbin "baserom.nds", 0x43BFF8, 0x63 - .incbin "baserom.nds", 0x43C05C, 0x6F - .incbin "baserom.nds", 0x43C0CC, 0x228 - .incbin "baserom.nds", 0x43C2F4, 0x228 - .incbin "baserom.nds", 0x43C51C, 0x228 + .incbin "baserom.nds", 0x0, 0x1840 + .incbin "baserom.nds", 0x1840, 0x824 + .incbin "baserom.nds", 0x2064, 0x1580 + .incbin "baserom.nds", 0x35E4, 0x228 + .incbin "baserom.nds", 0x380C, 0x824 + .incbin "baserom.nds", 0x4030, 0x228 + .incbin "baserom.nds", 0x4258, 0x228 + .incbin "baserom.nds", 0x4480, 0x228 + .incbin "baserom.nds", 0x46A8, 0x140 + .incbin "baserom.nds", 0x47E8, 0x824 + .incbin "baserom.nds", 0x500C, 0x228 + .incbin "baserom.nds", 0x5234, 0x1830 + .incbin "baserom.nds", 0x6A64, 0xF2 + .incbin "baserom.nds", 0x6B58, 0x146 + .incbin "baserom.nds", 0x6CA0, 0x430 + .incbin "baserom.nds", 0x70D0, 0x63 + .incbin "baserom.nds", 0x7134, 0x6F + .incbin "baserom.nds", 0x71A4, 0x430 + .incbin "baserom.nds", 0x75D4, 0x63 + .incbin "baserom.nds", 0x7638, 0x6F + .incbin "baserom.nds", 0x76A8, 0x228 + .incbin "baserom.nds", 0x78D0, 0x530 + .incbin "baserom.nds", 0x7E00, 0x166 + .incbin "baserom.nds", 0x7F68, 0x1F2 + .incbin "baserom.nds", 0x815C, 0x5B0 + .incbin "baserom.nds", 0x870C, 0x17B + .incbin "baserom.nds", 0x8888, 0x1C7 + .incbin "baserom.nds", 0x8A50, 0x228 + .incbin "baserom.nds", 0x8C78, 0x5B0 + .incbin "baserom.nds", 0x9228, 0x17B + .incbin "baserom.nds", 0x93A4, 0x1C7 + .incbin "baserom.nds", 0x956C, 0x228 + .incbin "baserom.nds", 0x9794, 0x5B0 + .incbin "baserom.nds", 0x9D44, 0x17B + .incbin "baserom.nds", 0x9EC0, 0x1C7 + .incbin "baserom.nds", 0xA088, 0x228 + .incbin "baserom.nds", 0xA2B0, 0x5B0 + .incbin "baserom.nds", 0xA860, 0x17B + .incbin "baserom.nds", 0xA9DC, 0x1C7 + .incbin "baserom.nds", 0xABA4, 0x228 + .incbin "baserom.nds", 0xADCC, 0x5B0 + .incbin "baserom.nds", 0xB37C, 0x17B + .incbin "baserom.nds", 0xB4F8, 0x1C7 + .incbin "baserom.nds", 0xB6C0, 0x228 + .incbin "baserom.nds", 0xB8E8, 0x1030 + .incbin "baserom.nds", 0xC918, 0x87 + .incbin "baserom.nds", 0xC9A0, 0x77 + .incbin "baserom.nds", 0xCA18, 0x228 + .incbin "baserom.nds", 0xCC40, 0x2830 + .incbin "baserom.nds", 0xF470, 0x116 + .incbin "baserom.nds", 0xF588, 0x16E + .incbin "baserom.nds", 0xF6F8, 0x228 + .incbin "baserom.nds", 0xF920, 0x2830 + .incbin "baserom.nds", 0x12150, 0x116 + .incbin "baserom.nds", 0x12268, 0x16E + .incbin "baserom.nds", 0x123D8, 0x228 + .incbin "baserom.nds", 0x12600, 0x830 + .incbin "baserom.nds", 0x12E30, 0x73 + .incbin "baserom.nds", 0x12EA4, 0x6F + .incbin "baserom.nds", 0x12F14, 0x228 + .incbin "baserom.nds", 0x1313C, 0xA30 + .incbin "baserom.nds", 0x13B6C, 0x166 + .incbin "baserom.nds", 0x13CD4, 0x1F2 + .incbin "baserom.nds", 0x13EC8, 0x228 + .incbin "baserom.nds", 0x140F0, 0x530 + .incbin "baserom.nds", 0x14620, 0x166 + .incbin "baserom.nds", 0x14788, 0x1F2 + .incbin "baserom.nds", 0x1497C, 0x228 + .incbin "baserom.nds", 0x14BA4, 0x1B0 + .incbin "baserom.nds", 0x14D54, 0x67 + .incbin "baserom.nds", 0x14DBC, 0x6F + .incbin "baserom.nds", 0x14E2C, 0x130 + .incbin "baserom.nds", 0x14F5C, 0x63 + .incbin "baserom.nds", 0x14FC0, 0x6F + .incbin "baserom.nds", 0x15030, 0x228 + .incbin "baserom.nds", 0x15258, 0x228 + .incbin "baserom.nds", 0x15480, 0x228 + .balign 4, 255 diff --git a/narc/data/smptm_koori.NANR.s b/narc/data/smptm_koori.NANR.s index 5a218dc3..a601a699 100644 --- a/narc/data/smptm_koori.NANR.s +++ b/narc/data/smptm_koori.NANR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43C800, 0xA3 diff --git a/narc/data/smptm_koori.NCER.s b/narc/data/smptm_koori.NCER.s index 7f9d061d..17d17b50 100644 --- a/narc/data/smptm_koori.NCER.s +++ b/narc/data/smptm_koori.NCER.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43CA00, 0xD7 diff --git a/narc/data/smptm_koori.NCGR.s b/narc/data/smptm_koori.NCGR.s index 9178474e..51903804 100644 --- a/narc/data/smptm_koori.NCGR.s +++ b/narc/data/smptm_koori.NCGR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43CC00, 0xCB0 diff --git a/narc/data/smptm_koori.NCLR.s b/narc/data/smptm_koori.NCLR.s index 1c774222..a7580c27 100644 --- a/narc/data/smptm_koori.NCLR.s +++ b/narc/data/smptm_koori.NCLR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43DA00, 0x228 diff --git a/narc/data/smptm_nemuri.NANR.s b/narc/data/smptm_nemuri.NANR.s index 6acf6b04..bc75954c 100644 --- a/narc/data/smptm_nemuri.NANR.s +++ b/narc/data/smptm_nemuri.NANR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43DE00, 0x6F diff --git a/narc/data/smptm_nemuri.NCER.s b/narc/data/smptm_nemuri.NCER.s index 5c4da27e..4cee2f49 100644 --- a/narc/data/smptm_nemuri.NCER.s +++ b/narc/data/smptm_nemuri.NCER.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43E000, 0x63 diff --git a/narc/data/smptm_nemuri.NCGR.s b/narc/data/smptm_nemuri.NCGR.s index 61251bf2..e4e2dba3 100644 --- a/narc/data/smptm_nemuri.NCGR.s +++ b/narc/data/smptm_nemuri.NCGR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43E200, 0x230 diff --git a/narc/data/smptm_nemuri.NCLR.s b/narc/data/smptm_nemuri.NCLR.s index 1724f429..1e95c1d4 100644 --- a/narc/data/smptm_nemuri.NCLR.s +++ b/narc/data/smptm_nemuri.NCLR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43E600, 0x228 diff --git a/narc/data/t3_fl_b.nsbtx.s b/narc/data/t3_fl_b.nsbtx.s index 9be163d0..ce4b205e 100644 --- a/narc/data/t3_fl_b.nsbtx.s +++ b/narc/data/t3_fl_b.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43EA00, 0x250 diff --git a/narc/data/t3_fl_p.nsbtx.s b/narc/data/t3_fl_p.nsbtx.s index e2e79541..eb06b30c 100644 --- a/narc/data/t3_fl_p.nsbtx.s +++ b/narc/data/t3_fl_p.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43EE00, 0x250 diff --git a/narc/data/t3_fl_r.nsbtx.s b/narc/data/t3_fl_r.nsbtx.s index 0ce2c9f2..ef7878f9 100644 --- a/narc/data/t3_fl_r.nsbtx.s +++ b/narc/data/t3_fl_r.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43F200, 0x250 diff --git a/narc/data/t3_fl_y.nsbtx.s b/narc/data/t3_fl_y.nsbtx.s index 4e260c9c..9e5dee37 100644 --- a/narc/data/t3_fl_y.nsbtx.s +++ b/narc/data/t3_fl_y.nsbtx.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43F600, 0x250 diff --git a/narc/data/test.atr.s b/narc/data/test.atr.s index 739240a0..7d3c31bd 100644 --- a/narc/data/test.atr.s +++ b/narc/data/test.atr.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x43FA00, 0x800 diff --git a/narc/data/tmap_block.dat.s b/narc/data/tmap_block.dat.s index c90a9b08..8d49efb5 100644 --- a/narc/data/tmap_block.dat.s +++ b/narc/data/tmap_block.dat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x440200, 0x1114 diff --git a/narc/data/tmap_flags.dat.s b/narc/data/tmap_flags.dat.s index fe07fc21..54ec3f89 100644 --- a/narc/data/tmap_flags.dat.s +++ b/narc/data/tmap_flags.dat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x441400, 0x2DC diff --git a/narc/data/tmapn_canm.resdat.s b/narc/data/tmapn_canm.resdat.s index f610ee5f..9cd2571b 100644 --- a/narc/data/tmapn_canm.resdat.s +++ b/narc/data/tmapn_canm.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x441800, 0x94 diff --git a/narc/data/tmapn_celact.cldat.s b/narc/data/tmapn_celact.cldat.s index b66cafe7..285a43d6 100644 --- a/narc/data/tmapn_celact.cldat.s +++ b/narc/data/tmapn_celact.cldat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x441A00, 0xC0 diff --git a/narc/data/tmapn_cell.resdat.s b/narc/data/tmapn_cell.resdat.s index d3696873..4158c838 100644 --- a/narc/data/tmapn_cell.resdat.s +++ b/narc/data/tmapn_cell.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x441E00, 0x94 diff --git a/narc/data/tmapn_chr.resdat.s b/narc/data/tmapn_chr.resdat.s index 9d4092fa..33c6e2f1 100644 --- a/narc/data/tmapn_chr.resdat.s +++ b/narc/data/tmapn_chr.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x442000, 0x94 diff --git a/narc/data/tmapn_pal.resdat.s b/narc/data/tmapn_pal.resdat.s index 30b5fbab..5f2500d5 100644 --- a/narc/data/tmapn_pal.resdat.s +++ b/narc/data/tmapn_pal.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x442200, 0x4C diff --git a/narc/data/tradelist.narc.s b/narc/data/tradelist.narc.s index d9dad837..eabcdd85 100644 --- a/narc/data/tradelist.narc.s +++ b/narc/data/tradelist.narc.s @@ -36,16 +36,17 @@ ; GMIF header .ascii "GMIF" .word 0x000029E0 ; chunk size - .incbin "baserom.nds", 0x442C9C, 0x228 - .incbin "baserom.nds", 0x442EC4, 0x34D - .incbin "baserom.nds", 0x443214, 0x242 - .incbin "baserom.nds", 0x443458, 0x342 - .incbin "baserom.nds", 0x44379C, 0x121 - .incbin "baserom.nds", 0x4438C0, 0x1FE - .incbin "baserom.nds", 0x443AC0, 0x120 - .incbin "baserom.nds", 0x443BE0, 0x870 - .incbin "baserom.nds", 0x444450, 0x1CA - .incbin "baserom.nds", 0x44461C, 0x1C6 - .incbin "baserom.nds", 0x4447E4, 0x9A4 - .incbin "baserom.nds", 0x445188, 0x2CD - .incbin "baserom.nds", 0x445458, 0x21B + .incbin "baserom.nds", 0x0, 0x228 + .incbin "baserom.nds", 0x228, 0x34D + .incbin "baserom.nds", 0x578, 0x242 + .incbin "baserom.nds", 0x7BC, 0x342 + .incbin "baserom.nds", 0xB00, 0x121 + .incbin "baserom.nds", 0xC24, 0x1FE + .incbin "baserom.nds", 0xE24, 0x120 + .incbin "baserom.nds", 0xF44, 0x870 + .incbin "baserom.nds", 0x17B4, 0x1CA + .incbin "baserom.nds", 0x1980, 0x1C6 + .incbin "baserom.nds", 0x1B48, 0x9A4 + .incbin "baserom.nds", 0x24EC, 0x2CD + .incbin "baserom.nds", 0x27BC, 0x21B + .balign 4, 255 diff --git a/narc/data/trapmark.narc.s b/narc/data/trapmark.narc.s index 18c7ae78..518b29ca 100644 --- a/narc/data/trapmark.narc.s +++ b/narc/data/trapmark.narc.s @@ -24,4 +24,5 @@ ; GMIF header .ascii "GMIF" .word 0x00000230 ; chunk size - .incbin "baserom.nds", 0x44583C, 0x228 + .incbin "baserom.nds", 0x0, 0x228 + .balign 4, 255 diff --git a/narc/data/ug_anim.narc.s b/narc/data/ug_anim.narc.s index 24d52271..e83a3ba2 100644 --- a/narc/data/ug_anim.narc.s +++ b/narc/data/ug_anim.narc.s @@ -31,11 +31,12 @@ ; GMIF header .ascii "GMIF" .word 0x00005C14 ; chunk size - .incbin "baserom.nds", 0x445C74, 0x228 - .incbin "baserom.nds", 0x445E9C, 0x159 - .incbin "baserom.nds", 0x445FF8, 0xD1 - .incbin "baserom.nds", 0x4460CC, 0xC30 - .incbin "baserom.nds", 0x446CFC, 0x371 - .incbin "baserom.nds", 0x447070, 0x235 - .incbin "baserom.nds", 0x4472A8, 0x43B0 - .incbin "baserom.nds", 0x44B658, 0x228 + .incbin "baserom.nds", 0x0, 0x228 + .incbin "baserom.nds", 0x228, 0x159 + .incbin "baserom.nds", 0x384, 0xD1 + .incbin "baserom.nds", 0x458, 0xC30 + .incbin "baserom.nds", 0x1088, 0x371 + .incbin "baserom.nds", 0x13FC, 0x235 + .incbin "baserom.nds", 0x1634, 0x43B0 + .incbin "baserom.nds", 0x59E4, 0x228 + .balign 4, 255 diff --git a/narc/data/ug_base_cur.nsbmd.s b/narc/data/ug_base_cur.nsbmd.s index 0a4f969d..6f1646d6 100644 --- a/narc/data/ug_base_cur.nsbmd.s +++ b/narc/data/ug_base_cur.nsbmd.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x44BA00, 0x694 diff --git a/narc/data/ug_boygirl.NCGR.s b/narc/data/ug_boygirl.NCGR.s index 5756e304..557afdbf 100644 --- a/narc/data/ug_boygirl.NCGR.s +++ b/narc/data/ug_boygirl.NCGR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x44C200, 0x1230 diff --git a/narc/data/ug_boygirl.NCLR.s b/narc/data/ug_boygirl.NCLR.s index 7e5bee4c..6c2baf8a 100644 --- a/narc/data/ug_boygirl.NCLR.s +++ b/narc/data/ug_boygirl.NCLR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x44D600, 0x228 diff --git a/narc/data/ug_fossil.narc.s b/narc/data/ug_fossil.narc.s index 91585f6e..52a9b24f 100644 --- a/narc/data/ug_fossil.narc.s +++ b/narc/data/ug_fossil.narc.s @@ -26,6 +26,7 @@ ; GMIF header .ascii "GMIF" .word 0x00003E94 ; chunk size - .incbin "baserom.nds", 0x44DA4C, 0x3640 - .incbin "baserom.nds", 0x45108C, 0x228 - .incbin "baserom.nds", 0x4512B4, 0x624 + .incbin "baserom.nds", 0x0, 0x3640 + .incbin "baserom.nds", 0x3640, 0x228 + .incbin "baserom.nds", 0x3868, 0x624 + .balign 4, 255 diff --git a/narc/data/ug_hero.NANR.s b/narc/data/ug_hero.NANR.s index ac1bd5ce..a3b69846 100644 --- a/narc/data/ug_hero.NANR.s +++ b/narc/data/ug_hero.NANR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x451A00, 0xF9 diff --git a/narc/data/ug_hero.NCER.s b/narc/data/ug_hero.NCER.s index 34181b38..bc3ba606 100644 --- a/narc/data/ug_hero.NCER.s +++ b/narc/data/ug_hero.NCER.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x451C00, 0x109 diff --git a/narc/data/ug_hole.NANR.s b/narc/data/ug_hole.NANR.s index 1782dfa0..d305342b 100644 --- a/narc/data/ug_hole.NANR.s +++ b/narc/data/ug_hole.NANR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x451E00, 0xD6 diff --git a/narc/data/ug_hole.NCER.s b/narc/data/ug_hole.NCER.s index 7885a7ae..3aa982f2 100644 --- a/narc/data/ug_hole.NCER.s +++ b/narc/data/ug_hole.NCER.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x452000, 0xA2 diff --git a/narc/data/ug_hole.NCGR.s b/narc/data/ug_hole.NCGR.s index 15ee3036..602e0f0c 100644 --- a/narc/data/ug_hole.NCGR.s +++ b/narc/data/ug_hole.NCGR.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x452200, 0x530 diff --git a/narc/data/ug_parts.narc.s b/narc/data/ug_parts.narc.s index fd361502..771fb22b 100644 --- a/narc/data/ug_parts.narc.s +++ b/narc/data/ug_parts.narc.s @@ -139,119 +139,120 @@ ; GMIF header .ascii "GMIF" .word 0x000203D0 ; chunk size - .incbin "baserom.nds", 0x452BD4, 0x228 - .incbin "baserom.nds", 0x452DFC, 0x4C0 - .incbin "baserom.nds", 0x4532BC, 0x240 - .incbin "baserom.nds", 0x4534FC, 0x228 - .incbin "baserom.nds", 0x453724, 0x4C0 - .incbin "baserom.nds", 0x453BE4, 0x240 - .incbin "baserom.nds", 0x453E24, 0x4C0 - .incbin "baserom.nds", 0x4542E4, 0x228 - .incbin "baserom.nds", 0x45450C, 0x228 - .incbin "baserom.nds", 0x454734, 0x440 - .incbin "baserom.nds", 0x454B74, 0x940 - .incbin "baserom.nds", 0x4554B4, 0x228 - .incbin "baserom.nds", 0x4556DC, 0x940 - .incbin "baserom.nds", 0x45601C, 0x840 - .incbin "baserom.nds", 0x45685C, 0x228 - .incbin "baserom.nds", 0x456A84, 0x228 - .incbin "baserom.nds", 0x456CAC, 0x4C0 - .incbin "baserom.nds", 0x45716C, 0x4C0 - .incbin "baserom.nds", 0x45762C, 0x240 - .incbin "baserom.nds", 0x45786C, 0x228 - .incbin "baserom.nds", 0x457A94, 0x240 - .incbin "baserom.nds", 0x457CD4, 0x228 - .incbin "baserom.nds", 0x457EFC, 0x640 - .incbin "baserom.nds", 0x45853C, 0x228 - .incbin "baserom.nds", 0x458764, 0x4C0 - .incbin "baserom.nds", 0x458C24, 0x228 - .incbin "baserom.nds", 0x458E4C, 0x228 - .incbin "baserom.nds", 0x459074, 0x240 - .incbin "baserom.nds", 0x4592B4, 0x240 - .incbin "baserom.nds", 0x4594F4, 0x240 - .incbin "baserom.nds", 0x459734, 0x340 - .incbin "baserom.nds", 0x459A74, 0x340 - .incbin "baserom.nds", 0x459DB4, 0x340 - .incbin "baserom.nds", 0x45A0F4, 0x340 - .incbin "baserom.nds", 0x45A434, 0x340 - .incbin "baserom.nds", 0x45A774, 0x340 - .incbin "baserom.nds", 0x45AAB4, 0x340 - .incbin "baserom.nds", 0x45ADF4, 0x340 - .incbin "baserom.nds", 0x45B134, 0x4C0 - .incbin "baserom.nds", 0x45B5F4, 0x440 - .incbin "baserom.nds", 0x45BA34, 0x440 - .incbin "baserom.nds", 0x45BE74, 0x840 - .incbin "baserom.nds", 0x45C6B4, 0x840 - .incbin "baserom.nds", 0x45CEF4, 0x840 - .incbin "baserom.nds", 0x45D734, 0x840 - .incbin "baserom.nds", 0x45DF74, 0x4C0 - .incbin "baserom.nds", 0x45E434, 0x228 - .incbin "baserom.nds", 0x45E65C, 0x840 - .incbin "baserom.nds", 0x45EE9C, 0x228 - .incbin "baserom.nds", 0x45F0C4, 0x228 - .incbin "baserom.nds", 0x45F2EC, 0x440 - .incbin "baserom.nds", 0x45F72C, 0x228 - .incbin "baserom.nds", 0x45F954, 0x840 - .incbin "baserom.nds", 0x460194, 0x228 - .incbin "baserom.nds", 0x4603BC, 0x840 - .incbin "baserom.nds", 0x460BFC, 0x228 - .incbin "baserom.nds", 0x460E24, 0x4C0 - .incbin "baserom.nds", 0x4612E4, 0x240 - .incbin "baserom.nds", 0x461524, 0xA40 - .incbin "baserom.nds", 0x461F64, 0x4C0 - .incbin "baserom.nds", 0x462424, 0x228 - .incbin "baserom.nds", 0x46264C, 0x228 - .incbin "baserom.nds", 0x462874, 0x4C0 - .incbin "baserom.nds", 0x462D34, 0x240 - .incbin "baserom.nds", 0x462F74, 0x4C0 - .incbin "baserom.nds", 0x463434, 0x228 - .incbin "baserom.nds", 0x46365C, 0x440 - .incbin "baserom.nds", 0x463A9C, 0x228 - .incbin "baserom.nds", 0x463CC4, 0x440 - .incbin "baserom.nds", 0x464104, 0xCC0 - .incbin "baserom.nds", 0x464DC4, 0xCC0 - .incbin "baserom.nds", 0x465A84, 0xCC0 - .incbin "baserom.nds", 0x466744, 0xCC0 - .incbin "baserom.nds", 0x467404, 0x840 - .incbin "baserom.nds", 0x467C44, 0x228 - .incbin "baserom.nds", 0x467E6C, 0x4C0 - .incbin "baserom.nds", 0x46832C, 0x228 - .incbin "baserom.nds", 0x468554, 0x228 - .incbin "baserom.nds", 0x46877C, 0x228 - .incbin "baserom.nds", 0x4689A4, 0x228 - .incbin "baserom.nds", 0x468BCC, 0x228 - .incbin "baserom.nds", 0x468DF4, 0x640 - .incbin "baserom.nds", 0x469434, 0x228 - .incbin "baserom.nds", 0x46965C, 0x228 - .incbin "baserom.nds", 0x469884, 0x228 - .incbin "baserom.nds", 0x469AAC, 0x228 - .incbin "baserom.nds", 0x469CD4, 0x640 - .incbin "baserom.nds", 0x46A314, 0x228 - .incbin "baserom.nds", 0x46A53C, 0x4C0 - .incbin "baserom.nds", 0x46A9FC, 0x228 - .incbin "baserom.nds", 0x46AC24, 0x228 - .incbin "baserom.nds", 0x46AE4C, 0x228 - .incbin "baserom.nds", 0x46B074, 0x228 - .incbin "baserom.nds", 0x46B29C, 0x228 - .incbin "baserom.nds", 0x46B4C4, 0x228 - .incbin "baserom.nds", 0x46B6EC, 0x640 - .incbin "baserom.nds", 0x46BD2C, 0x640 - .incbin "baserom.nds", 0x46C36C, 0x228 - .incbin "baserom.nds", 0x46C594, 0x640 - .incbin "baserom.nds", 0x46CBD4, 0x840 - .incbin "baserom.nds", 0x46D414, 0x228 - .incbin "baserom.nds", 0x46D63C, 0x228 - .incbin "baserom.nds", 0x46D864, 0x4C0 - .incbin "baserom.nds", 0x46DD24, 0x240 - .incbin "baserom.nds", 0x46DF64, 0x4C0 - .incbin "baserom.nds", 0x46E424, 0x228 - .incbin "baserom.nds", 0x46E64C, 0x4C0 - .incbin "baserom.nds", 0x46EB0C, 0x228 - .incbin "baserom.nds", 0x46ED34, 0xA40 - .incbin "baserom.nds", 0x46F774, 0xA40 - .incbin "baserom.nds", 0x4701B4, 0xA40 - .incbin "baserom.nds", 0x470BF4, 0xA40 - .incbin "baserom.nds", 0x471634, 0xA40 - .incbin "baserom.nds", 0x472074, 0x4C0 - .incbin "baserom.nds", 0x472534, 0x228 - .incbin "baserom.nds", 0x47275C, 0x840 + .incbin "baserom.nds", 0x0, 0x228 + .incbin "baserom.nds", 0x228, 0x4C0 + .incbin "baserom.nds", 0x6E8, 0x240 + .incbin "baserom.nds", 0x928, 0x228 + .incbin "baserom.nds", 0xB50, 0x4C0 + .incbin "baserom.nds", 0x1010, 0x240 + .incbin "baserom.nds", 0x1250, 0x4C0 + .incbin "baserom.nds", 0x1710, 0x228 + .incbin "baserom.nds", 0x1938, 0x228 + .incbin "baserom.nds", 0x1B60, 0x440 + .incbin "baserom.nds", 0x1FA0, 0x940 + .incbin "baserom.nds", 0x28E0, 0x228 + .incbin "baserom.nds", 0x2B08, 0x940 + .incbin "baserom.nds", 0x3448, 0x840 + .incbin "baserom.nds", 0x3C88, 0x228 + .incbin "baserom.nds", 0x3EB0, 0x228 + .incbin "baserom.nds", 0x40D8, 0x4C0 + .incbin "baserom.nds", 0x4598, 0x4C0 + .incbin "baserom.nds", 0x4A58, 0x240 + .incbin "baserom.nds", 0x4C98, 0x228 + .incbin "baserom.nds", 0x4EC0, 0x240 + .incbin "baserom.nds", 0x5100, 0x228 + .incbin "baserom.nds", 0x5328, 0x640 + .incbin "baserom.nds", 0x5968, 0x228 + .incbin "baserom.nds", 0x5B90, 0x4C0 + .incbin "baserom.nds", 0x6050, 0x228 + .incbin "baserom.nds", 0x6278, 0x228 + .incbin "baserom.nds", 0x64A0, 0x240 + .incbin "baserom.nds", 0x66E0, 0x240 + .incbin "baserom.nds", 0x6920, 0x240 + .incbin "baserom.nds", 0x6B60, 0x340 + .incbin "baserom.nds", 0x6EA0, 0x340 + .incbin "baserom.nds", 0x71E0, 0x340 + .incbin "baserom.nds", 0x7520, 0x340 + .incbin "baserom.nds", 0x7860, 0x340 + .incbin "baserom.nds", 0x7BA0, 0x340 + .incbin "baserom.nds", 0x7EE0, 0x340 + .incbin "baserom.nds", 0x8220, 0x340 + .incbin "baserom.nds", 0x8560, 0x4C0 + .incbin "baserom.nds", 0x8A20, 0x440 + .incbin "baserom.nds", 0x8E60, 0x440 + .incbin "baserom.nds", 0x92A0, 0x840 + .incbin "baserom.nds", 0x9AE0, 0x840 + .incbin "baserom.nds", 0xA320, 0x840 + .incbin "baserom.nds", 0xAB60, 0x840 + .incbin "baserom.nds", 0xB3A0, 0x4C0 + .incbin "baserom.nds", 0xB860, 0x228 + .incbin "baserom.nds", 0xBA88, 0x840 + .incbin "baserom.nds", 0xC2C8, 0x228 + .incbin "baserom.nds", 0xC4F0, 0x228 + .incbin "baserom.nds", 0xC718, 0x440 + .incbin "baserom.nds", 0xCB58, 0x228 + .incbin "baserom.nds", 0xCD80, 0x840 + .incbin "baserom.nds", 0xD5C0, 0x228 + .incbin "baserom.nds", 0xD7E8, 0x840 + .incbin "baserom.nds", 0xE028, 0x228 + .incbin "baserom.nds", 0xE250, 0x4C0 + .incbin "baserom.nds", 0xE710, 0x240 + .incbin "baserom.nds", 0xE950, 0xA40 + .incbin "baserom.nds", 0xF390, 0x4C0 + .incbin "baserom.nds", 0xF850, 0x228 + .incbin "baserom.nds", 0xFA78, 0x228 + .incbin "baserom.nds", 0xFCA0, 0x4C0 + .incbin "baserom.nds", 0x10160, 0x240 + .incbin "baserom.nds", 0x103A0, 0x4C0 + .incbin "baserom.nds", 0x10860, 0x228 + .incbin "baserom.nds", 0x10A88, 0x440 + .incbin "baserom.nds", 0x10EC8, 0x228 + .incbin "baserom.nds", 0x110F0, 0x440 + .incbin "baserom.nds", 0x11530, 0xCC0 + .incbin "baserom.nds", 0x121F0, 0xCC0 + .incbin "baserom.nds", 0x12EB0, 0xCC0 + .incbin "baserom.nds", 0x13B70, 0xCC0 + .incbin "baserom.nds", 0x14830, 0x840 + .incbin "baserom.nds", 0x15070, 0x228 + .incbin "baserom.nds", 0x15298, 0x4C0 + .incbin "baserom.nds", 0x15758, 0x228 + .incbin "baserom.nds", 0x15980, 0x228 + .incbin "baserom.nds", 0x15BA8, 0x228 + .incbin "baserom.nds", 0x15DD0, 0x228 + .incbin "baserom.nds", 0x15FF8, 0x228 + .incbin "baserom.nds", 0x16220, 0x640 + .incbin "baserom.nds", 0x16860, 0x228 + .incbin "baserom.nds", 0x16A88, 0x228 + .incbin "baserom.nds", 0x16CB0, 0x228 + .incbin "baserom.nds", 0x16ED8, 0x228 + .incbin "baserom.nds", 0x17100, 0x640 + .incbin "baserom.nds", 0x17740, 0x228 + .incbin "baserom.nds", 0x17968, 0x4C0 + .incbin "baserom.nds", 0x17E28, 0x228 + .incbin "baserom.nds", 0x18050, 0x228 + .incbin "baserom.nds", 0x18278, 0x228 + .incbin "baserom.nds", 0x184A0, 0x228 + .incbin "baserom.nds", 0x186C8, 0x228 + .incbin "baserom.nds", 0x188F0, 0x228 + .incbin "baserom.nds", 0x18B18, 0x640 + .incbin "baserom.nds", 0x19158, 0x640 + .incbin "baserom.nds", 0x19798, 0x228 + .incbin "baserom.nds", 0x199C0, 0x640 + .incbin "baserom.nds", 0x1A000, 0x840 + .incbin "baserom.nds", 0x1A840, 0x228 + .incbin "baserom.nds", 0x1AA68, 0x228 + .incbin "baserom.nds", 0x1AC90, 0x4C0 + .incbin "baserom.nds", 0x1B150, 0x240 + .incbin "baserom.nds", 0x1B390, 0x4C0 + .incbin "baserom.nds", 0x1B850, 0x228 + .incbin "baserom.nds", 0x1BA78, 0x4C0 + .incbin "baserom.nds", 0x1BF38, 0x228 + .incbin "baserom.nds", 0x1C160, 0xA40 + .incbin "baserom.nds", 0x1CBA0, 0xA40 + .incbin "baserom.nds", 0x1D5E0, 0xA40 + .incbin "baserom.nds", 0x1E020, 0xA40 + .incbin "baserom.nds", 0x1EA60, 0xA40 + .incbin "baserom.nds", 0x1F4A0, 0x4C0 + .incbin "baserom.nds", 0x1F960, 0x228 + .incbin "baserom.nds", 0x1FB88, 0x840 + .balign 4, 255 diff --git a/narc/data/ug_radar.narc.s b/narc/data/ug_radar.narc.s index 325802cf..b9890fea 100644 --- a/narc/data/ug_radar.narc.s +++ b/narc/data/ug_radar.narc.s @@ -30,10 +30,11 @@ ; GMIF header .ascii "GMIF" .word 0x00003804 ; chunk size - .incbin "baserom.nds", 0x47306C, 0x228 - .incbin "baserom.nds", 0x473294, 0x228 - .incbin "baserom.nds", 0x4734BC, 0x2440 - .incbin "baserom.nds", 0x4758FC, 0x530 - .incbin "baserom.nds", 0x475E2C, 0x824 - .incbin "baserom.nds", 0x476650, 0x12A - .incbin "baserom.nds", 0x47677C, 0xEA + .incbin "baserom.nds", 0x0, 0x228 + .incbin "baserom.nds", 0x228, 0x228 + .incbin "baserom.nds", 0x450, 0x2440 + .incbin "baserom.nds", 0x2890, 0x530 + .incbin "baserom.nds", 0x2DC0, 0x824 + .incbin "baserom.nds", 0x35E4, 0x12A + .incbin "baserom.nds", 0x3710, 0xEA + .balign 4, 255 diff --git a/narc/data/ug_trap.narc.s b/narc/data/ug_trap.narc.s index 04a3a676..52dea012 100644 --- a/narc/data/ug_trap.narc.s +++ b/narc/data/ug_trap.narc.s @@ -76,56 +76,57 @@ ; GMIF header .ascii "GMIF" .word 0x0001D9D8 ; chunk size - .incbin "baserom.nds", 0x476BDC, 0x6F - .incbin "baserom.nds", 0x476C4C, 0x7F - .incbin "baserom.nds", 0x476CCC, 0x1B0 - .incbin "baserom.nds", 0x476E7C, 0x228 - .incbin "baserom.nds", 0x4770A4, 0x15E - .incbin "baserom.nds", 0x477204, 0x12E - .incbin "baserom.nds", 0x477334, 0x21B0 - .incbin "baserom.nds", 0x4794E4, 0x228 - .incbin "baserom.nds", 0x47970C, 0x624 - .incbin "baserom.nds", 0x479D30, 0x8040 - .incbin "baserom.nds", 0x481D70, 0x228 - .incbin "baserom.nds", 0x481F98, 0x824 - .incbin "baserom.nds", 0x4827BC, 0x624 - .incbin "baserom.nds", 0x482DE0, 0x624 - .incbin "baserom.nds", 0x483404, 0x624 - .incbin "baserom.nds", 0x483A28, 0xED - .incbin "baserom.nds", 0x483B18, 0xD5 - .incbin "baserom.nds", 0x483BF0, 0x8F0 - .incbin "baserom.nds", 0x4844E0, 0x228 - .incbin "baserom.nds", 0x484708, 0x228 - .incbin "baserom.nds", 0x484930, 0xC2 - .incbin "baserom.nds", 0x4849F4, 0xB6 - .incbin "baserom.nds", 0x484AAC, 0x3030 - .incbin "baserom.nds", 0x487ADC, 0xC2 - .incbin "baserom.nds", 0x487BA0, 0xB6 - .incbin "baserom.nds", 0x487C58, 0xC30 - .incbin "baserom.nds", 0x488888, 0x6F - .incbin "baserom.nds", 0x4888F8, 0x63 - .incbin "baserom.nds", 0x48895C, 0xB0 - .incbin "baserom.nds", 0x488A0C, 0x228 - .incbin "baserom.nds", 0x488C34, 0x27F - .incbin "baserom.nds", 0x488EB4, 0x65F - .incbin "baserom.nds", 0x489514, 0x12D0 - .incbin "baserom.nds", 0x48A7E4, 0xF0 - .incbin "baserom.nds", 0x48A8D4, 0x5D4 - .incbin "baserom.nds", 0x48AEA8, 0x12D0 - .incbin "baserom.nds", 0x48C178, 0xF0 - .incbin "baserom.nds", 0x48C268, 0x5D4 - .incbin "baserom.nds", 0x48C83C, 0x12D0 - .incbin "baserom.nds", 0x48DB0C, 0xF0 - .incbin "baserom.nds", 0x48DBFC, 0x5D4 - .incbin "baserom.nds", 0x48E1D0, 0x12D0 - .incbin "baserom.nds", 0x48F4A0, 0xF0 - .incbin "baserom.nds", 0x48F590, 0x5D4 - .incbin "baserom.nds", 0x48FB64, 0x12D0 - .incbin "baserom.nds", 0x490E34, 0xF0 - .incbin "baserom.nds", 0x490F24, 0x5D4 - .incbin "baserom.nds", 0x4914F8, 0x12D0 - .incbin "baserom.nds", 0x4927C8, 0xF0 - .incbin "baserom.nds", 0x4928B8, 0x5D4 - .incbin "baserom.nds", 0x492E8C, 0x12D0 - .incbin "baserom.nds", 0x49415C, 0x228 - .incbin "baserom.nds", 0x494384, 0x228 + .incbin "baserom.nds", 0x0, 0x6F + .incbin "baserom.nds", 0x70, 0x7F + .incbin "baserom.nds", 0xF0, 0x1B0 + .incbin "baserom.nds", 0x2A0, 0x228 + .incbin "baserom.nds", 0x4C8, 0x15E + .incbin "baserom.nds", 0x628, 0x12E + .incbin "baserom.nds", 0x758, 0x21B0 + .incbin "baserom.nds", 0x2908, 0x228 + .incbin "baserom.nds", 0x2B30, 0x624 + .incbin "baserom.nds", 0x3154, 0x8040 + .incbin "baserom.nds", 0xB194, 0x228 + .incbin "baserom.nds", 0xB3BC, 0x824 + .incbin "baserom.nds", 0xBBE0, 0x624 + .incbin "baserom.nds", 0xC204, 0x624 + .incbin "baserom.nds", 0xC828, 0x624 + .incbin "baserom.nds", 0xCE4C, 0xED + .incbin "baserom.nds", 0xCF3C, 0xD5 + .incbin "baserom.nds", 0xD014, 0x8F0 + .incbin "baserom.nds", 0xD904, 0x228 + .incbin "baserom.nds", 0xDB2C, 0x228 + .incbin "baserom.nds", 0xDD54, 0xC2 + .incbin "baserom.nds", 0xDE18, 0xB6 + .incbin "baserom.nds", 0xDED0, 0x3030 + .incbin "baserom.nds", 0x10F00, 0xC2 + .incbin "baserom.nds", 0x10FC4, 0xB6 + .incbin "baserom.nds", 0x1107C, 0xC30 + .incbin "baserom.nds", 0x11CAC, 0x6F + .incbin "baserom.nds", 0x11D1C, 0x63 + .incbin "baserom.nds", 0x11D80, 0xB0 + .incbin "baserom.nds", 0x11E30, 0x228 + .incbin "baserom.nds", 0x12058, 0x27F + .incbin "baserom.nds", 0x122D8, 0x65F + .incbin "baserom.nds", 0x12938, 0x12D0 + .incbin "baserom.nds", 0x13C08, 0xF0 + .incbin "baserom.nds", 0x13CF8, 0x5D4 + .incbin "baserom.nds", 0x142CC, 0x12D0 + .incbin "baserom.nds", 0x1559C, 0xF0 + .incbin "baserom.nds", 0x1568C, 0x5D4 + .incbin "baserom.nds", 0x15C60, 0x12D0 + .incbin "baserom.nds", 0x16F30, 0xF0 + .incbin "baserom.nds", 0x17020, 0x5D4 + .incbin "baserom.nds", 0x175F4, 0x12D0 + .incbin "baserom.nds", 0x188C4, 0xF0 + .incbin "baserom.nds", 0x189B4, 0x5D4 + .incbin "baserom.nds", 0x18F88, 0x12D0 + .incbin "baserom.nds", 0x1A258, 0xF0 + .incbin "baserom.nds", 0x1A348, 0x5D4 + .incbin "baserom.nds", 0x1A91C, 0x12D0 + .incbin "baserom.nds", 0x1BBEC, 0xF0 + .incbin "baserom.nds", 0x1BCDC, 0x5D4 + .incbin "baserom.nds", 0x1C2B0, 0x12D0 + .incbin "baserom.nds", 0x1D580, 0x228 + .incbin "baserom.nds", 0x1D7A8, 0x228 + .balign 4, 255 diff --git a/narc/data/ugeffect_obj_graphic.narc.s b/narc/data/ugeffect_obj_graphic.narc.s index 4ee16095..6e047202 100644 --- a/narc/data/ugeffect_obj_graphic.narc.s +++ b/narc/data/ugeffect_obj_graphic.narc.s @@ -32,12 +32,13 @@ ; GMIF header .ascii "GMIF" .word 0x00004CF4 ; chunk size - .incbin "baserom.nds", 0x49467C, 0x1230 - .incbin "baserom.nds", 0x4958AC, 0x228 - .incbin "baserom.nds", 0x495AD4, 0x1230 - .incbin "baserom.nds", 0x496D04, 0x228 - .incbin "baserom.nds", 0x496F2C, 0xF9 - .incbin "baserom.nds", 0x497028, 0x169 - .incbin "baserom.nds", 0x497194, 0xD6 - .incbin "baserom.nds", 0x49726C, 0xCA - .incbin "baserom.nds", 0x497338, 0x2030 + .incbin "baserom.nds", 0x0, 0x1230 + .incbin "baserom.nds", 0x1230, 0x228 + .incbin "baserom.nds", 0x1458, 0x1230 + .incbin "baserom.nds", 0x2688, 0x228 + .incbin "baserom.nds", 0x28B0, 0xF9 + .incbin "baserom.nds", 0x29AC, 0x169 + .incbin "baserom.nds", 0x2B18, 0xD6 + .incbin "baserom.nds", 0x2BF0, 0xCA + .incbin "baserom.nds", 0x2CBC, 0x2030 + .balign 4, 255 diff --git a/narc/data/uground_cell.resdat.s b/narc/data/uground_cell.resdat.s index 1f9e7ce1..014e7b91 100644 --- a/narc/data/uground_cell.resdat.s +++ b/narc/data/uground_cell.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x499400, 0x4C diff --git a/narc/data/uground_cellanm.resdat.s b/narc/data/uground_cellanm.resdat.s index c17f6503..3b0ffea1 100644 --- a/narc/data/uground_cellanm.resdat.s +++ b/narc/data/uground_cellanm.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x499600, 0x4C diff --git a/narc/data/uground_char.resdat.s b/narc/data/uground_char.resdat.s index c4e7061e..94005d27 100644 --- a/narc/data/uground_char.resdat.s +++ b/narc/data/uground_char.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x499800, 0x4C diff --git a/narc/data/uground_char2.resdat.s b/narc/data/uground_char2.resdat.s index 69670a00..e321c2a7 100644 --- a/narc/data/uground_char2.resdat.s +++ b/narc/data/uground_char2.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x499A00, 0x4C diff --git a/narc/data/uground_clact.cldat.s b/narc/data/uground_clact.cldat.s index bbb2a032..af6c4df2 100644 --- a/narc/data/uground_clact.cldat.s +++ b/narc/data/uground_clact.cldat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x499C00, 0x60 diff --git a/narc/data/uground_pltt.resdat.s b/narc/data/uground_pltt.resdat.s index a0d7389b..7457f1b9 100644 --- a/narc/data/uground_pltt.resdat.s +++ b/narc/data/uground_pltt.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x499E00, 0x34 diff --git a/narc/data/uground_pltt2.resdat.s b/narc/data/uground_pltt2.resdat.s index 1deb1406..d299bee0 100644 --- a/narc/data/uground_pltt2.resdat.s +++ b/narc/data/uground_pltt2.resdat.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x49A000, 0x34 diff --git a/narc/data/underg_radar.narc.s b/narc/data/underg_radar.narc.s index 71101429..7a9c391c 100644 --- a/narc/data/underg_radar.narc.s +++ b/narc/data/underg_radar.narc.s @@ -30,10 +30,11 @@ ; GMIF header .ascii "GMIF" .word 0x0000A1D0 ; chunk size - .incbin "baserom.nds", 0x49A26C, 0x228 - .incbin "baserom.nds", 0x49A494, 0x8040 - .incbin "baserom.nds", 0x4A24D4, 0x824 - .incbin "baserom.nds", 0x4A2CF8, 0x228 - .incbin "baserom.nds", 0x4A2F20, 0xC50 - .incbin "baserom.nds", 0x4A3B70, 0x482 - .incbin "baserom.nds", 0x4A3FF4, 0x43E + .incbin "baserom.nds", 0x0, 0x228 + .incbin "baserom.nds", 0x228, 0x8040 + .incbin "baserom.nds", 0x8268, 0x824 + .incbin "baserom.nds", 0x8A8C, 0x228 + .incbin "baserom.nds", 0x8CB4, 0xC50 + .incbin "baserom.nds", 0x9904, 0x482 + .incbin "baserom.nds", 0x9D88, 0x43E + .balign 4, 255 diff --git a/narc/data/utility.bin.s b/narc/data/utility.bin.s index 0c7be088..73e91afb 100644 --- a/narc/data/utility.bin.s +++ b/narc/data/utility.bin.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x4A4600, 0xDB4C0 diff --git a/narc/data/weather_sys.narc.s b/narc/data/weather_sys.narc.s index 0f286ecb..832cd3bc 100644 --- a/narc/data/weather_sys.narc.s +++ b/narc/data/weather_sys.narc.s @@ -82,62 +82,63 @@ ; GMIF header .ascii "GMIF" .word 0x0000F6A4 ; chunk size - .incbin "baserom.nds", 0x57FE0C, 0xEF - .incbin "baserom.nds", 0x57FEFC, 0x117 - .incbin "baserom.nds", 0x580014, 0x730 - .incbin "baserom.nds", 0x580744, 0x228 - .incbin "baserom.nds", 0x58096C, 0x8B - .incbin "baserom.nds", 0x5809F8, 0x97 - .incbin "baserom.nds", 0x580A90, 0x210 - .incbin "baserom.nds", 0x580CA0, 0x228 - .incbin "baserom.nds", 0x580EC8, 0x4040 - .incbin "baserom.nds", 0x584F08, 0x228 - .incbin "baserom.nds", 0x585130, 0x824 - .incbin "baserom.nds", 0x585954, 0x8B - .incbin "baserom.nds", 0x5859E0, 0xAB - .incbin "baserom.nds", 0x585A8C, 0x670 - .incbin "baserom.nds", 0x5860FC, 0x8B - .incbin "baserom.nds", 0x586188, 0x8B - .incbin "baserom.nds", 0x586214, 0x230 - .incbin "baserom.nds", 0x586444, 0x228 - .incbin "baserom.nds", 0x58666C, 0x8B - .incbin "baserom.nds", 0x5866F8, 0x8B - .incbin "baserom.nds", 0x586784, 0xB0 - .incbin "baserom.nds", 0x586834, 0x228 - .incbin "baserom.nds", 0x586A5C, 0x153 - .incbin "baserom.nds", 0x586BB0, 0x1A3 - .incbin "baserom.nds", 0x586D54, 0x330 - .incbin "baserom.nds", 0x587084, 0x228 - .incbin "baserom.nds", 0x5872AC, 0x8B - .incbin "baserom.nds", 0x587338, 0x8B - .incbin "baserom.nds", 0x5873C4, 0xB0 - .incbin "baserom.nds", 0x587474, 0x60 - .incbin "baserom.nds", 0x5874D4, 0x228 - .incbin "baserom.nds", 0x5876FC, 0x824 - .incbin "baserom.nds", 0x587F20, 0x97 - .incbin "baserom.nds", 0x587FB8, 0x9B - .incbin "baserom.nds", 0x588054, 0x130 - .incbin "baserom.nds", 0x588184, 0x228 - .incbin "baserom.nds", 0x5883AC, 0x2040 - .incbin "baserom.nds", 0x58A3EC, 0x228 - .incbin "baserom.nds", 0x58A614, 0x824 - .incbin "baserom.nds", 0x58AE38, 0x8B - .incbin "baserom.nds", 0x58AEC4, 0x8B - .incbin "baserom.nds", 0x58AF50, 0xB0 - .incbin "baserom.nds", 0x58B000, 0x228 - .incbin "baserom.nds", 0x58B228, 0x824 - .incbin "baserom.nds", 0x58BA4C, 0x840 - .incbin "baserom.nds", 0x58C28C, 0x60 - .incbin "baserom.nds", 0x58C2EC, 0x228 - .incbin "baserom.nds", 0x58C514, 0x824 - .incbin "baserom.nds", 0x58CD38, 0x840 - .incbin "baserom.nds", 0x58D578, 0x228 - .incbin "baserom.nds", 0x58D7A0, 0x824 - .incbin "baserom.nds", 0x58DFC4, 0x228 - .incbin "baserom.nds", 0x58E1EC, 0x228 - .incbin "baserom.nds", 0x58E414, 0x440 - .incbin "baserom.nds", 0x58E854, 0x824 - .incbin "baserom.nds", 0x58F078, 0x10C - .incbin "baserom.nds", 0x58F184, 0x10C - .incbin "baserom.nds", 0x58F290, 0x10C - .incbin "baserom.nds", 0x58F39C, 0x10C + .incbin "baserom.nds", 0x0, 0xEF + .incbin "baserom.nds", 0xF0, 0x117 + .incbin "baserom.nds", 0x208, 0x730 + .incbin "baserom.nds", 0x938, 0x228 + .incbin "baserom.nds", 0xB60, 0x8B + .incbin "baserom.nds", 0xBEC, 0x97 + .incbin "baserom.nds", 0xC84, 0x210 + .incbin "baserom.nds", 0xE94, 0x228 + .incbin "baserom.nds", 0x10BC, 0x4040 + .incbin "baserom.nds", 0x50FC, 0x228 + .incbin "baserom.nds", 0x5324, 0x824 + .incbin "baserom.nds", 0x5B48, 0x8B + .incbin "baserom.nds", 0x5BD4, 0xAB + .incbin "baserom.nds", 0x5C80, 0x670 + .incbin "baserom.nds", 0x62F0, 0x8B + .incbin "baserom.nds", 0x637C, 0x8B + .incbin "baserom.nds", 0x6408, 0x230 + .incbin "baserom.nds", 0x6638, 0x228 + .incbin "baserom.nds", 0x6860, 0x8B + .incbin "baserom.nds", 0x68EC, 0x8B + .incbin "baserom.nds", 0x6978, 0xB0 + .incbin "baserom.nds", 0x6A28, 0x228 + .incbin "baserom.nds", 0x6C50, 0x153 + .incbin "baserom.nds", 0x6DA4, 0x1A3 + .incbin "baserom.nds", 0x6F48, 0x330 + .incbin "baserom.nds", 0x7278, 0x228 + .incbin "baserom.nds", 0x74A0, 0x8B + .incbin "baserom.nds", 0x752C, 0x8B + .incbin "baserom.nds", 0x75B8, 0xB0 + .incbin "baserom.nds", 0x7668, 0x60 + .incbin "baserom.nds", 0x76C8, 0x228 + .incbin "baserom.nds", 0x78F0, 0x824 + .incbin "baserom.nds", 0x8114, 0x97 + .incbin "baserom.nds", 0x81AC, 0x9B + .incbin "baserom.nds", 0x8248, 0x130 + .incbin "baserom.nds", 0x8378, 0x228 + .incbin "baserom.nds", 0x85A0, 0x2040 + .incbin "baserom.nds", 0xA5E0, 0x228 + .incbin "baserom.nds", 0xA808, 0x824 + .incbin "baserom.nds", 0xB02C, 0x8B + .incbin "baserom.nds", 0xB0B8, 0x8B + .incbin "baserom.nds", 0xB144, 0xB0 + .incbin "baserom.nds", 0xB1F4, 0x228 + .incbin "baserom.nds", 0xB41C, 0x824 + .incbin "baserom.nds", 0xBC40, 0x840 + .incbin "baserom.nds", 0xC480, 0x60 + .incbin "baserom.nds", 0xC4E0, 0x228 + .incbin "baserom.nds", 0xC708, 0x824 + .incbin "baserom.nds", 0xCF2C, 0x840 + .incbin "baserom.nds", 0xD76C, 0x228 + .incbin "baserom.nds", 0xD994, 0x824 + .incbin "baserom.nds", 0xE1B8, 0x228 + .incbin "baserom.nds", 0xE3E0, 0x228 + .incbin "baserom.nds", 0xE608, 0x440 + .incbin "baserom.nds", 0xEA48, 0x824 + .incbin "baserom.nds", 0xF26C, 0x10C + .incbin "baserom.nds", 0xF378, 0x10C + .incbin "baserom.nds", 0xF484, 0x10C + .incbin "baserom.nds", 0xF590, 0x10C + .balign 4, 255 diff --git a/narc/data/wifi.ncgr.s b/narc/data/wifi.ncgr.s index 0136e8ae..ea66df9b 100644 --- a/narc/data/wifi.ncgr.s +++ b/narc/data/wifi.ncgr.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x58F600, 0x240 diff --git a/narc/data/wifinote.narc.s b/narc/data/wifinote.narc.s index debb2567..c1661107 100644 --- a/narc/data/wifinote.narc.s +++ b/narc/data/wifinote.narc.s @@ -35,15 +35,16 @@ ; GMIF header .ascii "GMIF" .word 0x000038C0 ; chunk size - .incbin "baserom.nds", 0x58FA94, 0x9F - .incbin "baserom.nds", 0x58FB34, 0xA7 - .incbin "baserom.nds", 0x58FBDC, 0xC40 - .incbin "baserom.nds", 0x59081C, 0x228 - .incbin "baserom.nds", 0x590A44, 0x624 - .incbin "baserom.nds", 0x591068, 0x624 - .incbin "baserom.nds", 0x59168C, 0x624 - .incbin "baserom.nds", 0x591CB0, 0x624 - .incbin "baserom.nds", 0x5922D4, 0x624 - .incbin "baserom.nds", 0x5928F8, 0x70 - .incbin "baserom.nds", 0x592968, 0x3C0 - .incbin "baserom.nds", 0x592D28, 0x624 + .incbin "baserom.nds", 0x0, 0x9F + .incbin "baserom.nds", 0xA0, 0xA7 + .incbin "baserom.nds", 0x148, 0xC40 + .incbin "baserom.nds", 0xD88, 0x228 + .incbin "baserom.nds", 0xFB0, 0x624 + .incbin "baserom.nds", 0x15D4, 0x624 + .incbin "baserom.nds", 0x1BF8, 0x624 + .incbin "baserom.nds", 0x221C, 0x624 + .incbin "baserom.nds", 0x2840, 0x624 + .incbin "baserom.nds", 0x2E64, 0x70 + .incbin "baserom.nds", 0x2ED4, 0x3C0 + .incbin "baserom.nds", 0x3294, 0x624 + .balign 4, 255 diff --git a/narc/data/wifip2pmatch.narc.s b/narc/data/wifip2pmatch.narc.s index 5a17e9d6..12e255f8 100644 --- a/narc/data/wifip2pmatch.narc.s +++ b/narc/data/wifip2pmatch.narc.s @@ -34,14 +34,15 @@ ; GMIF header .ascii "GMIF" .word 0x00003D90 ; chunk size - .incbin "baserom.nds", 0x59348C, 0x13A - .incbin "baserom.nds", 0x5935C8, 0xFA - .incbin "baserom.nds", 0x5936C4, 0xB80 - .incbin "baserom.nds", 0x594244, 0x228 - .incbin "baserom.nds", 0x59446C, 0x624 - .incbin "baserom.nds", 0x594A90, 0x624 - .incbin "baserom.nds", 0x5950B4, 0x624 - .incbin "baserom.nds", 0x5956D8, 0x2B0 - .incbin "baserom.nds", 0x595988, 0x228 - .incbin "baserom.nds", 0x595BB0, 0x1040 - .incbin "baserom.nds", 0x596BF0, 0x624 + .incbin "baserom.nds", 0x0, 0x13A + .incbin "baserom.nds", 0x13C, 0xFA + .incbin "baserom.nds", 0x238, 0xB80 + .incbin "baserom.nds", 0xDB8, 0x228 + .incbin "baserom.nds", 0xFE0, 0x624 + .incbin "baserom.nds", 0x1604, 0x624 + .incbin "baserom.nds", 0x1C28, 0x624 + .incbin "baserom.nds", 0x224C, 0x2B0 + .incbin "baserom.nds", 0x24FC, 0x228 + .incbin "baserom.nds", 0x2724, 0x1040 + .incbin "baserom.nds", 0x3764, 0x624 + .balign 4, 255 diff --git a/narc/data/wm.ncgr.s b/narc/data/wm.ncgr.s index ca81365d..d65f9fac 100644 --- a/narc/data/wm.ncgr.s +++ b/narc/data/wm.ncgr.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x597400, 0x240 diff --git a/narc/data/wm.nclr.s b/narc/data/wm.nclr.s index ef908cf6..d6a09870 100644 --- a/narc/data/wm.nclr.s +++ b/narc/data/wm.nclr.s @@ -1,2 +1,3 @@ + .include "asm/macros.inc" .text .incbin "baserom.nds", 0x597800, 0x228 |