diff options
| -rw-r--r-- | asm/charmap.s | 164 | ||||
| -rw-r--r-- | asm/emerald.s | 4 | ||||
| -rw-r--r-- | data/data2.s | 7 |
3 files changed, 171 insertions, 4 deletions
diff --git a/asm/charmap.s b/asm/charmap.s index aac7dfacd..95ffcfde5 100644 --- a/asm/charmap.s +++ b/asm/charmap.s @@ -85,6 +85,170 @@ .charmap ":", 0xF0 .charmap "$", 0xFF +; Hiragana + .charmap "あ", 0x01 + .charmap "い", 0x02 + .charmap "う", 0x03 + .charmap "え", 0x04 + .charmap "お", 0x05 + .charmap "か", 0x06 + .charmap "き", 0x07 + .charmap "く", 0x08 + .charmap "け", 0x09 + .charmap "こ", 0x0A + .charmap "さ", 0x0B + .charmap "し", 0x0C + .charmap "す", 0x0D + .charmap "せ", 0x0E + .charmap "そ", 0x0F + .charmap "た", 0x10 + .charmap "ち", 0x11 + .charmap "つ", 0x12 + .charmap "て", 0x13 + .charmap "と", 0x14 + .charmap "な", 0x15 + .charmap "に", 0x16 + .charmap "ぬ", 0x17 + .charmap "ね", 0x18 + .charmap "の", 0x19 + .charmap "は", 0x1A + .charmap "ひ", 0x1B + .charmap "ふ", 0x1C + .charmap "へ", 0x1D + .charmap "ほ", 0x1E + .charmap "ま", 0x1F + .charmap "み", 0x20 + .charmap "む", 0x21 + .charmap "め", 0x22 + .charmap "も", 0x23 + .charmap "や", 0x24 + .charmap "ゆ", 0x25 + .charmap "よ", 0x26 + .charmap "ら", 0x27 + .charmap "り", 0x28 + .charmap "る", 0x29 + .charmap "れ", 0x2A + .charmap "ろ", 0x2B + .charmap "わ", 0x2C + .charmap "を", 0x2D + .charmap "ん", 0x2E + .charmap "ぁ", 0x2F + .charmap "ぃ", 0x30 + .charmap "ぅ", 0x31 + .charmap "ぇ", 0x32 + .charmap "ぉ", 0x33 + .charmap "ゃ", 0x34 + .charmap "ゅ", 0x35 + .charmap "ょ", 0x36 + .charmap "が", 0x37 + .charmap "ぎ", 0x38 + .charmap "ぐ", 0x39 + .charmap "げ", 0x3A + .charmap "ご", 0x3B + .charmap "ざ", 0x3C + .charmap "じ", 0x3D + .charmap "ず", 0x3E + .charmap "ぜ", 0x3F + .charmap "ぞ", 0x40 + .charmap "だ", 0x41 + .charmap "ぢ", 0x42 + .charmap "づ", 0x43 + .charmap "で", 0x44 + .charmap "ど", 0x45 + .charmap "ば", 0x46 + .charmap "び", 0x47 + .charmap "ぶ", 0x48 + .charmap "べ", 0x49 + .charmap "ぼ", 0x4A + .charmap "ぱ", 0x4B + .charmap "ぴ", 0x4C + .charmap "ぷ", 0x4D + .charmap "ぺ", 0x4E + .charmap "ぽ", 0x4F + .charmap "っ", 0x50 + +; Katakana + .charmap "ア", 0x51 + .charmap "イ", 0x52 + .charmap "ウ", 0x53 + .charmap "エ", 0x54 + .charmap "オ", 0x55 + .charmap "カ", 0x56 + .charmap "キ", 0x57 + .charmap "ク", 0x58 + .charmap "ケ", 0x59 + .charmap "コ", 0x5A + .charmap "サ", 0x5B + .charmap "シ", 0x5C + .charmap "ス", 0x5D + .charmap "セ", 0x5E + .charmap "ソ", 0x5F + .charmap "タ", 0x60 + .charmap "チ", 0x61 + .charmap "ツ", 0x62 + .charmap "テ", 0x63 + .charmap "ト", 0x64 + .charmap "ナ", 0x65 + .charmap "ニ", 0x66 + .charmap "ヌ", 0x67 + .charmap "ネ", 0x68 + .charmap "ノ", 0x69 + .charmap "ハ", 0x6A + .charmap "ヒ", 0x6B + .charmap "フ", 0x6C + .charmap "ヘ", 0x6D + .charmap "ホ", 0x6E + .charmap "マ", 0x6F + .charmap "ミ", 0x70 + .charmap "ム", 0x71 + .charmap "メ", 0x72 + .charmap "モ", 0x73 + .charmap "ヤ", 0x74 + .charmap "ユ", 0x75 + .charmap "ヨ", 0x76 + .charmap "ラ", 0x77 + .charmap "リ", 0x78 + .charmap "ル", 0x79 + .charmap "レ", 0x7A + .charmap "ロ", 0x7B + .charmap "ワ", 0x7C + .charmap "ヲ", 0x7D + .charmap "ン", 0x7E + .charmap "ァ", 0x7F + .charmap "ィ", 0x80 + .charmap "ゥ", 0x81 + .charmap "ェ", 0x82 + .charmap "ォ", 0x83 + .charmap "ャ", 0x84 + .charmap "ュ", 0x85 + .charmap "ョ", 0x86 + .charmap "ガ", 0x87 + .charmap "ギ", 0x88 + .charmap "グ", 0x89 + .charmap "ゲ", 0x8A + .charmap "ゴ", 0x8B + .charmap "ザ", 0x8C + .charmap "ジ", 0x8D + .charmap "ズ", 0x8E + .charmap "ゼ", 0x8F + .charmap "ゾ", 0x90 + .charmap "ダ", 0x91 + .charmap "ヂ", 0x92 + .charmap "ヅ", 0x93 + .charmap "デ", 0x94 + .charmap "ド", 0x95 + .charmap "バ", 0x96 + .charmap "ビ", 0x97 + .charmap "ブ", 0x98 + .charmap "ベ", 0x99 + .charmap "ボ", 0x9A + .charmap "パ", 0x9B + .charmap "ピ", 0x9C + .charmap "プ", 0x9D + .charmap "ペ", 0x9E + .charmap "ポ", 0x9F + .charmap "ッ", 0xA0 + .charmapconst PKMN, 0x53, 0x54 .charmapconst POKEBLOCK, 0x55, 0x56, 0x57, 0x58, 0x59 .charmapconst next, 0xFE diff --git a/asm/emerald.s b/asm/emerald.s index fc74c445a..c684826fd 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -201593,7 +201593,7 @@ sub_8070954: ; 8070954 movs r1, 0x26 add r2, sp, 0x10 bl pokemon_setattr - ldr r2, =gUnknown_0832B708 + ldr r2, =gEggName adds r0, r7, 0 movs r1, 0x2 bl pokemon_setattr @@ -201682,7 +201682,7 @@ sub_8070A0C: ; 8070A0C movs r1, 0x26 add r2, sp, 0x10 bl pokemon_setattr - ldr r2, =gUnknown_0832B708 + ldr r2, =gEggName adds r0, r6, 0 movs r1, 0x2 bl pokemon_setattr diff --git a/data/data2.s b/data/data2.s index a3644e1a5..0116298ea 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1768,8 +1768,11 @@ gUnknown_0832B6E0: ; 832B6E0 gUnknown_0832B6F8: ; 832B6F8 .incbin "base_emerald.gba", 0x32b6f8, 0x10 -gUnknown_0832B708: ; 832B708 - .incbin "base_emerald.gba", 0x32b708, 0x8dc +gEggName: ; 832B708 + .charmapstr "タマゴ$" ; "tamago" ("egg" in Japanese) + +; 832B70C + .incbin "base_emerald.gba", 0x32b70c, 0x8d8 gUnknown_0832BFE4: ; 832BFE4 .incbin "base_emerald.gba", 0x32bfe4, 0x8 |