diff options
author | FieryMewtwo <77066742+FieryMewtwo@users.noreply.github.com> | 2021-10-08 16:24:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-08 13:24:23 -0700 |
commit | fb7a3a03e71fc7f83ff5471067b7cbe2e069d0fc (patch) | |
tree | a98e11a738bee1d83ad7e338c9de62d0df15012a | |
parent | de6af79187d8f30a99e2e1d22c5646f4522474a7 (diff) |
Update Luminous Cave text to use more descriptive labels (#61)
* Update luminous_cave.inc
* Fix pointers
* Fix pointers
again
* Fix pointers
finally done
-rw-r--r-- | asm/friend_list_menu.s | 22 | ||||
-rw-r--r-- | data/text/luminous_cave.inc | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s index a01b173..2fe7701 100644 --- a/asm/friend_list_menu.s +++ b/asm/friend_list_menu.s @@ -11531,7 +11531,7 @@ _080249B6: b _08024A42 .align 2, 0 _080249C8: .4byte gUnknown_203B2B0 -_080249CC: .4byte gUnknown_80DCA34 +_080249CC: .4byte gLuminousCaveSeekAwakening _080249D0: bl sub_8024CFC ldr r0, _080249E0 @@ -11540,7 +11540,7 @@ _080249D0: ldr r2, [r1, 0x28] b _08024A42 .align 2, 0 -_080249E0: .4byte gUnknown_80DCAB8 +_080249E0: .4byte gLuminousCaveAskEvolution _080249E4: .4byte gUnknown_203B2B0 _080249E8: ldr r1, [r5] @@ -11561,7 +11561,7 @@ _080249F8: ldr r3, _08024A10 b _08024CB0 .align 2, 0 -_08024A0C: .4byte gUnknown_80DCD5C +_08024A0C: .4byte gLuminousCaveYeShallReturn _08024A10: .4byte 0x00000305 _08024A14: bl sub_8024D48 @@ -11657,7 +11657,7 @@ _08024ACA: ldr r0, _08024AD4 b _08024CAE .align 2, 0 -_08024AD4: .4byte gUnknown_80DCDDC +_08024AD4: .4byte gLuminousCaveLackWhatIsNeeded _08024AD8: ldr r1, [r5] movs r0, 0xA @@ -11665,7 +11665,7 @@ _08024AD8: ldr r0, _08024AE4 b _08024CAE .align 2, 0 -_08024AE4: .4byte gUnknown_80DCE18 +_08024AE4: .4byte gLuminousCaveOnlyOneItem _08024AE8: bl sub_8025254 ldr r0, _08024B00 @@ -11720,7 +11720,7 @@ _08024B3A: ldr r0, _08024B48 b _08024CAE .align 2, 0 -_08024B48: .4byte gUnknown_80DCE38 +_08024B48: .4byte gLuminousCaveLetUsBegin _08024B4C: ldr r0, _08024B68 ldr r1, [r5] @@ -11737,7 +11737,7 @@ _08024B4C: .align 2, 0 _08024B68: .4byte gPlayerName _08024B6C: .4byte 0x000001ff -_08024B70: .4byte gUnknown_80DCE68 +_08024B70: .4byte gLuminousCaveChangedAppearance _08024B74: ldr r0, [r5] ldr r0, [r0, 0xC] @@ -11808,7 +11808,7 @@ _08024C06: .align 2, 0 _08024C10: .4byte gAvailablePokemonNames _08024C14: .4byte 0x000001ff -_08024C18: .4byte gUnknown_80DCEB0 +_08024C18: .4byte gLuminousCaveEvolved _08024C1C: ldr r1, [r5] movs r0, 0x3 @@ -11816,7 +11816,7 @@ _08024C1C: ldr r0, _08024C28 b _08024CAE .align 2, 0 -_08024C28: .4byte gUnknown_80DCEDC +_08024C28: .4byte gLuminousCaveComeAlone _08024C2C: ldr r1, [r5] movs r0, 0x3 @@ -11832,7 +11832,7 @@ _08024C3C: ldr r0, _08024C48 b _08024CAE .align 2, 0 -_08024C48: .4byte gUnknown_80DCF88 +_08024C48: .4byte gLuminousCaveCantEvolveAnymore _08024C4C: ldr r1, [r5] movs r0, 0x3 @@ -11872,7 +11872,7 @@ _08024C8C: ldr r0, _08024C98 b _08024CAE .align 2, 0 -_08024C98: .4byte gUnknown_80DD0E0 +_08024C98: .4byte gLuminousCaveCantEvolveYet _08024C9C: movs r0, 0x8 movs r1, 0x3C diff --git a/data/text/luminous_cave.inc b/data/text/luminous_cave.inc index 255c124..96f852e 100644 --- a/data/text/luminous_cave.inc +++ b/data/text/luminous_cave.inc @@ -1,11 +1,11 @@ -gUnknown_80DCA34:: @ 80DCA34 +gLuminousCaveSeekAwakening:: @ 80DCA34 .string "#+...#WA voice emanates from somewhere...#P" .string "#+...Ye who seek awakening...#P" .string "#+This is Luminous Cave.#W\n" .string "#+Do ye seek a new evolution?\0" .align 2, 0 -gUnknown_80DCAB8:: @ 80DCAB8 +gLuminousCaveAskEvolution:: @ 80DCAB8 .string "#+Do ye seek evolution?\0" .align 2, 0 @@ -31,7 +31,7 @@ gLuminousCaveEvolutionInfo:: @ 80DCAD0 .string "#+before committing to evolution.\0" .align 2, 0 -gUnknown_80DCD5C:: @ 80DCD5C +gLuminousCaveYeShallReturn:: @ 80DCD5C .string "#+Ye shall return if evolution\n" .string "#+is what ye seek...\0" .align 2, 0 @@ -44,31 +44,31 @@ gLuminousCaveGiveAnotherItem:: @ 80DCDB8 .string "#+Will ye give yet another item?\0" .align 2, 0 -gUnknown_80DCDDC:: @ 80DCDDC +gLuminousCaveLackWhatIsNeeded:: @ 80DCDDC .string "#+Alas~2c ye seem to lack what is needed\n" .string "#+for evolution.\0" .align 2, 0 -gUnknown_80DCE18:: @ 80DCE18 +gLuminousCaveOnlyOneItem:: @ 80DCE18 .string "#+Ye seem to have but one item.\0" .align 2, 0 -gUnknown_80DCE38:: @ 80DCE38 +gLuminousCaveLetUsBegin:: @ 80DCE38 .string "#+...Ye who seek awakening...\n" .string "#+Let us begin.\0" .align 2, 0 -gUnknown_80DCE68:: @ 80DCE68 +gLuminousCaveChangedAppearance:: @ 80DCE68 .string "#+...#W$n0 is undergoing changes...#P" .string "#+$n0~27s appearance changed...#P\0" .align 2, 0 -gUnknown_80DCEB0:: @ 80DCEB0 +gLuminousCaveEvolved:: @ 80DCEB0 .string "#+It evolved from #C4$m0#R\n" .string "#+to #C6$m1#R!\0" .align 2, 0 -gUnknown_80DCEDC:: @ 80DCEDC +gLuminousCaveComeAlone:: @ 80DCEDC .string "#+...#P" .string "#+One cannot evolve if one\n" .string "#+is in the company of others.#P" @@ -81,7 +81,7 @@ gLuminousCaveLackLevel:: @ 80DCF44 .string "#+Ye have not high enough a level.\0" .align 2, 0 -gUnknown_80DCF88:: @ 80DCF88 +gLuminousCaveCantEvolveAnymore:: @ 80DCF88 .string "#+...#P" .string "#+Ye cannot evolve anymore.\0" .align 2, 0 @@ -111,7 +111,7 @@ gLuminousCaveLackItem:: @ 80DD098 .string "#+Ye seem to lack an item to evolve.\0" .align 2, 0 -gUnknown_80DD0E0:: @ 80DD0E0 +gLuminousCaveCantEvolveYet:: @ 80DD0E0 .string "#+#+...#P" .string "#+Ye cannot evolve yet. \0" .align 2, 0 |