summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-02-18 15:52:45 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2020-02-18 15:52:45 -0500
commitf65e07fb1fac3b8092f8ec29c2c9b42fcb80fa60 (patch)
treea6e679f5d8cd457c6fe09ee55733f9dccae84527 /data
parentaf6f99b9314f75150d9a5681c17ef5f95a9b1269 (diff)
pokemon_jump_3,4
Diffstat (limited to 'data')
-rw-r--r--data/pokemon_jump.s143
-rw-r--r--data/strings.s18
2 files changed, 9 insertions, 152 deletions
diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s
index 31a47d788..432f16d0b 100644
--- a/data/pokemon_jump.s
+++ b/data/pokemon_jump.s
@@ -3,149 +3,6 @@
.section .rodata
-gUnknown_846B794:: @ 846B794 gbapal
- .incbin "graphics/link_games/unk_846B794.gbapal"
-
-gUnknown_846B7B4:: @ 846B7B4 gbapal
- .incbin "graphics/link_games/unk_846B7B4.gbapal"
-
-gUnknown_846B7D4:: @ 846B7D4 4bpp.lz
- .incbin "graphics/link_games/unk_846B7D4.4bpp.lz"
-
-gUnknown_846BA00:: @ 846BA00 bin.lz
- .incbin "graphics/link_games/unk_846BA00.bin.lz"
-
-gUnknown_846BBB0:: @ 846BBB0 gbapal
- .incbin "graphics/link_games/unk_846BBB0.gbapal"
-
-gUnknown_846BBD0:: @ 846BBD0 4bpp.lz
- .incbin "graphics/link_games/unk_846BBD0.4bpp.lz"
-
-gUnknown_846C520:: @ 846C520 bin.lz
- .incbin "graphics/link_games/unk_846C520.bin.lz"
-
-gUnknown_846C8D8:: @ 846C8D8 gbapal
- .incbin "graphics/link_games/unk_846C8D8.gbapal"
-
-gUnknown_846C8F8:: @ 846C8F8 4bpp.lz
- .incbin "graphics/link_games/unk_846C8F8.4bpp.lz"
-
-gUnknown_846D3A8:: @ 846D3A8 bin.lz
- .incbin "graphics/link_games/unk_846D3A8.bin.lz"
-
-gUnknown_846D8D4:: @ 846D8D4
- .4byte 0x000001b0
- @ {
- @ .bg = 0,
- @ .charBaseIndex = 0,
- @ .mapBaseIndex = 27,
- @ .screenSize = 0,
- @ .paletteMode = 0,
- @ .priority = 0,
- @ .baseTile = 0x0000
- @ }
- .4byte 0x000025e6
- @ {
- @ .bg = 2,
- @ .charBaseIndex = 1,
- @ .mapBaseIndex = 30,
- @ .screenSize = 2,
- @ .paletteMode = 0,
- @ .priority = 2,
- @ .baseTile = 0x0000
- @ }
- .4byte 0x000016c9
- @ {
- @ .bg = 1,
- @ .charBaseIndex = 2,
- @ .mapBaseIndex = 12,
- @ .screenSize = 3,
- @ .paletteMode = 0,
- @ .priority = 1,
- @ .baseTile = 0x0000
- @ }
- .4byte 0x000031df
- @ {
- @ .bg = 3,
- @ .charBaseIndex = 3,
- @ .mapBaseIndex = 29,
- @ .screenSize = 0,
- @ .paletteMode = 0,
- @ .priority = 3,
- @ .baseTile = 0x0000
- @ }
-
-gUnknown_846D8E4:: @ 846D8E4
- .byte 0, 19, 0, 6, 2, 2
- .2byte 0x0013
- .byte 0, 8, 0, 6, 2, 2
- .2byte 0x001f
- .byte 255, 0, 0, 0, 0, 0
- .2byte 0x0000
-
-gUnknown_846D8FC:: @ 846D8FC
- .4byte 0, sub_8149DC8
- .4byte 1, sub_8149F64
- .4byte 2, sub_8149FD0
- .4byte 3, sub_814A03C
- .4byte 4, sub_814A0C8
- .4byte 5, sub_814A174
- .4byte 6, sub_814A218
- .4byte 7, sub_814A264
- .4byte 9, sub_814A3AC
- .4byte 8, sub_814A308
-
-gUnknown_846D94C:: @ 846D94C
- .string "IES$"
-
-gUnknown_846D950:: @ 846D950
- .byte 0x00, 0x02, 0x03
-
-gUnknown_846D953:: @ 846D953
- .byte 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-
-gUnknown_846D960:: @ 846D960
- obj_tiles gUnknown_8479688, 0, 800
-
-gUnknown_846D968:: @ 846D968
- obj_pal gUnknown_8479668, 800
-
-gUnknown_846D970::
- .2byte 0x0006, 0x0008, 0x0010, 0x0008
-
-gUnknown_846D978::
- .2byte 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008
-
-gUnknown_846D984::
- .2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006
-
-gUnknown_846D994::
- .2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006
-
-gUnknown_846D9A8:: @ 846D9A8
- .4byte gUnknown_846D970
- .4byte gUnknown_846D978
- .4byte gUnknown_846D984
- .4byte gUnknown_846D994
-
-gUnknown_846D9B8::
- .2byte 0x0058, 0x0098
-
-gUnknown_846D9BC::
- .2byte 0x0058, 0x0078, 0x0098
-
-gUnknown_846D9C2::
- .2byte 0x0038, 0x0058, 0x0098, 0x00b8
-
-gUnknown_846D9CA::
- .2byte 0x0038, 0x0058, 0x0078, 0x0098, 0x00b8
-
-gUnknown_846D9D4:: @ 846D9D4
- .4byte gUnknown_846D9B8
- .4byte gUnknown_846D9BC
- .4byte gUnknown_846D9C2
- .4byte gUnknown_846D9CA
-
gUnknown_846D9E4:: @ gbapal
.incbin "graphics/link_games/unk_846D9E4.gbapal"
diff --git a/data/strings.s b/data/strings.s
index f595170ff..591c7c7f4 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3289,10 +3289,10 @@ gString_Help:: @ 841CB49
gString_HelpSystem_ClearTo8:: @ 841CB4E
.string "{CLEAR_TO 8}$"
-gUnknown_841CB52:: @ 841CB52
+gText_SpacePoints2:: @ 841CB52
.string " points$"
-gUnknown_841CB5A:: @ 841CB5A
+gText_SpaceTimes3:: @ 841CB5A
.string " time(s)$"
gUnknown_841CB63:: @ 841CB63
@@ -3307,28 +3307,28 @@ gUnknown_841CB88::
gUnknown_841CB94::
.string "EXCELLENTS in a row:$"
-gUnknown_841CBA9:: @ 841CBA9
+gText_AwesomeWonF701F700:: @ 841CBA9
.string "Awesome score! You've\n"
.string "won {DYNAMIC 01} {DYNAMIC 00}!$"
-gUnknown_841CBCA:: @ 841CBCA
+gText_FilledStorageSpace2:: @ 841CBCA
.string "There's no room left now.$"
-gUnknown_841CBE4:: @ 841CBE4
+gText_CantHoldMore:: @ 841CBE4
.string "You can't hold any more!$"
-gUnknown_841CBFD:: @ 841CBFD
+gText_WantToPlayAgain2:: @ 841CBFD
.string "Want to play again?$"
-gUnknown_841CC11:: @ 841CC11
+gText_SomeoneDroppedOut2:: @ 841CC11
.string "Somebody dropped out.\n"
.string "The link will be canceled.$"
-gUnknown_841CC42:: @ 841CC42
+gText_SavingDontTurnOffPower:: @ 841CC42
.string "SAVING…\n"
.string "DON'T TURN OFF THE POWER.$"
-gUnknown_841CC64:: @ 841CC64
+gText_CommunicationStandby4:: @ 841CC64
.string "Communication standby…$"
.string "SAVING...\n"