nature names
This commit is contained in:
parent
bc7f744daa
commit
5f550963fa
3 changed files with 109 additions and 6 deletions
|
@ -206413,7 +206413,7 @@ sub_80730D4: ; 80730D4
|
|||
lsls r0, 24
|
||||
mov r4, sp
|
||||
adds r4, 0x6
|
||||
ldr r1, =gUnknown_0861CB50
|
||||
ldr r1, =gNatureNamePointers
|
||||
lsrs r0, 22
|
||||
adds r0, r1
|
||||
ldr r1, [r0]
|
||||
|
@ -694201,7 +694201,7 @@ sub_8167BA0: ; 8167BA0
|
|||
adds r0, r6
|
||||
ldr r1, =gUnknown_085EBF8D
|
||||
bl gf_strcpy
|
||||
ldr r1, =gUnknown_0861CB50
|
||||
ldr r1, =gNatureNamePointers
|
||||
lsls r4, 2
|
||||
adds r4, r1
|
||||
ldr r1, [r4]
|
||||
|
@ -871337,7 +871337,7 @@ sub_81C31C0: ; 81C31C0
|
|||
push {lr}
|
||||
ldr r0, =0x0203cf1c
|
||||
ldr r0, [r0]
|
||||
ldr r1, =gUnknown_0861CB50
|
||||
ldr r1, =gNatureNamePointers
|
||||
adds r0, 0xA3
|
||||
ldrb r0, [r0]
|
||||
lsls r0, 2
|
||||
|
|
|
@ -11117,10 +11117,10 @@ gUnknown_08618178: ; 8618178
|
|||
.incbin "base_emerald.gba", 0x618178, 0x43ac
|
||||
|
||||
gUnknown_0861C524: ; 861C524
|
||||
.incbin "base_emerald.gba", 0x61c524, 0x62c
|
||||
.incbin "base_emerald.gba", 0x61c524, 0x588
|
||||
|
||||
gUnknown_0861CB50: ; 861CB50
|
||||
.incbin "base_emerald.gba", 0x61cb50, 0x64
|
||||
; 861CAAC
|
||||
.include "data/text/nature_names.s"
|
||||
|
||||
gUnknown_0861CBB4: ; 861CBB4
|
||||
.incbin "base_emerald.gba", 0x61cbb4, 0x38
|
||||
|
|
103
data/text/nature_names.s
Normal file
103
data/text/nature_names.s
Normal file
|
@ -0,0 +1,103 @@
|
|||
gHardyNatureName: ; 861CAAC
|
||||
.charmapstr "HARDY$"
|
||||
|
||||
gLonelyNatureName: ; 861CAB2
|
||||
.charmapstr "LONELY$"
|
||||
|
||||
gBraveNatureName: ; 861CAB9
|
||||
.charmapstr "BRAVE$"
|
||||
|
||||
gAdamantNatureName: ; 861CABF
|
||||
.charmapstr "ADAMANT$"
|
||||
|
||||
gNaughtyNatureName: ; 861CAC7
|
||||
.charmapstr "NAUGHTY$"
|
||||
|
||||
gBoldNatureName: ; 861CACF
|
||||
.charmapstr "BOLD$"
|
||||
|
||||
gDocileNatureName: ; 861CAD4
|
||||
.charmapstr "DOCILE$"
|
||||
|
||||
gRelaxedNatureName: ; 861CADB
|
||||
.charmapstr "RELAXED$"
|
||||
|
||||
gImpishNatureName: ; 861CAE3
|
||||
.charmapstr "IMPISH$"
|
||||
|
||||
gLaxNatureName: ; 861CAEA
|
||||
.charmapstr "LAX$"
|
||||
|
||||
gTimidNatureName: ; 861CAEE
|
||||
.charmapstr "TIMID$"
|
||||
|
||||
gHastyNatureName: ; 861CAF4
|
||||
.charmapstr "HASTY$"
|
||||
|
||||
gSeriousNatureName: ; 861CAFA
|
||||
.charmapstr "SERIOUS$"
|
||||
|
||||
gJollyNatureName: ; 861CB02
|
||||
.charmapstr "JOLLY$"
|
||||
|
||||
gNaiveNatureName: ; 861CB08
|
||||
.charmapstr "NAIVE$"
|
||||
|
||||
gModestNatureName: ; 861CB0E
|
||||
.charmapstr "MODEST$"
|
||||
|
||||
gMildNatureName: ; 861CB15
|
||||
.charmapstr "MILD$"
|
||||
|
||||
gQuietNatureName: ; 861CB1A
|
||||
.charmapstr "QUIET$"
|
||||
|
||||
gBashfulNatureName: ; 861CB20
|
||||
.charmapstr "BASHFUL$"
|
||||
|
||||
gRashNatureName: ; 861CB28
|
||||
.charmapstr "RASH$"
|
||||
|
||||
gCalmNatureName: ; 861CB2D
|
||||
.charmapstr "CALM$"
|
||||
|
||||
gGentleNatureName: ; 861CB32
|
||||
.charmapstr "GENTLE$"
|
||||
|
||||
gSassyNatureName: ; 861CB39
|
||||
.charmapstr "SASSY$"
|
||||
|
||||
gCarefulNatureName: ; 861CB3F
|
||||
.charmapstr "CAREFUL$"
|
||||
|
||||
gQuirkyNatureName: ; 861CB47
|
||||
.charmapstr "QUIRKY$"
|
||||
|
||||
.align 2, 0
|
||||
|
||||
gNatureNamePointers: ; 861CB50
|
||||
.4byte gHardyNatureName
|
||||
.4byte gLonelyNatureName
|
||||
.4byte gBraveNatureName
|
||||
.4byte gAdamantNatureName
|
||||
.4byte gNaughtyNatureName
|
||||
.4byte gBoldNatureName
|
||||
.4byte gDocileNatureName
|
||||
.4byte gRelaxedNatureName
|
||||
.4byte gImpishNatureName
|
||||
.4byte gLaxNatureName
|
||||
.4byte gTimidNatureName
|
||||
.4byte gHastyNatureName
|
||||
.4byte gSeriousNatureName
|
||||
.4byte gJollyNatureName
|
||||
.4byte gNaiveNatureName
|
||||
.4byte gModestNatureName
|
||||
.4byte gMildNatureName
|
||||
.4byte gQuietNatureName
|
||||
.4byte gBashfulNatureName
|
||||
.4byte gRashNatureName
|
||||
.4byte gCalmNatureName
|
||||
.4byte gGentleNatureName
|
||||
.4byte gSassyNatureName
|
||||
.4byte gCarefulNatureName
|
||||
.4byte gQuirkyNatureName
|
Loading…
Reference in a new issue