diff options
| -rw-r--r-- | data/data_835B488.s | 2 | ||||
| -rw-r--r-- | data/data_8471F00.s | 65 | ||||
| -rw-r--r-- | data/graphics/unk_847a348.png | bin | 0 -> 828 bytes | |||
| -rw-r--r-- | data/text/map_section_names.inc | 2 |
4 files changed, 60 insertions, 9 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s index 8a3bec79c..8d2183672 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -2287,7 +2287,7 @@ gUnknown_83F1CAC:: @ 83F1CAC .4byte gMapSecName_BerryForest .4byte gMapSecName_IcefallCave .4byte gMapSecName_RocketWarehouse - .4byte gMapSecName_TrainerTower2 + .4byte gMapSecName_TrainerTower_2 .4byte gMapSecName_DottedHole .4byte gMapSecName_LostCave .4byte gMapSecName_PatternBush diff --git a/data/data_8471F00.s b/data/data_8471F00.s index c030cf67d..6490d59e2 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F00.s @@ -1,3 +1,6 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + .section .rodata .align 2 @@ -608,27 +611,75 @@ gUnknown_847A284:: @ 847A284 .2byte 0x0131, 0x0175, 0x017d gUnknown_847A2B4:: @ 847A2B4 - .incbin "baserom.gba", 0x47A2B4, 0x1E + .2byte 0x3f, 0x40, 0x41, 0x42, 0x43, 0x46, 0xb3, 0xb4, 0xb9, 0xba, 0xbb, 0xc6, 0xc7, 0xc9, 0xda gUnknown_847A2D2:: @ 847A2D2 - .incbin "baserom.gba", 0x47A2D2, 0x1C + .2byte 0x011d + .2byte 0x011c + .2byte 0x011c + .2byte 0x011b + .2byte 0x011d + .2byte 0x011d + .2byte 0x011b + .2byte 0x011b + .2byte 0x011d + .2byte 0x011c + .2byte 0x011d + .2byte 0x011d + .2byte 0x011d + .2byte 0x011d gUnknown_847A2EE:: @ 847A2EE - .incbin "baserom.gba", 0x47A2EE, 0x10 + .byte 0x00, 0x02 + .byte 0x01, 0x03 + .byte 0x02, 0x04 + .byte 0x03, 0x05 + .byte 0x04, 0x01 + .byte 0x05, 0x02 + .byte 0x00, 0x03 + .byte 0x01, 0x04 gUnknown_847A2FE:: @ 847A2FE - .incbin "baserom.gba", 0x47A2FE, 0x10 + .byte 0x00, 0x01 + .byte 0x01, 0x03 + .byte 0x02, 0x00 + .byte 0x03, 0x04 + .byte 0x04, 0x02 + .byte 0x05, 0x02 + .byte 0x00, 0x03 + .byte 0x01, 0x05 gUnknown_847A30E:: @ 847A30E - .incbin "baserom.gba", 0x47A30E, 0x48E + .byte 0x00, 0x02 + .byte 0x04, 0x01 + .byte 0x03, 0x05 + .byte 0x02, 0x03 + .byte 0x01, 0x03 + .byte 0x04, 0x00 + .byte 0x04, 0x01 + .byte 0x02, 0x05 + .byte 0x00, 0x03 + .byte 0x00, 0x05 + .byte 0x02, 0x01 + .byte 0x04, 0x05 + .byte 0x00, 0x00 + +gUnknown_847A328:: + .incbin "data/graphics/unk_847a348.gbapal" + +gUnknown_847A348:: + .incbin "data/graphics/unk_847a348.4bpp.lz" // unk_815F138 gUnknown_847A79C:: @ 847A79C - .incbin "baserom.gba", 0x47A79C, 0x8 + obj_tiles gUnknown_847A348, 0xE00, 0 gUnknown_847A7A4:: @ 847A7A4 - .incbin "baserom.gba", 0x47A7A4, 0xBC + obj_pal gUnknown_847A328, 0 + +gUnknown_847A7AC:: + .incbin "baserom.gba", 0x47A7AC, 0xB4 gUnknown_847A860:: @ 847A860 .incbin "baserom.gba", 0x47A860, 0x18 diff --git a/data/graphics/unk_847a348.png b/data/graphics/unk_847a348.png Binary files differnew file mode 100644 index 000000000..9897a6d36 --- /dev/null +++ b/data/graphics/unk_847a348.png diff --git a/data/text/map_section_names.inc b/data/text/map_section_names.inc index 611274f4e..e91368a40 100644 --- a/data/text/map_section_names.inc +++ b/data/text/map_section_names.inc @@ -271,7 +271,7 @@ gMapSecName_IcefallCave:: gMapSecName_RocketWarehouse:: .string "ROCKET WAREHOUSE$" -gMapSecName_TrainerTower2:: +gMapSecName_TrainerTower_2:: .string "TRAINER TOWER$" gMapSecName_DottedHole:: |
