diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 6 | ||||
| -rw-r--r-- | data/text/nature_names.s | 103 |
2 files changed, 106 insertions, 3 deletions
diff --git a/data/data2.s b/data/data2.s index faf079e14..e34164f13 100644 --- a/data/data2.s +++ b/data/data2.s @@ -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 diff --git a/data/text/nature_names.s b/data/text/nature_names.s new file mode 100644 index 000000000..fa5647a8a --- /dev/null +++ b/data/text/nature_names.s @@ -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 |