diff options
author | FieryMewtwo <77066742+FieryMewtwo@users.noreply.github.com> | 2021-10-11 12:04:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-11 09:04:44 -0700 |
commit | 18726d97cfe82c38a4809ca1fb4fd4aeda7a7ee1 (patch) | |
tree | dddb4b3dcb10acaa2b9059ba68b6c6bf8e23a565 | |
parent | 25794a39c3539e66d1c0b2334cb35273cd9d8494 (diff) |
More text cleanup (#62)
* Update build.yml
temporarily so that I can edit without having to try to figure out why my Git client keeps crashing
* Fix references to the old save.inc text labels
* Labels
welp here we go again
* Give Wonder Mail client 'thanks' text more descriptive function label names
* Change back the workflow
-rw-r--r-- | asm/code_2.s | 16 | ||||
-rw-r--r-- | asm/wonder_mail_3.s | 10 | ||||
-rw-r--r-- | data/text/save.inc | 16 | ||||
-rw-r--r-- | data/text/wonder_mail_complete.inc | 10 |
4 files changed, 26 insertions, 26 deletions
diff --git a/asm/code_2.s b/asm/code_2.s index b9d3464..4e8fddc 100644 --- a/asm/code_2.s +++ b/asm/code_2.s @@ -173,7 +173,7 @@ QuickSave: b _08000892 .align 2, 0 _080007AC: .4byte gUnknown_2026E4E -_080007B0: .4byte gUnknown_80B6A34 +_080007B0: .4byte gSaveTextQuicksaving _080007B4: cmp r4, 0x1 beq _0800086C @@ -227,7 +227,7 @@ _08000812: b _08000822 .align 2, 0 _08000818: .4byte 0x000f1206 -_0800081C: .4byte gUnknown_80B6A7C +_0800081C: .4byte gSaveTextYourAdventureHasBeenSaved _08000820: ldr r0, _08000834 _08000822: @@ -239,7 +239,7 @@ _08000822: movs r4, 0x1 b _08000892 .align 2, 0 -_08000834: .4byte gUnknown_80B6AA0 +_08000834: .4byte gSaveTextYourAdventureHasBeenSavedLong _08000838: .4byte 0x00000321 _0800083C: cmp r4, 0x1 @@ -252,7 +252,7 @@ _0800083C: movs r4, 0x3 b _08000892 .align 2, 0 -_08000850: .4byte gUnknown_80B6B14 +_08000850: .4byte gSaveTextTheDataCouldNotBeWritten _08000854: ldr r0, _08000864 movs r1, 0 @@ -263,7 +263,7 @@ _08000860: movs r4, 0x2 b _08000892 .align 2, 0 -_08000864: .4byte gUnknown_80B6B78 +_08000864: .4byte gSaveTextFailed _08000868: .4byte 0x00000301 _0800086C: cmp r6, 0 @@ -362,12 +362,12 @@ _08000934: movs r4, 0x2 b _080009A2 .align 2, 0 -_08000944: .4byte gUnknown_80B6B88 +_08000944: .4byte gSaveTextError _08000948: ldr r0, _0800094C b _08000952 .align 2, 0 -_0800094C: .4byte gUnknown_80B6BDC +_0800094C: .4byte gSaveTextCantResume _08000950: ldr r0, _08000960 _08000952: @@ -379,7 +379,7 @@ _0800095C: movs r4, 0x1 b _080009A2 .align 2, 0 -_08000960: .4byte gUnknown_80B6CB8 +_08000960: .4byte gSaveTextMayNotResume _08000964: .4byte 0x00000301 _08000968: cmp r4, 0x1 diff --git a/asm/wonder_mail_3.s b/asm/wonder_mail_3.s index 797431c..cd6126f 100644 --- a/asm/wonder_mail_3.s +++ b/asm/wonder_mail_3.s @@ -1069,22 +1069,22 @@ _0802DDDC: ldr r0, _0802DDE0 b _0802DE1C .align 2, 0 -_0802DDE0: .4byte gUnknown_80E0184 +_0802DDE0: .4byte gWonderMailClientThanksForRescuingMe _0802DDE4: ldr r0, _0802DDE8 b _0802DE1C .align 2, 0 -_0802DDE8: .4byte gUnknown_80E01A0 +_0802DDE8: .4byte gWonderMailClientThanksForRescuingThem _0802DDEC: ldr r0, _0802DDF0 b _0802DE1C .align 2, 0 -_0802DDF0: .4byte gUnknown_80E01C4 +_0802DDF0: .4byte gWonderMailClientEscorted _0802DDF4: ldr r0, _0802DDF8 b _0802DE1C .align 2, 0 -_0802DDF8: .4byte gUnknown_80E01F0 +_0802DDF8: .4byte gWonderMailClientItemDelivered1 _0802DDFC: ldr r0, [r5] ldr r0, [r0, 0x34] @@ -1108,7 +1108,7 @@ _0802DE1C: bl sub_80141B4 b _0802DE3E .align 2, 0 -_0802DE2C: .4byte gUnknown_80E0218 +_0802DE2C: .4byte gWonderMailClientItemDelivered2 _0802DE30: .4byte 0x0000010d _0802DE34: ldr r0, [r5] diff --git a/data/text/save.inc b/data/text/save.inc index b01e2d8..f20a139 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -1,35 +1,35 @@ -gUnknown_80B6A34:: @ 80B6A34 +gSaveTextQuicksaving:: @ 80B6A34 .string "#+Quicksaving your adventure...\n" .string "#+Please don~27t turn off the power.\0" .align 2, 0 -gUnknown_80B6A7C:: @ 80B6A7C +gSaveTextYourAdventureHasBeenSaved:: @ 80B6A7C .string "#+Your adventure has been saved.\0" .align 2, 0 -gUnknown_80B6AA0:: @ 80B6AA0 +gSaveTextYourAdventureHasBeenSavedLong:: @ 80B6AA0 .string "#+Your adventure has been saved.\n" .string "#+When you are in a dungeon~2c quicksave\n" .string "#+your progress before ending the game.\0" .align 2, 0 -gUnknown_80B6B14:: @ 80B6B14 +gSaveTextTheDataCouldNotBeWritten:: @ 80B6B14 .string "#+The data could not be written.\n" .string "#+Please turn off the power and remove\n" .string "#+and reinsert the DS Card.\0" .align 2, 0 -gUnknown_80B6B78:: @ 80B6B78 +gSaveTextFailed:: @ 80B6B78 .string "#+Save failed.\0" .align 2, 0 -gUnknown_80B6B88:: @ 80B6B88 +gSaveTextError:: @ 80B6B88 .string "#+Error reading data.\n" .string "#+Please turn off the power and reinsert\n" .string "#+the DS Game Card.\0" .align 2, 0 -gUnknown_80B6BDC:: @ 80B6BDC +gSaveTextCantResume:: @ 80B6BDC .string "#+Your data was not properly saved~2c\n" .string "#+so your game cannot be resumed\n" .string "#+from your last spot.#P#+Your last outing is considered a defeat.\n" @@ -37,7 +37,7 @@ gUnknown_80B6BDC:: @ 80B6BDC .string "#+team base~2c or quicksave in a dungeon.\0" .align 2, 0 -gUnknown_80B6CB8:: @ 80B6CB8 +gSaveTextMayNotResume:: @ 80B6CB8 .string "#+You may not resume your dungeon\n" .string "#+adventure using this saved data.\n" .string "#+Your last outing is considered a defeat.\0" diff --git a/data/text/wonder_mail_complete.inc b/data/text/wonder_mail_complete.inc index d919ffb..24a5288 100644 --- a/data/text/wonder_mail_complete.inc +++ b/data/text/wonder_mail_complete.inc @@ -1,23 +1,23 @@ -gUnknown_80E0184:: @ 80E0184 +gWonderMailClientThanksForRescuingMe:: @ 80E0184 .string " Thank you for rescuing me!\0" .align 2, 0 -gUnknown_80E01A0:: @ 80E01A0 +gWonderMailClientThanksForRescuingThem:: @ 80E01A0 .string " Thank you for rescuing\n" .string "#C5$m1#R!\0" .align 2, 0 -gUnknown_80E01C4:: @ 80E01C4 +gWonderMailClientEscorted:: @ 80E01C4 .string " Thank you for escorting me\n" .string "to #C5$m1#R! \0" .align 2, 0 -gUnknown_80E01F0:: @ 80E01F0 +gWonderMailClientItemDelivered1:: @ 80E01F0 .string " Thank you for delivering\n" .string "the #C4$i0#R!\0" .align 2, 0 -gUnknown_80E0218:: @ 80E0218 +gWonderMailClientItemDelivered2:: @ 80E0218 .string " Thank you for getting me\n" .string "the #C4$i0#R!\0" .align 2, 0 |