diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_8468C98.s | 8 | ||||
| -rw-r--r-- | data/data_8471F00.s | 15 | ||||
| -rw-r--r-- | data/maps/SSAnne_Exterior/scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
4 files changed, 16 insertions, 11 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..044a94e7d 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 "baserom.gba", 0x479748, 0xF0 -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..d0e530489 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -20,7 +20,7 @@ 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 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 |