QoL Tweaks

- Brock skip works properly
- Removed a Cut tree south of Cerulean
- "disabled!" is now "Disabled!" because the grammar burned my eyes

README.md

@@ -2,6 +2,8 @@ Kanto Expansion Pak
 ===================
 This is a ROM Hack of Pokémon Red and Blue, aiming to expand the Kanto region with more interesting locations, evolutions added in later generations, and QoL changes.
 
+If playing on an emulator, BGB is strongly recommended for its accuracy and features. VBA's inaccuracies can cause unintended glitches.
+
 New Pokemon:
 ====
 - The 34 known beta Pokemon that were cut from RBY have been fully implemented.
@@ -106,6 +108,7 @@ QoL Enhancements
 	- The Moon Stone is available over TM23 (Dragon Rage). Dragon Rage is accessible in Celadon University!
 - Bag capacity increased from 20 to 30 items.
 - Spinner tiles move faster.
+- If a move is disabled, it now has an upper-case D instead of a lower-case one.
 
 Bug Fixes
 ====

engine/battle/core.asm

@@ -2924,7 +2924,7 @@ PrintMenuItem:
 	jp Delay3
 
 DisabledText:
-	db "disabled!@"
+	db "Disabled!@"
 
 TypeText:
 	db "TYPE@"

maps/CeruleanCity.blk

@@ -18,7 +18,7 @@ N\	 !
 

 










/\bQQN

 tttttt

111_
NttN


 !



 !ttt_
NttN

-V|~
0	|s0	_
NttN













_
Nttbllll6V2llllllll
NttN















NttPRRm]nN]MRRRRNtttttm'n
+V|~
0	|s0	_
NttN













_
Nttbllll6Vmllllllll
NttN















NttPRRm]nN]MRRRRNtttttm'n
 
 
 

scripts/PewterCity.asm

@@ -17,75 +17,76 @@ PewterCityScript0:
 	xor a
 	ld [wMuseum1FCurScript], a
 	ResetEvent EVENT_BOUGHT_MUSEUM_TICKET
-	call PewterCityScript_1925e
+;	call PewterCityScript_1925e
 	ret
 
-PewterCityScript_1925e:
+;To allow for a Brock skip, the guy who takes you to Brock has been completely removed.
-	CheckEvent EVENT_BEAT_BROCK
+;PewterCityScript_1925e:
-	ret nz
+;	CheckEvent EVENT_BEAT_BROCK
-IF DEF(_DEBUG)
+;	ret nz
-	call DebugPressedOrHeldB
+;IF DEF(_DEBUG)
-	ret nz
+;	call DebugPressedOrHeldB
-ENDC
+;	ret nz
-	ld hl, CoordsData_19277
+;ENDC
-	call ArePlayerCoordsInArray
+;	ld hl, CoordsData_19277
-	ret nc
+;	call ArePlayerCoordsInArray
-	ld a, $f0
+;	ret nc
-	ld [wJoyIgnore], a
+;	ld a, $f0
-	ld a, $5
+;	ld [wJoyIgnore], a
-	ldh [hSpriteIndexOrTextID], a
+;	ld a, $5
-	jp DisplayTextID
+;	ldh [hSpriteIndexOrTextID], a
+;	jp DisplayTextID
 
-CoordsData_19277:
+;CoordsData_19277:
-	dbmapcoord 35, 17
+;	dbmapcoord 35, 17
-	dbmapcoord 36, 17
+;	dbmapcoord 36, 17
-	dbmapcoord 37, 18
+;	dbmapcoord 37, 18
-	dbmapcoord 37, 19
+;	dbmapcoord 37, 19
-	db -1 ; end
+;	db -1 ; end
 
 ;PewterCityScript1:
-	ld a, [wNPCMovementScriptPointerTableNum]
+;	ld a, [wNPCMovementScriptPointerTableNum]
-	and a
+;	and a
-	ret nz
+;	ret nz
-	ld a, $3
+;	ld a, $3
-	ldh [hSpriteIndex], a
+;	ldh [hSpriteIndex], a
-	ld a, SPRITE_FACING_UP
+;	ld a, SPRITE_FACING_UP
-	ldh [hSpriteFacingDirection], a
+;	ldh [hSpriteFacingDirection], a
-	call SetSpriteFacingDirectionAndDelay
+;	call SetSpriteFacingDirectionAndDelay
-	ld a, ($3 << 4) | SPRITE_FACING_UP
+;	ld a, ($3 << 4) | SPRITE_FACING_UP
-	ldh [hSpriteImageIndex], a
+;	ldh [hSpriteImageIndex], a
-	call SetSpriteImageIndexAfterSettingFacingDirection
+;	call SetSpriteImageIndexAfterSettingFacingDirection
-	call PlayDefaultMusic
+;	call PlayDefaultMusic
-	ld hl, wFlags_0xcd60
+;	ld hl, wFlags_0xcd60
-	set 4, [hl]
+;	set 4, [hl]
-	ld a, $d
+;	ld a, $d
-	ldh [hSpriteIndexOrTextID], a
+;	ldh [hSpriteIndexOrTextID], a
-	call DisplayTextID
+;	call DisplayTextID
-	ld a, $3c
+;	ld a, $3c
-	ldh [hSpriteScreenYCoord], a
+;	ldh [hSpriteScreenYCoord], a
-	ld a, $30
+;	ld a, $30
-	ldh [hSpriteScreenXCoord], a
+;	ldh [hSpriteScreenXCoord], a
-	ld a, 12
+;	ld a, 12
-	ldh [hSpriteMapYCoord], a
+;	ldh [hSpriteMapYCoord], a
-	ld a, 17
+;	ld a, 17
-	ldh [hSpriteMapXCoord], a
+;	ldh [hSpriteMapXCoord], a
-	ld a, $3
+;	ld a, $3
-	ld [wSpriteIndex], a
+;	ld [wSpriteIndex], a
-	call SetSpritePosition1
+;	call SetSpritePosition1
-	ld a, $3
+;	ld a, $3
-	ldh [hSpriteIndex], a
+;	ldh [hSpriteIndex], a
-	ld de, MovementData_PewterMuseumGuyExit
+;	ld de, MovementData_PewterMuseumGuyExit
-	call MoveSprite
+;	call MoveSprite
-	ld a, $2
+;	ld a, $2
-	ld [wPewterCityCurScript], a
+;	ld [wPewterCityCurScript], a
-	ret
+;	ret
 
-MovementData_PewterMuseumGuyExit:
+;MovementData_PewterMuseumGuyExit:
-	db NPC_MOVEMENT_DOWN
+;	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
+;	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
+;	db NPC_MOVEMENT_DOWN
-	db NPC_MOVEMENT_DOWN
+;	db NPC_MOVEMENT_DOWN
-	db -1 ; end
+;	db -1 ; end
 
 PewterCityScript2:
 	ld a, [wd730]