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

merge with master

Browse Source
This commit is contained in:
DizzyEggg
2018-08-12 12:11:35 +02:00
parent e787d5b602 40cf61307b
commit 957dcd01b3
148 changed files with 6964 additions and 11586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data/event_scripts.s
View File

@@ -5,6 +5,7 @@
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/vars.h"
#include "constants/heal_locations.h"
#include "constants/trainers.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
@@ -1110,10 +1111,10 @@ EventScript_2715DE:: @ 82715DE
setflag FLAG_0x2DE
setflag FLAG_0x351
setflag FLAG_0x32F
setflag FLAG_0x315
setflag FLAG_0x316
setflag FLAG_0x317
setflag FLAG_0x318
setflag FLAG_HIDE_FANCLUB_OLD_LADY
setflag FLAG_HIDE_FANCLUB_BOY
setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
setflag FLAG_HIDE_FANCLUB_LADY
setflag FLAG_0x2DA
setflag FLAG_0x31D
setflag FLAG_0x31E
@@ -2356,8 +2357,8 @@ RusturfTunnel_EventScript_272216:: @ 8272216
removeobject 10
clearflag FLAG_0x328
clearflag FLAG_0x3D8
setvar VAR_0x409A, 6
setflag FLAG_0x0C7
setvar VAR_RUSTURF_TUNNEL_STATE, 6
setflag FLAG_RUSTURF_TUNNEL_OPENED
return
EventScript_27222B:: @ 827222B
@@ -2517,7 +2518,7 @@ Route119_EventScript_272365:: @ 8272365
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq Route119_EventScript_2723C1
compare VAR_RESULT, 4
@@ -3346,7 +3347,7 @@ EventScript_2736D9:: @ 82736D9
end
EventScript_2736F4:: @ 82736F4
setrespawn 16
setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
return
EventScript_2736F8:: @ 82736F8

547
data/field_specials.s
View File

@@ -1,547 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B2B5C:: @ 85B2B5C
.byte 0x07, 0x09, 0x08, 0x0a
.align 2
gUnknown_085B2B60:: @ 85B2B60
.byte 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00
gUnknown_085B2B68:: @ 85B2B68
.byte 0x07, 0x16, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0a, 0x10, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x00
gUnknown_085B2B78:: @ 85B2B78
.byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x00
.align 1
gUnknown_085B2B7E:: @ 85B2B7E
.2byte 0x0218, 0x0219, 0x021a, 0x021b, 0x021c
gUnknown_085B2B88:: @ 85B2B88
.byte 0x0c, 0x02, 0x04, 0x05, 0x01, 0x08, 0x07, 0x0b, 0x03, 0x0a, 0x09, 0x06
gUnknown_085B2B94:: @ 85B2B94
.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x05
gUnknown_085B2BA0:: @ 85B2BA0
.byte 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05
.align 2
gUnknown_085B2BAC:: @ 85B2BAC
.byte 0x00, 0x15, 0x01, 0x08, 0x04, 0x0f, 0x08, 0x00
.align 2
gElevatorFloorsTable:: @ 85B2BB4
.4byte gText_B4F
.4byte gText_B3F
.4byte gText_B2F
.4byte gText_B1F
.4byte gText_1F
.4byte gText_2F
.4byte gText_3F
.4byte gText_4F
.4byte gText_5F
.4byte gText_6F
.4byte gText_7F
.4byte gText_8F
.4byte gText_9F
.4byte gText_10F
.4byte gText_11F
.4byte gText_Rooftop
.align 1
gUnknown_085B2BF4:: @ 85B2BF4
.2byte 0x0329, 0x032a, 0x032b, 0x0331, 0x0332, 0x0333, 0x0339, 0x033a, 0x033b
.align 1
gUnknown_085B2C06:: @ 85B2C06
.2byte 0x0329, 0x032b, 0x032a, 0x0331, 0x0333, 0x0332, 0x0339, 0x033b, 0x033a
gUnknown_085B2C18:: @ 85B2C18
.byte 0x08, 0x10, 0x18, 0x20, 0x26, 0x2e, 0x34, 0x38, 0x39
gUnknown_085B2C21:: @ 85B2C21
.byte 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b
.align 1
gUnknown_085B2C2A:: @ 85B2C2A
.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
.2byte 0x1a35, 0x193c, 0xffff
.align 2
gUnknown_085B2C50:: @ 85B2C50
.4byte BattleFrontier_Lounge2_Text_260971
.4byte BattleFrontier_Lounge2_Text_260A1E
.4byte BattleFrontier_Lounge2_Text_260AE7
.4byte BattleFrontier_Lounge2_Text_2619AC
.4byte BattleFrontier_Lounge2_Text_261A91
.4byte BattleFrontier_Lounge2_Text_261B0C
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_260BC4
.4byte BattleFrontier_Lounge2_Text_260C6D
.4byte BattleFrontier_Lounge2_Text_260D3A
.4byte BattleFrontier_Lounge2_Text_260E1E
.4byte BattleFrontier_Lounge2_Text_260EC7
.4byte BattleFrontier_Lounge2_Text_260F74
.4byte BattleFrontier_Lounge2_Text_2614E6
.4byte BattleFrontier_Lounge2_Text_261591
.4byte BattleFrontier_Lounge2_Text_26166F
.4byte BattleFrontier_Lounge2_Text_261282
.4byte BattleFrontier_Lounge2_Text_261329
.4byte BattleFrontier_Lounge2_Text_261403
.4byte BattleFrontier_Lounge2_Text_261026
.4byte BattleFrontier_Lounge2_Text_2610CC
.4byte BattleFrontier_Lounge2_Text_261194
.4byte BattleFrontier_Lounge2_Text_26174D
.4byte BattleFrontier_Lounge2_Text_2617F9
.4byte BattleFrontier_Lounge2_Text_2618C4
gUnknown_085B2CC8:: @ 85B2CC8
.byte 0x15, 0x38, 0x15, 0x23, 0xff, 0xff, 0xff, 0xff, 0x02, 0x04, 0x07, 0x15, 0x07, 0x15, 0x0e, 0x1c, 0x0d, 0x70, 0x07, 0x38
.align 1
gUnknown_085B2CDC:: @ 85B2CDC
.2byte 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x0031, 0x003f, 0x004d, 0x005b, 0x0000
.align 2
gUnknown_085B2CF0:: @ 85B2CF0
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BlueFlute
.4byte gText_YellowFlute
.4byte gText_RedFlute
.4byte gText_WhiteFlute
.4byte gText_BlackFlute
.4byte gText_PrettyChair
.4byte gText_PrettyDesk
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_0Pts
.4byte gText_10Pts
.4byte gText_20Pts
.4byte gText_30Pts
.4byte gText_40Pts
.4byte gText_50Pts
.4byte gText_60Pts
.4byte gText_70Pts
.4byte gText_80Pts
.4byte gText_90Pts
.4byte gText_100Pts
.4byte gText_QuestionMark
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_KissPoster16BP
.4byte gText_KissCushion32BP
.4byte gText_SmoochumDoll32BP
.4byte gText_TogepiDoll48BP
.4byte gText_MeowthDoll48BP
.4byte gText_ClefairyDoll48BP
.4byte gText_DittoDoll48BP
.4byte gText_CyndaquilDoll80BP
.4byte gText_ChikoritaDoll80BP
.4byte gText_TotodileDoll80BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_LaprasDoll128BP
.4byte gText_SnorlaxDoll128BP
.4byte gText_VenusaurDoll256BP
.4byte gText_CharizardDoll256BP
.4byte gText_BlastoiseDoll256BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Protein1BP
.4byte gText_Calcium1BP
.4byte gText_Iron1BP
.4byte gText_Zinc1BP
.4byte gText_Carbos1BP
.4byte gText_HpUp1BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Leftovers48BP
.4byte gText_WhiteHerb48BP
.4byte gText_QuickClaw48BP
.4byte gText_MentalHerb48BP
.4byte gText_BrightPowder64BP
.4byte gText_ChoiceBand64BP
.4byte gText_KingsRock64BP
.4byte gText_FocusBand64BP
.4byte gText_ScopeLens64BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_EnergyPowder50
.4byte gText_EnergyRoot80
.4byte gText_HealPowder50
.4byte gText_RevivalHerb300
.4byte gText_Protein1000
.4byte gText_Iron1000
.4byte gText_Carbos1000
.4byte gText_Calcium1000
.4byte gText_Zinc1000
.4byte gText_HPUp1000
.4byte gText_PPUp3000
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BattleTower2
.4byte gText_BattleDome
.4byte gText_BattlePalace
.4byte gText_BattleArena
.4byte gText_BattleFactory
.4byte gText_BattlePike
.4byte gText_BattlePyramid
.4byte gText_RankingHall
.4byte gText_ExchangeService
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Softboiled16BP
.4byte gText_SeismicToss24BP
.4byte gText_DreamEater24BP
.4byte gText_MegaPunch24BP
.4byte gText_MegaKick48BP
.4byte gText_BodySlam48BP
.4byte gText_RockSlide48BP
.4byte gText_Counter48BP
.4byte gText_ThunderWave48BP
.4byte gText_SwordsDance48BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_DefenseCurl16BP
.4byte gText_Snore24BP
.4byte gText_MudSlap24BP
.4byte gText_Swift24BP
.4byte gText_IcyWind24BP
.4byte gText_Endure48BP
.4byte gText_PsychUp48BP
.4byte gText_IcePunch48BP
.4byte gText_ThunderPunch48BP
.4byte gText_FirePunch48BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_SlateportCity
.4byte gText_BattleFrontier
.4byte gText_SouthernIsland
.4byte gText_NavelRock
.4byte gText_BirthIsland
.4byte gText_FarawayIsland
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BattleTrainers
.4byte gText_BattleBasics
.4byte gText_PokemonNature
.4byte gText_PokemonMoves
.4byte gText_Underpowered
.4byte gText_WhenInDanger
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.align 2
gUnknown_085B3030:: @ 85B3030
.4byte 0x03000002, 0x00000000, 0x07d00000, 0x00000064
.align 2
gUnknown_085B3040:: @ 85B3040
.4byte BattleFrontier_Lounge5_Text_26468D
.4byte BattleFrontier_Lounge5_Text_2646E5
.4byte BattleFrontier_Lounge5_Text_264741
.4byte BattleFrontier_Lounge5_Text_2647A4
.4byte BattleFrontier_Lounge5_Text_2647FC
.4byte BattleFrontier_Lounge5_Text_264858
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264916
.4byte BattleFrontier_Lounge5_Text_264972
.4byte BattleFrontier_Lounge5_Text_2649D5
.4byte BattleFrontier_Lounge5_Text_264A3F
.4byte BattleFrontier_Lounge5_Text_264A9B
.4byte BattleFrontier_Lounge5_Text_264AF3
.4byte BattleFrontier_Lounge5_Text_264B5D
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264BC3
.4byte BattleFrontier_Lounge5_Text_264C36
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264C95
.4byte BattleFrontier_Lounge5_Text_264D01
.4byte BattleFrontier_Lounge5_Text_264D6B
.4byte BattleFrontier_Lounge5_Text_264DD7
.4byte BattleFrontier_Lounge5_Text_264E33
.4byte BattleFrontier_Lounge5_Text_264E8F
.4byte BattleFrontier_Lounge5_Text_2648BE
.align 2
gUnknown_085B30A4:: @ 85B30A4
.4byte BattleFrontier_Lounge3_Text_262261
.4byte BattleFrontier_Lounge3_Text_26230D
.4byte BattleFrontier_Lounge3_Text_2623B9
.4byte BattleFrontier_Lounge3_Text_262464
.4byte BattleFrontier_Lounge3_Text_26250E
.4byte BattleFrontier_Lounge3_Text_2625B8
.4byte BattleFrontier_Lounge3_Text_26266A
.4byte BattleFrontier_Lounge3_Text_26271C
.4byte BattleFrontier_Lounge3_Text_2627C9
.4byte BattleFrontier_Lounge3_Text_262876
.4byte BattleFrontier_Lounge3_Text_26291A
.4byte BattleFrontier_Lounge3_Text_2629BC
.align 2
gUnknown_085B30D4:: @ 85B30D4
.4byte BattleFrontier_Lounge3_Text_262C04
.4byte BattleFrontier_Lounge3_Text_262C90
.4byte BattleFrontier_Lounge3_Text_262D1C
.4byte BattleFrontier_Lounge3_Text_262DA7
.4byte BattleFrontier_Lounge3_Text_262E34
.4byte BattleFrontier_Lounge3_Text_262EC1
.4byte BattleFrontier_Lounge3_Text_262F56
.4byte BattleFrontier_Lounge3_Text_262FEB
.4byte BattleFrontier_Lounge3_Text_263078
.4byte BattleFrontier_Lounge3_Text_263105
.4byte BattleFrontier_Lounge3_Text_26318C
.4byte BattleFrontier_Lounge3_Text_263211
.align 1
gUnknown_085B3104:: @ 85B3104
.2byte 0x0000, 0x0001, 0x0002, 0x0100, 0x0101, 0x0400, 0x0401, 0x0200, 0x0201, 0x0300, 0x0500, 0x0600
.align 2
gUnknown_085B311C:: @ 85B311C
window_template 0x00, 0x01, 0x01, 0x06, 0x02, 0x0f, 0x0008
.align 2
gUnknown_085B3124:: @ 85B3124
window_template 0x00, 0x02, 0x09, 0x04, 0x04, 0x0f, 0x0014
.align 1
gUnknown_085B312C:: @ 85B312C
.2byte 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff
.align 1
gUnknown_085B3142:: @ 85B3142
.2byte 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff
.align 1
gUnknown_085B314E:: @ 85B314E
.2byte 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff
.align 1
gUnknown_085B315C:: @ 85B315C
.2byte 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff
.align 2
gUnknown_085B3170:: @ 85B3170
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260201
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260287
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E
.4byte gText_Exit
.align 2
gUnknown_085B319C:: @ 85B319C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte gText_Exit
.align 2
gUnknown_085B31B4:: @ 85B31B4
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260397
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260436
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C
.4byte gText_Exit
.align 2
gUnknown_085B31D0:: @ 85B31D0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260542
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260575
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260613
.4byte gText_Exit
.align 1
gUnknown_085B31F8:: @ 85B31F8
.2byte 0x0087, 0x0045, 0x008a, 0x0005, 0x0019, 0x0022, 0x009d, 0x0044, 0x0056, 0x000e
.align 1
gUnknown_085B320C:: @ 85B320C
.2byte 0x006f, 0x00ad, 0x00bd, 0x0081, 0x00c4, 0x00cb, 0x00f4, 0x0008, 0x0009, 0x0007
.align 2
gUnknown_085B3220:: @ 85B3220
window_template 0x00, 0x01, 0x07, 0x0c, 0x06, 0x0f, 0x001c
.align 2
gUnknown_085B3228:: @ 85B3228
.4byte BattleFrontier_Lounge7_Text_265E30
.4byte BattleFrontier_Lounge7_Text_265E5B
.4byte BattleFrontier_Lounge7_Text_265E8A
.4byte BattleFrontier_Lounge7_Text_265EC0
.4byte BattleFrontier_Lounge7_Text_265EED
.4byte BattleFrontier_Lounge7_Text_265F1C
.4byte BattleFrontier_Lounge7_Text_265F47
.4byte BattleFrontier_Lounge7_Text_265F77
.4byte BattleFrontier_Lounge7_Text_265FAA
.4byte BattleFrontier_Lounge7_Text_265FDD
.4byte gText_Exit
.align 2
gUnknown_085B3254:: @ 85B3254
.4byte BattleFrontier_Lounge7_Text_26600A
.4byte BattleFrontier_Lounge7_Text_26603E
.4byte BattleFrontier_Lounge7_Text_266070
.4byte BattleFrontier_Lounge7_Text_2660A6
.4byte BattleFrontier_Lounge7_Text_2660D0
.4byte BattleFrontier_Lounge7_Text_2660FF
.4byte BattleFrontier_Lounge7_Text_26612D
.4byte BattleFrontier_Lounge7_Text_26615F
.4byte BattleFrontier_Lounge7_Text_266185
.4byte BattleFrontier_Lounge7_Text_2661B5
.4byte gText_Exit
.align 2
gUnknown_085B3280:: @ 85B3280
.incbin "graphics/unknown/unknown_5B3280.gbapal"
gUnknown_085B33E0:: @ 85B33E0
.byte 0x0f, 0x0c, 0x0b, 0x0e, 0x0f, 0x08, 0x13, 0x0e, 0x0c, 0x0b, 0x12, 0x0b, 0x0f, 0x0e, 0x0b, 0x0e, 0x13, 0x0e, 0x0f, 0x0f, 0x0f, 0x0a
gUnknown_085B33F6:: @ 85B33F6
.byte 0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x06, 0x03, 0x03
gUnknown_085B3400:: @ 85B3400
.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
gUnknown_085B3410:: @ 85B3410
.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
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

8
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
View File

@@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect 54
specialvar VAR_RESULT, sub_81392F8
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3
waitfieldeffect 54
@@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C
end
AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
specialvar VAR_RESULT, sub_81392AC
specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
compare VAR_RESULT, 1
goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32
delay 20
@@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect 54
specialvar VAR_RESULT, sub_8139320
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3
waitfieldeffect 54
@@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
setfieldeffectargument 1, 6
setfieldeffectargument 2, 0
dofieldeffect 54
specialvar VAR_RESULT, sub_81392D4
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3
waitfieldeffect 54

4
data/maps/AncientTomb/scripts.inc
View File

@@ -10,7 +10,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
end
AncientTomb_EventScript_238FCD:: @ 8238FCD
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, AncientTomb_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -75,7 +75,7 @@ AncientTomb_EventScript_23905A:: @ 823905A
special StartRegiBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq AncientTomb_EventScript_2390A1
compare VAR_RESULT, 4

6
data/maps/AquaHideout_B1F/scripts.inc
View File

@@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
end
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, AquaHideout_B1F_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -41,7 +41,7 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 4
@@ -68,7 +68,7 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 4

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

@@ -14,7 +14,7 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
waitmovement 0
special sub_813A080
waitse
special sub_8139A78
special ShakeScreenInElevator
waitstate
delay 48
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E

4
data/maps/BattleFrontier_OutsideEast/scripts.inc
View File

@@ -9,7 +9,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
end
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -134,7 +134,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 4

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

@@ -4,7 +4,7 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
.byte 0
BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
setrespawn 22
setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST
end
BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908

4
data/maps/BirthIsland_Exterior/scripts.inc
View File

@@ -37,7 +37,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
end
BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, BirthIsland_Exterior_EventScript_27374E
removeobject 2
@@ -91,7 +91,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
special BattleSetup_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq BirthIsland_Exterior_EventScript_26803B
compare VAR_RESULT, 4

4
data/maps/DesertRuins/scripts.inc
View File

@@ -10,7 +10,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B
end
DesertRuins_EventScript_22D975:: @ 822D975
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, DesertRuins_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -75,7 +75,7 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
special StartRegiBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq DesertRuins_EventScript_22DA49
compare VAR_RESULT, 4

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

@@ -4,7 +4,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
.byte 0
DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E
setrespawn 15
setrespawn HEAL_LOCATION_DEWFORD_TOWN
call DewfordTown_PokemonCenter_1F_EventScript_2718DE
end

4
data/maps/EverGrandeCity_HallOfFame/scripts.inc
View File

@@ -51,7 +51,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
end
EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
setrespawn 1
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
fadescreenspeed 1, 24
special GameClear
waitstate
@@ -59,7 +59,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
end
EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
setrespawn 2
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
fadescreenspeed 1, 24
special GameClear
waitstate

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

@@ -4,7 +4,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
.byte 0
EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
setrespawn 11
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
checkflag FLAG_0x1CF
call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
end

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

@@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
.byte 0
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
setrespawn 20
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
setflag FLAG_LANDMARK_POKEMON_LEAGUE
checkflag FLAG_0x107
call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED

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

@@ -4,7 +4,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
.byte 0
FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8
setrespawn 17
setrespawn HEAL_LOCATION_FALLARBOR_TOWN
call FallarborTown_PokemonCenter_1F_EventScript_2718DE
end

6
data/maps/FarawayIsland_Interior/scripts.inc
View File

@@ -11,7 +11,7 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
end
FarawayIsland_Interior_EventScript_267D19:: @ 8267D19
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq FarawayIsland_Interior_EventScript_267D4B
compare VAR_RESULT, 4
@@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
end
FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, FarawayIsland_Interior_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -148,7 +148,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
special BattleSetup_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq FarawayIsland_Interior_EventScript_267E96
compare VAR_RESULT, 4

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

@@ -4,7 +4,7 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
.byte 0
FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3
setrespawn 7
setrespawn HEAL_LOCATION_FORTREE_CITY
end
FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7

4
data/maps/InsideOfTruck/scripts.inc
View File

@@ -24,7 +24,7 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04
end
InsideOfTruck_EventScript_23BF20:: @ 823BF20
setrespawn 1
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
setvar VAR_0x4092, 1
setflag FLAG_0x2F7
setflag FLAG_0x2FA
@@ -37,7 +37,7 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20
end
InsideOfTruck_EventScript_23BF46:: @ 823BF46
setrespawn 2
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
setvar VAR_0x4092, 2
setflag FLAG_0x2F6
setflag FLAG_0x2F9

4
data/maps/IslandCave/scripts.inc
View File

@@ -10,7 +10,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A
end
IslandCave_EventScript_238E44:: @ 8238E44
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, IslandCave_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -107,7 +107,7 @@ IslandCave_EventScript_238F58:: @ 8238F58
special StartRegiBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq IslandCave_EventScript_238F9F
compare VAR_RESULT, 4

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

@@ -4,7 +4,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
.byte 0
LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05
setrespawn 16
setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE
end

4
data/maps/LilycoveCity/scripts.inc
View File

@@ -255,7 +255,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
compare VAR_RESULT, 0
goto_eq LilycoveCity_EventScript_1E2E5A
msgbox LilycoveCity_Text_1E3234, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, LilycoveCity_EventScript_1E2EDE
case 1, LilycoveCity_EventScript_1E2EEE
case 2, LilycoveCity_EventScript_1E2EFE
@@ -286,7 +286,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
compare VAR_RESULT, 0
goto_eq LilycoveCity_EventScript_1E2ECD
msgbox LilycoveCity_Text_1E373C, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, LilycoveCity_EventScript_1E2F0E
case 1, LilycoveCity_EventScript_1E2F1E
case 2, LilycoveCity_EventScript_1E2F2E

4
data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
View File

@@ -118,12 +118,12 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA
waitmovement 0
waitse
special sub_8139A78
special ShakeScreenInElevator
waitstate
setflag FLAG_0x002
return
LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
special sub_8139994
special SetDepartmentStoreFloorVar
return

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

@@ -21,7 +21,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
waitmessage
special RetrieveLotteryNumber
copyvar VAR_0x8008, VAR_RESULT
special sub_81397C4
special BufferLottoTicketNumber
msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4
applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8
waitmovement 0

4
data/maps/LilycoveCity_Harbor/scripts.inc
View File

@@ -89,7 +89,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149
msgbox LilycoveCity_Harbor_Text_21E864, 5
compare VAR_RESULT, 0
goto_eq LilycoveCity_Harbor_EventScript_21E5C0
setvar VAR_PORTHOLE, 5
setvar VAR_PORTHOLE_STATE, 5
call LilycoveCity_Harbor_EventScript_21E5CC
warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
waitstate
@@ -398,7 +398,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575
msgbox LilycoveCity_Harbor_Text_21E864, 5
compare VAR_RESULT, 0
goto_eq LilycoveCity_Harbor_EventScript_21E5C0
setvar VAR_PORTHOLE, 5
setvar VAR_PORTHOLE_STATE, 5
call LilycoveCity_Harbor_EventScript_21E5CC
warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
waitstate

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

@@ -4,7 +4,7 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
.byte 0
LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD
setrespawn 8
setrespawn HEAL_LOCATION_LILYCOVE_CITY
goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6
end

132
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
View File

@@ -4,7 +4,7 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
.byte 0
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
LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
@@ -24,7 +24,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
waitmovement 0
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
waitmovement 0
setvar VAR_0x4095, 2
setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2
releaseall
end
@@ -62,45 +62,45 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D
call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA
compare VAR_0x4095, 1
compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8
compare VAR_0x4095, 2
compare VAR_LILYCOVE_FAN_CLUB_STATE, 2
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829
special sub_813BCE8
special UpdateMovedLilycoveFanClubMembers
call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
setvar VAR_0x8004, 8
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8
setvar VAR_0x8004, 9
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
setvar VAR_0x8004, 10
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8
setvar VAR_0x8004, 11
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
setvar VAR_0x8004, 12
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
setvar VAR_0x8004, 13
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0
setvar VAR_0x8004, 14
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
setvar VAR_0x8004, 15
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
end
@@ -120,35 +120,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
setvar VAR_0x8005, 8
setvar VAR_0x8004, 8
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 9
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 10
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 11
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 12
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 13
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 14
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 15
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
compare VAR_0x8005, 5
@@ -208,13 +208,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
lock
faceplayer
setvar VAR_0x8004, 13
special sub_813BDB4
compare VAR_0x4095, 0
special BufferStreakTrainerText
compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4
@@ -222,7 +222,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4
@@ -248,13 +248,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
lock
faceplayer
setvar VAR_0x8004, 8
special sub_813BDB4
compare VAR_0x4095, 0
special BufferStreakTrainerText
compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4
@@ -262,7 +262,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4
@@ -288,13 +288,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
lock
faceplayer
setvar VAR_0x8004, 9
special sub_813BDB4
compare VAR_0x4095, 0
special BufferStreakTrainerText
compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4
@@ -302,7 +302,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4
@@ -328,13 +328,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
lock
faceplayer
setvar VAR_0x8004, 10
special sub_813BDB4
compare VAR_0x4095, 0
special BufferStreakTrainerText
compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9
specialvar VAR_RESULT, sub_813BD60
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4
@@ -342,7 +342,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4
@@ -368,11 +368,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
lock
faceplayer
setvar VAR_0x8004, 11
special sub_813BDB4
specialvar VAR_RESULT, sub_813BD60
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4
@@ -380,7 +380,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4
@@ -401,11 +401,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
lock
faceplayer
setvar VAR_0x8004, 12
special sub_813BDB4
specialvar VAR_RESULT, sub_813BD60
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4
@@ -413,7 +413,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4
@@ -434,11 +434,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
lock
faceplayer
setvar VAR_0x8004, 14
special sub_813BDB4
specialvar VAR_RESULT, sub_813BD60
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4
@@ -446,7 +446,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4
@@ -467,11 +467,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
lock
faceplayer
setvar VAR_0x8004, 15
special sub_813BDB4
specialvar VAR_RESULT, sub_813BD60
special BufferStreakTrainerText
specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4
@@ -479,7 +479,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
specialvar VAR_RESULT, sub_813BCA8
specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4
@@ -512,7 +512,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF
copyvar VAR_0x800A, VAR_0x8006
setvar VAR_0x8004, 8
special sub_813BDB4
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4
setvar VAR_0x8004, 14
copyvar VAR_0x8005, VAR_0x800A
@@ -532,7 +532,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
setvar VAR_0x8004, 8
special sub_813BDB4
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
@@ -542,7 +542,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
setvar VAR_0x8004, 8
special sub_813BDB4
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4
setvar VAR_0x8004, 14
copyvar VAR_0x8005, VAR_0x800A
@@ -557,7 +557,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
setvar VAR_0x8004, 8
special sub_813BDB4
special BufferStreakTrainerText
message LilycoveCity_PokemonTrainerFanClub_Text_281C95
waitmessage
setvar VAR_0x8004, 2
@@ -568,7 +568,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
setvar VAR_0x8004, 8
special sub_813BDB4
special BufferStreakTrainerText
copyvar VAR_0x8006, VAR_0x800A
copyvar VAR_0x8005, VAR_RESULT
special PutFanClubSpecialOnTheAir
@@ -577,7 +577,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
setvar VAR_0x8004, 8
special sub_813BDB4
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5
compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
@@ -587,14 +587,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
setvar VAR_0x8004, 8
special sub_813BDB4
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4
release
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
setvar VAR_0x8004, 8
special sub_813BDB4
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4
setflag FLAG_0x0D2
release
@@ -602,7 +602,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
setvar VAR_0x8004, 8
special sub_813BDB4
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4
release
end

4
data/maps/MarineCave_End/scripts.inc
View File

@@ -9,7 +9,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA
end
MarineCave_End_EventScript_23AFF4:: @ 823AFF4
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, MarineCave_End_EventScript_27374E
removeobject 1
@@ -42,7 +42,7 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
setvar VAR_TEMP_1, 0
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq MarineCave_End_EventScript_23B084
compare VAR_RESULT, 4

26
data/maps/MauvilleCity_GameCorner/scripts.inc
View File

@@ -409,7 +409,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137
msgbox MauvilleCity_GameCorner_Text_210750, 5
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210209
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, MauvilleCity_GameCorner_EventScript_21017C
case 1, MauvilleCity_GameCorner_EventScript_2101A6
case 2, MauvilleCity_GameCorner_EventScript_2101D0
@@ -540,7 +540,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 0
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -551,7 +551,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 1
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -562,7 +562,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 2
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -573,7 +573,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 3
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -584,7 +584,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 4
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -595,7 +595,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 5
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -606,7 +606,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 6
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -617,7 +617,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 7
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -628,7 +628,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 8
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -639,7 +639,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 9
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -650,7 +650,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 10
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end
@@ -661,7 +661,7 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436
compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 11
specialvar VAR_RESULT, sub_8139248
specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT
releaseall
end

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

@@ -4,7 +4,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
.byte 0
MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
setrespawn 5
setrespawn HEAL_LOCATION_MAUVILLE_CITY
call MauvilleCity_PokemonCenter_1F_EventScript_2718DE
goto MauvilleCity_PokemonCenter_1F_EventScript_210E74
end

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

@@ -4,7 +4,7 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
.byte 0
MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A
setrespawn 9
setrespawn HEAL_LOCATION_MOSSDEEP_CITY
end
MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E

4
data/maps/NavelRock_Bottom/scripts.inc
View File

@@ -26,7 +26,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284
end
NavelRock_Bottom_EventScript_26928E:: @ 826928E
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, NavelRock_Bottom_EventScript_27374E
removeobject 1
@@ -64,7 +64,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
special BattleSetup_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq NavelRock_Bottom_EventScript_269336
compare VAR_RESULT, 4

4
data/maps/NavelRock_Top/scripts.inc
View File

@@ -29,7 +29,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151
end
NavelRock_Top_EventScript_26915B:: @ 826915B
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, NavelRock_Top_EventScript_27374E
removeobject 1
@@ -69,7 +69,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
setvar VAR_LAST_TALKED, 1
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq NavelRock_Top_EventScript_269217
compare VAR_RESULT, 4

8
data/maps/NewMauville_Inside/scripts.inc
View File

@@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7
end
NewMauville_Inside_EventScript_237407:: @ 8237407
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, NewMauville_Inside_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -193,7 +193,7 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq NewMauville_Inside_EventScript_2377F3
compare VAR_RESULT, 4
@@ -220,7 +220,7 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq NewMauville_Inside_EventScript_237840
compare VAR_RESULT, 4
@@ -247,7 +247,7 @@ NewMauville_Inside_EventScript_237849:: @ 8237849
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq NewMauville_Inside_EventScript_23788D
compare VAR_RESULT, 4

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

@@ -4,7 +4,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
.byte 0
OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011
setrespawn 14
setrespawn HEAL_LOCATION_OLDALE_TOWN
call OldaleTown_PokemonCenter_1F_EventScript_2718DE
end

8
data/maps/PacifidlogTown_House2/scripts.inc
View File

@@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792
PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE
checkflag FLAG_0x12B
goto_if 0, PacifidlogTown_House2_EventScript_27374E
specialvar VAR_RESULT, sub_813970C
specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
compare VAR_RESULT, 0
call_if 1, PacifidlogTown_House2_EventScript_203812
return
@@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816
compare VAR_RESULT, 0
goto_eq PacifidlogTown_House2_EventScript_272054
setflag FLAG_0x12B
special sub_8139754
special SetPacifidlogTMReceivedDay
msgbox PacifidlogTown_House2_Text_203A85, 4
release
end
@@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F
compare VAR_RESULT, 0
goto_eq PacifidlogTown_House2_EventScript_272054
setflag FLAG_0x12B
special sub_8139754
special SetPacifidlogTMReceivedDay
msgbox PacifidlogTown_House2_Text_203A85, 4
release
end
PacifidlogTown_House2_EventScript_20387E:: @ 820387E
specialvar VAR_RESULT, sub_813970C
specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
buffernumberstring 0, VAR_RESULT
msgbox PacifidlogTown_House2_Text_203AF4, 4
release

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

@@ -4,7 +4,7 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
.byte 0
PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2
setrespawn 19
setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN
end
PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6

8
data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
View File

@@ -4,7 +4,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
.byte 0
PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3
setrespawn 3
setrespawn HEAL_LOCATION_PETALBURG_CITY
call PetalburgCity_PokemonCenter_1F_EventScript_2718DE
end
@@ -35,11 +35,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C
end
PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38
compare VAR_FIRST_POKE, 0
compare VAR_STARTER_MON, 0
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B
compare VAR_FIRST_POKE, 1
compare VAR_STARTER_MON, 1
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64
compare VAR_FIRST_POKE, 2
compare VAR_STARTER_MON, 2
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D
release
end

4
data/maps/Route103/scripts.inc
View File

@@ -38,7 +38,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA
applymovement 2, Route103_Movement_27259A
waitmovement 0
msgbox Route103_Text_1EC7DE, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, Route103_EventScript_1EC48E
case 1, Route103_EventScript_1EC49E
case 2, Route103_EventScript_1EC4AE
@@ -55,7 +55,7 @@ Route103_EventScript_1EC434:: @ 81EC434
applymovement 2, Route103_Movement_27259A
waitmovement 0
msgbox Route103_Text_1EC9CE, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, Route103_EventScript_1EC4BE
case 1, Route103_EventScript_1EC4CE
case 2, Route103_EventScript_1EC4DE

4
data/maps/Route104/scripts.inc
View File

@@ -153,7 +153,7 @@ Route104_EventScript_1ECDD0:: @ 81ECDD0
Route104_EventScript_1ECDED:: @ 81ECDED
msgbox Route104_Text_1EDDDB, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, Route104_EventScript_1ECE36
case 1, Route104_EventScript_1ECE49
case 2, Route104_EventScript_1ECE5C
@@ -230,7 +230,7 @@ Route104_EventScript_1ECEEC:: @ 81ECEEC
Route104_EventScript_1ECF09:: @ 81ECF09
msgbox Route104_Text_1EE0C7, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, Route104_EventScript_1ECF4D
case 1, Route104_EventScript_1ECF60
case 2, Route104_EventScript_1ECF73

4
data/maps/Route110/events.inc
View File

@@ -45,8 +45,8 @@ Route110_MapWarps: @ 8529050
warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
Route110_MapCoordEvents: @ 8529080
coord_event 28, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661
coord_event 29, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661
coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661
coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661
coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D
coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758
coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763

14
data/maps/Route110/scripts.inc
View File

@@ -11,7 +11,7 @@ Route110_MapScript1_1EF279: @ 81EF279
Route110_MapScript1_1EF27D: @ 81EF27D
call Route110_EventScript_271ED7
call Route110_EventScript_271EFB
compare VAR_0x40A9, 1
compare VAR_CYCLING_CHALLENGE_STATE, 1
call_if 1, Route110_EventScript_1EF293
end
@@ -20,12 +20,12 @@ Route110_EventScript_1EF293:: @ 81EF293
return
Route110_MapScript2_1EF297: @ 81EF297
map_script_2 VAR_0x40A9, 1, Route110_EventScript_1EF2A1
map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_1EF2A1
.2byte 0
Route110_EventScript_1EF2A1:: @ 81EF2A1
special Special_BeginCyclingRoadChallenge
setvar VAR_0x40A9, 2
setvar VAR_CYCLING_CHALLENGE_STATE, 2
return
Route110_EventScript_1EF2AA:: @ 81EF2AA
@@ -148,7 +148,7 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7
specialvar VAR_RESULT, GetPlayerAvatarBike
compare VAR_RESULT, 1
goto_eq Route110_EventScript_1EF3E8
compare VAR_0x40A9, 0
compare VAR_CYCLING_CHALLENGE_STATE, 0
goto_eq Route110_EventScript_1EF3DE
msgbox Route110_Text_1F06FB, 4
release
@@ -368,7 +368,7 @@ Route110_EventScript_1EF735:: @ 81EF735
end
Route110_EventScript_1EF743:: @ 81EF743
setvar VAR_0x40A9, 3
setvar VAR_CYCLING_CHALLENGE_STATE, 3
savebgm MUS_DUMMY
fadedefaultbgm
return
@@ -426,7 +426,7 @@ Route110_EventScript_1EF7E6:: @ 81EF7E6
Route110_EventScript_1EF7EB:: @ 81EF7EB
msgbox Route110_Text_1EFC48, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, Route110_EventScript_1EF81A
case 1, Route110_EventScript_1EF82A
case 2, Route110_EventScript_1EF83A
@@ -456,7 +456,7 @@ Route110_EventScript_1EF84A:: @ 81EF84A
Route110_EventScript_1EF865:: @ 81EF865
msgbox Route110_Text_1EFE3F, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, Route110_EventScript_1EF894
case 1, Route110_EventScript_1EF8A4
case 2, Route110_EventScript_1EF8B4

10
data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
View File

@@ -3,14 +3,14 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1
.byte 0
Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7
compare VAR_0x40A9, 3
compare VAR_CYCLING_CHALLENGE_STATE, 3
call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
compare VAR_0x40A9, 2
compare VAR_CYCLING_CHALLENGE_STATE, 2
call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE
setvar VAR_0x40A9, 1
setvar VAR_CYCLING_CHALLENGE_STATE, 1
return
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4
@@ -33,7 +33,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0
end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6
setvar VAR_0x40A9, 1
setvar VAR_CYCLING_CHALLENGE_STATE, 1
return
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC
@@ -50,7 +50,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13
lockall
setvar VAR_0x40A9, 0
setvar VAR_CYCLING_CHALLENGE_STATE, 0
clearflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 0
releaseall

4
data/maps/Route116/scripts.inc
View File

@@ -169,7 +169,7 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6
checkitem ITEM_BLACK_GLASSES, 1
compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2DF1
specialvar VAR_RESULT, sub_8139634
specialvar VAR_RESULT, FoundBlackGlasses
compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2DE2
msgbox Route116_Text_1F3657, 4
@@ -185,7 +185,7 @@ Route116_EventScript_1F2DE2:: @ 81F2DE2
Route116_EventScript_1F2DF1:: @ 81F2DF1
msgbox Route116_Text_1F3657, 4
msgbox Route116_Text_1F3688, 4
specialvar VAR_RESULT, sub_8139634
specialvar VAR_RESULT, FoundBlackGlasses
compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2E1B
msgbox Route116_Text_1F375E, 4

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

@@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863
Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C
lock
faceplayer
checkflag FLAG_0x0C7
checkflag FLAG_RUSTURF_TUNNEL_OPENED
goto_eq Route116_TunnelersRestHouse_EventScript_22B881
msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4
release

6
data/maps/Route119/scripts.inc
View File

@@ -9,7 +9,7 @@ Route119_MapScript1_1F442F: @ 81F442F
end
Route119_EventScript_1F4439:: @ 81F4439
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, Route119_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -80,7 +80,7 @@ Route119_EventScript_1F4506:: @ 81F4506
Route119_EventScript_1F450B:: @ 81F450B
msgbox Route119_Text_1F49FD, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, Route119_EventScript_1F453A
case 1, Route119_EventScript_1F454A
case 2, Route119_EventScript_1F455A
@@ -110,7 +110,7 @@ Route119_EventScript_1F456A:: @ 81F456A
Route119_EventScript_1F4585:: @ 81F4585
msgbox Route119_Text_1F4C9A, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, Route119_EventScript_1F45B4
case 1, Route119_EventScript_1F45C4
case 2, Route119_EventScript_1F45D4

6
data/maps/Route120/scripts.inc
View File

@@ -25,7 +25,7 @@ Route120_EventScript_1F5406:: @ 81F5406
return
Route120_EventScript_1F5449:: @ 81F5449
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, Route120_EventScript_27374E
removeobject 30
@@ -33,7 +33,7 @@ Route120_EventScript_1F5449:: @ 81F5449
return
Route120_EventScript_1F5460:: @ 81F5460
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, Route120_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -220,7 +220,7 @@ Route120_EventScript_1F568B:: @ 81F568B
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq Route120_EventScript_1F571C
compare VAR_RESULT, 4

6
data/maps/RustboroCity/scripts.inc
View File

@@ -306,7 +306,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
clearflag FLAG_0x2DC
setflag FLAG_0x08E
setvar VAR_0x405A, 2
setvar VAR_0x409A, 2
setvar VAR_RUSTURF_TUNNEL_STATE, 2
setvar VAR_0x406F, 1
clearflag FLAG_0x37B
clearflag FLAG_0x370
@@ -869,7 +869,7 @@ RustboroCity_EventScript_1E1070:: @ 81E1070
RustboroCity_EventScript_1E1092:: @ 81E1092
msgbox RustboroCity_Text_1E1C84, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, RustboroCity_EventScript_1E10DB
case 1, RustboroCity_EventScript_1E10EE
case 2, RustboroCity_EventScript_1E1101
@@ -940,7 +940,7 @@ RustboroCity_EventScript_1E1174:: @ 81E1174
RustboroCity_EventScript_1E1191:: @ 81E1191
msgbox RustboroCity_Text_1E1FA9, 4
switch VAR_FIRST_POKE
switch VAR_STARTER_MON
case 0, RustboroCity_EventScript_1E11D5
case 1, RustboroCity_EventScript_1E11E8
case 2, RustboroCity_EventScript_1E11FB

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

@@ -4,7 +4,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
.byte 0
RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D
setrespawn 6
setrespawn HEAL_LOCATION_RUSTBORO_CITY
call RustboroCity_PokemonCenter_1F_EventScript_2718DE
end

4
data/maps/RusturfTunnel/events.inc
View File

@@ -17,8 +17,8 @@ RusturfTunnel_MapWarps: @ 85342B4
RusturfTunnel_MapCoordEvents: @ 85342CC
coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071
coord_event 9, 4, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083
coord_event 9, 5, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083
coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077
coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D

8
data/maps/RusturfTunnel/scripts.inc
View File

@@ -4,12 +4,12 @@ RusturfTunnel_MapScripts:: @ 822CE27
.byte 0
RusturfTunnel_MapScript2_22CE32: @ 822CE32
map_script_2 VAR_0x409A, 4, RusturfTunnel_EventScript_22CEAE
map_script_2 VAR_0x409A, 5, RusturfTunnel_EventScript_22CEAE
map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_22CEAE
map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE
.2byte 0
RusturfTunnel_MapScript1_22CE44: @ 822CE44
compare VAR_0x409A, 2
compare VAR_RUSTURF_TUNNEL_STATE, 2
call_if 1, RusturfTunnel_EventScript_22CE50
end
@@ -288,7 +288,7 @@ RusturfTunnel_EventScript_22D083:: @ 822D083
waitmovement 0
moveobjectoffscreen 6
moveobjectoffscreen 7
setvar VAR_0x409A, 3
setvar VAR_RUSTURF_TUNNEL_STATE, 3
releaseall
end

40
data/maps/SSTidalCorridor/scripts.inc
View File

@@ -4,15 +4,15 @@ SSTidalCorridor_MapScripts:: @ 823BFCF
SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219
map_script_2 VAR_PORTHOLE, 1, SSTidalCorridor_EventScript_23BFFF
map_script_2 VAR_PORTHOLE, 5, SSTidalCorridor_EventScript_23C015
map_script_2 VAR_PORTHOLE, 9, SSTidalCorridor_EventScript_23C067
map_script_2 VAR_PORTHOLE, 10, SSTidalCorridor_EventScript_23C07D
map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF
map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015
map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067
map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_23C07D
.2byte 0
SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
special SetSSTidalFlag
setvar VAR_PORTHOLE, 2
setvar VAR_PORTHOLE_STATE, 2
lockall
playse SE_PINPON
msgbox SSTidalCorridor_Text_23C462, 4
@@ -20,7 +20,7 @@ SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
end
SSTidalCorridor_EventScript_23C015:: @ 823C015
setvar VAR_PORTHOLE, 6
setvar VAR_PORTHOLE_STATE, 6
lockall
playse SE_PINPON
msgbox SSTidalCorridor_Text_23C4E3, 4
@@ -29,28 +29,28 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015
SSTidalRooms_EventScript_23C028:: @ 823C028
special SetSSTidalFlag
setvar VAR_PORTHOLE, 7
setvar VAR_PORTHOLE_STATE, 7
playse SE_PINPON
msgbox SSTidalRooms_Text_23C462, 4
return
SSTidalRooms_EventScript_23C03C:: @ 823C03C
special ResetSSTidalFlag
setvar VAR_PORTHOLE, 4
setvar VAR_PORTHOLE_STATE, 4
playse SE_PINPON
msgbox SSTidalRooms_Text_23C553, 4
return
SSTidalCorridor_EventScript_23C050:: @ 823C050
compare VAR_PORTHOLE, 2
compare VAR_PORTHOLE_STATE, 2
goto_eq SSTidalCorridor_EventScript_23C067
compare VAR_PORTHOLE, 7
compare VAR_PORTHOLE_STATE, 7
goto_eq SSTidalCorridor_EventScript_23C07D
end
SSTidalCorridor_EventScript_23C067:: @ 823C067
special ResetSSTidalFlag
setvar VAR_PORTHOLE, 3
setvar VAR_PORTHOLE_STATE, 3
lockall
playse SE_PINPON
msgbox SSTidalCorridor_Text_23C4E3, 4
@@ -59,7 +59,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067
SSTidalCorridor_EventScript_23C07D:: @ 823C07D
special ResetSSTidalFlag
setvar VAR_PORTHOLE, 8
setvar VAR_PORTHOLE_STATE, 8
lockall
playse SE_PINPON
msgbox SSTidalCorridor_Text_23C50F, 4
@@ -68,13 +68,13 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D
SSTidalRooms_EventScript_23C093:: @ 823C093
special ResetSSTidalFlag
setvar VAR_PORTHOLE, 8
setvar VAR_PORTHOLE_STATE, 8
playse SE_PINPON
msgbox SSTidalRooms_Text_23C50F, 4
return
SSTidalRooms_EventScript_23C0A7:: @ 823C0A7
switch VAR_PORTHOLE
switch VAR_PORTHOLE_STATE
case 2, SSTidalRooms_EventScript_23C03C
case 3, SSTidalRooms_EventScript_23C03C
case 6, SSTidalRooms_EventScript_23C028
@@ -114,16 +114,16 @@ SSTidalCorridor_EventScript_23C110:: @ 823C110
SSTidalCorridor_EventScript_23C119:: @ 823C119
lock
faceplayer
compare VAR_PORTHOLE, 4
compare VAR_PORTHOLE_STATE, 4
goto_eq SSTidalCorridor_EventScript_23C13B
compare VAR_PORTHOLE, 8
compare VAR_PORTHOLE_STATE, 8
goto_eq SSTidalCorridor_EventScript_23C15A
msgbox SSTidalCorridor_Text_23C596, 4
release
end
SSTidalCorridor_EventScript_23C13B:: @ 823C13B
setrespawn 8
setrespawn HEAL_LOCATION_LILYCOVE_CITY
msgbox SSTidalCorridor_Text_23C64F, 4
checkflag FLAG_0x104
call_if 1, SSTidalCorridor_EventScript_23C179
@@ -133,7 +133,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B
end
SSTidalCorridor_EventScript_23C15A:: @ 823C15A
setrespawn 4
setrespawn HEAL_LOCATION_SLATEPORT_CITY
msgbox SSTidalCorridor_Text_23C64F, 4
checkflag FLAG_0x104
call_if 1, SSTidalCorridor_EventScript_23C179
@@ -148,9 +148,9 @@ SSTidalCorridor_EventScript_23C179:: @ 823C179
SSTidalCorridor_EventScript_23C17D:: @ 823C17D
lockall
compare VAR_PORTHOLE, 2
compare VAR_PORTHOLE_STATE, 2
goto_eq SSTidalCorridor_EventScript_23C19E
compare VAR_PORTHOLE, 7
compare VAR_PORTHOLE_STATE, 7
goto_eq SSTidalCorridor_EventScript_23C19E
msgbox SSTidalCorridor_Text_23C6C3, 4
releaseall

4
data/maps/SkyPillar_Top/scripts.inc
View File

@@ -10,7 +10,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8
end
SkyPillar_Top_EventScript_2396D2:: @ 82396D2
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, SkyPillar_Top_EventScript_27374E
removeobject VAR_LAST_TALKED
@@ -56,7 +56,7 @@ SkyPillar_Top_EventScript_239722:: @ 8239722
special BattleSetup_StartLegendaryBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq SkyPillar_Top_EventScript_239768
compare VAR_RESULT, 4

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

@@ -203,7 +203,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92
msgbox SlateportCity_Harbor_Text_20CF93, 5
compare VAR_RESULT, 0
goto_eq SlateportCity_Harbor_EventScript_20CBDD
setvar VAR_PORTHOLE, 1
setvar VAR_PORTHOLE_STATE, 1
call SlateportCity_Harbor_EventScript_20CBE9
warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
waitstate

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

@@ -34,7 +34,7 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3
special TV_CheckMonOTIDEqualsPlayerID
compare VAR_RESULT, 1
goto_eq SlateportCity_House1_EventScript_209B50
specialvar VAR_RESULT, sub_8139770
specialvar VAR_RESULT, MonOTNameMatchesPlayer
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare VAR_RESULT, 1
goto_eq SlateportCity_House1_EventScript_209B50

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

@@ -4,7 +4,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
.byte 0
SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA
setrespawn 4
setrespawn HEAL_LOCATION_SLATEPORT_CITY
call SlateportCity_PokemonCenter_1F_EventScript_2718DE
end

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

@@ -91,7 +91,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E
SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
special SavePlayerParty
special sub_8139238
special BufferEReaderTrainerName
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5
compare VAR_RESULT, 0
goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2

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

@@ -4,7 +4,7 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
.byte 0
SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC
setrespawn 10
setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY
end
SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500

4
data/maps/SouthernIsland_Interior/scripts.inc
View File

@@ -9,7 +9,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
end
SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, SouthernIsland_Interior_EventScript_27374E
removeobject 2
@@ -90,7 +90,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
special BattleSetup_StartLatiBattle
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq SouthernIsland_Interior_EventScript_242B81
compare VAR_RESULT, 4

4
data/maps/TerraCave_End/scripts.inc
View File

@@ -9,7 +9,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB
end
TerraCave_End_EventScript_23B0C5:: @ 823B0C5
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, TerraCave_End_EventScript_27374E
removeobject 1
@@ -42,7 +42,7 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC
waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE
setvar VAR_TEMP_1, 0
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq TerraCave_End_EventScript_23B155
compare VAR_RESULT, 4

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

@@ -50,7 +50,7 @@ TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4
TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
waitse
special sub_8139A78
special ShakeScreenInElevator
waitstate
return

4
data/maps/VerdanturfTown/scripts.inc
View File

@@ -10,7 +10,7 @@ VerdanturfTown_MapScript1_1EB56C: @ 81EB56C
VerdanturfTown_EventScript_1EB575:: @ 81EB575
lock
faceplayer
checkflag FLAG_0x0C7
checkflag FLAG_RUSTURF_TUNNEL_OPENED
goto_eq VerdanturfTown_EventScript_1EB594
msgbox VerdanturfTown_Text_1EB5FD, 4
applymovement 2, VerdanturfTown_Movement_2725A2
@@ -36,7 +36,7 @@ VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1
VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA
lock
faceplayer
checkflag FLAG_0x0C7
checkflag FLAG_RUSTURF_TUNNEL_OPENED
goto_eq VerdanturfTown_EventScript_1EB5CF
msgbox VerdanturfTown_Text_1EB854, 4
release

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

@@ -4,7 +4,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726
.byte 0
VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731
setrespawn 18
setrespawn HEAL_LOCATION_VERDANTURF_TOWN
call VerdanturfTown_PokemonCenter_1F_EventScript_2718DE
end

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

@@ -69,7 +69,7 @@ VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E
goto_eq VerdanturfTown_WandasHouse_EventScript_202989
checkflag FLAG_0x4F3
goto_eq VerdanturfTown_WandasHouse_EventScript_20297F
checkflag FLAG_0x0C7
checkflag FLAG_RUSTURF_TUNNEL_OPENED
goto_eq VerdanturfTown_WandasHouse_EventScript_202975
msgbox VerdanturfTown_WandasHouse_Text_202E47, 4
release

3
data/pokemon_summary_screen.s
View File

@@ -3,9 +3,6 @@
.section .rodata
@ 86181C1
.include "data/text/move_descriptions.inc"
@ 861CAAC
.include "data/text/nature_names.inc"

2
data/scripts/field_move_scripts.inc
View File

@@ -113,7 +113,7 @@ Route111_EventScript_2907FB:: @ 82907FB
applymovement VAR_LAST_TALKED, Route111_Movement_29082B
waitmovement 0
removeobject VAR_LAST_TALKED
specialvar VAR_RESULT, sub_81393FC
specialvar VAR_RESULT, TryUpdateRusturfTunnelState
compare VAR_RESULT, 1
goto_eq Route111_EventScript_290829
special RockSmashWildEncounter

40
data/specials.inc
View File

@@ -174,11 +174,11 @@ gSpecials:: @ 81DBA64
def_special GetFirstFreePokeblockSlot
def_special DoBerryBlending
def_special sub_8142BC8
def_special sub_813BD60
def_special sub_813BCA8
def_special sub_813BDB4
def_special ShouldMoveLilycoveFanClubMember
def_special GetNumMovedLilycoveFanClubMembers
def_special BufferStreakTrainerText
def_special sub_813BA30
def_special sub_813BCE8
def_special UpdateMovedLilycoveFanClubMembers
def_special sub_813BF60
def_special sub_813BA60
def_special sub_813BF7C
@@ -191,7 +191,7 @@ gSpecials:: @ 81DBA64
def_special GabbyAndTyGetLastQuote
def_special GabbyAndTyGetLastBattleTrivia
def_special GabbyAndTySetScriptVarsToEventObjectLocalIds
def_special sub_8138B80
def_special GetBattleOutcome
def_special GetDaycareMonNicknames
def_special GetDaycareState
def_special RejectEggFromDayCare
@@ -227,7 +227,7 @@ gSpecials:: @ 81DBA64
def_special ShowPokedexRatingMessage
def_special DoPCTurnOnEffect
def_special DoPCTurnOffEffect
def_special sub_8139994
def_special SetDepartmentStoreFloorVar
def_special DoLotteryCornerComputerEffect
def_special EndLotteryCornerComputerEffect
def_special sub_81B951C
@@ -258,7 +258,7 @@ gSpecials:: @ 81DBA64
def_special sub_81B9D08
def_special sub_80F9490
def_special ValidateEReaderTrainer
def_special sub_8139228
def_special GetBestBattleTowerStreak
def_special sub_80F94E8
def_special BedroomPC
def_special PlayerPC
@@ -284,7 +284,7 @@ gSpecials:: @ 81DBA64
def_special sub_80FB7A4
def_special DoSoftReset
def_special GameClear
def_special sub_8139A78
def_special ShakeScreenInElevator
def_special nullsub_55
def_special SpawnScriptEventObject
def_special RemoveScriptEventObject
@@ -295,20 +295,20 @@ gSpecials:: @ 81DBA64
def_special sub_80B0534
def_special sub_80B058C
def_special WaitWeather
def_special sub_8139238
def_special sub_8139248
def_special BufferEReaderTrainerName
def_special GetSlotMachineId
def_special GetPlayerFacingDirection
def_special sub_81392AC
def_special sub_81392D4
def_special sub_81392F8
def_special sub_8139320
def_special FoundAbandonedShipRoom1Key
def_special FoundAbandonedShipRoom2Key
def_special FoundAbandonedShipRoom4Key
def_special FoundAbandonedShipRoom6Key
def_special LeadMonHasEffortRibbon
def_special GiveLeadMonEffortRibbon
def_special Special_AreLeadMonEVsMaxedOut
def_special sub_8098574
def_special sub_809859C
def_special InitRoamer
def_special sub_81393FC
def_special TryUpdateRusturfTunnelState
def_special IsGrassTypeInParty
def_special sub_80AFC60
def_special PutZigzagoonInPlayerParty
@@ -326,7 +326,7 @@ gSpecials:: @ 81DBA64
def_special StartRegiBattle
def_special sub_80B16D8
def_special DoSealedChamberShakingEffect2
def_special sub_8139634
def_special FoundBlackGlasses
def_special sub_80AC81C
def_special sp13E_warp_to_last_warp
def_special sp13F_fall_to_last_warp
@@ -343,11 +343,11 @@ gSpecials:: @ 81DBA64
def_special sub_80E9B70
def_special LoadPlayerBag
def_special sub_80B05B4
def_special sub_8139754
def_special sub_813970C
def_special SetPacifidlogTMReceivedDay
def_special GetDaysUntilPacifidlogTMAvailable
def_special sub_80C08E4
def_special sub_8139770
def_special sub_81397C4
def_special MonOTNameMatchesPlayer
def_special BufferLottoTicketNumber
def_special sub_81653CC
def_special sub_80F9370
def_special sub_80F8FE8

1421
data/text/move_descriptions.inc
View File

File diff suppressed because it is too large Load Diff