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

wild encounter, fix merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-11-18 21:45:52 +01:00
parent f8b40754c7 5dc8beb034
commit 3de416662b
59 changed files with 4681 additions and 7626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
data/daycare.s
View File

@@ -1,24 +0,0 @@
@ the third big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ 832ADD8
.include "data/egg_moves.inc"
.align 2
gUnknown_0832B6C0:: @ 832B6C0
.incbin "baserom.gba", 0x32b6c0, 0x20
gUnknown_0832B6E0:: @ 832B6E0
.incbin "baserom.gba", 0x32b6e0, 0x18
gUnknown_0832B6F8:: @ 832B6F8
.incbin "baserom.gba", 0x32b6f8, 0x10
gEggName:: @ 832B708
.string "タマゴ$" @ "tamago" ("egg" in Japanese)

1306
data/egg_moves.inc
View File

File diff suppressed because it is too large Load Diff

44
data/scripts/day_care.inc
View File

@@ -1,8 +1,8 @@
Route117_EventScript_291C18:: @ 8291C18
lock
faceplayer
special sp0B5_daycare
specialvar VAR_RESULT, sp0B6_daycare
special GetDaycareMonNicknames
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 1
goto_eq Route117_EventScript_291C4D
compare_var_to_value VAR_RESULT, 2
@@ -21,8 +21,8 @@ Route117_EventScript_291C4D:: @ 8291C4D
compare_var_to_value VAR_RESULT, 1
goto_eq Route117_EventScript_291C83
msgbox Route117_Text_292149, 4
clearflag FLAG_0x086
special sub_8070728
clearflag FLAG_PENDING_DAYCARE_EGG
special RejectEggFromDayCare
release
end
@@ -40,8 +40,8 @@ Route117_EventScript_291C9D:: @ 8291C9D
waitfanfare
waitbuttonpress
msgbox Route117_Text_2921CF, 4
special sp0B8_daycare
clearflag FLAG_0x086
special GiveEggFromDaycare
clearflag FLAG_PENDING_DAYCARE_EGG
release
end
@@ -56,7 +56,7 @@ Route117_EventScript_291CC8:: @ 8291CC8
return
Route117_EventScript_291CD1:: @ 8291CD1
special sp0B5_daycare
special GetDaycareMonNicknames
msgbox Route117_Text_292114, 4
setvar VAR_0x8004, 0
call Route117_EventScript_291CB7
@@ -64,9 +64,9 @@ Route117_EventScript_291CD1:: @ 8291CD1
end
Route117_EventScript_291CE8:: @ 8291CE8
special sp0B5_daycare
special GetDaycareMonNicknames
msgbox Route117_Text_292299, 4
special sp0B9_daycare_relationship_comment
special SetDaycareCompatibilityString
special sub_8138AC0
waitmessage
waitbuttonpress
@@ -80,7 +80,7 @@ Route117_EventScript_291CE8:: @ 8291CE8
Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11
lock
faceplayer
specialvar VAR_RESULT, sp0B6_daycare
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291E0B
compare_var_to_value VAR_RESULT, 2
@@ -103,21 +103,21 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
goto_eq Route117_PokemonDayCare_EventScript_291E01
msgbox Route117_PokemonDayCare_Text_292349, 4
fadescreen 1
special sub_8071330
special ChooseSendDaycareMon
waitstate
compare_var_to_value VAR_0x8004, 255
goto_eq Route117_PokemonDayCare_EventScript_291DCA
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
compare_var_to_value VAR_RESULT, 0
goto_eq Route117_PokemonDayCare_EventScript_291DF7
specialvar VAR_0x8005, sub_8070C58
specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
waitse
playmoncry VAR_0x8005, 0
msgbox Route117_PokemonDayCare_Text_292370, 4
waitmoncry
special daycare_send_selected_pokemon
special StoreSelectedPokemonInDaycare
incrementgamestat 47
specialvar VAR_RESULT, sp0B6_daycare
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 2
goto_eq Route117_PokemonDayCare_EventScript_291DD4
release
@@ -160,7 +160,7 @@ Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15
return
Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E
specialvar VAR_RESULT, sub_806FF30
specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
compare_var_to_value VAR_RESULT, 0
call_if 5, Route117_PokemonDayCare_EventScript_291E15
return
@@ -182,11 +182,11 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare_var_to_value VAR_RESULT, 6
goto_eq Route117_PokemonDayCare_EventScript_291F3D
specialvar VAR_RESULT, sp0B6_daycare
specialvar VAR_RESULT, GetDaycareState
setvar VAR_0x8004, 0
compare_var_to_value VAR_RESULT, 2
goto_eq Route117_PokemonDayCare_EventScript_291EAC
special sub_80712C0
special ShowDaycareLevelMenu
waitstate
copyvar VAR_0x8004, VAR_RESULT
compare_var_to_value VAR_RESULT, 2
@@ -195,7 +195,7 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
end
Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC
special sub_806FED8
special GetDaycareCost
msgbox Route117_PokemonDayCare_Text_292549, 5
compare_var_to_value VAR_RESULT, 1
goto_eq Route117_PokemonDayCare_EventScript_291EC8
@@ -213,7 +213,7 @@ Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8
Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
applymovement 1, Route117_PokemonDayCare_Movement_291F47
waitmovement 0
specialvar VAR_RESULT, sub_806FDC4
specialvar VAR_RESULT, TakePokemonFromDaycare
special SubtractMoneyFromVar0x8005
playse SE_REGI
msgbox Route117_PokemonDayCare_Text_292575, 4
@@ -221,7 +221,7 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
playmoncry VAR_RESULT, 0
msgbox Route117_PokemonDayCare_Text_292593, 4
waitmoncry
specialvar VAR_RESULT, sp0B6_daycare
specialvar VAR_RESULT, GetDaycareState
compare_var_to_value VAR_RESULT, 2
goto_eq Route117_PokemonDayCare_EventScript_291F24
goto Route117_PokemonDayCare_EventScript_291DCA
@@ -278,12 +278,12 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C
end
Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
special sub_80712C0
special ShowDaycareLevelMenu
waitstate
compare_var_to_value VAR_RESULT, 2
goto_eq Route117_PokemonDayCare_EventScript_291DCA
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, sub_806FDC4
specialvar VAR_RESULT, TakePokemonFromDaycare
msgbox Route117_PokemonDayCare_Text_292575, 4
msgbox Route117_PokemonDayCare_Text_292476, 4
release

2
data/scripts/maps/Route117.inc
View File

@@ -7,7 +7,7 @@ Route117_MapScript1_1F3983: @ 81F3983
end
Route117_EventScript_1F3989:: @ 81F3989
checkflag FLAG_0x086
checkflag FLAG_PENDING_DAYCARE_EGG
goto_if 0, Route117_EventScript_1F3999
setobjectxyperm 3, 47, 6

25
data/specials.inc
View File

@@ -191,18 +191,18 @@ gSpecials:: @ 81DBA64
def_special GabbyAndTyGetLastBattleTrivia
def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds
def_special sub_8138B80
def_special sp0B5_daycare
def_special sp0B6_daycare
def_special sub_8070728
def_special sp0B8_daycare
def_special sp0B9_daycare_relationship_comment
def_special sub_8070C58
def_special daycare_send_selected_pokemon
def_special sub_8071330
def_special sub_80712C0
def_special sub_806FF30
def_special sub_806FED8
def_special sub_806FDC4
def_special GetDaycareMonNicknames
def_special GetDaycareState
def_special RejectEggFromDayCare
def_special GiveEggFromDaycare
def_special SetDaycareCompatibilityString
def_special GetSelectedMonNickAndSpecies
def_special StoreSelectedPokemonInDaycare
def_special ChooseSendDaycareMon
def_special ShowDaycareLevelMenu
def_special GetNumLevelsGainedFromDaycare
def_special GetDaycareCost
def_special TakePokemonFromDaycare
def_special ScriptHatchMon
def_special EggHatch
def_special sub_8071614
@@ -534,4 +534,3 @@ gSpecials:: @ 81DBA64
def_special sub_813C5A0
def_special sub_8139C10
def_special sub_80B3BC4

8
data/strings.s
View File

@@ -5121,16 +5121,16 @@ gText_YouDontHaveThreeCoins:: @ 85EF734
gText_ReelTimeHelp:: @ 85EF750
.string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus.$"
gUnknown_085EF7DA:: @ 85EF7DA
gDaycareText_GetAlongVeryWell:: @ 85EF7DA
.string "The two seem to get along\nvery well.$"
gUnknown_085EF7FF:: @ 85EF7FF
gDaycareText_GetAlong:: @ 85EF7FF
.string "The two seem to get along.$"
gUnknown_085EF81A:: @ 85EF81A
gDaycareText_DontLikeOther:: @ 85EF81A
.string "The two don’t seem to like\neach other much.$"
gUnknown_085EF846:: @ 85EF846
gDaycareText_PlayOther:: @ 85EF846
.string "The two prefer to play with other\nPOKéMON than each other.$"
gText_NewLine2:: @ 85EF881

10
data/trade.s
View File

@@ -19,13 +19,13 @@ gUnknown_0832D2BC:: @ 832D2BC
gUnknown_0832DABC:: @ 832DABC
.incbin "baserom.gba", 0x32dabc, 0xb
gUnknown_0832DAC7:: @ 832DAC7
.incbin "baserom.gba", 0x32dac7, 0x2
gText_MaleSymbol4:: @ 832DAC7
.string "♂$"
gUnknown_0832DAC9:: @ 832DAC9
.incbin "baserom.gba", 0x32dac9, 0x2
gText_FemaleSymbol4:: @ 832DAC9
.string "♀$"
gUnknown_0832DACB:: @ 832DACB
gText_GenderlessSymbol:: @ 832DACB
.incbin "baserom.gba", 0x32dacb, 0x7
gUnknown_0832DAD2:: @ 832DAD2