diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 22:12:18 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-15 22:12:18 +0100 |
| commit | ba00a1c688f84edcab44bd183d6dea4e2e7ba0be (patch) | |
| tree | d5dab85b30006f8064855afc0bb16d672b7eb91c /data | |
| parent | 616edd6c3f591ed62f11aedbeb0dbc744fac4c07 (diff) | |
daycare file fully done
Diffstat (limited to 'data')
| -rw-r--r-- | data/daycare.s | 22 | ||||
| -rw-r--r-- | data/strings.s | 8 |
2 files changed, 4 insertions, 26 deletions
diff --git a/data/daycare.s b/data/daycare.s deleted file mode 100644 index 44530acc9..000000000 --- a/data/daycare.s +++ /dev/null @@ -1,22 +0,0 @@ -@ the third big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - - - - .align 2 -sDaycareLevelMenuWindowTemplate:: @ 832B6C0 - .incbin "baserom.gba", 0x32b6c0, 0x20 - -sDaycareListMenuLevelTemplate:: @ 832B6E0 - .incbin "baserom.gba", 0x32b6e0, 0x18 - -sCompatibilityMessages:: @ 832B6F8 - .incbin "baserom.gba", 0x32b6f8, 0x10 - -sJapaneseEggNickname:: @ 832B708 - .string "タマゴ$" @ "tamago" ("egg" in Japanese) diff --git a/data/strings.s b/data/strings.s index 42dcc2316..f49697061 100644 --- a/data/strings.s +++ b/data/strings.s @@ -5121,16 +5121,16 @@ gText_YouDontHaveThreeCoins:: @ 85EF734 gText_ReelTimeHelp:: @ 85EF750 .string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus.$" -gUnknown_085EF7DA:: @ 85EF7DA +gDaycareText_GetAlongVeryWell:: @ 85EF7DA .string "The two seem to get along\nvery well.$" -gUnknown_085EF7FF:: @ 85EF7FF +gDaycareText_GetAlong:: @ 85EF7FF .string "The two seem to get along.$" -gUnknown_085EF81A:: @ 85EF81A +gDaycareText_DontLikeOther:: @ 85EF81A .string "The two don’t seem to like\neach other much.$" -gUnknown_085EF846:: @ 85EF846 +gDaycareText_PlayOther:: @ 85EF846 .string "The two prefer to play with other\nPOKéMON than each other.$" gText_NewLine2:: @ 85EF881 |