Merge pull request #13 from PlagueVonKarma/BattleTentPort

Battle Tent Port
This commit is contained in:
Llinos Evans 2023-05-14 20:39:13 +01:00 committed by GitHub
commit 3894953698
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 1385 additions and 22 deletions

View file

@ -0,0 +1,2 @@
map_header BattleTent, BATTLE_TENT, CLUB, 0
end_map_header

View file

@ -253,6 +253,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw GiovannisRoomHS
dw NoHS
assert_table_length NUM_MAPS
dw -1 ; end

View file

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

View file

@ -251,4 +251,5 @@ MapHeaderPointers::
dw AgathasRoom_h
dw RockTunnelB1F_h
dw GiovannisRoom_h
dw BattleTent_h
assert_table_length NUM_MAPS

View file

@ -0,0 +1,17 @@
BattleTent_Object: ; 0x1dd9b (size=38)
db $e ; border block
def_warp_events
warp_event 2, 19, CITRINE_CITY, 6
warp_event 3, 19, CITRINE_CITY, 6
def_bg_events
def_object_events
object_event 2, 14, SPRITE_WAITER, STAY, DOWN, 1 ; person
object_event 7, 14, SPRITE_CLERK, STAY, DOWN, 2 ; person
object_event 2, 4, SPRITE_WAITER, STAY, RIGHT, 3 ; person
object_event 10, 4, SPRITE_YOUNGSTER, STAY, LEFT, 4 ; person
def_warps_to BATTLE_TENT

View file

@ -7,6 +7,7 @@ CitrineCity_Object:
warp_event 15, 17, CITRINE_POKECENTER, 1
warp_event 15, 27, CITRINE_MART, 1
warp_event 22, 5, GARNET_CAVERN_1F, 1
warp_event 11, 7, BATTLE_TENT, 1
warp_event 35, 31, VERMILION_CITY, 6
warp_event 35, 30, VERMILION_CITY, 6

View file

@ -250,4 +250,5 @@ MapSongBanks::
db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
db MUSIC_DUNGEON2, 0 ; GIOVANNIS_ROOM
db MUSIC_GYM, 0 ; BATTLE_TENT
assert_table_length NUM_MAPS

View file

@ -126,4 +126,5 @@ InternalMapEntries:
internal_map AGATHAS_ROOM, 0, 2, PokemonLeagueName
internal_map ROCK_TUNNEL_B1F, 14, 3, RockTunnelName
internal_map GIOVANNIS_ROOM, 2, 8, ViridianCityName
internal_map BATTLE_TENT, 7, 9, CitrineCityName
db -1 ; end

View file

@ -53,4 +53,5 @@ TownMapOrder:
db BRUNSWICK_TRAIL
db CELESTE_HILL
db FARAWAY_ISLAND_OUTSIDE
db BATTLE_TENT
TownMapOrderEnd: