Skip to content

Commit cebada8

Browse files
DizzyEgggDizzyEggg
committed
Merge with master
2 parents df9e6a6 + 4b9e938 commit cebada8

File tree

466 files changed

+16798
-20921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

466 files changed

+16798
-20921
lines changed

‎asm/easy_chat.s

Lines changed: 0 additions & 3953 deletions
This file was deleted.

‎asm/pokenav.s

Lines changed: 284 additions & 920 deletions
Large diffs are not rendered by default.

‎data/easy_chat.s

Lines changed: 0 additions & 487 deletions
This file was deleted.

‎data/event_scripts.s

Lines changed: 119 additions & 617 deletions
Large diffs are not rendered by default.

‎data/map_events.s

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "constants/event_objects.h"
44
#include "constants/flags.h"
55
#include "constants/items.h"
6+
#include "constants/map_scripts.h"
67
#include "constants/maps.h"
78
#include "constants/secret_bases.h"
89
#include "constants/vars.h"

‎data/maps/AbandonedShip_Corridors_B1F/scripts.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84
2-
map_script 5, AbandonedShip_Corridors_B1F_MapScript1_237D8F
3-
map_script 1, AbandonedShip_Corridors_B1F_MapScript1_237D98
2+
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_237D8F
3+
map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_237D98
44
.byte 0
55

66
AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F

‎data/maps/AbandonedShip_Deck/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AbandonedShip_Deck_MapScripts:: @ 823799A
2-
map_script 3, AbandonedShip_Deck_MapScript1_2379A0
2+
map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_2379A0
33
.byte 0
44

55
AbandonedShip_Deck_MapScript1_2379A0: @ 82379A0

‎data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C
2-
map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_238977
3-
map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_238980
2+
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_238977
3+
map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_238980
44
.byte 0
55

66
AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977

‎data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49
2-
map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_238C4F
33
.byte 0
44

55
AbandonedShip_HiddenFloorRooms_MapScript2_238C4F: @ 8238C4F

‎data/maps/AbandonedShip_Rooms_B1F/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7
2-
map_script 5, AbandonedShip_Rooms_B1F_MapScript1_237FBD
2+
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_237FBD
33
.byte 0
44

55
AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD

‎data/maps/AbandonedShip_Underwater1/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AbandonedShip_Underwater1_MapScripts:: @ 8238096
2-
map_script 5, AbandonedShip_Underwater1_MapScript1_23809C
2+
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_23809C
33
.byte 0
44

55
AbandonedShip_Underwater1_MapScript1_23809C: @ 823809C

‎data/maps/AbandonedShip_Underwater2/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AbandonedShip_Underwater2_MapScripts:: @ 823895D
2-
map_script 5, AbandonedShip_Underwater2_MapScript1_238963
2+
map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_238963
33
.byte 0
44

55
AbandonedShip_Underwater2_MapScript1_238963: @ 8238963

‎data/maps/AlteringCave/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AlteringCave_MapScripts:: @ 823B177
2-
map_script 3, AlteringCave_MapScript1_23B17D
2+
map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_MapScript1_23B17D
33
.byte 0
44

55
AlteringCave_MapScript1_23B17D: @ 823B17D

‎data/maps/AncientTomb/scripts.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
AncientTomb_MapScripts:: @ 8238FB3
2-
map_script 5, AncientTomb_MapScript1_238FC3
3-
map_script 1, AncientTomb_MapScript1_238FF2
4-
map_script 3, AncientTomb_MapScript1_238FE1
2+
map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_238FC3
3+
map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_238FF2
4+
map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_238FE1
55
.byte 0
66

77
AncientTomb_MapScript1_238FC3: @ 8238FC3
@@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
1111
AncientTomb_EventScript_238FCD:: @ 8238FCD
1212
specialvar VAR_RESULT, GetBattleOutcome
1313
compare VAR_RESULT, 7
14-
goto_if_ne AncientTomb_EventScript_27374E
14+
goto_if_ne Common_EventScript_NopReturn
1515
removeobject VAR_LAST_TALKED
1616
return
1717

‎data/maps/AquaHideout_B1F/scripts.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AquaHideout_B1F_MapScripts:: @ 82339A7
2-
map_script 5, AquaHideout_B1F_MapScript1_2339B2
3-
map_script 3, AquaHideout_B1F_MapScript1_2339D0
2+
map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2
3+
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0
44
.byte 0
55

66
AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
@@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
1010
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
1111
specialvar VAR_RESULT, GetBattleOutcome
1212
compare VAR_RESULT, 7
13-
goto_if_ne AquaHideout_B1F_EventScript_27374E
13+
goto_if_ne Common_EventScript_NopReturn
1414
removeobject VAR_LAST_TALKED
1515
return
1616

‎data/maps/AquaHideout_B2F/scripts.inc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AquaHideout_B2F_MapScripts:: @ 8233DCF
2-
map_script 3, AquaHideout_B2F_MapScript1_233DD5
2+
map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5
33
.byte 0
44

55
AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
@@ -14,9 +14,9 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
1414
lockall
1515
setvar VAR_0x8008, 1
1616
playse SE_PIN
17-
applymovement VAR_0x8008, AquaHideout_B2F_Movement_272598
17+
applymovement VAR_0x8008, Common_Movement_ExclamationMark
1818
waitmovement 0
19-
applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
19+
applymovement VAR_0x8008, Common_Movement_FacePlayer
2020
waitmovement 0
2121
setvar VAR_TEMP_1, 1
2222
releaseall
@@ -31,19 +31,19 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09
3131
AquaHideout_B2F_EventScript_233E25:: @ 8233E25
3232
setvar VAR_0x8008, 1
3333
setvar VAR_0x8009, 4
34-
applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
34+
applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
3535
waitmovement 0
3636
delay 20
37-
applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
37+
applymovement VAR_0x8008, Common_Movement_FacePlayer
3838
waitmovement 0
3939
msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT
4040
closemessage
41-
applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
41+
applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft
4242
applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
4343
waitmovement 0
4444
removeobject VAR_0x8009
4545
delay 20
46-
applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
46+
applymovement VAR_0x8008, Common_Movement_FacePlayer
4747
waitmovement 0
4848
msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
4949
setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE

‎data/maps/ArtisanCave_B1F/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ArtisanCave_B1F_MapScripts:: @ 823AFAD
2-
map_script 3, ArtisanCave_B1F_MapScript1_23AFB3
2+
map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_MapScript1_23AFB3
33
.byte 0
44

55
ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3

‎data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
2-
map_script 3, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0
3-
map_script 2, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2
4-
map_script 4, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C
5-
map_script 5, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C
2+
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0
3+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2
4+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C
5+
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C
66
.byte 0
77

88
BattleFrontier_BattleArenaBattleRoom_MapScript1_25749C: @ 825749C

‎data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9
2-
map_script 2, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF
33
.byte 0
44

55
BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF

‎data/maps/BattleFrontier_BattleArenaLobby/scripts.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36
2-
map_script 2, BattleFrontier_BattleArenaLobby_MapScript2_255C55
3-
map_script 4, BattleFrontier_BattleArenaLobby_MapScript2_255C41
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C55
3+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_MapScript2_255C41
44
.byte 0
55

66
BattleFrontier_BattleArenaLobby_MapScript2_255C41: @ 8255C41
@@ -199,7 +199,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
199199
special LoadPlayerParty
200200
closemessage
201201
delay 2
202-
call BattleFrontier_BattleArenaLobby_EventScript_27134F
202+
call Common_EventScript_SaveGame
203203
setvar VAR_TEMP_0, 255
204204
compare VAR_RESULT, 0
205205
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1

‎data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
2-
map_script 3, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1
3-
map_script 2, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00
4-
map_script 4, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481
5-
map_script 5, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0
2+
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1
3+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00
4+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_MapScript2_24C481
5+
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0
66
.byte 0
77

88
BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
@@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
966966
random 2
967967
copyvar VAR_TEMP_D, VAR_RESULT
968968
compare VAR_TEMP_D, 0
969-
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
969+
goto_if_eq Common_EventScript_NopReturn
970970
setobjectxyperm 6, 2, 0
971971
setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT
972972
return
973973

974974
BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
975975
compare VAR_TEMP_D, 0
976-
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
976+
goto_if_eq Common_EventScript_NopReturn
977977
applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
978978
return
979979

‎data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
2-
map_script 2, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_MapScript2_24B104
33
.byte 0
44

55
BattleFrontier_BattleDomeCorridor_MapScript2_24B104: @ 824B104

‎data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
2-
map_script 5, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
3-
map_script 2, BattleFrontier_BattleDomeLobby_MapScript2_24980F
4-
map_script 4, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
2+
map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_MapScript1_2497F2
3+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_24980F
4+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_MapScript2_2497FB
55
.byte 0
66

77
BattleFrontier_BattleDomeLobby_MapScript1_2497F2: @ 82497F2
@@ -248,7 +248,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
248248
special LoadPlayerParty
249249
closemessage
250250
delay 2
251-
call BattleFrontier_BattleDomeLobby_EventScript_27134F
251+
call Common_EventScript_SaveGame
252252
setvar VAR_TEMP_0, 255
253253
compare VAR_RESULT, 0
254254
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A

‎data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9
2-
map_script 2, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218
3-
map_script 4, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218
3+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204
44
.byte 0
55

66
BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204

‎data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
2-
map_script 3, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB
3-
map_script 4, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00
4-
map_script 2, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31
2+
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB
3+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00
4+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31
55
.byte 0
66

77
BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
@@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA
304304
end
305305

306306
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
307-
applymovement 1, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
308-
applymovement 3, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
309-
applymovement 4, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8
310-
applymovement 5, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
311-
applymovement 6, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
312-
applymovement 7, BattleFrontier_BattleFactoryBattleRoom_Movement_2725A4
307+
applymovement 1, Common_Movement_WalkInPlaceRight
308+
applymovement 3, Common_Movement_WalkInPlaceRight
309+
applymovement 4, Common_Movement_WalkInPlaceRight
310+
applymovement 5, Common_Movement_WalkInPlaceLeft
311+
applymovement 6, Common_Movement_WalkInPlaceLeft
312+
applymovement 7, Common_Movement_WalkInPlaceLeft
313313
waitmovement 0
314314
return
315315

‎data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8
2-
map_script 2, BattleFrontier_BattleFactoryLobby_MapScript2_258407
3-
map_script 4, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_258407
3+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_MapScript2_2583F3
44
.byte 0
55

66
BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3
@@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
208208
special CallFrontierUtilFunc
209209
closemessage
210210
delay 2
211-
call BattleFrontier_BattleFactoryLobby_EventScript_27134F
211+
call Common_EventScript_SaveGame
212212
setvar VAR_TEMP_0, 255
213213
compare VAR_RESULT, 0
214214
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258783

‎data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA
2-
map_script 2, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF
3-
map_script 4, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF
3+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5
44
.byte 0
55

66
BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5

‎data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
2-
map_script 3, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825
3-
map_script 2, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861
4-
map_script 4, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34
2+
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825
3+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861
4+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_MapScript2_24FE34
55
.byte 0
66

77
BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
@@ -280,8 +280,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
280280
special CallFrontierUtilFunc
281281
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
282282
waitmovement 0
283-
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
284-
applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
283+
applymovement 1, Common_Movement_WalkInPlaceRight
284+
applymovement 3, Common_Movement_WalkInPlaceRight
285285
waitmovement 0
286286
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT
287287
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -323,8 +323,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
323323
special CallFrontierUtilFunc
324324
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6
325325
waitmovement 0
326-
applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
327-
applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8
326+
applymovement 1, Common_Movement_WalkInPlaceRight
327+
applymovement 3, Common_Movement_WalkInPlaceRight
328328
waitmovement 0
329329
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT
330330
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28

‎data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3
2-
map_script 2, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9
33
.byte 0
44

55
BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9

‎data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E
2-
map_script 2, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D
3-
map_script 4, BattleFrontier_BattlePalaceLobby_MapScript2_24D789
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D79D
3+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_MapScript2_24D789
44
.byte 0
55

66
BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789
@@ -223,7 +223,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
223223
special LoadPlayerParty
224224
closemessage
225225
delay 2
226-
call BattleFrontier_BattlePalaceLobby_EventScript_27134F
226+
call Common_EventScript_SaveGame
227227
setvar VAR_TEMP_0, 255
228228
compare VAR_RESULT, 0
229229
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A

‎data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
2-
map_script 2, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
3-
map_script 4, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
2+
map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C77C
3+
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7
44
.byte 0
55

66
BattleFrontier_BattlePikeCorridor_MapScript2_25C77C: @ 825C77C

0 commit comments

Comments
 (0)