Add regional trades, break trade limit

All over the place! S.S. Anne doesn't work properly though.

Thanks to Chatot4444 for bypassing the trade limit.
This commit is contained in:
Llinos Evans 2023-04-09 18:56:19 +01:00
parent 56793e1d11
commit 77fd55ea49
20 changed files with 265 additions and 42 deletions

View file

@ -13,5 +13,6 @@ CinnabarPokecenter_Object:
object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 9, 6, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 5 ; spamton
object_event 8, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 6 ; Muk Trader
def_warps_to CINNABAR_POKECENTER

View file

@ -24,5 +24,6 @@ SSAnne1FRooms_Object:
object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM
object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person
object_event 0, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Perrserker Trader
object_event 20, 14, SPRITE_GAMEBOY_KID, STAY, DOWN, 13 ; Weezing Trader
def_warps_to SS_ANNE_1F_ROOMS

View file

@ -32,5 +32,8 @@ SSAnne2FRooms_Object:
object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 12 ; person
object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, 13 ; person
object_event 0, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 14 ; Sirfetch'd Trader
object_event 0, 13, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Mr. Rime Trader
object_event 0, 13, SPRITE_GAMEBOY_KID, STAY, DOWN, 13 ; Rapidash Trader
def_warps_to SS_ANNE_2F_ROOMS

View file

@ -2,6 +2,7 @@ SSAnneB1F_Object:
db $c ; border block
def_warp_events
warp_event 3, 3, SS_ANNE_B1F_ROOMS, 11
warp_event 23, 3, SS_ANNE_B1F_ROOMS, 9
warp_event 19, 3, SS_ANNE_B1F_ROOMS, 7
warp_event 15, 3, SS_ANNE_B1F_ROOMS, 5

View file

@ -12,6 +12,8 @@ SSAnneB1FRooms_Object:
warp_event 3, 15, SS_ANNE_B1F, 2
warp_event 12, 15, SS_ANNE_B1F, 1
warp_event 13, 15, SS_ANNE_B1F, 1
warp_event 22, 15, SS_ANNE_B1F, 6
warp_event 23, 15, SS_ANNE_B1F, 6
def_bg_events
@ -27,6 +29,8 @@ SSAnneB1FRooms_Object:
object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER
object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST
object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION
object_event 0, 13, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Mr. Rime Trader
object_event 23, 14, SPRITE_ROCKER, STAY, LEFT, 15 ; Tauros C Trader
object_event 20, 13, SPRITE_ROCKER, STAY, RIGHT, 16 ; Tauros A Trader
object_event 22, 11, SPRITE_ROCKER, STAY, DOWN, 17 ; Tauros B Trader
def_warps_to SS_ANNE_B1F_ROOMS

View file

@ -13,6 +13,7 @@ SSAnneBow_Object:
object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 1
object_event 10, 8, SPRITE_SAILOR, STAY, UP, 5, OPP_SAILOR, 2
object_event 10, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 6 ; Rapidash Trader
object_event 10, 2, SPRITE_GAMEBOY_KID, STAY, UP, 6 ; Slowbro Trader
object_event 9, 2, SPRITE_GAMEBOY_KID, STAY, UP, 7 ; Slowking Trader
def_warps_to SS_ANNE_BOW