diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/events/special_pointers.asm | 1 | ||||
| -rw-r--r-- | data/player_names.asm | 8 | ||||
| -rw-r--r-- | data/text/battle.asm | 2 | ||||
| -rw-r--r-- | data/text/common_1.asm | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index 5d6b0a16e..e2814b879 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -179,6 +179,7 @@ SpecialsPointers:: add_special AskRememberPassword add_special LoadMapPalettes add_special UnusedFindItemInPCOrBag + add_special InitialSetDSTFlag add_special InitialClearDSTFlag add_special UnusedDummySpecial ; unused diff --git a/data/player_names.asm b/data/player_names.asm index 6263cb828..d537af5dc 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -2,8 +2,8 @@ ChrisNameMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .MaleNames - db 1 ; ???? - db 0 ; default option + db 1 ; default option + db 0 ; ???? .MaleNames: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags @@ -21,8 +21,8 @@ KrisNameMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .FemaleNames - db 1 ; ???? - db 0 ; default option + db 1 ; default option + db 0 ; ???? .FemaleNames: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags diff --git a/data/text/battle.asm b/data/text/battle.asm index a9836df4f..fc2e3a1cf 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -1085,7 +1085,7 @@ BeatUpAttackText: line "attack!" done -RefusedGiftText: +PresentFailedText: text "<TARGET>" line "refused the gift!" prompt diff --git a/data/text/common_1.asm b/data/text/common_1.asm index a07617e2c..46cf48b40 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -1664,7 +1664,7 @@ _DayCareManIntroText:: cont "raise a #MON?" done -_DayCareManOddEggText:: +_DayCareManIntroEggText:: text "I'm the DAY-CARE" line "MAN. Do you know" cont "about EGGS?" @@ -1691,7 +1691,7 @@ _DayCareLadyIntroText:: line "#MON for you?" done -_DayCareLadyOddEggText:: +_DayCareLadyIntroEggText:: text "I'm the DAY-CARE" line "LADY. Do you know" cont "about EGGS?" |