diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 10:24:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 10:24:11 -0500 |
| commit | a01d83a4341cd0cdad01fe2d0b96920301257f2a (patch) | |
| tree | ac4f4ce6086d4664ea49d515759a8044ecd1d973 /data/strings.s | |
| parent | e7cd8c59f4ca0f6c56a3b3782c21e896c203694e (diff) | |
| parent | 91099dbd0c451188742bf045a26a036e0e8d9f89 (diff) | |
Merge branch 'master' into sync-ai
Diffstat (limited to 'data/strings.s')
| -rw-r--r-- | data/strings.s | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/strings.s b/data/strings.s index 55c54f6c3..e77730429 100644 --- a/data/strings.s +++ b/data/strings.s @@ -411,7 +411,7 @@ gOtherText_Use:: gOtherText_Toss:: .string "TOSS$" -gUnknown_84161A9:: +gOtherText_Register:: .string "REGISTER$" gOtherText_Give:: @@ -420,7 +420,7 @@ gOtherText_Give:: gUnknown_84161B7:: .string "けってい$" -gUnknown_84161BC:: +gOtherText_Walk:: .string "WALK$" gFameCheckerText_Cancel:: @ 84161C1 @@ -447,16 +447,16 @@ gText_Take:: gText_Store:: .string "STORE$" -gUnknown_84161E9:: +gOtherText_Check:: .string "CHECK$" gUnknown_84161EF:: @ 84161EF .string "NONE$" -gUnknown_84161F4:: +gOtherText_Open:: .string "OPEN$" -gUnknown_84161F9:: +gOtherText_Deselect:: .string "DESELECT$" gUnknown_8416202:: @ 8416202 @@ -555,19 +555,19 @@ gUnknown_84162BD:: @ 84162BD gText_Coins:: @ 84162C4 .string "{STR_VAR_1} COINS$" -gUnknown_84162CD:: @ 0x84162CD +gText_Items2:: @ 0x84162CD .string "ITEMS$" -gUnknown_84162D3:: @ 0x84162D3 +gText_PokeBalls2:: @ 0x84162D3 .string "POKé BALLS$" -gUnknown_84162DE:: @ 0x84162DE +gText_KeyItems2:: @ 0x84162DE .string "KEY ITEMS$" gText_DepositItem:: @ 84162E8 .string "DEPOSIT ITEM$" -gUnknown_84162F5:: @ 84162F5 +gText_CloseBag:: @ 84162F5 .string "CLOSE BAG$" gOtherText_StrVar1:: @ 84162FF @@ -577,7 +577,7 @@ gText_IsSelected:: @ 8416301 .string " is\n" .string "selected.$" -gUnknown_841630F:: @ 841630F +gText_CantWriteMailHere:: @ 841630F .string "You can't write\n" .string "MAIL here.$" @@ -596,15 +596,15 @@ gText_TheStrVar1CantBeHeldHere:: @ 8416374 .string "The {STR_VAR_1} can't be held\n" .string "here.$" -gUnknown_841638F:: @ 841638F +gText_DepositHowManyStrVars1:: @ 841638F .string "Deposit how many\n" .string "{STR_VAR_1}(s)?$" -gUnknown_84163A7:: @ 84163A7 +gText_DepositedStrVar2StrVar1s:: @ 84163A7 .string "Deposited {STR_VAR_2}\n" .string "{STR_VAR_1}(s).$" -gUnknown_84163BB:: @ 84163BB +gText_NoRoomToStoreItems:: @ 84163BB .string "There's no room to\n" .string "store items.$" @@ -4598,14 +4598,14 @@ gText_WhichMoveShouldBeForgotten:: @ 841E50C gUnknown_841E52D:: @ 0x841E52D .string "----------$" -gUnknown_841E538:: @ 841E538 +gText_CommStandbyAwaitingOtherPlayer:: @ 841E538 .string "Communication standby‥\n" .string "Awaiting another player to choose.$" -gUnknown_841E572:: @ 841E572 +gText_BattleWasRefused:: @ 841E572 .string "The battle was refused.{PAUSE 0x3C}$" -gUnknown_841E58D:: @ 841E58D +gText_RefusedBattle:: @ 841E58D .string "Refused the battle.{PAUSE 0x3C}$" gFameCheckerText_MainScreenUI:: @ 841E5A4 |