summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-03-16 09:31:44 -0400
committerentrpntr <entrpntr@gmail.com>2020-03-17 11:47:47 -0400
commite3b53fa1b8ae55a82d50895aee67a3078209b216 (patch)
tree5d5bbe8bc66bf92c567fbea4475b25a4cd304db1 /data
parent1e0807e4bfd5ca3e710c284cbbd4c0a50131baf3 (diff)
Fill in a lot of missing bank $04 code.
Diffstat (limited to 'data')
-rw-r--r--data/events/elevator_floors.asm35
-rwxr-xr-xdata/text/common_1.asm4
-rw-r--r--data/text/common_2.asm46
3 files changed, 60 insertions, 25 deletions
diff --git a/data/events/elevator_floors.asm b/data/events/elevator_floors.asm
new file mode 100644
index 00000000..abc793cf
--- /dev/null
+++ b/data/events/elevator_floors.asm
@@ -0,0 +1,35 @@
+ElevatorFloorNames:
+; entries correspond to FLOOR_* constants
+ dw .B4F
+ dw .B3F
+ dw .B2F
+ dw .B1F
+ dw ._1F
+ dw ._2F
+ dw ._3F
+ dw ._4F
+ dw ._5F
+ dw ._6F
+ dw ._7F
+ dw ._8F
+ dw ._9F
+ dw ._10F
+ dw ._11F
+ dw .ROOF
+
+.B4F: db "B4F@"
+.B3F: db "B3F@"
+.B2F: db "B2F@"
+.B1F: db "B1F@"
+._1F: db "1F@"
+._2F: db "2F@"
+._3F: db "3F@"
+._4F: db "4F@"
+._5F: db "5F@"
+._6F: db "6F@"
+._7F: db "7F@"
+._8F: db "8F@"
+._9F: db "9F@"
+._10F: db "10F@"
+._11F: db "11F@"
+.ROOF: db "ROOF@"
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index 40f4bb79..82f153d0 100755
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -223,7 +223,7 @@ Text_BreedingIsNotPossible::
UnknownText_0x1bd0d8::
text "The compatibility"
line "is @"
- text_decimal wTempNumBuffer, 1, 3
+ text_decimal wBreedingCompatibility, 1, 3
text "."
cont "Should they breed?"
done
@@ -961,7 +961,7 @@ _RocketRadioText10::
text "Is he listening?"
done
-UnknownText_0x1bd2bc::
+_AskFloorElevatorText::
text "Which floor?"
done
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index 9f6c9413..5d712ccc 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -981,19 +981,19 @@ UnknownText_0x1c1a65::
text "Darn…"
done
-UnknownText_0x1c1a6c::
+_StartMenuContestEndText::
text "Would you like to"
line "end the Contest?"
done
-UnknownText_0x1c1a90::
+_ItemsTossOutHowManyText::
text "Toss out how many"
line "@"
text_ram wStringBuffer2
text "(S)?"
done
-UnknownText_0x1c1aad::
+_ItemsThrowAwayText::
text "Throw away @"
text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
@@ -1002,25 +1002,25 @@ UnknownText_0x1c1aad::
text "(S)?"
done
-UnknownText_0x1c1aca::
+_ItemsDiscardedText::
text "Discarded"
line "@"
text_ram wStringBuffer1
text "(S)."
prompt
-UnknownText_0x1c1adf::
+_ItemsTooImportantText::
text "That's too impor-"
line "tant to toss out!"
prompt
-UnknownText_0x1c1b03::
+_ItemsOakWarningText::
text "OAK: <PLAYER>!"
line "This isn't the"
cont "time to use that!"
done
-UnknownText_0x1c1b2c::
+_PokemonSwapItemText::
text "Took @"
text_ram wMonOrItemNameBuffer
text "'s"
@@ -1034,7 +1034,7 @@ UnknownText_0x1c1b2c::
text "."
prompt
-UnknownText_0x1c1b57::
+_PokemonHoldItemText::
text "Made @"
text_ram wMonOrItemNameBuffer
text_start
@@ -1043,23 +1043,23 @@ UnknownText_0x1c1b57::
text "."
prompt
-UnknownText_0x1c1b6f::
+_PokemonRemoveMailText::
text "Please remove the"
line "MAIL first."
prompt
-UnknownText_0x1c1b8e::
+_PokemonNotHoldingText::
text_ram wMonOrItemNameBuffer
text " isn't"
line "holding anything."
prompt
-UnknownText_0x1c1baa::
+_ItemStorageFullText::
text "Item storage space"
line "full."
prompt
-UnknownText_0x1c1bc4::
+_PokemonTookItemText::
text "Took @"
text_ram wStringBuffer1
text_start
@@ -1068,7 +1068,7 @@ UnknownText_0x1c1bc4::
text "."
prompt
-UnknownText_0x1c1bdc::
+_PokemonAskSwapItemText::
text_ram wMonOrItemNameBuffer
text " is"
line "already holding"
@@ -1079,48 +1079,48 @@ UnknownText_0x1c1bdc::
line "Switch items?"
done
-UnknownText_0x1c1c09::
+_ItemCantHeldText::
text "This item can't be"
line "held."
prompt
-UnknownText_0x1c1c22::
+_MailLoseMessageText::
text "The MAIL will lose"
line "its message. OK?"
done
-UnknownText_0x1c1c47::
+_MailDetachedText::
text "MAIL detached from"
line "@"
text_ram wStringBuffer1
text "."
prompt
-UnknownText_0x1c1c62::
+_MailNoSpaceText::
text "There's no space"
line "for removing MAIL."
prompt
-UnknownText_0x1c1c86::
+_MailAskSendToPCText::
text "Send the removed"
line "MAIL to your PC?"
done
-UnknownText_0x1c1ca9::
+_MailboxFullText::
text "Your PC's MAILBOX"
line "is full."
prompt
-UnknownText_0x1c1cc4::
+_MailSentToPCText::
text "The MAIL was sent"
line "to your PC."
prompt
-UnknownText_0x1c1ce3::
+_PokemonNotEnoughHPText::
text "Not enough HP!"
prompt
-UnknownText_0x1c1cf3::
+_MayRegisterItemText::
text "An item in your"
line "PACK may be"
@@ -1254,7 +1254,7 @@ UnknownText_0x1c41e6::
UnknownText_0x1c4212::
text "Trade @"
- text_ram wTemporaryBuffer
+ text_ram wceef
text_start
line "for @"
text_ram wStringBuffer1