thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-21 22:52:15 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug Fixes

Browse source 
Fixes the following bugs:
- Restores the Museum Guy's functionality that was removed when trying to allow Brock skip. Now works fine.
- Attempt to fix Yujirou's Sabrina-like glitch. If this doesn't fix it, look at Sabrina between RB and Y
- Attempt to fix some Misty text.
- Changed Squirtle check to use EVENT_BEAT_SURGE over the ThunderBadge. Same effect, saves a line of code, generally easier.
- Reverts a really old and shoddy DV generation system back to vanilla.

Also, I changed some gym/rival teams to reflect new philosophies from Discord discussion.
This commit is contained in:
Llinos Evans 2023-07-08 10:01:27 +01:00
parent 9528f45ce2
commit 8a87ce000e
7 changed files with 71 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

86
scripts/PewterCity.asm
View file

@ -6,7 +6,7 @@ PewterCity_Script:
PewterCity_ScriptPointers:
dw PewterCityScript0
; dw PewterCityScript1
dw PewterCityScript1
dw PewterCityScript2
dw PewterCityScript3
dw PewterCityScript4
@ -44,49 +44,49 @@ PewterCityScript0:
; 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
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
;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]