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

Merge pull request #293 from Diegoisawesome/master

Browse Source 
Decompile field_specials
This commit is contained in:
Diegoisawesome
2018-08-11 16:37:06 -07:00
committed by GitHub
parent 94eef0bfa5 cf9518f237
commit 73bdef2f67
104 changed files with 5216 additions and 9200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_2.s
+1 -1
View File
@@ -11843,7 +11843,7 @@ sub_81A0784: @ 81A0784
movs r1, 0 movs r1, 0
adds r2, r4, 0 adds r2, r4, 0
adds r3, r5, 0 adds r3, r5, 0
bl sub_8198A50 bl CreateWindowTemplate
ldr r0, [sp, 0x10] ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14] ldr r1, [sp, 0x14]
str r0, [sp, 0x18] str r0, [sp, 0x18]
asm/contest.s
+16 -16
View File
@@ -102,7 +102,7 @@ LoadContestBgAfterMoveAnim: @ 80D7724
movs r4, 0 movs r4, 0
movs r5, 0xA0 movs r5, 0xA0
_080D775E: _080D775E:
ldr r0, =0x0201a004 ldr r0, =gHeap+0x1A004
adds r0, r5, r0 adds r0, r5, r0
ldr r1, =gUnknown_02039F26 ldr r1, =gUnknown_02039F26
adds r1, r4, r1 adds r1, r4, r1
@@ -576,7 +576,7 @@ _080D7B4E:
ldr r1, =gReservedSpritePaletteCount ldr r1, =gReservedSpritePaletteCount
movs r0, 0x4 movs r0, 0x4
strb r0, [r1] strb r0, [r1]
ldr r0, =0x02000000 ldr r0, =gHeap
movs r1, 0xD0 movs r1, 0xD0
lsls r1, 9 lsls r1, 9
adds r0, r1 adds r0, r1
@@ -928,7 +928,7 @@ _080D7ED8:
ldr r4, =0x06002000 ldr r4, =0x06002000
adds r1, r4, 0 adds r1, r4, 0
bl LZDecompressVram bl LZDecompressVram
ldr r3, =0x02018000 ldr r3, =gHeap+0x18000
movs r5, 0x80 movs r5, 0x80
lsls r5, 6 lsls r5, 6
ldr r1, =0x040000d4 ldr r1, =0x040000d4
@@ -976,7 +976,7 @@ _080D7F40:
ldr r0, =gContestResources ldr r0, =gContestResources
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0, 0x2C] ldr r1, [r0, 0x2C]
ldr r2, =0x0201aa04 ldr r2, =gHeap+0x1AA04
ldr r0, =0x040000d4 ldr r0, =0x040000d4
str r1, [r0] str r1, [r0]
str r2, [r0, 0x4] str r2, [r0, 0x4]
@@ -1022,7 +1022,7 @@ _080D7F7C:
mov r0, sp mov r0, sp
adds r2, r6, 0 adds r2, r6, 0
bl CpuSet bl CpuSet
ldr r1, =0x0201a004 ldr r1, =gHeap+0x1A004
ldr r0, =0x040000d4 ldr r0, =0x040000d4
mov r2, r8 mov r2, r8
str r2, [r0] str r2, [r0]
@@ -1393,7 +1393,7 @@ sub_80D833C: @ 80D833C
strh r1, [r0] strh r1, [r0]
bl sub_80DCD48 bl sub_80DCD48
ldr r1, =gPlttBufferUnfaded ldr r1, =gPlttBufferUnfaded
ldr r2, =0x0201a204 ldr r2, =gHeap+0x1A204
ldr r0, =0x040000d4 ldr r0, =0x040000d4
str r1, [r0] str r1, [r0]
str r2, [r0, 0x4] str r2, [r0, 0x4]
@@ -2070,7 +2070,7 @@ _080D897C:
movs r0, 0 movs r0, 0
bl sub_80DED60 bl sub_80DED60
ldr r1, =gPlttBufferFaded ldr r1, =gPlttBufferFaded
ldr r0, =0x0201a604 ldr r0, =gHeap+0x1A604
movs r2, 0x80 movs r2, 0x80
lsls r2, 3 lsls r2, 3
ldr r4, =0x040000d4 ldr r4, =0x040000d4
@@ -5012,7 +5012,7 @@ _080DA33A:
sub_80DA348: @ 80DA348 sub_80DA348: @ 80DA348
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =0x0201a204 ldr r2, =gHeap+0x1A204
ldr r3, =gPlttBufferUnfaded ldr r3, =gPlttBufferUnfaded
ldr r1, =0x040000d4 ldr r1, =0x040000d4
str r2, [r1] str r2, [r1]
@@ -10211,7 +10211,7 @@ sub_80DCCD8: @ 80DCCD8
thumb_func_start sub_80DCD08 thumb_func_start sub_80DCD08
sub_80DCD08: @ 80DCD08 sub_80DCD08: @ 80DCD08
push {lr} push {lr}
ldr r0, =0x02000000 ldr r0, =gHeap
movs r1, 0xD0 movs r1, 0xD0
lsls r1, 9 lsls r1, 9
adds r2, r0, r1 adds r2, r0, r1
@@ -10250,7 +10250,7 @@ sub_80DCD48: @ 80DCD48
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _080DCE44 beq _080DCE44
ldr r0, =0x02000000 ldr r0, =gHeap
movs r1, 0xD0 movs r1, 0xD0
lsls r1, 9 lsls r1, 9
adds r0, r1 adds r0, r1
@@ -10639,7 +10639,7 @@ sub_80DD04C: @ 80DD04C
movs r4, 0 movs r4, 0
movs r5, 0xA0 movs r5, 0xA0
_080DD052: _080DD052:
ldr r0, =0x0201a004 ldr r0, =gHeap+0x1A004
adds r0, r5, r0 adds r0, r5, r0
ldr r1, =gUnknown_02039F26 ldr r1, =gUnknown_02039F26
adds r1, r4, r1 adds r1, r4, r1
@@ -12351,7 +12351,7 @@ sub_80DDE30: @ 80DDE30
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
cmp r0, 0 cmp r0, 0
bne _080DDE78 bne _080DDE78
ldr r0, =0x02019000 ldr r0, =gHeap+0x19000
ldr r1, =0x06002000 ldr r1, =0x06002000
movs r2, 0x80 movs r2, 0x80
lsls r2, 5 lsls r2, 5
@@ -12360,7 +12360,7 @@ sub_80DDE30: @ 80DDE30
b _080DDE8C b _080DDE8C
.pool .pool
_080DDE78: _080DDE78:
ldr r0, =0x02018000 ldr r0, =gHeap+0x18000
ldr r1, =0x06002000 ldr r1, =0x06002000
movs r2, 0x80 movs r2, 0x80
lsls r2, 5 lsls r2, 5
@@ -15417,7 +15417,7 @@ sub_80DF704: @ 80DF704
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r0, =0x02000000 ldr r0, =gHeap
movs r1, 0xD0 movs r1, 0xD0
lsls r1, 9 lsls r1, 9
adds r2, r0, r1 adds r2, r0, r1
@@ -15468,7 +15468,7 @@ sub_80DF750: @ 80DF750
bne _080DF766 bne _080DF766
b _080DF924 b _080DF924
_080DF766: _080DF766:
ldr r0, =0x02000000 ldr r0, =gHeap
movs r1, 0xD0 movs r1, 0xD0
lsls r1, 9 lsls r1, 9
adds r0, r1 adds r0, r1
@@ -15493,7 +15493,7 @@ _080DF784:
lsrs r7, r0, 24 lsrs r7, r0, 24
cmp r7, 0x3 cmp r7, 0x3
bls _080DF784 bls _080DF784
ldr r0, =0x02000000 ldr r0, =gHeap
movs r1, 0xD0 movs r1, 0xD0
lsls r1, 9 lsls r1, 9
adds r0, r1 adds r0, r1
asm/contest_link_80FC4F4.s
+1 -1
View File
@@ -11,7 +11,7 @@ sub_80FC4F4: @ 80FC4F4
adds r2, r0, 0 adds r2, r0, 0
lsls r4, r1, 16 lsls r4, r1, 16
lsrs r4, 16 lsrs r4, 16
ldr r5, =0x0201c000 ldr r5, =gDecompressionBuffer
adds r0, r5, 0 adds r0, r5, 0
adds r1, r2, 0 adds r1, r2, 0
adds r2, r4, 0 adds r2, r4, 0
asm/field_specials.s
-8075
View File
File diff suppressed because it is too large Load Diff
asm/pokenav.s
+5 -5
View File
@@ -1585,7 +1585,7 @@ sub_81C7E58: @ 81C7E58
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
ldr r4, =0x0201c000 ldr r4, =gDecompressionBuffer
mov r0, r8 mov r0, r8
adds r1, r4, 0 adds r1, r4, 0
bl LZ77UnCompWram bl LZ77UnCompWram
@@ -1667,7 +1667,7 @@ sub_81C7F24: @ 81C7F24
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
ldr r4, =0x0201d000 ldr r4, =gDecompressionBuffer+0x1000
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl LZ77UnCompWram bl LZ77UnCompWram
@@ -27036,7 +27036,7 @@ _081D4E1C:
thumb_func_start sub_81D4E30 thumb_func_start sub_81D4E30
sub_81D4E30: @ 81D4E30 sub_81D4E30: @ 81D4E30
push {lr} push {lr}
ldr r0, =0x0201c000 ldr r0, =gDecompressionBuffer
movs r2, 0x80 movs r2, 0x80
lsls r2, 6 lsls r2, 6
movs r1, 0 movs r1, 0
@@ -27657,7 +27657,7 @@ _081D5386:
strb r0, [r4, 0x8] strb r0, [r4, 0x8]
b _081D548A b _081D548A
_081D5390: _081D5390:
ldr r0, =0x0201c000 ldr r0, =gDecompressionBuffer
bl sub_81D3920 bl sub_81D3920
strb r0, [r4, 0xE] strb r0, [r4, 0xE]
ldrb r0, [r4, 0xE] ldrb r0, [r4, 0xE]
@@ -27683,7 +27683,7 @@ _081D53C0:
strb r0, [r4, 0x8] strb r0, [r4, 0x8]
b _081D548A b _081D548A
_081D53C6: _081D53C6:
ldr r0, =0x0201c000 ldr r0, =gDecompressionBuffer
bl sub_81D3AB0 bl sub_81D3AB0
cmp r0, 0 cmp r0, 0
beq _081D53EC beq _081D53EC
asm/rom_8011DC0.s
+3 -3
View File
@@ -15650,7 +15650,7 @@ _0801D7D0:
b _0801D804 b _0801D804
.pool .pool
_0801D7F0: _0801D7F0:
ldr r0, =0x0201c000 ldr r0, =gDecompressionBuffer
ldr r1, [r4, 0x18] ldr r1, [r4, 0x18]
movs r2, 0x80 movs r2, 0x80
lsls r2, 3 lsls r2, 3
@@ -15723,7 +15723,7 @@ _0801D858:
sub_801D860: @ 801D860 sub_801D860: @ 801D860
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r3, =0x0201c000 ldr r3, =gDecompressionBuffer
adds r0, r4, 0x4 adds r0, r4, 0x4
ldr r1, =gSaveBlock2Ptr ldr r1, =gSaveBlock2Ptr
ldr r1, [r1] ldr r1, [r1]
@@ -25386,7 +25386,7 @@ sub_80226D0: @ 80226D0
adds r6, r0, 0 adds r6, r0, 0
movs r5, 0 movs r5, 0
ldr r0, =gUnknown_08DE3FD4 ldr r0, =gUnknown_08DE3FD4
ldr r4, =0x0201c000 ldr r4, =gDecompressionBuffer
adds r1, r4, 0 adds r1, r4, 0
bl LZ77UnCompWram bl LZ77UnCompWram
b _0802271A b _0802271A
asm/roulette.s
+4 -4
View File
@@ -4948,7 +4948,7 @@ sub_8142CD0: @ 8142CD0
sub sp, 0x8 sub sp, 0x8
ldr r4, =gUnknown_085B7488 ldr r4, =gUnknown_085B7488
ldr r0, [r4] ldr r0, [r4]
ldr r5, =0x0201c000 ldr r5, =gDecompressionBuffer
adds r1, r5, 0 adds r1, r5, 0
bl LZ77UnCompWram bl LZ77UnCompWram
str r5, [sp] str r5, [sp]
@@ -5575,7 +5575,7 @@ sub_81431E4: @ 81431E4
sub sp, 0xC sub sp, 0xC
ldr r4, =gUnknown_085B741C ldr r4, =gUnknown_085B741C
ldr r0, [r4] ldr r0, [r4]
ldr r5, =0x0201c000 ldr r5, =gDecompressionBuffer
adds r1, r5, 0 adds r1, r5, 0
bl LZ77UnCompWram bl LZ77UnCompWram
str r5, [sp, 0x4] str r5, [sp, 0x4]
@@ -5720,7 +5720,7 @@ sub_8143314: @ 8143314
push {r7} push {r7}
sub sp, 0x8 sub sp, 0x8
movs r5, 0 movs r5, 0
ldr r7, =0x0201c000 ldr r7, =gDecompressionBuffer
mov r6, sp mov r6, sp
_08143322: _08143322:
ldr r0, =gUnknown_085B7750 ldr r0, =gUnknown_085B7750
@@ -6448,7 +6448,7 @@ sub_814391C: @ 814391C
sub sp, 0x8 sub sp, 0x8
ldr r4, =gUnknown_085B7948 ldr r4, =gUnknown_085B7948
ldr r0, [r4] ldr r0, [r4]
ldr r5, =0x0201c000 ldr r5, =gDecompressionBuffer
adds r1, r5, 0 adds r1, r5, 0
bl LZ77UnCompWram bl LZ77UnCompWram
str r5, [sp] str r5, [sp]
asm/script_menu.s
+1 -1
View File
@@ -1498,7 +1498,7 @@ CreateWindowFromRect: @ 80E2A1C
movs r1, 0 movs r1, 0
adds r2, r4, 0 adds r2, r4, 0
adds r3, r5, 0 adds r3, r5, 0
bl sub_8198A50 bl CreateWindowTemplate
ldr r0, [sp, 0x10] ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14] ldr r1, [sp, 0x14]
str r0, [sp, 0x18] str r0, [sp, 0x18]
asm/trade.s
+1 -1
View File
@@ -7612,7 +7612,7 @@ sub_807B170: @ 807B170
bl copy_decompressed_tile_data_to_vram_autofree bl copy_decompressed_tile_data_to_vram_autofree
ldr r0, =gBattleTextboxTilemap ldr r0, =gBattleTextboxTilemap
mov r8, r0 mov r8, r0
ldr r4, =0x0201c000 ldr r4, =gDecompressionBuffer
adds r1, r4, 0 adds r1, r4, 0
bl LZDecompressWram bl LZDecompressWram
movs r0, 0 movs r0, 0
common_syms/field_specials.txt
+1
View File
@@ -0,0 +1 @@
gUnknown_030061D0
data/event_scripts.s
+7 -7
View File
@@ -1110,10 +1110,10 @@ EventScript_2715DE:: @ 82715DE
setflag FLAG_0x2DE setflag FLAG_0x2DE
setflag FLAG_0x351 setflag FLAG_0x351
setflag FLAG_0x32F setflag FLAG_0x32F
setflag FLAG_0x315 setflag FLAG_HIDE_FANCLUB_OLD_LADY
setflag FLAG_0x316 setflag FLAG_HIDE_FANCLUB_BOY
setflag FLAG_0x317 setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
setflag FLAG_0x318 setflag FLAG_HIDE_FANCLUB_LADY
setflag FLAG_0x2DA setflag FLAG_0x2DA
setflag FLAG_0x31D setflag FLAG_0x31D
setflag FLAG_0x31E setflag FLAG_0x31E
@@ -2356,8 +2356,8 @@ RusturfTunnel_EventScript_272216:: @ 8272216
removeobject 10 removeobject 10
clearflag FLAG_0x328 clearflag FLAG_0x328
clearflag FLAG_0x3D8 clearflag FLAG_0x3D8
setvar VAR_0x409A, 6 setvar VAR_RUSTURF_TUNNEL_STATE, 6
setflag FLAG_0x0C7 setflag FLAG_RUSTURF_TUNNEL_OPENED
return return
EventScript_27222B:: @ 827222B EventScript_27222B:: @ 827222B
@@ -2517,7 +2517,7 @@ Route119_EventScript_272365:: @ 8272365
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq Route119_EventScript_2723C1 goto_eq Route119_EventScript_2723C1
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/field_specials.s
-547
View File
@@ -1,547 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085B2B5C:: @ 85B2B5C
.byte 0x07, 0x09, 0x08, 0x0a
.align 2
gUnknown_085B2B60:: @ 85B2B60
.byte 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00
gUnknown_085B2B68:: @ 85B2B68
.byte 0x07, 0x16, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0a, 0x10, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x00
gUnknown_085B2B78:: @ 85B2B78
.byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x00
.align 1
gUnknown_085B2B7E:: @ 85B2B7E
.2byte 0x0218, 0x0219, 0x021a, 0x021b, 0x021c
gUnknown_085B2B88:: @ 85B2B88
.byte 0x0c, 0x02, 0x04, 0x05, 0x01, 0x08, 0x07, 0x0b, 0x03, 0x0a, 0x09, 0x06
gUnknown_085B2B94:: @ 85B2B94
.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x05
gUnknown_085B2BA0:: @ 85B2BA0
.byte 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05
.align 2
gUnknown_085B2BAC:: @ 85B2BAC
.byte 0x00, 0x15, 0x01, 0x08, 0x04, 0x0f, 0x08, 0x00
.align 2
gElevatorFloorsTable:: @ 85B2BB4
.4byte gText_B4F
.4byte gText_B3F
.4byte gText_B2F
.4byte gText_B1F
.4byte gText_1F
.4byte gText_2F
.4byte gText_3F
.4byte gText_4F
.4byte gText_5F
.4byte gText_6F
.4byte gText_7F
.4byte gText_8F
.4byte gText_9F
.4byte gText_10F
.4byte gText_11F
.4byte gText_Rooftop
.align 1
gUnknown_085B2BF4:: @ 85B2BF4
.2byte 0x0329, 0x032a, 0x032b, 0x0331, 0x0332, 0x0333, 0x0339, 0x033a, 0x033b
.align 1
gUnknown_085B2C06:: @ 85B2C06
.2byte 0x0329, 0x032b, 0x032a, 0x0331, 0x0333, 0x0332, 0x0339, 0x033b, 0x033a
gUnknown_085B2C18:: @ 85B2C18
.byte 0x08, 0x10, 0x18, 0x20, 0x26, 0x2e, 0x34, 0x38, 0x39
gUnknown_085B2C21:: @ 85B2C21
.byte 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b
.align 1
gUnknown_085B2C2A:: @ 85B2C2A
.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
.2byte 0x1a35, 0x193c, 0xffff
.align 2
gUnknown_085B2C50:: @ 85B2C50
.4byte BattleFrontier_Lounge2_Text_260971
.4byte BattleFrontier_Lounge2_Text_260A1E
.4byte BattleFrontier_Lounge2_Text_260AE7
.4byte BattleFrontier_Lounge2_Text_2619AC
.4byte BattleFrontier_Lounge2_Text_261A91
.4byte BattleFrontier_Lounge2_Text_261B0C
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261B95
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_261C1A
.4byte BattleFrontier_Lounge2_Text_260BC4
.4byte BattleFrontier_Lounge2_Text_260C6D
.4byte BattleFrontier_Lounge2_Text_260D3A
.4byte BattleFrontier_Lounge2_Text_260E1E
.4byte BattleFrontier_Lounge2_Text_260EC7
.4byte BattleFrontier_Lounge2_Text_260F74
.4byte BattleFrontier_Lounge2_Text_2614E6
.4byte BattleFrontier_Lounge2_Text_261591
.4byte BattleFrontier_Lounge2_Text_26166F
.4byte BattleFrontier_Lounge2_Text_261282
.4byte BattleFrontier_Lounge2_Text_261329
.4byte BattleFrontier_Lounge2_Text_261403
.4byte BattleFrontier_Lounge2_Text_261026
.4byte BattleFrontier_Lounge2_Text_2610CC
.4byte BattleFrontier_Lounge2_Text_261194
.4byte BattleFrontier_Lounge2_Text_26174D
.4byte BattleFrontier_Lounge2_Text_2617F9
.4byte BattleFrontier_Lounge2_Text_2618C4
gUnknown_085B2CC8:: @ 85B2CC8
.byte 0x15, 0x38, 0x15, 0x23, 0xff, 0xff, 0xff, 0xff, 0x02, 0x04, 0x07, 0x15, 0x07, 0x15, 0x0e, 0x1c, 0x0d, 0x70, 0x07, 0x38
.align 1
gUnknown_085B2CDC:: @ 85B2CDC
.2byte 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x0031, 0x003f, 0x004d, 0x005b, 0x0000
.align 2
gUnknown_085B2CF0:: @ 85B2CF0
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BlueFlute
.4byte gText_YellowFlute
.4byte gText_RedFlute
.4byte gText_WhiteFlute
.4byte gText_BlackFlute
.4byte gText_PrettyChair
.4byte gText_PrettyDesk
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_0Pts
.4byte gText_10Pts
.4byte gText_20Pts
.4byte gText_30Pts
.4byte gText_40Pts
.4byte gText_50Pts
.4byte gText_60Pts
.4byte gText_70Pts
.4byte gText_80Pts
.4byte gText_90Pts
.4byte gText_100Pts
.4byte gText_QuestionMark
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_KissPoster16BP
.4byte gText_KissCushion32BP
.4byte gText_SmoochumDoll32BP
.4byte gText_TogepiDoll48BP
.4byte gText_MeowthDoll48BP
.4byte gText_ClefairyDoll48BP
.4byte gText_DittoDoll48BP
.4byte gText_CyndaquilDoll80BP
.4byte gText_ChikoritaDoll80BP
.4byte gText_TotodileDoll80BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_LaprasDoll128BP
.4byte gText_SnorlaxDoll128BP
.4byte gText_VenusaurDoll256BP
.4byte gText_CharizardDoll256BP
.4byte gText_BlastoiseDoll256BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Protein1BP
.4byte gText_Calcium1BP
.4byte gText_Iron1BP
.4byte gText_Zinc1BP
.4byte gText_Carbos1BP
.4byte gText_HpUp1BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Leftovers48BP
.4byte gText_WhiteHerb48BP
.4byte gText_QuickClaw48BP
.4byte gText_MentalHerb48BP
.4byte gText_BrightPowder64BP
.4byte gText_ChoiceBand64BP
.4byte gText_KingsRock64BP
.4byte gText_FocusBand64BP
.4byte gText_ScopeLens64BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_EnergyPowder50
.4byte gText_EnergyRoot80
.4byte gText_HealPowder50
.4byte gText_RevivalHerb300
.4byte gText_Protein1000
.4byte gText_Iron1000
.4byte gText_Carbos1000
.4byte gText_Calcium1000
.4byte gText_Zinc1000
.4byte gText_HPUp1000
.4byte gText_PPUp3000
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BattleTower2
.4byte gText_BattleDome
.4byte gText_BattlePalace
.4byte gText_BattleArena
.4byte gText_BattleFactory
.4byte gText_BattlePike
.4byte gText_BattlePyramid
.4byte gText_RankingHall
.4byte gText_ExchangeService
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_Softboiled16BP
.4byte gText_SeismicToss24BP
.4byte gText_DreamEater24BP
.4byte gText_MegaPunch24BP
.4byte gText_MegaKick48BP
.4byte gText_BodySlam48BP
.4byte gText_RockSlide48BP
.4byte gText_Counter48BP
.4byte gText_ThunderWave48BP
.4byte gText_SwordsDance48BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_DefenseCurl16BP
.4byte gText_Snore24BP
.4byte gText_MudSlap24BP
.4byte gText_Swift24BP
.4byte gText_IcyWind24BP
.4byte gText_Endure48BP
.4byte gText_PsychUp48BP
.4byte gText_IcePunch48BP
.4byte gText_ThunderPunch48BP
.4byte gText_FirePunch48BP
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_SlateportCity
.4byte gText_BattleFrontier
.4byte gText_SouthernIsland
.4byte gText_NavelRock
.4byte gText_BirthIsland
.4byte gText_FarawayIsland
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte gText_BattleTrainers
.4byte gText_BattleBasics
.4byte gText_PokemonNature
.4byte gText_PokemonMoves
.4byte gText_Underpowered
.4byte gText_WhenInDanger
.4byte gText_Exit
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
.align 2
gUnknown_085B3030:: @ 85B3030
.4byte 0x03000002, 0x00000000, 0x07d00000, 0x00000064
.align 2
gUnknown_085B3040:: @ 85B3040
.4byte BattleFrontier_Lounge5_Text_26468D
.4byte BattleFrontier_Lounge5_Text_2646E5
.4byte BattleFrontier_Lounge5_Text_264741
.4byte BattleFrontier_Lounge5_Text_2647A4
.4byte BattleFrontier_Lounge5_Text_2647FC
.4byte BattleFrontier_Lounge5_Text_264858
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264916
.4byte BattleFrontier_Lounge5_Text_264972
.4byte BattleFrontier_Lounge5_Text_2649D5
.4byte BattleFrontier_Lounge5_Text_264A3F
.4byte BattleFrontier_Lounge5_Text_264A9B
.4byte BattleFrontier_Lounge5_Text_264AF3
.4byte BattleFrontier_Lounge5_Text_264B5D
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264BC3
.4byte BattleFrontier_Lounge5_Text_264C36
.4byte BattleFrontier_Lounge5_Text_2648BE
.4byte BattleFrontier_Lounge5_Text_264C95
.4byte BattleFrontier_Lounge5_Text_264D01
.4byte BattleFrontier_Lounge5_Text_264D6B
.4byte BattleFrontier_Lounge5_Text_264DD7
.4byte BattleFrontier_Lounge5_Text_264E33
.4byte BattleFrontier_Lounge5_Text_264E8F
.4byte BattleFrontier_Lounge5_Text_2648BE
.align 2
gUnknown_085B30A4:: @ 85B30A4
.4byte BattleFrontier_Lounge3_Text_262261
.4byte BattleFrontier_Lounge3_Text_26230D
.4byte BattleFrontier_Lounge3_Text_2623B9
.4byte BattleFrontier_Lounge3_Text_262464
.4byte BattleFrontier_Lounge3_Text_26250E
.4byte BattleFrontier_Lounge3_Text_2625B8
.4byte BattleFrontier_Lounge3_Text_26266A
.4byte BattleFrontier_Lounge3_Text_26271C
.4byte BattleFrontier_Lounge3_Text_2627C9
.4byte BattleFrontier_Lounge3_Text_262876
.4byte BattleFrontier_Lounge3_Text_26291A
.4byte BattleFrontier_Lounge3_Text_2629BC
.align 2
gUnknown_085B30D4:: @ 85B30D4
.4byte BattleFrontier_Lounge3_Text_262C04
.4byte BattleFrontier_Lounge3_Text_262C90
.4byte BattleFrontier_Lounge3_Text_262D1C
.4byte BattleFrontier_Lounge3_Text_262DA7
.4byte BattleFrontier_Lounge3_Text_262E34
.4byte BattleFrontier_Lounge3_Text_262EC1
.4byte BattleFrontier_Lounge3_Text_262F56
.4byte BattleFrontier_Lounge3_Text_262FEB
.4byte BattleFrontier_Lounge3_Text_263078
.4byte BattleFrontier_Lounge3_Text_263105
.4byte BattleFrontier_Lounge3_Text_26318C
.4byte BattleFrontier_Lounge3_Text_263211
.align 1
gUnknown_085B3104:: @ 85B3104
.2byte 0x0000, 0x0001, 0x0002, 0x0100, 0x0101, 0x0400, 0x0401, 0x0200, 0x0201, 0x0300, 0x0500, 0x0600
.align 2
gUnknown_085B311C:: @ 85B311C
window_template 0x00, 0x01, 0x01, 0x06, 0x02, 0x0f, 0x0008
.align 2
gUnknown_085B3124:: @ 85B3124
window_template 0x00, 0x02, 0x09, 0x04, 0x04, 0x0f, 0x0014
.align 1
gUnknown_085B312C:: @ 85B312C
.2byte 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff
.align 1
gUnknown_085B3142:: @ 85B3142
.2byte 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff
.align 1
gUnknown_085B314E:: @ 85B314E
.2byte 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff
.align 1
gUnknown_085B315C:: @ 85B315C
.2byte 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff
.align 2
gUnknown_085B3170:: @ 85B3170
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260201
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260287
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E
.4byte gText_Exit
.align 2
gUnknown_085B319C:: @ 85B319C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
.4byte gText_Exit
.align 2
gUnknown_085B31B4:: @ 85B31B4
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260397
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260436
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C
.4byte gText_Exit
.align 2
gUnknown_085B31D0:: @ 85B31D0
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260542
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260575
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2
.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260613
.4byte gText_Exit
.align 1
gUnknown_085B31F8:: @ 85B31F8
.2byte 0x0087, 0x0045, 0x008a, 0x0005, 0x0019, 0x0022, 0x009d, 0x0044, 0x0056, 0x000e
.align 1
gUnknown_085B320C:: @ 85B320C
.2byte 0x006f, 0x00ad, 0x00bd, 0x0081, 0x00c4, 0x00cb, 0x00f4, 0x0008, 0x0009, 0x0007
.align 2
gUnknown_085B3220:: @ 85B3220
window_template 0x00, 0x01, 0x07, 0x0c, 0x06, 0x0f, 0x001c
.align 2
gUnknown_085B3228:: @ 85B3228
.4byte BattleFrontier_Lounge7_Text_265E30
.4byte BattleFrontier_Lounge7_Text_265E5B
.4byte BattleFrontier_Lounge7_Text_265E8A
.4byte BattleFrontier_Lounge7_Text_265EC0
.4byte BattleFrontier_Lounge7_Text_265EED
.4byte BattleFrontier_Lounge7_Text_265F1C
.4byte BattleFrontier_Lounge7_Text_265F47
.4byte BattleFrontier_Lounge7_Text_265F77
.4byte BattleFrontier_Lounge7_Text_265FAA
.4byte BattleFrontier_Lounge7_Text_265FDD
.4byte gText_Exit
.align 2
gUnknown_085B3254:: @ 85B3254
.4byte BattleFrontier_Lounge7_Text_26600A
.4byte BattleFrontier_Lounge7_Text_26603E
.4byte BattleFrontier_Lounge7_Text_266070
.4byte BattleFrontier_Lounge7_Text_2660A6
.4byte BattleFrontier_Lounge7_Text_2660D0
.4byte BattleFrontier_Lounge7_Text_2660FF
.4byte BattleFrontier_Lounge7_Text_26612D
.4byte BattleFrontier_Lounge7_Text_26615F
.4byte BattleFrontier_Lounge7_Text_266185
.4byte BattleFrontier_Lounge7_Text_2661B5
.4byte gText_Exit
.align 2
gUnknown_085B3280:: @ 85B3280
.incbin "graphics/unknown/unknown_5B3280.gbapal"
gUnknown_085B33E0:: @ 85B33E0
.byte 0x0f, 0x0c, 0x0b, 0x0e, 0x0f, 0x08, 0x13, 0x0e, 0x0c, 0x0b, 0x12, 0x0b, 0x0f, 0x0e, 0x0b, 0x0e, 0x13, 0x0e, 0x0f, 0x0f, 0x0f, 0x0a
gUnknown_085B33F6:: @ 85B33F6
.byte 0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x06, 0x03, 0x03
gUnknown_085B3400:: @ 85B3400
.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
gUnknown_085B3410:: @ 85B3410
.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
gUnknown_085B3420:: @ 85B3420
.byte 0x02, 0x04, 0x01, 0x04, 0x04, 0x01, 0x05, 0x00, 0x01, 0x06, 0x03, 0x01, 0x08, 0x06, 0x01, 0x09, 0x0d, 0x01, 0x0a, 0x07, 0x01, 0x0b, 0x07, 0x01, 0x0c, 0x04, 0x01, 0x0e, 0x05, 0x01, 0x0f, 0x04
.byte 0x01, 0x1a, 0x37, 0x01
.align 1
gUnknown_085B3444:: @ 85B3444
.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
.2byte 0x1a35, 0x1918, 0x1919, 0x191a, 0x191b, 0xffff
gUnknown_085B3470:: @ 85B3470
.byte 0x02, 0x01, 0x02, 0x01
gUnknown_085B3474:: @ 85B3474
.byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
gUnknown_085B347C:: @ 85B347C
.byte 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+4 -4
View File
@@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
setfieldeffectargument 1, 10 setfieldeffectargument 1, 10
setfieldeffectargument 2, 0 setfieldeffectargument 2, 0
dofieldeffect 54 dofieldeffect 54
specialvar VAR_RESULT, sub_81392F8 specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3
waitfieldeffect 54 waitfieldeffect 54
@@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C
end end
AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
specialvar VAR_RESULT, sub_81392AC specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32
delay 20 delay 20
@@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
setfieldeffectargument 1, 3 setfieldeffectargument 1, 3
setfieldeffectargument 2, 0 setfieldeffectargument 2, 0
dofieldeffect 54 dofieldeffect 54
specialvar VAR_RESULT, sub_8139320 specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3
waitfieldeffect 54 waitfieldeffect 54
@@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
setfieldeffectargument 1, 6 setfieldeffectargument 1, 6
setfieldeffectargument 2, 0 setfieldeffectargument 2, 0
dofieldeffect 54 dofieldeffect 54
specialvar VAR_RESULT, sub_81392D4 specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3
waitfieldeffect 54 waitfieldeffect 54
data/maps/AncientTomb/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
end end
AncientTomb_EventScript_238FCD:: @ 8238FCD AncientTomb_EventScript_238FCD:: @ 8238FCD
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, AncientTomb_EventScript_27374E goto_if 5, AncientTomb_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -75,7 +75,7 @@ AncientTomb_EventScript_23905A:: @ 823905A
special StartRegiBattle special StartRegiBattle
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq AncientTomb_EventScript_2390A1 goto_eq AncientTomb_EventScript_2390A1
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/AquaHideout_B1F/scripts.inc
+3 -3
View File
@@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
end end
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, AquaHideout_B1F_EventScript_27374E goto_if 5, AquaHideout_B1F_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -41,7 +41,7 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A2F goto_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 4 compare VAR_RESULT, 4
@@ -68,7 +68,7 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq AquaHideout_B1F_EventScript_233A7C goto_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+1 -1
View File
@@ -14,7 +14,7 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
waitmovement 0 waitmovement 0
special sub_813A080 special sub_813A080
waitse waitse
special sub_8139A78 special ShakeScreenInElevator
waitstate waitstate
delay 48 delay 48
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
data/maps/BattleFrontier_OutsideEast/scripts.inc
+2 -2
View File
@@ -9,7 +9,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
end end
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -134,7 +134,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BattleFrontier_OutsideEast_EventScript_242D60 goto_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/BirthIsland_Exterior/scripts.inc
+2 -2
View File
@@ -37,7 +37,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
end end
BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, BirthIsland_Exterior_EventScript_27374E goto_if 5, BirthIsland_Exterior_EventScript_27374E
removeobject 2 removeobject 2
@@ -91,7 +91,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
special BattleSetup_StartLegendaryBattle special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq BirthIsland_Exterior_EventScript_26803B goto_eq BirthIsland_Exterior_EventScript_26803B
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/DesertRuins/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B
end end
DesertRuins_EventScript_22D975:: @ 822D975 DesertRuins_EventScript_22D975:: @ 822D975
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, DesertRuins_EventScript_27374E goto_if 5, DesertRuins_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -75,7 +75,7 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
special StartRegiBattle special StartRegiBattle
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq DesertRuins_EventScript_22DA49 goto_eq DesertRuins_EventScript_22DA49
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/FarawayIsland_Interior/scripts.inc
+3 -3
View File
@@ -11,7 +11,7 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
end end
FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 FarawayIsland_Interior_EventScript_267D19:: @ 8267D19
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq FarawayIsland_Interior_EventScript_267D4B goto_eq FarawayIsland_Interior_EventScript_267D4B
compare VAR_RESULT, 4 compare VAR_RESULT, 4
@@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
end end
FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, FarawayIsland_Interior_EventScript_27374E goto_if 5, FarawayIsland_Interior_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -148,7 +148,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
special BattleSetup_StartLegendaryBattle special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq FarawayIsland_Interior_EventScript_267E96 goto_eq FarawayIsland_Interior_EventScript_267E96
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/IslandCave/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A
end end
IslandCave_EventScript_238E44:: @ 8238E44 IslandCave_EventScript_238E44:: @ 8238E44
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, IslandCave_EventScript_27374E goto_if 5, IslandCave_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -107,7 +107,7 @@ IslandCave_EventScript_238F58:: @ 8238F58
special StartRegiBattle special StartRegiBattle
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq IslandCave_EventScript_238F9F goto_eq IslandCave_EventScript_238F9F
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/LilycoveCity/scripts.inc
+2 -2
View File
@@ -255,7 +255,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq LilycoveCity_EventScript_1E2E5A goto_eq LilycoveCity_EventScript_1E2E5A
msgbox LilycoveCity_Text_1E3234, 4 msgbox LilycoveCity_Text_1E3234, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, LilycoveCity_EventScript_1E2EDE case 0, LilycoveCity_EventScript_1E2EDE
case 1, LilycoveCity_EventScript_1E2EEE case 1, LilycoveCity_EventScript_1E2EEE
case 2, LilycoveCity_EventScript_1E2EFE case 2, LilycoveCity_EventScript_1E2EFE
@@ -286,7 +286,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq LilycoveCity_EventScript_1E2ECD goto_eq LilycoveCity_EventScript_1E2ECD
msgbox LilycoveCity_Text_1E373C, 4 msgbox LilycoveCity_Text_1E373C, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, LilycoveCity_EventScript_1E2F0E case 0, LilycoveCity_EventScript_1E2F0E
case 1, LilycoveCity_EventScript_1E2F1E case 1, LilycoveCity_EventScript_1E2F1E
case 2, LilycoveCity_EventScript_1E2F2E case 2, LilycoveCity_EventScript_1E2F2E
data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+2 -2
View File
@@ -118,12 +118,12 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA
waitmovement 0 waitmovement 0
waitse waitse
special sub_8139A78 special ShakeScreenInElevator
waitstate waitstate
setflag FLAG_0x002 setflag FLAG_0x002
return return
LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
special sub_8139994 special SetDepartmentStoreFloorVar
return return
data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
waitmessage waitmessage
special RetrieveLotteryNumber special RetrieveLotteryNumber
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
special sub_81397C4 special BufferLottoTicketNumber
msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4 msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4
applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8
waitmovement 0 waitmovement 0
data/maps/LilycoveCity_Harbor/scripts.inc
+2 -2
View File
@@ -89,7 +89,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149
msgbox LilycoveCity_Harbor_Text_21E864, 5 msgbox LilycoveCity_Harbor_Text_21E864, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq LilycoveCity_Harbor_EventScript_21E5C0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0
setvar VAR_PORTHOLE, 5 setvar VAR_PORTHOLE_STATE, 5
call LilycoveCity_Harbor_EventScript_21E5CC call LilycoveCity_Harbor_EventScript_21E5CC
warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
waitstate waitstate
@@ -398,7 +398,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575
msgbox LilycoveCity_Harbor_Text_21E864, 5 msgbox LilycoveCity_Harbor_Text_21E864, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq LilycoveCity_Harbor_EventScript_21E5C0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0
setvar VAR_PORTHOLE, 5 setvar VAR_PORTHOLE_STATE, 5
call LilycoveCity_Harbor_EventScript_21E5CC call LilycoveCity_Harbor_EventScript_21E5CC
warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
waitstate waitstate
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+66 -66
View File
@@ -4,7 +4,7 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
.byte 0 .byte 0
LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
map_script_2 VAR_0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
.2byte 0 .2byte 0
LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
@@ -24,7 +24,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
waitmovement 0 waitmovement 0
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
waitmovement 0 waitmovement 0
setvar VAR_0x4095, 2 setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2
releaseall releaseall
end end
@@ -62,45 +62,45 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D
call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA
compare VAR_0x4095, 1 compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8
compare VAR_0x4095, 2 compare VAR_LILYCOVE_FAN_CLUB_STATE, 2
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829
special sub_813BCE8 special UpdateMovedLilycoveFanClubMembers
call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5 call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
end end
@@ -120,35 +120,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
setvar VAR_0x8005, 8 setvar VAR_0x8005, 8
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
compare VAR_0x8005, 5 compare VAR_0x8005, 5
@@ -208,13 +208,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special sub_813BDB4 special BufferStreakTrainerText
compare VAR_0x4095, 0 compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4
@@ -222,7 +222,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4
@@ -248,13 +248,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
compare VAR_0x4095, 0 compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4
@@ -262,7 +262,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4
@@ -288,13 +288,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special sub_813BDB4 special BufferStreakTrainerText
compare VAR_0x4095, 0 compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4
@@ -302,7 +302,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4
@@ -328,13 +328,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
special sub_813BDB4 special BufferStreakTrainerText
compare VAR_0x4095, 0 compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4
@@ -342,7 +342,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4
@@ -368,11 +368,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
special sub_813BDB4 special BufferStreakTrainerText
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4
@@ -380,7 +380,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4
@@ -401,11 +401,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 12 setvar VAR_0x8004, 12
special sub_813BDB4 special BufferStreakTrainerText
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4
@@ -413,7 +413,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4
@@ -434,11 +434,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
special sub_813BDB4 special BufferStreakTrainerText
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4
@@ -446,7 +446,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4
@@ -467,11 +467,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 15 setvar VAR_0x8004, 15
special sub_813BDB4 special BufferStreakTrainerText
specialvar VAR_RESULT, sub_813BD60 specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4
@@ -479,7 +479,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
specialvar VAR_RESULT, sub_813BCA8 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4
@@ -512,7 +512,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF
copyvar VAR_0x800A, VAR_0x8006 copyvar VAR_0x800A, VAR_0x8006
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
@@ -532,7 +532,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
@@ -542,7 +542,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4
setvar VAR_0x8004, 14 setvar VAR_0x8004, 14
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
@@ -557,7 +557,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
message LilycoveCity_PokemonTrainerFanClub_Text_281C95 message LilycoveCity_PokemonTrainerFanClub_Text_281C95
waitmessage waitmessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
@@ -568,7 +568,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
copyvar VAR_0x8006, VAR_0x800A copyvar VAR_0x8006, VAR_0x800A
copyvar VAR_0x8005, VAR_RESULT copyvar VAR_0x8005, VAR_RESULT
special PutFanClubSpecialOnTheAir special PutFanClubSpecialOnTheAir
@@ -577,7 +577,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
@@ -587,14 +587,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4
release release
end end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4
setflag FLAG_0x0D2 setflag FLAG_0x0D2
release release
@@ -602,7 +602,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special sub_813BDB4 special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4
release release
end end
data/maps/MarineCave_End/scripts.inc
+2 -2
View File
@@ -9,7 +9,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA
end end
MarineCave_End_EventScript_23AFF4:: @ 823AFF4 MarineCave_End_EventScript_23AFF4:: @ 823AFF4
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, MarineCave_End_EventScript_27374E goto_if 5, MarineCave_End_EventScript_27374E
removeobject 1 removeobject 1
@@ -42,7 +42,7 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq MarineCave_End_EventScript_23B084 goto_eq MarineCave_End_EventScript_23B084
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/MauvilleCity_GameCorner/scripts.inc
+13 -13
View File
@@ -409,7 +409,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137
msgbox MauvilleCity_GameCorner_Text_210750, 5 msgbox MauvilleCity_GameCorner_Text_210750, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210209 goto_eq MauvilleCity_GameCorner_EventScript_210209
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, MauvilleCity_GameCorner_EventScript_21017C case 0, MauvilleCity_GameCorner_EventScript_21017C
case 1, MauvilleCity_GameCorner_EventScript_2101A6 case 1, MauvilleCity_GameCorner_EventScript_2101A6
case 2, MauvilleCity_GameCorner_EventScript_2101D0 case 2, MauvilleCity_GameCorner_EventScript_2101D0
@@ -540,7 +540,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -551,7 +551,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -562,7 +562,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -573,7 +573,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -584,7 +584,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -595,7 +595,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -606,7 +606,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 6 setvar VAR_0x8004, 6
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -617,7 +617,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 7 setvar VAR_0x8004, 7
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -628,7 +628,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -639,7 +639,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -650,7 +650,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 10 setvar VAR_0x8004, 10
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
@@ -661,7 +661,7 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq MauvilleCity_GameCorner_EventScript_210456 goto_eq MauvilleCity_GameCorner_EventScript_210456
setvar VAR_0x8004, 11 setvar VAR_0x8004, 11
specialvar VAR_RESULT, sub_8139248 specialvar VAR_RESULT, GetSlotMachineId
playslotmachine VAR_RESULT playslotmachine VAR_RESULT
releaseall releaseall
end end
data/maps/NavelRock_Bottom/scripts.inc
+2 -2
View File
@@ -26,7 +26,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284
end end
NavelRock_Bottom_EventScript_26928E:: @ 826928E NavelRock_Bottom_EventScript_26928E:: @ 826928E
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, NavelRock_Bottom_EventScript_27374E goto_if 5, NavelRock_Bottom_EventScript_27374E
removeobject 1 removeobject 1
@@ -64,7 +64,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
special BattleSetup_StartLegendaryBattle special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq NavelRock_Bottom_EventScript_269336 goto_eq NavelRock_Bottom_EventScript_269336
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/NavelRock_Top/scripts.inc
+2 -2
View File
@@ -29,7 +29,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151
end end
NavelRock_Top_EventScript_26915B:: @ 826915B NavelRock_Top_EventScript_26915B:: @ 826915B
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, NavelRock_Top_EventScript_27374E goto_if 5, NavelRock_Top_EventScript_27374E
removeobject 1 removeobject 1
@@ -69,7 +69,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
setvar VAR_LAST_TALKED, 1 setvar VAR_LAST_TALKED, 1
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq NavelRock_Top_EventScript_269217 goto_eq NavelRock_Top_EventScript_269217
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/NewMauville_Inside/scripts.inc
+4 -4
View File
@@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7
end end
NewMauville_Inside_EventScript_237407:: @ 8237407 NewMauville_Inside_EventScript_237407:: @ 8237407
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, NewMauville_Inside_EventScript_27374E goto_if 5, NewMauville_Inside_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -193,7 +193,7 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq NewMauville_Inside_EventScript_2377F3 goto_eq NewMauville_Inside_EventScript_2377F3
compare VAR_RESULT, 4 compare VAR_RESULT, 4
@@ -220,7 +220,7 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq NewMauville_Inside_EventScript_237840 goto_eq NewMauville_Inside_EventScript_237840
compare VAR_RESULT, 4 compare VAR_RESULT, 4
@@ -247,7 +247,7 @@ NewMauville_Inside_EventScript_237849:: @ 8237849
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq NewMauville_Inside_EventScript_23788D goto_eq NewMauville_Inside_EventScript_23788D
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/PacifidlogTown_House2/scripts.inc
+4 -4
View File
@@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792
PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE
checkflag FLAG_0x12B checkflag FLAG_0x12B
goto_if 0, PacifidlogTown_House2_EventScript_27374E goto_if 0, PacifidlogTown_House2_EventScript_27374E
specialvar VAR_RESULT, sub_813970C specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if 1, PacifidlogTown_House2_EventScript_203812 call_if 1, PacifidlogTown_House2_EventScript_203812
return return
@@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq PacifidlogTown_House2_EventScript_272054 goto_eq PacifidlogTown_House2_EventScript_272054
setflag FLAG_0x12B setflag FLAG_0x12B
special sub_8139754 special SetPacifidlogTMReceivedDay
msgbox PacifidlogTown_House2_Text_203A85, 4 msgbox PacifidlogTown_House2_Text_203A85, 4
release release
end end
@@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq PacifidlogTown_House2_EventScript_272054 goto_eq PacifidlogTown_House2_EventScript_272054
setflag FLAG_0x12B setflag FLAG_0x12B
special sub_8139754 special SetPacifidlogTMReceivedDay
msgbox PacifidlogTown_House2_Text_203A85, 4 msgbox PacifidlogTown_House2_Text_203A85, 4
release release
end end
PacifidlogTown_House2_EventScript_20387E:: @ 820387E PacifidlogTown_House2_EventScript_20387E:: @ 820387E
specialvar VAR_RESULT, sub_813970C specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
buffernumberstring 0, VAR_RESULT buffernumberstring 0, VAR_RESULT
msgbox PacifidlogTown_House2_Text_203AF4, 4 msgbox PacifidlogTown_House2_Text_203AF4, 4
release release
data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -35,11 +35,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C
end end
PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38
compare VAR_FIRST_POKE, 0 compare VAR_STARTER_MON, 0
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B
compare VAR_FIRST_POKE, 1 compare VAR_STARTER_MON, 1
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64
compare VAR_FIRST_POKE, 2 compare VAR_STARTER_MON, 2
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D
release release
end end
data/maps/Route103/scripts.inc
+2 -2
View File
@@ -38,7 +38,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA
applymovement 2, Route103_Movement_27259A applymovement 2, Route103_Movement_27259A
waitmovement 0 waitmovement 0
msgbox Route103_Text_1EC7DE, 4 msgbox Route103_Text_1EC7DE, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, Route103_EventScript_1EC48E case 0, Route103_EventScript_1EC48E
case 1, Route103_EventScript_1EC49E case 1, Route103_EventScript_1EC49E
case 2, Route103_EventScript_1EC4AE case 2, Route103_EventScript_1EC4AE
@@ -55,7 +55,7 @@ Route103_EventScript_1EC434:: @ 81EC434
applymovement 2, Route103_Movement_27259A applymovement 2, Route103_Movement_27259A
waitmovement 0 waitmovement 0
msgbox Route103_Text_1EC9CE, 4 msgbox Route103_Text_1EC9CE, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, Route103_EventScript_1EC4BE case 0, Route103_EventScript_1EC4BE
case 1, Route103_EventScript_1EC4CE case 1, Route103_EventScript_1EC4CE
case 2, Route103_EventScript_1EC4DE case 2, Route103_EventScript_1EC4DE
data/maps/Route104/scripts.inc
+2 -2
View File
@@ -153,7 +153,7 @@ Route104_EventScript_1ECDD0:: @ 81ECDD0
Route104_EventScript_1ECDED:: @ 81ECDED Route104_EventScript_1ECDED:: @ 81ECDED
msgbox Route104_Text_1EDDDB, 4 msgbox Route104_Text_1EDDDB, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, Route104_EventScript_1ECE36 case 0, Route104_EventScript_1ECE36
case 1, Route104_EventScript_1ECE49 case 1, Route104_EventScript_1ECE49
case 2, Route104_EventScript_1ECE5C case 2, Route104_EventScript_1ECE5C
@@ -230,7 +230,7 @@ Route104_EventScript_1ECEEC:: @ 81ECEEC
Route104_EventScript_1ECF09:: @ 81ECF09 Route104_EventScript_1ECF09:: @ 81ECF09
msgbox Route104_Text_1EE0C7, 4 msgbox Route104_Text_1EE0C7, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, Route104_EventScript_1ECF4D case 0, Route104_EventScript_1ECF4D
case 1, Route104_EventScript_1ECF60 case 1, Route104_EventScript_1ECF60
case 2, Route104_EventScript_1ECF73 case 2, Route104_EventScript_1ECF73
data/maps/Route110/events.inc
+2 -2
View File
@@ -45,8 +45,8 @@ Route110_MapWarps: @ 8529050
warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
Route110_MapCoordEvents: @ 8529080 Route110_MapCoordEvents: @ 8529080
coord_event 28, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661 coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661
coord_event 29, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661 coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661
coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D
coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758 coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758
coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763 coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763
data/maps/Route110/scripts.inc
+7 -7
View File
@@ -11,7 +11,7 @@ Route110_MapScript1_1EF279: @ 81EF279
Route110_MapScript1_1EF27D: @ 81EF27D Route110_MapScript1_1EF27D: @ 81EF27D
call Route110_EventScript_271ED7 call Route110_EventScript_271ED7
call Route110_EventScript_271EFB call Route110_EventScript_271EFB
compare VAR_0x40A9, 1 compare VAR_CYCLING_CHALLENGE_STATE, 1
call_if 1, Route110_EventScript_1EF293 call_if 1, Route110_EventScript_1EF293
end end
@@ -20,12 +20,12 @@ Route110_EventScript_1EF293:: @ 81EF293
return return
Route110_MapScript2_1EF297: @ 81EF297 Route110_MapScript2_1EF297: @ 81EF297
map_script_2 VAR_0x40A9, 1, Route110_EventScript_1EF2A1 map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_1EF2A1
.2byte 0 .2byte 0
Route110_EventScript_1EF2A1:: @ 81EF2A1 Route110_EventScript_1EF2A1:: @ 81EF2A1
special Special_BeginCyclingRoadChallenge special Special_BeginCyclingRoadChallenge
setvar VAR_0x40A9, 2 setvar VAR_CYCLING_CHALLENGE_STATE, 2
return return
Route110_EventScript_1EF2AA:: @ 81EF2AA Route110_EventScript_1EF2AA:: @ 81EF2AA
@@ -148,7 +148,7 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7
specialvar VAR_RESULT, GetPlayerAvatarBike specialvar VAR_RESULT, GetPlayerAvatarBike
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq Route110_EventScript_1EF3E8 goto_eq Route110_EventScript_1EF3E8
compare VAR_0x40A9, 0 compare VAR_CYCLING_CHALLENGE_STATE, 0
goto_eq Route110_EventScript_1EF3DE goto_eq Route110_EventScript_1EF3DE
msgbox Route110_Text_1F06FB, 4 msgbox Route110_Text_1F06FB, 4
release release
@@ -368,7 +368,7 @@ Route110_EventScript_1EF735:: @ 81EF735
end end
Route110_EventScript_1EF743:: @ 81EF743 Route110_EventScript_1EF743:: @ 81EF743
setvar VAR_0x40A9, 3 setvar VAR_CYCLING_CHALLENGE_STATE, 3
savebgm MUS_DUMMY savebgm MUS_DUMMY
fadedefaultbgm fadedefaultbgm
return return
@@ -426,7 +426,7 @@ Route110_EventScript_1EF7E6:: @ 81EF7E6
Route110_EventScript_1EF7EB:: @ 81EF7EB Route110_EventScript_1EF7EB:: @ 81EF7EB
msgbox Route110_Text_1EFC48, 4 msgbox Route110_Text_1EFC48, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, Route110_EventScript_1EF81A case 0, Route110_EventScript_1EF81A
case 1, Route110_EventScript_1EF82A case 1, Route110_EventScript_1EF82A
case 2, Route110_EventScript_1EF83A case 2, Route110_EventScript_1EF83A
@@ -456,7 +456,7 @@ Route110_EventScript_1EF84A:: @ 81EF84A
Route110_EventScript_1EF865:: @ 81EF865 Route110_EventScript_1EF865:: @ 81EF865
msgbox Route110_Text_1EFE3F, 4 msgbox Route110_Text_1EFE3F, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, Route110_EventScript_1EF894 case 0, Route110_EventScript_1EF894
case 1, Route110_EventScript_1EF8A4 case 1, Route110_EventScript_1EF8A4
case 2, Route110_EventScript_1EF8B4 case 2, Route110_EventScript_1EF8B4
data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
+5 -5
View File
@@ -3,14 +3,14 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1
.byte 0 .byte 0
Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7
compare VAR_0x40A9, 3 compare VAR_CYCLING_CHALLENGE_STATE, 3
call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
compare VAR_0x40A9, 2 compare VAR_CYCLING_CHALLENGE_STATE, 2
call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
end end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE
setvar VAR_0x40A9, 1 setvar VAR_CYCLING_CHALLENGE_STATE, 1
return return
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4
@@ -33,7 +33,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0
end end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6
setvar VAR_0x40A9, 1 setvar VAR_CYCLING_CHALLENGE_STATE, 1
return return
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC
@@ -50,7 +50,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13
lockall lockall
setvar VAR_0x40A9, 0 setvar VAR_CYCLING_CHALLENGE_STATE, 0
clearflag FLAG_SYS_CYCLING_ROAD clearflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
releaseall releaseall
data/maps/Route116/scripts.inc
+2 -2
View File
@@ -169,7 +169,7 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6
checkitem ITEM_BLACK_GLASSES, 1 checkitem ITEM_BLACK_GLASSES, 1
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2DF1 goto_eq Route116_EventScript_1F2DF1
specialvar VAR_RESULT, sub_8139634 specialvar VAR_RESULT, FoundBlackGlasses
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2DE2 goto_eq Route116_EventScript_1F2DE2
msgbox Route116_Text_1F3657, 4 msgbox Route116_Text_1F3657, 4
@@ -185,7 +185,7 @@ Route116_EventScript_1F2DE2:: @ 81F2DE2
Route116_EventScript_1F2DF1:: @ 81F2DF1 Route116_EventScript_1F2DF1:: @ 81F2DF1
msgbox Route116_Text_1F3657, 4 msgbox Route116_Text_1F3657, 4
msgbox Route116_Text_1F3688, 4 msgbox Route116_Text_1F3688, 4
specialvar VAR_RESULT, sub_8139634 specialvar VAR_RESULT, FoundBlackGlasses
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq Route116_EventScript_1F2E1B goto_eq Route116_EventScript_1F2E1B
msgbox Route116_Text_1F375E, 4 msgbox Route116_Text_1F375E, 4
data/maps/Route116_TunnelersRestHouse/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863
Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C
lock lock
faceplayer faceplayer
checkflag FLAG_0x0C7 checkflag FLAG_RUSTURF_TUNNEL_OPENED
goto_eq Route116_TunnelersRestHouse_EventScript_22B881 goto_eq Route116_TunnelersRestHouse_EventScript_22B881
msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4 msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4
release release
data/maps/Route119/scripts.inc
+3 -3
View File
@@ -9,7 +9,7 @@ Route119_MapScript1_1F442F: @ 81F442F
end end
Route119_EventScript_1F4439:: @ 81F4439 Route119_EventScript_1F4439:: @ 81F4439
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, Route119_EventScript_27374E goto_if 5, Route119_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -80,7 +80,7 @@ Route119_EventScript_1F4506:: @ 81F4506
Route119_EventScript_1F450B:: @ 81F450B Route119_EventScript_1F450B:: @ 81F450B
msgbox Route119_Text_1F49FD, 4 msgbox Route119_Text_1F49FD, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, Route119_EventScript_1F453A case 0, Route119_EventScript_1F453A
case 1, Route119_EventScript_1F454A case 1, Route119_EventScript_1F454A
case 2, Route119_EventScript_1F455A case 2, Route119_EventScript_1F455A
@@ -110,7 +110,7 @@ Route119_EventScript_1F456A:: @ 81F456A
Route119_EventScript_1F4585:: @ 81F4585 Route119_EventScript_1F4585:: @ 81F4585
msgbox Route119_Text_1F4C9A, 4 msgbox Route119_Text_1F4C9A, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, Route119_EventScript_1F45B4 case 0, Route119_EventScript_1F45B4
case 1, Route119_EventScript_1F45C4 case 1, Route119_EventScript_1F45C4
case 2, Route119_EventScript_1F45D4 case 2, Route119_EventScript_1F45D4
data/maps/Route120/scripts.inc
+3 -3
View File
@@ -25,7 +25,7 @@ Route120_EventScript_1F5406:: @ 81F5406
return return
Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_1F5449:: @ 81F5449
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, Route120_EventScript_27374E goto_if 5, Route120_EventScript_27374E
removeobject 30 removeobject 30
@@ -33,7 +33,7 @@ Route120_EventScript_1F5449:: @ 81F5449
return return
Route120_EventScript_1F5460:: @ 81F5460 Route120_EventScript_1F5460:: @ 81F5460
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, Route120_EventScript_27374E goto_if 5, Route120_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -220,7 +220,7 @@ Route120_EventScript_1F568B:: @ 81F568B
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq Route120_EventScript_1F571C goto_eq Route120_EventScript_1F571C
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/RustboroCity/scripts.inc
+3 -3
View File
@@ -306,7 +306,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
clearflag FLAG_0x2DC clearflag FLAG_0x2DC
setflag FLAG_0x08E setflag FLAG_0x08E
setvar VAR_0x405A, 2 setvar VAR_0x405A, 2
setvar VAR_0x409A, 2 setvar VAR_RUSTURF_TUNNEL_STATE, 2
setvar VAR_0x406F, 1 setvar VAR_0x406F, 1
clearflag FLAG_0x37B clearflag FLAG_0x37B
clearflag FLAG_0x370 clearflag FLAG_0x370
@@ -869,7 +869,7 @@ RustboroCity_EventScript_1E1070:: @ 81E1070
RustboroCity_EventScript_1E1092:: @ 81E1092 RustboroCity_EventScript_1E1092:: @ 81E1092
msgbox RustboroCity_Text_1E1C84, 4 msgbox RustboroCity_Text_1E1C84, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, RustboroCity_EventScript_1E10DB case 0, RustboroCity_EventScript_1E10DB
case 1, RustboroCity_EventScript_1E10EE case 1, RustboroCity_EventScript_1E10EE
case 2, RustboroCity_EventScript_1E1101 case 2, RustboroCity_EventScript_1E1101
@@ -940,7 +940,7 @@ RustboroCity_EventScript_1E1174:: @ 81E1174
RustboroCity_EventScript_1E1191:: @ 81E1191 RustboroCity_EventScript_1E1191:: @ 81E1191
msgbox RustboroCity_Text_1E1FA9, 4 msgbox RustboroCity_Text_1E1FA9, 4
switch VAR_FIRST_POKE switch VAR_STARTER_MON
case 0, RustboroCity_EventScript_1E11D5 case 0, RustboroCity_EventScript_1E11D5
case 1, RustboroCity_EventScript_1E11E8 case 1, RustboroCity_EventScript_1E11E8
case 2, RustboroCity_EventScript_1E11FB case 2, RustboroCity_EventScript_1E11FB
data/maps/RusturfTunnel/events.inc
+2 -2
View File
@@ -17,8 +17,8 @@ RusturfTunnel_MapWarps: @ 85342B4
RusturfTunnel_MapCoordEvents: @ 85342CC RusturfTunnel_MapCoordEvents: @ 85342CC
coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071
coord_event 9, 4, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083 coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
coord_event 9, 5, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083 coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077 coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077
coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D
data/maps/RusturfTunnel/scripts.inc
+4 -4
View File
@@ -4,12 +4,12 @@ RusturfTunnel_MapScripts:: @ 822CE27
.byte 0 .byte 0
RusturfTunnel_MapScript2_22CE32: @ 822CE32 RusturfTunnel_MapScript2_22CE32: @ 822CE32
map_script_2 VAR_0x409A, 4, RusturfTunnel_EventScript_22CEAE map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_22CEAE
map_script_2 VAR_0x409A, 5, RusturfTunnel_EventScript_22CEAE map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE
.2byte 0 .2byte 0
RusturfTunnel_MapScript1_22CE44: @ 822CE44 RusturfTunnel_MapScript1_22CE44: @ 822CE44
compare VAR_0x409A, 2 compare VAR_RUSTURF_TUNNEL_STATE, 2
call_if 1, RusturfTunnel_EventScript_22CE50 call_if 1, RusturfTunnel_EventScript_22CE50
end end
@@ -288,7 +288,7 @@ RusturfTunnel_EventScript_22D083:: @ 822D083
waitmovement 0 waitmovement 0
moveobjectoffscreen 6 moveobjectoffscreen 6
moveobjectoffscreen 7 moveobjectoffscreen 7
setvar VAR_0x409A, 3 setvar VAR_RUSTURF_TUNNEL_STATE, 3
releaseall releaseall
end end
data/maps/SSTidalCorridor/scripts.inc
+18 -18
View File
@@ -4,15 +4,15 @@ SSTidalCorridor_MapScripts:: @ 823BFCF
SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219 map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219
map_script_2 VAR_PORTHOLE, 1, SSTidalCorridor_EventScript_23BFFF map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF
map_script_2 VAR_PORTHOLE, 5, SSTidalCorridor_EventScript_23C015 map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015
map_script_2 VAR_PORTHOLE, 9, SSTidalCorridor_EventScript_23C067 map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067
map_script_2 VAR_PORTHOLE, 10, SSTidalCorridor_EventScript_23C07D map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_23C07D
.2byte 0 .2byte 0
SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
special SetSSTidalFlag special SetSSTidalFlag
setvar VAR_PORTHOLE, 2 setvar VAR_PORTHOLE_STATE, 2
lockall lockall
playse SE_PINPON playse SE_PINPON
msgbox SSTidalCorridor_Text_23C462, 4 msgbox SSTidalCorridor_Text_23C462, 4
@@ -20,7 +20,7 @@ SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
end end
SSTidalCorridor_EventScript_23C015:: @ 823C015 SSTidalCorridor_EventScript_23C015:: @ 823C015
setvar VAR_PORTHOLE, 6 setvar VAR_PORTHOLE_STATE, 6
lockall lockall
playse SE_PINPON playse SE_PINPON
msgbox SSTidalCorridor_Text_23C4E3, 4 msgbox SSTidalCorridor_Text_23C4E3, 4
@@ -29,28 +29,28 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015
SSTidalRooms_EventScript_23C028:: @ 823C028 SSTidalRooms_EventScript_23C028:: @ 823C028
special SetSSTidalFlag special SetSSTidalFlag
setvar VAR_PORTHOLE, 7 setvar VAR_PORTHOLE_STATE, 7
playse SE_PINPON playse SE_PINPON
msgbox SSTidalRooms_Text_23C462, 4 msgbox SSTidalRooms_Text_23C462, 4
return return
SSTidalRooms_EventScript_23C03C:: @ 823C03C SSTidalRooms_EventScript_23C03C:: @ 823C03C
special ResetSSTidalFlag special ResetSSTidalFlag
setvar VAR_PORTHOLE, 4 setvar VAR_PORTHOLE_STATE, 4
playse SE_PINPON playse SE_PINPON
msgbox SSTidalRooms_Text_23C553, 4 msgbox SSTidalRooms_Text_23C553, 4
return return
SSTidalCorridor_EventScript_23C050:: @ 823C050 SSTidalCorridor_EventScript_23C050:: @ 823C050
compare VAR_PORTHOLE, 2 compare VAR_PORTHOLE_STATE, 2
goto_eq SSTidalCorridor_EventScript_23C067 goto_eq SSTidalCorridor_EventScript_23C067
compare VAR_PORTHOLE, 7 compare VAR_PORTHOLE_STATE, 7
goto_eq SSTidalCorridor_EventScript_23C07D goto_eq SSTidalCorridor_EventScript_23C07D
end end
SSTidalCorridor_EventScript_23C067:: @ 823C067 SSTidalCorridor_EventScript_23C067:: @ 823C067
special ResetSSTidalFlag special ResetSSTidalFlag
setvar VAR_PORTHOLE, 3 setvar VAR_PORTHOLE_STATE, 3
lockall lockall
playse SE_PINPON playse SE_PINPON
msgbox SSTidalCorridor_Text_23C4E3, 4 msgbox SSTidalCorridor_Text_23C4E3, 4
@@ -59,7 +59,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067
SSTidalCorridor_EventScript_23C07D:: @ 823C07D SSTidalCorridor_EventScript_23C07D:: @ 823C07D
special ResetSSTidalFlag special ResetSSTidalFlag
setvar VAR_PORTHOLE, 8 setvar VAR_PORTHOLE_STATE, 8
lockall lockall
playse SE_PINPON playse SE_PINPON
msgbox SSTidalCorridor_Text_23C50F, 4 msgbox SSTidalCorridor_Text_23C50F, 4
@@ -68,13 +68,13 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D
SSTidalRooms_EventScript_23C093:: @ 823C093 SSTidalRooms_EventScript_23C093:: @ 823C093
special ResetSSTidalFlag special ResetSSTidalFlag
setvar VAR_PORTHOLE, 8 setvar VAR_PORTHOLE_STATE, 8
playse SE_PINPON playse SE_PINPON
msgbox SSTidalRooms_Text_23C50F, 4 msgbox SSTidalRooms_Text_23C50F, 4
return return
SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 SSTidalRooms_EventScript_23C0A7:: @ 823C0A7
switch VAR_PORTHOLE switch VAR_PORTHOLE_STATE
case 2, SSTidalRooms_EventScript_23C03C case 2, SSTidalRooms_EventScript_23C03C
case 3, SSTidalRooms_EventScript_23C03C case 3, SSTidalRooms_EventScript_23C03C
case 6, SSTidalRooms_EventScript_23C028 case 6, SSTidalRooms_EventScript_23C028
@@ -114,9 +114,9 @@ SSTidalCorridor_EventScript_23C110:: @ 823C110
SSTidalCorridor_EventScript_23C119:: @ 823C119 SSTidalCorridor_EventScript_23C119:: @ 823C119
lock lock
faceplayer faceplayer
compare VAR_PORTHOLE, 4 compare VAR_PORTHOLE_STATE, 4
goto_eq SSTidalCorridor_EventScript_23C13B goto_eq SSTidalCorridor_EventScript_23C13B
compare VAR_PORTHOLE, 8 compare VAR_PORTHOLE_STATE, 8
goto_eq SSTidalCorridor_EventScript_23C15A goto_eq SSTidalCorridor_EventScript_23C15A
msgbox SSTidalCorridor_Text_23C596, 4 msgbox SSTidalCorridor_Text_23C596, 4
release release
@@ -148,9 +148,9 @@ SSTidalCorridor_EventScript_23C179:: @ 823C179
SSTidalCorridor_EventScript_23C17D:: @ 823C17D SSTidalCorridor_EventScript_23C17D:: @ 823C17D
lockall lockall
compare VAR_PORTHOLE, 2 compare VAR_PORTHOLE_STATE, 2
goto_eq SSTidalCorridor_EventScript_23C19E goto_eq SSTidalCorridor_EventScript_23C19E
compare VAR_PORTHOLE, 7 compare VAR_PORTHOLE_STATE, 7
goto_eq SSTidalCorridor_EventScript_23C19E goto_eq SSTidalCorridor_EventScript_23C19E
msgbox SSTidalCorridor_Text_23C6C3, 4 msgbox SSTidalCorridor_Text_23C6C3, 4
releaseall releaseall
data/maps/SkyPillar_Top/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8
end end
SkyPillar_Top_EventScript_2396D2:: @ 82396D2 SkyPillar_Top_EventScript_2396D2:: @ 82396D2
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, SkyPillar_Top_EventScript_27374E goto_if 5, SkyPillar_Top_EventScript_27374E
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
@@ -56,7 +56,7 @@ SkyPillar_Top_EventScript_239722:: @ 8239722
special BattleSetup_StartLegendaryBattle special BattleSetup_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq SkyPillar_Top_EventScript_239768 goto_eq SkyPillar_Top_EventScript_239768
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/SlateportCity_Harbor/scripts.inc
+1 -1
View File
@@ -203,7 +203,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92
msgbox SlateportCity_Harbor_Text_20CF93, 5 msgbox SlateportCity_Harbor_Text_20CF93, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq SlateportCity_Harbor_EventScript_20CBDD goto_eq SlateportCity_Harbor_EventScript_20CBDD
setvar VAR_PORTHOLE, 1 setvar VAR_PORTHOLE_STATE, 1
call SlateportCity_Harbor_EventScript_20CBE9 call SlateportCity_Harbor_EventScript_20CBE9
warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
waitstate waitstate
data/maps/SlateportCity_House1/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3
special TV_CheckMonOTIDEqualsPlayerID special TV_CheckMonOTIDEqualsPlayerID
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq SlateportCity_House1_EventScript_209B50 goto_eq SlateportCity_House1_EventScript_209B50
specialvar VAR_RESULT, sub_8139770 specialvar VAR_RESULT, MonOTNameMatchesPlayer
special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq SlateportCity_House1_EventScript_209B50 goto_eq SlateportCity_House1_EventScript_209B50
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+1 -1
View File
@@ -91,7 +91,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E
SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
special SavePlayerParty special SavePlayerParty
special sub_8139238 special BufferEReaderTrainerName
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
data/maps/SouthernIsland_Interior/scripts.inc
+2 -2
View File
@@ -9,7 +9,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
end end
SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, SouthernIsland_Interior_EventScript_27374E goto_if 5, SouthernIsland_Interior_EventScript_27374E
removeobject 2 removeobject 2
@@ -90,7 +90,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
special BattleSetup_StartLatiBattle special BattleSetup_StartLatiBattle
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq SouthernIsland_Interior_EventScript_242B81 goto_eq SouthernIsland_Interior_EventScript_242B81
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/TerraCave_End/scripts.inc
+2 -2
View File
@@ -9,7 +9,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB
end end
TerraCave_End_EventScript_23B0C5:: @ 823B0C5 TerraCave_End_EventScript_23B0C5:: @ 823B0C5
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if 5, TerraCave_End_EventScript_27374E goto_if 5, TerraCave_End_EventScript_27374E
removeobject 1 removeobject 1
@@ -42,7 +42,7 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
specialvar VAR_RESULT, sub_8138B80 specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq TerraCave_End_EventScript_23B155 goto_eq TerraCave_End_EventScript_23B155
compare VAR_RESULT, 4 compare VAR_RESULT, 4
data/maps/TrainerHill_Elevator/scripts.inc
+1 -1
View File
@@ -50,7 +50,7 @@ TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4
TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9 TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
waitse waitse
special sub_8139A78 special ShakeScreenInElevator
waitstate waitstate
return return
data/maps/VerdanturfTown/scripts.inc
+2 -2
View File
@@ -10,7 +10,7 @@ VerdanturfTown_MapScript1_1EB56C: @ 81EB56C
VerdanturfTown_EventScript_1EB575:: @ 81EB575 VerdanturfTown_EventScript_1EB575:: @ 81EB575
lock lock
faceplayer faceplayer
checkflag FLAG_0x0C7 checkflag FLAG_RUSTURF_TUNNEL_OPENED
goto_eq VerdanturfTown_EventScript_1EB594 goto_eq VerdanturfTown_EventScript_1EB594
msgbox VerdanturfTown_Text_1EB5FD, 4 msgbox VerdanturfTown_Text_1EB5FD, 4
applymovement 2, VerdanturfTown_Movement_2725A2 applymovement 2, VerdanturfTown_Movement_2725A2
@@ -36,7 +36,7 @@ VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1
VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA
lock lock
faceplayer faceplayer
checkflag FLAG_0x0C7 checkflag FLAG_RUSTURF_TUNNEL_OPENED
goto_eq VerdanturfTown_EventScript_1EB5CF goto_eq VerdanturfTown_EventScript_1EB5CF
msgbox VerdanturfTown_Text_1EB854, 4 msgbox VerdanturfTown_Text_1EB854, 4
release release
data/maps/VerdanturfTown_WandasHouse/scripts.inc
+1 -1
View File
@@ -69,7 +69,7 @@ VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E
goto_eq VerdanturfTown_WandasHouse_EventScript_202989 goto_eq VerdanturfTown_WandasHouse_EventScript_202989
checkflag FLAG_0x4F3 checkflag FLAG_0x4F3
goto_eq VerdanturfTown_WandasHouse_EventScript_20297F goto_eq VerdanturfTown_WandasHouse_EventScript_20297F
checkflag FLAG_0x0C7 checkflag FLAG_RUSTURF_TUNNEL_OPENED
goto_eq VerdanturfTown_WandasHouse_EventScript_202975 goto_eq VerdanturfTown_WandasHouse_EventScript_202975
msgbox VerdanturfTown_WandasHouse_Text_202E47, 4 msgbox VerdanturfTown_WandasHouse_Text_202E47, 4
release release
data/scripts/field_move_scripts.inc
+1 -1
View File
@@ -113,7 +113,7 @@ Route111_EventScript_2907FB:: @ 82907FB
applymovement VAR_LAST_TALKED, Route111_Movement_29082B applymovement VAR_LAST_TALKED, Route111_Movement_29082B
waitmovement 0 waitmovement 0
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
specialvar VAR_RESULT, sub_81393FC specialvar VAR_RESULT, TryUpdateRusturfTunnelState
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_eq Route111_EventScript_290829 goto_eq Route111_EventScript_290829
special RockSmashWildEncounter special RockSmashWildEncounter
data/specials.inc
+20 -20
View File
@@ -174,11 +174,11 @@ gSpecials:: @ 81DBA64
def_special GetFirstFreePokeblockSlot def_special GetFirstFreePokeblockSlot
def_special DoBerryBlending def_special DoBerryBlending
def_special sub_8142BC8 def_special sub_8142BC8
def_special sub_813BD60 def_special ShouldMoveLilycoveFanClubMember
def_special sub_813BCA8 def_special GetNumMovedLilycoveFanClubMembers
def_special sub_813BDB4 def_special BufferStreakTrainerText
def_special sub_813BA30 def_special sub_813BA30
def_special sub_813BCE8 def_special UpdateMovedLilycoveFanClubMembers
def_special sub_813BF60 def_special sub_813BF60
def_special sub_813BA60 def_special sub_813BA60
def_special sub_813BF7C def_special sub_813BF7C
@@ -191,7 +191,7 @@ gSpecials:: @ 81DBA64
def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastQuote
def_special GabbyAndTyGetLastBattleTrivia def_special GabbyAndTyGetLastBattleTrivia
def_special GabbyAndTySetScriptVarsToEventObjectLocalIds def_special GabbyAndTySetScriptVarsToEventObjectLocalIds
def_special sub_8138B80 def_special GetBattleOutcome
def_special GetDaycareMonNicknames def_special GetDaycareMonNicknames
def_special GetDaycareState def_special GetDaycareState
def_special RejectEggFromDayCare def_special RejectEggFromDayCare
@@ -227,7 +227,7 @@ gSpecials:: @ 81DBA64
def_special ShowPokedexRatingMessage def_special ShowPokedexRatingMessage
def_special DoPCTurnOnEffect def_special DoPCTurnOnEffect
def_special DoPCTurnOffEffect def_special DoPCTurnOffEffect
def_special sub_8139994 def_special SetDepartmentStoreFloorVar
def_special DoLotteryCornerComputerEffect def_special DoLotteryCornerComputerEffect
def_special EndLotteryCornerComputerEffect def_special EndLotteryCornerComputerEffect
def_special sub_81B951C def_special sub_81B951C
@@ -258,7 +258,7 @@ gSpecials:: @ 81DBA64
def_special sub_81B9D08 def_special sub_81B9D08
def_special sub_80F9490 def_special sub_80F9490
def_special ValidateEReaderTrainer def_special ValidateEReaderTrainer
def_special sub_8139228 def_special GetBestBattleTowerStreak
def_special sub_80F94E8 def_special sub_80F94E8
def_special BedroomPC def_special BedroomPC
def_special PlayerPC def_special PlayerPC
@@ -284,7 +284,7 @@ gSpecials:: @ 81DBA64
def_special sub_80FB7A4 def_special sub_80FB7A4
def_special DoSoftReset def_special DoSoftReset
def_special GameClear def_special GameClear
def_special sub_8139A78 def_special ShakeScreenInElevator
def_special nullsub_55 def_special nullsub_55
def_special SpawnScriptEventObject def_special SpawnScriptEventObject
def_special RemoveScriptEventObject def_special RemoveScriptEventObject
@@ -295,20 +295,20 @@ gSpecials:: @ 81DBA64
def_special sub_80B0534 def_special sub_80B0534
def_special sub_80B058C def_special sub_80B058C
def_special WaitWeather def_special WaitWeather
def_special sub_8139238 def_special BufferEReaderTrainerName
def_special sub_8139248 def_special GetSlotMachineId
def_special GetPlayerFacingDirection def_special GetPlayerFacingDirection
def_special sub_81392AC def_special FoundAbandonedShipRoom1Key
def_special sub_81392D4 def_special FoundAbandonedShipRoom2Key
def_special sub_81392F8 def_special FoundAbandonedShipRoom4Key
def_special sub_8139320 def_special FoundAbandonedShipRoom6Key
def_special LeadMonHasEffortRibbon def_special LeadMonHasEffortRibbon
def_special GiveLeadMonEffortRibbon def_special GiveLeadMonEffortRibbon
def_special Special_AreLeadMonEVsMaxedOut def_special Special_AreLeadMonEVsMaxedOut
def_special sub_8098574 def_special sub_8098574
def_special sub_809859C def_special sub_809859C
def_special InitRoamer def_special InitRoamer
def_special sub_81393FC def_special TryUpdateRusturfTunnelState
def_special IsGrassTypeInParty def_special IsGrassTypeInParty
def_special sub_80AFC60 def_special sub_80AFC60
def_special PutZigzagoonInPlayerParty def_special PutZigzagoonInPlayerParty
@@ -326,7 +326,7 @@ gSpecials:: @ 81DBA64
def_special StartRegiBattle def_special StartRegiBattle
def_special sub_80B16D8 def_special sub_80B16D8
def_special DoSealedChamberShakingEffect2 def_special DoSealedChamberShakingEffect2
def_special sub_8139634 def_special FoundBlackGlasses
def_special sub_80AC81C def_special sub_80AC81C
def_special sp13E_warp_to_last_warp def_special sp13E_warp_to_last_warp
def_special sp13F_fall_to_last_warp def_special sp13F_fall_to_last_warp
@@ -343,11 +343,11 @@ gSpecials:: @ 81DBA64
def_special sub_80E9B70 def_special sub_80E9B70
def_special LoadPlayerBag def_special LoadPlayerBag
def_special sub_80B05B4 def_special sub_80B05B4
def_special sub_8139754 def_special SetPacifidlogTMReceivedDay
def_special sub_813970C def_special GetDaysUntilPacifidlogTMAvailable
def_special sub_80C08E4 def_special sub_80C08E4
def_special sub_8139770 def_special MonOTNameMatchesPlayer
def_special sub_81397C4 def_special BufferLottoTicketNumber
def_special sub_81653CC def_special sub_81653CC
def_special sub_80F9370 def_special sub_80F9370
def_special sub_80F8FE8 def_special sub_80F8FE8
graphics/misc/deoxys1.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
180 180 180
148 148 148
90 90 98
57 57 74
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
222 222 222
0 0 0
graphics/misc/deoxys10.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
246 197 156
238 82 82
189 32 32
123 8 8
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/deoxys11.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 205 156
255 82 82
205 32 32
131 8 8
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/deoxys2.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
180 180 172
156 139 139
98 82 90
57 49 65
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/deoxys3.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
189 180 172
164 131 131
106 74 82
65 41 57
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/deoxys4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
197 180 172
172 123 123
123 65 74
74 41 49
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/deoxys5.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
205 189 164
189 115 115
131 65 65
82 32 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/deoxys6.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
213 189 164
197 115 115
148 57 65
90 32 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/deoxys7.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
222 189 164
205 106 106
156 49 57
98 24 32
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/deoxys8.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
230 197 156
222 98 98
164 49 49
106 16 24
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/misc/deoxys9.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
238 197 156
230 90 90
180 41 41
115 16 16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/unknown/unknown_5B3280.pal
-179
View File
@@ -1,179 +0,0 @@
JASC-PAL
0100
176
115 197 164
180 180 180
148 148 148
90 90 98
57 57 74
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
222 222 222
0 0 0
115 197 164
180 180 172
156 139 139
98 82 90
57 49 65
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 197 164
189 180 172
164 131 131
106 74 82
65 41 57
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 197 164
197 180 172
172 123 123
123 65 74
74 41 49
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 197 164
205 189 164
189 115 115
131 65 65
82 32 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 197 164
213 189 164
197 115 115
148 57 65
90 32 41
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 197 164
222 189 164
205 106 106
156 49 57
98 24 32
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 197 164
230 197 156
222 98 98
164 49 49
106 16 24
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 197 164
238 197 156
230 90 90
180 41 41
115 16 16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 197 164
246 197 156
238 82 82
189 32 32
123 8 8
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
115 197 164
255 205 156
255 82 82
205 32 32
131 8 8
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
include/battle_tower.h
+1
View File
@@ -42,5 +42,6 @@ void sub_81628A0(union BattleTowerRecord *);
void sub_8162614(u16 trainerId, u8); void sub_8162614(u16 trainerId, u8);
void ConvertBattleFrontierTrainerSpeechToString(u16 *words); void ConvertBattleFrontierTrainerSpeechToString(u16 *words);
void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); void GetFrontierTrainerName(u8 *dest, u16 trainerIdx);
void GetEreaderTrainerName(u8 *dest);
#endif //GUARD_BATTLE_TOWER_H #endif //GUARD_BATTLE_TOWER_H
include/cable_club.h
+3
View File
@@ -1,6 +1,8 @@
#ifndef GUARD_CABLE_CLUB_H #ifndef GUARD_CABLE_CLUB_H
#define GUARD_CABLE_CLUB_H #define GUARD_CABLE_CLUB_H
#include "task.h"
// Exported type declarations // Exported type declarations
// Exported RAM declarations // Exported RAM declarations
@@ -11,5 +13,6 @@ void sub_80B37D4(TaskFunc taskFunc);
u8 sub_80B3050(void); u8 sub_80B3050(void);
void sub_80B360C(void); void sub_80B360C(void);
bool32 sub_80B2AF4(u16 *arg0, u16 *arg1); bool32 sub_80B2AF4(u16 *arg0, u16 *arg1);
void sub_80B3AF8(u8 taskId);
#endif //GUARD_CABLE_CLUB_H #endif //GUARD_CABLE_CLUB_H
include/constants/flags.h
+12 -12
View File
@@ -199,7 +199,7 @@
#define FLAG_0x0C4 0xC4 #define FLAG_0x0C4 0xC4
#define FLAG_0x0C5 0xC5 #define FLAG_0x0C5 0xC5
#define FLAG_0x0C6 0xC6 #define FLAG_0x0C6 0xC6
#define FLAG_0x0C7 0xC7 #define FLAG_RUSTURF_TUNNEL_OPENED 0xC7
#define FLAG_0x0C8 0xC8 #define FLAG_0x0C8 0xC8
#define FLAG_0x0C9 0xC9 #define FLAG_0x0C9 0xC9
#define FLAG_0x0CA 0xCA #define FLAG_0x0CA 0xCA
@@ -532,10 +532,10 @@
#define FLAG_0x210 0x210 #define FLAG_0x210 0x210
#define FLAG_0x211 0x211 #define FLAG_0x211 0x211
#define FLAG_0x212 0x212 #define FLAG_0x212 0x212
#define FLAG_0x213 0x213 #define FLAG_HIDDEN_ITEM_1F 0x213
#define FLAG_0x214 0x214 #define FLAG_HIDDEN_ITEM_20 0x214
#define FLAG_0x215 0x215 #define FLAG_HIDDEN_ITEM_21 0x215
#define FLAG_0x216 0x216 #define FLAG_HIDDEN_ITEM_22 0x216
#define FLAG_0x217 0x217 #define FLAG_0x217 0x217
#define FLAG_0x218 0x218 #define FLAG_0x218 0x218
#define FLAG_0x219 0x219 #define FLAG_0x219 0x219
@@ -597,7 +597,7 @@
#define FLAG_0x251 0x251 #define FLAG_0x251 0x251
#define FLAG_0x252 0x252 #define FLAG_0x252 0x252
#define FLAG_0x253 0x253 #define FLAG_0x253 0x253
#define FLAG_0x254 0x254 #define FLAG_HIDDEN_ITEM_BLACK_GLASSES 0x254
#define FLAG_0x255 0x255 #define FLAG_0x255 0x255
#define FLAG_0x256 0x256 #define FLAG_0x256 0x256
#define FLAG_0x257 0x257 #define FLAG_0x257 0x257
@@ -790,10 +790,10 @@
#define FLAG_0x312 0x312 #define FLAG_0x312 0x312
#define FLAG_0x313 0x313 #define FLAG_0x313 0x313
#define FLAG_0x314 0x314 #define FLAG_0x314 0x314
#define FLAG_0x315 0x315 #define FLAG_HIDE_FANCLUB_OLD_LADY 0x315
#define FLAG_0x316 0x316 #define FLAG_HIDE_FANCLUB_BOY 0x316
#define FLAG_0x317 0x317 #define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317
#define FLAG_0x318 0x318 #define FLAG_HIDE_FANCLUB_LADY 0x318
#define FLAG_0x319 0x319 #define FLAG_0x319 0x319
#define FLAG_0x31A 0x31A #define FLAG_0x31A 0x31A
#define FLAG_0x31B 0x31B #define FLAG_0x31B 0x31B
@@ -932,8 +932,8 @@
#define FLAG_0x3A0 0x3A0 #define FLAG_0x3A0 0x3A0
#define FLAG_0x3A1 0x3A1 #define FLAG_0x3A1 0x3A1
#define FLAG_0x3A2 0x3A2 #define FLAG_0x3A2 0x3A2
#define FLAG_0x3A3 0x3A3 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3
#define FLAG_0x3A4 0x3A4 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4
#define FLAG_0x3A5 0x3A5 #define FLAG_0x3A5 0x3A5
#define FLAG_0x3A6 0x3A6 #define FLAG_0x3A6 0x3A6
#define FLAG_0x3A7 0x3A7 #define FLAG_0x3A7 0x3A7
include/constants/vars.h
+11 -11
View File
@@ -49,13 +49,13 @@
#define VAR_RECYCLE_GOODS 0x4020 #define VAR_RECYCLE_GOODS 0x4020
#define VAR_REPEL_STEP_COUNT 0x4021 #define VAR_REPEL_STEP_COUNT 0x4021
#define VAR_ICE_STEP_COUNT 0x4022 #define VAR_ICE_STEP_COUNT 0x4022
#define VAR_FIRST_POKE 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip #define VAR_STARTER_MON 0x4023 // 0=Treecko, 1=Torchic, 2=Mudkip
#define VAR_MIRAGE_RND_H 0x4024 #define VAR_MIRAGE_RND_H 0x4024
#define VAR_MIRAGE_RND_L 0x4025 #define VAR_MIRAGE_RND_L 0x4025
#define VAR_SECRET_BASE_MAP 0x4026 #define VAR_SECRET_BASE_MAP 0x4026
#define VAR_0x4027 0x4027 #define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027
#define VAR_0x4028 0x4028 #define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028
#define VAR_0x4029 0x4029 #define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029
#define VAR_HAPPINESS_STEP_COUNTER 0x402A #define VAR_HAPPINESS_STEP_COUNTER 0x402A
#define VAR_POISON_STEP_COUNTER 0x402B #define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C #define VAR_RESET_RTC_ENABLE 0x402C
@@ -81,8 +81,8 @@
#define VAR_ALTERING_CAVE_WILD_SET 0x403E #define VAR_ALTERING_CAVE_WILD_SET 0x403E
#define VAR_0x403F 0x403F #define VAR_0x403F 0x403F
#define VAR_DAYS 0x4040 #define VAR_DAYS 0x4040
#define VAR_0x4041 0x4041 #define VAR_FANCLUB_UNKNOWN_1 0x4041
#define VAR_0x4042 0x4042 #define VAR_FANCLUB_UNKNOWN_2 0x4042
#define VAR_DEPT_STORE_FLOOR 0x4043 #define VAR_DEPT_STORE_FLOOR 0x4043
#define VAR_0x4044 0x4044 #define VAR_0x4044 0x4044
#define VAR_POKELOT_PRIZE 0x4045 #define VAR_POKELOT_PRIZE 0x4045
@@ -165,12 +165,12 @@
#define VAR_0x4092 0x4092 #define VAR_0x4092 0x4092
#define VAR_0x4093 0x4093 #define VAR_0x4093 0x4093
#define VAR_0x4094 0x4094 #define VAR_0x4094 0x4094
#define VAR_0x4095 0x4095 #define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095
#define VAR_0x4096 0x4096 #define VAR_0x4096 0x4096
#define VAR_0x4097 0x4097 #define VAR_0x4097 0x4097
#define VAR_0x4098 0x4098 #define VAR_0x4098 0x4098
#define VAR_0x4099 0x4099 #define VAR_0x4099 0x4099
#define VAR_0x409A 0x409A #define VAR_RUSTURF_TUNNEL_STATE 0x409A
#define VAR_0x409B 0x409B #define VAR_0x409B 0x409B
#define VAR_0x409C 0x409C #define VAR_0x409C 0x409C
#define VAR_0x409D 0x409D #define VAR_0x409D 0x409D
@@ -185,7 +185,7 @@
#define VAR_0x40A6 0x40A6 #define VAR_0x40A6 0x40A6
#define VAR_0x40A7 0x40A7 #define VAR_0x40A7 0x40A7
#define VAR_0x40A8 0x40A8 #define VAR_0x40A8 0x40A8
#define VAR_0x40A9 0x40A9 #define VAR_CYCLING_CHALLENGE_STATE 0x40A9
#define VAR_0x40AA 0x40AA #define VAR_0x40AA 0x40AA
#define VAR_0x40AB 0x40AB #define VAR_0x40AB 0x40AB
#define VAR_0x40AC 0x40AC #define VAR_0x40AC 0x40AC
@@ -196,7 +196,7 @@
#define VAR_0x40B1 0x40B1 #define VAR_0x40B1 0x40B1
#define VAR_0x40B2 0x40B2 #define VAR_0x40B2 0x40B2
#define VAR_WEATHER_INSTITUTE_STATE 0x40B3 #define VAR_WEATHER_INSTITUTE_STATE 0x40B3
#define VAR_PORTHOLE 0x40B4 #define VAR_PORTHOLE_STATE 0x40B4
#define VAR_0x40B5 0x40B5 #define VAR_0x40B5 0x40B5
#define VAR_0x40B6 0x40B6 #define VAR_0x40B6 0x40B6
#define VAR_0x40B7 0x40B7 #define VAR_0x40B7 0x40B7
@@ -210,7 +210,7 @@
#define VAR_0x40BF 0x40BF #define VAR_0x40BF 0x40BF
#define VAR_0x40C0 0x40C0 #define VAR_0x40C0 0x40C0
#define VAR_0x40C1 0x40C1 #define VAR_0x40C1 0x40C1
#define VAR_0x40C2 0x40C2 #define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2
#define VAR_0x40C3 0x40C3 #define VAR_0x40C3 0x40C3
#define VAR_0x40C4 0x40C4 #define VAR_0x40C4 0x40C4
#define VAR_0x40C5 0x40C5 #define VAR_0x40C5 0x40C5
include/decoration.h
+1
View File
@@ -73,5 +73,6 @@ void sub_8126B2C(u8 taskId);
void sub_8127208(u8 taskId); void sub_8127208(u8 taskId);
void sub_8127250(u8 *dest, u8 decorCat); void sub_8127250(u8 *dest, u8 decorCat);
bool8 IsSelectedDecorInThePC(void); bool8 IsSelectedDecorInThePC(void);
u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u16 paletteTag);
#endif //GUARD_DECORATION_H #endif //GUARD_DECORATION_H
include/event_object_movement.h
+1
View File
@@ -185,6 +185,7 @@ bool8 FreezeEventObject(struct EventObject *eventObject);
u8 GetMoveDirectionFastAnimNum(u8); u8 GetMoveDirectionFastAnimNum(u8);
u8 GetMoveDirectionFasterAnimNum(u8); u8 GetMoveDirectionFasterAnimNum(u8);
u8 GetMoveDirectionFastestAnimNum(u8); u8 GetMoveDirectionFastestAnimNum(u8);
void CameraObjectSetFollowedObjectId(u8 objectId);
void MovementType_None(struct Sprite *); void MovementType_None(struct Sprite *);
void MovementType_LookAround(struct Sprite *); void MovementType_LookAround(struct Sprite *);
include/field_effect.h
+4 -1
View File
@@ -74,7 +74,10 @@ enum FieldEffectScriptIdx
FLDEFF_USE_FLY_ANCIENT_TOMB, FLDEFF_USE_FLY_ANCIENT_TOMB,
FLDEFF_PCTURN_ON, FLDEFF_PCTURN_ON,
FLDEFF_HALL_OF_FAME_RECORD, FLDEFF_HALL_OF_FAME_RECORD,
FLDEFF_USE_TELEPORT FLDEFF_USE_TELEPORT,
FLDEFF_64,
FLDEFF_65,
FLDEFF_66,
}; };
extern s32 gFieldEffectArguments[8]; extern s32 gFieldEffectArguments[8];
include/field_region_map.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_FIELD_REGION_MAP_H
#define GUARD_FIELD_REGION_MAP_H
void FieldInitRegionMap(MainCallback callback);
#endif // GUARD_FIELD_REGION_MAP_H
include/field_screen.h
+1
View File
@@ -15,5 +15,6 @@ void sub_80AC3D0(void);
void sub_80AC3E4(void); void sub_80AC3E4(void);
void PreservePaletteInWeather(u8); void PreservePaletteInWeather(u8);
void sub_80AF128(void); void sub_80AF128(void);
void sub_80AB104(u8);
#endif //GUARD_FIELD_SCREEN_H #endif //GUARD_FIELD_SCREEN_H
include/global.h
+20 -14
View File
@@ -163,6 +163,16 @@ enum
OPTIONS_BATTLE_STYLE_SET OPTIONS_BATTLE_STYLE_SET
}; };
struct Coords8 {
s8 x;
s8 y;
};
struct UCoords8 {
u8 x;
u8 y;
};
struct Coords16 struct Coords16
{ {
s16 x; s16 x;
@@ -344,7 +354,8 @@ struct BattleFrontier
/*0xCA9*/ u8 field_CA9_f:1; // 0x80 /*0xCA9*/ u8 field_CA9_f:1; // 0x80
/*0xCAA*/ u16 field_CAA[4]; /*0xCAA*/ u16 field_CAA[4];
/*0xCB2*/ u16 field_CB2; /*0xCB2*/ u16 field_CB2;
/*0xCB4*/ u16 field_CB4[30]; /*0xCB4*/ u16 field_CB4[22];
/*0xCE0*/ u16 field_CE0[4][2];
/*0xCF0*/ u16 field_CF0[2]; /*0xCF0*/ u16 field_CF0[2];
/*0xCF4*/ u16 field_CF4[2]; /*0xCF4*/ u16 field_CF4[2];
/*0xCF8*/ u16 field_CF8[2]; /*0xCF8*/ u16 field_CF8[2];
@@ -355,24 +366,21 @@ struct BattleFrontier
/*0xD09*/ u8 filler_D09; /*0xD09*/ u8 filler_D09;
/*0xD0A*/ u8 filler_D0A; /*0xD0A*/ u8 filler_D0A;
/*0xD0B*/ u8 filler_D0B; /*0xD0B*/ u8 filler_D0B;
/*0xD0C*/ u8 filler_D0C; /*0xD0C*/ u16 field_D0C[2];
/*0xD0D*/ u8 filler_D0D;
/*0xD0E*/ u8 filler_D0E;
/*0xD0F*/ u8 filler_D0F;
/*0xD10*/ u8 filler_D10; /*0xD10*/ u8 filler_D10;
/*0xD11*/ u8 filler_D11; /*0xD11*/ u8 filler_D11;
/*0xD12*/ u8 filler_D12; /*0xD12*/ u8 filler_D12;
/*0xD13*/ u8 filler_D13; /*0xD13*/ u8 filler_D13;
/*0xD14*/ u16 field_D14[2]; /*0xD14*/ u16 field_D14[2];
/*0xD18*/ u8 field_D18[0xB8]; /*0xD18*/ u8 field_D18[0xB0];
/*0xDC8*/ u16 field_DC8[2];
/*0xDCC*/ u8 filler_DCC[4];
/*0xDD0*/ u16 field_DD0[2]; /*0xDD0*/ u16 field_DD0[2];
/*0xDD4*/ u16 field_DD4[2]; /*0xDD4*/ u16 field_DD4[2];
/*0xDD8*/ u16 field_DD8; /*0xDD8*/ u16 field_DD8;
/*0xDDA*/ u16 field_DDA; /*0xDDA*/ u16 field_DDA[2];
/*0xDDC*/ u16 field_DDC;
/*0xDDE*/ u16 field_DDE[2]; /*0xDDE*/ u16 field_DDE[2];
/*0xDE2*/ u16 field_DE2; /*0xDE2*/ u16 field_DE2[2];
/*0xDE4*/ u16 field_DE4;
/*0xDE6*/ u16 field_DE6; /*0xDE6*/ u16 field_DE6;
/*0xDE8*/ u16 field_DE8; /*0xDE8*/ u16 field_DE8;
/*0xDEA*/ u16 field_DEA[2]; /*0xDEA*/ u16 field_DEA[2];
@@ -387,11 +395,9 @@ struct BattleFrontier
/*0xDFE*/ u16 field_DFE; /*0xDFE*/ u16 field_DFE;
/*0xE00*/ u16 field_E00; /*0xE00*/ u16 field_E00;
/*0xE02*/ u16 field_E02; /*0xE02*/ u16 field_E02;
/*0xE04*/ u16 field_E04; /*0xE04*/ u16 field_E04[2];
/*0xE06*/ u16 field_E06;
/*0xE08*/ u16 field_E08[9]; /*0xE08*/ u16 field_E08[9];
/*0xE1A*/ u16 field_E1A; /*0xE1A*/ u16 field_E1A[2];
/*0xE1C*/ u16 field_E1C;
/*0xE1E*/ u16 field_E1E[7]; /*0xE1E*/ u16 field_E1E[7];
/*0xE2C*/ struct PyramidBag pyramidBag; /*0xE2C*/ struct PyramidBag pyramidBag;
/*0xE58*/ u16 field_E58; /*0xE58*/ u16 field_E58;
include/match_call.h
+2
View File
@@ -10,4 +10,6 @@ enum {
MATCH_CALL_TYPE_GYMLEADER_ELITEFOUR MATCH_CALL_TYPE_GYMLEADER_ELITEFOUR
}; };
s32 GetRematchIdxByTrainerIdx(s32 trainerIdx);
#endif //GUARD_MATCH_CALL_H #endif //GUARD_MATCH_CALL_H
include/menu.h
+2 -1
View File
@@ -51,7 +51,7 @@ void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
void reset_temp_tile_data_buffers(void); void reset_temp_tile_data_buffers(void);
void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode); void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode);
bool8 free_temp_tile_data_buffers_if_possible(void); bool8 free_temp_tile_data_buffers_if_possible(void);
struct WindowTemplate sub_8198A50(u8, u8, u8, u8, u8, u8, u16); struct WindowTemplate CreateWindowTemplate(u8, u8, u8, u8, u8, u8, u16);
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos); void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
void copy_decompressed_tile_data_to_vram_autofree(u8 bgId, const void *src, int size, u16 offset, u8 mode); void copy_decompressed_tile_data_to_vram_autofree(u8 bgId, const void *src, int size, u16 offset, u8 mode);
s8 ProcessMenuInputNoWrap_(void); s8 ProcessMenuInputNoWrap_(void);
@@ -84,5 +84,6 @@ void sub_819A344(u8 a0, u8 *dest, u8 color);
void RemoveMapNamePopUpWindow(void); void RemoveMapNamePopUpWindow(void);
u8 GetMapNamePopUpWindowId(void); u8 GetMapNamePopUpWindowId(void);
u8 AddMapNamePopUpWindow(void); u8 AddMapNamePopUpWindow(void);
void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing);
#endif // GUARD_MENU_H #endif // GUARD_MENU_H
include/party_menu.h
+3
View File
@@ -34,6 +34,8 @@ struct Struct203CEC8
extern struct Struct203CEC8 gUnknown_0203CEC8; extern struct Struct203CEC8 gUnknown_0203CEC8;
extern const u16 gUnknown_0861500C[];
bool8 pokemon_has_move(struct Pokemon *, u16); bool8 pokemon_has_move(struct Pokemon *, u16);
void sub_81B58A8(void); void sub_81B58A8(void);
void DoWallyTutorialBagMenu(void); void DoWallyTutorialBagMenu(void);
@@ -54,5 +56,6 @@ void sub_81B8518(u8 unused);
u8 sub_81B1360(void); u8 sub_81B1360(void);
void sub_81B8904(u8 arg0, void (*callback)(void)); void sub_81B8904(u8 arg0, void (*callback)(void));
void OpenPartyMenuInBattle(u8 caseId); void OpenPartyMenuInBattle(u8 caseId);
u16 ItemIdToBattleMoveId(u16 itemId);
#endif // GUARD_PARTY_MENU_H #endif // GUARD_PARTY_MENU_H
include/pokemon_storage_system.h
+2
View File
@@ -9,5 +9,7 @@ struct BoxPokemon *GetBoxedMonPtr(u8, u8);
void SetBoxMonNickFromAnyBox(u8, u8, u8 *); void SetBoxMonNickFromAnyBox(u8, u8, u8 *);
void CompactPartySlots(void); void CompactPartySlots(void);
u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request); u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
bool8 CheckFreePokemonStorageSpace(void);
u8 StorageGetCurrentBox(void);
#endif // GUARD_POKEMON_STORAGE_SYSTEM_H #endif // GUARD_POKEMON_STORAGE_SYSTEM_H
include/rom_8011DC0.h
+1
View File
@@ -8,5 +8,6 @@
// Exported ROM declarations // Exported ROM declarations
void sub_8018438(void); void sub_8018438(void);
u16 mevent_081445C0(u8);
#endif //GUARD_rom_8011DC0_H #endif //GUARD_rom_8011DC0_H
include/script_menu.h
+2 -1
View File
@@ -9,8 +9,9 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
u8 convert_pixel_width_to_tile_width(s32); s32 convert_pixel_width_to_tile_width(s32);
u8 CreateWindowFromRect(u8, u8, u8, u8); u8 CreateWindowFromRect(u8, u8, u8, u8);
void sub_80E2A78(u8); void sub_80E2A78(u8);
u32 display_text_and_get_width(const u8*, u32);
#endif //GUARD_SCRIPT_MENU_H #endif //GUARD_SCRIPT_MENU_H
include/strings.h
+300
View File
@@ -462,4 +462,304 @@ extern const u8 gText_TotalRecordWLD[];
extern const u8 gText_PlayersBattleResults[]; extern const u8 gText_PlayersBattleResults[];
extern const u8 gText_WinLoseDraw[]; extern const u8 gText_WinLoseDraw[];
extern const u8 gText_99TimesPlus[];
extern const u8 gText_1MinutePlus[];
extern const u8 gText_SpaceSeconds[];
extern const u8 gText_SpaceTimes[];
extern const u8 gText_BigGuy[];
extern const u8 gText_BigGirl[];
extern const u8 gText_Son[];
extern const u8 gText_Daughter[];
extern const u8 gText_1F[];
extern const u8 gText_2F[];
extern const u8 gText_3F[];
extern const u8 gText_4F[];
extern const u8 gText_5F[];
extern const u8 gText_6F[];
extern const u8 gText_7F[];
extern const u8 gText_8F[];
extern const u8 gText_9F[];
extern const u8 gText_10F[];
extern const u8 gText_11F[];
extern const u8 gText_B1F[];
extern const u8 gText_B2F[];
extern const u8 gText_B3F[];
extern const u8 gText_B4F[];
extern const u8 gText_Rooftop[];
extern const u8 gText_ElevatorNowOn[];
extern const u8 gText_Exit[];
extern const u8 gText_BlueFlute[];
extern const u8 gText_YellowFlute[];
extern const u8 gText_RedFlute[];
extern const u8 gText_WhiteFlute[];
extern const u8 gText_BlackFlute[];
extern const u8 gText_PrettyChair[];
extern const u8 gText_PrettyDesk[];
extern const u8 gText_Exit[];
extern const u8 gText_0Pts[];
extern const u8 gText_10Pts[];
extern const u8 gText_20Pts[];
extern const u8 gText_30Pts[];
extern const u8 gText_40Pts[];
extern const u8 gText_50Pts[];
extern const u8 gText_60Pts[];
extern const u8 gText_70Pts[];
extern const u8 gText_80Pts[];
extern const u8 gText_90Pts[];
extern const u8 gText_100Pts[];
extern const u8 gText_QuestionMark[];
extern const u8 gText_KissPoster16BP[];
extern const u8 gText_KissCushion32BP[];
extern const u8 gText_SmoochumDoll32BP[];
extern const u8 gText_TogepiDoll48BP[];
extern const u8 gText_MeowthDoll48BP[];
extern const u8 gText_ClefairyDoll48BP[];
extern const u8 gText_DittoDoll48BP[];
extern const u8 gText_CyndaquilDoll80BP[];
extern const u8 gText_ChikoritaDoll80BP[];
extern const u8 gText_TotodileDoll80BP[];
extern const u8 gText_Exit[];
extern const u8 gText_LaprasDoll128BP[];
extern const u8 gText_SnorlaxDoll128BP[];
extern const u8 gText_VenusaurDoll256BP[];
extern const u8 gText_CharizardDoll256BP[];
extern const u8 gText_BlastoiseDoll256BP[];
extern const u8 gText_Exit[];
extern const u8 gText_Protein1BP[];
extern const u8 gText_Calcium1BP[];
extern const u8 gText_Iron1BP[];
extern const u8 gText_Zinc1BP[];
extern const u8 gText_Carbos1BP[];
extern const u8 gText_HpUp1BP[];
extern const u8 gText_Exit[];
extern const u8 gText_Leftovers48BP[];
extern const u8 gText_WhiteHerb48BP[];
extern const u8 gText_QuickClaw48BP[];
extern const u8 gText_MentalHerb48BP[];
extern const u8 gText_BrightPowder64BP[];
extern const u8 gText_ChoiceBand64BP[];
extern const u8 gText_KingsRock64BP[];
extern const u8 gText_FocusBand64BP[];
extern const u8 gText_ScopeLens64BP[];
extern const u8 gText_Exit[];
extern const u8 gText_EnergyPowder50[];
extern const u8 gText_EnergyRoot80[];
extern const u8 gText_HealPowder50[];
extern const u8 gText_RevivalHerb300[];
extern const u8 gText_Protein1000[];
extern const u8 gText_Iron1000[];
extern const u8 gText_Carbos1000[];
extern const u8 gText_Calcium1000[];
extern const u8 gText_Zinc1000[];
extern const u8 gText_HPUp1000[];
extern const u8 gText_PPUp3000[];
extern const u8 gText_Exit[];
extern const u8 gText_BattleTower2[];
extern const u8 gText_BattleDome[];
extern const u8 gText_BattlePalace[];
extern const u8 gText_BattleArena[];
extern const u8 gText_BattleFactory[];
extern const u8 gText_BattlePike[];
extern const u8 gText_BattlePyramid[];
extern const u8 gText_RankingHall[];
extern const u8 gText_ExchangeService[];
extern const u8 gText_Exit[];
extern const u8 gText_Softboiled16BP[];
extern const u8 gText_SeismicToss24BP[];
extern const u8 gText_DreamEater24BP[];
extern const u8 gText_MegaPunch24BP[];
extern const u8 gText_MegaKick48BP[];
extern const u8 gText_BodySlam48BP[];
extern const u8 gText_RockSlide48BP[];
extern const u8 gText_Counter48BP[];
extern const u8 gText_ThunderWave48BP[];
extern const u8 gText_SwordsDance48BP[];
extern const u8 gText_Exit[];
extern const u8 gText_DefenseCurl16BP[];
extern const u8 gText_Snore24BP[];
extern const u8 gText_MudSlap24BP[];
extern const u8 gText_Swift24BP[];
extern const u8 gText_IcyWind24BP[];
extern const u8 gText_Endure48BP[];
extern const u8 gText_PsychUp48BP[];
extern const u8 gText_IcePunch48BP[];
extern const u8 gText_ThunderPunch48BP[];
extern const u8 gText_FirePunch48BP[];
extern const u8 gText_Exit[];
extern const u8 gText_SlateportCity[];
extern const u8 gText_BattleFrontier[];
extern const u8 gText_SouthernIsland[];
extern const u8 gText_NavelRock[];
extern const u8 gText_BirthIsland[];
extern const u8 gText_FarawayIsland[];
extern const u8 gText_Exit[];
extern const u8 gText_BattleTrainers[];
extern const u8 gText_BattleBasics[];
extern const u8 gText_PokemonNature[];
extern const u8 gText_PokemonMoves[];
extern const u8 gText_Underpowered[];
extern const u8 gText_WhenInDanger[];
extern const u8 gText_Exit[];
extern const u8 BattleFrontier_Lounge2_Text_260971[];
extern const u8 BattleFrontier_Lounge2_Text_260A1E[];
extern const u8 BattleFrontier_Lounge2_Text_260AE7[];
extern const u8 BattleFrontier_Lounge2_Text_2619AC[];
extern const u8 BattleFrontier_Lounge2_Text_261A91[];
extern const u8 BattleFrontier_Lounge2_Text_261B0C[];
extern const u8 BattleFrontier_Lounge2_Text_261B95[];
extern const u8 BattleFrontier_Lounge2_Text_261B95[];
extern const u8 BattleFrontier_Lounge2_Text_261B95[];
extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
extern const u8 BattleFrontier_Lounge2_Text_260BC4[];
extern const u8 BattleFrontier_Lounge2_Text_260C6D[];
extern const u8 BattleFrontier_Lounge2_Text_260D3A[];
extern const u8 BattleFrontier_Lounge2_Text_260E1E[];
extern const u8 BattleFrontier_Lounge2_Text_260EC7[];
extern const u8 BattleFrontier_Lounge2_Text_260F74[];
extern const u8 BattleFrontier_Lounge2_Text_2614E6[];
extern const u8 BattleFrontier_Lounge2_Text_261591[];
extern const u8 BattleFrontier_Lounge2_Text_26166F[];
extern const u8 BattleFrontier_Lounge2_Text_261282[];
extern const u8 BattleFrontier_Lounge2_Text_261329[];
extern const u8 BattleFrontier_Lounge2_Text_261403[];
extern const u8 BattleFrontier_Lounge2_Text_261026[];
extern const u8 BattleFrontier_Lounge2_Text_2610CC[];
extern const u8 BattleFrontier_Lounge2_Text_261194[];
extern const u8 BattleFrontier_Lounge2_Text_26174D[];
extern const u8 BattleFrontier_Lounge2_Text_2617F9[];
extern const u8 BattleFrontier_Lounge2_Text_2618C4[];
extern const u8 BattleFrontier_Lounge5_Text_26468D[];
extern const u8 BattleFrontier_Lounge5_Text_2646E5[];
extern const u8 BattleFrontier_Lounge5_Text_264741[];
extern const u8 BattleFrontier_Lounge5_Text_2647A4[];
extern const u8 BattleFrontier_Lounge5_Text_2647FC[];
extern const u8 BattleFrontier_Lounge5_Text_264858[];
extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
extern const u8 BattleFrontier_Lounge5_Text_264916[];
extern const u8 BattleFrontier_Lounge5_Text_264972[];
extern const u8 BattleFrontier_Lounge5_Text_2649D5[];
extern const u8 BattleFrontier_Lounge5_Text_264A3F[];
extern const u8 BattleFrontier_Lounge5_Text_264A9B[];
extern const u8 BattleFrontier_Lounge5_Text_264AF3[];
extern const u8 BattleFrontier_Lounge5_Text_264B5D[];
extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
extern const u8 BattleFrontier_Lounge5_Text_264BC3[];
extern const u8 BattleFrontier_Lounge5_Text_264C36[];
extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
extern const u8 BattleFrontier_Lounge5_Text_264C95[];
extern const u8 BattleFrontier_Lounge5_Text_264D01[];
extern const u8 BattleFrontier_Lounge5_Text_264D6B[];
extern const u8 BattleFrontier_Lounge5_Text_264DD7[];
extern const u8 BattleFrontier_Lounge5_Text_264E33[];
extern const u8 BattleFrontier_Lounge5_Text_264E8F[];
extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
extern const u8 BattleFrontier_Lounge3_Text_262261[];
extern const u8 BattleFrontier_Lounge3_Text_26230D[];
extern const u8 BattleFrontier_Lounge3_Text_2623B9[];
extern const u8 BattleFrontier_Lounge3_Text_262464[];
extern const u8 BattleFrontier_Lounge3_Text_26250E[];
extern const u8 BattleFrontier_Lounge3_Text_2625B8[];
extern const u8 BattleFrontier_Lounge3_Text_26266A[];
extern const u8 BattleFrontier_Lounge3_Text_26271C[];
extern const u8 BattleFrontier_Lounge3_Text_2627C9[];
extern const u8 BattleFrontier_Lounge3_Text_262876[];
extern const u8 BattleFrontier_Lounge3_Text_26291A[];
extern const u8 BattleFrontier_Lounge3_Text_2629BC[];
extern const u8 BattleFrontier_Lounge3_Text_262C04[];
extern const u8 BattleFrontier_Lounge3_Text_262C90[];
extern const u8 BattleFrontier_Lounge3_Text_262D1C[];
extern const u8 BattleFrontier_Lounge3_Text_262DA7[];
extern const u8 BattleFrontier_Lounge3_Text_262E34[];
extern const u8 BattleFrontier_Lounge3_Text_262EC1[];
extern const u8 BattleFrontier_Lounge3_Text_262F56[];
extern const u8 BattleFrontier_Lounge3_Text_262FEB[];
extern const u8 BattleFrontier_Lounge3_Text_263078[];
extern const u8 BattleFrontier_Lounge3_Text_263105[];
extern const u8 BattleFrontier_Lounge3_Text_26318C[];
extern const u8 BattleFrontier_Lounge3_Text_263211[];
extern const u8 gText_BP[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260201[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260287[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260397[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260436[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260542[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260575[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2[];
extern const u8 BattleFrontier_BattlePointExchangeServiceCorner_Text_260613[];
extern const u8 BattleFrontier_Lounge7_Text_265E30[];
extern const u8 BattleFrontier_Lounge7_Text_265E5B[];
extern const u8 BattleFrontier_Lounge7_Text_265E8A[];
extern const u8 BattleFrontier_Lounge7_Text_265EC0[];
extern const u8 BattleFrontier_Lounge7_Text_265EED[];
extern const u8 BattleFrontier_Lounge7_Text_265F1C[];
extern const u8 BattleFrontier_Lounge7_Text_265F47[];
extern const u8 BattleFrontier_Lounge7_Text_265F77[];
extern const u8 BattleFrontier_Lounge7_Text_265FAA[];
extern const u8 BattleFrontier_Lounge7_Text_265FDD[];
extern const u8 BattleFrontier_Lounge7_Text_26600A[];
extern const u8 BattleFrontier_Lounge7_Text_26603E[];
extern const u8 BattleFrontier_Lounge7_Text_266070[];
extern const u8 BattleFrontier_Lounge7_Text_2660A6[];
extern const u8 BattleFrontier_Lounge7_Text_2660D0[];
extern const u8 BattleFrontier_Lounge7_Text_2660FF[];
extern const u8 BattleFrontier_Lounge7_Text_26612D[];
extern const u8 BattleFrontier_Lounge7_Text_26615F[];
extern const u8 BattleFrontier_Lounge7_Text_266185[];
extern const u8 BattleFrontier_Lounge7_Text_2661B5[];
extern const u8 gText_YourPartnerHasRetired[];
extern const u8 gText_Wallace[];
extern const u8 gText_Steven[];
extern const u8 gText_Brawly[];
extern const u8 gText_Winona[];
extern const u8 gText_Phoebe[];
extern const u8 gText_Glacia[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H
include/tv.h
+1
View File
@@ -48,5 +48,6 @@ void PutPokemonTodayCaughtOnAir(void);
void TV_PutSecretBaseVisitOnTheAir(void); void TV_PutSecretBaseVisitOnTheAir(void);
void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlayer, u16 speciesOpponent); void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlayer, u16 speciesOpponent);
void UpdateTVScreensOnMap(int, int); void UpdateTVScreensOnMap(int, int);
void TV_PrintIntToStringVar(u8 varIdx, int value);
#endif //GUARD_TV_H #endif //GUARD_TV_H
include/wallclock.h
+2 -1
View File
@@ -1,6 +1,7 @@
#ifndef GUARD_WALLCLOCK_H #ifndef GUARD_WALLCLOCK_H
#define GUARD_WALLCLOCK_H #define GUARD_WALLCLOCK_H
void Cb2_StartWallClock(void); void CB2_StartWallClock(void);
void CB2_ViewWallClock(void);
#endif //GUARD_WALLCLOCK_H #endif //GUARD_WALLCLOCK_H
ld_script.txt
+2 -2
View File
@@ -180,7 +180,7 @@ SECTIONS {
src/time_events.o(.text); src/time_events.o(.text);
src/birch_pc.o(.text); src/birch_pc.o(.text);
src/hof_pc.o(.text); src/hof_pc.o(.text);
asm/field_specials.o(.text); src/field_specials.o(.text);
src/battle_records.o(.text); src/battle_records.o(.text);
asm/pokedex_area_screen.o(.text); asm/pokedex_area_screen.o(.text);
src/evolution_scene.o(.text); src/evolution_scene.o(.text);
@@ -469,7 +469,7 @@ SECTIONS {
src/pokeblock.o(.rodata); src/pokeblock.o(.rodata);
src/fldeff_flash.o(.rodata); src/fldeff_flash.o(.rodata);
src/time_events.o(.rodata); src/time_events.o(.rodata);
data/field_specials.o(.rodata); src/field_specials.o(.rodata);
src/battle_records.o(.rodata); src/battle_records.o(.rodata);
data/pokedex_area_screen.o(.rodata); data/pokedex_area_screen.o(.rodata);
src/evolution_scene.o(.rodata); src/evolution_scene.o(.rodata);
src/battle_setup.c
+1 -1
View File
@@ -900,7 +900,7 @@ static void CB2_GiveStarter(void)
{ {
u16 starterMon; u16 starterMon;
*GetVarPointer(VAR_FIRST_POKE) = gSpecialVar_Result; *GetVarPointer(VAR_STARTER_MON) = gSpecialVar_Result;
starterMon = GetStarterPokemon(gSpecialVar_Result); starterMon = GetStarterPokemon(gSpecialVar_Result);
ScriptGiveMon(starterMon, 5, 0, 0, 0, 0); ScriptGiveMon(starterMon, 5, 0, 0, 0, 0);
ResetTasks(); ResetTasks();
src/clock.c
+1 -1
View File
@@ -88,6 +88,6 @@ static void ReturnFromStartWallClock(void)
void StartWallClock(void) void StartWallClock(void)
{ {
SetMainCallback2(Cb2_StartWallClock); SetMainCallback2(CB2_StartWallClock);
gMain.savedCallback = ReturnFromStartWallClock; gMain.savedCallback = ReturnFromStartWallClock;
} }
src/credits.c
+1 -1
View File
@@ -2285,7 +2285,7 @@ static void sub_81772B8(struct Sprite *sprite)
static void sub_8177388(void) static void sub_8177388(void)
{ {
u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_FIRST_POKE))); u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_STARTER_MON)));
u16 page; u16 page;
u16 dexNum; u16 dexNum;
u16 j; u16 j;
src/field_region_map.c
+1 -1
View File
@@ -63,7 +63,7 @@ static const struct WindowTemplate gUnknown_085E5070[] = {
// .text // .text
void sub_817018C(MainCallback callback) void FieldInitRegionMap(MainCallback callback)
{ {
SetVBlankCallback(NULL); SetVBlankCallback(NULL);
sFieldRegionMapHandler = malloc(sizeof(*sFieldRegionMapHandler)); sFieldRegionMapHandler = malloc(sizeof(*sFieldRegionMapHandler));
src/field_special_scene.c
+1 -1
View File
@@ -272,7 +272,7 @@ bool8 sub_80FB59C(void)
void Task_HandlePorthole(u8 taskId) void Task_HandlePorthole(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
u16 *var = GetVarPointer(VAR_PORTHOLE); u16 *var = GetVarPointer(VAR_PORTHOLE_STATE);
struct WarpData *location = &gSaveBlock1Ptr->location; struct WarpData *location = &gSaveBlock1Ptr->location;
switch (data[0]) switch (data[0])
src/field_specials.c
+4329
View File
File diff suppressed because it is too large Load Diff
src/main_menu.c
+1 -1
View File
@@ -1965,7 +1965,7 @@ void sub_80323CC(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f)
{ {
struct WindowTemplate sp; struct WindowTemplate sp;
sp = sub_8198A50(0, a + 1, b + 1, 5, 4, f, d); sp = CreateWindowTemplate(0, a + 1, b + 1, 5, 4, f, d);
CreateYesNoMenu(&sp, c, e, 0); CreateYesNoMenu(&sp, c, e, 0);
} }
src/match_call.c
+2 -2
View File
@@ -360,7 +360,7 @@ MATCHCALLDEF(sMomMatchCallHeader, 0, 0, FLAG_0x0D8, gMomMatchCallDesc, gMomMatch
static const match_call_text_data_t sStevenTextScripts[] = { static const match_call_text_data_t sStevenTextScripts[] = {
{ gText_Steven_Pokenav_2B5B95, 0xffff, 0xffff }, { gText_Steven_Pokenav_2B5B95, 0xffff, 0xffff },
{ gText_Steven_Pokenav_2B5C53, FLAG_0x0C7, 0xffff }, { gText_Steven_Pokenav_2B5C53, FLAG_RUSTURF_TUNNEL_OPENED, 0xffff },
{ gText_Steven_Pokenav_2B5CC9, FLAG_0x0D4, 0xffff }, { gText_Steven_Pokenav_2B5CC9, FLAG_0x0D4, 0xffff },
{ gText_Steven_Pokenav_2B5DB4, FLAG_0x070, 0xffff }, { gText_Steven_Pokenav_2B5DB4, FLAG_0x070, 0xffff },
{ gText_Steven_Pokenav_2B5E26, FLAG_0x4F6, 0xffff }, { gText_Steven_Pokenav_2B5E26, FLAG_0x4F6, 0xffff },
@@ -415,7 +415,7 @@ MATCHCALLDEF(sBrendanMatchCallHeader, 4, FEMALE, FLAG_0x0FD, gMayBrendanMatchCal
static const match_call_text_data_t sWallyTextScripts[] = { static const match_call_text_data_t sWallyTextScripts[] = {
{ gText_Wally_Pokenav_2B4DE2, 0xFFFF, 0xFFFF }, { gText_Wally_Pokenav_2B4DE2, 0xFFFF, 0xFFFF },
{ gText_Wally_Pokenav_2B4E57, FLAG_0x0C7, 0xFFFF }, { gText_Wally_Pokenav_2B4E57, FLAG_RUSTURF_TUNNEL_OPENED, 0xFFFF },
{ gText_Wally_Pokenav_2B4EA5, FLAG_0x4F3, 0xFFFF }, { gText_Wally_Pokenav_2B4EA5, FLAG_0x4F3, 0xFFFF },
{ gText_Wally_Pokenav_2B4F41, FLAG_0x097, 0xFFFF }, { gText_Wally_Pokenav_2B4F41, FLAG_0x097, 0xFFFF },
{ gText_Wally_Pokenav_2B4FF3, FLAG_0x06F, 0xFFFF }, { gText_Wally_Pokenav_2B4FF3, FLAG_0x06F, 0xFFFF },
src/menu.c
+1 -2
View File
@@ -120,7 +120,6 @@ extern void DrawWindowBorder(u8, u8, u8, u8, u8, u8);
extern void sub_81980A8(u8, u8, u8, u8, u8, u8); extern void sub_81980A8(u8, u8, u8, u8, u8, u8);
extern u8 MoveMenuCursor(s8); extern u8 MoveMenuCursor(s8);
extern u8 sub_8199134(s8, s8); extern u8 sub_8199134(s8, s8);
extern void sub_8199F74(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 letterSpacing, u8 lineSpacing);
extern void sub_8198C78(void); extern void sub_8198C78(void);
extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId); extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
@@ -1143,7 +1142,7 @@ void SetWindowTemplateFields(struct WindowTemplate *template, u8 bg, u8 left, u8
template->baseBlock = baseBlock; template->baseBlock = baseBlock;
} }
struct WindowTemplate sub_8198A50(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock) struct WindowTemplate CreateWindowTemplate(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
{ {
struct WindowTemplate template; struct WindowTemplate template;
SetWindowTemplateFields(&template, bg, left, top, width, height, paletteNum, baseBlock); SetWindowTemplateFields(&template, bg, left, top, width, height, paletteNum, baseBlock);
src/region_map.c
+35 -35
View File
@@ -52,7 +52,7 @@ static EWRAM_DATA struct {
/*0x88c*/ u8 unk_88c[0x1c0]; /*0x88c*/ u8 unk_88c[0x1c0];
/*0xa4c*/ u8 unk_a4c[0x26]; /*0xa4c*/ u8 unk_a4c[0x26];
/*0xa72*/ bool8 unk_a72; /*0xa72*/ bool8 unk_a72;
} *gUnknown_0203A148 = NULL; // a74 } *sFlyMap = NULL; // a74
static bool32 gUnknown_03001180; static bool32 gUnknown_03001180;
static bool32 gUnknown_03001184; static bool32 gUnknown_03001184;
@@ -1578,8 +1578,8 @@ void MCB2_FlyMap(void)
SetGpuReg(REG_OFFSET_BG2HOFS, 0); SetGpuReg(REG_OFFSET_BG2HOFS, 0);
SetGpuReg(REG_OFFSET_BG3HOFS, 0); SetGpuReg(REG_OFFSET_BG3HOFS, 0);
SetGpuReg(REG_OFFSET_BG3VOFS, 0); SetGpuReg(REG_OFFSET_BG3VOFS, 0);
gUnknown_0203A148 = malloc(sizeof(*gUnknown_0203A148)); sFlyMap = malloc(sizeof(*sFlyMap));
if (gUnknown_0203A148 == NULL) if (sFlyMap == NULL)
{ {
SetMainCallback2(CB2_ReturnToFieldWithOpenMenu); SetMainCallback2(CB2_ReturnToFieldWithOpenMenu);
} }
@@ -1608,11 +1608,11 @@ void MCB2_FlyMap(void)
gMain.state++; gMain.state++;
break; break;
case 4: case 4:
InitRegionMap(&gUnknown_0203A148->regionMap, FALSE); InitRegionMap(&sFlyMap->regionMap, FALSE);
CreateRegionMapCursor(0, 0); CreateRegionMapCursor(0, 0);
CreateRegionMapPlayerIcon(1, 1); CreateRegionMapPlayerIcon(1, 1);
gUnknown_0203A148->mapSecId = gUnknown_0203A148->regionMap.mapSecId; sFlyMap->mapSecId = sFlyMap->regionMap.mapSecId;
StringFill(gUnknown_0203A148->unk_a4c, CHAR_SPACE, 16); StringFill(sFlyMap->unk_a4c, CHAR_SPACE, 16);
gUnknown_03001180 = TRUE; gUnknown_03001180 = TRUE;
sub_8124904(); sub_8124904();
gMain.state++; gMain.state++;
@@ -1664,7 +1664,7 @@ static void sub_81248C0(void)
static void sub_81248D4(void) static void sub_81248D4(void)
{ {
gUnknown_0203A148->unk_000(); sFlyMap->unk_000();
AnimateSprites(); AnimateSprites();
BuildOamBuffer(); BuildOamBuffer();
do_scheduled_bg_tilemap_copies_to_vram(); do_scheduled_bg_tilemap_copies_to_vram();
@@ -1672,8 +1672,8 @@ static void sub_81248D4(void)
static void sub_81248F4(void callback(void)) static void sub_81248F4(void callback(void))
{ {
gUnknown_0203A148->unk_000 = callback; sFlyMap->unk_000 = callback;
gUnknown_0203A148->unk_004 = 0; sFlyMap->unk_004 = 0;
} }
static void sub_8124904(void) static void sub_8124904(void)
@@ -1682,21 +1682,21 @@ static void sub_8124904(void)
bool32 flag; bool32 flag;
const u8 *name; const u8 *name;
if (gUnknown_0203A148->regionMap.iconDrawType > MAPSECTYPE_NONE && gUnknown_0203A148->regionMap.iconDrawType <= MAPSECTYPE_BATTLE_FRONTIER) if (sFlyMap->regionMap.iconDrawType > MAPSECTYPE_NONE && sFlyMap->regionMap.iconDrawType <= MAPSECTYPE_BATTLE_FRONTIER)
{ {
flag = FALSE; flag = FALSE;
for (i = 0; i < 1; i++) for (i = 0; i < 1; i++)
{ {
if (gUnknown_0203A148->regionMap.mapSecId == gUnknown_085A1EDC[i].mapSecId) if (sFlyMap->regionMap.mapSecId == gUnknown_085A1EDC[i].mapSecId)
{ {
if (FlagGet(gUnknown_085A1EDC[i].flag)) if (FlagGet(gUnknown_085A1EDC[i].flag))
{ {
StringLength(gUnknown_085A1EDC[i].name[gUnknown_0203A148->regionMap.posWithinMapSec]); StringLength(gUnknown_085A1EDC[i].name[sFlyMap->regionMap.posWithinMapSec]);
flag = TRUE; flag = TRUE;
sub_8198070(0, FALSE); sub_8198070(0, FALSE);
SetWindowBorderStyle(1, FALSE, 0x65, 0x0d); SetWindowBorderStyle(1, FALSE, 0x65, 0x0d);
PrintTextOnWindow(1, 1, gUnknown_0203A148->regionMap.mapSecName, 0, 1, 0, NULL); PrintTextOnWindow(1, 1, sFlyMap->regionMap.mapSecName, 0, 1, 0, NULL);
name = gUnknown_085A1EDC[i].name[gUnknown_0203A148->regionMap.posWithinMapSec]; name = gUnknown_085A1EDC[i].name[sFlyMap->regionMap.posWithinMapSec];
PrintTextOnWindow(1, 1, name, GetStringRightAlignXOffset(1, name, 0x60), 0x11, 0, NULL); PrintTextOnWindow(1, 1, name, GetStringRightAlignXOffset(1, name, 0x60), 0x11, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
gUnknown_03001180 = TRUE; gUnknown_03001180 = TRUE;
@@ -1715,7 +1715,7 @@ static void sub_8124904(void)
{ {
FillWindowPixelBuffer(0, 0x11); FillWindowPixelBuffer(0, 0x11);
} }
PrintTextOnWindow(0, 1, gUnknown_0203A148->regionMap.mapSecName, 0, 1, 0, NULL); PrintTextOnWindow(0, 1, sFlyMap->regionMap.mapSecName, 0, 1, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
gUnknown_03001180 = FALSE; gUnknown_03001180 = FALSE;
} }
@@ -1739,8 +1739,8 @@ static void sub_8124A70(void)
{ {
struct SpriteSheet sheet; struct SpriteSheet sheet;
LZ77UnCompWram(sUnknown_085A1D68, gUnknown_0203A148->unk_88c); LZ77UnCompWram(sUnknown_085A1D68, sFlyMap->unk_88c);
sheet.data = gUnknown_0203A148->unk_88c; sheet.data = sFlyMap->unk_88c;
sheet.size = 0x1c0; sheet.size = 0x1c0;
sheet.tag = 2; sheet.tag = 2;
LoadSpriteSheet(&sheet); LoadSpriteSheet(&sheet);
@@ -1829,7 +1829,7 @@ static void sub_8124BE4(void)
static void sub_8124CBC(struct Sprite *sprite) static void sub_8124CBC(struct Sprite *sprite)
{ {
if (gUnknown_0203A148->regionMap.mapSecId == sprite->data[0]) if (sFlyMap->regionMap.mapSecId == sprite->data[0])
{ {
if (++sprite->data[1] > 16) if (++sprite->data[1] > 16)
{ {
@@ -1846,11 +1846,11 @@ static void sub_8124CBC(struct Sprite *sprite)
static void sub_8124D14(void) static void sub_8124D14(void)
{ {
switch (gUnknown_0203A148->unk_004) switch (sFlyMap->unk_004)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
gUnknown_0203A148->unk_004++; sFlyMap->unk_004++;
break; break;
case 1: case 1:
if (!UpdatePaletteFade()) if (!UpdatePaletteFade())
@@ -1863,7 +1863,7 @@ static void sub_8124D14(void)
static void sub_8124D64(void) static void sub_8124D64(void)
{ {
if (gUnknown_0203A148->unk_004 == 0) if (sFlyMap->unk_004 == 0)
{ {
switch (sub_81230AC()) switch (sub_81230AC())
{ {
@@ -1875,16 +1875,16 @@ static void sub_8124D64(void)
sub_8124904(); sub_8124904();
break; break;
case INPUT_EVENT_A_BUTTON: case INPUT_EVENT_A_BUTTON:
if (gUnknown_0203A148->regionMap.iconDrawType == MAPSECTYPE_CITY_CANFLY || gUnknown_0203A148->regionMap.iconDrawType == MAPSECTYPE_BATTLE_FRONTIER) if (sFlyMap->regionMap.iconDrawType == MAPSECTYPE_CITY_CANFLY || sFlyMap->regionMap.iconDrawType == MAPSECTYPE_BATTLE_FRONTIER)
{ {
m4aSongNumStart(SE_SELECT); m4aSongNumStart(SE_SELECT);
gUnknown_0203A148->unk_a72 = TRUE; sFlyMap->unk_a72 = TRUE;
sub_81248F4(sub_8124E0C); sub_81248F4(sub_8124E0C);
} }
break; break;
case INPUT_EVENT_B_BUTTON: case INPUT_EVENT_B_BUTTON:
m4aSongNumStart(SE_SELECT); m4aSongNumStart(SE_SELECT);
gUnknown_0203A148->unk_a72 = FALSE; sFlyMap->unk_a72 = FALSE;
sub_81248F4(sub_8124E0C); sub_81248F4(sub_8124E0C);
break; break;
} }
@@ -1893,19 +1893,19 @@ static void sub_8124D64(void)
static void sub_8124E0C(void) static void sub_8124E0C(void)
{ {
switch (gUnknown_0203A148->unk_004) switch (sFlyMap->unk_004)
{ {
case 0: case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gUnknown_0203A148->unk_004++; sFlyMap->unk_004++;
break; break;
case 1: case 1:
if (!UpdatePaletteFade()) if (!UpdatePaletteFade())
{ {
FreeRegionMapIconResources(); FreeRegionMapIconResources();
if (gUnknown_0203A148->unk_a72) if (sFlyMap->unk_a72)
{ {
switch (gUnknown_0203A148->regionMap.mapSecId) switch (sFlyMap->regionMap.mapSecId)
{ {
case MAPSEC_SOUTHERN_ISLAND: case MAPSEC_SOUTHERN_ISLAND:
sub_8084CCC(0x15); sub_8084CCC(0x15);
@@ -1917,16 +1917,16 @@ static void sub_8124E0C(void)
sub_8084CCC(gSaveBlock2Ptr->playerGender == MALE ? 0x0C : 0x0D); sub_8084CCC(gSaveBlock2Ptr->playerGender == MALE ? 0x0C : 0x0D);
break; break;
case MAPSEC_EVER_GRANDE_CITY: case MAPSEC_EVER_GRANDE_CITY:
sub_8084CCC(FlagGet(FLAG_LANDMARK_POKEMON_LEAGUE) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B); sub_8084CCC(FlagGet(FLAG_LANDMARK_POKEMON_LEAGUE) && sFlyMap->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B);
break; break;
default: default:
if (sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0) if (sUnknown_085A1E3C[sFlyMap->regionMap.mapSecId][2] != 0)
{ {
sub_8084CCC(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]); sub_8084CCC(sUnknown_085A1E3C[sFlyMap->regionMap.mapSecId][2]);
} }
else else
{ {
warp1_set_2(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1); warp1_set_2(sUnknown_085A1E3C[sFlyMap->regionMap.mapSecId][0], sUnknown_085A1E3C[sFlyMap->regionMap.mapSecId][1], -1);
} }
break; break;
} }
@@ -1936,10 +1936,10 @@ static void sub_8124E0C(void)
{ {
SetMainCallback2(sub_81B58A8); SetMainCallback2(sub_81B58A8);
} }
if (gUnknown_0203A148 != NULL) if (sFlyMap != NULL)
{ {
free(gUnknown_0203A148); free(sFlyMap);
gUnknown_0203A148 = NULL; sFlyMap = NULL;
} }
FreeAllWindowBuffers(); FreeAllWindowBuffers();
} }
src/rotating_gate.c
-6
View File
@@ -189,12 +189,6 @@ struct RotatingGatePuzzle
u8 orientation; u8 orientation;
}; };
struct Coords8
{
s8 deltaX;
s8 deltaY;
};
// .rodata // .rodata
// Fortree // Fortree
static const struct RotatingGatePuzzle sRotatingGate_FortreePuzzleConfig[] = static const struct RotatingGatePuzzle sRotatingGate_FortreePuzzleConfig[] =

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