From 4e9d76d3052db037bd92870eb6a7e086a566065f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Apr 2018 08:43:45 -0400 Subject: through CB2_UnusedPokedexAreaScreen --- data/pokedex_area_screen.s | 1 + 1 file changed, 1 insertion(+) (limited to 'data') diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 410f0d4c5..6d52e30a5 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -26,6 +26,7 @@ gUnknown_083F857A:: @ 83F857A @ XXX: what is this? .align 2 +gUnknown_083F8588:: .4byte gSharedMem .align 2 -- cgit v1.2.3 From 33bb43db0de5d7d60ab8eff6db0ac305d403474f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Apr 2018 23:00:25 -0400 Subject: Decompile some data objects --- data/pokedex_area_screen.s | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'data') diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 6d52e30a5..0742ef5a4 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -3,32 +3,6 @@ .section .rodata -gUnknown_083F8418:: @ 83F8418 - .incbin "graphics/pokedex/area_glow.gbapal" - -gUnknown_083F8438:: @ 83F8438 - .incbin "graphics/pokedex/area_glow.4bpp.lz" - - .align 1 -gUnknown_083F856C:: @ 83F856C - .2byte 360 - - .align 1 -gUnknown_083F856E:: @ 83F856E - .2byte 328, 0, 34 - .2byte 412, 0, 0 - - .align 1 -gUnknown_083F857A:: @ 83F857A - .2byte 85, 2142 @ FLAG_LANDMARK_SKY_PILLAR - .2byte 68, 2119 @ FLAG_LANDMARK_SEAFLOOR_CAVERN - .2byte 88, 0 - -@ XXX: what is this? - .align 2 -gUnknown_083F8588:: - .4byte gSharedMem - .align 2 gUnknown_083F858C:: @ 83F858C obj_tiles AreaMarkerTiles, 0x80, 2 -- cgit v1.2.3 From 3f34a0491d42c8e35a1d26bb34d59106d8a30660 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 24 Apr 2018 00:47:22 -0400 Subject: through DestroyAreaSprites --- data/pokedex_area_screen.s | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'data') diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 0742ef5a4..c2fc67ac6 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -3,32 +3,6 @@ .section .rodata - .align 2 -gUnknown_083F858C:: @ 83F858C - obj_tiles AreaMarkerTiles, 0x80, 2 - - .align 2 -gUnknown_083F8594:: @ 83F8594 - obj_pal AreaMarkerPalette, 2 - - .align 2 -gOamData_83F859C:: @ 83F859C - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteTemplate_83F85A4:: @ 83F85A4 - spr_template 2, 2, gOamData_83F859C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -AreaMarkerPalette: - .incbin "graphics/pokedex/area_marker.gbapal" - - .align 2 -AreaMarkerTiles: - .incbin "graphics/pokedex/area_marker.4bpp" - .align 2 gUnknown_083F865C:: @ 83F865C obj_pal gAreaUnknownPalette, 3 -- cgit v1.2.3 From bedf072c371990c991203d7ffca6e4c0941a891f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 24 Apr 2018 08:21:39 -0400 Subject: Finish decompilation of pokedex_area_screen --- data/pokedex_area_screen.s | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 data/pokedex_area_screen.s (limited to 'data') diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s deleted file mode 100644 index c2fc67ac6..000000000 --- a/data/pokedex_area_screen.s +++ /dev/null @@ -1,22 +0,0 @@ - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083F865C:: @ 83F865C - obj_pal gAreaUnknownPalette, 3 - - .align 2 -gUnknown_083F8664:: @ 83F8664 - obj_tiles gSharedMem + 0xFB4, 0x600, 3 - - .align 2 -gOamData_83F866C:: @ 83F866C - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteTemplate_83F8674:: @ 83F8674 - spr_template 3, 3, gOamData_83F866C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -- cgit v1.2.3