From 607c2d479b9bed882b6174f040628c1f184bbc42 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sun, 27 Jul 2025 09:29:31 +0200 Subject: [PATCH] maps: fxied bottom east exit table. updated tiles --- maps/map_bc.s | 6 +++--- maps/map_be.s | 34 +++++++++++++++++----------------- maps/map_bw.s | 30 +++++++++++++++--------------- maps/map_c.s | 14 +++++++------- maps/map_ce.s | 32 ++++++++++++++++---------------- maps/map_cw.s | 32 ++++++++++++++++---------------- maps/map_tc.s | 8 ++++---- maps/map_te.s | 33 +++++++++++++++++---------------- maps/map_tw.s | 30 +++++++++++++++--------------- src/unit_demo.s | 10 +++++----- 10 files changed, 115 insertions(+), 114 deletions(-) diff --git a/maps/map_bc.s b/maps/map_bc.s index 23ca005..979f4d2 100644 --- a/maps/map_bc.s +++ b/maps/map_bc.s @@ -14,9 +14,9 @@ dw 7 map_bc_bg: -.db 0x1, 0x44, 0x1, 0x44, 0xc, 0x0, 0x2, 0x44 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x1, 0x4a, 0x1, 0x4a, 0xc, 0x0, 0x2, 0x4a +.db 0x1, 0x4a, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x4a, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 .db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x0, 0x6, 0x6e .db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x0 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 diff --git a/maps/map_be.s b/maps/map_be.s index 7609092..0e676b9 100644 --- a/maps/map_be.s +++ b/maps/map_be.s @@ -9,30 +9,30 @@ dw bank8000 dw bank8800 dw bank8C00 dw bank9000 -dw map_bw_exit_table +dw map_be_exit_table dw 8 map_be_bg: -.db 0x1, 0x44, 0x1, 0x44, 0xd, 0x0, 0x1, 0x44 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 +.db 0x1, 0x4a, 0x1, 0x4a, 0xd, 0x0, 0x1, 0x26 +.db 0x1, 0x4a, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0, 0xe, 0x0 -.db 0x1, 0x44, 0x1, 0x0, 0xe, 0x0, 0x1, 0x44 +.db 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0, 0xe, 0x0 +.db 0x1, 0x26, 0x1, 0x0, 0xe, 0x0, 0x1, 0x26 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 +.db 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x44, 0xe, 0x44 -.db 0x1, 0x44 +.db 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x44, 0xe, 0x44 +.db 0x1, 0x46 .db 0x00 ; termiante data map_be_tile_flags: diff --git a/maps/map_bw.s b/maps/map_bw.s index 0cfada0..e8ef009 100644 --- a/maps/map_bw.s +++ b/maps/map_bw.s @@ -14,23 +14,23 @@ dw 6 map_bw_bg: -.db 0x1, 0x44, 0xd, 0x0, 0x2, 0x44, 0x1, 0x44 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44 +.db 0x1, 0x22, 0xd, 0x0, 0x2, 0x4a, 0x1, 0x22 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x4a +.db 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0xf, 0x0, 0x1, 0x44 -.db 0xf, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44 +.db 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x0, 0x1, 0x22, 0xf, 0x0, 0x1, 0x22 +.db 0xf, 0x0, 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44 +.db 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x42 .db 0xe, 0x44, 0x1, 0x44 .db 0x00 ; termiante data map_bw_tile_flags: diff --git a/maps/map_c.s b/maps/map_c.s index cebf578..52ae164 100644 --- a/maps/map_c.s +++ b/maps/map_c.s @@ -14,9 +14,9 @@ dw 4 map_c_bg: -.db 0x1, 0x44, 0x1, 0x44, 0xc, 0x0, 0x2, 0x44 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x1, 0x4a, 0x1, 0x4a, 0xc, 0x0, 0x2, 0x4a +.db 0x1, 0x4a, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x4a, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 .db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x0, 0x6, 0x6e .db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x0 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 @@ -29,10 +29,10 @@ map_c_bg: .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e .db 0x1, 0x0, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 .db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x0, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 -.db 0x1, 0x44, 0x1, 0x44, 0xc, 0x0, 0x1, 0x44 -.db 0x1, 0x44 +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x4a +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x4a +.db 0x1, 0x4a, 0x1, 0x4a, 0xc, 0x0, 0x1, 0x4a +.db 0x1, 0x4a .db 0x00 ; termiante data map_c_tile_flags: diff --git a/maps/map_ce.s b/maps/map_ce.s index b7e4498..f222e00 100644 --- a/maps/map_ce.s +++ b/maps/map_ce.s @@ -14,25 +14,25 @@ dw 5 map_ce_bg: -.db 0x1, 0x44, 0x1, 0x44, 0xd, 0x0, 0x1, 0x44 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 +.db 0x1, 0x4a, 0x1, 0x4a, 0xd, 0x0, 0x1, 0x26 +.db 0x1, 0x4a, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0, 0xe, 0x0 -.db 0x1, 0x44, 0x1, 0x0, 0xe, 0x0, 0x1, 0x44 +.db 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0, 0xe, 0x0 +.db 0x1, 0x26, 0x1, 0x0, 0xe, 0x0, 0x1, 0x26 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 +.db 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x44, 0x1, 0x44 -.db 0xd, 0x0, 0x1, 0x44 +.db 0x1, 0x26, 0x1, 0x4a, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x4a, 0x1, 0x4a +.db 0xd, 0x0, 0x1, 0x26 .db 0x00 ; termiante data map_ce_tile_flags: diff --git a/maps/map_cw.s b/maps/map_cw.s index 05f0485..452d39f 100644 --- a/maps/map_cw.s +++ b/maps/map_cw.s @@ -14,24 +14,24 @@ dw 3 map_cw_bg: -.db 0x1, 0x44, 0xd, 0x0, 0x2, 0x44, 0x1, 0x44 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44 +.db 0x1, 0x22, 0xd, 0x0, 0x2, 0x4a, 0x1, 0x22 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x4a +.db 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0xf, 0x0, 0x1, 0x44 -.db 0xf, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44 +.db 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x0, 0x1, 0x22, 0xf, 0x0, 0x1, 0x22 +.db 0xf, 0x0, 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44, 0x1, 0x44 -.db 0xd, 0x0, 0x1, 0x44, 0x1, 0x44 +.db 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x4a, 0x1, 0x22 +.db 0xd, 0x0, 0x1, 0x4a, 0x1, 0x4a .db 0x00 ; termiante data map_cw_tile_flags: diff --git a/maps/map_tc.s b/maps/map_tc.s index e3b324c..3a1d9fa 100644 --- a/maps/map_tc.s +++ b/maps/map_tc.s @@ -14,7 +14,7 @@ dw 1 map_tc_bg: -.db 0x1, 0x44, 0xf, 0x44, 0x1, 0x0, 0x6, 0x6e +.db 0x1, 0x4, 0xf, 0x4, 0x1, 0x0, 0x6, 0x6e .db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x0 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e @@ -29,9 +29,9 @@ map_tc_bg: .db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x0 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x44, 0x1, 0x44 -.db 0xc, 0x0, 0x1, 0x44, 0x1, 0x44 +.db 0x1, 0x0, 0x1, 0x4a, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x4a, 0x1, 0x4a, 0x1, 0x4a +.db 0xc, 0x0, 0x1, 0x4a, 0x1, 0x4a .db 0x00 ; termiante data map_tc_tile_flags: diff --git a/maps/map_te.s b/maps/map_te.s index 15be87d..f393568 100644 --- a/maps/map_te.s +++ b/maps/map_te.s @@ -14,24 +14,25 @@ dw 2 map_te_bg: -.db 0x1, 0x44, 0xf, 0x44, 0x1, 0x0, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 +.db 0x1, 0x4, 0xe, 0x4, 0x1, 0x6, 0x1, 0x0 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 -.db 0x1, 0x0, 0xe, 0x0, 0x1, 0x44, 0x1, 0x0 -.db 0xe, 0x0, 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 +.db 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26 .db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x0, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44, 0x1, 0x44 -.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x44 -.db 0x1, 0x44, 0x1, 0x44, 0xd, 0x0, 0x1, 0x44 +.db 0x1, 0x26, 0x1, 0x0, 0xe, 0x0, 0x1, 0x26 +.db 0x1, 0x0, 0xe, 0x0, 0x1, 0x26, 0x1, 0x0 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26 +.db 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26, 0x1, 0x0 +.db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x26 +.db 0x1, 0x4a, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x26, 0x1, 0x4a, 0x1, 0x4a, 0xd, 0x0 +.db 0x1, 0x26 .db 0x00 ; termiante data map_te_tile_flags: diff --git a/maps/map_tw.s b/maps/map_tw.s index e5ac2d7..50901a3 100644 --- a/maps/map_tw.s +++ b/maps/map_tw.s @@ -14,24 +14,24 @@ dw 0 map_tw_bg: -.db 0x1, 0x44, 0xf, 0x44, 0x1, 0x44, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44 +.db 0x1, 0x2, 0xf, 0x4, 0x1, 0x22, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44 +.db 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 -.db 0x1, 0x44, 0xf, 0x0, 0x1, 0x44, 0xf, 0x0 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e -.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x44 +.db 0x1, 0x22, 0xf, 0x0, 0x1, 0x22, 0xf, 0x0 +.db 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e +.db 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0, 0x1, 0x22 .db 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e, 0x1, 0x0 -.db 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e -.db 0x1, 0x0, 0x1, 0x44, 0x6, 0x6e, 0x2, 0x0 -.db 0x6, 0x6e, 0x1, 0x44, 0x1, 0x44, 0xd, 0x0 -.db 0x1, 0x44, 0x1, 0x44 +.db 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0, 0x6, 0x6e +.db 0x1, 0x0, 0x1, 0x22, 0x6, 0x6e, 0x2, 0x0 +.db 0x6, 0x6e, 0x1, 0x4a, 0x1, 0x22, 0xd, 0x0 +.db 0x1, 0x4a, 0x1, 0x4a .db 0x00 ; termiante data map_tw_tile_flags: diff --git a/src/unit_demo.s b/src/unit_demo.s index a8fe037..f041689 100644 --- a/src/unit_demo.s +++ b/src/unit_demo.s @@ -41,7 +41,7 @@ unit_demo_1_cpu_update_idle: unit_demo_2: st_def 0x00, unit_demo_1_init, st_unit_idle - act_def ACT_T_DEMO_1, 0, 3, 3, 0 + act_def ACT_T_DEMO_1, 0, 8, 8, 0 act_stat_def1 1, 1, 1, 1 act_stat_def2 1, 1, 32, 1 act_st_def NULL, NULL, st_unit_demo_1_cpu_update_idle, st_unit_idle @@ -49,7 +49,7 @@ unit_demo_2: unit_demo_warrior: st_def 0x00, unit_demo_1_init, st_unit_demo_1_cpu_update - act_def ACT_T_DEMO_1, 0, 4, 4, 0 + act_def ACT_T_DEMO_1, 0, 9, 9, 0 act_stat_def1 1, 1, 1, 1 act_stat_def2 1, 1, 32, 1 act_st_def NULL, NULL, st_unit_demo_1_cpu_update, st_unit_idle @@ -57,7 +57,7 @@ unit_demo_warrior: unit_demo_mage: st_def 0x00, unit_demo_1_init, st_unit_demo_1_cpu_update - act_def ACT_T_DEMO_1, 0, 4, 4, 0 + act_def ACT_T_DEMO_1, 0, 9, 9, 0 act_stat_def1 1, 1, 1, 1 act_stat_def2 1, 1, 32, 1 act_st_def NULL, NULL, st_unit_demo_1_cpu_update, st_unit_idle @@ -65,7 +65,7 @@ unit_demo_mage: unit_demo_thief: st_def 0x00, unit_demo_1_init, st_unit_demo_1_cpu_update - act_def ACT_T_DEMO_1, 0, 4, 4, 0 + act_def ACT_T_DEMO_1, 0, 9, 9, 0 act_stat_def1 1, 1, 1, 1 act_stat_def2 1, 1, 32, 1 act_st_def NULL, NULL, st_unit_demo_1_cpu_update, st_unit_idle @@ -74,7 +74,7 @@ unit_demo_thief: unit_demo_priest: st_def 0x00, unit_demo_1_init, st_unit_demo_1_cpu_update - act_def ACT_T_DEMO_1, 0, 4, 4, 0 + act_def ACT_T_DEMO_1, 0, 9, 9, 0 act_stat_def1 1, 1, 1, 1 act_stat_def2 1, 1, 32, 1 act_st_def NULL, NULL, st_unit_demo_1_cpu_update, st_unit_idle -- 2.30.2