diff options
| -rw-r--r-- | data/easy_chat.s | 10 | ||||
| -rw-r--r-- | data/region_map.s | 17 | ||||
| -rw-r--r-- | data/rotating_gate.s | 38 | ||||
| -rw-r--r-- | data/sound_check_menu.s | 6 | ||||
| -rw-r--r-- | data/use_pokeblock.s | 12 |
5 files changed, 67 insertions, 16 deletions
diff --git a/data/easy_chat.s b/data/easy_chat.s index d2e8ad924..cde3ae52b 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -347,13 +347,17 @@ gUnknown_083DBE1C:: @ 83DBE1C .incbin "baserom.gba", 0x003dbe1c, 0x24 gUnknown_083DBE40:: @ 83DBE40 - .incbin "baserom.gba", 0x003dbe40, 0x68 + .incbin "baserom.gba", 0x003dbe40, 0x68 @ LZ gUnknown_083DBEA8:: @ 83DBEA8 - .incbin "baserom.gba", 0x003dbea8, 0x4 + .string "{CLEAR_TO 88}$" + .align 2 gUnknown_083DBEAC:: @ 83DBEAC - .incbin "baserom.gba", 0x003dbeac, 0x80 + .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}others$", 0x20 + .string "{UNKNOWN_14 8} G H I J K L $", 0x20 + .string "{UNKNOWN_14 8} M N O P Q R S $", 0x20 + .string "{UNKNOWN_14 8} T U V W X Y Z $", 0x20 @ 83DBF2C .include "data/text/easy_chat/group_words.inc" diff --git a/data/region_map.s b/data/region_map.s index 2b81b344f..056da14da 100644 --- a/data/region_map.s +++ b/data/region_map.s @@ -50,7 +50,19 @@ gUnknown_083E6B04:: @ 83E6B04 .include "data/region_map_locations.inc" gUnknown_083E7684:: @ 83E7684 - .incbin "baserom.gba", 0x003e7684, 0x34 + .2byte 50, 39 + .2byte 51, 41 + .2byte 52, 42 + .2byte 53, 43 + .2byte 54, 14 + .2byte 69, 43 + .2byte 66, 12 + .2byte 79, 49 + .2byte 59, 19 + .2byte 76, 27 + .2byte 65, 37 + .2byte 85, 46 + .2byte 88, 88 .align 2 gOamData_83E76B8:: @ 83E76B8 @@ -129,7 +141,8 @@ gUnknown_083E79CC:: @ 83E79CC .align 2 gUnknown_083E79D4:: @ 83E79D4 - .incbin "baserom.gba", 0x003e79d4, 0x8 + .2byte 2120, 58 + .2byte 65535, 88 .align 2 gOamData_83E79DC:: @ 83E79DC diff --git a/data/rotating_gate.s b/data/rotating_gate.s index 377898327..05993ddd3 100644 --- a/data/rotating_gate.s +++ b/data/rotating_gate.s @@ -252,19 +252,45 @@ gSpriteTemplate_83D60A4:: @ 83D60A4 spr_template 4864, 0xFFFF, gOamData_83D5E14, gSpriteAnimTable_83D5E78, NULL, gSpriteAffineAnimTable_83D603C, sub_80C7C94 gUnknown_083D60BC:: @ 83D60BC - .incbin "baserom.gba", 0x003d60bc, 0x10 + .byte 255, 255, 255, 255 + .byte 39, 38, 18, 19 + .byte 255, 255, 255, 255 + .byte 255, 255, 255, 255 gUnknown_083D60CC:: @ 83D60CC - .incbin "baserom.gba", 0x003d60cc, 0x10 + .byte 255, 255, 255, 255 + .byte 255, 255, 255, 255 + .byte 23, 22, 34, 35 + .byte 255, 255, 255, 255 gUnknown_083D60DC:: @ 83D60DC - .incbin "baserom.gba", 0x003d60dc, 0x10 + .byte 255, 17, 255, 255 + .byte 255, 16, 255, 255 + .byte 255, 36, 255, 255 + .byte 255, 37, 255, 255 gUnknown_083D60EC:: @ 83D60EC - .incbin "baserom.gba", 0x003d60ec, 0x10 + .byte 255, 255, 33, 255 + .byte 255, 255, 32, 255 + .byte 255, 255, 20, 255 + .byte 255, 255, 21, 255 gUnknown_083D60FC:: @ 83D60FC - .incbin "baserom.gba", 0x003d60fc, 0x20 + .byte 0, -1, 0, 0 + .byte 1, -2, 0, 0 + .byte 0, 0, 0, 0 + .byte 1, 0, 0, 0 + .byte -1, 0, 0, 0 + .byte -1, 1, 0, 0 + .byte -1, -1, 0, 0 + .byte -2, -1, 0, 0 gUnknown_083D611C:: @ 83D611C - .incbin "baserom.gba", 0x003d611c, 0x20 + .byte -1, -1, 0, 0 + .byte -1, -2, 0, 0 + .byte 0, -1, 0, 0 + .byte 1, -1, 0, 0 + .byte 0, 0, 0, 0 + .byte 0, 1, 0, 0 + .byte -1, 0, 0, 0 + .byte -2, 0, 0, 0 diff --git a/data/sound_check_menu.s b/data/sound_check_menu.s index 48a24a0d0..c7c70385b 100644 --- a/data/sound_check_menu.s +++ b/data/sound_check_menu.s @@ -15,7 +15,7 @@ gDebugText_SE:: @ 83D02D5 .string "SE $" gUnknown_083D02D9:: @ 83D02D9 - .incbin "baserom.gba", 0x003d02d9, 0xd + .string "A‥さいせい B‥おわり$" gDebugText_UpDown:: @ 83D02E6 .string "L‥UP R‥DOWN$" @@ -27,10 +27,10 @@ gUnknown_083D0300:: @ 83D0300 .incbin "baserom.gba", 0x003d0300, 0x12 gUnknown_083D0312:: @ 83D0312 - .incbin "baserom.gba", 0x003d0312, 0xa + .string "Bぼたんで もどる$" gUnknown_083D031C:: @ 83D031C - .incbin "baserom.gba", 0x003d031c, 0xb + .string "Aぼたんで さいせい$" gDebugText_Voice:: @ 83D0327 .string "VOICE‥‥‥‥$" diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index 914b3570b..b82c6756c 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -12,7 +12,11 @@ ConditionUpDownTiles: .incbin "graphics/misc/condition_up_down.4bpp" gUnknown_08406118:: @ 8406118 - .incbin "baserom.gba", 0x00406118, 0x14 + .4byte 22 @ MON_DATA_COOL + .4byte 47 @ MON_DATA_TOUGH + .4byte 33 @ MON_DATA_SMART + .4byte 24 @ MON_DATA_CUTE + .4byte 23 @ MON_DATA_BEAUTY .align 2 gUnknown_0840612C:: @ 840612C @@ -35,7 +39,11 @@ gSpritePalette_ConditionUpDown:: @ 8406150 obj_pal ConditionUpDownPalette, 0 gUnknown_08406158:: @ 8406158 - .incbin "baserom.gba", 0x00406158, 0x14 + .2byte 156, 30 + .2byte 117, 53 + .2byte 117, 112 + .2byte 197, 112 + .2byte 197, 53 .align 2 gOamData_840616C:: @ 840616C |