diff options
| -rw-r--r-- | asm/rom5.s | 18 | ||||
| -rw-r--r-- | data/data2.s | 14 | ||||
| -rw-r--r-- | graphics/misc/cave_transition.png | bin | 0 -> 194 bytes | |||
| -rw-r--r-- | graphics/misc/cave_transition_map.bin | bin | 0 -> 2048 bytes | |||
| -rwxr-xr-x | graphics/pokenav/map_squares.png | bin | 258 -> 0 bytes |
5 files changed, 17 insertions, 15 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index dcd2cb78d..7c11eb00b 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -300744,11 +300744,11 @@ sub_810CE78: @ 810CE78 pop {r0} bx r0 .align 2, 0 -_0810CEE8: .4byte gUnknown_083F828C +_0810CEE8: .4byte gCaveTransitionTiles _0810CEEC: .4byte 0x0600c000 -_0810CEF0: .4byte gUnknown_083F80AC +_0810CEF0: .4byte gCaveTransitionTilemap _0810CEF4: .4byte 0x0600f800 -_0810CEF8: .4byte gUnknown_083F804C +_0810CEF8: .4byte gCaveTransitionPalette_White _0810CEFC: .4byte gUnknown_083F809C _0810CF00: .4byte REG_BLDCNT _0810CF04: .4byte 0x00003e41 @@ -300845,7 +300845,7 @@ _0810CFB6: pop {r0} bx r0 .align 2, 0 -_0810CFBC: .4byte gUnknown_083F804C +_0810CFBC: .4byte gCaveTransitionPalette_White _0810CFC0: .4byte sub_810CFC4 thumb_func_end sub_810CF5C @@ -300963,15 +300963,15 @@ sub_810D028: @ 810D028 pop {r0} bx r0 .align 2, 0 -_0810D098: .4byte gUnknown_083F828C +_0810D098: .4byte gCaveTransitionTiles _0810D09C: .4byte 0x0600c000 -_0810D0A0: .4byte gUnknown_083F80AC +_0810D0A0: .4byte gCaveTransitionTilemap _0810D0A4: .4byte 0x0600f800 _0810D0A8: .4byte REG_BLDCNT _0810D0AC: .4byte REG_BG0CNT _0810D0B0: .4byte 0x00001f0c -_0810D0B4: .4byte gUnknown_083F804C -_0810D0B8: .4byte gUnknown_083F806C +_0810D0B4: .4byte gCaveTransitionPalette_White +_0810D0B8: .4byte gCaveTransitionPalette_Black _0810D0BC: .4byte 0x03004b20 _0810D0C0: .4byte sub_810D0C4 thumb_func_end sub_810D028 @@ -301067,7 +301067,7 @@ _0810D172: pop {r0} bx r0 .align 2, 0 -_0810D178: .4byte gUnknown_083F806C +_0810D178: .4byte gCaveTransitionPalette_Black _0810D17C: .4byte 0x03001770 thumb_func_end sub_810D128 diff --git a/data/data2.s b/data/data2.s index b1802daac..d709a995a 100644 --- a/data/data2.s +++ b/data/data2.s @@ -24374,13 +24374,13 @@ gUnknown_083F7FC4:: @ 83F7FC4 .4byte NULL .align 2 -gUnknown_083F804C:: @ 83F804C +gCaveTransitionPalette_White:: @ 83F804C .rept 16 .2byte 0x7FFF .endr .align 2 -gUnknown_083F806C:: @ 83F806C +gCaveTransitionPalette_Black:: @ 83F806C .rept 16 .2byte 0x0000 .endr @@ -24391,11 +24391,13 @@ gUnknown_083F808C:: @ 83F808C gUnknown_083F809C:: @ 83F809C .incbin "baserom.gba", 0x003f809c, 0x10 -gUnknown_083F80AC:: @ 83F80AC - .incbin "baserom.gba", 0x003f80ac, 0x1e0 + .align 2 +gCaveTransitionTilemap:: @ 83F80AC + .incbin "graphics/misc/cave_transition_map.bin.lz" -gUnknown_083F828C:: @ 83F828C - .incbin "graphics/pokenav/map_squares.4bpp.lz" + .align 2 +gCaveTransitionTiles:: @ 83F828C + .incbin "graphics/misc/cave_transition.4bpp.lz" gUnknown_083F8340:: @ 83F8340 .incbin "baserom.gba", 0x003f8340, 0x18 diff --git a/graphics/misc/cave_transition.png b/graphics/misc/cave_transition.png Binary files differnew file mode 100644 index 000000000..dd265149f --- /dev/null +++ b/graphics/misc/cave_transition.png diff --git a/graphics/misc/cave_transition_map.bin b/graphics/misc/cave_transition_map.bin Binary files differnew file mode 100644 index 000000000..4293bfd1c --- /dev/null +++ b/graphics/misc/cave_transition_map.bin diff --git a/graphics/pokenav/map_squares.png b/graphics/pokenav/map_squares.png Binary files differdeleted file mode 100755 index 3ebceed2a..000000000 --- a/graphics/pokenav/map_squares.png +++ /dev/null |
