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

Merge branch 'master' into pokenav-decomp-again

Browse Source
This commit is contained in:
Phlosioneer
2019-04-07 01:56:36 -04:00
parent ad2a97935e c3cfd60658
commit d84d94e29a
3792 changed files with 73160 additions and 94218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -27,3 +27,4 @@ Thumbs.db
build/
.DS_Store
*.ddump
porymap.project.cfg

8
INSTALL.md
View File

@@ -66,6 +66,14 @@ cd ../pokeemerald
And build the ROM with `make`.
If the step `./build.sh` in the above list of commands fails with the error `Makefile:1: /opt/devkitpro/devkitARM/base_tools: No such file or directory`, then try installing the pacman package `devkitarm-rules` by executing the command
```
sudo dkp-pacman -S devkitarm-rules
```
Executing `./build.sh` again should now succeed.
# Faster builds
After the first build, subsequent builds are faster. You can further speed up the build:

5948
asm/berry_crush.s Executable file
View File

File diff suppressed because it is too large Load Diff

1152
asm/contest_painting_effects.s
View File

File diff suppressed because it is too large Load Diff

11806
asm/dodrio_berry_picking.s Executable file
View File

File diff suppressed because it is too large Load Diff

25
asm/m4a_1.s
View File

@@ -1907,3 +1907,28 @@ _081DDD90:
thumb_func_end ply_mod
.align 2, 0 @ Don't pad with nop.
.bss
gUnknown_03001300:
.space 0x40
.size gUnknown_03001300, .-gUnknown_03001300
.global gMPlayTrack_BGM
gMPlayTrack_BGM:
.space 0x320
.size gMPlayTrack_BGM, .-gMPlayTrack_BGM
.global gMPlayTrack_SE1
gMPlayTrack_SE1:
.space 0xF0
.size gMPlayTrack_SE1, .-gMPlayTrack_SE1
.global gMPlayTrack_SE2
gMPlayTrack_SE2:
.space 0x2D0
.size gMPlayTrack_SE2, .-gMPlayTrack_SE2
.global gMPlayTrack_SE3
gMPlayTrack_SE3:
.space 0x50
.size gMPlayTrack_SE3, .-gMPlayTrack_SE3

14
asm/macros/battle_anim_script.inc
View File

@@ -153,19 +153,19 @@
.byte \param4
.endm
.macro loopsewithpan se:req, param1:req, param2:req, param3:req
.macro loopsewithpan se:req, pan:req, wait:req, times:req
.byte 0x1c
.2byte \se
.byte \param1
.byte \param2
.byte \param3
.byte \pan
.byte \wait
.byte \times
.endm
.macro waitplaysewithpan se:req, param1:req, param2:req
.macro waitplaysewithpan se:req, pan:req, wait:req
.byte 0x1d
.2byte \se
.byte \param1
.byte \param2
.byte \pan
.byte \wait
.endm
.macro setbldcnt param0:req

34
asm/macros/battle_script.inc
View File

@@ -403,6 +403,38 @@
.byte \param0
.byte \param1
.endm
@ Help macros for 5 uses of moveend command
@ All cases
.macro moveendall
setbyte sMOVEEND_STATE, 0
moveend 0, 0
.endm
@ Chosen case
.macro moveendcase case:req
setbyte sMOVEEND_STATE, \case
moveend 1, 0
.endm
@ All cases from (inclusive)
.macro moveendfrom from:req
setbyte sMOVEEND_STATE, \from
moveend 0, 0
.endm
@ All cases from 0 to (not inclusive)
.macro moveendto to:req
setbyte sMOVEEND_STATE, 0
moveend 2, \to
.endm
@ Cases from (inclusive) to (not inclusive)
.macro moveendfromto from:req, to:req
setbyte sMOVEEND_STATE, \from
moveend 2, \to
.endm
.macro typecalc2
.byte 0x4a
@@ -1092,7 +1124,7 @@
.byte 0xdd
.endm
.macro asistattackselect param0:req
.macro assistattackselect param0:req
.byte 0xde
.4byte \param0
.endm

4
asm/macros/event.inc
View File

@@ -77,7 +77,7 @@
.endm
@ Executes a script stored in a default RAM location.
.macro gotoram
.macro returnram
.byte 0x0c
.endm
@@ -1440,7 +1440,7 @@
.endm
@ Depending on factors I haven't managed to understand yet, this command may cause script execution to jump to the offset specified by the pointer at 0x020375C0.
.macro execram
.macro gotoram
.byte 0xcf
.endm

9040
asm/pokemon_jump.s Executable file
View File

File diff suppressed because it is too large Load Diff

32
asm/pokenav.s
View File

@@ -5961,7 +5961,7 @@ sub_81CC09C: @ 81CC09C
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x4
bl sub_8098858
bl DrawTextBorderOuter
ldrb r0, [r4, 0x14]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -7211,7 +7211,7 @@ sub_81CCA1C: @ 81CCA1C
ldrb r0, [r5, 0x8]
movs r1, 0x42
movs r2, 0x4
bl sub_8098858
bl DrawTextBorderOuter
ldr r1, =gUnknown_08622888
str r4, [sp]
movs r0, 0x1
@@ -8696,7 +8696,7 @@ sub_81CD624: @ 81CD624
adds r1, r6, 0
movs r2, 0x2D
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
cmp r0, 0
beq _081CD690
ldr r1, =gText_EggNickname
@@ -8711,14 +8711,14 @@ _081CD690:
adds r1, r6, 0
movs r2, 0x2
adds r3, r5, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
adds r0, r5, 0
bl StringGetEnd10
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0xB
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
lsls r0, 16
lsrs r7, r0, 16
cmp r4, 0xE
@@ -9185,7 +9185,7 @@ _081CDA5A:
adds r1, r7, 0
movs r2, 0x16
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
mov r1, r9
lsls r5, r1, 2
adds r4, r5, r1
@@ -9197,7 +9197,7 @@ _081CDA5A:
adds r1, r7, 0
movs r2, 0x2F
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
ldr r1, =0x00006429
add r1, r8
adds r1, r4
@@ -9206,7 +9206,7 @@ _081CDA5A:
adds r1, r7, 0
movs r2, 0x21
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
ldr r1, =0x0000642a
add r1, r8
adds r1, r4
@@ -9215,7 +9215,7 @@ _081CDA5A:
adds r1, r7, 0
movs r2, 0x18
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
ldr r1, =0x0000642b
add r1, r8
adds r1, r4
@@ -9224,7 +9224,7 @@ _081CDA5A:
adds r1, r7, 0
movs r2, 0x17
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
ldr r1, =0x0000642c
add r1, r8
adds r1, r4
@@ -9238,14 +9238,14 @@ _081CDA5A:
adds r1, r7, 0
movs r2, 0x30
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
cmp r0, 0xFF
beq _081CDB10
adds r0, r6, 0
adds r1, r7, 0
movs r2, 0x30
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
movs r1, 0x1D
bl __udivsi3
b _081CDB12
@@ -9258,7 +9258,7 @@ _081CDB12:
adds r1, r7, 0
movs r2, 0x8
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
ldr r1, =0x00006783
add r1, r8
add r1, r9
@@ -9355,7 +9355,7 @@ _081CDBD0:
adds r1, r6, 0
movs r2, 0x41
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -9363,13 +9363,13 @@ _081CDBD0:
adds r1, r6, 0
movs r2, 0x1
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
mov r8, r0
adds r0, r5, 0
adds r1, r6, 0
movs r2, 0
movs r3, 0
bl sub_81D2C68
bl GetBoxOrPartyMonData
adds r5, r0, 0
lsls r0, r4, 3
ldr r1, =gMonFrontPicTable

48288
asm/rom_8011DC0.s
View File

File diff suppressed because it is too large Load Diff

7087
asm/rom_81D1C44.s
View File

File diff suppressed because it is too large Load Diff

3431
asm/use_pokeblock.s
View File

File diff suppressed because it is too large Load Diff

11
asmdiff.ps1
View File

@@ -107,13 +107,8 @@ if ($start_num -gt 0x1000000)
$end_str = [System.Convert]::ToString($start_num + $offset_num, 16)
$end_str = "0x$end_str"
$start_str = "0x$Start"
Write-Host "$start_str - $end_str"
Write-Host "$Start - $end_str"
$objdump = Join-Path -Path $env:DEVKITARM -ChildPath "arm-none-eabi\bin\objdump.exe"
Write-Host "Dumping [0/2]"
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$start_str" --stop-address="$end_str" .\baserom.gba > .\baserom.dump
Write-Host "Dumping [1/2]"
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$start_str" --stop-address="$end_str" .\pokeemerald.gba > .\pokeemerald.dump
Write-Host "Dumping [2/2]"
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\baserom.gba > .\baserom.dump
&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\pokeemerald.gba > .\pokeemerald.dump
Invoke-Expression "$DiffTool .\baserom.dump .\pokeemerald.dump"

2
charmap.txt
View File

@@ -424,7 +424,7 @@ PLAY_SE = FC 10
CLEAR = FC 11
SKIP = FC 12
CLEAR_TO = FC 13
UNKNOWN_14 = FC 14
MIN_LETTER_SPACING = FC 14
JPN = FC 15
ENG = FC 16
PAUSE_MUSIC = FC 17

0
common_syms/battle_anim_8170478.txt → common_syms/battle_anim_special.txt
View File

3
common_syms/faraway_island.txt Executable file
View File

@@ -0,0 +1,3 @@
sPlayerToMewDeltaX
sPlayerToMewDeltaY
sMewDirectionCandidates

118
data/battle_anim_scripts.s
View File

@@ -1515,7 +1515,7 @@ Move_VINE_WHIP:
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
delay 6
playsewithpan SE_W010, SOUND_PAN_TARGET
createsprite gUnknown_085928E8, ANIM_TARGET, 2, 0, 0
createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0
delay 6
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1
end
@@ -1656,12 +1656,12 @@ Explosion1:
Move_DEFENSE_CURL:
loadspritegfx ANIM_TAG_ECLIPSING_ORB
loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3
createvisualtask sub_811489C, 5, 0, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
createvisualtask sub_815B338, 5
waitforvisualfinish
createsprite gUnknown_085CE338, ANIM_ATTACKER, 2, 0, 6, 0, 1
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
waitforvisualfinish
end
@@ -2003,7 +2003,7 @@ Move_ATTRACT:
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31
waitforvisualfinish
waitplaysewithpan SE_W213B, 0, 15
createvisualtask sub_81062E8, 5
createvisualtask AnimTask_HeartsBackground, 5
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 16, 256, 0
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 224, 240, 15
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 126, 272, 30
@@ -2012,7 +2012,7 @@ Move_ATTRACT:
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 40, 256, 75
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 112, 256, 90
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 200, 272, 90
delay 0x4B
delay 75
createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27)
end
@@ -2960,7 +2960,7 @@ SkyAttackSetUpAgainstPartner:
SkyAttackUnleash:
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_BIRD
call SetFlyingBg
call SetSkyBg
monbg ANIM_ATTACKER
createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE
delay 4
@@ -2977,7 +2977,7 @@ SkyAttackUnleash:
createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE
waitforvisualfinish
clearmonbg ANIM_ATTACKER
call UnsetFlyingBg
call UnsetSkyBg
goto SkyAttackEnd
Move_FLASH:
@@ -3220,13 +3220,13 @@ EndureEffect:
Move_CHARM:
loadspritegfx ANIM_TAG_MAGENTA_HEART
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
waitforvisualfinish
end
@@ -4358,7 +4358,7 @@ Move_AERIAL_ACE:
Move_IRON_DEFENSE:
loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0
waitforvisualfinish
end
@@ -4393,13 +4393,13 @@ Move_COVET:
loadspritegfx ANIM_TAG_MAGENTA_HEART
loadspritegfx ANIM_TAG_ITEM_BAG
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
waitforvisualfinish
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@@ -4570,7 +4570,7 @@ Move_SHOCK_WAVE:
Move_HARDEN:
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
end
@@ -5347,7 +5347,7 @@ Move_ICE_BEAM:
loadspritegfx ANIM_TAG_ICE_CRYSTALS
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK
waitforvisualfinish
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20
delay 1
@@ -5392,7 +5392,7 @@ Move_WITHDRAW:
Move_AURORA_BEAM:
loadspritegfx ANIM_TAG_RAINBOW_RINGS
fadetobg BG_AURORABEAM
fadetobg BG_AURORA
waitbgfadein
playsewithpan SE_W062, SOUND_PAN_ATTACKER
setarg 7, 0
@@ -5403,7 +5403,7 @@ Move_AURORA_BEAM:
call AuroraBeam1
call AuroraBeam1
setarg 7, -1
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1
call AuroraBeam1
call AuroraBeam1
@@ -6195,7 +6195,7 @@ Move_AEROBLAST:
loadspritegfx ANIM_TAG_AIR_WAVE_2
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_DEF_PARTNER
call SetFlyingBg
call SetSkyBg
monbgprio_28 ANIM_TARGET
setalpha 12, 8
call Aeroblast1
@@ -6211,7 +6211,7 @@ Move_AEROBLAST:
clearmonbg ANIM_DEF_PARTNER
blendoff
delay 0
call UnsetFlyingBg
call UnsetSkyBg
end
Aeroblast1:
playsewithpan SE_W026, SOUND_PAN_ATTACKER
@@ -6568,7 +6568,7 @@ Move_DYNAMIC_PUNCH:
loadspritegfx ANIM_TAG_HANDS_AND_FEET
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_EXPLOSION
loadspritegfx ANIM_TAG_UNUSED_EXPLOSION
loadspritegfx ANIM_TAG_EXPLOSION_6
delay 1
monbg ANIM_DEF_PARTNER
setalpha 12, 8
@@ -7123,7 +7123,7 @@ Move_PSYBEAM:
loadspritegfx ANIM_TAG_GOLD_RING
playsewithpan SE_W060, SOUND_PAN_ATTACKER
call SetPsychicBackground
createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
createsoundtask sub_8158C58, SE_W060B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
call Psybeam1
call Psybeam1
createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET
@@ -7169,7 +7169,7 @@ Move_PSYWAVE:
playsewithpan SE_W060, SOUND_PAN_ATTACKER
call SetPsychicBackground
createvisualtask sub_81076C8, 5, 100
createsoundtask sub_8158C58, 203, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
createsoundtask sub_8158C58, SE_W100, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
call Psywave1
call Psywave1
createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31)
@@ -7213,7 +7213,7 @@ Move_STEEL_WING:
loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
@@ -7239,7 +7239,7 @@ Move_STEEL_WING:
Move_IRON_TAIL:
loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 1, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0
waitforvisualfinish
monbg ANIM_TARGET
setalpha 12, 8
@@ -7249,7 +7249,7 @@ Move_IRON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
clearmonbg ANIM_TARGET
blendoff
waitforvisualfinish
@@ -7259,7 +7259,7 @@ Move_POISON_TAIL:
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_POISON_BUBBLE
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23)
createvisualtask AnimTask_MetallicShine, 5, 1, 1, RGB(24, 6, 23)
waitforvisualfinish
monbg ANIM_TARGET
setalpha 12, 8
@@ -7269,7 +7269,7 @@ Move_POISON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_W233B, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask sub_811489C, 5, 0, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
clearmonbg ANIM_TARGET
blendoff
call PoisonBubblesEffect
@@ -7279,7 +7279,7 @@ Move_POISON_TAIL:
Move_METAL_CLAW:
loadspritegfx ANIM_TAG_CLAW_SLASH
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
createvisualtask sub_81144F8, 5, 0, 0, 0
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
waitforvisualfinish
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
delay 2
@@ -7346,8 +7346,8 @@ Move_SHADOW_BALL:
fadetobg BG_GHOST
waitbgfadein
delay 15
createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
createsprite gUnknown_08596D58, ANIM_TARGET, 2, 16, 16, 8
createsoundtask sub_8158C58, SE_W054, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8
waitforvisualfinish
playsewithpan SE_W028, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
@@ -7459,7 +7459,7 @@ Move_STRING_SHOT:
end
StringShot1:
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 1
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 1
delay 1
return
@@ -7488,7 +7488,7 @@ Move_SPIDER_WEB:
call SpiderWeb1
waitforvisualfinish
playsewithpan SE_W081B, SOUND_PAN_TARGET
createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
delay 1
@@ -7496,7 +7496,7 @@ Move_SPIDER_WEB:
end
SpiderWeb1:
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 0
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 0
delay 1
return
@@ -7941,16 +7941,16 @@ Move_PERISH_SONG:
panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
delay 80
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
createvisualtask sub_811489C, 5, 4, 0
createvisualtask sub_811489C, 5, 5, 0
createvisualtask sub_811489C, 5, 6, 0
createvisualtask sub_811489C, 5, 7, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 0
delay 100
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
createvisualtask sub_811489C, 5, 4, 1
createvisualtask sub_811489C, 5, 5, 1
createvisualtask sub_811489C, 5, 6, 1
createvisualtask sub_811489C, 5, 7, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 1
waitforvisualfinish
end
@@ -8019,7 +8019,7 @@ Move_TRI_ATTACK:
delay 20
playsewithpan SE_W161, SOUND_PAN_ATTACKER
delay 20
createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
createsoundtask sub_8158C58, SE_W161, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK
delay 16
@@ -8356,7 +8356,7 @@ Move_HYPER_BEAM:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1
waitforvisualfinish
delay 30
createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
createsoundtask sub_8158C58, SE_W063B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0
call HyperBeam1
@@ -9419,7 +9419,7 @@ Move_SEISMIC_TOSS:
waitforvisualfinish
createvisualtask AnimTask_GetSeismicTossDamageLevel, 3
delay 1
fadetobg BG_SEISMICTOSS_SKUUPPERCUT
fadetobg BG_IN_AIR
waitbgfadeout
createvisualtask sub_811152C, 3
playsewithpan SE_W327, 0
@@ -9570,7 +9570,7 @@ Move_DOOM_DESIRE:
createvisualtask sub_8114960, 2
delay 1
monbg ANIM_ATK_PARTNER
createvisualtask sub_811489C, 5, 1, 0
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 0
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK
waitforvisualfinish
setalpha 8, 8
@@ -9578,7 +9578,7 @@ Move_DOOM_DESIRE:
createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
waitforvisualfinish
delay 20
createvisualtask sub_811489C, 5, 1, 1
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 1
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
@@ -9589,7 +9589,7 @@ Move_SKY_UPPERCUT:
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
fadetobg BG_SEISMICTOSS_SKUUPPERCUT
fadetobg BG_IN_AIR
waitbgfadeout
playsewithpan SE_W327, SOUND_PAN_ATTACKER
createvisualtask sub_810DABC, 5, 55
@@ -10165,21 +10165,21 @@ UnsetPsychicBackground:
waitbgfadein
return
SetFlyingBg:
jumpifcontest SetBgFlyingContest
fadetobg BG_FLYING
SetSkyBg:
jumpifcontest SetSkyBgContest
fadetobg BG_SKY
waitbgfadeout
createvisualtask sub_8117660, 5, -2304, 768, 1, -1
SetBgFlyingContinue:
SetSkyBgContinue:
waitbgfadein
return
SetBgFlyingContest:
fadetobg BG_FLYING_CONTESTS
SetSkyBgContest:
fadetobg BG_SKY_CONTESTS
waitbgfadeout
createvisualtask sub_8117660, 5, 2304, 768, 0, -1
goto SetBgFlyingContinue
goto SetSkyBgContinue
UnsetFlyingBg:
UnsetSkyBg:
restorebg
waitbgfadeout
setarg 7, -1
@@ -10237,13 +10237,13 @@ Burn1:
Status_Infatuation:
loadspritegfx ANIM_TAG_MAGENTA_HEART
playsewithpan SE_W204, SOUND_PAN_ATTACKER
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
delay 15
playsewithpan SE_W204, SOUND_PAN_ATTACKER
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
delay 15
playsewithpan SE_W204, SOUND_PAN_ATTACKER
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
end
Status_Sleep:

136
data/battle_scripts_1.s
View File

@@ -284,8 +284,7 @@ BattleScript_HitFromAtkAnimation::
seteffectwithchance
tryfaintmon BS_TARGET, FALSE, NULL
BattleScript_MoveEnd::
setbyte sMOVEEND_STATE, 0x0
moveend 0x0, 0x0
moveendall
end
BattleScript_MakeMoveMissed::
@@ -423,8 +422,7 @@ BattleScript_ExplosionLoop:
resultmessage
waitmessage 0x40
tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
jumpifnexttargetvalid BattleScript_ExplosionLoop
tryfaintmon BS_ATTACKER, FALSE, NULL
end
@@ -432,8 +430,7 @@ BattleScript_ExplosionMissed:
effectivenesssound
resultmessage
waitmessage 0x40
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
jumpifnexttargetvalid BattleScript_ExplosionLoop
tryfaintmon BS_ATTACKER, FALSE, NULL
end
@@ -514,7 +511,7 @@ BattleScript_EffectStatUp::
BattleScript_EffectStatUpAfterAtkCanceler::
attackstring
ppreduce
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_StatUpEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_StatUpEnd
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpAttackAnim
pause 0x20
goto BattleScript_StatUpPrintString
@@ -560,7 +557,7 @@ BattleScript_EffectStatDown::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
statbuffchange 0x1, BattleScript_StatDownEnd
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_StatDownEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatDownDoAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x3, BattleScript_StatDownEnd
pause 0x20
@@ -657,8 +654,7 @@ BattleScript_DoMultiHit::
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
addbyte sMULTIHIT_STRING + 4, 0x1
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
decrementmultihit BattleScript_MultiHitLoop
goto BattleScript_MultiHitPrintStrings
@@ -674,10 +670,8 @@ BattleScript_MultiHitPrintStrings::
BattleScript_MultiHitEnd::
seteffectwithchance
tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x2
moveend 0x1, 0x0
setbyte sMOVEEND_STATE, 0x4
moveend 0x0, 0x0
moveendcase ATK49_SYNCHRONIZE_TARGET
moveendfrom ATK49_STATUS_IMMUNITY_ABILITIES
end
BattleScript_EffectConversion::
@@ -1441,8 +1435,7 @@ BattleScript_DoTripleKickAttack::
waitmessage 0x40
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
decrementmultihit BattleScript_TripleKickLoop
goto BattleScript_TripleKickPrintStrings
@@ -1461,8 +1454,7 @@ BattleScript_TripleKickPrintStrings::
BattleScript_TripleKickEnd::
seteffectwithchance
tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0xE
moveend 0x0, 0x0
moveendfrom ATK49_UPDATE_LAST_MOVES
end
BattleScript_EffectThief::
@@ -1521,17 +1513,17 @@ BattleScript_CurseTrySpeed::
attackanimation
waitanimation
setstatchanger STAT_SPEED, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CurseTryAttack
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CurseTryAttack
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_CurseTryAttack::
setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CurseTryDefence
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CurseTryDefence
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CurseTryDefence::
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CurseEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CurseEnd
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CurseEnd::
@@ -1643,7 +1635,7 @@ BattleScript_EffectSwagger::
attackanimation
waitanimation
setstatchanger STAT_ATK, 2, FALSE
statbuffchange 0x1, BattleScript_SwaggerTryConfuse
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_SwaggerTryConfuse
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SwaggerTryConfuse
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -1842,7 +1834,7 @@ BattleScript_EffectSkullBash::
setbyte sTWOTURN_STRINGID, 0x2
call BattleScriptFirstChargingTurn
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_SkullBashEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_SkullBashEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SkullBashEnd
setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -1893,8 +1885,7 @@ BattleScript_DoHitAllWithUndergroundBonus::
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop
end
BattleScript_HitAllWithUndergroundBonusMissed::
@@ -1903,8 +1894,7 @@ BattleScript_HitAllWithUndergroundBonusMissed::
effectivenesssound
resultmessage
waitmessage 0x40
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop
end
@@ -1995,8 +1985,7 @@ BattleScript_BeatUpAttack::
resultmessage
waitmessage 0x40
tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
goto BattleScript_BeatUpLoop
BattleScript_BeatUpEnd::
end
@@ -2048,7 +2037,7 @@ BattleScript_EffectDefenseCurl::
ppreduce
setdefensecurlbit
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DefenseCurlDoStatUpAnim
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_DefenseCurlDoStatUpAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_StatUpPrintString
attackanimation
waitanimation
@@ -2189,7 +2178,7 @@ BattleScript_EffectFlatter::
attackanimation
waitanimation
setstatchanger STAT_SPATK, 1, FALSE
statbuffchange 0x1, BattleScript_FlatterTryConfuse
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_FlatterTryConfuse
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_FlatterTryConfuse
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -2246,14 +2235,14 @@ BattleScript_EffectMemento::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO | ATK48_ONLY_MULTIPLE
playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
setstatchanger STAT_ATK, 2, TRUE
statbuffchange 0x1, BattleScript_EffectMementoTrySpAtk
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectMementoTrySpAtk
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_EffectMementoTrySpAtk
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_EffectMementoTrySpAtk:
playstatchangeanimation BS_TARGET, BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE
statbuffchange 0x1, BattleScript_EffectMementoTryFaint
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_EffectMementoTryFaint
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_EffectMementoTryFaint
printfromtable gStatDownStringIds
waitmessage 0x40
@@ -2395,7 +2384,7 @@ BattleScript_EffectWish::
BattleScript_EffectAssist::
attackcanceler
attackstring
asistattackselect BattleScript_ButItFailedPpReduce
assistattackselect BattleScript_ButItFailedPpReduce
attackanimation
waitanimation
setbyte sB_ANIM_TURN, 0x0
@@ -2617,8 +2606,7 @@ BattleScript_TeeterDanceLoop::
resultmessage
waitmessage 0x40
BattleScript_TeeterDanceDoMoveEndIncrement::
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
BattleScript_TeeterDanceLoopIncrement::
addbyte gBattlerTarget, 0x1
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TeeterDanceLoop
@@ -2692,14 +2680,14 @@ BattleScript_TickleDoMoveAnim::
playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
statbuffchange 0x1, BattleScript_TickleTryLowerDef
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_TickleTryLowerDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleTryLowerDef
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_TickleTryLowerDef::
playstatchangeanimation BS_TARGET, BIT_DEF, ATK48_STAT_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
statbuffchange 0x1, BattleScript_TickleEnd
statbuffchange STAT_CHANGE_BS_PTR, BattleScript_TickleEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleEnd
printfromtable gStatDownStringIds
waitmessage 0x40
@@ -2725,13 +2713,13 @@ BattleScript_CosmicPowerDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0x0
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CosmicPowerTrySpDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CosmicPowerTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerTrySpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CosmicPowerTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CosmicPowerEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CosmicPowerEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerEnd
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -2754,13 +2742,13 @@ BattleScript_BulkUpDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0x0
setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_BulkUpTryDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_BulkUpTryDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpTryDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_BulkUpTryDef::
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_BulkUpEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_BulkUpEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpEnd
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -2779,13 +2767,13 @@ BattleScript_CalmMindDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0x0
setstatchanger STAT_SPATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CalmMindTrySpDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CalmMindTrySpDef
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindTrySpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_CalmMindTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CalmMindEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_CalmMindEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindEnd
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -2811,13 +2799,13 @@ BattleScript_DragonDanceDoMoveAnim::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0x0
setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DragonDanceTrySpeed
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_DragonDanceTrySpeed
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceTrySpeed
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_DragonDanceTrySpeed::
setstatchanger STAT_SPEED, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DragonDanceEnd
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_DragonDanceEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceEnd
printfromtable gStatUpStringIds
waitmessage 0x40
@@ -3140,10 +3128,8 @@ BattleScript_DoSwitchOut::
switchinanim BS_ATTACKER, FALSE
waitstate
switchineffects BS_ATTACKER
setbyte sMOVEEND_STATE, 0x4
moveend 0x1, 0x0
setbyte sMOVEEND_STATE, 0xF
moveend 0x1, 0x0
moveendcase ATK49_STATUS_IMMUNITY_ABILITIES
moveendcase ATK49_MIRROR_MOVE
end2
BattleScript_PursuitDmgOnSwitchOut::
@@ -3166,8 +3152,7 @@ BattleScript_PursuitDmgOnSwitchOut::
resultmessage
waitmessage 0x40
tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x3
moveend 0x2, 0x6
moveendfromto ATK49_MOVE_END_ABILITIES, ATK49_CHOICE_MOVE
various4 BS_TARGET
jumpifbyte CMP_EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
setbyte sGIVEEXP_STATE, 0x0
@@ -3395,8 +3380,7 @@ BattleScript_DisabledNoMore::
BattleScript_SelectingDisabledMoveInPalace::
printstring STRINGID_PKMNMOVEISDISABLED
BattleScript_SelectingUnusableMoveInPalace::
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
end
BattleScript_EncoredNoMore::
@@ -3425,8 +3409,7 @@ BattleScript_SpikesOnAttacker::
BattleScript_SpikesOnAttackerFainted::
setbyte sGIVEEXP_STATE, 0x0
getexp BS_ATTACKER
setbyte sMOVEEND_STATE, 0x0
moveend 0x0, 0x0
moveendall
goto BattleScript_HandleFaintedMon
BattleScript_SpikesOnTarget::
@@ -3441,8 +3424,7 @@ BattleScript_SpikesOnTarget::
BattleScript_SpikesOnTargetFainted::
setbyte sGIVEEXP_STATE, 0x0
getexp BS_TARGET
setbyte sMOVEEND_STATE, 0x0
moveend 0x0, 0x0
moveendall
goto BattleScript_HandleFaintedMon
BattleScript_SpikesOnFaintedBattler::
@@ -3457,8 +3439,7 @@ BattleScript_SpikesOnFaintedBattler::
BattleScript_SpikesOnFaintedBattlerFainted::
setbyte sGIVEEXP_STATE, 0x0
getexp BS_FAINTED
setbyte sMOVEEND_STATE, 0x0
moveend 0x0, 0x0
moveendall
goto BattleScript_HandleFaintedMon
BattleScript_PrintHurtBySpikes::
@@ -3490,27 +3471,27 @@ BattleScript_AllStatsUpAtk::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0
setstatchanger STAT_ATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpDef::
setstatchanger STAT_DEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpeed
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpSpeed
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpSpeed::
setstatchanger STAT_SPEED, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpAtk
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpSpAtk
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpSpAtk::
setstatchanger STAT_SPATK, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpDef
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpSpDef
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpSpDef::
setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpRet
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_AllStatsUpRet
printfromtable gStatUpStringIds
waitmessage 0x40
BattleScript_AllStatsUpRet::
@@ -3562,10 +3543,8 @@ BattleScript_DoFutureAttackHit::
tryfaintmon BS_TARGET, FALSE, NULL
atk24 BattleScript_FutureAttackEnd
BattleScript_FutureAttackEnd::
setbyte sMOVEEND_STATE, 0x0
moveend 0x1, 0x0
setbyte sMOVEEND_STATE, 0xB
moveend 0x2, 0xE
moveendcase ATK49_RAGE
moveendfromto ATK49_ITEM_EFFECTS_ALL, ATK49_UPDATE_LAST_MOVES
setbyte gMoveResultFlags, 0
end2
@@ -3659,14 +3638,14 @@ BattleScript_AtkDefDown::
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
playstatchangeanimation BS_ATTACKER, BIT_ATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB144
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_82DB144
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB144
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_82DB144::
playstatchangeanimation BS_ATTACKER, BIT_DEF, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB167
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_82DB167
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB167
printfromtable gStatDownStringIds
waitmessage 0x40
@@ -3732,7 +3711,7 @@ BattleScript_SAtkDown2::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_SPATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_SAtkDown2End
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_BS_PTR, BattleScript_SAtkDown2End
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SAtkDown2End
printfromtable gStatDownStringIds
waitmessage 0x40
@@ -4063,7 +4042,7 @@ BattleScript_IntimidateActivatesLoop:
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented
statbuffchange 0x21, BattleScript_IntimidateActivatesLoopIncrement
statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_BS_PTR, BattleScript_IntimidateActivatesLoopIncrement
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_IntimidateActivatesLoopIncrement
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
@@ -4254,8 +4233,7 @@ BattleScript_AbilityCuredStatus::
BattleScript_IgnoresWhileAsleep::
printstring STRINGID_PKMNIGNORESASLEEP
waitmessage 0x40
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
end
BattleScript_IgnoresAndUsesRandomMove::
@@ -4271,8 +4249,7 @@ BattleScript_MoveUsedLoafingAround::
BattleScript_82DB6C7::
printfromtable gInobedientStringIds
waitmessage 0x40
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
end
BattleScript_IgnoresAndFallsAsleep::
@@ -4280,8 +4257,7 @@ BattleScript_IgnoresAndFallsAsleep::
waitmessage 0x40
setmoveeffect MOVE_EFFECT_SLEEP | MOVE_EFFECT_AFFECTS_USER
seteffectprimary
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
moveendto ATK49_NEXT_TARGET
end
BattleScript_IgnoresAndHitsItself::
@@ -4444,7 +4420,7 @@ BattleScript_BerryConfuseHealEnd2::
BattleScript_BerryStatRaiseEnd2::
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_82DB85B
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_BS_PTR, BattleScript_82DB85B
BattleScript_82DB85B::
setbyte cMULTISTRING_CHOOSER, 0x4
call BattleScript_StatUp

363
data/berry_crush.s Executable file
View File

@@ -0,0 +1,363 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082F325C:: @ 82F325C
.byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
.align 2
gUnknown_082F3264:: @ 82F3264
.byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00
.align 2
gUnknown_082F326C:: @ 82F326C
.byte 0x04, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04
.byte 0x02, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02
.byte 0x00, 0xfe, 0x00, 0x00, 0x00, 0x06, 0x03, 0x01
.byte 0xff, 0xfd, 0xff, 0x00, 0x06, 0x04, 0x01, 0xfe
.byte 0xfc, 0xfe, 0x00, 0x00
.align 2
gUnknown_082F3290:: @ 82F3290
.byte 0x03, 0x02, 0x01, 0x00, 0x03, 0x03, 0x01, 0x00
.byte 0x03, 0x03, 0x02, 0x00, 0x03, 0x04, 0x02, 0x00
.byte 0x03, 0x05, 0x03, 0x00
.align 2
gUnknown_082F32A4:: @ 82F32A4
.4byte gText_ReadyToBerryCrush
.4byte gText_WaitForAllChooseBerry
.4byte gText_EndedWithXUnitsPowder
.4byte gText_RecordingGameResults
.4byte gText_PlayBerryCrushAgain
.4byte gText_YouHaveNoBerries
.4byte gText_MemberDroppedOut
.4byte gText_TimesUpNoGoodPowder
.4byte gText_CommunicationStandby2
.align 2
gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate
.4byte 0x000000F8
.align 2
gUnknown_082F32CC:: @ 82F32CC struct BgTemplate? not sure
.byte 0xd1, 0x14, 0x00, 0x00, 0xc2, 0x20, 0x00, 0x00
.byte 0xb3, 0x30, 0x00, 0x00
.align 2
gUnknown_082F32D8:: @ 82F32D8
.byte 0x01, 0x02, 0x03
gUnknown_082F32DB:: @ 82F32DB
.byte 0x00, 0x01, 0x02
gUnknown_082F32DE:: @ 82F32DE
.byte 0x00, 0x03, 0x04
gUnknown_082F32E1:: @ 82F32E1
.byte 0x01, 0x08, 0x09
.byte 0x01, 0x06, 0x07
gUnknown_082F32E7:: @ 82F32E7
.byte 0x01, 0x04, 0x05
.align 2
gUnknown_082F32EC:: @ 82F32EC
window_template 0x00, 0x03, 0x04, 0x18, 0x0d, 0x0f, 0x0001
.align 2
gUnknown_082F32F4:: @ 82F32F4
window_template 0x00, 0x00, 0x00, 0x09, 0x02, 0x08, 0x03ed
window_template 0x00, 0x00, 0x03, 0x09, 0x02, 0x08, 0x03db
window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9
window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7
window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5
null_window_template
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001
null_window_template
.align 2
gUnknown_082F3344:: @ 82F3344
.byte 0x06, 0x08, 0x09, 0x0b, 0x0c, 0x0e, 0x0f, 0x10
.align 2
gUnknown_082F334C:: @ 82F334C
.byte 0x80, 0xf0, 0xfa, 0x02, 0x40, 0x78, 0x7d, 0x01
.byte 0x20, 0xbc, 0xbe, 0x00, 0x10, 0x5e, 0x5f, 0x00
.byte 0x08, 0xaf, 0x2f, 0x00, 0x84, 0xd7, 0x17, 0x00
.byte 0xc2, 0xeb, 0x0b, 0x00, 0xe1, 0xf5, 0x05, 0x00
.align 2
gBerryCrushGrinderBasePal:: @ 82F336C
.incbin "graphics/link_games/berrycrush_grinder_base.gbapal"
.align 2
gBerryCrushMiscSpritesPal:: @ 82F338C
.incbin "graphics/link_games/berrycrush_misc.gbapal"
.align 2
gBerryCrushTimerDigitsPal:: @ 82F33AC
.incbin "graphics/link_games/berrycrush_timerdigits.gbapal"
.align 2
gBerryCrushGrinderBaseGfx:: @ 82F33CC
.incbin "graphics/link_games/berrycrush_grinder_base.4bpp.lz"
.align 2
gBerryCrushBtnPressGfx:: @ 82F36F8
.incbin "graphics/link_games/berrycrush_btnpress.4bpp.lz"
.align 2
gBerryCrushSparkleGfx:: @ 82F3A74
.incbin "graphics/link_games/berrycrush_sparkle.4bpp.lz"
.align 2
gBerryCrushTimerDigitsGfx:: @ 82F3BC0
.incbin "graphics/link_games/berrycrush_timerdigits.4bpp.lz"
.align 2
gBerryCrushGrinderTopTilemap:: @ 82F3C8C
.incbin "graphics/link_games/berrycrush_grinder_top.bin.lz"
.align 2
gBerryCrushContainerCapTilemap:: @ 82F3DBC
.incbin "graphics/link_games/berrycrush_container_cap.bin.lz"
.align 2
gBerryCrushBackgroundTilemap:: @ 82F3F54
.incbin "graphics/link_games/berrycrush_background.bin.lz"
.align 2
gUnknown_082F417C:: @ 82F417C
.byte 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03
.byte 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x00, 0x00
.byte 0x01, 0x03, 0x02, 0x04
.align 2
gUnknown_082F4190:: @ 82F4190
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00
.byte 0xe4, 0xff, 0xfc, 0xff, 0xe8, 0xff, 0x10, 0x00
.byte 0x02, 0x00, 0x06, 0x00, 0xf0, 0xff, 0x14, 0x00
.byte 0xf8, 0xff, 0x10, 0x00, 0x03, 0x14, 0x03, 0x00
.byte 0x1c, 0x00, 0xfc, 0xff, 0x20, 0x00, 0xf8, 0xff
.byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00
.byte 0x10, 0x00, 0xf8, 0xff
.align 2
gUnknown_082F41CC:: @ 82F41CC
.byte 0x00, 0x00
.byte 0xff, 0x00
.byte 0x01, 0x01
gUnknown_082F41D2::
.byte 0x00, 0x00
.byte 0xf0, 0xfc
.byte 0x10, 0xfc
.byte 0xf8, 0xfe
.byte 0x08, 0xfe
.byte 0xe8, 0xf8
.byte 0x18, 0xf8
.byte 0xe0, 0xf4
.byte 0x20, 0xf4
.byte 0xd8, 0xf0
.byte 0x28, 0xf0
.align 2
gUnknown_082F41E8:: @ 82F41E8
.2byte 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000
.align 2
gUnknown_082F41F4:: @ 82F41F4
.4byte gBerryCrushGrinderBaseGfx
.2byte 0x0800, 0x0001
.4byte gBerryCrushBtnPressGfx
.2byte 0x0e00, 0x0002
.4byte gBerryCrushSparkleGfx
.2byte 0x0700, 0x0003
.align 2
gUnknown_082F420C:: @ 82F420C
.4byte gBerryCrushTimerDigitsGfx
.2byte 0x02c0, 0x0004
.4byte NULL
.2byte 0x0000, 0x0000
.align 2
gUnknown_082F421C:: @ 82F421C
.4byte gBerryCrushGrinderBasePal
.2byte 0x0001
.align 2
.4byte gBerryCrushMiscSpritesPal
.2byte 0x0002
.align 2
gUnknown_082F422C:: @ 82F422C
.align 2
.4byte gBerryCrushTimerDigitsPal
.2byte 0x0004
.align 2
.4byte NULL
.2byte 0x0000
.align 2
gUnknown_082F423C:: @ 82F423C
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082F4244:: @ 82F4244
.2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_082F4254:: @ 82F4254
.2byte 0x0030, 0x0002, 0x0040, 0x0002, 0x0050, 0x0002, 0x0060, 0x0002
.2byte 0xffff, 0x0000
.align 2
gUnknown_082F4268:: @ 82F4268
.2byte 0x0000, 0x0002, 0x0004, 0x0002, 0x0008, 0x0002, 0x000c, 0x0002
.2byte 0x0010, 0x0002, 0x0014, 0x0002, 0xfffe, 0x0000
.align 2
gUnknown_082F4284:: @ 82F4284
.2byte 0x0018, 0x0004, 0x001c, 0x0004, 0x0020, 0x0004, 0x0024, 0x0004
.2byte 0x0028, 0x0004, 0x002c, 0x0004, 0x0030, 0x0004, 0x0034, 0x0004
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082F42A8:: @ 82F42A8
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082F42B0:: @ 82F42B0
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082F42B8:: @ 82F42B8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0102, 0x0000
.2byte 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_082F42D0:: @ 82F42D0
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x01fe, 0x0000
.2byte 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_082F42E8:: @ 82F42E8
.4byte gUnknown_082F423C
.align 2
gUnknown_082F42EC:: @ 82F42EC
.4byte gUnknown_082F4244
.4byte gUnknown_082F4254
.align 2
gUnknown_082F42F4:: @ 82F42F4
.4byte gUnknown_082F4268
.4byte gUnknown_082F4284
.align 2
gUnknown_082F42FC:: @ 82F42FC
.4byte gUnknown_082F42A8
.align 2
gUnknown_082F4300:: @ 82F4300
.4byte gUnknown_082F42B0
.align 2
gUnknown_082F4304:: @ 82F4304
.4byte gUnknown_082F42B8
.4byte gUnknown_082F42D0
.align 2
gUnknown_082F430C:: @ 82F430C
spr_template 0x0001, 0x0001, gUnknown_0852491C, gUnknown_082F42E8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F4324:: @ 82F4324
spr_template 0x0002, 0x0002, gUnknown_08524914, gUnknown_082F42EC, NULL, gDummySpriteAffineAnimTable, sub_8022A20
.align 2
gUnknown_082F433C:: @ 82F433C
spr_template 0x0003, 0x0002, gUnknown_0852490C, gUnknown_082F42F4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F4354:: @ 82F4354
spr_template 0x0004, 0x0004, gUnknown_08524944, gUnknown_082F42FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F436C:: @ 82F436C
spr_template 0x0005, 0x0005, gUnknown_085249D4, gUnknown_082F4300, NULL, gUnknown_082F4304, SpriteCallbackDummy
.align 2
gUnknown_082F4384:: @ 82F4384
.byte 0x09, 0x02, 0x08, 0x00, 0x9c, 0x00, 0x00, 0x00
.4byte gUnknown_082F420C
.4byte gUnknown_082F422C
.byte 0x08, 0x02, 0x08, 0x00, 0xb4, 0x00, 0x00, 0x00
.4byte gUnknown_082F420C
.4byte gUnknown_082F422C
.byte 0x08, 0x02, 0x08, 0x00, 0xcc, 0x00, 0x00, 0x00
.4byte gUnknown_082F420C
.4byte gUnknown_082F422C
.align 2
gUnknown_082F43B4:: @ 82F43B4
.4byte gText_SpaceTimes2
.4byte gText_XDotY
.4byte gText_Var1Berry
.4byte gText_NeatnessRankings
.4byte gText_CoopRankings
.4byte gText_PressingPowerRankings
.align 2
gUnknown_082F43CC:: @ 82F43CC
.4byte NULL
.4byte sub_8022C58
.4byte sub_8022CB0
.4byte sub_8022D14
.4byte sub_8022E1C
.4byte sub_8022E3C
.4byte sub_8022E5C
.4byte sub_8022EAC
.4byte sub_8022F04
.4byte sub_8022F1C
.4byte sub_8023070
.4byte sub_80231B8
.4byte sub_80232EC
.4byte sub_80238F0
.4byte sub_8023998
.4byte sub_8023A30
.4byte sub_8023BC0
.4byte sub_8023CAC
.4byte sub_8024048
.4byte sub_8024134
.4byte sub_8024228
.4byte sub_80242E0
.4byte sub_80243BC
.4byte sub_8024444
.4byte sub_8024508
.4byte sub_8024568
.align 2
gUnknown_082F4434:: @ 82F4434
.byte 0x02, 0x04, 0x06, 0x07, 0x03, 0x05, 0x08, 0x0b
.byte 0x03, 0x07, 0x0b, 0x0f, 0x04, 0x08, 0x0c, 0x11
gUnknown_082F4444:: @ 82F4444
.byte 0x05, 0x07, 0x09, 0x0c
gUnknown_082F4448:: @ 82F4448
.byte 0x03, 0x07, 0x0f, 0x1f

36
data/berry_powder.s Executable file
View File

@@ -0,0 +1,36 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082F7BA4_UnrefDupe:: @ 82F444C struct BgTemplate(???)
.4byte 0x000001e0
.4byte 0x000012c9
.4byte 0x000012ea
.4byte 0x000021ff
.4byte 0x000000ff
.4byte 0x00000000
.align 2
gUnknown_082F7BBC_UnrefDupe:: @ 82F4464
window_template 0x00, 0x01, 0x01, 0x1c, 0x02, 0x0d, 0x0013
window_template 0x00, 0x01, 0x05, 0x1c, 0x0e, 0x0d, 0x004b
.align 2
gUnknown_082F7BCC_UnrefDupe:: @ 82F4474
window_template 0x00, 0x01, 0x05, 0x1c, 0x07, 0x0d, 0x004b
.align 2
gUnknown_082F7BD4_UnrefDupe:: @ 82F447C
window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013
window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c
.align 2
gUnknown_082F7BE4_UnrefDupe:: @ 82F448C
window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013
.align 2
gUnknown_082F7BEC_UnrefDupe:: @ 82F4494
window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013

412
data/contest.s
View File

@@ -1,412 +0,0 @@
#include "constants/species.h"
#include "constants/moves.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_08587A6C:: @ 8587A6C
.byte 0x24, 0x4c, 0x74, 0x9c
gUnknown_08587A70:: @ 8587A70
.byte 0x24, 0x4c, 0x74, 0x9c
.align 2
gUnknown_08587A74:: @ 8587A74
obj_tiles gTiles_8C19450, 0x0020, 0x4e20
.align 2
gOamData_8587A7C:: @ 8587A7C
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.align 2
gSpriteAffineAnim_8587A84:: @ 8587A84
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8587A94:: @ 8587A94
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, -20, 20
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8587AAC:: @ 8587AAC
obj_rot_scal_anim_frame 0x38, 0x38, 0, 0
obj_rot_scal_anim_frame 0xA, 0xA, 20, 20
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_8587AC4:: @ 8587AC4
.4byte gSpriteAffineAnim_8587A84
.4byte gSpriteAffineAnim_8587A94
.4byte gSpriteAffineAnim_8587AAC
.align 2
gSpriteTemplate_8587AD0:: @ 8587AD0
spr_template 0x4e20, 0xabe0, gOamData_8587A7C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8587AC4, SpriteCallbackDummy
.align 2
gUnknown_08587AE8:: @ 8587AE8
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e22
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e23
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e24
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e25
.align 2
gUnknown_08587B08:: @ 8587B08
obj_pal gContestPal, 0x4e22
.align 2
gOamData_8587B10:: @ 8587B10
.2byte 0x4000
.2byte 0x4000
.2byte 0x0000
.align 2
gSpriteTemplate_8587B18:: @ 8587B18
spr_template 0x4e22, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e23, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e24, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0x4e25, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSubspriteTable_8587B78:: @ 8587B78
subsprite -28, -4, 0, 0, 32x8
subsprite 4, -4, 0, 4, 32x8
.align 2
gSubspriteTables_8587B80:: @ 8587B80
.4byte 2, gSubspriteTable_8587B78
.align 2
gUnknown_08587B88:: @ 8587B88
obj_tiles gUnknown_08C19168, 0x0180, 0xabe1
.align 2
gOamData_8587B90:: @ 8587B90
.2byte 0x0000
.2byte 0x4000
.2byte 0x0000
.align 2
gSpriteTemplate_8587B98:: @ 8587B98
spr_template 0xabe1, 0xabe0, gOamData_8587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587BB0:: @ 8587BB0
obj_tiles gContestApplauseGfx, 0x0400, 0xabe2
.align 2
gUnknown_08587BB8:: @ 8587BB8
obj_pal gContestPal, 0xabe2
.align 2
gOamData_8587BC0:: @ 8587BC0
.2byte 0x4000
.2byte 0xC000
.2byte 0x0000
.align 2
gSpriteTemplate_8587BC8:: @ 8587BC8
spr_template 0xabe2, 0xabe2, gOamData_8587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_8587BE0:: @ 8587BE0
.2byte 0x0000
.2byte 0xC000
.2byte 0x2C00
.align 2
gSpriteTemplate_8587BE8:: @ 8587BE8
spr_template 0x4e21, 0x4e21, gOamData_8587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587C00:: @ 8587C00
obj_tiles gContestJudgeGfx, 0x0800, 0x4e21
.align 2
gUnknown_08587C08:: @ 8587C08
obj_tiles gContestJudgeSymbolsGfx, 0x0380, 0xabe0
.align 2
gUnknown_08587C10:: @ 8587C10
obj_pal gContest3Pal, 0xabe0
.align 2
gSpriteTemplate_8587C18:: @ 8587C18
spr_template 0xabe0, 0xabe0, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08587C30:: @ 8587C30
.incbin "graphics/unknown/unknown_587C30.gbapal"
@ 8587C50
.include "data/text/contest_text_pointers.inc"
.align 2
gUnknown_08587D5C:: @ 8587D5C
.4byte gText_0827D5C1
.4byte gText_0827D5DC
.4byte gText_0827D600
.4byte gText_0827D612
.4byte gText_0827D612
.4byte gText_0827D62D
.4byte gText_0827D654
.4byte gText_0827D67E
.4byte gText_0827D69C
.4byte gText_0827D6BA
.4byte gText_0827D6E5
.4byte gText_0827D706
.4byte gText_0827D71D
.align 2
gUnknown_08587D90:: @ 8587D90
.4byte gText_0827D743
.4byte gText_0827D764
.4byte gText_0827D785
.4byte gText_0827D7A5
.4byte gText_0827D7C8
.4byte gText_0827D7E8
.4byte gText_0827D831
.4byte gText_0827D855
.4byte gText_0827D830
.4byte gText_0827D872
.4byte gText_0827D88F
.4byte gText_0827D8B5
.4byte gText_0827D8E4
.4byte gText_0827D8FE
.4byte gText_0827D926
.4byte gText_0827D947
.4byte gText_0827D961
.4byte gText_0827D986
.4byte gText_0827D9B1
.4byte gText_0827D9D9
.4byte gText_0827DA03
.4byte gText_0827DA31
.4byte gText_0827DA5B
.4byte gText_0827DA85
.4byte gText_0827DAB2
.4byte gText_0827DADA
.4byte gText_0827DB03
.4byte gText_0827D830
.4byte gText_0827D830
.4byte gText_0827D830
.4byte gText_0827DB1F
.4byte gText_0827DB4E
.align 2
gUnknown_08587E10:: @ 8587E10
.4byte gText_827DB75
.4byte gText_827DBB0
.4byte gText_827DBE0
.4byte gText_827DC0F
.4byte gText_827DC45
.4byte gText_827DC7C
.4byte gText_827DCB4
.4byte gText_827DCE7
.4byte gText_827DD12
.4byte gText_827DD3D
.4byte gText_827DD6F
.4byte gText_827DD8E
.4byte gText_827DDC7
.4byte gText_827DDF2
.4byte gText_827DE14
.4byte gText_827DE44
.4byte gText_827DE73
.4byte gText_827DEA5
.4byte gText_827DED9
.4byte gText_827DF02
.4byte gText_827DF3A
.4byte gText_827DF63
.4byte gText_827DF8C
.4byte gText_827DFB8
.4byte gText_827DFE2
.4byte gText_827E00C
.4byte gText_827E02F
.4byte gText_827E05F
.4byte gText_827E08B
.4byte gText_827E0B5
.4byte gText_827E0DD
.4byte gText_827E107
.4byte gText_827E143
.4byte gText_827E17F
.4byte gText_827E1BB
.4byte gText_827E1F3
.4byte gText_827E220
.4byte gText_827E254
.4byte gText_827E289
.4byte gText_827E2C5
.4byte gText_0827E2FE
.4byte gText_0827E32E
.4byte gText_0827E35B
.4byte gText_0827E38D
.4byte gText_0827E3C1
.4byte gText_0827E3EB
.4byte gText_0827E416
.4byte gText_0827E448
.4byte gText_0827E473
.4byte gText_0827E4A6
.4byte gText_0827E4D5
.4byte gText_0827E504
.4byte gText_0827E531
.4byte gText_0827E55A
.4byte gText_0827E5B2
.4byte gText_0827E5D0
.4byte gText_0827E606
.4byte gText_0827E638
.4byte gText_0827E658
.4byte gText_0827E68B
.4byte gText_0827E6C4
.4byte gText_0827E7BA
.align 2
gUnknown_08587F08:: @ 8587F08
.4byte gText_0827E85F
.4byte gText_0827E868
.4byte gText_0827E86F
.4byte gText_0827E878
.4byte gText_0827E882
.align 2
gUnknown_08587F1C:: @ 8587F1C
.4byte gText_0827E894
.4byte gText_0827E89E
.4byte gText_0827E8AA
.4byte gText_0827E8B4
.4byte gText_0827E8BF
.4byte gText_0827E8CA
.align 2
gUnknown_08587F34:: @ 8587F34
.4byte 0x00000580, 0x000015e9, 0x000005c2, 0x000031a3
.align 2
gUnknown_08587F44:: @ 8587F44
window_template 0x00, 0x12, 0x00, 0x0c, 0x02, 0x0f, 0x0200
window_template 0x00, 0x12, 0x05, 0x0c, 0x02, 0x0f, 0x0218
window_template 0x00, 0x12, 0x0a, 0x0c, 0x02, 0x0f, 0x0230
window_template 0x00, 0x12, 0x0f, 0x0c, 0x02, 0x0f, 0x0248
window_template 0x00, 0x01, 0x0f, 0x11, 0x04, 0x0f, 0x0260
window_template 0x00, 0x01, 0x1f, 0x09, 0x02, 0x0f, 0x02a4
window_template 0x00, 0x01, 0x21, 0x09, 0x02, 0x0f, 0x02b6
window_template 0x00, 0x01, 0x23, 0x09, 0x02, 0x0f, 0x02c8
window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
null_window_template
.align 2
gUnknown_08587FA4:: @ 8587FA4
.4byte NULL, 0xFFFF
.2byte SPECIES_ELECTRIKE
.byte 2
.string "ELECTER$", 11
.string "EZRA$", 8
.2byte 0
.4byte NULL, 0xFFFF
.2byte SPECIES_TROPIUS
.byte 0
.string "TROPO$", 11
.string "ALLAN$", 8
.2byte 2
.4byte NULL, 0xFFFF
.2byte SPECIES_XATU
.byte 1
.string "TUXA$", 11
.string "JULIET$", 8
.2byte 0
.4byte NULL, 0xFFFF
.2byte SPECIES_PLUSLE
.byte 4
.string "PULSE$", 11
.string "BAILY$", 8
.2byte 3
.4byte NULL, 0xFFFF
.2byte SPECIES_SHUPPET
.byte 3
.string "SHUPUP$", 11
.string "MELANY$", 8
.2byte 1
.4byte NULL, 0xFFFF
.2byte SPECIES_ZANGOOSE
.byte 0
.string "GOOZAN$", 11
.string "HANA$", 8
.2byte 2
.4byte NULL, 0xFFFF
.2byte SPECIES_LOUDRED
.byte 1
.string "LOUDED$", 11
.string "BRYANT$", 8
.2byte 2
.4byte NULL, 0xFFFF
.2byte SPECIES_DELCATTY
.byte 2
.string "KITSY$", 11
.string "OMAR$", 8
.2byte 3
.align 2
gContestOpponents:: @ 85880A4
.include "data/contest_opponents.inc"
gUnknown_085898A4:: @ 85898A4
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
.byte 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02
.align 2
gUnknown_08589904:: @ 8589904
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e8
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e9
obj_tiles gBlankGfxCompressed, 0x1000, 0x80ea
obj_tiles gBlankGfxCompressed, 0x1000, 0x80eb
.align 2
gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is here
obj_pal gHeap + 0x1A0A4, 0x80e8
obj_pal gHeap + 0x1A0C4, 0x80e9
obj_pal gHeap + 0x1A0E4, 0x80ea
obj_pal gHeap + 0x1A104, 0x80eb
.align 2
gOamData_8589944:: @ 8589944
.2byte 0x0700
.2byte 0xC000
.2byte 0x0000
.align 2
gSpriteAffineAnim_858994C:: @ 858994C
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_858995C:: @ 858995C
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_8589984:: @ 8589984
.4byte gSpriteAffineAnim_858994C
.4byte gSpriteAffineAnim_858995C
.align 2
gSpriteTemplate_858998C:: @ 858998C
spr_template 0x80e8, 0x80e8, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
spr_template 0x80e9, 0x80e9, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
spr_template 0x80ea, 0x80ea, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
.align 2
gContestExcitementTable:: @ 85899EC
.2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000

2114
data/contest_opponents.inc
View File

File diff suppressed because it is too large Load Diff

663
data/dodrio_berry_picking.s Executable file
View File

@@ -0,0 +1,663 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082F449C:: @ 82F449C
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
.byte 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x03, 0x08
.byte 0x09, 0x00, 0x00, 0x01, 0x02, 0x05, 0x06, 0x03
.byte 0x04, 0x05, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x02, 0x09
.byte 0x00, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x02
.byte 0x03, 0x04, 0x09, 0x00, 0x00, 0x01, 0x06, 0x07
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x09, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x00
.byte 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01
.byte 0x02, 0x03, 0x00, 0x00, 0x05, 0x06, 0x07, 0x08
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x07
.byte 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03
.byte 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x02
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
.byte 0x01, 0x02, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x08
.byte 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
.byte 0x08, 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
.byte 0x06, 0x07, 0x08, 0x04, 0x05, 0x06, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x06, 0x03
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x04, 0x05, 0x06, 0x06, 0x07, 0x02, 0x02
.byte 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x04, 0x05, 0x05, 0x06, 0x07, 0x07, 0x08
.byte 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x04
.byte 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x00
.byte 0x00, 0x01, 0x02, 0x02, 0x03, 0x04, 0x01, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
.byte 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01
.byte 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x02
.byte 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x04
.byte 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x09, 0x09
.byte 0x09, 0x09, 0x00, 0x00, 0x01, 0x01, 0x00, 0x09
.byte 0x09, 0x09, 0x09, 0x09, 0x02, 0x02, 0x00, 0x00
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x03, 0x03
.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x09
.byte 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x01, 0x01
.byte 0x02, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x06, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07
.byte 0x00, 0x00, 0x02, 0x04, 0x06, 0x08, 0x00, 0x01
.byte 0x03, 0x05, 0x06, 0x09
.align 2
gUnknown_082F7DF0_UnrefDupe:: @ 82F4698
.incbin "graphics/link_games/dodrioberry_bg1.gbapal"
.align 2
.incbin "graphics/link_games/dodrioberry_bg2.gbapal"
.align 2
gUnknown_082F7E30_UnrefDupe:: @ 82F46B8
.incbin "graphics/link_games/dodrioberry_pkmn.gbapal"
.align 2
gUnknown_082F7E50_UnrefDupe:: @ 82F46D8
.incbin "graphics/link_games/dodrioberry_shiny.gbapal"
.align 2
gUnknown_082F7E70_UnrefDupe:: @ 82F46F8
.incbin "graphics/link_games/dodrioberry_status.gbapal"
.align 2
gUnknown_082F7E90_UnrefDupe:: @ 82F4718
.incbin "graphics/link_games/dodrioberry_berrysprites.gbapal"
.align 2
gUnknown_082F7EB0_UnrefDupe:: @ 82F4738
.incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz"
.align 2
gUnknown_082F8064_UnrefDupe:: @ 82F490C
.incbin "graphics/link_games/dodrioberry_platform.gbapal"
.align 2
gUnknown_082F8084_UnrefDupe:: @ 82F492C
.incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz"
.align 2
gUnknown_082F8914_UnrefDupe:: @ 82F51BC
.incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz"
.align 2
gUnknown_082F96E0_UnrefDupe:: @ 82F5F88
.incbin "graphics/link_games/dodrioberry_status.4bpp.lz"
.align 2
gUnknown_082F9774_UnrefDupe:: @ 82F601C
.incbin "graphics/link_games/dodrioberry_platform.4bpp.lz"
.align 2
gUnknown_082F98BC_UnrefDupe:: @ 82F6164
.incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz"
.align 2
gUnknown_082FAAD8_UnrefDupe:: @ 82F7380
.incbin "graphics/link_games/dodrioberry_bg1.bin.lz"
.align 2
gUnknown_082FAD44_UnrefDupe:: @ 82F75EC
.incbin "graphics/link_games/dodrioberry_bg2right.bin.lz"
.align 2
gUnknown_082FAF94_UnrefDupe:: @ 82F783C
.incbin "graphics/link_games/dodrioberry_bg2left.bin.lz"
.align 2
gUnknown_082F7A88:: @ 82F7A88
.byte 0x28, 0x18, 0x0d, 0x20, 0x13, 0x0a, 0x16, 0x0d
.byte 0x07, 0x00, 0x00, 0x00
.align 2
gUnknown_082F7A94:: @ 82F7A94
.byte 0x08, 0x05, 0x08, 0x0b, 0x0f, 0x00, 0x00, 0x00
.align 2
gUnknown_082F7A9C:: @ 82F7A9C
.byte 0x05, 0x0a, 0x14, 0x1e, 0x32, 0x46, 0x64, 0x00
.align 2
gUnknown_082F7AA4:: @ 82F7AA4
.byte 0x0f, 0x10, 0x11, 0x12, 0x13, 0x13, 0x12, 0x11
.byte 0x10, 0x0f, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19
.byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21
.byte 0x22, 0x22, 0x21, 0x20, 0x1f, 0x1e, 0x00, 0x00
.align 2
gUnknown_082F7AC4:: @ 82F7AC4
.4byte sub_8024DBC
.4byte sub_8024E00
.4byte sub_8024E38
.4byte sub_8024F10
.4byte sub_8024F38
.4byte sub_8025198
.4byte sub_8025324
.4byte sub_8025470
.4byte sub_8025644
.4byte sub_80256AC
.4byte sub_8025758
.4byte sub_80250D4
.align 2
gUnknown_082F7AF4:: @ 82F7AF4
.4byte sub_8024DBC
.4byte sub_8024E00
.4byte sub_8024E38
.4byte sub_8024F10
.4byte sub_8024FFC
.4byte sub_8025230
.4byte sub_8025324
.4byte sub_8025470
.4byte sub_8025644
.4byte sub_80256AC
.4byte sub_8025758
.4byte sub_8025158
.align 2
gUnknown_082F7B24:: @ 82F7B24
.2byte 0x000a, 0x001e, 0x0032, 0x0032
.align 2
gUnknown_082F7B2C:: @ 82F7B2C
.byte 0x00, 0x05, 0x01, 0x14, 0x0b, 0x0f, 0x01, 0x00
.align 2
gUnknown_082F7B34:: @ 82F7B34
.4byte gText_BerriesPicked
.4byte gText_BestScore
.4byte gText_BerriesInRowFivePlayers
.align 2
gUnknown_082F7B40:: @ 82F7B40
.byte 0x04, 0x07, 0x04, 0x00
.align 2
gUnknown_082F7B44:: @ 82F7B44
.2byte 0x0019, 0x0029, 0x0039
gUnknown_082F7B4A:: @ 82F7B4A
.2byte 0x0019, 0x0029, 0x0049
.align 2
gUnknown_082F7B50:: @ 82F7B50
.2byte 0x270f, 0x0000, 0x005a, 0x270f, 0x270f, 0x270f, 0x0046, 0x270f
.2byte 0x270f, 0x0000, 0x270f, 0x0000, 0x270f, 0x270f, 0x003c, 0x0000
.2byte 0x270f, 0x270f, 0x270f, 0x0000
.align 2
gUnknown_082F7B78:: @ 82F7B78
.string "ÀÁÂÇÈÉÊ$"
.align 2
gUnknown_082F7B80:: @ 82F7B80
.string "ABCDEFG$"
.align 2
gUnknown_082F7B88:: @ 82F7B88
.string "0123456$"
.align 2
gUnknown_082F7B90:: @ 82F7B90
.4byte gUnknown_082F7B78
.4byte gUnknown_082F7B78
.4byte gUnknown_082F7B78
.4byte gUnknown_082F7B80
.4byte gUnknown_082F7B88
.align 2
gUnknown_082F7BA4:: @ 82F7BA4 struct BgTemplate
.4byte 0x000001e0
.4byte 0x000012c9
.4byte 0x000012ea
.4byte 0x000021ff
.4byte 0x000000ff
.4byte 0x00000000
.align 2
gUnknown_082F7BBC:: @ 82F7BBC
window_template 0x00, 0x01, 0x01, 0x1c, 0x02, 0x0d, 0x0013
window_template 0x00, 0x01, 0x05, 0x1c, 0x0e, 0x0d, 0x004b
.align 2
gUnknown_082F7BCC:: @ 82F7BCC
window_template 0x00, 0x01, 0x05, 0x1c, 0x07, 0x0d, 0x004b
.align 2
gUnknown_082F7BD4:: @ 82F7BD4
window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013
window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c
.align 2
gUnknown_082F7BE4:: @ 82F7BE4
window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013
.align 2
gUnknown_082F7BEC:: @ 82F7BEC
window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013
.align 2
gUnknown_082F449C_UnrefDupe:: @ 82F7BF4
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
.byte 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x03, 0x08
.byte 0x09, 0x00, 0x00, 0x01, 0x02, 0x05, 0x06, 0x03
.byte 0x04, 0x05, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x02, 0x09
.byte 0x00, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x02
.byte 0x03, 0x04, 0x09, 0x00, 0x00, 0x01, 0x06, 0x07
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x09, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x00
.byte 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01
.byte 0x02, 0x03, 0x00, 0x00, 0x05, 0x06, 0x07, 0x08
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x07
.byte 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03
.byte 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x02
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
.byte 0x01, 0x02, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x08
.byte 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
.byte 0x08, 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
.byte 0x06, 0x07, 0x08, 0x04, 0x05, 0x06, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x06, 0x03
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x04, 0x05, 0x06, 0x06, 0x07, 0x02, 0x02
.byte 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x04, 0x05, 0x05, 0x06, 0x07, 0x07, 0x08
.byte 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x04
.byte 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x00
.byte 0x00, 0x01, 0x02, 0x02, 0x03, 0x04, 0x01, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
.byte 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01
.byte 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x02
.byte 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x04
.byte 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x09, 0x09
.byte 0x09, 0x09, 0x00, 0x00, 0x01, 0x01, 0x00, 0x09
.byte 0x09, 0x09, 0x09, 0x09, 0x02, 0x02, 0x00, 0x00
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x03, 0x03
.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x09
.byte 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x01, 0x01
.byte 0x02, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00
.byte 0x04, 0x06, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07
.byte 0x00, 0x00, 0x02, 0x04, 0x06, 0x08, 0x00, 0x01
.byte 0x03, 0x05, 0x06, 0x09
.align 2
gDodrioBerryBgPal1:: @ 82F7DF0
.incbin "graphics/link_games/dodrioberry_bg1.gbapal"
.align 2
.incbin "graphics/link_games/dodrioberry_bg2.gbapal"
.align 2
gDodrioBerryPkmnPal:: @ 82F7E30
.incbin "graphics/link_games/dodrioberry_pkmn.gbapal"
.align 2
gDodrioBerryShinyPal:: @ 82F7E50
.incbin "graphics/link_games/dodrioberry_shiny.gbapal"
.align 2
gDodrioBerryStatusPal:: @ 82F7E70
.incbin "graphics/link_games/dodrioberry_status.gbapal"
.align 2
gDodrioBerrySpritesPal:: @ 82F7E90
.incbin "graphics/link_games/dodrioberry_berrysprites.gbapal"
.align 2
gDodrioBerrySpritesGfx:: @ 82F7EB0
.incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz"
.align 2
gDodrioBerryPlatformPal:: @ 82F8064
.incbin "graphics/link_games/dodrioberry_platform.gbapal"
.align 2
gDodrioBerryBgGfx1:: @ 82F8084
.incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz"
.align 2
gDodrioBerryBgGfx2:: @ 82F8914
.incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz"
.align 2
gDodrioBerryStatusGfx:: @ 82F96E0
.incbin "graphics/link_games/dodrioberry_status.4bpp.lz"
.align 2
gDodrioBerryPlatformGfx:: @ 82F9774
.incbin "graphics/link_games/dodrioberry_platform.4bpp.lz"
.align 2
gDodrioBerryPkmnGfx:: @ 82F98BC
.incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz"
.align 2
gDodrioBerryBgTilemap1:: @ 82FAAD8
.incbin "graphics/link_games/dodrioberry_bg1.bin.lz"
.align 2
gDodrioBerryBgTilemap2Right:: @ 82FAD44
.incbin "graphics/link_games/dodrioberry_bg2right.bin.lz"
.align 2
gDodrioBerryBgTilemap2Left:: @ 82FAF94
.incbin "graphics/link_games/dodrioberry_bg2left.bin.lz"
.align 2
gUnknown_082FB1E0:: @ 82FB1E0
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_082FB1E8:: @ 82FB1E8
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_082FB1F0:: @ 82FB1F0
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_082FB1F8:: @ 82FB1F8
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_082FB200:: @ 82FB200
.2byte 0x0000, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB208:: @ 82FB208
.2byte 0x0040, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB210:: @ 82FB210
.2byte 0x0080, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB218:: @ 82FB218
.2byte 0x00c0, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB220:: @ 82FB220
.2byte 0x0100, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB228:: @ 82FB228
.4byte gUnknown_082FB200
.4byte gUnknown_082FB208
.4byte gUnknown_082FB210
.4byte gUnknown_082FB218
.4byte gUnknown_082FB220
.align 2
gUnknown_082FB23C:: @ 82FB23C
.2byte 0x0000, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB244:: @ 82FB244
.2byte 0x0004, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB24C:: @ 82FB24C
.2byte 0x0008, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB254:: @ 82FB254
.4byte gUnknown_082FB23C
.4byte gUnknown_082FB244
.4byte gUnknown_082FB24C
.align 2
gUnknown_082FB260:: @ 82FB260
.2byte 0x0000, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB268:: @ 82FB268
.2byte 0x0004, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB270:: @ 82FB270
.2byte 0x0008, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB278:: @ 82FB278
.2byte 0x000c, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB280:: @ 82FB280
.2byte 0x0010, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB288:: @ 82FB288
.2byte 0x0014, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB290:: @ 82FB290
.2byte 0x0018, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB298:: @ 82FB298
.2byte 0x001c, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB2A0:: @ 82FB2A0
.2byte 0x0020, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB2A8:: @ 82FB2A8
.4byte gUnknown_082FB260
.4byte gUnknown_082FB268
.4byte gUnknown_082FB270
.4byte gUnknown_082FB278
.4byte gUnknown_082FB280
.4byte gUnknown_082FB288
.4byte gUnknown_082FB290
.4byte gUnknown_082FB298
.4byte gUnknown_082FB2A0
.align 2
gUnknown_082FB2CC:: @ 82FB2CC
.2byte 0x0000, 0x0014
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082FB2D4:: @ 82FB2D4
.4byte gUnknown_082FB2CC
.align 2
gUnknown_082FB2D8:: @ 82FB2D8
obj_pal gDodrioBerryPkmnPal, 0x0000
.align 2
gUnknown_082FB2E0:: @ 82FB2E0
obj_pal gDodrioBerryShinyPal, 0x0001
.align 2
gUnknown_082FB2E8:: @ 82FB2E8
obj_pal gDodrioBerryStatusPal, 0x0002
.align 2
gUnknown_082FB2F0:: @ 82FB2F0
spr_template 0x0001, 0x0002, gUnknown_082FB1E8, gUnknown_082FB254, NULL, gDummySpriteAffineAnimTable, nullsub_15
.align 2
.byte 0xD4, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44
.byte 0x45, 0xFB, 0x00, 0x00
.align 2
gUnknown_082FB314:: @ 82FB314
obj_pal gDodrioBerrySpritesPal, 0x0003
.align 2
gUnknown_082FB31C:: @ 82FB31C
.2byte 0x0058, 0x0080, 0x00a8, 0x00d0
.align 2
gUnknown_082FB324:: @ 82FB324
spr_template 0x0002, 0x0003, gUnknown_082FB1F0, gUnknown_082FB2A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FB33C:: @ 82FB33C
spr_template 0x0002, 0x0003, gUnknown_082FB1E8, gUnknown_082FB2A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FB354:: @ 82FB354
.byte 0x1E, 0x14
gUnknown_082FB356:: @ 82FB356
.byte 0xE6, 0x00
.align 2
gUnknown_082FB358:: @ 82FB358
.2byte 0x0037, 0x001e, 0x004a, 0x0000
.align 2
gUnknown_082FB360:: @ 82FB360
obj_pal gDodrioBerryPlatformPal, 0x0006
.align 2
gUnknown_082FB368:: @ 82FB368
spr_template 0x0005, 0x0006, gUnknown_082FB1F8, gUnknown_082FB2D4, NULL, gDummySpriteAffineAnimTable, sub_8028CF4
.align 2
gUnknown_082FB380:: @ 82FB380
.byte 0x01, 0x02, 0x03
gUnknown_082FB383:: @ 82FB383
.byte 0x01, 0x04, 0x05
.byte 0x01, 0x08, 0x09
.byte 0x01, 0x06, 0x07
.align 2
gUnknown_082FB38C:: @ 82FB38C
.byte 0x0c, 0x06, 0x00, 0x00
.align 2
gUnknown_082FB390:: @ 82FB390
.byte 0x09, 0x0a, 0x00, 0x00, 0x0f, 0x06, 0x00, 0x00
.align 2
gUnknown_082FB398:: @ 82FB398
.byte 0x0c, 0x06, 0x00, 0x00, 0x12, 0x0a, 0x00, 0x00
.byte 0x06, 0x0a, 0x00, 0x00
.align 2
gUnknown_082FB3A4:: @ 82FB3A4
.byte 0x09, 0x0a, 0x00, 0x00, 0x0f, 0x06, 0x00, 0x00
.byte 0x15, 0x0a, 0x00, 0x00, 0x03, 0x06, 0x00, 0x00
.align 2
gUnknown_082FB3B4:: @ 82FB3B4
.byte 0x0c, 0x06, 0x00, 0x00, 0x12, 0x0a, 0x00, 0x00
.byte 0x17, 0x06, 0x00, 0x00, 0x01, 0x06, 0x00, 0x00
.byte 0x06, 0x0a, 0x00, 0x00
.align 2
gUnknown_082FB3C8:: @ 82FB3C8
.4byte gUnknown_082FB38C
.4byte gUnknown_082FB390
.4byte gUnknown_082FB398
.4byte gUnknown_082FB3A4
.4byte gUnknown_082FB3B4
.align 2
gUnknown_082FB3DC:: @ 82FB3DC
.4byte gText_1Colon
.4byte gText_2Colon
.4byte gText_3Colon
.4byte gText_4Colon
.4byte gText_5Colon
.align 2
gUnknown_082FB3F0:: @ 82FB3F0
.2byte 0x005c, 0x0084, 0x00ac, 0x00d4
gUnknown_082FB3F8:: @ 82FB3F8
.2byte 0x0021, 0x0031, 0x0041, 0x0051, 0x0061
gUnknown_082FB402:: @ 82FB402
.2byte 0x0011, 0x0021, 0x0031, 0x0041, 0x0051
.align 2
gUnknown_082FB40C:: @ 82FB40C
.4byte 0x00000000, sub_8029338
.4byte 0x00000001, sub_8029440
.4byte 0x00000002, sub_802988C
.4byte 0x00000003, sub_802A010
.4byte 0x00000004, sub_802A380
.4byte 0x00000005, sub_802A454
.4byte 0x00000006, sub_802A534
.4byte 0x00000007, sub_802A588
.4byte 0x00000008, unused_0
.4byte 0x00000009, nullsub_16
.align 2
gUnknown_082FB45C:: @ 82FB45C
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x00, 0x00, 0x00

53
data/ereader_helpers.s Normal file
View File

@@ -0,0 +1,53 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_08625B6C:: @ 8625B6C
@ apparently e-reader trainer data? idk
.byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06
.byte 0x22, 0x27, 0x2c, 0x16, 0x07, 0x06, 0x01, 0x0c, 0x47, 0x0a, 0x06, 0x06, 0x24, 0x0e, 0x00, 0x1e, 0x19, 0x12, 0x05, 0x0c, 0x25, 0x16, 0x25, 0x10, 0x0d, 0x1c, 0x2a, 0x1c, 0x06, 0x0a, 0x06, 0x0c
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x70, 0x01, 0xdb, 0x00, 0xbc, 0x00, 0xf7, 0x00, 0xdc, 0x00, 0x19, 0x01, 0x00, 0x00, 0x37, 0xff, 0x64, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
.byte 0x80, 0x00, 0x00, 0x00, 0x6f, 0x79, 0x69, 0xae, 0x71, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x26, 0x01, 0xb3, 0x00, 0x3e, 0x01, 0xbc, 0x00, 0xf7, 0x00, 0xca, 0x00, 0x00, 0x00, 0x00, 0xff
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x95, 0x58, 0x59, 0x52, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x01, 0xb7, 0x00
.byte 0xf6, 0x00, 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x9b, 0xff, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x2f, 0x00, 0x00, 0x00, 0x8d, 0xae, 0x77, 0x7e
.byte 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0x6a, 0x79, 0x6b, 0x64, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x1b, 0x01, 0x00, 0x00, 0x00, 0x54, 0x27, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x20, 0x06, 0x00, 0x0c, 0x13, 0x24, 0x2b, 0x0e
.byte 0xff, 0xff, 0x3b, 0x0a, 0x05, 0x12, 0x00, 0x0c, 0x6b, 0x26, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x0e, 0x12, 0x00, 0x0c, 0x2c, 0x24, 0x2b, 0x0e, 0xff, 0xff, 0x3b, 0x0a, 0x17, 0x12, 0x00, 0x0c
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x59, 0x01, 0xb7, 0x00, 0xca, 0x00, 0xb9, 0x00, 0x09, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x37, 0x00, 0x64, 0x00, 0xff, 0x64, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
.byte 0x8c, 0x00, 0x00, 0x00, 0x69, 0x58, 0x60, 0x5d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x01, 0xb3, 0x00, 0x07, 0x01, 0x4c, 0x01, 0x62, 0x00, 0x68, 0x00, 0x00, 0x00, 0xff, 0xff
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x80, 0x00, 0x00, 0x00, 0x55, 0x55, 0x5d, 0x96, 0x72, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x44, 0x01, 0x86, 0x00
.byte 0x39, 0x00, 0x59, 0x00, 0x85, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x65, 0x6f, 0x8e, 0x7e
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0x72, 0x52, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00, 0x4a, 0x04, 0x0e, 0x02, 0x35, 0x16, 0x10, 0x10, 0xda, 0x26, 0x3e, 0x10, 0x4a, 0x04, 0x0e, 0x02
.byte 0x47, 0x0a, 0xd9, 0x26, 0x21, 0x16, 0x3e, 0x10, 0x14, 0x1e, 0x07, 0x1e, 0x30, 0x06, 0x23, 0x16, 0x24, 0x0e, 0x06, 0x0c, 0x18, 0x14, 0x2f, 0x14, 0x1a, 0x08, 0x27, 0x1c, 0x00, 0x0c, 0xff, 0xff
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x3c, 0x01, 0x8d, 0x00, 0x2f, 0x00, 0x22, 0x00, 0xf7, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a
.byte 0x03, 0x00, 0x00, 0x00, 0x54, 0x68, 0x5a, 0x7b, 0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6b, 0x01, 0xc8, 0x00, 0xca, 0x00, 0x40, 0x01, 0x5c, 0x00, 0x49, 0x00, 0x00, 0x00, 0xff, 0x00
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a, 0x06, 0x00, 0x00, 0x00, 0x7b, 0x8f, 0x78, 0x51, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x24, 0x01, 0xb3, 0x00
.byte 0x3e, 0x01, 0x4c, 0x01, 0xd5, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x64, 0xc8, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x51, 0x8a, 0x6a, 0x7e
.byte 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0x9c, 0x54, 0xae, 0x79, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x46, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x0a, 0x0a, 0x23, 0x10, 0x00, 0x0c, 0x28, 0x0c, 0x14, 0x18
.byte 0x32, 0x14, 0x02, 0x16, 0x05, 0x10, 0xff, 0xff, 0x0c, 0x1e, 0x0a, 0x0a, 0x34, 0x12, 0x11, 0x1e, 0x1a, 0x08, 0x05, 0x0c, 0x1e, 0x0a, 0x02, 0x06, 0x20, 0x06, 0x22, 0x0a, 0x15, 0x10, 0x01, 0x0c
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0x00, 0x63, 0x01, 0xb3, 0x00, 0xf2, 0x00, 0x35, 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0xff, 0x9b, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x8a
.byte 0x00, 0x00, 0x00, 0x00, 0x58, 0x61, 0xae, 0x64, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4b, 0x01, 0xc6, 0x00, 0x39, 0x00, 0xf2, 0x00, 0x26, 0x00, 0x59, 0x00, 0x00, 0x00, 0xff, 0x00
.byte 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x5b, 0x72, 0x6a, 0x91, 0xae, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7a, 0x01, 0x8d, 0x00
.byte 0x5e, 0x00, 0xf7, 0x00, 0x55, 0x00, 0x05, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa5, 0x94, 0x52, 0x0a, 0x96, 0x00, 0x00, 0x00, 0x8d, 0x85, 0x9e, 0xa0
.byte 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff

7
data/ereader_screen.s Executable file
View File

@@ -0,0 +1,7 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0862609C:: @ 862609C
.incbin "data/unknown_jp_62609C.bin"

190
data/event_scripts.s
View File

@@ -442,28 +442,28 @@ gStdScripts_End:: @ 81DC2CC
EventScript_SecretBasePC:: @ 823B4BB
lockall
playse SE_PC_LOGIN
message Text_276805
message Text_SecretBaseBootUpPC
dofieldeffect FLDEFF_PCTURN_ON
waitstate
waitmessage
waitbuttonpress
playse SE_SELECT
goto EventScript_23B4D3
goto EventScript_SecretBasePCShowMainMenu
end
EventScript_23B4D3:: @ 823B4D3
message Text_27681A
EventScript_SecretBasePCShowMainMenu:: @ 823B4D3
message Text_SecretBasePCStartMenu
waitmessage
goto_if_set FLAG_DECORATION_16, EventScript_23B4EF
goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, EventScript_SecretBasePCMainMenuChoice
goto EventScript_23B531
end
gUnknown_0823B4E8:: @ 823B4E8
gUnknown_0823B4E8:: @ 823B4E8 ;EventScript_SecretBasePCCancel?
lockall
goto EventScript_23B4D3
goto EventScript_SecretBasePCShowMainMenu
end
EventScript_23B4EF:: @ 823B4EF
EventScript_SecretBasePCMainMenuChoice:: @ 823B4EF
multichoice 0, 0, 6, 0
switch VAR_RESULT
case 0, EventScript_23B581
@@ -485,23 +485,23 @@ EventScript_23B531:: @ 823B531
EventScript_23B568:: @ 823B568
msgbox Text_2766AA, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_23B4D3
goto_if_eq EventScript_SecretBasePCShowMainMenu
closemessage
special sub_80E9AC0
special MoveOutOfSecretBase
releaseall
end
EventScript_23B581:: @ 823B581
special sub_80E9C74
special ShowSecretBaseDecorationMenu
end
EventScript_23B585:: @ 823B585
special sub_80E9C88
special ShowSecretBaseRegistryMenu
end
EventScript_RecordMixingSecretBasePC:: @ 823B589
lockall
message Text_276805
message Text_SecretBaseBootUpPC
playse SE_PC_LOGIN
dofieldeffect FLDEFF_PCTURN_ON
waitstate
@@ -512,7 +512,7 @@ EventScript_RecordMixingSecretBasePC:: @ 823B589
end
EventScript_23B5A1:: @ 823B5A1
message Text_27681A
message Text_SecretBasePCStartMenu
waitmessage
multichoice 0, 0, 7, 0
switch VAR_RESULT
@@ -529,17 +529,17 @@ gUnknown_0823B5E9:: @ 823B5E9
end
EventScript_23B5F0:: @ 823B5F0
special sub_80E9BDC
special GetCurSecretBaseRegistrationValidity
compare VAR_RESULT, 1
goto_if_eq EventScript_23B62F
compare VAR_RESULT, 2
goto_if_eq EventScript_23B652
special sub_80E980C
msgbox Text_276707, MSGBOX_YESNO
goto_if_eq EventScript_CantRegisterTooManyBases
special CopyCurSecretBaseOwnerName_StrVar1
msgbox Text_WantToRegisterSecretBase, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_23B5A1
msgbox Text_2767D1, MSGBOX_SIGN
special sub_80E9C2C
special ToggleCurSecretBaseRegistry
special DoSecretBasePCTurnOffEffect
releaseall
end
@@ -549,13 +549,13 @@ EventScript_23B62F:: @ 823B62F
compare VAR_RESULT, 0
goto_if_eq EventScript_23B5A1
msgbox Text_2767E9, MSGBOX_SIGN
special sub_80E9C2C
special ToggleCurSecretBaseRegistry
special DoSecretBasePCTurnOffEffect
releaseall
end
EventScript_23B652:: @ 823B652
msgbox Text_27676F, MSGBOX_SIGN
EventScript_CantRegisterTooManyBases:: @ 823B652
msgbox Text_TooManyBasesDeleteSome, MSGBOX_SIGN
special DoSecretBasePCTurnOffEffect
closemessage
releaseall
@@ -573,23 +573,23 @@ EventScript_23B66E:: @ 823B66E
end
EventScript_23B674:: @ 823B674
special sub_80EB498
special SetSecretBaseSecretsTvFlags_Poster
end
EventScript_23B678:: @ 823B678
special sub_80EB56C
special SetSecretBaseSecretsTvFlags_MiscFurnature
end
EventScript_23B67C:: @ 823B67C
special sub_80EB9E0
special SetSecretBaseSecretsTvFlags_LargeDecorationSpot
end
EventScript_23B680:: @ 823B680
special sub_80EBB28
special SetSecretBaseSecretsTvFlags_SmallDecorationSpot
end
EventScript_SecretBaseSandOrnament:: @ 823B684
special sub_80EBE7C
special SetSecretBaseSecretsTvFlags_SandOrnament
dofieldeffect FLDEFF_SAND_PILLAR
waitstate
end
@@ -1099,7 +1099,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
compare VAR_FOSSIL_MANIAC_STATE, 0
call_if_eq EverGrandeCity_HallOfFame_EventScript_271839
clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
call EverGrandeCity_HallOfFame_EventScript_2718CC
call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
@@ -1147,7 +1147,7 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
return
EventScript_WhiteOut:: @ 8271857
call EverGrandeCity_HallOfFame_EventScript_2718CC
call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
goto EventScript_ResetMrBriney
end
@@ -1192,7 +1192,7 @@ EventScript_MoveMrBrineyToRoute108:: @ 82718B3
clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
end
EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC
EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC
clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
clearflag FLAG_DEFEATED_ELITE_4_GLACIA
@@ -1337,13 +1337,13 @@ OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19
OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43
specialvar VAR_RESULT, IsPokerusInParty
compare VAR_RESULT, 1
goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F
goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_Explain_Pokerus
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_2719B1
end
OldaleTown_PokemonCenter_1F_EventScript_271A5F:: @ 8271A5F
message gUnknown_08272F07
OldaleTown_PokemonCenter_1F_EventScript_Explain_Pokerus:: @ 8271A5F
message gText_PokerusExplanation
setflag FLAG_POKERUS_EXPLAINED
return
@@ -1437,7 +1437,7 @@ EventScript_271B85:: @ 8271B85
EventScript_271B95:: @ 8271B95
message gUnknown_08272A78
waitfanfare
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
setvar VAR_RESULT, 1
return
@@ -1491,13 +1491,13 @@ Std_FindItem:: @ 8271BFD
checkitemtype VAR_0x8000
call EventScript_271B08
compare VAR_0x8007, 1
call_if_eq EventScript_271C3A
call_if_eq EventScript_PickItemUp
compare VAR_0x8007, 0
call_if_eq EventScript_271CA1
release
return
EventScript_271C3A:: @ 8271C3A
EventScript_PickItemUp:: @ 8271C3A
removeobject VAR_LAST_TALKED
giveitem VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, sub_81398C0
@@ -1513,20 +1513,20 @@ EventScript_271C3A:: @ 8271C3A
special CallBattlePyramidFunction
compare VAR_RESULT, 1
goto_if_eq EventScript_271C86
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
return
EventScript_271C86:: @ 8271C86
msgbox gUnknown_08272AEA, MSGBOX_DEFAULT
msgbox gText_PlayerPutItemInBag, MSGBOX_DEFAULT
return
EventScript_271C8F:: @ 8271C8F
bufferitemnameplural 0, VAR_0x8004, VAR_0x8005
message gUnknown_082731A9
message gText_PlayerFoundOneItemTwoLines
return
EventScript_271C9B:: @ 8271C9B
message gUnknown_08272ABF
message gText_PlayerFoundOneItem
return
EventScript_271CA1:: @ 8271CA1
@@ -1561,12 +1561,12 @@ EventScript_271CE8:: @ 8271CE8
EventScript_271D0E:: @ 8271D0E
bufferitemnameplural 0, VAR_0x8004, 1
message gUnknown_082731A9
message gText_PlayerFoundOneItemTwoLines
goto EventScript_271D2A
end
EventScript_271D1F:: @ 8271D1F
message gUnknown_08272ABF
message gText_PlayerFoundOneItem
goto EventScript_271D2A
end
@@ -1575,14 +1575,14 @@ EventScript_271D2A:: @ 8271D2A
waitfanfare
bufferitemnameplural 1, VAR_0x8004, 1
copyvar VAR_0x8004, VAR_0x8008
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
special sub_80EDCE8
special SetFlagInVar
releaseall
end
EventScript_271D47:: @ 8271D47
msgbox gUnknown_08272ABF, MSGBOX_DEFAULT
msgbox gText_PlayerFoundOneItem, MSGBOX_DEFAULT
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
setvar VAR_RESULT, 0
releaseall
@@ -1591,7 +1591,7 @@ EventScript_271D47:: @ 8271D47
EventScript_271D5E:: @ 8271D5E
lock
faceplayer
msgbox Text_27260D, MSGBOX_YESNO
msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq EventScript_271D83
compare VAR_RESULT, 0
@@ -1605,7 +1605,7 @@ EventScript_271D83:: @ 8271D83
faceplayer
EventScript_271D89:: @ 8271D89
message Text_272640
message Text_WouldNotLikeToMixRecords
waitmessage
waitbuttonpress
release
@@ -1616,7 +1616,7 @@ EventScript_PC:: @ 8271D92
setvar VAR_0x8004, 0
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox Text_27265A, MSGBOX_DEFAULT
msgbox Text_BootUpPC, MSGBOX_DEFAULT
goto EventScript_271DAC
end
@@ -1639,7 +1639,7 @@ EventScript_271DBC:: @ 8271DBC
EventScript_271DF9:: @ 8271DF9
playse SE_PC_LOGIN
msgbox gUnknown_082726C2, MSGBOX_DEFAULT
msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
special PlayerPC
waitstate
goto EventScript_271DAC
@@ -1649,18 +1649,18 @@ EventScript_271E0E:: @ 8271E0E
playse SE_PC_LOGIN
call_if_unset FLAG_SYS_PC_LANETTE, EventScript_271E35
call_if_set FLAG_SYS_PC_LANETTE, EventScript_271E3E
msgbox gUnknown_082726A3, MSGBOX_DEFAULT
msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT
special ShowPokemonStorageSystemPC
waitstate
goto EventScript_271DAC
end
EventScript_271E35:: @ 8271E35
msgbox gUnknown_0827268C, MSGBOX_DEFAULT
msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT
return
EventScript_271E3E:: @ 8271E3E
msgbox gUnknown_082726D4, MSGBOX_DEFAULT
msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT
return
EventScript_271E47:: @ 8271E47
@@ -1717,20 +1717,20 @@ Route109_EventScript_271E95:: @ 8271E95
EventScript_UseSurf:: @ 8271EA0
checkpartymove MOVE_SURF
compare VAR_RESULT, 6
goto_if_eq EventScript_271ED6
goto_if_eq EventScript_CantSurf
bufferpartymonnick 0, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
lockall
msgbox gUnknown_08272FD6, MSGBOX_YESNO
msgbox gText_WantToUseSurf, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq EventScript_271ED5
msgbox gUnknown_0827300D, MSGBOX_DEFAULT
goto_if_eq EventScript_CancelSurf
msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT
dofieldeffect FLDEFF_USE_SURF
EventScript_271ED5:: @ 8271ED5
EventScript_CancelSurf:: @ 8271ED5
releaseall
EventScript_271ED6:: @ 8271ED6
EventScript_CantSurf:: @ 8271ED6
end
Common_EventScript_SetupRivalGender:: @ 8271ED7
@@ -2464,56 +2464,56 @@ Movement_2725CB:: @ 82725CB
step_end
EventScript_PictureBookShelf:: @ 82725CE
msgbox Text_2A81E5, MSGBOX_SIGN
msgbox Text_PictureBookShelf, MSGBOX_SIGN
end
EventScript_BookShelf:: @ 82725D7
msgbox Text_2A820D, MSGBOX_SIGN
msgbox Text_BookShelf, MSGBOX_SIGN
end
EventScript_PokemonCenterBookshelf:: @ 82725E0
msgbox Text_2A8232, MSGBOX_SIGN
EventScript_PokemonCenterBookShelf:: @ 82725E0
msgbox Text_PokemonCenterBookShelf, MSGBOX_SIGN
end
EventScript_Vase:: @ 82725E9
msgbox Text_2A8276, MSGBOX_SIGN
msgbox Text_Vase, MSGBOX_SIGN
end
EventScript_TrashCan:: @ 82725F2
msgbox Text_2A82B3, MSGBOX_SIGN
EventScript_EmptyTrashCan:: @ 82725F2
msgbox Text_EmptyTrashCan, MSGBOX_SIGN
end
EventScript_ShopShelf:: @ 82725FB
msgbox Text_2A82BF, MSGBOX_SIGN
msgbox Text_ShopShelf, MSGBOX_SIGN
end
EventScript_Blueprint:: @ 8272604
msgbox Text_2A82F7, MSGBOX_SIGN
msgbox Text_Blueprint, MSGBOX_SIGN
end
Text_27260D: @ 827260D
Text_WouldYouLikeToMixRecords: @ 827260D
.string "Would you like to mix records with\n"
.string "other TRAINERS?$"
Text_272640: @ 8272640
Text_WouldNotLikeToMixRecords: @ 8272640
.string "We hope to see you again!$"
Text_27265A: @ 827265A
Text_BootUpPC: @ 827265A
.string "{PLAYER} booted up the PC.$"
gText_WhichPCShouldBeAccessed:: @ 827266F
.string "Which PC should be accessed?$"
gUnknown_0827268C:: @ 827268C
gText_AccessedSomeonesPC:: @ 827268C
.string "Accessed SOMEONE'S PC.$"
gUnknown_082726A3:: @ 82726A3
gText_StorageSystemOpened:: @ 82726A3
.string "POKéMON Storage System opened.$"
gUnknown_082726C2:: @ 82726C2
gText_AccessedPlayersPC:: @ 82726C2
.string "Accessed {PLAYER}'s PC.$"
gUnknown_082726D4:: @ 82726D4
gText_AccessedLanettesPC:: @ 82726D4
.string "Accessed LANETTE's PC.$"
gUnknown_082726EB:: @ 82726EB
@@ -2561,16 +2561,16 @@ gUnknown_08272A78:: @ 8272A78
gUnknown_08272A89:: @ 8272A89
.string "The BAG is full…$"
gUnknown_08272A9A:: @ 8272A9A
gText_PutItemInPocket:: @ 8272A9A
.string "{PLAYER} put away the {STR_VAR_2}\nin the {STR_VAR_3} POCKET.$"
gUnknown_08272ABF:: @ 8272ABF
gText_PlayerFoundOneItem:: @ 8272ABF
.string "{PLAYER} found one {STR_VAR_2}!$"
gText_TooBadBagIsFull:: @ 8272AD0
.string "Too bad!\nThe BAG is full…$"
gUnknown_08272AEA:: @ 8272AEA
gText_PlayerPutItemInBag:: @ 8272AEA
.string "{PLAYER} put away the {STR_VAR_2}\nin the BAG.$"
gUnknown_08272B09:: @ 8272B09
@@ -2597,13 +2597,13 @@ gUnknown_08272C1D:: @ 8272C1D
gUnknown_08272C5F:: @ 8272C5F
.string "The sandstorm is vicious.\nIt's impossible to keep going.$"
gUnknown_08272C98:: @ 8272C98
gText_SelectWithoutRegisteredItem:: @ 8272C98
.string "An item in the BAG can be\nregistered to SELECT for easy use.$"
gUnknown_08272CD5:: @ 8272CD5
.string "There's an e-mail from POKéMON TRAINER\nSCHOOL.\p… … … … … …\pA POKéMON may learn up to four moves.\pA TRAINER's expertise is tested on the\nmove sets chosen for POKéMON.\p… … … … … …$"
gUnknown_08272D87:: @ 8272D87
gText_PlayerHouseBootPC:: @ 8272D87
.string "{PLAYER} booted up the PC.$"
gUnknown_08272D9C:: @ 8272D9C
@@ -2615,13 +2615,13 @@ gUnknown_08272DB3:: @ 8272DB3
gUnknown_08272DE3:: @ 8272DE3
.string "{PLAYER} is out of usable\nPOKéMON!\p{PLAYER} whited out!$"
gUnknown_08272E0F:: @ 8272E0F
gText_RegisteredTrainerinPokeNav:: @ 8272E0F
.string "Registered {STR_VAR_1} {STR_VAR_2}\nin the POKéNAV.$"
gUnknown_08272E30:: @ 8272E30
.string "Do you know the TM SECRET POWER?\pOur group, we love the TM SECRET\nPOWER.\pOne of our members will give it to you.\nCome back and show me if you get it.\pWe'll accept you as a member and sell\nyou good stuff in secrecy.$"
gUnknown_08272F07:: @ 8272F07
gText_PokerusExplanation:: @ 8272F07
.string "Your POKéMON may be infected with\nPOKéRUS.\pLittle is known about the POKéRUS\nexcept that they are microscopic life-\lforms that attach to POKéMON.\pWhile infected, POKéMON are said to\ngrow exceptionally well.$"
.include "data/text/surf.inc"
@@ -2650,13 +2650,13 @@ gUnknown_08273161:: @ 8273161
gUnknown_08273178:: @ 8273178
.string "Thank you for accessing the\nMYSTERY GIFT System.$"
gUnknown_082731A9:: @ 82731A9
gText_PlayerFoundOneItemTwoLines:: @ 82731A9
.string "{PLAYER} found one {STR_VAR_1}\n{STR_VAR_2}!$"
gUnknown_082731BD:: @ 82731BD
gText_Sudowoodo_Attacked:: @ 82731BD
.string "The weird tree doesn't like the\nWAILMER PAIL!\pThe weird tree attacked!$"
gUnknown_08273204:: @ 8273204
gText_LegendaryFlewAway:: @ 8273204
.string "The {STR_VAR_1} flew away!$"
gText_PkmnTransferredSomeonesPC:: @ 8273216
@@ -2674,7 +2674,7 @@ gText_PkmnBoxLanettesPCFull:: @ 82732D9
gUnknown_0827331C:: @ 827331C
.string "There's no more room for POKéMON!\pThe POKéMON BOXES are full and\ncan't accept any more!$"
gUnknown_08273374:: @ 8273374
gText_NicknameThisPokemon:: @ 8273374
.string "Do you want to give a nickname to\nthis {STR_VAR_1}?$"
gUnknown_0827339F:: @ 827339F
@@ -2707,8 +2707,8 @@ gText_UnusualWeatherEnded_Rain:: @ 8273656
gText_UnusualWeatherEnded_Sun:: @ 8273684
.string "The intense sunshine appears to\nhave subsided…$"
EventScript_2736B3:: @ 82736B3
msgbox gUnknown_08272C98, MSGBOX_SIGN
EventScript_SelectWithoutRegisteredItem:: @ 82736B3
msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN
end
EventScript_Poison:: @ 82736BC
@@ -2862,7 +2862,7 @@ TerraCave_End_EventScript_273776:: @ 8273776
removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0
bufferspeciesname 0, VAR_0x8004
msgbox gUnknown_08273204, MSGBOX_DEFAULT
msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
release
end
@@ -3433,7 +3433,7 @@ Std_RegisteredInMatchCall:: @ 82742C9
closemessage
delay 30
playfanfare MUS_ME_TORE_EYE
msgbox gUnknown_08272E0F, MSGBOX_DEFAULT
msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT
waitfanfare
closemessage
delay 30
@@ -4207,31 +4207,31 @@ MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D
.include "data/text/berries.inc"
.include "data/text/shoal_cave.inc"
Text_2A81E5: @ 82A81E5
Text_PictureBookShelf: @ 82A81E5
.string "There's a set of POKéMON picture books.$"
Text_2A820D: @ 82A820D
Text_BookShelf: @ 82A820D
.string "It's filled with all sorts of books.$"
Text_2A8232: @ 82A8232
Text_PokemonCenterBookShelf: @ 82A8232
.string "POKéMON magazines!\n"
.string "POKéMON PAL…\p"
.string "POKéMON HANDBOOK…\n"
.string "ADORABLE POKéMON…$"
Text_2A8276: @ 82A8276
Text_Vase: @ 82A8276
.string "This vase looks expensive…\n"
.string "Peered inside…\p"
.string "But, it was empty.$"
Text_2A82B3: @ 82A82B3
Text_EmptyTrashCan: @ 82A82B3
.string "It's empty.$"
Text_2A82BF: @ 82A82BF
Text_ShopShelf: @ 82A82BF
.string "The shelves brim with all sorts of\n"
.string "POKéMON merchandise.$"
Text_2A82F7: @ 82A82F7
Text_Blueprint: @ 82A82F7
.string "A blueprint of some sort?\n"
.string "It's too complicated!$"

96
data/field_effect_scripts.s
View File

@@ -16,26 +16,26 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_SurfBlob
.4byte gFieldEffectScript_UseSurf
.4byte gFieldEffectScript_GroundImpactDust
.4byte gFieldEffectScript_Unknown11
.4byte gFieldEffectScript_UseSecretPowerCave
.4byte gFieldEffectScript_BikeHopTallGrass
.4byte gFieldEffectScript_SandFootprints
.4byte gFieldEffectScript_BikeHopBigSplash
.4byte gFieldEffectScript_Splash
.4byte gFieldEffectScript_BikeHopSmallSplash
.4byte gFieldEffectScript_LongGrass
.4byte gFieldEffectScript_Unknown18
.4byte gFieldEffectScript_JumpLongGrass
.4byte gFieldEffectScript_Unknown19
.4byte gFieldEffectScript_Unknown20
.4byte gFieldEffectScript_Unknown21
.4byte gFieldEffectScript_Unknown22
.4byte gFieldEffectScript_BerryTreeGrowthSparkle
.4byte gFieldEffectScript_DeepSandFootprints
.4byte gFieldEffectScript_Unknown25
.4byte gFieldEffectScript_Unknown26
.4byte gFieldEffectScript_Unknown27
.4byte gFieldEffectScript_PokeCenterHeal
.4byte gFieldEffectScript_UseSecretPowerTree
.4byte gFieldEffectScript_UseSecretPowerShrub
.4byte gFieldEffectScript_TreeDisguise
.4byte gFieldEffectScript_MountainDisguise
.4byte gFieldEffectScript_Unknown30
.4byte gFieldEffectScript_NPCUseFly
.4byte gFieldEffectScript_UseFly
.4byte gFieldEffectScript_FlyIn
.4byte gFieldEffectScript_QuestionMarkIcon
@@ -43,35 +43,35 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_BikeTireTracks
.4byte gFieldEffectScript_SandDisguisePlaceholder
.4byte gFieldEffectScript_UseRockSmash
.4byte gFieldEffectScript_Unknown38
.4byte gFieldEffectScript_Unknown39
.4byte gFieldEffectScript_Unknown40
.4byte gFieldEffectScript_UseDig
.4byte gFieldEffectScript_SandPile
.4byte gFieldEffectScript_UseStrength
.4byte gFieldEffectScript_ShortGrass
.4byte gFieldEffectScript_HotSpringsWater
.4byte gFieldEffectScript_Unknown43
.4byte gFieldEffectScript_Unknown44
.4byte gFieldEffectScript_Unknown45
.4byte gFieldEffectScript_UseWaterfall
.4byte gFieldEffectScript_UseDive
.4byte gFieldEffectScript_Pokeball
.4byte gFieldEffectScript_HeartIcon
.4byte gFieldEffectScript_Unknown47
.4byte gFieldEffectScript_Unknown48
.4byte gFieldEffectScript_JumpOutOfAsh
.4byte gFieldEffectScript_Unknown50
.4byte gFieldEffectScript_Unknown51
.4byte gFieldEffectScript_Unknown52
.4byte gFieldEffectScript_LavaridgeGymWarp
.4byte gFieldEffectScript_SweetScent
.4byte gFieldEffectScript_SandPillar
.4byte gFieldEffectScript_Bubbles
.4byte gFieldEffectScript_Unknown54
.4byte gFieldEffectScript_Unknown55
.4byte gFieldEffectScript_Unknown56
.4byte gFieldEffectScript_Unknown57
.4byte gFieldEffectScript_Unknown58
.4byte gFieldEffectScript_Sparkle
.4byte gFieldEffectScript_ShowSecretPowerCave
.4byte gFieldEffectScript_ShowSecretPowerTree
.4byte gFieldEffectScript_ShowSecretPowerShrub
.4byte gFieldEffectScript_ShowCutGrass
.4byte gFieldEffectScript_FieldMoveShowMonInit
.4byte gFieldEffectScript_UsePuzzleEffect
.4byte gFieldEffectScript_Unknown61
.4byte gFieldEffectScript_Unknown62
.4byte gFieldEffectScript_Unknown63
.4byte gFieldEffectScript_SecretBaseBootPC
.4byte gFieldEffectScript_HallOfFameRecord
.4byte gFieldEffectScript_UseTeleport
.4byte gFieldEffectScript_Rayquaza
.4byte gFieldEffectScript_Unknown65
.4byte gFieldEffectScript_Unknown66
.4byte gFieldEffectScript_MoveDeoxysRock
gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
field_eff_callnative FldEff_ExclamationMarkIcon
@@ -117,7 +117,7 @@ gFieldEffectScript_GroundImpactDust:: @ 82DBB28
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Dust
field_eff_end
gFieldEffectScript_Unknown11:: @ 82DBB32
gFieldEffectScript_UseSecretPowerCave:: @ 82DBB32
field_eff_callnative FldEff_UseSecretPowerCave
field_eff_end
@@ -145,7 +145,7 @@ gFieldEffectScript_LongGrass:: @ 82DBB6A
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_LongGrass
field_eff_end
gFieldEffectScript_Unknown18:: @ 82DBB74
gFieldEffectScript_JumpLongGrass:: @ 82DBB74
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpLongGrass
field_eff_end
@@ -173,16 +173,16 @@ gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_DeepSandFootprints
field_eff_end
gFieldEffectScript_Unknown25:: @ 82DBBB6
gFieldEffectScript_PokeCenterHeal:: @ 82DBBB6
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal
field_eff_end
gFieldEffectScript_Unknown26:: @ 82DBBC5
gFieldEffectScript_UseSecretPowerTree:: @ 82DBBC5
field_eff_callnative FldEff_UseSecretPowerTree
field_eff_end
gFieldEffectScript_Unknown27:: @ 82DBBCB
gFieldEffectScript_UseSecretPowerShrub:: @ 82DBBCB
field_eff_callnative FldEff_UseSecretPowerShrub
field_eff_end
@@ -194,7 +194,7 @@ gFieldEffectScript_MountainDisguise:: @ 82DBBD7
field_eff_callnative ShowMountainDisguiseFieldEffect
field_eff_end
gFieldEffectScript_Unknown30:: @ 82DBBDD
gFieldEffectScript_NPCUseFly:: @ 82DBBDD
field_eff_callnative FldEff_NPCFlyOut
field_eff_end
@@ -226,15 +226,15 @@ gFieldEffectScript_UseRockSmash:: @ 82DBC0F
field_eff_callnative FldEff_UseRockSmash
field_eff_end
gFieldEffectScript_Unknown40:: @ 82DBC15
gFieldEffectScript_UseStrength:: @ 82DBC15
field_eff_callnative sub_8145E2C
field_eff_end
gFieldEffectScript_Unknown38:: @ 82DBC1B
gFieldEffectScript_UseDig:: @ 82DBC1B
field_eff_callnative FldEff_UseDig
field_eff_end
gFieldEffectScript_Unknown39:: @ 82DBC21
gFieldEffectScript_SandPile:: @ 82DBC21
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandPile
field_eff_end
@@ -246,15 +246,15 @@ gFieldEffectScript_HotSpringsWater:: @ 82DBC35
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_HotSpringsWater
field_eff_end
gFieldEffectScript_Unknown43:: @ 82DBC3F
gFieldEffectScript_UseWaterfall:: @ 82DBC3F
field_eff_callnative FldEff_UseWaterfall
field_eff_end
gFieldEffectScript_Unknown44:: @ 82DBC45
gFieldEffectScript_UseDive:: @ 82DBC45
field_eff_callnative FldEff_UseDive
field_eff_end
gFieldEffectScript_Unknown45:: @ 82DBC4B
gFieldEffectScript_Pokeball:: @ 82DBC4B
field_eff_loadpal gFieldEffectObjectPaletteInfo10
field_eff_callnative FldEff_Pokeball
field_eff_end
@@ -275,15 +275,15 @@ gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh
field_eff_end
gFieldEffectScript_Unknown50:: @ 82DBC76
gFieldEffectScript_LavaridgeGymWarp:: @ 82DBC76
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp
field_eff_end
gFieldEffectScript_Unknown51:: @ 82DBC80
gFieldEffectScript_SweetScent:: @ 82DBC80
field_eff_callnative FldEff_SweetScent
field_eff_end
gFieldEffectScript_Unknown52:: @ 82DBC86
gFieldEffectScript_SandPillar:: @ 82DBC86
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar
field_eff_end
@@ -291,23 +291,23 @@ gFieldEffectScript_Bubbles:: @ 82DBC90
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Bubbles
field_eff_end
gFieldEffectScript_Unknown54:: @ 82DBC9A
gFieldEffectScript_Sparkle:: @ 82DBC9A
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, FldEff_Sparkle
field_eff_end
gFieldEffectScript_Unknown55:: @ 82DBCA4
gFieldEffectScript_ShowSecretPowerCave:: @ 82DBCA4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave
field_eff_end
gFieldEffectScript_Unknown56:: @ 82DBCAE
gFieldEffectScript_ShowSecretPowerTree:: @ 82DBCAE
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree
field_eff_end
gFieldEffectScript_Unknown57:: @ 82DBCB8
gFieldEffectScript_ShowSecretPowerShrub:: @ 82DBCB8
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub
field_eff_end
gFieldEffectScript_Unknown58:: @ 82DBCC2
gFieldEffectScript_ShowCutGrass:: @ 82DBCC2
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass
field_eff_end
@@ -319,16 +319,16 @@ gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2
field_eff_callnative FldEff_UsePuzzleEffect
field_eff_end
gFieldEffectScript_Unknown61:: @ 82DBCD8
gFieldEffectScript_SecretBaseBootPC:: @ 82DBCD8
field_eff_callnative FldEff_SecretBasePCTurnOn
field_eff_end
gFieldEffectScript_Unknown62:: @ 82DBCDE
gFieldEffectScript_HallOfFameRecord:: @ 82DBCDE
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord
field_eff_end
gFieldEffectScript_Unknown63:: @ 82DBCED
gFieldEffectScript_UseTeleport:: @ 82DBCED
field_eff_callnative FldEff_UseTeleport
field_eff_end
@@ -340,6 +340,6 @@ gFieldEffectScript_Unknown65:: @ 82DBCF9
field_eff_callnative sub_80B9ADC
field_eff_end
gFieldEffectScript_Unknown66:: @ 82DBCFF
gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF
field_eff_callnative Fldeff_MoveDeoxysRock
field_eff_end

4
data/maps/AbandonedShip_CaptainsOffice/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_CaptainsOffice_EventScript_29126E",
"script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey",
"flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
}
],
@@ -59,4 +59,4 @@
],
"coord_events": [],
"bg_events": []
}
}

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

@@ -1,8 +1,8 @@
AbandonedShip_Deck_MapScripts:: @ 823799A
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition
.byte 0
AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0
AbandonedShip_Deck_OnTransition: @ 82379A0
setflag FLAG_LANDMARK_ABANDONED_SHIP
end

8
data/maps/AbandonedShip_HiddenFloorRooms/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_291288",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_291295",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
}
],

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

@@ -42,11 +42,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
setfieldeffectargument 0, 10
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
delay 20
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -72,15 +72,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
setfieldeffectargument 0, 8
setfieldeffectargument 1, 5
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 11
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -89,19 +89,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
setfieldeffectargument 0, 16
setfieldeffectargument 1, 3
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 25
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
setfieldeffectargument 0, 24
setfieldeffectargument 1, 6
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, 0
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3
waitfieldeffect 54
waitfieldeffect FLDEFF_SPARKLE
delay 10
end
@@ -112,28 +112,28 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3
setfieldeffectargument 0, 42
setfieldeffectargument 1, 10
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3
setfieldeffectargument 0, 20
setfieldeffectargument 1, 5
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3
setfieldeffectargument 0, 1
setfieldeffectargument 1, 12
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3
setfieldeffectargument 0, 1
setfieldeffectargument 1, 2
setfieldeffectargument 2, 0
dofieldeffect 54
dofieldeffect FLDEFF_SPARKLE
return
AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3

2
data/maps/AbandonedShip_Room_B1F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Room_B1F_EventScript_291254",
"script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13"
}
],

2
data/maps/AbandonedShip_Rooms2_1F/map.json
View File

@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_1F_EventScript_291261",
"script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
},
{

2
data/maps/AbandonedShip_Rooms2_B1F/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_B1F_EventScript_291247",
"script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
}
],

2
data/maps/AbandonedShip_Rooms_1F/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_1F_EventScript_29122D",
"script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
},
{

2
data/maps/AbandonedShip_Rooms_B1F/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_B1F_EventScript_29123A",
"script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
}
],

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

@@ -1,8 +1,8 @@
AlteringCave_MapScripts:: @ 823B177
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_OnTransition
.byte 0
AlteringCave_MapScript1_23B17D: @ 823B17D
AlteringCave_OnTransition: @ 823B17D
setflag FLAG_LANDMARK_ALTERING_CAVE
end

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

@@ -1,7 +1,7 @@
AncientTomb_MapScripts:: @ 8238FB3
map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3
map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
.byte 0
AncientTomb_MapScript1_238FC3: @ 8238FC3
@@ -15,7 +15,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
removeobject VAR_LAST_TALKED
return
AncientTomb_MapScript1_238FE1: @ 8238FE1
AncientTomb_OnTransition: @ 8238FE1
setflag FLAG_LANDMARK_ANCIENT_TOMB
call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE
end

6
data/maps/AquaHideout_B1F/map.json
View File

@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_291372",
"script": "AquaHideout_B1F_EventScript_ItemMaxElixir",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_291358",
"script": "AquaHideout_B1F_EventScript_ItemMasterBall",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_291365",
"script": "AquaHideout_B1F_EventScript_ItemNugget",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
},
{

2
data/maps/AquaHideout_B2F/map.json
View File

@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B2F_EventScript_29137F",
"script": "AquaHideout_B2F_EventScript_ItemNestBall",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
},
{

2
data/maps/ArtisanCave_1F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_1F_EventScript_2914D1",
"script": "ArtisanCave_1F_EventScript_ItemCarbos",
"flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS"
}
],

2
data/maps/ArtisanCave_B1F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_B1F_EventScript_2914C4",
"script": "ArtisanCave_B1F_EventScript_ItemHPUp",
"flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP"
}
],

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

@@ -1,8 +1,8 @@
ArtisanCave_B1F_MapScripts:: @ 823AFAD
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_OnTransition
.byte 0
ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3
ArtisanCave_B1F_OnTransition: @ 823AFB3
setflag FLAG_LANDMARK_ARTISAN_CAVE
end

2
data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
"name": "BattleFrontier_BattlePyramidEmptySquare",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattleFrontier_BattlePyramidTop/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
"name": "BattleFrontier_BattlePyramidTop",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -121,7 +121,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
playse 269
applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
waitmovement 0
msgbox gUnknown_082731BD, MSGBOX_DEFAULT
msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT
closemessage
waitse
playmoncry SPECIES_SUDOWOODO, 2

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

@@ -1,9 +1,9 @@
BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_OnTransition
.byte 0
BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
BattleFrontier_ReceptionGate_OnTransition: @ 82661E5
setflag FLAG_LANDMARK_BATTLE_FRONTIER
end

2
data/maps/BattlePyramidSquare01/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE01",
"name": "BattlePyramidSquare01",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare02/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE02",
"name": "BattlePyramidSquare02",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare03/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE03",
"name": "BattlePyramidSquare03",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare04/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE04",
"name": "BattlePyramidSquare04",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare05/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE05",
"name": "BattlePyramidSquare05",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare06/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE06",
"name": "BattlePyramidSquare06",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare07/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE07",
"name": "BattlePyramidSquare07",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare08/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE08",
"name": "BattlePyramidSquare08",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare09/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE09",
"name": "BattlePyramidSquare09",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare10/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE10",
"name": "BattlePyramidSquare10",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare11/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE11",
"name": "BattlePyramidSquare11",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare12/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE12",
"name": "BattlePyramidSquare12",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare13/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE13",
"name": "BattlePyramidSquare13",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare14/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE14",
"name": "BattlePyramidSquare14",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare15/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE15",
"name": "BattlePyramidSquare15",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare16/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE16",
"name": "BattlePyramidSquare16",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BirthIsland_Exterior/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BIRTH_ISLAND_EXTERIOR",
"name": "BirthIsland_Exterior",
"layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND_2",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -68,9 +68,9 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
setfieldeffectargument 0, 1
setfieldeffectargument 1, 58
setfieldeffectargument 2, 26
dofieldeffect 65
dofieldeffect FLDEFF_65
playbgm MUS_RG_DEOEYE, 0
waitfieldeffect 65
waitfieldeffect FLDEFF_65
addobject 2
applymovement 2, BirthIsland_Exterior_Movement_268054
waitmovement 0

2
data/maps/BirthIsland_Harbor/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BIRTH_ISLAND_HARBOR",
"name": "BirthIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND_2",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CaveOfOrigin_B1F/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_B1F",
"name": "CaveOfOrigin_B1F",
"layout": "LAYOUT_CAVE_OF_ORIGIN_B1F",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": false,
"weather": "WEATHER_FOG_1",

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

@@ -1,7 +1,7 @@
DesertRuins_MapScripts:: @ 822D95B
map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_22D96B
map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_22D989
map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_22D9CA
map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_OnTransition
.byte 0
DesertRuins_MapScript1_22D96B: @ 822D96B
@@ -28,7 +28,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
setmetatile 9, 20, 565, 1
return
DesertRuins_MapScript1_22D9CA: @ 822D9CA
DesertRuins_OnTransition: @ 822D9CA
setflag FLAG_LANDMARK_DESERT_RUINS
call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7
end

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

@@ -1,8 +1,8 @@
DesertUnderpass_MapScripts:: @ 823AF37
map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D
map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_OnTransition
.byte 0
DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
DesertUnderpass_OnTransition: @ 823AF3D
setflag FLAG_LANDMARK_DESERT_UNDERPASS
end

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

@@ -38,8 +38,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 20
dofieldeffect 62
waitfieldeffect 62
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
delay 40
setvar VAR_TEMP_1, 1
call EverGrandeCity_HallOfFame_EventScript_2717C1

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

@@ -1,9 +1,9 @@
EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
.byte 0
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
setflag FLAG_LANDMARK_POKEMON_LEAGUE
call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED

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

@@ -37,7 +37,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6
FallarborTown_House2_EventScript_20140C:: @ 820140C
msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT
special TeachMoveTutorMove
special TeachMoveRelearnerMove
waitstate
compare VAR_0x8004, 0
goto_if_eq FallarborTown_House2_EventScript_2013D6

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

@@ -38,7 +38,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
return
FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
setvar VAR_NEVER_READ_0x403A, 0
setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0
setvar VAR_TEMP_1, 1
call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86
end

16
data/maps/FieryPath/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_29119E",
"script": "FieryPath_EventScript_ItemTM06",
"flag": "FLAG_ITEM_FIERY_PATH_TM06"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_14"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_15"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_16"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_291191",
"script": "FieryPath_EventScript_ItemFireStone",
"flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
}
],

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

@@ -1,8 +1,8 @@
FieryPath_MapScripts:: @ 8230F24
map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_230F2A
map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_OnTransition
.byte 0
FieryPath_MapScript1_230F2A: @ 8230F2A
FieryPath_OnTransition: @ 8230F2A
call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37
setflag FLAG_LANDMARK_FIERY_PATH
end

2
data/maps/GraniteCave_1F/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_1F_EventScript_291150",
"script": "GraniteCave_1F_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE"
}
],

2
data/maps/GraniteCave_B1F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B1F_EventScript_29115D",
"script": "GraniteCave_B1F_EventScript_ItemPokeBall",
"flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL"
}
],

18
data/maps/GraniteCave_B2F/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_29116A",
"script": "GraniteCave_B2F_EventScript_ItemRepel",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_291177",
"script": "GraniteCave_B2F_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_13"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_14"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_15"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_16"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_17"
}
],

2
data/maps/InsideOfTruck/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_INSIDE_OF_TRUCK",
"name": "InsideOfTruck",
"layout": "LAYOUT_INSIDE_OF_TRUCK",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_INSIDE_OF_TRUCK",
"requires_flash": false,
"weather": "WEATHER_NONE",

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

@@ -1,7 +1,7 @@
IslandCave_MapScripts:: @ 8238E2A
map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A
map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58
map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_238E99
map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_OnTransition
.byte 0
IslandCave_MapScript1_238E3A: @ 8238E3A
@@ -28,7 +28,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
setmetatile 9, 20, 565, 1
return
IslandCave_MapScript1_238E99: @ 8238E99
IslandCave_OnTransition: @ 8238E99
setflag FLAG_LANDMARK_ISLAND_CAVE
call IslandCave_EventScript_238F45
call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB

2
data/maps/JaggedPass/map.json
View File

@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "JaggedPass_EventScript_291184",
"script": "JaggedPass_EventScript_ItemBurnHeal",
"flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL"
},
{

2
data/maps/LilycoveCity/map.json
View File

@@ -165,7 +165,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_EventScript_2910E8",
"script": "LilycoveCity_EventScript_ItemMaxRepel",
"flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL"
},
{

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

@@ -391,10 +391,10 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
waitmovement 0
delay 50
setfieldeffectargument 0, 1
dofieldeffect 30
dofieldeffect FLDEFF_NPCFLY_OUT
delay 15
removeobject VAR_LAST_TALKED
waitfieldeffect 30
waitfieldeffect FLDEFF_NPCFLY_OUT
savebgm MUS_DUMMY
fadedefaultbgm
setflag FLAG_MET_RIVAL_LILYCOVE

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

@@ -151,7 +151,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
bufferstdstring 2, 14
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
random 64
compare VAR_RESULT, 0
goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
@@ -163,7 +163,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
bufferstdstring 2, 14
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
random 64
compare VAR_RESULT, 0
goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
@@ -175,7 +175,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
bufferstdstring 2, 14
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436
end

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

@@ -257,7 +257,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
setvar VAR_0x8004, 1
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, MSGBOX_DEFAULT
msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
special BedroomPC
waitstate
releaseall

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

@@ -315,7 +315,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
setvar VAR_0x8004, 2
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, MSGBOX_DEFAULT
msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
special BedroomPC
waitstate
releaseall

12
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

@@ -347,7 +347,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@@ -358,7 +358,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
call LittlerootTown_ProfessorBirchsLab_EventScript_273797
@@ -392,7 +392,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 5
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@@ -403,7 +403,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 5
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
call LittlerootTown_ProfessorBirchsLab_EventScript_273797
@@ -437,7 +437,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 6
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@@ -448,7 +448,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 6
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
call LittlerootTown_ProfessorBirchsLab_EventScript_273797

8
data/maps/MagmaHideout_1F/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2914DE",
"script": "MagmaHideout_1F_EventScript_ItemRareCandy",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_11"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_12"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_2908BA",
"script": "EventScript_StrengthBoulder",
"flag": "FLAG_TEMP_13"
}
],

4
data/maps/MagmaHideout_2F_2R/map.json
View File

@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_2914EB",
"script": "MagmaHideout_2F_2R_EventScript_MaxElixir",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_2914F8",
"script": "MagmaHideout_2F_2R_EventScript_ItemFullRestore",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
}
],

2
data/maps/MagmaHideout_3F_1R/map.json
View File

@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_1R_EventScript_291505",
"script": "MagmaHideout_3F_1R_EventScript_ItemNugget",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
}
],

2
data/maps/MagmaHideout_3F_2R/map.json
View File

@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_2R_EventScript_291512",
"script": "MagmaHideout_3F_2R_EventScript_ItemPPMax",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
}
],

2
data/maps/MagmaHideout_3F_3R/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_3R_EventScript_29152C",
"script": "MagmaHideout_3F_3R_EventScript_ItemEscapeRope",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
}
],

2
data/maps/MagmaHideout_4F/map.json
View File

@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_4F_EventScript_29151F",
"script": "MagmaHideout_4F_EventScript_MaxRevive",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
}
],

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

@@ -12,8 +12,8 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
setfieldeffectargument 0, 18
setfieldeffectargument 1, 42
setfieldeffectargument 2, 0
dofieldeffect 54
waitfieldeffect 54
dofieldeffect FLDEFF_SPARKLE
waitfieldeffect FLDEFF_SPARKLE
setvar VAR_RESULT, 1
playfanfare MUS_ME_TAMA
playse SE_TAMA

2
data/maps/MauvilleCity/map.json
View File

@@ -149,7 +149,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_2910CE",
"script": "MauvilleCity_EventScript_ItemXSpeed",
"flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
},
{

8
data/maps/MeteorFalls_1F_1R/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911AB",
"script": "MeteorFalls_1F_1R_EventScript_ItemTM23",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911C5",
"script": "MeteorFalls_1F_1R_EventScript_ItemMoonStone",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911B8",
"script": "MeteorFalls_1F_1R_EventScript_ItemFullHeal",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_2911D2",
"script": "MeteorFalls_1F_1R_EventScript_ItemPPUP",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
},
{

2
data/maps/MeteorFalls_B1F_2R/map.json
View File

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_B1F_2R_EventScript_2911DF",
"script": "MeteorFalls_B1F_2R_EventScript_ItemTM02",
"flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02"
}
],

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

@@ -1,8 +1,8 @@
MirageTower_1F_MapScripts:: @ 823AD01
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_MapScript1_23AD07
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_OnTransition
.byte 0
MirageTower_1F_MapScript1_23AD07: @ 823AD07
MirageTower_1F_OnTransition: @ 823AD07
setflag FLAG_ENTERED_MIRAGE_TOWER
setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
setflag FLAG_LANDMARK_MIRAGE_TOWER

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