ARG_VALUE_0 ARG_VALUE_1 and gCommonFelicity

This commit is contained in:
Kermalis
2023-09-11 19:23:20 -04:00
parent ed4d98838d
commit 6a6f489d67
18 changed files with 332 additions and 340 deletions

View File

@@ -1,3 +1,5 @@
'\0' = 00
'\n' = 0A
' ' = 20
'!' = 21
'"' = 22
@@ -250,9 +252,6 @@ SELECT_BUTTON = 87 72 87 73
START_BUTTON = 87 53 87 71
DPAD = 87 52
'\0' = 00
'\n' = 0A
@ Character codes escaped with a '~'.
APOSTROPHE = 7E 32 37 @ ~27
COMMA = 7E 32 63 @ ~2c
@@ -260,6 +259,11 @@ QUOTE_START = 7E 39 33 @ ~93
QUOTE_END = 7E 39 34 @ ~94
@ Placeholders for message arguments to swap out for names within strings.
ARG_FRIEND_AREA = 24 68 @ $h
ARG_MOVE_ITEM_0 = 24 69 30 @ $i0
ARG_MOVE_ITEM_1 = 24 69 31 @ $i1
ARG_VALUE_0 = 24 64 30 @ $d0
ARG_VALUE_1 = 24 64 31 @ $d1
ARG_POKEMON_0 = 24 6D 30 @ $m0
ARG_POKEMON_1 = 24 6D 31 @ $m1
ARG_POKEMON_2 = 24 6D 32 @ $m2
@@ -269,9 +273,6 @@ ARG_POKEMON_5 = 24 6D 35 @ $m5
ARG_POKEMON_6 = 24 6D 36 @ $m6
ARG_POKEMON_7 = 24 6D 37 @ $m7
ARG_POKEMON_8 = 24 6D 38 @ $m8
ARG_MOVE_ITEM_0 = 24 69 30 @ $i0
ARG_MOVE_ITEM_1 = 24 69 31 @ $i1
ARG_FRIEND_AREA = 24 68 @ $h
@ TEXT MACROS
@

View File

@@ -2,254 +2,6 @@
.align 2,0
.global gCommonFelicity
gCommonFelicity: @ 80D49E0 (Felicity Bank Dialogue)
.4byte gUnknown_80D53E0
.4byte gUnknown_80D53C8
.4byte gUnknown_80D538C
.4byte gUnknown_80D5380
.4byte gUnknown_80D5364
.4byte gUnknown_80D5364
.4byte gUnknown_80D5340
.4byte gUnknown_80D52F8
.4byte gUnknown_80D527C
.4byte gUnknown_80D5244
.4byte gUnknown_80D5224
.4byte gUnknown_80D51DC
.4byte gUnknown_80D5184
.4byte gUnknown_80D5158
.4byte gUnknown_80D4FC8
.4byte gUnknown_80D4F94
.4byte gUnknown_80D4F74
.4byte gUnknown_80D4F24
.4byte gUnknown_80D4F08
.4byte gUnknown_80D4EDC
.4byte gUnknown_80D4EB0
.4byte gUnknown_80D4E84
.4byte gUnknown_80D4E28
.4byte gUnknown_80D4D8C
.4byte gUnknown_80D4D44
.4byte gUnknown_80D4D20
.4byte gUnknown_80D4CC0
.4byte gUnknown_80D4C50
.4byte gUnknown_80D4C14
.4byte gUnknown_80D4A58
.global gUnknown_80D4A58
gUnknown_80D4A58:
.string " Sssnore...\n"
.string "Ah{COMMA} you wish to know how the bank\n"
.string "operates... Very well...{EXTRA_MSG}"
.string " Zzz...\n"
.string "If you{APOSTROPHE}re defeated in a dungeon{COMMA}\n"
.string "you{APOSTROPHE}ll lose all your money. Did you know?{EXTRA_MSG}"
.string " Purr...\n"
.string "But{COMMA} you{APOSTROPHE}ve nothing to fear if you leave\n"
.string "your money with Felicity Bank...{EXTRA_MSG}"
.string " Meow... Even if you\n"
.string "return defeated from a dungeon{COMMA} your\n"
.string "money will be safe with me...{EXTRA_MSG}"
.string " Sssnore...\n"
.string "I assure you{COMMA} my bank will keep your\n"
.string "money safe...{EXTRA_MSG}"
.string " Zzz...\n"
.string "Simple{COMMA} isn{APOSTROPHE}t it...?\0"
.align 2, 0
.global gUnknown_80D4C14
gUnknown_80D4C14:
.string " {POKE}... Purr...\n"
.string "Very well{COMMA} {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "Here you are.\0"
.align 2, 0
.global gUnknown_80D4C50
gUnknown_80D4C50:
.string " Fnarf? Hunh...?{EXTRA_MSG}"
.string " Purr... I so do apologize{COMMA}\n"
.string "but you couldn{APOSTROPHE}t possibly carry any more\n"
.string "money with you...\0"
.align 2, 0
.global gUnknown_80D4CC0
gUnknown_80D4CC0:
.string " Fnarf? Meow...?{EXTRA_MSG}"
.string " Purr...\n"
.string "I so hate to disappoint{COMMA} but you have no\n"
.string "money saved with me...\0"
.align 2, 0
.global gUnknown_80D4D20
gUnknown_80D4D20:
.string " Zzz...\n"
.string "How much will you withdraw?\0"
.align 2, 0
.global gUnknown_80D4D44
gUnknown_80D4D44:
.string " Zzz...\n"
.string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}... Very well...{WAIT_PRESS}\n"
.string "I will guard it jealously...\0"
.align 2, 0
.global gUnknown_80D4D8C
gUnknown_80D4D8C:
.string " Fnarf? Purr...\n"
.string "Meow! All this money...{WAIT_PRESS}\n"
.string "Our safe is about to burst...{EXTRA_MSG}"
.string " Purr...\n"
.string "I am so sorry to say{COMMA} but I can{APOSTROPHE}t accept\n"
.string "any more of your money...\0"
.align 2, 0
.global gUnknown_80D4E28
gUnknown_80D4E28:
.string " Sssnore... Hmm?{EXTRA_MSG}"
.string " Zzz...\n"
.string "I{APOSTROPHE}m so sorry to say{COMMA} but you appear not\n"
.string "to have any money...\0"
.align 2, 0
.global gUnknown_80D4E84
gUnknown_80D4E84:
.string " Purr...\n"
.string "How much do you wish to deposit?\0"
.align 2, 0
.global gUnknown_80D4EB0
gUnknown_80D4EB0:
.string " Zzz... Meow...\n"
.string "I await your next visit...\0"
.align 2, 0
.global gUnknown_80D4EDC
gUnknown_80D4EDC:
.string " Zzz... Purr...\n"
.string "I await your next visit...\0"
.align 2, 0
.global gUnknown_80D4F08
gUnknown_80D4F08:
.string " Sssnore...\n"
.string "Very well...\0"
.align 2, 0
.global gUnknown_80D4F24
gUnknown_80D4F24:
.string " Sssnore... Purr...\n"
.string "Your account contains {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}...\n"
.string "How may I serve you?\0"
.align 2, 0
.global gUnknown_80D4F74
gUnknown_80D4F74:
.string " Zzz...\n"
.string "How may I serve you?\0"
.align 2, 0
.global gUnknown_80D4F94
gUnknown_80D4F94:
.string " Ssssnore... Welcome...\n"
.string "This is Felicity Bank...\0"
.align 2, 0
.global gUnknown_80D4FC8
gUnknown_80D4FC8:
.string " Ah{COMMA} you wish to know how\n"
.string "the bank operates. Very well.{EXTRA_MSG}"
.string " If you are defeated\n"
.string "in a dungeon{COMMA} you{APOSTROPHE}ll lose all your money.\n"
.string "Did you know that?{EXTRA_MSG}"
.string " But you can avoid that!{WAIT_PRESS}\n"
.string "You{APOSTROPHE}ve nothing to fear if you leave your\n"
.string "money with Felicity Bank.{EXTRA_MSG}"
.string " Even if you return\n"
.string "defeated from a dungeon{COMMA} your money will\n"
.string "be safe with me!{EXTRA_MSG}"
.string " I assure you{COMMA} my bank\n"
.string "will keep your money safe.{EXTRA_MSG}"
.string " Simple{COMMA} isn{APOSTROPHE}t it?\0"
.align 2, 0
.global gUnknown_80D5158
gUnknown_80D5158:
.string " Very well{COMMA} {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "Here you are.\0"
.align 2, 0
.global gUnknown_80D5184
gUnknown_80D5184:
.string " Oh?{WAIT_PRESS} I do so apologize{COMMA}\n"
.string "but you couldn{APOSTROPHE}t possibly carry any more\n"
.string "money with you.\0"
.align 2, 0
.global gUnknown_80D51DC
gUnknown_80D51DC:
.string " Oh?{WAIT_PRESS} I so hate to disappoint{COMMA}\n"
.string "but you have no money saved with me.\0"
.align 2, 0
.global gUnknown_80D5224
gUnknown_80D5224:
.string " How much will you\n"
.string "withdraw?\0"
.align 2, 0
.global gUnknown_80D5244
gUnknown_80D5244:
.string " {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}. Very well.{WAIT_PRESS}\n"
.string "I will guard it jealously.\0"
.align 2, 0
.global gUnknown_80D527C
gUnknown_80D527C:
.string " Meow! All this money!{WAIT_PRESS}\n"
.string "Our safe is about to burst!{EXTRA_MSG}"
.string " I am so sorry to say{COMMA} but\n"
.string "I can{APOSTROPHE}t accept any more of your money!\0"
.align 2, 0
.global gUnknown_80D52F8
gUnknown_80D52F8:
.string " Oh?{WAIT_PRESS} I{APOSTROPHE}m so sorry to say{COMMA}\n"
.string "but you appear not to have any money.\0"
.align 2, 0
.global gUnknown_80D5340
gUnknown_80D5340:
.string " How much do you wish to\n"
.string "deposit?\0"
.align 2, 0
.global gUnknown_80D5364
gUnknown_80D5364:
.string " I await your next visit.\0"
.align 2, 0
.global gUnknown_80D5380
gUnknown_80D5380:
.string " Very well.\0"
.align 2, 0
.global gUnknown_80D538C
gUnknown_80D538C:
.string " Your account contains\n"
.string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "How may I serve you?\0"
.align 2, 0
.global gUnknown_80D53C8
gUnknown_80D53C8:
.string " How may I serve you?\0"
.align 2, 0
.global gUnknown_80D53E0
gUnknown_80D53E0:
.string " Welcome.\n"
.string "This is Felicity Bank.\0"
.align 2, 0
.global gCommonKangaskhanStorage
gCommonKangaskhanStorage: @ 80D5404
.4byte gUnknown_80D5E9C
@@ -749,14 +501,14 @@ gUnknown_80D6364:
gUnknown_80D6394:
.string " Zzz... Reep{COMMA} what...?\n"
.string "For all that I can buy{COMMA} I will pay\n"
.string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}... OK?\0"
.string "{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}... OK?\0"
.align 2, 0
.global gUnknown_80D63E8
gUnknown_80D63E8:
.string " Zzzzzz... Zzzzzz...?\n"
.string "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\n"
.string "Is {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE} OK?\0"
.string "Is {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE} OK?\0"
.align 2, 0
.global gUnknown_80D6420
@@ -780,7 +532,7 @@ gUnknown_80D6478:
.global gUnknown_80D6494
gUnknown_80D6494:
.string " Zzzzzz...\n"
.string "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} is {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}...\n"
.string "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} is {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}...\n"
.string "OK?\0"
.align 2, 0
@@ -922,14 +674,14 @@ gUnknown_80D6B18:
.global gUnknown_80D6B50
gUnknown_80D6B50:
.string " For all that I can buy{COMMA} I can\n"
.string "offer you {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "offer you {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
.string "Is that acceptable?\0"
.align 2, 0
.global gUnknown_80D6BA0
gUnknown_80D6BA0:
.string " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}{COMMA} you say?\n"
.string "For that{COMMA} I can offer {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "For that{COMMA} I can offer {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
.string "Is that acceptable?\0"
.align 2, 0
@@ -948,7 +700,7 @@ gUnknown_80D6C1C:
.global gUnknown_80D6C48
gUnknown_80D6C48:
.string " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}{COMMA} you say?\n"
.string "That will be {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "That will be {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
.string "Is that acceptable?\0"
.align 2, 0
@@ -1070,7 +822,7 @@ gUnknown_80D7090:
.global gUnknown_80D70B4
gUnknown_80D70B4:
.string " Zzzzzz... Zzzzzz...?\n"
.string "I can pay you {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}\n"
.string "I can pay you {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}\n"
.string "for everything I can buy... OK?\0"
.align 2, 0
@@ -1078,7 +830,7 @@ gUnknown_80D70B4:
gUnknown_80D7108:
.string " Zzzzzz... Zzzzzz...?\n"
.string "Selling that {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...?\n"
.string "How about {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}?\0"
.string "How about {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}?\0"
.align 2, 0
.global gUnknown_80D7154
@@ -1103,7 +855,7 @@ gUnknown_80D71B0:
gUnknown_80D71CC:
.string " Zzz... Meep meep...\n"
.string "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...?\n"
.string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}{COMMA} OK?\0"
.string "{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}{COMMA} OK?\0"
.align 2, 0
.global gUnknown_80D7204
@@ -1234,14 +986,14 @@ gUnknown_80D7740:
.global gUnknown_80D776C
gUnknown_80D776C:
.string " For everything I can buy{COMMA}\n"
.string "I can offer {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "I can offer {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
.string "Is that acceptable to you?\0"
.align 2, 0
.global gUnknown_80D77C0
gUnknown_80D77C0:
.string " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\n"
.string "I can offer you {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "I can offer you {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
.string "Will you sell it for that price?\0"
.align 2, 0
@@ -1266,7 +1018,7 @@ gUnknown_80D785C:
.global gUnknown_80D788C
gUnknown_80D788C:
.string " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\n"
.string "That will be {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "That will be {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
.string "Is that to your liking?\0"
.align 2, 0
@@ -1466,7 +1218,7 @@ gUnknown_80D7F7C:
.global gUnknown_80D8000
gUnknown_80D8000:
.string " Kwoo? {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n"
.string "That{APOSTROPHE}s {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}...\n"
.string "That{APOSTROPHE}s {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}...\n"
.string "OK?\0"
.align 2, 0
@@ -1617,7 +1369,7 @@ gUnknown_80D86E4:
.global gUnknown_80D8738
gUnknown_80D8738:
.string " {COLOR_1 GREEN}{ARG_FRIEND_AREA}{END_COLOR_TEXT_1}?\n"
.string "That will be {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n"
.string "That will be {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
.string "Is that OK?\0"
.align 2, 0

View File

@@ -9671,7 +9671,7 @@ gUnknown_8100208: @ 8100208
.global gMagnitudeMessage
gMagnitudeMessage: @ 810020C
.string "It{APOSTROPHE}s Magnitude $d0!\0"
.string "It{APOSTROPHE}s Magnitude {ARG_VALUE_0}!\0"
.align 2, 0
.global gPtrMagnitudeMessage
@@ -9707,7 +9707,7 @@ gPtrSelfHealPreventedHungerMessage: @ 8100298
.global gUnknown_810029C
gUnknown_810029C: @ 810029C
.string "Rescue challenges left: $d0\0"
.string "Rescue challenges left: {ARG_VALUE_0}\0"
.align 2, 0
.global gUnknown_81002B8

View File

@@ -290,7 +290,7 @@ gUnknown_8106E5C: @ 8106E5C
.global gUnknown_8106E6C
gUnknown_8106E6C: @ 8106E6C
.string "Say bye to\n"
.string "$d0 more\0"
.string "{ARG_VALUE_0} more\0"
.align 2,0
.global gUnknown_8106E80

View File

@@ -250,32 +250,32 @@ AllFriendAreas_810B2A4:
.global NumFloorsExplored_810B2C4
NumFloorsExplored_810B2C4:
.string "$d0 floors were explored.\0"
.string "{ARG_VALUE_0} floors were explored.\0"
.align 2,0
.global NumThievingAttempts_810B2E0
NumThievingAttempts_810B2E0:
.string "$d0 thieving attempts succeeded.\0"
.string "{ARG_VALUE_0} thieving attempts succeeded.\0"
.align 2,0
.global NumPokemonJoined_810B304
NumPokemonJoined_810B304:
.string "$d0 Pokémon joined the team.\0"
.string "{ARG_VALUE_0} Pokémon joined the team.\0"
.align 2,0
.global NumPokemonEvolved_810B324
NumPokemonEvolved_810B324:
.string "$d0 Pokémon evolved.\0"
.string "{ARG_VALUE_0} Pokémon evolved.\0"
.align 2,0
.global NumFriendRescues_810B33C
NumFriendRescues_810B33C:
.string "$d0 Friend Rescues were successful.\0"
.string "{ARG_VALUE_0} Friend Rescues were successful.\0"
.align 2,0
.global NumMoves_810B360
NumMoves_810B360:
.string "$d0 moves were learned.\0"
.string "{ARG_VALUE_0} moves were learned.\0"
.align 2,0
.global SpottedMunchlax_810B378
@@ -2461,7 +2461,7 @@ gIQSkill810DD68_Ptr: @ 810DD68
.global Level_810DD6C
Level_810DD6C:
.string "Level: #>82.$d0 \0"
.string "Level: #>82.{ARG_VALUE_0} \0"
.align 2,0
.global gLevel810DD6C_Ptr
@@ -2470,7 +2470,7 @@ gLevel810DD6C_Ptr: @ 810DD80
.global ExpPts_810DD84
ExpPts_810DD84:
.string "Exp. Pts.: #>82.$d1 \0"
.string "Exp. Pts.: #>82.{ARG_VALUE_1} \0"
.align 2,0
.global gExpPts810DD9C_Ptr
@@ -2479,7 +2479,7 @@ gExpPts810DD9C_Ptr: @ 810DD9C
.global ToNextLevel_810DDA0
ToNextLevel_810DDA0:
.string "To next level:#>82.$d0\0"
.string "To next level:#>82.{ARG_VALUE_0}\0"
.align 2,0
.global gUnknown_810DDB8
@@ -5129,7 +5129,7 @@ gUnknown_8113870: @ 8113870
.global Level_8113874
Level_8113874:
.string "Level #>42.$d1#>64.Exp. Pts. $d0 \0"
.string "Level #>42.{ARG_VALUE_1}#>64.Exp. Pts. {ARG_VALUE_0} \0"
.align 2,0
.global gUnknown_8113898
@@ -5138,7 +5138,7 @@ gUnknown_8113898: @ 8113898
.global Level_811389C
Level_811389C:
.string "Level #>35.$d1#>64.Exp. Pts.$d0 \0"
.string "Level #>35.{ARG_VALUE_1}#>64.Exp. Pts.{ARG_VALUE_0} \0"
.align 2,0
.global gUnknown_81138C0
@@ -5147,7 +5147,7 @@ gUnknown_81138C0: @ 81138C0
.global HP_81138C4
HP_81138C4:
.string "HP#>42.$d0 \0"
.string "HP#>42.{ARG_VALUE_0} \0"
.align 2,0
.global gUnknown_81138D0
@@ -5156,7 +5156,7 @@ gUnknown_81138D0: @ 81138D0
.global Attack_81138D4
Attack_81138D4:
.string "Attack#>42.$d0 \0"
.string "Attack#>42.{ARG_VALUE_0} \0"
.align 2,0
.global gUnknown_81138E4
@@ -5165,7 +5165,7 @@ gUnknown_81138E4: @ 81138E4
.global Defense_81138E8
Defense_81138E8:
.string "#>80.Defense#>128.$d1 \0"
.string "#>80.Defense#>128.{ARG_VALUE_1} \0"
.align 2,0
.global gUnknown_8113900
@@ -5174,7 +5174,7 @@ gUnknown_8113900: @ 8113900
.global SpAtk_8113904
SpAtk_8113904:
.string "Sp. Atk.#>42.$d0 \0"
.string "Sp. Atk.#>42.{ARG_VALUE_0} \0"
.align 2,0
.global gUnknown_8113918
@@ -5183,7 +5183,7 @@ gUnknown_8113918: @ 8113918
.global SpDef_811391C
SpDef_811391C:
.string "#>80.Sp. Def.#>128.$d1 \0"
.string "#>80.Sp. Def.#>128.{ARG_VALUE_1} \0"
.align 2,0
.global gUnknown_8113934
@@ -5192,7 +5192,7 @@ gUnknown_8113934: @ 8113934
.global Attack_8113938
Attack_8113938:
.string "Attack#>42.{COLOR_2 RED}$d0{END_COLOR_TEXT_2} \0"
.string "Attack#>42.{COLOR_2 RED}{ARG_VALUE_0}{END_COLOR_TEXT_2} \0"
.align 2,0
.global gUnknown_8113950
@@ -5201,7 +5201,7 @@ gUnknown_8113950: @ 8113950
.global Defense_8113954
Defense_8113954:
.string "#>80.Defense#>128.{COLOR_2 RED}$d1{END_COLOR_TEXT_2} \0"
.string "#>80.Defense#>128.{COLOR_2 RED}{ARG_VALUE_1}{END_COLOR_TEXT_2} \0"
.align 2,0
.global gUnknown_8113974
@@ -5210,7 +5210,7 @@ gUnknown_8113974: @ 8113974
.global SpAtk_8113978
SpAtk_8113978:
.string "Sp. Atk.#>42.{COLOR_2 RED}$d0{END_COLOR_TEXT_2} \0"
.string "Sp. Atk.#>42.{COLOR_2 RED}{ARG_VALUE_0}{END_COLOR_TEXT_2} \0"
.align 2,0
.global gUnknown_8113990
@@ -5219,7 +5219,7 @@ gUnknown_8113990: @ 8113990
.global SpDef_8113994
SpDef_8113994:
.string "#>80.Sp. Def.#>128.{COLOR_2 RED}$d1{END_COLOR_TEXT_2} \0"
.string "#>80.Sp. Def.#>128.{COLOR_2 RED}{ARG_VALUE_1}{END_COLOR_TEXT_2} \0"
.align 2,0
.global gUnknown_81139B4
@@ -6276,7 +6276,7 @@ gUnknown_8115960:
.global PPD0Text
PPD0Text:
.string "PP $d0 \0"
.string "PP {ARG_VALUE_0} \0"
.global gPtrPPD0Text
gPtrPPD0Text: @ 8115970
@@ -6305,9 +6305,9 @@ gUnknown_8115A2C: @ 8115A2C
.global ItemLimitText_8105A30
ItemLimitText_8105A30:
.string "Only $d0 items may be brought into\n"
.string "Only {ARG_VALUE_0} items may be brought into\n"
.string "this dungeon.\n"
.string "Please put away $d1 item(s).\0"
.string "Please put away {ARG_VALUE_1} item(s).\0"
.align 2,0
.global gUnknown_8115A80
@@ -6316,9 +6316,9 @@ gUnknown_8115A80: @ 8115A80
.global ItemLimitAlsoText_8105A84
ItemLimitAlsoText_8105A84:
.string "Also{COMMA} only $d0 items may be brought\n"
.string "Also{COMMA} only {ARG_VALUE_0} items may be brought\n"
.string "into this dungeon.\n"
.string "Please put away $d1 item(s).\0"
.string "Please put away {ARG_VALUE_1} item(s).\0"
.align 2,0
.global gUnknown_8115ADC

View File

@@ -1,12 +1,8 @@
#ifndef GUARD_COMMON_STRINGS_H
#define GUARD_COMMON_STRINGS_H
enum FelicityBankMode
{
FELICITY_BANK_MODE_AWAKE,
FELICITY_BANK_MODE_ASLEEP,
FELICITY_BANK_MODE_COUNT
};
#include "constants/common_strings_felicity_bank.h"
enum KangaskhanStorageMode
{
KANGASKHAN_STORAGE_MODE_AWAKE,
@@ -67,12 +63,12 @@ extern const u8* const gCommonTripleQuestionMark[];
extern const u8* const gCommonDepositPrompt[];
extern const u8* const gCommonWithdrawPrompt[];
extern const u8 *gCommonFelicity[FELICITY_BANK_MODE_COUNT][15]; // 80D49E0
extern const u8 *gCommonKangaskhanStorage[KANGASKHAN_STORAGE_MODE_COUNT][20]; // 80D5404
extern const u8 *gCommonKecleonBros[KECLEON_BROS_MODE_COUNT][23]; // 80D5EC8
extern const u8 *gCommonWigglytuff[WIGGLYTUFF_SHOP_MODE_COUNT][20]; // 80D79A4
extern const u8 *gCommonGulpin[GULPIN_SHOP_MODE_COUNT][25]; // 80D8888
extern const u8 *gCommonMakuhita[MAKUHITA_DOJO_MODE_COUNT][10]; // 80D9FC8
extern const u8* const gCommonFelicity[FEL_MODE_COUNT][FEL_DLG_MAX];
extern const u8* const gCommonKangaskhanStorage[KANGASKHAN_STORAGE_MODE_COUNT][20]; // 80D5404
extern const u8* const gCommonKecleonBros[KECLEON_BROS_MODE_COUNT][23]; // 80D5EC8
extern const u8* const gCommonWigglytuff[WIGGLYTUFF_SHOP_MODE_COUNT][20]; // 80D79A4
extern const u8* const gCommonGulpin[GULPIN_SHOP_MODE_COUNT][25]; // 80D8888
extern const u8* const gCommonMakuhita[MAKUHITA_DOJO_MODE_COUNT][10]; // 80D9FC8
extern const Hints gCommonHints[MAX_HINTS]; // 80DAA98
#endif // GUARD_COMMON_STRINGS_H

View File

@@ -0,0 +1,30 @@
#ifndef GUARD_COMMON_STRINGS_FELICITY_BANK_H
#define GUARD_COMMON_STRINGS_FELICITY_BANK_H
enum FelicityBankMode
{
FEL_MODE_AWAKE,
FEL_MODE_ASLEEP,
FEL_MODE_COUNT
};
enum FelicityBankDialogue
{
FEL_DLG_WELCOME_TO_FELICITY,
FEL_DLG_HOW_MAY_I_SERVE__NO_MONEY,
FEL_DLG_HOW_MAY_I_SERVE__HAS_MONEY,
FEL_DLG_VERY_WELL,
FEL_DLG_BYE__NO_MONEY,
FEL_DLG_BYE__HAS_MONEY,
FEL_DLG_DEPOSIT__HOW_MUCH,
FEL_DLG_DEPOSIT__NO_MONEY,
FEL_DLG_DEPOSIT__BANK_FULL,
FEL_DLG_DEPOSIT__RECEIPT,
FEL_DLG_WITHDRAW__HOW_MUCH,
FEL_DLG_WITHDRAW__NO_MONEY,
FEL_DLG_WITHDRAW__WALLET_FULL,
FEL_DLG_WITHDRAW__RECEIPT,
FEL_DLG_HOW_IT_WORKS,
FEL_DLG_MAX
};
#endif // GUARD_COMMON_STRINGS_FELICITY_BANK_H

View File

@@ -11,7 +11,7 @@
// size: 0x108
typedef struct FelicityBankWork
{
/* 0x0 */ u32 isAsleep;
/* 0x0 */ u32 mode; // Corresponds to the enum: FelicityBankMode
/* 0x4 */ s32 currState;
/* 0x8 */ u32 fallbackState;
/* 0xC */ u32 chosenAmount;

View File

@@ -54,4 +54,6 @@ ALIGNED(4) static const u8 sDepositPrompt0[] = _("Deposit?");
ALIGNED(4) const u8* const gCommonDepositPrompt[] = { sDepositPrompt0 };
ALIGNED(4) static const u8 sWithdrawPrompt0[] = _("Withdraw?");
ALIGNED(4) const u8* const gCommonWithdrawPrompt[] = { sWithdrawPrompt0 };
ALIGNED(4) const u8* const gCommonWithdrawPrompt[] = { sWithdrawPrompt0 };
// TODO: Move remaining strings/arrays from common_strings.s

View File

@@ -0,0 +1,209 @@
// TODO: The strings are in reverse-order if you insert them in-line with the array creation.
// Our preprocessor doesn't ALIGNED(4) for _("") strings. It does ALIGNED(1). This is why we do it this way for now until that's fixed
static const u8 sUnknown_80D4A58[];
static const u8 sUnknown_80D4C14[];
static const u8 sUnknown_80D4C50[];
static const u8 sUnknown_80D4CC0[];
static const u8 sUnknown_80D4D20[];
static const u8 sUnknown_80D4D44[];
static const u8 sUnknown_80D4D8C[];
static const u8 sUnknown_80D4E28[];
static const u8 sUnknown_80D4E84[];
static const u8 sUnknown_80D4EB0[];
static const u8 sUnknown_80D4EDC[];
static const u8 sUnknown_80D4F08[];
static const u8 sUnknown_80D4F24[];
static const u8 sUnknown_80D4F74[];
static const u8 sUnknown_80D4F94[];
static const u8 sUnknown_80D4FC8[];
static const u8 sUnknown_80D5158[];
static const u8 sUnknown_80D5184[];
static const u8 sUnknown_80D51DC[];
static const u8 sUnknown_80D5224[];
static const u8 sUnknown_80D5244[];
static const u8 sUnknown_80D527C[];
static const u8 sUnknown_80D52F8[];
static const u8 sUnknown_80D5340[];
static const u8 sUnknown_80D5364[];
static const u8 sUnknown_80D5380[];
static const u8 sUnknown_80D538C[];
static const u8 sUnknown_80D53C8[];
static const u8 sUnknown_80D53E0[];
ALIGNED(4) const u8* const gCommonFelicity[FEL_MODE_COUNT][FEL_DLG_MAX] =
{
[FEL_MODE_AWAKE] = {
[FEL_DLG_WELCOME_TO_FELICITY] = sUnknown_80D53E0,
[FEL_DLG_HOW_MAY_I_SERVE__NO_MONEY] = sUnknown_80D53C8,
[FEL_DLG_HOW_MAY_I_SERVE__HAS_MONEY] = sUnknown_80D538C,
[FEL_DLG_VERY_WELL] = sUnknown_80D5380,
[FEL_DLG_BYE__NO_MONEY] = sUnknown_80D5364,
[FEL_DLG_BYE__HAS_MONEY] = sUnknown_80D5364,
[FEL_DLG_DEPOSIT__HOW_MUCH] = sUnknown_80D5340,
[FEL_DLG_DEPOSIT__NO_MONEY] = sUnknown_80D52F8,
[FEL_DLG_DEPOSIT__BANK_FULL] = sUnknown_80D527C,
[FEL_DLG_DEPOSIT__RECEIPT] = sUnknown_80D5244,
[FEL_DLG_WITHDRAW__HOW_MUCH] = sUnknown_80D5224,
[FEL_DLG_WITHDRAW__NO_MONEY] = sUnknown_80D51DC,
[FEL_DLG_WITHDRAW__WALLET_FULL] = sUnknown_80D5184,
[FEL_DLG_WITHDRAW__RECEIPT] = sUnknown_80D5158,
[FEL_DLG_HOW_IT_WORKS] = sUnknown_80D4FC8
},
[FEL_MODE_ASLEEP] = {
[FEL_DLG_WELCOME_TO_FELICITY] = sUnknown_80D4F94,
[FEL_DLG_HOW_MAY_I_SERVE__NO_MONEY] = sUnknown_80D4F74,
[FEL_DLG_HOW_MAY_I_SERVE__HAS_MONEY] = sUnknown_80D4F24,
[FEL_DLG_VERY_WELL] = sUnknown_80D4F08,
[FEL_DLG_BYE__NO_MONEY] = sUnknown_80D4EDC,
[FEL_DLG_BYE__HAS_MONEY] = sUnknown_80D4EB0,
[FEL_DLG_DEPOSIT__HOW_MUCH] = sUnknown_80D4E84,
[FEL_DLG_DEPOSIT__NO_MONEY] = sUnknown_80D4E28,
[FEL_DLG_DEPOSIT__BANK_FULL] = sUnknown_80D4D8C,
[FEL_DLG_DEPOSIT__RECEIPT] = sUnknown_80D4D44,
[FEL_DLG_WITHDRAW__HOW_MUCH] = sUnknown_80D4D20,
[FEL_DLG_WITHDRAW__NO_MONEY] = sUnknown_80D4CC0,
[FEL_DLG_WITHDRAW__WALLET_FULL] = sUnknown_80D4C50,
[FEL_DLG_WITHDRAW__RECEIPT] = sUnknown_80D4C14,
[FEL_DLG_HOW_IT_WORKS] = sUnknown_80D4A58
}
};
ALIGNED(4) static const u8 sUnknown_80D4A58[] = _(
" Sssnore...\n"
"Ah{COMMA} you wish to know how the bank\n"
"operates... Very well...{EXTRA_MSG} Zzz...\n"
"If you{APOSTROPHE}re defeated in a dungeon{COMMA}\n"
"you{APOSTROPHE}ll lose all your money. Did you know?{EXTRA_MSG} Purr...\n"
"But{COMMA} you{APOSTROPHE}ve nothing to fear if you leave\n"
"your money with Felicity Bank...{EXTRA_MSG} Meow... Even if you\n"
"return defeated from a dungeon{COMMA} your\n"
"money will be safe with me...{EXTRA_MSG} Sssnore...\n"
"I assure you{COMMA} my bank will keep your\n"
"money safe...{EXTRA_MSG} Zzz...\n"
"Simple{COMMA} isn{APOSTROPHE}t it...?");
ALIGNED(4) static const u8 sUnknown_80D4C14[] = _(
" {POKE}... Purr...\n"
"Very well{COMMA} {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
"Here you are.");
ALIGNED(4) static const u8 sUnknown_80D4C50[] = _(
" Fnarf? Hunh...?{EXTRA_MSG} Purr... I so do apologize{COMMA}\n"
"but you couldn{APOSTROPHE}t possibly carry any more\n"
"money with you...");
ALIGNED(4) static const u8 sUnknown_80D4CC0[] = _(
" Fnarf? Meow...?{EXTRA_MSG} Purr...\n"
"I so hate to disappoint{COMMA} but you have no\n"
"money saved with me...");
ALIGNED(4) static const u8 sUnknown_80D4D20[] = _(
" Zzz...\n"
"How much will you withdraw?");
ALIGNED(4) static const u8 sUnknown_80D4D44[] = _(
" Zzz...\n"
"{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}... Very well...{WAIT_PRESS}\n"
"I will guard it jealously...");
ALIGNED(4) static const u8 sUnknown_80D4D8C[] = _(
" Fnarf? Purr...\n"
"Meow! All this money...{WAIT_PRESS}\n"
"Our safe is about to burst...{EXTRA_MSG} Purr...\n"
"I am so sorry to say{COMMA} but I can{APOSTROPHE}t accept\n"
"any more of your money...");
ALIGNED(4) static const u8 sUnknown_80D4E28[] = _(
" Sssnore... Hmm?{EXTRA_MSG} Zzz...\n"
"I{APOSTROPHE}m so sorry to say{COMMA} but you appear not\n"
"to have any money...");
ALIGNED(4) static const u8 sUnknown_80D4E84[] = _(
" Purr...\n"
"How much do you wish to deposit?");
ALIGNED(4) static const u8 sUnknown_80D4EB0[] = _(
" Zzz... Meow...\n"
"I await your next visit...");
ALIGNED(4) static const u8 sUnknown_80D4EDC[] = _(
" Zzz... Purr...\n"
"I await your next visit...");
ALIGNED(4) static const u8 sUnknown_80D4F08[] = _(
" Sssnore...\n"
"Very well...");
ALIGNED(4) static const u8 sUnknown_80D4F24[] = _(
" Sssnore... Purr...\n"
"Your account contains {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}...\n"
"How may I serve you?");
ALIGNED(4) static const u8 sUnknown_80D4F74[] = _(
" Zzz...\n"
"How may I serve you?");
ALIGNED(4) static const u8 sUnknown_80D4F94[] = _(
" Ssssnore... Welcome...\n"
"This is Felicity Bank...");
ALIGNED(4) static const u8 sUnknown_80D4FC8[] = _(
" Ah{COMMA} you wish to know how\n"
"the bank operates. Very well.{EXTRA_MSG} If you are defeated\n"
"in a dungeon{COMMA} you{APOSTROPHE}ll lose all your money.\n"
"Did you know that?{EXTRA_MSG} But you can avoid that!{WAIT_PRESS}\n"
"You{APOSTROPHE}ve nothing to fear if you leave your\n"
"money with Felicity Bank.{EXTRA_MSG} Even if you return\n"
"defeated from a dungeon{COMMA} your money will\n"
"be safe with me!{EXTRA_MSG} I assure you{COMMA} my bank\n"
"will keep your money safe.{EXTRA_MSG} Simple{COMMA} isn{APOSTROPHE}t it?");
ALIGNED(4) static const u8 sUnknown_80D5158[] = _(
" Very well{COMMA} {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
"Here you are.");
ALIGNED(4) static const u8 sUnknown_80D5184[] = _(
" Oh?{WAIT_PRESS} I do so apologize{COMMA}\n"
"but you couldn{APOSTROPHE}t possibly carry any more\n"
"money with you.");
ALIGNED(4) static const u8 sUnknown_80D51DC[] = _(
" Oh?{WAIT_PRESS} I so hate to disappoint{COMMA}\n"
"but you have no money saved with me.");
ALIGNED(4) static const u8 sUnknown_80D5224[] = _(
" How much will you\n"
"withdraw?");
ALIGNED(4) static const u8 sUnknown_80D5244[] = _(
" {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}. Very well.{WAIT_PRESS}\n"
"I will guard it jealously.");
ALIGNED(4) static const u8 sUnknown_80D527C[] = _(
" Meow! All this money!{WAIT_PRESS}\n"
"Our safe is about to burst!{EXTRA_MSG} I am so sorry to say{COMMA} but\n"
"I can{APOSTROPHE}t accept any more of your money!");
ALIGNED(4) static const u8 sUnknown_80D52F8[] = _(
" Oh?{WAIT_PRESS} I{APOSTROPHE}m so sorry to say{COMMA}\n"
"but you appear not to have any money.");
ALIGNED(4) static const u8 sUnknown_80D5340[] = _(
" How much do you wish to\n"
"deposit?");
ALIGNED(4) static const u8 sUnknown_80D5364[] = _(" I await your next visit.");
ALIGNED(4) static const u8 sUnknown_80D5380[] = _(" Very well.");
ALIGNED(4) static const u8 sUnknown_80D538C[] = _(
" Your account contains\n"
"{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.\n"
"How may I serve you?");
ALIGNED(4) static const u8 sUnknown_80D53C8[] = _(" How may I serve you?");
ALIGNED(4) static const u8 sUnknown_80D53E0[] = _(
" Welcome.\n"
"This is Felicity Bank.");

View File

@@ -106,7 +106,7 @@ static const MenuItem sUnknown_80E6760[4] = {
};
ALIGNED(4) static const u8 sUnknown_80E6780[] = _("{CENTER_ALIGN}please try again.");
ALIGNED(4) static const u8 sUnknown_80E6794[] = _("{CENTER_ALIGN}Check the Game Link cable and");
ALIGNED(4) static const u8 sUnknown_80E67B4[] = _("{CENTER_ALIGN}#C2Communication error!{END_COLOR_TEXT_1} ");
ALIGNED(4) static const u8 sUnknown_80E67B4[] = _("{CENTER_ALIGN}{COLOR_1 RED}Communication error!{END_COLOR_TEXT_1} ");
static const UnkTextStruct2 sUnknown_80E67D4 = {
0, 0, 0, 0,
@@ -166,7 +166,7 @@ static const MenuItem sUnknown_80E68B4[4] = {
};
ALIGNED(4) static const u8 sUnknown_80E68D4[] = _("{CENTER_ALIGN}someone{APOSTROPHE}s storage space was full.");
ALIGNED(4) static const u8 sUnknown_80E68FC[] = _("{CENTER_ALIGN}An item could not be transferred because");
ALIGNED(4) static const u8 sUnknown_80E6928[] = _("{CENTER_ALIGN}#C2Error!{END_COLOR_TEXT_1} ");
ALIGNED(4) static const u8 sUnknown_80E6928[] = _("{CENTER_ALIGN}{COLOR_1 RED}Error!{END_COLOR_TEXT_1} ");
static const UnkTextStruct2 sUnknown_80E6938 = {
0, 0, 0, 0,

View File

@@ -64,7 +64,7 @@ static const MenuItem sUnknown_80E618C[3] = {
ALIGNED(4) static const u8 sWhatDoPrompt[] = "What would you like to do? ";
ALIGNED(4) static const u8 sPleaseChooseItem[] = "Please choose the item to be sent.";
ALIGNED(4) static const u8 sFmtWillBeSentPrompt[] = _(
"{COLOR_1 LIGHT_BLUE}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}\n"
"{COLOR_1 LIGHT_BLUE}{ARG_VALUE_0}{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}\n"
"will be sent.\n"
"Is that OK?");
@@ -85,10 +85,10 @@ ALIGNED(4) static const u8 sInCommunication[] = _(
ALIGNED(4) static const u8 sFmtYouReceived[] = _(
"You received\n"
"{COLOR_1 LIGHT_BLUE}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\n"
"{COLOR_1 LIGHT_BLUE}{ARG_VALUE_0}{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\n"
"Your adventure will be saved.");
ALIGNED(4) static const u8 sFmtYouSent[] = _("You sent {COLOR_1 LIGHT_BLUE}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.");
ALIGNED(4) static const u8 sFmtYouSent[] = _("You sent {COLOR_1 LIGHT_BLUE}{ARG_VALUE_0}{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.");
// Trade Items Menu Link Error Messages
ALIGNED(4) static const u8 sCommunicationError[] = "There was a communication error.";

View File

@@ -39,13 +39,13 @@ bool8 CreateFelicityBank(s32 mode)
sub_800641C(NULL, TRUE, TRUE);
sFelicityBankWork = MemoryAlloc(sizeof(FelicityBankWork), 8);
sFelicityBankWork->menuAction = 0;
sFelicityBankWork->isAsleep = mode;
sFelicityBankWork->mode = mode;
CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PERSIAN);
CopyYellowMonsterNametoBuffer(gUnknown_202E1C8, MONSTER_PERSIAN);
monName = GetMonSpecies(MONSTER_PERSIAN);
strcpy(gUnknown_202E1C8 - 80, monName);
if (sFelicityBankWork->isAsleep == 1)
if (sFelicityBankWork->mode == FEL_MODE_ASLEEP)
sFelicityBankWork->unkA4 = NULL;
else
sFelicityBankWork->unkA4 = &sFelicityBankWork->faceFile;
@@ -149,49 +149,49 @@ static void UpdateFelicityBankDialogue(void)
switch (sFelicityBankWork->currState) {
case 0:
sFelicityBankWork->fallbackState = 1;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][0], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WELCOME_TO_FELICITY], 0, sFelicityBankWork->unkA4, 0x10D);
break;
case 1:
CreateFelicityBankShopMenu();
sFelicityBankWork->fallbackState = 2;
if (gTeamInventoryRef->teamSavings == 0)
sub_8014248(gCommonFelicity[sFelicityBankWork->isAsleep][1], 0, sFelicityBankWork->menuAction,
sub_8014248(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_HOW_MAY_I_SERVE__NO_MONEY], 0, sFelicityBankWork->menuAction,
sFelicityBankWork->unk14, sFelicityBankWork->unk54, 4, 0, sFelicityBankWork->unkA4, 0xC);
else {
gUnknown_202DE30 = gTeamInventoryRef->teamSavings;
sub_8014248(gCommonFelicity[sFelicityBankWork->isAsleep][2], 0, sFelicityBankWork->menuAction,
sub_8014248(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_HOW_MAY_I_SERVE__HAS_MONEY], 0, sFelicityBankWork->menuAction,
sFelicityBankWork->unk14, sFelicityBankWork->unk54, 4, 0, sFelicityBankWork->unkA4, 0xC);
}
break;
case 3:
sFelicityBankWork->fallbackState = 1;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][14], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_HOW_IT_WORKS], 0, sFelicityBankWork->unkA4, 0x10D);
break;
case 4:
sFelicityBankWork->fallbackState = 6;
if (gTeamInventoryRef->teamSavings == 0)
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][4], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_BYE__NO_MONEY], 0, sFelicityBankWork->unkA4, 0x10D);
else {
gUnknown_202DE30 = gTeamInventoryRef->teamSavings;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][5], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_BYE__HAS_MONEY], 0, sFelicityBankWork->unkA4, 0x10D);
}
break;
case 5:
sFelicityBankWork->fallbackState = 1;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][3], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_VERY_WELL], 0, sFelicityBankWork->unkA4, 0x10D);
break;
case 7:
if (gTeamInventoryRef->teamMoney == 0) {
sFelicityBankWork->fallbackState = 1;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][7], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__NO_MONEY], 0, sFelicityBankWork->unkA4, 0x10D);
}
else if (gTeamInventoryRef->teamSavings >= MAX_TEAM_SAVINGS) {
sFelicityBankWork->fallbackState = 1;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][8], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__BANK_FULL], 0, sFelicityBankWork->unkA4, 0x10D);
}
else {
sFelicityBankWork->fallbackState = 8;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][6], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__HOW_MUCH], 0, sFelicityBankWork->unkA4, 0x10D);
}
break;
case 8:
@@ -212,21 +212,21 @@ static void UpdateFelicityBankDialogue(void)
case 9:
sFelicityBankWork->fallbackState = 1;
gUnknown_202DE30 = sFelicityBankWork->chosenAmount;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][9], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_DEPOSIT__RECEIPT], 0, sFelicityBankWork->unkA4, 0x10D);
break;
case 10:
if (gTeamInventoryRef->teamMoney >= MAX_TEAM_MONEY) {
sFelicityBankWork->fallbackState = 1;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][12], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__WALLET_FULL], 0, sFelicityBankWork->unkA4, 0x10D);
}
else if (gTeamInventoryRef->teamSavings == 0) {
sFelicityBankWork->fallbackState = 1;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][11], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__NO_MONEY], 0, sFelicityBankWork->unkA4, 0x10D);
}
else {
sFelicityBankWork->fallbackState = 11;
gUnknown_202DE30 = gTeamInventoryRef->teamSavings;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][10], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__HOW_MUCH], 0, sFelicityBankWork->unkA4, 0x10D);
}
break;
case 11:
@@ -250,7 +250,7 @@ static void UpdateFelicityBankDialogue(void)
case 12:
sFelicityBankWork->fallbackState = 1;
gUnknown_202DE30 = sFelicityBankWork->chosenAmount;
sub_80141B4(gCommonFelicity[sFelicityBankWork->isAsleep][13], 0, sFelicityBankWork->unkA4, 0x10D);
sub_80141B4(gCommonFelicity[sFelicityBankWork->mode][FEL_DLG_WITHDRAW__RECEIPT], 0, sFelicityBankWork->unkA4, 0x10D);
break;
}
}

View File

@@ -22,7 +22,7 @@ extern u16 gGummiStatBoostLUT[];
extern u8 gUnknown_202DE58[];
extern u32 gUnknown_202DE30;
extern u8* gPtrTypeText; // ptr to "Type\0"
extern u8* gPtrPPD0Text; // ptr to "PP $d0 \0"
extern u8* gPtrPPD0Text; // ptr to "PP {ARG_VALUE_0} \0"
extern u32 gUnknown_810A3F0[100];
extern u32 gUnknown_81097E8[4]; // some sort of lookup table (16, 18, 20, 22)
extern u32 gUnknown_81097F8[4]; // some sort of lookup table (17, 19, 21, 23)

View File

@@ -303,7 +303,7 @@ const MenuItem gUnknown_80E5DF0[] = {
{0, 0xFFDD}
};
static const u8 sUnknown_80E5E08[] = _("#C2Beware#R! This will delete it forever!");
static const u8 sUnknown_80E5E08[] = _("{COLOR_1 RED}Beware{END_COLOR_TEXT_1}! This will delete it forever!");
static const u8 sUnknown_80E5E34[] = "This will delete your saved game data.";
const MenuItem gUnknown_80E5E5C[] = {

View File

@@ -688,7 +688,7 @@ void HealTargetHP(Entity *pokemon, Entity *target, s32 param_3, s32 param_4, boo
if (sub_8045888(target) != 0) {
r8 = maxHPStat;
}
sub_80522F4(pokemon,target,*gUnknown_80FB240); // m0$'s max HP rose by $d1
sub_80522F4(pokemon,target,*gUnknown_80FB240); // m0$'s max HP rose by {ARG_VALUE_1}
}
if (HP != 0) {
if (sub_8045888(target) != 0) {
@@ -699,7 +699,7 @@ void HealTargetHP(Entity *pokemon, Entity *target, s32 param_3, s32 param_4, boo
sub_80522F4(pokemon,target,*gUnknown_80FB1E0); // $m0 was fully healed
}
else {
sub_80522F4(pokemon,target,*gUnknown_80FB1C4); // $m0 recovered $d0 HP
sub_80522F4(pokemon,target,*gUnknown_80FB1C4); // $m0 recovered {ARG_VALUE_0} HP
}
}
}

View File

@@ -162,15 +162,15 @@ const UnkTextStruct2 gUnknown_80E041C = {
ALIGNED(4) const u8 gUnknown_80E0434[] = _(
" Here{APOSTROPHE}s your reward!\n"
"{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}!");
"{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}!");
ALIGNED(4) const u8 gUnknown_80E045C[] = _(
"{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n"
"{CENTER_ALIGN}{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.");
"{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.");
ALIGNED(4) const u8 gUnknown_80E0484[] = _(
"{CENTER_ALIGN}{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team received\n"
"{CENTER_ALIGN}{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.");
"{CENTER_ALIGN}{COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} {POKE}.");
ALIGNED(4) const u8 gUnknown_80E04B4[]= _(
" As your reward{COMMA} you can\n"
@@ -202,7 +202,7 @@ ALIGNED(4) const u8 gUnknown_80E0640[] = _(
ALIGNED(4) const u8 gUnknown_80E0670[] = _(
"{CENTER_ALIGN}Rescue Team {COLOR_1 LIGHT_BLUE}$t{END_COLOR_TEXT_1}\n"
"{CENTER_ALIGN}gained {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} rescue points.");
"{CENTER_ALIGN}gained {COLOR_1 CYAN}{ARG_VALUE_0}{END_COLOR_TEXT_1} rescue points.");
ALIGNED(4) const u8 gUnknown_80E06A8[] = _(
"{CENTER_ALIGN}Congratulations!{EXTRA_MSG}"

View File

@@ -250,6 +250,8 @@ gUnknown_202DE28: /* 202DE28 (save) */
.space 0x4
.align 4
/* gUnknown_202DE30[0] seems to be the s32 value to insert in place of "$d0" (ARG_VALUE_0) in strings */
/* gUnknown_202DE30[1] is used for "$d1" (ARG_VALUE_1). "$d2" is not in any strings so it may not exist */
gUnknown_202DE30: /* 202DE30 */
.space 0x28