From 8ea03a5afc2b8b565a47131575a5369800a28d2e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Wed, 31 Aug 2016 22:50:35 -0700 Subject: [PATCH] cable car tilemaps --- asm/rom5.s | 16 ++++----- data/data2.s | 40 ++++++++++++--------- graphics/misc/cable_car_mountain_map.bin | Bin 0 -> 1200 bytes graphics/misc/cable_car_mt_chimney_map.bin | Bin 0 -> 360 bytes graphics/misc/cable_car_pylon_stem_map.bin | Bin 0 -> 120 bytes graphics/misc/cable_car_tree_map.bin | Bin 0 -> 960 bytes 6 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 graphics/misc/cable_car_mountain_map.bin create mode 100644 graphics/misc/cable_car_mt_chimney_map.bin create mode 100644 graphics/misc/cable_car_pylon_stem_map.bin create mode 100644 graphics/misc/cable_car_tree_map.bin diff --git a/asm/rom5.s b/asm/rom5.s index 7c11eb00b..563b5ea60 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -345635,11 +345635,11 @@ _081233EC: .align 2, 0 _08123454: .4byte gUnknown_08401CF8 _08123458: .4byte gUnknown_08401D18 -_0812345C: .4byte gUnknown_08401820 +_0812345C: .4byte gCableCarMtChimneyTilemap _08123460: .4byte 0x02019000 -_08123464: .4byte gUnknown_08401978 -_08123468: .4byte gUnknown_08401AFC -_0812346C: .4byte gUnknown_08401CD4 +_08123464: .4byte gCableCarTreeTilemap +_08123468: .4byte gCableCarMountainTilemap +_0812346C: .4byte gCableCarPylonStemTilemap _08123470: .4byte 0x000009d8 _08123474: .4byte gUnknown_08E7EB9C _08123478: .4byte gUnknown_08E7EC3C @@ -345770,7 +345770,7 @@ _0812357C: .4byte 0x02019168 _08123580: .4byte 0x0600f000 _08123584: .4byte 0x02039274 _08123588: .4byte 0x000008fc -_0812358C: .4byte gUnknown_08401CC0 +_0812358C: .4byte gCableCarPylonHookTilemapEntries _08123590: .4byte 0x03001770 _08123594: .4byte 0x0000043c _08123598: @@ -346437,7 +346437,7 @@ _08123AD6: bx r0 .align 2, 0 _08123AE8: .4byte 0x000008fc -_08123AEC: .4byte gUnknown_08401CC0 +_08123AEC: .4byte gCableCarPylonHookTilemapEntries _08123AF0: .4byte 0x020199d8 _08123AF4: .4byte 0x030024d0 thumb_func_end sub_81239E4 @@ -346553,7 +346553,7 @@ _08123BB0: ldr r2, _08123BD8 b _08123BEA .align 2, 0 -_08123BD4: .4byte gUnknown_08401CC4 +_08123BD4: .4byte gCableCarPylonHookTilemapEntries + 0x4 _08123BD8: .4byte 0x00000942 _08123BDC: ldr r2, _08123C08 @@ -346579,7 +346579,7 @@ _08123BEE: ldrsh r0, [r4, r1] b _08123C26 .align 2, 0 -_08123C08: .4byte gUnknown_08401CC8 +_08123C08: .4byte gCableCarPylonHookTilemapEntries + 0x8 _08123C0C: .4byte 0x00000904 _08123C10: .4byte 0x00000944 _08123C14: .4byte 0x02039274 diff --git a/data/data2.s b/data/data2.s index 4cc672e12..178fde2e7 100644 --- a/data/data2.s +++ b/data/data2.s @@ -25827,26 +25827,34 @@ gUnknown_08401810:: @ 8401810 .4byte 2307, gUnknown_08401808 .4byte 2306, gUnknown_0840180B -gUnknown_08401820:: @ 8401820 - .incbin "baserom.gba", 0x00401820, 0x158 + .align 2 +gCableCarMtChimneyTilemap:: @ 8401820 + .incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz" -gUnknown_08401978:: @ 8401978 - .incbin "baserom.gba", 0x00401978, 0x184 + .align 2 +gCableCarTreeTilemap:: @ 8401978 + .incbin "graphics/misc/cable_car_tree_map.bin.lz" -gUnknown_08401AFC:: @ 8401AFC - .incbin "baserom.gba", 0x00401afc, 0x1c4 + .align 2 +gCableCarMountainTilemap:: @ 8401AFC + .incbin "graphics/misc/cable_car_mountain_map.bin.lz" -gUnknown_08401CC0:: @ 8401CC0 - .incbin "baserom.gba", 0x00401cc0, 0x4 + .align 2 +gCableCarPylonHookTilemapEntries:: @ 8401CC0 + .2byte 0x3000 + .2byte 0x3001 + .2byte 0x3002 + .2byte 0x3003 + .2byte 0x3004 + .2byte 0x3005 + .2byte 0x3006 + .2byte 0x3007 + .2byte 0x3008 + .2byte 0x3009 -gUnknown_08401CC4:: @ 8401CC4 - .incbin "baserom.gba", 0x00401cc4, 0x4 - -gUnknown_08401CC8:: @ 8401CC8 - .incbin "baserom.gba", 0x00401cc8, 0xc - -gUnknown_08401CD4:: @ 8401CD4 - .incbin "baserom.gba", 0x00401cd4, 0x24 + .align 2 +gCableCarPylonStemTilemap:: @ 8401CD4 + .incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz" .align 2 gUnknown_08401CF8:: @ 8401CF8 diff --git a/graphics/misc/cable_car_mountain_map.bin b/graphics/misc/cable_car_mountain_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..3d4e092bceab978102f2a3d2513281c65201552c GIT binary patch literal 1200 zcmdVJ*)kAN007W$IiD7lJ)=ZX3?)f1N<_sJMWIl#MOi94$y&&kN**kU-u%OTGiT1W z?PF)huF!k_3cc^2&<75M{x94K5h9&*%4t!e#fTLrUV<|cJ@QzUYEL{>qt-Le)v4Fu zg_n|?bxyMLQlz@zqBQ9)xhzAbCe2=Xt;HLy+O+G?>8&o^-pP{fimP&5lk2)XH{`qN zmI8%(^y<^^gO5HLFlflI5u?V8D{|W%#qKIm>Yg&??t9>&3Y9*a^u?5EGiJ@1_tiHG k7A^U%(fi;NmW5uiD)gFlp?}yA`lnw)|F$XgA6r5n0j@($lK=n! literal 0 HcmV?d00001 diff --git a/graphics/misc/cable_car_mt_chimney_map.bin b/graphics/misc/cable_car_mt_chimney_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..8ae7818bfbc7bd295752b8526559d973d5cef2ca GIT binary patch literal 360 zcmaLNNjDY%0EOY_Cm>2}h@xyrGHoc8Y7+OJ@?-C&64eoyK>xf-vhZGdgQSu^5iSd#EEy^4G9t@xhdH#DQ-)Z zCS8V1wd&Ms(5OkXx88ZLMXNR+wCnKEC!M-<>(T48KK%v^`eMki5u?V8`)b0ZDbv20 o@!b!z=FD5LXvwmlR;*g{%Wr@DwQj?vE!%eN+OzM#p?{A22a0z~IRF3v literal 0 HcmV?d00001 diff --git a/graphics/misc/cable_car_pylon_stem_map.bin b/graphics/misc/cable_car_pylon_stem_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..e6f12efc6a42b62d35a8f26d27084347ae2489ad GIT binary patch literal 120 acmd-w;5Ohf;5Fbg;5U#nkjIK?AqM~wU=f=D literal 0 HcmV?d00001 diff --git a/graphics/misc/cable_car_tree_map.bin b/graphics/misc/cable_car_tree_map.bin new file mode 100644 index 0000000000000000000000000000000000000000..1e9b7a8f819a09d3bf40bd1a7bc815ca3a976590 GIT binary patch literal 960 zcmd_f#a4o000v>Z;~l$E5WBm5Cu)FgTzQw=v%$e2WXIU#+)tc6|p-pXR zTRYm-o&pMLUw(rh=uk&G)`?DarjWuq*M%;1rEA^jRwlpGy&m+aCq3&$uX@wFKJ=+C zed|ZRGI<1%L=jC4vBVKi0*NG%ObV%_k&ej)WROV~+2oK*9{ChdND;-9V8i64lwrp~ zIZi65q>5^4sHKj28fe7iO*GR&D{ZvXK_^{w(?c(P^fQ19le-yYh+#$;#lsk0#+hIe YA5%;-gUM%^!^-nmYk@_qyu|