PR #638

3 files changed, 12 insertions, 10 deletions

diff --git a/Add-a-new-Pack-pocket.md b/Add-a-new-Pack-pocket.md
index 406d9c6..c9632eb 100644
--- a/Add-a-new-Pack-pocket.md
+++ b/Add-a-new-Pack-pocket.md
@@ -790,7 +790,7 @@ These are tilemaps for the pocket name labels in pack_menu.png. Each one is thre
  .MenuData:
  	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
  	db 5, 8 ; rows, columns
- 	db 2 ; horizontal spacing
+ 	db SCROLLINGMENU_ITEMS_QUANTITY ; item format
  	dbw 0, wNumBalls
  	dba PlaceMenuItemName
  	dba PlaceMenuItemQuantity
@@ -805,7 +805,7 @@ These are tilemaps for the pocket name labels in pack_menu.png. Each one is thre
  .MenuData:
  	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
  	db 5, 8 ; rows, columns
- 	db 2 ; horizontal spacing
+ 	db SCROLLINGMENU_ITEMS_QUANTITY ; item format
  	dbw 0, wNumBalls
  	dba PlaceMenuItemName
  	dba PlaceMenuItemQuantity
@@ -820,7 +820,7 @@ These are tilemaps for the pocket name labels in pack_menu.png. Each one is thre
 +.MenuData:
 +	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
 +	db 5, 8 ; rows, columns
-+	db 2 ; horizontal spacing
++	db SCROLLINGMENU_ITEMS_QUANTITY ; item format
 +	dbw 0, wNumBerries
 +	dba PlaceMenuItemName
 +	dba PlaceMenuItemQuantity
@@ -835,7 +835,7 @@ These are tilemaps for the pocket name labels in pack_menu.png. Each one is thre
 +.MenuData:
 +	db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
 +	db 5, 8 ; rows, columns
-+	db 2 ; horizontal spacing
++	db SCROLLINGMENU_ITEMS_QUANTITY ; item format
 +	dbw 0, wNumBerries
 +	dba PlaceMenuItemName
 +	dba PlaceMenuItemQuantity
diff --git a/Allow-tiles-to-have-different-attributes-in-different-blocks-(including-X-and-Y-flip).md b/Allow-tiles-to-have-different-attributes-in-different-blocks-(including-X-and-Y-flip).md
index 682aa20..fdcd158 100644
--- a/Allow-tiles-to-have-different-attributes-in-different-blocks-(including-X-and-Y-flip).md
+++ b/Allow-tiles-to-have-different-attributes-in-different-blocks-(including-X-and-Y-flip).md
@@ -589,7 +589,7 @@ The `LoadMetatiles` routine copies data from \*_metatiles.bin (pointed to by `[w
 We also fixed [the bug that only allowed 128 blocks](../blob/master/docs/bugs_and_glitches.md#loadmetatiles-wraps-around-past-128-blocks), since you'll probably need 256 to take full advantage of this block attribute system.
 
 ```diff
- ScrollMapDown::
+ ScrollMapUp::
  	hlcoord 0, 0
  	ld de, wBGMapBuffer
  	call BackupBGMapRow
@@ -600,7 +600,7 @@ We also fixed [the bug that only allowed 128 blocks](../blob/master/docs/bugs_an
 +	call BackupBGMapRow
  	...
 
- ScrollMapUp::
+ ScrollMapDown::
  	hlcoord 0, SCREEN_HEIGHT - 2
  	ld de, wBGMapBuffer
  	call BackupBGMapRow
@@ -611,7 +611,7 @@ We also fixed [the bug that only allowed 128 blocks](../blob/master/docs/bugs_an
 +	call BackupBGMapRow
  	...
 
- ScrollMapRight::
+ ScrollMapLeft::
  	hlcoord 0, 0
  	ld de, wBGMapBuffer
  	call BackupBGMapColumn
@@ -622,7 +622,7 @@ We also fixed [the bug that only allowed 128 blocks](../blob/master/docs/bugs_an
 +	call BackupBGMapColumn
  	...
 
- ScrollMapLeft::
+ ScrollMapRight::
  	hlcoord SCREEN_WIDTH - 2, 0
  	ld de, wBGMapBuffer
  	call BackupBGMapColumn
@@ -636,6 +636,8 @@ We also fixed [the bug that only allowed 128 blocks](../blob/master/docs/bugs_an
 
 `FarCallScrollBGMapPalettes` used to update `wBGMapPalBuffer` when the screen was scrolled. We deleted it, so now have to update it the same way as `wBGMapBuffer`.
 
+(Note that before June 17, 2019, the names of `ScrollMapUp` and `ScrollMapDown` were mistakenly reversed, as were `ScrollMapLeft` and `ScrollMapRight`.)
+
 
 ## 8. Finish changing how tile attributes are loaded
 
diff --git a/Edit-the-Town-Map.md b/Edit-the-Town-Map.md
index 38eb75c..3acdda0 100644
--- a/Edit-the-Town-Map.md
+++ b/Edit-the-Town-Map.md
@@ -160,7 +160,7 @@ You can minimize those elements by making them only take up two rows. Edit [engi
  .ok
  	farcall PokegearMap
 -	ld a, $07
--	ld bc, $12
+-	ld bc, SCREEN_WIDTH  - 2
 -	hlcoord 1, 2
 -	call ByteFill
 -	hlcoord 0, 2
@@ -232,7 +232,7 @@ You can minimize those elements by making them only take up two rows. Edit [engi
 -	hlcoord 1, 1
 -
 -; Middle row
--	ld bc, 18
+-	ld bc, SCREEN_WIDTH - 2
 -	ld a, " "
 -	call ByteFill
 -