diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/box_party_pokemon_dropdown.s | 10 | ||||
| -rw-r--r-- | data/clear_save_data_screen.s | 20 | ||||
| -rw-r--r-- | data/evolution_graphics.s | 3 | ||||
| -rw-r--r-- | data/field_door.s | 17 | ||||
| -rw-r--r-- | data/field_tasks.s | 19 | ||||
| -rw-r--r-- | data/item_use.s | 15 | ||||
| -rw-r--r-- | data/map_name_popup.s | 10 | ||||
| -rw-r--r-- | data/metatile_behavior.s | 6 | ||||
| -rw-r--r-- | data/save_failed_screen.s | 2 |
9 files changed, 47 insertions, 55 deletions
diff --git a/data/box_party_pokemon_dropdown.s b/data/box_party_pokemon_dropdown.s index 929aa6ab5..275b53db2 100644 --- a/data/box_party_pokemon_dropdown.s +++ b/data/box_party_pokemon_dropdown.s @@ -7,4 +7,12 @@ .align 2 gUnknown_841F4B4:: @ 841F4B4 - .incbin "baserom.gba", 0x41f4b4, 0x20 + .2byte 0x0100, 0x0100 + .2byte 0x0200, 0x0100 + .2byte 0x0100, 0x0200 + .2byte 0x0200, 0x0200 + + .2byte 0x0080, 0x0080 + .2byte 0x0100, 0x0100 + .2byte 0x0200, 0x0200 + .2byte 0x0400, 0x0400 diff --git a/data/clear_save_data_screen.s b/data/clear_save_data_screen.s index 51149a021..32a2d422a 100644 --- a/data/clear_save_data_screen.s +++ b/data/clear_save_data_screen.s @@ -7,10 +7,24 @@ .align 2 gUnknown_841EE64:: @ 841EE64 - .incbin "baserom.gba", 0x41EE64, 0x4 + .4byte 0x000001f0 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } gUnknown_841EE68:: @ 841EE68 - .incbin "baserom.gba", 0x41EE68, 0x18 + .byte 0, 3, 5, 6, 4, 15 + .2byte 0x000a + .byte 0, 3, 15, 23, 4, 15 + .2byte 0x0022 + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 gUnknown_841EE80:: @ 841EE80 - .incbin "baserom.gba", 0x41EE80, 0x44 + .byte 0x01, 0x02, 0x03 diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s index 0fd702447..08276557a 100644 --- a/data/evolution_graphics.s +++ b/data/evolution_graphics.s @@ -6,6 +6,9 @@ .section .rodata .align 2 +gUnknown_841EE84:: @ 841EE84 + .incbin "baserom.gba", 0x41EE84, 0x40 + gUnknown_841EEC4:: @ 841EEC4 .incbin "baserom.gba", 0x41EEC4, 0x10 diff --git a/data/field_door.s b/data/field_door.s deleted file mode 100644 index a29cf3e24..000000000 --- a/data/field_door.s +++ /dev/null @@ -1,17 +0,0 @@ - .section .rodata - - .align 2 -gUnknown_835B488:: @ 835B488 - .incbin "baserom.gba", 0x35B488, 0x14 - -gUnknown_835B49C:: @ 835B49C - .incbin "baserom.gba", 0x35B49C, 0x14 - -gUnknown_835B4B0:: @ 835B4B0 - .incbin "baserom.gba", 0x35B4B0, 0x14 - -gUnknown_835B4C4:: @ 835B4C4 - .incbin "baserom.gba", 0x35B4C4, 0x114 - -gUnknown_835B5D8:: @ 835B5D8 - .incbin "baserom.gba", 0x35B5D8, 0x18C diff --git a/data/field_tasks.s b/data/field_tasks.s index a91e6cec9..2ff9ad215 100644 --- a/data/field_tasks.s +++ b/data/field_tasks.s @@ -1,7 +1,22 @@ .section .rodata .align 2 gUnknown_83A7310:: @ 83A7310 - .incbin "baserom.gba", 0x3A7310, 0x20 + .4byte nullsub_40 + .4byte sub_806EB54 + .4byte nullsub_40 + .4byte nullsub_40 + .4byte sub_806E9E0 + .4byte nullsub_40 + .4byte nullsub_40 + .4byte sub_806EC40 gUnknown_83A7330:: @ 83A7330 - .incbin "baserom.gba", 0x3A7330, 0x14 + .byte 0x08, 0x03 + .byte 0x0a, 0x05 + .byte 0x0f, 0x05 + .byte 0x08, 0x09 + .byte 0x09, 0x09 + .byte 0x10, 0x09 + .byte 0x08, 0x0a + .byte 0x09, 0x0a + .byte 0x08, 0x0e diff --git a/data/item_use.s b/data/item_use.s deleted file mode 100644 index aa78ac919..000000000 --- a/data/item_use.s +++ /dev/null @@ -1,15 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - - .incbin "baserom.gba", 0x3E27B4, 0x1A0 - -gUnknown_83E2954:: @ 83E2954 - .4byte sub_8124C8C - .4byte CB2_ReturnToField - .4byte NULL - .4byte NULL diff --git a/data/map_name_popup.s b/data/map_name_popup.s deleted file mode 100644 index 6509df895..000000000 --- a/data/map_name_popup.s +++ /dev/null @@ -1,10 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnknown_83D4164:: @ 83D4164 - .incbin "baserom.gba", 0x3D4164, 0x8 diff --git a/data/metatile_behavior.s b/data/metatile_behavior.s deleted file mode 100644 index 64d88840d..000000000 --- a/data/metatile_behavior.s +++ /dev/null @@ -1,6 +0,0 @@ - .section .rodata - - .align 2 - -gUnknown_8353068:: @ 8353068 - .incbin "baserom.gba", 0x353068, 0x8420 diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s index cdf68c4de..e19763962 100644 --- a/data/save_failed_screen.s +++ b/data/save_failed_screen.s @@ -7,4 +7,4 @@ .align 2 gUnknown_841EE44:: @ 841EE44 - .incbin "baserom.gba", 0x41EE44, 0x20 + .incbin "graphics/interface/save_failed_screen.gbapal" |