diff --git a/README.md b/README.md index 44215684..e2fa39b2 100644 --- a/README.md +++ b/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 ==== diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 0589a8df..0286d00c 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2924,7 +2924,7 @@ PrintMenuItem: jp Delay3 DisabledText: - db "disabled!@" + db "Disabled!@" TypeText: db "TYPE@" diff --git a/maps/CeruleanCity.blk b/maps/CeruleanCity.blk index d7abfd3d..8ab22a0d 100644 --- a/maps/CeruleanCity.blk +++ b/maps/CeruleanCity.blk @@ -18,7 +18,7 @@ N\  !  /\bQQN tttttt111_NttN ! !ttt_NttN -V|~0 |s0 _NttN_Nttbllll6V2llllllllNttNNttPRRm]nN]MRRRRNtttttm'n +V|~0 |s0 _NttN_Nttbllll6VmllllllllNttNNttPRRm]nN]MRRRRNtttttm'n diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm index 7f87485d..632bf0b3 100644 --- a/scripts/PewterCity.asm +++ b/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: - CheckEvent EVENT_BEAT_BROCK - ret nz -IF DEF(_DEBUG) - call DebugPressedOrHeldB - ret nz -ENDC - ld hl, CoordsData_19277 - call ArePlayerCoordsInArray - ret nc - ld a, $f0 - ld [wJoyIgnore], a - ld a, $5 - ldh [hSpriteIndexOrTextID], a - jp DisplayTextID +;To allow for a Brock skip, the guy who takes you to Brock has been completely removed. +;PewterCityScript_1925e: +; CheckEvent EVENT_BEAT_BROCK +; ret nz +;IF DEF(_DEBUG) +; call DebugPressedOrHeldB +; ret nz +;ENDC +; ld hl, CoordsData_19277 +; call ArePlayerCoordsInArray +; ret nc +; ld a, $f0 +; ld [wJoyIgnore], a +; ld a, $5 +; ldh [hSpriteIndexOrTextID], a +; jp DisplayTextID -CoordsData_19277: - dbmapcoord 35, 17 - dbmapcoord 36, 17 - dbmapcoord 37, 18 - dbmapcoord 37, 19 - db -1 ; end +;CoordsData_19277: +; dbmapcoord 35, 17 +; dbmapcoord 36, 17 +; dbmapcoord 37, 18 +; dbmapcoord 37, 19 +; db -1 ; end ;PewterCityScript1: - ld a, [wNPCMovementScriptPointerTableNum] - and a - ret nz - ld a, $3 - ldh [hSpriteIndex], a - ld a, SPRITE_FACING_UP - ldh [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, ($3 << 4) | SPRITE_FACING_UP - ldh [hSpriteImageIndex], a - call SetSpriteImageIndexAfterSettingFacingDirection - call PlayDefaultMusic - ld hl, wFlags_0xcd60 - set 4, [hl] - ld a, $d - ldh [hSpriteIndexOrTextID], a - call DisplayTextID - ld a, $3c - ldh [hSpriteScreenYCoord], a - ld a, $30 - ldh [hSpriteScreenXCoord], a - ld a, 12 - ldh [hSpriteMapYCoord], a - ld a, 17 - ldh [hSpriteMapXCoord], a - ld a, $3 - ld [wSpriteIndex], a - call SetSpritePosition1 - ld a, $3 - ldh [hSpriteIndex], a - ld de, MovementData_PewterMuseumGuyExit - call MoveSprite - ld a, $2 - ld [wPewterCityCurScript], a - ret +; ld a, [wNPCMovementScriptPointerTableNum] +; and a +; ret nz +; ld a, $3 +; ldh [hSpriteIndex], a +; ld a, SPRITE_FACING_UP +; ldh [hSpriteFacingDirection], a +; call SetSpriteFacingDirectionAndDelay +; ld a, ($3 << 4) | SPRITE_FACING_UP +; ldh [hSpriteImageIndex], a +; call SetSpriteImageIndexAfterSettingFacingDirection +; call PlayDefaultMusic +; ld hl, wFlags_0xcd60 +; set 4, [hl] +; ld a, $d +; ldh [hSpriteIndexOrTextID], a +; call DisplayTextID +; ld a, $3c +; ldh [hSpriteScreenYCoord], a +; ld a, $30 +; ldh [hSpriteScreenXCoord], a +; ld a, 12 +; ldh [hSpriteMapYCoord], a +; ld a, 17 +; ldh [hSpriteMapXCoord], a +; ld a, $3 +; ld [wSpriteIndex], a +; call SetSpritePosition1 +; ld a, $3 +; ldh [hSpriteIndex], a +; ld de, MovementData_PewterMuseumGuyExit +; call MoveSprite +; ld a, $2 +; ld [wPewterCityCurScript], a +; ret -MovementData_PewterMuseumGuyExit: - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_DOWN - db -1 ; end +;MovementData_PewterMuseumGuyExit: +; db NPC_MOVEMENT_DOWN +; db NPC_MOVEMENT_DOWN +; db NPC_MOVEMENT_DOWN +; db NPC_MOVEMENT_DOWN +; db -1 ; end PewterCityScript2: ld a, [wd730]