From a9eea150484ef79959eb8fef2e7f8b33fd43010a Mon Sep 17 00:00:00 2001 From: vulcandth Date: Fri, 17 Nov 2023 18:51:09 +0000 Subject: [PATCH] Add constants for wMapConnections bits and group map header wram labels * Add constants for wMapConnections bits * Apply Vulcandth and Rangi42 feedback --------- Co-authored-by: vulcandth --- pokeblue.map | 10 ++++++---- pokeblue.sym | 10 ++++++---- pokeblue_debug.map | 10 ++++++---- pokeblue_debug.sym | 10 ++++++---- pokeblue_vc.map | 10 ++++++---- pokeblue_vc.sym | 10 ++++++---- pokered.map | 10 ++++++---- pokered.sym | 10 ++++++---- pokered_vc.map | 10 ++++++---- pokered_vc.sym | 10 ++++++---- 10 files changed, 60 insertions(+), 40 deletions(-) diff --git a/pokeblue.map b/pokeblue.map index 8c96bffcd..425899fea 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -19360,14 +19360,16 @@ WRAM0 bank #0: $d364 = wXBlockCoord $d365 = wLastMap $d366 = wUnusedD366 + $d367 = wCurMapHeader $d367 = wCurMapTileset $d368 = wCurMapHeight $d369 = wCurMapWidth - $d36a = wMapDataPtr - $d36c = wMapTextPtr - $d36e = wMapScriptPtr - $d370 = wMapConnections + $d36a = wCurMapDataPtr + $d36c = wCurMapTextPtr + $d36e = wCurMapScriptPtr + $d370 = wCurMapConnections $d371 = wNorthConnectedMap + $d371 = wCurMapHeaderEnd $d371 = wNorthConnectionHeader $d372 = wNorthConnectionStripSrc $d374 = wNorthConnectionStripDest diff --git a/pokeblue.sym b/pokeblue.sym index 8869ed1b5..d72fe884c 100644 --- a/pokeblue.sym +++ b/pokeblue.sym @@ -19031,14 +19031,16 @@ 00:d364 wXBlockCoord 00:d365 wLastMap 00:d366 wUnusedD366 +00:d367 wCurMapHeader 00:d367 wCurMapTileset 00:d368 wCurMapHeight 00:d369 wCurMapWidth -00:d36a wMapDataPtr -00:d36c wMapTextPtr -00:d36e wMapScriptPtr -00:d370 wMapConnections +00:d36a wCurMapDataPtr +00:d36c wCurMapTextPtr +00:d36e wCurMapScriptPtr +00:d370 wCurMapConnections 00:d371 wNorthConnectedMap +00:d371 wCurMapHeaderEnd 00:d371 wNorthConnectionHeader 00:d372 wNorthConnectionStripSrc 00:d374 wNorthConnectionStripDest diff --git a/pokeblue_debug.map b/pokeblue_debug.map index 3ccb72fe3..f21ef36ad 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -19370,14 +19370,16 @@ WRAM0 bank #0: $d364 = wXBlockCoord $d365 = wLastMap $d366 = wUnusedD366 + $d367 = wCurMapHeader $d367 = wCurMapTileset $d368 = wCurMapHeight $d369 = wCurMapWidth - $d36a = wMapDataPtr - $d36c = wMapTextPtr - $d36e = wMapScriptPtr - $d370 = wMapConnections + $d36a = wCurMapDataPtr + $d36c = wCurMapTextPtr + $d36e = wCurMapScriptPtr + $d370 = wCurMapConnections $d371 = wNorthConnectedMap + $d371 = wCurMapHeaderEnd $d371 = wNorthConnectionHeader $d372 = wNorthConnectionStripSrc $d374 = wNorthConnectionStripDest diff --git a/pokeblue_debug.sym b/pokeblue_debug.sym index d1d626de6..48f37e6e9 100644 --- a/pokeblue_debug.sym +++ b/pokeblue_debug.sym @@ -19041,14 +19041,16 @@ 00:d364 wXBlockCoord 00:d365 wLastMap 00:d366 wUnusedD366 +00:d367 wCurMapHeader 00:d367 wCurMapTileset 00:d368 wCurMapHeight 00:d369 wCurMapWidth -00:d36a wMapDataPtr -00:d36c wMapTextPtr -00:d36e wMapScriptPtr -00:d370 wMapConnections +00:d36a wCurMapDataPtr +00:d36c wCurMapTextPtr +00:d36e wCurMapScriptPtr +00:d370 wCurMapConnections 00:d371 wNorthConnectedMap +00:d371 wCurMapHeaderEnd 00:d371 wNorthConnectionHeader 00:d372 wNorthConnectionStripSrc 00:d374 wNorthConnectionStripDest diff --git a/pokeblue_vc.map b/pokeblue_vc.map index fa70b69b6..971287251 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -19412,14 +19412,16 @@ WRAM0 bank #0: $d364 = wXBlockCoord $d365 = wLastMap $d366 = wUnusedD366 + $d367 = wCurMapHeader $d367 = wCurMapTileset $d368 = wCurMapHeight $d369 = wCurMapWidth - $d36a = wMapDataPtr - $d36c = wMapTextPtr - $d36e = wMapScriptPtr - $d370 = wMapConnections + $d36a = wCurMapDataPtr + $d36c = wCurMapTextPtr + $d36e = wCurMapScriptPtr + $d370 = wCurMapConnections $d371 = wNorthConnectedMap + $d371 = wCurMapHeaderEnd $d371 = wNorthConnectionHeader $d372 = wNorthConnectionStripSrc $d374 = wNorthConnectionStripDest diff --git a/pokeblue_vc.sym b/pokeblue_vc.sym index 45f52f75f..040570ca2 100644 --- a/pokeblue_vc.sym +++ b/pokeblue_vc.sym @@ -19083,14 +19083,16 @@ 00:d364 wXBlockCoord 00:d365 wLastMap 00:d366 wUnusedD366 +00:d367 wCurMapHeader 00:d367 wCurMapTileset 00:d368 wCurMapHeight 00:d369 wCurMapWidth -00:d36a wMapDataPtr -00:d36c wMapTextPtr -00:d36e wMapScriptPtr -00:d370 wMapConnections +00:d36a wCurMapDataPtr +00:d36c wCurMapTextPtr +00:d36e wCurMapScriptPtr +00:d370 wCurMapConnections 00:d371 wNorthConnectedMap +00:d371 wCurMapHeaderEnd 00:d371 wNorthConnectionHeader 00:d372 wNorthConnectionStripSrc 00:d374 wNorthConnectionStripDest diff --git a/pokered.map b/pokered.map index d29e34d33..a8229a7a5 100644 --- a/pokered.map +++ b/pokered.map @@ -19360,14 +19360,16 @@ WRAM0 bank #0: $d364 = wXBlockCoord $d365 = wLastMap $d366 = wUnusedD366 + $d367 = wCurMapHeader $d367 = wCurMapTileset $d368 = wCurMapHeight $d369 = wCurMapWidth - $d36a = wMapDataPtr - $d36c = wMapTextPtr - $d36e = wMapScriptPtr - $d370 = wMapConnections + $d36a = wCurMapDataPtr + $d36c = wCurMapTextPtr + $d36e = wCurMapScriptPtr + $d370 = wCurMapConnections $d371 = wNorthConnectedMap + $d371 = wCurMapHeaderEnd $d371 = wNorthConnectionHeader $d372 = wNorthConnectionStripSrc $d374 = wNorthConnectionStripDest diff --git a/pokered.sym b/pokered.sym index de249eaf4..8613887da 100644 --- a/pokered.sym +++ b/pokered.sym @@ -19031,14 +19031,16 @@ 00:d364 wXBlockCoord 00:d365 wLastMap 00:d366 wUnusedD366 +00:d367 wCurMapHeader 00:d367 wCurMapTileset 00:d368 wCurMapHeight 00:d369 wCurMapWidth -00:d36a wMapDataPtr -00:d36c wMapTextPtr -00:d36e wMapScriptPtr -00:d370 wMapConnections +00:d36a wCurMapDataPtr +00:d36c wCurMapTextPtr +00:d36e wCurMapScriptPtr +00:d370 wCurMapConnections 00:d371 wNorthConnectedMap +00:d371 wCurMapHeaderEnd 00:d371 wNorthConnectionHeader 00:d372 wNorthConnectionStripSrc 00:d374 wNorthConnectionStripDest diff --git a/pokered_vc.map b/pokered_vc.map index 1a9b70ac9..8930f6509 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -19415,14 +19415,16 @@ WRAM0 bank #0: $d364 = wXBlockCoord $d365 = wLastMap $d366 = wUnusedD366 + $d367 = wCurMapHeader $d367 = wCurMapTileset $d368 = wCurMapHeight $d369 = wCurMapWidth - $d36a = wMapDataPtr - $d36c = wMapTextPtr - $d36e = wMapScriptPtr - $d370 = wMapConnections + $d36a = wCurMapDataPtr + $d36c = wCurMapTextPtr + $d36e = wCurMapScriptPtr + $d370 = wCurMapConnections $d371 = wNorthConnectedMap + $d371 = wCurMapHeaderEnd $d371 = wNorthConnectionHeader $d372 = wNorthConnectionStripSrc $d374 = wNorthConnectionStripDest diff --git a/pokered_vc.sym b/pokered_vc.sym index f5c6e0801..f481c5cad 100644 --- a/pokered_vc.sym +++ b/pokered_vc.sym @@ -19086,14 +19086,16 @@ 00:d364 wXBlockCoord 00:d365 wLastMap 00:d366 wUnusedD366 +00:d367 wCurMapHeader 00:d367 wCurMapTileset 00:d368 wCurMapHeight 00:d369 wCurMapWidth -00:d36a wMapDataPtr -00:d36c wMapTextPtr -00:d36e wMapScriptPtr -00:d370 wMapConnections +00:d36a wCurMapDataPtr +00:d36c wCurMapTextPtr +00:d36e wCurMapScriptPtr +00:d370 wCurMapConnections 00:d371 wNorthConnectedMap +00:d371 wCurMapHeaderEnd 00:d371 wNorthConnectionHeader 00:d372 wNorthConnectionStripSrc 00:d374 wNorthConnectionStripDest