diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-05-15 16:59:55 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-15 18:59:55 -0500 |
commit | f402e46cd3c8b7236673d6edbae77903a7cc0618 (patch) | |
tree | 37a19f3ab35a73c29d4d6da565741beaf7bb547f /data/dungeon_sbin.s | |
parent | f65dee5a143bd543c74c010d7252eb76893ee243 (diff) |
Sese's April/May Dump (#37)
* splitting lots of pokemon square and labeling lots of other things
* actually commit this stuff
* more moving data and things
* more screen work
* split out some pokemon dungeon data
* lots of data work
* push more data work
* split kecleon, decomp another kanghaskhan func, and try to doc UpdateBGControl more
* lots of item work
* label more item things
* subtype -> category and doc types/category
Diffstat (limited to 'data/dungeon_sbin.s')
-rw-r--r-- | data/dungeon_sbin.s | 139 |
1 files changed, 102 insertions, 37 deletions
diff --git a/data/dungeon_sbin.s b/data/dungeon_sbin.s index 170f716..efe6f64 100644 --- a/data/dungeon_sbin.s +++ b/data/dungeon_sbin.s @@ -571,57 +571,57 @@ StartOfDungeonTable: .4byte PartnerConversion18SIRO .byte 0x58, 0x0f, 0x3b, 0x08 .4byte PartnerConversion19SIRO -.byte 0x50, 0x0f, 0x3b, 0x08 +.4byte talkp2_string .4byte PartnerConversion2SIRO -.byte 0x48, 0x0f, 0x3b, 0x08 +.4byte talkp20_string .4byte PartnerConversion20SIRO -.byte 0x40, 0x0f, 0x3b, 0x08 +.4byte talkp21_string .4byte PartnerConversion21SIRO -.byte 0x38, 0x0f, 0x3b, 0x08 +.4byte talkp22_string .4byte PartnerConversion22SIRO -.byte 0x30, 0x0f, 0x3b, 0x08 +.4byte talkp23_string .4byte PartnerConversion23SIRO -.byte 0x28, 0x0f, 0x3b, 0x08 +.4byte talkp24_string .4byte PartnerConversion24SIRO -.byte 0x20, 0x0f, 0x3b, 0x08 +.4byte talkp25_string .4byte PartnerConversion25SIRO -.byte 0x18, 0x0f, 0x3b, 0x08 +.4byte talkp26_string .4byte PartnerConversion26SIRO -.byte 0x10, 0x0f, 0x3b, 0x08 +.4byte talkp27_string .4byte PartnerConversion27SIRO -.byte 0x08, 0x0f, 0x3b, 0x08 +.4byte talkp28_string .4byte PartnerConversion28SIRO -.byte 0x00, 0x0f, 0x3b, 0x08 +.4byte talkp29_string .4byte PartnerConversion29SIRO -.byte 0xf8, 0x0e, 0x3b, 0x08 +.4byte talkp3_string .4byte PartnerConversion3SIRO -.byte 0xf0, 0x0e, 0x3b, 0x08 +.4byte talkp30_string .4byte PartnerConversion30SIRO -.byte 0xe8, 0x0e, 0x3b, 0x08 +.4byte talkp31_string .4byte PartnerConversion31SIRO -.byte 0xe0, 0x0e, 0x3b, 0x08 +.4byte talkp32_string .4byte PartnerConversion32SIRO -.byte 0xd8, 0x0e, 0x3b, 0x08 +.4byte talkp33_string .4byte PartnerConversion33SIRO -.byte 0xd0, 0x0e, 0x3b, 0x08 +.4byte talkp34_string .4byte PartnerConversion34SIRO -.byte 0xc8, 0x0e, 0x3b, 0x08 +.4byte talkp35_string .4byte PartnerConversion35SIRO -.byte 0xc0, 0x0e, 0x3b, 0x08 +.4byte talkp36_string .4byte PartnerConversion36SIRO -.byte 0xb8, 0x0e, 0x3b, 0x08 +.4byte talkp37_string .4byte PartnerConversion37SIRO -.byte 0xb0, 0x0e, 0x3b, 0x08 +.4byte talkp38_string .4byte PartnerConversion38SIRO -.byte 0xa8, 0x0e, 0x3b, 0x08 +.4byte talkp39_string .4byte PartnerConversion39SIRO -.byte 0xa0, 0x0e, 0x3b, 0x08 +.4byte talkp4_string .4byte PartnerConversion4SIRO -.byte 0x98, 0x0e, 0x3b, 0x08 +.4byte talkp40_string .4byte PartnerConversion40SIRO -.byte 0x90, 0x0e, 0x3b, 0x08 +.4byte talkp41_string .4byte PartnerConversion41SIRO -.byte 0x88, 0x0e, 0x3b, 0x08 +.4byte talkp42_string .4byte PartnerConversion42SIRO .4byte talkp5_string .4byte PartnerConversion5SIRO @@ -671,35 +671,87 @@ talkp5_string: .string "talkp5\0" .align 2,0 +.global talkp42_string +talkp42_string: .string "talkp42\0" +.global talkp41_string +talkp41_string: .string "talkp41\0" +.global talkp40_string +talkp40_string: .string "talkp40\0" +.global talkp4_string +talkp4_string: .string "talkp4\0" .align 2,0 +.global talkp39_string +talkp39_string: .string "talkp39\0" +.global talkp38_string +talkp38_string: .string "talkp38\0" +.global talkp37_string +talkp37_string: .string "talkp37\0" +.global talkp36_string +talkp36_string: .string "talkp36\0" +.global talkp35_string +talkp35_string: .string "talkp35\0" +.global talkp34_string +talkp34_string: .string "talkp34\0" +.global talkp33_string +talkp33_string: .string "talkp33\0" +.global talkp32_string +talkp32_string: .string "talkp32\0" +.global talkp31_string +talkp31_string: .string "talkp31\0" +.global talkp30_string +talkp30_string: .string "talkp30\0" +.global talkp3_string +talkp3_string: .string "talkp3\0" .align 2,0 +.global talkp29_string +talkp29_string: .string "talkp29\0" +.global talkp28_string +talkp28_string: .string "talkp28\0" +.global talkp27_string +talkp27_string: .string "talkp27\0" +.global talkp26_string +talkp26_string: .string "talkp26\0" +.global talkp25_string +talkp25_string: .string "talkp25\0" +.global talkp24_string +talkp24_string: .string "talkp24\0" +.global talkp23_string +talkp23_string: .string "talkp23\0" +.global talkp22_string +talkp22_string: .string "talkp22\0" +.global talkp21_string +talkp21_string: .string "talkp21\0" +.global talkp20_string +talkp20_string: .string "talkp20\0" +.global talkp2_string +talkp2_string: .string "talkp2\0" .align 2,0 @@ -812,17 +864,30 @@ talkp5_string: .string "talk0\0" .align 2,0 -.byte 0x6d, 0x61, 0x70, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x00, 0x00, 0x00, 0x00 -.byte 0x6c, 0x65, 0x76, 0x66, 0x6f, 0x6e, 0x74, 0x00 -.byte 0x6a, 0x79, 0x6f, 0x63, 0x68, 0x75, 0x00, 0x00 -.byte 0x69, 0x74, 0x65, 0x6d, 0x70, 0x61, 0x74, 0x00 -.byte 0x68, 0x70, 0x35, 0x66, 0x6f, 0x6e, 0x74, 0x00 -.byte 0x66, 0x69, 0x78, 0x65, 0x64, 0x6d, 0x61, 0x70, 0x00, 0x00, 0x00, 0x00 -.byte 0x65, 0x74, 0x63, 0x66, 0x6f, 0x6e, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00 -.byte 0x65, 0x74, 0x63, 0x66, 0x6f, 0x6e, 0x74, 0x00 -.byte 0x63, 0x6f, 0x6c, 0x76, 0x65, 0x63, 0x00, 0x00 -.byte 0x62, 0x61, 0x6e, 0x72, 0x70, 0x61, 0x6c, 0x00 -.byte 0x62, 0x61, 0x6e, 0x66, 0x6f, 0x6e, 0x74, 0x00 +.string "mapparam\0" +.align 2,0 +.string "levfont\0" +.align 2,0 +.string "jyochu\0" +.align 2,0 +.string "itempat\0" +.align 2,0 +.string "hp5font\0" +.align 2,0 +.string "fixedmap\0" +.align 2,0 +.string "etcfonta\0" +.align 2,0 +.string "etcfont\0" +.align 2,0 +.string "colvec\0" +.align 2,0 +.string "banrpal\0" +.align 2,0 +.string "banfont\0" +.align 2,0 + +@ B__ Groups .byte 0x62, 0x37, 0x35, 0x70, 0x61, 0x6c, 0x00, 0x00 .byte 0x62, 0x37, 0x35, 0x66, 0x6f, 0x6e, 0x00, 0x00 .byte 0x62, 0x37, 0x35, 0x65, 0x6d, 0x61, 0x70, 0x30, 0x00, 0x00, 0x00, 0x00 |