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

Merge branch 'master' into dodrio_berry_picking

Browse Source
This commit is contained in:
PikalaxALT
2019-05-11 21:22:09 -04:00
parent a58d9a16dd fc72b74e6c
commit 539d472796
783 changed files with 74008 additions and 50982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -28,3 +28,5 @@ build/
.DS_Store
*.ddump
.idea/
porymap.project.cfg
.vscode/

8
.travis.yml
View File

@@ -22,9 +22,15 @@ install:
matrix:
include:
- os: linux
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
env: _="Build"
script:
- ./build_tools.sh
- ./build_tools.sh g++-7
- make -j2 compare
after_success:
- .travis/calcrom/webhook.sh pokeemerald

6
Makefile
View File

@@ -23,6 +23,7 @@ MAP = $(ROM:.gba=.map)
C_SUBDIR = src
ASM_SUBDIR = asm
DATA_SRC_SUBDIR = src/data
DATA_ASM_SUBDIR = data
SONG_SUBDIR = sound/songs
MID_SUBDIR = sound/songs/midi
@@ -53,6 +54,7 @@ PREPROC := tools/preproc/preproc$(EXE)
RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE)
FIX := tools/gbafix/gbafix$(EXE)
MAPJSON := tools/mapjson/mapjson$(EXE)
JSONPROC := tools/jsonproc/jsonproc$(EXE)
# Clear the default suffixes
.SUFFIXES:
@@ -86,6 +88,8 @@ OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
SUBDIRS := $(sort $(dir $(OBJS)))
AUTO_GEN_TARGETS :=
$(shell mkdir -p $(SUBDIRS))
rom: $(ROM)
@@ -101,6 +105,7 @@ clean: tidy
rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc
find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
rm -f $(AUTO_GEN_TARGETS)
tidy:
rm -f $(ROM) $(ELF) $(MAP)
@@ -109,6 +114,7 @@ tidy:
include graphics_file_rules.mk
include map_data_rules.mk
include spritesheet_rules.mk
include json_data_rules.mk
include songs.mk
%.s: ;

6
asm/macros/battle_anim_script.inc
View File

@@ -144,7 +144,7 @@
.byte \pan
.endm
.macro panse_1B se:req, param1:req, param2:req, param3:req, param4
.macro panse_1B se:req, param1:req, param2:req, param3:req, param4:req
.byte 0x1b
.2byte \se
.byte \param1
@@ -215,7 +215,7 @@
.byte \param2
.endm
.macro panse_26 se:req, param1:req, param2:req, param3:req, param4
.macro panse_26 se:req, param1:req, param2:req, param3:req, param4:req
.byte 0x26
.2byte \se
.byte \param1
@@ -224,7 +224,7 @@
.byte \param4
.endm
.macro panse_27 se:req, param1:req, param2:req, param3:req, param4
.macro panse_27 se:req, param1:req, param2:req, param3:req, param4:req
.byte 0x27
.2byte \se
.byte \param1

4738
asm/pokemon_jump.s
View File

File diff suppressed because it is too large Load Diff

18699
asm/pokenav.s
View File

File diff suppressed because it is too large Load Diff

2185
asm/pokenav_unk_10.s Normal file
View File

File diff suppressed because it is too large Load Diff

2277
asm/pokenav_unk_2.s Normal file
View File

File diff suppressed because it is too large Load Diff

1752
asm/pokenav_unk_6.s Normal file
View File

File diff suppressed because it is too large Load Diff

2001
asm/pokenav_unk_7.s Normal file
View File

File diff suppressed because it is too large Load Diff

1377
asm/pokenav_unk_8.s Normal file
View File

File diff suppressed because it is too large Load Diff

1393
asm/pokenav_unk_9.s Normal file
View File

File diff suppressed because it is too large Load Diff

8
asmdiff.ps1
View File

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

1
build_tools.sh
View File

@@ -9,3 +9,4 @@ make -C tools/ramscrgen CXX=${1:-g++}
make -C tools/gbafix CXX=${1:-g++}
make -C tools/mid2agb CXX=${1:-g++}
make -C tools/mapjson CXX=${1:-g++}
make -C tools/jsonproc CXX=${1:-g++}

4
charmap.txt
View File

@@ -61,6 +61,10 @@ UP_ARROW = 79
DOWN_ARROW = 7A
LEFT_ARROW = 7B
RIGHT_ARROW = 7C
SUPER_E = 84
'<' = 85
'>' = 86
SUPER_RE = A0
'0' = A1
'1' = A2
'2' = A3

2
data/battle_ai_scripts.s
View File

@@ -3307,7 +3307,7 @@ AI_HPAware_DiscouragedEffectsWhenTargetLowHP: @ 82DE2B1
.byte EFFECT_TOXIC
.byte EFFECT_LIGHT_SCREEN
.byte EFFECT_OHKO
.byte EFFECT_SUPER_FANG
.byte EFFECT_SUPER_FANG //Maybe supposed to be EFFECT_RAZOR_WIND
.byte EFFECT_SUPER_FANG
.byte EFFECT_MIST
.byte EFFECT_FOCUS_ENERGY

50
data/battle_anim_scripts.s
View File

@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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
@@ -10331,15 +10331,15 @@ General_SubstituteAppear:
General_PokeblockThrow:
createvisualtask sub_817345C, 2, 0
createvisualtask sub_81732B0, 2
createvisualtask AnimTask_LoadPokeblockGfx, 2
delay 0
waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22
createsprite gBattleAnimSpriteTemplate_85E5338, ANIM_TARGET, 3, -18, 12, 0, 32
createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32
delay 50
loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2
createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET
waitforvisualfinish
createvisualtask sub_81732E4, 2
createvisualtask AnimTask_FreePokeblockGfx, 2
end
General_ItemKnockoff:
@@ -10516,7 +10516,7 @@ General_Hail:
goto Move_HAIL
General_LeechSeedDrain:
createvisualtask sub_817351C, 5
createvisualtask AnimTask_GetBattlersFromArg, 5
delay 0
goto Move_ABSORB
@@ -10535,7 +10535,7 @@ General_MonHit:
General_ItemSteal:
loadspritegfx ANIM_TAG_ITEM_BAG
createvisualtask sub_8117F30, 2
createvisualtask sub_8172ED0, 2
createvisualtask AnimTask_TargetToEffectBattler, 2
delay 1
createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1
end
@@ -10664,8 +10664,8 @@ General_WishHeal:
end
AnimScript_82D85A3:
createvisualtask sub_8172E9C, 2
jumpreteq 1, AnimScript_82D85B4
createvisualtask AnimTask_IsAttackerBehindSubstitute, 2
jumprettrue AnimScript_82D85B4
AnimScript_82D85B2:
waitforvisualfinish
return
@@ -10675,8 +10675,8 @@ AnimScript_82D85B4:
goto AnimScript_82D85B2
AnimScript_82D85C3:
createvisualtask sub_8172E9C, 2
jumpreteq 1, AnimScript_82D85D4
createvisualtask AnimTask_IsAttackerBehindSubstitute, 2
jumprettrue AnimScript_82D85D4
AnimScript_82D85D2:
waitforvisualfinish
return

67
data/contest_ai_scripts.s
View File

@@ -11,39 +11,40 @@
enum MON_4
.align 2
gContestAIs:: @ 82DE350
.4byte AI_CheckForBadMove
.4byte AI_CheckForCombo
.4byte AI_CheckBoring
.4byte AI_CheckExcitement
.4byte AI_CheckOrder
.4byte AI_CheckForGoodMove
.4byte AI_Erratic
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
.4byte AI_Nothing
gContestAIChecks:: @ 82DE350
.4byte AI_CheckForBadMove // 0x00000001
.4byte AI_CheckForCombo // 0x00000002
.4byte AI_CheckBoring // 0x00000004
.4byte AI_CheckExcitement // 0x00000008
.4byte AI_CheckOrder // 0x00000010
.4byte AI_CheckForGoodMove // 0x00000020
.4byte AI_Erratic // 0x00000040
.4byte AI_Nothing // 0x00000080
.4byte AI_Nothing // 0x00000100
.4byte AI_Nothing // 0x00000200
.4byte AI_Nothing // 0x00000400
.4byte AI_Nothing // 0x00000800
.4byte AI_Nothing // 0x00001000
.4byte AI_Nothing // 0x00002000
.4byte AI_Nothing // 0x00004000
.4byte AI_Nothing // 0x00008000
.4byte AI_Nothing // 0x00010000
.4byte AI_Nothing // 0x00020000
.4byte AI_Nothing // 0x00040000
.4byte AI_Nothing // 0x00080000
.4byte AI_Nothing // 0x00100000
.4byte AI_Nothing // 0x00200000
.4byte AI_Nothing // 0x00400000
.4byte AI_Nothing // 0x00800000
.4byte AI_Nothing // 0x01000000
.4byte AI_Nothing // 0x02000000
.4byte AI_Nothing // 0x04000000
.4byte AI_Nothing // 0x08000000
.4byte AI_Nothing // 0x10000000
.4byte AI_Nothing // 0x20000000
.4byte AI_Nothing // 0x40000000
.4byte AI_Nothing // 0x80000000
@ Unreferenced AI routine to encourage moves that improve condition on the first
@ turn. Additionally, it checks the appeal order of the user and the effect

45
data/event_scripts.s
View File

@@ -6,6 +6,7 @@
#include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h"
#include "constants/flags.h"
#include "constants/decorations.h"
#include "constants/items.h"
#include "constants/heal_locations.h"
#include "constants/layouts.h"
@@ -454,7 +455,7 @@ EventScript_SecretBasePC:: @ 823B4BB
EventScript_SecretBasePCShowMainMenu:: @ 823B4D3
message Text_SecretBasePCStartMenu
waitmessage
goto_if_set FLAG_DECORATION_16, EventScript_SecretBasePCMainMenuChoice
goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, EventScript_SecretBasePCMainMenuChoice
goto EventScript_23B531
end
@@ -487,16 +488,16 @@ EventScript_23B568:: @ 823B568
compare VAR_RESULT, 0
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
@@ -529,17 +530,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_CantRegisterTooManyBases
special sub_80E980C
msgbox Text_276707, MSGBOX_YESNO
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,7 +550,7 @@ 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
@@ -573,23 +574,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
@@ -825,7 +826,7 @@ Std_10: @ 8271347
waitmessage
return
EventScript_27134E: @ 827134E
EventScript_UnusedReturn: @ 827134E
return
Common_EventScript_SaveGame:: @ 827134F
@@ -846,7 +847,7 @@ Std_MsgboxAutoclose:: @ 8271494
release
return
EventScript_27149D:: @ 827149D
EventScript_ResetAllBerries:: @ 827149D
setberrytree 2, 7, 5
setberrytree 1, 3, 5
setberrytree 11, 7, 5
@@ -1089,13 +1090,13 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
setflag FLAG_HIDE_SKY_PILLAR_WALLACE
setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
call EventScript_27149D
call EventScript_ResetAllBerries
end
EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
special sub_81AFDD0
setflag FLAG_IS_CHAMPION
call EverGrandeCity_HallOfFame_EventScript_271829
call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries
compare VAR_FOSSIL_MANIAC_STATE, 0
call_if_eq EverGrandeCity_HallOfFame_EventScript_271839
clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
@@ -1120,7 +1121,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
call_if_eq EverGrandeCity_HallOfFame_EventScript_271851
return
EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829
EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829
clearflag FLAG_DEFEATED_MEW
clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS
clearflag FLAG_DEFEATED_DEOXYS
@@ -1193,7 +1194,7 @@ EventScript_MoveMrBrineyToRoute108:: @ 82718B3
end
EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC
clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
clearflag FLAG_DEFEATED_ELITE_4_SIDNEY
clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
clearflag FLAG_DEFEATED_ELITE_4_GLACIA
clearflag FLAG_DEFEATED_ELITE_4_DRAKE
@@ -2766,7 +2767,7 @@ EventScript_2736F8:: @ 82736F8
Common_EventScript_NopReturn:: @ 827374E
return
EventScript_27374F:: @ 827374F
EventScript_UnusedSetVarResult1:: @ 827374F
setvar VAR_RESULT, 1
return
@@ -3460,7 +3461,7 @@ EventScript_GotoTrainerScript:: @ 82742F6
gUnknown_0827E8CE:: @ 827E8CE
.string "Missed turn$"
gUnknown_0827E8DA:: @ 827E8DA
gText_LinkStandby4:: @ 827E8DA
.string "Link standby!$"
gUnknown_0827E8E8:: @ 827E8E8

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

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

@@ -1,6 +1,6 @@
AquaHideout_B1F_MapScripts:: @ 82339A7
map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition
.byte 0
AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
@@ -14,7 +14,7 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
removeobject VAR_LAST_TALKED
return
AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
AquaHideout_B1F_OnTransition: @ 82339D0
call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3
call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7
end

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

@@ -1,8 +1,8 @@
AquaHideout_B2F_MapScripts:: @ 8233DCF
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_OnTransition
.byte 0
AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
AquaHideout_B2F_OnTransition: @ 8233DD5
call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF
end

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

@@ -2,7 +2,7 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9

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

@@ -1,5 +1,5 @@
BirthIsland_Exterior_MapScripts:: @ 8267F15
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25
.byte 0
@@ -8,7 +8,7 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
special sub_813B1D0
end
BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
BirthIsland_Exterior_OnTransition: @ 8267F29
setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0
@@ -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

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

@@ -1,7 +1,7 @@
CaveOfOrigin_1F_MapScripts:: @ 8235768
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_OnTransition
.byte 0
CaveOfOrigin_1F_MapScript1_23576E: @ 823576E
CaveOfOrigin_1F_OnTransition: @ 823576E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_1F_EventScript_2722C1
end

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

@@ -1,7 +1,7 @@
CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_OnTransition
.byte 0
CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E
CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
end

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

@@ -1,8 +1,8 @@
CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_OnTransition
.byte 0
CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E
CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
end

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

@@ -1,8 +1,8 @@
CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_OnTransition
.byte 0
CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E
CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
end

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

@@ -1,8 +1,8 @@
DewfordTown_MapScripts:: @ 81E9507
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_OnTransition
.byte 0
DewfordTown_MapScript1_1E950D: @ 81E950D
DewfordTown_OnTransition: @ 81E950D
setflag FLAG_VISITED_DEWFORD_TOWN
end

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

@@ -1,8 +1,8 @@
DewfordTown_Gym_MapScripts:: @ 81FC63C
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_OnTransition
.byte 0
DewfordTown_Gym_MapScript1_1FC642: @ 81FC642
DewfordTown_Gym_OnTransition: @ 81FC642
call DewfordTown_Gym_EventScript_1FC648
end

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

@@ -1,9 +1,9 @@
DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30
.byte 0
DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E
DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E
setrespawn HEAL_LOCATION_DEWFORD_TOWN
call DewfordTown_PokemonCenter_1F_EventScript_2718DE
end

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

@@ -2,7 +2,7 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A

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

@@ -1,8 +1,8 @@
EverGrandeCity_MapScripts:: @ 81E7D1B
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_OnTransition
.byte 0
EverGrandeCity_MapScript1_1E7D21: @ 81E7D21
EverGrandeCity_OnTransition: @ 81E7D21
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
end

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

@@ -1,10 +1,10 @@
EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14
.byte 0
EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF
EverGrandeCity_ChampionsRoom_OnTransition: @ 82289FF
call Common_EventScript_SetupRivalGender
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_PokemonCenter_1F/scripts.inc
View File

@@ -1,9 +1,9 @@
EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
.byte 0
EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
end

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

@@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5

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

@@ -2,7 +2,7 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C

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

@@ -1,17 +1,17 @@
EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_227F16
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D
.byte 0
EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16
setflag FLAG_MET_SCOTT_IN_EVERGRANDE
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
end
EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
compare VAR_ELITE_4_STATE, 1
call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
end
@@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57
EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64
lock
faceplayer
goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B
goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B
playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2
@@ -60,7 +60,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B
end
EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95
setflag FLAG_DEFEATED_ELITE_4_SYDNEY
setflag FLAG_DEFEATED_ELITE_4_SIDNEY
call EverGrandeCity_SidneysRoom_EventScript_2723F8
msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT
release

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

@@ -1,8 +1,8 @@
FallarborTown_MapScripts:: @ 81EB1FA
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_OnTransition
.byte 0
FallarborTown_MapScript1_1EB200: @ 81EB200
FallarborTown_OnTransition: @ 81EB200
setflag FLAG_VISITED_FALLARBOR_TOWN
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
clearflag FLAG_CONTEST_SKETCH_CREATED

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

@@ -1,10 +1,10 @@
FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0
.byte 0
FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9
FallarborTown_BattleTentBattleRoom_OnTransition: @ 82008A9
call FallarborTown_BattleTentBattleRoom_EventScript_2008AF
end

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

@@ -1,9 +1,9 @@
FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30
.byte 0
FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8
FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8
setrespawn HEAL_LOCATION_FALLARBOR_TOWN
call FallarborTown_PokemonCenter_1F_EventScript_2718DE
end

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

@@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00

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

@@ -1,8 +1,8 @@
FarawayIsland_Entrance_MapScripts:: @ 8267C8E
map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94
map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_OnTransition
.byte 0
FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
FarawayIsland_Entrance_OnTransition: @ 8267C94
setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND
end

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

@@ -1,6 +1,6 @@
FarawayIsland_Interior_MapScripts:: @ 8267CFA
map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54
map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_267D72
map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F
.byte 0
@@ -37,7 +37,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
removeobject VAR_LAST_TALKED
return
FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
FarawayIsland_Interior_OnTransition: @ 8267D72
setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0
setvar VAR_TEMP_1, 1
call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86

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

@@ -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"
},
{

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

@@ -1,9 +1,9 @@
FortreeCity_MapScripts:: @ 81E25A4
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_1E25AF
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3
.byte 0
FortreeCity_MapScript1_1E25AF: @ 81E25AF
FortreeCity_OnTransition: @ 81E25AF
setflag FLAG_VISITED_FORTREE_CITY
end

44
data/maps/FortreeCity_DecorationShop/scripts.inc
View File

@@ -14,22 +14,22 @@ FortreeCity_DecorationShop_EventScript_218020:: @ 8218020
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218038
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Desks
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
FortreeCity_DecorationShop_PokemartDecor_218038: @ 8218038
.2byte 1
.2byte 2
.2byte 3
.2byte 4
.2byte 5
.2byte 7
.2byte 8
.2byte 9
.2byte 0
FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038
.2byte DECOR_SMALL_DESK
.2byte DECOR_POKEMON_DESK
.2byte DECOR_HEAVY_DESK
.2byte DECOR_RAGGED_DESK
.2byte DECOR_COMFORT_DESK
.2byte DECOR_BRICK_DESK
.2byte DECOR_CAMP_DESK
.2byte DECOR_HARD_DESK
.2byte DECOR_NONE
release
end
@@ -38,22 +38,22 @@ FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218064
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Chairs
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
FortreeCity_DecorationShop_PokemartDecor_218064: @ 8218064
.2byte 10
.2byte 11
.2byte 12
.2byte 15
.2byte 14
.2byte 16
.2byte 17
.2byte 18
.2byte 0
FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064
.2byte DECOR_SMALL_CHAIR
.2byte DECOR_POKEMON_CHAIR
.2byte DECOR_HEAVY_CHAIR
.2byte DECOR_RAGGED_CHAIR
.2byte DECOR_COMFORT_CHAIR
.2byte DECOR_BRICK_CHAIR
.2byte DECOR_CAMP_CHAIR
.2byte DECOR_HARD_CHAIR
.2byte DECOR_NONE
release
end

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

@@ -1,9 +1,9 @@
FortreeCity_Gym_MapScripts:: @ 82165AB
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_2165B6
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA
.byte 0
FortreeCity_Gym_MapScript1_2165B6: @ 82165B6
FortreeCity_Gym_OnTransition: @ 82165B6
special RotatingGate_InitPuzzle
end

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

@@ -1,9 +1,9 @@
FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_2173E3
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30
.byte 0
FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3
FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3
setrespawn HEAL_LOCATION_FORTREE_CITY
end

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

@@ -2,7 +2,7 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653

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

@@ -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"
}
],

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

@@ -1,6 +1,6 @@
JaggedPass_MapScripts:: @ 8230656
map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666
map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_23068B
map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_OnTransition
map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C
.byte 0
@@ -20,7 +20,7 @@ JaggedPass_EventScript_230685:: @ 8230685
setvar VAR_JAGGED_PASS_STATE, 1
return
JaggedPass_MapScript1_23068B: @ 823068B
JaggedPass_OnTransition: @ 823068B
compare VAR_JAGGED_PASS_ASH_WEATHER, 1
call_if_eq JaggedPass_EventScript_230697
end

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

@@ -1,9 +1,9 @@
LavaridgeTown_MapScripts:: @ 81EA4D3
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_1EA4DE
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547
.byte 0
LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
LavaridgeTown_OnTransition: @ 81EA4DE
setflag FLAG_VISITED_LAVARIDGE_TOWN
call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514
call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F

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

@@ -1,8 +1,8 @@
LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_1FE6FA
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_OnTransition
.byte 0
LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA
LavaridgeTown_Gym_1F_OnTransition: @ 81FE6FA
call LavaridgeTown_Gym_1F_EventScript_1FE705
call LavaridgeTown_Gym_1F_EventScript_1FE757
end

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

@@ -1,8 +1,8 @@
LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_MapScript1_1FF884
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_OnTransition
.byte 0
LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884
LavaridgeTown_Gym_B1F_OnTransition: @ 81FF884
call LavaridgeTown_Gym_B1F_EventScript_1FF88F
call LavaridgeTown_Gym_B1F_EventScript_1FF8DC
end

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

@@ -1,9 +1,9 @@
LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30
.byte 0
LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05
LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05
setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE
end

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

@@ -2,7 +2,7 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC

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

@@ -1,9 +1,9 @@
LilycoveCity_MapScripts:: @ 81E2B3C
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_1E2B47
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_OnTransition
map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61
.byte 0
LilycoveCity_MapScript1_1E2B47: @ 81E2B47
LilycoveCity_OnTransition: @ 81E2B47
setflag FLAG_VISITED_LILYCOVE_CITY
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
@@ -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

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

@@ -1,9 +1,9 @@
LilycoveCity_ContestLobby_MapScripts:: @ 821A211
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_21A21C
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243
.byte 0
LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C
LilycoveCity_ContestLobby_OnTransition: @ 821A21C
call LilycoveCity_ContestLobby_EventScript_28CB2B
call LilycoveCity_ContestLobby_EventScript_21A227
end

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

@@ -1,8 +1,8 @@
LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_OnTransition
.byte 0
LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D
LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D
getpricereduction 3
compare VAR_RESULT, 1
call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227
@@ -30,20 +30,20 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F
.align 2
LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
.2byte 39
.2byte 35
.2byte 36
.2byte 37
.2byte 40
.2byte 33
.2byte 41
.2byte 38
.2byte 34
.2byte 45
.2byte 46
.2byte 47
.2byte 117
.2byte 112
.2byte DECOR_MUD_BALL
.2byte DECOR_FENCE_LENGTH
.2byte DECOR_FENCE_WIDTH
.2byte DECOR_TIRE
.2byte DECOR_BREAKABLE_DOOR
.2byte DECOR_SOLID_BOARD
.2byte DECOR_SAND_ORNAMENT
.2byte DECOR_STAND
.2byte DECOR_SLIDE
.2byte DECOR_TV
.2byte DECOR_ROUND_TV
.2byte DECOR_CUTE_TV
.2byte DECOR_WAILMER_DOLL
.2byte DECOR_RHYDON_DOLL
.2byte 0
release
end
@@ -235,4 +235,3 @@ LilycoveCity_DepartmentStoreRooftop_Text_2205F1: @ 82205F1
LilycoveCity_DepartmentStoreRooftop_Text_220603: @ 8220603
.string "Decided against buying a drink.$"

105
data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
View File

@@ -18,26 +18,26 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Dolls
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0: @ 821FFC0
.2byte ITEM_X_DEFEND
.2byte ITEM_X_SPEED
.2byte ITEM_X_ACCURACY
.2byte ITEM_SUPER_REPEL
.2byte 91
.2byte 92
.2byte ITEM_SUN_STONE
.2byte ITEM_MOON_STONE
.2byte ITEM_FIRE_STONE
.2byte ITEM_THUNDER_STONE
.2byte ITEM_WATER_STONE
.2byte ITEM_LEAF_STONE
.2byte ITEM_NONE
LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0
.2byte DECOR_PICHU_DOLL
.2byte DECOR_PIKACHU_DOLL
.2byte DECOR_MARILL_DOLL
.2byte DECOR_JIGGLYPUFF_DOLL
.2byte DECOR_DUSKULL_DOLL
.2byte DECOR_WYNAUT_DOLL
.2byte DECOR_BALTOY_DOLL
.2byte DECOR_KECLEON_DOLL
.2byte DECOR_AZURILL_DOLL
.2byte DECOR_SKITTY_DOLL
.2byte DECOR_SWABLU_DOLL
.2byte DECOR_GULPIN_DOLL
.2byte DECOR_NONE
release
end
@@ -46,23 +46,23 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Cushions
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4: @ 821FFF4
.2byte 101
.2byte 102
.2byte ITEM_BIG_MUSHROOM
.2byte 105
.2byte ITEM_PEARL
.2byte ITEM_BIG_PEARL
.2byte ITEM_STARDUST
.2byte ITEM_STAR_PIECE
.2byte ITEM_NUGGET
.2byte ITEM_NONE
LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4
.2byte DECOR_PIKA_CUSHION
.2byte DECOR_ROUND_CUSHION
.2byte DECOR_ZIGZAG_CUSHION
.2byte DECOR_SPIN_CUSHION
.2byte DECOR_DIAMOND_CUSHION
.2byte DECOR_BALL_CUSHION
.2byte DECOR_GRASS_CUSHION
.2byte DECOR_FIRE_CUSHION
.2byte DECOR_WATER_CUSHION
.2byte DECOR_NONE
release
end
@@ -71,23 +71,23 @@ LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220024
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Posters
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
LilycoveCity_DepartmentStore_5F_Pokemart_220024: @ 8220024
.2byte ITEM_CARBOS
.2byte ITEM_CALCIUM
.2byte ITEM_RARE_CANDY
.2byte ITEM_PP_UP
.2byte ITEM_ZINC
.2byte ITEM_PP_MAX
.2byte 72
.2byte ITEM_GUARD_SPEC
.2byte ITEM_DIRE_HIT
.2byte ITEM_NONE
LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024
.2byte DECOR_BALL_POSTER
.2byte DECOR_GREEN_POSTER
.2byte DECOR_RED_POSTER
.2byte DECOR_BLUE_POSTER
.2byte DECOR_CUTE_POSTER
.2byte DECOR_PIKA_POSTER
.2byte DECOR_LONG_POSTER
.2byte DECOR_SEA_POSTER
.2byte DECOR_SKY_POSTER
.2byte DECOR_NONE
release
end
@@ -96,24 +96,24 @@ LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220054
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Mats
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054
.2byte 59
.2byte 60
.2byte 61
.2byte 62
.2byte ITEM_HP_UP
.2byte ITEM_PROTEIN
.2byte ITEM_IRON
.2byte ITEM_RED_SHARD
.2byte ITEM_BLUE_SHARD
.2byte ITEM_YELLOW_SHARD
.2byte ITEM_NONE
LilycoveCity_DepartmentStore_5F_Pokemart_Mats: @ 8220054
.2byte DECOR_SURF_MAT
.2byte DECOR_THUNDER_MAT
.2byte DECOR_FIRE_BLAST_MAT
.2byte DECOR_POWDER_SNOW_MAT
.2byte DECOR_ATTRACT_MAT
.2byte DECOR_FISSURE_MAT
.2byte DECOR_SPIKES_MAT
.2byte DECOR_GLITTER_MAT
.2byte DECOR_JUMP_MAT
.2byte DECOR_SPIN_MAT
.2byte DECOR_NONE
release
end
@@ -167,4 +167,3 @@ LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B
LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4
.string "I think they closed the rooftop\n"
.string "because the weather is wild today.$"

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

@@ -1,8 +1,8 @@
LilycoveCity_Harbor_MapScripts:: @ 821E000
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_21E006
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_OnTransition
.byte 0
LilycoveCity_Harbor_MapScript1_21E006: @ 821E006
LilycoveCity_Harbor_OnTransition: @ 821E006
setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33
end

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

@@ -1,8 +1,8 @@
LilycoveCity_House3_MapScripts:: @ 821EE3C
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_21EE42
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_OnTransition
.byte 0
LilycoveCity_House3_MapScript1_21EE42: @ 821EE42
LilycoveCity_House3_OnTransition: @ 821EE42
random 4
copyvar VAR_TEMP_1, VAR_RESULT
end

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

@@ -1,9 +1,9 @@
LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30
.byte 0
LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD
LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD
setrespawn HEAL_LOCATION_LILYCOVE_CITY
goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6
end

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

@@ -2,7 +2,7 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772

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

@@ -1,6 +1,6 @@
LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D
map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_OnTransition
.byte 0
LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
@@ -60,7 +60,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
walk_in_place_fastest_down
step_end
LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D
LilycoveCity_PokemonTrainerFanClub_OnTransition: @ 821C80D
call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA
compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8

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

@@ -1,7 +1,7 @@
LinkContestRoom1_MapScripts:: @ 823B781
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F
map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815
map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_23B79F
map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_OnTransition
map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B
.byte 0
@@ -10,7 +10,7 @@ LinkContestRoom1_MapScript1_23B79B: @ 823B79B
special sub_80F8B94
end
LinkContestRoom1_MapScript1_23B79F: @ 823B79F
LinkContestRoom1_OnTransition: @ 823B79F
call LinkContestRoom1_EventScript_23B7AF
setvar VAR_TEMP_0, 1
call LinkContestRoom1_EventScript_23B842

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

@@ -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_1F/scripts.inc
View File

@@ -1,8 +1,8 @@
MagmaHideout_1F_MapScripts:: @ 8239880
map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_239886
map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_OnTransition
.byte 0
MagmaHideout_1F_MapScript1_239886: @ 8239886
MagmaHideout_1F_OnTransition: @ 8239886
setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
end

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

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

@@ -1,6 +1,6 @@
MarineCave_End_MapScripts:: @ 823AFDF
map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA
map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_23B008
map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_OnTransition
.byte 0
MarineCave_End_MapScript1_23AFEA: @ 823AFEA
@@ -14,7 +14,7 @@ MarineCave_End_EventScript_23AFF4:: @ 823AFF4
removeobject 1
return
MarineCave_End_MapScript1_23B008: @ 823B008
MarineCave_End_OnTransition: @ 823B008
call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_23B012
end

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

@@ -1,8 +1,8 @@
MauvilleCity_MapScripts:: @ 81DF385
map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_1DF38B
map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_OnTransition
.byte 0
MauvilleCity_MapScript1_1DF38B: @ 81DF38B
MauvilleCity_OnTransition: @ 81DF38B
setflag FLAG_VISITED_MAUVILLE_CITY
clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION

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

@@ -1,9 +1,9 @@
MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_210E66
map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30
.byte 0
MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66
setrespawn HEAL_LOCATION_MAUVILLE_CITY
call MauvilleCity_PokemonCenter_1F_EventScript_2718DE
goto MauvilleCity_PokemonCenter_1F_EventScript_210E74

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

@@ -2,7 +2,7 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008
map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D

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

@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MirageTower_3F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MirageTower_3F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_12"
}
],

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

@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "MirageTower_4F_EventScript_2907A6",
"script": "EventScript_RockSmash",
"flag": "FLAG_TEMP_11"
}
],

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

@@ -1,8 +1,8 @@
MossdeepCity_MapScripts:: @ 81E4A96
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_1E4A9C
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_OnTransition
.byte 0
MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C
MossdeepCity_OnTransition: @ 81E4A9C
clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
clearflag FLAG_MOSSDEEP_GYM_SWITCH_3

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

@@ -17,7 +17,7 @@ MossdeepCity_House4_EventScript_222DED:: @ 8222DED
MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7
lock
faceplayer
special sub_80E8BC8
special CheckPlayerHasSecretBase
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_House4_EventScript_222E14
special GetSecretBaseNearbyMapName

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

@@ -1,9 +1,9 @@
MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_22224A
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30
.byte 0
MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A
MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A
setrespawn HEAL_LOCATION_MOSSDEEP_CITY
end

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

@@ -2,7 +2,7 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349

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

@@ -1,9 +1,9 @@
MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41
map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_OnTransition
.byte 0
MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C
MossdeepCity_SpaceCenter_1F_OnTransition: @ 8222F4C
compare VAR_MOSSDEEP_STATE, 2
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58
end

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

@@ -1,9 +1,9 @@
MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_MapScript1_223D63
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5
.byte 0
MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63
MossdeepCity_SpaceCenter_2F_OnTransition: @ 8223D63
compare VAR_MOSSDEEP_STATE, 2
call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A
compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2

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

@@ -1,6 +1,6 @@
MossdeepCity_StevensHouse_MapScripts:: @ 8222784
map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_2227A8
map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0
.byte 0
@@ -12,7 +12,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
setmetatile 6, 4, 753, 1
return
MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8
MossdeepCity_StevensHouse_OnTransition: @ 82227A8
compare VAR_STEVENS_HOUSE_STATE, 2
call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4
end

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

@@ -1,9 +1,9 @@
MtChimney_MapScripts:: @ 822EDC1
map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2
map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_22EDCC
map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_OnTransition
.byte 0
MtChimney_MapScript1_22EDCC: @ 822EDCC
MtChimney_OnTransition: @ 822EDCC
setvar VAR_JAGGED_PASS_ASH_WEATHER, 1
end

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

@@ -1,9 +1,9 @@
MtChimney_CableCarStation_MapScripts:: @ 822ABFA
map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_22AC05
map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D
.byte 0
MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05
MtChimney_CableCarStation_OnTransition: @ 822AC05
compare VAR_CABLE_CAR_STATION_STATE, 1
call_if_eq MtChimney_CableCarStation_EventScript_22AC11
end

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

@@ -1,8 +1,8 @@
MtPyre_Exterior_MapScripts:: @ 8231FCC
map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_231FD2
map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_OnTransition
.byte 0
MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2
MtPyre_Exterior_OnTransition: @ 8231FD2
call MtPyre_Exterior_EventScript_231FD8
end

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

@@ -1,8 +1,8 @@
MtPyre_Summit_MapScripts:: @ 8231FF7
map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD
map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_OnTransition
.byte 0
MtPyre_Summit_MapScript1_231FFD: @ 8231FFD
MtPyre_Summit_OnTransition: @ 8231FFD
compare VAR_MT_PYRE_STATE, 2
call_if_eq MtPyre_Summit_EventScript_232009
end

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

@@ -1,9 +1,9 @@
NavelRock_Bottom_MapScripts:: @ 8269255
map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_269260
map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_OnTransition
map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284
.byte 0
NavelRock_Bottom_MapScript1_269260: @ 8269260
NavelRock_Bottom_OnTransition: @ 8269260
call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269273
call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269277
end

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

@@ -1,8 +1,8 @@
NavelRock_Exterior_MapScripts:: @ 82690B2
map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_MapScript1_2690B8
map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_OnTransition
.byte 0
NavelRock_Exterior_MapScript1_2690B8: @ 82690B8
NavelRock_Exterior_OnTransition: @ 82690B8
setflag FLAG_ARRIVED_AT_NAVEL_ROCK
end

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

@@ -1,9 +1,9 @@
NavelRock_Top_MapScripts:: @ 8269113
map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_MapScript1_26911E
map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_OnTransition
map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151
.byte 0
NavelRock_Top_MapScript1_26911E: @ 826911E
NavelRock_Top_OnTransition: @ 826911E
call_if_set FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_269131
call_if_unset FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_26913A
end

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

@@ -1,6 +1,6 @@
NewMauville_Inside_MapScripts:: @ 82373D7
map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_23741B
map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_OnTransition
map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D
.byte 0
@@ -19,7 +19,7 @@ NewMauville_Inside_EventScript_237407:: @ 8237407
removeobject VAR_LAST_TALKED
return
NewMauville_Inside_MapScript1_23741B: @ 823741B
NewMauville_Inside_OnTransition: @ 823741B
setvar VAR_TEMP_1, 0
setvar VAR_TEMP_2, 0
call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_237441

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

@@ -1,8 +1,8 @@
OldaleTown_MapScripts:: @ 81E8EA2
map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_1E8EA8
map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_OnTransition
.byte 0
OldaleTown_MapScript1_1E8EA8: @ 81E8EA8
OldaleTown_OnTransition: @ 81E8EA8
call Common_EventScript_SetupRivalGender
setflag FLAG_VISITED_OLDALE_TOWN
call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2

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

@@ -1,9 +1,9 @@
OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_1FC011
map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30
.byte 0
OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011
OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011
setrespawn HEAL_LOCATION_OLDALE_TOWN
call OldaleTown_PokemonCenter_1F_EventScript_2718DE
end

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

@@ -2,7 +2,7 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D

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

@@ -1,9 +1,9 @@
PacifidlogTown_MapScripts:: @ 81EBAB1
map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_1EBABC
map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_OnTransition
map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0
.byte 0
PacifidlogTown_MapScript1_1EBABC: @ 81EBABC
PacifidlogTown_OnTransition: @ 81EBABC
setflag FLAG_VISITED_PACIFIDLOG_TOWN
end

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

@@ -1,9 +1,9 @@
PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2
map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30
.byte 0
PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2
PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2
setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN
end

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

@@ -2,7 +2,7 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635
map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C
map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE
map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF
map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition
.byte 0
PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A

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

@@ -1,9 +1,9 @@
PetalburgCity_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_1DC2D7
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C
.byte 0
PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7
PetalburgCity_OnTransition: @ 81DC2D7
setflag FLAG_VISITED_PETALBURG_CITY
compare VAR_PETALBURG_STATE, 0
call_if_eq PetalburgCity_EventScript_1DC307

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

@@ -1,11 +1,11 @@
PetalburgCity_Gym_MapScripts:: @ 8204889
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_20489E
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A
.byte 0
PetalburgCity_Gym_MapScript1_20489E: @ 820489E
PetalburgCity_Gym_OnTransition: @ 820489E
compare VAR_PETALBURG_GYM_STATE, 6
goto_if_eq PetalburgCity_Gym_EventScript_2048B5
compare VAR_PETALBURG_GYM_STATE, 7

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