ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 19:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finish adding symbols to battle_anims

Browse Source
This commit is contained in:
Diegoisawesome 2018-01-14 21:04:06 -06:00
parent d2a55b1b10
commit 59680b2a73
6 changed files with 646 additions and 636 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/battle_anim_80FE840.s
View File

@ -36243,7 +36243,7 @@ _08110C10:
mov r0, sp
movs r2, 0
bl sub_80A6D60
ldr r0, =gUnknown_08D8DAB8
ldr r0, =gBattleAnimSpritePalette_261
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4

4
charmap.txt
View File

@ -73,6 +73,7 @@ RIGHT_ARROW = 7C
'?' = AC
'.' = AD
'-' = AE
'·' = AF
'…' = B0
'“' = B1
'”' = B2
@ -317,8 +318,7 @@ TALL_PLUS = FC 0C FB
'？' = AC
'。' = AD
'ー' = AE
'·' = AF
'‥' = B0
'⋯' = B0
STRING = FD

1211
data/battle_anims.s
View File

File diff suppressed because it is too large Load Diff

4
data/field_map_obj.s
View File

@ -8,9 +8,7 @@ gUnknown_084975C4:: @ 84975C4
.byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00
gUnknown_084975D4:: @ 84975D4
.2byte 0, 65535
sprite_template gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
spr_template 0x0000, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
gUnknown_084975EC:: @ 84975EC
.4byte CameraObject_0

14
data/graphics.s
View File

@ -2329,11 +2329,11 @@ gSubstituteDollTilemap:: @ 8C2D120
.incbin "graphics/battle_anims/sprites/substitute.bin.lz"
.align 2
gUnknown_08C2D348:: @ 8C2D348
gBattleAnimSpriteSheet_241:: @ 8C2D348
.incbin "graphics/battle_anims/sprites/241.4bpp.lz"
.align 2
gUnknown_08C2D40C:: @ 8C2D40C
gBattleAnimSpritePalette_241:: @ 8C2D40C
.incbin "graphics/battle_anims/sprites/241.gbapal.lz"
.align 2
@ -2345,19 +2345,19 @@ gContestConfetti_Pal:: @ 8C2D548
.incbin "graphics/misc/confetti.gbapal.lz"
.align 2
gUnknown_08C2D570:: @ 8C2D570
gBattleAnimSpriteSheet_242:: @ 8C2D570
.incbin "graphics/battle_anims/sprites/242.4bpp.lz"
.align 2
gUnknown_08C2D6AC:: @ 8C2D6AC
gBattleAnimSpritePalette_242:: @ 8C2D6AC
.incbin "graphics/battle_anims/sprites/242.gbapal.lz"
.align 2
gUnknown_08C2D6D0:: @ 8C2D6D0
gBattleAnimSpriteSheet_243:: @ 8C2D6D0
.incbin "graphics/battle_anims/sprites/243.4bpp.lz"
.align 2
gUnknown_08C2D6F8:: @ 8C2D6F8
gBattleAnimSpritePalette_243:: @ 8C2D6F8
.incbin "graphics/battle_anims/sprites/243.gbapal.lz"
.align 2
@ -3081,7 +3081,7 @@ gUnknown_08D8D58C:: @ 8D8D58C
.incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz"
.align 2
gUnknown_08D8DAB8:: @ 8E68580
gBattleAnimSpritePalette_261:: @ 8E68580
.incbin "graphics/battle_anims/sprites/261.gbapal.lz"
.align 2

47
data/strings.s
View File

@ -4169,48 +4169,61 @@ gJPText_MysteryGift:: @ 85EDFBF
gJPText_DecideStop:: @ 85EDFC9
.string "{UNK_CTRL_F800}けってい {UNK_CTRL_F801}やめる$" @ "{UNK_CTRL_F800}kettei {UNK_CTRL_F801}yameru" ("{UNK_CTRL_F800}decide {UNK_CTRL_F801}stop" in Japanese)
@ A bunch of Japanese strings here, waiting for updated datadump to dump properly
gUnknown_085EDFD6:: @ 85EDFD6
.byte 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x00, 0x44, 0xfe, 0x1c, 0x0c, 0x38, 0x15, 0x23, 0x27, 0x02, 0x23, 0x19, 0x2d, 0x00, 0x26, 0x20, 0x0a, 0x20, 0x1f, 0x0d, 0xff
.string "カードeリーダー{UNK_CTRL_F9 0x04}　で\n"
.string "ふしぎなもらいものを　よみこみます$"
gUnknown_085EDFF5:: @ 85EDFF5
.byte 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x19, 0x00, 0x72, 0x66, 0x85, 0xae, 0x06, 0x27, 0xfe, 0xb3, 0x12, 0x03, 0x0c, 0x2e, 0xb4, 0x2d, 0x00, 0x04, 0x27, 0x47, 0xff
.string "カードeリーダー{UNK_CTRL_F9 0x04}の　メニューから\n"
.string "‘つうしん’を　えらび$"
gUnknown_085EE014:: @ 85EE014
.byte 0xb3, 0x8a, 0xae, 0x71, 0x9a, 0xae, 0x52, 0x51, 0x95, 0x96, 0x7e, 0x5d, 0x14, 0x12, 0x03, 0x0c, 0x2e, 0xb4, 0xfe, 0x2d, 0x00, 0x0e, 0x2e, 0x10, 0x08, 0x00, 0x0c, 0x13, 0x08, 0x41, 0x0b, 0x02
.byte 0xff, 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x19, 0x00, 0xb3, 0x12, 0x03, 0x0c, 0x2e, 0xb4, 0x2d, 0xfe, 0x04, 0x27, 0x2e, 0x44, 0x00, 0xbb, 0x9a, 0x60, 0x7e, 0x2d, 0x00
.byte 0x05, 0x0c, 0x13, 0x08, 0x41, 0x0b, 0x02, 0xff
.string "‘ゲームボーイアドバンスとつうしん’\n"
.string "を　せんたく　してください$"
gUnknown_085EE035:: @ 85EE035
.string "カードeリーダー{UNK_CTRL_F9 0x04}の　‘つうしん’を\n"
.string "えらんで　Aボタンを　おしてください$"
gUnknown_085EE05C:: @ 85EE05C
.byte 0x0e, 0x12, 0x40, 0x08, 0x37, 0x00, 0x1f, 0x11, 0x37, 0x50, 0x13, 0x02, 0x1f, 0x0d, 0xff
.string "せつぞくが　まちがっています$"
gUnknown_085EE06B:: @ 85EE06B
.byte 0x56, 0xae, 0x95, 0x19, 0x00, 0x26, 0x20, 0x0a, 0x20, 0x2d, 0xfe, 0x11, 0x35, 0x03, 0x0c, 0x00, 0x0c, 0x1f, 0x0c, 0x10, 0xff, 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x14
.byte 0xfe, 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x44, 0x07, 0x1f, 0x0e, 0x2e, 0xff
.string "カードの　よみこみを\n"
.string "ちゅうし　しました$"
gUnknown_085EE080:: @ 85EE080
.string "カードeリーダー{UNK_CTRL_F9 0x04}と\n"
.string "つうしん　できません$"
gUnknown_085EE097:: @ 85EE097
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x11, 0x35, 0x03, 0x00, 0x44, 0x0d, 0xff
.string "つうしん　ちゅう　です$"
gUnknown_085EE0A3:: @ 85EE0A3
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x54, 0x77, 0xae, 0x44, 0x0d, 0xfe, 0x0e, 0x12, 0x40, 0x08, 0x2d, 0x00, 0x10, 0x0c, 0x06, 0x22, 0x13, 0x00, 0x08, 0x41, 0x0b, 0x02, 0xff
.string "つうしん　エラーです\n"
.string "せつぞくを　たしかめて　ください$"
gUnknown_085EE0BF:: @ 85EE0BF
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x54, 0x77, 0xae, 0x44, 0x0d, 0xfe, 0x1a, 0x3d, 0x22, 0x06, 0x27, 0x00, 0x24, 0x28, 0x15, 0x05, 0x0c, 0x13, 0x00, 0x08, 0x41, 0x0b, 0x02, 0xff
.string "つうしん　エラーです\n"
.string "はじめから　やりなおして　ください$"
gUnknown_085EE0DC:: @ 85EE0DC
.byte 0x56, 0xae, 0x95, 0xd9, 0x78, 0xae, 0x91, 0xae, 0xf9, 0x04, 0x00, 0x16, 0xfe, 0x56, 0xae, 0x95, 0x2d, 0x00, 0x26, 0x20, 0x0a, 0x1f, 0x0e, 0x13, 0x00, 0x08, 0x41, 0x0b, 0x02, 0xff
.string "カードeリーダー{UNK_CTRL_F9 0x04}　に\n"
.string "カードを　よみこませて　ください$"
gUnknown_085EE0FA:: @ 85EE0FA
.byte 0x12, 0x03, 0x0c, 0x2e, 0x00, 0x0c, 0x35, 0x03, 0x28, 0x36, 0x03, 0xab, 0xff
.string "つうしん　しゅうりょう！$"
gUnknown_085EE107:: @ 85EE107
.byte 0x01, 0x27, 0x10, 0x15, 0x00, 0x64, 0x7a, 0xae, 0x65, 0xae, 0x37, 0xfe, 0x6e, 0x53, 0x54, 0x7e, 0x16, 0x00, 0x24, 0x50, 0x13, 0x07, 0x10, 0xab, 0xff
.string "あらたな　トレーナーが\n"
.string "ホウエンに　やってきた！$"
gUnknown_085EE120:: @ 85EE120
.byte 0x0c, 0x46, 0x27, 0x08, 0x00, 0x05, 0x1f, 0x11, 0x08, 0x41, 0x0b, 0x02, 0xff
.string "しばらく　おまちください$"
gUnknown_085EE12D:: @ 85EE12D
.byte 0x06, 0x07, 0x0a, 0x20, 0x00, 0x54, 0x77, 0xae, 0x00, 0x44, 0x0d, 0xfe, 0x94, 0xae, 0x60, 0x37, 0x00, 0x1e, 0x40, 0x2e, 0x00, 0x44, 0x07, 0x1f, 0x0e, 0x2e, 0x44, 0x0c, 0x10, 0xff
.string "かきこみ　エラー　です\n"
.string "データが　ほぞん　できませんでした$"
gUnknown_085EE14B:: @ 85EE14B
.string "RED$"