summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data_8468C98.s8
-rw-r--r--data/data_8471F00.s15
-rw-r--r--data/maps/SSAnne_Exterior/scripts.inc4
-rw-r--r--data/maps/VermilionCity/map.json4
-rw-r--r--data/maps/VermilionCity/scripts.inc4
-rw-r--r--data/specials.inc2
6 files changed, 21 insertions, 16 deletions
diff --git a/data/data_8468C98.s b/data/data_8468C98.s
index 5b59683b2..7ce7c3a02 100644
--- a/data/data_8468C98.s
+++ b/data/data_8468C98.s
@@ -138,10 +138,14 @@ gUnknown_846D953:: @ 846D953
.incbin "baserom.gba", 0x46D953, 0xD
gUnknown_846D960:: @ 846D960
- .incbin "baserom.gba", 0x46D960, 0x8
+ obj_tiles gUnknown_8479688, 0, 800
gUnknown_846D968:: @ 846D968
- .incbin "baserom.gba", 0x46D968, 0x40
+ obj_pal gUnknown_8479668, 800
+
+gUnknown_846D970::
+ .2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0002, 0x0006
+ .2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006, 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006
gUnknown_846D9A8:: @ 846D9A8
.incbin "baserom.gba", 0x46D9A8, 0x2C
diff --git a/data/data_8471F00.s b/data/data_8471F00.s
index 672a9178e..c1e9c3106 100644
--- a/data/data_8471F00.s
+++ b/data/data_8471F00.s
@@ -219,16 +219,17 @@ gUnknown_84792D0:: @ 84792D0
.align 2
gUnknown_8479668:: @ 8479668
- .incbin "baserom.gba", 0x479668, 0x5F0
+ .incbin "graphics/misc/unk_8479688.gbapal"
-gUnknown_8479C58:: @ 8479C58
- .incbin "baserom.gba", 0x479C58, 0x30
+gUnknown_8479688::
+ .incbin "graphics/misc/unk_8479688.4bpp.lz"
-gUnknown_8479C88:: @ 8479C88
- .incbin "baserom.gba", 0x479C88, 0x38
+gUnknown_8479748::
+ .incbin "graphics/misc/unk_8479748.4bpp.lz"
-gUnknown_8479CC0:: @ 8479CC0
- .incbin "baserom.gba", 0x479CC0, 0x18
+ .section .rodata.cereader_tool
+
+ // cereader_tool
.align 2
gUnknown_8479CD8:: @ 8479CD8
diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc
index 0d08a0152..b0112c459 100644
--- a/data/maps/SSAnne_Exterior/scripts.inc
+++ b/data/maps/SSAnne_Exterior/scripts.inc
@@ -20,13 +20,13 @@ SSAnne_Exterior_160859:: @ 8160859
call_if 4, EventScript_1608AC
fadenewbgm BGM_FRLG_SURF
delay 50
- special sub_815D334
+ special Special_SSAnneDepartureCutscene
waitstate
removeobject 1
applymovement 255, Movement_1608B7
waitmovement 0
setvar VAR_MAP_SCENE_VERMILION_CITY, 2
- setvar VAR_0x4053, 0
+ setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
warp MAP_VERMILION_CITY, 255, 23, 34
waitstate
releaseall
diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json
index 30efc81c4..d041e9157 100644
--- a/data/maps/VermilionCity/map.json
+++ b/data/maps/VermilionCity/map.json
@@ -207,7 +207,7 @@
"x": 22,
"y": 33,
"elevation": 0,
- "var": "VAR_0x4053",
+ "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
"var_value": 0,
"script": "VermilionCity_EventScript_166B8A"
},
@@ -216,7 +216,7 @@
"x": 23,
"y": 33,
"elevation": 0,
- "var": "VAR_0x4053",
+ "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
"var_value": 0,
"script": "VermilionCity_EventScript_166B91"
},
diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc
index 1f476abf3..c809fd7bd 100644
--- a/data/maps/VermilionCity/scripts.inc
+++ b/data/maps/VermilionCity/scripts.inc
@@ -200,7 +200,7 @@ VermilionCity_EventScript_166B91:: @ 8166B91
VermilionCity_EventScript_166B98:: @ 8166B98
lockall
- setvar VAR_0x4053, 0
+ setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
releaseall
end
@@ -215,7 +215,7 @@ EventScript_166BA0:: @ 8166BA0
checkflag FLAG_0x234
goto_if 0, EventScript_166BDE
msgbox gUnknown_817FA77
- setvar VAR_0x4053, 1
+ setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1
releaseall
end
diff --git a/data/specials.inc b/data/specials.inc
index f40c3d3be..0b00645de 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -410,7 +410,7 @@ gSpecials:: @ 815FD60
def_special sub_8127888
def_special sub_80803FC
def_special sub_812B35C
- def_special sub_815D334
+ def_special Special_SSAnneDepartureCutscene
def_special sub_8149A18
def_special sub_806E25C
def_special sub_815D9E8