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

Small edits

Browse source 
- Attempted to fix the Mt. Moon J&J encounter (did not work, will look at the script file)

- Fixed a few bugged warps relating to Mt. Moon Square/Crater

- Fixed the credits text layout (just need to figure out how to decrease the delay between them, so it still matches the music...)

- Added the Crater guard back

- Changed the silhouettes in the credits to be more prominent Pokemon (Leader and E4 aces, plus some postgame teasers in Omega for the Chief fight, and the legendary wings)
This commit is contained in:
MementoMartha 2023-05-25 23:54:19 +01:00
parent 4997045bae
commit 6d4b0f7a4e
13 changed files with 209 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

15
data/maps/hide_show_data.asm
View file

@ -422,12 +422,13 @@ MtMoon1FHS:
db MT_MOON_1F, $0C, SHOW ; HS_MT_MOON_1F_ITEM_5
db MT_MOON_1F, $0D, SHOW ; HS_MT_MOON_1F_ITEM_6
MtMoonB2FHS:
db MT_MOON_B2F, $02, HIDE ; Jessie
db MT_MOON_B2F, $06, HIDE ; James
db MT_MOON_B2F, $07, SHOW ; Fossil 1
db MT_MOON_B2F, $08, SHOW ; Fossil 2
db MT_MOON_B2F, $09, SHOW ; Item 1
db MT_MOON_B2F, $0A, SHOW ; Item 2
db MT_MOON_B2F, $02, HIDE ; HS_MT_MOON_B2F_JESSIE
db MT_MOON_B2F, $06, HIDE ; HS_MT_MOON_B2F_JAMES
db MT_MOON_B2F, $07, SHOW ; HS_MT_MOON_B2F_FOSSIL_1
db MT_MOON_B2F, $08, SHOW ; HS_MT_MOON_B2F_FOSSIL_2
db MT_MOON_B2F, $09, SHOW ; HS_MT_MOON_B2F_ITEM_1
db MT_MOON_B2F, $0A, SHOW ; HS_MT_MOON_B2F_ITEM_2
db MT_MOON_B2F, $0B, HIDE ; HS_MT_MOON_CRATER_GUARD
SSAnne2FHS:
db SS_ANNE_2F, $02, HIDE ; HS_SS_ANNE_2F_RIVAL
SSAnne1FRoomsHS:
@ -601,8 +602,6 @@ MtMoonCraterHS:
db MT_MOON_CRATER, $07, SHOW ; HS_MT_MOON_CRATER_ITEM_7
db MT_MOON_CRATER, $08, SHOW ; HS_MT_MOON_CRATER_ITEM_8
db MT_MOON_CRATER, $09, SHOW ; HS_MT_MOON_CRATER_ITEM_9
db MT_MOON_CRATER, $0A, SHOW ; HS_MT_MOON_CRATER_ITEM_10
db MT_MOON_CRATER, $0B, SHOW ; HS_MT_MOON_CRATER_ITEM_11
GiovannisRoomHS:
db GIOVANNIS_ROOM, $05, SHOW ; HS_GIOVANNIS_ROOM_ITEM_1
db GIOVANNIS_ROOM, $06, SHOW ; HS_GIOVANNIS_ROOM_ITEM_2

5
data/maps/objects/MtMoonB2F.asm
View file

@ -14,12 +14,13 @@ MtMoonB2F_Object:
object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
object_event 9, 3, SPRITE_JESSIE, STAY, LEFT, 2
object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2
object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3
object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 4, OPP_ROCKET, 3
object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 1
object_event 9, 4, SPRITE_JAMES, STAY, LEFT, 6
object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 8 ; person
object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 9, HP_UP
object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 10, WING_FOSSIL
object_event 35, 6, SPRITE_FOSSIL, STAY, NONE, 10, WING_FOSSIL
object_event 29, 8, SPRITE_SCIENTIST, STAY, NONE, 11, ; Crater Guard
def_warps_to MT_MOON_B2F

16
data/maps/objects/MtMoonCrater.asm
View file

@ -2,8 +2,8 @@ MtMoonCrater_Object:
db $03 ; border block
def_warp_events
warp_event 23, 49, MT_MOON_SQUARE, 3
warp_event 22, 49, MT_MOON_SQUARE, 3
warp_event 23, 49, MT_MOON_SQUARE, 2
warp_event 22, 49, MT_MOON_SQUARE, 2
def_bg_events
@ -12,12 +12,10 @@ MtMoonCrater_Object:
object_event 33, 17, SPRITE_FOSSIL, STAY, NONE, 2, DOME_FOSSIL
object_event 25, 21, SPRITE_FOSSIL, STAY, NONE, 3, WING_FOSSIL
object_event 33, 16, SPRITE_FOSSIL, STAY, NONE, 4, HELIX_FOSSIL
object_event 26, 20, SPRITE_FOSSIL, STAY, NONE, 5, OLD_AMBER
object_event 25, 4, SPRITE_POKE_BALL, STAY, NONE, 6, HYPER_POTION
object_event 45, 24, SPRITE_POKE_BALL, STAY, NONE, 7, MAX_ETHER
object_event 44, 17, SPRITE_POKE_BALL, STAY, NONE, 8, MAX_REVIVE
object_event 17, 20, SPRITE_POKE_BALL, STAY, NONE, 9, HEART_STONE
object_event 20, 20, SPRITE_POKE_BALL, STAY, NONE, 10, POISON_STONE
object_event 32, 45, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_ETHER
object_event 45, 24, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_ETHER
object_event 44, 17, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_REVIVE
object_event 17, 20, SPRITE_POKE_BALL, STAY, NONE, 7, HEART_STONE
object_event 20, 20, SPRITE_POKE_BALL, STAY, NONE, 8, POISON_STONE
object_event 32, 45, SPRITE_POKE_BALL, STAY, NONE, 9, MAX_ETHER
def_warps_to MT_MOON_CRATER

5
data/maps/objects/MtMoonSquare.asm
View file

@ -2,10 +2,9 @@ MtMoonSquare_Object:
db $2C ; border block
def_warp_events
warp_event 16, 3, MT_MOON_1F, 10
warp_event 20, 9, MT_MOON_1F, 10
warp_event 16, 3, MT_MOON_B1F, 10
warp_event 22, 1, MT_MOON_CRATER, 1
warp_event 11, 5, MT_MOON_SQUARE_HOUSE, 2
warp_event 11, 5, MT_MOON_SQUARE_HOUSE, 1
def_bg_events
bg_event 15, 5, 4 ; Sign

4
data/maps/objects/MtMoonSquareHouse.asm
View file

@ -2,8 +2,8 @@ MtMoonSquareHouse_Object:
db $a ; border block
def_warp_events
warp_event 4, 7, MT_MOON_SQUARE, 4
warp_event 5, 7, MT_MOON_SQUARE, 4
warp_event 4, 7, MT_MOON_SQUARE, 3
warp_event 5, 7, MT_MOON_SQUARE, 3
def_bg_events