From: Lukas Krickl Date: Wed, 20 Aug 2025 03:24:44 +0000 (+0200) Subject: map: removed seed index X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=915f091cc0c784ff6749924d372a87856f1ea9e5;p=gbrg%2F.git map: removed seed index --- diff --git a/maps/map_bc.s b/maps/map_bc.s index 979f4d2..65fd2ea 100644 --- a/maps/map_bc.s +++ b/maps/map_bc.s @@ -10,7 +10,6 @@ dw bank8800 dw bank8C00 dw bank9000 dw map_bc_exit_table -dw 7 map_bc_bg: diff --git a/maps/map_be.s b/maps/map_be.s index 0e676b9..9563a23 100644 --- a/maps/map_be.s +++ b/maps/map_be.s @@ -10,7 +10,6 @@ dw bank8800 dw bank8C00 dw bank9000 dw map_be_exit_table -dw 8 map_be_bg: diff --git a/maps/map_bw.s b/maps/map_bw.s index e8ef009..4d47b49 100644 --- a/maps/map_bw.s +++ b/maps/map_bw.s @@ -10,7 +10,6 @@ dw bank8800 dw bank8C00 dw bank9000 dw map_bw_exit_table -dw 6 map_bw_bg: diff --git a/maps/map_c.s b/maps/map_c.s index a4bba6d..77b9b6b 100644 --- a/maps/map_c.s +++ b/maps/map_c.s @@ -10,7 +10,6 @@ dw bank8800 dw bank8C00 dw bank9000 dw map_c_exit_table -dw 4 map_c_bg: diff --git a/maps/map_ce.s b/maps/map_ce.s index f222e00..229addf 100644 --- a/maps/map_ce.s +++ b/maps/map_ce.s @@ -10,7 +10,6 @@ dw bank8800 dw bank8C00 dw bank9000 dw map_ce_exit_table -dw 5 map_ce_bg: diff --git a/maps/map_cw.s b/maps/map_cw.s index 452d39f..d9bbd83 100644 --- a/maps/map_cw.s +++ b/maps/map_cw.s @@ -10,7 +10,6 @@ dw bank8800 dw bank8C00 dw bank9000 dw map_cw_exit_table -dw 3 map_cw_bg: diff --git a/maps/map_tc.s b/maps/map_tc.s index 3a1d9fa..54526d5 100644 --- a/maps/map_tc.s +++ b/maps/map_tc.s @@ -10,7 +10,6 @@ dw bank8800 dw bank8C00 dw bank9000 dw map_tc_exit_table -dw 1 map_tc_bg: diff --git a/maps/map_te.s b/maps/map_te.s index f393568..e89f838 100644 --- a/maps/map_te.s +++ b/maps/map_te.s @@ -10,7 +10,6 @@ dw bank8800 dw bank8C00 dw bank9000 dw map_te_exit_table -dw 2 map_te_bg: diff --git a/maps/map_tw.s b/maps/map_tw.s index 50901a3..8a56c20 100644 --- a/maps/map_tw.s +++ b/maps/map_tw.s @@ -10,7 +10,6 @@ dw bank8800 dw bank8C00 dw bank9000 dw map_tw_exit_table -dw 0 map_tw_bg: diff --git a/src/actsave.s b/src/actsave.s index b80a445..f632eef 100644 --- a/src/actsave.s +++ b/src/actsave.s @@ -12,13 +12,7 @@ act_save_init: ; returns: ; bc: act save game slot act_sg_load_current_slot: - ld a, [map_header] - ld l, a - ld a, [map_header+1] - ld h, a - ld de, map_seed_index - add hl, de - ld a, [hl] ; a = seed index + ld a, [player_map_cursor] ; a = seed index ld hl, act_sg ; no need to loop if a is 0 diff --git a/src/defs.s b/src/defs.s index ade2635..23e5aea 100644 --- a/src/defs.s +++ b/src/defs.s @@ -301,9 +301,6 @@ ; pointer to exit table ; .de map_exit_table_ptr, 2 - ; the seed to use for this map - ; read from [map_seeds] -.de map_seed_index, 1 .de map_header_size, 0 ; map actor table struct diff --git a/tools/tms2map.py b/tools/tms2map.py index 4180741..2706b45 100755 --- a/tools/tms2map.py +++ b/tools/tms2map.py @@ -15,7 +15,6 @@ tile_bank2 = "bank8C00" tile_bank3 = "bank9000" exit_table = "map_c_exit_table" actor_table_ptr = "map_actor_table_null" -map_seed_index = 0 map_name = "noname" NAME_LEN = 8 @@ -110,7 +109,6 @@ def print_header(name): print("dw " + tile_bank2) print("dw " + tile_bank3) print("dw " + exit_table) - print("dw " + str(map_seed_index)) print("") def get_flag(tile): @@ -141,7 +139,6 @@ def get_map_props(root): global tile_bank3 global map_name global exit_table - global map_seed_index for child in root: if child.tag == "properties": @@ -164,8 +161,6 @@ def get_map_props(root): map_name = value elif name == 'exit_table': exit_table = value - elif name == 'seed_index': - map_seed_index = int(value) return