thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from thornAvery/master

Browse source 
Bug Fixes
This commit is contained in:
Llinos Evans 2023-09-23 01:23:57 +01:00 committed by GitHub
parent 94dc5cbc5c 9f5094d23e
commit 85b4d39146
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/tilesets/water_tilesets.asm
View file

@ -12,3 +12,8 @@ WaterTilesets:
db CITRINE db CITRINE
db CELESTE db CELESTE
db -1 ; end db -1 ; end
NonShoreTilesets:
db GYM
db SHIP_PORT
db -1 ; end

14
engine/battle/experience.asm
View file

@ -174,6 +174,7 @@ GainExperience:
farcall CalcLevelFromExperience farcall CalcLevelFromExperience
pop hl pop hl
ld a, [hl] ; current level ld a, [hl] ; current level
ld [wTempLevel], a
cp d cp d
jp z, .nextMon ; if level didn't change, go to next mon jp z, .nextMon ; if level didn't change, go to next mon
ld a, [wCurEnemyLVL] ld a, [wCurEnemyLVL]
@ -269,7 +270,20 @@ GainExperience:
ld [wMonDataLocation], a ld [wMonDataLocation], a
ld a, [wd0b5] ld a, [wd0b5]
ld [wd11e], a ld [wd11e], a
ld a, [wCurEnemyLVL]
ld c, a
ld a, [wTempLevel]
ld b, a
.level_loop
inc b
ld a, b
ld [wCurEnemyLVL], a
push bc
predef LearnMoveFromLevelUp predef LearnMoveFromLevelUp
pop bc
ld a, b
cp c
jr nz, .level_loop
ld hl, wCanEvolveFlags ld hl, wCanEvolveFlags
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
ld c, a ld c, a

6
engine/items/item_effects.asm
View file

@ -2942,9 +2942,11 @@ IsNextTileShoreOrWater:
call IsInArray call IsInArray
jr nc, .notShoreOrWater jr nc, .notShoreOrWater
ld a, [wCurMapTileset] ld a, [wCurMapTileset]
cp SHIP_PORT ; Vermilion Dock tileset ld hl, NonShoreTilesets
ld de, 1
call IsInArray ; check if shore tiles should be skipped
ld a, [wTileInFrontOfPlayer] ; tile in front of player ld a, [wTileInFrontOfPlayer] ; tile in front of player
jr z, .skipShoreTiles ; if it's the Vermilion Dock tileset jr c, .skipShoreTiles ; if it's the Vermilion Dock tileset
cp $48 ; eastern shore tile in Safari Zone cp $48 ; eastern shore tile in Safari Zone
jr z, .shoreOrWater jr z, .shoreOrWater
cp $32 ; usual eastern shore tile cp $32 ; usual eastern shore tile

2
engine/menus/main_menu.asm
View file

@ -681,7 +681,7 @@ SetCursorPositionsFromOptions:
; 00: X coordinate of menu cursor ; 00: X coordinate of menu cursor
; 01: delay after printing a letter (in frames) ; 01: delay after printing a letter (in frames)
TextSpeedOptionData: TextSpeedOptionData:
db 14, TEXT_DELAY_SLOW db 15, TEXT_DELAY_SLOW
db 9, TEXT_DELAY_MEDIUM db 9, TEXT_DELAY_MEDIUM
db 1, TEXT_DELAY_FAST db 1, TEXT_DELAY_FAST
db 9, -1 ; end (default X coordinate) db 9, -1 ; end (default X coordinate)

2
engine/menus/save.asm
View file

@ -25,6 +25,8 @@ LoadSAV:
ld a, $1 ; bad checksum ld a, $1 ; bad checksum
.goodsum .goodsum
ld [wSaveFileStatus], a ld [wSaveFileStatus], a
ld a, 1
ld [wOptionsInitialized], a
ret ret
FileDataDestroyedText: FileDataDestroyedText:

2
engine/movie/oak_speech/init_player_data.asm
View file

@ -35,8 +35,6 @@ DEF START_MONEY EQU $3000
ld hl, wObtainedBadges ld hl, wObtainedBadges
ld [hli], a ld [hli], a
ld [hl], a
ld hl, wPlayerCoins ld hl, wPlayerCoins
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a

1
ram/wram.asm
View file

@ -203,6 +203,7 @@ ENDU
SECTION "Overworld Map", WRAM0 SECTION "Overworld Map", WRAM0
UNION UNION
wTempLevel::
wOverworldMap:: ds 1300 wOverworldMap:: ds 1300
wOverworldMapEnd:: wOverworldMapEnd::