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

Finish decompiling field_specials

Browse Source
This commit is contained in:
Diegoisawesome
2018-08-11 14:51:54 -07:00
parent 1e0f3ec433
commit b54793be91
15 changed files with 1060 additions and 1897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_specials.s
-1320
View File
File diff suppressed because it is too large Load Diff
data/event_scripts.s
+4 -4
View File
@@ -1110,10 +1110,10 @@ EventScript_2715DE:: @ 82715DE
setflag FLAG_0x2DE setflag FLAG_0x2DE
setflag FLAG_0x351 setflag FLAG_0x351
setflag FLAG_0x32F setflag FLAG_0x32F
setflag FLAG_0x315 setflag FLAG_HIDE_FANCLUB_OLD_LADY
setflag FLAG_0x316 setflag FLAG_HIDE_FANCLUB_BOY
setflag FLAG_0x317 setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
setflag FLAG_0x318 setflag FLAG_HIDE_FANCLUB_LADY
setflag FLAG_0x2DA setflag FLAG_0x2DA
setflag FLAG_0x31D setflag FLAG_0x31D
setflag FLAG_0x31E setflag FLAG_0x31E
data/field_specials.s
-23
View File
@@ -1,23 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_085B3420:: @ 85B3420
.byte 0x02, 0x04, 0x01, 0x04, 0x04, 0x01, 0x05, 0x00, 0x01, 0x06, 0x03, 0x01, 0x08, 0x06, 0x01, 0x09, 0x0d, 0x01, 0x0a, 0x07, 0x01, 0x0b, 0x07, 0x01, 0x0c, 0x04, 0x01, 0x0e, 0x05, 0x01, 0x0f, 0x04
.byte 0x01, 0x1a, 0x37, 0x01
.align 1
gUnknown_085B3444:: @ 85B3444
.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
.2byte 0x1a35, 0x1918, 0x1919, 0x191a, 0x191b, 0xffff
gUnknown_085B3470:: @ 85B3470
.byte 0x02, 0x01, 0x02, 0x01
gUnknown_085B3474:: @ 85B3474
.byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
gUnknown_085B347C:: @ 85B347C
.byte 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+66 -66
View File
@@ -4,7 +4,7 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
.byte 0 .byte 0
LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
map_script_2 VAR_0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
.2byte 0 .2byte 0
LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
@@ -24,7 +24,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
waitmovement 0 waitmovement 0
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
waitmovement 0 waitmovement 0
setvar VAR_0x4095, 2 setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2
releaseall releaseall
end end
@@ -62,45 +62,45 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D
call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA
compare VAR_0x4095, 1 compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8
compare VAR_0x4095, 2 compare VAR_LILYCOVE_FAN_CLUB_STATE, 2
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829
special sub_813BCE8 special UpdateMovedLilycoveFanClubMembers
call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5 call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
end end
@@ -120,35 +120,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
setvar VAR_0x8005, 8 setvar VAR_0x8005, 8
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
compare VAR_0x8005, 5 compare VAR_0x8005, 5
@@ -208,13 +208,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_813BDB4 special BufferStreakTrainerText
compare VAR_0x4095, 0 compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4
@@ -222,7 +222,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4
@@ -248,13 +248,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
compare VAR_0x4095, 0 compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4
@@ -262,7 +262,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4
@@ -288,13 +288,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_813BDB4 special BufferStreakTrainerText
compare VAR_0x4095, 0 compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4
@@ -302,7 +302,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4
@@ -328,13 +328,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_813BDB4 special BufferStreakTrainerText
compare VAR_0x4095, 0 compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4
@@ -342,7 +342,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4
@@ -368,11 +368,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special sub_813BDB4 special BufferStreakTrainerText
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4
@@ -380,7 +380,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4
@@ -401,11 +401,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_813BDB4 special BufferStreakTrainerText
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4
@@ -413,7 +413,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4
@@ -434,11 +434,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
special sub_813BDB4 special BufferStreakTrainerText
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4
@@ -446,7 +446,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4
@@ -467,11 +467,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_813BDB4 special BufferStreakTrainerText
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4
@@ -479,7 +479,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4
@@ -512,7 +512,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF
copyvar VAR_0x800A, VAR_0x8006 copyvar VAR_0x800A, VAR_0x8006
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
@@ -532,7 +532,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
@@ -542,7 +542,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
@@ -557,7 +557,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
message LilycoveCity_PokemonTrainerFanClub_Text_281C95 message LilycoveCity_PokemonTrainerFanClub_Text_281C95
waitmessage waitmessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
@@ -568,7 +568,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
copyvar VAR_0x8006, VAR_0x800A copyvar VAR_0x8006, VAR_0x800A
copyvar VAR_0x8005, VAR_RESULT copyvar VAR_0x8005, VAR_RESULT
special PutFanClubSpecialOnTheAir special PutFanClubSpecialOnTheAir
@@ -577,7 +577,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
@@ -587,14 +587,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4
release release
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4
setflag FLAG_0x0D2 setflag FLAG_0x0D2
release release
@@ -602,7 +602,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4
release release
end end
data/specials.inc
+4 -4
View File
@@ -174,11 +174,11 @@ gSpecials:: @ 81DBA64
def_special GetFirstFreePokeblockSlot def_special GetFirstFreePokeblockSlot
def_special DoBerryBlending def_special DoBerryBlending
def_special sub_8142BC8 def_special sub_8142BC8
def_special sub_813BD60 def_special ShouldMoveLilycoveFanClubMember
def_special sub_813BCA8 def_special GetNumMovedLilycoveFanClubMembers
def_special sub_813BDB4 def_special BufferStreakTrainerText
def_special sub_813BA30 def_special sub_813BA30
def_special sub_813BCE8 def_special UpdateMovedLilycoveFanClubMembers
def_special sub_813BF60 def_special sub_813BF60
def_special sub_813BA60 def_special sub_813BA60
def_special sub_813BF7C def_special sub_813BF7C
include/cable_club.h
+3
View File
@@ -1,6 +1,8 @@
#ifndef GUARD_CABLE_CLUB_H #ifndef GUARD_CABLE_CLUB_H
#define GUARD_CABLE_CLUB_H #define GUARD_CABLE_CLUB_H
#include "task.h"
// Exported type declarations // Exported type declarations
// Exported RAM declarations // Exported RAM declarations
@@ -11,5 +13,6 @@ void sub_80B37D4(TaskFunc taskFunc);
u8 sub_80B3050(void); u8 sub_80B3050(void);
void sub_80B360C(void); void sub_80B360C(void);
bool32 sub_80B2AF4(u16 *arg0, u16 *arg1); bool32 sub_80B2AF4(u16 *arg0, u16 *arg1);
void sub_80B3AF8(u8 taskId);
#endif //GUARD_CABLE_CLUB_H #endif //GUARD_CABLE_CLUB_H
include/constants/flags.h
+4 -4
View File
@@ -790,10 +790,10 @@
#define FLAG_0x312 0x312 #define FLAG_0x312 0x312
#define FLAG_0x313 0x313 #define FLAG_0x313 0x313
#define FLAG_0x314 0x314 #define FLAG_0x314 0x314
#define FLAG_0x315 0x315 #define FLAG_HIDE_FANCLUB_OLD_LADY 0x315
#define FLAG_0x316 0x316 #define FLAG_HIDE_FANCLUB_BOY 0x316
#define FLAG_0x317 0x317 #define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317
#define FLAG_0x318 0x318 #define FLAG_HIDE_FANCLUB_LADY 0x318
#define FLAG_0x319 0x319 #define FLAG_0x319 0x319
#define FLAG_0x31A 0x31A #define FLAG_0x31A 0x31A
#define FLAG_0x31B 0x31B #define FLAG_0x31B 0x31B
include/constants/vars.h
+3 -3
View File
@@ -81,8 +81,8 @@
#define VAR_ALTERING_CAVE_WILD_SET 0x403E #define VAR_ALTERING_CAVE_WILD_SET 0x403E
#define VAR_0x403F 0x403F #define VAR_0x403F 0x403F
#define VAR_DAYS 0x4040 #define VAR_DAYS 0x4040
#define VAR_0x4041 0x4041 #define VAR_FANCLUB_UNKNOWN_1 0x4041
#define VAR_0x4042 0x4042 #define VAR_FANCLUB_UNKNOWN_2 0x4042
#define VAR_DEPT_STORE_FLOOR 0x4043 #define VAR_DEPT_STORE_FLOOR 0x4043
#define VAR_0x4044 0x4044 #define VAR_0x4044 0x4044
#define VAR_POKELOT_PRIZE 0x4045 #define VAR_POKELOT_PRIZE 0x4045
@@ -165,7 +165,7 @@
#define VAR_0x4092 0x4092 #define VAR_0x4092 0x4092
#define VAR_0x4093 0x4093 #define VAR_0x4093 0x4093
#define VAR_0x4094 0x4094 #define VAR_0x4094 0x4094
#define VAR_0x4095 0x4095 #define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095
#define VAR_0x4096 0x4096 #define VAR_0x4096 0x4096
#define VAR_0x4097 0x4097 #define VAR_0x4097 0x4097
#define VAR_0x4098 0x4098 #define VAR_0x4098 0x4098
include/field_screen.h
+1
View File
@@ -15,5 +15,6 @@ void sub_80AC3D0(void);
void sub_80AC3E4(void); void sub_80AC3E4(void);
void PreservePaletteInWeather(u8); void PreservePaletteInWeather(u8);
void sub_80AF128(void); void sub_80AF128(void);
void sub_80AB104(u8);
#endif //GUARD_FIELD_SCREEN_H #endif //GUARD_FIELD_SCREEN_H
include/global.h
+10
View File
@@ -163,6 +163,16 @@ enum
OPTIONS_BATTLE_STYLE_SET OPTIONS_BATTLE_STYLE_SET
}; };
struct Coords8 {
s8 x;
s8 y;
};
struct UCoords8 {
u8 x;
u8 y;
};
struct Coords16 struct Coords16
{ {
s16 x; s16 x;
include/match_call.h
+2
View File
@@ -10,4 +10,6 @@ enum {
MATCH_CALL_TYPE_GYMLEADER_ELITEFOUR MATCH_CALL_TYPE_GYMLEADER_ELITEFOUR
}; };
s32 GetRematchIdxByTrainerIdx(s32 trainerIdx);
#endif //GUARD_MATCH_CALL_H #endif //GUARD_MATCH_CALL_H
include/strings.h
+9
View File
@@ -753,4 +753,13 @@ extern const u8 BattleFrontier_Lounge7_Text_26615F[];
extern const u8 BattleFrontier_Lounge7_Text_266185[]; extern const u8 BattleFrontier_Lounge7_Text_266185[];
extern const u8 BattleFrontier_Lounge7_Text_2661B5[]; extern const u8 BattleFrontier_Lounge7_Text_2661B5[];
extern const u8 gText_YourPartnerHasRetired[];
extern const u8 gText_Wallace[];
extern const u8 gText_Steven[];
extern const u8 gText_Brawly[];
extern const u8 gText_Winona[];
extern const u8 gText_Phoebe[];
extern const u8 gText_Glacia[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H
ld_script.txt
-2
View File
@@ -181,7 +181,6 @@ SECTIONS {
src/birch_pc.o(.text); src/birch_pc.o(.text);
src/hof_pc.o(.text); src/hof_pc.o(.text);
src/field_specials.o(.text); src/field_specials.o(.text);
asm/field_specials.o(.text);
src/battle_records.o(.text); src/battle_records.o(.text);
asm/pokedex_area_screen.o(.text); asm/pokedex_area_screen.o(.text);
src/evolution_scene.o(.text); src/evolution_scene.o(.text);
@@ -471,7 +470,6 @@ SECTIONS {
src/fldeff_flash.o(.rodata); src/fldeff_flash.o(.rodata);
src/time_events.o(.rodata); src/time_events.o(.rodata);
src/field_specials.o(.rodata); src/field_specials.o(.rodata);
data/field_specials.o(.rodata);
src/battle_records.o(.rodata); src/battle_records.o(.rodata);
data/pokedex_area_screen.o(.rodata); data/pokedex_area_screen.o(.rodata);
src/evolution_scene.o(.rodata); src/evolution_scene.o(.rodata);
src/field_specials.c
+954 -467
View File
File diff suppressed because it is too large Load Diff
sym_ewram.txt
-4
View File
@@ -604,10 +604,6 @@ gPlayerFacingPosition: @ 203AB40
.include "src/pokeblock.o" .include "src/pokeblock.o"
.include "src/field_specials.o" .include "src/field_specials.o"
gUnknown_0203AB70: @ 203AB70
.space 0x4
.include "src/battle_records.o" .include "src/battle_records.o"
gUnknown_0203AB7C: @ 203AB7C gUnknown_0203AB7C: @ 203AB7C