diff options
author | YamaArashi <shadow962@live.com> | 2016-07-10 18:11:11 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-07-10 18:17:28 -0700 |
commit | d7301cec16cb9fbaf354779e52fb0c752e6e10ae (patch) | |
tree | d713058a76a0cd039bd54153c4e71fb7c60f555f | |
parent | e18398b0f82c60f9ef31830f2c983890d798149c (diff) |
pokemon/trainer pic coords
-rw-r--r-- | asm/rom3.s | 42 | ||||
-rw-r--r-- | asm/rom5.s | 68 | ||||
-rw-r--r-- | asm/rom_8074BAC.s | 38 | ||||
-rw-r--r-- | data/data2.s | 16 | ||||
-rw-r--r-- | data/graphics/pokemon/back_pic_coords.s | 442 | ||||
-rw-r--r-- | data/graphics/pokemon/front_pic_coords.s | 442 | ||||
-rw-r--r-- | data/graphics/trainers/back_pic_coords.s | 5 | ||||
-rw-r--r-- | data/graphics/trainers/front_pic_coords.s | 85 |
8 files changed, 1056 insertions, 82 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 6309a7d91..bdde4eaf8 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -3495,7 +3495,7 @@ sub_800B25C: @ 800B25C bx r1 .align 2, 0 _0800B2B8: .4byte gMonFrontPicTable + 0xAF0 -_0800B2BC: .4byte gUnknown_081E7C74 +_0800B2BC: .4byte gMonFrontPicCoords _0800B2C0: .4byte gUnknown_081FAF4C _0800B2C4: .4byte gMonPaletteTable + 0xAF0 _0800B2C8: .4byte 0x02024e8c @@ -13803,7 +13803,7 @@ _08010426: lsls r0, 2 b _08010468 .align 2, 0 -_0801042C: .4byte gUnknown_081E7C74 +_0801042C: .4byte gMonFrontPicCoords _08010430: ldr r0, _08010448 cmp r4, r0 @@ -13828,7 +13828,7 @@ _08010454: ldr r0, _08010460 b _0801046A .align 2, 0 -_08010460: .4byte gUnknown_081E7C74 +_08010460: .4byte gMonFrontPicCoords _08010464: ldr r1, _0801048C lsls r0, r4, 2 @@ -13853,7 +13853,7 @@ _0801046C: pop {r0} bx r0 .align 2, 0 -_0801048C: .4byte gUnknown_081E7C74 +_0801048C: .4byte gMonFrontPicCoords _08010490: .4byte sub_8010494 thumb_func_end sub_8010384 @@ -75884,7 +75884,7 @@ _0802FBEA: _0802FCB8: .4byte 0x02024ea4 _0802FCBC: .4byte 0x02024a60 _0802FCC0: .4byte 0x02024e8c -_0802FCC4: .4byte gUnknown_081ECAD8 +_0802FCC4: .4byte gTrainerBackPicCoords _0802FCC8: .4byte 0x02024be0 _0802FCCC: .4byte 0x02020004 _0802FCD0: .4byte 0x0000fffe @@ -75984,7 +75984,7 @@ sub_802FCE0: @ 802FCE0 _0802FD94: .4byte 0x02024ea4 _0802FD98: .4byte 0x02024a60 _0802FD9C: .4byte 0x02024e8c -_0802FDA0: .4byte gUnknown_081ECAD8 +_0802FDA0: .4byte gTrainerBackPicCoords _0802FDA4: .4byte 0x02024be0 _0802FDA8: .4byte 0x02020004 _0802FDAC: .4byte 0x0000ffa0 @@ -79303,7 +79303,7 @@ _080317DC: .align 2, 0 _08031838: .4byte 0x02024e70 _0803183C: .4byte gMonFrontPicTable -_08031840: .4byte gUnknown_081E7C74 +_08031840: .4byte gMonFrontPicCoords _08031844: .4byte gUnknown_081FAF4C _08031848: .4byte 0x02017800 _0803184C: @@ -79467,7 +79467,7 @@ _08031944: .align 2, 0 _080319A0: .4byte 0x02024e70 _080319A4: .4byte gMonBackPicTable -_080319A8: .4byte gUnknown_081E9114 +_080319A8: .4byte gMonBackPicCoords _080319AC: .4byte gUnknown_081FAF4C _080319B0: .4byte 0x02017800 _080319B4: @@ -79615,7 +79615,7 @@ sub_8031A6C: @ 8031A6C bx r0 .align 2, 0 _08031ADC: .4byte gTrainerFrontPicTable -_08031AE0: .4byte gUnknown_081EC3F0 +_08031AE0: .4byte gTrainerFrontPicCoords _08031AE4: .4byte gUnknown_081FAF4C _08031AE8: .4byte 0xffff0000 _08031AEC: .4byte 0x0000ffff @@ -79677,7 +79677,7 @@ sub_8031AF4: @ 8031AF4 bx r0 .align 2, 0 _08031B60: .4byte gTrainerBackPicTable -_08031B64: .4byte gUnknown_081ECAD8 +_08031B64: .4byte gTrainerBackPicCoords _08031B68: .4byte gUnknown_081FAF4C _08031B6C: .4byte gTrainerBackPicPaletteTable thumb_func_end sub_8031AF4 @@ -80356,7 +80356,7 @@ _08032088: .align 2, 0 _080320C0: .4byte 0x02019348 _080320C4: .4byte gMonBackPicTable -_080320C8: .4byte gUnknown_081E9114 +_080320C8: .4byte gMonBackPicCoords _080320CC: .4byte gUnknown_081FAF4C _080320D0: mov r0, r8 @@ -80452,7 +80452,7 @@ _08032184: _0803218C: .4byte 0x02024a6a _08032190: .4byte 0x03004360 _08032194: .4byte gMonBackPicTable -_08032198: .4byte gUnknown_081E9114 +_08032198: .4byte gMonBackPicCoords _0803219C: .4byte gUnknown_081FAF4C _080321A0: .4byte 0x02024e70 _080321A4: @@ -80628,7 +80628,7 @@ _080322F6: _08032308: .4byte 0x02024a6a _0803230C: .4byte 0x030045c0 _08032310: .4byte gMonFrontPicTable -_08032314: .4byte gUnknown_081E7C74 +_08032314: .4byte gMonFrontPicCoords _08032318: .4byte gUnknown_081FAF4C _0803231C: .4byte 0x02024e70 _08032320: .4byte 0x02024be0 @@ -85802,7 +85802,7 @@ _08034C56: _08034D88: .4byte gTrainers _08034D8C: .4byte 0x02024a60 _08034D90: .4byte 0x02024e8c -_08034D94: .4byte gUnknown_081EC3F0 +_08034D94: .4byte gTrainerFrontPicCoords _08034D98: .4byte 0x02024be0 _08034D9C: .4byte 0x02020004 _08034DA0: .4byte 0x0000ff10 @@ -86014,7 +86014,7 @@ _08034E1A: _08034F4C: .4byte gTrainers _08034F50: .4byte 0x02024a60 _08034F54: .4byte 0x02024e8c -_08034F58: .4byte gUnknown_081EC3F0 +_08034F58: .4byte gTrainerFrontPicCoords _08034F5C: .4byte 0x02024be0 _08034F60: .4byte 0x02020004 _08034F64: .4byte 0x0000fffe @@ -95023,7 +95023,7 @@ _08039724: _0803986C: .4byte 0x03002970 _08039870: .4byte 0x02024a60 _08039874: .4byte 0x02024e8c -_08039878: .4byte gUnknown_081EC3F0 +_08039878: .4byte gTrainerFrontPicCoords _0803987C: .4byte 0x02024be0 _08039880: .4byte 0x02020004 _08039884: .4byte 0x0000ff10 @@ -114203,7 +114203,7 @@ _08042BB4: b _08042C50 .align 2, 0 _08042C04: .4byte gMonFrontPicTable -_08042C08: .4byte gUnknown_081E7C74 +_08042C08: .4byte gMonFrontPicCoords _08042C0C: .4byte 0x02000000 _08042C10: .4byte gUnknown_081FAF4C _08042C14: @@ -115146,7 +115146,7 @@ _08043404: .4byte sub_8043460 _08043408: .4byte 0x0300481c _0804340C: .4byte 0x03004360 _08043410: .4byte 0x02020004 -_08043414: .4byte gUnknown_081E7C74 +_08043414: .4byte gMonFrontPicCoords _08043418: ldrh r0, [r4, 0x30] adds r0, 0x14 @@ -131304,7 +131304,7 @@ _0804B330: b _0804B3FA .align 2, 0 _0804B390: .4byte gMonFrontPicTable -_0804B394: .4byte gUnknown_081E7C74 +_0804B394: .4byte gMonFrontPicCoords _0804B398: .4byte 0x02000000 _0804B39C: .4byte gUnknown_081FAF4C _0804B3A0: .4byte 0x03004828 @@ -133303,7 +133303,7 @@ _0804C5EC: .align 2, 0 _0804C65C: .4byte 0x02020004 _0804C660: .4byte 0x0000ff4c -_0804C664: .4byte gUnknown_081E7C74 +_0804C664: .4byte gMonFrontPicCoords _0804C668: .4byte 0x00000179 _0804C66C: ldr r4, [r6] @@ -134917,7 +134917,7 @@ _0804D314: b _0804D53C .align 2, 0 _0804D3B4: .4byte 0x02020004 -_0804D3B8: .4byte gUnknown_081E7C74 +_0804D3B8: .4byte gMonFrontPicCoords _0804D3BC: .4byte 0x000fffff _0804D3C0: .4byte 0x00000103 _0804D3C4: diff --git a/asm/rom5.s b/asm/rom5.s index 0e6fdb085..33bb4d2e8 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -689,7 +689,7 @@ _0807B2D8: _0807B328: .4byte 0x020239f8 _0807B32C: .4byte 0x02024ea4 _0807B330: .4byte 0x02024e8c -_0807B334: .4byte gUnknown_081ECAD8 +_0807B334: .4byte gTrainerBackPicCoords _0807B338: ldrh r1, [r2] movs r0, 0x80 @@ -756,7 +756,7 @@ _0807B37C: b _0807B4AC .align 2, 0 _0807B3BC: .4byte 0x02024e8c -_0807B3C0: .4byte gUnknown_081ECAD8 +_0807B3C0: .4byte gTrainerBackPicCoords _0807B3C4: .4byte 0x02024be0 _0807B3C8: .4byte 0x02020004 _0807B3CC: .4byte SpriteCallbackDummy @@ -22632,7 +22632,7 @@ sub_8085AD4: @ 8085AD4 bx r1 .align 2, 0 _08085B74: .4byte gMonFrontPicTable -_08085B78: .4byte gUnknown_081E7C74 +_08085B78: .4byte gMonFrontPicCoords _08085B7C: .4byte gUnknown_081FAF4C _08085B80: .4byte gMonPaletteTable _08085B84: .4byte 0x02024e8c @@ -22721,7 +22721,7 @@ sub_8085B88: @ 8085B88 bx r1 .align 2, 0 _08085C34: .4byte gMonFrontPicTable -_08085C38: .4byte gUnknown_081E7C74 +_08085C38: .4byte gMonFrontPicCoords _08085C3C: .4byte gUnknown_081FAF4C _08085C40: .4byte 0x02024e8c thumb_func_end sub_8085B88 @@ -46469,7 +46469,7 @@ sub_80918EC: @ 80918EC b _080919CE .align 2, 0 _0809194C: .4byte gMonFrontPicTable -_08091950: .4byte gUnknown_081E7C74 +_08091950: .4byte gMonFrontPicCoords _08091954: .4byte gUnknown_083B5584 _08091958: lsls r6, r7, 3 @@ -46499,7 +46499,7 @@ _08091958: b _080919CE .align 2, 0 _0809198C: .4byte gMonFrontPicTable -_08091990: .4byte gUnknown_081E7C74 +_08091990: .4byte gMonFrontPicCoords _08091994: .4byte gUnknown_083B5584 _08091998: .4byte 0x02024ea4 _0809199C: @@ -46576,7 +46576,7 @@ _080919CE: bx r1 .align 2, 0 _08091A30: .4byte gMonFrontPicTable -_08091A34: .4byte gUnknown_081E7C74 +_08091A34: .4byte gMonFrontPicCoords _08091A38: .4byte gUnknown_083B5584 _08091A3C: .4byte 0x02024ea4 _08091A40: .4byte gMonPaletteTable @@ -46661,7 +46661,7 @@ sub_8091A4C: @ 8091A4C bx r1 .align 2, 0 _08091AE4: .4byte gTrainerFrontPicTable -_08091AE8: .4byte gUnknown_081EC3F0 +_08091AE8: .4byte gTrainerFrontPicCoords _08091AEC: .4byte gUnknown_083B5584 _08091AF0: .4byte 0x02024e8c _08091AF4: .4byte 0x02020004 @@ -59730,7 +59730,7 @@ sub_80981F0: @ 80981F0 .align 2, 0 _08098274: .4byte 0x02000000 _08098278: .4byte gMonFrontPicTable -_0809827C: .4byte gUnknown_081E7C74 +_0809827C: .4byte gMonFrontPicCoords _08098280: .4byte 0x00004784 _08098284: .4byte 0x00002784 _08098288: .4byte 0x000011e8 @@ -74636,7 +74636,7 @@ _0809F6D2: b _0809F74E .align 2, 0 _0809F70C: .4byte gMonFrontPicTable -_0809F710: .4byte gUnknown_081E7C74 +_0809F710: .4byte gMonFrontPicCoords _0809F714: .4byte gUnknown_081FAF4C _0809F718: adds r0, r4, 0 @@ -105557,7 +105557,7 @@ unref_sub_80AE908: @ 80AE908 _080AE9D4: .4byte 0x02038570 _080AE9D8: .4byte 0x02038695 _080AE9DC: .4byte gMonFrontPicTable -_080AE9E0: .4byte gUnknown_081E7C74 +_080AE9E0: .4byte gMonFrontPicCoords _080AE9E4: .4byte gUnknown_081FAF4C _080AE9E8: .4byte gMonPaletteTable _080AE9EC: .4byte 0x02024e8c @@ -105665,7 +105665,7 @@ sub_80AE9FC: @ 80AE9FC b _080AEAF0 .align 2, 0 _080AEACC: .4byte gMonBackPicTable -_080AEAD0: .4byte gUnknown_081E9114 +_080AEAD0: .4byte gMonBackPicCoords _080AEAD4: .4byte gUnknown_081FAF4C _080AEAD8: .4byte 0x02024e8c _080AEADC: .4byte 0x02020004 @@ -147039,7 +147039,7 @@ _080C2BCC: .4byte 0x00005050 _080C2BD0: .4byte 0x02038690 _080C2BD4: .4byte 0x02038570 _080C2BD8: .4byte gMonFrontPicTable -_080C2BDC: .4byte gUnknown_081E7C74 +_080C2BDC: .4byte gMonFrontPicCoords _080C2BE0: .4byte gUnknown_081FAF4C _080C2BE4: .4byte 0x02000000 _080C2BE8: .4byte 0x02024e8c @@ -151897,7 +151897,7 @@ _080C5140: .4byte 0x02038570 _080C5144: .4byte 0x0202e8d0 _080C5148: .4byte 0x03004b20 _080C514C: .4byte gMonFrontPicTable -_080C5150: .4byte gUnknown_081E7C74 +_080C5150: .4byte gMonFrontPicCoords _080C5154: .4byte gUnknown_081FAF4C _080C5158: .4byte 0x02024e8c _080C515C: .4byte 0x02020004 @@ -249669,7 +249669,7 @@ _080F48E0: .4byte gUnknown_083DFEC4 _080F48E4: .4byte 0x0000893f _080F48E8: .4byte 0x0000893d _080F48EC: .4byte gMonFrontPicTable -_080F48F0: .4byte gUnknown_081E7C74 +_080F48F0: .4byte gMonFrontPicCoords _080F48F4: .4byte 0x000131e4 _080F48F8: .4byte 0x0000d1e4 _080F48FC: .4byte 0x0000d1d6 @@ -254502,7 +254502,7 @@ _080F6E7C: .4byte 0x0000876e _080F6E80: .4byte 0x0000cee8 _080F6E84: .4byte gTrainers _080F6E88: .4byte gTrainerFrontPicTable -_080F6E8C: .4byte gUnknown_081EC3F0 +_080F6E8C: .4byte gTrainerFrontPicCoords _080F6E90: .4byte 0x000131e4 _080F6E94: .4byte 0x0000d1e4 _080F6E98: .4byte gTrainerFrontPicPaletteTable @@ -287795,7 +287795,7 @@ sub_8106AC4: @ 8106AC4 _08106B28: .4byte 0x03005e8c _08106B2C: .4byte 0x03005e90 _08106B30: .4byte gMonFrontPicTable -_08106B34: .4byte gUnknown_081E7C74 +_08106B34: .4byte gMonFrontPicCoords _08106B38: .4byte gUnknown_081FAF4C _08106B3C: .4byte 0x03005e10 _08106B40: @@ -287832,7 +287832,7 @@ _08106B74: bx r0 .align 2, 0 _08106B80: .4byte gMonBackPicTable -_08106B84: .4byte gUnknown_081E9114 +_08106B84: .4byte gMonBackPicCoords _08106B88: .4byte gUnknown_081FAF4C _08106B8C: .4byte 0x03005e10 thumb_func_end sub_8106AC4 @@ -295534,7 +295534,7 @@ sub_810A580: @ 810A580 bx r1 .align 2, 0 _0810A610: .4byte gMonFrontPicTable -_0810A614: .4byte gUnknown_081E7C74 +_0810A614: .4byte gMonFrontPicCoords _0810A618: .4byte gUnknown_081FAF4C _0810A61C: .4byte gMonPaletteTable _0810A620: .4byte 0x02024e8c @@ -310744,7 +310744,7 @@ _08111C48: .4byte 0x020231cc _08111C4C: .4byte 0x020232cc _08111C50: .4byte gSpeciesNames _08111C54: .4byte gMonFrontPicTable -_08111C58: .4byte gUnknown_081E7C74 +_08111C58: .4byte gMonFrontPicCoords _08111C5C: .4byte gUnknown_081FAF4C _08111C60: .4byte 0x02024e8c _08111C64: .4byte gDummySpriteAffineAnimTable @@ -310953,7 +310953,7 @@ _08111E4C: .4byte 0x03004210 _08111E50: .4byte 0x0300428c _08111E54: .4byte 0x030028f8 _08111E58: .4byte gMonFrontPicTable -_08111E5C: .4byte gUnknown_081E7C74 +_08111E5C: .4byte gMonFrontPicCoords _08111E60: .4byte gUnknown_081FAF4C _08111E64: .4byte 0x02024e8c _08111E68: .4byte gDummySpriteAffineAnimTable @@ -311147,7 +311147,7 @@ _08111FE2: b _0811208E .align 2, 0 _08112034: .4byte gMonFrontPicTable -_08112038: .4byte gUnknown_081E7C74 +_08112038: .4byte gMonFrontPicCoords _0811203C: .4byte gUnknown_081FAF4C _08112040: .4byte 0x03001770 _08112044: .4byte 0x0000043c @@ -311386,7 +311386,7 @@ _0811223C: .4byte gSpeciesNames _08112240: .4byte 0x020211c8 _08112244: .4byte 0x02014800 _08112248: .4byte gMonFrontPicTable -_0811224C: .4byte gUnknown_081E7C74 +_0811224C: .4byte gMonFrontPicCoords _08112250: .4byte gUnknown_081FAF4C _08112254: .4byte 0x02024e8c _08112258: .4byte gDummySpriteAffineAnimTable @@ -338607,7 +338607,7 @@ _0811FB34: _0811FC08: .4byte 0x03002970 _0811FC0C: .4byte 0x02024a60 _0811FC10: .4byte 0x02024e8c -_0811FC14: .4byte gUnknown_081ECAD8 +_0811FC14: .4byte gTrainerBackPicCoords _0811FC18: .4byte 0x02024be0 _0811FC1C: .4byte 0x02020004 _0811FC20: .4byte 0x0000fffe @@ -363369,7 +363369,7 @@ sub_812B8B8: @ 812B8B8 _0812B96C: .4byte 0x02024ea4 _0812B970: .4byte 0x02024a60 _0812B974: .4byte 0x02024e8c -_0812B978: .4byte gUnknown_081ECAD8 +_0812B978: .4byte gTrainerBackPicCoords _0812B97C: .4byte 0x02024be0 _0812B980: .4byte 0x02020004 _0812B984: .4byte 0x0000fffe @@ -390400,7 +390400,7 @@ sub_8138D38: @ 8138D38 .align 2, 0 _08138DE0: .4byte 0x02024a60 _08138DE4: .4byte 0x02024e8c -_08138DE8: .4byte gUnknown_081ECAD8 +_08138DE8: .4byte gTrainerBackPicCoords _08138DEC: .4byte 0x02024be0 _08138DF0: .4byte 0x02020004 _08138DF4: .4byte 0x0000fffe @@ -390494,7 +390494,7 @@ sub_8138E04: @ 8138E04 .align 2, 0 _08138EAC: .4byte 0x02024a60 _08138EB0: .4byte 0x02024e8c -_08138EB4: .4byte gUnknown_081ECAD8 +_08138EB4: .4byte gTrainerBackPicCoords _08138EB8: .4byte 0x02024be0 _08138EBC: .4byte 0x02020004 _08138EC0: .4byte 0x0000ffa0 @@ -398501,7 +398501,7 @@ sub_813CE88: @ 813CE88 b _0813CF1C .align 2, 0 _0813CEE4: .4byte gMonFrontPicTable -_0813CEE8: .4byte gUnknown_081E7C74 +_0813CEE8: .4byte gMonFrontPicCoords _0813CEEC: .4byte gUnknown_0840B5A0 _0813CEF0: lsls r0, r7, 3 @@ -398582,7 +398582,7 @@ _0813CF1C: bx r1 .align 2, 0 _0813CF90: .4byte gMonBackPicTable -_0813CF94: .4byte gUnknown_081E9114 +_0813CF94: .4byte gMonBackPicCoords _0813CF98: .4byte gUnknown_0840B5A0 _0813CF9C: .4byte 0x0000ffff _0813CFA0: .4byte 0x02024e8c @@ -398684,7 +398684,7 @@ sub_813CFA8: @ 813CFA8 bx r1 .align 2, 0 _0813D068: .4byte gTrainerBackPicTable -_0813D06C: .4byte gUnknown_081ECAD8 +_0813D06C: .4byte gTrainerBackPicCoords _0813D070: .4byte gUnknown_0840B5A0 _0813D074: .4byte gTrainerBackPicPaletteTable _0813D078: .4byte 0x02024e8c @@ -411863,7 +411863,7 @@ sub_81436BC: @ 81436BC bx r1 .align 2, 0 _08143790: .4byte gMonFrontPicTable -_08143794: .4byte gUnknown_081E7C74 +_08143794: .4byte gMonFrontPicCoords _08143798: .4byte gUnknown_0840B5A0 _0814379C: .4byte 0x02024e8c _081437A0: .4byte 0x02020004 @@ -411957,7 +411957,7 @@ sub_81437A4: @ 81437A4 bx r1 .align 2, 0 _08143854: .4byte gTrainerFrontPicTable -_08143858: .4byte gUnknown_081EC3F0 +_08143858: .4byte gTrainerFrontPicCoords _0814385C: .4byte gUnknown_0840B5A0 _08143860: .4byte gTrainerFrontPicPaletteTable _08143864: .4byte 0x02024e8c @@ -415914,7 +415914,7 @@ _081456FC: .align 2, 0 _081457E8: .4byte 0x02024ea4 _081457EC: .4byte gMonFrontPicTable -_081457F0: .4byte gUnknown_081E7C74 +_081457F0: .4byte gMonFrontPicCoords _081457F4: .4byte gUnknown_0840B5A0 _081457F8: .4byte 0x0000ffff _081457FC: .4byte 0x02024e8c @@ -420248,7 +420248,7 @@ _08147B70: b _08147C40 .align 2, 0 _08147BAC: .4byte gMonFrontPicTable -_08147BB0: .4byte gUnknown_081E7C74 +_08147BB0: .4byte gMonFrontPicCoords _08147BB4: .4byte gUnknown_081FAF4C _08147BB8: adds r0, r4, 0 diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s index dbf623a43..dead0a663 100644 --- a/asm/rom_8074BAC.s +++ b/asm/rom_8074BAC.s @@ -6378,7 +6378,7 @@ _08077CC2: lsls r0, 2 b _08077DC8 .align 2, 0 -_08077CC8: .4byte gUnknown_081E9114 +_08077CC8: .4byte gMonBackPicCoords _08077CCC: ldr r0, _08077CE0 cmp r5, r0 @@ -6402,12 +6402,12 @@ _08077CEC: ldr r0, _08077CF8 b _08077DCA .align 2, 0 -_08077CF8: .4byte gUnknown_081E9114 +_08077CF8: .4byte gMonBackPicCoords _08077CFC: ldr r1, _08077D00 b _08077DC6 .align 2, 0 -_08077D00: .4byte gUnknown_081E9114 +_08077D00: .4byte gMonBackPicCoords _08077D04: cmp r5, 0xC9 bne _08077D90 @@ -6476,7 +6476,7 @@ _08077D86: lsls r0, 2 b _08077DC8 .align 2, 0 -_08077D8C: .4byte gUnknown_081E7C74 +_08077D8C: .4byte gMonFrontPicCoords _08077D90: ldr r0, _08077DA8 cmp r5, r0 @@ -6501,7 +6501,7 @@ _08077DB4: ldr r0, _08077DC0 b _08077DCA .align 2, 0 -_08077DC0: .4byte gUnknown_081E7C74 +_08077DC0: .4byte gMonFrontPicCoords _08077DC4: ldr r1, _08077DD4 _08077DC6: @@ -6515,7 +6515,7 @@ _08077DCC: pop {r1} bx r1 .align 2, 0 -_08077DD4: .4byte gUnknown_081E7C74 +_08077DD4: .4byte gMonFrontPicCoords thumb_func_end sub_8077BFC thumb_func_start sub_8077DD8 @@ -10532,7 +10532,7 @@ _08079B2C: .align 2, 0 _08079B44: .4byte 0x02020004 _08079B48: .4byte 0x02024be0 -_08079B4C: .4byte gUnknown_081E9114 +_08079B4C: .4byte gMonBackPicCoords _08079B50: .4byte 0x02019348 _08079B54: lsls r0, r4, 24 @@ -10602,7 +10602,7 @@ _08079BD2: ldrb r0, [r1, 0x1] b _08079BEC .align 2, 0 -_08079BDC: .4byte gUnknown_081E7C74 +_08079BDC: .4byte gMonFrontPicCoords _08079BE0: adds r0, r4, 0x1 lsls r0, 16 @@ -11155,7 +11155,7 @@ sub_8079F44: @ 8079F44 _08079FE0: .4byte gUnknown_0837F5E0 _08079FE4: .4byte gSpriteTemplate_837F5B0 _08079FE8: .4byte gMonFrontPicTable -_08079FEC: .4byte gUnknown_081E7C74 +_08079FEC: .4byte gMonFrontPicCoords _08079FF0: adds r0, r6, 0 ldr r1, [sp, 0x44] @@ -11217,12 +11217,12 @@ _0807A02E: b _0807A09E .align 2, 0 _0807A068: .4byte gMonBackPicTable -_0807A06C: .4byte gUnknown_081E9114 +_0807A06C: .4byte gMonBackPicCoords _0807A070: .4byte 0x06010000 _0807A074: .4byte 0x040000d4 _0807A078: .4byte 0x84000200 _0807A07C: .4byte gSpriteTemplate_837F5B0 -_0807A080: .4byte gUnknown_081E7C74 +_0807A080: .4byte gMonFrontPicCoords _0807A084: lsls r0, r7, 1 adds r0, r7 @@ -11272,7 +11272,7 @@ _0807A0D0: bx r1 .align 2, 0 _0807A0E4: .4byte gSpriteTemplate_837F5B0 -_0807A0E8: .4byte gUnknown_081E9114 +_0807A0E8: .4byte gMonBackPicCoords _0807A0EC: .4byte 0x02020004 _0807A0F0: .4byte gSpriteAffineAnimTable_81E7C18 thumb_func_end sub_8079F44 @@ -11354,7 +11354,7 @@ _0807A17A: ldr r0, _0807A180 b _0807A33C .align 2, 0 -_0807A180: .4byte gUnknown_081E9114 +_0807A180: .4byte gMonBackPicCoords _0807A184: ldr r0, _0807A19C cmp r7, r0 @@ -11370,7 +11370,7 @@ _0807A18C: b _0807A33C .align 2, 0 _0807A19C: .4byte 0x00000181 -_0807A1A0: .4byte gUnknown_081E9114 +_0807A1A0: .4byte gMonBackPicCoords _0807A1A4: mov r0, r8 bl battle_side_get_owner @@ -11454,7 +11454,7 @@ _0807A246: ldr r0, _0807A24C b _0807A33C .align 2, 0 -_0807A24C: .4byte gUnknown_081E9114 +_0807A24C: .4byte gMonBackPicCoords _0807A250: movs r0, 0xCE lsls r0, 1 @@ -11464,13 +11464,13 @@ _0807A258: ldr r4, _0807A25C b _0807A33E .align 2, 0 -_0807A25C: .4byte gUnknown_081E9114 +_0807A25C: .4byte gMonBackPicCoords _0807A260: lsls r1, r7, 2 ldr r0, _0807A268 b _0807A33C .align 2, 0 -_0807A268: .4byte gUnknown_081E9114 +_0807A268: .4byte gMonBackPicCoords _0807A26C: mov r0, r8 lsls r2, r0, 2 @@ -11571,7 +11571,7 @@ _0807A328: ldr r4, _0807A334 b _0807A33E .align 2, 0 -_0807A334: .4byte gUnknown_081E7C74 +_0807A334: .4byte gMonFrontPicCoords _0807A338: lsls r1, r7, 2 _0807A33A: @@ -11588,7 +11588,7 @@ _0807A33E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807A350: .4byte gUnknown_081E7C74 +_0807A350: .4byte gMonFrontPicCoords _0807A354: .4byte _0807A358 .align 2, 0 _0807A358: diff --git a/data/data2.s b/data/data2.s index 352c07d82..c50ffd088 100644 --- a/data/data2.s +++ b/data/data2.s @@ -244,14 +244,14 @@ gSpriteAnimTable_81E7C64:: @ 81E7C64 .4byte gSpriteAnim_81E7C54 .4byte gSpriteAnim_81E7C5C -gUnknown_081E7C74:: @ 81E7C74 - .incbin "baserom.gba", 0x001e7c74, 0x6e0 +@ 81E7C74 + .include "data/graphics/pokemon/front_pic_coords.s" @ 81E8354 .include "data/graphics/pokemon/front_pic_table.s" -gUnknown_081E9114:: @ 81E9114 - .incbin "baserom.gba", 0x001e9114, 0x6e0 +@ 81E9114 + .include "data/graphics/pokemon/back_pic_coords.s" @ 81E97F4 .include "data/graphics/pokemon/back_pic_table.s" @@ -698,8 +698,8 @@ gUnknown_081EC2A4:: @ 81EC2A4 .4byte gSpriteAnimTable_81EC29C .4byte gSpriteAnimTable_81EC2A0 -gUnknown_081EC3F0:: @ 81EC3F0 - .incbin "baserom.gba", 0x001ec3f0, 0x14c +@ 81EC3F0 + .include "data/graphics/trainers/front_pic_coords.s" @ 81EC53C .include "data/graphics/trainers/front_pic_table.s" @@ -755,8 +755,8 @@ gUnknown_081ECACC:: @ 81ECACC .4byte gSpriteAnimTable_81ECABC .4byte gSpriteAnimTable_81ECAC4 -gUnknown_081ECAD8:: @ 81ECAD8 - .incbin "baserom.gba", 0x001ecad8, 0xc +@ 81ECAD8 + .include "data/graphics/trainers/back_pic_coords.s" @ 81ECAE4 .include "data/graphics/trainers/back_pic_table.s" diff --git a/data/graphics/pokemon/back_pic_coords.s b/data/graphics/pokemon/back_pic_coords.s new file mode 100644 index 000000000..71c81a81b --- /dev/null +++ b/data/graphics/pokemon/back_pic_coords.s @@ -0,0 +1,442 @@ + .align 2 +gMonBackPicCoords:: @ 81E9114 + .byte 136, 0, 0, 0 + .byte 100, 16, 0, 0 + .byte 102, 9, 0, 0 + .byte 135, 7, 0, 0 + .byte 101, 14, 0, 0 + .byte 102, 9, 0, 0 + .byte 135, 4, 0, 0 + .byte 101, 14, 0, 0 + .byte 118, 10, 0, 0 + .byte 135, 7, 0, 0 + .byte 85, 13, 0, 0 + .byte 101, 12, 0, 0 + .byte 119, 6, 0, 0 + .byte 86, 11, 0, 0 + .byte 70, 10, 0, 0 + .byte 134, 9, 0, 0 + .byte 102, 8, 0, 0 + .byte 133, 12, 0, 0 + .byte 120, 2, 0, 0 + .byte 101, 13, 0, 0 + .byte 117, 13, 0, 0 + .byte 101, 12, 0, 0 + .byte 135, 5, 0, 0 + .byte 102, 9, 0, 0 + .byte 119, 4, 0, 0 + .byte 119, 7, 0, 0 + .byte 102, 8, 0, 0 + .byte 101, 13, 0, 0 + .byte 134, 9, 0, 0 + .byte 85, 12, 0, 0 + .byte 134, 10, 0, 0 + .byte 119, 6, 0, 0 + .byte 86, 8, 0, 0 + .byte 134, 9, 0, 0 + .byte 136, 3, 0, 0 + .byte 101, 13, 0, 0 + .byte 118, 10, 0, 0 + .byte 118, 9, 0, 0 + .byte 119, 5, 0, 0 + .byte 101, 13, 0, 0 + .byte 102, 8, 0, 0 + .byte 118, 11, 0, 0 + .byte 135, 6, 0, 0 + .byte 86, 11, 0, 0 + .byte 102, 10, 0, 0 + .byte 135, 7, 0, 0 + .byte 99, 20, 0, 0 + .byte 135, 7, 0, 0 + .byte 119, 6, 0, 0 + .byte 119, 4, 0, 0 + .byte 84, 16, 0, 0 + .byte 102, 11, 0, 0 + .byte 101, 12, 0, 0 + .byte 135, 7, 0, 0 + .byte 103, 7, 0, 0 + .byte 119, 5, 0, 0 + .byte 118, 11, 0, 0 + .byte 119, 7, 0, 0 + .byte 102, 8, 0, 0 + .byte 135, 6, 0, 0 + .byte 116, 16, 0, 0 + .byte 101, 12, 0, 0 + .byte 134, 11, 0, 0 + .byte 102, 11, 0, 0 + .byte 118, 8, 0, 0 + .byte 103, 5, 0, 0 + .byte 101, 12, 0, 0 + .byte 118, 9, 0, 0 + .byte 103, 4, 0, 0 + .byte 102, 10, 0, 0 + .byte 102, 9, 0, 0 + .byte 135, 6, 0, 0 + .byte 86, 10, 0, 0 + .byte 134, 11, 0, 0 + .byte 102, 11, 0, 0 + .byte 117, 12, 0, 0 + .byte 132, 16, 0, 0 + .byte 102, 9, 0, 0 + .byte 135, 5, 0, 0 + .byte 133, 14, 0, 0 + .byte 134, 10, 0, 0 + .byte 67, 20, 0, 0 + .byte 102, 10, 0, 0 + .byte 102, 10, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 1, 0, 0 + .byte 102, 10, 0, 0 + .byte 119, 5, 0, 0 + .byte 117, 12, 0, 0 + .byte 135, 5, 0, 0 + .byte 118, 11, 0, 0 + .byte 135, 6, 0, 0 + .byte 133, 14, 0, 0 + .byte 118, 8, 0, 0 + .byte 118, 9, 0, 0 + .byte 120, 0, 0, 0 + .byte 101, 13, 0, 0 + .byte 102, 9, 0, 0 + .byte 102, 10, 0, 0 + .byte 119, 4, 0, 0 + .byte 85, 14, 0, 0 + .byte 101, 13, 0, 0 + .byte 101, 13, 0, 0 + .byte 135, 4, 0, 0 + .byte 102, 10, 0, 0 + .byte 102, 8, 0, 0 + .byte 101, 12, 0, 0 + .byte 101, 12, 0, 0 + .byte 101, 14, 0, 0 + .byte 102, 9, 0, 0 + .byte 119, 6, 0, 0 + .byte 133, 12, 0, 0 + .byte 136, 3, 0, 0 + .byte 134, 11, 0, 0 + .byte 133, 14, 0, 0 + .byte 119, 5, 0, 0 + .byte 102, 9, 0, 0 + .byte 102, 8, 0, 0 + .byte 102, 8, 0, 0 + .byte 118, 11, 0, 0 + .byte 101, 13, 0, 0 + .byte 133, 14, 0, 0 + .byte 133, 13, 0, 0 + .byte 119, 7, 0, 0 + .byte 134, 10, 0, 0 + .byte 102, 8, 0, 0 + .byte 102, 8, 0, 0 + .byte 102, 9, 0, 0 + .byte 133, 13, 0, 0 + .byte 118, 9, 0, 0 + .byte 120, 0, 0, 0 + .byte 119, 4, 0, 0 + .byte 84, 17, 0, 0 + .byte 102, 10, 0, 0 + .byte 102, 10, 0, 0 + .byte 135, 6, 0, 0 + .byte 103, 5, 0, 0 + .byte 101, 13, 0, 0 + .byte 102, 10, 0, 0 + .byte 102, 8, 0, 0 + .byte 101, 13, 0, 0 + .byte 119, 5, 0, 0 + .byte 134, 8, 0, 0 + .byte 134, 11, 0, 0 + .byte 101, 12, 0, 0 + .byte 118, 11, 0, 0 + .byte 135, 4, 0, 0 + .byte 102, 9, 0, 0 + .byte 120, 0, 0, 0 + .byte 135, 6, 0, 0 + .byte 120, 1, 0, 0 + .byte 102, 8, 0, 0 + .byte 86, 10, 0, 0 + .byte 102, 8, 0, 0 + .byte 120, 0, 0, 0 + .byte 118, 9, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 102, 11, 0, 0 + .byte 103, 7, 0, 0 + .byte 136, 1, 0, 0 + .byte 103, 5, 0, 0 + .byte 102, 8, 0, 0 + .byte 102, 8, 0, 0 + .byte 104, 3, 0, 0 + .byte 118, 11, 0, 0 + .byte 119, 7, 0, 0 + .byte 115, 21, 0, 0 + .byte 134, 11, 0, 0 + .byte 135, 5, 0, 0 + .byte 134, 8, 0, 0 + .byte 134, 8, 0, 0 + .byte 102, 11, 0, 0 + .byte 101, 15, 0, 0 + .byte 102, 11, 0, 0 + .byte 84, 16, 0, 0 + .byte 102, 8, 0, 0 + .byte 84, 17, 0, 0 + .byte 118, 8, 0, 0 + .byte 102, 9, 0, 0 + .byte 102, 9, 0, 0 + .byte 136, 1, 0, 0 + .byte 102, 11, 0, 0 + .byte 117, 12, 0, 0 + .byte 134, 8, 0, 0 + .byte 102, 8, 0, 0 + .byte 102, 9, 0, 0 + .byte 102, 11, 0, 0 + .byte 101, 13, 0, 0 + .byte 135, 4, 0, 0 + .byte 102, 9, 0, 0 + .byte 86, 10, 0, 0 + .byte 102, 8, 0, 0 + .byte 119, 4, 0, 0 + .byte 133, 15, 0, 0 + .byte 118, 8, 0, 0 + .byte 118, 11, 0, 0 + .byte 135, 4, 0, 0 + .byte 102, 9, 0, 0 + .byte 102, 8, 0, 0 + .byte 102, 10, 0, 0 + .byte 54, 8, 0, 0 + .byte 117, 12, 0, 0 + .byte 135, 5, 0, 0 + .byte 101, 15, 0, 0 + .byte 132, 16, 0, 0 + .byte 133, 15, 0, 0 + .byte 135, 5, 0, 0 + .byte 136, 0, 0, 0 + .byte 118, 10, 0, 0 + .byte 135, 5, 0, 0 + .byte 119, 7, 0, 0 + .byte 119, 4, 0, 0 + .byte 86, 11, 0, 0 + .byte 119, 4, 0, 0 + .byte 102, 8, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 3, 0, 0 + .byte 102, 8, 0, 0 + .byte 118, 9, 0, 0 + .byte 99, 21, 0, 0 + .byte 117, 13, 0, 0 + .byte 101, 12, 0, 0 + .byte 117, 13, 0, 0 + .byte 102, 10, 0, 0 + .byte 103, 6, 0, 0 + .byte 135, 7, 0, 0 + .byte 135, 4, 0, 0 + .byte 85, 12, 0, 0 + .byte 135, 7, 0, 0 + .byte 135, 6, 0, 0 + .byte 101, 14, 0, 0 + .byte 133, 13, 0, 0 + .byte 118, 10, 0, 0 + .byte 120, 3, 0, 0 + .byte 118, 10, 0, 0 + .byte 102, 8, 0, 0 + .byte 135, 5, 0, 0 + .byte 86, 9, 0, 0 + .byte 102, 8, 0, 0 + .byte 102, 11, 0, 0 + .byte 135, 7, 0, 0 + .byte 133, 13, 0, 0 + .byte 134, 10, 0, 0 + .byte 135, 6, 0, 0 + .byte 136, 3, 0, 0 + .byte 102, 8, 0, 0 + .byte 103, 5, 0, 0 + .byte 136, 0, 0, 0 + .byte 136, 1, 0, 0 + .byte 136, 1, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 2, 0, 0 + .byte 135, 6, 0, 0 + .byte 134, 8, 0, 0 + .byte 136, 1, 0, 0 + .byte 103, 5, 0, 0 + .byte 136, 0, 0, 0 + .byte 136, 0, 0, 0 + .byte 119, 5, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 5, 0, 0 + .byte 118, 9, 0, 0 + .byte 135, 4, 0, 0 + .byte 118, 11, 0, 0 + .byte 133, 15, 0, 0 + .byte 118, 11, 0, 0 + .byte 131, 21, 0, 0 + .byte 136, 0, 0, 0 + .byte 115, 20, 0, 0 + .byte 131, 20, 0, 0 + .byte 117, 15, 0, 0 + .byte 134, 8, 0, 0 + .byte 134, 10, 0, 0 + .byte 134, 9, 0, 0 + .byte 118, 10, 0, 0 + .byte 134, 8, 0, 0 + .byte 131, 20, 0, 0 + .byte 134, 8, 0, 0 + .byte 119, 6, 0, 0 + .byte 100, 17, 0, 0 + .byte 134, 8, 0, 0 + .byte 133, 13, 0, 0 + .byte 135, 4, 0, 0 + .byte 119, 4, 0, 0 + .byte 133, 14, 0, 0 + .byte 135, 6, 0, 0 + .byte 134, 11, 0, 0 + .byte 136, 0, 0, 0 + .byte 131, 21, 0, 0 + .byte 131, 22, 0, 0 + .byte 134, 10, 0, 0 + .byte 134, 8, 0, 0 + .byte 135, 6, 0, 0 + .byte 134, 8, 0, 0 + .byte 135, 7, 0, 0 + .byte 133, 12, 0, 0 + .byte 134, 10, 0, 0 + .byte 118, 8, 0, 0 + .byte 102, 10, 0, 0 + .byte 134, 10, 0, 0 + .byte 70, 10, 0, 0 + .byte 119, 7, 0, 0 + .byte 135, 5, 0, 0 + .byte 103, 7, 0, 0 + .byte 104, 2, 0, 0 + .byte 135, 7, 0, 0 + .byte 136, 2, 0, 0 + .byte 117, 14, 0, 0 + .byte 116, 17, 0, 0 + .byte 136, 2, 0, 0 + .byte 118, 11, 0, 0 + .byte 135, 7, 0, 0 + .byte 132, 16, 0, 0 + .byte 135, 4, 0, 0 + .byte 134, 11, 0, 0 + .byte 132, 19, 0, 0 + .byte 100, 18, 0, 0 + .byte 134, 10, 0, 0 + .byte 135, 6, 0, 0 + .byte 133, 15, 0, 0 + .byte 135, 7, 0, 0 + .byte 118, 10, 0, 0 + .byte 133, 12, 0, 0 + .byte 135, 5, 0, 0 + .byte 135, 5, 0, 0 + .byte 134, 10, 0, 0 + .byte 86, 11, 0, 0 + .byte 135, 4, 0, 0 + .byte 118, 8, 0, 0 + .byte 118, 8, 0, 0 + .byte 135, 4, 0, 0 + .byte 118, 11, 0, 0 + .byte 104, 3, 0, 0 + .byte 134, 9, 0, 0 + .byte 135, 6, 0, 0 + .byte 119, 7, 0, 0 + .byte 102, 11, 0, 0 + .byte 134, 8, 0, 0 + .byte 134, 8, 0, 0 + .byte 133, 15, 0, 0 + .byte 134, 10, 0, 0 + .byte 134, 8, 0, 0 + .byte 102, 11, 0, 0 + .byte 119, 6, 0, 0 + .byte 135, 7, 0, 0 + .byte 133, 13, 0, 0 + .byte 134, 9, 0, 0 + .byte 136, 3, 0, 0 + .byte 133, 13, 0, 0 + .byte 104, 2, 0, 0 + .byte 119, 5, 0, 0 + .byte 120, 3, 0, 0 + .byte 119, 6, 0, 0 + .byte 101, 12, 0, 0 + .byte 136, 3, 0, 0 + .byte 136, 1, 0, 0 + .byte 134, 10, 0, 0 + .byte 84, 17, 0, 0 + .byte 132, 17, 0, 0 + .byte 135, 7, 0, 0 + .byte 69, 13, 0, 0 + .byte 118, 8, 0, 0 + .byte 103, 6, 0, 0 + .byte 134, 9, 0, 0 + .byte 119, 4, 0, 0 + .byte 131, 23, 0, 0 + .byte 119, 5, 0, 0 + .byte 69, 13, 0, 0 + .byte 87, 6, 0, 0 + .byte 119, 4, 0, 0 + .byte 102, 8, 0, 0 + .byte 133, 13, 0, 0 + .byte 119, 6, 0, 0 + .byte 102, 10, 0, 0 + .byte 132, 16, 0, 0 + .byte 131, 20, 0, 0 + .byte 134, 10, 0, 0 + .byte 133, 14, 0, 0 + .byte 133, 14, 0, 0 + .byte 132, 19, 0, 0 + .byte 135, 7, 0, 0 + .byte 120, 0, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 3, 0, 0 + .byte 135, 5, 0, 0 + .byte 134, 9, 0, 0 + .byte 71, 7, 0, 0 + .byte 54, 10, 0, 0 + .byte 86, 9, 0, 0 + .byte 103, 6, 0, 0 + .byte 86, 8, 0, 0 + .byte 86, 10, 0, 0 + .byte 102, 10, 0, 0 + .byte 87, 5, 0, 0 + .byte 102, 8, 0, 0 + .byte 55, 7, 0, 0 + .byte 70, 9, 0, 0 + .byte 87, 7, 0, 0 + .byte 70, 10, 0, 0 + .byte 101, 13, 0, 0 + .byte 101, 13, 0, 0 + .byte 102, 8, 0, 0 + .byte 70, 10, 0, 0 + .byte 85, 15, 0, 0 + .byte 69, 12, 0, 0 + .byte 87, 4, 0, 0 + .byte 69, 13, 0, 0 + .byte 101, 13, 0, 0 + .byte 86, 11, 0, 0 + .byte 85, 13, 0, 0 + .byte 85, 15, 0, 0 + .byte 70, 10, 0, 0 + .byte 70, 10, 0, 0 + .byte 55, 6, 0, 0 + .byte 71, 6, 0, 0 diff --git a/data/graphics/pokemon/front_pic_coords.s b/data/graphics/pokemon/front_pic_coords.s new file mode 100644 index 000000000..bda4eac5d --- /dev/null +++ b/data/graphics/pokemon/front_pic_coords.s @@ -0,0 +1,442 @@ + .align 2 +gMonFrontPicCoords:: @ 81E7C74 + .byte 136, 0, 0, 0 + .byte 69, 14, 0, 0 + .byte 86, 10, 0, 0 + .byte 136, 3, 0, 0 + .byte 85, 12, 0, 0 + .byte 102, 9, 0, 0 + .byte 136, 1, 0, 0 + .byte 101, 13, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 0, 0, 0 + .byte 69, 16, 0, 0 + .byte 84, 20, 0, 0 + .byte 118, 9, 0, 0 + .byte 84, 18, 0, 0 + .byte 69, 14, 0, 0 + .byte 134, 9, 0, 0 + .byte 101, 13, 0, 0 + .byte 103, 11, 0, 0 + .byte 136, 1, 0, 0 + .byte 68, 16, 0, 0 + .byte 102, 11, 0, 0 + .byte 69, 15, 0, 0 + .byte 120, 0, 0, 0 + .byte 101, 12, 0, 0 + .byte 136, 2, 0, 0 + .byte 103, 9, 0, 0 + .byte 103, 4, 0, 0 + .byte 85, 14, 0, 0 + .byte 118, 9, 0, 0 + .byte 69, 15, 0, 0 + .byte 102, 11, 0, 0 + .byte 120, 3, 0, 0 + .byte 85, 12, 0, 0 + .byte 102, 9, 0, 0 + .byte 120, 2, 0, 0 + .byte 85, 16, 0, 0 + .byte 102, 8, 0, 0 + .byte 101, 12, 0, 0 + .byte 136, 3, 0, 0 + .byte 69, 16, 0, 0 + .byte 103, 8, 0, 0 + .byte 103, 6, 0, 0 + .byte 136, 3, 0, 0 + .byte 69, 15, 0, 0 + .byte 102, 10, 0, 0 + .byte 119, 6, 0, 0 + .byte 85, 15, 0, 0 + .byte 134, 8, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 2, 0, 0 + .byte 84, 18, 0, 0 + .byte 117, 13, 0, 0 + .byte 85, 12, 0, 0 + .byte 119, 7, 0, 0 + .byte 86, 9, 0, 0 + .byte 120, 2, 0, 0 + .byte 101, 14, 0, 0 + .byte 119, 7, 0, 0 + .byte 102, 11, 0, 0 + .byte 136, 2, 0, 0 + .byte 116, 19, 0, 0 + .byte 118, 10, 0, 0 + .byte 118, 8, 0, 0 + .byte 102, 11, 0, 0 + .byte 119, 5, 0, 0 + .byte 135, 4, 0, 0 + .byte 86, 11, 0, 0 + .byte 103, 6, 0, 0 + .byte 136, 1, 0, 0 + .byte 101, 15, 0, 0 + .byte 102, 11, 0, 0 + .byte 119, 5, 0, 0 + .byte 70, 9, 0, 0 + .byte 135, 4, 0, 0 + .byte 84, 18, 0, 0 + .byte 135, 4, 0, 0 + .byte 119, 5, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 1, 0, 0 + .byte 102, 11, 0, 0 + .byte 134, 8, 0, 0 + .byte 67, 21, 0, 0 + .byte 118, 8, 0, 0 + .byte 102, 9, 0, 0 + .byte 87, 5, 0, 0 + .byte 136, 0, 0, 0 + .byte 118, 10, 0, 0 + .byte 135, 7, 0, 0 + .byte 101, 12, 0, 0 + .byte 135, 4, 0, 0 + .byte 85, 16, 0, 0 + .byte 135, 5, 0, 0 + .byte 119, 6, 0, 0 + .byte 119, 5, 0, 0 + .byte 119, 5, 0, 0 + .byte 120, 2, 0, 0 + .byte 119, 7, 0, 0 + .byte 119, 4, 0, 0 + .byte 101, 13, 0, 0 + .byte 136, 3, 0, 0 + .byte 68, 19, 0, 0 + .byte 85, 14, 0, 0 + .byte 135, 7, 0, 0 + .byte 136, 0, 0, 0 + .byte 85, 15, 0, 0 + .byte 118, 11, 0, 0 + .byte 135, 4, 0, 0 + .byte 103, 4, 0, 0 + .byte 134, 8, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 2, 0, 0 + .byte 118, 9, 0, 0 + .byte 136, 2, 0, 0 + .byte 118, 9, 0, 0 + .byte 103, 7, 0, 0 + .byte 136, 0, 0, 0 + .byte 69, 15, 0, 0 + .byte 103, 7, 0, 0 + .byte 102, 10, 0, 0 + .byte 119, 4, 0, 0 + .byte 102, 10, 0, 0 + .byte 119, 6, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 0, 0, 0 + .byte 119, 4, 0, 0 + .byte 120, 2, 0, 0 + .byte 119, 4, 0, 0 + .byte 119, 4, 0, 0 + .byte 120, 0, 0, 0 + .byte 103, 6, 0, 0 + .byte 136, 8, 0, 0 + .byte 133, 13, 0, 0 + .byte 84, 17, 0, 0 + .byte 86, 9, 0, 0 + .byte 103, 6, 0, 0 + .byte 118, 9, 0, 0 + .byte 102, 10, 0, 0 + .byte 85, 13, 0, 0 + .byte 69, 15, 0, 0 + .byte 103, 7, 0, 0 + .byte 84, 17, 0, 0 + .byte 136, 3, 0, 0 + .byte 136, 1, 0, 0 + .byte 135, 5, 0, 0 + .byte 136, 3, 0, 0 + .byte 135, 4, 0, 0 + .byte 136, 0, 0, 0 + .byte 117, 14, 0, 0 + .byte 135, 6, 0, 0 + .byte 136, 0, 0, 0 + .byte 136, 0, 0, 0 + .byte 85, 13, 0, 0 + .byte 117, 13, 0, 0 + .byte 119, 4, 0, 0 + .byte 136, 0, 0, 0 + .byte 85, 14, 0, 0 + .byte 118, 8, 0, 0 + .byte 120, 0, 0, 0 + .byte 85, 15, 0, 0 + .byte 103, 6, 0, 0 + .byte 136, 0, 0, 0 + .byte 71, 4, 0, 0 + .byte 103, 7, 0, 0 + .byte 85, 13, 0, 0 + .byte 88, 3, 0, 0 + .byte 86, 12, 0, 0 + .byte 103, 4, 0, 0 + .byte 84, 19, 0, 0 + .byte 135, 5, 0, 0 + .byte 136, 0, 0, 0 + .byte 117, 16, 0, 0 + .byte 135, 11, 0, 0 + .byte 69, 12, 0, 0 + .byte 68, 20, 0, 0 + .byte 68, 18, 0, 0 + .byte 52, 20, 0, 0 + .byte 70, 9, 0, 0 + .byte 68, 20, 0, 0 + .byte 71, 7, 0, 0 + .byte 85, 16, 0, 0 + .byte 86, 10, 0, 0 + .byte 119, 5, 0, 0 + .byte 69, 14, 0, 0 + .byte 101, 14, 0, 0 + .byte 118, 9, 0, 0 + .byte 103, 6, 0, 0 + .byte 103, 6, 0, 0 + .byte 102, 10, 0, 0 + .byte 85, 15, 0, 0 + .byte 119, 7, 0, 0 + .byte 88, 3, 0, 0 + .byte 68, 16, 0, 0 + .byte 86, 8, 0, 0 + .byte 134, 10, 0, 0 + .byte 84, 16, 0, 0 + .byte 119, 7, 0, 0 + .byte 102, 8, 0, 0 + .byte 103, 8, 0, 0 + .byte 102, 11, 0, 0 + .byte 88, 1, 0, 0 + .byte 85, 12, 0, 0 + .byte 53, 15, 0, 0 + .byte 119, 6, 0, 0 + .byte 136, 3, 0, 0 + .byte 86, 10, 0, 0 + .byte 118, 9, 0, 0 + .byte 116, 17, 0, 0 + .byte 120, 3, 0, 0 + .byte 136, 0, 0, 0 + .byte 85, 13, 0, 0 + .byte 87, 6, 0, 0 + .byte 86, 10, 0, 0 + .byte 136, 0, 0, 0 + .byte 102, 9, 0, 0 + .byte 136, 3, 0, 0 + .byte 103, 5, 0, 0 + .byte 69, 13, 0, 0 + .byte 120, 1, 0, 0 + .byte 69, 13, 0, 0 + .byte 87, 13, 0, 0 + .byte 67, 20, 0, 0 + .byte 102, 8, 0, 0 + .byte 101, 12, 0, 0 + .byte 85, 14, 0, 0 + .byte 102, 10, 0, 0 + .byte 86, 8, 0, 0 + .byte 136, 1, 0, 0 + .byte 136, 0, 0, 0 + .byte 86, 11, 0, 0 + .byte 119, 5, 0, 0 + .byte 120, 4, 0, 0 + .byte 84, 16, 0, 0 + .byte 134, 8, 0, 0 + .byte 85, 15, 0, 0 + .byte 136, 0, 0, 0 + .byte 119, 6, 0, 0 + .byte 70, 9, 0, 0 + .byte 103, 5, 0, 0 + .byte 53, 15, 0, 0 + .byte 118, 10, 0, 0 + .byte 69, 13, 0, 0 + .byte 119, 4, 0, 0 + .byte 119, 6, 0, 0 + .byte 136, 0, 0, 0 + .byte 136, 0, 0, 0 + .byte 136, 0, 0, 0 + .byte 70, 9, 0, 0 + .byte 86, 9, 0, 0 + .byte 136, 0, 0, 0 + .byte 136, 0, 0, 0 + .byte 136, 0, 0, 0 + .byte 85, 14, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 135, 4, 0, 0 + .byte 102, 8, 0, 0 + .byte 135, 4, 0, 0 + .byte 136, 0, 0, 0 + .byte 86, 8, 0, 0 + .byte 136, 1, 0, 0 + .byte 136, 0, 0, 0 + .byte 86, 12, 0, 0 + .byte 103, 6, 0, 0 + .byte 136, 0, 0, 0 + .byte 85, 12, 0, 0 + .byte 135, 4, 0, 0 + .byte 133, 15, 0, 0 + .byte 120, 3, 0, 0 + .byte 69, 14, 0, 0 + .byte 117, 17, 0, 0 + .byte 134, 9, 0, 0 + .byte 116, 16, 0, 0 + .byte 134, 15, 0, 0 + .byte 101, 14, 0, 0 + .byte 102, 9, 0, 0 + .byte 136, 0, 0, 0 + .byte 70, 16, 0, 0 + .byte 86, 8, 0, 0 + .byte 136, 2, 0, 0 + .byte 116, 18, 0, 0 + .byte 134, 10, 0, 0 + .byte 102, 10, 0, 0 + .byte 100, 16, 0, 0 + .byte 135, 6, 0, 0 + .byte 84, 16, 0, 0 + .byte 119, 4, 0, 0 + .byte 104, 1, 0, 0 + .byte 132, 24, 0, 0 + .byte 119, 4, 0, 0 + .byte 101, 15, 0, 0 + .byte 136, 1, 0, 0 + .byte 117, 15, 0, 0 + .byte 135, 10, 0, 0 + .byte 102, 11, 0, 0 + .byte 102, 8, 0, 0 + .byte 103, 7, 0, 0 + .byte 85, 16, 0, 0 + .byte 120, 6, 0, 0 + .byte 86, 12, 0, 0 + .byte 136, 2, 0, 0 + .byte 102, 9, 0, 0 + .byte 70, 11, 0, 0 + .byte 118, 9, 0, 0 + .byte 70, 24, 0, 0 + .byte 102, 12, 0, 0 + .byte 136, 1, 0, 0 + .byte 70, 13, 0, 0 + .byte 136, 0, 0, 0 + .byte 103, 6, 0, 0 + .byte 120, 3, 0, 0 + .byte 84, 16, 0, 0 + .byte 134, 12, 0, 0 + .byte 136, 1, 0, 0 + .byte 101, 12, 0, 0 + .byte 136, 1, 0, 0 + .byte 100, 18, 0, 0 + .byte 103, 4, 0, 0 + .byte 101, 15, 0, 0 + .byte 135, 9, 0, 0 + .byte 101, 16, 0, 0 + .byte 134, 10, 0, 0 + .byte 136, 1, 0, 0 + .byte 116, 16, 0, 0 + .byte 136, 0, 0, 0 + .byte 86, 11, 0, 0 + .byte 118, 10, 0, 0 + .byte 102, 9, 0, 0 + .byte 136, 1, 0, 0 + .byte 85, 15, 0, 0 + .byte 70, 9, 0, 0 + .byte 119, 5, 0, 0 + .byte 86, 14, 0, 0 + .byte 102, 12, 0, 0 + .byte 118, 8, 0, 0 + .byte 101, 12, 0, 0 + .byte 104, 1, 0, 0 + .byte 118, 17, 0, 0 + .byte 136, 2, 0, 0 + .byte 85, 12, 0, 0 + .byte 102, 10, 0, 0 + .byte 119, 5, 0, 0 + .byte 118, 8, 0, 0 + .byte 116, 18, 0, 0 + .byte 120, 0, 0, 0 + .byte 134, 8, 0, 0 + .byte 85, 18, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 0, 0, 0 + .byte 85, 14, 0, 0 + .byte 120, 3, 0, 0 + .byte 136, 1, 0, 0 + .byte 85, 14, 0, 0 + .byte 120, 3, 0, 0 + .byte 134, 11, 0, 0 + .byte 104, 0, 0, 0 + .byte 86, 14, 0, 0 + .byte 85, 12, 0, 0 + .byte 119, 8, 0, 0 + .byte 135, 5, 0, 0 + .byte 119, 11, 0, 0 + .byte 67, 20, 0, 0 + .byte 117, 13, 0, 0 + .byte 136, 0, 0, 0 + .byte 52, 17, 0, 0 + .byte 102, 8, 0, 0 + .byte 86, 8, 0, 0 + .byte 103, 7, 0, 0 + .byte 120, 0, 0, 0 + .byte 102, 8, 0, 0 + .byte 136, 0, 0, 0 + .byte 53, 15, 0, 0 + .byte 71, 6, 0, 0 + .byte 120, 1, 0, 0 + .byte 86, 11, 0, 0 + .byte 102, 9, 0, 0 + .byte 135, 4, 0, 0 + .byte 85, 15, 0, 0 + .byte 135, 7, 0, 0 + .byte 135, 6, 0, 0 + .byte 120, 4, 0, 0 + .byte 136, 2, 0, 0 + .byte 136, 3, 0, 0 + .byte 135, 4, 0, 0 + .byte 136, 1, 0, 0 + .byte 136, 0, 0, 0 + .byte 136, 1, 0, 0 + .byte 136, 2, 0, 0 + .byte 102, 13, 0, 0 + .byte 136, 1, 0, 0 + .byte 55, 6, 0, 0 + .byte 51, 20, 0, 0 + .byte 52, 16, 0, 0 + .byte 68, 16, 0, 0 + .byte 68, 16, 0, 0 + .byte 68, 17, 0, 0 + .byte 68, 17, 0, 0 + .byte 53, 14, 0, 0 + .byte 68, 16, 0, 0 + .byte 52, 16, 0, 0 + .byte 52, 17, 0, 0 + .byte 68, 17, 0, 0 + .byte 52, 19, 0, 0 + .byte 68, 19, 0, 0 + .byte 67, 20, 0, 0 + .byte 68, 16, 0, 0 + .byte 52, 19, 0, 0 + .byte 67, 21, 0, 0 + .byte 52, 19, 0, 0 + .byte 69, 12, 0, 0 + .byte 52, 18, 0, 0 + .byte 68, 18, 0, 0 + .byte 68, 18, 0, 0 + .byte 68, 19, 0, 0 + .byte 51, 21, 0, 0 + .byte 52, 17, 0, 0 + .byte 52, 16, 0, 0 + .byte 53, 15, 0, 0 + .byte 53, 13, 0, 0 diff --git a/data/graphics/trainers/back_pic_coords.s b/data/graphics/trainers/back_pic_coords.s new file mode 100644 index 000000000..e1c0b0e60 --- /dev/null +++ b/data/graphics/trainers/back_pic_coords.s @@ -0,0 +1,5 @@ + .align 2 +gTrainerBackPicCoords:: @ 81ECAD8 + .byte 8, 4, 0, 0 + .byte 8, 4, 0, 0 + .byte 8, 4, 0, 0 diff --git a/data/graphics/trainers/front_pic_coords.s b/data/graphics/trainers/front_pic_coords.s new file mode 100644 index 000000000..c095febdb --- /dev/null +++ b/data/graphics/trainers/front_pic_coords.s @@ -0,0 +1,85 @@ + .align 2 +gTrainerFrontPicCoords:: @ 81EC3F0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 2, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 2, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 2, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 2, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 + .byte 8, 1, 0, 0 |