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 | |
| 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')
40 files changed, 2420 insertions, 1673 deletions
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s index 0801563..e88989f 100644 --- a/data/data_80B9BB8.s +++ b/data/data_80B9BB8.s @@ -1,17 +1,5 @@ .section .rodata - .string "pksdir0\0" - .align 2,0 - - .global gByteShiftLookup -gByteShiftLookup: @ 80B9BB8 - .4byte 0 - .4byte 8 - .4byte 16 - .4byte 24 - - .string "pksdir0\0" - .string "pksdir0\0" .string "PKD ROM USER DATA 000000\0" .global gUnknown_80B9BF1 @@ -526,7 +514,13 @@ gUnknown_80D4120: @ 80D4120 .global gUnknown_80D4124 gUnknown_80D4124: @ 80D4124 - .incbin "baserom.gba", 0xD4124, 0x20 + .string "$i0($v02" + .byte 0x81, 0x5E + .asciz "$v12)" + .align 2,0 + + .asciz "pksdir0" + .asciz "pksdir0" .global gUnknown_80D4144 gUnknown_80D4144: @ 80D4144 @@ -768,11 +762,42 @@ gUnknown_80D47B8: @ 80D47B8 .byte 0x07, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00 + + .global UnkData_80D47C4 + UnkData_80D47C4: .byte 0x01, 0x00, 0x10, 0x00 .global gUnknown_80D47C8 gUnknown_80D47C8: @ 80D47C8 - .incbin "baserom.gba", 0xD47C8, 0x60 +@ replacing .incbin "baserom.gba", 0x000d47c8, 0x60 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x02, 0x00 + .byte 0x1a, 0x00, 0x0c, 0x00 + .byte 0x0c, 0x00, 0x00, 0x00 + + .4byte UnkData_80D47C4 + + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80D4828 gUnknown_80D4828: @ 80D4828 @@ -781,30 +806,43 @@ gUnknown_80D4828: @ 80D4828 .global gUnknown_80D4830 gUnknown_80D4830: @ 80D4830 - .incbin "baserom.gba", 0xD4830, 0x2C + .byte 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x10, 0x27, 0x00, 0x00, 0xa0, 0x86, 0x01, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x80, 0x96, 0x98, 0x00 + .byte 0x00, 0xe1, 0xf5, 0x05 + .asciz "pksdir0" + .global gUnknown_80D485C gUnknown_80D485C: @ 80D485C - .byte 0x78, 0x48, 0x0D, 0x08 + .4byte Data_80D4878 .byte 0x01, 0x00, 0x00, 0x00 - .byte 0x74, 0x48, 0x0D, 0x08 + .4byte Data_80D4874 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF + + .global Data_80D4874 + Data_80D4874: .string "No\0" .align 2,0 + .global Data_80D4878 + Data_80D4878: .string "*Yes\0" .align 2,0 .global gUnknown_80D4880 gUnknown_80D4880: @ 80D4880 - .byte 0x9C, 0x48, 0x0D, 0x08 @ Pointer to Yes + .4byte Data_80D489C .byte 0x01, 0x00, 0x00, 0x00 - .byte 0x98, 0x48, 0x0D, 0x08 @ Pointer to No + .4byte Data_80D4898 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @ End of table .byte 0xFF, 0xFF, 0xFF, 0xFF + + .global Data_80D4898 + Data_80D4898: .string "*No\0" + .global Data_80D489C + Data_80D489C: .string "Yes\0" .align 2,0 @@ -1765,6 +1803,8 @@ gUnknown_80DBE7C: @ 80DBE7C .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 + .global UnkData_80DBE94 + UnkData_80DBE94: .byte 0x01, 0x00, 0x07, 0x00 .global gUnknown_80DBE98 @@ -1775,7 +1815,7 @@ gUnknown_80DBE98: @ 80DBE98 .byte 0x09, 0x00, 0x06, 0x00 .byte 0x06, 0x00, 0x00, 0x00 - .byte 0x94, 0xBE, 0x0D, 0x08 + .4byte UnkData_80DBE94 .global gUnknown_80DBEB0 gUnknown_80DBEB0: @ 80DBEB0 @@ -1860,6 +1900,8 @@ gUnknown_80DBFB0: @ 80DBFB0 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 + .global UnkData_80DBFC8 + UnkData_80DBFC8: .byte 0x01, 0x00, 0x07, 0x00 .global gUnknown_80DBFCC @@ -1870,7 +1912,7 @@ gUnknown_80DBFCC: @ 80DBFCC .byte 0x0A, 0x00, 0x06, 0x00 .byte 0x06, 0x00, 0x00, 0x00 - .byte 0xC8, 0xBF, 0x0D, 0x08 + .4byte UnkData_80DBFC8 .global gOthers_MenuOption gOthers_MenuOption: @ 80DBFE4 @@ -1903,6 +1945,8 @@ gUnknown_80DC020: @ 80DC020 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 + .global UnkData_80DC038 + UnkData_80DC038: .byte 0x01, 0x00, 0x0a, 0x00 .global gUnknown_80DC03C @@ -1913,7 +1957,7 @@ gUnknown_80DC03C: @ 80DC03C .byte 0x18, 0x00, 0x10, 0x00 .byte 0x12, 0x00, 0x00, 0x00 - .byte 0x38, 0xC0, 0x0D, 0x08 + .4byte UnkData_80DC038 @ Window Settings @@ -1955,6 +1999,8 @@ gUnknown_80DC0A0: @ 80DC0A0 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 + .global Data_80DC0B8 + Data_80DC0B8: .byte 0x01, 0x00, 0x08, 0x00 .global gUnknown_80DC0BC @@ -1965,7 +2011,7 @@ gUnknown_80DC0BC: @ 80DC0BC .byte 0x18, 0x00, 0x0E, 0x00 .byte 0x0E, 0x00, 0x00, 0x00 - .byte 0xB8, 0xC0, 0x0D, 0x08 + .4byte Data_80DC0B8 .global gUnknown_80DC0D4 gUnknown_80DC0D4: @ 80DC0D4 @@ -2005,7 +2051,18 @@ gUnknown_80DC11C: @ 80DC11C .global gUnknown_80DC134 gUnknown_80DC134: @ 80DC134 - .incbin "baserom.gba", 0xDC134, 0x30 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x16, 0x00, 0x04, 0x00 + .byte 0x06, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x16, 0x00, 0x0e, 0x00 + .byte 0x06, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80DC164 gUnknown_80DC164: @ 80DC164 @@ -2042,6 +2099,8 @@ gUnknown_80DC240: @ 80DC240 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 + .global Data_80DC258 + Data_80DC258: .byte 0x01, 0x00, 0x0f, 0x00 .global gUnknown_80DC25C @@ -2056,7 +2115,8 @@ gUnknown_80DC25C: @ 80DC25C .byte 0x08, 0x00 .byte 0x08, 0x00 .byte 0x00, 0x00 - .byte 0x58, 0xc2, 0x0d, 0x08 + + .4byte Data_80DC258 .global gUnknown_80DC274 gUnknown_80DC274: @ 80DC274 @@ -2909,7 +2969,17 @@ gUnknown_80DDA80: @ 80DDA80 .global gUnknown_80DDAA0 gUnknown_80DDAA0: @ 80DDAA0 - .incbin "baserom.gba", 0xDDAA0, 0x2C + .4byte SendWOPokemon + .byte 0x12, 0x00, 0x00, 0x00 + .4byte gWonderMailCancel + .byte 0x0a, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x0a, 0x00, 0x00, 0x00 + + .global SendWOPokemon + SendWOPokemon: + .string "Send w/o Pokémon\0" + .align 2,0 .global gUnknown_80DDACC gUnknown_80DDACC: @ 80DDACC @@ -2971,5 +3041,23 @@ gUnknown_80DDB24: @ 80DDB24 .global gUnknown_80DDB60 gUnknown_80DDB60: @ 80DDB60 - .incbin "baserom.gba", 0xDDB60, 0x48 + + .4byte SendPokemon_80DDB98 + .byte 0x11, 0x00, 0x00, 0x00 + .4byte DontSendPokemon_80DDB80 + .byte 0x12, 0x00, 0x00, 0x00 + .4byte gWonderMailCancel + .byte 0x0a, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x0a, 0x00, 0x00, 0x00 + + .global DontSendPokemon_80DDB80 + DontSendPokemon_80DDB80: + .string "Don~27t Send Pokémon\0" + .align 2,0 + + .global SendPokemon_80DDB98 + SendPokemon_80DDB98: + .string "Send Pokémon\0" + .align 2,0 diff --git a/data/data_80DED44.s b/data/data_80DED44.s index ce3aad8..0f0884a 100644 --- a/data/data_80DED44.s +++ b/data/data_80DED44.s @@ -2,7 +2,6 @@ .global gUnknown_80DED48 gUnknown_80DED48: @ 80DED48 - @ replacing .incbin "baserom.gba", 0x000ded48, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x15, 0x00, 0x04, 0x00 @@ -12,7 +11,6 @@ gUnknown_80DED48: @ 80DED48 .global gUnknown_80DED60 gUnknown_80DED60: @ 80DED60 - @ replacing .incbin "baserom.gba", 0x000ded60, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x16, 0x00, 0x07, 0x00 @@ -22,7 +20,6 @@ gUnknown_80DED60: @ 80DED60 .global gUnknown_80DED78 gUnknown_80DED78: @ 80DED78 - @ replacing .incbin "baserom.gba", 0x000ded78, 0x40 .4byte Confirm_80DED98 .byte 0x0b, 0x00, 0x00, 0x00 .4byte Info_80DED90 @@ -48,7 +45,6 @@ gUnknown_80DED78: @ 80DED78 .global gUnknown_80DEDB8 gUnknown_80DEDB8: @ 80DEDB8 - @ replacing .incbin "baserom.gba", 0x000dedb8, 0x50 .4byte SendThankYou_Text .byte 0x01, 0x00, 0x00, 0x00 .4byte GetThankYou_Text @@ -76,7 +72,6 @@ gUnknown_80DEDB8: @ 80DEDB8 .global gUnknown_80DEE08 gUnknown_80DEE08: @ 80DEE08 @ Thank You Mail Pelipper Menu - @ replacing .incbin "baserom.gba", 0x000dee08, 0x3c .4byte GameLinkCable_Text .byte 0x03, 0x00, 0x00, 0x00 .4byte Password_Text @@ -99,7 +94,6 @@ gUnknown_80DEE08: @ 80DEE08 .global gUnknown_80DEE44 gUnknown_80DEE44: @ 80DEE44 @ Game Link Cable Thank-You Mail Menu - @ replacing .incbin "baserom.gba", 0x000dee44, 0x1c .4byte Yes_80DEE5C .byte 0x07, 0x00, 0x00, 0x00 .4byte Cancel_80DEDD8 @@ -114,7 +108,6 @@ gUnknown_80DEE44: @ 80DEE44 .global gUnknown_80DEE60 gUnknown_80DEE60: @ 80DEE60 - @ replacing .incbin "baserom.gba", 0x000dee60, 0x1c .4byte Yes_80DEE5C .byte 0x07, 0x00, 0x00, 0x00 .4byte No_80DEE78 @@ -129,7 +122,6 @@ gUnknown_80DEE60: @ 80DEE60 .global gUnknown_80DEE7C gUnknown_80DEE7C: @ 80DEE7C - @ replacing .incbin "baserom.gba", 0x000dee7c, 0x40 .4byte SendItem_Text .byte 0x09, 0x00, 0x00, 0x00 .4byte DontSendItemText @@ -151,7 +143,6 @@ gUnknown_80DEE7C: @ 80DEE7C .global gUnknown_80DEEBC gUnknown_80DEEBC: @ 80DEEBC - @ replacing .incbin "baserom.gba", 0x000deebc, 0x28 .4byte SendWOItem_Text .byte 0x0a, 0x00, 0x00, 0x00 .4byte Cancel_80DEDD8 @@ -166,7 +157,6 @@ gUnknown_80DEEBC: @ 80DEEBC .global gUnknown_80DEEE4 gUnknown_80DEEE4: @ 80DEEE4 - @ replacing .incbin "baserom.gba", 0x000deee4, 0x20 .4byte Yes_80DEE5C .byte 0x07, 0x00, 0x00, 0x00 .4byte No_80DEE78 @@ -193,12 +183,10 @@ gUnknown_80DFBD0: @ 80DFBD0 .global gUnknown_80DFBE8 gUnknown_80DFBE8: @ 80DFBE8 -@ replacing .incbin "baserom.gba", 0x000dfbe8, 0x4 .byte 0x01, 0x00, 0x0c, 0x00 .global gUnknown_80DFBEC gUnknown_80DFBEC: @ 80DFBEC -@ replacing .incbin "baserom.gba", 0x000dfbec, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x02, 0x00 @@ -251,7 +239,6 @@ gUnknown_80DFC50: @ 80DFC50 .global gUnknown_80DFC5C gUnknown_80DFC5C: @ 80DFC5C -@ replacing .incbin "baserom.gba", 0x000dfc5c, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -261,7 +248,6 @@ gUnknown_80DFC5C: @ 80DFC5C .global gUnknown_80DFC74 gUnknown_80DFC74: @ 80DFC74 -@ replacing .incbin "baserom.gba", 0x000dfc74, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x02, 0x00 @@ -276,7 +262,6 @@ gMailboxText: @ 80DFC8C .global gUnknown_80DFC9C gUnknown_80DFC9C: @ 80DFC9C -@ replacing .incbin "baserom.gba", 0x000dfc9c, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -286,7 +271,6 @@ gUnknown_80DFC9C: @ 80DFC9C .global gUnknown_80DFCB4 gUnknown_80DFCB4: @ 80DFCB4 -@ replacing .incbin "baserom.gba", 0x000dfcb4, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x02, 0x00 @@ -302,7 +286,6 @@ gBulletinBoardText: @ 80DFCCC .global gUnknown_80DFCE4 gUnknown_80DFCE4: @ 80DFCE4 -@ replacing .incbin "baserom.gba", 0x000dfce4, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -312,7 +295,6 @@ gUnknown_80DFCE4: @ 80DFCE4 .global gUnknown_80DFCFC gUnknown_80DFCFC: @ 80DFCFC -@ replacing .incbin "baserom.gba", 0x000dfcfc, 0x18 .byte 0x00, 0x00 .byte 0x00, 0x00 .byte 0x06, 0x00 @@ -334,7 +316,6 @@ gUnknown_80DFD14: @ 80DFD14 .global gUnknown_80DFD28 gUnknown_80DFD28: @ 80DFD28 -@ replacing .incbin "baserom.gba", 0x000dfd28, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -344,7 +325,6 @@ gUnknown_80DFD28: @ 80DFD28 .global gUnknown_80DFD40 gUnknown_80DFD40: @ 80DFD40 -@ replacing .incbin "baserom.gba", 0x000dfd40, 0x18 .byte 0x00, 0x00 .byte 0x00, 0x00 .byte 0x04, 0x00 @@ -360,7 +340,6 @@ gUnknown_80DFD40: @ 80DFD40 .global gUnknown_80DFD58 gUnknown_80DFD58: @ 80DFD58 -@ replacing .incbin "baserom.gba", 0x000dfd58, 0x18 .byte 0x00, 0x00 .byte 0x00, 0x00 .byte 0x04, 0x00 @@ -386,7 +365,6 @@ gUnknown_80DFD7C: @ 80DFD7C .global gUnknown_80DFD8C gUnknown_80DFD8C: @ 80DFD8C -@ replacing .incbin "baserom.gba", 0x000dfd8c, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -396,7 +374,6 @@ gUnknown_80DFD8C: @ 80DFD8C .global gUnknown_80DFDA4 gUnknown_80DFDA4: @ 80DFDA4 -@ replacing .incbin "baserom.gba", 0x000dfda4, 0x18 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x06, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x02, 0x0 @@ -614,7 +591,19 @@ gUnknown_80E03B8: @ 80E03B8 .global gUnknown_80E03C4 gUnknown_80E03C4: @ 80E03C4 - .incbin "baserom.gba", 0xE03C4, 0x30 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x03, 0x00 + .byte 0x07, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E03F4 gUnknown_80E03F4: @ 80E03F4 @@ -650,7 +639,11 @@ gUnknown_80E0434: @ 80E0434 .global gUnknown_80E045C gUnknown_80E045C: @ 80E045C - .incbin "baserom.gba", 0xE045C, 0x28 +@ replacing .incbin "baserom.gba", 0x000e045c, 0x28 + .string "#+#CN$m0#R received\n" + .string "#+#C5$d0#R" + .byte 0x20, 0x83 + .byte 0xbf, 0x83, 0xc4, 0x2e, 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E0484 gUnknown_80E0484: @ 80E0484 @@ -977,232 +970,13 @@ gUnknown_80E09C0: @ 80E09C0 .global gUnknown_80E09D8 gUnknown_80E09D8: @ 80E09D8 - .incbin "baserom.gba", 0xE09D8, 0x34 + .string " ...Uh~2c no?\n" + .asciz "You don~27t have any #CGSOS Mail#R." + .align 2,0 .global gUnknown_80E0A0C gUnknown_80E0A0C: @ 80E0A0C - .incbin "baserom.gba", 0xE0A0C, 0x3C - - .global gUnknown_80E0A48 -gUnknown_80E0A48: @ 80E0A48 - @ Pelipper help menu (one not at the counter on the right) - .incbin "baserom.gba", 0xE0A48, 0x74 - - .global gUnknown_80E0ABC -gUnknown_80E0ABC: @ 80E0ABC - @ Friend Rescue menu from help menu - @ replacing .incbin "baserom.gba", 0x000e0abc, 0x80 - .4byte FriendRescueInfo_Text - .byte 0x06, 0x00, 0x00, 0x00 - .4byte GoRescue_Text - .byte 0x07, 0x00, 0x00, 0x00 - .4byte GetHelp_Text - .byte 0x08, 0x00, 0x00, 0x00 - .4byte DeletingMailInfo_Text - .byte 0x09, 0x00, 0x00, 0x00 - .4byte Exit_80EA0EC - .byte 0x05, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00 - - .global Exit_80E0AEC - Exit_80EA0EC: - .string "Exit\0" - .align 2,0 - - .global DeletingMailInfo_Text - DeletingMailInfo_Text: - .string "Deleting Mail Info\0" - .align 2,0 - - .global GetHelp_Text - GetHelp_Text: - .string "#C6Get help#R \0" - .align 2,0 - - .global GoRescue_Text - GoRescue_Text: - .string "#C6Go rescue#R \0" - .align 2,0 - - .global FriendRescueInfo_Text - FriendRescueInfo_Text: - .string "Friend Rescue Info\0" - .align 2,0 - - .global gUnknown_80E0B3C -gUnknown_80E0B3C: @ 80E0B3C - @ Go Resuce menu from Peilipper help menu - @ replacing .incbin "baserom.gba", 0x000e0b3c, 0x98 - .4byte RescueProcedures_Text - .byte 0x0a, 0x00, 0x00, 0x00 - .4byte ReceiveSOSMail_Text - .byte 0x0b, 0x00, 0x00, 0x00 - .4byte LeaveForRescue_Text - .byte 0x0c, 0x00, 0x00, 0x00 - .4byte SendAOKMail_Text - .byte 0x0d, 0x00, 0x00, 0x00 - .4byte GetThankYouMail_Text - .byte 0x0e, 0x00, 0x00, 0x00 - .4byte Exit_80EA0EC - .byte 0x05, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00 - - .global GetThankYouMail_Text - GetThankYouMail_Text: - .string "Get Thank-You Mail\0" - .align 2,0 - - .global SendAOKMail_Text - SendAOKMail_Text: - .string "Send A-OK Mail\0" - .align 2,0 - - .global LeaveForResuce_Text - LeaveForRescue_Text: - .string "Leave for Rescue\0" - .align 2,0 - - .global ReceiveSOSMail_Text - ReceiveSOSMail_Text: - .string "Receive SOS Mail\0" - .align 2,0 - - .global RescueProcedures_Text - RescueProcedures_Text: - .string "Rescue Procedures\0" - .align 2,0 - - .global gUnknown_80E0BD4 -gUnknown_80E0BD4: @ 80E0BD4 - @ Get help menu from Pelipper help menu - @ replacing .incbin "baserom.gba", 0x000e0bd4, 0x78 - .4byte GettingHelp_Text - .byte 0x0f, 0x00, 0x00, 0x00 - .4byte SendSOSMail_Text - .byte 0x10, 0x00, 0x00, 0x00 - .4byte RecieveAOKMail_Text - .byte 0x11, 0x00, 0x00, 0x00 - .4byte SentThankYouMail_Text - .byte 0x12, 0x00, 0x00, 0x00 - .4byte Exit_80EA0EC - .byte 0x05, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00 - - .global SendThankYouMail_Text - SentThankYouMail_Text: - .string "Send Thank-You Mail\0" - .align 2,0 - - .global ReceiveAOKMail_Text - RecieveAOKMail_Text: - .string "Receive A-OK Mail\0" - .align 2,0 - - .global SendSOSMail_Text - SendSOSMail_Text: - .string "Send SOS Mail\0" - .align 2,0 - - .global GettingHelp_Text - GettingHelp_Text: - .string "Getting Help\0" - .align 2,0 - - - .include "data/text/wonder_mail_4.inc" - - .global gUnknown_80E1EFC -gUnknown_80E1EFC: @ 80E1EFC - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnkData_80E1F14 - gUnkData_80E1F14: - .byte 0x01, 0x00, 0x08, 0x00 - - .global gUnknown_80E1F18 -gUnknown_80E1F18: @ 80E1F18 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x02, 0x00 - .byte 0x14, 0x00, 0x04, 0x00 - .byte 0x04, 0x00, 0x00, 0x00 - - .4byte gUnkData_80E1F14 - - .global gUnknown_80E1F30 -gUnknown_80E1F30: @ 80E1F30 - .string "Objectives\0" - .align 2,0 - - .global gUnknown_80E1F3C -gUnknown_80E1F3C: @ 80E1F3C - .string "%dF\0" - - .global gUnknown_80E1F40 -gUnknown_80E1F40: @ 80E1F40 - .string " Rescue #C6%s#R\0" - .align 2,0 - - .global gUnknown_80E1F54 -gUnknown_80E1F54: @ 80E1F54 - .string "Just go!\0" - .align 2,0 - - .global gUnknown_80E1F60 -gUnknown_80E1F60: @ 80E1F60 - .string " Bring #C4%s#R\0" - .align 2,0 - - .global gUnknown_80E1F70 -gUnknown_80E1F70: @ 80E1F70 - .string " Find #C4%s#R\0" - .align 2,0 - - .global gUnknown_80E1F80 -gUnknown_80E1F80: @ 80E1F80 - .string " Escort to #C6%s#R\0" - .align 2,0 - - .global gUnknown_80E1F94 -gUnknown_80E1F94: @ 80E1F94 - .string "#CW???#R\0" - .align 2,0 - .string "pksdir0\0" - - .global gUnknown_80E1FA8 -gUnknown_80E1FA8: @ 80E1FA8 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnkData_80E1FC0 - gUnkData_80E1FC0: - .byte 0x01, 0x00, 0x0A, 0x00 - - .global gUnknown_80E1FC4 -gUnknown_80E1FC4: @ 80E1FC4 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x02, 0x00 - .byte 0x1a, 0x00, 0x0a, 0x00 - .byte 0x0a, 0x00, 0x00, 0x00 - - .4byte gUnkData_80E1FC0 - - .global gUnknown_80E1FDC -gUnknown_80E1FDC: @ 80E1FDC - .string "Password\0" - .align 2,0 - .string "pksdir0\0" + .string " ...Uh~2c no?\n" + .asciz "You don~27t have any #CGA-OK Mail#R." .align 2,0 + .asciz "pksdir0" diff --git a/data/data_80E1F30.s b/data/data_80E1F30.s new file mode 100644 index 0000000..725d0e5 --- /dev/null +++ b/data/data_80E1F30.s @@ -0,0 +1,71 @@ + .section .rodata + + .global gUnknown_80E1F30 +gUnknown_80E1F30: @ 80E1F30 + .string "Objectives\0" + .align 2,0 + + .global gUnknown_80E1F3C +gUnknown_80E1F3C: @ 80E1F3C + .string "%dF\0" + + .global gUnknown_80E1F40 +gUnknown_80E1F40: @ 80E1F40 + .string " Rescue #C6%s#R\0" + .align 2,0 + + .global gUnknown_80E1F54 +gUnknown_80E1F54: @ 80E1F54 + .string "Just go!\0" + .align 2,0 + + .global gUnknown_80E1F60 +gUnknown_80E1F60: @ 80E1F60 + .string " Bring #C4%s#R\0" + .align 2,0 + + .global gUnknown_80E1F70 +gUnknown_80E1F70: @ 80E1F70 + .string " Find #C4%s#R\0" + .align 2,0 + + .global gUnknown_80E1F80 +gUnknown_80E1F80: @ 80E1F80 + .string " Escort to #C6%s#R\0" + .align 2,0 + + .global gUnknown_80E1F94 +gUnknown_80E1F94: @ 80E1F94 + .string "#CW???#R\0" + .align 2,0 + .string "pksdir0\0" + + .global gUnknown_80E1FA8 +gUnknown_80E1FA8: @ 80E1FA8 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnkData_80E1FC0 + gUnkData_80E1FC0: + .byte 0x01, 0x00, 0x0A, 0x00 + + .global gUnknown_80E1FC4 +gUnknown_80E1FC4: @ 80E1FC4 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x02, 0x00 + .byte 0x1a, 0x00, 0x0a, 0x00 + .byte 0x0a, 0x00, 0x00, 0x00 + + .4byte gUnkData_80E1FC0 + + .global gUnknown_80E1FDC +gUnknown_80E1FDC: @ 80E1FDC + .string "Password\0" + .align 2,0 + .string "pksdir0\0" + .align 2,0 diff --git a/data/data_80E2068.s b/data/data_80E2068.s index d30aaa2..be653e5 100644 --- a/data/data_80E2068.s +++ b/data/data_80E2068.s @@ -255,19 +255,54 @@ gUnknown_80E22F0: @ 80E22F0 .global gUnknown_80E231C gUnknown_80E231C: @ 80E231C - .incbin "baserom.gba", 0xE231C, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x16, 0x00, 0x07, 0x00 + .byte 0x06, 0x00, 0x04, 0x00 + .byte 0x04, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E2334 gUnknown_80E2334: @ 80E2334 - .incbin "baserom.gba", 0xE2334, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x16, 0x00, 0x06, 0x00 + .byte 0x06, 0x00, 0x04, 0x00 + .byte 0x04, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E234C gUnknown_80E234C: @ 80E234C - .incbin "baserom.gba", 0xE234C, 0x20 + .4byte Confirm_80E2364 + .byte 0x09, 0x00, 0x00, 0x00 + .4byte Info_80E2098 + .byte 0x0a, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x08, 0x00, 0x00, 0x00 + .global Confirm_80E2364 + Confirm_80E2364: + .string "Confirm\0" + .align 2,0 .global gUnknown_80E236C gUnknown_80E236C: @ 80E236C - .incbin "baserom.gba", 0xE236C, 0x3C + .4byte GameLinkCable_80E2398 + .byte 0x0b, 0x00, 0x00, 0x00 + .4byte Password_80E238C + .byte 0x0d, 0x00, 0x00, 0x00 + .4byte Cancel_80E22A8 + .byte 0x08, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x08, 0x00, 0x00, 0x00 + + .global Password_80E238C + Password_80E238C: + .string "Password\0" + .align 2,0 + .global GameLinkCable_80E2398 + GameLinkCable_80E2398: + .string "Game Link cable\0" + .align 2,0 .global gUnknown_80E23A8 gUnknown_80E23A8: @ 80E23A8 @@ -388,7 +423,8 @@ gUnknown_80E29D0: @ 80E29D0 .global gUnknown_80E2A0C gUnknown_80E2A0C: @ 80E2A0C - .incbin "baserom.gba", 0xE2A0C, 0x10 + .asciz "Save completed." + .align 2,0 .global gUnknown_80E2A1C gUnknown_80E2A1C: @ 80E2A1C @@ -396,11 +432,13 @@ gUnknown_80E2A1C: @ 80E2A1C .global gUnknown_80E2A5C gUnknown_80E2A5C: @ 80E2A5C - .incbin "baserom.gba", 0xE2A5C, 0x24 + .asciz "Here is the #CGSOS Mail password#R." + .align 2,0 .global gUnknown_80E2A80 gUnknown_80E2A80: @ 80E2A80 - .incbin "baserom.gba", 0xE2A80, 0x28 + .asciz "Here is the #CGA-OK Mail password#R." + .align 2,0 .global gUnknown_80E2AA8 gUnknown_80E2AA8: @ 80E2AA8 @@ -444,7 +482,8 @@ gUnknown_80E2D30: @ 80E2D30 .global gUnknown_80E2D60 gUnknown_80E2D60: @ 80E2D60 - .incbin "baserom.gba", 0xE2D60, 0x1C + .asciz "There is no #CGA-OK Mail#R." + .align 2,0 .global gUnknown_80E2D7C gUnknown_80E2D7C: @ 80E2D7C @@ -854,7 +893,12 @@ gUnknown_80E59C8: @ 80E59C8 .global gUnknown_80E59E0 gUnknown_80E59E0: @ 80E59E0 - .incbin "baserom.gba", 0xE59E0, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x02, 0x00 + .byte 0x0A, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E59F8 gUnknown_80E59F8: @ 80E59F8 @@ -862,11 +906,21 @@ gUnknown_80E59F8: @ 80E59F8 .global gUnknown_80E5A60 gUnknown_80E5A60: @ 80E5A60 - .incbin "baserom.gba", 0xE5A60, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x02, 0x00 + .byte 0x0A, 0x00, 0x08, 0x00 + .byte 0x08, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E5A78 gUnknown_80E5A78: @ 80E5A78 - .incbin "baserom.gba", 0xE5A78, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x02, 0x00 + .byte 0x0B, 0x00, 0x09, 0x00 + .byte 0x09, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E5A90 gUnknown_80E5A90: @ 80E5A90 @@ -878,7 +932,12 @@ gUnknown_80E5AFC: @ 80E5AFC .global gUnknown_80E5B34 gUnknown_80E5B34: @ 80E5B34 - .incbin "baserom.gba", 0xE5B34, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x02, 0x00 + .byte 0x0A, 0x00, 0x08, 0x00 + .byte 0x08, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E5B4C gUnknown_80E5B4C: @ 80E5B4C @@ -890,7 +949,12 @@ gUnknown_80E5B8C: @ 80E5B8C .global gUnknown_80E5BC4 gUnknown_80E5BC4: @ 80E5BC4 - .incbin "baserom.gba", 0xE5BC4, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x02, 0x00 + .byte 0x0A, 0x00, 0x08, 0x00 + .byte 0x08, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E5BDC gUnknown_80E5BDC: @ 80E5BDC @@ -902,7 +966,12 @@ gUnknown_80E5C18: @ 80E5C18 .global gUnknown_80E5CB4 gUnknown_80E5CB4: @ 80E5CB4 - .incbin "baserom.gba", 0xE5CB4, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x0F, 0x00 + .byte 0x1A, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E5CCC gUnknown_80E5CCC: @ 80E5CCC @@ -952,39 +1021,121 @@ gUnknown_80E6030: @ 80E6030 .global gUnknown_80E60A0 gUnknown_80E60A0: @ 80E60A0 - .incbin "baserom.gba", 0xE60A0, 0x34 + .4byte SendItem_80E60C8 + .4byte 1 + .4byte ReceiveItem_80E60B8 + .4byte 2 + .4byte 0 + .4byte 0 + + .global ReceiveItem_80E60B8 + ReceiveItem_80E60B8: + .asciz "Receive item" + .align 2,0 + + .global SendItem_80E60C8 + SendItem_80E60C8: + .asciz "Send item" + .align 2,0 .global gUnknown_80E60D4 gUnknown_80E60D4: @ 80E60D4 - .incbin "baserom.gba", 0xE60D4, 0x18 + .4byte SendItem_80E60C8 + .byte 0xFF, 0xFF, 0xFF, 0xFF + .4byte ReceiveItem_80E60B8 + .4byte 2 + .4byte 0 + .4byte 0 .global gUnknown_80E60EC gUnknown_80E60EC: @ 80E60EC - .incbin "baserom.gba", 0xE60EC, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x15, 0x00, 0x04, 0x00 + .byte 0x06, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6104 gUnknown_80E6104: @ 80E6104 - .incbin "baserom.gba", 0xE6104, 0x50 + .4byte Confirm_80E6134 + .4byte 3 + .4byte Info_80E612C + .4byte 4 + .4byte Cancel_80E6124 + .4byte 7 + .4byte 0 + .4byte 0 + + .global Cancel_80E6124 + Cancel_80E6124: + .asciz "Cancel" + .align 2,0 + + + .global Info_80E612C + Info_80E612C: + .asciz "Info" + .align 2,0 + + .global Confirm_80E6134 + Confirm_80E6134: + .asciz "Confirm" + .align 2,0 + + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x16, 0x00, 0x09, 0x00 + .byte 0x05, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6154 gUnknown_80E6154: @ 80E6154 - .incbin "baserom.gba", 0xE6154, 0x20 + .4byte Yes_80E6170 + .4byte 5 + .4byte No_80E616C + .4byte 6 + .4byte 0 + .4byte 0 + + .global No_80E616C + No_80E616C: + .asciz "No" + .align 2,0 + + .global Yes_80E6170 + Yes_80E6170: + .asciz "Yes" + .align 2,0 .global gUnknown_80E6174 gUnknown_80E6174: @ 80E6174 - .incbin "baserom.gba", 0xE6174, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x15, 0x00, 0x0D, 0x00 + .byte 0x06, 0x00, 0x04, 0x00 + .byte 0x04, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E618C gUnknown_80E618C: @ 80E618C - .incbin "baserom.gba", 0xE618C, 0x18 + .4byte Yes_80E6170 + .4byte 5 + .4byte Cancel_80E6124 + .4byte 0 + .4byte 0 + .4byte 0 .global gUnknown_80E61A4 gUnknown_80E61A4: @ 80E61A4 - .incbin "baserom.gba", 0xE61A4, 0x1C + .asciz "What would you like to do? " + .align 2,0 .global gUnknown_80E61C0 gUnknown_80E61C0: @ 80E61C0 - .incbin "baserom.gba", 0xE61C0, 0x24 + .asciz "Please choose the item to be sent." + .align 2,0 .global gUnknown_80E61E4 gUnknown_80E61E4: @ 80E61E4 @@ -1013,7 +1164,8 @@ gUnknown_80E6358: @ 80E6358 @ Trade Items Link Errors .global gTradeItemsCommunicationError gTradeItemsCommunicationError: @ 80E6378 - .incbin "baserom.gba", 0xE6378, 0x24 + .asciz "There was a communication error." + .align 2,0 .global gUnknown_80E639C gUnknown_80E639C: @ 80E639C @@ -1033,17 +1185,30 @@ gUnknown_80E64AC: @ 80E64AC .global gTradeItemsHowManyText gTradeItemsHowManyText: @ 80E6528 - .incbin "baserom.gba", 0xE6528, 0x14 + .asciz "How many?" + .align 2,0 + .asciz "pksdir0" @ End of Trade Menu Data .global gUnknown_80E653C gUnknown_80E653C: @ 80E653C - .incbin "baserom.gba", 0xE653C, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6554 gUnknown_80E6554: @ 80E6554 - .incbin "baserom.gba", 0xE6554, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .global gUnknown_80E656C gUnknown_80E656C: @ 80E656C @@ -1067,7 +1232,12 @@ gUnknown_80E667C: @ 80E667C .global gUnknown_80E66BC gUnknown_80E66BC: @ 80E66BC - .incbin "baserom.gba", 0xE66BC, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E66D4 gUnknown_80E66D4: @ 80E66D4 @@ -1075,7 +1245,12 @@ gUnknown_80E66D4: @ 80E66D4 .global gUnknown_80E6748 gUnknown_80E6748: @ 80E6748 - .incbin "baserom.gba", 0xE6748, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6760 gUnknown_80E6760: @ 80E6760 @@ -1083,7 +1258,12 @@ gUnknown_80E6760: @ 80E6760 .global gUnknown_80E67D4 gUnknown_80E67D4: @ 80E67D4 - .incbin "baserom.gba", 0xE67D4, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E67EC gUnknown_80E67EC: @ 80E67EC @@ -1091,7 +1271,12 @@ gUnknown_80E67EC: @ 80E67EC .global gUnknown_80E689C gUnknown_80E689C: @ 80E689C - .incbin "baserom.gba", 0xE689C, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E68B4 gUnknown_80E68B4: @ 80E68B4 @@ -1099,7 +1284,12 @@ gUnknown_80E68B4: @ 80E68B4 .global gUnknown_80E6938 gUnknown_80E6938: @ 80E6938 - .incbin "baserom.gba", 0xE6938, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6950 gUnknown_80E6950: @ 80E6950 @@ -1107,7 +1297,12 @@ gUnknown_80E6950: @ 80E6950 .global gUnknown_80E69B0 gUnknown_80E69B0: @ 80E69B0 - .incbin "baserom.gba", 0xE69B0, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E69C8 gUnknown_80E69C8: @ 80E69C8 @@ -1115,7 +1310,12 @@ gUnknown_80E69C8: @ 80E69C8 .global gUnknown_80E6A10 gUnknown_80E6A10: @ 80E6A10 - .incbin "baserom.gba", 0xE6A10, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6A28 gUnknown_80E6A28: @ 80E6A28 @@ -1123,7 +1323,12 @@ gUnknown_80E6A28: @ 80E6A28 .global gUnknown_80E6A74 gUnknown_80E6A74: @ 80E6A74 - .incbin "baserom.gba", 0xE6A74, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6A8C gUnknown_80E6A8C: @ 80E6A8C @@ -1131,7 +1336,12 @@ gUnknown_80E6A8C: @ 80E6A8C .global gUnknown_80E6B78 gUnknown_80E6B78: @ 80E6B78 - .incbin "baserom.gba", 0xE6B78, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6B90 gUnknown_80E6B90: @ 80E6B90 @@ -1139,7 +1349,12 @@ gUnknown_80E6B90: @ 80E6B90 .global gUnknown_80E6BF4 gUnknown_80E6BF4: @ 80E6BF4 - .incbin "baserom.gba", 0xE6BF4, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6C0C gUnknown_80E6C0C: @ 80E6C0C @@ -1147,7 +1362,12 @@ gUnknown_80E6C0C: @ 80E6C0C .global gUnknown_80E6C50 gUnknown_80E6C50: @ 80E6C50 - .incbin "baserom.gba", 0xE6C50, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6C68 gUnknown_80E6C68: @ 80E6C68 @@ -1155,7 +1375,12 @@ gUnknown_80E6C68: @ 80E6C68 .global gUnknown_80E6CD0 gUnknown_80E6CD0: @ 80E6CD0 - .incbin "baserom.gba", 0xE6CD0, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6CE8 gUnknown_80E6CE8: @ 80E6CE8 @@ -1163,7 +1388,12 @@ gUnknown_80E6CE8: @ 80E6CE8 .global gUnknown_80E6D54 gUnknown_80E6D54: @ 80E6D54 - .incbin "baserom.gba", 0xE6D54, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6D6C gUnknown_80E6D6C: @ 80E6D6C @@ -1171,7 +1401,12 @@ gUnknown_80E6D6C: @ 80E6D6C .global gUnknown_80E6DDC gUnknown_80E6DDC: @ 80E6DDC - .incbin "baserom.gba", 0xE6DDC, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x08, 0x00 + .byte 0x18, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6DF4 gUnknown_80E6DF4: @ 80E6DF4 @@ -1181,23 +1416,67 @@ gUnknown_80E6DF4: @ 80E6DF4 .global gUnknown_80E6E7C gUnknown_80E6E7C: @ 80E6E7C - .incbin "baserom.gba", 0xE6E7C, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6E94 gUnknown_80E6E94: @ 80E6E94 - .incbin "baserom.gba", 0xE6E94, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x05, 0x00, 0x09, 0x00 + .byte 0x13, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6EAC gUnknown_80E6EAC: @ 80E6EAC - .incbin "baserom.gba", 0xE6EAC, 0x74 + .4byte Caution_80E6F04 + .4byte 3 + .4byte StorageEmpty_80E6EE4 + .4byte 3 + .4byte CheckAgain_80E6ECC + .4byte 3 + .4byte 0 + .4byte 1 + + .global CheckAgain_80E6ECC + CheckAgain_80E6ECC: + .asciz "#+Please check again." + .align 2,0 + + .global StorageEmpty_80E6EE4 + StorageEmpty_80E6EE4: + .asciz "#+The storage space is empty!" + .align 2,0 + + .global Caution_80E6F04 + Caution_80E6F04: + .asciz "#+#C2Caution!#R " + .align 2,0 + + .asciz "pksdir0" .global gUnknown_80E6F20 gUnknown_80E6F20: @ 80E6F20 - .incbin "baserom.gba", 0xE6F20, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6F38 gUnknown_80E6F38: @ 80E6F38 - .incbin "baserom.gba", 0xE6F38, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x05, 0x00, 0x08, 0x00 + .byte 0x15, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E6F50 gUnknown_80E6F50: @ 80E6F50 @@ -1213,11 +1492,40 @@ gUnknown_80E701C: @ 80E701C .global gUnknown_80E7090 gUnknown_80E7090: @ 80E7090 - .incbin "baserom.gba", 0xE7090, 0x3C + .4byte 0x80e6fac + .4byte 4 + .4byte DeletingAdventure_80E70B0 + .4byte 4 + .4byte 0x80e6f70 + .4byte 4 + .4byte 0 + .4byte 2 + + .global DeletingAdventure_80E70B0 + DeletingAdventure_80E70B0: + .string "#+Deleting your adventure!" + .align 2,0 .global gUnknown_80E70CC gUnknown_80E70CC: @ 80E70CC - .incbin "baserom.gba", 0xE70CC, 0x48 + .4byte 0x80e7008 + .4byte 4 + .4byte AdventureDeleted_80E70F0 + .4byte 4 + .4byte Data_80E70EC + .4byte 4 + .4byte 0 + .4byte 2 + + .global Data_80E70EC + Data_80E70EC: + .string " " + .align 2,0 + + .global AdventureDeleted_80E70F0 + AdventureDeleted_80E70F0: + .string "#+Your adventure has been deleted." + .align 2,0 .global gUnknown_80E7114 gUnknown_80E7114: @ 80E7114 @@ -1247,7 +1555,29 @@ gUnknown_80E71FC: @ 80E71FC .global gUnknown_80E7214 gUnknown_80E7214: @ 80E7214 - .incbin "baserom.gba", 0xE7214, 0x64 + .4byte Error_80E7268 + .4byte 0xC + .4byte IncorrectPassword_80E7250 + .4byte 0xC + .4byte CheckAgain_80E7234 + .4byte 0xC + .4byte 0 + .4byte 0xA + + .global CheckAgain_80E7234 + CheckAgain_80E7234: + .asciz "#+Please check it again." + .align 2,0 + + .global IncorrectPassword_80E7250 + IncorrectPassword_80E7250: + .asciz "#+Incorrect password!" + .align 2,0 + + .global Error_80E7268 + Error_80E7268: + .asciz "#+#C2Error!#R " + .align 2,0 .global gUnknown_80E7278 gUnknown_80E7278: @ 80E7278 @@ -1294,7 +1624,19 @@ gUnknown_80E72EC: @ 80E72EC .global gUnknown_80E7304 gUnknown_80E7304: @ 80E7304 - .incbin "baserom.gba", 0xE7304, 0x40 + .4byte Error_80E7268 + .4byte 0xC + .4byte NotSOSMail_80E7324 + .4byte 0xC + .4byte CheckAgain_80E7234 + .4byte 0xC + .4byte 0 + .4byte 0xA + + .global NotSOSMail_80E7324 + NotSOSMail_80E7324: + .asciz "#+This is not an #CGSOS Mail#R." + .align 2,0 .global gUnknown_80E7344 gUnknown_80E7344: @ 80E7344 @@ -1307,7 +1649,19 @@ gUnknown_80E7344: @ 80E7344 .global gUnknown_80E735C gUnknown_80E735C: @ 80E735C - .incbin "baserom.gba", 0xE735C, 0x50 + .4byte Error_80E7268 + .4byte 0xC + .4byte ReceiveSOSMail_80E737C + .4byte 0xC + .4byte CheckAgain_80E7234 + .4byte 0xC + .4byte 0 + .4byte 0xA + + .global ReceiveSOSMail_80E737C + ReceiveSOSMail_80E737C: + .asciz "#+This #CGSOS Mail#R has been received already." + .align 2,0 .global gUnknown_80E73AC gUnknown_80E73AC: @ 80E73AC @@ -1324,7 +1678,12 @@ gUnknown_80E73C4: @ 80E73C4 .global gUnknown_80E7408 gUnknown_80E7408: @ 80E7408 - .incbin "baserom.gba", 0xE7408, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x09, 0x00 + .byte 0x17, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E7420 gUnknown_80E7420: @ 80E7420 @@ -1332,7 +1691,12 @@ gUnknown_80E7420: @ 80E7420 .global gUnknown_80E7468 gUnknown_80E7468: @ 80E7468 - .incbin "baserom.gba", 0xE7468, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x09, 0x00 + .byte 0x17, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E7480 gUnknown_80E7480: @ 80E7480 @@ -1340,7 +1704,12 @@ gUnknown_80E7480: @ 80E7480 .global gUnknown_80E74C8 gUnknown_80E74C8: @ 80E74C8 - .incbin "baserom.gba", 0xE74C8, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x09, 0x00 + .byte 0x17, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E74E0 gUnknown_80E74E0: @ 80E74E0 @@ -1348,7 +1717,12 @@ gUnknown_80E74E0: @ 80E74E0 .global gUnknown_80E752C gUnknown_80E752C: @ 80E752C - .incbin "baserom.gba", 0xE752C, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x09, 0x00 + .byte 0x17, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E7544 gUnknown_80E7544: @ 80E7544 @@ -1356,7 +1730,12 @@ gUnknown_80E7544: @ 80E7544 .global gUnknown_80E7588 gUnknown_80E7588: @ 80E7588 - .incbin "baserom.gba", 0xE7588, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x09, 0x00 + .byte 0x17, 0x00, 0x05, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E75A0 gUnknown_80E75A0: @ 80E75A0 @@ -1364,15 +1743,31 @@ gUnknown_80E75A0: @ 80E75A0 .global gUnknown_80E75F8 gUnknown_80E75F8: @ 80E75F8 - .incbin "baserom.gba", 0xE75F8, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E7610 gUnknown_80E7610: @ 80E7610 - .incbin "baserom.gba", 0xE7610, 0x1C + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x02, 0x00 + .byte 0x1A, 0x00, 0x0B, 0x00 + .byte 0x0B, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x20, 0x00, 0x00, 0x00 .global gUnknown_80E762C gUnknown_80E762C: @ 80E762C - .incbin "baserom.gba", 0xE762C, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x0F, 0x00 + .byte 0x13, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E7644 gUnknown_80E7644: @ 80E7644 @@ -1396,11 +1791,31 @@ gUnknown_80E7730: @ 80E7730 .global gUnknown_80E7784 gUnknown_80E7784: @ 80E7784 - .incbin "baserom.gba", 0xE7784, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x17, 0x00, 0x0F, 0x00 + .byte 0x05, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E779C gUnknown_80E779C: @ 80E779C - .incbin "baserom.gba", 0xE779C, 0x20 + .4byte Yes_80E77B8 + .4byte 1 + .4byte No_80E77B4 + .4byte 2 + .4byte 0 + .4byte 3 + + .global No_80E77B4 + No_80E77B4: + .asciz "No" + .align 2,0 + + .global Yes_80E77B8 + Yes_80E77B8: + .asciz "Yes" + .align 2,0 .global gUnknown_80E77BC gUnknown_80E77BC: @ 80E77BC @@ -1642,562 +2057,21 @@ gUnknown_80E7CC4: @ 80E7CC4 .string "Would you like to enter it again?\0" .align 2,0 .string "pksdir0\0" - .byte 0x2C, 0x7D, 0x0E, 0x08 + .4byte Yes_80E7D2C .byte 0x01, 0x00, 0x00, 0x00 - .byte 0x24, 0x7D, 0x0E, 0x08 + .4byte Cancel_80E7D24 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 + + .global Cancel_80E7D24 + Cancel_80E7D24: .string "Cancel\0" .align 2,0 + .global Yes_80E7D2C + Yes_80E7D2C: .string "Yes\0" .align 2,0 .string "pksdir0\0" .string "pksdir0\0" - .global gUnknown_80E7D40 -gUnknown_80E7D40: @ 80E7D40 -@ replacing .incbin "baserom.gba", 0x000e7d40, 0x18 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80E7D58 -gUnknown_80E7D58: @ 80E7D58 -@ replacing .incbin "baserom.gba", 0x000e7d58, 0x18 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x02, 0x00 - .byte 0x09, 0x00, 0x0b, 0x00 - .byte 0x0b, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gDebugMenuItems -gDebugMenuItems: @ 80E7D70 -@ replacing .incbin "baserom.gba", 0x000e7d70, 0xc4 - .4byte dungeons_string - .byte 0x00, 0x00, 0x00, 0x00 - .4byte field_string - .byte 0x01, 0x00, 0x00, 0x00 - .4byte field_map_string - .byte 0x02, 0x00, 0x00, 0x00 - .4byte field_script_string - .byte 0x03, 0x00, 0x00, 0x00 - .4byte debug_menu_string - .byte 0x04, 0x00, 0x00, 0x00 - .4byte storage_string - .byte 0x06, 0x00, 0x00, 0x00 - .4byte h_open_string - .byte 0x09, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x0a, 0x00, 0x00, 0x00 - - .global h_open_string - h_open_string: - .string "h-open\0" - .align 2,0 - - .global storage_string - storage_string: - .string "Storage\0" - .align 2,0 - - .global debug_menu_string - debug_menu_string: - .string "Debug Menu\0" - .align 2,0 - - .global field_script_string - field_script_string: - .string "Field Script\0" - .align 2,0 - - .global field_map_string - field_map_string: - .string "Field Map\0" - .align 2,0 - - .global field_string - field_string: - .string "Field\0" - .align 2,0 - - .global dungeons_string - dungeons_string: - .string "Dungeons\0" - .align 2,0 - - .string "pksdir0\0" - .string "pksdir0\0" - .string "pksdir0\0" - .string "pksdir0\0" - .string "pksdir0\0" - .string "pksdir0\0" - .string "pksdir0\0" - - - .global gUnknown_80E7E34 -gUnknown_80E7E34: @ 80E7E34 -@ replacing .incbin "baserom.gba", 0x000e7e34, 0x18 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80E7E4C -gUnknown_80E7E4C: @ 80E7E4C -@ replacing .incbin "baserom.gba", 0x000e7e4c, 0x18 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x04, 0x00 - .byte 0x06, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80E7E64 -gUnknown_80E7E64: @ 80E7E64 -@ replacing .incbin "baserom.gba", 0x000e7e64, 0x18 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x0e, 0x00 - .byte 0x06, 0x00, 0x04, 0x00 - .byte 0x04, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gDebug_NumberText -gDebug_NumberText: @ 80E7E7C - .string "Number?\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80E7E8C -gUnknown_80E7E8C: @ 80E7E8C -@ replacing .incbin "baserom.gba", 0x000e7e8c, 0x18 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80E7EA4 -gUnknown_80E7EA4: @ 80E7EA4 -@ replacing .incbin "baserom.gba", 0x000e7ea4, 0x18 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x04, 0x00 - .byte 0x06, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - - .global gDebug_CloseText -gDebug_CloseText: @ 80E7EBC - .string "CLOSE\0" - .align 2,0 - - .global gDebug_OpenText -gDebug_OpenText: @ 80E7EC4 - .string "OPEN\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80E7ED4 -gUnknown_80E7ED4: @ 80E7ED4 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80E7EEC -gUnknown_80E7EEC: @ 80E7EEC - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x13, 0x00, 0x04, 0x00 - .byte 0x09, 0x00, 0x03, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80E7F04 -gUnknown_80E7F04: @ 80E7F04 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x13, 0x00, 0x0e, 0x00 - .byte 0x06, 0x00, 0x04, 0x00 - .byte 0x04, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gDebug_NumberText2 -gDebug_NumberText2: @ 80E7F1C - .string "Number?\0" - .align 2,0 - - .global gDebug_LevelText -gDebug_LevelText: @ 80E7F24 - .string "LEVEL\0" - .align 2,0 - - .global gUnknown_80E7F2C -gUnknown_80E7F2C: @ 80E7F2C - .string "Name\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80E7F3C -gUnknown_80E7F3C: @ 80E7F3C - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80E7F54 -gUnknown_80E7F54: @ 80E7F54 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x02, 0x00 - .byte 0x18, 0x00, 0x11, 0x00 - .byte 0x11, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - - .global gUnknown_80E7F6C -gUnknown_80E7F6C: @ 80E7F6C - .string "Script\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80E7F94 -gUnknown_80E7F94: @ 80E7F94 - .incbin "baserom.gba", 0xE7F94, 0x10C - - .global gUnknown_80E80A0 -gUnknown_80E80A0: @ 80E80A0 - .incbin "baserom.gba", 0xE80A0, 0x40 - - .global gUnknown_80E80E0 -gUnknown_80E80E0: @ 80E80E0 - .incbin "baserom.gba", 0xE80E0, 0x46 - - .global gUnknown_80E8126 -gUnknown_80E8126: @ 80E8126 - .incbin "baserom.gba", 0xE8126, 0x42 - - .global gUnknown_80E8168 -gUnknown_80E8168: @ 80E8168 - .incbin "baserom.gba", 0xE8168, 0x18 - - .global gUnknown_80E8180 -gUnknown_80E8180: @ 80E8180 - .incbin "baserom.gba", 0xE8180, 0x54 - - .global gUnknown_80E81D4 -gUnknown_80E81D4: @ 80E81D4 - .incbin "baserom.gba", 0xE81D4, 0x608 - - .global gMankeyMission -gMankeyMission: @ 80E87DC - .string "Punish bad #C6Mankey#R!\0" - .align 2,0 - - .global gSmeargleMission -gSmeargleMission: @ 80E87F4 - .string "#C6Smeargle#R~27s desperate plea!\0" - .align 2,0 - - .global gMedichamMission -gMedichamMission: @ 80E8818 - .string "#C6Medicham#R: Help me!\0" - .align 2,0 - - .global gUnknown_80E8830 -gUnknown_80E8830: @ 80E8830 - .string "Deliver one #C4%s#R.\0" - .align 2,0 - - .global gUnknown_80E8848 -gUnknown_80E8848: @ 80E8848 - .string "One #C4%s#R wanted!\0" - .align 2,0 - - .global gUnknown_80E885C -gUnknown_80E885C: @ 80E885C - .string "Save my child!\0" - .align 2,0 - - .global gUnknown_80E886C -gUnknown_80E886C: @ 80E886C - .string "Escort me to my love!\0" - .align 2,0 - - .global gUnknown_80E8884 -gUnknown_80E8884: @ 80E8884 - .string "Near %s\0" - .align 2,0 - - .global gUnknown_80E888C -gUnknown_80E888C: @ 80E888C - .string "Rescue Description\0" - .align 2,0 - - .global gUnknown_80E88A0 -gUnknown_80E88A0: @ 80E88A0 - .string "Please punish bad #C6Mankey#R~27s gang.\0" - .align 2,0 - - .global gUnknown_80E88C8 -gUnknown_80E88C8: @ 80E88C8 - .string "I didn~27t want to become a grown-up~2c so I\n" - .string "fled~2c but now I~27ve lost my way! Help!\0" - .align 2,0 - - .global gUnknown_80E8920 -gUnknown_80E8920: @ 80E8920 - .string "This is #C6Medicham#R. Rescue me~2c please!\n" - .string "The reward is a secret" - .byte 0x81, 0x60 - .string "♪ " - .align 2,0 - - .global gUnknown_80E8968 -gUnknown_80E8968: @ 80E8968 - .string "With the item #C4%s#R~2c I can\n" - .string "evolve! I~27m yearning to evolve! Help!\0" - .align 2,0 - - .global gUnknown_80E89B0 -gUnknown_80E89B0: @ 80E89B0 - .string "The #C4%s#R! What I love to eat\n" - .string "and can~27t live without! Please get one!\0" - .align 2,0 - - .global gUnknown_80E89FC -gUnknown_80E89FC: @ 80E89FC - .string "This is a rescue through communication.\n" - .string "Get a friend to help you!\0" - .align 2,0 - - .global gUnknown_80E8A40 -gUnknown_80E8A40: @ 80E8A40 - .string "This is a rescue through communication.\n" - .string "Rescue a friend!\0" - .align 2,0 - - .global gUnknown_80E8A7C -gUnknown_80E8A7C: @ 80E8A7C - .string "This is a rescue through communication.\n" - .string "Send your thanks to your friend!\0" - .align 2,0 - - .global gUnknown_80E8AC8 -gUnknown_80E8AC8: @ 80E8AC8 - .string "Client:\0" - .align 2,0 - - .global gUnknown_80E8AD0 -gUnknown_80E8AD0: @ 80E8AD0 - .string "%s#C4" - .byte 0x81 - .string "i%s" - .byte 0x81 - .string "j#R\0" - .align 2,0 - - .global gUnknown_80E8AE0 -gUnknown_80E8AE0: @ 80E8AE0 - .string "Objective:\0" - .align 2,0 - - .global gUnknown_80E8AEC -gUnknown_80E8AEC: @ 80E8AEC - .string "Friend Rescue\0" - .align 2,0 - - .global gUnknown_80E8AFC -gUnknown_80E8AFC: @ 80E8AFC - .string "Deliver #C4%s#R.\0" - .align 2,0 - - .global gUnknown_80E8B10 -gUnknown_80E8B10: @ 80E8B10 - .string "Find #C4%s#R.\0" - .align 2,0 - - .global gUnknown_80E8B20 -gUnknown_80E8B20: @ 80E8B20 - .string "Help me.\0" - .align 2,0 - - .global gUnknown_80E8B2C -gUnknown_80E8B2C: @ 80E8B2C - .string "Escort to #C6%s#R.\0" - .align 2,0 - - .global gUnknown_80E8B40 -gUnknown_80E8B40: @ 80E8B40 - .string "Find #C6%s#R.\0" - .align 2,0 - - .global gSpecialMissionText -gSpecialMissionText: @ 80E8B50 - .string "Special mission\0" - .align 2,0 - - .global gPlaceText -gPlaceText: @ 80E8B60 - .string "Place:\0" - .align 2,0 - - .global gDifficultyText -gDifficultyText: @ 80E8B68 - .string "Difficulty:\0" - .align 2,0 - - .global gRewardText -gRewardText: @ 80E8B74 - .string "Reward:\0" - .align 2,0 - - .global gUnknown_80E8B7C -gUnknown_80E8B7C: @ 80E8B7C - .string "Wonder Mail:\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80E8B94 -gUnknown_80E8B94: @ 80E8B94 - .incbin "baserom.gba", 0xE8B94, 0x38 - - .global gUnknown_80E8BCC -gUnknown_80E8BCC: @ 80E8BCC - .byte 0xC8, 0x8B, 0x0E, 0x08 - .4byte SuspendText - .4byte TakeJobText - .4byte DoneText - - .global DoneText - DoneText: - .string "Done\0" - .align 2,0 - - .global TakeJobText - TakeJobText: - .string "Take Job\0" - .align 2,0 - - .global SuspendText - SuspendText: - .string "Suspend\0" - .align 2,0 - - .global gUnknown_80E8BF8 -gUnknown_80E8BF8: @ 80E8BF8 - .incbin "baserom.gba", 0xE8BF8, 0x50 - - .global gMissionRewardText -gMissionRewardText: @ 80E8C48 - .incbin "baserom.gba", 0xE8C48, 0x50 - - .global gUnknown_80E8C98 -gUnknown_80E8C98: @ 80E8C98 - .incbin "baserom.gba", 0xE8C98, 0x14C - - .global gUnknown_80E8DE4 -gUnknown_80E8DE4: @ 80E8DE4 - .incbin "baserom.gba", 0xE8DE4, 0x1CC - - .global gUnknown_80E8FB0 -gUnknown_80E8FB0: @ 80E8FB0 - .incbin "baserom.gba", 0xE8FB0, 0x15C - - .global gUnknown_80E910C -gUnknown_80E910C: @ 80E910C - .incbin "baserom.gba", 0xE910C, 0xC8 - - .global gUnknown_80E91D4 -gUnknown_80E91D4: @ 80E91D4 - .incbin "baserom.gba", 0xE91D4, 0x64C - - .global gUnknown_80E9820 -gUnknown_80E9820: @ 80E9820 - .incbin "baserom.gba", 0xE9820, 0x100 - - .global gUnknown_80E9920 -gUnknown_80E9920: @ 80E9920 - .incbin "baserom.gba", 0xE9920, 0x66C - - .global gUnknown_80E9F8C -gUnknown_80E9F8C: @ 80E9F8C - .incbin "baserom.gba", 0xE9F8C, 0xED0 - -@ Escort Mission Text - .global gUnknown_80EAE5C -gUnknown_80EAE5C: @ 80EAE5C - .4byte TakeMe_Text - .4byte WantToSee_Text - .4byte TakeMeWith_Text - .4byte EscortMe_Text - - - .global EscortMe_Text - EscortMe_Text: - .asciz "Escort me!" - .align 2,0 - - .global TakeMeWith_Text - TakeMeWith_Text: - .asciz "Please take me with you!" - .align 2,0 - - .global WantToSee_Text - WantToSee_Text: - .asciz "I want to see #C6%s#R." - .align 2,0 - - .global TakeMe_Text - TakeMe_Text: - .asciz "Take me!" - .align 2,0 - - .global gUnknown_80EAEB8 -gUnknown_80EAEB8: @ 80EAEB8 - .incbin "baserom.gba", 0xEAEB8, 0x2E0 - - .global gUnknown_80EB198 -gUnknown_80EB198: @ 80EB198 - .incbin "baserom.gba", 0xEB198, 0x88 - - .global gUnknown_80EB220 -gUnknown_80EB220: @ 80EB220 - .incbin "baserom.gba", 0xEB220, 0xD0 - - .global gUnknown_80EB2F0 -gUnknown_80EB2F0: @ 80EB2F0 - .incbin "baserom.gba", 0xEB2F0, 0x108 - -@ Item Delivery Mission Text - .global gUnknown_80EB3F8 -gUnknown_80EB3F8: @ 80EB3F8 - .incbin "baserom.gba", 0xEB3F8, 0x334 - - .global gUnknown_80EB72C -gUnknown_80EB72C: @ 80EB72C - .incbin "baserom.gba", 0xEB72C, 0x2EC diff --git a/data/data_80E7D40.s b/data/data_80E7D40.s new file mode 100644 index 0000000..0d93398 --- /dev/null +++ b/data/data_80E7D40.s @@ -0,0 +1,653 @@ + .section .rodata + + .global gUnknown_80E7E34 +gUnknown_80E7E34: @ 80E7E34 +@ replacing .incbin "baserom.gba", 0x000e7e34, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80E7E4C +gUnknown_80E7E4C: @ 80E7E4C +@ replacing .incbin "baserom.gba", 0x000e7e4c, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x04, 0x00 + .byte 0x06, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80E7E64 +gUnknown_80E7E64: @ 80E7E64 +@ replacing .incbin "baserom.gba", 0x000e7e64, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x14, 0x00, 0x0e, 0x00 + .byte 0x06, 0x00, 0x04, 0x00 + .byte 0x04, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gDebug_NumberText +gDebug_NumberText: @ 80E7E7C + .string "Number?\0" + .align 2,0 + .string "pksdir0\0" + .align 2,0 + + .global gUnknown_80E7E8C +gUnknown_80E7E8C: @ 80E7E8C +@ replacing .incbin "baserom.gba", 0x000e7e8c, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80E7EA4 +gUnknown_80E7EA4: @ 80E7EA4 +@ replacing .incbin "baserom.gba", 0x000e7ea4, 0x18 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x15, 0x00, 0x04, 0x00 + .byte 0x06, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + + .global gDebug_CloseText +gDebug_CloseText: @ 80E7EBC + .string "CLOSE\0" + .align 2,0 + + .global gDebug_OpenText +gDebug_OpenText: @ 80E7EC4 + .string "OPEN\0" + .align 2,0 + .string "pksdir0\0" + .align 2,0 + + .global gUnknown_80E7ED4 +gUnknown_80E7ED4: @ 80E7ED4 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80E7EEC +gUnknown_80E7EEC: @ 80E7EEC + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x13, 0x00, 0x04, 0x00 + .byte 0x09, 0x00, 0x03, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80E7F04 +gUnknown_80E7F04: @ 80E7F04 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x13, 0x00, 0x0e, 0x00 + .byte 0x06, 0x00, 0x04, 0x00 + .byte 0x04, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gDebug_NumberText2 +gDebug_NumberText2: @ 80E7F1C + .string "Number?\0" + .align 2,0 + + .global gDebug_LevelText +gDebug_LevelText: @ 80E7F24 + .string "LEVEL\0" + .align 2,0 + + .global gUnknown_80E7F2C +gUnknown_80E7F2C: @ 80E7F2C + .string "Name\0" + .align 2,0 + .string "pksdir0\0" + .align 2,0 + + .global gUnknown_80E7F3C +gUnknown_80E7F3C: @ 80E7F3C + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80E7F54 +gUnknown_80E7F54: @ 80E7F54 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x02, 0x00 + .byte 0x18, 0x00, 0x11, 0x00 + .byte 0x11, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global gUnknown_80E7F6C +gUnknown_80E7F6C: @ 80E7F6C + .string "Script\0" + .align 2,0 + .string "pksdir0\0" + .align 2,0 + .string "pksdir0\0" + .align 2,0 + .string "pksdir0\0" + .align 2,0 + .string "pksdir0\0" + .align 2,0 + + .global gUnknown_80E7F94 +gUnknown_80E7F94: @ 80E7F94 + .incbin "baserom.gba", 0xE7F94, 0x10C + + .global gUnknown_80E80A0 +gUnknown_80E80A0: @ 80E80A0 + .incbin "baserom.gba", 0xE80A0, 0x40 + + .global gUnknown_80E80E0 +gUnknown_80E80E0: @ 80E80E0 + .incbin "baserom.gba", 0xE80E0, 0x46 + + .global gUnknown_80E8126 +gUnknown_80E8126: @ 80E8126 + .incbin "baserom.gba", 0xE8126, 0x42 + + .global gUnknown_80E8168 +gUnknown_80E8168: @ 80E8168 + .incbin "baserom.gba", 0xE8168, 0x18 + + .global gUnknown_80E8180 +gUnknown_80E8180: @ 80E8180 + .incbin "baserom.gba", 0xE8180, 0x54 + + .global gUnknown_80E81D4 +gUnknown_80E81D4: @ 80E81D4 + .incbin "baserom.gba", 0xE81D4, 0x608 + + .global gMankeyMission +gMankeyMission: @ 80E87DC + .string "Punish bad #C6Mankey#R!\0" + .align 2,0 + + .global gSmeargleMission +gSmeargleMission: @ 80E87F4 + .string "#C6Smeargle#R~27s desperate plea!\0" + .align 2,0 + + .global gMedichamMission +gMedichamMission: @ 80E8818 + .string "#C6Medicham#R: Help me!\0" + .align 2,0 + + .global gUnknown_80E8830 +gUnknown_80E8830: @ 80E8830 + .string "Deliver one #C4%s#R.\0" + .align 2,0 + + .global gUnknown_80E8848 +gUnknown_80E8848: @ 80E8848 + .string "One #C4%s#R wanted!\0" + .align 2,0 + + .global gUnknown_80E885C +gUnknown_80E885C: @ 80E885C + .string "Save my child!\0" + .align 2,0 + + .global gUnknown_80E886C +gUnknown_80E886C: @ 80E886C + .string "Escort me to my love!\0" + .align 2,0 + + .global gUnknown_80E8884 +gUnknown_80E8884: @ 80E8884 + .string "Near %s\0" + .align 2,0 + + .global gUnknown_80E888C +gUnknown_80E888C: @ 80E888C + .string "Rescue Description\0" + .align 2,0 + + .global gMankeyMissionDescription +gMankeyMissionDescription: @ 80E88A0 + .string "Please punish bad #C6Mankey#R~27s gang.\0" + .align 2,0 + + .global gSmeargleMissionDescription +gSmeargleMissionDescription: @ 80E88C8 + .string "I didn~27t want to become a grown-up~2c so I\n" + .string "fled~2c but now I~27ve lost my way! Help!\0" + .align 2,0 + + .global gMedichamMissionDescription +gMedichamMissionDescription: @ 80E8920 + .string "This is #C6Medicham#R. Rescue me~2c please!\n" + .string "The reward is a secret" + .byte 0x81, 0x60 + .string "♪ " + .align 2,0 + + .global gUnknown_80E8968 +gUnknown_80E8968: @ 80E8968 + .string "With the item #C4%s#R~2c I can\n" + .string "evolve! I~27m yearning to evolve! Help!\0" + .align 2,0 + + .global gUnknown_80E89B0 +gUnknown_80E89B0: @ 80E89B0 + .string "The #C4%s#R! What I love to eat\n" + .string "and can~27t live without! Please get one!\0" + .align 2,0 + + .global gUnknown_80E89FC +gUnknown_80E89FC: @ 80E89FC + .string "This is a rescue through communication.\n" + .string "Get a friend to help you!\0" + .align 2,0 + + .global gUnknown_80E8A40 +gUnknown_80E8A40: @ 80E8A40 + .string "This is a rescue through communication.\n" + .string "Rescue a friend!\0" + .align 2,0 + + .global gUnknown_80E8A7C +gUnknown_80E8A7C: @ 80E8A7C + .string "This is a rescue through communication.\n" + .string "Send your thanks to your friend!\0" + .align 2,0 + + .global gUnknown_80E8AC8 +gUnknown_80E8AC8: @ 80E8AC8 + .string "Client:\0" + .align 2,0 + + .global gUnknown_80E8AD0 +gUnknown_80E8AD0: @ 80E8AD0 + .string "%s#C4" + .byte 0x81 + .string "i%s" + .byte 0x81 + .string "j#R\0" + .align 2,0 + + .global gUnknown_80E8AE0 +gUnknown_80E8AE0: @ 80E8AE0 + .string "Objective:\0" + .align 2,0 + + .global gUnknown_80E8AEC +gUnknown_80E8AEC: @ 80E8AEC + .string "Friend Rescue\0" + .align 2,0 + + .global gUnknown_80E8AFC +gUnknown_80E8AFC: @ 80E8AFC + .string "Deliver #C4%s#R.\0" + .align 2,0 + + .global gUnknown_80E8B10 +gUnknown_80E8B10: @ 80E8B10 + .string "Find #C4%s#R.\0" + .align 2,0 + + .global gUnknown_80E8B20 +gUnknown_80E8B20: @ 80E8B20 + .string "Help me.\0" + .align 2,0 + + .global gUnknown_80E8B2C +gUnknown_80E8B2C: @ 80E8B2C + .string "Escort to #C6%s#R.\0" + .align 2,0 + + .global gUnknown_80E8B40 +gUnknown_80E8B40: @ 80E8B40 + .string "Find #C6%s#R.\0" + .align 2,0 + + .global gSpecialMissionText +gSpecialMissionText: @ 80E8B50 + .string "Special mission\0" + .align 2,0 + + .global gPlaceText +gPlaceText: @ 80E8B60 + .string "Place:\0" + .align 2,0 + + .global gDifficultyText +gDifficultyText: @ 80E8B68 + .string "Difficulty:\0" + .align 2,0 + + .global gRewardText +gRewardText: @ 80E8B74 + .string "Reward:\0" + .align 2,0 + + .global gUnknown_80E8B7C +gUnknown_80E8B7C: @ 80E8B7C + .string "Wonder Mail:\0" + .align 2,0 + .string "pksdir0\0" + .align 2,0 + + .global gUnknown_80E8B94 +gUnknown_80E8B94: @ 80E8B94 +@ replacing .incbin "baserom.gba", 0x000e8b94, 0x38 + .4byte UnkData_80E8BC8 + .4byte UnkData_80E8BC4 + .4byte UnkData_80E8BC0 + .4byte UnkData_80E8BBC + .4byte UnkData_80E8BB8 + .4byte UnkData_80E8BB4 + .4byte UnkData_80E8BB0 + + .global UnkData_80E8BB0 + UnkData_80E8BB0: + .byte 0x83, 0xc3, 0x00, 0x00 + + .global UnkData_80E8BB4 + UnkData_80E8BB4: + .byte 0x83, 0xc2, 0x00, 0x00 + + .global UnkData_80E8BB8 + UnkData_80E8BB8: + .byte 0x83, 0xc1, 0x00, 0x00 + + .global UnkData_80E8BBC + UnkData_80E8BBC: + .byte 0x83, 0xc0, 0x00, 0x00 + + .global UnkData_80E8BC0 + UnkData_80E8BC0: + .byte 0x87, 0x40, 0x00, 0x00 + + .global UnkData_80E8BC4 + UnkData_80E8BC4: + .byte 0x84, 0x87, 0x00, 0x00 + + .global UnkData_80E8BC8 + UnkData_80E8BC8: + .byte 0x81, 0x40, 0x00, 0x00 + + + .global gUnknown_80E8BCC +gUnknown_80E8BCC: @ 80E8BCC + .4byte UnkData_80E8BC8 + .4byte SuspendText + .4byte TakeJobText + .4byte DoneText + + .global DoneText + DoneText: + .string "Done\0" + .align 2,0 + + .global TakeJobText + TakeJobText: + .string "Take Job\0" + .align 2,0 + + .global SuspendText + SuspendText: + .string "Suspend\0" + .align 2,0 + + .global gUnknown_80E8BF8 +gUnknown_80E8BF8: @ 80E8BF8 + .incbin "baserom.gba", 0xE8BF8, 0x50 + + .global gMissionRewardText +gMissionRewardText: @ 80E8C48 + .incbin "baserom.gba", 0xE8C48, 0x50 + + .global gUnknown_80E8C98 +gUnknown_80E8C98: @ 80E8C98 + .incbin "baserom.gba", 0xE8C98, 0x14C + + .global gUnknown_80E8DE4 +gUnknown_80E8DE4: @ 80E8DE4 + .incbin "baserom.gba", 0xE8DE4, 0x1CC + + .global gUnknown_80E8FB0 +gUnknown_80E8FB0: @ 80E8FB0 + .incbin "baserom.gba", 0xE8FB0, 0x15C + + .global gUnknown_80E910C +gUnknown_80E910C: @ 80E910C + .incbin "baserom.gba", 0xE910C, 0xC8 + + .global gUnknown_80E91D4 +gUnknown_80E91D4: @ 80E91D4 + .incbin "baserom.gba", 0xE91D4, 0x64C + + .global gUnknown_80E9820 +gUnknown_80E9820: @ 80E9820 + .incbin "baserom.gba", 0xE9820, 0x100 + + .global gUnknown_80E9920 +gUnknown_80E9920: @ 80E9920 + .incbin "baserom.gba", 0xE9920, 0x66C + + .global gUnknown_80E9F8C +gUnknown_80E9F8C: @ 80E9F8C + .incbin "baserom.gba", 0xE9F8C, 0xED0 + +@ Escort Mission Text + .global gUnknown_80EAE5C +gUnknown_80EAE5C: @ 80EAE5C + .4byte TakeMe_Text + .4byte WantToSee_Text + .4byte TakeMeWith_Text + .4byte EscortMe_Text + + + .global EscortMe_Text + EscortMe_Text: + .asciz "Escort me!" + .align 2,0 + + .global TakeMeWith_Text + TakeMeWith_Text: + .asciz "Please take me with you!" + .align 2,0 + + .global WantToSee_Text + WantToSee_Text: + .asciz "I want to see #C6%s#R." + .align 2,0 + + .global TakeMe_Text + TakeMe_Text: + .asciz "Take me!" + .align 2,0 + + .global gUnknown_80EAEB8 +gUnknown_80EAEB8: @ 80EAEB8 +@ replacing .incbin "baserom.gba", 0x000eaeb8, 0x2e0 + .byte 0x7c, 0xb1, 0x0e, 0x08 + .byte 0x58, 0xb1, 0x0e, 0x08 + .byte 0x38, 0xb1, 0x0e, 0x08 + .byte 0x18, 0xb1, 0x0e, 0x08 + .byte 0xfc, 0xb0, 0x0e, 0x08 + .byte 0xdc, 0xb0, 0x0e, 0x08 + .byte 0xb4, 0xb0, 0x0e, 0x08 + .byte 0x90, 0xb0, 0x0e, 0x08 + .byte 0x6c, 0xb0, 0x0e, 0x08 + .byte 0x48, 0xb0, 0x0e, 0x08 + .byte 0x30, 0xb0, 0x0e, 0x08 + .byte 0x14, 0xb0, 0x0e, 0x08 + .byte 0xf0, 0xaf, 0x0e, 0x08 + .byte 0xd4, 0xaf, 0x0e, 0x08 + .byte 0xa4, 0xaf, 0x0e, 0x08 + .byte 0x94, 0xaf, 0x0e, 0x08 + .byte 0x70, 0xaf, 0x0e, 0x08 + .byte 0x4c, 0xaf, 0x0e, 0x08 + .byte 0x2c, 0xaf, 0x0e, 0x08 + .byte 0x08, 0xaf, 0x0e, 0x08 + + .asciz "I~27m close friends with #C6%s#R!" + .align 2,0 + + .asciz "I want to apologize to #C6%s#R." + .align 2,0 + + .asciz "I don~27t care how--we must meet!" + .align 2,0 + + .asciz "We have to meet--whatever it takes!" + .align 2,0 + + .asciz "I have to go!" + .align 2,0 + + .asciz "We haven~27t seen each other in a long time." + .align 2,0 + + .asciz "I~27m sick with worry..." + .align 2,0 + + .asciz "#C6%s#R may have fainted inside..." + .align 2,0 + + .asciz "#C6%s#R hasn~27t returned!" + .align 2,0 + + .asciz "I want to help #C6%s#R!" + .align 2,0 + + .asciz "Hurry~2c #C6%s#R is in trouble..." + .align 2,0 + + .asciz "#C6%s#R has been waiting forever..." + .align 2,0 + + .asciz "#C6%s#R is waiting in the dungeon." + .align 2,0 + + .asciz "I~27m too weak. It~27s not possible." + .align 2,0 + + .asciz "I can~27t go on my own power..." + .align 2,0 + + .asciz "I can~27t go by myself..." + .align 2,0 + + .asciz "I~27m worried about #C6%s#R..." + .align 2,0 + + .asciz "I want to meet with #C6%s#R." + .align 2,0 + + .asciz "We promised to meet in the dungeon!" + .align 2,0 + + .asciz "#C6%s#R is waiting for me!" + .align 2,0 + + + .global gUnknown_80EB198 +gUnknown_80EB198: @ 80EB198 + .4byte PleaseTakeMeToSee + .4byte PleaseTakeMeThere + .4byte PleaseEscortMe + .4byte SomeonePleaseEscort + + .global SomeonePleaseEscort + SomeonePleaseEscort: + .asciz "Someone~2c please escort me!" + .align 2,0 + + .global PleaseEscortMe + PleaseEscortMe: + .asciz "Please escort me there!" + .align 2,0 + + .global PleaseTakeMeThere + PleaseTakeMeThere: + .asciz "Please take me there with you!" + .align 2,0 + + .global PleaseTakeMeToSee + PleaseTakeMeToSee: + .asciz "Please take me to see #C6%s#R!" + .align 2,0 + + .global gUnknown_80EB220 +gUnknown_80EB220: @ 80EB220 +@ replacing .incbin "baserom.gba", 0x000eb220, 0xd0 + .byte 0xcc, 0xb2, 0x0e, 0x08 + .byte 0xac, 0xb2, 0x0e, 0x08 + .byte 0x94, 0xb2, 0x0e, 0x08 + .byte 0x74, 0xb2, 0x0e, 0x08 + .byte 0x50, 0xb2, 0x0e, 0x08 + .byte 0x38, 0xb2, 0x0e, 0x08 + + .asciz "Without #C6%s#R~2c I..." + .align 2,0 + + .asciz "I~27m so worried about #C6%s#R..." + .align 2,0 + + .asciz "I really want to meet #C6%s#R!" + .align 2,0 + + .asciz "Help me meet #C6%s#R!" + .align 2,0 + + .asciz "Please escort me to my #C6%s#R!" + .align 2,0 + + .asciz "Please! Take me to meet #C6%s#R!" + .align 2,0 + + .global gUnknown_80EB2F0 +gUnknown_80EB2F0: @ 80EB2F0 +@ replacing .incbin "baserom.gba", 0x000eb2f0, 0x108 + .byte 0xcc, 0xb3, 0x0e, 0x08 + .byte 0xa4, 0xb3, 0x0e, 0x08 + .byte 0x7c, 0xb3, 0x0e, 0x08 + .byte 0x5c, 0xb3, 0x0e, 0x08 + .byte 0x34, 0xb3, 0x0e, 0x08 + .byte 0x08, 0xb3, 0x0e, 0x08 + + .asciz "I~27m very lonely! Please take me with you!" + .align 2,0 + + .asciz "It~27s no good if we~27re not together!" + .align 2,0 + + .asciz "This means everything to me!" + .align 2,0 + + .asciz "We~27ve promised our futures together." + .align 2,0 + + .asciz "We belong together! Please escort me!" + .align 2,0 + + .asciz "We~27re in love! Please~2c take me there!" + .align 2,0 + +@ Item Delivery Mission Text + .global gUnknown_80EB3F8 +gUnknown_80EB3F8: @ 80EB3F8 + .incbin "baserom.gba", 0xEB3F8, 0x334 + + .global gUnknown_80EB72C +gUnknown_80EB72C: @ 80EB72C + .incbin "baserom.gba", 0xEB72C, 0x2EC + diff --git a/data/data_80F4278.s b/data/data_80F4278.s index 5265b3c..f1d78e9 100644 --- a/data/data_80F4278.s +++ b/data/data_80F4278.s @@ -7799,8 +7799,8 @@ gUnknown_8107608: @ 8107608 .string "%s#r" .align 2,0 - .global gUnknown_8107610 -gUnknown_8107610: @ 8107610 + .global gUnownLetters +gUnownLetters: @ 8107610 .string "ABCDEFGHIJKLMNOPQRSTUVWXYZ!?\0" .align 2,0 @@ -7816,7 +7816,7 @@ gUnknown_8107638: @ 8107638 .global gUnknown_810763C gUnknown_810763C: @ 810763C - .incbin "baserom.gba", 0x10763C, 0x9 + .string "#c%c%s#r\0" .global gUnknown_8107645 gUnknown_8107645: @ 8107645 diff --git a/data/data_810AE24.s b/data/data_810AE24.s index c7000db..03ab158 100644 --- a/data/data_810AE24.s +++ b/data/data_810AE24.s @@ -831,7 +831,7 @@ gUnknown_81161E8: @ 81161E8 @ replacing .incbin "baserom.gba", 0x001161e8, 0x10 .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .4byte sub_801641C + .4byte CleanFelicityBank .4byte sub_80163A0 .global gUnknown_81161F8 @@ -887,7 +887,7 @@ gUnknown_8116258: @ 8116258 @ replacing .incbin "baserom.gba", 0x00116258, 0x10 .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .4byte sub_80315C0 + .4byte CleanHelperPelipper .4byte sub_8031540 .global gUnknown_8116268 diff --git a/data/dungeon/Autopilot/floor_id.inc b/data/dungeon/Autopilot/floor_id.inc index 266c053..cf29555 100644 --- a/data/dungeon/Autopilot/floor_id.inc +++ b/data/dungeon/Autopilot/floor_id.inc @@ -1,9 +1,14 @@ .global AutopilotFloorID AutopilotFloorID: -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x69, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x6a, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x6b, 0x04, 0x0f, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x6c, 0x04, 0x10, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x6d, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x6e, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x6f, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x70, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x71, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x72, 0x04, 0x13, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x69, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x6a, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x6b, 0x04, 0x0f, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x6c, 0x04, 0x10, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x6d, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x6e, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x6f, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x70, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x71, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x72, 0x04, 0x13, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 diff --git a/data/dungeon/Boss9/floor_id.inc b/data/dungeon/Boss9/floor_id.inc index d890c06..c67eace 100644 --- a/data/dungeon/Boss9/floor_id.inc +++ b/data/dungeon/Boss9/floor_id.inc @@ -1,12 +1,16 @@ .global Boss9FloorID Boss9FloorID: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xd8, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0xd9, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xda, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0xdb, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xdc, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0xdd, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xde, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0xdf, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xe0, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0xe1, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xe2, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00 +.byte 0xd8, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xd9, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xda, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xdb, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xdc, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xdd, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xde, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xdf, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xe0, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xe1, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0xe2, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 .byte 0xe3, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 diff --git a/data/dungeon/D50/floor_id.inc b/data/dungeon/D50/floor_id.inc index 47e9fe6..232ab1f 100644 --- a/data/dungeon/D50/floor_id.inc +++ b/data/dungeon/D50/floor_id.inc @@ -1,6 +1,6 @@ .global D50FloorID D50FloorID: -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x73, 0x04, 0x0e, 0x02, 0x57, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x74, 0x04, 0x0e, 0x02, 0x57, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x42, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x73, 0x04, 0x0e, 0x02, 0x57, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x74, 0x04, 0x0e, 0x02, 0x57, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00 diff --git a/data/dungeon/D54/floor_id.inc b/data/dungeon/D54/floor_id.inc index fcf58c6..fd761d1 100644 --- a/data/dungeon/D54/floor_id.inc +++ b/data/dungeon/D54/floor_id.inc @@ -1,21 +1,35 @@ .global D54FloorID D54FloorID: -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf9, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xfa, 0x04, 0x0f, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xfb, 0x04, 0x10, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xfc, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xfd, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xfe, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xff, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x05, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x02, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x05, 0x16, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x06, 0x05, 0x16, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x08, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x09, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x0a, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0b, 0x05, 0x18, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x0c, 0x05, 0x18, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0d, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x0e, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0f, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x10, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x11, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x12, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x13, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x14, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x15, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xf8, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xf9, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xfa, 0x04, 0x0f, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xfb, 0x04, 0x10, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xfc, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xfd, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xfe, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xff, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x00, 0x05, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x01, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x02, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x03, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x04, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x05, 0x05, 0x16, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x06, 0x05, 0x16, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x07, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x08, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x09, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x0a, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x0b, 0x05, 0x18, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x0c, 0x05, 0x18, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x0d, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x0e, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x0f, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x10, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x11, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x12, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x13, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x14, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x15, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 diff --git a/data/dungeon/DesertRegion/floor_id.inc b/data/dungeon/DesertRegion/floor_id.inc index 283cbfa..891141b 100644 --- a/data/dungeon/DesertRegion/floor_id.inc +++ b/data/dungeon/DesertRegion/floor_id.inc @@ -10,11 +10,15 @@ DesertRegionFloorID: .byte 0xea, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 .byte 0xeb, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 .byte 0xec, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 -.byte 0xed, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00 -.byte 0x5b, 0x00, 0x00, 0x00, 0xee, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00, 0xef, 0x02, 0x56, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00 -.byte 0x5b, 0x00, 0x00, 0x00, 0xf0, 0x02, 0x56, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00, 0xf1, 0x02, 0x57, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00 -.byte 0x5b, 0x00, 0x00, 0x00, 0xf2, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00, 0xf3, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00 -.byte 0x5b, 0x00, 0x00, 0x00, 0xf4, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00, 0xf5, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00 -.byte 0x5b, 0x00, 0x00, 0x00, 0xf6, 0x02, 0x58, 0x01, 0x40, 0x00, 0x5c, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xed, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xee, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xef, 0x02, 0x56, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xf0, 0x02, 0x56, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xf1, 0x02, 0x57, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xf2, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xf3, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xf4, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xf5, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 +.byte 0xf6, 0x02, 0x58, 0x01, 0x40, 0x00, 0x5c, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 .byte 0xf7, 0x02, 0x58, 0x01, 0x40, 0x00, 0x5c, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00 diff --git a/data/dungeon/GreatCanyon/pokemon_found.inc b/data/dungeon/GreatCanyon/pokemon_found.inc new file mode 100644 index 0000000..cafa22e --- /dev/null +++ b/data/dungeon/GreatCanyon/pokemon_found.inc @@ -0,0 +1,85 @@ +.global GreatCanyon_1F_3F_Pokemon +GreatCanyon_1F_3F_Pokemon: +.byte 0x54, 0x1c, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00 +.byte 0xbc, 0x1a, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00 +.byte 0xe7, 0x1a, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00 +.byte 0x00, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global GreatCanyon_4F_Pokemon +GreatCanyon_4F_Pokemon: +.byte 0x2d, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 +.byte 0x54, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 +.byte 0x37, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global GreatCanyon_5F_Pokemon +GreatCanyon_5F_Pokemon: +.byte 0x2d, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 +.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0x37, 0x1d, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 +.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global GreatCanyon_6F_Pokemon +GreatCanyon_6F_Pokemon: +.byte 0x2d, 0x1c, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 +.byte 0xa4, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 +.byte 0xc6, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 +.byte 0x37, 0x1d, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00 +.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global GreatCanyon_7F_Pokemon +GreatCanyon_7F_Pokemon: +.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 +.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 +.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global GreatCanyon_8F_Pokemon +GreatCanyon_8F_Pokemon: +.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 +.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 +.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + +.global GreatCanyon_9F_Pokemon +GreatCanyon_9F_Pokemon: +.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0xef, 0x1c, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global GreatCanyon_10F_11F_Pokemon +GreatCanyon_10F_11F_Pokemon: +.byte 0x80, 0x1e, 0x05, 0x0c, 0x05, 0x0c, 0x00, 0x00 +.byte 0xa8, 0x1c, 0x0a, 0x18, 0x0a, 0x18, 0x00, 0x00 +.byte 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global GreatCanyon_12F_Pokemon +GreatCanyon_12F_Pokemon: +.byte 0x80, 0x1e, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00 +.byte 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/LapisCave/pokemon_found.inc b/data/dungeon/LapisCave/pokemon_found.inc new file mode 100644 index 0000000..26c16f7 --- /dev/null +++ b/data/dungeon/LapisCave/pokemon_found.inc @@ -0,0 +1,57 @@ +.global LapisCave_1F_3F_Pokemon +LapisCave_1F_3F_Pokemon: +.byte 0x29, 0x22, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global LapisCave_4F_Pokemon +LapisCave_4F_Pokemon: +.byte 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 +.byte 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 +.byte 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global LapisCave_5F_8F_Pokemon +LapisCave_5F_8F_Pokemon: +.byte 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 +.byte 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 +.byte 0x53, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global LapisCave_9F_10F_Pokemon +LapisCave_9F_10F_Pokemon: +.byte 0x72, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global LapisCave_11F_12F_Pokemon +LapisCave_11F_12F_Pokemon: +.byte 0x2a, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 +.byte 0x72, 0x1c, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global LapisCave_13F_Pokemon +LapisCave_13F_Pokemon: +.byte 0x2a, 0x14, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global LapisCave_14F_Pokemon +LapisCave_14F_Pokemon: +.byte 0x2a, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/MtSteel/pokemon_found.inc b/data/dungeon/MtSteel/pokemon_found.inc new file mode 100644 index 0000000..1cf6500 --- /dev/null +++ b/data/dungeon/MtSteel/pokemon_found.inc @@ -0,0 +1,53 @@ +.global MtSteel_1F_4F_Pokemon +MtSteel_1F_4F_Pokemon: +.byte 0x15, 0x08, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00 +.byte 0x20, 0x0b, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00 +.byte 0x49, 0x0d, 0xdf, 0x1d, 0xdf, 0x1d, 0x00, 0x00 +.byte 0x70, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtSteel_5F_Pokemon +MtSteel_5F_Pokemon: +.byte 0x4a, 0x0a, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00 +.byte 0x05, 0x0d, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00 +.byte 0x20, 0x0b, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00 +.byte 0x49, 0x0d, 0x9f, 0x1f, 0x9f, 0x1f, 0x00, 0x00 +.byte 0x4c, 0x0d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtSteel_6F_Pokemon +MtSteel_6F_Pokemon: +.byte 0x4a, 0x0a, 0x03, 0x08, 0x03, 0x08, 0x00, 0x00 +.byte 0x05, 0x0d, 0x07, 0x10, 0x07, 0x10, 0x00, 0x00 +.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 +.byte 0x4c, 0x0d, 0x0e, 0x22, 0x0e, 0x22, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtSteel_7F_8F_Pokemon +MtSteel_7F_8F_Pokemon: +.byte 0x4a, 0x0a, 0x61, 0x06, 0x61, 0x06, 0x00, 0x00 +.byte 0x7f, 0x0c, 0x59, 0x0e, 0x59, 0x0e, 0x00, 0x00 +.byte 0x05, 0x0d, 0xba, 0x14, 0xba, 0x14, 0x00, 0x00 +.byte 0x49, 0x0d, 0xb3, 0x1c, 0xb3, 0x1c, 0x00, 0x00 +.byte 0x4c, 0x0d, 0x14, 0x23, 0x14, 0x23, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtSteel_9F_Pokemon +MtSteel_9F_Pokemon: +.byte 0x32, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xfc, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/MtThunder/pokemon_found.inc b/data/dungeon/MtThunder/pokemon_found.inc new file mode 100644 index 0000000..b2d3e93 --- /dev/null +++ b/data/dungeon/MtThunder/pokemon_found.inc @@ -0,0 +1,84 @@ +.global MtThunder_1F_Pokemon +MtThunder_1F_Pokemon: +.byte 0x0d, 0x10, 0x53, 0x07, 0x53, 0x07, 0x00, 0x00 +.byte 0x20, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0x4e, 0x19, 0xbd, 0x1f, 0xbd, 0x1f, 0x00, 0x00 +.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtThunder_2F_4F_Pokemon +MtThunder_2F_4F_Pokemon: +.byte 0x0d, 0x10, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00 +.byte 0x11, 0x16, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00 +.byte 0x20, 0x18, 0x2e, 0x18, 0x2e, 0x18, 0x00, 0x00 +.byte 0x4e, 0x19, 0x7b, 0x21, 0x7b, 0x21, 0x00, 0x00 +.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtThunder_5F_Pokemon +MtThunder_5F_Pokemon: +.byte 0x0f, 0x14, 0x35, 0x05, 0x35, 0x05, 0x00, 0x00 +.byte 0x11, 0x16, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00 +.byte 0x7d, 0x18, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 +.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtThunder_6F_Pokemon +MtThunder_6F_Pokemon: +.byte 0x0f, 0x14, 0x02, 0x06, 0x02, 0x06, 0x00, 0x00 +.byte 0x7d, 0x18, 0x07, 0x12, 0x07, 0x12, 0x00, 0x00 +.byte 0xb5, 0x18, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00 +.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtThunder_7F_Pokemon +MtThunder_7F_Pokemon: +.byte 0x0f, 0x14, 0x57, 0x04, 0x57, 0x04, 0x00, 0x00 +.byte 0x7d, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 +.byte 0xb5, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0xe8, 0x18, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00 +.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtThunder_8F_Pokemon +MtThunder_8F_Pokemon: +.byte 0x0f, 0x14, 0x66, 0x03, 0x66, 0x03, 0x00, 0x00 +.byte 0x7d, 0x18, 0x31, 0x0a, 0x31, 0x0a, 0x00, 0x00 +.byte 0xb5, 0x18, 0x49, 0x0f, 0x49, 0x0f, 0x00, 0x00 +.byte 0xe8, 0x18, 0xc7, 0x17, 0xc7, 0x17, 0x00, 0x00 +.byte 0x03, 0x13, 0x92, 0x1e, 0x92, 0x1e, 0x00, 0x00 +.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtThunder_9F_Pokemon +MtThunder_9F_Pokemon: +.byte 0x3a, 0x14, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00 +.byte 0xb5, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 +.byte 0xe8, 0x18, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00 +.byte 0x03, 0x13, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00 +.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtThunder_10F_Pokemon +MtThunder_10F_Pokemon: +.byte 0x3a, 0x14, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00 +.byte 0xb5, 0x18, 0x16, 0x10, 0x16, 0x10, 0x00, 0x00 +.byte 0xe8, 0x18, 0x93, 0x1b, 0x93, 0x1b, 0x00, 0x00 +.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/MtThunderPeak/pokemon_found.inc b/data/dungeon/MtThunderPeak/pokemon_found.inc new file mode 100644 index 0000000..b8ce32c --- /dev/null +++ b/data/dungeon/MtThunderPeak/pokemon_found.inc @@ -0,0 +1,17 @@ +.global MtThunderPeak_1F_2F_Pokemon +MtThunderPeak_1F_2F_Pokemon: +.byte 0x3a, 0x14, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 +.byte 0x7d, 0x18, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 +.byte 0xb5, 0x18, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 +.byte 0xe8, 0x18, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00 +.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global MtThunderPeak_3F_Pokemon +MtThunderPeak_3F_Pokemon: +.byte 0x91, 0x32, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/PitfallValley/floor_id.inc b/data/dungeon/PitfallValley/floor_id.inc index 61a26bd..d63bfa6 100644 --- a/data/dungeon/PitfallValley/floor_id.inc +++ b/data/dungeon/PitfallValley/floor_id.inc @@ -2,20 +2,28 @@ PitfallValleyFloorID: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xa6, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0xa7, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xa9, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xaa, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xab, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xac, 0x02, 0x3f, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xad, 0x02, 0x3f, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xae, 0x02, 0x40, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xaf, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xb1, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb2, 0x02, 0x42, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xb3, 0x02, 0x42, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb4, 0x02, 0x43, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xb5, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb6, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xb7, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb8, 0x02, 0x45, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xb9, 0x02, 0x45, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xba, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0xbb, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0xbc, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00 +.byte 0xa7, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xa8, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xa9, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xaa, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xab, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xac, 0x02, 0x3f, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xad, 0x02, 0x3f, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xae, 0x02, 0x40, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xaf, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb0, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb1, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb2, 0x02, 0x42, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb3, 0x02, 0x42, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb4, 0x02, 0x43, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb5, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb6, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb7, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb8, 0x02, 0x45, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xb9, 0x02, 0x45, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xba, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xbb, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0xbc, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0xbd, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 -.byte 0xbe, 0x02, 0x46, 0x01, 0x3d, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00 +.byte 0xbe, 0x02, 0x46, 0x01, 0x3d, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 diff --git a/data/dungeon/RemainsIsland/floor_id.inc b/data/dungeon/RemainsIsland/floor_id.inc index 6db9405..8b3a3d8 100644 --- a/data/dungeon/RemainsIsland/floor_id.inc +++ b/data/dungeon/RemainsIsland/floor_id.inc @@ -1,15 +1,24 @@ .global RemainsIslandFloorID RemainsIslandFloorID: -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x1b, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x1c, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00, 0x1d, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x1e, 0x04, 0xec, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00, 0x1f, 0x04, 0xed, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x20, 0x04, 0xed, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00, 0x21, 0x04, 0xee, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x22, 0x04, 0xee, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00, 0x23, 0x04, 0xef, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x24, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00, 0x25, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x26, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00, 0x27, 0x04, 0xf1, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x28, 0x04, 0xf2, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00, 0x29, 0x04, 0xf3, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x2a, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00, 0x2b, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x2c, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00, 0x2d, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x2e, 0x04, 0xf5, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00 -.byte 0x6d, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x1b, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x1c, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x1d, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x1e, 0x04, 0xec, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x1f, 0x04, 0xed, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x20, 0x04, 0xed, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x21, 0x04, 0xee, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x22, 0x04, 0xee, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x23, 0x04, 0xef, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x24, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x25, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x26, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x27, 0x04, 0xf1, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x28, 0x04, 0xf2, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x29, 0x04, 0xf3, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x2a, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x2b, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x2c, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x2d, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 +.byte 0x2e, 0x04, 0xf5, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00 diff --git a/data/dungeon/RockPath/floor_id.inc b/data/dungeon/RockPath/floor_id.inc index cc8f15b..0f886dd 100644 --- a/data/dungeon/RockPath/floor_id.inc +++ b/data/dungeon/RockPath/floor_id.inc @@ -1,7 +1,9 @@ .global RockPathFloorID RockPathFloorID: -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x62, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x63, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x64, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x61, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x62, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x63, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x64, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 diff --git a/data/dungeon/SilentChasm/pokemon_found.inc b/data/dungeon/SilentChasm/pokemon_found.inc new file mode 100644 index 0000000..d622578 --- /dev/null +++ b/data/dungeon/SilentChasm/pokemon_found.inc @@ -0,0 +1,84 @@ +.global SilentChasm_1F_3F_Pokemon +SilentChasm_1F_3F_Pokemon: +.byte 0x0d, 0x10, 0x83, 0x06, 0x83, 0x06, 0x00, 0x00 +.byte 0x2c, 0x14, 0x6b, 0x0a, 0x6b, 0x0a, 0x00, 0x00 +.byte 0x53, 0x14, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00 +.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 +.byte 0xf1, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SilentChasm_4F_Pokemon +SilentChasm_4F_Pokemon: +.byte 0x0d, 0x10, 0xda, 0x0a, 0xda, 0x0a, 0x00, 0x00 +.byte 0x2c, 0x14, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00 +.byte 0xc1, 0x14, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00 +.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SilentChasm_5F_Pokemon +SilentChasm_5F_Pokemon: +.byte 0x0d, 0x10, 0xeb, 0x05, 0xeb, 0x05, 0x00, 0x00 +.byte 0x2c, 0x14, 0x78, 0x09, 0x78, 0x09, 0x00, 0x00 +.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 +.byte 0xc1, 0x14, 0x20, 0x14, 0x20, 0x14, 0x00, 0x00 +.byte 0xfd, 0x16, 0x98, 0x1d, 0x98, 0x1d, 0x00, 0x00 +.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SilentChasm_6F_Pokemon +SilentChasm_6F_Pokemon: +.byte 0x0d, 0x10, 0x28, 0x04, 0x28, 0x04, 0x00, 0x00 +.byte 0x2c, 0x14, 0xa6, 0x06, 0xa6, 0x06, 0x00, 0x00 +.byte 0x3c, 0x14, 0x24, 0x09, 0x24, 0x09, 0x00, 0x00 +.byte 0xa7, 0x16, 0x21, 0x0e, 0x21, 0x0e, 0x00, 0x00 +.byte 0xc1, 0x14, 0x1e, 0x13, 0x1e, 0x13, 0x00, 0x00 +.byte 0xfd, 0x16, 0xc4, 0x19, 0xc4, 0x19, 0x00, 0x00 +.byte 0x26, 0x15, 0x6a, 0x20, 0x6a, 0x20, 0x00, 0x00 +.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SilentChasm_7F_Pokemon +SilentChasm_7F_Pokemon: +.byte 0x2c, 0x14, 0x8c, 0x02, 0x8c, 0x02, 0x00, 0x00 +.byte 0x2e, 0x16, 0xf2, 0x05, 0xf2, 0x05, 0x00, 0x00 +.byte 0x3c, 0x14, 0x7e, 0x08, 0x7e, 0x08, 0x00, 0x00 +.byte 0xa7, 0x16, 0x96, 0x0d, 0x96, 0x0d, 0x00, 0x00 +.byte 0xc1, 0x14, 0xaf, 0x12, 0xaf, 0x12, 0x00, 0x00 +.byte 0xfd, 0x16, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00 +.byte 0x26, 0x15, 0x45, 0x20, 0x45, 0x20, 0x00, 0x00 +.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SilentChasm_8F_Pokemon +SilentChasm_8F_Pokemon: +.byte 0x2c, 0x14, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00 +.byte 0x2e, 0x16, 0x1d, 0x09, 0x1d, 0x09, 0x00, 0x00 +.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 +.byte 0xa7, 0x16, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00 +.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 +.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SilentChasm_9F_Pokemon +SilentChasm_9F_Pokemon: +.byte 0x0f, 0x14, 0xbc, 0x06, 0xbc, 0x06, 0x00, 0x00 +.byte 0x2c, 0x14, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00 +.byte 0x2e, 0x16, 0x2a, 0x10, 0x2a, 0x10, 0x00, 0x00 +.byte 0x3c, 0x14, 0x34, 0x14, 0x34, 0x14, 0x00, 0x00 +.byte 0xa7, 0x16, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00 +.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/SinisterWoods/pokemon_found.inc b/data/dungeon/SinisterWoods/pokemon_found.inc new file mode 100644 index 0000000..a31fbad --- /dev/null +++ b/data/dungeon/SinisterWoods/pokemon_found.inc @@ -0,0 +1,126 @@ +.global SinisterWoods_1F_Pokemon +SinisterWoods_1F_Pokemon: +.byte 0x2b, 0x0e, 0x2b, 0x06, 0x2b, 0x06, 0x00, 0x00 +.byte 0xb9, 0x0e, 0x9d, 0x16, 0x9d, 0x16, 0x00, 0x00 +.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_2F_Pokemon +SinisterWoods_2F_Pokemon: +.byte 0x2b, 0x0e, 0x54, 0x05, 0x54, 0x05, 0x00, 0x00 +.byte 0xb9, 0x0e, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0xc0, 0x10, 0xdc, 0x18, 0xdc, 0x18, 0x00, 0x00 +.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_3F_Pokemon +SinisterWoods_3F_Pokemon: +.byte 0x2b, 0x0e, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00 +.byte 0xa1, 0x0c, 0x53, 0x0e, 0x53, 0x0e, 0x00, 0x00 +.byte 0xb9, 0x0e, 0xbd, 0x18, 0xbd, 0x18, 0x00, 0x00 +.byte 0xc0, 0x10, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 +.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_4F_Pokemon +SinisterWoods_4F_Pokemon: +.byte 0x2b, 0x0e, 0xa9, 0x03, 0xa9, 0x03, 0x00, 0x00 +.byte 0xa1, 0x0c, 0x6d, 0x0d, 0x6d, 0x0d, 0x00, 0x00 +.byte 0xb9, 0x0e, 0x31, 0x17, 0x31, 0x17, 0x00, 0x00 +.byte 0xc0, 0x10, 0xdb, 0x1a, 0xdb, 0x1a, 0x00, 0x00 +.byte 0x23, 0x11, 0xf5, 0x20, 0xf5, 0x20, 0x00, 0x00 +.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_5F_Pokemon +SinisterWoods_5F_Pokemon: +.byte 0xa1, 0x0c, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00 +.byte 0xc0, 0x10, 0x76, 0x14, 0x76, 0x14, 0x00, 0x00 +.byte 0x23, 0x11, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00 +.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_6F_Pokemon +SinisterWoods_6F_Pokemon: +.byte 0xa1, 0x0c, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00 +.byte 0xc0, 0x10, 0xd1, 0x0e, 0xd1, 0x0e, 0x00, 0x00 +.byte 0x23, 0x11, 0x8d, 0x15, 0x8d, 0x15, 0x00, 0x00 +.byte 0x25, 0x11, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00 +.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_7F_Pokemon +SinisterWoods_7F_Pokemon: +.byte 0xa5, 0x0e, 0x60, 0x09, 0x60, 0x09, 0x00, 0x00 +.byte 0xc0, 0x10, 0x10, 0x0e, 0x10, 0x0e, 0x00, 0x00 +.byte 0x21, 0x11, 0x90, 0x1a, 0x90, 0x1a, 0x00, 0x00 +.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_8F_9F_Pokemon +SinisterWoods_8F_9F_Pokemon: +.byte 0x7b, 0x14, 0xee, 0x08, 0xee, 0x08, 0x00, 0x00 +.byte 0xa5, 0x0e, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 +.byte 0xc2, 0x14, 0x35, 0x15, 0x35, 0x15, 0x00, 0x00 +.byte 0x21, 0x11, 0x22, 0x1e, 0x22, 0x1e, 0x00, 0x00 +.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_10F_Pokemon +SinisterWoods_10F_Pokemon: +.byte 0x67, 0x10, 0x21, 0x06, 0x21, 0x06, 0x00, 0x00 +.byte 0x7b, 0x14, 0x41, 0x0c, 0x41, 0x0c, 0x00, 0x00 +.byte 0xa3, 0x0c, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00 +.byte 0xa5, 0x0e, 0xfa, 0x16, 0xfa, 0x16, 0x00, 0x00 +.byte 0xc2, 0x14, 0xcf, 0x1a, 0xcf, 0x1a, 0x00, 0x00 +.byte 0x36, 0x13, 0xef, 0x20, 0xef, 0x20, 0x00, 0x00 +.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_11F_Pokemon +SinisterWoods_11F_Pokemon: +.byte 0x67, 0x10, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 +.byte 0x7b, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 +.byte 0xa3, 0x0c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 +.byte 0x36, 0x13, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00 +.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_12F_Pokemon +SinisterWoods_12F_Pokemon: +.byte 0x67, 0x10, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 +.byte 0xa3, 0x0c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0x36, 0x13, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 +.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global SinisterWoods_13F_Pokemon +SinisterWoods_13F_Pokemon: +.byte 0x17, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 +.byte 0x5e, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 +.byte 0x4d, 0x19, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/SnowPath/floor_id.inc b/data/dungeon/SnowPath/floor_id.inc index fe8e0e2..265dc7d 100644 --- a/data/dungeon/SnowPath/floor_id.inc +++ b/data/dungeon/SnowPath/floor_id.inc @@ -1,7 +1,8 @@ .global SnowPathFloorID SnowPathFloorID: -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x65, 0x04, 0x0a, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x66, 0x04, 0x0b, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x67, 0x04, 0x0c, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x68, 0x04, 0x0d, 0x02, 0x0a, 0x00, 0x7d, 0x00, 0x01, 0x00, 0x02, 0x00 -.byte 0x03, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x65, 0x04, 0x0a, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x66, 0x04, 0x0b, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x67, 0x04, 0x0c, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x68, 0x04, 0x0d, 0x02, 0x0a, 0x00, 0x7d, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00 diff --git a/data/dungeon/SolarCave/floor_id.inc b/data/dungeon/SolarCave/floor_id.inc index 475d630..08d7b70 100644 --- a/data/dungeon/SolarCave/floor_id.inc +++ b/data/dungeon/SolarCave/floor_id.inc @@ -1,16 +1,24 @@ .global SolarCaveFloorID SolarCaveFloorID: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x84, 0x03, 0x9c, 0x01, 0x4b, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x85, 0x03, 0x9c, 0x01, 0x4c, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x86, 0x03, 0x9c, 0x01, 0x4d, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x87, 0x03, 0x9d, 0x01, 0x4e, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x88, 0x03, 0x9e, 0x01, 0x4f, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x89, 0x03, 0x9f, 0x01, 0x50, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x8a, 0x03, 0xa0, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x8b, 0x03, 0xa1, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x8c, 0x03, 0xa2, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x8d, 0x03, 0xa3, 0x01, 0x51, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x8e, 0x03, 0xa4, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x8f, 0x03, 0xa5, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x90, 0x03, 0xa6, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x91, 0x03, 0xa6, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x92, 0x03, 0xa7, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x93, 0x03, 0xa8, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x94, 0x03, 0xa9, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00, 0x95, 0x03, 0xaa, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x96, 0x03, 0xaa, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00 -.byte 0x03, 0x00, 0x00, 0x00 +.byte 0x84, 0x03, 0x9c, 0x01, 0x4b, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x85, 0x03, 0x9c, 0x01, 0x4c, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x86, 0x03, 0x9c, 0x01, 0x4d, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x87, 0x03, 0x9d, 0x01, 0x4e, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x88, 0x03, 0x9e, 0x01, 0x4f, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x89, 0x03, 0x9f, 0x01, 0x50, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x8a, 0x03, 0xa0, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x8b, 0x03, 0xa1, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x8c, 0x03, 0xa2, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x8d, 0x03, 0xa3, 0x01, 0x51, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x8e, 0x03, 0xa4, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x8f, 0x03, 0xa5, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x90, 0x03, 0xa6, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x91, 0x03, 0xa6, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x92, 0x03, 0xa7, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x93, 0x03, 0xa8, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x94, 0x03, 0xa9, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x95, 0x03, 0xaa, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 +.byte 0x96, 0x03, 0xaa, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0x97, 0x03, 0xaa, 0x01, 0x54, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00 diff --git a/data/dungeon/SouthernCavern/floor_id.inc b/data/dungeon/SouthernCavern/floor_id.inc index 4729657..103b6f9 100644 --- a/data/dungeon/SouthernCavern/floor_id.inc +++ b/data/dungeon/SouthernCavern/floor_id.inc @@ -1,32 +1,54 @@ .global SouthernCavernFloorID SouthernCavernFloorID: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xf8, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00 -.byte 0xf9, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0xfa, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0xfb, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0xfc, 0x02, 0x5a, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0xfd, 0x02, 0x5a, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x5b, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0xff, 0x02, 0x5c, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x00, 0x03, 0x5c, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x01, 0x03, 0x5d, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x02, 0x03, 0x5e, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x03, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x04, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x05, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x06, 0x03, 0x60, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x07, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x08, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x09, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x0a, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x0b, 0x03, 0x62, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x63, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x0d, 0x03, 0x63, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x0e, 0x03, 0x64, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x0f, 0x03, 0x64, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x10, 0x03, 0x65, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x11, 0x03, 0x66, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x12, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x13, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x14, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x15, 0x03, 0x67, 0x01, 0x43, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x16, 0x03, 0x68, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x17, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x18, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x19, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x1a, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x1b, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x1c, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x1d, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x1e, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x1f, 0x03, 0x6b, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x20, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x21, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x22, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x23, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x24, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x25, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x26, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00, 0x27, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x28, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5f, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x39, 0x00, 0x00, 0x00 +.byte 0xf8, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0xf9, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0xfa, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0xfb, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0xfc, 0x02, 0x5a, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0xfd, 0x02, 0x5a, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0xfe, 0x02, 0x5b, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0xff, 0x02, 0x5c, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x00, 0x03, 0x5c, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x01, 0x03, 0x5d, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x02, 0x03, 0x5e, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x03, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x04, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x05, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x06, 0x03, 0x60, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x07, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x08, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x09, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x0a, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x0b, 0x03, 0x62, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x0c, 0x03, 0x63, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x0d, 0x03, 0x63, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x0e, 0x03, 0x64, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x0f, 0x03, 0x64, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x10, 0x03, 0x65, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x11, 0x03, 0x66, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x12, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x13, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x14, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x15, 0x03, 0x67, 0x01, 0x43, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x16, 0x03, 0x68, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x17, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x18, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x19, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x1a, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x1b, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x1c, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x1d, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x1e, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x1f, 0x03, 0x6b, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x20, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x21, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x22, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x23, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x24, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x25, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x26, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x27, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 +.byte 0x28, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5f, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 .byte 0x29, 0x03, 0x6d, 0x01, 0x46, 0x00, 0x5f, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00 diff --git a/data/dungeon/ThunderwaveCave/pokemon_found.inc b/data/dungeon/ThunderwaveCave/pokemon_found.inc new file mode 100644 index 0000000..007e8a0 --- /dev/null +++ b/data/dungeon/ThunderwaveCave/pokemon_found.inc @@ -0,0 +1,28 @@ +.global ThunderwaveCave_1F_2F_Pokemon +ThunderwaveCave_1F_2F_Pokemon: +.byte 0x13, 0x06, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 +.byte 0x1d, 0x08, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 +.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global ThunderwaveCave_3F_Pokemon +ThunderwaveCave_3F_Pokemon: +.byte 0x13, 0x06, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00 +.byte 0x1d, 0x08, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00 +.byte 0x64, 0x06, 0xed, 0x1e, 0xed, 0x1e, 0x00, 0x00 +.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global ThunderwaveCave_4F_5F_Pokemon +ThunderwaveCave_4F_5F_Pokemon: +.byte 0x64, 0x06, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00 +.byte 0x08, 0x09, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00 +.byte 0x50, 0x07, 0x0e, 0x21, 0x0e, 0x21, 0x00, 0x00 +.byte 0x51, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/TinyWoods/pokemon_found.inc b/data/dungeon/TinyWoods/pokemon_found.inc new file mode 100644 index 0000000..9a5b566 --- /dev/null +++ b/data/dungeon/TinyWoods/pokemon_found.inc @@ -0,0 +1,18 @@ +.global TinyWoods1F_2FPokemon +TinyWoods1F_2F_Pokemon: +.byte 0x10, 0x02, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 +.byte 0xbf, 0x02, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 +.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global TinyWoods3FPokemon +TinyWoods3F_Pokemon: +.byte 0x10, 0x02, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00 +.byte 0x66, 0x02, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00 +.byte 0xbf, 0x02, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00 +.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/WyvernHill/floor_id.inc b/data/dungeon/WyvernHill/floor_id.inc index bb60244..6f2b2d9 100644 --- a/data/dungeon/WyvernHill/floor_id.inc +++ b/data/dungeon/WyvernHill/floor_id.inc @@ -1,20 +1,34 @@ .global WyvernHillFloorID WyvernHillFloorID: .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x2a, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x2b, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x2c, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x2d, 0x03, 0x6f, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x2e, 0x03, 0x70, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x2f, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x30, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x31, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x32, 0x03, 0x72, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x33, 0x03, 0x73, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x34, 0x03, 0x73, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x35, 0x03, 0x74, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x36, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x37, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x38, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x39, 0x03, 0x76, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x3a, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x3b, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x3d, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x3e, 0x03, 0x78, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x3f, 0x03, 0x79, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x40, 0x03, 0x79, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x41, 0x03, 0x7a, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x42, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x43, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x44, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x45, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00 -.byte 0x42, 0x00, 0x00, 0x00, 0x46, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x61, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x2a, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x2b, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x2c, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x2d, 0x03, 0x6f, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x2e, 0x03, 0x70, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x2f, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x30, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x31, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x32, 0x03, 0x72, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x33, 0x03, 0x73, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x34, 0x03, 0x73, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x35, 0x03, 0x74, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x36, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x37, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x38, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x39, 0x03, 0x76, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x3a, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x3b, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x3c, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x3d, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x3e, 0x03, 0x78, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x3f, 0x03, 0x79, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x40, 0x03, 0x79, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x41, 0x03, 0x7a, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x42, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x43, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x44, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x45, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 +.byte 0x46, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x61, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 .byte 0x47, 0x03, 0x7c, 0x01, 0x47, 0x00, 0x61, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00 diff --git a/data/dungeon/banfont.inc b/data/dungeon/banfont.inc index d806881..0a87029 100644 --- a/data/dungeon/banfont.inc +++ b/data/dungeon/banfont.inc @@ -1,7 +1,11 @@ .global banfont_SIRO banfont_SIRO: -.byte 0x53, 0x49, 0x52, 0x4f, 0x98, 0xbb, 0x49, 0x08, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0 +.string "SIRO" +.4byte banfont_table +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 + +.byte 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0 .byte 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0 .byte 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xa0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0 .byte 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xd0, 0x45, 0xfa, 0x0f, 0x0f, 0x0e, 0x02 @@ -282,4 +286,9 @@ banfont_SIRO: .byte 0x4a, 0xb2, 0x49, 0x08, 0x6b, 0x00, 0x0a, 0x00, 0xce, 0xb2, 0x49, 0x08, 0x6c, 0x00, 0x04, 0x00, 0x37, 0xb3, 0x49, 0x08, 0x6d, 0x00, 0x0f, 0x00, 0xbc, 0xb3, 0x49, 0x08, 0x6e, 0x00, 0x09, 0x00 .byte 0x35, 0xb4, 0x49, 0x08, 0x6f, 0x00, 0x0a, 0x00, 0xb0, 0xb4, 0x49, 0x08, 0x70, 0x00, 0x0a, 0x00, 0x36, 0xb5, 0x49, 0x08, 0x72, 0x00, 0x09, 0x00, 0x9f, 0xb5, 0x49, 0x08, 0x73, 0x00, 0x0a, 0x00 .byte 0x1b, 0xb6, 0x49, 0x08, 0x74, 0x00, 0x0b, 0x00, 0x91, 0xb6, 0x49, 0x08, 0x75, 0x00, 0x0a, 0x00, 0x08, 0xb7, 0x49, 0x08, 0x76, 0x00, 0x0a, 0x00, 0x82, 0xb7, 0x49, 0x08, 0x77, 0x00, 0x0d, 0x00 -.byte 0x09, 0xb8, 0x49, 0x08, 0x78, 0x00, 0x0a, 0x00, 0x87, 0xb8, 0x49, 0x08, 0x79, 0x00, 0x0a, 0x00, 0x0b, 0xb9, 0x49, 0x08, 0x7a, 0x00, 0x0a, 0x00, 0x80, 0xb9, 0x49, 0x08, 0x43, 0x00, 0x00, 0x00 +.byte 0x09, 0xb8, 0x49, 0x08, 0x78, 0x00, 0x0a, 0x00, 0x87, 0xb8, 0x49, 0x08, 0x79, 0x00, 0x0a, 0x00, 0x0b, 0xb9, 0x49, 0x08, 0x7a, 0x00, 0x0a, 0x00 + +.global banfont_table +banfont_table: +.byte 0x80, 0xb9, 0x49, 0x08 +.byte 0x43, 0x00, 0x00, 0x00 diff --git a/data/dungeon/colvec.inc b/data/dungeon/colvec.inc index a2ee60f..dc68d7f 100644 --- a/data/dungeon/colvec.inc +++ b/data/dungeon/colvec.inc @@ -1,6 +1,13 @@ .global colvec_SIRO colvec_SIRO: -.byte 0x53, 0x49, 0x52, 0x4f, 0xf0, 0xbb, 0x49, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff +.string "SIRO" +.4byte colvec +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 + +.global colvec +colvec: +.byte 0x00, 0x00, 0x00, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff .byte 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff .byte 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff .byte 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x1f, 0x1f, 0x1f, 0xff, 0x1f, 0x1f, 0x1f, 0xff, 0x1f, 0x1f, 0x1f, 0xff, 0x1f, 0x1f, 0x1f, 0xff diff --git a/data/dungeon/etcfonta.inc b/data/dungeon/etcfonta.inc index 4ce9eb0..725c946 100644 --- a/data/dungeon/etcfonta.inc +++ b/data/dungeon/etcfonta.inc @@ -1,7 +1,13 @@ .global etcfonta_SIRO etcfonta_SIRO: -.byte 0x53, 0x49, 0x52, 0x4f, 0x44, 0xe2, 0x49, 0x08, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x09, 0x00, 0x90, 0xa9, 0x99, 0x09, 0x90, 0xa9, 0x99, 0x09, 0x00, 0x90, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00 +.string "SIRO" +.4byte etcfonta +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 + +.global etcfonta +etcfonta: +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x09, 0x00, 0x90, 0xa9, 0x99, 0x09, 0x90, 0xa9, 0x99, 0x09, 0x00, 0x90, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x90, 0xaa, 0x99, 0x90, 0x99, 0xaa, 0x99, 0x90, 0x99, 0xaa, 0x99, 0x00, 0x90, 0xaa, 0x99, 0x00, 0x00, 0x00, 0x90 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x99, 0x99, 0x09, 0x00, 0x99, 0x99, 0x99, 0x09, 0x99, 0x99, 0x99, 0x09, 0x99, 0x99, 0x09, 0x00, 0x09, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0a, 0x00 diff --git a/data/dungeon/itempat.inc b/data/dungeon/itempat.inc index d2efab8..dc8ba95 100644 --- a/data/dungeon/itempat.inc +++ b/data/dungeon/itempat.inc @@ -1,7 +1,12 @@ .global itempat_SIRO itempat_SIRO: .string "SIRO" -.byte 0x04, 0x14, 0x4a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.4byte itempat_table +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 + +.global itempat +itempat: .byte 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x91, 0x01, 0x00, 0x00, 0x10, 0x19, 0x00, 0x00, 0x10, 0x89, 0x01, 0x00, 0x00, 0xa1, 0x18 .byte 0x00, 0x00, 0x81, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa9, 0x00, 0x00, 0x10, 0xa8, 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00 @@ -98,4 +103,9 @@ itempat_SIRO: .byte 0x10, 0x34, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x11, 0xf3, 0x01, 0x00, 0x1f, 0x43, 0x1f, 0x00, 0x43, 0x38, 0x14, 0x00, 0xff, 0x98, 0x43, 0x01, 0xff, 0x81, 0x14, 0x00 .byte 0x43, 0x11, 0x01, 0x00, 0x00, 0xf1, 0xf3, 0x3f, 0x00, 0x10, 0xf4, 0x4f, 0x00, 0xd1, 0x18, 0x11, 0x00, 0x10, 0xda, 0x18, 0x00, 0x00, 0x11, 0x8a, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x1f, 0x98, 0x19, 0x00, 0x81, 0x8a, 0x01, 0x00, 0x91, 0x11, 0x01, 0x00, 0x1d, 0x98, 0x1a, 0x00, 0x89, 0x19, 0x01, 0x00, 0x18, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x4a, 0x08, 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 + +.global itempat_table +itempat_table: +.4byte itempat +.byte 0x00, 0x00, 0x00, 0x00 diff --git a/data/dungeon/jyochu.inc b/data/dungeon/jyochu.inc index a688d43..84c2e96 100644 --- a/data/dungeon/jyochu.inc +++ b/data/dungeon/jyochu.inc @@ -1,7 +1,11 @@ .global jyochu_SIRO jyochu_SIRO: .string "SIRO" -.byte 0x44, 0x1f, 0x4a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00 +.4byte jyochu_table +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 + +.byte 0xff, 0xff, 0x00, 0x00 .byte 0xf0, 0x01, 0xf0, 0x80, 0x00, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xf0, 0x01, 0xf0, 0x80, 0x10, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xf0, 0x01, 0xf0, 0x80, 0x20, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xf0, 0x01, 0xf0, 0x80 .byte 0x30, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xf0, 0x01, 0xf0, 0x80, 0x40, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff @@ -91,6 +95,10 @@ jyochu_SIRO: .byte 0xa7, 0x6f, 0x00, 0x80, 0xdf, 0xb7, 0x00, 0x80, 0xff, 0xf7, 0x00, 0x80, 0x00, 0x67, 0xb7, 0x80, 0x1f, 0x9f, 0xe7, 0x80, 0x9f, 0xe7, 0xff, 0x80, 0x9f, 0x00, 0x00, 0x80, 0xd7, 0x3f, 0x00, 0x80 .byte 0xff, 0x87, 0x5f, 0x80, 0xff, 0x87, 0xbf, 0x80, 0xff, 0xff, 0xff, 0x80, 0x1c, 0x14, 0x4a, 0x08, 0x30, 0x14, 0x4a, 0x08, 0x44, 0x14, 0x4a, 0x08, 0x58, 0x14, 0x4a, 0x08, 0x6c, 0x14, 0x4a, 0x08 .byte 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08 -.byte 0x20, 0x1f, 0x4a, 0x08, 0x0c, 0x1f, 0x4a, 0x08, 0x40, 0x1f, 0x4a, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x14, 0x4a, 0x08, 0xcc, 0x1e, 0x4a, 0x08 +.byte 0x20, 0x1f, 0x4a, 0x08 + +.global jyochu_table +jyochu_table: +.byte 0x0c, 0x1f, 0x4a, 0x08, 0x40, 0x1f, 0x4a, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x14, 0x4a, 0x08, 0xcc, 0x1e, 0x4a, 0x08 .byte 0x50, 0x00, 0x00, 0x00 diff --git a/data/dungeon/levfont.inc b/data/dungeon/levfont.inc index ab6358c..2fc24d6 100644 --- a/data/dungeon/levfont.inc +++ b/data/dungeon/levfont.inc @@ -1,7 +1,13 @@ .global levfont_SIRO levfont_SIRO: .string "SIRO" -.byte 0x74, 0x1f, 0x4a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.4byte levfont +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 + +.global levfont +levfont: +.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x01, 0x11, 0x11, 0x11, 0x11, 0x11, 0x61, 0x16, 0x11 .byte 0x11, 0x46, 0x64, 0x11, 0x11, 0x46, 0x64, 0x11, 0x11, 0x61, 0x16, 0x11, 0x11, 0x11, 0x11, 0x11, 0x10, 0x11, 0x11, 0x01, 0x10, 0xfc, 0xcf, 0x01, 0x11, 0x1f, 0xf1, 0x11, 0x11, 0x11, 0xf1, 0x11 .byte 0x11, 0x11, 0xcf, 0x11, 0x11, 0xf1, 0x1c, 0x11, 0x11, 0xcf, 0x11, 0x11, 0x11, 0xff, 0xff, 0x11, 0x50, 0x55, 0x55, 0x05, 0x10, 0xfc, 0xcf, 0x01, 0x11, 0x1f, 0xf1, 0x11, 0x11, 0x11, 0xf1, 0x11 diff --git a/data/dungeon/pokemon_found.inc b/data/dungeon/pokemon_found.inc index e780b9a..9b5508b 100644 --- a/data/dungeon/pokemon_found.inc +++ b/data/dungeon/pokemon_found.inc @@ -1,398 +1,40 @@ @ Start of Pokemon Found (0x84b6064) -.byte 0x10, 0x02, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xbf, 0x02, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x10, 0x02, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00 -.byte 0x66, 0x02, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00 -.byte 0xbf, 0x02, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00 -.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x13, 0x06, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x1d, 0x08, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 -.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x13, 0x06, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00 -.byte 0x1d, 0x08, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00 -.byte 0x64, 0x06, 0xed, 0x1e, 0xed, 0x1e, 0x00, 0x00 -.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x64, 0x06, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00 -.byte 0x08, 0x09, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00 -.byte 0x50, 0x07, 0x0e, 0x21, 0x0e, 0x21, 0x00, 0x00 -.byte 0x51, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x15, 0x08, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00 -.byte 0x20, 0x0b, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00 -.byte 0x49, 0x0d, 0xdf, 0x1d, 0xdf, 0x1d, 0x00, 0x00 -.byte 0x70, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x4a, 0x0a, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00 -.byte 0x05, 0x0d, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00 -.byte 0x20, 0x0b, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00 -.byte 0x49, 0x0d, 0x9f, 0x1f, 0x9f, 0x1f, 0x00, 0x00 -.byte 0x4c, 0x0d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x4a, 0x0a, 0x03, 0x08, 0x03, 0x08, 0x00, 0x00 -.byte 0x05, 0x0d, 0x07, 0x10, 0x07, 0x10, 0x00, 0x00 -.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x4c, 0x0d, 0x0e, 0x22, 0x0e, 0x22, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x4a, 0x0a, 0x61, 0x06, 0x61, 0x06, 0x00, 0x00 -.byte 0x7f, 0x0c, 0x59, 0x0e, 0x59, 0x0e, 0x00, 0x00 -.byte 0x05, 0x0d, 0xba, 0x14, 0xba, 0x14, 0x00, 0x00 -.byte 0x49, 0x0d, 0xb3, 0x1c, 0xb3, 0x1c, 0x00, 0x00 -.byte 0x4c, 0x0d, 0x14, 0x23, 0x14, 0x23, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x32, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xfc, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x2b, 0x0e, 0x2b, 0x06, 0x2b, 0x06, 0x00, 0x00 -.byte 0xb9, 0x0e, 0x9d, 0x16, 0x9d, 0x16, 0x00, 0x00 -.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x2b, 0x0e, 0x54, 0x05, 0x54, 0x05, 0x00, 0x00 -.byte 0xb9, 0x0e, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0xc0, 0x10, 0xdc, 0x18, 0xdc, 0x18, 0x00, 0x00 -.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x2b, 0x0e, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00 -.byte 0xa1, 0x0c, 0x53, 0x0e, 0x53, 0x0e, 0x00, 0x00 -.byte 0xb9, 0x0e, 0xbd, 0x18, 0xbd, 0x18, 0x00, 0x00 -.byte 0xc0, 0x10, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 -.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x2b, 0x0e, 0xa9, 0x03, 0xa9, 0x03, 0x00, 0x00 -.byte 0xa1, 0x0c, 0x6d, 0x0d, 0x6d, 0x0d, 0x00, 0x00 -.byte 0xb9, 0x0e, 0x31, 0x17, 0x31, 0x17, 0x00, 0x00 -.byte 0xc0, 0x10, 0xdb, 0x1a, 0xdb, 0x1a, 0x00, 0x00 -.byte 0x23, 0x11, 0xf5, 0x20, 0xf5, 0x20, 0x00, 0x00 -.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0xa1, 0x0c, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00 -.byte 0xc0, 0x10, 0x76, 0x14, 0x76, 0x14, 0x00, 0x00 -.byte 0x23, 0x11, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00 -.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0xa1, 0x0c, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00 -.byte 0xc0, 0x10, 0xd1, 0x0e, 0xd1, 0x0e, 0x00, 0x00 -.byte 0x23, 0x11, 0x8d, 0x15, 0x8d, 0x15, 0x00, 0x00 -.byte 0x25, 0x11, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00 -.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0xa5, 0x0e, 0x60, 0x09, 0x60, 0x09, 0x00, 0x00 -.byte 0xc0, 0x10, 0x10, 0x0e, 0x10, 0x0e, 0x00, 0x00 -.byte 0x21, 0x11, 0x90, 0x1a, 0x90, 0x1a, 0x00, 0x00 -.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x7b, 0x14, 0xee, 0x08, 0xee, 0x08, 0x00, 0x00 -.byte 0xa5, 0x0e, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0xc2, 0x14, 0x35, 0x15, 0x35, 0x15, 0x00, 0x00 -.byte 0x21, 0x11, 0x22, 0x1e, 0x22, 0x1e, 0x00, 0x00 -.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x67, 0x10, 0x21, 0x06, 0x21, 0x06, 0x00, 0x00 -.byte 0x7b, 0x14, 0x41, 0x0c, 0x41, 0x0c, 0x00, 0x00 -.byte 0xa3, 0x0c, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00 -.byte 0xa5, 0x0e, 0xfa, 0x16, 0xfa, 0x16, 0x00, 0x00 -.byte 0xc2, 0x14, 0xcf, 0x1a, 0xcf, 0x1a, 0x00, 0x00 -.byte 0x36, 0x13, 0xef, 0x20, 0xef, 0x20, 0x00, 0x00 -.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.include "data/dungeon/TinyWoods/pokemon_found.inc" +.include "data/dungeon/ThunderwaveCave/pokemon_found.inc" +.include "data/dungeon/MtSteel/pokemon_found.inc" +.include "data/dungeon/SinisterWoods/pokemon_found.inc" +.include "data/dungeon/SilentChasm/pokemon_found.inc" +.include "data/dungeon/MtThunder/pokemon_found.inc" +.include "data/dungeon/MtThunderPeak/pokemon_found.inc" +.include "data/dungeon/GreatCanyon/pokemon_found.inc" +.include "data/dungeon/LapisCave/pokemon_found.inc" -.byte 0x67, 0x10, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 -.byte 0x7b, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0xa3, 0x0c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 -.byte 0x36, 0x13, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00 -.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x67, 0x10, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 -.byte 0xa3, 0x0c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x36, 0x13, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 -.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0x12, 0x20, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00 +.byte 0xf3, 0x20, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00 +.byte 0x09, 0x23, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00 +.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 .byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x17, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0x5e, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00 -.byte 0x4d, 0x19, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0xf3, 0x20, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 +.byte 0x09, 0x23, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 +.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 .byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x0d, 0x10, 0x83, 0x06, 0x83, 0x06, 0x00, 0x00 -.byte 0x2c, 0x14, 0x6b, 0x0a, 0x6b, 0x0a, 0x00, 0x00 -.byte 0x53, 0x14, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00 -.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 -.byte 0xf1, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 +.byte 0xee, 0x1e, 0x18, 0x05, 0x18, 0x05, 0x00, 0x00 +.byte 0xf3, 0x20, 0xe3, 0x0b, 0xe3, 0x0b, 0x00, 0x00 +.byte 0x09, 0x23, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00 +.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 .byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x0d, 0x10, 0xda, 0x0a, 0xda, 0x0a, 0x00, 0x00 -.byte 0x2c, 0x14, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00 -.byte 0xc1, 0x14, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00 -.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x0d, 0x10, 0xeb, 0x05, 0xeb, 0x05, 0x00, 0x00 -.byte 0x2c, 0x14, 0x78, 0x09, 0x78, 0x09, 0x00, 0x00 -.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xc1, 0x14, 0x20, 0x14, 0x20, 0x14, 0x00, 0x00 -.byte 0xfd, 0x16, 0x98, 0x1d, 0x98, 0x1d, 0x00, 0x00 -.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x0d, 0x10, 0x28, 0x04, 0x28, 0x04, 0x00, 0x00 -.byte 0x2c, 0x14, 0xa6, 0x06, 0xa6, 0x06, 0x00, 0x00 -.byte 0x3c, 0x14, 0x24, 0x09, 0x24, 0x09, 0x00, 0x00 -.byte 0xa7, 0x16, 0x21, 0x0e, 0x21, 0x0e, 0x00, 0x00 -.byte 0xc1, 0x14, 0x1e, 0x13, 0x1e, 0x13, 0x00, 0x00 -.byte 0xfd, 0x16, 0xc4, 0x19, 0xc4, 0x19, 0x00, 0x00 -.byte 0x26, 0x15, 0x6a, 0x20, 0x6a, 0x20, 0x00, 0x00 -.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x2c, 0x14, 0x8c, 0x02, 0x8c, 0x02, 0x00, 0x00 -.byte 0x2e, 0x16, 0xf2, 0x05, 0xf2, 0x05, 0x00, 0x00 -.byte 0x3c, 0x14, 0x7e, 0x08, 0x7e, 0x08, 0x00, 0x00 -.byte 0xa7, 0x16, 0x96, 0x0d, 0x96, 0x0d, 0x00, 0x00 -.byte 0xc1, 0x14, 0xaf, 0x12, 0xaf, 0x12, 0x00, 0x00 -.byte 0xfd, 0x16, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00 -.byte 0x26, 0x15, 0x45, 0x20, 0x45, 0x20, 0x00, 0x00 -.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x2c, 0x14, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00 -.byte 0x2e, 0x16, 0x1d, 0x09, 0x1d, 0x09, 0x00, 0x00 -.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xa7, 0x16, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00 -.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 -.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x0f, 0x14, 0xbc, 0x06, 0xbc, 0x06, 0x00, 0x00 -.byte 0x2c, 0x14, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00 -.byte 0x2e, 0x16, 0x2a, 0x10, 0x2a, 0x10, 0x00, 0x00 -.byte 0x3c, 0x14, 0x34, 0x14, 0x34, 0x14, 0x00, 0x00 -.byte 0xa7, 0x16, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00 -.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x0d, 0x10, 0x53, 0x07, 0x53, 0x07, 0x00, 0x00 -.byte 0x20, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x4e, 0x19, 0xbd, 0x1f, 0xbd, 0x1f, 0x00, 0x00 -.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x0d, 0x10, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00 -.byte 0x11, 0x16, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00 -.byte 0x20, 0x18, 0x2e, 0x18, 0x2e, 0x18, 0x00, 0x00 -.byte 0x4e, 0x19, 0x7b, 0x21, 0x7b, 0x21, 0x00, 0x00 -.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x0f, 0x14, 0x35, 0x05, 0x35, 0x05, 0x00, 0x00 -.byte 0x11, 0x16, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00 -.byte 0x7d, 0x18, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00 -.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x0f, 0x14, 0x02, 0x06, 0x02, 0x06, 0x00, 0x00 -.byte 0x7d, 0x18, 0x07, 0x12, 0x07, 0x12, 0x00, 0x00 -.byte 0xb5, 0x18, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00 -.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x0f, 0x14, 0x57, 0x04, 0x57, 0x04, 0x00, 0x00 -.byte 0x7d, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xb5, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0xe8, 0x18, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00 -.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x0f, 0x14, 0x66, 0x03, 0x66, 0x03, 0x00, 0x00 -.byte 0x7d, 0x18, 0x31, 0x0a, 0x31, 0x0a, 0x00, 0x00 -.byte 0xb5, 0x18, 0x49, 0x0f, 0x49, 0x0f, 0x00, 0x00 -.byte 0xe8, 0x18, 0xc7, 0x17, 0xc7, 0x17, 0x00, 0x00 -.byte 0x03, 0x13, 0x92, 0x1e, 0x92, 0x1e, 0x00, 0x00 -.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x3a, 0x14, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00 -.byte 0xb5, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00 -.byte 0xe8, 0x18, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00 -.byte 0x03, 0x13, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00 -.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x3a, 0x14, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00 -.byte 0xb5, 0x18, 0x16, 0x10, 0x16, 0x10, 0x00, 0x00 -.byte 0xe8, 0x18, 0x93, 0x1b, 0x93, 0x1b, 0x00, 0x00 -.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x3a, 0x14, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 -.byte 0x7d, 0x18, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0xb5, 0x18, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 -.byte 0xe8, 0x18, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00 -.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x91, 0x32, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x54, 0x1c, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00 -.byte 0xbc, 0x1a, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00 -.byte 0xe7, 0x1a, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00 -.byte 0x00, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 - -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x2d, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0x54, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 -.byte 0x37, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x2d, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00 -.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00 -.byte 0x37, 0x1d, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00 -.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0x2d, 0x1c, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00 -.byte 0xa4, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00 -.byte 0xc6, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00 -.byte 0x37, 0x1d, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00 -.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00 -.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00, 0x65, 0x1d, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x1c, 0xc4, 0x09 -.byte 0xc4, 0x09, 0x00, 0x00, 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00, 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0xef, 0x1c, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1e, 0x05, 0x0c -.byte 0x05, 0x0c, 0x00, 0x00, 0xa8, 0x1c, 0x0a, 0x18, 0x0a, 0x18, 0x00, 0x00, 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1e, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00, 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x22, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x3b, 0x1d, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1e, 0x05, 0x0d -.byte 0x05, 0x0d, 0x00, 0x00, 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x53, 0x1f, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0x1c, 0x88, 0x13 -.byte 0x88, 0x13, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x2a, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x72, 0x1c, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8f, 0x21, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x14, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x14, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20, 0x29, 0x0b -.byte 0x29, 0x0b, 0x00, 0x00, 0xf3, 0x20, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00, 0x09, 0x23, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x20, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0x09, 0x23, 0x70, 0x17 -.byte 0x70, 0x17, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 -.byte 0x00, 0x00, 0x00, 0x00, 0xee, 0x1e, 0x18, 0x05, 0x18, 0x05, 0x00, 0x00, 0xf3, 0x20, 0xe3, 0x0b, 0xe3, 0x0b, 0x00, 0x00, 0x09, 0x23, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27 -.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x1e, 0xd0, 0x07 +.byte 0xee, 0x1e, 0xd0, 0x07 .byte 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x1e, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27 .byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x14, 0x96, 0x0d @@ -1919,19 +1561,104 @@ .global DungeonPokemonFoundTable DungeonPokemonFoundTable: -.byte 0x64, 0x60, 0x4b, 0x08 -.byte 0x94, 0x60, 0x4b, 0x08, 0xcc, 0x60, 0x4b, 0x08, 0xfc, 0x60, 0x4b, 0x08, 0x34, 0x61, 0x4b, 0x08, 0x6c, 0x61, 0x4b, 0x08, 0xa4, 0x61, 0x4b, 0x08, 0xe4, 0x61, 0x4b, 0x08, 0x24, 0x62, 0x4b, 0x08 -.byte 0x6c, 0x62, 0x4b, 0x08, 0xa4, 0x62, 0x4b, 0x08, 0xd4, 0x62, 0x4b, 0x08, 0x0c, 0x63, 0x4b, 0x08, 0x4c, 0x63, 0x4b, 0x08, 0x94, 0x63, 0x4b, 0x08, 0xcc, 0x63, 0x4b, 0x08, 0x0c, 0x64, 0x4b, 0x08 -.byte 0x44, 0x64, 0x4b, 0x08, 0x84, 0x64, 0x4b, 0x08, 0xd4, 0x64, 0x4b, 0x08, 0x14, 0x65, 0x4b, 0x08, 0x4c, 0x65, 0x4b, 0x08, 0x7c, 0x65, 0x4b, 0x08, 0xbc, 0x65, 0x4b, 0x08, 0xf4, 0x65, 0x4b, 0x08 -.byte 0x3c, 0x66, 0x4b, 0x08, 0x94, 0x66, 0x4b, 0x08, 0xec, 0x66, 0x4b, 0x08, 0x34, 0x67, 0x4b, 0x08, 0x7c, 0x67, 0x4b, 0x08, 0xb4, 0x67, 0x4b, 0x08, 0xf4, 0x67, 0x4b, 0x08, 0x2c, 0x68, 0x4b, 0x08 -.byte 0x64, 0x68, 0x4b, 0x08, 0xa4, 0x68, 0x4b, 0x08, 0xec, 0x68, 0x4b, 0x08, 0x2c, 0x69, 0x4b, 0x08, 0x64, 0x69, 0x4b, 0x08, 0xa4, 0x69, 0x4b, 0x08, 0xc4, 0x69, 0x4b, 0x08, 0xfc, 0x69, 0x4b, 0x08 -.byte 0x2c, 0x6a, 0x4b, 0x08, 0x64, 0x6a, 0x4b, 0x08, 0xa4, 0x6a, 0x4b, 0x08, 0xdc, 0x6a, 0x4b, 0x08, 0x14, 0x6b, 0x4b, 0x08, 0x3c, 0x6b, 0x4b, 0x08, 0x6c, 0x6b, 0x4b, 0x08, 0x94, 0x6b, 0x4b, 0x08 -.byte 0xbc, 0x6b, 0x4b, 0x08, 0xec, 0x6b, 0x4b, 0x08, 0x1c, 0x6c, 0x4b, 0x08, 0x44, 0x6c, 0x4b, 0x08, 0x74, 0x6c, 0x4b, 0x08, 0x9c, 0x6c, 0x4b, 0x08, 0xbc, 0x6c, 0x4b, 0x08, 0xf4, 0x6c, 0x4b, 0x08 -.byte 0x24, 0x6d, 0x4b, 0x08, 0x5c, 0x6d, 0x4b, 0x08, 0x8c, 0x6d, 0x4b, 0x08, 0xbc, 0x6d, 0x4b, 0x08, 0xf4, 0x6d, 0x4b, 0x08, 0x24, 0x6e, 0x4b, 0x08, 0x4c, 0x6e, 0x4b, 0x08, 0x6c, 0x6e, 0x4b, 0x08 -.byte 0x94, 0x6e, 0x4b, 0x08, 0xc4, 0x6e, 0x4b, 0x08, 0xfc, 0x6e, 0x4b, 0x08, 0x2c, 0x6f, 0x4b, 0x08, 0x5c, 0x6f, 0x4b, 0x08, 0x94, 0x6f, 0x4b, 0x08, 0xbc, 0x6f, 0x4b, 0x08, 0xdc, 0x6f, 0x4b, 0x08 -.byte 0x0c, 0x70, 0x4b, 0x08, 0x4c, 0x70, 0x4b, 0x08, 0x7c, 0x70, 0x4b, 0x08, 0xb4, 0x70, 0x4b, 0x08, 0xe4, 0x70, 0x4b, 0x08, 0x14, 0x71, 0x4b, 0x08, 0x3c, 0x71, 0x4b, 0x08, 0x5c, 0x71, 0x4b, 0x08 -.byte 0x94, 0x71, 0x4b, 0x08, 0xcc, 0x71, 0x4b, 0x08, 0xfc, 0x71, 0x4b, 0x08, 0x34, 0x72, 0x4b, 0x08, 0x5c, 0x72, 0x4b, 0x08, 0x94, 0x72, 0x4b, 0x08, 0xd4, 0x72, 0x4b, 0x08, 0x0c, 0x73, 0x4b, 0x08 -.byte 0x3c, 0x73, 0x4b, 0x08, 0x64, 0x73, 0x4b, 0x08, 0x94, 0x73, 0x4b, 0x08, 0xcc, 0x73, 0x4b, 0x08, 0xf4, 0x73, 0x4b, 0x08, 0x14, 0x74, 0x4b, 0x08, 0x3c, 0x74, 0x4b, 0x08, 0x64, 0x74, 0x4b, 0x08 +.4byte TinyWoods1F_2F_Pokemon +.4byte TinyWoods3F_Pokemon +.4byte ThunderwaveCave_1F_2F_Pokemon +.4byte ThunderwaveCave_3F_Pokemon +.4byte ThunderwaveCave_4F_5F_Pokemon +.4byte MtSteel_1F_4F_Pokemon +.4byte MtSteel_5F_Pokemon +.4byte MtSteel_6F_Pokemon +.4byte MtSteel_7F_8F_Pokemon +.4byte MtSteel_9F_Pokemon +.4byte SinisterWoods_1F_Pokemon +.4byte SinisterWoods_2F_Pokemon +.4byte SinisterWoods_3F_Pokemon +.4byte SinisterWoods_4F_Pokemon +.4byte SinisterWoods_5F_Pokemon +.4byte SinisterWoods_6F_Pokemon +.4byte SinisterWoods_7F_Pokemon +.4byte SinisterWoods_8F_9F_Pokemon +.4byte SinisterWoods_10F_Pokemon +.4byte SinisterWoods_11F_Pokemon +.4byte SinisterWoods_12F_Pokemon +.4byte SinisterWoods_13F_Pokemon +.4byte SilentChasm_1F_3F_Pokemon +.4byte SilentChasm_4F_Pokemon +.4byte SilentChasm_5F_Pokemon +.4byte SilentChasm_6F_Pokemon +.4byte SilentChasm_7F_Pokemon +.4byte SilentChasm_8F_Pokemon +.4byte SilentChasm_9F_Pokemon +.4byte MtThunder_1F_Pokemon +.4byte MtThunder_2F_4F_Pokemon +.4byte MtThunder_5F_Pokemon +.4byte MtThunder_6F_Pokemon +.4byte MtThunder_7F_Pokemon +.4byte MtThunder_8F_Pokemon +.4byte MtThunder_9F_Pokemon +.4byte MtThunder_10F_Pokemon +.4byte MtThunderPeak_1F_2F_Pokemon +.4byte MtThunderPeak_3F_Pokemon +.4byte GreatCanyon_1F_3F_Pokemon +.4byte GreatCanyon_4F_Pokemon +.4byte GreatCanyon_5F_Pokemon +.4byte GreatCanyon_6F_Pokemon +.4byte GreatCanyon_7F_Pokemon +.4byte GreatCanyon_8F_Pokemon +.4byte GreatCanyon_9F_Pokemon +.4byte GreatCanyon_10F_11F_Pokemon +.4byte GreatCanyon_12F_Pokemon +.4byte LapisCave_1F_3F_Pokemon +.4byte LapisCave_4F_Pokemon +.4byte LapisCave_5F_8F_Pokemon +.4byte LapisCave_9F_10F_Pokemon +.4byte LapisCave_11F_12F_Pokemon +.4byte LapisCave_13F_Pokemon +.4byte LapisCave_14F_Pokemon + +.byte 0xbc, 0x6c, 0x4b, 0x08 +.byte 0xf4, 0x6c, 0x4b, 0x08 +.byte 0x24, 0x6d, 0x4b, 0x08 +.byte 0x5c, 0x6d, 0x4b, 0x08 +.byte 0x8c, 0x6d, 0x4b, 0x08 +.byte 0xbc, 0x6d, 0x4b, 0x08 +.byte 0xf4, 0x6d, 0x4b, 0x08 +.byte 0x24, 0x6e, 0x4b, 0x08 +.byte 0x4c, 0x6e, 0x4b, 0x08 +.byte 0x6c, 0x6e, 0x4b, 0x08 +.byte 0x94, 0x6e, 0x4b, 0x08 +.byte 0xc4, 0x6e, 0x4b, 0x08 +.byte 0xfc, 0x6e, 0x4b, 0x08 +.byte 0x2c, 0x6f, 0x4b, 0x08 +.byte 0x5c, 0x6f, 0x4b, 0x08 +.byte 0x94, 0x6f, 0x4b, 0x08 +.byte 0xbc, 0x6f, 0x4b, 0x08 +.byte 0xdc, 0x6f, 0x4b, 0x08 +.byte 0x0c, 0x70, 0x4b, 0x08 +.byte 0x4c, 0x70, 0x4b, 0x08 +.byte 0x7c, 0x70, 0x4b, 0x08 +.byte 0xb4, 0x70, 0x4b, 0x08 +.byte 0xe4, 0x70, 0x4b, 0x08 +.byte 0x14, 0x71, 0x4b, 0x08 +.byte 0x3c, 0x71, 0x4b, 0x08 +.byte 0x5c, 0x71, 0x4b, 0x08 +.byte 0x94, 0x71, 0x4b, 0x08 +.byte 0xcc, 0x71, 0x4b, 0x08 +.byte 0xfc, 0x71, 0x4b, 0x08 +.byte 0x34, 0x72, 0x4b, 0x08 +.byte 0x5c, 0x72, 0x4b, 0x08 +.byte 0x94, 0x72, 0x4b, 0x08 +.byte 0xd4, 0x72, 0x4b, 0x08 +.byte 0x0c, 0x73, 0x4b, 0x08 +.byte 0x3c, 0x73, 0x4b, 0x08 +.byte 0x64, 0x73, 0x4b, 0x08 +.byte 0x94, 0x73, 0x4b, 0x08 +.byte 0xcc, 0x73, 0x4b, 0x08 +.byte 0xf4, 0x73, 0x4b, 0x08 +.byte 0x14, 0x74, 0x4b, 0x08 +.byte 0x3c, 0x74, 0x4b, 0x08 +.byte 0x64, 0x74, 0x4b, 0x08 .byte 0x8c, 0x74, 0x4b, 0x08, 0xcc, 0x74, 0x4b, 0x08, 0x04, 0x75, 0x4b, 0x08, 0x34, 0x75, 0x4b, 0x08, 0x64, 0x75, 0x4b, 0x08, 0x9c, 0x75, 0x4b, 0x08, 0xdc, 0x75, 0x4b, 0x08, 0x1c, 0x76, 0x4b, 0x08 .byte 0x5c, 0x76, 0x4b, 0x08, 0x94, 0x76, 0x4b, 0x08, 0xcc, 0x76, 0x4b, 0x08, 0x0c, 0x77, 0x4b, 0x08, 0x4c, 0x77, 0x4b, 0x08, 0x84, 0x77, 0x4b, 0x08, 0xcc, 0x77, 0x4b, 0x08, 0xec, 0x77, 0x4b, 0x08 .byte 0x3c, 0x78, 0x4b, 0x08, 0x7c, 0x78, 0x4b, 0x08, 0xc4, 0x78, 0x4b, 0x08, 0xfc, 0x78, 0x4b, 0x08, 0x44, 0x79, 0x4b, 0x08, 0x8c, 0x79, 0x4b, 0x08, 0xcc, 0x79, 0x4b, 0x08, 0x0c, 0x7a, 0x4b, 0x08 diff --git a/data/dungeon/trappat.inc b/data/dungeon/trappat.inc index d9767bb..1cd295c 100644 --- a/data/dungeon/trappat.inc +++ b/data/dungeon/trappat.inc @@ -1,7 +1,13 @@ .global Trappat_SIRO Trappat_SIRO: .string "SIRO" -.byte 0xa0, 0x45, 0x4f, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x00 +.4byte trappat_table +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 + +.global trappat +trappat: +.byte 0x05, 0x01, 0x00, 0x00 .byte 0x34, 0x33, 0x33, 0x33, 0x45, 0x44, 0x44, 0x44, 0x45, 0x56, 0x44, 0x44, 0x45, 0x45, 0x44, 0x44, 0x45, 0x44, 0x44, 0x44, 0x45, 0x44, 0x44, 0x64, 0x45, 0x44, 0x44, 0x76, 0x45, 0x44, 0x54, 0x76 .byte 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x65, 0x77, 0x67, 0x56, 0x76, 0x77, 0x77, 0x67, 0x77, 0x77, 0x77, 0x67, 0xf7, 0xff, 0x67, 0x56 .byte 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x34, 0x44, 0x44, 0x65, 0x34, 0x44, 0x44, 0x54, 0x34, 0x44, 0x44, 0x44, 0x34, 0x56, 0x44, 0x44, 0x34, 0x55, 0x45, 0x44, 0x34, 0x66, 0x35, 0x43, 0x34 @@ -267,4 +273,8 @@ Trappat_SIRO: .byte 0x57, 0x2f, 0x7f, 0xff, 0x87, 0x6f, 0x97, 0xff, 0x9f, 0x4f, 0x4f, 0xff, 0xd7, 0x5f, 0x5f, 0xff, 0xff, 0x8f, 0x87, 0xff, 0xdf, 0xb7, 0x00, 0xff, 0xff, 0xdf, 0x6f, 0xff, 0xef, 0xf7, 0xe7, 0xff .byte 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x1f, 0x1f, 0xff, 0x3f, 0x37, 0x47, 0xff, 0x67, 0x5f, 0x67, 0xff, 0x87, 0x87, 0x87, 0xff, 0xaf, 0xaf, 0xa7, 0xff, 0xcf, 0xd7, 0xc7, 0xff .byte 0x4f, 0x97, 0x4f, 0xff, 0x47, 0xb7, 0x47, 0xff, 0x9f, 0x57, 0x0f, 0xff, 0xbf, 0x67, 0x17, 0xff, 0xdf, 0x77, 0x1f, 0xff, 0x7f, 0xff, 0x8f, 0xff, 0xb7, 0xe7, 0xf7, 0xff, 0xef, 0xf7, 0xe7, 0xff -.byte 0x7c, 0x24, 0x4f, 0x08, 0x20, 0x45, 0x4f, 0x08 + +.global trappat_table +trappat_table: +.4byte trappat +.byte 0x20, 0x45, 0x4f, 0x08 diff --git a/data/dungeon/zmappat.inc b/data/dungeon/zmappat.inc index d8632dc..a3c8ecc 100644 --- a/data/dungeon/zmappat.inc +++ b/data/dungeon/zmappat.inc @@ -1,7 +1,7 @@ .global Zmappat_SIRO Zmappat_SIRO: .string "SIRO" -.byte 0xf8, 0x11, 0x50, 0x08 +.4byte zmappat_table .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @@ -1680,5 +1680,8 @@ Zmappat_SIRO: .byte 0x37, 0xa7, 0x2f, 0xff, 0x00, 0x00, 0x00, 0x00 .byte 0xe7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe7, 0x07, 0x00, 0x00, 0xe7, 0xe7, 0x00, 0xe7, 0xe7, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0xaf, 0xaf, 0xaf, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x00 + +.global zmapat_table +zmappat_table: .byte 0xb8, 0x05, 0x50, 0x08 .byte 0xb8, 0x11, 0x50, 0x08 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 diff --git a/data/text/wonder_mail_4.inc b/data/text/wonder_mail_4.inc deleted file mode 100644 index b1b2c12..0000000 --- a/data/text/wonder_mail_4.inc +++ /dev/null @@ -1,207 +0,0 @@ -gUnknown_80E0C4C:: @ 80E0C4C - .string " So~2c what~27d you want to\n" - .string "know?\0" - .align 2, 0 - -gUnknown_80E0C70:: @ 80E0C70 - .string " If you need to call for\n" - .string "help~2c first send your friend\n" - .string "an #CGSOS Mail#R.#P" - .string " Once you send that mail~2c\n" - .string "wait until your friend sends you back\n" - .string "an #CGA-OK Mail#R.#P" - .string " When you get that\n" - .string "#CGA-OK Mail#R back~2c your team\n" - .string "can continue from where it went down.#P" - .string " Make sure you send your\n" - .string "friend a #CGThank-You Mail#R.\n" - .string "That~27s if you get revived~2c of course.\0" - .align 2, 0 - -gUnknown_80E0DD0:: @ 80E0DD0 - .string " If your team gets defeated\n" - .string "in a dungeon~2c you can send an #CGSOS Mail#R\n" - .string "to a friend willing to help.#P" - .string " But I have to warn you.\n" - .string "You can~27t get anyone to rescue you\n" - .string "in certain places.#P" - .string " If you need to send\n" - .string "an #CGSOS Mail#R~2c you send it from the\n" - .string "#CGmain menu#R.\0" - .align 2, 0 - -gUnknown_80E0ED8:: @ 80E0ED8 - .string " If your friend manages to\n" - .string "rescue your team~2c you need to receive\n" - .string "an #CGA-OK Mail#R from your friend.#P" - .string " See~2c once you get that\n" - .string "#CGA-OK Mail#R~2c your team can continue from\n" - .string "where it went down in the dungeon.#P" - .string " And~2c if you use\n" - .string "a #CGGame Link cable#R~2c your friend can\n" - .string "even send you a #CGhelper Pokémon#R.#P" - .string " There~27s just one thing.\n" - .string "A #CGhelper Pokémon#R can~27t bring\n" - .string "any item it happens to be holding.#P" - .string " You can receive that\n" - .string "team-saving #CGA-OK Mail#R on the #CGmain menu#R~2c\n" - .string "all right?\0" - .align 2, 0 - -gUnknown_80E10C8:: @ 80E10C8 - .string " If your team gets rescued~2c\n" - .string "be sure to send your friend\n" - .string "a #CGThank-You Mail#R.#P" - .string " You do that by going to\n" - .string "the #CGright counter#R~2c or\n" - .string "by selecting it from the #CGmain menu#R.#P" - .string " You can attach an item in\n" - .string "storage to your #CGThank-You Mail#R\n" - .string "as a #CGreward item#R.#P" - .string " You don~27t want to ever\n" - .string "forget to express your thanks.\0" - .align 2, 0 - -gUnknown_80E120C:: @ 80E120C - .string " If you want to go and\n" - .string "rescue your friend~27s KO~27d team~2c\n" - .string "you need to receive an #CGSOS Mail#R.#P" - .string " When you get that mail~2c\n" - .string "you can rescue your friend at\n" - .string "the #CGleft counter#R over there.#P" - .string " If you do manage to rescue\n" - .string "the team~2c you send your friend\n" - .string "an #CGA-OK Mail#R.#P" - .string " After you do that~2c your\n" - .string "friend can send back to you\n" - .string "a #CGThank-You Mail#R.\0" - .align 2, 0 - -gUnknown_80E136C:: @ 80E136C - .string " To go off on a rescue~2c\n" - .string "you first need to receive your friend~27s\n" - .string "#CGSOS Mail#R.#P" - .string " You do that at\n" - .string "the #CGleft counter#R over there~2c\n" - .string "or by selecting it from the #CGmain menu#R.\0" - .align 2, 0 - -gUnknown_80E1420:: @ 80E1420 - .string " If you succeed in rescuing\n" - .string "that team~2c you send your friend an\n" - .string "#CGA-OK Mail#R.#P" - .string " You do that by going to\n" - .string "the #CGleft counter#R~2c\n" - .string "or from the #CGmain menu#R.#P" - .string " You can send your friend\n" - .string "a Pokémon as a helper from your Friend\n" - .string "Areas using a #CGGame Link cable#R.#P" - .string " This Pokémon won~27t\n" - .string "disappear from its Friend Area~2c so\n" - .string "don~27t you worry any.\0" - .align 2, 0 - -gUnknown_80E157C:: @ 80E157C - .string " If you get an #CGSOS Mail#R~2c\n" - .string "you head off on the rescue from\n" - .string "the #CGleft counter#R.#P" - .string " But~2c I have to warn you.\n" - .string "You can~27t go off to rescue in a dungeon\n" - .string "if you can~27t get into it.#P" - .string " You~27ll be able to get\n" - .string "there when you go farther in your\n" - .string "adventure~2c so it won~27t do to fret.\0" - .align 2, 0 - -gUnknown_80E169C:: @ 80E169C - .string " If you send your friend\n" - .string "an #CGA-OK Mail#R~2c you can look forward\n" - .string "to getting a #CGThank-You Mail#R back.#P" - .string " You can receive it at\n" - .string "the #CGright counter#R\n" - .string "or on the #CGmain menu#R.#P" - .string " But you need to #C2be careful#R.\n" - .string "You #C2must not delete the A-OK Mail#R\n" - .string "before you get the #CGThank-You Mail#R back.\0" - .align 2, 0 - -gUnknown_80E17C8:: @ 80E17C8 - .string " I~27m your guide to what you\n" - .string "can expect at the Pelipper Post Office.\n" - .string "If you have any questions~2c just ask away!\0" - .align 2, 0 - -gUnknown_80E183C:: @ 80E183C - .string " Did you want to ask about\n" - .string "anything else?\0" - .align 2, 0 - -gUnknown_80E1868:: @ 80E1868 - .string " #CGThe Pelipper Post Office#R\n" - .string "keeps track of information from\n" - .string "around the world.#P" - .string " We inform folks\n" - .string "about everything from gossip to calls\n" - .string "for help from fellow Pokémon.#P" - .string " For the latest news~2c check\n" - .string "#CGyour Mailbox#R or the #CGBulletin Board#R\n" - .string "outside~2c all right?#P" - .string " Oh~2c that~27s not all.\n" - .string "You can arrange for #CGFriend Rescue#R\n" - .string "missions at that counter there.#P" - .string " The #CGleft counter#R is\n" - .string "for rescues~2c and the #CGright counter#R\n" - .string "is for Thank-You Mail.\0" - .align 2, 0 - -gUnknown_80E1A30:: @ 80E1A30 - .string " The #CGBulletin Board#R outside\n" - .string "here lists rescue requests.#P" - .string " Take on rescue jobs from\n" - .string "the Bulletin Board. Be a hero and handle\n" - .string "the jobs for fellow Pokémon in need!\0" - .align 2, 0 - -gUnknown_80E1AD8:: @ 80E1AD8 - .string " If your rescue team\n" - .string "becomes famous for doing lots of rescues~2c\n" - .string "expect to get rescue requests directly.#P" - .string " Our delivery $m0\n" - .string "will take those jobs straight to your\n" - .string "#CGMailbox#R.\0" - .align 2, 0 - -gUnknown_80E1B88:: @ 80E1B88 - .string " Friend Rescue is what we\n" - .string "call rescue missions between friends using\n" - .string "a #CGGame Link cable#R~2c #CGpasswords#R~2c etc.#P" - .string " For instance~2c you can send\n" - .string "out for help saying your team wiped out\n" - .string "in a dungeon at such and such a place.#P" - .string " Your friend could play\n" - .string "the hero and come to your team~27s rescue.\n" - .string "Or it can be the other way around~2c too.#P" - .string " If you use #CGpasswords#R~2c\n" - .string "you can do rescues with friends in\n" - .string "far-away places.#P" - .string " You can apply for Friend\n" - .string "Rescue jobs at the #CGleft counter#R of\n" - .string "that counter there.\0" - .align 2, 0 - -gUnknown_80E1D84:: @ 80E1D84 - .string " Deleting mail just means\n" - .string "getting rid of old mail that you don~27t\n" - .string "need anymore.#P" - .string " If you do lots of Friend\n" - .string "Rescues~2c you~27ll find #CGSOS Mail#R and\n" - .string "#CGA-OK Mail#R piling up.#P" - .string " Once you get #CG30 pieces#R~2c\n" - .string "you won~27t be able to receive more mail.\n" - .string "That~27s why you~27ll need to delete old mail.#P" - .string " You can look through old\n" - .string "mail at the #CGleft counter#R over there.\0" - .align 2, 0 - - .string "pksdir0\0" - .align 2, 0 diff --git a/data/unk_data.s b/data/unk_data.s index b9bc87d..aa9d19e 100644 --- a/data/unk_data.s +++ b/data/unk_data.s @@ -2,13 +2,13 @@ .string "pksdir0\0" .4byte 1 - .4byte unk_data_table + .4byte monpal_table .string "pksdir0\0" - .global unk_data_table - unk_data_table: + .global monpal_table + monpal_table: .4byte monpal_string - .4byte unkPalette + .4byte monPal .global monpal_string monpal_string: @@ -17,8 +17,8 @@ .string "pksdir0\0" @ Unknown Palette - .global unkPalette - unkPalette: + .global monPal + monPal: .byte 0x00, 0x00, 0x00, 0x80 .byte 0x17, 0x17, 0x0f, 0x80 .byte 0x47, 0x37, 0x37, 0x80 |