From f402e46cd3c8b7236673d6edbae77903a7cc0618 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 15 May 2021 16:59:55 -0700 Subject: 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 --- data/dungeon/trappat.inc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'data/dungeon/trappat.inc') 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 -- cgit v1.2.3