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

Merge branch 'master' into main-menu-state-machine

Browse Source
This commit is contained in:
Phlosioneer
2019-02-26 22:34:42 -05:00
parent 6cb4c677cd 231355f84d
commit 72bb0daccb
457 changed files with 17619 additions and 23557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7290
asm/easy_chat.s
View File

File diff suppressed because it is too large Load Diff

1204
asm/pokenav.s
View File

File diff suppressed because it is too large Load Diff

480
data/easy_chat.s
View File

@@ -1,480 +0,0 @@
#include "constants/easy_chat.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_08597530:: @ 8597530
.4byte 0x0000001a
.4byte sub_811A8CC
.4byte 0x00000019
.4byte sub_811A8F0
.4byte 0x0000001c
.4byte sub_811A914
.4byte 0x0000001b
.4byte sub_811A938
gEasyChatScreenTemplates:: @ 8597550
.byte 0x00, 0x02, 0x02, 0x00
.align 2
.4byte gText_Profile
.4byte gText_CombineFourWordsOrPhrases
.4byte gText_AndMakeYourProfile
.4byte gText_YourProfile
.4byte gText_IsAsShownOkay
.byte 0x01, 0x02, 0x03, 0x01
.align 2
.4byte gText_AtTheBattlesStart
.4byte gText_CombineSixWordsOrPhrases
.4byte gText_AndMakeAMessage
.4byte gText_YourFeelingAtTheBattlesStart
.4byte gText_IsAsShownOkay
.byte 0x02, 0x02, 0x03, 0x01
.align 2
.4byte gText_UponWinningABattle
.4byte gText_CombineSixWordsOrPhrases
.4byte gText_AndMakeAMessage
.4byte gText_WhatYouSayIfYouWin
.4byte gText_IsAsShownOkay
.byte 0x03, 0x02, 0x03, 0x01
.align 2
.4byte gText_UponLosingABattle
.4byte gText_CombineSixWordsOrPhrases
.4byte gText_AndMakeAMessage
.4byte gText_WhatYouSayIfYouLose
.4byte gText_IsAsShownOkay
.byte 0x04, 0x02, 0x05, 0x02
.align 2
.4byte NULL
.4byte gText_CombineNineWordsOrPhrases
.4byte gText_AndMakeAMessage2
.4byte gText_TheMailMessage
.4byte gText_IsAsShownOkay
.byte 0x05, 0x02, 0x02, 0x05
.align 2
.4byte gText_Interview
.4byte gText_CombineFourWordsOrPhrases
.4byte gText_LetsReplyToTheInterview
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x06, 0x02, 0x03, 0x01
.align 2
.4byte gText_TheBardsSong
.4byte gText_ChangeJustOneWordOrPhrase
.4byte gText_AndImproveTheBardsSong
.4byte gText_TheBardsSong2
.4byte gText_IsAsShownOkay
.byte 0x07, 0x01, 0x01, 0x04
.align 2
.4byte gText_Interview
.4byte gText_FindWordsThatDescribeYour
.4byte gText_FeelingsRightNow
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x09, 0x02, 0x01, 0x03
.align 2
.4byte gText_WhatsHipAndHappening
.4byte gText_CombineTwoWordsOrPhrases
.4byte gText_AndMakeATrendySaying
.4byte gText_TheTrendySaying
.4byte gText_IsAsShownOkay
.byte 0x10, 0x02, 0x05, 0x87
.align 2
.4byte NULL
.4byte gText_AfterYouHaveReadTheQuiz
.4byte gText_QuestionPressTheAButton
.4byte NULL
.4byte NULL
.byte 0x0f, 0x01, 0x01, 0x86
.align 2
.4byte gText_TheQuizAnswerIs
.4byte gText_OutOfTheListedChoices
.4byte gText_SelectTheAnswerToTheQuiz
.4byte gText_TheAnswerColon
.4byte gText_IsAsShownOkay
.byte 0x11, 0x02, 0x05, 0x88
.align 2
.4byte NULL
.4byte gText_CombineNineWordsOrPhrases
.4byte gText_AndCreateAQuiz
.4byte gText_IsThisQuizOK
.4byte NULL
.byte 0x12, 0x01, 0x01, 0x86
.align 2
.4byte gText_TheQuizAnswerIs
.4byte gText_PickAWordOrPhraseAnd
.4byte gText_SetTheQuizAnswer
.4byte gText_IsThisQuizOK
.4byte NULL
.byte 0x06, 0x02, 0x03, 0x01
.align 2
.4byte gText_TheBardsSong
.4byte gText_ChangeJustOneWordOrPhrase
.4byte gText_AndImproveTheBardsSong
.4byte gText_TheBardsSong2
.4byte gText_IsAsShownOkay
.byte 0x13, 0x02, 0x03, 0x01
.align 2
.4byte gText_ApprenticesPhrase
.4byte gText_FindWordsWhichFit
.4byte gText_TheTrainersImage
.4byte gText_ApprenticePhrase
.4byte gText_IsAsShownOkay
.byte 0x0d, 0x02, 0x01, 0x03
.align 2
.4byte gText_GoodSaying
.4byte gText_CombineTwoWordsOrPhrases2
.4byte gText_ToTeachHerAGoodSaying
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x0a, 0x01, 0x01, 0x04
.align 2
.4byte gText_Interview
.4byte gText_FindWordsThatDescribeYour
.4byte gText_FeelingsRightNow
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x0c, 0x01, 0x01, 0x04
.align 2
.4byte gText_Interview
.4byte gText_FindWordsThatDescribeYour
.4byte gText_FeelingsRightNow
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x0b, 0x01, 0x01, 0x04
.align 2
.4byte gText_Interview
.4byte gText_FindWordsThatDescribeYour
.4byte gText_FeelingsRightNow
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
.byte 0x0e, 0x01, 0x01, 0x04
.align 2
.4byte gText_FansQuestion
.4byte gText_FindWordsWhichFit
.4byte gText_TheTrainersImage
.4byte gText_TheImage
.4byte gText_IsAsShownOkay
.byte 0x14, 0x02, 0x02, 0x00
.align 2
.4byte gText_Questionnaire
.4byte gText_CombineFourWordsOrPhrases
.4byte gText_AndFillOutTheQuestionnaire
.4byte gText_TheAnswer
.4byte gText_IsAsShownOkay
gUnknown_08597748:: @ 8597748
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00
.byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00
.byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13
.byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
gUnknown_08597764:: @ 8597764
.2byte 0x0209, 0x140b, 0x1030, 0x102a
gUnknown_0859776C:: @ 859776C
.2byte 0x1240, 0x0628
.2byte 0x061f, 0x2204
.2byte 0x1422, 0x0197
.2byte 0x0415, 0x0198
.2byte 0x2207, 0x0449
.align 2
gUnknown_08597780:: @ 8597780
.incbin "graphics/misc/interview_triangle_cursor.gbapal"
.align 2
gUnknown_085977A0:: @ 85977A0
.incbin "graphics/misc/interview_triangle_cursor.4bpp"
.align 2
gUnknown_085977C0:: @ 85977C0
.incbin "graphics/misc/interview_arrow.4bpp"
.align 2
gUnknown_085978C0:: @ 85978C0
.incbin "graphics/misc/interview_buttons.4bpp"
.align 2
gUnknown_085979C0:: @ 85979C0
.incbin "graphics/misc/interview_frame.gbapal"
.align 2
gUnknown_085979E0:: @ 85979E0
.incbin "graphics/misc/interview_frame.4bpp.lz"
.align 2
gUnknown_08597B14:: @ 8597B14
.incbin "graphics/misc/interview_frame_orange.gbapal"
.align 2
gUnknown_08597B34:: @ 8597B34
.incbin "graphics/misc/interview_frame_green.gbapal"
.align 2
gUnknown_08597B54:: @ 8597B54
.incbin "graphics/misc/interview_frame_2.4bpp.lz"
.align 2
gUnknown_08597C1C:: @ 8597C1C
.incbin "graphics/misc/8597C1C.gbapal"
.align 2
gUnknown_08597C24:: @ 8597C24
.incbin "graphics/misc/8597C24.gbapal"
gUnknown_08597C30:: @ 8597C30
.byte 0x83, 0x18, 0x04, 0x00, 0x63, 0x18, 0x06, 0x00, 0x03, 0x18, 0x0a, 0x00, 0xa3, 0x18, 0x02, 0x00, 0xb0, 0x0c, 0x02, 0x00, 0x83, 0x18, 0x04, 0x00, 0x89, 0x0c, 0x02, 0x01, 0x65, 0x14, 0x0a, 0x03
.byte 0x03, 0x18, 0x0a, 0x02
.align 2
gUnknown_08597C54:: @ 8597C54
.4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb
.align 2
gUnknown_08597C64:: @ 8597C64
window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a
window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000
null_window_template
.align 2
gUnknown_08597C84:: @ 8597C84
window_template 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x006a
gUnknown_08597C8C:: @ 8597C8C
.string "{CLEAR 17}$"
.align 2
gUnknown_08597C90:: @ 8597C90
.4byte gUnknown_862B810
.4byte gUnknown_862B832
.4byte gUnknown_862B84B
.4byte gUnknown_862B86C
.align 2
gUnknown_08597CA0:: @ 8597CA0
obj_tiles gUnknown_085977A0, 0x0020, 0x0000
obj_tiles gUnknown_085977C0, 0x0100, 0x0002
obj_tiles gUnknown_085978C0, 0x0100, 0x0003
null_obj_tiles
.align 2
gUnknown_08597CC0:: @ 8597CC0
obj_pal gUnknown_08597780, 0x0000
obj_pal gEasyChatCursor_Pal, 0x0001
obj_pal gEasyChatRightWindow_Pal, 0x0002
obj_pal gUnknown_085979C0, 0x0003
null_obj_pal
.align 2
gUnknown_08597CE8:: @ 8597CE8
obj_tiles gUnknown_085979E0, 0x0800, 0x0005
obj_tiles gEasyChatCursor_Gfx, 0x1000, 0x0001
obj_tiles gEasyChatRightWindow_Gfx, 0x0800, 0x0006
obj_tiles gEasyChatMode_Gfx, 0x1000, 0x0004
gUnknown_08597D08:: @ 8597D08
.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00
.align 2
gOamData_8597D10:: @ 8597D10
.2byte 0x0000
.2byte 0x0000
.2byte 0x0C00
.align 2
gUnknown_08597D18:: @ 8597D18
spr_template 0x0000, 0x0000, gOamData_8597D10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811DF28
.align 2
gUnknown_08597D30:: @ 8597D30
.2byte 0x4000, 0xc000, 0x0400, 0x0000
.align 2
gUnknown_08597D38:: @ 8597D38
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D40:: @ 8597D40
.2byte 0x0020, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D48:: @ 8597D48
.2byte 0x0040, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D50:: @ 8597D50
.2byte 0x0060, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D58:: @ 8597D58
.4byte gUnknown_08597D38
.4byte gUnknown_08597D40
.4byte gUnknown_08597D48
.4byte gUnknown_08597D50
.align 2
gUnknown_08597D68:: @ 8597D68
spr_template 0x0001, 0x0001, gUnknown_08597D30, gUnknown_08597D58, NULL, gDummySpriteAffineAnimTable, sub_811DF28
.align 2
gUnknown_08597D80:: @ 8597D80
.2byte 0x4000, 0xc000, 0x0400, 0x0000
.align 2
gUnknown_08597D88:: @ 8597D88
.2byte 0x0060, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597D90:: @ 8597D90
.2byte 0x0040, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08597D9C:: @ 8597D9C
.2byte 0x0040, 0x0004, 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08597DA8:: @ 8597DA8
.2byte 0x0040, 0x0004, 0x0060, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597DB4:: @ 8597DB4
.2byte 0x0040, 0x0004, 0xffff, 0x0000
.align 2
gUnknown_08597DBC:: @ 8597DBC
.4byte gUnknown_08597D88
.4byte gUnknown_08597D90
.4byte gUnknown_08597D9C
.4byte gUnknown_08597DA8
.4byte gUnknown_08597DB4
.align 2
gUnknown_08597DD0:: @ 8597DD0
spr_template 0x0004, 0x0002, gUnknown_08597D80, gUnknown_08597DBC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08597DE8:: @ 8597DE8
.2byte 0x0000, 0xc000, 0x0c00, 0x0000
.align 2
gUnknown_08597DF0:: @ 8597DF0
spr_template 0x0006, 0x0002, gUnknown_08597DE8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08597E08:: @ 8597E08
.2byte 0x4000, 0x4000, 0x0400, 0x0000
.align 2
gUnknown_08597E10:: @ 8597E10
.2byte 0x0000, 0x4000, 0x0400, 0x0000
.align 2
gUnknown_08597E18:: @ 8597E18
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597E20:: @ 8597E20
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_08597E28:: @ 8597E28
.4byte gUnknown_08597E18
.4byte gUnknown_08597E20
.align 2
gUnknown_08597E30:: @ 8597E30
spr_template 0x0003, 0x0002, gUnknown_08597E08, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08597E48:: @ 8597E48
spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_08597E60:: @ 8597E60
.byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa
.align 2
gUnknown_08597E6C:: @ 8597E6C
.4byte gText_DelAll
.4byte gText_Cancel5
.4byte gText_Ok2
.4byte NULL
.4byte gText_DelAll
.4byte gText_Cancel5
.4byte gText_Ok2
.4byte gText_Quiz
.4byte gText_DelAll
.4byte gText_Cancel5
.4byte gText_Ok2
.4byte gText_Answer
@ 8597E9C
.include "data/text/easy_chat/easy_chat_groups.inc"
@ 859D0B4
.include "data/text/easy_chat/easy_chat_words_by_letter.inc"
@ 859E5D4
.include "data/text/easy_chat/easy_chat_group_name_pointers.inc"
gUnknown_0859E62C:: @ 859E62C
.2byte 0x0a29, 0x1020, 0x020e, 0x0a33
gUnknown_0859E634:: @ 859E634
.2byte 0x100f, 0x0a02, 0x0e25, 0x0c03, 0x0803, 0x0c00
gUnknown_0859E640:: @ 859E640
.2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01
gUnknown_0859E64C:: @ 859E64C
.2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04
gUnknown_0859E658:: @ 859E658
.2byte 0x019a, 0x0000

670
data/event_scripts.s
View File

File diff suppressed because it is too large Load Diff

1
data/map_events.s
View File

@@ -3,6 +3,7 @@
#include "constants/event_objects.h"
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/map_scripts.h"
#include "constants/maps.h"
#include "constants/secret_bases.h"
#include "constants/vars.h"

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

@@ -1,6 +1,6 @@
AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84
map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F
map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F
map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98
.byte 0
AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F

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

@@ -1,5 +1,5 @@
AbandonedShip_Deck_MapScripts:: @ 823799A
map_script 3, AbandonedShip_Deck_MapScript1_2379A0
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0
.byte 0
AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0

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

@@ -1,6 +1,6 @@
AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C
map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977
map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977
map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980
.byte 0
AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977

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

@@ -1,5 +1,5 @@
AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49
map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F
map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F
.byte 0
AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F

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

@@ -1,5 +1,5 @@
AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7
map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD
.byte 0
AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD

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

@@ -1,5 +1,5 @@
AbandonedShip_Underwater1_MapScripts:: @ 8238096
map_script 5, AbandonedShip_Underwater1_MapScript1_23809C
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C
.byte 0
AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C

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

@@ -1,5 +1,5 @@
AbandonedShip_Underwater2_MapScripts:: @ 823895D
map_script 5, AbandonedShip_Underwater2_MapScript1_238963
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963
.byte 0
AbandonedShip_Underwater2_MapScript1_238963: @ 8238963

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

@@ -1,5 +1,5 @@
AlteringCave_MapScripts:: @ 823B177
map_script 3, AlteringCave_MapScript1_23B17D
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D
.byte 0
AlteringCave_MapScript1_23B17D: @ 823B17D

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

@@ -1,7 +1,7 @@
AncientTomb_MapScripts:: @ 8238FB3
map_script 5, AncientTomb_MapScript1_238FC3
map_script 1, AncientTomb_MapScript1_238FF2
map_script 3, AncientTomb_MapScript1_238FE1
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
.byte 0
AncientTomb_MapScript1_238FC3: @ 8238FC3
@@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
AncientTomb_EventScript_238FCD:: @ 8238FCD
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne AncientTomb_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

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

@@ -1,6 +1,6 @@
AquaHideout_B1F_MapScripts:: @ 82339A7
map_script 5, AquaHideout_B1F_MapScript1_2339B2
map_script 3, AquaHideout_B1F_MapScript1_2339D0
map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0
.byte 0
AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
@@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne AquaHideout_B1F_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

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

@@ -1,5 +1,5 @@
AquaHideout_B2F_MapScripts:: @ 8233DCF
map_script 3, AquaHideout_B2F_MapScript1_233DD5
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5
.byte 0
AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
@@ -14,9 +14,9 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
lockall
setvar VAR_0x8008, 1
playse SE_PIN
applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598
applymovement VAR_0x8008, Common_Movement_ExclamationMark
waitmovement 0
applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
applymovement VAR_0x8008, Common_Movement_FacePlayer
waitmovement 0
setvar VAR_TEMP_1, 1
releaseall
@@ -31,19 +31,19 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09
AquaHideout_B2F_EventScript_233E25:: @ 8233E25
setvar VAR_0x8008, 1
setvar VAR_0x8009, 4
applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
waitmovement 0
delay 20
applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
applymovement VAR_0x8008, Common_Movement_FacePlayer
waitmovement 0
msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
waitmovement 0
removeobject VAR_0x8009
delay 20
applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
applymovement VAR_0x8008, Common_Movement_FacePlayer
waitmovement 0
msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE

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

@@ -1,5 +1,5 @@
ArtisanCave_B1F_MapScripts:: @ 823AFAD
map_script 3, ArtisanCave_B1F_MapScript1_23AFB3
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3
.byte 0
ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3

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

@@ -1,8 +1,8 @@
BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0
map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2
map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C
map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C
.byte 0
BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C

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

@@ -1,5 +1,5 @@
BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9
map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF
.byte 0
BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF

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

@@ -1,6 +1,6 @@
BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36
map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55
map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C55
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C41
.byte 0
BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
@@ -199,7 +199,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
special LoadPlayerParty
closemessage
delay 2
call BattleFrontier_BattleArenaLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1

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

@@ -1,8 +1,8 @@
BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1
map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00
map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481
map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0
.byte 0
BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
@@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
random 2
copyvar VAR_TEMP_D, VAR_RESULT
compare VAR_TEMP_D, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
setobjectxyperm 6, 2, 0
setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
compare VAR_TEMP_D, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
return

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

@@ -1,5 +1,5 @@
BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
.byte 0
BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104

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

@@ -1,7 +1,7 @@
BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F
map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
.byte 0
BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
@@ -248,7 +248,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
special LoadPlayerParty
closemessage
delay 2
call BattleFrontier_BattleDomeLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A

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

@@ -1,6 +1,6 @@
BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9
map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218
map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204
.byte 0
BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204

18
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
View File

@@ -1,7 +1,7 @@
BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB
map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00
map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31
.byte 0
BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
@@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA
end
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
applymovement 1, Common_Movement_WalkInPlaceRight
applymovement 3, Common_Movement_WalkInPlaceRight
applymovement 4, Common_Movement_WalkInPlaceRight
applymovement 5, Common_Movement_WalkInPlaceLeft
applymovement 6, Common_Movement_WalkInPlaceLeft
applymovement 7, Common_Movement_WalkInPlaceLeft
waitmovement 0
return

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

@@ -1,6 +1,6 @@
BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8
map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407
map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_258407
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3
.byte 0
BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
@@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
special CallFrontierUtilFunc
closemessage
delay 2
call BattleFrontier_BattleFactoryLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783

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

@@ -1,6 +1,6 @@
BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA
map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF
map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5
.byte 0
BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5

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

@@ -1,7 +1,7 @@
BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825
map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861
map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34
.byte 0
BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
@@ -280,8 +280,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
waitmovement 0
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
applymovement 1, Common_Movement_WalkInPlaceRight
applymovement 3, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -323,8 +323,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
waitmovement 0
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
applymovement 1, Common_Movement_WalkInPlaceRight
applymovement 3, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28

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

@@ -1,5 +1,5 @@
BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3
map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9
.byte 0
BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9

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

@@ -1,6 +1,6 @@
BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E
map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D
map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D789
.byte 0
BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
@@ -223,7 +223,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
special LoadPlayerParty
closemessage
delay 2
call BattleFrontier_BattlePalaceLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A

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

@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
.byte 0
BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C

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

@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6
map_script 2, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1
map_script 4, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6D1
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_MapScript2_25B6F3
.byte 0
BattleFrontier_BattlePikeLobby_MapScript2_25B6D1: @ 825B6D1
@@ -195,7 +195,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
special LoadPlayerParty
closemessage
delay 2
call BattleFrontier_BattlePikeLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
setvar VAR_0x8004, 26
special CallBattlePikeFunction

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

@@ -1,8 +1,8 @@
BattleFrontier_BattlePikeRandomRoom1_MapScripts:: @ 825D152
map_script 5, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E
map_script 3, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25
map_script 2, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167
map_script 4, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C423E
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRandomRoom1_MapScript1_2C3E25
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE
.byte 0
BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167

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

@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeRandomRoom2_MapScripts:: @ 825E392
map_script 2, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D
map_script 4, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE
.byte 0
BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E39D: @ 825E39D

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

@@ -1,7 +1,7 @@
BattleFrontier_BattlePikeRandomRoom3_MapScripts:: @ 825E41A
map_script 5, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A
map_script 2, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A
map_script 4, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E466
.byte 0
BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A

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

@@ -1,7 +1,7 @@
BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843
map_script 5, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E
map_script 2, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853
map_script 4, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C87D
.byte 0
BattleFrontier_BattlePikeThreePathRoom_MapScript2_25C853: @ 825C853

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

@@ -1,7 +1,7 @@
BattleFrontier_BattlePyramidEmptySquare_MapScripts:: @ 8252A33
map_script 5, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2
map_script 2, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43
map_script 3, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA
.byte 0
BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43

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

@@ -1,6 +1,6 @@
BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716
map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735
map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_250735
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB
.byte 0
BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721
@@ -200,7 +200,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
special LoadPlayerParty
closemessage
delay 2
call BattleFrontier_BattlePyramidLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA
@@ -260,7 +260,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC
BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE
lockall
applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E
applymovement 2, Common_Movement_FacePlayer
waitmovement 0
msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT
call BattleFrontier_BattlePyramidLobby_EventScript_250AF0

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

@@ -1,8 +1,8 @@
BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
map_script 5, BattleFrontier_BattlePyramidTop_MapScript1_2550F4
map_script 2, BattleFrontier_BattlePyramidTop_MapScript2_25516E
map_script 3, BattleFrontier_BattlePyramidTop_MapScript1_2550B6
map_script 4, BattleFrontier_BattlePyramidTop_MapScript2_2550CE
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_MapScript1_2550F4
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_25516E
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_MapScript1_2550B6
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_MapScript2_2550CE
.byte 0
BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6

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

@@ -1,6 +1,6 @@
BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40
map_script 2, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62
map_script 4, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B
.byte 0
BattleFrontier_BattleTowerBattleRoom_MapScript2_241B4B: @ 8241B4B
@@ -233,9 +233,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6
waitmovement 0
playse SE_PIN
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_272598
applymovement 2, Common_Movement_ExclamationMark
waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_27259A
applymovement 2, Common_Movement_Delay48
waitmovement 0
applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2421A6
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_2421AB

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

@@ -1,7 +1,7 @@
BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8
map_script 3, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
map_script 4, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
map_script 2, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43
.byte 0
BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8

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

@@ -1,6 +1,6 @@
BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
map_script 1, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5
map_script 2, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6
map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_MapScript1_241AB5
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_MapScript2_241AE6
.byte 0
BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5

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

@@ -1,7 +1,7 @@
BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A
map_script 3, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A
map_script 4, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95
map_script 2, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248D95
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor2_MapScript2_248DB2
.byte 0
BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A
@@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5
waitmovement 0
delay 40
applymovement 3, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_2725A6
applymovement 3, Common_Movement_WalkInPlaceUp
applymovement 2, Common_Movement_WalkInPlaceUp
waitmovement 0
opendoor 7, 1
waitdooranim

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

@@ -1,6 +1,6 @@
BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB
map_script 2, BattleFrontier_BattleTowerElevator_MapScript2_2419E6
map_script 4, BattleFrontier_BattleTowerElevator_MapScript2_241A96
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_2419E6
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_MapScript2_241A96
.byte 0
BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6

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

@@ -1,8 +1,8 @@
BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
map_script 5, BattleFrontier_BattleTowerLobby_MapScript1_23E690
map_script 3, BattleFrontier_BattleTowerLobby_MapScript1_23E694
map_script 2, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD
map_script 4, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_MapScript1_23E690
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_MapScript1_23E694
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6DD
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_MapScript2_23E6C9
.byte 0
BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
@@ -231,7 +231,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
end
BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930
setvar VAR_0x40BC, 1
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
return
BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936
@@ -300,12 +300,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
special LoadPlayerParty
closemessage
delay 2
call BattleFrontier_BattleTowerLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
setvar VAR_0x40BC, 1
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -380,12 +380,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
special LoadPlayerParty
closemessage
delay 2
call BattleFrontier_BattleTowerLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -461,12 +461,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
special LoadPlayerParty
closemessage
delay 2
call BattleFrontier_BattleTowerLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
incrementgamestat 30
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
end
@@ -544,7 +544,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
setvar VAR_0x8004, 6
setvar VAR_0x8005, 0
special sub_8161F74
call BattleFrontier_BattleTowerLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
@@ -995,7 +995,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6
BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
incrementgamestat 30
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
message BattleFrontier_BattleTowerLobby_Text_24144D
waitmessage
setvar VAR_0x8004, 6
@@ -1058,7 +1058,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
incrementgamestat 30
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
message BattleFrontier_BattleTowerLobby_Text_24144D
waitmessage
setvar VAR_0x8004, 6

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

@@ -1,8 +1,8 @@
BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
map_script 5, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7
map_script 3, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0
map_script 4, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14
map_script 2, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23
.byte 0
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
@@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
waitmovement 0
moveobjectoffscreen 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT
special HealPlayerParty
@@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5
msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT
closemessage
applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6
applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
opendoor 10, 1
waitdooranim

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

@@ -198,7 +198,7 @@ BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1
BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1
closemessage
applymovement VAR_LAST_TALKED, BattleFrontier_Lounge3_Movement_2725A2
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end

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

@@ -36,7 +36,7 @@ BattleFrontier_Mart_EventScript_267B02:: @ 8267B02
BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B
lock
applymovement 2, BattleFrontier_Mart_Movement_2725B0
applymovement 2, Common_Movement_FaceDown
waitmovement 0
msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT
release

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

@@ -515,7 +515,7 @@
"y": 51,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_OutsideEast_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -523,7 +523,7 @@
"y": 51,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_OutsideEast_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
}
]
}

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

@@ -1,6 +1,6 @@
BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F
map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_MapScript1_242C0F
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_MapScript1_242C2D
.byte 0
BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
@@ -10,12 +10,12 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F
end

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

@@ -444,7 +444,7 @@
"y": 51,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_OutsideWest_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
},
{
"type": "sign",
@@ -452,7 +452,7 @@
"y": 51,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "BattleFrontier_OutsideWest_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
}
]
}

20
data/maps/BattleFrontier_OutsideWest/scripts.inc
View File

@@ -1,9 +1,9 @@
BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
map_script 3, BattleFrontier_OutsideWest_MapScript1_23D3E7
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_MapScript1_23D3E7
.byte 0
BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
setvar VAR_0x40BC, 0
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
end
@@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
closemessage
applymovement VAR_LAST_TALKED, BattleFrontier_OutsideWest_Movement_2725AA
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
waitmovement 0
delay 30
hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
@@ -105,7 +105,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518
faceplayer
message BattleFrontier_OutsideWest_Text_23DA60
waitmessage
applymovement 18, BattleFrontier_OutsideWest_Movement_2725A0
applymovement 18, Common_Movement_FaceAwayPlayer
waitmovement 0
waitbuttonpress
release
@@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
end
BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8
applymovement 9, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT
applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4
applymovement 10, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT
closemessage
delay 25
applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6
applymovement 10, BattleFrontier_OutsideWest_Movement_2725A6
applymovement 9, Common_Movement_WalkInPlaceUp
applymovement 10, Common_Movement_WalkInPlaceUp
waitmovement 0
release
end
@@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
end
BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
applymovement 14, BattleFrontier_OutsideWest_Movement_2725A6
applymovement 14, Common_Movement_WalkInPlaceUp
waitmovement 0
return
@@ -298,7 +298,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7
faceplayer
msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT
closemessage
applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2
applymovement 23, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end

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

@@ -1,6 +1,6 @@
BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
map_script 3, BattleFrontier_PokemonCenter_1F_MapScript1_267904
map_script 5, BattleFrontier_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30
.byte 0
BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904

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

@@ -1,8 +1,8 @@
BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B
map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C
map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE
map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF
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
.byte 0
BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9

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

@@ -1,6 +1,6 @@
BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
map_script 2, BattleFrontier_ReceptionGate_MapScript2_2661E9
map_script 3, BattleFrontier_ReceptionGate_MapScript1_2661E5
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_MapScript2_2661E9
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_MapScript1_2661E5
.byte 0
BattleFrontier_ReceptionGate_MapScript1_2661E5: @ 82661E5
@@ -15,9 +15,9 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3
lockall
setvar VAR_0x40D0, 1
playse SE_PIN
applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
applymovement 1, Common_Movement_ExclamationMark
waitmovement 0
applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A
applymovement 1, Common_Movement_Delay48
waitmovement 0
msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT
closemessage
@@ -38,14 +38,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT
closemessage
applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6
applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_2725A6
applymovement 1, Common_Movement_WalkInPlaceUp
applymovement 2, Common_Movement_WalkInPlaceUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
playse SE_PIN
applymovement 1, BattleFrontier_ReceptionGate_Movement_272598
applymovement 2, BattleFrontier_ReceptionGate_Movement_272598
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_272598
applymovement 1, Common_Movement_ExclamationMark
applymovement 2, Common_Movement_ExclamationMark
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
waitmovement 0
msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT
closemessage

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

@@ -181,7 +181,7 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
compare VAR_FACING, 3
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E
applymovement 1, Common_Movement_FacePlayer
waitmovement 0
msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT
compare VAR_0x40D1, 13
@@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
end
BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13
applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A6
applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
return
BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E
applymovement 1, BattleFrontier_ScottsHouse_Movement_2725AA
applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0
return
BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29
applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A8
applymovement 1, Common_Movement_WalkInPlaceRight
waitmovement 0
return
BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34
applymovement 1, BattleFrontier_ScottsHouse_Movement_2725A4
applymovement 1, Common_Movement_WalkInPlaceLeft
waitmovement 0
return

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

@@ -1,7 +1,7 @@
BirthIsland_Exterior_MapScripts:: @ 8267F15
map_script 3, BirthIsland_Exterior_MapScript1_267F29
map_script 5, BirthIsland_Exterior_MapScript1_267F65
map_script 7, BirthIsland_Exterior_MapScript1_267F25
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29
map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25
.byte 0
BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
@@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
return
BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E
goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn
clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
clearflag FLAG_DEOXYS_ROCK_COMPLETE
return
@@ -35,7 +35,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne BirthIsland_Exterior_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject 2
return

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

@@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D
goto_if_eq BirthIsland_Harbor_EventScript_2680A2
msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
waitmovement 0
delay 30
hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR

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

@@ -1,5 +1,5 @@
CaveOfOrigin_1F_MapScripts:: @ 8235768
map_script 3, CaveOfOrigin_1F_MapScript1_23576E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E
.byte 0
CaveOfOrigin_1F_MapScript1_23576E: @ 823576E

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

@@ -6,16 +6,16 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9
faceplayer
msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT
closemessage
applymovement 1, CaveOfOrigin_B1F_Movement_2725A6
applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 60
playse SE_PIN
applymovement 1, CaveOfOrigin_B1F_Movement_272598
applymovement 1, Common_Movement_ExclamationMark
waitmovement 0
applymovement 1, CaveOfOrigin_B1F_Movement_27259A
applymovement 1, Common_Movement_Delay48
waitmovement 0
delay 30
applymovement 1, CaveOfOrigin_B1F_Movement_27259E
applymovement 1, Common_Movement_FacePlayer
waitmovement 0
message CaveOfOrigin_B1F_Text_235ACE
waitmessage

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

@@ -1,5 +1,5 @@
CaveOfOrigin_Entrance_MapScripts:: @ 8235759
map_script 5, CaveOfOrigin_Entrance_MapScript1_23575F
map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_MapScript1_23575F
.byte 0
CaveOfOrigin_Entrance_MapScript1_23575F: @ 823575F

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

@@ -1,5 +1,5 @@
CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
map_script 3, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E
.byte 0
CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E

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

@@ -1,5 +1,5 @@
CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
map_script 3, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E
.byte 0
CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E

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

@@ -1,5 +1,5 @@
CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
map_script 3, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E
map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E
.byte 0
CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E

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

@@ -1,7 +1,7 @@
DesertRuins_MapScripts:: @ 822D95B
map_script 5, DesertRuins_MapScript1_22D96B
map_script 1, DesertRuins_MapScript1_22D989
map_script 3, DesertRuins_MapScript1_22D9CA
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
.byte 0
DesertRuins_MapScript1_22D96B: @ 822D96B
@@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B
DesertRuins_EventScript_22D975:: @ 822D975
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne DesertRuins_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

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

@@ -1,5 +1,5 @@
DesertUnderpass_MapScripts:: @ 823AF37
map_script 3, DesertUnderpass_MapScript1_23AF3D
map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_MapScript1_23AF3D
.byte 0
DesertUnderpass_MapScript1_23AF3D: @ 823AF3D

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

@@ -152,7 +152,7 @@
"y": 10,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "DewfordTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -160,7 +160,7 @@
"y": 10,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "DewfordTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",

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

@@ -1,5 +1,5 @@
DewfordTown_MapScripts:: @ 81E9507
map_script 3, DewfordTown_MapScript1_1E950D
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D
.byte 0
DewfordTown_MapScript1_1E950D: @ 81E950D
@@ -138,10 +138,10 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN
setvar VAR_0x408E, 2
setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
copyvar VAR_0x4096, VAR_0x8008
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
waitstate
release
end
@@ -177,7 +177,7 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790
call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799
closemessage
copyvar VAR_0x4096, VAR_0x8008
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority 2, MAP_ROUTE109
moveobjectoffscreen 2

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

@@ -1,5 +1,5 @@
DewfordTown_Gym_MapScripts:: @ 81FC63C
map_script 3, DewfordTown_Gym_MapScript1_1FC642
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642
.byte 0
DewfordTown_Gym_MapScript1_1FC642: @ 81FC642
@@ -169,12 +169,12 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
call DewfordTown_Gym_EventScript_1FC75D
message DewfordTown_Gym_Text_1FD07D
waitmessage
call DewfordTown_Gym_EventScript_27207E
call Common_EventScript_PlayGymBadgeFanfare
msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_DEWFORD_GYM
setflag FLAG_BADGE02_GET
addvar VAR_0x4085, 1
compare VAR_0x4085, 6
addvar VAR_PETALBURG_GYM_STATE, 1
compare VAR_PETALBURG_GYM_STATE, 6
call_if_eq DewfordTown_Gym_EventScript_271E84
setvar VAR_0x8008, 2
call DewfordTown_Gym_EventScript_271F43
@@ -195,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
giveitem_std ITEM_TM08
compare VAR_RESULT, 0
goto_if_eq DewfordTown_Gym_EventScript_27205E
goto_if_eq Common_EventScript_BagIsFull
msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM08
return
@@ -203,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
giveitem_std ITEM_TM08
compare VAR_RESULT, 0
goto_if_eq DewfordTown_Gym_EventScript_272054
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM08
release

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

@@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547
call DewfordTown_Hall_EventScript_271E8B
msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT
closemessage
applymovement 4, DewfordTown_Hall_Movement_2725A6
applymovement 4, Common_Movement_WalkInPlaceUp
waitmovement 0
release
end
@@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563
call DewfordTown_Hall_EventScript_271E8B
msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT
closemessage
applymovement 5, DewfordTown_Hall_Movement_2725A6
applymovement 5, Common_Movement_WalkInPlaceUp
waitmovement 0
release
end
@@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
compare VAR_FACING, 4
goto_if_eq DewfordTown_Hall_EventScript_1FD739
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
return
@@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
return
DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
return
DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725AA
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0
return
DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
compare VAR_FACING, 3
goto_if_eq DewfordTown_Hall_EventScript_1FD739
applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Hall_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
return
@@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT
giveitem_std ITEM_TM36
compare VAR_RESULT, 0
goto_if_eq DewfordTown_Hall_EventScript_272054
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM36
release
end

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

@@ -1,6 +1,6 @@
DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E
map_script 5, DewfordTown_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E
map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30
.byte 0
DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E

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

@@ -1,8 +1,8 @@
DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_276C3B
map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_276B6C
map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_276BBE
map_script 3, DewfordTown_PokemonCenter_2F_MapScript1_276ACF
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
.byte 0
DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A

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

@@ -166,7 +166,7 @@
"y": 48,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "EverGrandeCity_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -190,7 +190,7 @@
"y": 48,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "EverGrandeCity_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
}
]
}

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

@@ -1,9 +1,9 @@
EverGrandeCity_MapScripts:: @ 81E7D1B
map_script 3, EverGrandeCity_MapScript1_1E7D21
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21
.byte 0
EverGrandeCity_MapScript1_1E7D21: @ 81E7D21
call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_27207A
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
end
EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B

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

@@ -1,11 +1,11 @@
EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_2289FF
map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_228A05
map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_228A14
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF
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
call EverGrandeCity_ChampionsRoom_EventScript_271ED7
call Common_EventScript_SetupRivalGender
end
EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05
@@ -78,9 +78,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6
msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT
delay 40
playse SE_PIN
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
applymovement 2, Common_Movement_ExclamationMark
waitmovement 0
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
applymovement 2, Common_Movement_Delay48
waitmovement 0
call EverGrandeCity_ChampionsRoom_EventScript_228C12
msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT
@@ -91,9 +91,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB
msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT
delay 40
playse SE_PIN
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598
applymovement 2, Common_Movement_ExclamationMark
waitmovement 0
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A
applymovement 2, Common_Movement_Delay48
waitmovement 0
call EverGrandeCity_ChampionsRoom_EventScript_228C12
msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT
@@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30
addobject 3
applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT
call EverGrandeCity_ChampionsRoom_EventScript_272184
msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6
applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 20
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA
applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT
closemessage
delay 30
applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D
applymovement 3, EverGrandeCity_ChampionsRoom_Movement_2725A6
applymovement 3, Common_Movement_WalkInPlaceUp
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38
waitmovement 0
delay 20
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725AA
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT
checkplayergender
@@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4
EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
return

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

@@ -1,7 +1,7 @@
EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C
map_script 2, EverGrandeCity_DrakesRoom_MapScript2_2286BB
map_script 1, EverGrandeCity_DrakesRoom_MapScript1_2286D2
map_script 4, EverGrandeCity_DrakesRoom_MapScript2_227F3E
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E
.byte 0
EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC
@@ -13,19 +13,19 @@ EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6
end
EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB
map_script_2 VAR_0x409C, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5
map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5
.2byte 0
EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5
lockall
call EverGrandeCity_DrakesRoom_EventScript_272475
setvar VAR_0x409C, 4
setvar VAR_ELITE_4_STATE, 4
releaseall
end
EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2
call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7
compare VAR_0x409C, 4
compare VAR_ELITE_4_STATE, 4
call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED
end

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

@@ -1,7 +1,7 @@
EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412
map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_228431
map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_228448
map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_228422
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422
.byte 0
EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422
@@ -13,19 +13,19 @@ EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C
end
EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431
map_script_2 VAR_0x409C, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B
map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B
.2byte 0
EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B
lockall
call EverGrandeCity_GlaciasRoom_EventScript_272475
setvar VAR_0x409C, 3
setvar VAR_ELITE_4_STATE, 3
releaseall
end
EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448
call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D
compare VAR_0x409C, 3
compare VAR_ELITE_4_STATE, 3
call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463
end

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

@@ -1,5 +1,5 @@
EverGrandeCity_Hall1_MapScripts:: @ 8229569
map_script 4, EverGrandeCity_Hall1_MapScript2_22956F
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_MapScript2_22956F
.byte 0
EverGrandeCity_Hall1_MapScript2_22956F: @ 822956F

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

@@ -1,5 +1,5 @@
EverGrandeCity_Hall2_MapScripts:: @ 822957E
map_script 4, EverGrandeCity_Hall2_MapScript2_229584
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_MapScript2_229584
.byte 0
EverGrandeCity_Hall2_MapScript2_229584: @ 8229584

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

@@ -1,5 +1,5 @@
EverGrandeCity_Hall3_MapScripts:: @ 8229593
map_script 4, EverGrandeCity_Hall3_MapScript2_229599
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_MapScript2_229599
.byte 0
EverGrandeCity_Hall3_MapScript2_229599: @ 8229599

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

@@ -1,5 +1,5 @@
EverGrandeCity_Hall4_MapScripts:: @ 82295A8
map_script 4, EverGrandeCity_Hall4_MapScript2_2295AE
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_MapScript2_2295AE
.byte 0
EverGrandeCity_Hall4_MapScript2_2295AE: @ 82295AE

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

@@ -1,5 +1,5 @@
EverGrandeCity_Hall5_MapScripts:: @ 82295BD
map_script 4, EverGrandeCity_Hall5_MapScript2_2295C3
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_MapScript2_2295C3
.byte 0
EverGrandeCity_Hall5_MapScript2_2295C3: @ 82295C3

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

@@ -1,6 +1,6 @@
EverGrandeCity_HallOfFame_MapScripts:: @ 822982C
map_script 2, EverGrandeCity_HallOfFame_MapScript2_229846
map_script 4, EverGrandeCity_HallOfFame_MapScript2_229837
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_229846
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_229837
.byte 0
EverGrandeCity_HallOfFame_MapScript2_229837: @ 8229837
@@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901
waitmovement 0
applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4
applymovement 1, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT
closemessage
@@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908
waitmovement 0
delay 20
applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A4
applymovement 1, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
waitmovement 0
msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT
closemessage
applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_2725A6
applymovement 1, Common_Movement_WalkInPlaceUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
delay 20
dofieldeffect 62

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

@@ -1,7 +1,7 @@
EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174
map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_2281AA
map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_228184
map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_228193
map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184
map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193
.byte 0
EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184
@@ -13,19 +13,19 @@ EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E
end
EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193
map_script_2 VAR_0x409C, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D
map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D
.2byte 0
EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D
lockall
call EverGrandeCity_PhoebesRoom_EventScript_272475
setvar VAR_0x409C, 2
setvar VAR_ELITE_4_STATE, 2
releaseall
end
EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA
call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF
compare VAR_0x409C, 2
compare VAR_ELITE_4_STATE, 2
call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5
end

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

@@ -1,6 +1,6 @@
EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F
map_script 5, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30
.byte 0
EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
@@ -9,7 +9,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
end
EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E
goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn
clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
return

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

@@ -1,8 +1,8 @@
EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B
map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C
map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE
map_script 3, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF
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
.byte 0
EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5

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

@@ -1,6 +1,6 @@
EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
map_script 3, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD
map_script 5, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD
map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonLeague_1F_MapScript1_277C30
.byte 0
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
@@ -90,11 +90,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE
end
EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB
applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E
applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
waitmovement 0
msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
releaseall
end

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

@@ -1,8 +1,8 @@
EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
map_script 2, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B
map_script 4, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C
map_script 1, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE
map_script 3, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF
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
.byte 0
EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C

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

@@ -1,8 +1,8 @@
EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
map_script 1, EverGrandeCity_SidneysRoom_MapScript1_227F1D
map_script 4, EverGrandeCity_SidneysRoom_MapScript2_227F3E
map_script 3, EverGrandeCity_SidneysRoom_MapScript1_227F16
map_script 2, EverGrandeCity_SidneysRoom_MapScript2_227F4D
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_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D
.byte 0
EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
@@ -12,7 +12,7 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
compare VAR_0x409C, 1
compare VAR_ELITE_4_STATE, 1
call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
end
@@ -34,13 +34,13 @@ EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48
end
EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D
map_script_2 VAR_0x409C, 0, EverGrandeCity_SidneysRoom_EventScript_227F57
map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57
.2byte 0
EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57
lockall
call EverGrandeCity_SidneysRoom_EventScript_272475
setvar VAR_0x409C, 1
setvar VAR_ELITE_4_STATE, 1
releaseall
end

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

@@ -123,7 +123,7 @@
"y": 15,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FallarborTown_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
},
{
"type": "sign",
@@ -131,7 +131,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FallarborTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -147,7 +147,7 @@
"y": 7,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FallarborTown_EventScript_271E73"
"script": "Common_EventScript_ShowPokemonCenterSign"
},
{
"type": "sign",
@@ -163,7 +163,7 @@
"y": 15,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "FallarborTown_EventScript_271E6A"
"script": "Common_EventScript_ShowPokemartSign"
},
{
"type": "sign",

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

@@ -1,10 +1,10 @@
FallarborTown_MapScripts:: @ 81EB1FA
map_script 3, FallarborTown_MapScript1_1EB200
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200
.byte 0
FallarborTown_MapScript1_1EB200: @ 81EB200
setflag FLAG_VISITED_FALLARBOR_TOWN
setvar VAR_0x4086, 0
setvar VAR_LINK_CONTEST_ROOM_STATE, 0
clearflag FLAG_CONTEST_SKETCH_CREATED
end

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

@@ -1,7 +1,7 @@
FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
map_script 3, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9
map_script 2, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD
map_script 4, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9
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

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

@@ -1,5 +1,5 @@
FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7
map_script 2, FallarborTown_BattleTentCorridor_MapScript2_2006AD
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_MapScript2_2006AD
.byte 0
FallarborTown_BattleTentCorridor_MapScript2_2006AD: @ 82006AD

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

@@ -1,6 +1,6 @@
FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66
map_script 2, FallarborTown_BattleTentLobby_MapScript2_1FFE85
map_script 4, FallarborTown_BattleTentLobby_MapScript2_1FFE71
map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE85
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_MapScript2_1FFE71
.byte 0
FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71
@@ -191,7 +191,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
special LoadPlayerParty
closemessage
delay 2
call FallarborTown_BattleTentLobby_EventScript_27134F
call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0
goto_if_eq FallarborTown_BattleTentLobby_EventScript_2001AB

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

@@ -20,7 +20,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38
msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT
giveitem_std ITEM_TM27
compare VAR_RESULT, 0
goto_if_eq FallarborTown_House1_EventScript_272054
goto_if_eq Common_EventScript_ShowBagIsFull
setvar VAR_0x8004, 280
call FallarborTown_House1_EventScript_2723E4
setflag FLAG_RECEIVED_TM27

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

@@ -3,7 +3,7 @@ FallarborTown_House2_MapScripts:: @ 8201382
FallarborTown_House2_EventScript_201383:: @ 8201383
lockall
applymovement 1, FallarborTown_House2_Movement_27259E
applymovement 1, Common_Movement_FacePlayer
waitmovement 0
goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_2013A8
msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT

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

@@ -1,6 +1,6 @@
FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_200BD8
map_script 5, FallarborTown_PokemonCenter_1F_MapScript1_277C30
map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8
map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30
.byte 0
FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8

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

@@ -1,8 +1,8 @@
FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_276C3B
map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_276B6C
map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_276BBE
map_script 3, FallarborTown_PokemonCenter_2F_MapScript1_276ACF
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
.byte 0
FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00

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

@@ -1,5 +1,5 @@
FarawayIsland_Entrance_MapScripts:: @ 8267C8E
map_script 3, FarawayIsland_Entrance_MapScript1_267C94
map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94
.byte 0
FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
@@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
goto_if_eq FarawayIsland_Entrance_EventScript_267CE7
msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown
waitmovement 0
delay 30
hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE

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

@@ -1,8 +1,8 @@
FarawayIsland_Interior_MapScripts:: @ 8267CFA
map_script 5, FarawayIsland_Interior_MapScript1_267D54
map_script 3, FarawayIsland_Interior_MapScript1_267D72
map_script 2, FarawayIsland_Interior_MapScript2_267D98
map_script 7, FarawayIsland_Interior_MapScript1_267D0F
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_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98
map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F
.byte 0
FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
@@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne FarawayIsland_Interior_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
@@ -44,7 +44,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
end
FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E
goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn
clearflag FLAG_HIDE_MEW
setvar VAR_TEMP_1, 0
return
@@ -56,9 +56,9 @@ FarawayIsland_Interior_MapScript2_267D98: @ 8267D98
FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2
lockall
playse SE_PIN
applymovement 1, FarawayIsland_Interior_Movement_272598
applymovement 1, Common_Movement_ExclamationMark
waitmovement 0
applymovement 1, FarawayIsland_Interior_Movement_27259A
applymovement 1, Common_Movement_Delay48
waitmovement 0
applymovement 1, FarawayIsland_Interior_Movement_267DCE
waitmovement 0

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