dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Finish renaming strings in strings.s

Browse Source
This commit is contained in:
Diegoisawesome
2017-09-20 14:38:05 -05:00
parent 4ec2fe8f37
commit 9ed9f7de94
64 changed files with 1600 additions and 1528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/shop.s
+17 -17
View File
@@ -325,14 +325,14 @@ Task_ExitSellMenu: @ 80DFCF8
ldrb r0, [r0, 0xF]
cmp r0, 0x2
bne _080DFD2C
ldr r1, =gUnknown_085E95C7
ldr r1, =gText_CanIHelpWithAnythingElse
ldr r2, =ReturnToShopMenuAfterExitingSellMenu
adds r0, r4, 0
bl DisplayItemMessageOnField
b _080DFD36
.pool
_080DFD2C:
ldr r1, =gUnknown_085E959B
ldr r1, =gText_AnythingElseICanHelp
ldr r2, =ReturnToShopMenuAfterExitingSellMenu
adds r0, r5, 0
bl DisplayItemMessageOnField
@@ -748,7 +748,7 @@ _080E00D8:
b _080E00EA
.pool
_080E00E8:
ldr r4, =gUnknown_085E93E0
ldr r4, =gText_QuitShopping
_080E00EA:
movs r0, 0x2
movs r1, 0
@@ -817,7 +817,7 @@ _080E0164:
bl ConvertIntToDecimalStringN
_080E0176:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E969C
ldr r1, =gText_PokedollarVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x7
@@ -2060,7 +2060,7 @@ _080E0B92:
lsls r0, 24
cmp r0, 0
bne _080E0BD0
ldr r1, =gUnknown_085E9539
ldr r1, =gText_YouDontHaveMoney
ldr r2, =BuyMenuReturnToItemList
b _080E0C28
.pool
@@ -2091,11 +2091,11 @@ _080E0BD0:
adds r1, r0
adds r0, r4, 0
bl StringCopy
ldr r1, =gUnknown_085E9417
ldr r1, =gText_Var1CertainlyHowMany2
b _080E0C26
.pool
_080E0C24:
ldr r1, =gUnknown_085E93EF
ldr r1, =gText_Var1CertainlyHowMany
_080E0C26:
ldr r2, =Task_BuyHowManyDialogueInit
_080E0C28:
@@ -2121,13 +2121,13 @@ _080E0C38:
cmp r0, 0x1
bne _080E0C7C
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9468
ldr r1, =gText_Var1IsItThatllBeVar2
bl StringExpandPlaceholders
b _080E0C84
.pool
_080E0C7C:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9493
ldr r1, =gText_YouWantedVar1ThatllBeVar2
bl StringExpandPlaceholders
_080E0C84:
ldr r1, =gStringVar4
@@ -2171,7 +2171,7 @@ Task_BuyHowManyDialogueInit: @ 80E0CA4
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E93D5
ldr r1, =gText_InBagVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@@ -2319,7 +2319,7 @@ _080E0DF0:
movs r2, 0
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085E943F
ldr r1, =gText_Var1AndYouWantedVar2
ldr r2, =BuyMenuConfirmPurchase
adds r0, r6, 0
bl BuyMenuDisplayMessage
@@ -2400,7 +2400,7 @@ BuyMenuTryMakePurchase: @ 80E0EDC
lsrs r0, 24
cmp r0, 0x1
bne _080E0F30
ldr r1, =gUnknown_085E94C5
ldr r1, =gText_HereYouGoThankYou
ldr r2, =BuyMenuSubtractMoney
adds r0, r5, 0
bl BuyMenuDisplayMessage
@@ -2409,7 +2409,7 @@ BuyMenuTryMakePurchase: @ 80E0EDC
b _080E0F7A
.pool
_080E0F30:
ldr r1, =gUnknown_085E9558
ldr r1, =gText_NoMoreRoomForThis
ldr r2, =BuyMenuReturnToItemList
b _080E0F60
.pool
@@ -2422,11 +2422,11 @@ _080E0F40:
ldrb r0, [r6, 0xF]
cmp r0, 0x1
bne _080E0F5C
ldr r1, =gUnknown_085E94E7
ldr r1, =gText_ThankYouIllSendItHome
b _080E0F5E
.pool
_080E0F5C:
ldr r1, =gUnknown_085E9510
ldr r1, =gText_ThanksIllSendItHome
_080E0F5E:
ldr r2, =BuyMenuSubtractMoney
_080E0F60:
@@ -2435,7 +2435,7 @@ _080E0F60:
b _080E0F7A
.pool
_080E0F70:
ldr r1, =gUnknown_085E957F
ldr r1, =gText_SpaceForVar1Full
ldr r2, =BuyMenuReturnToItemList
adds r0, r7, 0
bl BuyMenuDisplayMessage
@@ -2536,7 +2536,7 @@ Task_ReturnToItemListAfterItemPurchase: @ 80E100C
lsrs r0, 24
cmp r0, 0x1
bne _080E106C
ldr r1, =gUnknown_085E95EA
ldr r1, =gText_ThrowInPremierBall
ldr r2, =BuyMenuReturnToItemList
adds r0, r4, 0
bl BuyMenuDisplayMessage