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

Merge branch 'mistress' into renewables

Browse source
This commit is contained in:
Thorn Avery 2024-01-15 06:44:40 +11:00
parent 65e94896d1 a034504c8b
commit b9b0ea0301
8 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/maps/objects/CinnabarVolcano.asm
View file

@ -3,6 +3,7 @@ CinnabarVolcano_Object:
def_warp_events
warp_event 15, 21, CINNABAR_VOLCANO_FLOORS, 9
warp_event 16, 5, CINNABAR_VOLCANO_FLOORS, 10
def_bg_events

2
data/maps/objects/CinnabarVolcanoFloors.asm
View file

@ -11,6 +11,7 @@ CinnabarVolcanoFloors_Object:
warp_event 5, 3, CINNABAR_VOLCANO_FLOORS, 8
warp_event 5, 25, CINNABAR_VOLCANO_FLOORS, 7
warp_event 12, 24, CINNABAR_VOLCANO, 1
warp_event 31, 37, CINNABAR_VOLCANO, 2
def_bg_events
@ -27,5 +28,6 @@ CinnabarVolcanoFloors_Object:
object_event 34, 11, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
object_event 11, 35, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
object_event 12, 30, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
object_event 29, 37, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13
def_warps_to CINNABAR_VOLCANO_FLOORS

1
engine/menus/naming_screen.asm
View file

@ -34,7 +34,6 @@ AskName:
and a
jr nz, .inBattle
call ReloadMapSpriteTilePatterns
call ReloadMapData
.inBattle
call LoadScreenTilesFromBuffer1
pop hl

2
maps/CinnabarVolcano.blk
View file

@ -1 +1 @@
..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvv3vvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN
..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvv3vvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN

4
maps/CinnabarVolcanoFloors.blk
View file

@ -1,4 +1,4 @@
,+,+|__b "+
 vvvfvvvvvvv-vvvvfvvv-v |fyvr
 _,+,+|#'  r+ vvvvvvvvvvvvvvvvv vvvvr-tfvvvv_
 " ___$
 _,+,+|#'  r+ vvvvvvvvvvvvvvvvv vvvvr-tfvvv_
 "(___$

1
scripts/CinnabarVolcanoFloors.asm
View file

@ -25,6 +25,7 @@ CinnabarVolcanoFloors_TextPointers:
dw BoulderText
dw BoulderText
dw BoulderText
dw BoulderText
CinnabarVolcanoFloorsTrainerHeaders:
def_trainers

3
scripts/FightingDojo.asm
View file

@ -68,7 +68,7 @@ FightingDojoScript3:
.asm_5cde4
ld a, $f0
ld [wJoyIgnore], a
SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
SetEventRange EVENT_DEFEATED_FIGHTING_DOJO, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
ld a, $9
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -175,7 +175,6 @@ FightingDojoText1: ; gym scaling can be removed to make space
.continue2
ld hl, FightingDojoText8
call PrintText
SetEvent EVENT_DEFEATED_FIGHTING_DOJO
.asm_9dba4
jp TextScriptEnd

2
text/Route24.asm
View file

@ -99,6 +99,6 @@ _Route24DamienText4::
done
_DamienFullParty::
text "Huh? Your PARTY"
text "Huh? Your BOX"
line "is full?"
done