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

Mt Moon Square, Jessie & James Backport

Browse source 
This adds Victory4 in its original form over Mt. Moon Square's music, which could possibly have the initial jingle removed. I noticed the GSC version was being used, which wasn't ideal.

Mt. Moon Square's map is added, with accessibility where the Crater's originally was (for now). One warp on the south part of the map doesn't go anywhere (actually it's a glitch city). The shop and Clefairy event aren't done yet.

The Mt. Moon Crater Guard has been removed with the pretence of re-adding him on the Square map once it's finished.

I'm trying out having the text in the raw script file without farcalling, which seems to be more optimal than doing it the way the devs originally did it. The Battle Tent does this too.
This commit is contained in:
Llinos Evans 2023-05-15 19:26:42 +01:00
parent b03e9ffc6e
commit 082e581d81
20 changed files with 646 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/headers/MtMoonSquare.asm Normal file
View file

@ -0,0 +1,2 @@
map_header MtMoonSquare, MT_MOON_SQUARE, OVERWORLD, 0
end_map_header

14
data/maps/hide_show_data.asm
View file

@ -253,7 +253,8 @@ MapHSPointers:
dw NoHS
dw NoHS
dw GiovannisRoomHS
dw NoHS
dw NoHS ; Battle Tent
dw NoHS ; Mt Moon Square
assert_table_length NUM_MAPS
dw -1 ; end
@ -420,11 +421,12 @@ 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, $06, SHOW ; HS_MT_MOON_B2F_FOSSIL_1
db MT_MOON_B2F, $07, SHOW ; HS_MT_MOON_B2F_FOSSIL_2
db MT_MOON_B2F, $08, SHOW ; HS_MT_MOON_B2F_ITEM_1
db MT_MOON_B2F, $09, SHOW ; HS_MT_MOON_B2F_ITEM_2
db MT_MOON_B2F, $0A, HIDE ; HS_MT_MOON_CRATER_GUARD
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
SSAnne2FHS:
db SS_ANNE_2F, $02, HIDE ; HS_SS_ANNE_2F_RIVAL
SSAnne1FRoomsHS:

1
data/maps/map_header_banks.asm
View file

@ -252,4 +252,5 @@ MapHeaderBanks::
db BANK(RockTunnelB1F_h)
db BANK(GiovannisRoom_h)
db BANK(BattleTent_h)
db BANK(MtMoonSquare_h)
assert_table_length NUM_MAPS

1
data/maps/map_header_pointers.asm
View file

@ -252,4 +252,5 @@ MapHeaderPointers::
dw RockTunnelB1F_h
dw GiovannisRoom_h
dw BattleTent_h
dw MtMoonSquare_h
assert_table_length NUM_MAPS

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

@ -6,20 +6,20 @@ MtMoonB2F_Object:
warp_event 21, 17, MT_MOON_B1F, 5
warp_event 15, 27, MT_MOON_B1F, 6
warp_event 5, 7, MT_MOON_B1F, 7
warp_event 29, 7, MT_MOON_B1F, 9
warp_event 29, 7, MT_MOON_SQUARE, 1
def_bg_events
def_object_events
object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1
object_event 9, 3, SPRITE_JESSIE, STAY, LEFT, 2
object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2
object_event 34, 25, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3
object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4
object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP
object_event 21, 5, SPRITE_FOSSIL, STAY, NONE, 9, WING_FOSSIL
object_event 29, 7, SPRITE_SCIENTIST, STAY, NONE, 10, ; Crater Guard
object_event 29, 11, SPRITE_ROCKET, STAY, UP, 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 33, 9, SPRITE_POKE_BALL, STAY, NONE, 10, WING_FOSSIL
def_warps_to MT_MOON_B2F

16
data/maps/objects/MtMoonSquare.asm Normal file
View file

@ -0,0 +1,16 @@
MtMoonSquare_Object:
db $2C ; border block
def_warp_events
warp_event 18, 5, MT_MOON_1F, 8
warp_event 22, 11, MT_MOON_1F, 8
warp_event 24, 3, MT_MOON_CRATER, 1
;warp_event 13, 7, MT_MOON_SQUARE_HOUSE, 1
def_bg_events
bg_event 17, 7, 1 ; Sign
def_object_events
object_event 8, 8, SPRITE_CLEFAIRY, STAY, DOWN, 1 ; person
def_warps_to MT_MOON_SQUARE

3
data/maps/songs.asm
View file

@ -119,7 +119,7 @@ MapSongBanks::
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_73 / FARAWAY ISLAND OUTSIDE
db MUSIC_CINNABAR_MANSION, 0 ; UNUSED_MAP_74 / POKEMON MANSION B2F
db MUSIC_MTMOONSQUARE, 0 ; UNUSED_MAP_75 / MT. MOON CRATER
db MUSIC_VICTORY4, 0 ; UNUSED_MAP_75 / MT. MOON CRATER
db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME
db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH
db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM
@ -251,4 +251,5 @@ MapSongBanks::
db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
db MUSIC_DUNGEON2, 0 ; GIOVANNIS_ROOM
db MUSIC_GYM, 0 ; BATTLE_TENT
db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE
assert_table_length NUM_MAPS

1
data/wild/grass_water.asm
View file

@ -251,6 +251,7 @@ WildDataPointers:
dw RockTunnelB1FWildMons
dw NothingWildMons
dw NothingWildMons ; battle tent
dw NothingWildMons ; mt moon square
assert_table_length NUM_MAPS
dw -1 ; end