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

Merge remote-tracking branch 'pret/master' into trade

Browse Source
This commit is contained in:
Diegoisawesome
2018-12-25 15:03:13 -06:00
parent dea41e1a7e a54aa03d20
commit d8948a5cda
517 changed files with 41317 additions and 67419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim_effects_3.s
-44
View File
@@ -5,50 +5,6 @@
.text
thumb_func_start AnimTask_GetReturnPowerLevel
AnimTask_GetReturnPowerLevel: @ 815F8A0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r3, =gBattleAnimArgs
movs r2, 0
strh r2, [r3, 0xE]
ldr r1, =gAnimFriendship
ldrb r0, [r1]
ldrb r1, [r1]
adds r0, r1, 0
subs r0, 0x3D
lsls r0, 24
lsrs r0, 24
adds r2, r1, 0
cmp r0, 0x1E
bhi _0815F8C4
movs r0, 0x1
strh r0, [r3, 0xE]
_0815F8C4:
adds r0, r2, 0
subs r0, 0x5C
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6C
bhi _0815F8D4
movs r0, 0x2
strh r0, [r3, 0xE]
_0815F8D4:
lsls r0, r1, 24
lsrs r0, 24
cmp r0, 0xC8
bls _0815F8E0
movs r0, 0x3
strh r0, [r3, 0xE]
_0815F8E0:
adds r0, r4, 0
bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end AnimTask_GetReturnPowerLevel
thumb_func_start sub_815F8F4
sub_815F8F4: @ 815F8F4
asm/contest.s
+3 -3
View File
@@ -1657,7 +1657,7 @@ _080DC506:
lsls r0, r5, 3
ldr r1, =gUnknown_08587AE8
adds r0, r1
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, =gSpriteTemplate_8587B18
adds r0, r6, r0
ldr r2, =gUnknown_08587A70
@@ -1713,7 +1713,7 @@ _080DC506:
sub_80DC594: @ 80DC594
push {lr}
ldr r0, =gUnknown_08587BB0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_08587BB8
bl LoadSpritePalette
ldr r0, =gSpriteTemplate_8587BC8
@@ -2286,7 +2286,7 @@ sub_80DC9EC: @ 80DC9EC
lsls r4, r1, 3
ldr r0, =gUnknown_08589904
adds r0, r4, r0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_08589924
adds r4, r0
adds r0, r4, 0
asm/contest_link_80F57C4.s
+4 -4
View File
@@ -1417,7 +1417,7 @@ _080F64F2:
adds r2, r4, 0
bl GetMonSpritePalStructFromOtIdPersonality
adds r4, r0, 0
bl LoadCompressedObjectPalette
bl LoadCompressedSpritePalette
adds r0, r6, 0
movs r1, 0x1
bl SetMultiuseSpriteTemplateToPokemon
@@ -1451,9 +1451,9 @@ _080F64F2:
ldr r1, [r1]
strb r0, [r1, 0x8]
ldr r0, =gUnknown_0858D878
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_0858D880
bl LoadCompressedObjectPalette
bl LoadCompressedSpritePalette
ldr r0, =sub_80F7670
movs r1, 0xA
bl CreateTask
@@ -2093,7 +2093,7 @@ _080F6AA6:
adds r0, r1
ldrh r0, [r0]
movs r1, 0
bl mon_icon_convert_unown_species_id
bl GetIconSpecies
lsls r0, 16
lsrs r0, 16
adds r0, r6
asm/dark.s
-2199
View File
File diff suppressed because it is too large Load Diff
asm/easy_chat.s
+1 -1
View File
@@ -6455,7 +6455,7 @@ sub_811DE90: @ 811DE90
ldr r4, =gUnknown_08597CE8
_0811DEA2:
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x3
asm/fldeff_80F9BCC.s
-2514
View File
File diff suppressed because it is too large Load Diff
asm/flying.s
+13 -13
View File
@@ -10,7 +10,7 @@ sub_810DE70: @ 810DE70
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A6980
bl InitSpritePosToAnimTarget
ldrh r0, [r4, 0x22]
adds r0, 0x14
strh r0, [r4, 0x22]
@@ -163,7 +163,7 @@ sub_810DFA8: @ 810DFA8
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl InitAnimSpritePos
bl InitSpritePosToAnimAttacker
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -216,7 +216,7 @@ _0810DFC8:
sub_810E028: @ 810E028
push {r4,lr}
adds r4, r0, 0
bl TranslateAnimLinear
bl AnimTranslateLinear
lsls r0, 24
cmp r0, 0
beq _0810E03C
@@ -342,7 +342,7 @@ sub_810E13C: @ 810E13C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl InitAnimSpritePos
bl InitSpritePosToAnimAttacker
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]
@@ -471,7 +471,7 @@ sub_810E24C: @ 810E24C
movs r0, 0x1
strh r0, [r4, 0x2E]
adds r0, r4, 0
bl TranslateAnimLinear
bl AnimTranslateLinear
ldrh r1, [r4, 0x34]
lsrs r0, r1, 8
cmp r0, 0xC8
@@ -655,7 +655,7 @@ _0810E354:
cmp r0, 0
bne _0810E3F0
adds r0, r6, 0
bl sub_80A8328
bl GetBattlerSpriteBGPriority
lsls r0, 24
lsrs r0, 24
adds r0, 0x1
@@ -672,7 +672,7 @@ _0810E354:
.pool
_0810E3F0:
adds r0, r6, 0
bl sub_80A8328
bl GetBattlerSpriteBGPriority
movs r1, 0x3
ands r1, r0
lsls r1, 2
@@ -718,7 +718,7 @@ _0810E408:
b _0810E4A2
_0810E44A:
adds r0, r6, 0
bl sub_80A8328
bl GetBattlerSpriteBGPriority
movs r1, 0x3
ands r1, r0
lsls r1, 2
@@ -1535,7 +1535,7 @@ sub_810EA4C: @ 810EA4C
adds r4, r0, 0
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl sub_80A8328
bl GetBattlerSpriteBGPriority
movs r1, 0x3
ands r1, r0
lsls r1, 2
@@ -1577,13 +1577,13 @@ sub_810EAA0: @ 810EAA0
bne _0810EABC
adds r0, r5, 0
movs r1, 0
bl InitAnimSpritePos
bl InitSpritePosToAnimAttacker
b _0810EAC4
.pool
_0810EABC:
adds r0, r5, 0
movs r1, 0
bl sub_80A6980
bl InitSpritePosToAnimTarget
_0810EAC4:
ldr r4, =gBattleAnimArgs
movs r2, 0x4
@@ -1771,7 +1771,7 @@ sub_810EC34: @ 810EC34
_0810EC46:
adds r0, r4, 0
movs r1, 0x1
bl InitAnimSpritePos
bl InitSpritePosToAnimAttacker
movs r0, 0
bl GetAnimBattlerSpriteId
ldr r2, =gSprites
@@ -1891,7 +1891,7 @@ sub_810ED28: @ 810ED28
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl InitAnimSpritePos
bl InitSpritePosToAnimAttacker
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]
asm/ice.s
-2944
View File
File diff suppressed because it is too large Load Diff
asm/macros/event.inc
+66 -2
View File
@@ -1557,17 +1557,81 @@
@ Supplementary
.macro goto_eq dest:req
.macro goto_if_unset flag:req, dest:req
checkflag \flag
goto_if 0, \dest
.endm
.macro goto_if_set flag:req, dest:req
checkflag \flag
goto_if 1, \dest
.endm
.macro goto_if_lt dest:req @ LESS THAN
goto_if 0, \dest
.endm
.macro goto_if_eq dest:req @ EQUAL
goto_if 1, \dest
.endm
.macro goto_if_gt dest:req @ GREATER THAN
goto_if 2, \dest
.endm
.macro goto_if_le dest:req @ LESS THAN OR EQUAL
goto_if 3, \dest
.endm
.macro goto_if_ge dest:req @ GREATER THAN OR EQUAL
goto_if 4, \dest
.endm
.macro goto_if_ne dest:req @ NOT EQUAL
goto_if 5, \dest
.endm
.macro call_if_unset flag:req, dest:req
checkflag \flag
call_if 0, \dest
.endm
.macro call_if_set flag:req, dest:req
checkflag \flag
call_if 1, \dest
.endm
.macro call_if_lt dest:req @ LESS THAN
call_if 0, \dest
.endm
.macro call_if_eq dest:req @ EQUAL
call_if 1, \dest
.endm
.macro call_if_gt dest:req @ GREATER THAN
call_if 2, \dest
.endm
.macro call_if_le dest:req @ LESS THAN OR EQUAL
call_if 3, \dest
.endm
.macro call_if_ge dest:req @ GREATER THAN OR EQUAL
call_if 4, \dest
.endm
.macro call_if_ne dest:req @ NOT EQUAL
call_if 5, \dest
.endm
.macro switch var:req
copyvar 0x8000, \var
.endm
.macro case condition:req, dest:req
compare 0x8000, \condition
goto_eq \dest
goto_if_eq \dest
.endm
@ Message box types
asm/macros/map.inc
+1 -1
View File
@@ -14,7 +14,7 @@
.4byte \address
.endm
.macro object_event index, gfx, replacement, x, y, elevation, movement_type, x_radius, y_radius, trainer_type, sight_radius_tree_etc, script, event_flag
.macro object_event index:req, gfx:req, replacement:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
.byte \index, \gfx, \replacement, 0
.2byte \x
.2byte \y
asm/party_menu.s
-18014
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_storage_system.s
-20963
View File
File diff suppressed because it is too large Load Diff
asm/pokenav.s
+20 -20
View File
@@ -409,14 +409,14 @@ _081C73C2:
_081C73C6:
adds r0, r4, 0
adds r1, r5, 0
bl sub_80D2270
bl CheckBoxMonSanityAt
cmp r0, 0
beq _081C73EC
lsls r1, r5, 24
lsrs r1, 24
lsrs r0, r6, 24
movs r2, 0x52
bl GetBoxMonDataFromAnyBox
bl GetBoxMonDataAt
cmp r0, 0
beq _081C73EC
_081C73E2:
@@ -1524,7 +1524,7 @@ sub_81C7C28: @ 81C7C28
ldr r4, =gUnknown_0861FA4C
_081C7C36:
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r4, 0x8
adds r5, 0x1
cmp r5, 0
@@ -1648,7 +1648,7 @@ sub_81C7D28: @ 81C7D28
bl sub_81C763C
adds r6, r0, 0
ldr r0, =gUnknown_0861FA64
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
movs r0, 0x1
bl AllocSpritePalette
movs r0, 0x2
@@ -3924,7 +3924,7 @@ sub_81C8ED0: @ 81C8ED0
ldr r4, =gUnknown_0861FBFC
_081C8ED6:
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r4, 0x8
adds r5, 0x1
cmp r5, 0
@@ -6086,7 +6086,7 @@ sub_81C9FC4: @ 81C9FC4
ldr r4, =gUnknown_086201C4
_081C9FCA:
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x1
@@ -10537,7 +10537,7 @@ sub_81CC214: @ 81CC214
ldr r4, =gUnknown_08622810
_081CC224:
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r4, 0x8
adds r5, 0x1
cmp r5, 0
@@ -11509,7 +11509,7 @@ sub_81CC9C0: @ 81CC9C0
ldr r4, =gUnknown_086230F8
_081CC9C6:
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r4, 0x8
adds r5, 0x1
cmp r5, 0
@@ -12444,7 +12444,7 @@ _081CD174:
adds r1, r3, 0
movs r2, 0x8
mov r3, sp
bl SetBoxMonDataFromAnyBox
bl SetBoxMonDataAt
_081CD180:
ldr r0, =0x00006304
adds r1, r6, r0
@@ -16376,7 +16376,7 @@ _081CF1F4:
_081CF1FC:
adds r0, r5, 0
adds r1, r4, 0
bl sub_80D2270
bl CheckBoxMonSanityAt
cmp r0, 0
beq _081CF23A
ldr r1, =0xffffff00
@@ -16392,7 +16392,7 @@ _081CF1FC:
str r0, [sp]
ldr r2, [r6, 0x14]
adds r0, r7, 0
bl GetBoxMonDataFromAnyBox
bl GetBoxMonDataAt
lsls r0, 16
ldr r2, =0x0000ffff
ldr r1, [sp]
@@ -17735,7 +17735,7 @@ sub_81CFC40: @ 81CFC40
_081CFC60:
adds r0, r7, 0
adds r1, r6, 0
bl sub_80D2270
bl CheckBoxMonSanityAt
cmp r0, 0
beq _081CFCA6
lsls r0, r7, 24
@@ -17745,7 +17745,7 @@ _081CFC60:
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x52
bl GetBoxMonDataFromAnyBox
bl GetBoxMonDataAt
adds r3, r0, 0
cmp r3, 0
beq _081CFCA6
@@ -17900,14 +17900,14 @@ _081CFD92:
_081CFD96:
adds r0, r5, 0
adds r1, r4, 0
bl sub_80D2270
bl CheckBoxMonSanityAt
cmp r0, 0
beq _081CFDBC
lsls r1, r4, 24
lsrs r1, 24
lsrs r0, r6, 24
movs r2, 0x53
bl GetBoxMonDataFromAnyBox
bl GetBoxMonDataAt
cmp r0, 0
beq _081CFDBC
_081CFDB2:
@@ -19257,7 +19257,7 @@ sub_81D07D8: @ 81D07D8
beq _081D07FA
ldrb r1, [r1, 0x1]
movs r2, 0x52
bl GetBoxMonDataFromAnyBox
bl GetBoxMonDataAt
b _081D080A
_081D07FA:
ldrb r1, [r1, 0x1]
@@ -19302,7 +19302,7 @@ _081D0848:
ldrb r0, [r1]
ldrb r1, [r1, 0x1]
movs r2, 0x53
bl GetBoxMonDataFromAnyBox
bl GetBoxMonDataAt
_081D0852:
mov r12, r0
movs r0, 0
@@ -20756,7 +20756,7 @@ sub_81D13FC: @ 81D13FC
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624C78
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_08624C80
bl sub_81C795C
ldr r0, =gUnknown_08624D04
@@ -23046,14 +23046,14 @@ _081D2CB0:
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
bl GetAndCopyBoxMonDataFromAnyBox
bl GetAndCopyBoxMonDataAt
b _081D2CCA
_081D2CBE:
lsls r0, 24
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
bl GetBoxMonDataFromAnyBox
bl GetBoxMonDataAt
_081D2CCA:
pop {r1}
bx r1
asm/psychic.s
-2172
View File
File diff suppressed because it is too large Load Diff
asm/rom_8011DC0.s
+8 -8
View File
@@ -11006,7 +11006,7 @@ _0801C52C:
cmp r0, 0x1
bne _0801C5EE
ldr r0, =gUnknown_082F1D00
bl LoadCompressedObjectPicUsingHeap
bl LoadCompressedSpriteSheetUsingHeap
ldr r0, [r4]
movs r2, 0xB8
lsls r2, 1
@@ -14596,7 +14596,7 @@ _0801E1B4:
movs r0, 0x5
bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
bl Menu_MoveCursor
b _0801E23A
.pool
_0801E1D4:
@@ -19425,7 +19425,7 @@ sub_8020890: @ 8020890
ldr r4, =gUnknown_082F3134
_08020896:
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x4
@@ -23100,7 +23100,7 @@ sub_8022730: @ 8022730
_08022746:
lsls r0, r5, 3
adds r0, r4
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -43324,7 +43324,7 @@ sub_802C974: @ 802C974
ldr r5, =gUnknown_082FBE08
_0802C97C:
adds r0, r5, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r5, 0x8
adds r4, 0x1
cmp r4, 0x4
@@ -43447,7 +43447,7 @@ _0802CA32:
ands r1, r5
orrs r1, r4
str r1, [r0, 0x4]
bl LoadCompressedObjectPalette
bl LoadCompressedSpritePalette
mov r0, r8
bl Free
mov r0, r10
@@ -47113,7 +47113,7 @@ sub_802E75C: @ 802E75C
lsls r0, 3
ldr r1, =gUnknown_082FE6C8
adds r0, r1
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
movs r2, 0x8
ldrsh r0, [r4, r2]
lsls r0, 3
@@ -48126,7 +48126,7 @@ sub_802EF50: @ 802EF50
orrs r0, r1
str r0, [r4, 0x4]
mov r0, sp
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r0, r4, 0
bl LoadSpritePalette
add sp, 0x10
asm/roulette.s
+3 -3
View File
@@ -4865,11 +4865,11 @@ sub_8142C0C: @ 8142C0C
ldr r0, =gUnknown_085B7384
bl LoadSpritePalettes
ldr r0, =gUnknown_085B7864
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_085B7978
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_085B7A40
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
b _08142C5A
.pool
_08142C44:
asm/trade.s
+1 -1
View File
@@ -656,7 +656,7 @@ _0807AD94:
_0807ADB2:
mov r0, r8
bl GetMonSpritePalStruct
bl LoadCompressedObjectPalette
bl LoadCompressedSpritePalette
ldr r0, =gUnknown_020322A0
ldr r1, [r0]
adds r0, r1, 0
asm/trainer_card.s
+5 -5
View File
@@ -6952,10 +6952,10 @@ sub_80C62DC: @ 80C62DC
bl LoadSpritePalettes
ldr r4, =gUnknown_085714BC
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
adds r4, 0x10
adds r0, r4, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_085715B4
ldr r1, =gUnknown_02039CEC
ldr r2, [r1]
@@ -7706,7 +7706,7 @@ sub_80C6974: @ 80C6974
bl LoadSpritePalettes
ldr r6, =gUnknown_085714BC
adds r0, r6, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_085715B4
mov r8, r0
ldr r4, =gUnknown_02039CF4
@@ -7747,7 +7747,7 @@ sub_80C6974: @ 80C6974
bl StartSpriteAnim
adds r6, 0x8
adds r0, r6, 0
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
movs r3, 0x18
add r8, r3
ldr r6, =gUnknown_08571650
@@ -7875,7 +7875,7 @@ _080C6AEE:
lsrs r4, r0, 16
_080C6AF2:
ldr r0, =gUnknown_085714D4
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
mov r1, sp
ldr r0, =gUnknown_085715FC
ldm r0!, {r2,r3,r6}
asm/use_pokeblock.s
+1 -1
View File
@@ -3273,7 +3273,7 @@ sub_8168248: @ 8168248
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
bl LoadCompressedObjectPic
bl LoadCompressedSpriteSheet
add r0, sp, 0x8
bl LoadSpritePalette
add sp, 0x10
asm/water.s
-3607
View File
File diff suppressed because it is too large Load Diff
data/battle_anim_scripts.s
+211 -211
View File
@@ -3484,7 +3484,7 @@ Move_HAIL:
loadspritegfx ANIM_TAG_ICE_CRYSTALS
createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK
waitforvisualfinish
createvisualtask sub_810C918, 5
createvisualtask AnimTask_Hail1, 5
loopsewithpan SE_W258, 0, 8, 10
waitforvisualfinish
createvisualtask sub_8116620, 10, 1, 3, 6, 0, RGB_BLACK
@@ -3956,7 +3956,7 @@ Move_MIST_BALL:
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16
delay 0
playsewithpan SE_W114, 0
createvisualtask sub_810C324, 5
createvisualtask AnimTask_LoadMistTiles, 5
createvisualtask sub_8116620, 10, 4, 3, 0, 16, RGB_WHITE
delay 8
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0
@@ -5443,54 +5443,54 @@ SolarBeamSetUp:
blendoff
goto SolarBeamEnd
SolarBeamSetUp1:
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 40, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 40, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -40, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -40, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, 40, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 40, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 0, -40, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -40, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -20, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -20, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 20, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 20, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 20, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, 30, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, 30, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, -30, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, -30, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -20, -30, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, -30, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 20, 30, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, 30, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, 0, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 0, 16
delay 2
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, 0, 16
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 0, 16
delay 2
return
SolarBeamUnleash:
call SetSolarbeamBg
panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
createvisualtask sub_80FEA58, 5
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0
createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
delay 4
createvisualtask sub_8116620, 10, 4, 1, 0, 10, RGB(25, 31, 0)
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
delay 4
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
delay 4
call SolarBeamUnleash1
call SolarBeamUnleash1
@@ -5499,19 +5499,19 @@ SolarBeamUnleash:
call UnsetSolarbeamBg
goto SolarBeamEnd
SolarBeamUnleash1:
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 0
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 1
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 2
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 3
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 5
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
delay 4
createsprite gUnknown_085921F8, ANIM_TARGET, 3, 15, 0, 20, 6
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
delay 4
return
@@ -5717,28 +5717,28 @@ Move_ABSORB:
AbsorbEffect:
playsewithpan SE_W152, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W152, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W152, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
delay 4
playsewithpan SE_W152, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
delay 4
playsewithpan SE_W152, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W152, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W152, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W152, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
return
@@ -5770,36 +5770,36 @@ Move_MEGA_DRAIN:
MegaDrainEffect:
playsewithpan SE_W145C, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
playsewithpan SE_W145C, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W145C, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W145C, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W145C, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
delay 4
playsewithpan SE_W145C, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
delay 4
playsewithpan SE_W145C, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W145C, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
return
@@ -5831,44 +5831,44 @@ Move_GIGA_DRAIN:
GigaDrainEffect:
playsewithpan SE_W202, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -40, 35
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W202, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 28, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 40, 39
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39
delay 4
playsewithpan SE_W202, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -32, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26
delay 4
playsewithpan SE_W202, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W202, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W202, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -40, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26
delay 4
playsewithpan SE_W202, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 36, 33
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W202, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
return
@@ -6749,11 +6749,11 @@ Move_COTTON_SPORE:
end
CottonSpore1:
createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0
createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0
delay 12
createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0
createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0
delay 12
createsprite gUnknown_085922EC, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0
createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0
delay 12
return
@@ -6761,7 +6761,7 @@ Move_SPORE:
loadspritegfx ANIM_TAG_SPORE
monbg ANIM_DEF_PARTNER
setalpha 12, 8
createvisualtask sub_80FEE1C, 2
createvisualtask AnimTask_SporeDoubleBattle, 2
loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11
call Spore1
call Spore1
@@ -6773,11 +6773,11 @@ Move_SPORE:
end
Spore1:
createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -20, 85, 80, 1
createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -20, 85, 80, 1
delay 12
createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -10, 170, 80, 1
createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -10, 170, 80, 1
delay 12
createsprite gUnknown_085922EC, ANIM_TARGET, 2, 0, -15, 0, 80, 1
createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 80, 1
delay 12
return
@@ -6788,23 +6788,23 @@ Move_PETAL_DANCE:
setalpha 12, 8
playsewithpan SE_W080, SOUND_PAN_ATTACKER
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3
createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 16, -24, 8, 100
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -16, -24, 8, 100
createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 8, 100
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -16, -24, 8, 100
delay 15
createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 32, -24, 8, 100
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -32, -24, 8, 100
createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 32, -24, 8, 100
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -32, -24, 8, 100
delay 15
createsprite gUnknown_0859231C, ANIM_ATTACKER, 2, 0, -24, 8, 140
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 24, -24, 8, 100
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -24, -24, 8, 100
createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 24, -24, 8, 100
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 8, 100
delay 30
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 16, -24, 0, 100
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -16, -24, 0, 100
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 0, 100
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -16, -24, 0, 100
delay 30
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, 20, -16, 14, 80
createsprite gUnknown_08592334, ANIM_ATTACKER, 2, -20, -14, 16, 80
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 20, -16, 14, 80
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -20, -14, 16, 80
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5
delay 3
@@ -6827,29 +6827,29 @@ Move_RAZOR_LEAF:
setalpha 12, 8
delay 1
loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -4, -4, 7
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 3, -3, 11
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -6, 8
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 12
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -4, 13
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 4, -5, 7
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -6, 11
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8
delay 60
playsewithpan SE_W013B, SOUND_PAN_ATTACKER
createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1
createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1
createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1
createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1
delay 20
playsewithpan SE_W013, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@@ -6937,7 +6937,7 @@ Mist1:
Move_HAZE:
waitforvisualfinish
playsewithpan SE_W114, 0
createvisualtask sub_810C0A0, 5
createvisualtask AnimTask_Haze1, 5
delay 30
createvisualtask sub_8116620, 10, 0x780, 2, 0, 16, RGB_BLACK
delay 0x5A
@@ -7025,44 +7025,44 @@ Move_DREAM_EATER:
end
DreamEaterEffect:
playsewithpan SE_W207, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -40, 35
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W207, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 28, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 40, 39
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39
delay 4
playsewithpan SE_W207, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -32, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26
delay 4
playsewithpan SE_W207, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
delay 4
playsewithpan SE_W207, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
delay 4
playsewithpan SE_W207, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -40, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26
delay 4
playsewithpan SE_W207, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -5, 15, 36, 33
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, -10, 20, 20, 39
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
delay 4
playsewithpan SE_W207, SOUND_PAN_TARGET
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gUnknown_08592270, ANIM_ATTACKER, 3, 5, -18, -20, 35
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
delay 4
return
@@ -7573,19 +7573,19 @@ Move_RECOVER:
end
Recover1:
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 40, -10, 13
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -10, 13
delay 3
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -35, -10, 13
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -35, -10, 13
delay 3
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 15, -40, 13
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 15, -40, 13
delay 3
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -10, -32, 13
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -10, -32, 13
delay 3
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 25, -20, 13
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 25, -20, 13
delay 3
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, -40, -20, 13
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 13
delay 3
createsprite gUnknown_085921E0, ANIM_ATTACKER, 2, 5, -40, 13
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 5, -40, 13
delay 3
return
@@ -7597,7 +7597,7 @@ Move_MIMIC:
panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
createvisualtask sub_80FF458, 5, 128, 24
delay 15
createsprite gUnknown_085924DC, ANIM_TARGET, 2, -12, 24
createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24
delay 10
setarg 7, -1
waitforvisualfinish
@@ -7611,12 +7611,12 @@ Move_MIMIC:
Move_CONSTRICT:
loadspritegfx ANIM_TAG_TENDRILS
loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4
createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 2
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2
delay 7
createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, 0, 0, 2
createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 2
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 2
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 2
delay 7
createsprite gUnknown_08592494, ANIM_TARGET, 3, 0, -8, 1, 2
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, -8, 1, 2
delay 8
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
delay 20
@@ -7824,28 +7824,28 @@ Move_FURY_SWIPES:
Move_INGRAIN:
loadspritegfx ANIM_TAG_ROOTS
loadspritegfx ANIM_TAG_ORBS
createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150
createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150
playsewithpan SE_W010, SOUND_PAN_ATTACKER
delay 10
createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140
createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140
playsewithpan SE_W010, SOUND_PAN_ATTACKER
delay 10
createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130
createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130
playsewithpan SE_W010, SOUND_PAN_ATTACKER
delay 10
createsprite gUnknown_0859254C, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120
createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120
playsewithpan SE_W010, SOUND_PAN_ATTACKER
delay 40
createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30
createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30
delay 5
playsewithpan SE_W145C, SOUND_PAN_ATTACKER
delay 5
createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30
createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30
playsewithpan SE_W145C, SOUND_PAN_ATTACKER
delay 5
playsewithpan SE_W145C, SOUND_PAN_ATTACKER
delay 5
createsprite gUnknown_0859258C, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18
createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18
playsewithpan SE_W145C, SOUND_PAN_ATTACKER
delay 10
waitforvisualfinish
@@ -7854,7 +7854,7 @@ Move_INGRAIN:
Move_PRESENT:
loadspritegfx ANIM_TAG_ITEM_BAG
createvisualtask AnimTask_IsHealingMove, 2
createsprite gUnknown_08592610, ANIM_TARGET, 2, 0, -5, 10, 2, -1
createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1
playsewithpan SE_W039, SOUND_PAN_ATTACKER
delay 14
playsewithpan SE_W145B, SOUND_PAN_ATTACKER
@@ -7889,23 +7889,23 @@ PresentHeal:
loadspritegfx ANIM_TAG_GREEN_SPARKLE
loadspritegfx ANIM_TAG_BLUE_STAR
playsewithpan SE_W234, SOUND_PAN_TARGET
createsprite gUnknown_08592658, ANIM_TARGET, 4, -16, 32, -3, 1
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1
delay 3
createsprite gUnknown_08592658, ANIM_TARGET, 4, 16, 32, -3, -1
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1
delay 3
createsprite gUnknown_08592658, ANIM_TARGET, 4, 32, 32, -3, 1
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 32, 32, -3, 1
delay 3
createsprite gUnknown_08592658, ANIM_TARGET, 4, -32, 32, -3, 1
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -32, 32, -3, 1
delay 3
createsprite gUnknown_08592658, ANIM_TARGET, 4, 0, 32, -3, 1
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 0, 32, -3, 1
delay 3
createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1
delay 3
createsprite gUnknown_08592658, ANIM_TARGET, 4, -8, 32, -3, 1
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1
delay 3
createsprite gUnknown_08592658, ANIM_TARGET, 4, 24, 32, -3, 1
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 24, 32, -3, 1
delay 3
createsprite gUnknown_08592658, ANIM_TARGET, 4, -24, 32, -3, 1
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -24, 32, -3, 1
waitforvisualfinish
waitsound
call HealingEffect2
@@ -8115,8 +8115,8 @@ Move_ENCORE:
Move_TRICK:
loadspritegfx ANIM_TAG_ITEM_BAG
loadspritegfx ANIM_TAG_SPEED_DUST
createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 80
createsprite gUnknown_085926E8, ANIM_ATTACKER, 2, -40, 208
createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80
createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208
delay 16
playsewithpan SE_W166, 0
createvisualtask sub_8106020, 3
@@ -8167,21 +8167,21 @@ Move_STOCKPILE:
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE
end
Stockpile1:
createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 55, 13
createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 55, 13
delay 1
createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -55, 13
createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -55, 13
delay 1
createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, 55, 13
createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 55, 13
delay 1
createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 0, -55, 13
createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -55, 13
delay 1
createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, -34, 13
createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, -34, 13
delay 1
createsprite gUnknown_08592244, ANIM_ATTACKER, 2, 55, 34, 13
createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 34, 13
delay 1
createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, -34, 13
createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -34, 13
delay 1
createsprite gUnknown_08592244, ANIM_ATTACKER, 2, -55, 34, 13
createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, 34, 13
delay 1
return
@@ -8392,8 +8392,8 @@ Move_HYPER_BEAM:
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 16, 0, RGB_BLACK
end
HyperBeam1:
createsprite gUnknown_08592288, ANIM_TARGET, 2
createsprite gUnknown_08592288, ANIM_TARGET, 2
createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2
createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2
delay 1
return
@@ -8790,31 +8790,31 @@ Move_FRENZY_PLANT:
setalpha 12, 8
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK
waitforvisualfinish
createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100
playsewithpan SE_W010, SOUND_PAN_ATTACKER
delay 5
createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95
playsewithpan SE_W010, -43
delay 5
createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90
playsewithpan SE_W010, -22
delay 5
createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85
playsewithpan SE_W010, 0
delay 5
createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85
playsewithpan SE_W010, +21
delay 5
createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85
playsewithpan SE_W010, +42
delay 5
createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85
playsewithpan SE_W010, SOUND_PAN_TARGET
delay 5
createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80
playsewithpan SE_W010, SOUND_PAN_TARGET
delay 5
createsprite gUnknown_08592564, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75
playsewithpan SE_W010, SOUND_PAN_TARGET
delay 5
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, 1, 3
@@ -9649,26 +9649,26 @@ Move_TWISTER:
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
playsewithpan SE_W239, SOUND_PAN_TARGET
createsprite gUnknown_085923A8, ANIM_TARGET, 2, 120, 70, 5, 70, 30
createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30
delay 1
createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 6, 60, 25
createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 6, 60, 25
delay 1
createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 60, 7, 60, 30
createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 55, 10, 60, 30
createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 60, 7, 60, 30
createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 10, 60, 30
delay 3
createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 100, 50, 4, 50, 26
delay 1
createsprite gUnknown_085923A8, ANIM_TARGET, 2, 105, 25, 8, 60, 20
createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 105, 25, 8, 60, 20
delay 1
createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 40, 10, 48, 30
createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 40, 10, 48, 30
delay 3
createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 120, 30, 6, 45, 25
createsprite gUnknown_085923A8, ANIM_TARGET, 2, 115, 35, 10, 60, 30
createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 35, 10, 60, 30
delay 3
createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 105, 20, 8, 40, 0
delay 3
createsprite gUnknown_085923A8, ANIM_TARGET, 2, 20, 255, 15, 32, 0
createsprite gUnknown_085923A8, ANIM_TARGET, 2, 110, 10, 8, 32, 20
createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 20, 255, 15, 32, 0
createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20
waitforvisualfinish
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, 1, 3
playsewithpan SE_W004, SOUND_PAN_TARGET
@@ -9697,29 +9697,29 @@ Move_MAGICAL_LEAF:
delay 1
loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5
createvisualtask sub_81007C4, 5
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -2, 10
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -1, 15
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -4, -4, 7
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -4, -4, 7
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 3, -3, 11
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 3, -3, 11
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -1, -6, 8
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -6, 8
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -1, 12
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 12
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -4, 13
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -4, 13
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 4, -5, 7
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 4, -5, 7
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, 2, -6, 11
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -6, 11
delay 2
createsprite gUnknown_08592390, ANIM_ATTACKER, 2, -3, -5, 8
createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8
delay 60
playsewithpan SE_W013B, SOUND_PAN_ATTACKER
createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0
createsprite gUnknown_085923D8, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0
createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0
createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0
delay 30
playsewithpan SE_W013, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, 1, 2
@@ -10344,7 +10344,7 @@ General_PokeblockThrow:
General_ItemKnockoff:
loadspritegfx ANIM_TAG_ITEM_BAG
createsprite gBattleAnimSpriteTemplate_8592628, ANIM_TARGET, 2
createsprite gKnockOffItemSpriteTemplate, ANIM_TARGET, 2
end
General_TurnTrap:
@@ -10357,9 +10357,9 @@ General_TurnTrap:
Status_BindWrap:
loadspritegfx ANIM_TAG_TENDRILS
loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2
createsprite gUnknown_08592494, ANIM_TARGET, 4, 0, 16, 0, 1
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1
delay 7
createsprite gUnknown_08592494, ANIM_TARGET, 2, 0, 8, 1, 1
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1
delay 3
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
delay 20
@@ -10537,7 +10537,7 @@ General_ItemSteal:
createvisualtask sub_8117F30, 2
createvisualtask sub_8172ED0, 2
delay 1
createsprite gUnknown_08592670, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1
createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1
end
General_SnatchMove:
data/cry_id_table.inc
-137
View File
@@ -1,137 +0,0 @@
.align 1
gSpeciesIdToCryId:: @ 831F61C
.2byte 273 @ TREECKO
.2byte 274 @ GROVYLE
.2byte 275 @ SCEPTILE
.2byte 270 @ TORCHIC
.2byte 271 @ COMBUSKEN
.2byte 272 @ BLAZIKEN
.2byte 276 @ MUDKIP
.2byte 277 @ MARSHTOMP
.2byte 278 @ SWAMPERT
.2byte 359 @ POOCHYENA
.2byte 360 @ MIGHTYENA
.2byte 378 @ ZIGZAGOON
.2byte 375 @ LINOONE
.2byte 290 @ WURMPLE
.2byte 291 @ SILCOON
.2byte 292 @ BEAUTIFLY
.2byte 293 @ CASCOON
.2byte 294 @ DUSTOX
.2byte 283 @ LOTAD
.2byte 284 @ LOMBRE
.2byte 285 @ LUDICOLO
.2byte 286 @ SEEDOT
.2byte 287 @ NUZLEAF
.2byte 288 @ SHIFTRY
.2byte 301 @ NINCADA
.2byte 302 @ NINJASK
.2byte 303 @ SHEDINJA
.2byte 266 @ TAILLOW
.2byte 267 @ SWELLOW
.2byte 374 @ SHROOMISH
.2byte 373 @ BRELOOM
.2byte 269 @ SPINDA
.2byte 280 @ WINGULL
.2byte 279 @ PELIPPER
.2byte 310 @ SURSKIT
.2byte 311 @ MASQUERAIN
.2byte 377 @ WAILMER
.2byte 381 @ WAILORD
.2byte 312 @ SKITTY
.2byte 313 @ DELCATTY
.2byte 251 @ KECLEON
.2byte 329 @ BALTOY
.2byte 330 @ CLAYDOL
.2byte 306 @ NOSEPASS
.2byte 253 @ TORKOAL
.2byte 362 @ SABLEYE
.2byte 318 @ BARBOACH
.2byte 319 @ WHISCASH
.2byte 368 @ LUVDISC
.2byte 320 @ CORPHISH
.2byte 321 @ CRAWDAUNT
.2byte 333 @ FEEBAS
.2byte 334 @ MILOTIC
.2byte 289 @ CARVANHA
.2byte 260 @ SHARPEDO
.2byte 324 @ TRAPINCH
.2byte 325 @ VIBRAVA
.2byte 326 @ FLYGON
.2byte 304 @ MAKUHITA
.2byte 305 @ HARIYAMA
.2byte 254 @ ELECTRIKE
.2byte 255 @ MANECTRIC
.2byte 316 @ NUMEL
.2byte 317 @ CAMERUPT
.2byte 338 @ SPHEAL
.2byte 339 @ SEALEO
.2byte 340 @ WALREIN
.2byte 327 @ CACNEA
.2byte 328 @ CACTURNE
.2byte 383 @ SNORUNT
.2byte 307 @ GLALIE
.2byte 331 @ LUNATONE
.2byte 332 @ SOLROCK
.2byte 262 @ AZURILL
.2byte 322 @ SPOINK
.2byte 323 @ GRUMPIG
.2byte 308 @ PLUSLE
.2byte 309 @ MINUN
.2byte 363 @ MAWILE
.2byte 336 @ MEDITITE
.2byte 337 @ MEDICHAM
.2byte 263 @ SWABLU
.2byte 264 @ ALTARIA
.2byte 258 @ WYNAUT
.2byte 256 @ DUSKULL
.2byte 361 @ DUSCLOPS
.2byte 252 @ ROSELIA
.2byte 298 @ SLAKOTH
.2byte 299 @ VIGOROTH
.2byte 300 @ SLAKING
.2byte 314 @ GULPIN
.2byte 315 @ SWALOT
.2byte 376 @ TROPIUS
.2byte 382 @ WHISMUR
.2byte 380 @ LOUDRED
.2byte 379 @ EXPLOUD
.2byte 341 @ CLAMPERL
.2byte 342 @ HUNTAIL
.2byte 343 @ GOREBYSS
.2byte 335 @ ABSOL
.2byte 282 @ SHUPPET
.2byte 281 @ BANETTE
.2byte 259 @ SEVIPER
.2byte 261 @ ZANGOOSE
.2byte 367 @ RELICANTH
.2byte 364 @ ARON
.2byte 365 @ LAIRON
.2byte 366 @ AGGRON
.2byte 356 @ CASTFORM
.2byte 357 @ VOLBEAT
.2byte 358 @ ILLUMISE
.2byte 344 @ LILEEP
.2byte 345 @ CRADILY
.2byte 346 @ ANORITH
.2byte 347 @ ARMALDO
.2byte 295 @ RALTS
.2byte 296 @ KIRLIA
.2byte 297 @ GARDEVOIR
.2byte 351 @ BAGON
.2byte 352 @ SHELGON
.2byte 372 @ SALAMENCE
.2byte 348 @ BELDUM
.2byte 349 @ METANG
.2byte 350 @ METAGROSS
.2byte 353 @ REGIROCK
.2byte 354 @ REGICE
.2byte 355 @ REGISTEEL
.2byte 370 @ KYOGRE
.2byte 369 @ GROUDON
.2byte 371 @ RAYQUAZA
.2byte 257 @ LATIAS
.2byte 384 @ LATIOS
.2byte 385 @ JIRACHI
.2byte 386 @ DEOXYS
.2byte 387 @ CHIMECHO
data/data2c.s
-56
View File
@@ -1,56 +0,0 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gBattleIntroSlideScanlineEffectParams:: @ 831AC70
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.align 2
gUnknown_0831AC7C:: @ 831AC7C
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.align 2
gUnknown_0831AC88:: @ 831AC88
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
gText_ShedinjaJapaneseName:: @ 831ACA0
.string "ヌケニン$" @ Nukenin
.align 2
gUnknown_0831ACA8:: @ 831ACA8
.2byte 0x0100
.2byte 0xC000
.2byte 0x0800
.align 2
gUnknown_0831ACB0:: @ 831ACB0
.2byte 0x0100
.2byte 0xC000
.2byte 0x2800
.align 2
gUnknown_0831ACB8:: @ 831ACB8
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0831ACC0:: @ 831ACC0
.4byte gUnknown_0831ACB8
.align 2
gUnknown_0831ACC4:: @ 831ACC4
.2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_0831ACDC:: @ 831ACDC
.4byte gUnknown_0831ACC4
data/event_scripts.s
+303 -338
View File
File diff suppressed because it is too large Load Diff
data/field_effect_helpers.s
-11
View File
@@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 1
gUnknown_085CDC6E:: @ 85CDC6E
@the following might be unref, not sure
.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00
data/field_effect_misc.s
-244
View File
@@ -1,244 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gSpriteImage_858D978:: @ 858D978
.incbin "graphics/unknown/858E588/0.4bpp"
.align 2
gSpriteImage_858D9F8:: @ 858D9F8
.incbin "graphics/unknown/858E588/1.4bpp"
.align 2
gSpriteImage_858DA78:: @ 858DA78
.incbin "graphics/unknown/858E588/2.4bpp"
.align 2
gSpriteImage_858DAF8:: @ 858DAF8
.incbin "graphics/unknown/858E588/3.4bpp"
.align 2
gSpriteImage_858DB78:: @ 858DB78
.incbin "graphics/unknown/858E588/4.4bpp"
.space 32
.align 2
gFieldEffectObjectPalette7:: @ 858DC18
.incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal"
.align 2
gSpriteImage_858DC38:: @ 858DC38
.incbin "graphics/unknown/858E5D8/0.4bpp"
.align 2
gSpriteImage_858DCB8:: @ 858DCB8
.incbin "graphics/unknown/858E5D8/1.4bpp"
.align 2
gSpriteImage_858DD38:: @ 858DD38
.incbin "graphics/unknown/858E5D8/2.4bpp"
.align 2
gSpriteImage_858DDB8:: @ 858DDB8
.incbin "graphics/unknown/858E5D8/3.4bpp"
.align 2
gSpriteImage_858DE38:: @ 858DE38
.incbin "graphics/unknown/858E5D8/4.4bpp"
.align 2
gSpriteImage_858DEB8:: @ 858DEB8
.incbin "graphics/unknown/858E5B0/0.4bpp"
.align 2
gSpriteImage_858DF38:: @ 858DF38
.incbin "graphics/unknown/858E5B0/1.4bpp"
.align 2
gSpriteImage_858DFB8:: @ 858DFB8
.incbin "graphics/unknown/858E5B0/2.4bpp"
.align 2
gSpriteImage_858E038:: @ 858E038
.incbin "graphics/unknown/858E5B0/3.4bpp"
.align 2
gSpriteImage_858E0B8:: @ 858E0B8
.incbin "graphics/unknown/858E5B0/4.4bpp"
.align 2
gSpriteImage_858E138:: @ 858E138
.incbin "graphics/unknown/858E5B0/5.4bpp"
.align 2
gFieldEffectObjectPalette8:: @ 858E1B8
.incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal"
.align 2
gSpriteImage_858E1D8:: @ 858E1D8
.incbin "graphics/unknown/858E674/0.4bpp"
.align 2
gSpriteImage_858E2D8:: @ 858E2D8
.incbin "graphics/unknown/858E674/1.4bpp"
.align 2
gSpriteImage_858E3D8:: @ 858E3D8
.incbin "graphics/unknown/858E674/2.4bpp"
.align 2
gOamData_858E4D8:: @ 858E4D8
.2byte 0x0000, 0x4000, 0x0800, 0x0000
.align 2
gSpriteAnim_858E4E0:: @ 858E4E0
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858E4F8:: @ 858E4F8
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858E510:: @ 858E510
.2byte 0x0004, 0x0008, 0x0003, 0x0008, 0x0002, 0x0008, 0x0001, 0x0008, 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858E528:: @ 858E528
.2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0004, 0x0048, 0xffff, 0x0000
.align 2
gSpriteAnim_858E540:: @ 858E540
.2byte 0x0004, 0x0048, 0x0003, 0x0048, 0x0002, 0x0048, 0x0001, 0x0048, 0x0000, 0x0048, 0xffff, 0x0000
.align 2
gSpriteAnim_858E558:: @ 858E558
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnimTable_858E570:: @ 858E570
.4byte gSpriteAnim_858E4E0
.align 2
gSpriteAnimTable_858E574:: @ 858E574
.4byte gSpriteAnim_858E4F8
.4byte gSpriteAnim_858E510
.4byte gSpriteAnim_858E528
.4byte gSpriteAnim_858E540
.align 2
gSpriteAnimTable_858E584:: @ 858E584
.4byte gSpriteAnim_858E558
.align 2
gUnknown_858E588:: @ 858E588
obj_frame_tiles gSpriteImage_858D978, 0x0080
obj_frame_tiles gSpriteImage_858D9F8, 0x0080
obj_frame_tiles gSpriteImage_858DA78, 0x0080
obj_frame_tiles gSpriteImage_858DAF8, 0x0080
obj_frame_tiles gSpriteImage_858DB78, 0x0080
.align 2
gUnknown_858E5B0:: @ 858E5B0
obj_frame_tiles gSpriteImage_858DEB8, 0x0080
obj_frame_tiles gSpriteImage_858DF38, 0x0080
obj_frame_tiles gSpriteImage_858DFB8, 0x0080
obj_frame_tiles gSpriteImage_858E038, 0x0080
obj_frame_tiles gSpriteImage_858E0B8, 0x0080
.align 2
gUnknown_858E5D8:: @ 858E5D8
obj_frame_tiles gSpriteImage_858DC38, 0x0080
obj_frame_tiles gSpriteImage_858DCB8, 0x0080
obj_frame_tiles gSpriteImage_858DD38, 0x0080
obj_frame_tiles gSpriteImage_858DDB8, 0x0080
obj_frame_tiles gSpriteImage_858DE38, 0x0080
.align 2
gUnknown_0858E600:: @ 858E600
spr_template 0xffff, 0x1003, gOamData_858E4D8, gSpriteAnimTable_858E570, gUnknown_858E588, gDummySpriteAffineAnimTable, sub_80FA18C
.align 2
gUnknown_0858E618:: @ 858E618
spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E574, gUnknown_858E5B0, gDummySpriteAffineAnimTable, sub_80FA2D8
.align 2
gUnknown_0858E630:: @ 858E630
spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E584, gUnknown_858E5D8, gDummySpriteAffineAnimTable, sub_80FA3FC
.align 2
gFieldEffectObjectPaletteInfo7:: @ 858E648
obj_pal gFieldEffectObjectPalette7, 0x1003
.align 2
gFieldEffectObjectPaletteInfo8:: @ 858E650
obj_pal gFieldEffectObjectPalette8, 0x1008
.align 2
gOamData_858E658:: @ 858E658
.2byte 0x8000, 0x8000, 0x0800, 0x0000
.align 2
gSpriteAnim_858E660:: @ 858E660
.2byte 0x0000, 0x0006, 0x0001, 0x0006, 0x0002, 0x0006, 0xffff, 0x0000
.align 2
gSpriteAnimTable_858E670:: @ 858E670
.4byte gSpriteAnim_858E660
.align 2
gUnknown_0858E674:: @ 858E674
obj_frame_tiles gSpriteImage_858E1D8, 0x0100
obj_frame_tiles gSpriteImage_858E2D8, 0x0100
obj_frame_tiles gSpriteImage_858E3D8, 0x0100
.align 2
gUnknown_0858E68C:: @ 858E68C
spr_template 0xffff, 0x100e, gOamData_858E658, gSpriteAnimTable_858E670, gUnknown_0858E674, gDummySpriteAffineAnimTable, door_restore_tilemap
.align 2
@ This uses one of the secret base palettes, so there is no
@ "field_effect_object_palette_09.pal" file.
gFieldEffectObjectPaletteInfo9:: @ 858E6A4
obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E
.align 2
gSpriteImage_858E6AC:: @ 858E6AC
.incbin "graphics/unknown/858E84C/0.4bpp"
.align 2
gSpriteImage_858E72C:: @ 858E72C
.incbin "graphics/unknown/858E84C/1.4bpp"
.align 2
gSpriteImage_858E7AC:: @ 858E7AC
.incbin "graphics/unknown/858E84C/2.4bpp"
.align 2
gUnknown_0858E82C:: @ 858E82C
.incbin "graphics/unknown/unknown_58E82C.gbapal"
.align 2
gUnknown_0858E84C:: @ 858E84C
obj_frame_tiles gSpriteImage_858E6AC, 0x0080
obj_frame_tiles gSpriteImage_858E72C, 0x0080
obj_frame_tiles gSpriteImage_858E7AC, 0x0080
.align 2
gUnknown_0858E864:: @ 858E864
obj_pal gUnknown_0858E82C, 0x1000
.align 2
gSpriteAnim_858E86C:: @ 858E86C
.2byte 0x0000, 0x001e, 0x0001, 0x001e, 0x0002, 0x001e, 0xfffe, 0x0000
.align 2
gSpriteAnimTable_858E87C:: @ 858E87C
.4byte gSpriteAnim_858E86C
.align 2
gUnknown_0858E880:: @ 858E880
spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/field_effect_scripts.s
+10 -10
View File
@@ -118,7 +118,7 @@ gFieldEffectScript_GroundImpactDust:: @ 82DBB28
field_eff_end
gFieldEffectScript_Unknown11:: @ 82DBB32
field_eff_callnative oei_sweet_scent
field_eff_callnative FldEff_UseSecretPowerCave
field_eff_end
gFieldEffectScript_BikeHopTallGrass:: @ 82DBB38
@@ -179,11 +179,11 @@ gFieldEffectScript_Unknown25:: @ 82DBBB6
field_eff_end
gFieldEffectScript_Unknown26:: @ 82DBBC5
field_eff_callnative sub_80FA208
field_eff_callnative FldEff_UseSecretPowerTree
field_eff_end
gFieldEffectScript_Unknown27:: @ 82DBBCB
field_eff_callnative sub_80FA36C
field_eff_callnative FldEff_UseSecretPowerShrub
field_eff_end
gFieldEffectScript_TreeDisguise:: @ 82DBBD1
@@ -264,11 +264,11 @@ gFieldEffectScript_HeartIcon:: @ 82DBC56
field_eff_end
gFieldEffectScript_Unknown47:: @ 82DBC60
field_eff_callnative sub_80FA6FC
field_eff_callnative FldEff_NopA6FC
field_eff_end
gFieldEffectScript_Unknown48:: @ 82DBC66
field_eff_callnative sub_80FA700
field_eff_callnative FldEff_NopA700
field_eff_end
gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C
@@ -284,7 +284,7 @@ gFieldEffectScript_Unknown51:: @ 82DBC80
field_eff_end
gFieldEffectScript_Unknown52:: @ 82DBC86
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, sub_80FAA7C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar
field_eff_end
gFieldEffectScript_Bubbles:: @ 82DBC90
@@ -296,15 +296,15 @@ gFieldEffectScript_Unknown54:: @ 82DBC9A
field_eff_end
gFieldEffectScript_Unknown55:: @ 82DBCA4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, sub_80FA13C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave
field_eff_end
gFieldEffectScript_Unknown56:: @ 82DBCAE
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA248
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree
field_eff_end
gFieldEffectScript_Unknown57:: @ 82DBCB8
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA3AC
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub
field_eff_end
gFieldEffectScript_Unknown58:: @ 82DBCC2
@@ -320,7 +320,7 @@ gFieldEffectScript_Unknown60:: @ 82DBCD2
field_eff_end
gFieldEffectScript_Unknown61:: @ 82DBCD8
field_eff_callnative sub_80FA458
field_eff_callnative FldEff_SecretBasePCTurnOn
field_eff_end
gFieldEffectScript_Unknown62:: @ 82DBCDE
data/maps/AbandonedShip_CaptainsOffice/scripts.inc
+3 -5
View File
@@ -4,13 +4,11 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2
lock
faceplayer
checkflag FLAG_TRADED_SCANNER_TO_STERN
goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A
goto_if_set FLAG_TRADED_SCANNER_TO_STERN, AbandonedShip_CaptainsOffice_EventScript_23881A
checkitem ITEM_SCANNER, 1
compare VAR_RESULT, 1
goto_eq AbandonedShip_CaptainsOffice_EventScript_238810
checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER
goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A
goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810
goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A
msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT
release
end
data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+4 -7
View File
@@ -8,10 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F
end
AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98
checkflag FLAG_0x0EF
call_if 0, AbandonedShip_Corridors_B1F_EventScript_237DAB
checkflag FLAG_0x0EF
call_if 1, AbandonedShip_Corridors_B1F_EventScript_237DB5
call_if_unset FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DAB
call_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DB5
end
AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB
@@ -28,11 +26,10 @@ AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF
AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
lockall
checkflag FLAG_0x0EF
goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09
goto_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237E09
checkitem ITEM_STORAGE_KEY, 1
compare VAR_RESULT, 0
goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF
goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF
msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_STORAGE_KEY, 1
data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+16 -28
View File
@@ -8,22 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977
end
AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980
checkflag FLAG_0x0F0
call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
checkflag FLAG_0x0F1
call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
checkflag FLAG_0x0F2
call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
checkflag FLAG_0x0F3
call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
checkflag FLAG_0x0F0
call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
checkflag FLAG_0x0F1
call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
checkflag FLAG_0x0F2
call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
checkflag FLAG_0x0F3
call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
call_if_unset FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
call_if_unset FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
call_if_unset FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
call_if_unset FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
call_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
call_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
call_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
call_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
end
AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9
@@ -60,11 +52,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F
AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
lockall
checkflag FLAG_0x0F0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_1_KEY, 1
compare VAR_RESULT, 0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_1_KEY, 1
@@ -76,11 +67,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
lockall
checkflag FLAG_0x0F1
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_2_KEY, 1
compare VAR_RESULT, 0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_2_KEY, 1
@@ -92,11 +82,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
lockall
checkflag FLAG_0x0F2
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_4_KEY, 1
compare VAR_RESULT, 0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_4_KEY, 1
@@ -108,11 +97,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
lockall
checkflag FLAG_0x0F3
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_6_KEY, 1
compare VAR_RESULT, 0
goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_6_KEY, 1
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+8 -8
View File
@@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59
getplayerxy VAR_TEMP_2, VAR_TEMP_3
setvar VAR_TEMP_4, 1
compare VAR_TEMP_2, 21
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD1
compare VAR_TEMP_2, 36
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CD7
compare VAR_TEMP_3, 2
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238CDD
switch VAR_TEMP_4
case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3
case 2, AbandonedShip_HiddenFloorRooms_EventScript_238D0C
@@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
dofieldeffect 54
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3
waitfieldeffect 54
delay 10
end
@@ -56,10 +56,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C
AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
compare VAR_RESULT, 1
goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32
goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32
delay 20
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3
waitfieldeffect 54
delay 10
end
@@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
dofieldeffect 54
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3
waitfieldeffect 54
delay 10
end
@@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
dofieldeffect 54
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3
waitfieldeffect 54
delay 10
end
data/maps/AbandonedShip_Rooms2_1F/scripts.inc
+2 -2
View File
@@ -5,7 +5,7 @@ AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7
trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_2380F0
msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT
release
end
@@ -25,7 +25,7 @@ AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B
trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq AbandonedShip_Rooms2_1F_EventScript_238154
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_238154
msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT
release
end
data/maps/AbandonedShip_Rooms_1F/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3
trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE
goto_if_eq AbandonedShip_Rooms_1F_EventScript_237AFE
msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT
release
end
data/maps/AncientTomb/scripts.inc
+8 -12
View File
@@ -5,21 +5,19 @@ AncientTomb_MapScripts:: @ 8238FB3
.byte 0
AncientTomb_MapScript1_238FC3: @ 8238FC3
checkflag FLAG_SYS_CTRL_OBJ_DELETE
call_if 1, AncientTomb_EventScript_238FCD
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_238FCD
end
AncientTomb_EventScript_238FCD:: @ 8238FCD
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, AncientTomb_EventScript_27374E
goto_if_ne AncientTomb_EventScript_27374E
removeobject VAR_LAST_TALKED
return
AncientTomb_MapScript1_238FE1: @ 8238FE1
setflag FLAG_LANDMARK_ANCIENT_TOMB
checkflag FLAG_0x1BD
call_if 0, AncientTomb_EventScript_238FEE
call_if_unset FLAG_0x1BD, AncientTomb_EventScript_238FEE
end
AncientTomb_EventScript_238FEE:: @ 8238FEE
@@ -27,8 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE
return
AncientTomb_MapScript1_238FF2: @ 8238FF2
checkflag FLAG_SYS_BRAILLE_FLY
call_if 0, AncientTomb_EventScript_238FFC
call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_238FFC
end
AncientTomb_EventScript_238FFC:: @ 8238FFC
@@ -42,8 +39,7 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC
AncientTomb_EventScript_239033:: @ 8239033
lockall
checkflag FLAG_SYS_BRAILLE_FLY
goto_eq AncientTomb_EventScript_239046
goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_239046
braillemessage AncientTomb_Braille_2A6D06
waitbuttonpress
hidebox2
@@ -77,11 +73,11 @@ AncientTomb_EventScript_23905A:: @ 823905A
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq AncientTomb_EventScript_2390A1
goto_if_eq AncientTomb_EventScript_2390A1
compare VAR_RESULT, 4
goto_eq AncientTomb_EventScript_2390AA
goto_if_eq AncientTomb_EventScript_2390AA
compare VAR_RESULT, 5
goto_eq AncientTomb_EventScript_2390AA
goto_if_eq AncientTomb_EventScript_2390AA
setflag FLAG_0x1BD
release
end
data/maps/AquaHideout_1F/scripts.inc
+4 -8
View File
@@ -4,10 +4,8 @@ AquaHideout_1F_MapScripts:: @ 8233493
AquaHideout_1F_EventScript_233494:: @ 8233494
lock
faceplayer
checkflag FLAG_0x06F
goto_eq AquaHideout_1F_EventScript_2334BC
checkflag FLAG_0x0D4
goto_eq AquaHideout_1F_EventScript_2334B2
goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334BC
goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334B2
msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT
release
end
@@ -25,10 +23,8 @@ AquaHideout_1F_EventScript_2334BC:: @ 82334BC
AquaHideout_1F_EventScript_2334C6:: @ 82334C6
lock
faceplayer
checkflag FLAG_0x06F
goto_eq AquaHideout_1F_EventScript_2334EE
checkflag FLAG_0x0D4
goto_eq AquaHideout_1F_EventScript_2334E4
goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334EE
goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334E4
msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT
release
end
data/maps/AquaHideout_B1F/scripts.inc
+10 -13
View File
@@ -4,22 +4,19 @@ AquaHideout_B1F_MapScripts:: @ 82339A7
.byte 0
AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
checkflag FLAG_SYS_CTRL_OBJ_DELETE
call_if 1, AquaHideout_B1F_EventScript_2339BC
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_2339BC
end
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, AquaHideout_B1F_EventScript_27374E
goto_if_ne AquaHideout_B1F_EventScript_27374E
removeobject VAR_LAST_TALKED
return
AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
checkflag FLAG_0x1C4
call_if 0, AquaHideout_B1F_EventScript_2339E3
checkflag FLAG_0x1C5
call_if 0, AquaHideout_B1F_EventScript_2339E7
call_if_unset FLAG_0x1C4, AquaHideout_B1F_EventScript_2339E3
call_if_unset FLAG_0x1C5, AquaHideout_B1F_EventScript_2339E7
end
AquaHideout_B1F_EventScript_2339E3:: @ 82339E3
@@ -43,11 +40,11 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A2F
goto_if_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 4
goto_eq AquaHideout_B1F_EventScript_233A2F
goto_if_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 5
goto_eq AquaHideout_B1F_EventScript_233A2F
goto_if_eq AquaHideout_B1F_EventScript_233A2F
setflag FLAG_0x1C4
release
end
@@ -70,11 +67,11 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A7C
goto_if_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 4
goto_eq AquaHideout_B1F_EventScript_233A7C
goto_if_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 5
goto_eq AquaHideout_B1F_EventScript_233A7C
goto_if_eq AquaHideout_B1F_EventScript_233A7C
setflag FLAG_0x1C5
release
end
data/maps/AquaHideout_B2F/scripts.inc
+1 -2
View File
@@ -3,8 +3,7 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF
.byte 0
AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
checkflag FLAG_0x070
call_if 1, AquaHideout_B2F_EventScript_233DDF
call_if_set FLAG_0x070, AquaHideout_B2F_EventScript_233DDF
end
AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+20 -20
View File
@@ -18,9 +18,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
checkplayergender
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
return
BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6
@@ -44,7 +44,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
setvar VAR_TEMP_2, 1
@@ -150,25 +150,25 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257870
compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257877
compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25787E
compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257885
compare VAR_RESULT, 5
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25788C
compare VAR_RESULT, 6
call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257893
call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768
multichoice 19, 4, 103, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_25783A
@@ -276,7 +276,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A
BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC
compare VAR_TEMP_2, 1
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1
@@ -285,7 +285,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4
waitmessage
call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B
multichoice 19, 4, 103, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_257961
@@ -334,7 +334,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 2
@@ -352,7 +352,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F
msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, MSGBOX_DEFAULT
call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C
goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB
BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
@@ -360,7 +360,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, MSGBOX_DEFAULT
@@ -378,7 +378,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 2
@@ -396,7 +396,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8
msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, MSGBOX_DEFAULT
call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15
goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB
BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
@@ -404,7 +404,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, MSGBOX_DEFAULT
@@ -536,7 +536,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16
hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
removeobject 7
call BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC
applymovement 255, BattleFrontier_BattleArenaBattleRoom_Movement_24C773
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_24C773
setvar VAR_TEMP_1, 1
end
data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
+2 -2
View File
@@ -10,14 +10,14 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9
delay 16
setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F
applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_257417
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_257417
waitmovement 0
applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444
waitmovement 0
msgbox BattleFrontier_BattleArenaCorridor_Text_257449, MSGBOX_SIGN
applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446
waitmovement 0
applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_25742C
waitmovement 0
setvar VAR_0x8006, 0
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+12 -12
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
BattleFrontier_BattleArenaLobby_EventScript_255C4B:: @ 8255C4B
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleArenaLobby_MapScript2_255C55: @ 8255C55
@@ -50,7 +50,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF
setvar VAR_0x8004, 10
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0
msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT
goto BattleFrontier_BattleArenaLobby_EventScript_255CF8
@@ -98,7 +98,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
waitse
call BattleFrontier_BattleArenaLobby_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF
message BattleFrontier_BattleArenaLobby_Text_256B19
waitmessage
multichoicedefault 20, 8, 94, 1, 0
@@ -157,7 +157,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -170,7 +170,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8
msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8
@@ -202,7 +202,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
call BattleFrontier_BattleArenaLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1
BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
special SavePlayerParty
@@ -215,9 +215,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
setvar VAR_0x8005, 1
special CallFrontierUtilFunc
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005
call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256005
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050
call_if_eq BattleFrontier_BattleArenaLobby_EventScript_256050
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13
setvar VAR_TEMP_0, 0
waitstate
@@ -259,12 +259,12 @@ BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003
BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_256034
applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256041
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256041
waitmovement 0
opendoor 2, 2
waitdooranim
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E
applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C
waitmovement 0
closedoor 2, 2
waitdooranim
@@ -308,12 +308,12 @@ BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C
BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25607F
applymovement 255, BattleFrontier_BattleArenaLobby_Movement_256088
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_256088
waitmovement 0
opendoor 11, 2
waitdooranim
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_25603E
applymovement 255, BattleFrontier_BattleArenaLobby_Movement_25604C
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_25604C
waitmovement 0
closedoor 11, 2
waitdooranim
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+33 -33
View File
@@ -13,7 +13,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C919
call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC
end
@@ -21,9 +21,9 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
checkplayergender
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4
@@ -42,7 +42,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
lockall
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938
applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
waitmovement 0
call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5
@@ -50,9 +50,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
closemessage
showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
compare VAR_TEMP_F, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E
compare VAR_TEMP_E, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A
BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E
applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C775
@@ -66,9 +66,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
waitmovement 0
compare VAR_TEMP_F, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82
compare VAR_TEMP_E, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB
BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82
setvar VAR_0x8004, 4
@@ -107,7 +107,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B
waitmovement 0
compare VAR_TEMP_2, 2
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F
setvar VAR_0x8004, 19
special CallBattleDomeFunction
switch VAR_RESULT
@@ -119,11 +119,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
setvar VAR_0x8004, 4
special CallBattleDomeFunction
compare VAR_TEMP_2, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1
compare VAR_TEMP_2, 1
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5
compare VAR_TEMP_2, 2
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9
playse SE_W227B
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
delay 60
@@ -166,9 +166,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4
waitmovement 0
compare VAR_TEMP_2, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3
compare VAR_TEMP_2, 1
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC
playse SE_W227B
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E
delay 60
@@ -229,17 +229,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5
setvar VAR_0x8005, 6
special CallBattleDomeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023
setvar VAR_0x8004, 1
setvar VAR_0x8005, 7
special CallBattleDomeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special CallBattleDomeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A
goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9
return
@@ -303,7 +303,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2
BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9
compare VAR_TEMP_F, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C105
switch VAR_TEMP_E
case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158
case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C161
@@ -430,7 +430,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -450,7 +450,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
closemessage
applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
waitmovement 0
@@ -469,7 +469,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C373
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -489,7 +489,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62
closemessage
applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B
waitmovement 0
@@ -551,17 +551,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502
call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC
setvar VAR_TEMP_1, 1
applymovement 255, BattleFrontier_BattleDomeBattleRoom_Movement_24C773
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_24C773
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_RESULT, 3
goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
setvar VAR_0x8004, 9
special CallFrontierUtilFunc
copyvar VAR_TEMP_E, VAR_RESULT
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF
call BattleFrontier_BattleDomeBattleRoom_EventScript_242170
setobjectxyperm 15, 13, 9
removeobject 15
@@ -573,7 +573,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF
BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0
compare VAR_TEMP_9, 1
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC
end
BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC
@@ -582,13 +582,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC
BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502
compare VAR_TEMP_F, 0
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F
compare VAR_TEMP_F, 1
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C530
compare VAR_TEMP_F, 2
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C594
compare VAR_TEMP_F, 3
call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C652
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F
@@ -952,7 +952,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5
BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
waitstate
end
@@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
random 2
copyvar VAR_TEMP_D, VAR_RESULT
compare VAR_TEMP_D, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
setobjectxyperm 6, 2, 0
setobjectmovementtype 6, 10
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
compare VAR_TEMP_D, 0
goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
return
data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+5 -5
View File
@@ -13,14 +13,14 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
setvar VAR_0x8005, 1
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2
applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1A1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1
waitmovement 0
opendoor 13, 3
waitdooranim
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE
applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1AE
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE
waitmovement 0
closedoor 13, 3
waitdooranim
@@ -28,12 +28,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E
BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6
applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1C1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1
waitmovement 0
opendoor 37, 3
waitdooranim
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6
applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1D2
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2
waitmovement 0
closedoor 37, 3
waitdooranim
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+26 -26
View File
@@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB
BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F
@@ -62,7 +62,7 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B
setvar VAR_0x8004, 10
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1
msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_2498C9
@@ -128,7 +128,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
waitse
call BattleFrontier_BattleDomeLobby_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9
message BattleFrontier_BattleDomeLobby_Text_24AE17
waitmessage
multichoicedefault 20, 8, 94, 1, 0
@@ -183,15 +183,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47
BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59
special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CFD
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D06
BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D0F
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D15
waitmessage
multichoice 17, 6, 23, 0
switch VAR_RESULT
@@ -210,7 +210,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -223,7 +223,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C61
msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61
@@ -251,7 +251,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
call BattleFrontier_BattleDomeLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A
setvar VAR_0x8004, 22
special CallBattleDomeFunction
@@ -273,9 +273,9 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D1B
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D24
goto BattleFrontier_BattleDomeLobby_EventScript_249A72
BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15
@@ -310,26 +310,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C
BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5
applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D33
waitdooranim
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5
applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D3F
waitdooranim
return
@@ -435,13 +435,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84
setvar VAR_0x8005, 9
special CallBattleDomeFunction
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DC9
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DD2
compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB
compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4
fadescreen 1
setvar VAR_0x8004, 8
special CallBattleDomeFunction
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+9 -11
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
@@ -18,13 +18,13 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222
compare VAR_0x8006, 1
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7
setvar VAR_0x8004, 2
setvar VAR_0x8005, 6
setvar VAR_0x8006, 1
special CallFrontierUtilFunc
setvar VAR_TEMP_0, 1
applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652
waitmovement 0
lockall
@@ -34,7 +34,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F
switch VAR_RESULT
call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1
multichoice 16, 0, 73, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD
@@ -159,7 +159,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
setvar VAR_0x8004, 21
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F
setvar VAR_0x8004, 2
setvar VAR_0x8005, 8
special CallBattleDomeFunction
@@ -171,11 +171,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D
closemessage
applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F
waitmovement 0
applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657
waitmovement 0
opendoor 5, 1
waitdooranim
applymovement 255, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659
waitmovement 0
closedoor 5, 1
waitdooranim
@@ -219,15 +219,13 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C
return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B
checkflag FLAG_TEMP_1
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5
goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, MSGBOX_DEFAULT
setflag FLAG_TEMP_1
return
BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0
checkflag FLAG_TEMP_1
goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE
goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE
msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, MSGBOX_DEFAULT
setflag FLAG_TEMP_1
return
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+19 -19
View File
@@ -9,14 +9,14 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
special CallFrontierUtilFunc
checkplayergender
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
setvar VAR_0x8004, 9
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3
end
BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3:: @ 825ADF3
@@ -30,9 +30,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A
setvar VAR_TEMP_1, 1
hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
compare VAR_TEMP_F, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24
hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24
@@ -55,7 +55,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B
closemessage
applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
waitmovement 0
call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7
@@ -63,9 +63,9 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67
compare VAR_TEMP_F, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B
waitmovement 0
call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4
setvar VAR_0x8004, 11
@@ -78,7 +78,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7
compare VAR_TEMP_F, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C
setvar VAR_0x8004, 5
special CallBattlePalaceFunction
lockall
@@ -111,7 +111,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F
setvar VAR_0x8005, 3
special CallBattleFactoryFunction
compare VAR_RESULT, 9999
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
addvar VAR_RESULT, 1
setorcopyvar VAR_0x8006, VAR_RESULT
setvar VAR_0x8004, 2
@@ -152,7 +152,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -162,14 +162,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT
call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT
closemessage
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
@@ -188,7 +188,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -198,14 +198,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT
call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT
waitmessage
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182
@@ -237,7 +237,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
setvar VAR_0x8005, 3
special CallBattleFactoryFunction
compare VAR_RESULT, 9999
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E
addvar VAR_RESULT, 1
setorcopyvar VAR_0x8006, VAR_RESULT
setvar VAR_0x8004, 2
@@ -247,7 +247,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105
setvar VAR_0x8005, 1
special CallBattleFactoryFunction
compare VAR_RESULT, 9999
goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43
addvar VAR_RESULT, 1
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
@@ -293,7 +293,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8
waitstate
end
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+13 -13
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407
@@ -56,7 +56,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B
setvar VAR_0x8004, 10
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD
msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT
waitmessage
goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6
@@ -103,7 +103,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B
call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258582
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258582
message BattleFrontier_BattleFactoryLobby_Text_259388
waitmessage
multichoicedefault 20, 8, 94, 1, 0
@@ -156,15 +156,15 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD
BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED
special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587B1
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587BA
BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C3
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587C9
waitmessage
multichoice 17, 6, 23, 0
switch VAR_RESULT
@@ -211,7 +211,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
call BattleFrontier_BattleFactoryLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783
setvar VAR_0x8006, 0
BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
@@ -219,11 +219,11 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT
closemessage
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_25875C
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258762
applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7
applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC
waitmovement 0
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13
setvar VAR_TEMP_0, 0
@@ -240,9 +240,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762
BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587CF
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_2587D8
goto BattleFrontier_BattleFactoryLobby_EventScript_258606
BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+47 -47
View File
@@ -10,12 +10,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF
setvar VAR_TEMP_1, 1
compare VAR_0x8006, 1
goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA
goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA
setobjectxy 1, 8, 7
turnobject 1, 1
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF
@@ -24,13 +24,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9
compare VAR_0x8006, 1
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5
setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC
applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A
waitmovement 0
compare VAR_0x8006, 2
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69
setvar VAR_0x8004, 13
special CallBattleFactoryFunction
setvar VAR_0x8004, 12
@@ -56,9 +56,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74
closemessage
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B
waitmovement 0
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11
waitstate
@@ -76,7 +76,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5
setvar VAR_0x8004, 9
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26
playse 263
waitse
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, MSGBOX_DEFAULT
@@ -97,27 +97,27 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13
setvar VAR_0x8004, 9
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D
compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24
compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B
compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32
compare VAR_RESULT, 5
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39
compare VAR_RESULT, 6
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6
multichoice 19, 4, 103, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98
@@ -186,7 +186,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2
special CallBattleFactoryFunction
waitstate
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74
setvar VAR_0x8004, 8
special CallBattleFactoryFunction
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, MSGBOX_DEFAULT
@@ -250,41 +250,41 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT
compare VAR_0x8005, 0
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62
compare VAR_0x8005, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B
compare VAR_0x8005, 2
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74
compare VAR_0x8005, 3
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D
compare VAR_0x8005, 4
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86
compare VAR_0x8005, 5
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F
compare VAR_0x8005, 6
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98
compare VAR_0x8005, 7
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1
compare VAR_0x8005, 8
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA
compare VAR_0x8005, 10
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3
compare VAR_0x8005, 11
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC
compare VAR_0x8005, 12
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5
compare VAR_0x8005, 13
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE
compare VAR_0x8005, 14
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7
compare VAR_0x8005, 15
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0
compare VAR_0x8005, 16
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9
compare VAR_0x8005, 17
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2
compare VAR_0x8005, 18
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB
return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62
@@ -361,23 +361,23 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004
compare VAR_0x8006, 0
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068
compare VAR_0x8006, 1
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071
compare VAR_0x8006, 2
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A
compare VAR_0x8006, 3
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083
compare VAR_0x8006, 4
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C
compare VAR_0x8006, 5
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095
compare VAR_0x8006, 6
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E
compare VAR_0x8006, 7
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7
compare VAR_0x8006, 8
call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0
return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068
@@ -421,7 +421,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9
waitmessage
call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110
multichoice 19, 4, 103, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146
@@ -448,12 +448,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C
applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3
applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0
return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B
applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9
applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6
return
BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+21 -21
View File
@@ -13,9 +13,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
checkplayergender
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
return
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B
@@ -38,7 +38,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B
waitmovement 0
applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
@@ -107,25 +107,25 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66
compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D
compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74
compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B
compare VAR_RESULT, 5
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82
compare VAR_RESULT, 6
call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89
call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42
multichoice 19, 4, 103, 1
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB14
@@ -199,7 +199,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61
compare VAR_TEMP_2, 1
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1
@@ -208,7 +208,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79
waitmessage
call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0
multichoice 19, 4, 103, 1
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06
@@ -248,7 +248,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -258,7 +258,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, MSGBOX_DEFAULT
call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
@@ -267,7 +267,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, MSGBOX_DEFAULT
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
@@ -291,7 +291,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -301,7 +301,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, MSGBOX_DEFAULT
call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
@@ -310,7 +310,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, MSGBOX_DEFAULT
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99
applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
@@ -357,7 +357,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833
setvar VAR_TEMP_1, 1
applymovement 255, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
removeobject 2
applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90
@@ -461,7 +461,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6
BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5
warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7
waitstate
end
data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+11 -11
View File
@@ -9,34 +9,34 @@ BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9
BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
delay 16
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8
waitmovement 0
lockall
setvar VAR_0x8004, 3
special CallBattlePalaceFunction
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F58B
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F594
compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F59D
compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6
compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF
closemessage
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553
goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD
applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4
waitmovement 0
opendoor 6, 3
waitdooranim
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA
applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
waitmovement 0
closedoor 6, 3
waitdooranim
@@ -44,12 +44,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3
BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB
applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2
waitmovement 0
opendoor 10, 3
waitdooranim
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA
applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9
waitmovement 0
closedoor 10, 3
waitdooranim
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+20 -20
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D
@@ -50,7 +50,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817
setvar VAR_0x8004, 10
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838
msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceLobby_EventScript_24D840
@@ -98,7 +98,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
waitse
call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907
message BattleFrontier_BattlePalaceLobby_Text_24EF16
waitmessage
multichoicedefault 20, 8, 94, 1, 0
@@ -151,18 +151,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
setvar VAR_0x8005, 0
special CallBattlePalaceFunction
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817
goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_24D817
special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBA7
BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB0
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DBB6
waitmessage
multichoice 17, 6, 23, 0
switch VAR_RESULT
@@ -181,7 +181,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -194,7 +194,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91
msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91
@@ -226,7 +226,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
call BattleFrontier_BattlePalaceLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A
BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
special SavePlayerParty
@@ -243,7 +243,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20
compare VAR_FRONTIER_BATTLE_MODE, 1
goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38
msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceLobby_EventScript_24D999
@@ -299,24 +299,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6
BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC23
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC29
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47
applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC2F
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC35
waitdooranim
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49
applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC3B
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC41
waitdooranim
return
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+3 -3
View File
@@ -18,14 +18,14 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
setvar VAR_0x8004, 24
setvar VAR_0x8005, 1
special CallBattlePikeFunction
applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80B
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B
applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812
waitmovement 0
lockall
msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, MSGBOX_DEFAULT
closemessage
releaseall
applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E
waitmovement 0
setvar VAR_0x8004, 2
setvar VAR_0x8005, 0
@@ -42,7 +42,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7
BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+6 -6
View File
@@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3
BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
@@ -52,7 +52,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762
setvar VAR_0x8004, 10
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25B784
msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT
waitmessage
goto BattleFrontier_BattlePikeLobby_EventScript_25B78D
@@ -150,7 +150,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -163,7 +163,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73
msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73
@@ -200,7 +200,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
setvar VAR_0x8004, 26
special CallBattlePikeFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
special SavePlayerParty
setvar VAR_0x8004, 3
setvar VAR_0x8005, 3
@@ -263,7 +263,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94
applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7
applymovement 255, BattleFrontier_BattlePikeLobby_Movement_25BAA6
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_25BAA6
waitmovement 0
return
data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+24 -24
View File
@@ -112,8 +112,8 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT
closemessage
special SpawnScriptEventObject
applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2
waitmovement 0
playse 267
@@ -146,7 +146,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -156,14 +156,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT
call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA
goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT
waitmessage
playfanfare MUS_ME_SYMBOLGET
@@ -181,7 +181,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
goto_if_ne BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -191,14 +191,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT
call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460
goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460
goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT
waitmessage
playfanfare MUS_ME_SYMBOLGET
@@ -215,7 +215,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA
waitmovement 0
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
@@ -277,7 +277,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA
waitmovement 0
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB
waitmovement 0
setvar VAR_0x8004, 21
setvar VAR_0x8005, 0
@@ -285,7 +285,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
msgbox gStringVar4, MSGBOX_DEFAULT
closemessage
delay 16
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
waitmovement 0
setvar VAR_0x8004, 21
setvar VAR_0x8005, 1
@@ -302,13 +302,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC:: @ 825D5DC
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
waitmovement 0
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC
waitmovement 0
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4
waitmovement 0
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF
waitmovement 0
end
@@ -321,9 +321,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605
special CallBattlePikeFunction
copyvar VAR_0x8004, VAR_RESULT
compare VAR_0x8004, 0
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643
compare VAR_0x8004, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT
closemessage
releaseall
@@ -338,13 +338,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
setvar VAR_0x8004, 11
special CallBattlePikeFunction
compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758
compare VAR_RESULT, 3
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F
compare VAR_RESULT, 4
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766
setvar VAR_0x8004, 15
special CallBattlePikeFunction
waitstate
@@ -375,9 +375,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
setvar VAR_0x8004, 11
special CallBattlePikeFunction
compare VAR_RESULT, 0
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774
setvar VAR_0x8004, 15
special CallBattlePikeFunction
waitstate
@@ -431,7 +431,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774:: @ 825D774
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B
closemessage
applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
waitmovement 0
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
setvar VAR_0x8005, 0
@@ -608,9 +608,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
setvar VAR_0x8004, 13
special CallBattlePikeFunction
compare VAR_RESULT, 2
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875
playfanfare MUS_ME_ASA
waitfanfare
msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT
data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE
BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3E8:: @ 825E3E8
setvar VAR_TEMP_4, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2: @ 825E3F2
data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
+3 -3
View File
@@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466: @ 825E466
BattleFrontier_BattlePikeRandomRoom3_EventScript_25E470:: @ 825E470
setvar VAR_TEMP_4, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A
@@ -39,9 +39,9 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A
setvar VAR_0x8005, 5
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
compare VAR_RESULT, 3
goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
goto_if_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3
end
BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3:: @ 825E4A3
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+3 -3
View File
@@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D: @ 825C87D
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887
setvar VAR_TEMP_4, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25C891:: @ 825C891
@@ -169,7 +169,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78
setvar VAR_0x8004, 17
special CallBattlePikeFunction
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
setvar VAR_TEMP_5, 255
end
@@ -192,7 +192,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB
setvar VAR_0x8004, 19
special CallBattlePikeFunction
compare VAR_RESULT, 4
goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2
lock
faceplayer
msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc
+40 -40
View File
@@ -15,29 +15,29 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A
specialvar VAR_TEMP_1, sub_813AA04
compare VAR_TEMP_1, VAR_0x8008
goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9
goto_if_ge BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT
compare VAR_TEMP_2, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
compare VAR_TEMP_2, 1
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
compare VAR_TEMP_2, 2
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9
compare VAR_TEMP_2, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5
compare VAR_TEMP_2, 1
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A
end
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
checkdecorspace VAR_0x8009
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D
copyvar VAR_0x8004, VAR_0x8008
special sub_813A9A4
givedecoration VAR_0x8009
@@ -45,7 +45,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5
playse SE_REGI
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT
compare VAR_TEMP_2, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
end
@@ -58,7 +58,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
checkitemspace VAR_0x8009, 1
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166
copyvar VAR_0x8004, VAR_0x8008
special sub_813A9A4
giveitem VAR_0x8009, 1
@@ -66,7 +66,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A
playse SE_REGI
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT
compare VAR_TEMP_2, 2
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
end
@@ -108,7 +108,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 16
setvar VAR_0x8009, 75
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -117,7 +117,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 32
setvar VAR_0x8009, 103
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -126,7 +126,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 32
setvar VAR_0x8009, 87
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -135,7 +135,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 48
setvar VAR_0x8009, 79
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -144,7 +144,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 48
setvar VAR_0x8009, 84
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -153,7 +153,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 48
setvar VAR_0x8009, 85
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -162,7 +162,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 48
setvar VAR_0x8009, 86
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -171,7 +171,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 80
setvar VAR_0x8009, 80
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -180,7 +180,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 80
setvar VAR_0x8009, 81
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -189,7 +189,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185
setvar VAR_0x8008, 80
setvar VAR_0x8009, 82
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -222,7 +222,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
setvar VAR_0x8008, 128
setvar VAR_0x8009, 113
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -231,7 +231,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
setvar VAR_0x8008, 128
setvar VAR_0x8009, 111
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -240,7 +240,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
setvar VAR_0x8008, 256
setvar VAR_0x8009, 114
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -249,7 +249,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
setvar VAR_0x8008, 256
setvar VAR_0x8009, 115
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -258,7 +258,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E
setvar VAR_0x8008, 256
setvar VAR_0x8009, 116
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -292,7 +292,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
setvar VAR_0x8008, 1
setvar VAR_0x8009, 64
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -301,7 +301,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
setvar VAR_0x8008, 1
setvar VAR_0x8009, 67
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -310,7 +310,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
setvar VAR_0x8008, 1
setvar VAR_0x8009, 65
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -319,7 +319,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
setvar VAR_0x8008, 1
setvar VAR_0x8009, 70
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -328,7 +328,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
setvar VAR_0x8008, 1
setvar VAR_0x8009, 66
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -337,7 +337,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1
setvar VAR_0x8008, 1
setvar VAR_0x8009, 63
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -374,7 +374,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
setvar VAR_0x8008, 48
setvar VAR_0x8009, 200
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -383,7 +383,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
setvar VAR_0x8008, 48
setvar VAR_0x8009, 180
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -392,7 +392,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
setvar VAR_0x8008, 48
setvar VAR_0x8009, 183
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -401,7 +401,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
setvar VAR_0x8008, 48
setvar VAR_0x8009, 185
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -410,7 +410,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
setvar VAR_0x8008, 64
setvar VAR_0x8009, 179
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -419,7 +419,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
setvar VAR_0x8008, 64
setvar VAR_0x8009, 186
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -428,7 +428,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
setvar VAR_0x8008, 64
setvar VAR_0x8009, 187
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -437,7 +437,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
setvar VAR_0x8008, 64
setvar VAR_0x8009, 196
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
@@ -446,7 +446,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785
BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8
msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
goto_if_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602
setvar VAR_0x8008, 64
setvar VAR_0x8009, 198
goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A
data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+9 -9
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77
special CallBattlePyramidFunction
delay 2
compare VAR_RESULT, 2
goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77
goto_if_ne BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77
setvar VAR_TEMP_D, 0
releaseall
end
@@ -50,17 +50,17 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
setvar VAR_0x8005, 5
special CallFrontierUtilFunc
compare VAR_RESULT, 4
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
compare VAR_RESULT, 5
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
compare VAR_RESULT, 3
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
compare VAR_RESULT, 9
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42
setvar VAR_0x8004, 14
setvar VAR_0x8005, 8
special CallFrontierUtilFunc
@@ -135,7 +135,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
copyvar VAR_0x8006, VAR_RESULT
special CallFrontierUtilFunc
compare VAR_RESULT, 7
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
setvar VAR_0x8004, 6
special CallBattlePyramidFunction
setvar VAR_0x8004, 2
@@ -167,7 +167,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A
special CallBattlePyramidFunction
callstd STD_FIND_ITEM
compare VAR_0x8007, 0
goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87
setvar VAR_0x8004, 8
special CallBattlePyramidFunction
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+13 -13
View File
@@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735
@@ -53,7 +53,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1
setvar VAR_0x8004, 10
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2
msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA
@@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2
BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
special sub_81B95E0
compare VAR_RESULT, 1
call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB
call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250DDB
clearflag FLAG_SPECIAL_FLAG_0x4004
setvar VAR_0x8004, 8
special CallFrontierUtilFunc
@@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -167,7 +167,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1
msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1
@@ -203,7 +203,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
call BattleFrontier_BattlePyramidLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA
BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
special SavePlayerParty
@@ -286,7 +286,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
setvar VAR_0x8005, 5
special CallBattlePyramidFunction
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53
goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B53
setvar VAR_RESULT, 0
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
return
@@ -304,7 +304,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
setvar VAR_0x8005, 6
special CallBattlePyramidFunction
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91
goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_250B91
setvar VAR_RESULT, 0
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
return
@@ -434,14 +434,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4
applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD
waitmovement 0
msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special CallBattlePyramidFunction
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94
msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C
@@ -457,7 +457,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C
closemessage
applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5
waitmovement 0
applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DD8
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DD8
waitmovement 0
return
@@ -497,7 +497,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB
setflag FLAG_SPECIAL_FLAG_0x4004
special sub_81C6A94
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00
message BattleFrontier_BattlePyramidLobby_Text_2518C6
waitmessage
goto BattleFrontier_BattlePyramidLobby_EventScript_250E09
@@ -535,7 +535,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50
BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60
special sub_81B95E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F
return
BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+19 -19
View File
@@ -19,9 +19,9 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE
BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
compare VAR_TEMP_C, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3
setobjectxyperm 2, 0, 0
BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3
@@ -31,7 +31,7 @@ BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4
setvar VAR_0x8004, 9
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25510C
call BattleFrontier_BattlePyramidTop_EventScript_242170
BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
@@ -46,11 +46,11 @@ BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C
setvar VAR_0x8005, 5
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 3
goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
compare VAR_RESULT, 9
goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
end
BattleFrontier_BattlePyramidTop_MapScript2_25516E: @ 825516E
@@ -89,14 +89,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0
lock
faceplayer
compare VAR_TEMP_D, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255236
compare VAR_TEMP_C, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255240
msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT
closemessage
applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD
waitmovement 0
applymovement 255, BattleFrontier_BattlePyramidTop_Movement_255403
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403
waitmovement 0
applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400
waitmovement 0
@@ -137,9 +137,9 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0
special SpawnScriptEventObject
applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT
closemessage
@@ -161,14 +161,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA
call BattleFrontier_BattlePyramidTop_EventScript_2553ED
playbgm MUS_PYRAMID_TOP, 0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB
goto BattleFrontier_BattlePyramidTop_EventScript_252B42
BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_25521A
msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattlePyramidTop_Text_2558E9
@@ -184,9 +184,9 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388
special SpawnScriptEventObject
applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT
closemessage
@@ -208,14 +208,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392
call BattleFrontier_BattlePyramidTop_EventScript_2553ED
playbgm MUS_PYRAMID_TOP, 0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3
goto BattleFrontier_BattlePyramidTop_EventScript_252B42
BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_25521A
msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattlePyramidTop_Text_255B59
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+21 -21
View File
@@ -18,16 +18,16 @@ BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62
BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C
setvar VAR_TEMP_0, 1
applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242179
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179
waitmovement 0
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
waitmovement 0
applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
waitmovement 0
setvar VAR_TEMP_2, 1
setvar VAR_0x8004, 2
@@ -76,10 +76,10 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F
setvar VAR_0x8004, 9
special CallFrontierUtilFunc
compare VAR_RESULT, 0
call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D
waitmovement 0
applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E
waitmovement 0
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
@@ -91,14 +91,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F
special CallFrontierUtilFunc
copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44
call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A
multichoice 19, 4, 103, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC
@@ -146,7 +146,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA
BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC
closemessage
applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180
waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192
waitmovement 0
@@ -246,7 +246,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A
compare VAR_TEMP_2, 1
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1
@@ -255,7 +255,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22
waitmessage
call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79
multichoice 19, 4, 103, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF
@@ -275,7 +275,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79
BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
call BattleFrontier_BattleTowerBattleRoom_EventScript_242170
closemessage
applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_242180
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180
waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192
waitmovement 0
@@ -290,7 +290,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_242029
msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -300,7 +300,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029
msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT
call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
@@ -308,7 +308,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattleTowerBattleRoom_Text_24270E
@@ -324,7 +324,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085
setvar VAR_0x8005, 7
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT
setvar VAR_0x8004, 2
setvar VAR_0x8005, 7
@@ -334,7 +334,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT
call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
@@ -342,7 +342,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF
setvar VAR_0x8004, 12
special CallFrontierUtilFunc
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6
msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT
playfanfare MUS_ME_SYMBOLGET
message BattleFrontier_BattleTowerBattleRoom_Text_242932
@@ -368,7 +368,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E
waitstate
copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE
compare VAR_0x8004, 3
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A
setvar VAR_0x8004, 18
special CallFrontierUtilFunc
special HealPlayerParty
@@ -486,11 +486,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8
BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2
compare VAR_RESULT, 3
goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6
waitstate
end
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+14 -15
View File
@@ -6,9 +6,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F
end
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
@@ -16,7 +16,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
special sub_8161F74
checkplayergender
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
setvar VAR_OBJ_GFX_ID_F, 0
return
@@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33
.2byte 0
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D
hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2
end
BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43
@@ -49,7 +49,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4
applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E
waitmovement 0
@@ -71,7 +71,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4
applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026
setvar VAR_0x8004, 7
setvar VAR_0x8005, 0
special sub_8161F74
@@ -143,7 +143,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA
applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118
msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121
@@ -158,7 +158,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
setvar VAR_0x8005, 2
special CallFrontierUtilFunc
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
call_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249514
playfanfare MUS_ME_ASA
waitfanfare
special HealPlayerParty
@@ -169,10 +169,10 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143
special CallFrontierUtilFunc
call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1
multichoice 19, 4, 103, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249283
@@ -257,7 +257,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB
BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E
copyvar VAR_TEMP_F, VAR_RESULT
switch VAR_TEMP_F
case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249354
@@ -349,8 +349,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249412:: @ 8249412
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_249417:: @ 8249417
checkflag FLAG_TEMP_2
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerBattleRoom2_EventScript_249457
multichoice 19, 6, 105, 1
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249483
@@ -375,7 +374,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483
special sub_813B568
waitstate
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
goto_if_ne BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412
end
@@ -396,7 +395,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD
waitmessage
multichoicedefault 20, 8, 94, 1, 0
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA
goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143
end
data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
+4 -4
View File
@@ -5,7 +5,7 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5
compare VAR_0x8006, 1
goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3
setmetatile 12, 0, 519, 0
setmetatile 12, 1, 527, 0
end
@@ -22,15 +22,15 @@ BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6
BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0
setvar VAR_TEMP_0, 1
compare VAR_0x8006, 1
goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A
applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B39
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39
waitmovement 0
goto BattleFrontier_BattleTowerCorridor_EventScript_241B27
BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37
applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B36
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36
waitmovement 0
BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+8 -8
View File
@@ -6,9 +6,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D71
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D91
end
BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
@@ -16,7 +16,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
special sub_8161F74
checkplayergender
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
setvar VAR_OBJ_GFX_ID_F, 0
return
@@ -33,7 +33,7 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95
.2byte 0
BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F
hideobjectat 255, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2
special sub_8139980
@@ -88,13 +88,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248E9E
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EA8
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2
call_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248EB2
return
BattleFrontier_BattleTowerCorridor2_EventScript_248E9E:: @ 8248E9E
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+8 -9
View File
@@ -10,7 +10,7 @@ BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6
BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86
applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A8A
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A
waitmovement 0
special sub_813A080
waitse
@@ -18,20 +18,20 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
waitstate
delay 48
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
applymovement 255, BattleFrontier_BattleTowerElevator_Movement_241A92
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92
waitmovement 0
call BattleFrontier_BattleTowerElevator_EventScript_241A28
end
BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A55
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A5F
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_241A72
return
BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55
@@ -40,8 +40,7 @@ BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55
return
BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F
checkflag FLAG_0x152
goto_if 0, BattleFrontier_BattleTowerElevator_EventScript_241A7C
goto_if_unset FLAG_0x152, BattleFrontier_BattleTowerElevator_EventScript_241A7C
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2
waitstate
return
@@ -86,6 +85,6 @@ BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96
BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+66 -68
View File
@@ -14,9 +14,8 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
setvar VAR_0x8004, 10
special CallApprenticeFunction
compare VAR_0x8004, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
checkflag FLAG_0x934
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
goto_if_set FLAG_0x934, BattleFrontier_BattleTowerLobby_EventScript_23E6C1
BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
clearflag FLAG_HIDE_APPRENTICE
@@ -36,7 +35,7 @@ BattleFrontier_BattleTowerLobby_MapScript2_23E6C9: @ 823E6C9
BattleFrontier_BattleTowerLobby_EventScript_23E6D3:: @ 823E6D3
setvar VAR_TEMP_1, 1
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleTowerLobby_MapScript2_23E6DD: @ 823E6DD
@@ -79,7 +78,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758
setvar VAR_0x8004, 10
special CallFrontierUtilFunc
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E778
message BattleFrontier_BattleTowerLobby_Text_23F60D
waitmessage
goto BattleFrontier_BattleTowerLobby_EventScript_23E780
@@ -91,7 +90,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780
setvar VAR_0x8004, 5
special sub_8161F74
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5
message BattleFrontier_BattleTowerLobby_Text_23F844
waitmessage
playfanfare MUS_FANFA4
@@ -108,7 +107,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5
setvar VAR_0x8005, 1
special sub_8161F74
compare VAR_RESULT, 49
goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E7E2
msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT
BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2
@@ -120,14 +119,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2
BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
compare VAR_FRONTIER_BATTLE_MODE, 2
goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E
checkflag FLAG_0x152
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
goto_if_set FLAG_0x152, BattleFrontier_BattleTowerLobby_EventScript_23E81E
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_8161F74
compare VAR_RESULT, 0
goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E830
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E830
BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E
setvar VAR_0x8004, 2
@@ -161,7 +159,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
waitse
call BattleFrontier_BattleTowerLobby_EventScript_23E8E0
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF
message BattleFrontier_BattleTowerLobby_Text_23FE3C
waitmessage
multichoicedefault 20, 8, 94, 1, 0
@@ -184,7 +182,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4
setvar VAR_0x8004, 19
special CallFrontierUtilFunc
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7
playse SE_SAVE
msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF
@@ -215,7 +213,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
lock
faceplayer
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E930
message BattleFrontier_BattleTowerLobby_Text_23F737
waitmessage
message BattleFrontier_BattleTowerLobby_Text_23F754
@@ -264,7 +262,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -277,7 +275,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
@@ -305,7 +303,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
call BattleFrontier_BattleTowerLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
setvar VAR_0x40BC, 1
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
@@ -344,7 +342,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -357,7 +355,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
@@ -385,7 +383,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
call BattleFrontier_BattleTowerLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
setvar VAR_0x40BC, 0
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
@@ -425,7 +423,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -438,7 +436,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
@@ -466,7 +464,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
call BattleFrontier_BattleTowerLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
setvar VAR_0x40BC, 0
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
@@ -505,7 +503,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
setvar VAR_0x8004, 15
special CallFrontierUtilFunc
compare VAR_0x8004, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT
@@ -518,7 +516,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2
special sub_80F9490
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3
msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO
switch VAR_RESULT
case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3
@@ -549,11 +547,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
call BattleFrontier_BattleTowerLobby_EventScript_27134F
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8
goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5
end
@@ -606,9 +604,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80
BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB
end
BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1
@@ -744,7 +742,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
special sub_8161F74
delay 1
compare VAR_RESULT, 6
goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23F108
call BattleFrontier_BattleTowerLobby_EventScript_23F135
clearflag FLAG_0x077
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6
@@ -755,7 +753,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135
call BattleFrontier_BattleTowerLobby_EventScript_23F1A7
compare VAR_FRONTIER_BATTLE_MODE, 3
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F152
msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_23F15B
@@ -769,12 +767,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B
call BattleFrontier_BattleTowerLobby_EventScript_23F1E8
call BattleFrontier_BattleTowerLobby_EventScript_23F22D
applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195
applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F195
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F195
waitmovement 0
opendoor VAR_0x8004, 1
waitdooranim
applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199
applymovement 255, BattleFrontier_BattleTowerLobby_Movement_23F19C
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F19C
waitmovement 0
closedoor VAR_0x8004, 1
waitdooranim
@@ -808,13 +806,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0
BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D4
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1D9
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1DE
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F1E3
return
BattleFrontier_BattleTowerLobby_EventScript_23F1D4:: @ 823F1D4
@@ -835,13 +833,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3
BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F215
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F21B
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F221
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F227
return
BattleFrontier_BattleTowerLobby_EventScript_23F215:: @ 823F215
@@ -862,13 +860,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227
BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F25A
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F260
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F266
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F26C
return
BattleFrontier_BattleTowerLobby_EventScript_23F25A:: @ 823F25A
@@ -889,13 +887,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C
BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272
compare VAR_FRONTIER_BATTLE_MODE, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F29F
compare VAR_FRONTIER_BATTLE_MODE, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2A5
compare VAR_FRONTIER_BATTLE_MODE, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2AB
compare VAR_FRONTIER_BATTLE_MODE, 3
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F2B1
return
BattleFrontier_BattleTowerLobby_EventScript_23F29F:: @ 823F29F
@@ -935,25 +933,25 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
special sub_80B2DA4
waitstate
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF
compare VAR_RESULT, 2
goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2
compare VAR_RESULT, 3
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F327
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F327
compare VAR_RESULT, 4
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F351
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F351
compare VAR_RESULT, 5
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6
compare VAR_RESULT, 6
goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5
compare VAR_RESULT, 11
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
end
BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327
special CloseLink
compare VAR_0x8005, 3
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F
msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT
release
end
@@ -974,11 +972,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366
special CloseLink
compare VAR_0x8005, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F394
compare VAR_0x8005, 1
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F39D
compare VAR_0x8005, 2
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3A6
msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT
release
end
@@ -1035,26 +1033,26 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3
BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430
call BattleFrontier_BattleTowerLobby_EventScript_277B30
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
compare VAR_RESULT, 5
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3
compare VAR_RESULT, 8
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F430
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F430
compare VAR_RESULT, 11
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
release
return
BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
call BattleFrontier_BattleTowerLobby_EventScript_277B35
compare VAR_RESULT, 1
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F496
compare VAR_RESULT, 5
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3
compare VAR_RESULT, 8
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F463
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F463
compare VAR_RESULT, 11
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F366
release
return
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+11 -13
View File
@@ -11,8 +11,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
end
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
checkflag FLAG_0x152
goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
@@ -44,7 +43,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14
.2byte 0
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23
@@ -60,12 +59,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
lockall
applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75
waitmovement 0
applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
waitmovement 0
moveobjectoffscreen 1
applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
waitmovement 0
msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT
special HealPlayerParty
@@ -89,7 +88,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A
waitmessage
multichoicedefault 20, 8, 94, 1, 0
compare VAR_RESULT, 0
goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D
msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT
release
end
@@ -119,19 +118,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4
applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A
waitmovement 0
return
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6
applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E
waitmovement 0
return
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08
applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26
applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22
waitmovement 0
return
@@ -166,8 +165,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
checkflag FLAG_0x152
goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
setvar VAR_0x8004, 11
setvar VAR_0x8005, 0
special sub_8161F74
@@ -193,9 +191,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
waitbuttonpress
closemessage
compare VAR_FACING, 1
call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4
call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4
compare VAR_FACING, 1
call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
removeobject VAR_LAST_TALKED
setflag FLAG_0x152
warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3
data/maps/BattleFrontier_Lounge1/scripts.inc
+19 -21
View File
@@ -4,10 +4,8 @@ BattleFrontier_Lounge1_MapScripts:: @ 825E774
BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775
lock
faceplayer
checkflag FLAG_0x153
call_if 0, BattleFrontier_Lounge1_EventScript_25E7AD
checkflag FLAG_0x153
call_if 1, BattleFrontier_Lounge1_EventScript_25E7B6
call_if_unset FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7AD
call_if_set FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7B6
setflag FLAG_0x153
goto BattleFrontier_Lounge1_EventScript_25E792
end
@@ -16,9 +14,9 @@ BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792
special sub_81B94B0
waitstate
compare VAR_0x8004, 255
goto_if 5, BattleFrontier_Lounge1_EventScript_25E7BF
goto_if_ne BattleFrontier_Lounge1_EventScript_25E7BF
compare VAR_0x8004, 255
goto_eq BattleFrontier_Lounge1_EventScript_25E943
goto_if_eq BattleFrontier_Lounge1_EventScript_25E943
end
BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD
@@ -32,16 +30,16 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6
BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF
specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, 412
goto_eq BattleFrontier_Lounge1_EventScript_25E7FF
goto_if_eq BattleFrontier_Lounge1_EventScript_25E7FF
special sub_8139D98
compare VAR_0x8005, 90
goto_if 3, BattleFrontier_Lounge1_EventScript_25E87F
goto_if_le BattleFrontier_Lounge1_EventScript_25E87F
compare VAR_0x8005, 120
goto_if 3, BattleFrontier_Lounge1_EventScript_25E88D
goto_if_le BattleFrontier_Lounge1_EventScript_25E88D
compare VAR_0x8005, 150
goto_if 3, BattleFrontier_Lounge1_EventScript_25E89B
goto_if_le BattleFrontier_Lounge1_EventScript_25E89B
compare VAR_0x8005, 151
goto_if 4, BattleFrontier_Lounge1_EventScript_25E8A9
goto_if_ge BattleFrontier_Lounge1_EventScript_25E8A9
end
BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF
@@ -51,28 +49,28 @@ BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF
BattleFrontier_Lounge1_EventScript_25E80D:: @ 825E80D
compare VAR_0x8006, 0
goto_eq BattleFrontier_Lounge1_EventScript_25E8B7
goto_if_eq BattleFrontier_Lounge1_EventScript_25E8B7
compare VAR_0x8006, 1
goto_eq BattleFrontier_Lounge1_EventScript_25E8C5
goto_if_eq BattleFrontier_Lounge1_EventScript_25E8C5
compare VAR_0x8006, 2
goto_eq BattleFrontier_Lounge1_EventScript_25E8D3
goto_if_eq BattleFrontier_Lounge1_EventScript_25E8D3
compare VAR_0x8006, 3
goto_eq BattleFrontier_Lounge1_EventScript_25E8E1
goto_if_eq BattleFrontier_Lounge1_EventScript_25E8E1
compare VAR_0x8006, 4
goto_eq BattleFrontier_Lounge1_EventScript_25E8EF
goto_if_eq BattleFrontier_Lounge1_EventScript_25E8EF
compare VAR_0x8006, 5
goto_eq BattleFrontier_Lounge1_EventScript_25E8FD
goto_if_eq BattleFrontier_Lounge1_EventScript_25E8FD
end
BattleFrontier_Lounge1_EventScript_25E850:: @ 825E850
compare VAR_0x8007, 15
goto_if 3, BattleFrontier_Lounge1_EventScript_25E90B
goto_if_le BattleFrontier_Lounge1_EventScript_25E90B
compare VAR_0x8007, 25
goto_if 3, BattleFrontier_Lounge1_EventScript_25E919
goto_if_le BattleFrontier_Lounge1_EventScript_25E919
compare VAR_0x8007, 30
goto_if 3, BattleFrontier_Lounge1_EventScript_25E927
goto_if_le BattleFrontier_Lounge1_EventScript_25E927
compare VAR_0x8007, 31
goto_if 4, BattleFrontier_Lounge1_EventScript_25E935
goto_if_ge BattleFrontier_Lounge1_EventScript_25E935
end
BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D
data/maps/BattleFrontier_Lounge2/scripts.inc
+13 -14
View File
@@ -4,8 +4,7 @@ BattleFrontier_Lounge2_MapScripts:: @ 8260642
BattleFrontier_Lounge2_EventScript_260643:: @ 8260643
lock
faceplayer
checkflag FLAG_0x154
goto_eq BattleFrontier_Lounge2_EventScript_26065F
goto_if_set FLAG_0x154, BattleFrontier_Lounge2_EventScript_26065F
setflag FLAG_0x154
msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT
goto BattleFrontier_Lounge2_EventScript_26066D
@@ -18,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F
BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D
compare VAR_FRONTIER_MANIAC_FACILITY, 0
call_if 1, BattleFrontier_Lounge2_EventScript_26070A
call_if_eq BattleFrontier_Lounge2_EventScript_26070A
compare VAR_FRONTIER_MANIAC_FACILITY, 1
call_if 1, BattleFrontier_Lounge2_EventScript_26070F
call_if_eq BattleFrontier_Lounge2_EventScript_26070F
compare VAR_FRONTIER_MANIAC_FACILITY, 2
call_if 1, BattleFrontier_Lounge2_EventScript_260714
call_if_eq BattleFrontier_Lounge2_EventScript_260714
compare VAR_FRONTIER_MANIAC_FACILITY, 3
call_if 1, BattleFrontier_Lounge2_EventScript_260719
call_if_eq BattleFrontier_Lounge2_EventScript_260719
compare VAR_FRONTIER_MANIAC_FACILITY, 4
call_if 1, BattleFrontier_Lounge2_EventScript_26071E
call_if_eq BattleFrontier_Lounge2_EventScript_26071E
compare VAR_FRONTIER_MANIAC_FACILITY, 5
call_if 1, BattleFrontier_Lounge2_EventScript_260723
call_if_eq BattleFrontier_Lounge2_EventScript_260723
compare VAR_FRONTIER_MANIAC_FACILITY, 6
call_if 1, BattleFrontier_Lounge2_EventScript_260728
call_if_eq BattleFrontier_Lounge2_EventScript_260728
compare VAR_FRONTIER_MANIAC_FACILITY, 7
call_if 1, BattleFrontier_Lounge2_EventScript_26072D
call_if_eq BattleFrontier_Lounge2_EventScript_26072D
compare VAR_FRONTIER_MANIAC_FACILITY, 8
call_if 1, BattleFrontier_Lounge2_EventScript_260732
call_if_eq BattleFrontier_Lounge2_EventScript_260732
compare VAR_FRONTIER_MANIAC_FACILITY, 9
call_if 1, BattleFrontier_Lounge2_EventScript_260737
call_if_eq BattleFrontier_Lounge2_EventScript_260737
compare VAR_FRONTIER_MANIAC_FACILITY, 3
call_if 3, BattleFrontier_Lounge2_EventScript_2606F8
call_if_le BattleFrontier_Lounge2_EventScript_2606F8
compare VAR_FRONTIER_MANIAC_FACILITY, 4
call_if 4, BattleFrontier_Lounge2_EventScript_260701
call_if_ge BattleFrontier_Lounge2_EventScript_260701
special sub_8139F20
waitmessage
waitbuttonpress
data/maps/BattleFrontier_Lounge3/scripts.inc
+18 -26
View File
@@ -4,11 +4,10 @@ BattleFrontier_Lounge3_MapScripts:: @ 8261D82
BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83
lock
faceplayer
checkflag FLAG_0x157
goto_eq BattleFrontier_Lounge3_EventScript_261EF9
goto_if_set FLAG_0x157, BattleFrontier_Lounge3_EventScript_261EF9
call BattleFrontier_Lounge3_EventScript_261EA0
compare VAR_0x8004, 2
goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB
goto_if_le BattleFrontier_Lounge3_EventScript_261EEB
setflag FLAG_0x157
msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT
goto BattleFrontier_Lounge3_EventScript_261DAF
@@ -20,10 +19,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
waitbuttonpress
msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_Lounge3_EventScript_261FA5
goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_Lounge3_EventScript_261FA5
goto_if_eq BattleFrontier_Lounge3_EventScript_261FA5
message BattleFrontier_Lounge3_Text_262B42
waitmessage
special sub_813A958
@@ -59,7 +58,7 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46
BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
specialvar VAR_TEMP_1, sub_813AA04
compare VAR_TEMP_1, VAR_0x8008
goto_if 4, BattleFrontier_Lounge3_EventScript_261E75
goto_if_ge BattleFrontier_Lounge3_EventScript_261E75
msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT
message BattleFrontier_Lounge3_Text_262B42
waitmessage
@@ -86,20 +85,13 @@ BattleFrontier_Lounge3_EventScript_261E96:: @ 8261E96
BattleFrontier_Lounge3_EventScript_261EA0:: @ 8261EA0
setvar VAR_0x8004, 0
checkflag FLAG_SYS_TOWER_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_DOME_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_PALACE_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_ARENA_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_FACTORY_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_PIKE_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
checkflag FLAG_SYS_PYRAMID_SILVER
call_if 1, BattleFrontier_Lounge3_EventScript_261EE5
call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if_set FLAG_SYS_PALACE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if_set FLAG_SYS_ARENA_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if_set FLAG_SYS_FACTORY_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if_set FLAG_SYS_PIKE_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_261EE5
return
BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5
@@ -114,26 +106,26 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB
BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9
msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT
compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
goto_if 4, BattleFrontier_Lounge3_EventScript_261F12
goto_if_ge BattleFrontier_Lounge3_EventScript_261F12
goto BattleFrontier_Lounge3_EventScript_261DAF
end
BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
goto_eq BattleFrontier_Lounge3_EventScript_261F9E
goto_if_eq BattleFrontier_Lounge3_EventScript_261F9E
compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2
goto_eq BattleFrontier_Lounge3_EventScript_261F2E
goto_if_eq BattleFrontier_Lounge3_EventScript_261F2E
goto BattleFrontier_Lounge3_EventScript_261F71
end
BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0
call_if 1, BattleFrontier_Lounge3_EventScript_261F80
call_if_eq BattleFrontier_Lounge3_EventScript_261F80
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1
call_if 1, BattleFrontier_Lounge3_EventScript_261F8A
call_if_eq BattleFrontier_Lounge3_EventScript_261F8A
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2
call_if 1, BattleFrontier_Lounge3_EventScript_261F94
call_if_eq BattleFrontier_Lounge3_EventScript_261F94
msgbox BattleFrontier_Lounge3_Text_2633D4, 9
special sub_813A9D0
msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT
data/maps/BattleFrontier_Lounge5/scripts.inc
+3 -3
View File
@@ -6,16 +6,16 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6
faceplayer
msgbox BattleFrontier_Lounge5_Text_264632, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_Lounge5_EventScript_26460D
goto_if_eq BattleFrontier_Lounge5_EventScript_26460D
special sub_81B94B0
waitstate
lock
faceplayer
compare VAR_0x8004, 255
goto_eq BattleFrontier_Lounge5_EventScript_26460D
goto_if_eq BattleFrontier_Lounge5_EventScript_26460D
specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, 412
goto_eq BattleFrontier_Lounge5_EventScript_264603
goto_if_eq BattleFrontier_Lounge5_EventScript_264603
special sub_813A7B8
waitmessage
waitbuttonpress
data/maps/BattleFrontier_Lounge6/scripts.inc
+4 -5
View File
@@ -4,25 +4,24 @@ BattleFrontier_Lounge6_MapScripts:: @ 8264FEC
BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
lock
faceplayer
checkflag FLAG_0x09C
goto_eq BattleFrontier_Lounge6_EventScript_265083
goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_Lounge6_EventScript_26506B
goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
special sub_81B94B0
waitstate
copyvar VAR_0x800A, VAR_0x8004
compare VAR_0x8004, 255
goto_eq BattleFrontier_Lounge6_EventScript_26506B
goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if 5, BattleFrontier_Lounge6_EventScript_265075
goto_if_ne BattleFrontier_Lounge6_EventScript_265075
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
data/maps/BattleFrontier_Lounge7/scripts.inc
+6 -8
View File
@@ -5,8 +5,7 @@ BattleFrontier_Lounge7_EventScript_265255:: @ 8265255
lock
faceplayer
setvar VAR_TEMP_C, 9
checkflag FLAG_0x15A
goto_eq BattleFrontier_Lounge7_EventScript_265276
goto_if_set FLAG_0x15A, BattleFrontier_Lounge7_EventScript_265276
msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT
setflag FLAG_0x15A
goto BattleFrontier_Lounge7_EventScript_265284
@@ -120,8 +119,7 @@ BattleFrontier_Lounge7_EventScript_265445:: @ 8265445
lock
faceplayer
setvar VAR_TEMP_C, 10
checkflag FLAG_0x15B
goto_eq BattleFrontier_Lounge7_EventScript_265466
goto_if_set FLAG_0x15B, BattleFrontier_Lounge7_EventScript_265466
msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT
setflag FLAG_0x15B
goto BattleFrontier_Lounge7_EventScript_265474
@@ -251,10 +249,10 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F
copyvar VAR_0x8004, VAR_TEMP_C
msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_Lounge7_EventScript_2656CA
goto_if_eq BattleFrontier_Lounge7_EventScript_2656CA
specialvar VAR_TEMP_1, sub_813AA04
compare VAR_TEMP_1, VAR_0x8008
goto_if 4, BattleFrontier_Lounge7_EventScript_265696
goto_if_ge BattleFrontier_Lounge7_EventScript_265696
msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT
goto BattleFrontier_Lounge7_EventScript_2656CA
end
@@ -268,7 +266,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
special sub_81B892C
waitstate
compare VAR_RESULT, 0
goto_eq BattleFrontier_Lounge7_EventScript_265645
goto_if_eq BattleFrontier_Lounge7_EventScript_265645
msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT
copyvar VAR_0x8004, VAR_0x8008
special sub_813A9A4
@@ -277,7 +275,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA
compare VAR_TEMP_E, 0
goto_eq BattleFrontier_Lounge7_EventScript_26532F
goto_if_eq BattleFrontier_Lounge7_EventScript_26532F
goto BattleFrontier_Lounge7_EventScript_26551F
end
data/maps/BattleFrontier_OutsideEast/scripts.inc
+8 -11
View File
@@ -4,22 +4,20 @@ BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
.byte 0
BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
checkflag FLAG_SYS_CTRL_OBJ_DELETE
call_if 1, BattleFrontier_OutsideEast_EventScript_242C19
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_242C19
end
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E
goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E
removeobject VAR_LAST_TALKED
return
BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
setvar VAR_0x40BC, 0
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
checkflag FLAG_0x1C6
call_if 0, BattleFrontier_OutsideEast_EventScript_242C3F
call_if_unset FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242C3F
end
BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
@@ -117,7 +115,7 @@ BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA
BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
lock
faceplayer
special sub_80FAFF8
special DoWateringBerryTreeAnim
waitstate
waitse
playse 269
@@ -136,11 +134,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq BattleFrontier_OutsideEast_EventScript_242D60
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 4
goto_eq BattleFrontier_OutsideEast_EventScript_242D60
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 5
goto_eq BattleFrontier_OutsideEast_EventScript_242D60
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
setflag FLAG_0x1C6
release
end
@@ -223,8 +221,7 @@ BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0
BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9
lock
faceplayer
checkflag FLAG_0x1C6
goto_eq BattleFrontier_OutsideEast_EventScript_242DFE
goto_if_set FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242DFE
msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT
release
end
data/maps/BattleFrontier_OutsideWest/scripts.inc
+12 -12
View File
@@ -13,7 +13,7 @@ BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0
msgbox BattleFrontier_OutsideWest_Text_23D808, MSGBOX_DEFAULT
checkitem ITEM_SS_TICKET, 1
compare VAR_RESULT, 0
goto_eq BattleFrontier_OutsideWest_EventScript_23D44E
goto_if_eq BattleFrontier_OutsideWest_EventScript_23D44E
message BattleFrontier_OutsideWest_Text_23D89D
waitmessage
goto BattleFrontier_OutsideWest_EventScript_23D416
@@ -36,7 +36,7 @@ BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E
BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458
msgbox BattleFrontier_OutsideWest_Text_23D8F2, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE
goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE
msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT
call BattleFrontier_OutsideWest_EventScript_23D4BA
warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
@@ -47,7 +47,7 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458
BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483
msgbox BattleFrontier_OutsideWest_Text_23D90E, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE
goto_if_eq BattleFrontier_OutsideWest_EventScript_23D4AE
msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT
call BattleFrontier_OutsideWest_EventScript_23D4BA
warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
@@ -145,13 +145,13 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
faceplayer
delay 20
compare VAR_FACING, 2
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
compare VAR_FACING, 1
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5
compare VAR_FACING, 3
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
compare VAR_FACING, 4
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT
release
end
@@ -170,13 +170,13 @@ BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6
message BattleFrontier_OutsideWest_Text_23DCB0
waitmessage
compare VAR_FACING, 2
call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD
compare VAR_FACING, 1
call_if 1, BattleFrontier_OutsideWest_EventScript_23D608
call_if_eq BattleFrontier_OutsideWest_EventScript_23D608
compare VAR_FACING, 3
call_if 1, BattleFrontier_OutsideWest_EventScript_23D613
call_if_eq BattleFrontier_OutsideWest_EventScript_23D613
compare VAR_FACING, 4
call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E
call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E
waitbuttonpress
release
end
@@ -227,7 +227,7 @@ BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635
msgbox BattleFrontier_OutsideWest_Text_23DD3B, MSGBOX_DEFAULT
random 2
compare VAR_RESULT, 1
goto_eq BattleFrontier_OutsideWest_EventScript_23D653
goto_if_eq BattleFrontier_OutsideWest_EventScript_23D653
goto BattleFrontier_OutsideWest_EventScript_23D65D
end
data/maps/BattleFrontier_RankingHall/scripts.inc
+1 -1
View File
@@ -87,7 +87,7 @@ BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A
faceplayer
msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq BattleFrontier_RankingHall_EventScript_25E569
goto_if_eq BattleFrontier_RankingHall_EventScript_25E569
msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT
release
end
data/maps/BattleFrontier_ReceptionGate/scripts.inc
+4 -4
View File
@@ -21,7 +21,7 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
waitmovement 0
msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT
closemessage
applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D2
waitmovement 0
goto BattleFrontier_ReceptionGate_EventScript_266229
end
@@ -40,18 +40,18 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
closemessage
applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6
applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6
applymovement 255, BattleFrontier_ReceptionGate_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6
waitmovement 0
playse SE_PIN
applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
applymovement 2, BattleFrontier_ReceptionGate_Movement_272598
applymovement 255, BattleFrontier_ReceptionGate_Movement_272598
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598
waitmovement 0
msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT
closemessage
applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0
applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6
applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D7
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2662D7
applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0
waitmovement 0
msgbox BattleFrontier_ReceptionGate_Text_266764, MSGBOX_DEFAULT
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+39 -61
View File
@@ -4,76 +4,54 @@ BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7
BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8
lock
faceplayer
checkflag FLAG_TEMP_4
goto_eq BattleFrontier_ScottsHouse_EventScript_2637DA
checkflag FLAG_TEMP_3
goto_eq BattleFrontier_ScottsHouse_EventScript_2638AA
checkflag FLAG_TEMP_2
goto_eq BattleFrontier_ScottsHouse_EventScript_263939
goto_if_set FLAG_TEMP_4, BattleFrontier_ScottsHouse_EventScript_2637DA
goto_if_set FLAG_TEMP_3, BattleFrontier_ScottsHouse_EventScript_2638AA
goto_if_set FLAG_TEMP_2, BattleFrontier_ScottsHouse_EventScript_263939
goto BattleFrontier_ScottsHouse_EventScript_2636CB
end
BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB
checkflag FLAG_0x1D1
goto_if 0, BattleFrontier_ScottsHouse_EventScript_263943
checkflag FLAG_0x05C
goto_if 0, BattleFrontier_ScottsHouse_EventScript_263704
checkflag FLAG_0x1D2
goto_if 0, BattleFrontier_ScottsHouse_EventScript_26376A
goto_if_unset FLAG_0x1D1, BattleFrontier_ScottsHouse_EventScript_263943
goto_if_unset FLAG_0x05C, BattleFrontier_ScottsHouse_EventScript_263704
goto_if_unset FLAG_0x1D2, BattleFrontier_ScottsHouse_EventScript_26376A
goto BattleFrontier_ScottsHouse_EventScript_2636EC
end
BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC
checkflag FLAG_0x0ED
goto_if 0, BattleFrontier_ScottsHouse_EventScript_26381B
checkflag FLAG_0x0EE
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2638B4
goto_if_unset FLAG_0x0ED, BattleFrontier_ScottsHouse_EventScript_26381B
goto_if_unset FLAG_0x0EE, BattleFrontier_ScottsHouse_EventScript_2638B4
goto BattleFrontier_ScottsHouse_EventScript_2637E4
end
BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704
checkflag FLAG_SYS_TOWER_SILVER
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_DOME_SILVER
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_PALACE_SILVER
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_ARENA_SILVER
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_FACTORY_SILVER
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_PIKE_SILVER
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_PYRAMID_SILVER
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_TOWER_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_DOME_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_PALACE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_ARENA_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_FACTORY_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_PIKE_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_2636EC
msgbox BattleFrontier_ScottsHouse_Text_2640BC, MSGBOX_DEFAULT
giveitem_std ITEM_LANSAT_BERRY
compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
setflag FLAG_0x05C
setflag FLAG_TEMP_4
release
end
BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
checkflag FLAG_SYS_TOWER_GOLD
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_DOME_GOLD
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_PALACE_GOLD
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_ARENA_GOLD
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_FACTORY_GOLD
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_PIKE_GOLD
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
checkflag FLAG_SYS_PYRAMID_GOLD
goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_TOWER_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_DOME_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_PALACE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_ARENA_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_FACTORY_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_PIKE_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_2636EC
msgbox BattleFrontier_ScottsHouse_Text_264216, MSGBOX_DEFAULT
giveitem_std ITEM_STARF_BERRY
compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
setflag FLAG_0x1D2
setflag FLAG_TEMP_4
release
@@ -92,9 +70,9 @@ BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA
BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4
random 3
compare VAR_RESULT, 1
goto_eq BattleFrontier_ScottsHouse_EventScript_263807
goto_if_eq BattleFrontier_ScottsHouse_EventScript_263807
compare VAR_RESULT, 2
goto_eq BattleFrontier_ScottsHouse_EventScript_263811
goto_if_eq BattleFrontier_ScottsHouse_EventScript_263811
msgbox BattleFrontier_ScottsHouse_Text_263DDD, MSGBOX_DEFAULT
release
end
@@ -119,7 +97,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
setvar VAR_0x8005, 1
special sub_8161F74
compare VAR_RESULT, 50
goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A
goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 1
@@ -128,7 +106,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B
setvar VAR_0x8005, 1
special sub_8161F74
compare VAR_RESULT, 50
goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A
goto_if_ge BattleFrontier_ScottsHouse_EventScript_26387A
goto BattleFrontier_ScottsHouse_EventScript_2637E4
end
@@ -136,7 +114,7 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT
givedecoration_std 42
compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
setflag FLAG_0x0ED
setflag FLAG_TEMP_3
goto BattleFrontier_ScottsHouse_EventScript_2638AA
@@ -162,7 +140,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
setvar VAR_0x8005, 1
special sub_8161F74
compare VAR_RESULT, 100
goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913
goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913
setvar VAR_0x8004, 2
setvar VAR_0x8005, 1
setvar VAR_0x8006, 1
@@ -171,7 +149,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4
setvar VAR_0x8005, 1
special sub_8161F74
compare VAR_RESULT, 100
goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913
goto_if_ge BattleFrontier_ScottsHouse_EventScript_263913
goto BattleFrontier_ScottsHouse_EventScript_2637E4
end
@@ -179,7 +157,7 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT
givedecoration_std 43
compare VAR_RESULT, 0
goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
setflag FLAG_0x0EE
setflag FLAG_TEMP_3
goto BattleFrontier_ScottsHouse_EventScript_2638AA
@@ -195,23 +173,23 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
closemessage
delay 30
compare VAR_FACING, 2
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A13
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13
compare VAR_FACING, 1
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A1E
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E
compare VAR_FACING, 4
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29
compare VAR_FACING, 3
call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E
waitmovement 0
msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT
compare VAR_0x40D1, 13
goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2639BC
compare VAR_0x40D1, 9
goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639CB
goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639CB
compare VAR_0x40D1, 6
goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639DA
goto_if_ge BattleFrontier_ScottsHouse_EventScript_2639DA
goto BattleFrontier_ScottsHouse_EventScript_2639E9
end
data/maps/BirthIsland_Exterior/scripts.inc
+8 -12
View File
@@ -13,10 +13,8 @@ BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_0x4034, 0
setvar VAR_0x4035, 0
checkflag FLAG_0x1AD
call_if 1, BirthIsland_Exterior_EventScript_267F4E
checkflag FLAG_0x1AD
call_if 0, BirthIsland_Exterior_EventScript_267F55
call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E
call_if_unset FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F55
end
BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
@@ -25,21 +23,19 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
return
BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
checkflag FLAG_0x1AC
goto_eq BirthIsland_Exterior_EventScript_27374E
goto_if_set FLAG_0x1AC, BirthIsland_Exterior_EventScript_27374E
clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
clearflag FLAG_0x8D4
return
BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
checkflag FLAG_SYS_CTRL_OBJ_DELETE
call_if 1, BirthIsland_Exterior_EventScript_267F6F
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_267F6F
end
BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, BirthIsland_Exterior_EventScript_27374E
goto_if_ne BirthIsland_Exterior_EventScript_27374E
removeobject 2
return
@@ -93,11 +89,11 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq BirthIsland_Exterior_EventScript_26803B
goto_if_eq BirthIsland_Exterior_EventScript_26803B
compare VAR_RESULT, 4
goto_eq BirthIsland_Exterior_EventScript_268049
goto_if_eq BirthIsland_Exterior_EventScript_268049
compare VAR_RESULT, 5
goto_eq BirthIsland_Exterior_EventScript_268049
goto_if_eq BirthIsland_Exterior_EventScript_268049
setflag FLAG_0x1AD
release
end
data/maps/BirthIsland_Harbor/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D
faceplayer
msgbox BirthIsland_Harbor_Text_2C6B90, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_eq BirthIsland_Harbor_EventScript_2680A2
goto_if_eq BirthIsland_Harbor_EventScript_2680A2
msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA
data/maps/CaveOfOrigin_1F/scripts.inc
+1 -2
View File
@@ -3,7 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768
.byte 0
CaveOfOrigin_1F_MapScript1_23576E: @ 823576E
checkflag FLAG_0x071
call_if 1, CaveOfOrigin_1F_EventScript_2722C1
call_if_set FLAG_0x071, CaveOfOrigin_1F_EventScript_2722C1
end
data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
+1 -2
View File
@@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
.byte 0
CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E
checkflag FLAG_0x071
call_if 1, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
end
data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
+1 -2
View File
@@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
.byte 0
CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E
checkflag FLAG_0x071
call_if 1, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
end
data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
+1 -2
View File
@@ -3,7 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
.byte 0
CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E
checkflag FLAG_0x071
call_if 1, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
end
data/maps/DesertRuins/scripts.inc
+8 -12
View File
@@ -5,20 +5,18 @@ DesertRuins_MapScripts:: @ 822D95B
.byte 0
DesertRuins_MapScript1_22D96B: @ 822D96B
checkflag FLAG_SYS_CTRL_OBJ_DELETE
call_if 1, DesertRuins_EventScript_22D975
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_22D975
end
DesertRuins_EventScript_22D975:: @ 822D975
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if 5, DesertRuins_EventScript_27374E
goto_if_ne DesertRuins_EventScript_27374E
removeobject VAR_LAST_TALKED
return
DesertRuins_MapScript1_22D989: @ 822D989
checkflag FLAG_SYS_BRAILLE_STRENGTH
call_if 0, DesertRuins_EventScript_22D993
call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D993
end
DesertRuins_EventScript_22D993:: @ 822D993
@@ -32,8 +30,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
DesertRuins_MapScript1_22D9CA: @ 822D9CA
setflag FLAG_LANDMARK_DESERT_RUINS
checkflag FLAG_0x1BB
call_if 0, DesertRuins_EventScript_22D9D7
call_if_unset FLAG_0x1BB, DesertRuins_EventScript_22D9D7
end
DesertRuins_EventScript_22D9D7:: @ 822D9D7
@@ -42,8 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7
DesertRuins_EventScript_22D9DB:: @ 822D9DB
lockall
checkflag FLAG_SYS_BRAILLE_STRENGTH
goto_eq DesertRuins_EventScript_22D9EE
goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D9EE
braillemessage DesertRuins_Braille_2A6CA0
waitbuttonpress
hidebox2
@@ -77,11 +73,11 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq DesertRuins_EventScript_22DA49
goto_if_eq DesertRuins_EventScript_22DA49
compare VAR_RESULT, 4
goto_eq DesertRuins_EventScript_22DA52
goto_if_eq DesertRuins_EventScript_22DA52
compare VAR_RESULT, 5
goto_eq DesertRuins_EventScript_22DA52
goto_if_eq DesertRuins_EventScript_22DA52
setflag FLAG_0x1BB
release
end
data/maps/DesertUnderpass/scripts.inc
+2 -4
View File
@@ -9,10 +9,8 @@ DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
DesertUnderpass_EventScript_23AF41:: @ 823AF41
lock
faceplayer
checkflag FLAG_0x14F
goto_eq DesertUnderpass_EventScript_23AF57
checkflag FLAG_0x150
goto_eq DesertUnderpass_EventScript_23AF68
goto_if_set FLAG_0x14F, DesertUnderpass_EventScript_23AF57
goto_if_set FLAG_0x150, DesertUnderpass_EventScript_23AF68
release
end
data/maps/DewfordTown/scripts.inc
+29 -33
View File
@@ -9,8 +9,7 @@ DewfordTown_MapScript1_1E950D: @ 81E950D
DewfordTown_EventScript_1E9511:: @ 81E9511
lock
faceplayer
checkflag FLAG_0x0BD
goto_if 0, DewfordTown_EventScript_1E9585
goto_if_unset FLAG_0x0BD, DewfordTown_EventScript_1E9585
message DewfordTown_Text_1E9C8A
waitmessage
multichoicedefault 21, 6, 0, 2, 0
@@ -44,7 +43,7 @@ DewfordTown_EventScript_1E957A:: @ 81E957A
DewfordTown_EventScript_1E9585:: @ 81E9585
msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E95A2
goto_if_eq DewfordTown_EventScript_1E95A2
msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT
release
end
@@ -74,13 +73,12 @@ DewfordTown_EventScript_1E95CC:: @ 81E95CC
DewfordTown_EventScript_1E95D5:: @ 81E95D5
lock
faceplayer
checkflag FLAG_0x101
goto_eq DewfordTown_EventScript_1E962A
goto_if_set FLAG_0x101, DewfordTown_EventScript_1E962A
msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E95FF
goto_if_eq DewfordTown_EventScript_1E95FF
compare VAR_RESULT, 0
goto_eq DewfordTown_EventScript_1E9620
goto_if_eq DewfordTown_EventScript_1E9620
end
DewfordTown_EventScript_1E95FF:: @ 81E95FF
@@ -101,9 +99,9 @@ DewfordTown_EventScript_1E962A:: @ 81E962A
waitmessage
multichoice 20, 8, 50, 1
compare VAR_RESULT, 0
goto_eq DewfordTown_EventScript_1E964C
goto_if_eq DewfordTown_EventScript_1E964C
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E9656
goto_if_eq DewfordTown_EventScript_1E9656
end
DewfordTown_EventScript_1E964C:: @ 81E964C
@@ -119,29 +117,29 @@ DewfordTown_EventScript_1E9656:: @ 81E9656
DewfordTown_EventScript_1E9660:: @ 81E9660
call DewfordTown_EventScript_271E95
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority 255, MAP_DEWFORD_TOWN, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0
applymovement 2, DewfordTown_Movement_1E991D
waitmovement 0
removeobject 2
applymovement 255, DewfordTown_Movement_1E9911
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
waitmovement 0
hideobjectat 255, MAP_DEWFORD_TOWN
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
call DewfordTown_EventScript_2720A0
applymovement 4, DewfordTown_Movement_1E97A2
applymovement 255, DewfordTown_Movement_1E97A2
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E97A2
waitmovement 0
showobjectat 255, MAP_ROUTE104
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
call DewfordTown_EventScript_2720A8
applymovement 255, DewfordTown_Movement_1E9914
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9914
waitmovement 0
showobjectat 255, MAP_ROUTE104
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN
setvar VAR_0x408E, 2
resetobjectpriority 255, MAP_DEWFORD_TOWN
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
copyvar VAR_0x4096, VAR_0x8008
waitstate
@@ -151,20 +149,20 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
DewfordTown_EventScript_1E96E7:: @ 81E96E7
call DewfordTown_EventScript_271E95
setobjectpriority 2, MAP_DEWFORD_TOWN, 0
setobjectpriority 255, MAP_DEWFORD_TOWN, 1
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1
applymovement 2, DewfordTown_Movement_1E991D
waitmovement 0
removeobject 2
applymovement 255, DewfordTown_Movement_1E9911
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9911
waitmovement 0
hideobjectat 255, MAP_DEWFORD_TOWN
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
call DewfordTown_EventScript_2720A0
applymovement 4, DewfordTown_Movement_1E9865
applymovement 255, DewfordTown_Movement_1E9865
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9865
waitmovement 0
call DewfordTown_EventScript_2720A8
showobjectat 255, MAP_ROUTE109
applymovement 255, DewfordTown_Movement_1E9918
showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_1E9918
waitmovement 0
setobjectxyperm 2, 21, 26
addobject 2
@@ -176,13 +174,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN
checkflag FLAG_0x095
call_if 0, DewfordTown_EventScript_1E9790
checkflag FLAG_0x095
call_if 1, DewfordTown_EventScript_1E9799
call_if_unset FLAG_0x095, DewfordTown_EventScript_1E9790
call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799
closemessage
copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority 255, MAP_DEWFORD_TOWN
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority 2, MAP_ROUTE109
moveobjectoffscreen 2
release
@@ -600,9 +596,9 @@ DewfordTown_EventScript_1E9922:: @ 81E9922
call DewfordTown_EventScript_271E8B
msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E9948
goto_if_eq DewfordTown_EventScript_1E9948
compare VAR_RESULT, 0
goto_eq DewfordTown_EventScript_1E9952
goto_if_eq DewfordTown_EventScript_1E9952
end
DewfordTown_EventScript_1E9948:: @ 81E9948
@@ -617,15 +613,15 @@ DewfordTown_EventScript_1E9952:: @ 81E9952
lock
faceplayer
compare VAR_RESULT, 1
goto_eq DewfordTown_EventScript_1E997D
goto_if_eq DewfordTown_EventScript_1E997D
compare VAR_RESULT, 0
goto_eq DewfordTown_EventScript_1E9994
goto_if_eq DewfordTown_EventScript_1E9994
end
DewfordTown_EventScript_1E997D:: @ 81E997D
incrementgamestat 2
compare VAR_0x8004, 0
goto_eq DewfordTown_EventScript_1E999E
goto_if_eq DewfordTown_EventScript_1E999E
msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT
release
end
data/maps/DewfordTown_Gym/scripts.inc
+28 -32
View File
@@ -8,21 +8,21 @@ DewfordTown_Gym_MapScript1_1FC642: @ 81FC642
DewfordTown_Gym_EventScript_1FC648:: @ 81FC648
checktrainerflag TRAINER_BRAWLY_1
goto_eq DewfordTown_Gym_EventScript_1FC6A2
goto_if_eq DewfordTown_Gym_EventScript_1FC6A2
call DewfordTown_Gym_EventScript_1FC768
copyvar VAR_0x8001, VAR_0x8000
compare VAR_0x8000, 0
goto_eq DewfordTown_Gym_EventScript_1FC6BE
goto_if_eq DewfordTown_Gym_EventScript_1FC6BE
compare VAR_0x8000, 1
goto_eq DewfordTown_Gym_EventScript_1FC6BA
goto_if_eq DewfordTown_Gym_EventScript_1FC6BA
compare VAR_0x8000, 2
goto_eq DewfordTown_Gym_EventScript_1FC6B6
goto_if_eq DewfordTown_Gym_EventScript_1FC6B6
compare VAR_0x8000, 3
goto_eq DewfordTown_Gym_EventScript_1FC6B2
goto_if_eq DewfordTown_Gym_EventScript_1FC6B2
compare VAR_0x8000, 4
goto_eq DewfordTown_Gym_EventScript_1FC6AE
goto_if_eq DewfordTown_Gym_EventScript_1FC6AE
compare VAR_0x8000, 5
goto_eq DewfordTown_Gym_EventScript_1FC6AA
goto_if_eq DewfordTown_Gym_EventScript_1FC6AA
goto DewfordTown_Gym_EventScript_1FC6A6
DewfordTown_Gym_EventScript_1FC6A2:: @ 81FC6A2
@@ -61,20 +61,20 @@ DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2
call DewfordTown_Gym_EventScript_1FC768
nop1
compare VAR_0x8000, VAR_0x8001
goto_eq DewfordTown_Gym_EventScript_1FC71A
goto_if_eq DewfordTown_Gym_EventScript_1FC71A
copyvar VAR_0x8001, VAR_0x8000
compare VAR_0x8000, 1
goto_eq DewfordTown_Gym_EventScript_1FC71B
goto_if_eq DewfordTown_Gym_EventScript_1FC71B
compare VAR_0x8000, 2
goto_eq DewfordTown_Gym_EventScript_1FC726
goto_if_eq DewfordTown_Gym_EventScript_1FC726
compare VAR_0x8000, 3
goto_eq DewfordTown_Gym_EventScript_1FC731
goto_if_eq DewfordTown_Gym_EventScript_1FC731
compare VAR_0x8000, 4
goto_eq DewfordTown_Gym_EventScript_1FC73C
goto_if_eq DewfordTown_Gym_EventScript_1FC73C
compare VAR_0x8000, 5
goto_eq DewfordTown_Gym_EventScript_1FC747
goto_if_eq DewfordTown_Gym_EventScript_1FC747
compare VAR_0x8000, 6
goto_eq DewfordTown_Gym_EventScript_1FC752
goto_if_eq DewfordTown_Gym_EventScript_1FC752
DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A
return
@@ -124,32 +124,32 @@ DewfordTown_Gym_EventScript_1FC75D:: @ 81FC75D
DewfordTown_Gym_EventScript_1FC768:: @ 81FC768
setvar VAR_0x8000, 0
checktrainerflag TRAINER_TAKAO
goto_if 0, DewfordTown_Gym_EventScript_1FC77B
goto_if_lt DewfordTown_Gym_EventScript_1FC77B
addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_1FC77B:: @ 81FC77B
checktrainerflag TRAINER_JOCELYN
goto_if 0, DewfordTown_Gym_EventScript_1FC789
goto_if_lt DewfordTown_Gym_EventScript_1FC789
addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_1FC789:: @ 81FC789
checktrainerflag TRAINER_LAURA
goto_if 0, DewfordTown_Gym_EventScript_1FC797
goto_if_lt DewfordTown_Gym_EventScript_1FC797
addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_1FC797:: @ 81FC797
checktrainerflag TRAINER_BRENDEN
goto_if 0, DewfordTown_Gym_EventScript_1FC7A5
goto_if_lt DewfordTown_Gym_EventScript_1FC7A5
addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_1FC7A5:: @ 81FC7A5
checktrainerflag TRAINER_CRISTIAN
goto_if 0, DewfordTown_Gym_EventScript_1FC7B3
goto_if_lt DewfordTown_Gym_EventScript_1FC7B3
addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_1FC7B3:: @ 81FC7B3
checktrainerflag TRAINER_LILITH
goto_if 0, DewfordTown_Gym_EventScript_1FC7C1
goto_if_lt DewfordTown_Gym_EventScript_1FC7C1
addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1
@@ -159,9 +159,8 @@ DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2
trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq DewfordTown_Gym_EventScript_1FC89C
checkflag FLAG_0x0A6
goto_if 0, DewfordTown_Gym_EventScript_1FC878
goto_if_eq DewfordTown_Gym_EventScript_1FC89C
goto_if_unset FLAG_0x0A6, DewfordTown_Gym_EventScript_1FC878
msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT
release
end
@@ -176,7 +175,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
setflag FLAG_BADGE02_GET
addvar VAR_0x4085, 1
compare VAR_0x4085, 6
call_if 1, DewfordTown_Gym_EventScript_271E84
call_if_eq DewfordTown_Gym_EventScript_271E84
setvar VAR_0x8008, 2
call DewfordTown_Gym_EventScript_271F43
call DewfordTown_Gym_EventScript_1FC855
@@ -196,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
giveitem_std ITEM_TM08
compare VAR_RESULT, 0
goto_eq DewfordTown_Gym_EventScript_27205E
goto_if_eq DewfordTown_Gym_EventScript_27205E
msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
setflag FLAG_0x0A6
return
@@ -204,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
giveitem_std ITEM_TM08
compare VAR_RESULT, 0
goto_eq DewfordTown_Gym_EventScript_272054
goto_if_eq DewfordTown_Gym_EventScript_272054
msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
setflag FLAG_0x0A6
release
@@ -278,8 +277,7 @@ DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C
DewfordTown_Gym_EventScript_1FC983:: @ 81FC983
lock
faceplayer
checkflag FLAG_0x4F1
goto_eq DewfordTown_Gym_EventScript_1FC998
goto_if_set FLAG_0x4F1, DewfordTown_Gym_EventScript_1FC998
msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT
release
end
@@ -291,15 +289,13 @@ DewfordTown_Gym_EventScript_1FC998:: @ 81FC998
DewfordTown_Gym_EventScript_1FC9A2:: @ 81FC9A2
lockall
checkflag FLAG_BADGE02_GET
goto_eq DewfordTown_Gym_EventScript_1FC9C2
goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2
goto DewfordTown_Gym_EventScript_1FC9CC
end
DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2
lockall
checkflag FLAG_BADGE02_GET
goto_eq DewfordTown_Gym_EventScript_1FC9C2
goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2
goto DewfordTown_Gym_EventScript_1FC9CC
end
data/maps/DewfordTown_Hall/scripts.inc
+17 -18
View File
@@ -7,7 +7,7 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0
call DewfordTown_Hall_EventScript_271E8B
special TrendyPhraseIsOld
compare VAR_RESULT, 1
goto_eq DewfordTown_Hall_EventScript_1FD4EF
goto_if_eq DewfordTown_Hall_EventScript_1FD4EF
msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT
release
end
@@ -32,9 +32,9 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A
special sub_811EF6C
msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_eq DewfordTown_Hall_EventScript_1FD533
goto_if_eq DewfordTown_Hall_EventScript_1FD533
compare VAR_RESULT, 0
goto_eq DewfordTown_Hall_EventScript_1FD53D
goto_if_eq DewfordTown_Hall_EventScript_1FD53D
end
DewfordTown_Hall_EventScript_1FD533:: @ 81FD533
@@ -192,15 +192,15 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
applymovement 8, DewfordTown_Hall_Movement_1FD7D6
waitmovement 0
compare VAR_0x8008, 0
goto_eq DewfordTown_Hall_EventScript_1FD75B
goto_if_eq DewfordTown_Hall_EventScript_1FD75B
compare VAR_0x8008, 1
goto_eq DewfordTown_Hall_EventScript_1FD771
goto_if_eq DewfordTown_Hall_EventScript_1FD771
end
DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
compare VAR_FACING, 4
goto_eq DewfordTown_Hall_EventScript_1FD739
applymovement 255, DewfordTown_Hall_Movement_2725A8
goto_if_eq DewfordTown_Hall_EventScript_1FD739
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8
waitmovement 0
return
@@ -211,32 +211,32 @@ DewfordTown_Hall_EventScript_1FD772:: @ 81FD772
applymovement 7, DewfordTown_Hall_Movement_1FD7D8
waitmovement 0
compare VAR_0x8008, 0
goto_eq DewfordTown_Hall_EventScript_1FD793
goto_if_eq DewfordTown_Hall_EventScript_1FD793
compare VAR_0x8008, 1
goto_eq DewfordTown_Hall_EventScript_1FD7C0
goto_if_eq DewfordTown_Hall_EventScript_1FD7C0
end
DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
compare VAR_FACING, 2
call_if 1, DewfordTown_Hall_EventScript_1FD7AA
call_if_eq DewfordTown_Hall_EventScript_1FD7AA
compare VAR_FACING, 1
call_if 1, DewfordTown_Hall_EventScript_1FD7B5
call_if_eq DewfordTown_Hall_EventScript_1FD7B5
return
DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
applymovement 255, DewfordTown_Hall_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6
waitmovement 0
return
DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
applymovement 255, DewfordTown_Hall_Movement_2725AA
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA
waitmovement 0
return
DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
compare VAR_FACING, 3
goto_eq DewfordTown_Hall_EventScript_1FD739
applymovement 255, DewfordTown_Hall_Movement_2725A4
goto_if_eq DewfordTown_Hall_EventScript_1FD739
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4
waitmovement 0
return
@@ -252,12 +252,11 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
lock
faceplayer
call DewfordTown_Hall_EventScript_271E8B
checkflag FLAG_RECEIVED_TM_36
goto_eq DewfordTown_Hall_EventScript_1FD80E
goto_if_set FLAG_RECEIVED_TM_36, DewfordTown_Hall_EventScript_1FD80E
msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT
giveitem_std ITEM_TM36
compare VAR_RESULT, 0
goto_eq DewfordTown_Hall_EventScript_272054
goto_if_eq DewfordTown_Hall_EventScript_272054
setflag FLAG_RECEIVED_TM_36
release
end
data/maps/DewfordTown_House2/scripts.inc
+2 -3
View File
@@ -4,12 +4,11 @@ DewfordTown_House2_MapScripts:: @ 81FE22D
DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E
lock
faceplayer
checkflag FLAG_0x121
goto_eq DewfordTown_House2_EventScript_1FE267
goto_if_set FLAG_0x121, DewfordTown_House2_EventScript_1FE267
msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT
giveitem_std ITEM_SILK_SCARF
compare VAR_RESULT, 0
goto_eq DewfordTown_House2_EventScript_1FE25D
goto_if_eq DewfordTown_House2_EventScript_1FE25D
setflag FLAG_0x121
release
end
data/maps/EverGrandeCity/scripts.inc
+1 -2
View File
@@ -3,8 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B
.byte 0
EverGrandeCity_MapScript1_1E7D21: @ 81E7D21
checkflag FLAG_SYS_WEATHER_CTRL
call_if 1, EverGrandeCity_EventScript_27207A
call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A
end
EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+14 -14
View File
@@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
.2byte 0
EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14
@@ -22,10 +22,10 @@ EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14
EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E
lockall
applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725C1
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725C1
waitmovement 0
delay 40
applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228A42
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228A42
waitmovement 0
setvar VAR_TEMP_1, 1
goto EverGrandeCity_ChampionsRoom_EventScript_228A45
@@ -54,16 +54,16 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61
playse SE_DOOR
checkplayergender
compare VAR_RESULT, 0
call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC
compare VAR_RESULT, 1
call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1
addobject 2
call EverGrandeCity_ChampionsRoom_EventScript_228BFD
checkplayergender
compare VAR_RESULT, 0
goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6
goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6
compare VAR_RESULT, 1
goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB
goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB
end
EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC
@@ -105,7 +105,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
addobject 3
applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43
waitmovement 0
applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8
waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT
call EverGrandeCity_ChampionsRoom_EventScript_272184
@@ -119,22 +119,22 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
closemessage
delay 30
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B
applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C1D
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D
applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38
waitmovement 0
delay 20
applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA
waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT
checkplayergender
compare VAR_RESULT, 0
call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB
compare VAR_RESULT, 1
call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4
closemessage
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F
applymovement 255, EverGrandeCity_ChampionsRoom_Movement_228C20
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20
waitmovement 0
setflag FLAG_HIDE_PETALBURG_GYM_GREETER
warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
@@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4
EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26
waitmovement 0
applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4
waitmovement 0
return
data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+4 -6
View File
@@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
.2byte 0
EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB
@@ -24,10 +24,9 @@ EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5
end
EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2
checkflag FLAG_0x4FE
call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286E7
call_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_2286E7
compare VAR_0x409C, 4
call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286ED
call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED
end
EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7
@@ -41,8 +40,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED
EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3
lock
faceplayer
checkflag FLAG_0x4FE
goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A
goto_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_22871A
playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895
data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+4 -6
View File
@@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422
.2byte 0
EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431
@@ -24,10 +24,9 @@ EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B
end
EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448
checkflag FLAG_0x4FD
call_if 1, EverGrandeCity_GlaciasRoom_EventScript_22845D
call_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_22845D
compare VAR_0x409C, 3
call_if 1, EverGrandeCity_GlaciasRoom_EventScript_228463
call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463
end
EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D
@@ -41,8 +40,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463
EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469
lock
faceplayer
checkflag FLAG_0x4FD
goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490
goto_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_228490
playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4
data/maps/EverGrandeCity_Hall1/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F
.2byte 0
EverGrandeCity_Hall1_EventScript_229579:: @ 8229579
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
data/maps/EverGrandeCity_Hall2/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall2_MapScript2_229584: @ 8229584
.2byte 0
EverGrandeCity_Hall2_EventScript_22958E:: @ 822958E
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
data/maps/EverGrandeCity_Hall3/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall3_MapScript2_229599: @ 8229599
.2byte 0
EverGrandeCity_Hall3_EventScript_2295A3:: @ 82295A3
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
data/maps/EverGrandeCity_Hall4/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE
.2byte 0
EverGrandeCity_Hall4_EventScript_2295B8:: @ 82295B8
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
data/maps/EverGrandeCity_Hall5/scripts.inc
+1 -1
View File
@@ -7,6 +7,6 @@ EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3
.2byte 0
EverGrandeCity_Hall5_EventScript_2295CD:: @ 82295CD
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
data/maps/EverGrandeCity_HallOfFame/scripts.inc
+8 -8
View File
@@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
.2byte 0
EverGrandeCity_HallOfFame_EventScript_229841:: @ 8229841
turnobject 255, 2
turnobject EVENT_OBJ_ID_PLAYER, 2
end
EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846
@@ -18,24 +18,24 @@ EverGrandeCity_HallOfFame_MapScript2_229846: @ 8229846
EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
lockall
applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
applymovement 255, EverGrandeCity_HallOfFame_Movement_229901
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901
waitmovement 0
applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4
waitmovement 0
msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT
closemessage
applymovement 1, EverGrandeCity_HallOfFame_Movement_229908
applymovement 255, EverGrandeCity_HallOfFame_Movement_229908
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908
waitmovement 0
delay 20
applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4
waitmovement 0
msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT
closemessage
applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6
applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6
waitmovement 0
delay 20
dofieldeffect 62
@@ -45,9 +45,9 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
call EverGrandeCity_HallOfFame_EventScript_2717C1
checkplayergender
compare VAR_RESULT, 0
goto_eq EverGrandeCity_HallOfFame_EventScript_2298E9
goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298E9
compare VAR_RESULT, 1
goto_eq EverGrandeCity_HallOfFame_EventScript_2298F5
goto_if_eq EverGrandeCity_HallOfFame_EventScript_2298F5
end
EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9

Some files were not shown because too many files have changed in this diff Show More