atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

type names

Browse source
This commit is contained in:
YamaArashi 2015-10-11 01:20:41 -07:00
parent 1874db5e8a
commit 52c9f4a7dc
3 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
asm/emerald.s
View file

@ -27021,7 +27021,7 @@ sub_80156E0: ; 80156E0
lsrs r2, 2 lsrs r2, 2
lsls r1, r2, 3 lsls r1, r2, 3
subs r1, r2 subs r1, r2
ldr r2, =gUnknown_0831AE38 ldr r2, =gTypeNames
adds r1, r2 adds r1, r2
bl gf_strcpy bl gf_strcpy
ldr r1, =gUnknown_082EF6E4 ldr r1, =gUnknown_082EF6E4
@ -27040,7 +27040,7 @@ sub_80156E0: ; 80156E0
lsrs r2, 2 lsrs r2, 2
lsls r1, r2, 3 lsls r1, r2, 3
subs r1, r2 subs r1, r2
ldr r2, =gUnknown_0831AE38 ldr r2, =gTypeNames
adds r1, r2 adds r1, r2
bl gf_strcpy bl gf_strcpy
ldr r1, =gUnknown_082EF718 ldr r1, =gUnknown_082EF718
@ -157037,7 +157037,7 @@ sub_8059BB0: ; 8059BB0
ldrb r2, [r1, 0x2] ldrb r2, [r1, 0x2]
lsls r1, r2, 3 lsls r1, r2, 3
subs r1, r2 subs r1, r2
ldr r2, =gUnknown_0831AE38 ldr r2, =gTypeNames
adds r1, r2 adds r1, r2
bl gf_strcpy bl gf_strcpy
adds r0, r6, 0 adds r0, r6, 0
@ -645730,7 +645730,7 @@ sub_814F648: ; 814F648
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
lsls r1, r0, 3 lsls r1, r0, 3
subs r1, r0 subs r1, r0
ldr r0, =gUnknown_0831AE38 ldr r0, =gTypeNames
b @0814F846 b @0814F846
.align 2, 0 .align 2, 0
.pool .pool
@ -902977,7 +902977,7 @@ sub_81D28FC: ; 81D28FC
ldrb r1, [r6, 0x2] ldrb r1, [r6, 0x2]
lsls r0, r1, 3 lsls r0, r1, 3
subs r0, r1 subs r0, r1
ldr r1, =gUnknown_0831AE38 ldr r1, =gTypeNames
adds r5, r0, r1 adds r5, r0, r1
movs r0, 0x19 movs r0, 0x19
str r0, [sp] str r0, [sp]

6
data/data2.s
View file

@ -1481,8 +1481,10 @@ gUnknown_0831ACE0: ; 831ACE0
gUnknown_0831ACE8: ; 831ACE8 gUnknown_0831ACE8: ; 831ACE8
.incbin "base_emerald.gba", 0x31ace8, 0x150 .incbin "base_emerald.gba", 0x31ace8, 0x150
gUnknown_0831AE38: ; 831AE38 ; 831AE38
.incbin "base_emerald.gba", 0x31ae38, 0x80 .include "data/text/type_names.s"
.align 2, 0
gUnknown_0831AEB8: ; 831AEB8 gUnknown_0831AEB8: ; 831AEB8
.incbin "base_emerald.gba", 0x31aeb8, 0x823 .incbin "base_emerald.gba", 0x31aeb8, 0x823

19
data/text/type_names.s Normal file
View file

@ -0,0 +1,19 @@
gTypeNames: ; 831AE38
.charmapstr "NORMAL$", 7
.charmapstr "FIGHT$", 7
.charmapstr "FLYING$", 7
.charmapstr "POISON$", 7
.charmapstr "GROUND$", 7
.charmapstr "ROCK$", 7
.charmapstr "BUG$", 7
.charmapstr "GHOST$", 7
.charmapstr "STEEL$", 7
.charmapstr "???$", 7
.charmapstr "FIRE$", 7
.charmapstr "WATER$", 7
.charmapstr "GRASS$", 7
.charmapstr "ELECTR$", 7
.charmapstr "PSYCHC$", 7
.charmapstr "ICE$", 7
.charmapstr "DRAGON$", 7
.charmapstr "DARK$", 7