diff options
| author | IIMarckus <iimarckus@gmail.com> | 2015-06-11 10:57:45 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2015-06-11 10:57:45 -0600 |
| commit | 2bf3a322bae185fce9f58dcc1972b6844f36041e (patch) | |
| tree | 6186e76fdf393ff4b0407c8f968ae091b16b5175 | |
| parent | 3ea4ebff80d394a26188a6bed0e78a6588feae07 (diff) | |
Labels for "sent some to mom" text.
| -rw-r--r-- | battle/core.asm | 14 | ||||
| -rw-r--r-- | text/battle.asm | 12 |
2 files changed, 11 insertions, 15 deletions
diff --git a/battle/core.asm b/battle/core.asm index 2dc97dfc2..472687a13 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2544,10 +2544,10 @@ Function3d02b: ; 3d02b call Function3d099 call Function3d099 pop af - jr nc, .asm_3d07b + jr nc, .KeepItAll ld a, [wMomSavingMoney] and $7 - jr z, .asm_3d07b + jr z, .KeepItAll ld hl, SentToMomTexts dec a ld c, a @@ -2559,8 +2559,8 @@ Function3d02b: ; 3d02b ld l, a jp StdBattleTextBox -.asm_3d07b - ld hl, BattleText_0x809be +.KeepItAll + ld hl, GotMoneyForWinningText jp StdBattleTextBox ; 3d081 @@ -2598,9 +2598,9 @@ Function3d099: ; 3d099 ; 3d0ab SentToMomTexts: ; 3d0ab - dw BattleText_0x809fc - dw BattleText_0x80a2a - dw BattleText_0x80a3d + dw SentSomeToMomText + dw SentHalfToMomText + dw SentAllToMomText ; 3d0b1 diff --git a/text/battle.asm b/text/battle.asm index 48c39dc1a..bc67cd95e 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -192,13 +192,12 @@ BattleText_0x809a8: ; 0x809a8 prompt ; 0x809be -BattleText_0x809be: ; 0x809be +GotMoneyForWinningText: text $52, " got ¥@" deciram wc686, $36 text "" line "for winning!" prompt -; 0x809da BattleText_0x809da: ; 0x809da text $3f @@ -212,24 +211,21 @@ TiedAgainstText: ; 0x809eb prompt ; 0x809fc -BattleText_0x809fc: ; 0x809fc +SentSomeToMomText: text $52, " got ¥@" deciram wc686, $36 text "" line "for winning!" cont "Sent some to MOM!" prompt -; 0x80a2a -BattleText_0x80a2a: ; 0x80a2a +SentHalfToMomText: text "Sent half to MOM!" prompt -; 0x80a3d -BattleText_0x80a3d: ; 0x80a3d +SentAllToMomText: text "Sent all to MOM!" prompt -; 0x80a4f BattleText_0x80a4f: ; 0x80a4f text $53, ": Huh? I" |