Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Begin porting/decompiling field_specials

Browse Source
This commit is contained in:
Diegoisawesome 2018-08-08 01:37:12 -07:00
parent 85ebd76cd0
commit 90896e38c9
73 changed files with 1915 additions and 3895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
asm/contest.s
View File

@ -102,7 +102,7 @@ LoadContestBgAfterMoveAnim: @ 80D7724
movs r4, 0
movs r5, 0xA0
_080D775E:
ldr r0, =0x0201a004
ldr r0, =gHeap+0x1A004
adds r0, r5, r0
ldr r1, =gUnknown_02039F26
adds r1, r4, r1
@ -576,7 +576,7 @@ _080D7B4E:
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x4
strb r0, [r1]
ldr r0, =0x02000000
ldr r0, =gHeap
movs r1, 0xD0
lsls r1, 9
adds r0, r1
@ -928,7 +928,7 @@ _080D7ED8:
ldr r4, =0x06002000
adds r1, r4, 0
bl LZDecompressVram
ldr r3, =0x02018000
ldr r3, =gHeap+0x18000
movs r5, 0x80
lsls r5, 6
ldr r1, =0x040000d4
@ -976,7 +976,7 @@ _080D7F40:
ldr r0, =gContestResources
ldr r0, [r0]
ldr r1, [r0, 0x2C]
ldr r2, =0x0201aa04
ldr r2, =gHeap+0x1AA04
ldr r0, =0x040000d4
str r1, [r0]
str r2, [r0, 0x4]
@ -1022,7 +1022,7 @@ _080D7F7C:
mov r0, sp
adds r2, r6, 0
bl CpuSet
ldr r1, =0x0201a004
ldr r1, =gHeap+0x1A004
ldr r0, =0x040000d4
mov r2, r8
str r2, [r0]
@ -1393,7 +1393,7 @@ sub_80D833C: @ 80D833C
strh r1, [r0]
bl sub_80DCD48
ldr r1, =gPlttBufferUnfaded
ldr r2, =0x0201a204
ldr r2, =gHeap+0x1A204
ldr r0, =0x040000d4
str r1, [r0]
str r2, [r0, 0x4]
@ -2070,7 +2070,7 @@ _080D897C:
movs r0, 0
bl sub_80DED60
ldr r1, =gPlttBufferFaded
ldr r0, =0x0201a604
ldr r0, =gHeap+0x1A604
movs r2, 0x80
lsls r2, 3
ldr r4, =0x040000d4
@ -5012,7 +5012,7 @@ _080DA33A:
sub_80DA348: @ 80DA348
lsls r0, 24
lsrs r0, 24
ldr r2, =0x0201a204
ldr r2, =gHeap+0x1A204
ldr r3, =gPlttBufferUnfaded
ldr r1, =0x040000d4
str r2, [r1]
@ -10211,7 +10211,7 @@ sub_80DCCD8: @ 80DCCD8
thumb_func_start sub_80DCD08
sub_80DCD08: @ 80DCD08
push {lr}
ldr r0, =0x02000000
ldr r0, =gHeap
movs r1, 0xD0
lsls r1, 9
adds r2, r0, r1
@ -10250,7 +10250,7 @@ sub_80DCD48: @ 80DCD48
ldrb r0, [r0]
cmp r0, 0
beq _080DCE44
ldr r0, =0x02000000
ldr r0, =gHeap
movs r1, 0xD0
lsls r1, 9
adds r0, r1
@ -10639,7 +10639,7 @@ sub_80DD04C: @ 80DD04C
movs r4, 0
movs r5, 0xA0
_080DD052:
ldr r0, =0x0201a004
ldr r0, =gHeap+0x1A004
adds r0, r5, r0
ldr r1, =gUnknown_02039F26
adds r1, r4, r1
@ -12351,7 +12351,7 @@ sub_80DDE30: @ 80DDE30
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080DDE78
ldr r0, =0x02019000
ldr r0, =gHeap+0x19000
ldr r1, =0x06002000
movs r2, 0x80
lsls r2, 5
@ -12360,7 +12360,7 @@ sub_80DDE30: @ 80DDE30
b _080DDE8C
.pool
_080DDE78:
ldr r0, =0x02018000
ldr r0, =gHeap+0x18000
ldr r1, =0x06002000
movs r2, 0x80
lsls r2, 5
@ -15417,7 +15417,7 @@ sub_80DF704: @ 80DF704
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r0, =0x02000000
ldr r0, =gHeap
movs r1, 0xD0
lsls r1, 9
adds r2, r0, r1
@ -15468,7 +15468,7 @@ sub_80DF750: @ 80DF750
bne _080DF766
b _080DF924
_080DF766:
ldr r0, =0x02000000
ldr r0, =gHeap
movs r1, 0xD0
lsls r1, 9
adds r0, r1
@ -15493,7 +15493,7 @@ _080DF784:
lsrs r7, r0, 24
cmp r7, 0x3
bls _080DF784
ldr r0, =0x02000000
ldr r0, =gHeap
movs r1, 0xD0
lsls r1, 9
adds r0, r1

2
asm/contest_link_80FC4F4.s
View File

@ -11,7 +11,7 @@ sub_80FC4F4: @ 80FC4F4
adds r2, r0, 0
lsls r4, r1, 16
lsrs r4, 16
ldr r5, =0x0201c000
ldr r5, =gDecompressionBuffer
adds r0, r5, 0
adds r1, r2, 0
adds r2, r4, 0

3621
asm/field_specials.s
View File

File diff suppressed because it is too large Load Diff

10
asm/pokenav.s
View File

@ -1585,7 +1585,7 @@ sub_81C7E58: @ 81C7E58
adds r0, r4, 0
movs r2, 0x20
bl LoadPalette
ldr r4, =0x0201c000
ldr r4, =gDecompressionBuffer
mov r0, r8
adds r1, r4, 0
bl LZ77UnCompWram
@ -1667,7 +1667,7 @@ sub_81C7F24: @ 81C7F24
adds r0, r4, 0
movs r2, 0x20
bl LoadPalette
ldr r4, =0x0201d000
ldr r4, =gDecompressionBuffer+0x1000
adds r0, r6, 0
adds r1, r4, 0
bl LZ77UnCompWram
@ -27036,7 +27036,7 @@ _081D4E1C:
thumb_func_start sub_81D4E30
sub_81D4E30: @ 81D4E30
push {lr}
ldr r0, =0x0201c000
ldr r0, =gDecompressionBuffer
movs r2, 0x80
lsls r2, 6
movs r1, 0
@ -27657,7 +27657,7 @@ _081D5386:
strb r0, [r4, 0x8]
b _081D548A
_081D5390:
ldr r0, =0x0201c000
ldr r0, =gDecompressionBuffer
bl sub_81D3920
strb r0, [r4, 0xE]
ldrb r0, [r4, 0xE]
@ -27683,7 +27683,7 @@ _081D53C0:
strb r0, [r4, 0x8]
b _081D548A
_081D53C6:
ldr r0, =0x0201c000
ldr r0, =gDecompressionBuffer
bl sub_81D3AB0
cmp r0, 0
beq _081D53EC

6
asm/rom_8011DC0.s
View File

@ -15650,7 +15650,7 @@ _0801D7D0:
b _0801D804
.pool
_0801D7F0:
ldr r0, =0x0201c000
ldr r0, =gDecompressionBuffer
ldr r1, [r4, 0x18]
movs r2, 0x80
lsls r2, 3
@ -15723,7 +15723,7 @@ _0801D858:
sub_801D860: @ 801D860
push {r4,lr}
adds r4, r0, 0
ldr r3, =0x0201c000
ldr r3, =gDecompressionBuffer
adds r0, r4, 0x4
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
@ -25386,7 +25386,7 @@ sub_80226D0: @ 80226D0
adds r6, r0, 0
movs r5, 0
ldr r0, =gUnknown_08DE3FD4
ldr r4, =0x0201c000
ldr r4, =gDecompressionBuffer
adds r1, r4, 0
bl LZ77UnCompWram
b _0802271A

8
asm/roulette.s
View File

@ -4948,7 +4948,7 @@ sub_8142CD0: @ 8142CD0
sub sp, 0x8
ldr r4, =gUnknown_085B7488
ldr r0, [r4]
ldr r5, =0x0201c000
ldr r5, =gDecompressionBuffer
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp]
@ -5575,7 +5575,7 @@ sub_81431E4: @ 81431E4
sub sp, 0xC
ldr r4, =gUnknown_085B741C
ldr r0, [r4]
ldr r5, =0x0201c000
ldr r5, =gDecompressionBuffer
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp, 0x4]
@ -5720,7 +5720,7 @@ sub_8143314: @ 8143314
push {r7}
sub sp, 0x8
movs r5, 0
ldr r7, =0x0201c000
ldr r7, =gDecompressionBuffer
mov r6, sp
_08143322:
ldr r0, =gUnknown_085B7750
@ -6448,7 +6448,7 @@ sub_814391C: @ 814391C
sub sp, 0x8
ldr r4, =gUnknown_085B7948
ldr r0, [r4]
ldr r5, =0x0201c000
ldr r5, =gDecompressionBuffer
adds r1, r5, 0
bl LZ77UnCompWram
str r5, [sp]

2
asm/trade.s
View File

@ -7612,7 +7612,7 @@ sub_807B170: @ 807B170
bl copy_decompressed_tile_data_to_vram_autofree
ldr r0, =gBattleTextboxTilemap
mov r8, r0
ldr r4, =0x0201c000
ldr r4, =gDecompressionBuffer
adds r1, r4, 0
bl LZDecompressWram
movs r0, 0

6
data/event_scripts.s
View File

@ -2356,8 +2356,8 @@ RusturfTunnel_EventScript_272216:: @ 8272216
removeobject 10
clearflag FLAG_0x328
clearflag FLAG_0x3D8
setvar VAR_0x409A, 6
setflag FLAG_0x0C7
setvar VAR_RUSTURF_TUNNEL_STATE, 6
setflag FLAG_RUSTURF_TUNNEL_OPENED
return
EventScript_27222B:: @ 827222B
@ -2517,7 +2517,7 @@ Route119_EventScript_272365:: @ 8272365
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, sub_8138B80
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_eq Route119_EventScript_2723C1
compare VAR_RESULT, 4

27
data/field_specials.s
View File

@ -3,33 +3,6 @@
.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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -124,6 +124,6 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
return
LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
special sub_8139994
special SetDepartmentStoreFloorVar
return

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -35,11 +35,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C
end
PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38
compare VAR_FIRST_POKE, 0
compare VAR_STARTER_MON, 0
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B
compare VAR_FIRST_POKE, 1
compare VAR_STARTER_MON, 1
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64
compare VAR_FIRST_POKE, 2
compare VAR_STARTER_MON, 2
call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D
release
end

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
data/scripts/field_move_scripts.inc
View File

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

30
data/specials.inc
View File

@ -191,7 +191,7 @@ gSpecials:: @ 81DBA64
def_special GabbyAndTyGetLastQuote
def_special GabbyAndTyGetLastBattleTrivia
def_special GabbyAndTySetScriptVarsToEventObjectLocalIds
def_special sub_8138B80
def_special GetBattleOutcome
def_special GetDaycareMonNicknames
def_special GetDaycareState
def_special RejectEggFromDayCare
@ -227,7 +227,7 @@ gSpecials:: @ 81DBA64
def_special ShowPokedexRatingMessage
def_special DoPCTurnOnEffect
def_special DoPCTurnOffEffect
def_special sub_8139994
def_special SetDepartmentStoreFloorVar
def_special DoLotteryCornerComputerEffect
def_special EndLotteryCornerComputerEffect
def_special sub_81B951C
@ -258,7 +258,7 @@ gSpecials:: @ 81DBA64
def_special sub_81B9D08
def_special sub_80F9490
def_special ValidateEReaderTrainer
def_special sub_8139228
def_special GetBestBattleTowerStreak
def_special sub_80F94E8
def_special BedroomPC
def_special PlayerPC
@ -295,20 +295,20 @@ gSpecials:: @ 81DBA64
def_special sub_80B0534
def_special sub_80B058C
def_special WaitWeather
def_special sub_8139238
def_special sub_8139248
def_special BufferEReaderTrainerName
def_special GetSlotMachineId
def_special GetPlayerFacingDirection
def_special sub_81392AC
def_special sub_81392D4
def_special sub_81392F8
def_special sub_8139320
def_special FoundAbandonedShipRoom1Key
def_special FoundAbandonedShipRoom2Key
def_special FoundAbandonedShipRoom4Key
def_special FoundAbandonedShipRoom6Key
def_special LeadMonHasEffortRibbon
def_special GiveLeadMonEffortRibbon
def_special Special_AreLeadMonEVsMaxedOut
def_special sub_8098574
def_special sub_809859C
def_special InitRoamer
def_special sub_81393FC
def_special TryUpdateRusturfTunnelState
def_special IsGrassTypeInParty
def_special sub_80AFC60
def_special PutZigzagoonInPlayerParty
@ -326,7 +326,7 @@ gSpecials:: @ 81DBA64
def_special StartRegiBattle
def_special sub_80B16D8
def_special DoSealedChamberShakingEffect2
def_special sub_8139634
def_special FoundBlackGlasses
def_special sub_80AC81C
def_special sp13E_warp_to_last_warp
def_special sp13F_fall_to_last_warp
@ -343,11 +343,11 @@ gSpecials:: @ 81DBA64
def_special sub_80E9B70
def_special LoadPlayerBag
def_special sub_80B05B4
def_special sub_8139754
def_special sub_813970C
def_special SetPacifidlogTMReceivedDay
def_special GetDaysUntilPacifidlogTMAvailable
def_special sub_80C08E4
def_special sub_8139770
def_special sub_81397C4
def_special MonOTNameMatchesPlayer
def_special BufferLottoTicketNumber
def_special sub_81653CC
def_special sub_80F9370
def_special sub_80F8FE8

1
include/battle_tower.h
View File

@ -42,5 +42,6 @@ void sub_81628A0(union BattleTowerRecord *);
void sub_8162614(u16 trainerId, u8);
void ConvertBattleFrontierTrainerSpeechToString(u16 *words);
void GetFrontierTrainerName(u8 *dest, u16 trainerIdx);
void GetEreaderTrainerName(u8 *dest);
#endif //GUARD_BATTLE_TOWER_H

16
include/constants/flags.h
View File

@ -199,7 +199,7 @@
#define FLAG_0x0C4 0xC4
#define FLAG_0x0C5 0xC5
#define FLAG_0x0C6 0xC6
#define FLAG_0x0C7 0xC7
#define FLAG_RUSTURF_TUNNEL_OPENED 0xC7
#define FLAG_0x0C8 0xC8
#define FLAG_0x0C9 0xC9
#define FLAG_0x0CA 0xCA
@ -532,10 +532,10 @@
#define FLAG_0x210 0x210
#define FLAG_0x211 0x211
#define FLAG_0x212 0x212
#define FLAG_0x213 0x213
#define FLAG_0x214 0x214
#define FLAG_0x215 0x215
#define FLAG_0x216 0x216
#define FLAG_HIDDEN_ITEM_1F 0x213
#define FLAG_HIDDEN_ITEM_20 0x214
#define FLAG_HIDDEN_ITEM_21 0x215
#define FLAG_HIDDEN_ITEM_22 0x216
#define FLAG_0x217 0x217
#define FLAG_0x218 0x218
#define FLAG_0x219 0x219
@ -597,7 +597,7 @@
#define FLAG_0x251 0x251
#define FLAG_0x252 0x252
#define FLAG_0x253 0x253
#define FLAG_0x254 0x254
#define FLAG_HIDDEN_ITEM_BLACK_GLASSES 0x254
#define FLAG_0x255 0x255
#define FLAG_0x256 0x256
#define FLAG_0x257 0x257
@ -932,8 +932,8 @@
#define FLAG_0x3A0 0x3A0
#define FLAG_0x3A1 0x3A1
#define FLAG_0x3A2 0x3A2
#define FLAG_0x3A3 0x3A3
#define FLAG_0x3A4 0x3A4
#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3
#define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4
#define FLAG_0x3A5 0x3A5
#define FLAG_0x3A6 0x3A6
#define FLAG_0x3A7 0x3A7

16
include/constants/vars.h
View File

@ -49,13 +49,13 @@
#define VAR_RECYCLE_GOODS 0x4020
#define VAR_REPEL_STEP_COUNT 0x4021
#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_L 0x4025
#define VAR_SECRET_BASE_MAP 0x4026
#define VAR_0x4027 0x4027
#define VAR_0x4028 0x4028
#define VAR_0x4029 0x4029
#define VAR_CYCLING_ROAD_RECORD_COLLISIONS 0x4027
#define VAR_CYCLING_ROAD_RECORD_TIME_L 0x4028
#define VAR_CYCLING_ROAD_RECORD_TIME_H 0x4029
#define VAR_HAPPINESS_STEP_COUNTER 0x402A
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
@ -170,7 +170,7 @@
#define VAR_0x4097 0x4097
#define VAR_0x4098 0x4098
#define VAR_0x4099 0x4099
#define VAR_0x409A 0x409A
#define VAR_RUSTURF_TUNNEL_STATE 0x409A
#define VAR_0x409B 0x409B
#define VAR_0x409C 0x409C
#define VAR_0x409D 0x409D
@ -185,7 +185,7 @@
#define VAR_0x40A6 0x40A6
#define VAR_0x40A7 0x40A7
#define VAR_0x40A8 0x40A8
#define VAR_0x40A9 0x40A9
#define VAR_CYCLING_CHALLENGE_STATE 0x40A9
#define VAR_0x40AA 0x40AA
#define VAR_0x40AB 0x40AB
#define VAR_0x40AC 0x40AC
@ -196,7 +196,7 @@
#define VAR_0x40B1 0x40B1
#define VAR_0x40B2 0x40B2
#define VAR_WEATHER_INSTITUTE_STATE 0x40B3
#define VAR_PORTHOLE 0x40B4
#define VAR_PORTHOLE_STATE 0x40B4
#define VAR_0x40B5 0x40B5
#define VAR_0x40B6 0x40B6
#define VAR_0x40B7 0x40B7
@ -210,7 +210,7 @@
#define VAR_0x40BF 0x40BF
#define VAR_0x40C0 0x40C0
#define VAR_0x40C1 0x40C1
#define VAR_0x40C2 0x40C2
#define VAR_PACIFIDLOG_TM_RECEIVED_DAY 0x40C2
#define VAR_0x40C3 0x40C3
#define VAR_0x40C4 0x40C4
#define VAR_0x40C5 0x40C5

1
include/event_object_movement.h
View File

@ -185,6 +185,7 @@ bool8 FreezeEventObject(struct EventObject *eventObject);
u8 GetMoveDirectionFastAnimNum(u8);
u8 GetMoveDirectionFasterAnimNum(u8);
u8 GetMoveDirectionFastestAnimNum(u8);
void CameraObjectSetFollowedObjectId(u8 objectId);
void MovementType_None(struct Sprite *);
void MovementType_LookAround(struct Sprite *);

6
include/field_region_map.h Normal file
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

1
include/party_menu.h
View File

@ -54,5 +54,6 @@ void sub_81B8518(u8 unused);
u8 sub_81B1360(void);
void sub_81B8904(u8 arg0, void (*callback)(void));
void OpenPartyMenuInBattle(u8 caseId);
u16 ItemIdToBattleMoveId(u16 itemId);
#endif // GUARD_PARTY_MENU_H

1
include/pokemon_storage_system.h
View File

@ -9,5 +9,6 @@ struct BoxPokemon *GetBoxedMonPtr(u8, u8);
void SetBoxMonNickFromAnyBox(u8, u8, u8 *);
void CompactPartySlots(void);
u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
bool8 CheckFreePokemonStorageSpace(void);
#endif // GUARD_POKEMON_STORAGE_SYSTEM_H

1
include/rom_8011DC0.h
View File

@ -8,5 +8,6 @@
// Exported ROM declarations
void sub_8018438(void);
u16 mevent_081445C0(u8);
#endif //GUARD_rom_8011DC0_H

10
include/strings.h
View File

@ -462,4 +462,14 @@ extern const u8 gText_TotalRecordWLD[];
extern const u8 gText_PlayersBattleResults[];
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[];
#endif //GUARD_STRINGS_H

1
include/tv.h
View File

@ -48,5 +48,6 @@ void PutPokemonTodayCaughtOnAir(void);
void TV_PutSecretBaseVisitOnTheAir(void);
void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlayer, u16 speciesOpponent);
void UpdateTVScreensOnMap(int, int);
void TV_PrintIntToStringVar(u8 varIdx, int value);
#endif //GUARD_TV_H

3
include/wallclock.h
View File

@ -1,6 +1,7 @@
#ifndef GUARD_WALLCLOCK_H
#define GUARD_WALLCLOCK_H
void Cb2_StartWallClock(void);
void CB2_StartWallClock(void);
void CB2_ViewWallClock(void);
#endif //GUARD_WALLCLOCK_H

2
ld_script.txt
View File

@ -180,6 +180,7 @@ SECTIONS {
src/time_events.o(.text);
src/birch_pc.o(.text);
src/hof_pc.o(.text);
src/field_specials.o(.text);
asm/field_specials.o(.text);
src/battle_records.o(.text);
asm/pokedex_area_screen.o(.text);
@ -469,6 +470,7 @@ SECTIONS {
src/pokeblock.o(.rodata);
src/fldeff_flash.o(.rodata);
src/time_events.o(.rodata);
src/field_specials.o(.rodata);
data/field_specials.o(.rodata);
src/battle_records.o(.rodata);
data/pokedex_area_screen.o(.rodata);

2
src/battle_setup.c
View File

@ -900,7 +900,7 @@ static void CB2_GiveStarter(void)
{
u16 starterMon;
*GetVarPointer(VAR_FIRST_POKE) = gSpecialVar_Result;
*GetVarPointer(VAR_STARTER_MON) = gSpecialVar_Result;
starterMon = GetStarterPokemon(gSpecialVar_Result);
ScriptGiveMon(starterMon, 5, 0, 0, 0, 0);
ResetTasks();

2
src/clock.c
View File

@ -88,6 +88,6 @@ static void ReturnFromStartWallClock(void)
void StartWallClock(void)
{
SetMainCallback2(Cb2_StartWallClock);
SetMainCallback2(CB2_StartWallClock);
gMain.savedCallback = ReturnFromStartWallClock;
}

2
src/credits.c
View File

@ -2285,7 +2285,7 @@ static void sub_81772B8(struct Sprite *sprite)
static void sub_8177388(void)
{
u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_FIRST_POKE)));
u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_STARTER_MON)));
u16 page;
u16 dexNum;
u16 j;

2
src/field_region_map.c
View File

@ -63,7 +63,7 @@ static const struct WindowTemplate gUnknown_085E5070[] = {
// .text
void sub_817018C(MainCallback callback)
void FieldInitRegionMap(MainCallback callback)
{
SetVBlankCallback(NULL);
sFieldRegionMapHandler = malloc(sizeof(*sFieldRegionMapHandler));

2
src/field_special_scene.c
View File

@ -272,7 +272,7 @@ bool8 sub_80FB59C(void)
void Task_HandlePorthole(u8 taskId)
{
s16 *data = gTasks[taskId].data;
u16 *var = GetVarPointer(VAR_PORTHOLE);
u16 *var = GetVarPointer(VAR_PORTHOLE_STATE);
struct WarpData *location = &gSaveBlock1Ptr->location;
switch (data[0])

1657
src/field_specials.c Normal file
View File

File diff suppressed because it is too large Load Diff

4
src/match_call.c
View File

@ -360,7 +360,7 @@ MATCHCALLDEF(sMomMatchCallHeader, 0, 0, FLAG_0x0D8, gMomMatchCallDesc, gMomMatch
static const match_call_text_data_t sStevenTextScripts[] = {
{ 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_2B5DB4, FLAG_0x070, 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[] = {
{ 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_2B4F41, FLAG_0x097, 0xFFFF },
{ gText_Wally_Pokenav_2B4FF3, FLAG_0x06F, 0xFFFF },

70
src/region_map.c
View File

@ -52,7 +52,7 @@ static EWRAM_DATA struct {
/*0x88c*/ u8 unk_88c[0x1c0];
/*0xa4c*/ u8 unk_a4c[0x26];
/*0xa72*/ bool8 unk_a72;
} *gUnknown_0203A148 = NULL; // a74
} *sFlyMap = NULL; // a74
static bool32 gUnknown_03001180;
static bool32 gUnknown_03001184;
@ -1578,8 +1578,8 @@ void MCB2_FlyMap(void)
SetGpuReg(REG_OFFSET_BG2HOFS, 0);
SetGpuReg(REG_OFFSET_BG3HOFS, 0);
SetGpuReg(REG_OFFSET_BG3VOFS, 0);
gUnknown_0203A148 = malloc(sizeof(*gUnknown_0203A148));
if (gUnknown_0203A148 == NULL)
sFlyMap = malloc(sizeof(*sFlyMap));
if (sFlyMap == NULL)
{
SetMainCallback2(CB2_ReturnToFieldWithOpenMenu);
}
@ -1608,11 +1608,11 @@ void MCB2_FlyMap(void)
gMain.state++;
break;
case 4:
InitRegionMap(&gUnknown_0203A148->regionMap, FALSE);
InitRegionMap(&sFlyMap->regionMap, FALSE);
CreateRegionMapCursor(0, 0);
CreateRegionMapPlayerIcon(1, 1);
gUnknown_0203A148->mapSecId = gUnknown_0203A148->regionMap.mapSecId;
StringFill(gUnknown_0203A148->unk_a4c, CHAR_SPACE, 16);
sFlyMap->mapSecId = sFlyMap->regionMap.mapSecId;
StringFill(sFlyMap->unk_a4c, CHAR_SPACE, 16);
gUnknown_03001180 = TRUE;
sub_8124904();
gMain.state++;
@ -1664,7 +1664,7 @@ static void sub_81248C0(void)
static void sub_81248D4(void)
{
gUnknown_0203A148->unk_000();
sFlyMap->unk_000();
AnimateSprites();
BuildOamBuffer();
do_scheduled_bg_tilemap_copies_to_vram();
@ -1672,8 +1672,8 @@ static void sub_81248D4(void)
static void sub_81248F4(void callback(void))
{
gUnknown_0203A148->unk_000 = callback;
gUnknown_0203A148->unk_004 = 0;
sFlyMap->unk_000 = callback;
sFlyMap->unk_004 = 0;
}
static void sub_8124904(void)
@ -1682,21 +1682,21 @@ static void sub_8124904(void)
bool32 flag;
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;
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))
{
StringLength(gUnknown_085A1EDC[i].name[gUnknown_0203A148->regionMap.posWithinMapSec]);
StringLength(gUnknown_085A1EDC[i].name[sFlyMap->regionMap.posWithinMapSec]);
flag = TRUE;
sub_8198070(0, FALSE);
SetWindowBorderStyle(1, FALSE, 0x65, 0x0d);
PrintTextOnWindow(1, 1, gUnknown_0203A148->regionMap.mapSecName, 0, 1, 0, NULL);
name = gUnknown_085A1EDC[i].name[gUnknown_0203A148->regionMap.posWithinMapSec];
PrintTextOnWindow(1, 1, sFlyMap->regionMap.mapSecName, 0, 1, 0, NULL);
name = gUnknown_085A1EDC[i].name[sFlyMap->regionMap.posWithinMapSec];
PrintTextOnWindow(1, 1, name, GetStringRightAlignXOffset(1, name, 0x60), 0x11, 0, NULL);
schedule_bg_copy_tilemap_to_vram(0);
gUnknown_03001180 = TRUE;
@ -1715,7 +1715,7 @@ static void sub_8124904(void)
{
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);
gUnknown_03001180 = FALSE;
}
@ -1739,8 +1739,8 @@ static void sub_8124A70(void)
{
struct SpriteSheet sheet;
LZ77UnCompWram(sUnknown_085A1D68, gUnknown_0203A148->unk_88c);
sheet.data = gUnknown_0203A148->unk_88c;
LZ77UnCompWram(sUnknown_085A1D68, sFlyMap->unk_88c);
sheet.data = sFlyMap->unk_88c;
sheet.size = 0x1c0;
sheet.tag = 2;
LoadSpriteSheet(&sheet);
@ -1829,7 +1829,7 @@ static void sub_8124BE4(void)
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)
{
@ -1846,11 +1846,11 @@ static void sub_8124CBC(struct Sprite *sprite)
static void sub_8124D14(void)
{
switch (gUnknown_0203A148->unk_004)
switch (sFlyMap->unk_004)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
gUnknown_0203A148->unk_004++;
sFlyMap->unk_004++;
break;
case 1:
if (!UpdatePaletteFade())
@ -1863,7 +1863,7 @@ static void sub_8124D14(void)
static void sub_8124D64(void)
{
if (gUnknown_0203A148->unk_004 == 0)
if (sFlyMap->unk_004 == 0)
{
switch (sub_81230AC())
{
@ -1875,16 +1875,16 @@ static void sub_8124D64(void)
sub_8124904();
break;
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);
gUnknown_0203A148->unk_a72 = TRUE;
sFlyMap->unk_a72 = TRUE;
sub_81248F4(sub_8124E0C);
}
break;
case INPUT_EVENT_B_BUTTON:
m4aSongNumStart(SE_SELECT);
gUnknown_0203A148->unk_a72 = FALSE;
sFlyMap->unk_a72 = FALSE;
sub_81248F4(sub_8124E0C);
break;
}
@ -1893,19 +1893,19 @@ static void sub_8124D64(void)
static void sub_8124E0C(void)
{
switch (gUnknown_0203A148->unk_004)
switch (sFlyMap->unk_004)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gUnknown_0203A148->unk_004++;
sFlyMap->unk_004++;
break;
case 1:
if (!UpdatePaletteFade())
{
FreeRegionMapIconResources();
if (gUnknown_0203A148->unk_a72)
if (sFlyMap->unk_a72)
{
switch (gUnknown_0203A148->regionMap.mapSecId)
switch (sFlyMap->regionMap.mapSecId)
{
case MAPSEC_SOUTHERN_ISLAND:
sub_8084CCC(0x15);
@ -1917,16 +1917,16 @@ static void sub_8124E0C(void)
sub_8084CCC(gSaveBlock2Ptr->playerGender == MALE ? 0x0C : 0x0D);
break;
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;
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
{
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;
}
@ -1936,10 +1936,10 @@ static void sub_8124E0C(void)
{
SetMainCallback2(sub_81B58A8);
}
if (gUnknown_0203A148 != NULL)
if (sFlyMap != NULL)
{
free(gUnknown_0203A148);
gUnknown_0203A148 = NULL;
free(sFlyMap);
sFlyMap = NULL;
}
FreeAllWindowBuffers();
}

4
src/wallclock.c
View File

@ -602,7 +602,7 @@ static void WallClockInit(void)
ShowBg(3);
}
void Cb2_StartWallClock(void)
void CB2_StartWallClock(void)
{
u8 taskId;
u8 spriteId;
@ -644,7 +644,7 @@ void Cb2_StartWallClock(void)
schedule_bg_copy_tilemap_to_vram(2);
}
void Cb2_ViewWallClock(void)
void CB2_ViewWallClock(void)
{
u8 taskId;
u8 spriteId;

16
sym_ewram.txt
View File

@ -603,21 +603,7 @@ gPlayerFacingPosition: @ 203AB40
.space 0x8
.include "src/pokeblock.o"
gBikeCyclingChallenge: @ 203AB54
.space 0x1
gBikeCollisions: @ 203AB55
.space 0x3
gUnknown_0203AB58: @ 203AB58
.space 0x4
gUnknown_0203AB5C: @ 203AB5C
.space 0x1
gUnknown_0203AB5D: @ 203AB5D
.space 0x1
.include "src/field_specials.o"
gUnknown_0203AB5E: @ 203AB5E
.space 0x2