dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Almost done with trade

Browse Source
This commit is contained in:
Diegoisawesome
2018-12-29 12:46:15 -06:00
parent 146ad2bdd4
commit 2fb9f490fb
11 changed files with 629 additions and 1748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BattleFrontier_Lounge6/scripts.inc
+4 -4
View File
@@ -7,7 +7,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
compare VAR_0x8004, 255
goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne BattleFrontier_Lounge6_EventScript_265075
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
special sub_807F0E4
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
setflag FLAG_0x09C
data/maps/FortreeCity_House1/scripts.inc
+4 -4
View File
@@ -7,7 +7,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
goto_if_set FLAG_0x09B, FortreeCity_House1_EventScript_216355
setvar VAR_0x8008, 1
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
compare VAR_0x8004, 255
goto_if_eq FortreeCity_House1_EventScript_21633D
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne FortreeCity_House1_EventScript_216347
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
special sub_807F0E4
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
bufferspeciesname 0, VAR_0x8009
msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT
data/maps/PacifidlogTown_House3/scripts.inc
+4 -4
View File
@@ -7,7 +7,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
goto_if_set FLAG_0x09A, PacifidlogTown_House3_EventScript_203CAB
setvar VAR_0x8008, 2
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11
compare VAR_0x8004, 255
goto_if_eq PacifidlogTown_House3_EventScript_203C93
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne PacifidlogTown_House3_EventScript_203C9D
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
special sub_807F0E4
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
bufferspeciesname 0, VAR_0x8009
msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT
data/maps/RustboroCity_House1/scripts.inc
+4 -4
View File
@@ -7,7 +7,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F
goto_if_set FLAG_0x099, RustboroCity_House1_EventScript_2159D5
setvar VAR_0x8008, 0
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F
compare VAR_0x8004, 255
goto_if_eq RustboroCity_House1_EventScript_2159BD
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne RustboroCity_House1_EventScript_2159C7
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
special sub_807F0E4
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT
setflag FLAG_0x099
data/specials.inc
+4 -4
View File
@@ -263,10 +263,10 @@ gSpecials:: @ 81DBA64
def_special BedroomPC
def_special PlayerPC
def_special FieldShowRegionMap
def_special sub_807E73C
def_special sub_807EA10
def_special sub_807F0E4
def_special sub_807E9D4
def_special GetInGameTradeSpeciesInfo
def_special CreateInGameTradePokemon
def_special DoInGameTradeScene
def_special GetTradeSpecies
def_special GetWeekCount
def_special RetrieveLotteryNumber
def_special PickLotteryCornerTicket
data/trade.s
+2 -2
View File
@@ -617,7 +617,7 @@ gIngameTrades:: @ 8338ED0
.2byte SPECIES_SKITTY
.align 2
gUnknown_08338FC0:: @ 8338FC0
gIngameTradeMail:: @ 8338FC0
.2byte 0x1006, 0x1232, 0x102f, 0x0161, 0x0c00, 0x0182, 0x1000, 0x1006, 0x0e3b, 0x0000, 0x0a01, 0x1000, 0x161e, 0x018b, 0x0433, 0x1611
.2byte 0x180f, 0x0074, 0x1440, 0x0000, 0x0811, 0x102b, 0x013b, 0x2a34, 0x0c16, 0x1037, 0x1020, 0x0418, 0x0c23, 0x0000
@@ -634,7 +634,7 @@ gUnknown_0833900C:: @ 833900C
gUnknown_08339014:: @ 8339014
.4byte 0x000001fc, 0x00002051, 0x00002326, 0x00003063
gUnknown_08339024:: @ 8339024
gTradeBallVerticalVelocityTable:: @ 8339024
.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xfe, 0xfe, 0xfe
.byte 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04
.byte 0x04, 0x04, 0xfc, 0xfd, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0xfc, 0xfd, 0xfe, 0xff