From 2582f7e44b46f6f83007928fb2992ff3d1f235b4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Nov 2019 09:29:07 -0500 Subject: Dump tileset anims data --- data/tileset_anims.s | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'data') diff --git a/data/tileset_anims.s b/data/tileset_anims.s index 5f2320fd3..bd9a27175 100644 --- a/data/tileset_anims.s +++ b/data/tileset_anims.s @@ -1,28 +1,2 @@ .section .rodata .align 2 -gUnknown_83A73E0:: @ 83A73E0 - .incbin "baserom.gba", 0x3A73E0, 0x280 - -gUnknown_83A7660:: @ 83A7660 - .incbin "baserom.gba", 0x3A7660, 0x2FF4 - -gUnknown_83AA654:: @ 83AA654 - .incbin "baserom.gba", 0x3AA654, 0x1220 - -gUnknown_83AB874:: @ 83AB874 - .incbin "baserom.gba", 0x3AB874, 0x540 - -gUnknown_83ABDB4:: @ 83ABDB4 - .incbin "baserom.gba", 0x3ABDB4, 0x434 - -gUnknown_83AC1E8:: @ 83AC1E8 - .incbin "baserom.gba", 0x3AC1E8, 0x410 - -gUnknown_83AC5F8:: @ 83AC5F8 - .incbin "baserom.gba", 0x3AC5F8, 0x1D0 - -gUnknown_83AC7C8:: @ 83AC7C8 - .incbin "baserom.gba", 0x3AC7C8, 0x188 - -gUnknown_83AC950:: @ 83AC950 - .incbin "baserom.gba", 0x3AC950, 0x10 -- cgit v1.2.3 From d83039f7c84ebd14e4e276fea806194317968d0a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Nov 2019 10:14:43 -0500 Subject: Disassemble data/field_ground_effect --- data/field_ground_effect.s | 51 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 11 deletions(-) (limited to 'data') diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s index b1f34c8d7..c871b2d4b 100644 --- a/data/field_ground_effect.s +++ b/data/field_ground_effect.s @@ -1,34 +1,63 @@ .section .rodata .align 2 gUnknown_83A7024:: @ 83A7024 - .incbin "baserom.gba", 0x3A7024, 0x8 + .4byte 0x00000020, 0x00000010 gUnknown_83A702C:: @ 83A702C - .incbin "baserom.gba", 0x3A702C, 0x18 + .4byte MetatileBehavior_IsTallGrass_2 + .4byte MetatileBehavior_IsLongGrass + .4byte MetatileBehavior_IsPuddle + .4byte MetatileBehavior_IsSurfable + .4byte MetatileBehavior_IsWaterfallBottom + .4byte MetatileBehavior_UnusedReturnTrue gUnknown_83A7044:: @ 83A7044 - .incbin "baserom.gba", 0x3A7044, 0x18 + .4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000 gUnknown_83A705C:: @ 83A705C - .incbin "baserom.gba", 0x3A705C, 0x10 + .4byte MetatileBehavior_IsJumpSouth + .4byte MetatileBehavior_IsJumpNorth + .4byte MetatileBehavior_IsJumpWest + .4byte MetatileBehavior_IsJumpEast gUnknown_83A706C:: @ 83A706C - .incbin "baserom.gba", 0x3A706C, 0x10 + .byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 gUnknown_83A707C:: @ 83A707C - .incbin "baserom.gba", 0x3A707C, 0x10 + .byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02 gUnknown_83A708C:: @ 83A708C - .incbin "baserom.gba", 0x3A708C, 0x10 + .byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01 gUnknown_83A709C:: @ 83A709C - .incbin "baserom.gba", 0x3A709C, 0xC + .4byte nullsub_26 + .4byte DoTracksGroundEffect_Footprints + .4byte DoTracksGroundEffect_BikeTireTracks gUnknown_83A70A8:: @ 83A70A8 - .incbin "baserom.gba", 0x3A70A8, 0x4 + .byte 0x0d, 0x00, 0x18, 0x00 gUnknown_83A70AC:: @ 83A70AC - .incbin "baserom.gba", 0x3A70AC, 0x10 + .byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04 gUnknown_83A70BC:: @ 83A70BC - .incbin "baserom.gba", 0x3A70BC, 0x50 + .4byte GroundEffect_SpawnOnTallGrass + .4byte GroundEffect_StepOnTallGrass + .4byte GroundEffect_SpawnOnLongGrass + .4byte GroundEffect_StepOnLongGrass + .4byte GroundEffect_WaterReflection + .4byte GroundEffect_IceReflection + .4byte GroundEffect_FlowingWater + .4byte GroundEffect_SandTracks + .4byte GroundEffect_DeepSandTracks + .4byte GroundEffect_Ripple + .4byte GroundEffect_StepOnPuddle + .4byte GroundEffect_SandHeap + .4byte GroundEffect_JumpOnTallGrass + .4byte GroundEffect_JumpOnLongGrass + .4byte GroundEffect_JumpOnShallowWater + .4byte GroundEffect_JumpOnWater + .4byte GroundEffect_JumpLandingDust + .4byte GroundEffect_ShortGrass + .4byte GroundEffect_HotSprings + .4byte GroundEffect_Seaweed -- cgit v1.2.3 From 4596a9c7bba34a879a5af8f116a9d562d03bac5c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Nov 2019 10:59:22 -0500 Subject: Fix review comments --- data/tileset_anims.s | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 data/tileset_anims.s (limited to 'data') diff --git a/data/tileset_anims.s b/data/tileset_anims.s deleted file mode 100644 index bd9a27175..000000000 --- a/data/tileset_anims.s +++ /dev/null @@ -1,2 +0,0 @@ - .section .rodata - .align 2 -- cgit v1.2.3 From 4eecfaf6642725904d9561b7fb55f25809be0c93 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Nov 2019 12:28:27 -0500 Subject: Dump item_menu data --- data/item_menu.s | 92 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 75 insertions(+), 17 deletions(-) (limited to 'data') diff --git a/data/item_menu.s b/data/item_menu.s index 6b548edbe..b5cc492e3 100644 --- a/data/item_menu.s +++ b/data/item_menu.s @@ -7,52 +7,110 @@ .align 2 gUnknown_8452CF4:: @ 8452CF4 - .incbin "baserom.gba", 0x452CF4, 0x8 + .4byte 0x000001f0 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x000011ed + @ { + @ .bg = 1, + @ .charBaseIndex = 3, + @ .mapBaseIndex = 30, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0000 + @ } gUnknown_8452CFC:: @ 8452CFC - .incbin "baserom.gba", 0x452CFC, 0xC + .4byte gUnknown_84162CD + .4byte gUnknown_84162DE + .4byte gUnknown_84162D3 gUnknown_8452D08:: @ 8452D08 - .incbin "baserom.gba", 0x452D08, 0x1B0 + .incbin "graphics/item_menu/bagmap_0.bin" + .incbin "graphics/item_menu/bagmap_1.bin" + .incbin "graphics/item_menu/bagmap_2.bin" + .incbin "graphics/item_menu/bagmap_3.bin" + .incbin "graphics/item_menu/bagmap_4.bin" + .incbin "graphics/item_menu/bagmap_5.bin" + .incbin "graphics/item_menu/bagmap_6.bin" + .incbin "graphics/item_menu/bagmap_7.bin" + .incbin "graphics/item_menu/bagmap_8.bin" + .incbin "graphics/item_menu/bagmap_9.bin" + .incbin "graphics/item_menu/bagmap_A.bin" + .incbin "graphics/item_menu/bagmap_B.bin" gUnknown_8452EB8:: @ 8452EB8 - .incbin "baserom.gba", 0x452EB8, 0x60 + .4byte gOtherText_Use, sub_8109C50 + .4byte gOtherText_Toss, sub_8109CC0 + .4byte gUnknown_84161A9, sub_810A000 + .4byte gOtherText_Give, sub_810A0A8 + .4byte gFameCheckerText_Cancel, sub_810A2DC + .4byte gOtherText_Use, sub_810A324 + .4byte gUnknown_84161E9, sub_8109C50 + .4byte gUnknown_84161F4, sub_8109C50 + .4byte gUnknown_84161F4, sub_810A324 + .4byte gUnknown_84161BC, sub_8109C50 + .4byte gUnknown_84161F9, sub_810A000 + .4byte gString_Dummy, NULL gUnknown_8452F18:: @ 8452F18 - .incbin "baserom.gba", 0x452F18, 0xC + .byte 0x00, 0x03, 0x01, 0x04 + .byte 0x00, 0x02, 0x04, 0x0b + .byte 0x03, 0x01, 0x04, 0x0b gUnknown_8452F24:: @ 8452F24 - .incbin "baserom.gba", 0x452F24, 0x4 + .byte 0x06, 0x03, 0x01, 0x04 gUnknown_8452F28:: @ 8452F28 - .incbin "baserom.gba", 0x452F28, 0x6 + .byte 0x03, 0x04 + .byte 0x04, 0x0b + .byte 0x03, 0x04 gUnknown_8452F2E:: @ 8452F2E - .incbin "baserom.gba", 0x452F2E, 0x2 + .byte 0x07, 0x04 gUnknown_8452F30:: @ 8452F30 - .incbin "baserom.gba", 0x452F30, 0x2 + .byte 0x05, 0x04 gUnknown_8452F32:: @ 8452F32 - .incbin "baserom.gba", 0x452F32, 0x2 + .byte 0x04, 0x0b gUnknown_8452F34:: @ 8452F34 - .incbin "baserom.gba", 0x452F34, 0x1C + .4byte sub_8109BB8 + .4byte sub_810A370 + .4byte sub_810A568 + .4byte sub_810AB40 + .4byte sub_810A468 + .4byte sub_8109BB8 + .4byte NULL gUnknown_8452F50:: @ 8452F50 - .incbin "baserom.gba", 0x452F50, 0x8 + .4byte sub_8109EA8 + .4byte sub_8109DB0 gUnknown_8452F58:: @ 8452F58 - .incbin "baserom.gba", 0x452F58, 0x8 + .4byte sub_810A940 + .4byte sub_810A720 gUnknown_8452F60:: @ 8452F60 - .incbin "baserom.gba", 0x452F60, 0x6 + .string "{COLOR_HIGHLIGHT_SHADOW RED TRANSPARENT GREEN}$" gUnknown_8452F66:: @ 8452F66 - .incbin "baserom.gba", 0x452F66, 0x6 + .string "{COLOR_HIGHLIGHT_SHADOW LIGHT_GRAY TRANSPARENT BLACK}$" gUnknown_8452F6C:: @ 8452F6C - .incbin "baserom.gba", 0x452F6C, 0x10 + .byte 0, 8, 72, 1, 72, 72 + .2byte 0, 2, 111, 111 + .byte 0 + .align 2 gUnknown_8452F7C:: @ 8452F7C - .incbin "baserom.gba", 0x452F7C, 0xC0 + .incbin "graphics/interface/select_button.4bpp" -- cgit v1.2.3 From cd20ffefb75229b1772b25517a084e18fd4ffe76 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Nov 2019 14:20:38 -0500 Subject: Disassemble data/link_rfu_2.s --- data/link_rfu_2.s | 203 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 184 insertions(+), 19 deletions(-) (limited to 'data') diff --git a/data/link_rfu_2.s b/data/link_rfu_2.s index 9827f17ea..5285ac578 100644 --- a/data/link_rfu_2.s +++ b/data/link_rfu_2.s @@ -7,32 +7,91 @@ .align 2 gUnknown_843EBB4:: @ 843EBB4 - .incbin "baserom.gba", 0x43EBB4, 0x18 + .byte 0x04, 0x20 + .2byte 0x0000 + .byte 0x00 + .align 1 + .2byte 0x0002 + .4byte gUnknown_3005440 + .4byte gUnknown_3005E00 + .byte 0x01, 0x00 + .2byte 0x0258, 0x012c + .align 2 gUnknown_843EBCC:: @ 843EBCC - .incbin "baserom.gba", 0x43EBCC, 0x8 + .byte 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00 gUnknown_843EBD4:: @ 843EBD4 - .incbin "baserom.gba", 0x43EBD4, 0x64 + .4byte 0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f + .4byte 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff + .4byte 0x0000ffff, 0x0001ffff, 0x0003ffff, 0x0007ffff, 0x000fffff, 0x001fffff, 0x003fffff, 0x007fffff + .4byte 0x00ffffff gUnknown_843EC38:: @ 843EC38 - .incbin "baserom.gba", 0x43EC38, 0x9 + .byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02 + .byte 0x03 gUnknown_843EC41:: @ 843EC41 - .incbin "baserom.gba", 0x43EC41, 0x10 + .byte 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02, 0x03 + .byte 0x01, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x04 gUnknown_843EC51:: @ 843EC51 - .incbin "baserom.gba", 0x43EC51, 0x13 + .byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00 + .byte 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00 + .byte 0x00, 0x00, 0x00 gUnknown_843EC64:: @ 843EC64 - .incbin "baserom.gba", 0x43EC64, 0x28 + .4byte gBlockSendBuffer + .2byte 0xc8 + .align 2 + .4byte gBlockSendBuffer + .2byte 0xc8 + .align 2 + .4byte gBlockSendBuffer + .2byte 0x64 + .align 2 + .4byte gBlockSendBuffer + .2byte 0xdc + .align 2 + .4byte gBlockSendBuffer + .2byte 0x28 + .align 2 gUnknown_843EC8C:: @ 843EC8C - .incbin "baserom.gba", 0x43EC8C, 0xFC + .2byte 0x0002, 0x7f7d, 0xffff + + .macro ascipad str, len +1: + .ascii "\str" +2: + .space \len - (2b - 1b) + .endm + +sUnref_843EC92:: + ascipad "RFU WAIT", 15 + ascipad "RFU BOOT", 15 + ascipad "RFU ERROR", 15 + ascipad "RFU RESET", 15 + ascipad "RFU CONFIG", 15 + ascipad "RFU START", 15 + ascipad "RFU SC POLL", 15 + ascipad "RFU SP POLL", 15 + ascipad "RFU START", 15 + ascipad "RFU SEND ERR", 15 + ascipad "RFU CP POLL", 15 + +sUnref_843ED38:: + ascipad " ", 16 + ascipad "RECOVER START ", 16 + ascipad "DISSCONECT ", 16 + ascipad "RECOVER SUUSES", 16 + ascipad "RECOVER FAILED", 16 .align 2 gUnknown_843ED88:: @ 843ED88 - .incbin "baserom.gba", 0x43ED88, 0xC + .4byte sub_80FA834 + .4byte sub_80FAA94 + .4byte sub_80FACF0 .align 2 gUnknown_843ED94:: @ 843ED94 @@ -62,13 +121,15 @@ gUnknown_843EE10:: @ 843EE10 .align 2 gUnknown_843EE28:: @ 843EE28 - .incbin "baserom.gba", 0x43EE28, 0x1F + .asciz " " gUnknown_843EE47:: @ 843EE47 - .incbin "baserom.gba", 0x43EE47, 0x10 + .asciz " " gUnknown_843EE57:: @ 843EE57 - .incbin "baserom.gba", 0x43EE57, 0xD + .asciz " " + .asciz " " + .asciz "*" .align 2 gUnknown_843EE64:: @ 843EE64 @@ -91,22 +152,126 @@ gUnknown_843EE64:: @ 843EE64 .asciz "SEARCH" .align 2 - .incbin "baserom.gba", 0x43EEC0, 0x144 +gUnknown_843EEC0:: + .incbin "graphics/interface/wireless_link_icon.gbapal" + +gUnknown_843EEE0:: + .incbin "graphics/interface/wireless_link_icon.4bpp.lz" gUnknown_843F004:: @ 843F004 - .incbin "baserom.gba", 0x43F004, 0x100 + .byte 0xff, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37 + .byte 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f + .byte 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47 + .byte 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f + .byte 0x00, 0xab, 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0xb2, 0xf1, 0x00, 0xae, 0xad, 0xba + .byte 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8 + .byte 0xa9, 0xaa, 0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f + .byte 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1 + .byte 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9 + .byte 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1 + .byte 0xd2, 0xd3, 0xd4, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6 + .byte 0x00, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb + .byte 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3 + .byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb + .byte 0xec, 0xed, 0xee, 0x2d, 0x2f, 0x30, 0x31, 0x32 + .byte 0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02 + .byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a + .byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 + .byte 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a + .byte 0x1b, 0xad, 0xb3, 0xb4, 0x00, 0xaf, 0x7d, 0x7f + .byte 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0xa0 + .byte 0xae, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57 + .byte 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f + .byte 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67 + .byte 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f + .byte 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77 + .byte 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7e, 0xb0, 0xac + .byte 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23 + .byte 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b + .byte 0x2c, 0x2e, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c + .byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94 gUnknown_843F104:: @ 843F104 - .incbin "baserom.gba", 0x43F104, 0x100 + .byte 0x20, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c + .byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94 + .byte 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c + .byte 0x9d, 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3 + .byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb + .byte 0xec, 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c + .byte 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07 + .byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f + .byte 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 + .byte 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f + .byte 0x84, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7 + .byte 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf + .byte 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7 + .byte 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf + .byte 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7 + .byte 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7 + .byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2 + .byte 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa + .byte 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03 + .byte 0x04, 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f + .byte 0xaf, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36 + .byte 0x37, 0x38, 0x39, 0x21, 0xdf, 0xa1, 0xb0, 0xa5 + .byte 0xde, 0x24, 0x2a, 0xa2, 0xa3, 0x22, 0x23, 0x20 + .byte 0xa4, 0x20, 0x2f, 0x41, 0x42, 0x43, 0x44, 0x45 + .byte 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d + .byte 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55 + .byte 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63 + .byte 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b + .byte 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73 + .byte 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x20 + .byte 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20 + .byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00 gUnknown_843F204:: @ 843F204 - .incbin "baserom.gba", 0x43F204, 0x70 + .4byte 0x40000000, 0x00000000 + +gAnimCmd_843F20C:: + obj_image_anim_frame 0x0004, 5 + obj_image_anim_frame 0x0008, 5 + obj_image_anim_frame 0x000c, 5 + obj_image_anim_frame 0x0010, 10 + obj_image_anim_frame 0x000c, 5 + obj_image_anim_frame 0x0008, 5 + obj_image_anim_jump 0 + +gAnimCmd_843F228:: + obj_image_anim_frame 0x0004, 5 + obj_image_anim_frame 0x0008, 5 + obj_image_anim_frame 0x000c, 10 + obj_image_anim_frame 0x0008, 5 + obj_image_anim_jump 0 + +gAnimCmd_843F23C:: + obj_image_anim_frame 0x0004, 5 + obj_image_anim_frame 0x0008, 5 + obj_image_anim_jump 0 + +gAnimCmd_843F248:: + obj_image_anim_frame 0x0004, 10 + obj_image_anim_frame 0x0014, 10 + obj_image_anim_jump 0 + +gAnimCmd_843F254:: + obj_image_anim_frame 0x0018, 10 + obj_image_anim_frame 0x0004, 10 + obj_image_anim_jump 0 + +gSpriteAnimTable_843F260:: + .4byte gAnimCmd_843F20C + .4byte gAnimCmd_843F228 + .4byte gAnimCmd_843F23C + .4byte gAnimCmd_843F248 + .4byte gAnimCmd_843F254 gUnknown_843F274:: @ 843F274 - .incbin "baserom.gba", 0x43F274, 0x8 + obj_tiles gUnknown_843EEE0, 0x0380, 54321 gUnknown_843F27C:: @ 843F27C - .incbin "baserom.gba", 0x43F27C, 0x8 + obj_pal gUnknown_843EEC0, 54322 gUnknown_843F284:: @ 843F284 - .incbin "baserom.gba", 0x43F284, 0x18 + spr_template 54321, 54322, gUnknown_843F204, gSpriteAnimTable_843F260, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -- cgit v1.2.3 From fe2b25755fd55c44d94194572e1c0f6ecd3a6a2f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 22 Nov 2019 10:14:04 -0500 Subject: Dump data/union_room_chat --- data/data_8471F00.s | 85 +++++++++++++ data/union_room_chat.s | 332 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 395 insertions(+), 22 deletions(-) (limited to 'data') diff --git a/data/data_8471F00.s b/data/data_8471F00.s index 62a23c646..c3b4b7c01 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F00.s @@ -218,38 +218,103 @@ gUnknown_847A913:: gUnknown_847A934:: .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" + +gUnknown_847A955:: .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$" + +gUnknown_847A976:: .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$" + +gUnknown_847A997:: .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $" + +gUnknown_847A9B8:: .string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $" + +gUnknown_847A9D9:: .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$" + +gUnknown_847A9FA:: .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$" + +gUnknown_847AA1B:: .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" + +gUnknown_847AA3C:: .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" + +gUnknown_847AA5D:: .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $" + +gUnknown_847AA76:: .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $" + +gUnknown_847AA8F:: .string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$" + +gUnknown_847AAA8:: .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $" + +gUnknown_847AAC1:: .string "ABCDE$" + +gUnknown_847AAC7:: .string "FGHIJ$" + +gUnknown_847AACD:: .string "KLMNO$" + +gUnknown_847AAD3:: .string "PQRST$" + +gUnknown_847AAD9:: .string "UVWXY$" + +gUnknown_847AADF:: .string "Z $" + +gUnknown_847AAE5:: .string "01234$" + +gUnknown_847AAEB:: .string "56789$" + +gUnknown_847AAF1:: .string ".,!? $" + +gUnknown_847AAF7:: .string "-/&… $" + +gUnknown_847AAFD:: .string "abcde$" + +gUnknown_847AB03:: .string "fghij$" + +gUnknown_847AB09:: .string "klmno$" + +gUnknown_847AB0F:: .string "pqrst$" + +gUnknown_847AB15:: .string "uvwxy$" + +gUnknown_847AB1B:: .string "z $" + +gUnknown_847AB21:: .string "01234$" + +gUnknown_847AB27:: .string "56789$" + +gUnknown_847AB2D:: .string ".,!? $" + +gUnknown_847AB33:: .string "-/&… $" + .string "$" .string "$" .string "$" @@ -258,15 +323,35 @@ gUnknown_847A934:: .string "$" .string "$" .string "$" + +gUnknown_847AB41:: .string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$" + +gUnknown_847AB4C:: .string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$" + +gUnknown_847AB57:: .string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$" + +gUnknown_847AB62:: .string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$" + +gUnknown_847AB6B:: .string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$" + +gUnknown_847AB76:: .string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$" + +gUnknown_847AB81:: .string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$" + +gUnknown_847AB8C:: .string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$" + +gUnknown_847AB97:: .string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$" + +gUnknown_847ABA2:: .string "{EXTRA 210}{EXTRA 208}ょ: $" // trainer_tower (again?) diff --git a/data/union_room_chat.s b/data/union_room_chat.s index 3133c65d6..b61c5f44d 100644 --- a/data/union_room_chat.s +++ b/data/union_room_chat.s @@ -7,64 +7,352 @@ .align 2 gUnknown_845A880:: @ 845A880 - .incbin "baserom.gba", 0x45A880, 0x28 + .4byte sub_8128640 + .4byte sub_81286C4 + .4byte sub_81287B4 + .4byte sub_81288D4 + .4byte sub_8128DA4 + .4byte sub_8128E78 + .4byte sub_8128AA0 + .4byte sub_8128C04 + .4byte sub_8128CA8 + .4byte sub_8128FB8 gUnknown_845A8A8:: @ 845A8A8 - .incbin "baserom.gba", 0x45A8A8, 0x4 + .byte 0x09, 0x09, 0x09, 0x09 gUnknown_845A8AC:: @ 845A8AC - .incbin "baserom.gba", 0x45A8AC, 0x100 + .byte 0x00, 0x16, 0x17, 0x68, 0x19, 0x1a, 0x1b, 0x1c + .byte 0x1d, 0x1e, 0x00, 0x20, 0x21, 0x22, 0x23, 0x24 + .byte 0x25, 0x26, 0x27, 0x28, 0x29, 0x15, 0x01, 0x02 + .byte 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00 + .byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 + .byte 0x13, 0x14, 0x2a, 0x2b, 0x2c, 0x2d, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x36, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x53, 0x54, 0x55, 0x56, 0x00 + .byte 0x00, 0x00, 0x6f, 0x5b, 0x5c, 0x5d, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x84, 0x85, 0x86, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7 + .byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf + .byte 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7 + .byte 0xb8, 0xb9, 0xba, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9 + .byte 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1 + .byte 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9 + .byte 0xea, 0xeb, 0xec, 0xed, 0xee, 0xbb, 0xbc, 0xbd + .byte 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5 + .byte 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd + .byte 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xef + .byte 0xf0, 0xf4, 0xf5, 0xf6, 0xf1, 0xf2, 0xf3, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_845A9AC:: @ 845A9AC - .incbin "baserom.gba", 0x45A9AC, 0x78 + .4byte gUnknown_847AAC1 + .4byte gUnknown_847AAC7 + .4byte gUnknown_847AACD + .4byte gUnknown_847AAD3 + .4byte gUnknown_847AAD9 + .4byte gUnknown_847AADF + .4byte gUnknown_847AAE5 + .4byte gUnknown_847AAEB + .4byte gUnknown_847AAF1 + .4byte gUnknown_847AAF7 + .4byte gUnknown_847AAFD + .4byte gUnknown_847AB03 + .4byte gUnknown_847AB09 + .4byte gUnknown_847AB0F + .4byte gUnknown_847AB15 + .4byte gUnknown_847AB1B + .4byte gUnknown_847AB21 + .4byte gUnknown_847AB27 + .4byte gUnknown_847AB2D + .4byte gUnknown_847AB33 + .4byte gUnknown_847AB41 + .4byte gUnknown_847AB4C + .4byte gUnknown_847AB57 + .4byte gUnknown_847AB62 + .4byte gUnknown_847AB6B + .4byte gUnknown_847AB76 + .4byte gUnknown_847AB81 + .4byte gUnknown_847AB8C + .4byte gUnknown_847AB97 + .4byte gUnknown_847ABA2 gUnknown_845AA24:: @ 845AA24 - .incbin "baserom.gba", 0x45AA24, 0x20 + .incbin "graphics/union_room_chat/unk_845AA24.gbapal" gUnknown_845AA44:: @ 845AA44 - .incbin "baserom.gba", 0x45AA44, 0x20 + .incbin "graphics/union_room_chat/unk_845AA44.gbapal" gUnknown_845AA64:: @ 845AA64 - .incbin "baserom.gba", 0x45AA64, 0x20 + .incbin "graphics/union_room_chat/unk_845AA64.gbapal" gUnknown_845AA84:: @ 845AA84 - .incbin "baserom.gba", 0x45AA84, 0x10 + .4byte 0x00000070 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 7, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x000011fd + @ { + @ .bg = 1, + @ .charBaseIndex = 3, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0000 + @ } + .4byte 0x0000217a + @ { + @ .bg = 2, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 23, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + .4byte 0x000070f7 + @ { + @ .bg = 3, + @ .charBaseIndex = 1, + @ .mapBaseIndex = 15, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0001 + @ } gUnknown_845AA94:: @ 845AA94 - .incbin "baserom.gba", 0x45AA94, 0x28 + .byte 3, 8, 1, 21, 19, 15 + .2byte 0x0001 + .byte 1, 9, 18, 15, 2, 12 + .2byte 0x007a + .byte 1, 0, 2, 6, 15, 7 + .2byte 0x0020 + .byte 0, 1, 2, 7, 9, 14 + .2byte 0x0013 + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 gUnknown_845AABC:: @ 845AABC - .incbin "baserom.gba", 0x45AABC, 0xA8 + .2byte 0x00 + .align 2 + .4byte sub_8129CA0 + .2byte 0x03 + .align 2 + .4byte sub_8129D40 + .2byte 0x04 + .align 2 + .4byte sub_8129D78 + .2byte 0x05 + .align 2 + .4byte sub_8129DB0 + .2byte 0x01 + .align 2 + .4byte sub_8129E1C + .2byte 0x06 + .align 2 + .4byte sub_8129E28 + .2byte 0x07 + .align 2 + .4byte sub_8129E74 + .2byte 0x08 + .align 2 + .4byte sub_8129EB8 + .2byte 0x09 + .align 2 + .4byte sub_8129F24 + .2byte 0x0a + .align 2 + .4byte sub_8129FCC + .2byte 0x0b + .align 2 + .4byte sub_812A074 + .2byte 0x0c + .align 2 + .4byte sub_812A0B0 + .2byte 0x02 + .align 2 + .4byte sub_812A18C + .2byte 0x0d + .align 2 + .4byte sub_812A1B8 + .2byte 0x12 + .align 2 + .4byte sub_812A1FC + .2byte 0x13 + .align 2 + .4byte sub_812A240 + .2byte 0x0e + .align 2 + .4byte sub_812A294 + .2byte 0x0f + .align 2 + .4byte sub_812A2E4 + .2byte 0x10 + .align 2 + .4byte sub_812A334 + .2byte 0x11 + .align 2 + .4byte sub_812A378 + .2byte 0x14 + .align 2 + .4byte sub_812A3D0 gUnknown_845AB64:: @ 845AB64 - .incbin "baserom.gba", 0x45AB64, 0x84 + .4byte gUnknown_841B366 + .byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 + .align 2 + .4byte gUnknown_841B375 + .byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 + .align 2 + .4byte gUnknown_841B38A + .byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 + .align 2 + .4byte gUnknown_841B39E + .byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 + .align 2 + .4byte gUnknown_841B3E9 + .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00 + .align 2 + .4byte gUnknown_841B3FB + .byte 0x02, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00 + .align 2 + .4byte gUnknown_841B426 + .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01 + .align 2 + .4byte gUnknown_841B469 + .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01 + .align 2 + .4byte gUnknown_841B4A4 + .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01 + .align 2 + .4byte gUnknown_841B4C6 + .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x01, 0x01 + .align 2 + .4byte gUnknown_841B4D9 + .byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01 + .align 2 gUnknown_845ABE8:: @ 845ABE8 - .incbin "baserom.gba", 0x45ABE8, 0x4 + .string "…$" + .align 2 gUnknown_845ABEC:: @ 845ABEC - .incbin "baserom.gba", 0x45ABEC, 0x2A + .4byte gUnknown_841B33D, 0 + .4byte gUnknown_841B343, 0 + .4byte gUnknown_841B350, 0 + .4byte gUnknown_841B358, 0 + .4byte gUnknown_841B361, 0 -gUnknown_845AC16:: @ 845AC16 - .incbin "baserom.gba", 0x45AC16, 0x342 +gUnknown_845AC14:: @ 845AC14 + .incbin "graphics/union_room_chat/unk_845AC14.gbapal" + +gUnknown_845AC34:: + .incbin "graphics/union_room_chat/unk_845AC34.4bpp.lz" + +gUnknown_845AEB8:: + .incbin "graphics/union_room_chat/unk_845AEB8.4bpp.lz" + +gUnknown_845AED8:: + .incbin "graphics/union_room_chat/unk_845AED8.4bpp.lz" + +gUnknown_845AF04:: + .incbin "graphics/union_room_chat/unk_845AF04.4bpp.lz" gUnknown_845AF58:: @ 845AF58 - .incbin "baserom.gba", 0x45AF58, 0x28 + obj_tiles gUnknown_845AC34, 0x1000, 0 + obj_tiles gUnknown_845AED8, 0x0040, 1 + obj_tiles gUnknown_845AEB8, 0x0040, 2 + obj_tiles gUnknown_845AF04, 0x0080, 3 + obj_tiles gUnknown_8EA1A50, 0x0400, 4 gUnknown_845AF80:: @ 845AF80 - .incbin "baserom.gba", 0x45AF80, 0x40 + obj_pal gUnknown_845AC14, 0 + +gOamData_845AF88:: + .4byte 0xc0004000, 0x00000400 + +gAnimCmd_845AF90:: + obj_image_anim_frame 0x0000, 30 + obj_image_anim_end + +gAnimCmd_845AF98:: + obj_image_anim_frame 0x0020, 30 + obj_image_anim_end + +gAnimCmd_845AFA0:: + obj_image_anim_frame 0x0040, 30 + obj_image_anim_end + +gAnimCmd_845AFA8:: + obj_image_anim_frame 0x0060, 30 + obj_image_anim_end + +gSpriteAnimTable_845AFB0:: + .4byte gAnimCmd_845AF90 + .4byte gAnimCmd_845AF98 + .4byte gAnimCmd_845AFA0 + .4byte gAnimCmd_845AFA8 gUnknown_845AFC0:: @ 845AFC0 - .incbin "baserom.gba", 0x45AFC0, 0x20 + spr_template 0, 0, gOamData_845AF88, gSpriteAnimTable_845AFB0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gOamData_845AFD8:: + .4byte 0x00008000, 0x00000800 gUnknown_845AFE0:: @ 845AFE0 - .incbin "baserom.gba", 0x45AFE0, 0x18 + spr_template 2, 0, gOamData_845AFD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812B09C gUnknown_845AFF8:: @ 845AFF8 - .incbin "baserom.gba", 0x45AFF8, 0x58 + spr_template 1, 0, gOamData_845AFD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812B0D4 + +gOamData_845B010:: + .4byte 0x40000000, 0x00000800 + +gOamData_845B018:: + .4byte 0x80004000, 0x00000800 + +gAnimCmd_845B020:: + obj_image_anim_frame 0x0000, 2 + obj_image_anim_end + +gAnimCmd_845B028:: + obj_image_anim_frame 0x0008, 2 + obj_image_anim_end + +gAnimCmd_845B030:: + obj_image_anim_frame 0x0010, 2 + obj_image_anim_end + +gAnimCmd_845B038:: + obj_image_anim_frame 0x0018, 2 + obj_image_anim_end + +gSpriteAnimTable_845B040:: + .4byte gAnimCmd_845B020 + .4byte gAnimCmd_845B028 + .4byte gAnimCmd_845B030 + .4byte gAnimCmd_845B038 gUnknown_845B050:: @ 845B050 - .incbin "baserom.gba", 0x45B050, 0x18 + spr_template 3, 0, gOamData_845B010, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_845B068:: @ 845B068 - .incbin "baserom.gba", 0x45B068, 0x18 + spr_template 4, 0, gOamData_845B018, gSpriteAnimTable_845B040, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -- cgit v1.2.3 From 74476eb2a2d65ee27173ee4a88f1c26e1b4fdbce Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 22 Nov 2019 12:44:59 -0500 Subject: Dump data/pokemon_special_anim.s --- data/pokemon_special_anim.s | 236 +++++++++++++++++++++++++++++++++----------- 1 file changed, 180 insertions(+), 56 deletions(-) (limited to 'data') diff --git a/data/pokemon_special_anim.s b/data/pokemon_special_anim.s index d0f4decdf..16593e4d8 100644 --- a/data/pokemon_special_anim.s +++ b/data/pokemon_special_anim.s @@ -6,71 +6,195 @@ .section .rodata .align 2 -gUnknown_8459634:: @ 8459634 - .incbin "baserom.gba", 0x459634, 0x8 +gUnknown_8459634:: @ 8459634 data16 2x2 + .2byte 0x0044, 0x0000 + .2byte 0x000d, 0x0001 + +gUnknown_845963C:: @ 845963C gbapal + .incbin "graphics/pokemon_special_anim/unk_845963C.gbapal" -gUnknown_845963C:: @ 845963C - .incbin "baserom.gba", 0x45963C, 0x20 +gUnknown_845965C:: @ 845965C gbapal + .incbin "graphics/pokemon_special_anim/unk_845965C.gbapal" -gUnknown_845965C:: @ 845965C - .incbin "baserom.gba", 0x45965C, 0x20 +gUnknown_845967C:: @ 845967C 4bpp.lz + .incbin "graphics/pokemon_special_anim/unk_845967C.4bpp.lz" + +gUnknown_845973C:: @ 845973C bin.lz + .incbin "graphics/pokemon_special_anim/unk_845973C.bin.lz" + +gUnknown_8459868:: @ 8459868 gbapal + .incbin "graphics/pokemon_special_anim/unk_8459868.gbapal" -gUnknown_845967C:: @ 845967C - .incbin "baserom.gba", 0x45967C, 0xC0 +gUnknown_8459888:: @ 8459888 4bpp.lz + .incbin "graphics/pokemon_special_anim/unk_8459888.4bpp.lz" + +gUnknown_84598A4:: @ 84598A4 gbapal + .incbin "graphics/pokemon_special_anim/unk_84598A4.gbapal" + +gUnknown_84598C4:: @ 84598C4 4bpp.lz + .incbin "graphics/pokemon_special_anim/unk_84598C4.4bpp.lz" + +gUnknown_8459940:: @ 8459940 gbapal + .incbin "graphics/pokemon_special_anim/unk_8459940.gbapal" + +gUnknown_8459960:: @ 8459960 4bpp.lz + .incbin "graphics/pokemon_special_anim/unk_8459960.4bpp.lz" + +gUnknown_8459980:: @ 8459980 bg_template + .4byte 0x000041f0 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0001 + @ } + .4byte 0x000031cf + @ { + @ .bg = 3, + @ .charBaseIndex = 3, + @ .mapBaseIndex = 28, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } + +gUnknown_8459988:: @ 8459988 window_template + .byte 0, 1, 15, 28, 4, 15 + .2byte 0x000a + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 + +gUnknown_8459998:: @ 8459998 dataptr + .4byte gUnknown_841B2ED @ 1, + .4byte gUnknown_841B2F1 @ 2, and ‥ ‥ ‥ + .4byte gUnknown_841B2FF @ Poof! -gUnknown_845973C:: @ 845973C - .incbin "baserom.gba", 0x45973C, 0x12C +gUnknown_84599A4:: @ 84599A4 + .2byte 0x0000, 0x0010 + +gUnknown_84599A8:: @ 84599A8 unref, data16? + .2byte 0x0044 + +gUnknown_84599AA:: @ 84599AA data16 + .2byte 0x0100, 0x0155, 0x01aa, 0x0200 + +gUnknown_84599B2:: @ 84599B2 data8 + .byte 0xf8, 0xf8, 0x06, 0xf3, 0x08, 0xf8 + +gUnknown_84599B8:: @ 84599B8 sprite_sheet + obj_tiles gUnknown_84598C4, 0x0080, 2 + +gUnknown_84599C0:: @ 84599C0 sprite_palette + obj_pal gUnknown_84598A4, 2 + +gUnknown_84599C8:: @ 84599C8 sprite_sheet + obj_tiles gUnknown_8459960, 0x0060, 5 + +gUnknown_84599D0:: @ 84599D0 sprite_palette + obj_pal gUnknown_8459940, 5 + +gUnknown_84599D8:: @ 84599D8 + .4byte 0xc0000300, 0x00000400 + +gUnknown_84599E0:: @ 84599E0 + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_end + +gUnknown_84599F0:: @ 84599F0 + obj_rot_scal_anim_frame 341, 341, 0, 0 + obj_rot_scal_anim_end + +gUnknown_8459A00:: @ 8459A00 + obj_rot_scal_anim_frame 426, 426, 0, 0 + obj_rot_scal_anim_end + +gUnknown_8459A10:: @ 8459A10 + obj_rot_scal_anim_frame 512, 512, 0, 0 + obj_rot_scal_anim_end + +gUnknown_8459A20:: @ 8459A20 dataptr + .4byte gUnknown_84599E0 + .4byte gUnknown_84599F0 + .4byte gUnknown_8459A00 + .4byte gUnknown_8459A10 + +gUnknown_8459A30:: @ 8459A30 spr_template + spr_template 0, 0, gUnknown_84599D8, gDummySpriteAnimTable, NULL, gUnknown_8459A20, SpriteCallbackDummy + +gUnknown_8459A48:: @ 8459A48 affine_anim_cmd? + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_frame -28, -28, 0, 8 + obj_rot_scal_anim_end + +gUnknown_8459A60:: @ 459A60 + obj_rot_scal_anim_frame 341, 341, 0, 0 + obj_rot_scal_anim_frame -37, -37, 0, 8 + obj_rot_scal_anim_end + +gUnknown_8459A78:: @ 459A78 + obj_rot_scal_anim_frame 426, 426, 0, 0 + obj_rot_scal_anim_frame -47, -47, 0, 8 + obj_rot_scal_anim_end + +gUnknown_8459A90:: @ 459A90 + obj_rot_scal_anim_frame 512, 512, 0, 0 + obj_rot_scal_anim_frame -56, -56, 0, 8 + obj_rot_scal_anim_end + +gUnknown_8459AA8:: @ 8459AA8 dataptr + .4byte gUnknown_8459A48 + .4byte gUnknown_8459A60 + .4byte gUnknown_8459A78 + .4byte gUnknown_8459A90 + +gUnknown_8459AB8:: @ 8459AB8 + .4byte 0x00008400, 0x00000400 + +gUnknown_8459AC0:: @ 8459AC0 + obj_image_anim_frame 0x0000, 3 + obj_image_anim_end + +gUnknown_8459AC8:: @ 8459AC8 + .4byte gUnknown_8459AC0 -gUnknown_8459868:: @ 8459868 - .incbin "baserom.gba", 0x459868, 0x20 +gUnknown_8459ACC:: @ 8459ACC spr_template + spr_template 0, 0, gUnknown_8459AB8, gUnknown_8459AC8, NULL, gDummySpriteAffineAnimTable, sub_811E7B4 -gUnknown_8459888:: @ 8459888 - .incbin "baserom.gba", 0x459888, 0xF8 +gUnknown_8459AE4:: @ 8459AE4 + .4byte 0x40000000, 0x00000400 -gUnknown_8459980:: @ 8459980 - .incbin "baserom.gba", 0x459980, 0x8 +gUnknown_8459AEC:: @ 8459AEC spr_template + spr_template 2, 2, gUnknown_8459AE4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811E300 -gUnknown_8459988:: @ 8459988 - .incbin "baserom.gba", 0x459988, 0x10 +gUnknown_8459B04:: @ 8459B04 + .4byte 0x00000000, 0x00000000 -gUnknown_8459998:: @ 8459998 - .incbin "baserom.gba", 0x459998, 0x12 +gUnknown_8459B0C:: @ 8459B0C + obj_image_anim_frame 0x0000, 16 + obj_image_anim_frame 0x0001, 8 + obj_image_anim_frame 0x0002, 4 + obj_image_anim_end -gUnknown_84599AA:: @ 84599AA - .incbin "baserom.gba", 0x4599AA, 0x8 +gUnknown_8459B1C:: @ 8459B1C + obj_image_anim_frame 0x0001, 4 + obj_image_anim_frame 0x0000, 4 + obj_image_anim_end -gUnknown_84599B2:: @ 84599B2 - .incbin "baserom.gba", 0x4599B2, 0x6 +gUnknown_8459B28:: @ 8459B28 + .4byte gUnknown_8459B0C + .4byte gUnknown_8459B1C -gUnknown_84599B8:: @ 84599B8 - .incbin "baserom.gba", 0x4599B8, 0x8 - -gUnknown_84599C0:: @ 84599C0 - .incbin "baserom.gba", 0x4599C0, 0x8 - -gUnknown_84599C8:: @ 84599C8 - .incbin "baserom.gba", 0x4599C8, 0x8 - -gUnknown_84599D0:: @ 84599D0 - .incbin "baserom.gba", 0x4599D0, 0x50 - -gUnknown_8459A20:: @ 8459A20 - .incbin "baserom.gba", 0x459A20, 0x10 - -gUnknown_8459A30:: @ 8459A30 - .incbin "baserom.gba", 0x459A30, 0x78 - -gUnknown_8459AA8:: @ 8459AA8 - .incbin "baserom.gba", 0x459AA8, 0x24 - -gUnknown_8459ACC:: @ 8459ACC - .incbin "baserom.gba", 0x459ACC, 0x20 - -gUnknown_8459AEC:: @ 8459AEC - .incbin "baserom.gba", 0x459AEC, 0x44 - -gUnknown_8459B30:: @ 8459B30 - .incbin "baserom.gba", 0x459B30, 0x18 - -gUnknown_8459B48:: @ 8459B48 - .incbin "baserom.gba", 0x459B48, 0x18 +gUnknown_8459B30:: @ 8459B30 spr_template + spr_template 5, 5, gUnknown_8459B04, gUnknown_8459B28, NULL, gDummySpriteAffineAnimTable, sub_811E520 + +gUnknown_8459B48:: @ 8459B48 dataptr + .4byte gUnknown_841B2A9 + .4byte gUnknown_841B2B7 + .4byte gUnknown_841B2BE + .4byte gUnknown_841B2CC + .4byte gUnknown_841B2D4 + .4byte gUnknown_841B2C6 -- cgit v1.2.3 From 00ec85cb01c9463e7f39b025e35d693e6a9a3300 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 22 Nov 2019 14:40:57 -0500 Subject: Dump data/field_player_avatar.s --- data/field_player_avatar.s | 113 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 89 insertions(+), 24 deletions(-) (limited to 'data') diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index c11bc74b3..d89daa03c 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -1,73 +1,138 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 gUnknown_835B764:: @ 835B764 - .incbin "baserom.gba", 0x35B764, 0xB0 + .4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip + .4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip + .4byte MetatileBehavior_IsWalkSouth, sub_805B750 + .4byte MetatileBehavior_IsWalkNorth, sub_805B768 + .4byte MetatileBehavior_IsWalkWest, sub_805B780 + .4byte MetatileBehavior_IsWalkEast, sub_805B798 + .4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C + .4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844 + .4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C + .4byte MetatileBehavior_IsEastwardCurrent, sub_805B874 + .4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0 + .4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC + .4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8 + .4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804 + .4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth + .4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth + .4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest + .4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast + .4byte MetatileBehavior_IsWaterfall, sub_805B82C + .4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924 + .4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930 + .4byte NULL, ForcedMovement_None gUnknown_835B814:: @ 835B814 - .incbin "baserom.gba", 0x35B814, 0xC + .4byte PlayerNotOnBikeNotMoving + .4byte sub_805B9C4 + .4byte sub_805B9D4 gUnknown_835B820:: @ 835B820 - .incbin "baserom.gba", 0x35B820, 0x8 + .byte 0x04, 0x04, 0x05, 0x06, 0x07 + .align 2 gUnknown_835B828:: @ 835B828 - .incbin "baserom.gba", 0x35B828, 0x14 + .4byte MetatileBehavior_ReturnFalse_14 + .4byte MetatileBehavior_ReturnFalse_15 + .4byte MetatileBehavior_ReturnFalse_16 + .4byte MetatileBehavior_ReturnFalse_17 + .4byte MetatileBehavior_ReturnFalse_18 gUnknown_835B83C:: @ 835B83C - .incbin "baserom.gba", 0x35B83C, 0x8 + .byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d + .align 2 gUnknown_835B844:: @ 835B844 - .incbin "baserom.gba", 0x35B844, 0x20 + .4byte sub_805BE60 + .4byte sub_805BE74 + .4byte sub_805BE74 + .4byte sub_805BE90 + .4byte nullsub_23 + .4byte PlayerAvatarTransition_ReturnToField + .4byte nullsub_22 + .4byte nullsub_22 gUnknown_835B864:: @ 835B864 - .incbin "baserom.gba", 0x35B864, 0x10 + .4byte MetatileBehavior_IsSouthArrowWarp + .4byte MetatileBehavior_IsNorthArrowWarp + .4byte MetatileBehavior_IsWestArrowWarp + .4byte MetatileBehavior_IsEastArrowWarp gUnknown_835B874:: @ 835B874 - .incbin "baserom.gba", 0x35B874, 0xC + .byte 0x00, 0x07, 0x01, 0x08, 0x02, 0x09, 0x03, 0x0a, 0x04, 0x0b, 0x05, 0x0c gUnknown_835B880:: @ 835B880 - .incbin "baserom.gba", 0x35B880, 0x2 + .byte 0x0e, 0x0f gUnknown_835B882:: @ 835B882 - .incbin "baserom.gba", 0x35B882, 0xC + .byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x08, 0x07, 0x01, 0x08, 0x02, 0x09, 0x08 gUnknown_835B88E:: @ 835B88E - .incbin "baserom.gba", 0x35B88E, 0x2 + .byte 0x06, 0x0d gUnknown_835B890:: @ 835B890 - .incbin "baserom.gba", 0x35B890, 0x10 + .4byte MetatileBehavior_IsSouthArrowWarp + .4byte MetatileBehavior_IsNorthArrowWarp + .4byte MetatileBehavior_IsWestArrowWarp + .4byte MetatileBehavior_IsEastArrowWarp gUnknown_835B8A0:: @ 835B8A0 - .incbin "baserom.gba", 0x35B8A0, 0xC + .4byte sub_805CD64 + .4byte sub_805CD84 + .4byte sub_805CE20 gUnknown_835B8AC:: @ 835B8AC - .incbin "baserom.gba", 0x35B8AC, 0x4 + .4byte PlayerAvatar_DoSecretBaseMatJump gUnknown_835B8B0:: @ 835B8B0 - .incbin "baserom.gba", 0x35B8B0, 0x10 + .4byte sub_805CFC4 + .4byte sub_805CFEC + .4byte sub_805D064 + .4byte sub_805D0A4 gUnknown_835B8C0:: @ 835B8C0 - .incbin "baserom.gba", 0x35B8C0, 0x4 + .byte 0x03, 0x04, 0x02, 0x01 gUnknown_835B8C4:: @ 835B8C4 - .incbin "baserom.gba", 0x35B8C4, 0x8 + .byte 0x18, 0x18, 0x19, 0x1a, 0x1b + .align 2 gUnknown_835B8CC:: @ 835B8CC - .incbin "baserom.gba", 0x35B8CC, 0x40 + .4byte sub_805D33C + .4byte fish1 + .4byte fish2 + .4byte sub_805D430 + .4byte sub_805D47C + .4byte sub_805D508 + .4byte sub_805D574 + .4byte sub_805D580 + .4byte sub_805D5EC + .4byte sub_805D66C + .4byte sub_805D6C8 + .4byte sub_805D7C0 + .4byte sub_805D838 + .4byte sub_805D8AC + .4byte sub_805D8D8 + .4byte sub_805D980 gUnknown_835B90C:: @ 835B90C - .incbin "baserom.gba", 0x35B90C, 0x6 + .2byte 0x0001, 0x0001, 0x0001 gUnknown_835B912:: @ 835B912 - .incbin "baserom.gba", 0x35B912, 0x6 + .2byte 0x0001, 0x0003, 0x0006 gUnknown_835B918:: @ 835B918 - .incbin "baserom.gba", 0x35B918, 0x2 + .string "·$" gUnknown_835B91A:: @ 835B91A - .incbin "baserom.gba", 0x35B91A, 0x6 + .2byte 0x0024, 0x0021, 0x001e gUnknown_835B920:: @ 835B920 - .incbin "baserom.gba", 0x35B920, 0xC + .2byte 0x0000, 0x0000, 0x0028, 0x000a, 0x0046, 0x001e gUnknown_835B92C:: @ 835B92C - .incbin "baserom.gba", 0x35B92C, 0x8 + .byte 0x01, 0x03, 0x04, 0x02, 0x01 -- cgit v1.2.3 From 622fcd2cb95401d99c27820bebbc5141a12e0b49 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 20 Nov 2019 11:23:34 +0800 Subject: document some symbols --- data/event_scripts.s | 4 +-- data/graphics.s | 6 ++-- data/party_menu.s | 95 +++++++++++++++++++++++++--------------------------- data/specials.inc | 2 +- data/strings.s | 90 ++++++++++++++++++++++++------------------------- 5 files changed, 97 insertions(+), 100 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index f75442912..89099c58f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -9706,7 +9706,7 @@ EventScript_1BC13A:: @ 81BC13A goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 0 - special sub_8127888 + special ChooseMonForWirelessMinigame waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_1BB83F @@ -9726,7 +9726,7 @@ EventScript_1BC184:: @ 81BC184 goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 1 - special sub_8127888 + special ChooseMonForWirelessMinigame waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_1BB83F diff --git a/data/graphics.s b/data/graphics.s index 5eacc0cb2..9810abf91 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13892,15 +13892,15 @@ gFile_graphics_battle_anims_sprites_188_palette:: @ 8E826E8 .incbin "graphics/battle_anims/sprites/188.gbapal.lz" .align 2 -gFile_graphics_interface_party_menu_misc_sheet:: @ 8E82700 +gPartyMenuBg_Gfx:: @ 8E82700 .incbin "graphics/interface/party_menu_misc.4bpp.lz" .align 2 -gUnknown_8E829C8:: @ 8E829C8 +gPartyMenuBg_Pal:: @ 8E829C8 .incbin "baserom.gba", 0xE829C8, 0xE8 .align 2 -gFile_graphics_interface_party_menu_misc_tilemap:: @ 8E82AB0 +gPartyMenuBg_Tilemap:: @ 8E82AB0 .incbin "graphics/interface/party_menu_misc.bin.lz" .align 2 diff --git a/data/party_menu.s b/data/party_menu.s index 7c484deb3..1f10d0ea5 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -23,7 +23,7 @@ gMoveTutorMoves:: @ 8459B60 .2byte MOVE_ROCK_SLIDE .2byte MOVE_SUBSTITUTE -gMoveTutorMoveCompatibilityTable:: @ 8459B7E +sTutorLearnsets:: @ 8459B7E .2byte 0x0000 .2byte 0x409a .2byte 0x409a @@ -438,16 +438,13 @@ gMoveTutorMoveCompatibilityTable:: @ 8459B7E .2byte 0x4490 .align 2 -gUnknown_8459EB8:: @ 8459EB8 +sPartyMenuBgTemplates:: @ 8459EB8 .incbin "baserom.gba", 0x459EB8, 0xC -gUnknown_8459EC4:: @ 8459EC4 - .incbin "baserom.gba", 0x459EC4, 0x20 +sPartyBoxInfoRects:: @ 8459EC4 + .incbin "baserom.gba", 0x459EC4, 0x40 -gUnknown_8459EE4:: @ 8459EE4 - .incbin "baserom.gba", 0x459EE4, 0x20 - -gUnknown_8459F04:: @ 8459F04 +sPartyMenuSpriteCoords:: @ 8459F04 .incbin "baserom.gba", 0x459F04, 0xC0 gUnknown_8459FC4:: @ 8459FC4 @@ -456,31 +453,31 @@ gUnknown_8459FC4:: @ 8459FC4 gUnknown_8459FE0:: @ 8459FE0 .incbin "baserom.gba", 0x459FE0, 0x1C -gUnknown_8459FFC:: @ 8459FFC +sFontColorTable:: @ 8459FFC .incbin "baserom.gba", 0x459FFC, 0xF gUnknown_845A00B:: @ 845A00B .incbin "baserom.gba", 0x45A00B, 0x5 -gUnknown_845A010:: @ 845A010 +sSinglePartyMenuWindowTemplate:: @ 845A010 .incbin "baserom.gba", 0x45A010, 0x40 -gUnknown_845A050:: @ 845A050 +sDoublePartyMenuWindowTemplate:: @ 845A050 .incbin "baserom.gba", 0x45A050, 0x40 -gUnknown_845A090:: @ 845A090 +sMultiPartyMenuWindowTemplate:: @ 845A090 .incbin "baserom.gba", 0x45A090, 0x40 -gUnknown_845A0D0:: @ 845A0D0 +sShowcaseMultiPartyMenuWindowTemplate:: @ 845A0D0 .incbin "baserom.gba", 0x45A0D0, 0x38 -gUnknown_845A108:: @ 845A108 +sCancelButtonWindowTemplate:: @ 845A108 .incbin "baserom.gba", 0x45A108, 0x8 -gUnknown_845A110:: @ 845A110 +sMultiCancelButtonWindowTemplate:: @ 845A110 .incbin "baserom.gba", 0x45A110, 0x8 -gUnknown_845A118:: @ 845A118 +sConfirmButtonWindowTemplate:: @ 845A118 .incbin "baserom.gba", 0x45A118, 0x8 gUnknown_845A120:: @ 845A120 @@ -498,19 +495,19 @@ gUnknown_845A138:: @ 845A138 gUnknown_845A140:: @ 845A140 .incbin "baserom.gba", 0x45A140, 0x8 -gUnknown_845A148:: @ 845A148 +sItemGiveTakeWindowTemplate:: @ 845A148 .incbin "baserom.gba", 0x45A148, 0x8 -gUnknown_845A150:: @ 845A150 +sMailReadTakeWindowTemplate:: @ 845A150 .incbin "baserom.gba", 0x45A150, 0x8 -gUnknown_845A158:: @ 845A158 +sMoveSelectWindowTemplate:: @ 845A158 .incbin "baserom.gba", 0x45A158, 0x8 -gUnknown_845A160:: @ 845A160 +sPartyMenuYesNoWindowTemplate:: @ 845A160 .incbin "baserom.gba", 0x45A160, 0x8 -gUnknown_845A168:: @ 845A168 +sLevelUpStatsWindowTemplate:: @ 845A168 .incbin "baserom.gba", 0x45A168, 0x8 gUnknown_845A170:: @ 845A170 @@ -519,22 +516,22 @@ gUnknown_845A170:: @ 845A170 gUnknown_845A178:: @ 845A178 .incbin "baserom.gba", 0x45A178, 0x8 -gUnknown_845A180:: @ 845A180 +sMainSlotTileNums:: @ 845A180 .incbin "baserom.gba", 0x45A180, 0x46 -gUnknown_845A1C6:: @ 845A1C6 +sMainSlotTileNums_Egg:: @ 845A1C6 .incbin "baserom.gba", 0x45A1C6, 0x46 -gUnknown_845A20C:: @ 845A20C +sOtherSlotTileNums:: @ 845A20C .incbin "baserom.gba", 0x45A20C, 0x36 -gUnknown_845A242:: @ 845A242 +sOtherSlotTileNums_Egg:: @ 845A242 .incbin "baserom.gba", 0x45A242, 0x36 gUnknown_845A278:: @ 845A278 .incbin "baserom.gba", 0x45A278, 0x36 -gUnknown_845A2AE:: @ 845A2AE +sGenderPalOffsets:: @ 845A2AE .incbin "baserom.gba", 0x45A2AE, 0x2 gUnknown_845A2B0:: @ 845A2B0 @@ -546,10 +543,10 @@ gUnknown_845A2B2:: @ 845A2B2 gUnknown_845A2B5:: @ 845A2B5 .incbin "baserom.gba", 0x45A2B5, 0x3 -gUnknown_845A2B8:: @ 845A2B8 +sGenderMalePalIds:: @ 845A2B8 .incbin "baserom.gba", 0x45A2B8, 0x2 -gUnknown_845A2BA:: @ 845A2BA +sGenderFemalePalIds:: @ 845A2BA .incbin "baserom.gba", 0x45A2BA, 0x2 gUnknown_845A2BC:: @ 845A2BC @@ -597,67 +594,67 @@ gUnknown_845A2E0:: @ 845A2E0 gUnknown_845A2E3:: @ 845A2E3 .incbin "baserom.gba", 0x45A2E3, 0x5 -gUnknown_845A2E8:: @ 845A2E8 +sActionStringTable:: @ 845A2E8 .incbin "baserom.gba", 0x45A2E8, 0x6C -gUnknown_845A354:: @ 845A354 +sDescriptionStringTable:: @ 845A354 .incbin "baserom.gba", 0x45A354, 0x28 gUnknown_845A37C:: @ 845A37C .incbin "baserom.gba", 0x45A37C, 0xB0 -gUnknown_845A42C:: @ 845A42C +sSpriteSheet_HeldItem:: @ 845A42C .incbin "baserom.gba", 0x45A42C, 0x8 -gUnknown_845A434:: @ 845A434 +sSpritePalette_HeldItem:: @ 845A434 .incbin "baserom.gba", 0x45A434, 0x8 -gUnknown_845A43C:: @ 845A43C +sSpriteTemplate_HeldItem:: @ 845A43C .incbin "baserom.gba", 0x45A43C, 0x38 -gUnknown_845A474:: @ 845A474 +sSpriteSheet_MenuPokeball:: @ 845A474 .incbin "baserom.gba", 0x45A474, 0x8 -gUnknown_845A47C:: @ 845A47C +sSpritePalette_MenuPokeball:: @ 845A47C .incbin "baserom.gba", 0x45A47C, 0x8 -gUnknown_845A484:: @ 845A484 +sSpriteTemplate_MenuPokeball:: @ 845A484 .incbin "baserom.gba", 0x45A484, 0x68 -gUnknown_845A4EC:: @ 845A4EC +sSpriteSheet_MenuPokeballSmall:: @ 845A4EC .incbin "baserom.gba", 0x45A4EC, 0x8 -gUnknown_845A4F4:: @ 845A4F4 +sSpriteTemplate_MenuPokeballSmall:: @ 845A4F4 .incbin "baserom.gba", 0x45A4F4, 0x80 -gUnknown_845A574:: @ 845A574 +sSpriteSheet_StatusIcons:: @ 845A574 .incbin "baserom.gba", 0x45A574, 0x8 -gUnknown_845A57C:: @ 845A57C +sSpritePalette_StatusIcons:: @ 845A57C .incbin "baserom.gba", 0x45A57C, 0x8 -gUnknown_845A584:: @ 845A584 +sSpriteTemplate_StatusIcons:: @ 845A584 .incbin "baserom.gba", 0x45A584, 0x18 -gUnknown_845A59C:: @ 845A59C +sMultiBattlePartnersPartyMask:: @ 845A59C .incbin "baserom.gba", 0x45A59C, 0x7C -gUnknown_845A618:: @ 845A618 +sCursorOptions:: @ 845A618 .incbin "baserom.gba", 0x45A618, 0x114 -gUnknown_845A72C:: @ 845A72C +sPartyMenuActions:: @ 845A72C .incbin "baserom.gba", 0x45A72C, 0x34 -gUnknown_845A760:: @ 845A760 +sPartyMenuActionCounts:: @ 845A760 .incbin "baserom.gba", 0x45A760, 0xE -gUnknown_845A76E:: @ 845A76E +sFieldMoves:: @ 845A76E .incbin "baserom.gba", 0x45A76E, 0x1A -gUnknown_845A788:: @ 845A788 +sFieldMoveCursorCallbacks:: @ 845A788 .incbin "baserom.gba", 0x45A788, 0x60 -gUnknown_845A7E8:: @ 845A7E8 +sUnionRoomTradeMessages:: @ 845A7E8 .4byte gUnknown_841718C @ Not what other player wants .4byte gUnknown_84171CC @ Not an egg .4byte gUnknown_84170BC @ Mon can't be traded @@ -668,5 +665,5 @@ gUnknown_845A7E8:: @ 845A7E8 .4byte gUnknown_8417164 @ Can't trade with trainer now .4byte gUnknown_8417164 @ Can't trade with trainer now -gUnknown_845A80C:: @ 845A80C +sTMHMMoves:: @ 845A80C .incbin "baserom.gba", 0x45A80C, 0x74 diff --git a/data/specials.inc b/data/specials.inc index 6c1cbfa8e..148da72dc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -406,7 +406,7 @@ gSpecials:: @ 815FD60 def_special Special_OpenMuseumFossilPic def_special Special_CloseMuseumFossilPic def_special sub_812781C - def_special sub_8127888 + def_special ChooseMonForWirelessMinigame def_special SetBattledTrainerFlag def_special sub_812B35C def_special Special_SSAnneDepartureCutscene diff --git a/data/strings.s b/data/strings.s index a1892e209..3cd263df9 100644 --- a/data/strings.s +++ b/data/strings.s @@ -463,7 +463,7 @@ gUnknown_8416202:: @ 8416202 gUnknown_8416206:: .string "?????$" -gUnknown_841620C:: @ 841620C +gText_Slash:: @ 841620C .string "/$" gUnknown_841620E:: @ 841620E @@ -478,10 +478,10 @@ gText_ThreeHyphens:: @ 8416213 gUnknown_8416217:: @ 8416217 .string "-------$" -gUnknown_841621F:: @ 841621F +gText_MaleSymbol:: @ 841621F .string "♂$" -gUnknown_8416221:: @ 8416221 +gText_FemaleSymbol:: @ 8416221 .string "♀$" gText_Lv:: @ 8416223 @@ -834,25 +834,25 @@ gUnknown_84169B7:: @ 0x84169B7 gUnknown_84169BC:: @ 0x84169BC .string "TRADE$" -gUnknown_84169C2:: @ 84169C2 +gText_HP3:: @ 84169C2 .string "HP$" -gUnknown_84169C5:: @ 84169C5 +gText_SpAtk3:: @ 84169C5 .string "SP. ATK$" -gUnknown_84169CD:: @ 84169CD +gText_SpDef3:: @ 84169CD .string "SP. DEF$" -gUnknown_84169D5:: @ 84169D5 +gMenuText_Confirm:: @ 84169D5 .string "OK$" gUnknown_84169D8:: @ 0x84169D8 .string "$" -gUnknown_84169D9:: @ 84169D9 +gText_PauseUntilPress:: @ 84169D9 .string "{PAUSE_UNTIL_PRESS}$" -gUnknown_84169DC:: @ 84169DC +gText_WontHaveEffect:: @ 84169DC .string "It won't have any effect.{PAUSE_UNTIL_PRESS}$" gUnknown_84169F8:: @ 84169F8 @@ -882,7 +882,7 @@ gUnknown_8416A98:: @ 8416A98 gUnknown_8416ACB:: @ 8416ACB .string "An EGG can't battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416AE2:: @ 8416AE2 +gText_CantUseUntilNewBadge:: @ 8416AE2 .string "This can't be used until a new\n" .string "BADGE is obtained.{PAUSE_UNTIL_PRESS}$" @@ -894,17 +894,17 @@ gUnknown_8416B3E:: @ 8416B3E .string "No more than two POKéMON\n" .string "may enter.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416B64:: @ 8416B64 +gText_SendMailToPC:: @ 8416B64 .string "Send the removed MAIL to\n" .string "your PC?$" -gUnknown_8416B86:: @ 8416B86 +gText_MailSentToPC:: @ 8416B86 .string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416BA6:: @ 8416BA6 +gText_PCMailboxFull:: @ 8416BA6 .string "Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416BC3:: @ 8416BC3 +gText_MailMessageWillBeLost:: @ 8416BC3 .string "If the MAIL is removed, the\n" .string "message will be lost. Okay?$" @@ -912,11 +912,11 @@ gUnknown_8416BFB:: @ 8416BFB .string "MAIL must be removed before\n" .string "holding an item.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416C2A:: @ 8416C2A +gText_PkmnWasGivenItem:: @ 8416C2A .string "{STR_VAR_1} was given the\n" .string "{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416C49:: @ 8416C49 +gText_PkmnAlreadyHoldingItemSwitch:: @ 8416C49 .string "{STR_VAR_1} is already holding\n" .string "one {STR_VAR_2}.\p" .string "Would you like to switch the\n" @@ -926,41 +926,41 @@ gUnknown_8416C8F:: @ 8416C8F .string "{STR_VAR_1} isn't holding\n" .string "anything.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416CAC:: @ 8416CAC +gText_ReceivedItemFromPkmn:: @ 8416CAC .string "Received the {STR_VAR_2}\n" .string "from {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416CC7:: @ 8416CC7 +gText_MailTakenFromPkmn:: @ 8416CC7 .string "MAIL was taken from the\n" .string "POKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416CEA:: @ 8416CEA +gText_SwitchedPkmnItem:: @ 8416CEA .string "The {STR_VAR_2} was taken and\n" .string "replaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416D17:: @ 8416D17 +gText_PkmnHoldingItemCantHoldMail:: @ 8416D17 .string "This POKéMON is holding an\n" .string "item. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416D4F:: @ 8416D4F +gText_MailTransferredFromMailbox:: @ 8416D4F .string "MAIL was transferred from\n" .string "the MAILBOX.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416D78:: @ 8416D78 +gText_BagFullCouldNotRemoveItem:: @ 8416D78 .string "The {STR_VAR_1} is full. The POKéMON's\n" .string "item could not be removed.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416DB3:: @ 8416DB3 +gText_PkmnLearnedMove3:: @ 8416DB3 .string "{STR_VAR_1} learned\n" .string "{STR_VAR_2}!$" -gUnknown_8416DC2:: @ 8416DC2 +gText_PkmnCantLearnMove:: @ 8416DC2 .string "{STR_VAR_1} and {STR_VAR_2}\n" .string "are not compatible.\p" .string "{STR_VAR_2} can't be\n" .string "learned.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416DF7:: @ 8416DF7 +gText_PkmnNeedsToReplaceMove:: @ 8416DF7 .string "{STR_VAR_1} wants to learn the\n" .string "move {STR_VAR_2}.\p" .string "However, {STR_VAR_1} already\n" @@ -968,15 +968,15 @@ gUnknown_8416DF7:: @ 8416DF7 .string "Should a move be deleted and\n" .string "replaced with {STR_VAR_2}?$" -gUnknown_8416E6B:: @ 8416E6B +gText_StopLearningMove2:: @ 8416E6B .string "Stop trying to teach\n" .string "{STR_VAR_2}?$" -gUnknown_8416E84:: @ 8416E84 +gText_MoveNotLearned:: @ 8416E84 .string "{STR_VAR_1} did not learn the\n" .string "move {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416EA4:: @ 8416EA4 +gText_WhichMoveToForget:: @ 8416EA4 .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" gUnknown_8416EC6:: @ 8416EC6 @@ -985,57 +985,57 @@ gUnknown_8416EC6:: @ 8416EC6 .string "use {STR_VAR_2}.\p" .string "And...{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F10:: @ 8416F10 +gText_PkmnAlreadyKnows:: @ 8416F10 .string "{STR_VAR_1} already knows\n" .string "{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F27:: @ 8416F27 +gText_PkmnHPRestoredByVar2:: @ 8416F27 .string "{STR_VAR_1}'s HP was restored\n" .string "by {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F4E:: @ 8416F4E +gText_PkmnCuredOfPoison:: @ 8416F4E .string "{STR_VAR_1} was cured of its\n" .string "poisoning.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F6F:: @ 8416F6F +gText_PkmnCuredOfParalysis:: @ 8416F6F .string "{STR_VAR_1} was cured of\n" .string "paralysis.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F8C:: @ 8416F8C +gText_PkmnWokeUp2:: @ 8416F8C .string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416F9A:: @ 8416F9A +gText_PkmnBurnHealed:: @ 8416F9A .string "{STR_VAR_1}'s burn was healed.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416FB2:: @ 8416FB2 +gText_PkmnThawedOut:: @ 8416FB2 .string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416FC7:: @ 8416FC7 +gText_PPWasRestored:: @ 8416FC7 .string "PP was restored.{PAUSE_UNTIL_PRESS}$" gUnknown_8416FDA:: @ 0x8416FDA .string "{STR_VAR_1}は\n" .string "げんきを とりもどした!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416FED:: @ 8416FED +gText_PkmnBecameHealthy:: @ 8416FED .string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$" -gUnknown_8417002:: @ 8417002 +gText_MovesPPIncreased:: @ 8417002 .string "{STR_VAR_1}'s PP increased.{PAUSE_UNTIL_PRESS}$" -gUnknown_8417017:: @ 8417017 +gText_PkmnElevatedToLvVar2:: @ 8417017 .string "{STR_VAR_1} was elevated to\n" .string "Lv. {STR_VAR_2}.$" -gUnknown_8417032:: @ 8417032 +gText_PkmnBaseVar2StatIncreased:: @ 8417032 .string "{STR_VAR_1}'s base {STR_VAR_2}\n" .string "stat was raised.{PAUSE_UNTIL_PRESS}$" -gUnknown_8417052:: @ 8417052 +gText_PkmnSnappedOutOfConfusion:: @ 8417052 .string "{STR_VAR_1} snapped out of its\n" .string "confusion.{PAUSE_UNTIL_PRESS}$" -gUnknown_8417075:: @ 8417075 +gText_PkmnGotOverInfatuation:: @ 8417075 .string "{STR_VAR_1} got over its\n" .string "infatuation.{PAUSE_UNTIL_PRESS}$" @@ -1241,10 +1241,10 @@ gUnknown_8417640:: @ 8417640 .string "Want to return to the healing spot\n" .string "used last in {STR_VAR_1}?$" -gUnknown_8417674:: @ 8417674 +gText_Attack3:: @ 8417674 .string "ATTACK$" -gUnknown_841767B:: @ 841767B +gText_Defense3:: @ 841767B .string "DEFENSE$" gUnknown_8417683:: @ 0x8417683 @@ -1253,7 +1253,7 @@ gUnknown_8417683:: @ 0x8417683 gUnknown_8417688:: @ 0x8417688 .string "とくぼう$" -gUnknown_841768D:: @ 841768D +gText_Speed2:: @ 841768D .string "SPEED$" gUnknown_8417693:: @ 0x8417693 -- cgit v1.2.3 From d89a2d791edaf9bc892bd00dbf2ffcd35f84435a Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Thu, 21 Nov 2019 10:48:08 +0800 Subject: party_menu data --- data/graphics.s | 10 +- data/party_menu.s | 669 ------------------------------------------------------ data/strings.s | 136 +++++------ 3 files changed, 73 insertions(+), 742 deletions(-) delete mode 100644 data/party_menu.s (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 9810abf91..a6b9db097 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13904,23 +13904,23 @@ gPartyMenuBg_Tilemap:: @ 8E82AB0 .incbin "graphics/interface/party_menu_misc.bin.lz" .align 2 -gFile_graphics_interface_party_menu_pokeball_sheet:: @ 8E82BE8 +gPartyMenuPokeball_Gfx:: @ 8E82BE8 .incbin "graphics/interface/party_menu_pokeball.4bpp.lz" .align 2 -gFile_graphics_interface_party_menu_pokeball_small_sheet:: @ 8E82D68 +gPartyMenuPokeballSmall_Gfx:: @ 8E82D68 .incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz" .align 2 -gFile_graphics_interface_party_menu_pokeball_palette:: @ 8E82E7C +gPartyMenuPokeball_Pal:: @ 8E82E7C .incbin "graphics/interface/party_menu_pokeball.gbapal.lz" .align 2 -gUnknown_8E82EA0:: @ 8E82EA0 +gStatusGfx_Icons:: @ 8E82EA0 .incbin "baserom.gba", 0xE82EA0, 0x204 .align 2 -gFile_graphics_interface_status_icons_palette:: @ 8E830A4 +gStatusPal_Icons:: @ 8E830A4 .incbin "graphics/interface/status_icons.gbapal.lz" .align 2 diff --git a/data/party_menu.s b/data/party_menu.s deleted file mode 100644 index 1f10d0ea5..000000000 --- a/data/party_menu.s +++ /dev/null @@ -1,669 +0,0 @@ -#include "constants/region_map.h" -#include "constants/flags.h" -#include "constants/moves.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gMoveTutorMoves:: @ 8459B60 - .2byte MOVE_MEGA_PUNCH - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_MEGA_KICK - .2byte MOVE_BODY_SLAM - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_COUNTER - .2byte MOVE_SEISMIC_TOSS - .2byte MOVE_MIMIC - .2byte MOVE_METRONOME - .2byte MOVE_SOFT_BOILED - .2byte MOVE_DREAM_EATER - .2byte MOVE_THUNDER_WAVE - .2byte MOVE_EXPLOSION - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_SUBSTITUTE - -sTutorLearnsets:: @ 8459B7E - .2byte 0x0000 - .2byte 0x409a - .2byte 0x409a - .2byte 0x409a - .2byte 0x60ff - .2byte 0x60ff - .2byte 0x60ff - .2byte 0x40fd - .2byte 0x40fd - .2byte 0x40fd - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x4490 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x4092 - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x48b8 - .2byte 0x48b8 - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x48fd - .2byte 0x48fd - .2byte 0x60fa - .2byte 0x60fa - .2byte 0x40b8 - .2byte 0x40b8 - .2byte 0x60fd - .2byte 0x40b8 - .2byte 0x40b8 - .2byte 0x60fd - .2byte 0x4ffd - .2byte 0x4ffd - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4cfd - .2byte 0x4cfd - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x4092 - .2byte 0x4092 - .2byte 0x409a - .2byte 0x40ba - .2byte 0x40ba - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x4498 - .2byte 0x4498 - .2byte 0x40fd - .2byte 0x40fd - .2byte 0x61fd - .2byte 0x61fd - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x41fd - .2byte 0x41fd - .2byte 0x4dfd - .2byte 0x4dfd - .2byte 0x4dfd - .2byte 0x61fd - .2byte 0x61fd - .2byte 0x61fd - .2byte 0x4092 - .2byte 0x4092 - .2byte 0x409a - .2byte 0x4092 - .2byte 0x4092 - .2byte 0x71f9 - .2byte 0x71f9 - .2byte 0x71fd - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4c98 - .2byte 0x4cfd - .2byte 0x4890 - .2byte 0x4890 - .2byte 0x409a - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x5088 - .2byte 0x5088 - .2byte 0x5090 - .2byte 0x5090 - .2byte 0x5480 - .2byte 0x5480 - .2byte 0x55fd - .2byte 0x7098 - .2byte 0x4dfd - .2byte 0x4dfd - .2byte 0x409a - .2byte 0x409a - .2byte 0x5880 - .2byte 0x5880 - .2byte 0x5490 - .2byte 0x5490 - .2byte 0x60ff - .2byte 0x60ff - .2byte 0x61fd - .2byte 0x61fd - .2byte 0x64ff - .2byte 0x5080 - .2byte 0x5080 - .2byte 0x60ba - .2byte 0x60ff - .2byte 0x4ffd - .2byte 0x409a - .2byte 0x60fd - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x4890 - .2byte 0x4c90 - .2byte 0x4dfd - .2byte 0x40b2 - .2byte 0x45fd - .2byte 0x48fd - .2byte 0x40fd - .2byte 0x60da - .2byte 0x4098 - .2byte 0x0000 - .2byte 0x4898 - .2byte 0x4498 - .2byte 0x0000 - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4898 - .2byte 0x4098 - .2byte 0x4c90 - .2byte 0x6098 - .2byte 0x60d8 - .2byte 0x6098 - .2byte 0x60de - .2byte 0x6090 - .2byte 0x61fd - .2byte 0x4090 - .2byte 0x4890 - .2byte 0x4090 - .2byte 0x4898 - .2byte 0x4898 - .2byte 0x4898 - .2byte 0x4dfd - .2byte 0x7fff - .2byte 0x40ba - .2byte 0x40ba - .2byte 0x40ba - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x60fd - .2byte 0x60ff - .2byte 0x60ff - .2byte 0x60ff - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4490 - .2byte 0x4490 - .2byte 0x4093 - .2byte 0x4093 - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4090 - .2byte 0x4890 - .2byte 0x4890 - .2byte 0x48fd - .2byte 0x4ffd - .2byte 0x4cfd - .2byte 0x4ffd - .2byte 0x4ffd - .2byte 0x4c90 - .2byte 0x4c90 - .2byte 0x4898 - .2byte 0x48fd - .2byte 0x48fd - .2byte 0x4092 - .2byte 0x40dd - .2byte 0x40dd - .2byte 0x70fd - .2byte 0x41fd - .2byte 0x4092 - .2byte 0x4092 - .2byte 0x4092 - .2byte 0x4dfd - .2byte 0x4092 - .2byte 0x4092 - .2byte 0x4490 - .2byte 0x4098 - .2byte 0x40fd - .2byte 0x4498 - .2byte 0x4498 - .2byte 0x4c90 - .2byte 0x4cfd - .2byte 0x4c90 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x4c98 - .2byte 0x70b8 - .2byte 0x70b8 - .2byte 0x6cb8 - .2byte 0x64b2 - .2byte 0x7098 - .2byte 0x49fd - .2byte 0x69fd - .2byte 0x4892 - .2byte 0x40b2 - .2byte 0x6098 - .2byte 0x60fa - .2byte 0x44b2 - .2byte 0x41ff - .2byte 0x61ff - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x7098 - .2byte 0x4890 - .2byte 0x48d0 - .2byte 0x40fd - .2byte 0x4098 - .2byte 0x60b0 - .2byte 0x44b8 - .2byte 0x44b8 - .2byte 0x4098 - .2byte 0x40b8 - .2byte 0x60b8 - .2byte 0x4c90 - .2byte 0x4c98 - .2byte 0x0000 - .2byte 0x60fc - .2byte 0x60fc - .2byte 0x45fd - .2byte 0x48fd - .2byte 0x40fd - .2byte 0x69fd - .2byte 0x4ffd - .2byte 0x4898 - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x68fd - .2byte 0x4c98 - .2byte 0x4c90 - .2byte 0x4592 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x40ff - .2byte 0x40ff - .2byte 0x40ff - .2byte 0x60ff - .2byte 0x60ff - .2byte 0x60ff - .2byte 0x4098 - .2byte 0x60fd - .2byte 0x60fd - .2byte 0x40b8 - .2byte 0x40b8 - .2byte 0x4898 - .2byte 0x4898 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x4090 - .2byte 0x0000 - .2byte 0x4090 - .2byte 0x409a - .2byte 0x409a - .2byte 0x41ff - .2byte 0x509a - .2byte 0x509e - .2byte 0x509e - .2byte 0x4090 - .2byte 0x4092 - .2byte 0x4490 - .2byte 0x40b0 - .2byte 0x40b0 - .2byte 0x409a - .2byte 0x40ff - .2byte 0x65fd - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4c98 - .2byte 0x4c98 - .2byte 0x69fd - .2byte 0x7490 - .2byte 0x7490 - .2byte 0x7898 - .2byte 0x7098 - .2byte 0x45fd - .2byte 0x4090 - .2byte 0x6090 - .2byte 0x4090 - .2byte 0x40ba - .2byte 0x40ba - .2byte 0x4090 - .2byte 0x4098 - .2byte 0x4090 - .2byte 0x4090 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x61fd - .2byte 0x61fd - .2byte 0x4898 - .2byte 0x4898 - .2byte 0x6098 - .2byte 0x7098 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x40fb - .2byte 0x40ff - .2byte 0x4098 - .2byte 0x5098 - .2byte 0x7498 - .2byte 0x7498 - .2byte 0x4098 - .2byte 0x4498 - .2byte 0x44fd - .2byte 0x49fd - .2byte 0x49fd - .2byte 0x60ff - .2byte 0x45fd - .2byte 0x65fd - .2byte 0x4498 - .2byte 0x4498 - .2byte 0x0000 - .2byte 0x4498 - .2byte 0x65fd - .2byte 0x409a - .2byte 0x60fd - .2byte 0x60fd - .2byte 0x60fd - .2byte 0x54b8 - .2byte 0x54b8 - .2byte 0x409a - .2byte 0x40fd - .2byte 0x60fd - .2byte 0x60fd - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x4098 - .2byte 0x6cba - .2byte 0x4c98 - .2byte 0x4d98 - .2byte 0x4098 - .2byte 0x68ff - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x68fd - .2byte 0x4898 - .2byte 0x49fd - .2byte 0x49fd - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x609a - .2byte 0x60da - .2byte 0x4c98 - .2byte 0x4c98 - .2byte 0x4c98 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x6098 - .2byte 0x0000 - .2byte 0x7098 - .2byte 0x7098 - .2byte 0x78fd - .2byte 0x78fd - .2byte 0x78fd - .2byte 0x6898 - .2byte 0x68ff - .2byte 0x6898 - .2byte 0x4c98 - .2byte 0x4c98 - .2byte 0x4d98 - .2byte 0x6cfd - .2byte 0x4490 - - .align 2 -sPartyMenuBgTemplates:: @ 8459EB8 - .incbin "baserom.gba", 0x459EB8, 0xC - -sPartyBoxInfoRects:: @ 8459EC4 - .incbin "baserom.gba", 0x459EC4, 0x40 - -sPartyMenuSpriteCoords:: @ 8459F04 - .incbin "baserom.gba", 0x459F04, 0xC0 - -gUnknown_8459FC4:: @ 8459FC4 - .incbin "baserom.gba", 0x459FC4, 0x1C - -gUnknown_8459FE0:: @ 8459FE0 - .incbin "baserom.gba", 0x459FE0, 0x1C - -sFontColorTable:: @ 8459FFC - .incbin "baserom.gba", 0x459FFC, 0xF - -gUnknown_845A00B:: @ 845A00B - .incbin "baserom.gba", 0x45A00B, 0x5 - -sSinglePartyMenuWindowTemplate:: @ 845A010 - .incbin "baserom.gba", 0x45A010, 0x40 - -sDoublePartyMenuWindowTemplate:: @ 845A050 - .incbin "baserom.gba", 0x45A050, 0x40 - -sMultiPartyMenuWindowTemplate:: @ 845A090 - .incbin "baserom.gba", 0x45A090, 0x40 - -sShowcaseMultiPartyMenuWindowTemplate:: @ 845A0D0 - .incbin "baserom.gba", 0x45A0D0, 0x38 - -sCancelButtonWindowTemplate:: @ 845A108 - .incbin "baserom.gba", 0x45A108, 0x8 - -sMultiCancelButtonWindowTemplate:: @ 845A110 - .incbin "baserom.gba", 0x45A110, 0x8 - -sConfirmButtonWindowTemplate:: @ 845A118 - .incbin "baserom.gba", 0x45A118, 0x8 - -gUnknown_845A120:: @ 845A120 - .incbin "baserom.gba", 0x45A120, 0x8 - -gUnknown_845A128:: @ 845A128 - .incbin "baserom.gba", 0x45A128, 0x8 - -gUnknown_845A130:: @ 845A130 - .incbin "baserom.gba", 0x45A130, 0x8 - -gUnknown_845A138:: @ 845A138 - .incbin "baserom.gba", 0x45A138, 0x8 - -gUnknown_845A140:: @ 845A140 - .incbin "baserom.gba", 0x45A140, 0x8 - -sItemGiveTakeWindowTemplate:: @ 845A148 - .incbin "baserom.gba", 0x45A148, 0x8 - -sMailReadTakeWindowTemplate:: @ 845A150 - .incbin "baserom.gba", 0x45A150, 0x8 - -sMoveSelectWindowTemplate:: @ 845A158 - .incbin "baserom.gba", 0x45A158, 0x8 - -sPartyMenuYesNoWindowTemplate:: @ 845A160 - .incbin "baserom.gba", 0x45A160, 0x8 - -sLevelUpStatsWindowTemplate:: @ 845A168 - .incbin "baserom.gba", 0x45A168, 0x8 - -gUnknown_845A170:: @ 845A170 - .incbin "baserom.gba", 0x45A170, 0x8 - -gUnknown_845A178:: @ 845A178 - .incbin "baserom.gba", 0x45A178, 0x8 - -sMainSlotTileNums:: @ 845A180 - .incbin "baserom.gba", 0x45A180, 0x46 - -sMainSlotTileNums_Egg:: @ 845A1C6 - .incbin "baserom.gba", 0x45A1C6, 0x46 - -sOtherSlotTileNums:: @ 845A20C - .incbin "baserom.gba", 0x45A20C, 0x36 - -sOtherSlotTileNums_Egg:: @ 845A242 - .incbin "baserom.gba", 0x45A242, 0x36 - -gUnknown_845A278:: @ 845A278 - .incbin "baserom.gba", 0x45A278, 0x36 - -sGenderPalOffsets:: @ 845A2AE - .incbin "baserom.gba", 0x45A2AE, 0x2 - -gUnknown_845A2B0:: @ 845A2B0 - .incbin "baserom.gba", 0x45A2B0, 0x2 - -gUnknown_845A2B2:: @ 845A2B2 - .incbin "baserom.gba", 0x45A2B2, 0x3 - -gUnknown_845A2B5:: @ 845A2B5 - .incbin "baserom.gba", 0x45A2B5, 0x3 - -sGenderMalePalIds:: @ 845A2B8 - .incbin "baserom.gba", 0x45A2B8, 0x2 - -sGenderFemalePalIds:: @ 845A2BA - .incbin "baserom.gba", 0x45A2BA, 0x2 - -gUnknown_845A2BC:: @ 845A2BC - .incbin "baserom.gba", 0x45A2BC, 0x2 - -gUnknown_845A2BE:: @ 845A2BE - .incbin "baserom.gba", 0x45A2BE, 0x2 - -gUnknown_845A2C0:: @ 845A2C0 - .incbin "baserom.gba", 0x45A2C0, 0x2 - -gUnknown_845A2C2:: @ 845A2C2 - .incbin "baserom.gba", 0x45A2C2, 0x3 - -gUnknown_845A2C5:: @ 845A2C5 - .incbin "baserom.gba", 0x45A2C5, 0x3 - -gUnknown_845A2C8:: @ 845A2C8 - .incbin "baserom.gba", 0x45A2C8, 0x3 - -gUnknown_845A2CB:: @ 845A2CB - .incbin "baserom.gba", 0x45A2CB, 0x3 - -gUnknown_845A2CE:: @ 845A2CE - .incbin "baserom.gba", 0x45A2CE, 0x3 - -gUnknown_845A2D1:: @ 845A2D1 - .incbin "baserom.gba", 0x45A2D1, 0x3 - -gUnknown_845A2D4:: @ 845A2D4 - .incbin "baserom.gba", 0x45A2D4, 0x3 - -gUnknown_845A2D7:: @ 845A2D7 - .incbin "baserom.gba", 0x45A2D7, 0x3 - -gUnknown_845A2DA:: @ 845A2DA - .incbin "baserom.gba", 0x45A2DA, 0x3 - -gUnknown_845A2DD:: @ 845A2DD - .incbin "baserom.gba", 0x45A2DD, 0x3 - -gUnknown_845A2E0:: @ 845A2E0 - .incbin "baserom.gba", 0x45A2E0, 0x3 - -gUnknown_845A2E3:: @ 845A2E3 - .incbin "baserom.gba", 0x45A2E3, 0x5 - -sActionStringTable:: @ 845A2E8 - .incbin "baserom.gba", 0x45A2E8, 0x6C - -sDescriptionStringTable:: @ 845A354 - .incbin "baserom.gba", 0x45A354, 0x28 - -gUnknown_845A37C:: @ 845A37C - .incbin "baserom.gba", 0x45A37C, 0xB0 - -sSpriteSheet_HeldItem:: @ 845A42C - .incbin "baserom.gba", 0x45A42C, 0x8 - -sSpritePalette_HeldItem:: @ 845A434 - .incbin "baserom.gba", 0x45A434, 0x8 - -sSpriteTemplate_HeldItem:: @ 845A43C - .incbin "baserom.gba", 0x45A43C, 0x38 - -sSpriteSheet_MenuPokeball:: @ 845A474 - .incbin "baserom.gba", 0x45A474, 0x8 - -sSpritePalette_MenuPokeball:: @ 845A47C - .incbin "baserom.gba", 0x45A47C, 0x8 - -sSpriteTemplate_MenuPokeball:: @ 845A484 - .incbin "baserom.gba", 0x45A484, 0x68 - -sSpriteSheet_MenuPokeballSmall:: @ 845A4EC - .incbin "baserom.gba", 0x45A4EC, 0x8 - -sSpriteTemplate_MenuPokeballSmall:: @ 845A4F4 - .incbin "baserom.gba", 0x45A4F4, 0x80 - -sSpriteSheet_StatusIcons:: @ 845A574 - .incbin "baserom.gba", 0x45A574, 0x8 - -sSpritePalette_StatusIcons:: @ 845A57C - .incbin "baserom.gba", 0x45A57C, 0x8 - -sSpriteTemplate_StatusIcons:: @ 845A584 - .incbin "baserom.gba", 0x45A584, 0x18 - -sMultiBattlePartnersPartyMask:: @ 845A59C - .incbin "baserom.gba", 0x45A59C, 0x7C - -sCursorOptions:: @ 845A618 - .incbin "baserom.gba", 0x45A618, 0x114 - -sPartyMenuActions:: @ 845A72C - .incbin "baserom.gba", 0x45A72C, 0x34 - -sPartyMenuActionCounts:: @ 845A760 - .incbin "baserom.gba", 0x45A760, 0xE - -sFieldMoves:: @ 845A76E - .incbin "baserom.gba", 0x45A76E, 0x1A - -sFieldMoveCursorCallbacks:: @ 845A788 - .incbin "baserom.gba", 0x45A788, 0x60 - -sUnionRoomTradeMessages:: @ 845A7E8 - .4byte gUnknown_841718C @ Not what other player wants - .4byte gUnknown_84171CC @ Not an egg - .4byte gUnknown_84170BC @ Mon can't be traded - .4byte gUnknown_84170BC @ Mon can't be traded - .4byte gUnknown_84170FC @ Other trainer's mon can't be traded - .4byte gUnknown_84170E0 @ Egg can't be traded - .4byte gUnknown_8417130 @ Other trainer can't accept - .4byte gUnknown_8417164 @ Can't trade with trainer now - .4byte gUnknown_8417164 @ Can't trade with trainer now - -sTMHMMoves:: @ 845A80C - .incbin "baserom.gba", 0x45A80C, 0x74 diff --git a/data/strings.s b/data/strings.s index 3cd263df9..a0454c12b 100644 --- a/data/strings.s +++ b/data/strings.s @@ -433,16 +433,16 @@ gString_Dummy:: @ 84161CD gUnknown_84161CE:: .string "キャンセル$" -gUnknown_84161D4:: +gText_Item:: .string "ITEM$" -gUnknown_84161D9:: +gText_Mail:: .string "MAIL$" -gUnknown_84161DE:: +gText_Take:: .string "TAKE$" -gUnknown_84161E3:: +gText_Store:: .string "STORE$" gUnknown_84161E9:: @@ -804,34 +804,34 @@ gText_TurnedOverItemsWorthYen:: @ 8416959 gText_PokedollarVar1:: @ 841697A .string "¥{STR_VAR_1}$" -gUnknown_841697E:: @ 0x841697E +gText_Shift:: @ 0x841697E .string "SHIFT$" -gUnknown_8416984:: @ 0x8416984 +gText_SendOut:: @ 0x8416984 .string "SEND OUT$" -gUnknown_841698D:: @ 0x841698D +gText_Switch2:: @ 0x841698D .string "SWITCH$" -gUnknown_8416994:: @ 0x8416994 +gText_Summary5:: @ 0x8416994 .string "SUMMARY$" gUnknown_841699C:: @ 0x841699C .string "つかえるわざ$" -gUnknown_84169A3:: @ 0x84169A3 +gText_Enter:: @ 0x84169A3 .string "ENTER$" -gUnknown_84169A9:: @ 0x84169A9 +gText_NoEntry:: @ 0x84169A9 .string "NO ENTRY$" -gUnknown_84169B2:: @ 0x84169B2 +gText_Take2:: @ 0x84169B2 .string "TAKE$" -gUnknown_84169B7:: @ 0x84169B7 +gText_Read2:: @ 0x84169B7 .string "READ$" -gUnknown_84169BC:: @ 0x84169BC +gText_Trade4:: @ 0x84169BC .string "TRADE$" gText_HP3:: @ 84169C2 @@ -1044,144 +1044,144 @@ gUnknown_8417094:: @ 0x8417094 .string "POKéMON for battle.$" .align 2 -gUnknown_84170BC:: @ 84170BC +gText_PkmnCantBeTradedNow:: @ 84170BC .string "That POKéMON can't be traded\n" .string "now.$" .align 2 -gUnknown_84170E0:: @ 84170E0 +gText_EggCantBeTradedNow:: @ 84170E0 .string "An EGG can't be traded now.$" .align 2 -gUnknown_84170FC:: @ 0x84170FC +gText_OtherTrainersPkmnCantBeTraded:: @ 0x84170FC .string "The other TRAINER's POKéMON\n" .string "can't be traded now.$" .align 2 -gUnknown_8417130:: @ 0x8417130 +gText_OtherTrainerCantAcceptPkmn:: @ 0x8417130 .string "The other TRAINER can't accept\n" .string "that POKéMON now.$" .align 2 -gUnknown_8417164:: @ 0x8417164 +gText_CantTradeWithTrainer:: @ 0x8417164 .string "You can't trade with that\n" .string "TRAINER now.$" .align 2 -gUnknown_841718C:: @ 0x841718C +gText_NotPkmnOtherTrainerWants:: @ 0x841718C .string "That isn't the type of POKéMON\n" .string "that the other TRAINER wants.$" .align 2 -gUnknown_84171CC:: @ 0x84171CC +gText_ThatIsntAnEgg:: @ 0x84171CC .string "That isn't an EGG.$" -gUnknown_84171DF:: @ 0x84171DF +gText_ChoosePokemon:: @ 0x84171DF .string "Choose a POKéMON.$" -gUnknown_84171F1:: @ 0x84171F1 +gText_MoveToWhere:: @ 0x84171F1 .string "Move to where?$" -gUnknown_8417200:: @ 0x8417200 +gText_TeachWhichPokemon:: @ 0x8417200 .string "Teach which POKéMON?$" -gUnknown_8417215:: @ 0x8417215 +gText_UseOnWhichPokemon:: @ 0x8417215 .string "Use on which POKéMON?$" -gUnknown_841722B:: @ 0x841722B +gText_GiveToWhichPokemon:: @ 0x841722B .string "Give to which POKéMON?$" -gUnknown_8417242:: @ 0x8417242 +gText_DoWhatWithPokemon:: @ 0x8417242 .string "Do what with this {PKMN}?$" -gUnknown_8417258:: @ 0x8417258 +gText_NothingToCut:: @ 0x8417258 .string "There's nothing to CUT.$" -gUnknown_8417270:: @ 0x8417270 +gText_CantSurfHere:: @ 0x8417270 .string "No SURFING here!$" -gUnknown_8417281:: @ 0x8417281 +gText_AlreadySurfing:: @ 0x8417281 .string "You're already SURFING.$" -gUnknown_8417299:: @ 0x8417299 +gText_CantUseHere:: @ 0x8417299 .string "Can't use that here.$" -gUnknown_84172AE:: @ 0x84172AE +gText_RestoreWhichMove:: @ 0x84172AE .string "Restore which move?$" -gUnknown_84172C2:: @ 0x84172C2 +gText_BoostPp:: @ 0x84172C2 .string "Boost PP of which?$" -gUnknown_84172D5:: @ 0x84172D5 +gText_DoWhatWithItem:: @ 0x84172D5 .string "Do what with an item?$" -gUnknown_84172EB:: @ 0x84172EB +gText_NoPokemonForBattle:: @ 0x84172EB .string "No battling this way!$" -gUnknown_8417301:: @ 0x8417301 +gText_ChoosePokemon2:: @ 0x8417301 .string "Choose a POKéMON.$" -gUnknown_8417313:: @ 0x8417313 +gText_NotEnoughHp:: @ 0x8417313 .string "Not enough HP‥$" -gUnknown_8417322:: @ 0x8417322 +gText_ThreePkmnAreNeeded:: @ 0x8417322 .string "Three {PKMN} are needed.$" -gUnknown_8417337:: @ 0x8417337 +gText_PokemonCantBeSame:: @ 0x8417337 .string "{PKMN} can't be the same.$" -gUnknown_841734D:: @ 0x841734D +gText_NoIdenticalHoldItems:: @ 0x841734D .string "No same hold items!$" -gUnknown_8417361:: @ 0x8417361 +gText_CurrentIsTooFast:: @ 0x8417361 .string "The current is much too fast!$" -gUnknown_841737F:: @ 0x841737F +gText_DoWhatWithMail:: @ 0x841737F .string "Do what with the MAIL?$" -gUnknown_8417396:: @ 0x8417396 +gText_ChoosePokemonCancel:: @ 0x8417396 .string "Choose POKéMON or CANCEL.$" -gUnknown_84173B0:: @ 0x84173B0 +gText_ChoosePokemonConfirm:: @ 0x84173B0 .string "Choose POKéMON and confirm.$" -gUnknown_84173CC:: @ 0x84173CC +gText_TwoPokemonAreNeeded:: @ 0x84173CC .string "Two POKéMON are needed.$" -gUnknown_84173E4:: @ 0x84173E4 +gText_EnjoyCycling:: @ 0x84173E4 .string "Let's enjoy cycling!$" -gUnknown_84173F9:: @ 0x84173F9 +gText_InUseAlready_PM:: @ 0x84173F9 .string "This is in use already.$" -gUnknown_8417411:: @ 0x8417411 +gText_NoUse:: @ 0x8417411 .string "No use.$" -gUnknown_8417419:: @ 0x8417419 +gText_Able:: @ 0x8417419 .string "ABLE$" -gUnknown_841741E:: @ 0x841741E +gText_First_PM:: @ 0x841741E .string "FIRST$" -gUnknown_8417424:: @ 0x8417424 +gText_Second_PM:: @ 0x8417424 .string "SECOND$" -gUnknown_841742B:: @ 0x841742B +gText_Third_PM:: @ 0x841742B .string "THIRD$" -gUnknown_8417431:: @ 0x8417431 +gText_Able2:: @ 0x8417431 .string "ABLE$" -gUnknown_8417436:: @ 0x8417436 +gText_NotAble:: @ 0x8417436 .string "NOT ABLE$" -gUnknown_841743F:: @ 0x841743F +gText_Able3:: @ 0x841743F .string "ABLE!$" -gUnknown_8417445:: @ 0x8417445 +gText_NotAble2:: @ 0x8417445 .string "NOT ABLE!$" -gUnknown_841744F:: @ 0x841744F +gText_Learned:: @ 0x841744F .string "LEARNED$" gUnknown_8417457:: @ 8417457 @@ -1197,40 +1197,40 @@ gUnknown_8417494:: @ 8417494 .string "You also choose POKéMON here if\n" .string "you want to use an item on one.{PAUSE_UNTIL_PRESS}$" -gUnknown_8417533:: @ 0x8417533 +gText_CutATreeOrGrass:: @ 0x8417533 .string "Cut a tree or grass.$" -gUnknown_8417548:: @ 0x8417548 +gText_FlyToAKnownTown:: @ 0x8417548 .string "Fly to a known town.$" -gUnknown_841755D:: @ 0x841755D +gText_TravelOnWater:: @ 0x841755D .string "Travel on water.$" -gUnknown_841756E:: @ 0x841756E +gText_MoveHeavyBoulders:: @ 0x841756E .string "Move heavy boulders.$" -gUnknown_8417583:: @ 0x8417583 +gText_LightUpDarkness:: @ 0x8417583 .string "Light up darkness.$" -gUnknown_8417596:: @ 0x8417596 +gText_ShatterACrackedRock:: @ 0x8417596 .string "Shatter a cracked rock.$" -gUnknown_84175AE:: @ 0x84175AE +gText_ClimbAWaterfall:: @ 0x84175AE .string "Climb a waterfall.$" gUnknown_84175C1:: @ 0x84175C1 .string "すいちゅうに もぐる$" -gUnknown_84175CC:: @ 0x84175CC +gText_EscapeFromHere:: @ 0x84175CC .string "Escape from here.$" -gUnknown_84175DE:: @ 0x84175DE +gText_LureWildPokemon:: @ 0x84175DE .string "Lure wild POKéMON.$" -gUnknown_84175F1:: @ 0x84175F1 +gText_ShareHp:: @ 0x84175F1 .string "Share HP.$" -gUnknown_84175FB:: @ 0x84175FB +gText_ReturnToAHealingSpot:: @ 0x84175FB .string "Return to a healing spot.$" gUnknown_8417615:: @ 8417615 @@ -3266,7 +3266,7 @@ gText_Badges:: @ 841B6EC gTextJPDummy_Ko:: @ 841B6F3 .string "$" -gUnknown_841B6F4:: @ 0x841B6F4 +gText_Register:: @ 0x841B6F4 .string "REGISTER$" gText_HatchedFromEgg:: @ 841B6FD -- cgit v1.2.3 From 069eb2baed314133a9d72658c07126e73b3b3db1 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 22 Nov 2019 06:46:04 +0800 Subject: party_menu first quarter --- data/strings.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/strings.s b/data/strings.s index a0454c12b..547005fd6 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1259,10 +1259,10 @@ gText_Speed2:: @ 841768D gUnknown_8417693:: @ 0x8417693 .string "HP$" -gUnknown_8417696:: @ 8417696 +gText_PkmnCantParticipate:: @ 8417696 .string "That POKéMON can't participate.{PAUSE_UNTIL_PRESS}$" -gUnknown_84176B8:: @ 84176B8 +gText_CancelParticipation:: @ 84176B8 .string "Cancel participation?$" gUnknown_84176CE:: @ 0x84176CE -- cgit v1.2.3 From 17743fe0e675be80b3df7bc3b480c684fe110fde Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 23 Nov 2019 08:09:06 +0800 Subject: party_menu third quarter --- data/strings.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/strings.s b/data/strings.s index 547005fd6..35548d0dc 100644 --- a/data/strings.s +++ b/data/strings.s @@ -922,7 +922,7 @@ gText_PkmnAlreadyHoldingItemSwitch:: @ 8416C49 .string "Would you like to switch the\n" .string "two items?$" -gUnknown_8416C8F:: @ 8416C8F +gText_PkmnNotHolding:: @ 8416C8F .string "{STR_VAR_1} isn't holding\n" .string "anything.{PAUSE_UNTIL_PRESS}$" @@ -979,7 +979,7 @@ gText_MoveNotLearned:: @ 8416E84 gText_WhichMoveToForget:: @ 8416EA4 .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" -gUnknown_8416EC6:: @ 8416EC6 +gText_12PoofForgotMove:: @ 8416EC6 .string "1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p" .string "{STR_VAR_1} forgot how to\n" .string "use {STR_VAR_2}.\p" @@ -1233,11 +1233,11 @@ gText_ShareHp:: @ 0x84175F1 gText_ReturnToAHealingSpot:: @ 0x84175FB .string "Return to a healing spot.$" -gUnknown_8417615:: @ 8417615 +gText_EscapeFromHereAndReturnTo:: @ 8417615 .string "Want to escape from here and return\n" .string "to {STR_VAR_1}?$" -gUnknown_8417640:: @ 8417640 +gText_ReturnToHealingSpot:: @ 8417640 .string "Want to return to the healing spot\n" .string "used last in {STR_VAR_1}?$" -- cgit v1.2.3 From 1ffe7f78cb75b5e5f63bd803ad3fd47126a2e7c6 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sun, 24 Nov 2019 03:03:29 +0800 Subject: party_menu fourth quarter --- data/event_scripts.s | 2 +- data/specials.inc | 2 +- data/strings.s | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 89099c58f..c07f400a1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -13968,7 +13968,7 @@ EventScript_1C4F26:: @ 81C4F26 end EventScript_1C4F30:: @ 81C4F30 - special sub_812781C + special ChooseMonForMoveTutor waitstate lock faceplayer diff --git a/data/specials.inc b/data/specials.inc index 148da72dc..74ba0c849 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -405,7 +405,7 @@ gSpecials:: @ 815FD60 def_special get_unknown_box_id def_special Special_OpenMuseumFossilPic def_special Special_CloseMuseumFossilPic - def_special sub_812781C + def_special ChooseMonForMoveTutor def_special ChooseMonForWirelessMinigame def_special SetBattledTrainerFlag def_special sub_812B35C diff --git a/data/strings.s b/data/strings.s index 35548d0dc..628bbda28 100644 --- a/data/strings.s +++ b/data/strings.s @@ -859,27 +859,27 @@ gUnknown_84169F8:: @ 84169F8 .string "This can't be used on\n" .string "that POKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A1E:: @ 8416A1E +gText_PkmnCantSwitchOut:: @ 8416A1E .string "{STR_VAR_1} can't be switched\n" .string "out!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A3A:: @ 8416A3A +gText_PkmnAlreadyInBattle:: @ 8416A3A .string "{STR_VAR_1} is already\n" .string "in battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A55:: @ 8416A55 +gText_PkmnAlreadySelected:: @ 8416A55 .string "{STR_VAR_1} has already been\n" .string "selected.{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A75:: @ 8416A75 +gText_PkmnHasNoEnergy:: @ 8416A75 .string "{STR_VAR_1} has no energy\n" .string "left to battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416A98:: @ 8416A98 +gText_CantSwitchWithAlly:: @ 8416A98 .string "You can't switch {STR_VAR_1}'s\n" .string "POKéMON with one of yours!{PAUSE_UNTIL_PRESS}$" -gUnknown_8416ACB:: @ 8416ACB +gText_EggCantBattle:: @ 8416ACB .string "An EGG can't battle!{PAUSE_UNTIL_PRESS}$" gText_CantUseUntilNewBadge:: @ 8416AE2 @@ -908,7 +908,7 @@ gText_MailMessageWillBeLost:: @ 8416BC3 .string "If the MAIL is removed, the\n" .string "message will be lost. Okay?$" -gUnknown_8416BFB:: @ 8416BFB +gText_RemoveMailBeforeItem:: @ 8416BFB .string "MAIL must be removed before\n" .string "holding an item.{PAUSE_UNTIL_PRESS}$" -- cgit v1.2.3 From aa0d8cdaa0b57ed4b625dad321886d52d2b6dbb7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 23 Nov 2019 16:51:05 -0500 Subject: battle_message 1 --- data/battle_message.s | 2923 ------------------------------------------------- 1 file changed, 2923 deletions(-) delete mode 100644 data/battle_message.s (limited to 'data') diff --git a/data/battle_message.s b/data/battle_message.s deleted file mode 100644 index 4f7576103..000000000 --- a/data/battle_message.s +++ /dev/null @@ -1,2923 +0,0 @@ -#include "constants/moves.h" -#include "constants/battle.h" -#include "battle_string_ids.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2, 0 - -gUnknown_83FB218:: @ 83FB218 - .string "$" - -gUnknown_83FB219:: @ 83FB219 - .string "{B_TRAINER1_LOSE_TEXT}$" - -gUnknown_83FB21C:: @ 83FB21C - .string "{B_TRAINER2_CLASS}$" - -gUnknown_83FB21F:: @ 83FB21F - .string "{B_TRAINER1_NAME}: {B_OPPONENT_MON1_NAME}, come back!$" - -gUnknown_83FB232:: @ 83FB232 - .string "{B_TRAINER1_WIN_TEXT}$" - -gUnknown_83FB235:: @ 83FB235 - .string "{B_TRAINER1_NAME}: {B_OPPONENT_MON2_NAME}, come back!$" - -gUnknown_83FB248:: @ 83FB248 - .string "{B_TRAINER1_NAME}: {B_OPPONENT_MON1_NAME} and\n" - .string "{B_OPPONENT_MON2_NAME}, come back!$" - -gUnknown_83FB262:: @ 83FB262 - .string "{B_TRAINER2_NAME}$" - -gUnknown_83FB265:: @ 83FB265 - .string "{B_BUFF1} gained{B_BUFF2}\n" - .string "{B_TRAINER2_LOSE_TEXT} EXP. Points!\p" - .string "$" - -gUnknown_83FB282:: @ 83FB282 - .string "$" - -gUnknown_83FB283:: @ 83FB283 - .string " a boosted$" - -gUnknown_83FB28E:: @ 83FB28E - .string "{B_BUFF1} grew to\n" - .string "LV. {B_BUFF2}!{WAIT_SE}\p" - .string "$" - -gUnknown_83FB2A4:: @ 83FB2A4 - .string "{B_BUFF1} learned\n" - .string "{B_BUFF2}!{WAIT_SE}\p" - .string "$" - -gUnknown_83FB2B6:: @ 83FB2B6 - .string "{B_BUFF1} is trying to\n" - .string "learn {B_BUFF2}.\p" - .string "$" - -gUnknown_83FB2D1:: @ 83FB2D1 - .string "But, {B_BUFF1} can't learn\n" - .string "more than four moves.\p" - .string "$" - -gUnknown_83FB2FC:: @ 83FB2FC - .string "Delete a move to make\n" - .string "room for {B_BUFF2}?$" - -gUnknown_83FB31F:: @ 83FB31F - .string "{B_BUFF1} forgot\n" - .string "{B_BUFF2}.\p" - .string "$" - -gUnknown_83FB32E:: @ 83FB32E - .string "{PAUSE 32}Stop learning\n" - .string "{B_BUFF2}?$" - -gUnknown_83FB343:: @ 83FB343 - .string "{B_BUFF1} did not learn\n" - .string "{B_BUFF2}.\p" - .string "$" - -gUnknown_83FB359:: @ 83FB359 - .string "Use next POKéMON?$" - -gUnknown_83FB36B:: @ 83FB36B - .string "{B_ATK_NAME_WITH_PREFIX}'s\n" - .string "attack missed!$" - -gUnknown_83FB37F:: @ 83FB37F - .string "{B_DEF_NAME_WITH_PREFIX}\n" - .string "protected itself!$" - -gUnknown_83FB394:: @ 83FB394 - .string "{B_DEF_NAME_WITH_PREFIX} avoided\n" - .string "damage with {B_DEF_ABILITY}!$" - -gUnknown_83FB3AF:: @ 83FB3AF - .string "{B_DEF_NAME_WITH_PREFIX} makes GROUND\n" - .string "moves miss with {B_DEF_ABILITY}!$" - -gUnknown_83FB3D3:: @ 83FB3D3 - .string "{B_DEF_NAME_WITH_PREFIX} avoided\n" - .string "the attack!$" - -gUnknown_83FB3EA:: @ 83FB3EA - .string "It doesn't affect\n" - .string "{B_DEF_NAME_WITH_PREFIX}…$" - -gUnknown_83FB400:: @ 83FB400 - .string "{B_ATK_NAME_WITH_PREFIX}\n" - .string "fainted!\p" - .string "$" - -gUnknown_83FB40D:: @ 83FB40D - .string "{B_DEF_NAME_WITH_PREFIX}\n" - .string "fainted!\p" - .string "$" - -gUnknown_83FB41A:: @ 83FB41A - .string "{B_PLAYER_NAME} got ¥{B_BUFF1}\n" - .string "for winning!\p" - .string "$" - -gUnknown_83FB433:: @ 83FB433 - .string "{B_PLAYER_NAME} is out of\n" - .string "usable POKéMON!\p" - .string "$" - -gUnknown_83FB451:: @ 83FB451 - .string "{B_PLAYER_NAME} panicked and lost ¥{B_BUFF1}…\p" - .string "… … … …\p" - .string "{B_PLAYER_NAME} whited out!{PAUSE_UNTIL_PRESS}$" - -gUnknown_83FB484:: @ 83FB484 - .string "{B_PLAYER_NAME} is out of\n" - .string "usable POKéMON!\p" - .string "Player lost against\n" - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!{PAUSE_UNTIL_PRESS}$" - -gUnknown_83FB4BE:: @ 83FB4BE - .string "{B_PLAYER_NAME} paid ¥{B_BUFF1} as the prize\n" - .string "money…\p" - .string "… … … …\p" - .string "{B_PLAYER_NAME} whited out!{PAUSE_UNTIL_PRESS}$" - -gUnknown_83FB4F7:: @ 83FB4F7 - .string "{B_PLAYER_NAME} whited out!{PAUSE_UNTIL_PRESS}$" - -gUnknown_83FB508:: @ 83FB508 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX} prevents\n" - .string "escape with {B_SCR_ACTIVE_ABILITY}!\p" - .string "$" - -gUnknown_83FB525:: @ 83FB525 - .string "Can't escape!\p" - .string "$" - -gUnknown_83FB534:: @ 83FB534 - .string "{B_ATK_NAME_WITH_PREFIX} can't escape!$" - -gUnknown_83FB545:: @ 83FB545 - .string "Hit {B_BUFF1} time(s)!$" - -gUnknown_83FB555:: @ 83FB555 - .string "{B_EFF_NAME_WITH_PREFIX}\n" - .string "fell asleep!$" - -gUnknown_83FB565:: @ 83FB565 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "made {B_EFF_NAME_WITH_PREFIX} sleep!$" - -gUnknown_83FB57C:: @ 83FB57C - .string "{B_DEF_NAME_WITH_PREFIX} is\n" - .string "already asleep!$" - -gUnknown_83FB592:: @ 83FB592 - .string "{B_ATK_NAME_WITH_PREFIX} is\n" - .string "already asleep!$" - -gUnknown_83FB5A8:: @ 83FB5A8 - .string "{B_DEF_NAME_WITH_PREFIX}\n" - .string "wasn't affected!$" - -gUnknown_83FB5BC:: @ 83FB5BC - .string "{B_EFF_NAME_WITH_PREFIX}\n" - .string "was poisoned!$" - -gUnknown_83FB5CD:: @ 83FB5CD - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "poisoned {B_EFF_NAME_WITH_PREFIX}!$" - -gUnknown_83FB5E2:: @ 83FB5E2 - .string "{B_ATK_NAME_WITH_PREFIX} is hurt\n" - .string "by poison!$" - -gUnknown_83FB5F8:: @ 83FB5F8 - .string "{B_DEF_NAME_WITH_PREFIX} is already\n" - .string "poisoned.$" - -gUnknown_83FB610:: @ 83FB610 - .string "{B_EFF_NAME_WITH_PREFIX} is badly\n" - .string "poisoned!$" - -gUnknown_83FB626:: @ 83FB626 - .string "{B_DEF_NAME_WITH_PREFIX} had its\n" - .string "energy drained!$" - -gUnknown_83FB641:: @ 83FB641 - .string "{B_EFF_NAME_WITH_PREFIX} was burned!$" - -gUnknown_83FB650:: @ 83FB650 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "burned {B_EFF_NAME_WITH_PREFIX}!$" - -gUnknown_83FB663:: @ 83FB663 - .string "{B_ATK_NAME_WITH_PREFIX} is hurt\n" - .string "by its burn!$" - -gUnknown_83FB67B:: @ 83FB67B - .string "{B_DEF_NAME_WITH_PREFIX} already\n" - .string "has a burn.$" - -gUnknown_83FB692:: @ 83FB692 - .string "{B_EFF_NAME_WITH_PREFIX} was\n" - .string "frozen solid!$" - -gUnknown_83FB6A7:: @ 83FB6A7 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "froze {B_EFF_NAME_WITH_PREFIX} solid!$" - -gUnknown_83FB6BF:: @ 83FB6BF - .string "{B_ATK_NAME_WITH_PREFIX} is\n" - .string "frozen solid!$" - -gUnknown_83FB6D3:: @ 83FB6D3 - .string "{B_DEF_NAME_WITH_PREFIX} was\n" - .string "defrosted!$" - -gUnknown_83FB6E5:: @ 83FB6E5 - .string "{B_ATK_NAME_WITH_PREFIX} was\n" - .string "defrosted!$" - -gUnknown_83FB6F7:: @ 83FB6F7 - .string "{B_ATK_NAME_WITH_PREFIX} was\n" - .string "defrosted by {B_CURRENT_MOVE}!$" - -gUnknown_83FB70F:: @ 83FB70F - .string "{B_EFF_NAME_WITH_PREFIX} is paralyzed!\n" - .string "It may be unable to move!$" - -gUnknown_83FB73A:: @ 83FB73A - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "paralyzed {B_EFF_NAME_WITH_PREFIX}!\l" - .string "It may be unable to move!$" - -gUnknown_83FB76A:: @ 83FB76A - .string "{B_ATK_NAME_WITH_PREFIX} is paralyzed!\n" - .string "It can't move!$" - -gUnknown_83FB78A:: @ 83FB78A - .string "{B_DEF_NAME_WITH_PREFIX} is\n" - .string "already paralyzed!$" - -gUnknown_83FB7A3:: @ 83FB7A3 - .string "{B_DEF_NAME_WITH_PREFIX} was\n" - .string "healed of paralysis!$" - -gUnknown_83FB7BF:: @ 83FB7BF - .string "{B_DEF_NAME_WITH_PREFIX}'s\n" - .string "dream was eaten!$" - -gUnknown_83FB7D5:: @ 83FB7D5 - .string "{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n" - .string "won't go higher!$" - -gUnknown_83FB7EE:: @ 83FB7EE - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n" - .string "won't go lower!$" - -gUnknown_83FB806:: @ 83FB806 - .string "Your team's {B_BUFF1}\n" - .string "stopped working!$" - -gUnknown_83FB826:: @ 83FB826 - .string "The foe's {B_BUFF1}\n" - .string "stopped working!$" - -gUnknown_83FB844:: @ 83FB844 - .string "{B_ATK_NAME_WITH_PREFIX} is\n" - .string "confused!$" - -gUnknown_83FB854:: @ 83FB854 - .string "{B_ATK_NAME_WITH_PREFIX} snapped\n" - .string "out of confusion!$" - -gUnknown_83FB871:: @ 83FB871 - .string "{B_EFF_NAME_WITH_PREFIX} became\n" - .string "confused!$" - -gUnknown_83FB885:: @ 83FB885 - .string "{B_DEF_NAME_WITH_PREFIX} is\n" - .string "already confused!$" - -gUnknown_83FB89D:: @ 83FB89D - .string "{B_DEF_NAME_WITH_PREFIX}\n" - .string "fell in love!$" - -gUnknown_83FB8AE:: @ 83FB8AE - .string "{B_ATK_NAME_WITH_PREFIX} is in love\n" - .string "with {B_SCR_ACTIVE_NAME_WITH_PREFIX}!$" - -gUnknown_83FB8C5:: @ 83FB8C5 - .string "{B_ATK_NAME_WITH_PREFIX} is\n" - .string "immobilized by love!$" - -gUnknown_83FB8E0:: @ 83FB8E0 - .string "{B_DEF_NAME_WITH_PREFIX} was\n" - .string "blown away!$" - -gUnknown_83FB8F3:: @ 83FB8F3 - .string "{B_ATK_NAME_WITH_PREFIX} transformed\n" - .string "into the {B_BUFF1} type!$" - -gUnknown_83FB914:: @ 83FB914 - .string "{B_ATK_NAME_WITH_PREFIX} flinched!$" - -gUnknown_83FB921:: @ 83FB921 - .string "{B_DEF_NAME_WITH_PREFIX} regained\n" - .string "health!$" - -gUnknown_83FB935:: @ 83FB935 - .string "{B_DEF_NAME_WITH_PREFIX}'s\n" - .string "HP is full!$" - -gUnknown_83FB946:: @ 83FB946 - .string "{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\n" - .string "raised SP. DEF!$" - -gUnknown_83FB95E:: @ 83FB95E - .string "{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\n" - .string "raised SP. DEF a little!$" - -gUnknown_83FB97F:: @ 83FB97F - .string "{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\n" - .string "raised DEFENSE!$" - -gUnknown_83FB997:: @ 83FB997 - .string "{B_ATK_PREFIX2}'s {B_CURRENT_MOVE}\n" - .string "raised DEFENSE a little!$" - -gUnknown_83FB9B8:: @ 83FB9B8 - .string "{B_ATK_PREFIX2}'s party is covered\n" - .string "by a veil!$" - -gUnknown_83FB9D9:: @ 83FB9D9 - .string "{B_DEF_NAME_WITH_PREFIX}'s party is protected\n" - .string "by SAFEGUARD!$" - -gUnknown_83FB9FF:: @ 83FB9FF - .string "{B_ATK_PREFIX3}'s party is no longer\n" - .string "protected by SAFEGUARD!$" - -gUnknown_83FBA2F:: @ 83FBA2F - .string "{B_ATK_NAME_WITH_PREFIX} went\n" - .string "to sleep!$" - -gUnknown_83FBA41:: @ 83FBA41 - .string "{B_ATK_NAME_WITH_PREFIX} slept and\n" - .string "became healthy!$" - -gUnknown_83FBA5E:: @ 83FBA5E - .string "{B_ATK_NAME_WITH_PREFIX} whipped\n" - .string "up a whirlwind!$" - -gUnknown_83FBA79:: @ 83FBA79 - .string "{B_ATK_NAME_WITH_PREFIX} took\n" - .string "in sunlight!$" - -gUnknown_83FBA8E:: @ 83FBA8E - .string "{B_ATK_NAME_WITH_PREFIX} lowered\n" - .string "its head!$" - -gUnknown_83FBAA3:: @ 83FBAA3 - .string "{B_ATK_NAME_WITH_PREFIX} is glowing!$" - -gUnknown_83FBAB2:: @ 83FBAB2 - .string "{B_ATK_NAME_WITH_PREFIX} flew\n" - .string "up high!$" - -gUnknown_83FBAC3:: @ 83FBAC3 - .string "{B_ATK_NAME_WITH_PREFIX} dug a hole!$" - -gUnknown_83FBAD2:: @ 83FBAD2 - .string "{B_ATK_NAME_WITH_PREFIX} hid\n" - .string "underwater!$" - -gUnknown_83FBAE5:: @ 83FBAE5 - .string "{B_ATK_NAME_WITH_PREFIX} sprang up!$" - -gUnknown_83FBAF3:: @ 83FBAF3 - .string "{B_DEF_NAME_WITH_PREFIX} was squeezed by\n" - .string "{B_ATK_NAME_WITH_PREFIX}'s BIND!$" - -gUnknown_83FBB11:: @ 83FBB11 - .string "{B_DEF_NAME_WITH_PREFIX} was trapped\n" - .string "in the vortex!$" - -gUnknown_83FBB2F:: @ 83FBB2F - .string "{B_DEF_NAME_WITH_PREFIX} was trapped\n" - .string "by SAND TOMB!$" - -gUnknown_83FBB4C:: @ 83FBB4C - .string "{B_DEF_NAME_WITH_PREFIX} was WRAPPED by\n" - .string "{B_ATK_NAME_WITH_PREFIX}!$" - -gUnknown_83FBB62:: @ 83FBB62 - .string "{B_ATK_NAME_WITH_PREFIX} CLAMPED\n" - .string "{B_DEF_NAME_WITH_PREFIX}!$" - -gUnknown_83FBB71:: @ 83FBB71 - .string "{B_ATK_NAME_WITH_PREFIX} is hurt\n" - .string "by {B_BUFF1}!$" - -gUnknown_83FBB83:: @ 83FBB83 - .string "{B_ATK_NAME_WITH_PREFIX} was freed\n" - .string "from {B_BUFF1}!$" - -gUnknown_83FBB99:: @ 83FBB99 - .string "{B_ATK_NAME_WITH_PREFIX} kept going\n" - .string "and crashed!$" - -BattleText_MistShroud:: @ 83FBBB4 - .string "{B_ATK_PREFIX2} became\n" - .string "shrouded in MIST!$" - -gUnknown_83FBBD0:: @ 83FBBD0 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX} is protected\n" - .string "by MIST!$" - -BattleText_GetPumped:: @ 83FBBE9 - .string "{B_ATK_NAME_WITH_PREFIX} is getting\n" - .string "pumped!$" - -gUnknown_83FBBFF:: @ 83FBBFF - .string "{B_ATK_NAME_WITH_PREFIX} is hit\n" - .string "with recoil!$" - -gUnknown_83FBC16:: @ 83FBC16 - .string "{B_ATK_NAME_WITH_PREFIX} protected\n" - .string "itself!$" - -gUnknown_83FBC2B:: @ 83FBC2B - .string "{B_ATK_NAME_WITH_PREFIX} is buffeted\n" - .string "by the sandstorm!$" - -gUnknown_83FBC4C:: @ 83FBC4C - .string "{B_ATK_NAME_WITH_PREFIX} is pelted\n" - .string "by HAIL!$" - -gUnknown_83FBC62:: @ 83FBC62 - .string "{B_ATK_PREFIX1}'s {B_BUFF1}\n" - .string "wore off!$" - -gUnknown_83FBC74:: @ 83FBC74 - .string "{B_DEF_NAME_WITH_PREFIX} was seeded!$" - -gUnknown_83FBC83:: @ 83FBC83 - .string "{B_DEF_NAME_WITH_PREFIX} evaded\n" - .string "the attack!$" - -gUnknown_83FBC99:: @ 83FBC99 - .string "{B_ATK_NAME_WITH_PREFIX}'s health is\n" - .string "sapped by LEECH SEED!$" - -gUnknown_83FBCBE:: @ 83FBCBE - .string "{B_ATK_NAME_WITH_PREFIX} is fast\n" - .string "asleep.$" - -gUnknown_83FBCD1:: @ 83FBCD1 - .string "{B_ATK_NAME_WITH_PREFIX} woke up!$" - -gUnknown_83FBCDD:: @ 83FBCDD - .string "But {B_SCR_ACTIVE_NAME_WITH_PREFIX}'s UPROAR\n" - .string "kept it awake!$" - -gUnknown_83FBCFC:: @ 83FBCFC - .string "{B_ATK_NAME_WITH_PREFIX} woke up\n" - .string "in the UPROAR!$" - -gUnknown_83FBD16:: @ 83FBD16 - .string "{B_ATK_NAME_WITH_PREFIX} caused\n" - .string "an UPROAR!$" - -gUnknown_83FBD2B:: @ 83FBD2B - .string "{B_ATK_NAME_WITH_PREFIX} is making\n" - .string "an UPROAR!$" - -gUnknown_83FBD43:: @ 83FBD43 - .string "{B_ATK_NAME_WITH_PREFIX} calmed down.$" - -gUnknown_83FBD53:: @ 83FBD53 - .string "But {B_DEF_NAME_WITH_PREFIX} can't\n" - .string "sleep in an UPROAR!$" - -gUnknown_83FBD74:: @ 83FBD74 - .string "{B_ATK_NAME_WITH_PREFIX} STOCKPILED\n" - .string "{B_BUFF1}!$" - -gUnknown_83FBD86:: @ 83FBD86 - .string "{B_ATK_NAME_WITH_PREFIX} can't\n" - .string "STOCKPILE any more!$" - -gUnknown_83FBDA3:: @ 83FBDA3 - .string "But {B_DEF_NAME_WITH_PREFIX} can't\n" - .string "sleep in an UPROAR!$" - -gUnknown_83FBDC4:: @ 83FBDC4 - .string "But the UPROAR kept\n" - .string "{B_DEF_NAME_WITH_PREFIX} awake!$" - -gUnknown_83FBDE2:: @ 83FBDE2 - .string "{B_DEF_NAME_WITH_PREFIX} stayed awake\n" - .string "using its {B_DEF_ABILITY}!$" - -gUnknown_83FBE00:: @ 83FBE00 - .string "{B_ATK_NAME_WITH_PREFIX} is storing\n" - .string "energy!$" - -gUnknown_83FBE16:: @ 83FBE16 - .string "{B_ATK_NAME_WITH_PREFIX} unleashed\n" - .string "energy!$" - -gUnknown_83FBE2B:: @ 83FBE2B - .string "{B_ATK_NAME_WITH_PREFIX} became\n" - .string "confused due to fatigue!$" - -gUnknown_83FBE4E:: @ 83FBE4E - .string "{B_PLAYER_NAME} picked up\n" - .string "¥{B_BUFF1}!\p" - .string "$" - -gUnknown_83FBE61:: @ 83FBE61 - .string "{B_DEF_NAME_WITH_PREFIX} is\n" - .string "unaffected!$" - -gUnknown_83FBE73:: @ 83FBE73 - .string "{B_ATK_NAME_WITH_PREFIX} transformed\n" - .string "into {B_BUFF1}!$" - -gUnknown_83FBE8B:: @ 83FBE8B - .string "{B_ATK_NAME_WITH_PREFIX} made\n" - .string "a SUBSTITUTE!$" - -gUnknown_83FBEA1:: @ 83FBEA1 - .string "{B_ATK_NAME_WITH_PREFIX} already\n" - .string "has a SUBSTITUTE!$" - -gUnknown_83FBEBE:: @ 83FBEBE - .string "The SUBSTITUTE took damage\n" - .string "for {B_DEF_NAME_WITH_PREFIX}!\p" - .string "$" - -gUnknown_83FBEE2:: @ 83FBEE2 - .string "{B_DEF_NAME_WITH_PREFIX}'s\n" - .string "SUBSTITUTE faded!\p" - .string "$" - -gUnknown_83FBEFA:: @ 83FBEFA - .string "{B_ATK_NAME_WITH_PREFIX} must\n" - .string "recharge!$" - -gUnknown_83FBF0C:: @ 83FBF0C - .string "{B_DEF_NAME_WITH_PREFIX}'s RAGE\n" - .string "is building!$" - -gUnknown_83FBF23:: @ 83FBF23 - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n" - .string "was disabled!$" - -gUnknown_83FBF39:: @ 83FBF39 - .string "{B_ATK_NAME_WITH_PREFIX} is disabled\n" - .string "no more!$" - -gUnknown_83FBF51:: @ 83FBF51 - .string "{B_DEF_NAME_WITH_PREFIX} got\n" - .string "an ENCORE!$" - -gUnknown_83FBF63:: @ 83FBF63 - .string "{B_ATK_NAME_WITH_PREFIX}'s ENCORE\n" - .string "ended!$" - -gUnknown_83FBF76:: @ 83FBF76 - .string "{B_ATK_NAME_WITH_PREFIX} took aim\n" - .string "at {B_DEF_NAME_WITH_PREFIX}!$" - -gUnknown_83FBF89:: @ 83FBF89 - .string "{B_ATK_NAME_WITH_PREFIX} SKETCHED\n" - .string "{B_BUFF1}!$" - -gUnknown_83FBF99:: @ 83FBF99 - .string "{B_ATK_NAME_WITH_PREFIX} is trying\n" - .string "to take its foe with it!$" - -gUnknown_83FBFBF:: @ 83FBFBF - .string "{B_DEF_NAME_WITH_PREFIX} took\n" - .string "{B_ATK_NAME_WITH_PREFIX} with it!$" - -gUnknown_83FBFD3:: @ 83FBFD3 - .string "Reduced {B_DEF_NAME_WITH_PREFIX}'s\n" - .string "{B_BUFF1} by {B_BUFF2}!$" - -gUnknown_83FBFEA:: @ 83FBFEA - .string "{B_ATK_NAME_WITH_PREFIX} stole\n" - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_LAST_ITEM}!$" - -gUnknown_83FBFFC:: @ 83FBFFC - .string "{B_DEF_NAME_WITH_PREFIX} can't\n" - .string "escape now!$" - -gUnknown_83FC011:: @ 83FC011 - .string "{B_DEF_NAME_WITH_PREFIX} fell into\n" - .string "a NIGHTMARE!$" - -gUnknown_83FC02B:: @ 83FC02B - .string "{B_ATK_NAME_WITH_PREFIX} is locked\n" - .string "in a NIGHTMARE!$" - -gUnknown_83FC048:: @ 83FC048 - .string "{B_ATK_NAME_WITH_PREFIX} cut its own HP and\n" - .string "laid a CURSE on {B_DEF_NAME_WITH_PREFIX}!$" - -gUnknown_83FC072:: @ 83FC072 - .string "{B_ATK_NAME_WITH_PREFIX} is afflicted\n" - .string "by the CURSE!$" - -gUnknown_83FC090:: @ 83FC090 - .string "SPIKES were scattered all around\n" - .string "the opponent's side!$" - -gUnknown_83FC0C6:: @ 83FC0C6 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX} is hurt\n" - .string "by SPIKES!$" - -gUnknown_83FC0DC:: @ 83FC0DC - .string "{B_ATK_NAME_WITH_PREFIX} identified\n" - .string "{B_DEF_NAME_WITH_PREFIX}!$" - -gUnknown_83FC0EE:: @ 83FC0EE - .string "{B_ATK_NAME_WITH_PREFIX}'s PERISH count\n" - .string "fell to {B_BUFF1}!$" - -gUnknown_83FC10C:: @ 83FC10C - .string "{B_ATK_NAME_WITH_PREFIX} braced\n" - .string "itself!$" - -gUnknown_83FC11E:: @ 83FC11E - .string "{B_DEF_NAME_WITH_PREFIX} ENDURED\n" - .string "the hit!$" - -gUnknown_83FC132:: @ 83FC132 - .string "MAGNITUDE {B_BUFF1}!$" - -gUnknown_83FC140:: @ 83FC140 - .string "{B_ATK_NAME_WITH_PREFIX} cut its own HP\n" - .string "and maximized ATTACK!$" - -gUnknown_83FC168:: @ 83FC168 - .string "{B_ATK_NAME_WITH_PREFIX} copied\n" - .string "{B_DEF_NAME_WITH_PREFIX}'s stat changes!$" - -gUnknown_83FC185:: @ 83FC185 - .string "{B_ATK_NAME_WITH_PREFIX} got free of\n" - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}!$" - -gUnknown_83FC19D:: @ 83FC19D - .string "{B_ATK_NAME_WITH_PREFIX} shed\n" - .string "LEECH SEED!$" - -gUnknown_83FC1B1:: @ 83FC1B1 - .string "{B_ATK_NAME_WITH_PREFIX} blew away\n" - .string "SPIKES!$" - -gUnknown_83FC1C6:: @ 83FC1C6 - .string "{B_ATK_NAME_WITH_PREFIX} fled from\n" - .string "battle!$" - -gUnknown_83FC1DB:: @ 83FC1DB - .string "{B_ATK_NAME_WITH_PREFIX} foresaw\n" - .string "an attack!$" - -gUnknown_83FC1F1:: @ 83FC1F1 - .string "{B_DEF_NAME_WITH_PREFIX} took the\n" - .string "{B_BUFF1} attack!$" - -gUnknown_83FC208:: @ 83FC208 - .string "{B_ATK_NAME_WITH_PREFIX} chose\n" - .string "{B_CURRENT_MOVE} as its destiny!$" - -gUnknown_83FC224:: @ 83FC224 - .string "{B_BUFF1}'s attack!$" - -gUnknown_83FC231:: @ 83FC231 - .string "{B_ATK_NAME_WITH_PREFIX} became the\n" - .string "center of attention!$" - -gUnknown_83FC254:: @ 83FC254 - .string "{B_ATK_NAME_WITH_PREFIX} began\n" - .string "charging power!$" - -gUnknown_83FC26D:: @ 83FC26D - .string "NATURE POWER turned into\n" - .string "{B_CURRENT_MOVE}!$" - -gUnknown_83FC28A:: @ 83FC28A - .string "{B_ATK_NAME_WITH_PREFIX}'s status\n" - .string "returned to normal!$" - -gUnknown_83FC2AA:: @ 83FC2AA - .string "{B_DEF_NAME_WITH_PREFIX} was subjected\n" - .string "to TORMENT!$" - -gUnknown_83FC2C7:: @ 83FC2C7 - .string "{B_ATK_NAME_WITH_PREFIX} is tightening\n" - .string "its focus!$" - -gUnknown_83FC2E3:: @ 83FC2E3 - .string "{B_DEF_NAME_WITH_PREFIX} fell for\n" - .string "the TAUNT!$" - -gUnknown_83FC2FA:: @ 83FC2FA - .string "{B_ATK_NAME_WITH_PREFIX} is ready to\n" - .string "help {B_DEF_NAME_WITH_PREFIX}!$" - -gUnknown_83FC312:: @ 83FC312 - .string "{B_ATK_NAME_WITH_PREFIX} switched\n" - .string "items with its opponent!$" - -gUnknown_83FC337:: @ 83FC337 - .string "{B_ATK_NAME_WITH_PREFIX} obtained\n" - .string "{B_BUFF1}.$" - -gUnknown_83FC347:: @ 83FC347 - .string "{B_DEF_NAME_WITH_PREFIX} obtained\n" - .string "{B_BUFF2}.$" - -gUnknown_83FC357:: @ 83FC357 - .string "{B_ATK_NAME_WITH_PREFIX} obtained\n" - .string "{B_BUFF1}.\p" - .string "{B_DEF_NAME_WITH_PREFIX} obtained\n" - .string "{B_BUFF2}.$" - -gUnknown_83FC377:: @ 83FC377 - .string "{B_ATK_NAME_WITH_PREFIX} copied\n" - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}!$" - -gUnknown_83FC38A:: @ 83FC38A - .string "{B_ATK_NAME_WITH_PREFIX} made a WISH!$" - -gUnknown_83FC39A:: @ 83FC39A - .string "{B_BUFF1}'s WISH\n" - .string "came true!$" - -gUnknown_83FC3AF:: @ 83FC3AF - .string "{B_ATK_NAME_WITH_PREFIX} planted its roots!$" - -gUnknown_83FC3C5:: @ 83FC3C5 - .string "{B_ATK_NAME_WITH_PREFIX} absorbed\n" - .string "nutrients with its roots!$" - -gUnknown_83FC3EB:: @ 83FC3EB - .string "{B_DEF_NAME_WITH_PREFIX} anchored\n" - .string "itself with its roots!$" - -gUnknown_83FC40E:: @ 83FC40E - .string "{B_ATK_NAME_WITH_PREFIX} made\n" - .string "{B_DEF_NAME_WITH_PREFIX} drowsy!$" - -gUnknown_83FC421:: @ 83FC421 - .string "{B_ATK_NAME_WITH_PREFIX} knocked off\n" - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_LAST_ITEM}!$" - -gUnknown_83FC439:: @ 83FC439 - .string "{B_ATK_NAME_WITH_PREFIX} swapped abilities\n" - .string "with its opponent!$" - -gUnknown_83FC461:: @ 83FC461 - .string "{B_ATK_NAME_WITH_PREFIX} sealed the\n" - .string "opponent's moveシsス!$" - -gUnknown_83FC483:: @ 83FC483 - .string "{B_ATK_NAME_WITH_PREFIX} wants the\n" - .string "opponent to bear a GRUDGE!$" - -gUnknown_83FC4AB:: @ 83FC4AB - .string "{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1} lost\n" - .string "all its PP due to the GRUDGE!$" - -gUnknown_83FC4D6:: @ 83FC4D6 - .string "{B_ATK_NAME_WITH_PREFIX} shrouded\n" - .string "itself in {B_CURRENT_MOVE}!$" - -gUnknown_83FC4F0:: @ 83FC4F0 - .string "{B_ATK_NAME_WITH_PREFIX}'s {B_CURRENT_MOVE}\n" - .string "was bounced back by MAGIC COAT!$" - -gUnknown_83FC518:: @ 83FC518 - .string "{B_ATK_NAME_WITH_PREFIX} waits for its foe\n" - .string "to make a move!$" - -gUnknown_83FC53D:: @ 83FC53D - .string "{B_DEF_NAME_WITH_PREFIX} SNATCHED\n" - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s move!$" - -gUnknown_83FC554:: @ 83FC554 - .string "Electricity's power was\n" - .string "weakened!$" - -gUnknown_83FC576:: @ 83FC576 - .string "Fire's power was\n" - .string "weakened!$" - -gUnknown_83FC591:: @ 83FC591 - .string "{B_ATK_NAME_WITH_PREFIX} found\n" - .string "one {B_LAST_ITEM}!$" - -gUnknown_83FC5A2:: @ 83FC5A2 - .string "A soothing aroma wafted\n" - .string "through the area!$" - -gUnknown_83FC5CC:: @ 83FC5CC - .string "Items can't be used now.{PAUSE 64}$" - -gUnknown_83FC5E8:: @ 83FC5E8 - .string "For {B_SCR_ACTIVE_NAME_WITH_PREFIX},\n" - .string "{B_LAST_ITEM} {B_BUFF1}$" - -gUnknown_83FC5F6:: @ 83FC5F6 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX} used\n" - .string "{B_LAST_ITEM} to hustle!$" - -gUnknown_83FC60C:: @ 83FC60C - .string "{B_ATK_NAME_WITH_PREFIX} lost its\n" - .string "focus and couldn't move!$" - -gUnknown_83FC631:: @ 83FC631 - .string "{B_DEF_NAME_WITH_PREFIX} was\n" - .string "dragged out!\p" - .string "$" - -gUnknown_83FC646:: @ 83FC646 - .string "The wall shattered!$" - -gUnknown_83FC65A:: @ 83FC65A - .string "But it had no effect!$" - -gUnknown_83FC670:: @ 83FC670 - .string "{B_ACTIVE_NAME_WITH_PREFIX} has no\n" - .string "moves left!\p" - .string "$" - -gUnknown_83FC687:: @ 83FC687 - .string "{B_ACTIVE_NAME_WITH_PREFIX}'s {B_CURRENT_MOVE}\n" - .string "is disabled!\p" - .string "$" - -gUnknown_83FC69D:: @ 83FC69D - .string "{B_ACTIVE_NAME_WITH_PREFIX} can't use the same\n" - .string "move in a row due to the TORMENT!\p" - .string "$" - -gUnknown_83FC6D6:: @ 83FC6D6 - .string "{B_ACTIVE_NAME_WITH_PREFIX} can't use\n" - .string "{B_CURRENT_MOVE} after the TAUNT!\p" - .string "$" - -gUnknown_83FC6F8:: @ 83FC6F8 - .string "{B_ACTIVE_NAME_WITH_PREFIX} can't use the\n" - .string "sealed {B_CURRENT_MOVE}!\p" - .string "$" - -gUnknown_83FC715:: @ 83FC715 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "made it rain!$" - -gUnknown_83FC72B:: @ 83FC72B - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "raised its SPEED!$" - -gUnknown_83FC745:: @ 83FC745 - .string "{B_DEF_NAME_WITH_PREFIX} was protected\n" - .string "by {B_DEF_ABILITY}!$" - -gUnknown_83FC75D:: @ 83FC75D - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "prevents {B_ATK_NAME_WITH_PREFIX}\l" - .string "from using {B_CURRENT_MOVE}!$" - -gUnknown_83FC780:: @ 83FC780 - .string "{B_DEF_NAME_WITH_PREFIX} restored HP\n" - .string "using its {B_DEF_ABILITY}!$" - -gUnknown_83FC79D:: @ 83FC79D - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "made {B_CURRENT_MOVE} useless!$" - -gUnknown_83FC7B6:: @ 83FC7B6 - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "made it the {B_BUFF1} type!$" - -gUnknown_83FC7D3:: @ 83FC7D3 - .string "{B_EFF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "prevents paralysis!$" - -gUnknown_83FC7EF:: @ 83FC7EF - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "prevents romance!$" - -gUnknown_83FC809:: @ 83FC809 - .string "{B_EFF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "prevents poisoning!$" - -gUnknown_83FC825:: @ 83FC825 - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "prevents confusion!$" - -gUnknown_83FC841:: @ 83FC841 - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "raised its FIRE power!$" - -gUnknown_83FC860:: @ 83FC860 - .string "{B_DEF_NAME_WITH_PREFIX} anchors\n" - .string "itself with {B_DEF_ABILITY}!$" - -gUnknown_83FC87B:: @ 83FC87B - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "cuts {B_DEF_NAME_WITH_PREFIX}'s ATTACK!$" - -gUnknown_83FC895:: @ 83FC895 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "prevents stat loss!$" - -gUnknown_83FC8B1:: @ 83FC8B1 - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "hurt {B_ATK_NAME_WITH_PREFIX}!$" - -gUnknown_83FC8C2:: @ 83FC8C2 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX} TRACED\n" - .string "{B_BUFF1}'s {B_BUFF2}!$" - -gUnknown_83FC8D5:: @ 83FC8D5 - .string "{B_EFF_NAME_WITH_PREFIX}'s {B_EFF_ABILITY}\n" - .string "prevents burns!$" - -gUnknown_83FC8ED:: @ 83FC8ED - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "blocks {B_CURRENT_MOVE}!$" - -gUnknown_83FC900:: @ 83FC900 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "blocks {B_CURRENT_MOVE}!$" - -gUnknown_83FC913:: @ 83FC913 - .string "{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}\n" - .string "restored its HP a little!$" - -gUnknown_83FC935:: @ 83FC935 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "whipped up a sandstorm!$" - -gUnknown_83FC955:: @ 83FC955 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "intensified the sun's rays!$" - -gUnknown_83FC979:: @ 83FC979 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "prevents {B_BUFF1} loss!$" - -gUnknown_83FC993:: @ 83FC993 - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "infatuated {B_ATK_NAME_WITH_PREFIX}!$" - -gUnknown_83FC9AA:: @ 83FC9AA - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "made {B_CURRENT_MOVE} ineffective!$" - -gUnknown_83FC9C7:: @ 83FC9C7 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "cured its {B_BUFF1} problem!$" - -gUnknown_83FC9E5:: @ 83FC9E5 - .string "It sucked up the\n" - .string "LIQUID OOZE!$" - -gUnknown_83FCA03:: @ 83FCA03 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX} transformed!$" - -gUnknown_83FCA13:: @ 83FCA13 - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "took the attack!$" - -gText_PkmnsXPreventsSwitching:: @ 83FCA2C - .string "{B_BUFF1}'s {B_LAST_ABILITY}\n" - .string "prevents switching!\p" - .string "$" - -gUnknown_83FCA49:: @ 83FCA49 - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY}\n" - .string "prevented {B_SCR_ACTIVE_NAME_WITH_PREFIX}'s\l" - .string "{B_BUFF1} from working!$" - -gUnknown_83FCA71:: @ 83FCA71 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "made it ineffective!$" - -gUnknown_83FCA8E:: @ 83FCA8E - .string "{B_EFF_NAME_WITH_PREFIX}'s {B_EFF_ABILITY}\n" - .string "prevents flinching!$" - -gUnknown_83FCAAA:: @ 83FCAAA - .string "{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY}\n" - .string "prevents {B_DEF_NAME_WITH_PREFIX}'s\l" - .string "{B_DEF_ABILITY} from working!$" - -gUnknown_83FCAD1:: @ 83FCAD1 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "cured its {B_BUFF1} problem!$" - -gUnknown_83FCAEF:: @ 83FCAEF - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\n" - .string "had no effect on {B_EFF_NAME_WITH_PREFIX}!$" - -gUnknown_83FCB0C:: @ 83FCB0C - .string "{B_ATK_NAME_WITH_PREFIX} is too scared to move!$" - -gUnknown_83FCB26:: @ 83FCB26 - .string "GHOST: Get out…… Get out……$" - -gUnknown_83FCB41:: @ 83FCB41 - .string "sharply $" - -BattleText_Rose:: @ 83FCB4A - .string "rose!$" - -gUnknown_83FCB50:: @ 83FCB50 - .string "harshly $" - -gUnknown_83FCB59:: @ 83FCB59 - .string "fell!$" - -gUnknown_83FCB5F:: @ 83FCB5F - .string "{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n" - .string "{B_BUFF2}$" - -BattleText_UnknownString3:: @ 83FCB6A - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n" - .string "{B_BUFF2}$" - -gUnknown_83FCB75:: @ 83FCB75 - .string "Using {B_LAST_ITEM}, the {B_BUFF1}\n" - .string "of {B_SCR_ACTIVE_NAME_WITH_PREFIX} {B_BUFF2}$" - -gUnknown_83FCB8F:: @ 83FCB8F - .string "{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n" - .string "{B_BUFF2}$" - -gUnknown_83FCB9A:: @ 83FCB9A - .string "{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n" - .string "{B_BUFF2}$" - -gUnknown_83FCBA5:: @ 83FCBA5 - .string "{B_ATK_NAME_WITH_PREFIX}'s stats won't\n" - .string "go any higher!$" - -gUnknown_83FCBC5:: @ 83FCBC5 - .string "{B_DEF_NAME_WITH_PREFIX}'s stats won't\n" - .string "go any lower!$" - -gUnknown_83FCBE4:: @ 83FCBE4 - .string "A critical hit!$" - -gUnknown_83FCBF4:: @ 83FCBF4 - .string "It's a one-hit KO!$" - -gUnknown_83FCC07:: @ 83FCC07 - .string "{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p" - .string "$" - -gUnknown_83FCC33:: @ 83FCC33 - .string "And…\p" - .string "$" - -gUnknown_83FCC39:: @ 83FCC39 - .string "HM moves can't be\n" - .string "forgotten now.\p" - .string "$" - -gUnknown_83FCC5B:: @ 83FCC5B - .string "It's not very effective…$" - -gUnknown_83FCC74:: @ 83FCC74 - .string "It's super effective!$" - -gUnknown_83FCC8A:: @ 83FCC8A - .string "{PLAY_SE SE_NIGERU}Got away safely!\p" - .string "$" - -gUnknown_83FCCA0:: @ 83FCCA0 - .string "{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\n" - .string "using its {B_LAST_ITEM}!\p" - .string "$" - -gUnknown_83FCCBB:: @ 83FCCBB - .string "{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\n" - .string "using {B_ATK_ABILITY}!\p" - .string "$" - -gUnknown_83FCCD2:: @ 83FCCD2 - .string "{PLAY_SE SE_NIGERU}Wild {B_BUFF1} fled!$" - -gUnknown_83FCCE4:: @ 83FCCE4 - .string "Player defeated\n" - .string "{B_LINK_OPPONENT1_NAME}!$" - -gUnknown_83FCCF8:: @ 83FCCF8 - .string "Player beat {B_LINK_OPPONENT1_NAME}\n" - .string "and {B_LINK_OPPONENT2_NAME}!$" - -gUnknown_83FCD0F:: @ 83FCD0F - .string "Player lost against\n" - .string "{B_LINK_OPPONENT1_NAME}!$" - -gUnknown_83FCD27:: @ 83FCD27 - .string "Player lost to {B_LINK_OPPONENT1_NAME}\n" - .string "and {B_LINK_OPPONENT2_NAME}!$" - -gUnknown_83FCD41:: @ 83FCD41 - .string "Player battled to a draw against\n" - .string "{B_LINK_OPPONENT1_NAME}!$" - -gUnknown_83FCD66:: @ 83FCD66 - .string "Player battled to a draw against\n" - .string "{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!$" - -gUnknown_83FCD92:: @ 83FCD92 - .string "{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} fled!$" - -gUnknown_83FCD9F:: @ 83FCD9F - .string "{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} and\n" - .string "{B_LINK_OPPONENT2_NAME} fled!$" - -gUnknown_83FCDB3:: @ 83FCDB3 - .string "No! There's no running\n" - .string "from a TRAINER battle!\p" - .string "$" - -gUnknown_83FCDE2:: @ 83FCDE2 - .string "Can't escape!\p" - .string "$" - -gUnknown_83FCDF1:: @ 83FCDF1 - .string "$" - -gUnknown_83FCDF2:: @ 83FCDF2 - .string "But nothing happened!$" - -gUnknown_83FCE08:: @ 83FCE08 - .string "But it failed!$" - -gUnknown_83FCE17:: @ 83FCE17 - .string "It hurt itself in its\n" - .string "confusion!$" - -gUnknown_83FCE38:: @ 83FCE38 - .string "The MIRROR MOVE failed!$" - -gUnknown_83FCE50:: @ 83FCE50 - .string "It started to rain!$" - -gUnknown_83FCE64:: @ 83FCE64 - .string "A downpour started!$" - -gUnknown_83FCE78:: @ 83FCE78 - .string "Rain continues to fall.$" - -gUnknown_83FCE90:: @ 83FCE90 - .string "The downpour continues.$" - -gUnknown_83FCEA8:: @ 83FCEA8 - .string "The rain stopped.$" - -gUnknown_83FCEBA:: @ 83FCEBA - .string "A sandstorm brewed!$" - -gUnknown_83FCECE:: @ 83FCECE - .string "The sandstorm rages.$" - -gUnknown_83FCEE3:: @ 83FCEE3 - .string "The sandstorm subsided.$" - -gUnknown_83FCEFB:: @ 83FCEFB - .string "The sunlight got bright!$" - -gUnknown_83FCF14:: @ 83FCF14 - .string "The sunlight is strong.$" - -gUnknown_83FCF2C:: @ 83FCF2C - .string "The sunlight faded.$" - -gUnknown_83FCF40:: @ 83FCF40 - .string "It started to hail!$" - -gUnknown_83FCF54:: @ 83FCF54 - .string "Hail continues to fall.$" - -gUnknown_83FCF6C:: @ 83FCF6C - .string "The hail stopped.$" - -gUnknown_83FCF7E:: @ 83FCF7E - .string "But it failed to SPIT UP\n" - .string "a thing!$" - -gUnknown_83FCFA0:: @ 83FCFA0 - .string "But it failed to SWALLOW\n" - .string "a thing!$" - -gUnknown_83FCFC2:: @ 83FCFC2 - .string "The wind turned into a\n" - .string "HEAT WAVE!$" - -gUnknown_83FCFE4:: @ 83FCFE4 - .string "All stat changes were\n" - .string "eliminated!$" - -gUnknown_83FD006:: @ 83FD006 - .string "Coins scattered everywhere!$" - -gUnknown_83FD022:: @ 83FD022 - .string "It was too weak to make\n" - .string "a SUBSTITUTE!$" - -gUnknown_83FD048:: @ 83FD048 - .string "The battlers shared\n" - .string "their pain!$" - -gUnknown_83FD068:: @ 83FD068 - .string "A bell chimed!$" - -gUnknown_83FD077:: @ 83FD077 - .string "All affected POKéMON will\n" - .string "faint in three turns!$" - -gUnknown_83FD0A7:: @ 83FD0A7 - .string "There's no PP left for\n" - .string "this move!\p" - .string "$" - -gUnknown_83FD0CA:: @ 83FD0CA - .string "But there was no PP left\n" - .string "for the move!$" - -gUnknown_83FD0F1:: @ 83FD0F1 - .string "{B_ATK_NAME_WITH_PREFIX} ignored\n" - .string "orders while asleep!$" - -gUnknown_83FD111:: @ 83FD111 - .string "{B_ATK_NAME_WITH_PREFIX} ignored\n" - .string "orders!$" - -gUnknown_83FD124:: @ 83FD124 - .string "{B_ATK_NAME_WITH_PREFIX} began to nap!$" - -gUnknown_83FD135:: @ 83FD135 - .string "{B_ATK_NAME_WITH_PREFIX} is\n" - .string "loafing around!$" - -gUnknown_83FD14B:: @ 83FD14B - .string "{B_ATK_NAME_WITH_PREFIX} won't\n" - .string "obey!$" - -gUnknown_83FD15A:: @ 83FD15A - .string "{B_ATK_NAME_WITH_PREFIX} turned away!$" - -gUnknown_83FD16A:: @ 83FD16A - .string "{B_ATK_NAME_WITH_PREFIX} pretended\n" - .string "not to notice!$" - -gUnknown_83FD186:: @ 83FD186 - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME} is\n" - .string "about to use {B_BUFF2}.\p" - .string "Will {B_PLAYER_NAME} change\n" - .string "POKéMON?$" - -gUnknown_83FD1B8:: @ 83FD1B8 - .string "{B_ATK_NAME_WITH_PREFIX} learned\n" - .string "{B_BUFF1}!$" - -gUnknown_83FD1C7:: @ 83FD1C7 - .string "Player defeated\n" - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!\p" - .string "$" - -gUnknown_83FD1DF:: @ 83FD1DF - .string "{B_PLAYER_NAME} threw a ROCK\n" - .string "at the {B_OPPONENT_MON1_NAME}!$" - -gUnknown_83FD1FA:: @ 83FD1FA - .string "{B_PLAYER_NAME} threw some BAIT\n" - .string "at the {B_OPPONENT_MON1_NAME}!$" - -gUnknown_83FD218:: @ 83FD218 - .string "{B_OPPONENT_MON1_NAME} is watching\n" - .string "carefully!$" - -gUnknown_83FD232:: @ 83FD232 - .string "{B_OPPONENT_MON1_NAME} is angry!$" - -gUnknown_83FD23F:: @ 83FD23F - .string "{B_OPPONENT_MON1_NAME} is eating!$" - -gUnknown_83FD24D:: @ 83FD24D - .string "{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\n" - .string "SAFARI BALLS! Game over!\p" - .string "$" - -gUnknown_83FD284:: @ 83FD284 - .string "Wild {B_OPPONENT_MON1_NAME} appeared!\p" - .string "$" - -gUnknown_83FD297:: @ 83FD297 - .string "Wild {B_OPPONENT_MON1_NAME} appeared!\p" - .string "$" - -gUnknown_83FD2AA:: @ 83FD2AA - .string "Wild {B_OPPONENT_MON1_NAME} appeared!{PAUSE 127}$" - -gUnknown_83FD2BF:: @ 83FD2BF - .string "Wild {B_OPPONENT_MON1_NAME} and\n" - .string "{B_OPPONENT_MON2_NAME} appeared!\p" - .string "$" - -gUnknown_83FD2D9:: @ 83FD2D9 - .string "The GHOST appeared!\p" - .string "Darn!\n" - .string "The GHOST can't be ID'd!\p" - .string "$" - -gUnknown_83FD30D:: @ 83FD30D - .string "The GHOST appeared!\p" - .string "$" - -gUnknown_83FD322:: @ 83FD322 - .string "SILPH SCOPE unveiled the GHOST's\n" - .string "identity!$" - -gUnknown_83FD34D:: @ 83FD34D - .string "The GHOST was MAROWAK!\p" - .string "\n" - .string "$" - -gUnknown_83FD366:: @ 83FD366 - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME}\n" - .string "would like to battle!\p" - .string "$" - -gUnknown_83FD383:: @ 83FD383 - .string "{B_LINK_OPPONENT1_NAME}\n" - .string "wants to battle!$" - -gUnknown_83FD397:: @ 83FD397 - .string "{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}\n" - .string "want to battle!$" - -gUnknown_83FD3B1:: @ 83FD3B1 - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME} sent\n" - .string "out {B_OPPONENT_MON1_NAME}!{PAUSE 60}$" - -gUnknown_83FD3C7:: @ 83FD3C7 - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME} sent\n" - .string "out {B_OPPONENT_MON1_NAME} and {B_OPPONENT_MON2_NAME}!{PAUSE 60}$" - -gUnknown_83FD3E4:: @ 83FD3E4 - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME} sent\n" - .string "out {B_BUFF1}!$" - -gUnknown_83FD3F7:: @ 83FD3F7 - .string "{B_LINK_OPPONENT1_NAME} sent out\n" - .string "{B_OPPONENT_MON1_NAME}!$" - -gUnknown_83FD407:: @ 83FD407 - .string "{B_LINK_OPPONENT1_NAME} sent out\n" - .string "{B_OPPONENT_MON1_NAME} and {B_OPPONENT_MON2_NAME}!$" - -gUnknown_83FD41E:: @ 83FD41E - .string "{B_LINK_OPPONENT1_NAME} sent out {B_LINK_OPPONENT_MON1_NAME}!\n" - .string "{B_LINK_OPPONENT2_NAME} sent out {B_LINK_OPPONENT_MON2_NAME}!$" - -gUnknown_83FD43E:: @ 83FD43E - .string "{B_LINK_OPPONENT1_NAME} sent out\n" - .string "{B_BUFF1}!$" - -gUnknown_83FD44E:: @ 83FD44E - .string "{B_LINK_SCR_TRAINER_NAME} sent out\n" - .string "{B_BUFF1}!$" - -gUnknown_83FD45E:: @ 83FD45E - .string "Go! {B_PLAYER_MON1_NAME}!$" - -gUnknown_83FD466:: @ 83FD466 - .string "Go! {B_PLAYER_MON1_NAME} and\n" - .string "{B_PLAYER_MON2_NAME}!$" - -gUnknown_83FD475:: @ 83FD475 - .string "Go! {B_BUFF1}!$" - -gUnknown_83FD47D:: @ 83FD47D - .string "Do it! {B_BUFF1}!$" - -gUnknown_83FD488:: @ 83FD488 - .string "Go for it, {B_BUFF1}!$" - -gUnknown_83FD497:: @ 83FD497 - .string "Your foe's weak!\n" - .string "Get 'em, {B_BUFF1}!$" - -gUnknown_83FD4B5:: @ 83FD4B5 - .string "{B_LINK_PARTNER_NAME} sent out {B_LINK_PLAYER_MON2_NAME}!\n" - .string "Go! {GOOD_TEAM}!$" - -gUnknown_83FD4CD:: @ 83FD4CD - .string "{B_BUFF1}, that's enough!\n" - .string "Come back!$" - -gUnknown_83FD4EB:: @ 83FD4EB - .string "{B_BUFF1}, come back!$" - -gUnknown_83FD4FA:: @ 83FD4FA - .string "{B_BUFF1}, OK!\n" - .string "Come back!$" - -gUnknown_83FD50D:: @ 83FD50D - .string "{B_BUFF1}, good!\n" - .string "Come back!$" - -gUnknown_83FD522:: @ 83FD522 - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME}\n" - .string "withdrew {B_BUFF1}!$" - -gUnknown_83FD535:: @ 83FD535 - .string "{B_LINK_OPPONENT1_NAME} withdrew\n" - .string "{B_BUFF1}!$" - -gUnknown_83FD545:: @ 83FD545 - .string "{B_LINK_SCR_TRAINER_NAME} withdrew\n" - .string "{B_BUFF1}!$" - -gUnknown_83FD555:: @ 83FD555 - .string "Wild $" - -gUnknown_83FD55B:: @ 83FD55B - .string "Foe $" - -gUnknown_83FD560:: @ 83FD560 - .string "Foe$" - -gUnknown_83FD564:: @ 83FD564 - .string "Ally$" - -gUnknown_83FD569:: @ 83FD569 - .string "Foe$" - -gUnknown_83FD56D:: @ 83FD56D - .string "Ally$" - -gUnknown_83FD572:: @ 83FD572 - .string "Foe$" - -gUnknown_83FD576:: @ 83FD576 - .string "Ally$" - -gUnknown_83FD57B:: @ 83FD57B - .string "{B_ATK_NAME_WITH_PREFIX} used\n" - .string "{B_BUFF2}$" - -gUnknown_83FD586:: @ 83FD586 - .string "!$" - -gUnknown_83FD588:: @ 83FD588 - .string "!$" - -gUnknown_83FD58A:: @ 83FD58A - .string "!$" - -gUnknown_83FD58C:: @ 83FD58C - .string "!$" - -gUnknown_83FD58E:: @ 83FD58E - .string "!$" - -gUnknown_83FD590:: @ 83FD590 - .string "HP$" - -gUnknown_83FD593:: @ 83FD593 - .string "ATTACK$" - -gUnknown_83FD59A:: @ 83FD59A - .string "DEFENSE$" - -gUnknown_83FD5A2:: @ 83FD5A2 - .string "SPEED$" - -gUnknown_83FD5A8:: @ 83FD5A8 - .string "SP. ATK$" - -gUnknown_83FD5B0:: @ 83FD5B0 - .string "SP. DEF$" - -gUnknown_83FD5B8:: @ 83FD5B8 - .string "accuracy$" - -gUnknown_83FD5C1:: @ 83FD5C1 - .string "evasiveness$" - - .align 2 -gUnknown_83FD5D0:: @ 83FD5D0 - .4byte gUnknown_83FD590 - .4byte gUnknown_83FD593 - .4byte gUnknown_83FD59A - .4byte gUnknown_83FD5A2 - .4byte gUnknown_83FD5A8 - .4byte gUnknown_83FD5B0 - .4byte gUnknown_83FD5B8 - .4byte gUnknown_83FD5C1 - -gUnknown_83FD5F0:: - .string "was too spicy!$" - -gUnknown_83FD5FF:: @ 83FD5FF - .string "was too dry!$" - -gUnknown_83FD60C:: @ 83FD60C - .string "was too sweet!$" - -gUnknown_83FD61B:: @ 83FD61B - .string "was too bitter!$" - -gUnknown_83FD62B:: @ 83FD62B - .string "was too sour!$" - - .align 2 -gUnknown_83FD63C:: @ 83FD63C - .4byte gUnknown_83FD5F0 - .4byte gUnknown_83FD5FF - .4byte gUnknown_83FD60C - .4byte gUnknown_83FD61B - .4byte gUnknown_83FD62B - -gUnknown_83FD650:: @ 83FD650 - .string "{B_PLAYER_NAME} used\n" - .string "{B_LAST_ITEM}!$" - -gUnknown_83FD65C:: @ 83FD65C - .string "The old man used\n" - .string "{B_LAST_ITEM}!$" - -gUnknown_83FD671:: @ 83FD671 - .string "The POKé DUDE used\n" - .string "{B_LAST_ITEM}!$" - -gUnknown_83FD688:: @ 83FD688 - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME}\n" - .string "used {B_LAST_ITEM}!$" - -gUnknown_83FD697:: @ 83FD697 - .string "The TRAINER blocked the BALL!$" - -gUnknown_83FD6B5:: @ 83FD6B5 - .string "Don't be a thief!$" - -gUnknown_83FD6C7:: @ 83FD6C7 - .string "It dodged the thrown BALL!\n" - .string "This POKéMON can't be caught!$" - -gUnknown_83FD700:: @ 83FD700 - .string "You missed the POKéMON!$" - -gUnknown_83FD718:: @ 83FD718 - .string "Oh, no!\n" - .string "The POKéMON broke free!$" - -gUnknown_83FD738:: @ 83FD738 - .string "Aww!\n" - .string "It appeared to be caught!$" - -gUnknown_83FD757:: @ 83FD757 - .string "Aargh!\n" - .string "Almost had it!$" - -gUnknown_83FD76D:: @ 83FD76D - .string "Shoot!\n" - .string "It was so close, too!$" - -gUnknown_83FD78A:: @ 83FD78A - .string "よけられた!\n" - .string "こいつは つかまりそうにないぞ!$" - -gUnknown_83FD7A2:: @ 83FD7A2 - .string "Gotcha!\n" - .string "{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_GET_YASEI}\p" - .string "$" - -gUnknown_83FD7C0:: @ 83FD7C0 - .string "Gotcha!\n" - .string "{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_GET_YASEI}{PAUSE 127}$" - -gUnknown_83FD7E0:: @ 83FD7E0 - .string "Give a nickname to the\n" - .string "captured {B_OPPONENT_MON1_NAME}?$" - -gUnknown_83FD804:: @ 83FD804 - .string "{B_OPPONENT_MON1_NAME} was sent to\n" - .string "{B_PC_CREATOR_NAME} PC.$" - -gUnknown_83FD81A:: @ 83FD81A - .string "someone's$" - -gUnknown_83FD824:: @ 83FD824 - .string "BILL's$" - -gUnknown_83FD82B:: @ 83FD82B - .string "{B_OPPONENT_MON1_NAME}'s data was\n" - .string "added to the POKéDEX.\p" - .string "$" - -gUnknown_83FD850:: @ 83FD850 - .string "It is raining.$" - -gUnknown_83FD85F:: @ 83FD85F - .string "A sandstorm is raging.$" - -gUnknown_83FD876:: @ 83FD876 - .string "The BOX is full!\n" - .string "You can't catch any more!\p" - .string "$" - -gUnknown_83FD8A2:: @ 83FD8A2 - .string "ENIGMA BERRY$" - -gUnknown_83FD8AF:: @ 83FD8AF - .string " BERRY$" - -gUnknown_83FD8B6:: @ 83FD8B6 - .string "ナゾ$" - -gUnknown_83FD8B9:: @ 83FD8B9 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "cured paralysis!$" - -gUnknown_83FD8D2:: @ 83FD8D2 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "cured poison!$" - -gUnknown_83FD8E8:: @ 83FD8E8 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "healed its burn!$" - -gUnknown_83FD901:: @ 83FD901 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "defrosted it!$" - -gUnknown_83FD917:: @ 83FD917 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "woke it from its sleep!$" - -gUnknown_83FD937:: @ 83FD937 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "snapped it out of confusion!$" - -gUnknown_83FD95C:: @ 83FD95C - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "cured its {B_BUFF1} problem!$" - -gUnknown_83FD97A:: @ 83FD97A - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "normalized its status!$" - -gUnknown_83FD999:: @ 83FD999 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "restored health!$" - -gUnknown_83FD9B2:: @ 83FD9B2 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "restored {B_BUFF1}'s PP!$" - -gUnknown_83FD9CC:: @ 83FD9CC - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "restored its status!$" - -gUnknown_83FD9E9:: @ 83FD9E9 - .string "{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_LAST_ITEM}\n" - .string "restored its HP a little!$" - -gUnknown_83FDA0B:: @ 83FDA0B - .string "{B_LAST_ITEM}'s effect allows only\n" - .string "{B_CURRENT_MOVE} to be used!\p" - .string "$" - -gUnknown_83FDA33:: @ 83FDA33 - .string "{B_DEF_NAME_WITH_PREFIX} hung on\n" - .string "using its {B_LAST_ITEM}!$" - -gUnknown_83FDA4C:: @ 83FDA4C - .string "$" - -gUnknown_83FDA4D:: @ 83FDA4D - .string "{B_PLAYER_NAME} played the {B_LAST_ITEM}.\p" - .string "Now, that's a catchy tune!$" - -gUnknown_83FDA7A:: @ 83FDA7A - .string "{B_PLAYER_NAME} played the\n" - .string "{B_LAST_ITEM}.$" - -gUnknown_83FDA8C:: @ 83FDA8C - .string "The POKéMON hearing the FLUTE\n" - .string "awoke!$" - -gUnknown_83FDAB1:: @ 83FDAB1 - .string "You throw a BALL now, right?\n" - .string "I… I'll do my best!$" - -gUnknown_83FDAE2:: @ 83FDAE2 - .string "OAK: Oh, for Pete's sake…\n" - .string "So pushy, as always.\p" - .string "{B_PLAYER_NAME}.\p" - .string "You've never had a POKéMON battle\n" - .string "before, have you?\p" - .string "A POKéMON battle is when TRAINERS\n" - .string "pit their POKéMON against each\l" - .string "other.\p" - .string "$" - -gUnknown_83FDB92:: @ 83FDB92 - .string "The TRAINER that makes the other\n" - .string "TRAINER's POKéMON faint by lowering\l" - .string "their HP to “0,” wins.\p" - .string "$" - -gUnknown_83FDBEF:: @ 83FDBEF - .string "But rather than talking about it,\n" - .string "you'll learn more from experience.\p" - .string "Try battling and see for yourself.\p" - .string "$" - -gUnknown_83FDC58:: @ 83FDC58 - .string "OAK: Inflicting damage on the foe\n" - .string "is the key to any battle.\p" - .string "$" - -gUnknown_83FDC95:: @ 83FDC95 - .string "OAK: Lowering the foe's stats\n" - .string "will put you at an advantage.\p" - .string "$" - -gUnknown_83FDCD2:: @ 83FDCD2 - .string "OAK: Keep your eyes on your\n" - .string "POKéMON's HP.\p" - .string "It will faint if the HP drops to\n" - .string "“0.”\p" - .string "$" - -gUnknown_83FDD23:: @ 83FDD23 - .string "OAK: No! There's no running away\n" - .string "from a TRAINER POKéMON battle!\p" - .string "$" - -gUnknown_83FDD64:: @ 83FDD64 - .string "OAK: Hm! Excellent!\p" - .string "If you win, you earn prize money,\n" - .string "and your POKéMON will grow!\p" - .string "Battle other TRAINERS and make\n" - .string "your POKéMON strong!\p" - .string "$" - -gUnknown_83FDDEB:: @ 83FDDEB - .string "OAK: Hm…\n" - .string "How disappointing…\p" - .string "If you win, you earn prize money,\n" - .string "and your POKéMON grow.\p" - .string "But if you lose, {B_PLAYER_NAME}, you end\n" - .string "up paying prize money…\p" - .string "However, since you had no warning\n" - .string "this time, I'll pay for you.\p" - .string "But things won't be this way once\n" - .string "you step outside these doors.\p" - .string "That's why you must strengthen your\n" - .string "POKéMON by battling wild POKéMON.\p" - .string "$" - - .align 2 -gBattleStringsTable:: @ 83FDF3C - .4byte gUnknown_83FB219 - .4byte gUnknown_83FB265 - .4byte gUnknown_83FB28E - .4byte gUnknown_83FB2A4 - .4byte gUnknown_83FB2B6 - .4byte gUnknown_83FB2D1 - .4byte gUnknown_83FB2FC - .4byte gUnknown_83FB31F - .4byte gUnknown_83FB32E - .4byte gUnknown_83FB343 - .4byte gUnknown_83FD1B8 - .4byte gUnknown_83FB36B - .4byte gUnknown_83FB37F - .4byte gUnknown_83FCBA5 - .4byte gUnknown_83FB394 - .4byte gUnknown_83FB3EA - .4byte gUnknown_83FB400 - .4byte gUnknown_83FB40D - .4byte gUnknown_83FB41A - .4byte gUnknown_83FB433 - .4byte gUnknown_83FB451 - .4byte gUnknown_83FB508 - .4byte gUnknown_83FB545 - .4byte gUnknown_83FB555 - .4byte gUnknown_83FB565 - .4byte gUnknown_83FB57C - .4byte gUnknown_83FB592 - .4byte gUnknown_83FB5A8 - .4byte gUnknown_83FB5BC - .4byte gUnknown_83FB5CD - .4byte gUnknown_83FB5E2 - .4byte gUnknown_83FB5F8 - .4byte gUnknown_83FB610 - .4byte gUnknown_83FB626 - .4byte gUnknown_83FB641 - .4byte gUnknown_83FB650 - .4byte gUnknown_83FB663 - .4byte gUnknown_83FB692 - .4byte gUnknown_83FB6A7 - .4byte gUnknown_83FB6BF - .4byte gUnknown_83FB6D3 - .4byte gUnknown_83FB6E5 - .4byte gUnknown_83FB6F7 - .4byte gUnknown_83FB70F - .4byte gUnknown_83FB73A - .4byte gUnknown_83FB76A - .4byte gUnknown_83FB78A - .4byte gUnknown_83FB7A3 - .4byte gUnknown_83FB7BF - .4byte gUnknown_83FB7D5 - .4byte gUnknown_83FB7EE - .4byte gUnknown_83FB806 - .4byte gUnknown_83FB826 - .4byte gUnknown_83FB844 - .4byte gUnknown_83FB854 - .4byte gUnknown_83FB871 - .4byte gUnknown_83FB885 - .4byte gUnknown_83FB89D - .4byte gUnknown_83FB8AE - .4byte gUnknown_83FB8C5 - .4byte gUnknown_83FB8E0 - .4byte gUnknown_83FB8F3 - .4byte gUnknown_83FB914 - .4byte gUnknown_83FB921 - .4byte gUnknown_83FB935 - .4byte gUnknown_83FB946 - .4byte gUnknown_83FB97F - .4byte gUnknown_83FB9B8 - .4byte gUnknown_83FB9D9 - .4byte gUnknown_83FB9FF - .4byte gUnknown_83FBA2F - .4byte gUnknown_83FBA41 - .4byte gUnknown_83FBA5E - .4byte gUnknown_83FBA79 - .4byte gUnknown_83FBA8E - .4byte gUnknown_83FBAA3 - .4byte gUnknown_83FBAB2 - .4byte gUnknown_83FBAC3 - .4byte gUnknown_83FBAF3 - .4byte gUnknown_83FBB11 - .4byte gUnknown_83FBB4C - .4byte gUnknown_83FBB62 - .4byte gUnknown_83FBB71 - .4byte gUnknown_83FBB83 - .4byte gUnknown_83FBB99 - .4byte BattleText_MistShroud - .4byte gUnknown_83FBBD0 - .4byte BattleText_GetPumped - .4byte gUnknown_83FBBFF - .4byte gUnknown_83FBC16 - .4byte gUnknown_83FBC2B - .4byte gUnknown_83FBC4C - .4byte gUnknown_83FBC74 - .4byte gUnknown_83FBC83 - .4byte gUnknown_83FBC99 - .4byte gUnknown_83FBCBE - .4byte gUnknown_83FBCD1 - .4byte gUnknown_83FBCDD - .4byte gUnknown_83FBCFC - .4byte gUnknown_83FBD16 - .4byte gUnknown_83FBD2B - .4byte gUnknown_83FBD43 - .4byte gUnknown_83FBD53 - .4byte gUnknown_83FBD74 - .4byte gUnknown_83FBD86 - .4byte gUnknown_83FBDA3 - .4byte gUnknown_83FBDC4 - .4byte gUnknown_83FBDE2 - .4byte gUnknown_83FBE00 - .4byte gUnknown_83FBE16 - .4byte gUnknown_83FBE2B - .4byte gUnknown_83FBE4E - .4byte gUnknown_83FBE61 - .4byte gUnknown_83FBE73 - .4byte gUnknown_83FBE8B - .4byte gUnknown_83FBEA1 - .4byte gUnknown_83FBEBE - .4byte gUnknown_83FBEE2 - .4byte gUnknown_83FBEFA - .4byte gUnknown_83FBF0C - .4byte gUnknown_83FBF23 - .4byte gUnknown_83FC687 - .4byte gUnknown_83FBF39 - .4byte gUnknown_83FBF51 - .4byte gUnknown_83FBF63 - .4byte gUnknown_83FBF76 - .4byte gUnknown_83FBF89 - .4byte gUnknown_83FBF99 - .4byte gUnknown_83FBFBF - .4byte gUnknown_83FBFD3 - .4byte gUnknown_83FBFEA - .4byte gUnknown_83FBFFC - .4byte gUnknown_83FC011 - .4byte gUnknown_83FC02B - .4byte gUnknown_83FC048 - .4byte gUnknown_83FC072 - .4byte gUnknown_83FC090 - .4byte gUnknown_83FC0C6 - .4byte gUnknown_83FC0DC - .4byte gUnknown_83FC0EE - .4byte gUnknown_83FC10C - .4byte gUnknown_83FC11E - .4byte gUnknown_83FC132 - .4byte gUnknown_83FC140 - .4byte gUnknown_83FC168 - .4byte gUnknown_83FC185 - .4byte gUnknown_83FC19D - .4byte gUnknown_83FC1B1 - .4byte gUnknown_83FC1C6 - .4byte gUnknown_83FC1DB - .4byte gUnknown_83FC1F1 - .4byte gUnknown_83FC224 - .4byte gUnknown_83FC231 - .4byte gUnknown_83FC254 - .4byte gUnknown_83FC26D - .4byte gUnknown_83FC28A - .4byte gUnknown_83FC670 - .4byte gUnknown_83FC2AA - .4byte gUnknown_83FC69D - .4byte gUnknown_83FC2C7 - .4byte gUnknown_83FC2E3 - .4byte gUnknown_83FC6D6 - .4byte gUnknown_83FC2FA - .4byte gUnknown_83FC312 - .4byte gUnknown_83FC377 - .4byte gUnknown_83FC38A - .4byte gUnknown_83FC39A - .4byte gUnknown_83FC3AF - .4byte gUnknown_83FC3C5 - .4byte gUnknown_83FC3EB - .4byte gUnknown_83FC40E - .4byte gUnknown_83FC421 - .4byte gUnknown_83FC439 - .4byte gUnknown_83FC461 - .4byte gUnknown_83FC6F8 - .4byte gUnknown_83FC483 - .4byte gUnknown_83FC4AB - .4byte gUnknown_83FC4D6 - .4byte gUnknown_83FC4F0 - .4byte gUnknown_83FC518 - .4byte gUnknown_83FC53D - .4byte gUnknown_83FC715 - .4byte gUnknown_83FC72B - .4byte gUnknown_83FC745 - .4byte gUnknown_83FC75D - .4byte gUnknown_83FC780 - .4byte gUnknown_83FC7B6 - .4byte gUnknown_83FC7D3 - .4byte gUnknown_83FC7EF - .4byte gUnknown_83FC809 - .4byte gUnknown_83FC825 - .4byte gUnknown_83FC841 - .4byte gUnknown_83FC860 - .4byte gUnknown_83FC87B - .4byte gUnknown_83FC895 - .4byte gUnknown_83FC8B1 - .4byte gUnknown_83FC8C2 - .4byte gUnknown_83FCB41 - .4byte BattleText_Rose - .4byte gUnknown_83FCB50 - .4byte gUnknown_83FCB59 - .4byte gUnknown_83FCB5F - .4byte BattleText_UnknownString3 - .4byte gUnknown_83FCB8F - .4byte gUnknown_83FCB9A - .4byte gUnknown_83FCBE4 - .4byte gUnknown_83FCBF4 - .4byte gUnknown_83FCC07 - .4byte gUnknown_83FCC33 - .4byte gUnknown_83FCC5B - .4byte gUnknown_83FCC74 - .4byte gUnknown_83FCC8A - .4byte gUnknown_83FCCD2 - .4byte gUnknown_83FCDB3 - .4byte gUnknown_83FCDE2 - .4byte gUnknown_83FCDF1 - .4byte gUnknown_83FCDF2 - .4byte gUnknown_83FCE08 - .4byte gUnknown_83FCE17 - .4byte gUnknown_83FCE38 - .4byte gUnknown_83FCE50 - .4byte gUnknown_83FCE64 - .4byte gUnknown_83FCE78 - .4byte gUnknown_83FCE90 - .4byte gUnknown_83FCEA8 - .4byte gUnknown_83FCEBA - .4byte gUnknown_83FCECE - .4byte gUnknown_83FCEE3 - .4byte gUnknown_83FCEFB - .4byte gUnknown_83FCF14 - .4byte gUnknown_83FCF2C - .4byte gUnknown_83FCF40 - .4byte gUnknown_83FCF54 - .4byte gUnknown_83FCF6C - .4byte gUnknown_83FCF7E - .4byte gUnknown_83FCFA0 - .4byte gUnknown_83FCFC2 - .4byte gUnknown_83FCFE4 - .4byte gUnknown_83FD006 - .4byte gUnknown_83FD022 - .4byte gUnknown_83FD048 - .4byte gUnknown_83FD068 - .4byte gUnknown_83FD077 - .4byte gUnknown_83FD0A7 - .4byte gUnknown_83FD0CA - .4byte gUnknown_83FD650 - .4byte gUnknown_83FD65C - .4byte gUnknown_83FD697 - .4byte gUnknown_83FD6B5 - .4byte gUnknown_83FD6C7 - .4byte gUnknown_83FD700 - .4byte gUnknown_83FD718 - .4byte gUnknown_83FD738 - .4byte gUnknown_83FD757 - .4byte gUnknown_83FD76D - .4byte gUnknown_83FD7A2 - .4byte gUnknown_83FD7C0 - .4byte gUnknown_83FD7E0 - .4byte gUnknown_83FD804 - .4byte gUnknown_83FD82B - .4byte gUnknown_83FD850 - .4byte gUnknown_83FD85F - .4byte gUnknown_83FB525 - .4byte gUnknown_83FD0F1 - .4byte gUnknown_83FD111 - .4byte gUnknown_83FD124 - .4byte gUnknown_83FD135 - .4byte gUnknown_83FD14B - .4byte gUnknown_83FD15A - .4byte gUnknown_83FD16A - .4byte gUnknown_83FD186 - .4byte gUnknown_83FD1DF - .4byte gUnknown_83FD1FA - .4byte gUnknown_83FD218 - .4byte gUnknown_83FD232 - .4byte gUnknown_83FD23F - .4byte gUnknown_83FB218 - .4byte gUnknown_83FB218 - .4byte gUnknown_83FD24D - .4byte gUnknown_83FD8B9 - .4byte gUnknown_83FD8D2 - .4byte gUnknown_83FD8E8 - .4byte gUnknown_83FD901 - .4byte gUnknown_83FD917 - .4byte gUnknown_83FD937 - .4byte gUnknown_83FD95C - .4byte gUnknown_83FD999 - .4byte gUnknown_83FD9B2 - .4byte gUnknown_83FD9CC - .4byte gUnknown_83FD9E9 - .4byte gUnknown_83FDA0B - .4byte gUnknown_83FDA33 - .4byte gUnknown_83FDA4C - .4byte gUnknown_83FC8D5 - .4byte gUnknown_83FC8ED - .4byte gUnknown_83FC913 - .4byte gUnknown_83FC935 - .4byte gUnknown_83FC979 - .4byte gUnknown_83FC993 - .4byte gUnknown_83FC9AA - .4byte gUnknown_83FC9C7 - .4byte gUnknown_83FC9E5 - .4byte gUnknown_83FCA03 - .4byte gUnknown_83FC554 - .4byte gUnknown_83FC576 - .4byte gUnknown_83FBAD2 - .4byte gUnknown_83FBAE5 - .4byte gUnknown_83FCC39 - .4byte gUnknown_83FC591 - .4byte gUnknown_83FD1C7 - .4byte gUnknown_83FC5A2 - .4byte gUnknown_83FC5CC - .4byte gUnknown_83FC5E8 - .4byte gUnknown_83FCB75 - .4byte gUnknown_83FC5F6 - .4byte gUnknown_83FC79D - .4byte gUnknown_83FBB2F - .4byte gUnknown_83FB282 - .4byte gUnknown_83FB283 - .4byte gUnknown_83FC955 - .4byte gUnknown_83FB3AF - .4byte gUnknown_83FDAB1 - .4byte gUnknown_83FCA13 - .4byte gUnknown_83FC208 - .4byte gUnknown_83FC60C - .4byte gUnknown_83FB359 - .4byte gUnknown_83FCCA0 - .4byte gUnknown_83FCCBB - .4byte gUnknown_83FC631 - .4byte gUnknown_83FCA49 - .4byte gUnknown_83FD97A - .4byte gUnknown_83FD688 - .4byte gUnknown_83FD876 - .4byte gUnknown_83FB3D3 - .4byte gUnknown_83FCA71 - .4byte gUnknown_83FCA8E - .4byte gUnknown_83FB67B - .4byte gUnknown_83FCBC5 - .4byte gUnknown_83FC900 - .4byte gUnknown_83FBC62 - .4byte gUnknown_83FB997 - .4byte gUnknown_83FB95E - .4byte gUnknown_83FC646 - .4byte gUnknown_83FCAAA - .4byte gUnknown_83FCAD1 - .4byte gUnknown_83FB534 - .4byte gUnknown_83FC337 - .4byte gUnknown_83FC347 - .4byte gUnknown_83FC357 - .4byte gUnknown_83FC65A - .4byte gUnknown_83FCAEF - .4byte gUnknown_83FDD64 - .4byte gUnknown_83FDDEB - .4byte gUnknown_83FB484 - .4byte gUnknown_83FB4BE - .4byte Text_1A5CF1 - .4byte Text_1A5D31 - .4byte Text_1A5D6E - .4byte Text_1A5DB1 - .4byte gUnknown_83FD671 - .4byte gUnknown_83FDA4D - .4byte gUnknown_83FDA7A - .4byte gUnknown_83FDA8C - .4byte gUnknown_83FB21C - .4byte gUnknown_83FB262 - .4byte gUnknown_83FB4F7 - .4byte gUnknown_83FCB0C - .4byte gUnknown_83FCB26 - .4byte gUnknown_83FD322 - .4byte gUnknown_83FD34D - .4byte gUnknown_83FB21F - .4byte gUnknown_83FB232 - .4byte gUnknown_83FB235 - .4byte gUnknown_83FB248 - -gMissStringIds:: @ 83FE514 - .2byte STRINGID_ATTACKMISSED - .2byte STRINGID_PKMNPROTECTEDITSELF - .2byte STRINGID_PKMNAVOIDEDATTACK - .2byte STRINGID_AVOIDEDDAMAGE - .2byte STRINGID_PKMNMAKESGROUNDMISS - -gNoEscapeStringIds:: - .2byte STRINGID_CANTESCAPE - .2byte STRINGID_DONTLEAVEBIRCH - .2byte STRINGID_PREVENTSESCAPE - .2byte STRINGID_CANTESCAPE2 - .2byte STRINGID_ATTACKERCANTESCAPE - -gMoveWeatherChangeStringIds:: - .2byte STRINGID_STARTEDTORAIN - .2byte STRINGID_DOWNPOURSTARTED - .2byte STRINGID_BUTITFAILED - .2byte STRINGID_SANDSTORMBREWED - .2byte STRINGID_SUNLIGHTGOTBRIGHT - .2byte STRINGID_STARTEDHAIL - -gSandStormHailContinuesStringIds:: - .2byte STRINGID_SANDSTORMRAGES - .2byte STRINGID_HAILCONTINUES - -gSandStormHailDmgStringIds:: - .2byte STRINGID_PKMNBUFFETEDBYSANDSTORM - .2byte STRINGID_PKMNPELTEDBYHAIL - -gSandStormHailEndStringIds:: - .2byte STRINGID_SANDSTORMSUBSIDED - .2byte STRINGID_HAILSTOPPED - -gRainContinuesStringIds:: - .2byte STRINGID_RAINCONTINUES - .2byte STRINGID_DOWNPOURCONTINUES - .2byte STRINGID_RAINSTOPPED - -gProtectLikeUsedStringIds:: - .2byte STRINGID_PKMNPROTECTEDITSELF2 - .2byte STRINGID_PKMNBRACEDITSELF - .2byte STRINGID_BUTITFAILED - -gReflectLightScreenSafeguardStringIds:: - .2byte STRINGID_BUTITFAILED - .2byte STRINGID_PKMNRAISEDDEF - .2byte STRINGID_PKMNRAISEDDEFALITTLE - .2byte STRINGID_PKMNRAISEDSPDEF - .2byte STRINGID_PKMNRAISEDSPDEFALITTLE - .2byte STRINGID_PKMNCOVEREDBYVEIL - -gLeechSeedStringIds:: - .2byte STRINGID_PKMNSEEDED - .2byte STRINGID_PKMNEVADEDATTACK - .2byte STRINGID_ITDOESNTAFFECT - .2byte STRINGID_PKMNSAPPEDBYLEECHSEED - .2byte STRINGID_ITSUCKEDLIQUIDOOZE - -gRestUsedStringIds:: - .2byte STRINGID_PKMNWENTTOSLEEP - .2byte STRINGID_PKMNSLEPTHEALTHY - -gUproarOverTurnStringIds:: - .2byte STRINGID_PKMNMAKINGUPROAR - .2byte STRINGID_PKMNCALMEDDOWN - -gStockpileUsedStringIds:: - .2byte STRINGID_PKMNSTOCKPILED - .2byte STRINGID_PKMNCANTSTOCKPILE - -gWokeUpStringIds:: - .2byte STRINGID_PKMNWOKEUP - .2byte STRINGID_PKMNWOKEUPINUPROAR - -gSwallowFailStringIds:: - .2byte STRINGID_FAILEDTOSWALLOW - .2byte STRINGID_PKMNHPFULL - -gUproarAwakeStringIds:: - .2byte STRINGID_PKMNCANTSLEEPINUPROAR2 - .2byte STRINGID_UPROARKEPTPKMNAWAKE - .2byte STRINGID_PKMNSTAYEDAWAKEUSING - -gStatUpStringIds:: - .2byte STRINGID_PKMNSSTATCHANGED - .2byte STRINGID_PKMNSSTATCHANGED2 - .2byte STRINGID_STATSWONTINCREASE - .2byte STRINGID_EMPTYSTRING3 - .2byte STRINGID_USINGXTHEYOFZN - .2byte STRINGID_PKMNUSEDXTOGETPUMPED - -gStatDownStringIds:: - .2byte STRINGID_PKMNSSTATCHANGED3 - .2byte STRINGID_PKMNSSTATCHANGED4 - .2byte STRINGID_STATSWONTDECREASE - .2byte STRINGID_EMPTYSTRING3 - -gFirstTurnOfTwoStringIds:: - .2byte STRINGID_PKMNWHIPPEDWHIRLWIND - .2byte STRINGID_PKMNTOOKSUNLIGHT - .2byte STRINGID_PKMNLOWEREDHEAD - .2byte STRINGID_PKMNISGLOWING - .2byte STRINGID_PKMNFLEWHIGH - .2byte STRINGID_PKMNDUGHOLE - .2byte STRINGID_PKMNHIDUNDERWATER - .2byte STRINGID_PKMNSPRANGUP - -gWrappedStringIds:: - .2byte STRINGID_PKMNSQUEEZEDBYBIND - .2byte STRINGID_PKMNWRAPPEDBY - .2byte STRINGID_PKMNTRAPPEDINVORTEX - .2byte STRINGID_PKMNCLAMPED - .2byte STRINGID_PKMNTRAPPEDINVORTEX - .2byte STRINGID_PKMNTRAPPEDBYSANDTOMB - -gMistUsedStringIds:: - .2byte STRINGID_PKMNSHROUDEDINMIST - .2byte STRINGID_BUTITFAILED - -gFocusEnergyUsedStringIds:: - .2byte STRINGID_PKMNGETTINGPUMPED - .2byte STRINGID_BUTITFAILED - -gTransformUsedStringIds:: - .2byte STRINGID_PKMNTRANSFORMEDINTO - .2byte STRINGID_BUTITFAILED - -gSubsituteUsedStringIds:: - .2byte STRINGID_PKMNMADESUBSTITUTE - .2byte STRINGID_TOOWEAKFORSUBSTITUTE - -gGotPoisonedStringIds:: - .2byte STRINGID_PKMNWASPOISONED - .2byte STRINGID_PKMNPOISONEDBY - -gGotParalyzedStringIds:: - .2byte STRINGID_PKMNWASPARALYZED - .2byte STRINGID_PKMNWASPARALYZEDBY - -gFellAsleepStringIds:: - .2byte STRINGID_PKMNFELLASLEEP - .2byte STRINGID_PKMNMADESLEEP - -gGotBurnedStringIds:: - .2byte STRINGID_PKMNWASBURNED - .2byte STRINGID_PKMNBURNEDBY - -gGotFrozenStringIds:: - .2byte STRINGID_PKMNWASFROZEN - .2byte STRINGID_PKMNFROZENBY - -gGotDefrostedStringIds:: - .2byte STRINGID_PKMNWASDEFROSTED2 - .2byte STRINGID_PKMNWASDEFROSTEDBY - -gKOFailedStringIds:: - .2byte STRINGID_ATTACKMISSED - .2byte STRINGID_PKMNUNAFFECTED - -gAttractUsedStringIds:: - .2byte STRINGID_PKMNFELLINLOVE - .2byte STRINGID_PKMNSXINFATUATEDY - -gLeechSeedDrainStringIds:: - .2byte STRINGID_PKMNENERGYDRAINED - .2byte STRINGID_ITSUCKEDLIQUIDOOZE - -gSportsUsedStringIds:: - .2byte STRINGID_ELECTRICITYWEAKENED - .2byte STRINGID_FIREWEAKENED - -gPartyStatusHealStringIds:: - .2byte STRINGID_BELLCHIMED - .2byte STRINGID_BELLCHIMED - .2byte STRINGID_BELLCHIMED - .2byte STRINGID_BELLCHIMED - .2byte STRINGID_SOOTHINGAROMA - -gFutureMoveUsedStringIds:: - .2byte STRINGID_PKMNFORESAWATTACK - .2byte STRINGID_PKMNCHOSEXASDESTINY - -gBallEscapeStringIds:: - .2byte STRINGID_PKMNBROKEFREE - .2byte STRINGID_ITAPPEAREDCAUGHT - .2byte STRINGID_AARGHALMOSTHADIT - .2byte STRINGID_SHOOTSOCLOSE - -gWeatherContinuesStringIds:: - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_SANDSTORMISRAGING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_SUNLIGHTSTRONG - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - .2byte STRINGID_ITISRAINING - -gInobedientStringIds:: - .2byte STRINGID_PKMNLOAFING - .2byte STRINGID_PKMNWONTOBEY - .2byte STRINGID_PKMNTURNEDAWAY - .2byte STRINGID_PKMNPRETENDNOTNOTICE - -gSafariPokeblockResultStringIds:: - .2byte STRINGID_PKMNWATCHINGCAREFULLY - .2byte STRINGID_PKMNANGRY - .2byte STRINGID_PKMNEATING - -gTrainerItemCuredStatusStringIds:: - .2byte STRINGID_PKMNSITEMSNAPPEDOUT - .2byte STRINGID_PKMNSITEMCUREDPARALYSIS - .2byte STRINGID_PKMNSITEMDEFROSTEDIT - .2byte STRINGID_PKMNSITEMHEALEDBURN - .2byte STRINGID_PKMNSITEMCUREDPOISON - .2byte STRINGID_PKMNSITEMWOKEIT - -gBerryEffectStringIds:: - .2byte STRINGID_PKMNSITEMCUREDPROBLEM - .2byte STRINGID_PKMNSITEMNORMALIZEDSTATUS - -gBRNPreventionStringIds:: - .2byte STRINGID_PKMNSXPREVENTSBURNS - .2byte STRINGID_PKMNSXPREVENTSYSZ - .2byte STRINGID_PKMNSXHADNOEFFECTONY - -gPRLZPreventionStringIds:: - .2byte STRINGID_PKMNPREVENTSPARALYSISWITH - .2byte STRINGID_PKMNSXPREVENTSYSZ - .2byte STRINGID_PKMNSXHADNOEFFECTONY - -gPSNPreventionStringIds:: - .2byte STRINGID_PKMNPREVENTSPOISONINGWITH - .2byte STRINGID_PKMNSXPREVENTSYSZ - .2byte STRINGID_PKMNSXHADNOEFFECTONY - -gItemSwapStringIds:: - .2byte STRINGID_PKMNOBTAINEDX - .2byte STRINGID_PKMNOBTAINEDX2 - .2byte STRINGID_PKMNOBTAINEDXYOBTAINEDZ - -gFlashFireStringIds:: - .2byte STRINGID_PKMNRAISEDFIREPOWERWITH - .2byte STRINGID_PKMNSXMADEYINEFFECTIVE - -gCaughtMonStringIds:: - .2byte STRINGID_PKMNTRANSFERREDSOMEONESPC - .2byte STRINGID_PKMNTRANSFERREDBILLSPC - .2byte STRINGID_PKMNBOXSOMEONESPCFULL - .2byte STRINGID_PKMNBOXBILLSPCFULL - -gDoubleBattleRecallStrings:: - .2byte STRINGID_TRAINER1MON1COMEBACK - .2byte STRINGID_TRAINER1MON1COMEBACK - .2byte STRINGID_TRAINER1MON2COMEBACK - .2byte STRINGID_TRAINER1MON1AND2COMEBACK - -gTrappingMoves:: @ 83FE664 - .2byte MOVE_BIND - .2byte MOVE_WRAP - .2byte MOVE_FIRE_SPIN - .2byte MOVE_CLAMP - .2byte MOVE_WHIRLPOOL - .2byte MOVE_SAND_TOMB - .2byte 0xFFFF - -gText_PkmnIsEvolving:: @ 83FE672 - .string "What?\n" - .string "{STR_VAR_1} is evolving!$" - -gText_CongratsPkmnEvolved:: @ 83FE688 - .string "Congratulations! Your {STR_VAR_1}\n" - .string "evolved into {STR_VAR_2}!{WAIT_SE}\p" - .string "$" - -gText_PkmnStoppedEvolving:: @ 83FE6B5 - .string "Huh? {STR_VAR_1}\n" - .string "stopped evolving!\p" - .string "$" - -gText_EllipsisQuestionMark:: @ 83FE6D0 - .string "……?\p" - .string "$" - -gText_WhatWillPkmnDo:: @ 83FE6D5 - .string "What will\n" - .string "{B_ACTIVE_NAME_WITH_PREFIX} do?$" - -gUnknown_83FE6E6:: @ 83FE6E6 - .string "What will {B_PLAYER_NAME}\n" - .string "throw?$" - -gUnknown_83FE6FA:: @ 83FE6FA - .string "What will the\n" - .string "old man do?$" - -gText_LinkStandby:: @ 83FE714 - .string "{PAUSE 16}Link standby…$" - -gUnknown_83FE725:: @ 83FE725 - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW 13 14 15}FIGHT{CLEAR_TO 56}BAG\n" - .string "POKéMON{CLEAR_TO 56}RUN$" - -gUnknown_83FE747:: @ 83FE747 - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW 13 14 15}BALL{CLEAR_TO 56}BAIT\n" - .string "ROCK{CLEAR_TO 56}RUN$" - -gText_MoveInterfacePP:: @ 83FE766 - .string "PP $" - -gText_MoveInterfaceType:: @ 83FE76A - .string "TYPE/$" - -gUnknown_83FE770:: @ 83FE770 - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW 13 14 15}$" - -gUnknown_83FE779:: @ 83FE779 - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW 13 14 15}どの わざを\n" - .string "わすれさせたい?$" - -gText_BattleYesNoChoice:: @ 83FE791 - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW 13 14 15}Yes\n" - .string "No$" - -gText_BattleSwitchWhich:: @ 83FE7A0 - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW 13 14 15}Switch\n" - .string "which?$" - -gUnknown_83FE7B6:: @ 83FE7B6 - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW 13 14 15}$" - -gUnknown_83FE7BF:: @ 83FE7BF - .string "{RIGHT_ARROW_2}$" - -gUnknown_83FE7C2:: @ 83FE7C2 - .string "{PLUS}$" - -gUnknown_83FE7C5:: @ 83FE7C5 - .string "-$" - -gUnknown_83FE7C7:: @ 83FE7C7 - .string "{SIZE 0}Max{SIZE 2} HP$" - -gUnknown_83FE7D4:: @ 83FE7D4 - .string "ATTACK $" - -gUnknown_83FE7DC:: @ 83FE7DC - .string "DEFENSE$" - -gUnknown_83FE7E4:: @ 83FE7E4 - .string "SP. ATK$" - -gUnknown_83FE7EC:: @ 83FE7EC - .string "SP. DEF$" - -gUnknown_83FE7F4:: @ 83FE7F4 - .4byte gUnknown_83FE7C7 - .4byte gUnknown_83FE7E4 - .4byte gUnknown_83FE7D4 - .4byte gUnknown_83FE7EC - .4byte gUnknown_83FE7DC - .4byte gUnknown_83FD5A2 - -gUnknown_83FE80C:: - .string "{HIGHLIGHT 2}SAFARI BALLS$" - -gText_HighlightRed_Left:: @ 83FE81C - .string "{HIGHLIGHT 2}Left: $" - -gText_HighlightRed:: @ 83FE826 - .string "{HIGHLIGHT 2}$" - -gText_Sleep:: @ 83FE82A - .string "sleep$" - -gText_Poison:: @ 83FE830 - .string "poison$" - -gText_Burn:: @ 83FE837 - .string "burn$" - -gText_Paralysis:: @ 83FE83C - .string "paralysis$" - -gText_Ice:: @ 83FE846 - .string "ice$" - -gText_Confusion:: @ 83FE84A - .string "confusion$" - -gText_Love:: @ 83FE854 - .string "love$" - -gUnknown_83FE859:: @ 83FE859 - .string " $" - -gUnknown_83FE85C:: @ 83FE85C - .string "\n" - .string "$" - -gUnknown_83FE85E:: @ 83FE85E - .string "\n" - .string "$" - -gUnknown_83FE860:: @ 83FE860 - .string " is$" - -gUnknown_83FE864:: @ 83FE864 - .string " is$" - -gText_BadEgg:: @ 83FE868 - .string "Bad EGG$" - -gUnknown_83FE870:: @ 83FE870 - .string "ミツル$" - -gUnknown_83FE874:: @ 83FE874 - .string "{HIGHLIGHT 0}Win$" - -gUnknown_83FE87B:: @ 83FE87B - .string "{HIGHLIGHT 0}Loss$" - -gUnknown_83FE883:: @ 83FE883 - .string "{HIGHLIGHT 0}Draw$" - -gUnknown_83FE88B:: @ 83FE88B - .string " is$" - -gUnknown_83FE88F:: @ 83FE88F - .string "'s$" - -gUnknown_83FE892:: @ 83FE892 - .string "a NORMAL move$" - -gUnknown_83FE8A0:: @ 83FE8A0 - .string "a FIGHTING move$" - -gUnknown_83FE8B0:: @ 83FE8B0 - .string "a FLYING move$" - -gUnknown_83FE8BE:: @ 83FE8BE - .string "a POISON move$" - -gUnknown_83FE8CC:: @ 83FE8CC - .string "a GROUND move$" - -gUnknown_83FE8DA:: @ 83FE8DA - .string "a ROCK move$" - -gUnknown_83FE8E6:: @ 83FE8E6 - .string "a BUG move$" - -gUnknown_83FE8F1:: @ 83FE8F1 - .string "a GHOST move$" - -gUnknown_83FE8FE:: @ 83FE8FE - .string "a STEEL move$" - -gUnknown_83FE90B:: @ 83FE90B - .string "a ??? move$" - -gUnknown_83FE916:: @ 83FE916 - .string "a FIRE move$" - -gUnknown_83FE922:: @ 83FE922 - .string "a WATER move$" - -gUnknown_83FE92F:: @ 83FE92F - .string "a GRASS move$" - -gUnknown_83FE93C:: @ 83FE93C - .string "an ELECTRIC move$" - -gUnknown_83FE94D:: @ 83FE94D - .string "a PSYCHIC move$" - -gUnknown_83FE95C:: @ 83FE95C - .string "an ICE move$" - -gUnknown_83FE968:: @ 83FE968 - .string "a DRAGON move$" - -gUnknown_83FE976:: @ 83FE976 - .string "a DARK move$" - -gUnknown_83FE982:: @ 83FE982 - .string "TIME BOARD$" - -gUnknown_83FE98D:: @ 83FE98D - .string "CLEAR TIME$" - -gUnknown_83FE998:: @ 83FE998 - .string "{STR_VAR_1}MIN. {STR_VAR_2}.{STR_VAR_3}SEC.$" - -gUnknown_83FE9A9:: @ 83FE9A9 - .string "1F$" - -gUnknown_83FE9AC:: @ 83FE9AC - .string "2F$" - -gUnknown_83FE9AF:: @ 83FE9AF - .string "3F$" - -gUnknown_83FE9B2:: @ 83FE9B2 - .string "4F$" - -gUnknown_83FE9B5:: @ 83FE9B5 - .string "5F$" - -gUnknown_83FE9B8:: @ 83FE9B8 - .string "6F$" - -gUnknown_83FE9BB:: @ 83FE9BB - .string "7F$" - -gUnknown_83FE9BE:: @ 83FE9BE - .string "8F$" - - .align 2 -gUnknown_83FE9C4:: @ 83FE9C4 - .4byte gOtherText_Single - .4byte gOtherText_Double - .4byte gOtherText_Knockout - .4byte gOtherText_Mixed - -gUnknown_83FE9D4:: - .string "{PLAY_SE SE_NIGERU}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!$" - -gUnknown_83FE9E4:: @ 83FE9E4 - .string "Player lost against\n" - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!$" - -gUnknown_83FE9FF:: @ 83FE9FF - .string "Player battled to a draw against\n" - .string "{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!$" - - .align 2 -gUnknown_83FEA28:: @ 83FEA28 - .4byte gUnknown_83FE892 - .4byte gUnknown_83FE8A0 - .4byte gUnknown_83FE8B0 - .4byte gUnknown_83FE8BE - .4byte gUnknown_83FE8CC - .4byte gUnknown_83FE8DA - .4byte gUnknown_83FE8E6 - .4byte gUnknown_83FE8F1 - .4byte gUnknown_83FE8FE - .4byte gUnknown_83FE90B - .4byte gUnknown_83FE916 - .4byte gUnknown_83FE922 - .4byte gUnknown_83FE92F - .4byte gUnknown_83FE93C - .4byte gUnknown_83FE94D - .4byte gUnknown_83FE95C - .4byte gUnknown_83FE968 - .4byte gUnknown_83FE976 - - .align 1 -gUnknown_83FEA70:: @ 83FEA70 - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_STRENGTH - .2byte MOVE_GROWTH - .2byte MOVE_HARDEN - .2byte MOVE_MINIMIZE - .2byte MOVE_SMOKESCREEN - .2byte MOVE_WITHDRAW - .2byte MOVE_DEFENSE_CURL - .2byte MOVE_EGG_BOMB - .2byte MOVE_SMOG - .2byte MOVE_BONE_CLUB - .2byte MOVE_FLASH - .2byte MOVE_SPLASH - .2byte MOVE_ACID_ARMOR - .2byte MOVE_BONEMERANG - .2byte MOVE_REST - .2byte MOVE_SHARPEN - .2byte MOVE_SUBSTITUTE - .2byte MOVE_MIND_READER - .2byte MOVE_SNORE - .2byte MOVE_PROTECT - .2byte MOVE_SPIKES - .2byte MOVE_ENDURE - .2byte MOVE_ROLLOUT - .2byte MOVE_SWAGGER - .2byte MOVE_SLEEP_TALK - .2byte MOVE_HIDDEN_POWER - .2byte MOVE_PSYCH_UP - .2byte MOVE_EXTREME_SPEED - .2byte MOVE_FOLLOW_ME - .2byte MOVE_TRICK - .2byte MOVE_ASSIST - .2byte MOVE_INGRAIN - .2byte MOVE_KNOCK_OFF - .2byte MOVE_CAMOUFLAGE - .2byte MOVE_ASTONISH - .2byte MOVE_ODOR_SLEUTH - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_SHEER_COLD - .2byte MOVE_MUDDY_WATER - .2byte MOVE_IRON_DEFENSE - .2byte MOVE_BOUNCE - .2byte MOVE_NONE - - .2byte MOVE_TELEPORT - .2byte MOVE_RECOVER - .2byte MOVE_BIDE - .2byte MOVE_AMNESIA - .2byte MOVE_FLAIL - .2byte MOVE_TAUNT - .2byte MOVE_BULK_UP - .2byte MOVE_NONE - - .2byte MOVE_MEDITATE - .2byte MOVE_AGILITY - .2byte MOVE_MIMIC - .2byte MOVE_DOUBLE_TEAM - .2byte MOVE_BARRAGE - .2byte MOVE_TRANSFORM - .2byte MOVE_STRUGGLE - .2byte MOVE_SCARY_FACE - .2byte MOVE_CHARGE - .2byte MOVE_WISH - .2byte MOVE_BRICK_BREAK - .2byte MOVE_YAWN - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_TEETER_DANCE - .2byte MOVE_MUD_SPORT - .2byte MOVE_FAKE_TEARS - .2byte MOVE_WATER_SPORT - .2byte MOVE_CALM_MIND - .2byte MOVE_NONE - - .2byte MOVE_POUND - .2byte MOVE_SCRATCH - .2byte MOVE_VICE_GRIP - .2byte MOVE_WING_ATTACK - .2byte MOVE_FLY - .2byte MOVE_BIND - .2byte MOVE_SLAM - .2byte MOVE_HORN_ATTACK - .2byte MOVE_WRAP - .2byte MOVE_THRASH - .2byte MOVE_TAIL_WHIP - .2byte MOVE_LEER - .2byte MOVE_BITE - .2byte MOVE_GROWL - .2byte MOVE_ROAR - .2byte MOVE_SING - .2byte MOVE_PECK - .2byte MOVE_ABSORB - .2byte MOVE_STRING_SHOT - .2byte MOVE_EARTHQUAKE - .2byte MOVE_FISSURE - .2byte MOVE_DIG - .2byte MOVE_TOXIC - .2byte MOVE_SCREECH - .2byte MOVE_METRONOME - .2byte MOVE_LICK - .2byte MOVE_CLAMP - .2byte MOVE_CONSTRICT - .2byte MOVE_POISON_GAS - .2byte MOVE_BUBBLE - .2byte MOVE_SLASH - .2byte MOVE_SPIDER_WEB - .2byte MOVE_NIGHTMARE - .2byte MOVE_CURSE - .2byte MOVE_FORESIGHT - .2byte MOVE_CHARM - .2byte MOVE_ATTRACT - .2byte MOVE_ROCK_SMASH - .2byte MOVE_UPROAR - .2byte MOVE_SPIT_UP - .2byte MOVE_SWALLOW - .2byte MOVE_TORMENT - .2byte MOVE_FLATTER - .2byte MOVE_ROLE_PLAY - .2byte MOVE_ENDEAVOR - .2byte MOVE_TICKLE - .2byte MOVE_COVET - .2byte MOVE_NONE - -gUnknown_83FEB5C:: @ 83FEB5C - .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff - - .align 2 -gUnknown_83FEB64:: @ 83FEB64 - .byte 0xff, 0x02, 0x02, 0x02, 0x00, 0x02, 0x01, 0x01, 0x0f, 0x06 - .align 2 - .byte 0xff, 0x02, 0x02, 0x02, 0x00, 0x02, 0x00, 0x01, 0x0f, 0x06 - .align 2 - .byte 0xee, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0c, 0x0e, 0x0b - .align 2 - .byte 0xee, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x01, 0x0a, 0x02, 0x00, 0x02, 0x00, 0x0c, 0x0e, 0x0b - .align 2 - .byte 0xee, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02 - .align 2 - .byte 0xee, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0xee, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0d, 0x0e, 0x0f - .align 2 - .byte 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06 - .align 2 - .byte 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06 - .align 2 - .byte 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06 - .align 2 - .byte 0x11, 0x04, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x01, 0x03 - .align 2 - -gUnknown_83FEC90:: @ 83FEC90 - .byte 0x04, 0x05, 0x02, 0x02 -- cgit v1.2.3 From 058999f49bd7d81487590ff75688dfe10c4eef96 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 23 Nov 2019 19:21:31 -0500 Subject: Address review comments --- data/battle_scripts_1.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index b802723b7..2ac9f7f6d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3167,7 +3167,7 @@ BattleScript_RainContinuesOrEndsEnd:: end2 BattleScript_DamagingWeatherContinues:: - printfromtable gSandStormHailContinuesStringIds + printfromtable gSandstormHailContinuesStringIds waitmessage 0x40 playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL setbyte gBattleCommunication, 0 @@ -3175,7 +3175,7 @@ BattleScript_DamagingWeatherLoop:: copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1 weatherdamage jumpifword CMP_EQUAL, gBattleMoveDamage, NULL, BattleScript_DamagingWeatherContinuesEnd - printfromtable gSandStormHailDmgStringIds + printfromtable gSandstormHailDmgStringIds waitmessage 0x40 orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE effectivenesssound @@ -3193,7 +3193,7 @@ BattleScript_WeatherDamageEndedBattle:: end2 BattleScript_SandStormHailEnds:: - printfromtable gSandStormHailEndStringIds + printfromtable gSandstormHailEndStringIds waitmessage 0x40 end2 -- cgit v1.2.3 From 30bab4776aafbb6ec27b602042b46177ace6e29f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 24 Nov 2019 17:18:00 -0500 Subject: Most of data/link_rfu.s --- data/link_rfu.s | 261 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 219 insertions(+), 42 deletions(-) (limited to 'data') diff --git a/data/link_rfu.s b/data/link_rfu.s index d16c35a22..877242271 100644 --- a/data/link_rfu.s +++ b/data/link_rfu.s @@ -7,82 +7,259 @@ .align 2 gUnknown_843F29C:: @ 843F29C - .incbin "baserom.gba", 0x43F29C, 0x8 + .2byte 0x143a, 0x1817, 0x100b, 0x200f gUnknown_843F2A4:: @ 843F2A4 - .incbin "baserom.gba", 0x43F2A4, 0x8 + .2byte 0x0209, 0x140b, 0x1030, 0x102a gUnknown_843F2AC:: @ 843F2AC - .incbin "baserom.gba", 0x43F2AC, 0xF0 + .byte 0, 2, 2, 0 + .4byte gUnknown_8418A2B + .4byte gUnknown_84186D1 + .4byte gUnknown_84186EF + .4byte gUnknown_841880E + .4byte gUnknown_8418902 + .byte 1, 2, 3, 1 + .4byte gUnknown_8418A33 + .4byte gUnknown_8418706 + .4byte gUnknown_8418725 + .4byte gUnknown_841881B + .4byte gUnknown_8418902 + .byte 2, 2, 3, 1 + .4byte gUnknown_8418A4A + .4byte gUnknown_8418706 + .4byte gUnknown_8418725 + .4byte gUnknown_841883E + .4byte gUnknown_8418902 + .byte 3, 2, 3, 1 + .4byte gUnknown_8418A61 + .4byte gUnknown_8418706 + .4byte gUnknown_8418725 + .4byte gUnknown_841885F + .4byte gUnknown_8418902 + .byte 4, 2, 5, 2 + .4byte NULL + .4byte gUnknown_8418780 + .4byte gUnknown_841879E + .4byte gUnknown_841888C + .4byte gUnknown_8418902 + .byte 5, 2, 2, 0 + .4byte NULL + .4byte gUnknown_8418780 + .4byte gUnknown_841879E + .4byte NULL + .4byte NULL + .byte 6, 2, 3, 1 + .4byte gUnknown_8418A77 + .4byte gUnknown_84187B2 + .4byte gUnknown_84187D1 + .4byte gUnknown_84188AC + .4byte gUnknown_8418902 + .byte 7, 2, 3, 1 + .4byte gUnknown_8418AA1 + .4byte gUnknown_8418745 + .4byte gUnknown_8418763 + .4byte gUnknown_8418881 + .4byte gUnknown_8418902 + .byte 9, 2, 1, 3 + .4byte gUnknown_8418A87 + .4byte gUnknown_84188B9 + .4byte gUnknown_84188D6 + .4byte gUnknown_84188F0 + .4byte gUnknown_8418902 + .byte 14, 2, 2, 0 + .4byte gUnknown_8418AB2 + .4byte gUnknown_84186D1 + .4byte gUnknown_84187EE + .4byte gUnknown_8418881 + .4byte gUnknown_8418902 -gUnknown_843F39C:: @ 843F39C - .incbin "baserom.gba", 0x43F39C, 0x3D0 +gUnknown_843F39C:: @ 843F39C data8 4x7 + .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a -gUnknown_843F76C:: @ 843F76C +gUnknown_843F3B8:: @ 843F3B8 + .incbin "baserom.gba", 0x43F3B8, 0x20 + +gUnknown_843F3D8:: @ 843F3D8 + .incbin "baserom.gba", 0x43F3D8, 0x20 + +gUnknown_843F3F8:: @ 843F3F8 + .incbin "baserom.gba", 0x43F3F8, 0x20 + +gUnknown_843F418:: @ 843F418 + .incbin "baserom.gba", 0x43F418, 0x100 + +gUnknown_843F518:: @ 843F518 + .incbin "baserom.gba", 0x43F518, 0x100 + +gUnknown_843F618:: @ 843F618 + .incbin "baserom.gba", 0x43F618, 0x20 + +gUnknown_843F638:: @ 843F638 + .incbin "baserom.gba", 0x43F638, 0x134 + +gUnknown_843F76C:: @ 843F76C gbapal .incbin "baserom.gba", 0x43F76C, 0x20 -gUnknown_843F78C:: @ 843F78C +gUnknown_843F78C:: @ 843F78C gbapal .incbin "baserom.gba", 0x43F78C, 0x20 -gUnknown_843F7AC:: @ 843F7AC +gUnknown_843F7AC:: @ 843F7AC 4bpp.lz .incbin "baserom.gba", 0x43F7AC, 0xC8 -gUnknown_843F874:: @ 843F874 +gUnknown_843F874:: @ 843F874 gbapal .incbin "baserom.gba", 0x43F874, 0x8 -gUnknown_843F87C:: @ 843F87C +gUnknown_843F87C:: @ 843F87C gbapal .incbin "baserom.gba", 0x43F87C, 0xC -gUnknown_843F888:: @ 843F888 - .incbin "baserom.gba", 0x43F888, 0x18 +gUnknown_843F888:: @ 843F888 data8 6x4 + .byte 0x03, 0x04, 0x18, 0x04, 0x01, 0x04, 0x1b, 0x04, 0x03, 0x00, 0x18, 0x0a, 0x06, 0x06, 0x12, 0x04, 0x10, 0x04, 0x09, 0x02, 0x0e, 0x04, 0x12, 0x04 -gUnknown_843F8A0:: @ 843F8A0 - .incbin "baserom.gba", 0x43F8A0, 0x10 +gUnknown_843F8A0:: @ 843F8A0 bg_template + .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb -gUnknown_843F8B0:: @ 843F8B0 - .incbin "baserom.gba", 0x43F8B0, 0x20 +gUnknown_843F8B0:: @ 843F8B0 window_template + .align 2 + .byte 0x01, 0x07, 0x00, 0x10, 0x02, 0x0a + .2byte 0x0010 + @ {0x01, 0x07, 0x00, 0x10, 0x02, 0x0a, 0x0010} + .align 2 + .byte 0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f + .2byte 0x000a + @ {0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f, 0x000a} + .align 2 + .byte 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03 + .2byte 0x0000 + @ {0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000} + .align 2 + .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 + .2byte 0x0000 + @ {0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000} -gUnknown_843F8D0:: @ 843F8D0 - .incbin "baserom.gba", 0x43F8D0, 0x8 +gUnknown_843F8D0:: @ 843F8D0 window_template + .align 2 + .byte 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f + .2byte 0x0062 + @ {0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x0062} -gUnknown_843F8D8:: @ 843F8D8 - .incbin "baserom.gba", 0x43F8D8, 0x3 +gUnknown_843F8D8:: @ 843F8D8 text + .string "{UNDERSCORE}$" -gUnknown_843F8DB:: @ 843F8DB - .incbin "baserom.gba", 0x43F8DB, 0x5 +gUnknown_843F8DB:: @ 843F8DB text + .string "{CLEAR 17}$" + .align 2 gUnknown_843F8E0:: @ 843F8E0 .4byte gUnknown_847A8D8 .4byte gUnknown_847A8FA .4byte gUnknown_847A913 .4byte gUnknown_847A934 -gUnknown_843F8F0:: @ 843F8F0 - .incbin "baserom.gba", 0x43F8F0, 0x20 +gUnknown_843F8F0:: @ 843F8F0 sprite_sheet + obj_tiles gUnknown_843F3F8, 0x0020, 0 + obj_tiles gUnknown_843F418, 0x0100, 2 + obj_tiles gUnknown_843F518, 0x0100, 3 + obj_tiles NULL, 0x0000, 0 + +gUnknown_843F910:: @ 843F910 sprite_palette + obj_pal gUnknown_843F3B8, 0 + obj_pal gUnknown_843F3D8, 1 + obj_pal gUnknown_8E99F24, 2 + obj_pal gUnknown_843F618, 3 + null_obj_pal + +gUnknown_843F938:: @ 843F938 sprite_sheet + obj_tiles gUnknown_843F638, 0x0800, 5 + obj_tiles gUnknown_8E9BD28, 0x1000, 1 + obj_tiles gUnknown_8E99F44, 0x0800, 6 + obj_tiles gUnknown_8E9A168, 0x1000, 4 + +gUnknown_843F958:: @ 843F958 data8 + .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00 + +gUnknown_843F960:: + .4byte 0x00000000, 0x00000c00 + +gUnknown_843F968:: @ 843F968 sprite_template + spr_template 0, 0, gUnknown_843F960, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8101B20 + +gUnknown_843F980:: + .4byte 0xc0004000, 0x00000400 + +gUnknown_843F988:: + .incbin "baserom.gba", 0x43F988, 0x8 + +gUnknown_843F990:: + .incbin "baserom.gba", 0x43F990, 0x8 + +gUnknown_843F998:: + .incbin "baserom.gba", 0x43F998, 0x8 + +gUnknown_843F9A0:: + .incbin "baserom.gba", 0x43F9A0, 0x8 + +gUnknown_843F9A8:: + .4byte 0x843f988 + .4byte 0x843f990 + .4byte 0x843f998 + .4byte 0x843f9a0 + +gUnknown_843F9B8:: @ 843F9B8 sprite_template + spr_template 1, 1, gUnknown_843F980, gUnknown_843F9A8, NULL, gDummySpriteAffineAnimTable, sub_8101B20 + +gUnknown_843F9D0:: + .4byte 0xc0004000, 0x00000400 + +gUnknown_843F9D8:: + .incbin "baserom.gba", 0x43F9D8, 0x8 + +gUnknown_843F9E0:: + .incbin "baserom.gba", 0x43F9E0, 0xC + +gUnknown_843F9EC:: + .incbin "baserom.gba", 0x43F9EC, 0xC + +gUnknown_843F9F8:: + .incbin "baserom.gba", 0x43F9F8, 0xC + +gUnknown_843FA04:: + .incbin "baserom.gba", 0x43FA04, 0x8 + +gUnknown_843FA0C:: + .4byte gUnknown_843F9D8 + .4byte gUnknown_843F9E0 + .4byte gUnknown_843F9EC + .4byte gUnknown_843F9F8 + .4byte gUnknown_843FA04 + +gUnknown_843FA20:: @ 843FA20 sprite_template + spr_template 4, 2, gUnknown_843F9D0, gUnknown_843FA0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_843F910:: @ 843F910 - .incbin "baserom.gba", 0x43F910, 0x28 +gUnknown_843FA38:: + .4byte 0xc0000000, 0x00000c00 -gUnknown_843F938:: @ 843F938 - .incbin "baserom.gba", 0x43F938, 0x20 +gUnknown_843FA40:: @ 843FA40 sprite_template + spr_template 6, 2, gUnknown_843FA38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_843F958:: @ 843F958 - .incbin "baserom.gba", 0x43F958, 0x10 +gUnknown_843FA58:: + .4byte 0x40004000, 0x00000400 -gUnknown_843F968:: @ 843F968 - .incbin "baserom.gba", 0x43F968, 0x50 +gUnknown_843FA60:: + .4byte 0x40000000, 0x00000400 -gUnknown_843F9B8:: @ 843F9B8 - .incbin "baserom.gba", 0x43F9B8, 0x68 +gUnknown_843FA68:: + .incbin "baserom.gba", 0x43FA68, 0x8 -gUnknown_843FA20:: @ 843FA20 - .incbin "baserom.gba", 0x43FA20, 0x20 +gUnknown_843FA70:: + .incbin "baserom.gba", 0x43FA70, 0x8 -gUnknown_843FA40:: @ 843FA40 - .incbin "baserom.gba", 0x43FA40, 0x40 +gUnknown_843FA78:: + .4byte gUnknown_843FA68 + .4byte gUnknown_843FA70 -gUnknown_843FA80:: @ 843FA80 - .incbin "baserom.gba", 0x43FA80, 0x18 +gUnknown_843FA80:: @ 843FA80 sprite_template + spr_template 3, 2, gUnknown_843FA58, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -gUnknown_843FA98:: @ 843FA98 - .incbin "baserom.gba", 0x43FA98, 0x18 +gUnknown_843FA98:: @ 843FA98 sprite_template + spr_template 2, 2, gUnknown_843FA60, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy -- cgit v1.2.3 From 9fbaa28dd9ca618ca7934087ad363d6f159f1713 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 25 Nov 2019 09:52:19 -0500 Subject: Dump link_rfu graphics --- data/graphics.s | 12 +++---- data/link_rfu.s | 97 +++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 70 insertions(+), 39 deletions(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index a6b9db097..818b01e3a 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -16125,22 +16125,22 @@ gUnknown_8E998CC:: @ 8E998CC .incbin "baserom.gba", 0xE998CC, 0x4C0 gUnknown_8E99D8C:: @ 8E99D8C - .incbin "baserom.gba", 0xE99D8C, 0x20 @UNKNOWN + .incbin "graphics/link_rfu/unk_8E99DAC.gbapal" gUnknown_8E99DAC:: @ 8E99DAC - .incbin "baserom.gba", 0xE99DAC, 0xC8 @UNKNOWN + .incbin "graphics/link_rfu/unk_8E99DAC.4bpp.lz" gUnknown_8E99E74:: @ 8E99E74 - .incbin "baserom.gba", 0xE99E74, 0xB0 + .incbin "graphics/link_rfu/unk_8E99E74.bin.lz" gUnknown_8E99F24:: @ 8E99F24 - .incbin "baserom.gba", 0xE99F24, 0x20 @UNKNOWN + .incbin "graphics/link_rfu/unk_8E9A168.gbapal" gUnknown_8E99F44:: @ 8E99F44 - .incbin "baserom.gba", 0xE99F44, 0x224 + .incbin "graphics/link_rfu/unk_8E99F44.4bpp.lz" gUnknown_8E9A168:: @ 8E9A168 - .incbin "baserom.gba", 0xE9A168, 0x2F8 + .incbin "graphics/link_rfu/unk_8E9A168.4bpp.lz" gUnknown_8E9A460:: @ 8E9A460 .incbin "baserom.gba", 0xE9A460, 0xEB0 diff --git a/data/link_rfu.s b/data/link_rfu.s index 877242271..8e9abd3f0 100644 --- a/data/link_rfu.s +++ b/data/link_rfu.s @@ -1,6 +1,7 @@ #include "constants/region_map.h" #include "constants/flags.h" #include "constants/moves.h" +#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata @@ -75,46 +76,62 @@ gUnknown_843F2AC:: @ 843F2AC .4byte gUnknown_8418902 gUnknown_843F39C:: @ 843F39C data8 4x7 - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a + .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00 + .byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00 + .byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 + .byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a -gUnknown_843F3B8:: @ 843F3B8 - .incbin "baserom.gba", 0x43F3B8, 0x20 +gUnknown_843F3B8:: @ 843F3B8 gbapal + .incbin "graphics/link_rfu/unk_843F3F8.gbapal" -gUnknown_843F3D8:: @ 843F3D8 - .incbin "baserom.gba", 0x43F3D8, 0x20 +gUnknown_843F3D8:: @ 843F3D8 gbapal + .incbin "graphics/link_rfu/unk_8E9BD28.gbapal" -gUnknown_843F3F8:: @ 843F3F8 - .incbin "baserom.gba", 0x43F3F8, 0x20 +gUnknown_843F3F8:: @ 843F3F8 4bpp + .incbin "graphics/link_rfu/unk_843F3F8.4bpp" -gUnknown_843F418:: @ 843F418 - .incbin "baserom.gba", 0x43F418, 0x100 +gUnknown_843F418:: @ 843F418 4bpp + .incbin "graphics/link_rfu/unk_843F418.4bpp" -gUnknown_843F518:: @ 843F518 - .incbin "baserom.gba", 0x43F518, 0x100 +gUnknown_843F518:: @ 843F518 4bpp + .incbin "graphics/link_rfu/unk_843F518.4bpp" -gUnknown_843F618:: @ 843F618 - .incbin "baserom.gba", 0x43F618, 0x20 +gUnknown_843F618:: @ 843F618 gbapal + .incbin "graphics/link_rfu/unk_843F638.gbapal" -gUnknown_843F638:: @ 843F638 - .incbin "baserom.gba", 0x43F638, 0x134 +gUnknown_843F638:: @ 843F638 4bpp.lz + .incbin "graphics/link_rfu/unk_843F638.4bpp.lz" gUnknown_843F76C:: @ 843F76C gbapal - .incbin "baserom.gba", 0x43F76C, 0x20 + .incbin "graphics/link_rfu/unk_843F76C.gbapal" gUnknown_843F78C:: @ 843F78C gbapal - .incbin "baserom.gba", 0x43F78C, 0x20 + .incbin "graphics/link_rfu/unk_843F78C.gbapal" gUnknown_843F7AC:: @ 843F7AC 4bpp.lz - .incbin "baserom.gba", 0x43F7AC, 0xC8 + .incbin "graphics/link_rfu/unk_843F7AC.4bpp.lz" gUnknown_843F874:: @ 843F874 gbapal - .incbin "baserom.gba", 0x43F874, 0x8 + .2byte RGB(0, 0, 0) + .2byte RGB(0, 0, 0) + .2byte RGB(7, 25, 31) + .2byte RGB(21, 21, 29) gUnknown_843F87C:: @ 843F87C gbapal - .incbin "baserom.gba", 0x43F87C, 0xC + .2byte RGB(0, 0, 0) + .2byte RGB(31, 31, 31) + .2byte RGB(12, 12, 12) + .2byte RGB(27, 26, 27) + .2byte RGB(8, 17, 9) + .align 2 gUnknown_843F888:: @ 843F888 data8 6x4 - .byte 0x03, 0x04, 0x18, 0x04, 0x01, 0x04, 0x1b, 0x04, 0x03, 0x00, 0x18, 0x0a, 0x06, 0x06, 0x12, 0x04, 0x10, 0x04, 0x09, 0x02, 0x0e, 0x04, 0x12, 0x04 + .byte 0x03, 0x04, 0x18, 0x04 + .byte 0x01, 0x04, 0x1b, 0x04 + .byte 0x03, 0x00, 0x18, 0x0a + .byte 0x06, 0x06, 0x12, 0x04 + .byte 0x10, 0x04, 0x09, 0x02 + .byte 0x0e, 0x04, 0x12, 0x04 gUnknown_843F8A0:: @ 843F8A0 bg_template .4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb @@ -160,7 +177,7 @@ gUnknown_843F8F0:: @ 843F8F0 sprite_sheet obj_tiles gUnknown_843F3F8, 0x0020, 0 obj_tiles gUnknown_843F418, 0x0100, 2 obj_tiles gUnknown_843F518, 0x0100, 3 - obj_tiles NULL, 0x0000, 0 + null_obj_tiles gUnknown_843F910:: @ 843F910 sprite_palette obj_pal gUnknown_843F3B8, 0 @@ -188,16 +205,20 @@ gUnknown_843F980:: .4byte 0xc0004000, 0x00000400 gUnknown_843F988:: - .incbin "baserom.gba", 0x43F988, 0x8 + obj_image_anim_frame 0x0000, 0 + obj_image_anim_end gUnknown_843F990:: - .incbin "baserom.gba", 0x43F990, 0x8 + obj_image_anim_frame 0x0020, 0 + obj_image_anim_end gUnknown_843F998:: - .incbin "baserom.gba", 0x43F998, 0x8 + obj_image_anim_frame 0x0040, 0 + obj_image_anim_end gUnknown_843F9A0:: - .incbin "baserom.gba", 0x43F9A0, 0x8 + obj_image_anim_frame 0x0060, 0 + obj_image_anim_end gUnknown_843F9A8:: .4byte 0x843f988 @@ -212,19 +233,27 @@ gUnknown_843F9D0:: .4byte 0xc0004000, 0x00000400 gUnknown_843F9D8:: - .incbin "baserom.gba", 0x43F9D8, 0x8 + obj_image_anim_frame 0x0060, 0 + obj_image_anim_end gUnknown_843F9E0:: - .incbin "baserom.gba", 0x43F9E0, 0xC + obj_image_anim_frame 0x0040, 4 + obj_image_anim_frame 0x0020, 4 + obj_image_anim_end gUnknown_843F9EC:: - .incbin "baserom.gba", 0x43F9EC, 0xC + obj_image_anim_frame 0x0040, 4 + obj_image_anim_frame 0x0000, 4 + obj_image_anim_end gUnknown_843F9F8:: - .incbin "baserom.gba", 0x43F9F8, 0xC + obj_image_anim_frame 0x0040, 4 + obj_image_anim_frame 0x0060, 0 + obj_image_anim_end gUnknown_843FA04:: - .incbin "baserom.gba", 0x43FA04, 0x8 + obj_image_anim_frame 0x0040, 4 + obj_image_anim_end gUnknown_843FA0C:: .4byte gUnknown_843F9D8 @@ -249,10 +278,12 @@ gUnknown_843FA60:: .4byte 0x40000000, 0x00000400 gUnknown_843FA68:: - .incbin "baserom.gba", 0x43FA68, 0x8 + obj_image_anim_frame 0x0000, 0 + obj_image_anim_end gUnknown_843FA70:: - .incbin "baserom.gba", 0x43FA70, 0x8 + obj_image_anim_frame 0x0004, 0 + obj_image_anim_end gUnknown_843FA78:: .4byte gUnknown_843FA68 -- cgit v1.2.3 From 4e0ab73caf206ba806adf0d3e8a45b5a3461e69b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 25 Nov 2019 13:35:57 -0500 Subject: Dump data/field_weather --- data/field_weather.s | 360 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 326 insertions(+), 34 deletions(-) (limited to 'data') diff --git a/data/field_weather.s b/data/field_weather.s index 03b3e8faa..a9bc70f3c 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -1,104 +1,396 @@ +#include "constants/region_map.h" +#include "constants/flags.h" +#include "constants/moves.h" +#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 gUnknown_83BFBE4:: @ 83BFBE4 - .incbin "baserom.gba", 0x3BFBE4, 0x2FD8 + .incbin "graphics/field_effects/unk_83BFBE4.bin.lz" + +gUnknown_83C0408:: + .incbin "graphics/field_effects/unk_83C0408.bin.lz" + +gUnknown_83C0C00:: + .incbin "graphics/field_effects/unk_83C0C00.bin.lz" + +gUnknown_83C139C:: + .incbin "graphics/field_effects/unk_83C139C.bin.lz" + +gUnknown_83C1BB8:: + .incbin "graphics/field_effects/unk_83C1BB8.bin.lz" + +gUnknown_83C2380:: + .incbin "graphics/field_effects/unk_83C2380.bin.lz" + +gUnknown_83C2BA4:: + .4byte gUnknown_83BFBE4 + .4byte gUnknown_83C0408 + .4byte gUnknown_83C0C00 + .4byte gUnknown_83C139C + .4byte gUnknown_83C1BB8 + .4byte gUnknown_83C2380 gUnknown_83C2BBC:: @ 83C2BBC - .incbin "baserom.gba", 0x3C2BBC, 0x4 + .4byte gUnknown_2037F34 gUnknown_83C2BC0:: @ 83C2BC0 - .incbin "baserom.gba", 0x3C2BC0, 0xF0 + .4byte sub_8079EC0 + .4byte nullsub_45 + .4byte sub_8079EC0 + .4byte sub_8079EE4 + .4byte Clouds_InitVars + .4byte Clouds_Main + .4byte Clouds_InitAll + .4byte Clouds_Finish + .4byte Weather2_InitVars + .4byte nullsub_48 + .4byte Weather2_InitAll + .4byte sub_807B434 + .4byte LightRain_InitVars + .4byte LightRain_Main + .4byte LightRain_InitAll + .4byte LightRain_Finish + .4byte Snow_InitVars + .4byte snowflakes_progress2 + .4byte Snow_InitAll + .4byte Snow_Finish + .4byte sub_807C2E4 + .4byte Rain_Main + .4byte sub_807C358 + .4byte Rain_Finish + .4byte Fog1_InitVars + .4byte Fog1_Main + .4byte Fog1_InitAll + .4byte Fog1_Finish + .4byte Ash_InitVars + .4byte Ash_Main + .4byte Ash_InitAll + .4byte Ash_Finish + .4byte Sandstorm_InitVars + .4byte Sandstorm_Main + .4byte Sandstorm_InitAll + .4byte Sandstorm_Finish + .4byte Fog2_InitVars + .4byte Fog2_Main + .4byte Fog2_InitAll + .4byte Fog2_Finish + .4byte Fog1_InitVars + .4byte Fog1_Main + .4byte Fog1_InitAll + .4byte Fog1_Finish + .4byte Weather11_InitVars + .4byte nullsub_49 + .4byte Weather11_InitAll + .4byte sub_807D8D0 + .4byte Drought_InitVars + .4byte Drought_Main + .4byte Drought_InitAll + .4byte sub_807B6BC + .4byte sub_807C388 + .4byte Rain_Main + .4byte sub_807C3F4 + .4byte Rain_Finish + .4byte Bubbles_InitVars + .4byte Bubbles_Main + .4byte Bubbles_InitAll + .4byte Bubbles_Finish gUnknown_83C2CB0:: @ 83C2CB0 - .incbin "baserom.gba", 0x3C2CB0, 0x10 + .4byte sub_8079FFC + .4byte sub_807A084 + .4byte nullsub_46 + .4byte nullsub_46 gUnknown_83C2CC0:: @ 83C2CC0 - .incbin "baserom.gba", 0x3C2CC0, 0x20 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01 gUnknown_83C2CE0:: @ 83C2CE0 - .incbin "baserom.gba", 0x3C2CE0, 0x20 + .incbin "graphics/field_effects/unk_83C2CE0.gbapal" gUnknown_83C2D00:: @ 83C2D00 - .incbin "baserom.gba", 0x3C2D00, 0x20 + .incbin "graphics/field_effects/unk_83C2D00.gbapal" gUnknown_83C2D20:: @ 83C2D20 - .incbin "baserom.gba", 0x3C2D20, 0x820 + .incbin "graphics/field_effects/unk_83C2D20.gbapal" + +gUnknown_83C2D40:: + .incbin "graphics/field_effects/unk_83C2D40.4bpp" gWeatherFog1Tiles:: @ 83C3540 - .incbin "baserom.gba", 0x3C3540, 0x3080 + .incbin "graphics/field_effects/unk_83C3540.4bpp" + +gUnknown_83C3D40:: + .incbin "graphics/field_effects/unk_83C3D40.4bpp" + +gUnknown_83C4540:: + .incbin "graphics/field_effects/unk_83C4540.4bpp" + +gUnknown_83C4580:: + .incbin "graphics/field_effects/unk_83C4580.4bpp" + +gUnknown_83C45C0:: + .incbin "graphics/field_effects/unk_83C45C0.4bpp" + +gUnknown_83C55C0:: + .incbin "graphics/field_effects/unk_83C55C0.4bpp" + +gUnknown_83C5BC0:: + .incbin "graphics/field_effects/unk_83C5BC0.4bpp" gUnknown_83C65C0:: @ 83C65C0 - .incbin "baserom.gba", 0x3C65C0, 0x4 + .byte 0x02, 0x03, 0x05, 0x03 gUnknown_83C65C4:: @ 83C65C4 - .incbin "baserom.gba", 0x3C65C4, 0x4 + .byte 0x02, 0x02, 0x03, 0x02 gUnknown_83C65C8:: @ 83C65C8 - .incbin "baserom.gba", 0x3C65C8, 0xC + .2byte 0x0000, 0x0042, 0x0005, 0x0049, 0x000a, 0x004e gUnknown_83C65D4:: @ 83C65D4 - .incbin "baserom.gba", 0x3C65D4, 0x1C + obj_tiles gUnknown_83C3D40, 0x0800, 4608 + +gUnknown_83C65DC:: + .4byte 0xc0000400, 0x00000c00 + +gUnknown_83C65E4:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_end + +gUnknown_83C65EC:: + .4byte gUnknown_83C65E4 gUnknown_83C65F0:: @ 83C65F0 - .incbin "baserom.gba", 0x3C65F0, 0x18 + spr_template 4608, 4608, gUnknown_83C65DC, gUnknown_83C65EC, NULL, gDummySpriteAffineAnimTable, sub_807B558 gUnknown_83C6608:: @ 83C6608 - .incbin "baserom.gba", 0x3C6608, 0x9C + .2byte 0x0000, 0x0000 + .2byte 0x0000, 0x00a0 + .2byte 0x0000, 0x0040 + .2byte 0x0090, 0x00e0 + .2byte 0x0090, 0x0080 + .2byte 0x0020, 0x0020 + .2byte 0x0020, 0x00c0 + .2byte 0x0020, 0x0060 + .2byte 0x0048, 0x0080 + .2byte 0x0048, 0x0020 + .2byte 0x0048, 0x00c0 + .2byte 0x00d8, 0x0060 + .2byte 0x00d8, 0x0000 + .2byte 0x0068, 0x00a0 + .2byte 0x0068, 0x0040 + .2byte 0x0068, 0x00e0 + .2byte 0x0090, 0x0000 + .2byte 0x0090, 0x00a0 + .2byte 0x0090, 0x0040 + .2byte 0x0020, 0x00e0 + .2byte 0x0020, 0x0080 + .2byte 0x0048, 0x0020 + .2byte 0x0048, 0x00c0 + .2byte 0x0030, 0x0060 + +gUnknown_83C6668:: + .4byte 0x80008000, 0x00002400 + +gUnknown_83C6670:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_jump 0 + +gUnknown_83C6678:: + obj_image_anim_frame 0x0008, 3 + obj_image_anim_frame 0x0020, 2 + obj_image_anim_frame 0x0028, 2 + obj_image_anim_end + +gUnknown_83C6688:: + obj_image_anim_frame 0x0008, 3 + obj_image_anim_frame 0x0010, 3 + obj_image_anim_frame 0x0018, 4 + obj_image_anim_end + +gUnknown_83C6698:: + .4byte gUnknown_83C6670 + .4byte gUnknown_83C6678 + .4byte gUnknown_83C6688 gUnknown_83C66A4:: @ 83C66A4 - .incbin "baserom.gba", 0x3C66A4, 0x18 + spr_template 4614, 4608, gUnknown_83C6668, gUnknown_83C6698, NULL, gDummySpriteAffineAnimTable, sub_807BA24 gUnknown_83C66BC:: @ 83C66BC - .incbin "baserom.gba", 0x3C66BC, 0x8 + .2byte 0xff98, 0x00d0 + .2byte 0xff60, 0x0140 gUnknown_83C66C4:: @ 83C66C4 - .incbin "baserom.gba", 0x3C66C4, 0x8 + .2byte 0x0012, 0x0007 + .2byte 0x000c, 0x000a gUnknown_83C66CC:: @ 83C66CC - .incbin "baserom.gba", 0x3C66CC, 0x38 + obj_tiles gUnknown_83C55C0, 0x0600, 4614 + +gUnknown_83C66D4:: + .4byte 0x00000000, 0x00000400 + +gUnknown_83C66DC:: + obj_frame_tiles gUnknown_83C4540 + 0x00, 0x0020 + obj_frame_tiles gUnknown_83C4540 + 0x20, 0x0020 + +gUnknown_83C66EC:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_end + +gUnknown_83C66F4:: + obj_image_anim_frame 0x0001, 16 + obj_image_anim_end + +gUnknown_83C66FC:: + .4byte gUnknown_83C66EC + .4byte gUnknown_83C66F4 gUnknown_83C6704:: @ 83C6704 - .incbin "baserom.gba", 0x3C6704, 0x8C + spr_template 65535, 4608, gUnknown_83C66D4, gUnknown_83C66FC, gUnknown_83C66DC, gDummySpriteAffineAnimTable, sub_807C1AC + +gUnknown_83C671C:: + .2byte 0x0000, 0x0006, 0x0006, 0x000c, 0x0012, 0x002a, 0x012c, 0x012c + +gUnknown_83C672C:: + .4byte 0xc0000400, 0x00000800 + +gUnknown_83C6734:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_end + +gUnknown_83C673C:: + obj_image_anim_frame 0x0020, 16 + obj_image_anim_end + +gUnknown_83C6744:: + obj_image_anim_frame 0x0040, 16 + obj_image_anim_end + +gUnknown_83C674C:: + obj_image_anim_frame 0x0060, 16 + obj_image_anim_end + +gUnknown_83C6754:: + obj_image_anim_frame 0x0080, 16 + obj_image_anim_end + +gUnknown_83C675C:: + obj_image_anim_frame 0x00a0, 16 + obj_image_anim_end + +gUnknown_83C6764:: + .4byte gUnknown_83C6734 + .4byte gUnknown_83C673C + .4byte gUnknown_83C6744 + .4byte gUnknown_83C674C + .4byte gUnknown_83C6754 + .4byte gUnknown_83C675C + +gUnknown_83C677C:: + obj_rot_scal_anim_frame 512, 512, 0, 0 + obj_rot_scal_anim_end + +gUnknown_83C678C:: + .4byte gUnknown_83C677C gUnknown_83C6790:: @ 83C6790 - .incbin "baserom.gba", 0x3C6790, 0x18 + spr_template 4609, 4608, gUnknown_83C672C, gUnknown_83C6764, NULL, gUnknown_83C678C, Fog1SpriteCallback gUnknown_83C67A8:: @ 83C67A8 - .incbin "baserom.gba", 0x3C67A8, 0x8 + obj_tiles gWeatherFog1Tiles, 0x0800, 4609 gUnknown_83C67B0:: @ 83C67B0 - .incbin "baserom.gba", 0x3C67B0, 0x20 + obj_tiles gUnknown_83C45C0, 0x1000, 4610 + +gUknown_83C67B8:: + .4byte 0xc0000400, 0x0000f400 + +gUnknown_83C67C0:: + obj_image_anim_frame 0x0000, 60 + obj_image_anim_frame 0x0040, 60 + obj_image_anim_jump 0 + +gUnknown_83C67CC:: + .4byte gUnknown_83C67C0 gUnknown_83C67D0:: @ 83C67D0 - .incbin "baserom.gba", 0x3C67D0, 0x18 + spr_template 4610, 4608, gUknown_83C67B8, gUnknown_83C67CC, NULL, gDummySpriteAffineAnimTable, sub_807CF08 gUnknown_83C67E8:: @ 83C67E8 - .incbin "baserom.gba", 0x3C67E8, 0x1C + obj_tiles gUnknown_83C2D40, 0x0800, 4611 + +gUnknown_83C67F0:: + .4byte 0xc0000400, 0x00000800 + +gUnknown_83C67F8:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_end + +gUnknown_83C6800:: + .4byte gUnknown_83C67F8 gUnknown_83C6804:: @ 83C6804 - .incbin "baserom.gba", 0x3C6804, 0x38 + spr_template 4611, 4608, gUnknown_83C67F0, gUnknown_83C6800, NULL, gDummySpriteAffineAnimTable, Fog2SpriteCallback + +gUnknown_83C681C:: + .4byte 0xc0000400, 0x00000400 + +gUnknown_83C6824:: + obj_image_anim_frame 0x0000, 3 + obj_image_anim_end + +gUnknown_83C682C:: + obj_image_anim_frame 0x0040, 3 + obj_image_anim_end + +gUnknown_83C6834:: + .4byte gUnknown_83C6824 + .4byte gUnknown_83C682C gUnknown_83C683C:: @ 83C683C - .incbin "baserom.gba", 0x3C683C, 0x18 + spr_template 4612, 4608, gUnknown_83C681C, gUnknown_83C6834, NULL, gDummySpriteAffineAnimTable, SandstormSpriteCallback1 gUnknown_83C6854:: @ 83C6854 - .incbin "baserom.gba", 0x3C6854, 0x8 + obj_tiles gUnknown_83C5BC0, 0x0a00, 4612 gUnknown_83C685C:: @ 83C685C - .incbin "baserom.gba", 0x3C685C, 0xC + .2byte 0x0000, 0x0078, 0x0050, 0x00a0, 0x0028, 0x0000 gUnknown_83C6868:: @ 83C6868 - .incbin "baserom.gba", 0x3C6868, 0x8 + .byte 0x28, 0x5a, 0x3c, 0x5a, 0x02, 0x3c, 0x28, 0x1e gUnknown_83C6870:: @ 83C6870 - .incbin "baserom.gba", 0x3C6870, 0x8 + obj_tiles gUnknown_83C4580, 0x0040, 4613 gUnknown_83C6878:: @ 83C6878 - .incbin "baserom.gba", 0x3C6878, 0x44 + .2byte 0x0078, 0x00a0 + .2byte 0x0178, 0x00a0 + .2byte 0x0028, 0x008c + .2byte 0x0128, 0x008c + .2byte 0x00b4, 0x0082 + .2byte 0x01b4, 0x0082 + .2byte 0x003c, 0x00a0 + .2byte 0x01b4, 0x00a0 + .2byte 0x00dc, 0x00b4 + .2byte 0x01dc, 0x00b4 + .2byte 0x000a, 0x005a + .2byte 0x010a, 0x005a + .2byte 0x0100, 0x00a0 + +gUnknown_83C68AC:: + obj_image_anim_frame 0x0000, 16 + obj_image_anim_frame 0x0001, 16 + obj_image_anim_end + +gUnknown_83C68B8:: + .4byte gUnknown_83C68AC gUnknown_83C68BC:: @ 83C68BC - .incbin "baserom.gba", 0x3C68BC, 0x18 + spr_template 4613, 4608, gOamData_83AC9C8, gUnknown_83C68B8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4 gUnknown_83C68D4:: @ 83C68D4 - .incbin "baserom.gba", 0x3C68D4, 0xC + .2byte 0x00c8, 0x0048, 0x0038, 0x0028, 0x0018, 0x0000 + -- cgit v1.2.3 From 7c84525193367f323406ab561dafeb640c17866a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 25 Nov 2019 15:53:09 -0500 Subject: Dump data/pokemon_jump --- data/field_weather.s | 1 - data/pokemon_jump.s | 355 ++++++++++++++++++++++++++++++++++++++++++++------- data/strings.s | 3 + 3 files changed, 309 insertions(+), 50 deletions(-) (limited to 'data') diff --git a/data/field_weather.s b/data/field_weather.s index a9bc70f3c..356ec81a5 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -393,4 +393,3 @@ gUnknown_83C68BC:: @ 83C68BC gUnknown_83C68D4:: @ 83C68D4 .2byte 0x00c8, 0x0048, 0x0038, 0x0028, 0x0018, 0x0000 - diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s index bddff8c3a..a5f30c674 100644 --- a/data/pokemon_jump.s +++ b/data/pokemon_jump.s @@ -60,82 +60,171 @@ gUnknown_846B4AC:: @ 846B4AC .4byte sub_81477C0, sub_814784C, sub_81479D4, sub_8147A34 gUnknown_846B4BC:: @ 846B4BC - .incbin "baserom.gba", 0x46B4BC, 0x190 + .2byte 0x0001, 0x0002, 0x0004, 0x0001, 0x0007, 0x0000, 0x000a, 0x0001, 0x000b, 0x0001, 0x000d, 0x0001, 0x000e, 0x0001, 0x0013, 0x0001 + .2byte 0x0014, 0x0001, 0x0019, 0x0000, 0x001b, 0x0000, 0x001d, 0x0000, 0x0020, 0x0000, 0x0023, 0x0000, 0x0025, 0x0000, 0x0027, 0x0002 + .2byte 0x002b, 0x0002, 0x002e, 0x0001, 0x0034, 0x0000, 0x0036, 0x0002, 0x0038, 0x0001, 0x003a, 0x0001, 0x003c, 0x0002, 0x0045, 0x0002 + .2byte 0x005a, 0x0001, 0x0062, 0x0001, 0x0066, 0x0002, 0x0068, 0x0000, 0x0084, 0x0002, 0x0085, 0x0000, 0x008a, 0x0001, 0x008c, 0x0001 + .2byte 0x0098, 0x0002, 0x009b, 0x0001, 0x009e, 0x0000, 0x00a7, 0x0001, 0x00ac, 0x0000, 0x00ad, 0x0000, 0x00ae, 0x0002, 0x00af, 0x0002 + .2byte 0x00b3, 0x0000, 0x00b6, 0x0002, 0x00b7, 0x0002, 0x00bf, 0x0002, 0x00c2, 0x0002, 0x00cc, 0x0002, 0x00d1, 0x0000, 0x00d5, 0x0002 + .2byte 0x00d8, 0x0000, 0x00da, 0x0002, 0x00dc, 0x0000, 0x00e4, 0x0001, 0x00e7, 0x0000, 0x00e9, 0x0000, 0x00ec, 0x0001, 0x00ee, 0x0002 + .2byte 0x00ef, 0x0001, 0x00f0, 0x0001, 0x00f6, 0x0001, 0x0115, 0x0001, 0x0118, 0x0002, 0x011b, 0x0000, 0x011c, 0x0000, 0x011e, 0x0001 + .2byte 0x0120, 0x0000, 0x0121, 0x0000, 0x0122, 0x0001, 0x0123, 0x0002, 0x0125, 0x0002, 0x0127, 0x0002, 0x012a, 0x0001, 0x0188, 0x0000 + .2byte 0x0189, 0x0000, 0x0137, 0x0002, 0x0132, 0x0002, 0x012d, 0x0001, 0x0172, 0x0000, 0x015e, 0x0002, 0x013b, 0x0000, 0x0142, 0x0000 + .2byte 0x0163, 0x0000, 0x017e, 0x0001, 0x0164, 0x0002, 0x0151, 0x0001, 0x0161, 0x0001, 0x0162, 0x0001, 0x0182, 0x0000, 0x0183, 0x0000 + .2byte 0x016b, 0x0002, 0x016f, 0x0002, 0x0153, 0x0002, 0x0141, 0x0002, 0x015f, 0x0000, 0x014c, 0x0002, 0x0158, 0x0002, 0x0186, 0x0001 + .2byte 0x0168, 0x0000, 0x015a, 0x0000, 0x0175, 0x0001, 0x018b, 0x0001 gUnknown_846B64C:: @ 846B64C - .incbin "baserom.gba", 0x46B64C, 0x24 + .4byte sub_8148344 + .4byte sub_81483D0 + .4byte sub_8148464 + .4byte sub_81484D0 + .4byte sub_81485C8 + .4byte sub_81486C4 + .4byte sub_8148760 + .4byte sub_81487B4 + .4byte sub_814881C gUnknown_846B670:: @ 846B670 - .incbin "baserom.gba", 0x46B670, 0x24 + .4byte sub_8148398 + .4byte sub_8148418 + .4byte sub_81484B0 + .4byte sub_814856C + .4byte sub_8148664 + .4byte sub_8148724 + .4byte sub_8148760 + .4byte sub_8148800 + .4byte sub_814881C gUnknown_846B694:: @ 846B694 - .incbin "baserom.gba", 0x46B694, 0x10 + .2byte 0x001a, 0x001f, 0x0024, 0x0029, 0x002e, 0x0033, 0x0038, 0x003d gUnknown_846B6A4:: @ 846B6A4 - .incbin "baserom.gba", 0x46B6A4, 0x8 + .2byte 0x0000, 0x0001, 0x0001, 0x0002 gUnknown_846B6AC:: @ 846B6AC - .incbin "baserom.gba", 0x46B6AC, 0x8 + .2byte 0x0058, 0x005f, 0x00dd, 0x00fe gUnknown_846B6B4:: @ 846B6B4 - .incbin "baserom.gba", 0x46B6B4, 0x90 + .byte 0xfd, 0xfa, 0xf8, 0xf6, 0xf3, 0xf1, 0xef, 0xed, 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe9, 0xea, 0xec, 0xee, 0xef, 0xf1, 0xf3, 0xf5, 0xf8, 0xfa, 0xfc + .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfa, 0xf7, 0xf5, 0xf2, 0xf0, 0xee, 0xec, 0xea, 0xe8, 0xe6, 0xe4, 0xe3, 0xe2, 0xe2, 0xe4 + .byte 0xe6, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2, 0xf5, 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xfd, 0xfa, 0xf7, 0xf5, 0xf3, 0xf1, 0xef, 0xed, 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2, 0xe2, 0xe2, 0xe3, 0xe3, 0xe4, 0xe4, 0xe5, 0xe5, 0xe6, 0xe7, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2 + .byte 0xf4, 0xf5, 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 gUnknown_846B744:: @ 846B744 - .incbin "baserom.gba", 0x46B744, 0x18 + .4byte 0, 0, 50, 100, 200, 500 gUnknown_846B75C:: @ 846B75C - .incbin "baserom.gba", 0x46B75C, 0x10 + .2byte 0x008a, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092, 0x0093 gUnknown_846B76C:: @ 846B76C - .incbin "baserom.gba", 0x46B76C, 0x28 + .4byte 5000, 1 + .4byte 8000, 2 + .4byte 12000, 3 + .4byte 16000, 4 + .4byte 20000, 5 -gUnknown_846B794:: @ 846B794 - .incbin "baserom.gba", 0x46B794, 0x20 +gUnknown_846B794:: @ 846B794 gbapal + .incbin "graphics/misc/unk_846B794.gbapal" -gUnknown_846B7B4:: @ 846B7B4 - .incbin "baserom.gba", 0x46B7B4, 0x20 +gUnknown_846B7B4:: @ 846B7B4 gbapal + .incbin "graphics/misc/unk_846B7B4.gbapal" -gUnknown_846B7D4:: @ 846B7D4 - .incbin "baserom.gba", 0x46B7D4, 0x22C +gUnknown_846B7D4:: @ 846B7D4 4bpp.lz + .incbin "graphics/misc/unk_846B7D4.4bpp.lz" -gUnknown_846BA00:: @ 846BA00 - .incbin "baserom.gba", 0x46BA00, 0x1B0 +gUnknown_846BA00:: @ 846BA00 bin.lz + .incbin "graphics/misc/unk_846BA00.bin.lz" -gUnknown_846BBB0:: @ 846BBB0 - .incbin "baserom.gba", 0x46BBB0, 0x20 +gUnknown_846BBB0:: @ 846BBB0 gbapal + .incbin "graphics/misc/unk_846BBB0.gbapal" -gUnknown_846BBD0:: @ 846BBD0 - .incbin "baserom.gba", 0x46BBD0, 0x950 +gUnknown_846BBD0:: @ 846BBD0 4bpp.lz + .incbin "graphics/misc/unk_846BBD0.4bpp.lz" -gUnknown_846C520:: @ 846C520 - .incbin "baserom.gba", 0x46C520, 0x3B8 +gUnknown_846C520:: @ 846C520 bin.lz + .incbin "graphics/misc/unk_846C520.bin.lz" -gUnknown_846C8D8:: @ 846C8D8 - .incbin "baserom.gba", 0x46C8D8, 0x20 +gUnknown_846C8D8:: @ 846C8D8 gbapal + .incbin "graphics/misc/unk_846C8D8.gbapal" -gUnknown_846C8F8:: @ 846C8F8 - .incbin "baserom.gba", 0x46C8F8, 0xAB0 +gUnknown_846C8F8:: @ 846C8F8 4bpp.lz + .incbin "graphics/misc/unk_846C8F8.4bpp.lz" -gUnknown_846D3A8:: @ 846D3A8 - .incbin "baserom.gba", 0x46D3A8, 0x52C +gUnknown_846D3A8:: @ 846D3A8 bin.lz + .incbin "graphics/misc/unk_846D3A8.bin.lz" gUnknown_846D8D4:: @ 846D8D4 - .incbin "baserom.gba", 0x46D8D4, 0x10 + .4byte 0x000001b0 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 27, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x000025e6 + @ { + @ .bg = 2, + @ .charBaseIndex = 1, + @ .mapBaseIndex = 30, + @ .screenSize = 2, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + .4byte 0x000016c9 + @ { + @ .bg = 1, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 12, + @ .screenSize = 3, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0000 + @ } + .4byte 0x000031df + @ { + @ .bg = 3, + @ .charBaseIndex = 3, + @ .mapBaseIndex = 29, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } gUnknown_846D8E4:: @ 846D8E4 - .incbin "baserom.gba", 0x46D8E4, 0x18 + .byte 0, 19, 0, 6, 2, 2 + .2byte 0x0013 + .byte 0, 8, 0, 6, 2, 2 + .2byte 0x001f + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 gUnknown_846D8FC:: @ 846D8FC - .incbin "baserom.gba", 0x46D8FC, 0x50 + .4byte 0, sub_8149DC8 + .4byte 1, sub_8149F64 + .4byte 2, sub_8149FD0 + .4byte 3, sub_814A03C + .4byte 4, sub_814A0C8 + .4byte 5, sub_814A174 + .4byte 6, sub_814A218 + .4byte 7, sub_814A264 + .4byte 9, sub_814A3AC + .4byte 8, sub_814A308 gUnknown_846D94C:: @ 846D94C - .incbin "baserom.gba", 0x46D94C, 0x4 + .string "IES$" gUnknown_846D950:: @ 846D950 - .incbin "baserom.gba", 0x46D950, 0x3 + .byte 0x00, 0x02, 0x03 gUnknown_846D953:: @ 846D953 - .incbin "baserom.gba", 0x46D953, 0xD + .byte 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 gUnknown_846D960:: @ 846D960 obj_tiles gUnknown_8479688, 0, 800 @@ -144,38 +233,206 @@ gUnknown_846D968:: @ 846D968 obj_pal gUnknown_8479668, 800 gUnknown_846D970:: - .2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0002, 0x0006 - .2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006, 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006 + .2byte 0x0006, 0x0008, 0x0010, 0x0008 + +gUnknown_846D978:: + .2byte 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008 + +gUnknown_846D984:: + .2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006 + +gUnknown_846D994:: + .2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006 gUnknown_846D9A8:: @ 846D9A8 - .incbin "baserom.gba", 0x46D9A8, 0x2C + .4byte gUnknown_846D970 + .4byte gUnknown_846D978 + .4byte gUnknown_846D984 + .4byte gUnknown_846D994 + +gUnknown_846D9B8:: + .2byte 0x0058, 0x0098 + +gUnknown_846D9BC:: + .2byte 0x0058, 0x0078, 0x0098 + +gUnknown_846D9C2:: + .2byte 0x0038, 0x0058, 0x0098, 0x00b8 + +gUnknown_846D9CA:: + .2byte 0x0038, 0x0058, 0x0078, 0x0098, 0x00b8 gUnknown_846D9D4:: @ 846D9D4 - .incbin "baserom.gba", 0x46D9D4, 0x6DC + .4byte gUnknown_846D9B8 + .4byte gUnknown_846D9BC + .4byte gUnknown_846D9C2 + .4byte gUnknown_846D9CA + +gUnknown_846D9E4:: @ gbapal + .incbin "graphics/misc/unk_846D9E4.gbapal" + +gUnknown_846DA04:: @ gbapal + .incbin "graphics/misc/unk_846DA04.gbapal" + +gUnknown_846DA24:: @ 4bpp.lz + .incbin "graphics/misc/unk_846DA24.4bpp.lz" + +gUnknown_846DB44:: @ 4bpp.lz + .incbin "graphics/misc/unk_846DB44.4bpp.lz" + +gUnknown_846DD18:: @ 4bpp.lz + .incbin "graphics/misc/unk_846DD18.4bpp.lz" + +gUnknown_846DE48:: @ 4bpp.lz + .incbin "graphics/misc/unk_846DE48.4bpp.lz" + +gUnknown_846DF44:: @ 4bpp.lz + .incbin "graphics/misc/unk_846DF44.4bpp.lz" gUnknown_846E0B0:: @ 846E0B0 - .incbin "baserom.gba", 0x46E0B0, 0x28 + obj_tiles gUnknown_846DA24, 0x0600, 5 + obj_tiles gUnknown_846DB44, 0x0c00, 6 + obj_tiles gUnknown_846DD18, 0x0600, 7 + obj_tiles gUnknown_846DE48, 0x0600, 8 + obj_tiles gUnknown_846DF44, 0x0200, 10 gUnknown_846E0D8:: @ 846E0D8 - .incbin "baserom.gba", 0x46E0D8, 0x10 + obj_pal gUnknown_846D9E4, 5 + obj_pal gUnknown_846DA04, 6 gUnknown_846E0E8:: @ 846E0E8 - .incbin "baserom.gba", 0x46E0E8, 0x18 + spr_template 0, 0, gUnknown_846E170, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846E100:: @ 846E100 - .incbin "baserom.gba", 0x46E100, 0x50 + .2byte 0x0060, 0x0060, 0x0060, 0x0072, 0x0078, 0x0078, 0x0078, 0x0072, 0x0060, 0x0060, 0x0046, 0x0050, 0x0060, 0x0072, 0x0078, 0x0080 + .2byte 0x0078, 0x0072, 0x0060, 0x0050, 0x0032, 0x0048, 0x0060, 0x0072, 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048, 0x002a, 0x0048 + .2byte 0x0060, 0x0072, 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048 gUnknown_846E150:: @ 846E150 - .incbin "baserom.gba", 0x46E150, 0x10 + .2byte 0x0010, 0x0028, 0x0048, 0x0068, 0x0088, 0x00a8, 0x00c8, 0x00e0 gUnknown_846E160:: @ 846E160 - .incbin "baserom.gba", 0x46E160, 0x154 + .4byte gUnknown_846E220 + .4byte gUnknown_846E238 + .4byte gUnknown_846E250 + .4byte gUnknown_846E268 + +gUnknown_846E170:: + .4byte 0xc0000000, 0x00000800 + +gUnknown_846E178:: + .4byte 0x80008000, 0x00000800 + +gUnknown_846E180:: + .4byte 0x80000000, 0x00000800 + +gUnknown_846E188:: + .4byte 0x80004000, 0x00000800 + +gUnknown_846E190:: + obj_image_anim_frame 0x0000, 1 + obj_image_anim_end + +gUnknown_846E198:: + obj_image_anim_frame 0x0008, 1 + obj_image_anim_end + +gUnknown_846E1A0:: + obj_image_anim_frame 0x0010, 1 + obj_image_anim_end + +gUnknown_846E1A8:: + obj_image_anim_frame 0x0018, 1 + obj_image_anim_end + +gUnknown_846E1B0:: + obj_image_anim_frame 0x0020, 1 + obj_image_anim_end + +gUnknown_846E1B8:: + obj_image_anim_frame 0x0028, 1 + obj_image_anim_end + +gUnknown_846E1C0:: + obj_image_anim_frame 0x0000, 1 + obj_image_anim_end + +gUnknown_846E1C8:: + obj_image_anim_frame 0x0010, 1 + obj_image_anim_end + +gUnknown_846E1D0:: + obj_image_anim_frame 0x0020, 1 + obj_image_anim_end + +gUnknown_846E1D8:: + obj_image_anim_frame 0x0030, 1 + obj_image_anim_end + +gUnknown_846E1E0:: + obj_image_anim_frame 0x0040, 1 + obj_image_anim_end + +gUnknown_846E1E8:: + obj_image_anim_frame 0x0050, 1 + obj_image_anim_end + +gUnknown_846E1F0:: + .4byte gUnknown_846E190 + .4byte gUnknown_846E198 + .4byte gUnknown_846E1A0 + .4byte gUnknown_846E1A8 + .4byte gUnknown_846E1B0 + .4byte gUnknown_846E1B8 + +gUnknown_846E208:: + .4byte gUnknown_846E1C0 + .4byte gUnknown_846E1C8 + .4byte gUnknown_846E1D0 + .4byte gUnknown_846E1D8 + .4byte gUnknown_846E1E0 + .4byte gUnknown_846E1E8 + +gUnknown_846E220:: + spr_template 5, 5, gUnknown_846E178, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_846E238:: + spr_template 6, 5, gUnknown_846E180, gUnknown_846E208, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_846E250:: + spr_template 7, 5, gUnknown_846E188, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_846E268:: + spr_template 8, 5, gUnknown_846E188, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_846E280:: + .4byte 0x40000000, 0x00000400 + +gUnknown_846E288:: + obj_image_anim_frame 0x0000, 0 + obj_image_anim_end + +gUnknown_846E290:: + obj_image_anim_frame 0x0000, 4 + obj_image_anim_frame 0x0004, 4 + obj_image_anim_frame 0x0008, 4 + obj_image_anim_frame 0x000c, 4 + obj_image_anim_loop 1 + obj_image_anim_frame 0x0000, 4 + obj_image_anim_end + +gUnknown_846E2AC:: + .4byte gUnknown_846E288 + .4byte gUnknown_846E290 gUnknown_846E2B4:: @ 846E2B4 - .incbin "baserom.gba", 0x46E2B4, 0x18 + spr_template 10, 5, gUnknown_846E280, gUnknown_846E2AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846E2CC:: @ 846E2CC - .incbin "baserom.gba", 0x46E2CC, 0x8 + .byte 0, 1, 1, 28, 9, 15 + .2byte 0x0001 gUnknown_846E2D4:: @ 846E2D4 - .incbin "baserom.gba", 0x46E2D4, 0xC + .4byte gUnknown_841CB78 + .4byte gUnknown_841CB88 + .4byte gUnknown_841CB94 diff --git a/data/strings.s b/data/strings.s index 628bbda28..b94462470 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3315,10 +3315,13 @@ gUnknown_841CB5A:: @ 841CB5A gUnknown_841CB63:: @ 841CB63 .string "POKéMON JUMP RECORDS$" +gUnknown_841CB78:: .string "Jumps in a row:$" +gUnknown_841CB88:: .string "Best score:$" +gUnknown_841CB94:: .string "EXCELLENTS in a row:$" gUnknown_841CBA9:: @ 841CBA9 -- cgit v1.2.3 From dc5afbdd899099fa20da61a8f7721e25d6bf2047 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 25 Nov 2019 16:08:05 -0500 Subject: Move newly-dumped graphics to link_games --- data/pokemon_jump.s | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'data') diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s index a5f30c674..3d01bf64f 100644 --- a/data/pokemon_jump.s +++ b/data/pokemon_jump.s @@ -126,34 +126,34 @@ gUnknown_846B76C:: @ 846B76C .4byte 20000, 5 gUnknown_846B794:: @ 846B794 gbapal - .incbin "graphics/misc/unk_846B794.gbapal" + .incbin "graphics/link_games/unk_846B794.gbapal" gUnknown_846B7B4:: @ 846B7B4 gbapal - .incbin "graphics/misc/unk_846B7B4.gbapal" + .incbin "graphics/link_games/unk_846B7B4.gbapal" gUnknown_846B7D4:: @ 846B7D4 4bpp.lz - .incbin "graphics/misc/unk_846B7D4.4bpp.lz" + .incbin "graphics/link_games/unk_846B7D4.4bpp.lz" gUnknown_846BA00:: @ 846BA00 bin.lz - .incbin "graphics/misc/unk_846BA00.bin.lz" + .incbin "graphics/link_games/unk_846BA00.bin.lz" gUnknown_846BBB0:: @ 846BBB0 gbapal - .incbin "graphics/misc/unk_846BBB0.gbapal" + .incbin "graphics/link_games/unk_846BBB0.gbapal" gUnknown_846BBD0:: @ 846BBD0 4bpp.lz - .incbin "graphics/misc/unk_846BBD0.4bpp.lz" + .incbin "graphics/link_games/unk_846BBD0.4bpp.lz" gUnknown_846C520:: @ 846C520 bin.lz - .incbin "graphics/misc/unk_846C520.bin.lz" + .incbin "graphics/link_games/unk_846C520.bin.lz" gUnknown_846C8D8:: @ 846C8D8 gbapal - .incbin "graphics/misc/unk_846C8D8.gbapal" + .incbin "graphics/link_games/unk_846C8D8.gbapal" gUnknown_846C8F8:: @ 846C8F8 4bpp.lz - .incbin "graphics/misc/unk_846C8F8.4bpp.lz" + .incbin "graphics/link_games/unk_846C8F8.4bpp.lz" gUnknown_846D3A8:: @ 846D3A8 bin.lz - .incbin "graphics/misc/unk_846D3A8.bin.lz" + .incbin "graphics/link_games/unk_846D3A8.bin.lz" gUnknown_846D8D4:: @ 846D8D4 .4byte 0x000001b0 @@ -269,25 +269,25 @@ gUnknown_846D9D4:: @ 846D9D4 .4byte gUnknown_846D9CA gUnknown_846D9E4:: @ gbapal - .incbin "graphics/misc/unk_846D9E4.gbapal" + .incbin "graphics/link_games/unk_846D9E4.gbapal" gUnknown_846DA04:: @ gbapal - .incbin "graphics/misc/unk_846DA04.gbapal" + .incbin "graphics/link_games/unk_846DA04.gbapal" gUnknown_846DA24:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DA24.4bpp.lz" + .incbin "graphics/link_games/unk_846DA24.4bpp.lz" gUnknown_846DB44:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DB44.4bpp.lz" + .incbin "graphics/link_games/unk_846DB44.4bpp.lz" gUnknown_846DD18:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DD18.4bpp.lz" + .incbin "graphics/link_games/unk_846DD18.4bpp.lz" gUnknown_846DE48:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DE48.4bpp.lz" + .incbin "graphics/link_games/unk_846DE48.4bpp.lz" gUnknown_846DF44:: @ 4bpp.lz - .incbin "graphics/misc/unk_846DF44.4bpp.lz" + .incbin "graphics/link_games/unk_846DF44.4bpp.lz" gUnknown_846E0B0:: @ 846E0B0 obj_tiles gUnknown_846DA24, 0x0600, 5 -- cgit v1.2.3 From ea7fbdf9f2d330f880fd66c6c18d6d65d2f14961 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Nov 2019 09:46:04 -0500 Subject: Dump data/berry_crush --- data/berry_crush.s | 312 ++++++++++++++++++++++++++++++++++++++++++++--------- data/strings.s | 62 +++++++---- 2 files changed, 306 insertions(+), 68 deletions(-) (limited to 'data') diff --git a/data/berry_crush.s b/data/berry_crush.s index c17f2c8af..6fca974f5 100644 --- a/data/berry_crush.s +++ b/data/berry_crush.s @@ -2,119 +2,331 @@ .include "constants/constants.inc" .section .rodata + .align 2 gUnknown_846E2E0:: @ 846E2E0 - .incbin "baserom.gba", 0x46E2E0, 0x8 + .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 gUnknown_846E2E8:: @ 846E2E8 - .incbin "baserom.gba", 0x46E2E8, 0x8 + .byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00 gUnknown_846E2F0:: @ 846E2F0 - .incbin "baserom.gba", 0x46E2F0, 0x24 + .byte 0x04, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x06, 0x03, 0x01, 0xff, 0xfd, 0xff, 0x00, 0x06, 0x04, 0x01, 0xfe + .byte 0xfc, 0xfe, 0x00, 0x00 gUnknown_846E314:: @ 846E314 - .incbin "baserom.gba", 0x46E314, 0x14 + .byte 0x03, 0x02, 0x01, 0x00, 0x03, 0x03, 0x01, 0x00, 0x03, 0x03, 0x02, 0x00, 0x03, 0x04, 0x02, 0x00, 0x03, 0x05, 0x03, 0x00 gUnknown_846E328:: @ 846E328 - .incbin "baserom.gba", 0x46E328, 0x24 + .4byte gUnknown_841CE3C + .4byte gUnknown_841CE78 + .4byte gUnknown_841CEA8 + .4byte gUnknown_841CF14 + .4byte gUnknown_841CF50 + .4byte gUnknown_841CF70 + .4byte gUnknown_841CFA0 + .4byte gUnknown_841CFD4 + .4byte gUnknown_841D008 gUnknown_846E34C:: @ 846E34C - .incbin "baserom.gba", 0x46E34C, 0x68 + .4byte NULL + .4byte sub_814BBB8 + .4byte sub_814BC10 + .4byte sub_814BC74 + .4byte sub_814BD7C + .4byte sub_814BD9C + .4byte sub_814BDBC + .4byte sub_814BE0C + .4byte sub_814BE64 + .4byte sub_814BE7C + .4byte sub_814BFD0 + .4byte sub_814C118 + .4byte sub_814C24C + .4byte sub_814C850 + .4byte sub_814C8F8 + .4byte sub_814C990 + .4byte sub_814CB20 + .4byte sub_814CC0C + .4byte sub_814CFA8 + .4byte sub_814D094 + .4byte sub_814D188 + .4byte sub_814D240 + .4byte sub_814D31C + .4byte sub_814D3A4 + .4byte sub_814D468 + .4byte sub_814D4C8 gUnknown_846E3B4:: @ 846E3B4 - .incbin "baserom.gba", 0x46E3B4, 0x10 + .byte 0x02, 0x04, 0x06, 0x07, 0x03, 0x05, 0x08, 0x0b, 0x03, 0x07, 0x0b, 0x0f, 0x04, 0x08, 0x0c, 0x11 gUnknown_846E3C4:: @ 846E3C4 - .incbin "baserom.gba", 0x46E3C4, 0x4 + .byte 0x05, 0x07, 0x09, 0x0c gUnknown_846E3C8:: @ 846E3C8 - .incbin "baserom.gba", 0x46E3C8, 0x4 + .byte 0x03, 0x07, 0x0f, 0x1f gUnknown_846E3CC:: @ 846E3CC - .incbin "baserom.gba", 0x46E3CC, 0x4 - -gUnknown_846E3D0:: @ 846E3D0 - .incbin "baserom.gba", 0x46E3D0, 0xC + .4byte 0x000000f8 + @ { + @ .bg = 0, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 15, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x000014d1 + @ { + @ .bg = 1, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 13, + @ .screenSize = 2, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0000 + @ } + .4byte 0x000020c2 + @ { + @ .bg = 2, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 12, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + .4byte 0x000030b3 + @ { + @ .bg = 3, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 11, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } gUnknown_846E3DC:: @ 846E3DC - .incbin "baserom.gba", 0x46E3DC, 0x3 + .byte 0x01, 0x02, 0x03 gUnknown_846E3DF:: @ 846E3DF - .incbin "baserom.gba", 0x46E3DF, 0x3 + .byte 0x00, 0x01, 0x02 gUnknown_846E3E2:: @ 846E3E2 - .incbin "baserom.gba", 0x46E3E2, 0x3 + .byte 0x00, 0x03, 0x04 gUnknown_846E3E5:: @ 846E3E5 - .incbin "baserom.gba", 0x46E3E5, 0x6 + .byte 0x01, 0x08, 0x09, 0x01, 0x06, 0x07 gUnknown_846E3EB:: @ 846E3EB - .incbin "baserom.gba", 0x46E3EB, 0x5 + .byte 0x01, 0x04, 0x05, 0x00, 0x00 gUnknown_846E3F0:: @ 846E3F0 - .incbin "baserom.gba", 0x46E3F0, 0x8 + .byte 0, 3, 4, 24, 13, 15 + .2byte 0x0001 gUnknown_846E3F8:: @ 846E3F8 - .incbin "baserom.gba", 0x46E3F8, 0x50 + .byte 0, 0, 0, 9, 2, 8 + .2byte 0x03ed + .byte 0, 0, 3, 9, 2, 8 + .2byte 0x03db + .byte 0, 0, 6, 9, 2, 8 + .2byte 0x03c9 + .byte 0, 21, 3, 9, 2, 8 + .2byte 0x03b7 + .byte 0, 21, 6, 9, 2, 8 + .2byte 0x03a5 + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 + .byte 0, 4, 2, 22, 16, 15 + .2byte 0x0001 + .byte 0, 4, 2, 22, 16, 15 + .2byte 0x0001 + .byte 0, 3, 2, 24, 16, 15 + .2byte 0x0001 + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 gUnknown_846E448:: @ 846E448 - .incbin "baserom.gba", 0x46E448, 0x8 + .byte 0x06, 0x08, 0x09, 0x0b, 0x0c, 0x0e, 0x0f, 0x10 gUnknown_846E450:: @ 846E450 - .incbin "baserom.gba", 0x46E450, 0x940 + .4byte 50000000, 25000000, 12500000, 6250000, 3125000, 1562500, 781250, 390625 + +gUnknown_846E470:: @ 846E470 gbapal + .incbin "graphics/link_games/unk_846E4D0.gbapal" + +gUnknown_846E490:: @ 846E490 gbapal + .incbin "graphics/link_games/unk_846E7FC.gbapal" + +gUnknown_846E4B0:: @ 846E4B0 gbapal + .incbin "graphics/link_games/unk_846ECC4.gbapal" + +gUnknown_846E4D0:: @ 846E4D0 4bpp.lz + .incbin "graphics/link_games/unk_846E4D0.4bpp.lz" + +gUnknown_846E7FC:: @ 846E7FC 4bpp.lz + .incbin "graphics/link_games/unk_846E7FC.4bpp.lz" -gUnknown_846ED90:: @ 846ED90 - .incbin "baserom.gba", 0x46ED90, 0x130 +gUnknown_846EB78:: @ 846EB78 4bpp.lz + .incbin "graphics/link_games/unk_846EB78.4bpp.lz" -gUnknown_846EEC0:: @ 846EEC0 - .incbin "baserom.gba", 0x46EEC0, 0x198 +gUnknown_846ECC4:: @ 846ECC4 4bpp.lz + .incbin "graphics/link_games/unk_846ECC4.4bpp.lz" -gUnknown_846F058:: @ 846F058 - .incbin "baserom.gba", 0x46F058, 0x228 +gUnknown_846ED90:: @ 846ED90 bin.lz + .incbin "graphics/link_games/unk_846ED90.bin.lz" + +gUnknown_846EEC0:: @ 846EEC0 bin.lz + .incbin "graphics/link_games/unk_846EEC0.bin.lz" + +gUnknown_846F058:: @ 846F058 bin.lz + .incbin "graphics/link_games/unk_846F058.bin.lz" gUnknown_846F280:: @ 846F280 - .incbin "baserom.gba", 0x46F280, 0x14 + .byte 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04 gUnknown_846F294:: @ 846F294 - .incbin "baserom.gba", 0x46F294, 0x3C + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x03, 0x00, 0xe4, 0xff, 0xfc, 0xff, 0xe8, 0xff, 0x10, 0x00 + .byte 0x02, 0x00, 0x06, 0x00, 0xf0, 0xff, 0x14, 0x00, 0xf8, 0xff, 0x10, 0x00 + .byte 0x03, 0x14, 0x03, 0x00, 0x1c, 0x00, 0xfc, 0xff, 0x20, 0x00, 0xf8, 0xff + .byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00, 0x10, 0x00, 0xf8, 0xff gUnknown_846F2D0:: @ 846F2D0 - .incbin "baserom.gba", 0x46F2D0, 0x1 - -gUnknown_846F2D1:: @ 846F2D1 - .incbin "baserom.gba", 0x46F2D1, 0x5 + .byte 0x00, 0x00, 0xff, 0x00, 0x01, 0x01 gUnknown_846F2D6:: @ 846F2D6 - .incbin "baserom.gba", 0x46F2D6, 0x1 - -gUnknown_846F2D7:: @ 846F2D7 - .incbin "baserom.gba", 0x46F2D7, 0x15 + .byte 0x00, 0x00, 0xf0, 0xfc, 0x10, 0xfc, 0xf8, 0xfe, 0x08, 0xfe, 0xe8, 0xf8, 0x18, 0xf8, 0xe0, 0xf4, 0x20, 0xf4, 0xd8, 0xf0, 0x28, 0xf0 gUnknown_846F2EC:: @ 846F2EC - .incbin "baserom.gba", 0x46F2EC, 0xC + .2byte 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000 gUnknown_846F2F8:: @ 846F2F8 - .incbin "baserom.gba", 0x46F2F8, 0x28 + obj_tiles gUnknown_846E4D0, 0x0800, 1 + obj_tiles gUnknown_846E7FC, 0x0e00, 2 + obj_tiles gUnknown_846EB78, 0x0700, 3 + obj_tiles gUnknown_846ECC4, 0x02c0, 4 + obj_tiles NULL, 0x0000, 0 gUnknown_846F320:: @ 846F320 - .incbin "baserom.gba", 0x46F320, 0xF0 + obj_pal gUnknown_846E470, 1 + obj_pal gUnknown_846E490, 2 + obj_pal gUnknown_846E4B0, 4 + obj_pal NULL, 0 + +gUnknown_846F340:: + obj_image_anim_frame 0x0000, 0 + obj_image_anim_end + +gUnknown_846F348:: + obj_image_anim_frame 0x0000, 4 + obj_image_anim_frame 0x0010, 4 + obj_image_anim_frame 0x0020, 4 + obj_image_anim_end + +gUnknown_846F358:: + obj_image_anim_frame 0x0030, 2 + obj_image_anim_frame 0x0040, 2 + obj_image_anim_frame 0x0050, 2 + obj_image_anim_frame 0x0060, 2 + obj_image_anim_end + +gUnknown_846F36C:: + obj_image_anim_frame 0x0000, 2 + obj_image_anim_frame 0x0004, 2 + obj_image_anim_frame 0x0008, 2 + obj_image_anim_frame 0x000c, 2 + obj_image_anim_frame 0x0010, 2 + obj_image_anim_frame 0x0014, 2 + obj_image_anim_jump 0 + +gUnknown_846F388:: + obj_image_anim_frame 0x0018, 4 + obj_image_anim_frame 0x001c, 4 + obj_image_anim_frame 0x0020, 4 + obj_image_anim_frame 0x0024, 4 + obj_image_anim_frame 0x0028, 4 + obj_image_anim_frame 0x002c, 4 + obj_image_anim_frame 0x0030, 4 + obj_image_anim_frame 0x0034, 4 + obj_image_anim_jump 0 + +gUnknown_846F3AC:: + obj_image_anim_frame 0x0014, 0 + obj_image_anim_end + +gUnknown_846F3B4:: + obj_image_anim_frame 0x0000, 0 + obj_image_anim_end + +gUnknown_846F3BC:: + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_frame 0, 0, 2, 1 + obj_rot_scal_anim_jump 1 + +gUnknown_846F3D4:: + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_frame 0, 0, 254, 1 + obj_rot_scal_anim_jump 1 + +gUnknown_846F3EC:: + .4byte gUnknown_846F340 + +gUnknown_846F3F0:: + .4byte gUnknown_846F348 + .4byte gUnknown_846F358 + +gUnknown_846F3F8:: + .4byte gUnknown_846F36C + .4byte gUnknown_846F388 + +gUnknown_846F400:: + .4byte gUnknown_846F3AC + +gUnknown_846F404:: + .4byte gUnknown_846F3B4 + +gUnknown_846F408:: + .4byte gUnknown_846F3BC + .4byte gUnknown_846F3D4 gUnknown_846F410:: @ 846F410 - .incbin "baserom.gba", 0x46F410, 0x18 + spr_template 1, 1, gOamData_83AC9E0, gUnknown_846F3EC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846F428:: @ 846F428 - .incbin "baserom.gba", 0x46F428, 0x18 + spr_template 2, 2, gOamData_83AC9D8, gUnknown_846F3F0, NULL, gDummySpriteAffineAnimTable, sub_814EFD0 gUnknown_846F440:: @ 846F440 - .incbin "baserom.gba", 0x46F440, 0x18 + spr_template 3, 2, gOamData_83AC9D0, gUnknown_846F3F8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846F458:: @ 846F458 - .incbin "baserom.gba", 0x46F458, 0x18 + spr_template 4, 4, gOamData_83ACA08, gUnknown_846F400, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846F470:: @ 846F470 - .incbin "baserom.gba", 0x46F470, 0x18 - -gUnknown_846F488:: @ 846F488 - .incbin "baserom.gba", 0x46F488, 0x30 + spr_template 5, 5, gOamData_83ACA98, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy + +gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not + .byte 9, 2, 8 + .align 2 + .4byte 0x9c + .4byte gUnknown_846F2F8 + 0x18 + .4byte gUnknown_846F320 + 0x10 + .byte 8, 2, 8 + .align 2 + .4byte 0xb4 + .4byte gUnknown_846F2F8 + 0x18 + .4byte gUnknown_846F320 + 0x10 + .byte 8, 2, 8 + .align 2 + .4byte 0xcc + .4byte gUnknown_846F2F8 + 0x18 + .4byte gUnknown_846F320 + 0x10 gUnknown_846F4B8:: @ 846F4B8 - .incbin "baserom.gba", 0x46F4B8, 0x18 + .4byte gUnknown_841D034 + .4byte gUnknown_841D03C + .4byte gUnknown_841D044 + .4byte gUnknown_841D0D4 + .4byte gUnknown_841D0E8 + .4byte gUnknown_841D100 diff --git a/data/strings.s b/data/strings.s index b94462470..ac7241354 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3405,37 +3405,55 @@ gUnknown_841CE1C:: @ 841CE1C gUnknown_841CE24:: @ 841CE24 .string "Communication standby…$" - .string " Are you ready to BERRY-CRUSH?\n" + .align 2 +gUnknown_841CE3C:: @ 841CE3C + .string "Are you ready to BERRY-CRUSH?\n" .string "Please pick a BERRY for use.\p" .string "$" + .align 2 +gUnknown_841CE78:: @ 841CE78 .string "Please wait while each member\n" .string "chooses a BERRY.$" - .string " {PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\n" + .align 2 +gUnknown_841CEA8:: @ 841CEA8 + .string "{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\n" .string "silky-smooth BERRY POWDER.{RESUME_MUSIC}\p" .string "Your total amount of BERRY POWDER\n" .string "is {STR_VAR_2}.\p" .string "$" - .string " Recording your game results in the\n" + .align 2 +gUnknown_841CF14:: @ 841CF14 + .string "Recording your game results in the\n" .string "save file.\n" .string "Please wait.$" - .string " Want to play BERRY CRUSH again?$" + .align 2 +gUnknown_841CF50:: @ 841CF50 + .string "Want to play BERRY CRUSH again?$" + .align 2 +gUnknown_841CF70:: @ 841CF70 .string "You have no BERRIES.\n" .string "The game will be canceled.$" + .align 2 +gUnknown_841CFA0:: @ 841CFA0 .string "A member dropped out.\n" .string "The game will be canceled.$" - .string " Time's up.\p" + .align 2 +gUnknown_841CFD4:: @ 841CFD4 + .string "Time's up.\p" .string "Good BERRY POWDER could not be\n" .string "made…\p" .string "$" - .string " Communication standby…$" + .align 2 +gUnknown_841D008:: @ 841D008 + .string "Communication standby…$" .align 2 gUnknown_841D020:: @ 841D020 @@ -3444,14 +3462,17 @@ gUnknown_841D020:: @ 841D020 gUnknown_841D02C:: @ 841D02C .string "1. {DYNAMIC 0x00}$" -gUnknown_841D032:: @ 0x841D032 - .string " times$" + .align 2 +gUnknown_841D034:: @ 0x841D034 + .string " times$" -gUnknown_841D03B:: @ 0x841D03B - .string " {STR_VAR_1}.{STR_VAR_2}$" + .align 2 +gUnknown_841D03C:: @ 0x841D03C + .string "{STR_VAR_1}.{STR_VAR_2}$" -gUnknown_841D042:: @ 0x841D042 - .string " {STR_VAR_1} BERRY$" + .align 2 +gUnknown_841D044:: @ 0x841D044 + .string "{STR_VAR_1} BERRY$" .align 2 gUnknown_841D050:: @ 841D050 @@ -3492,20 +3513,25 @@ gUnknown_841D098:: @ 841D098 gUnknown_841D0A4:: @ 841D0A4 .string "{STR_VAR_1}サ$" + .align 2 gUnknown_841D0A8:: @ 841D0A8 .string "No. of Presses Rankings$" + .align 2 gUnknown_841D0C0:: @ 841D0C0 .string "Crushing Results$" -gUnknown_841D0D1:: @ 0x841D0D1 - .string " Neatness Rankings$" + .align 2 +gUnknown_841D0D4:: @ 0x841D0D4 + .string "Neatness Rankings$" -gUnknown_841D0E6:: @ 0x841D0E6 - .string " Cooperative Rankings$" + .align 2 +gUnknown_841D0E8:: @ 0x841D0E8 + .string "Cooperative Rankings$" -gUnknown_841D0FD:: @ 0x841D0FD - .string " Pressing-Power Rankings$" + .align 2 +gUnknown_841D100:: @ 0x841D100 + .string "Pressing-Power Rankings$" gUnknown_841D118:: @ 841D118 .string "BERRY CRUSH$" -- cgit v1.2.3 From ee2e165a26180ca263bb0681a9e3e7a19f09e271 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Nov 2019 10:26:42 -0500 Subject: Minor tweak --- data/berry_crush.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/berry_crush.s b/data/berry_crush.s index 6fca974f5..c47bd7f36 100644 --- a/data/berry_crush.s +++ b/data/berry_crush.s @@ -309,17 +309,17 @@ gUnknown_846F470:: @ 846F470 gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not .byte 9, 2, 8 .align 2 - .4byte 0x9c + .2byte 0x9c, 0x00 .4byte gUnknown_846F2F8 + 0x18 .4byte gUnknown_846F320 + 0x10 .byte 8, 2, 8 .align 2 - .4byte 0xb4 + .2byte 0xb4, 0x00 .4byte gUnknown_846F2F8 + 0x18 .4byte gUnknown_846F320 + 0x10 .byte 8, 2, 8 .align 2 - .4byte 0xcc + .2byte 0xcc, 0x00 .4byte gUnknown_846F2F8 + 0x18 .4byte gUnknown_846F320 + 0x10 -- cgit v1.2.3 From b724ffb87364f49e61414bd1f468673511830fde Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Nov 2019 10:45:17 -0500 Subject: Data alignment and organization --- data/berry_crush.s | 53 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 10 deletions(-) (limited to 'data') diff --git a/data/berry_crush.s b/data/berry_crush.s index c47bd7f36..8ca6e6a0c 100644 --- a/data/berry_crush.s +++ b/data/berry_crush.s @@ -10,11 +10,22 @@ gUnknown_846E2E8:: @ 846E2E8 .byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00 gUnknown_846E2F0:: @ 846E2F0 - .byte 0x04, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x06, 0x03, 0x01, 0xff, 0xfd, 0xff, 0x00, 0x06, 0x04, 0x01, 0xfe + .byte 0x04, 0x01, 0x00, 0xff + .byte 0x00, 0x00, 0x00, 0x04 + .byte 0x02, 0x00, 0xff, 0x00 + .byte 0x00, 0x00, 0x04, 0x02 + .byte 0x00, 0xfe, 0x00, 0x00 + .byte 0x00, 0x06, 0x03, 0x01 + .byte 0xff, 0xfd, 0xff, 0x00 + .byte 0x06, 0x04, 0x01, 0xfe .byte 0xfc, 0xfe, 0x00, 0x00 gUnknown_846E314:: @ 846E314 - .byte 0x03, 0x02, 0x01, 0x00, 0x03, 0x03, 0x01, 0x00, 0x03, 0x03, 0x02, 0x00, 0x03, 0x04, 0x02, 0x00, 0x03, 0x05, 0x03, 0x00 + .byte 0x03, 0x02, 0x01, 0x00 + .byte 0x03, 0x03, 0x01, 0x00 + .byte 0x03, 0x03, 0x02, 0x00 + .byte 0x03, 0x04, 0x02, 0x00 + .byte 0x03, 0x05, 0x03, 0x00 gUnknown_846E328:: @ 846E328 .4byte gUnknown_841CE3C @@ -56,7 +67,10 @@ gUnknown_846E34C:: @ 846E34C .4byte sub_814D4C8 gUnknown_846E3B4:: @ 846E3B4 - .byte 0x02, 0x04, 0x06, 0x07, 0x03, 0x05, 0x08, 0x0b, 0x03, 0x07, 0x0b, 0x0f, 0x04, 0x08, 0x0c, 0x11 + .byte 0x02, 0x04, 0x06, 0x07 + .byte 0x03, 0x05, 0x08, 0x0b + .byte 0x03, 0x07, 0x0b, 0x0f + .byte 0x04, 0x08, 0x0c, 0x11 gUnknown_846E3C4:: @ 846E3C4 .byte 0x05, 0x07, 0x09, 0x0c @@ -116,11 +130,13 @@ gUnknown_846E3E2:: @ 846E3E2 .byte 0x00, 0x03, 0x04 gUnknown_846E3E5:: @ 846E3E5 - .byte 0x01, 0x08, 0x09, 0x01, 0x06, 0x07 + .byte 0x01, 0x08, 0x09 + .byte 0x01, 0x06, 0x07 gUnknown_846E3EB:: @ 846E3EB - .byte 0x01, 0x04, 0x05, 0x00, 0x00 + .byte 0x01, 0x04, 0x05 + .align 2 gUnknown_846E3F0:: @ 846E3F0 .byte 0, 3, 4, 24, 13, 15 .2byte 0x0001 @@ -148,7 +164,8 @@ gUnknown_846E3F8:: @ 846E3F8 .2byte 0x0000 gUnknown_846E448:: @ 846E448 - .byte 0x06, 0x08, 0x09, 0x0b, 0x0c, 0x0e, 0x0f, 0x10 + .byte 0x06, 0x08, 0x09, 0x0b + .byte 0x0c, 0x0e, 0x0f, 0x10 gUnknown_846E450:: @ 846E450 .4byte 50000000, 25000000, 12500000, 6250000, 3125000, 1562500, 781250, 390625 @@ -184,7 +201,10 @@ gUnknown_846F058:: @ 846F058 bin.lz .incbin "graphics/link_games/unk_846F058.bin.lz" gUnknown_846F280:: @ 846F280 - .byte 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04 + .byte 0x01, 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x03, 0x00, 0x00 + .byte 0x01, 0x03, 0x02, 0x04, 0x00 + .byte 0x00, 0x01, 0x03, 0x02, 0x04 gUnknown_846F294:: @ 846F294 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00 @@ -194,14 +214,27 @@ gUnknown_846F294:: @ 846F294 .byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00, 0x10, 0x00, 0xf8, 0xff gUnknown_846F2D0:: @ 846F2D0 - .byte 0x00, 0x00, 0xff, 0x00, 0x01, 0x01 + .byte 0x00, 0x00 + .byte 0xff, 0x00 + .byte 0x01, 0x01 gUnknown_846F2D6:: @ 846F2D6 - .byte 0x00, 0x00, 0xf0, 0xfc, 0x10, 0xfc, 0xf8, 0xfe, 0x08, 0xfe, 0xe8, 0xf8, 0x18, 0xf8, 0xe0, 0xf4, 0x20, 0xf4, 0xd8, 0xf0, 0x28, 0xf0 + .byte 0x00, 0x00 + .byte 0xf0, 0xfc + .byte 0x10, 0xfc + .byte 0xf8, 0xfe + .byte 0x08, 0xfe + .byte 0xe8, 0xf8 + .byte 0x18, 0xf8 + .byte 0xe0, 0xf4 + .byte 0x20, 0xf4 + .byte 0xd8, 0xf0 + .byte 0x28, 0xf0 gUnknown_846F2EC:: @ 846F2EC - .2byte 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000 + .2byte 5, 6, 7, 8, 9 + .align 2 gUnknown_846F2F8:: @ 846F2F8 obj_tiles gUnknown_846E4D0, 0x0800, 1 obj_tiles gUnknown_846E7FC, 0x0e00, 2 -- cgit v1.2.3 From bfeec5e4b635b19edae3454429b8c7f4c02b670a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Nov 2019 15:12:05 -0500 Subject: Dump data/pokemon_storage_system --- data/pokemon_storage_system.s | 689 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 624 insertions(+), 65 deletions(-) (limited to 'data') diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 0196b3cb5..af47e785c 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -7,127 +7,686 @@ .align 2 gUnknown_83CDA20:: @ 83CDA20 - .incbin "baserom.gba", 0x3CDA20, 0x28 + .4byte gUnknown_841856C, gUnknown_84185AD + .4byte gUnknown_841857D, gUnknown_84185E2 + .4byte gUnknown_841858D, gUnknown_8418611 + .4byte gUnknown_841859A, gUnknown_8418642 + .4byte gUnknown_84185A5, gUnknown_8418681 gUnknown_83CDA48:: @ 83CDA48 - .incbin "baserom.gba", 0x3CDA48, 0x28 + .byte 0, 1, 1, 17, 10, 15 + .2byte 0x0001 + +gUnknown_83CDA50:: + obj_image_anim_frame 0x0000, 5 + obj_image_anim_end + +gUnknown_83CDA58:: + obj_image_anim_frame 0x0004, 5 + obj_image_anim_end + +gUnknown_83CDA60:: + obj_image_anim_frame 0x0006, 5 + obj_image_anim_end + +gUnknown_83CDA68:: + obj_image_anim_frame 0x000a, 5 + obj_image_anim_end gUnknown_83CDA70:: @ 83CDA70 - .incbin "baserom.gba", 0x3CDA70, 0x24 + .4byte gUnknown_83CDA50 + .4byte gUnknown_83CDA58 + .4byte gUnknown_83CDA60 + .4byte gUnknown_83CDA68 + +gUnknown_83CDA80:: + obj_rot_scal_anim_frame 224, 224, 0, 0 + obj_rot_scal_anim_end + +gUnknown_83CDA90:: + .4byte gUnknown_83CDA80 gUnknown_83CDA94:: @ 83CDA94 - .incbin "baserom.gba", 0x3CDA94, 0x4 + .string "/30$" + +gUnknown_83CDA98:: @ 83CDA98 gbapal + .incbin "graphics/interface/pss_unk_3CDA98.gbapal" + +gUnknown_83CDAB8:: @ 83CDAB8 4bpp + .incbin "graphics/interface/pss_unk_3CDAB8.4bpp" + +gUnknown_83CE2B8:: @ 83CE2B8 4bpp + .incbin "graphics/interface/pss_unk_3CE2B8.4bpp" + +gUnknown_83CE438:: @ 83CE438 4bpp.lz + .incbin "graphics/interface/pss_unk_83CE438.4bpp.lz" + +gUnknown_83CE4D0:: @ 83CE4D0 bin.lz + .incbin "graphics/interface/pss_unk_83CE4D0.bin.lz" + .incbin "graphics/interface/pss_unk_83CE5DC.gbapal" + +gUnknown_83CE5FC:: @ 83CE5FC bin.lz + .incbin "graphics/interface/pss_unk_83CE5FC.bin.lz" + +gUnknown_83CE6F8:: @ 83CE6F8 @ raw8 + .byte 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x01, 0x06, 0x01, 0x07, 0x01, 0x08, 0x01, 0x11, 0x01, 0x12, 0x01, 0x13, 0x01, 0x14, 0x01, 0x15, 0x01, 0x16, 0x01, 0x17, 0x01, 0x18, 0x01 + .byte 0x01, 0x21, 0x02, 0x21, 0x03, 0x21, 0x04, 0x21, 0x05, 0x21, 0x06, 0x21, 0x07, 0x21, 0x08, 0x21, 0x11, 0x21, 0x12, 0x21, 0x13, 0x21, 0x14, 0x21, 0x15, 0x21, 0x16, 0x21, 0x17, 0x21, 0x18, 0x21 + +gUnknown_83CE738:: @ 83CE738 gbapal + .incbin "graphics/interface/pss_unk_83CE738.gbapal" + +gUnknown_83CE758:: @ 83CE758 gbapal + .incbin "graphics/interface/pss_unk_83CE758.gbapal" + +gUnknown_83CE778:: @ 83CE778 @ raw16 + .2byte 0x014c, 0x014d, 0x014e, 0x014f, 0x0170, 0x0171, 0x0172, 0x0173, 0x0174, 0x015c, 0x015d, 0x015e, 0x015f, 0x0180, 0x0181, 0x0182 + .2byte 0x0183, 0x0184, 0x0175, 0x0176, 0x0177, 0x0178, 0x0179, 0x017a, 0x017b, 0x017c, 0x017d, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189 + .2byte 0x018a, 0x018b, 0x018c, 0x018d + +gUnknown_83CE7C0:: @ 83CE7C0 @ raw8 + .byte 0x40, 0x11, 0x41, 0x11, 0x41, 0x11, 0x42, 0x11, 0x50, 0x11, 0x51, 0x11, 0x51, 0x11, 0x52, 0x11, 0x60, 0x11, 0x61, 0x11, 0x61, 0x11, 0x62, 0x11 + +gUnknown_83CE7D8:: @ 83CE7D8 @ raw8 + .byte 0x43, 0x11, 0x44, 0x11, 0x44, 0x11, 0x45, 0x11, 0x53, 0x11, 0x54, 0x11, 0x54, 0x11, 0x55, 0x11, 0x63, 0x11, 0x64, 0x11, 0x64, 0x11, 0x65, 0x11 + +gUnknown_83CE7F0:: @ 83CE7F0 gbapal + .incbin "graphics/interface/pss_unk_83CE810.gbapal" + +gUnknown_83CE810:: @ 83CE810 4bpp + .incbin "graphics/interface/pss_unk_83CE810.4bpp" + .incbin "graphics/interface/pss_unk_83CE9D0.gbapal" + +gUnknown_83CEA10:: @ 83CEA10 gbapal + .incbin "graphics/interface/pss_unk_83CEA10.gbapal" + +gUnknown_83CEA30:: @ 83CEA30 gbapal + .incbin "graphics/interface/pss_unk_83CEA30.gbapal" + +gUnknown_83CEA50:: @ 83CEA50 bg_template + .4byte 0x000001d0 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 29, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x004011e5 + @ { + @ .bg = 1, + @ .charBaseIndex = 1, + @ .mapBaseIndex = 30, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0100 + @ } + .4byte 0x000023ba + @ { + @ .bg = 2, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 27, + @ .screenSize = 1, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + .4byte 0x000031ff + @ { + @ .bg = 3, + @ .charBaseIndex = 3, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } + +gUnknown_83CEA60:: @ 83CEA60 sprite_palette + obj_pal gUnknown_83CE7F0, 56010 + +gUnknown_83CEA68:: @ 83CEA68 sprite_sheet + obj_tiles gUnknown_83CE810, 0x01c0, 5 + +gUnknown_83CEA70:: @ 83CEA70 spr_template + spr_template 2, 56006, gUnknown_83CEB88, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_83CEA88:: @ 83CEA88 struct {const u8 *; u8;} + .4byte gUnknown_8418208 + .byte 0 + .align 2 + .4byte gUnknown_841821B + .byte 0 + .align 2 + .4byte gUnknown_8418233 + .byte 0 + .align 2 + .4byte gUnknown_8418248 + .byte 0 + .align 2 + .4byte gUnknown_841825C + .byte 1 + .align 2 + .4byte gUnknown_841826C + .byte 0 + .align 2 + .4byte gUnknown_841827F + .byte 0 + .align 2 + .4byte gUnknown_8418295 + .byte 1 + .align 2 + .4byte gUnknown_84182A7 + .byte 0 + .align 2 + .4byte gUnknown_84182B8 + .byte 0 + .align 2 + .4byte gUnknown_84182CE + .byte 4 + .align 2 + .4byte gUnknown_84182DF + .byte 6 + .align 2 + .4byte gUnknown_84182EC + .byte 0 + .align 2 + .4byte gUnknown_84182FF + .byte 0 + .align 2 + .4byte gUnknown_8418319 + .byte 0 + .align 2 + .4byte gUnknown_841832C + .byte 0 + .align 2 + .4byte gUnknown_8418346 + .byte 0 + .align 2 + .4byte gUnknown_841835F + .byte 0 + .align 2 + .4byte gUnknown_8418379 + .byte 0 + .align 2 + .4byte gUnknown_8418392 + .byte 1 + .align 2 + .4byte gUnknown_84183A0 + .byte 0 + .align 2 + .4byte gUnknown_84183BA + .byte 0 + .align 2 + .4byte gUnknown_84183C5 + .byte 0 + .align 2 + .4byte gUnknown_841825C + .byte 7 + .align 2 + .4byte gUnknown_84183DD + .byte 0 + .align 2 + .4byte gUnknown_84183F0 + .byte 7 + .align 2 + .4byte gUnknown_8418408 + .byte 0 + .align 2 + .4byte gUnknown_8418419 + .byte 0 + .align 2 + .4byte gUnknown_8418433 + .byte 7 + .align 2 + .4byte gUnknown_8418443 + .byte 7 + .align 2 + .4byte gUnknown_8418452 + .byte 0 + .align 2 + +gUnknown_83CEB80:: @ 83CEB80 window_template + .byte 0, 24, 11, 5, 4, 15 + .2byte 0x005c + +gUnknown_83CEB88:: + .4byte 0xc0000000, 0x00000000 + +gUnknown_83CEB90:: + .4byte 0x00004000, 0x00000000 + +gUnknown_83CEB98:: + obj_image_anim_frame 0x0000, 5 + obj_image_anim_end + +gUnknown_83CEBA0:: + obj_image_anim_frame 0x0002, 8 + obj_image_anim_frame 0x0004, 8 + obj_image_anim_frame 0x0006, 8 + obj_image_anim_jump 0 + +gUnknown_83CEBB0:: + obj_image_anim_frame 0x0008, 5 + obj_image_anim_end + +gUnknown_83CEBB8:: + obj_image_anim_frame 0x000a, 8 + obj_image_anim_frame 0x0004, 8 + obj_image_anim_frame 0x000c, 8 + obj_image_anim_jump 0 + +gUnknown_83CEBC8:: + .4byte gUnknown_83CEB98 + .4byte gUnknown_83CEBA0 + .4byte gUnknown_83CEBB0 + .4byte gUnknown_83CEBB8 + +gUnknown_83CEBD8:: @ 83CEBD8 spr_template + spr_template 5, 56010, gUnknown_83CEB90, gUnknown_83CEBC8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_83CEBF0:: @ 83CEBF0 spr_template + spr_template 18, 56000, gUnknown_83CEC08, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_83CEC08:: + .4byte 0x80000000, 0x00000000 + +gUnknown_83CEC10:: + obj_rot_scal_anim_frame -2, -2, 0, 120 + obj_rot_scal_anim_end + +gUnknown_83CEC20:: + obj_rot_scal_anim_frame 16, 16, 0, 0 + obj_rot_scal_anim_frame 16, 16, 0, 15 + obj_rot_scal_anim_end + +gUnknown_83CEC38:: @ 83CEC38 dataptr + .4byte gUnknown_83CEC10 + .4byte gUnknown_83CEC20 -gUnknown_83CDA98:: @ 83CDA98 - .incbin "baserom.gba", 0x3CDA98, 0x20 +gUnknown_83CEC40:: @ 83CEC40 + .incbin "graphics/interface/pss_unk_83CEC40.gbapal" -gUnknown_83CDAB8:: @ 83CDAB8 - .incbin "baserom.gba", 0x3CDAB8, 0x800 +gUnknown_83CEC80:: @ 83CEC80 + .incbin "graphics/interface/pss_unk_83CEC80.4bpp.lz" -gUnknown_83CE2B8:: @ 83CE2B8 - .incbin "baserom.gba", 0x3CE2B8, 0x180 +gUnknown_83CF050:: @ 83CF050 + .incbin "graphics/interface/pss_unk_83CF050.bin.lz" -gUnknown_83CE438:: @ 83CE438 - .incbin "baserom.gba", 0x3CE438, 0x98 +gUnknown_83CF12C:: @ 83CF12C + .incbin "graphics/interface/pss_unk_83CF12C.gbapal" -gUnknown_83CE4D0:: @ 83CE4D0 - .incbin "baserom.gba", 0x3CE4D0, 0x12C +gUnknown_83CF16C:: @ 83CF16C + .incbin "graphics/interface/pss_unk_83CF16C.4bpp.lz" -gUnknown_83CE5FC:: @ 83CE5FC - .incbin "baserom.gba", 0x3CE5FC, 0xFC +gUnknown_83CF374:: @ 83CF374 + .incbin "graphics/interface/pss_unk_83CF374.bin.lz" -gUnknown_83CE6F8:: @ 83CE6F8 - .incbin "baserom.gba", 0x3CE6F8, 0x40 +gUnknown_83CF424:: @ 83CF424 + .incbin "graphics/interface/pss_unk_83CF424.gbapal" -gUnknown_83CE738:: @ 83CE738 - .incbin "baserom.gba", 0x3CE738, 0x20 +gUnknown_83CF464:: @ 83CF464 + .incbin "graphics/interface/pss_unk_83CF464.4bpp.lz" -gUnknown_83CE758:: @ 83CE758 - .incbin "baserom.gba", 0x3CE758, 0x20 +gUnknown_83CF750:: @ 83CF750 + .incbin "graphics/interface/pss_unk_83CF750.bin.lz" -gUnknown_83CE778:: @ 83CE778 - .incbin "baserom.gba", 0x3CE778, 0x48 +gUnknown_83CF834:: @ 83CF834 + .incbin "graphics/interface/pss_unk_83CF834.gbapal" -gUnknown_83CE7C0:: @ 83CE7C0 - .incbin "baserom.gba", 0x3CE7C0, 0x18 +gUnknown_83CF874:: @ 83CF874 + .incbin "graphics/interface/pss_unk_83CF874.4bpp.lz" -gUnknown_83CE7D8:: @ 83CE7D8 - .incbin "baserom.gba", 0x3CE7D8, 0x238 +gUnknown_83CFA94:: @ 83CFA94 + .incbin "graphics/interface/pss_unk_83CFA94.bin.lz" -gUnknown_83CEA10:: @ 83CEA10 - .incbin "baserom.gba", 0x3CEA10, 0x20 +gUnknown_83CFB60:: @ 83CFB60 + .incbin "graphics/interface/pss_unk_83CFB60.gbapal" -gUnknown_83CEA30:: @ 83CEA30 - .incbin "baserom.gba", 0x3CEA30, 0x20 +gUnknown_83CFBA0:: @ 83CFBA0 + .incbin "graphics/interface/pss_unk_83CFBA0.4bpp.lz" -gUnknown_83CEA50:: @ 83CEA50 - .incbin "baserom.gba", 0x3CEA50, 0x10 +gUnknown_83CFEF0:: @ 83CFEF0 + .incbin "graphics/interface/pss_unk_83CFEF0.bin.lz" -gUnknown_83CEA60:: @ 83CEA60 - .incbin "baserom.gba", 0x3CEA60, 0x8 +gUnknown_83CFFC8:: @ 83CFFC8 + .incbin "graphics/interface/pss_unk_83CFFC8.gbapal" -gUnknown_83CEA68:: @ 83CEA68 - .incbin "baserom.gba", 0x3CEA68, 0x8 +gUnknown_83D0008:: @ 83D0008 + .incbin "graphics/interface/pss_unk_83D0008.4bpp.lz" + .space 4 -gUnknown_83CEA70:: @ 83CEA70 - .incbin "baserom.gba", 0x3CEA70, 0x18 +gUnknown_83D033C:: @ 83D033C + .incbin "graphics/interface/pss_unk_83D033C.bin.lz" -gUnknown_83CEA88:: @ 83CEA88 - .incbin "baserom.gba", 0x3CEA88, 0xF8 +gUnknown_83D0414:: @ 83D0414 + .incbin "graphics/interface/pss_unk_83D0414.gbapal" -gUnknown_83CEB80:: @ 83CEB80 - .incbin "baserom.gba", 0x3CEB80, 0x58 +gUnknown_83D0454:: @ 83D0454 + .incbin "graphics/interface/pss_unk_83D0454.4bpp.lz" -gUnknown_83CEBD8:: @ 83CEBD8 - .incbin "baserom.gba", 0x3CEBD8, 0x18 +gUnknown_83D070C:: @ 83D070C + .incbin "graphics/interface/pss_unk_83D070C.bin.lz" -gUnknown_83CEBF0:: @ 83CEBF0 - .incbin "baserom.gba", 0x3CEBF0, 0x48 +gUnknown_83D07D8:: @ 83D07D8 + .incbin "graphics/interface/pss_unk_83D07D8.gbapal" -gUnknown_83CEC38:: @ 83CEC38 - .incbin "baserom.gba", 0x3CEC38, 0x3D98 +gUnknown_83D0818:: @ 83D0818 + .incbin "graphics/interface/pss_unk_83D0818.4bpp.lz" + +gUnknown_83D0B5C:: @ 83D0B5C + .incbin "graphics/interface/pss_unk_83D0B5C.bin.lz" + +gUnknown_83D0C38:: @ 83D0C38 + .incbin "graphics/interface/pss_unk_83D0C38.gbapal" + +gUnknown_83D0C78:: @ 83D0C78 + .incbin "graphics/interface/pss_unk_83D0C78.4bpp.lz" + +gUnknown_83D0FFC:: @ 83D0FFC + .incbin "graphics/interface/pss_unk_83D0FFC.bin.lz" + +gUnknown_83D10E4:: @ 83D10E4 + .incbin "graphics/interface/pss_unk_83D10E4.gbapal" + +gUnknown_83D1124:: @ 83D1124 + .incbin "graphics/interface/pss_unk_83D1124.4bpp.lz" + +gUnknown_83D13D8:: @ 83D13D8 + .incbin "graphics/interface/pss_unk_83D13D8.bin.lz" + +gUnknown_83D14B4:: @ 83D14B4 + .incbin "graphics/interface/pss_unk_83D14B4.gbapal" + +gUnknown_83D14F4:: @ 83D14F4 + .incbin "graphics/interface/pss_unk_83D14F4.4bpp.lz" + +gUnknown_83D1788:: @ 83D1788 + .incbin "graphics/interface/pss_unk_83D1788.bin.lz" + +gUnknown_83D1874:: @ 83D1874 + .incbin "graphics/interface/pss_unk_83D1874.gbapal" + +gUnknown_83D18B4:: @ 83D18B4 + .incbin "graphics/interface/pss_unk_83D18B4.4bpp.lz" + +gUnknown_83D1B4C:: @ 83D1B4C + .incbin "graphics/interface/pss_unk_83D1B4C.bin.lz" + +gUnknown_83D1C2C:: @ 83D1C2C + .incbin "graphics/interface/pss_unk_83D1C2C.gbapal" + + .space 32 + +gUnknown_83D1C8C:: @ 83D1C8C + .incbin "graphics/interface/pss_unk_83D1C8C.4bpp.lz" + +gUnknown_83D1EC4:: @ 83D1EC4 + .incbin "graphics/interface/pss_unk_83D1EC4.bin.lz" + +gUnknown_83D1F94:: @ 83D1F94 + .incbin "graphics/interface/pss_unk_83D1F94.gbapal" + +gUnknown_83D1FD4:: @ 83D1FD4 + .incbin "graphics/interface/pss_unk_83D1FD4.4bpp.lz" + +gUnknown_83D22B8:: @ 83D22B8 + .incbin "graphics/interface/pss_unk_83D22B8.bin.lz" + +gUnknown_83D239C:: @ 83D239C + .incbin "graphics/interface/pss_unk_83D239C.gbapal" + +gUnknown_83D23DC:: @ 83D23DC + .incbin "graphics/interface/pss_unk_83D23DC.4bpp.lz" + +gUnknown_83D256C:: @ 83D256C + .incbin "graphics/interface/pss_unk_83D256C.bin.lz" + +gUnknown_83D2614:: @ 83D2614 + .incbin "graphics/interface/pss_unk_83D2614.gbapal" + +gUnknown_83D2654:: @ 83D2654 + .incbin "graphics/interface/pss_unk_83D2654.4bpp.lz" + +gUnknown_83D277C:: @ 83D277C + .incbin "graphics/interface/pss_unk_83D277C.bin.lz" + + .incbin "graphics/interface/pss_unk_83D2820.bin" gUnknown_83D29D0:: @ 83D29D0 - .incbin "baserom.gba", 0x3D29D0, 0x40 + .incbin "graphics/interface/pss_unk_83D29D0.gbapal" gUnknown_83D2A10:: @ 83D2A10 - .incbin "baserom.gba", 0x3D2A10, 0x144 + .4byte gUnknown_83CEC80, gUnknown_83CF050, gUnknown_83CEC40 + .4byte gUnknown_83CF16C, gUnknown_83CF374, gUnknown_83CF12C + .4byte gUnknown_83CF464, gUnknown_83CF750, gUnknown_83CF424 + .4byte gUnknown_83CF874, gUnknown_83CFA94, gUnknown_83CF834 + .4byte gUnknown_83CFBA0, gUnknown_83CFEF0, gUnknown_83CFB60 + .4byte gUnknown_83D0008, gUnknown_83D033C, gUnknown_83CFFC8 + .4byte gUnknown_83D0454, gUnknown_83D070C, gUnknown_83D0414 + .4byte gUnknown_83D0818, gUnknown_83D0B5C, gUnknown_83D07D8 + .4byte gUnknown_83D0C78, gUnknown_83D0FFC, gUnknown_83D0C38 + .4byte gUnknown_83D1124, gUnknown_83D13D8, gUnknown_83D10E4 + .4byte gUnknown_83D14F4, gUnknown_83D1788, gUnknown_83D14B4 + .4byte gUnknown_83D18B4, gUnknown_83D1B4C, gUnknown_83D1874 + .4byte gUnknown_83D1C8C, gUnknown_83D1EC4, gUnknown_83D1C2C + .4byte gUnknown_83D1FD4, gUnknown_83D22B8, gUnknown_83D1F94 + .4byte gUnknown_83D23DC, gUnknown_83D256C, gUnknown_83D239C + .4byte gUnknown_83D2654, gUnknown_83D277C, gUnknown_83D2614 + +gUnknown_83D2AD0:: + .incbin "graphics/interface/pss_unk_83D2AD0.4bpp" + .4byte 0x000023ba gUnknown_83D2B54:: @ 83D2B54 - .incbin "baserom.gba", 0x3D2B54, 0x28 + obj_tiles gUnknown_83D2AD0, 0x0080, 6 + +gUnknown_83D2B5C:: + .4byte 0x80004000, 0x00000800 + +gUnknown_83D2B64:: + obj_image_anim_frame 0x0000, 5 + obj_image_anim_end + +gUnknown_83D2B6C:: + obj_image_anim_frame 0x0008, 5 + obj_image_anim_end + +gUnknown_83D2B74:: + .4byte gUnknown_83D2B64 + .4byte gUnknown_83D2B6C gUnknown_83D2B7C:: @ 83D2B7C - .incbin "baserom.gba", 0x3D2B7C, 0x38 + spr_template 3, 56009, gUnknown_83D2B5C, gUnknown_83D2B74, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_83D2B94:: + .4byte 0x00008000, 0x00000800 + +gUnknown_83D2B9C:: + obj_image_anim_frame 0x0000, 5 + obj_image_anim_end + +gUnknown_83D2BA4:: + obj_image_anim_frame 0x0002, 5 + obj_image_anim_end + +gUnknown_83D2BAC:: + .4byte gUnknown_83D2B9C + .4byte gUnknown_83D2BA4 gUnknown_83D2BB4:: @ 83D2BB4 - .incbin "baserom.gba", 0x3D2BB4, 0x8B8 + spr_template 6, 56010, gUnknown_83D2B94, gUnknown_83D2BAC, NULL, gDummySpriteAffineAnimTable, sub_8092164 + +gUnknown_83D2BCC:: + .incbin "graphics/interface/pss_unk_83D2BCC.gbapal" + +gUnknown_83D2BEC:: + .incbin "graphics/interface/pss_unk_83D2BEC.4bpp" + +gUnknown_83D33EC:: + .incbin "graphics/interface/pss_unk_83D33EC.4bpp" gUnknown_83D346C:: @ 83D346C - .incbin "baserom.gba", 0x3D346C, 0xC + .4byte sub_8092C18 + .4byte sub_8092CA4 + .4byte sub_8092D20 gUnknown_83D3478:: @ 83D3478 - .incbin "baserom.gba", 0x3D3478, 0x28 + .4byte sub_8093F98 + .byte 0 + .align 2 + .4byte sub_809448C + .byte 1 + .align 2 + .4byte sub_80946AC + .byte 2 + .align 2 + .4byte sub_80947A0 + .byte 3 + .align 2 + .4byte NULL + .byte 0 + .align 2 gUnknown_83D34A0:: @ 83D34A0 - .incbin "baserom.gba", 0x3D34A0, 0x18 + obj_tiles gUnknown_83D2BEC, 0x0800, 0 + obj_tiles gUnknown_83D33EC, 0x0080, 1 + null_obj_tiles gUnknown_83D34B8:: @ 83D34B8 - .incbin "baserom.gba", 0x3D34B8, 0x54 + obj_pal gUnknown_83D2BCC, 56007 + null_obj_pal + +gUnknown_83D34C8:: + .4byte 0x80000000, 0x00000400 + +gUnknown_83D34D0:: + .4byte 0x40000000, 0x00000400 + +gUnknown_83D34D8:: + obj_image_anim_frame 0x0000, 30 + obj_image_anim_frame 0x0010, 30 + obj_image_anim_jump 0 + +gUnknown_83D34E4:: + obj_image_anim_frame 0x0000, 5 + obj_image_anim_end + +gUnknown_83D34EC:: + obj_image_anim_frame 0x0020, 5 + obj_image_anim_end + +gUnknown_83D34F4:: + obj_image_anim_frame 0x0030, 5 + obj_image_anim_end + +gUnknown_83D34FC:: + .4byte gUnknown_83D34D8 + .4byte gUnknown_83D34E4 + .4byte gUnknown_83D34EC + .4byte gUnknown_83D34F4 gUnknown_83D350C:: @ 83D350C - .incbin "baserom.gba", 0x3D350C, 0x18 + spr_template 0, 56010, gUnknown_83D34C8, gUnknown_83D34FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_83D3524:: @ 83D3524 - .incbin "baserom.gba", 0x3D3524, 0x18 + spr_template 1, 56010, gUnknown_83D34D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8094AB8 gUnknown_83D353C:: @ 83D353C - .incbin "baserom.gba", 0x3D353C, 0x98 + .4byte gUnknown_8418468 + .4byte gUnknown_841846F + .4byte gUnknown_8418475 + .4byte gUnknown_8418484 + .4byte gUnknown_841847E + .4byte gUnknown_8418489 + .4byte gUnknown_841848F + .4byte gUnknown_8418497 + .4byte gUnknown_841849F + .4byte gUnknown_84184A9 + .4byte gUnknown_84184AE + .4byte gUnknown_84184A4 + .4byte gUnknown_84184B8 + .4byte gUnknown_84184BD + .4byte gUnknown_84184BD + .4byte gUnknown_84184C2 + .4byte gUnknown_84184C9 + .4byte gUnknown_84184CD + .4byte gUnknown_84184D2 + .4byte gUnknown_84184DC + .4byte gUnknown_84184E6 + .4byte gUnknown_84184F0 + .4byte gUnknown_84184F9 + .4byte gUnknown_8418500 + .4byte gUnknown_8418505 + .4byte gUnknown_841850C + .4byte gUnknown_8418514 + .4byte gUnknown_8418519 + .4byte gUnknown_8418521 + .4byte gUnknown_8418526 + .4byte gUnknown_841852B + .4byte gUnknown_8418531 + .4byte gUnknown_841853A + .4byte gUnknown_8418540 + .4byte gUnknown_8418544 + .4byte gUnknown_841854A + .4byte gUnknown_8418555 + .4byte gUnknown_841855B gUnknown_83D35D4:: @ 83D35D4 - .incbin "baserom.gba", 0x3D35D4, 0x8 + .byte 0, 10, 3, 20, 18, 9 + .2byte 0x000a gUnknown_83D35DC:: @ 83D35DC - .incbin "baserom.gba", 0x3D35DC, 0x14C + .incbin "graphics/interface/pss_unk_83D35DC.4bpp" + +gUnknown_83D365C:: + .4byte 0x80000100, 0x00000400 + +gUnknown_83D3664:: + obj_rot_scal_anim_frame 128, 128, 0, 0 + obj_rot_scal_anim_end + +gUnknown_83D3674:: + obj_rot_scal_anim_frame 88, 88, 0, 0 + obj_rot_scal_anim_frame 5, 5, 0, 8 + obj_rot_scal_anim_end + +gUnknown_83D368C:: + obj_rot_scal_anim_frame 128, 128, 0, 0 + obj_rot_scal_anim_frame -5, -5, 0, 8 + obj_rot_scal_anim_end + +gUnknown_83D36A4:: + obj_rot_scal_anim_frame 128, 128, 0, 0 + obj_rot_scal_anim_frame 10, 10, 0, 12 + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_end + +gUnknown_83D36C4:: + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_frame -10, -10, 0, 12 + obj_rot_scal_anim_frame 128, 128, 0, 0 + obj_rot_scal_anim_end + +gUnknown_83D36E4:: + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_frame -5, -5, 0, 16 + obj_rot_scal_anim_end + +gUnknown_83D36FC:: + obj_rot_scal_anim_frame 256, 256, 0, 0 + obj_rot_scal_anim_end + +gUnknown_83D370C:: + .4byte gUnknown_83D3664 + .4byte gUnknown_83D3674 + .4byte gUnknown_83D368C + .4byte gUnknown_83D36A4 + .4byte gUnknown_83D36C4 + .4byte gUnknown_83D36E4 + .4byte gUnknown_83D36FC gUnknown_83D3728:: @ 83D3728 - .incbin "baserom.gba", 0x3D3728, 0x18 + spr_template 7, 56011, gUnknown_83D365C, gDummySpriteAnimTable, NULL, gUnknown_83D370C, SpriteCallbackDummy -- cgit v1.2.3 From cd2378407a7304df343777987f33dc30d05c8c71 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Nov 2019 16:13:16 -0500 Subject: Fix filenames --- data/pokemon_storage_system.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index af47e785c..0ac3268b6 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -50,13 +50,13 @@ gUnknown_83CDA94:: @ 83CDA94 .string "/30$" gUnknown_83CDA98:: @ 83CDA98 gbapal - .incbin "graphics/interface/pss_unk_3CDA98.gbapal" + .incbin "graphics/interface/pss_unk_83CDA98.gbapal" gUnknown_83CDAB8:: @ 83CDAB8 4bpp - .incbin "graphics/interface/pss_unk_3CDAB8.4bpp" + .incbin "graphics/interface/pss_unk_83CDAB8.4bpp" gUnknown_83CE2B8:: @ 83CE2B8 4bpp - .incbin "graphics/interface/pss_unk_3CE2B8.4bpp" + .incbin "graphics/interface/pss_unk_83CE2B8.4bpp" gUnknown_83CE438:: @ 83CE438 4bpp.lz .incbin "graphics/interface/pss_unk_83CE438.4bpp.lz" -- cgit v1.2.3 From a50258494f0726802af096583cc23488a022f108 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Nov 2019 16:50:22 -0500 Subject: Dump data/pokemon_summary_screen, 1 --- data/pokemon_summary_screen.s | 439 ++++++++++++++++++++++++++++++++---------- 1 file changed, 334 insertions(+), 105 deletions(-) (limited to 'data') diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index be7c0de93..c986d6c9d 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -1,134 +1,363 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_84636C0:: @ 84636C0 +gUnknown_84636C0:: @ 84636C0 gbapal .incbin "baserom.gba", 0x4636C0, 0x20 -gUnknown_84636E0:: @ 84636E0 +gUnknown_84636E0:: @ 84636E0 gbapal .incbin "baserom.gba", 0x4636E0, 0x20 -gUnknown_8463700:: @ 8463700 +gUnknown_8463700:: @ 8463700 gbapal .incbin "baserom.gba", 0x463700, 0x20 -gUnknown_8463720:: @ 8463720 +gUnknown_8463720:: @ 8463720 gbapal .incbin "baserom.gba", 0x463720, 0x20 -gUnknown_8463740:: @ 8463740 +gUnknown_8463740:: @ 8463740 something.lz .incbin "baserom.gba", 0x463740, 0x12C -gUnknown_846386C:: @ 846386C +gUnknown_846386C:: @ 846386C something.lz .incbin "baserom.gba", 0x46386C, 0x120 -gUnknown_846398C:: @ 846398C - .incbin "baserom.gba", 0x46398C, 0x18 - -gUnknown_84639A4:: @ 84639A4 - .incbin "baserom.gba", 0x4639A4, 0x8 - -gUnknown_84639AC:: @ 84639AC - .incbin "baserom.gba", 0x4639AC, 0x48 - -gUnknown_84639F4:: @ 84639F4 - .incbin "baserom.gba", 0x4639F4, 0x20 - -gUnknown_8463A14:: @ 8463A14 - .incbin "baserom.gba", 0x463A14, 0x68 - -gUnknown_8463A7C:: @ 8463A7C - .incbin "baserom.gba", 0x463A7C, 0x70 - -gUnknown_8463AEC:: @ 8463AEC - .incbin "baserom.gba", 0x463AEC, 0x10 - -gUnknown_8463AFC:: @ 8463AFC - .incbin "baserom.gba", 0x463AFC, 0x4 - -gUnknown_8463B00:: @ 8463B00 +gUnknown_846398C:: @ 846398C oamdata + .4byte 0xc0004000, 0x00000000 + @ animcmd + +gUnknown_8463994:: + obj_image_anim_frame 0x0000, 20 + obj_image_anim_jump 0 + +gUnknown_846399C:: + obj_image_anim_frame 0x0020, 20 + obj_image_anim_jump 0 + +gUnknown_84639A4:: @ 84639A4 dataptr + .4byte gUnknown_8463994 + .4byte gUnknown_846399C + +gUnknown_84639AC:: @ 84639AC oamdata + .4byte 0x40004000, 0x00000000 + @ animcmd + +gUnknown_84639B4:: + obj_image_anim_frame 0x0000, 20 + obj_image_anim_jump 0 + +gUnknown_84639BC:: + obj_image_anim_frame 0x0004, 20 + obj_image_anim_jump 0 + +gUnknown_84639C4:: + obj_image_anim_frame 0x0008, 20 + obj_image_anim_jump 0 + +gUnknown_84639CC:: + obj_image_anim_frame 0x000c, 20 + obj_image_anim_jump 0 + +gUnknown_84639D4:: + obj_image_anim_frame 0x0010, 20 + obj_image_anim_jump 0 + +gUnknown_84639DC:: + obj_image_anim_frame 0x0014, 20 + obj_image_anim_jump 0 + +gUnknown_84639E4:: + obj_image_anim_frame 0x0018, 20 + obj_image_anim_jump 0 + +gUnknown_84639EC:: + obj_image_anim_frame 0x001c, 20 + obj_image_anim_jump 0 + +gUnknown_84639F4:: @ 84639F4 dataptr + .4byte gUnknown_84639B4 + .4byte gUnknown_84639BC + .4byte gUnknown_84639C4 + .4byte gUnknown_84639CC + .4byte gUnknown_84639D4 + .4byte gUnknown_84639DC + .4byte gUnknown_84639E4 + .4byte gUnknown_84639EC + +gUnknown_8463A14:: @ 8463A14 oamdata + .4byte 0x00000000, 0x00000000 + +gUnknown_8463A1C:: + obj_image_anim_frame 0x0000, 20 + obj_image_anim_jump 0 + +gUnknown_8463A24:: + obj_image_anim_frame 0x0001, 20 + obj_image_anim_jump 0 + +gUnknown_8463A2C:: + obj_image_anim_frame 0x0002, 20 + obj_image_anim_jump 0 + +gUnknown_8463A34:: + obj_image_anim_frame 0x0003, 20 + obj_image_anim_jump 0 + +gUnknown_8463A3C:: + obj_image_anim_frame 0x0004, 20 + obj_image_anim_jump 0 + +gUnknown_8463A44:: + obj_image_anim_frame 0x0005, 20 + obj_image_anim_jump 0 + +gUnknown_8463A4C:: + obj_image_anim_frame 0x0006, 20 + obj_image_anim_jump 0 + +gUnknown_8463A54:: + obj_image_anim_frame 0x0007, 20 + obj_image_anim_jump 0 + +gUnknown_8463A5C:: + obj_image_anim_frame 0x0008, 20 + obj_image_anim_jump 0 + +gUnknown_8463A64:: + obj_image_anim_frame 0x0009, 20 + obj_image_anim_jump 0 + +gUnknown_8463A6C:: + obj_image_anim_frame 0x000a, 20 + obj_image_anim_jump 0 + +gUnknown_8463A74:: + obj_image_anim_frame 0x000b, 20 + obj_image_anim_jump 0 + +gUnknown_8463A7C:: @ 8463A7C dataptr + .4byte gUnknown_8463A1C + .4byte gUnknown_8463A24 + .4byte gUnknown_8463A2C + .4byte gUnknown_8463A34 + .4byte gUnknown_8463A3C + .4byte gUnknown_8463A44 + .4byte gUnknown_8463A4C + .4byte gUnknown_8463A54 + .4byte gUnknown_8463A5C + .4byte gUnknown_8463A64 + .4byte gUnknown_8463A6C + .4byte gUnknown_8463A74 + +gUnknown_8463AAC:: @ 8463AAC gbapal + .incbin "baserom.gba", 0x463AAC, 0x20 + +gUnknown_8463ACC:: @ 8463ACC gbapal + .incbin "baserom.gba", 0x463ACC, 0x20 + +gUnknown_8463AEC:: @ 8463AEC oamdata + .4byte 0x00000000, 0x00000000 + @ animcmd + obj_image_anim_frame 0x0000, 20 + obj_image_anim_jump 0 + +gUnknown_8463AFC:: @ 8463AFC dataptr + .4byte 0x8463af4 + +gUnknown_8463B00:: @ 8463B00 gbapal .incbin "baserom.gba", 0x463B00, 0x20 -gUnknown_8463B20:: @ 8463B20 +gUnknown_8463B20:: @ 8463B20 something.lz .incbin "baserom.gba", 0x463B20, 0x10 -gUnknown_8463B30:: @ 8463B30 - .incbin "baserom.gba", 0x463B30, 0x10 +gUnknown_8463B30:: @ 8463B30 oamdata + .4byte 0x00000000, 0x00000000 + @ animcmd + obj_image_anim_frame 0x0001, 20 + obj_image_anim_jump 0 -gUnknown_8463B40:: @ 8463B40 - .incbin "baserom.gba", 0x463B40, 0x4 +gUnknown_8463B40:: @ 8463B40 dataptr + .4byte 0x8463b38 -gUnknown_8463B44:: @ 8463B44 +gUnknown_8463B44:: @ 8463B44 gbapal .incbin "baserom.gba", 0x463B44, 0x20 -gUnknown_8463B64:: @ 8463B64 +gUnknown_8463B64:: @ 8463B64 something.lz .incbin "baserom.gba", 0x463B64, 0x24 -gUnknown_8463B88:: @ 8463B88 +gUnknown_8463B88:: @ 8463B88 bin.lz .incbin "baserom.gba", 0x463B88, 0xF8 -gUnknown_8463C80:: @ 8463C80 +gUnknown_8463C80:: @ 8463C80 bin.lz .incbin "baserom.gba", 0x463C80, 0x1E0 -gUnknown_8463E60:: @ 8463E60 - .incbin "baserom.gba", 0x463E60, 0x64 - -gUnknown_8463EC4:: @ 8463EC4 - .incbin "baserom.gba", 0x463EC4, 0x10 - -gUnknown_8463ED4:: @ 8463ED4 - .incbin "baserom.gba", 0x463ED4, 0x1C - -gUnknown_8463EF0:: @ 8463EF0 - .incbin "baserom.gba", 0x463EF0, 0xC - -gUnknown_8463EFC:: @ 8463EFC - .incbin "baserom.gba", 0x463EFC, 0x10 - -gUnknown_8463F0C:: @ 8463F0C - .incbin "baserom.gba", 0x463F0C, 0x18 - -gUnknown_8463F24:: @ 8463F24 - .incbin "baserom.gba", 0x463F24, 0x18 - -gUnknown_8463F3C:: @ 8463F3C - .incbin "baserom.gba", 0x463F3C, 0x20 - -gUnknown_8463F5C:: @ 8463F5C - .incbin "baserom.gba", 0x463F5C, 0x20 - -gUnknown_8463F7C:: @ 8463F7C - .incbin "baserom.gba", 0x463F7C, 0x20 - -gUnknown_8463F9C:: @ 8463F9C - .incbin "baserom.gba", 0x463F9C, 0x8 - -gUnknown_8463FA4:: @ 8463FA4 - .incbin "baserom.gba", 0x463FA4, 0x3 - -gUnknown_8463FA7:: @ 8463FA7 - .incbin "baserom.gba", 0x463FA7, 0x11 - -gUnknown_8463FB8:: @ 8463FB8 - .incbin "baserom.gba", 0x463FB8, 0x6 - -gUnknown_8463FBE:: @ 8463FBE - .incbin "baserom.gba", 0x463FBE, 0x3 - -gUnknown_8463FC1:: @ 8463FC1 - .incbin "baserom.gba", 0x463FC1, 0x5 - -gUnknown_8463FC6:: @ 8463FC6 - .incbin "baserom.gba", 0x463FC6, 0x7 - -gUnknown_8463FCD:: @ 8463FCD - .incbin "baserom.gba", 0x463FCD, 0x7 - -gUnknown_8463FD4:: @ 8463FD4 - .incbin "baserom.gba", 0x463FD4, 0xB - -gUnknown_8463FDF:: @ 8463FDF - .incbin "baserom.gba", 0x463FDF, 0xB - -gUnknown_8463FEA:: @ 8463FEA - .incbin "baserom.gba", 0x463FEA, 0x12 - -gUnknown_8463FFC:: @ 8463FFC - .incbin "baserom.gba", 0x463FFC, 0xC +gUnknown_8463E60:: @ 8463E60 dataptr + .4byte 0x8463dbc + .4byte 0x8463dc2 + .4byte 0x8463dc9 + .4byte 0x8463dcf + .4byte 0x8463dd7 + .4byte 0x8463ddf + .4byte 0x8463de4 + .4byte 0x8463deb + .4byte 0x8463df3 + .4byte 0x8463dfa + .4byte 0x8463dfe + .4byte 0x8463e04 + .4byte 0x8463e0a + .4byte 0x8463e12 + .4byte 0x8463e18 + .4byte 0x8463e1e + .4byte 0x8463e25 + .4byte 0x8463e2a + .4byte 0x8463e30 + .4byte 0x8463e38 + .4byte 0x8463e3d + .4byte 0x8463e42 + .4byte 0x8463e49 + .4byte 0x8463e4f + .4byte 0x8463e57 + +gUnknown_8463EC4:: @ 8463EC4 dataptr + .4byte 0x8419b44 + .4byte 0x8419b7b + .4byte 0x8419bae + .4byte 0x8419bdb + +gUnknown_8463ED4:: @ 8463ED4 dataptr + .4byte 0x8419a3d + .4byte 0x8419b18 + .4byte 0x8419a6e + .4byte 0x8419b18 + .4byte 0x8419aa2 + .4byte 0x8419ade + .4byte 0x8419b18 + +gUnknown_8463EF0:: @ 8463EF0 data8 + .byte 0x00, 0x07, 0x08, 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06 + +gUnknown_8463EFC:: @ 8463EFC bg_template + .4byte 0x000002e0 + @ { + @ .bg = 0, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 14, + @ .screenSize = 1, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x000012aa + @ { + @ .bg = 2, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 10, + @ .screenSize = 1, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0000 + @ } + .4byte 0x0000309b + @ { + @ .bg = 3, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 9, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } + .4byte 0x000022c9 + @ { + @ .bg = 1, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 12, + @ .screenSize = 1, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + +gUnknown_8463F0C:: @ 8463F0C window_template + .byte 1, 0, 0, 13, 2, 7 + .2byte 0x0258 + .byte 1, 19, 0, 11, 2, 7 + .2byte 0x0272 + .byte 1, 0, 2, 15, 2, 7 + .2byte 0x0288 + +gUnknown_8463F24:: @ 8463F24 window_template + .byte 2, 0, 0, 13, 2, 7 + .2byte 0x0258 + .byte 2, 19, 0, 11, 2, 7 + .2byte 0x0272 + .byte 2, 0, 2, 15, 2, 7 + .2byte 0x0288 + +gUnknown_8463F3C:: @ 8463F3C window_template + .byte 0, 15, 2, 15, 12, 6 + .2byte 0x0001 + .byte 0, 1, 14, 28, 6, 6 + .2byte 0x00b5 + .byte 0, 0, 0, 0, 0, 0 + .2byte 0x0000 + .byte 0, 0, 0, 0, 0, 0 + .2byte 0x0000 + +gUnknown_8463F5C:: @ 8463F5C window_template + .byte 0, 20, 2, 10, 14, 6 + .2byte 0x0001 + .byte 0, 6, 12, 14, 4, 6 + .2byte 0x008d + .byte 0, 1, 16, 29, 4, 6 + .2byte 0x00c5 + .byte 0, 0, 0, 0, 0, 0 + .2byte 0x0000 + +gUnknown_8463F7C:: @ 8463F7C window_template + .byte 0, 20, 2, 10, 18, 8 + .2byte 0x0001 + .byte 0, 0, 7, 15, 13, 6 + .2byte 0x00b5 + .byte 0, 15, 2, 5, 18, 6 + .2byte 0x0178 + .byte 0, 6, 4, 9, 2, 6 + .2byte 0x01d2 + +gUnknown_8463F9C:: @ 8463F9C window_template + .byte 255, 0, 0, 0, 0, 0 + .2byte 0x0000 + +gUnknown_8463FA4:: @ 8463FA4 data8 + .byte 0x00, 0x0e, 0x0a + +gUnknown_8463FA7:: @ 8463FA7 data8 + .byte 0x00, 0x01, 0x02, 0x00, 0x09, 0x08, 0x00, 0x05, 0x04, 0x00, 0x02, 0x03, 0x00, 0x0b, 0x0a, 0x00, 0x00 + +gUnknown_8463FB8:: @ 8463FB8 data8 + .byte 0x00, 0x02, 0x03, 0x01, 0x04, 0x05 + +gUnknown_8463FBE:: @ 8463FBE data8 + .byte 0xff, 0x00, 0x01 + +gUnknown_8463FC1:: @ 8463FC1 data8 + .byte 0xfe, 0xff, 0x00, 0x01, 0x02 + +gUnknown_8463FC6:: @ 8463FC6 data8 + .byte 0xfd, 0xfe, 0xff, 0x00, 0x01, 0x02, 0x03 + +gUnknown_8463FCD:: @ 8463FCD data8 + .byte 0xfb, 0xfd, 0xff, 0x00, 0x01, 0x03, 0x05 + +gUnknown_8463FD4:: @ 8463FD4 data8 + .byte 0x01, 0x01, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x01, 0x01 + +gUnknown_8463FDF:: @ 8463FDF data8 + .byte 0x02, 0x01, 0x00, 0xff, 0xfe, 0x00, 0xfe, 0xff, 0x00, 0x01, 0x02 + +gUnknown_8463FEA:: @ 8463FEA data8 + .byte 0x02, 0x01, 0x01, 0x00, 0xff, 0xff, 0xfe, 0x00, 0xfe, 0xff, 0xff, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00 + +gUnknown_8463FFC:: @ 8463FFC dataptr + .4byte gUnknown_8E9B578 + .4byte gUnknown_8463AAC + .4byte gUnknown_8463ACC -- cgit v1.2.3 From 3237a1d0383aed7f189fa0fd7cf9192bac8c10af Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 27 Nov 2019 09:20:51 -0500 Subject: Dump data/pokemon_summary_screen, 2 --- data/pokemon_summary_screen.s | 194 +++++++++++++++++++++++++++++------------- 1 file changed, 136 insertions(+), 58 deletions(-) (limited to 'data') diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index c986d6c9d..a26613dd7 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -4,26 +4,26 @@ .align 2 gUnknown_84636C0:: @ 84636C0 gbapal - .incbin "baserom.gba", 0x4636C0, 0x20 + .incbin "graphics/interface/pokesummary_unk_84636C0.gbapal" gUnknown_84636E0:: @ 84636E0 gbapal - .incbin "baserom.gba", 0x4636E0, 0x20 + .incbin "graphics/interface/pokesummary_unk_84636E0.gbapal" gUnknown_8463700:: @ 8463700 gbapal - .incbin "baserom.gba", 0x463700, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463700.gbapal" gUnknown_8463720:: @ 8463720 gbapal - .incbin "baserom.gba", 0x463720, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463720.gbapal" gUnknown_8463740:: @ 8463740 something.lz - .incbin "baserom.gba", 0x463740, 0x12C + .incbin "graphics/interface/pokesummary_unk_8463740.4bpp.lz" gUnknown_846386C:: @ 846386C something.lz - .incbin "baserom.gba", 0x46386C, 0x120 + .incbin "graphics/interface/pokesummary_unk_846386C.4bpp.lz" gUnknown_846398C:: @ 846398C oamdata .4byte 0xc0004000, 0x00000000 - @ animcmd + gUnknown_8463994:: obj_image_anim_frame 0x0000, 20 @@ -39,7 +39,7 @@ gUnknown_84639A4:: @ 84639A4 dataptr gUnknown_84639AC:: @ 84639AC oamdata .4byte 0x40004000, 0x00000000 - @ animcmd + gUnknown_84639B4:: obj_image_anim_frame 0x0000, 20 @@ -149,88 +149,166 @@ gUnknown_8463A7C:: @ 8463A7C dataptr .4byte gUnknown_8463A74 gUnknown_8463AAC:: @ 8463AAC gbapal - .incbin "baserom.gba", 0x463AAC, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463AAC.gbapal" gUnknown_8463ACC:: @ 8463ACC gbapal - .incbin "baserom.gba", 0x463ACC, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463ACC.gbapal" gUnknown_8463AEC:: @ 8463AEC oamdata .4byte 0x00000000, 0x00000000 - @ animcmd + +gUnknown_8463AF4:: obj_image_anim_frame 0x0000, 20 obj_image_anim_jump 0 gUnknown_8463AFC:: @ 8463AFC dataptr - .4byte 0x8463af4 + .4byte gUnknown_8463AF4 gUnknown_8463B00:: @ 8463B00 gbapal - .incbin "baserom.gba", 0x463B00, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463B00.gbapal" gUnknown_8463B20:: @ 8463B20 something.lz - .incbin "baserom.gba", 0x463B20, 0x10 + .incbin "graphics/interface/pokesummary_unk_8463B20.4bpp.lz" gUnknown_8463B30:: @ 8463B30 oamdata .4byte 0x00000000, 0x00000000 - @ animcmd + +gUnknown_8463B38:: obj_image_anim_frame 0x0001, 20 obj_image_anim_jump 0 gUnknown_8463B40:: @ 8463B40 dataptr - .4byte 0x8463b38 + .4byte gUnknown_8463B38 gUnknown_8463B44:: @ 8463B44 gbapal - .incbin "baserom.gba", 0x463B44, 0x20 + .incbin "graphics/interface/pokesummary_unk_8463B44.gbapal" gUnknown_8463B64:: @ 8463B64 something.lz - .incbin "baserom.gba", 0x463B64, 0x24 + .incbin "graphics/interface/pokesummary_unk_8463B64.4bpp.lz" gUnknown_8463B88:: @ 8463B88 bin.lz - .incbin "baserom.gba", 0x463B88, 0xF8 + .incbin "graphics/interface/pokesummary_unk_8463B88.bin.lz" gUnknown_8463C80:: @ 8463C80 bin.lz - .incbin "baserom.gba", 0x463C80, 0x1E0 - -gUnknown_8463E60:: @ 8463E60 dataptr - .4byte 0x8463dbc - .4byte 0x8463dc2 - .4byte 0x8463dc9 - .4byte 0x8463dcf - .4byte 0x8463dd7 - .4byte 0x8463ddf - .4byte 0x8463de4 - .4byte 0x8463deb - .4byte 0x8463df3 - .4byte 0x8463dfa - .4byte 0x8463dfe - .4byte 0x8463e04 - .4byte 0x8463e0a - .4byte 0x8463e12 - .4byte 0x8463e18 - .4byte 0x8463e1e - .4byte 0x8463e25 - .4byte 0x8463e2a - .4byte 0x8463e30 - .4byte 0x8463e38 - .4byte 0x8463e3d - .4byte 0x8463e42 - .4byte 0x8463e49 - .4byte 0x8463e4f - .4byte 0x8463e57 + .incbin "graphics/interface/pokesummary_unk_8463C80.bin.lz" + +gUnknown_8463DBC:: + .string "HARDY$" + +gUnknown_8463DC2:: + .string "LONELY$" + +gUnknown_8463DC9:: + .string "BRAVE$" + +gUnknown_8463DCF:: + .string "ADAMANT$" + +gUnknown_8463DD7:: + .string "NAUGHTY$" + +gUnknown_8463DDF:: + .string "BOLD$" + +gUnknown_8463DE4:: + .string "DOCILE$" + +gUnknown_8463DEB:: + .string "RELAXED$" + +gUnknown_8463DF3:: + .string "IMPISH$" + +gUnknown_8463DFA:: + .string "LAX$" + +gUnknown_8463DFE:: + .string "TIMID$" + +gUnknown_8463E04:: + .string "HASTY$" + +gUnknown_8463E0A:: + .string "SERIOUS$" + +gUnknown_8463E12:: + .string "JOLLY$" + +gUnknown_8463E18:: + .string "NAIVE$" + +gUnknown_8463E1E:: + .string "MODEST$" + +gUnknown_8463E25:: + .string "MILD$" + +gUnknown_8463E2A:: + .string "QUIET$" + +gUnknown_8463E30:: + .string "BASHFUL$" + +gUnknown_8463E38:: + .string "RASH$" + +gUnknown_8463E3D:: + .string "CALM$" + +gUnknown_8463E42:: + .string "GENTLE$" + +gUnknown_8463E49:: + .string "SASSY$" + +gUnknown_8463E4F:: + .string "CAREFUL$" + +gUnknown_8463E57:: + .string "QUIRKY$" + + .align 2 +gNatureNames:: @ 8463E60 dataptr + .4byte gUnknown_8463DBC + .4byte gUnknown_8463DC2 + .4byte gUnknown_8463DC9 + .4byte gUnknown_8463DCF + .4byte gUnknown_8463DD7 + .4byte gUnknown_8463DDF + .4byte gUnknown_8463DE4 + .4byte gUnknown_8463DEB + .4byte gUnknown_8463DF3 + .4byte gUnknown_8463DFA + .4byte gUnknown_8463DFE + .4byte gUnknown_8463E04 + .4byte gUnknown_8463E0A + .4byte gUnknown_8463E12 + .4byte gUnknown_8463E18 + .4byte gUnknown_8463E1E + .4byte gUnknown_8463E25 + .4byte gUnknown_8463E2A + .4byte gUnknown_8463E30 + .4byte gUnknown_8463E38 + .4byte gUnknown_8463E3D + .4byte gUnknown_8463E42 + .4byte gUnknown_8463E49 + .4byte gUnknown_8463E4F + .4byte gUnknown_8463E57 gUnknown_8463EC4:: @ 8463EC4 dataptr - .4byte 0x8419b44 - .4byte 0x8419b7b - .4byte 0x8419bae - .4byte 0x8419bdb + .4byte gUnknown_8419B44 + .4byte gUnknown_8419B7B + .4byte gUnknown_8419BAE + .4byte gUnknown_8419BDB gUnknown_8463ED4:: @ 8463ED4 dataptr - .4byte 0x8419a3d - .4byte 0x8419b18 - .4byte 0x8419a6e - .4byte 0x8419b18 - .4byte 0x8419aa2 - .4byte 0x8419ade - .4byte 0x8419b18 + .4byte gUnknown_8419A3D + .4byte gUnknown_8419B18 + .4byte gUnknown_8419A6E + .4byte gUnknown_8419B18 + .4byte gUnknown_8419AA2 + .4byte gUnknown_8419ADE + .4byte gUnknown_8419B18 gUnknown_8463EF0:: @ 8463EF0 data8 .byte 0x00, 0x07, 0x08, 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06 -- cgit v1.2.3 From 72d1bbd73fd02b601eedcfbdb15b58adbf569729 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 27 Nov 2019 09:24:06 -0500 Subject: Cleanup --- data/pokemon_summary_screen.s | 190 +++++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 96 deletions(-) (limited to 'data') diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index a26613dd7..ff732f5ae 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -3,77 +3,75 @@ .section .rodata .align 2 -gUnknown_84636C0:: @ 84636C0 gbapal +gUnknown_84636C0:: @ 84636C0 .incbin "graphics/interface/pokesummary_unk_84636C0.gbapal" -gUnknown_84636E0:: @ 84636E0 gbapal +gUnknown_84636E0:: @ 84636E0 .incbin "graphics/interface/pokesummary_unk_84636E0.gbapal" -gUnknown_8463700:: @ 8463700 gbapal +gUnknown_8463700:: @ 8463700 .incbin "graphics/interface/pokesummary_unk_8463700.gbapal" -gUnknown_8463720:: @ 8463720 gbapal +gUnknown_8463720:: @ 8463720 .incbin "graphics/interface/pokesummary_unk_8463720.gbapal" -gUnknown_8463740:: @ 8463740 something.lz +gUnknown_8463740:: @ 8463740 .incbin "graphics/interface/pokesummary_unk_8463740.4bpp.lz" -gUnknown_846386C:: @ 846386C something.lz +gUnknown_846386C:: @ 846386C .incbin "graphics/interface/pokesummary_unk_846386C.4bpp.lz" -gUnknown_846398C:: @ 846398C oamdata +gUnknown_846398C:: @ 846398C .4byte 0xc0004000, 0x00000000 - -gUnknown_8463994:: +gUnknown_8463994:: @ 8463994 obj_image_anim_frame 0x0000, 20 obj_image_anim_jump 0 -gUnknown_846399C:: +gUnknown_846399C:: @ 846399C obj_image_anim_frame 0x0020, 20 obj_image_anim_jump 0 -gUnknown_84639A4:: @ 84639A4 dataptr +gUnknown_84639A4:: @ 84639A4 .4byte gUnknown_8463994 .4byte gUnknown_846399C -gUnknown_84639AC:: @ 84639AC oamdata +gUnknown_84639AC:: @ 84639AC .4byte 0x40004000, 0x00000000 - -gUnknown_84639B4:: +gUnknown_84639B4:: @ 84639B4 obj_image_anim_frame 0x0000, 20 obj_image_anim_jump 0 -gUnknown_84639BC:: +gUnknown_84639BC:: @ 84639BC obj_image_anim_frame 0x0004, 20 obj_image_anim_jump 0 -gUnknown_84639C4:: +gUnknown_84639C4:: @ 84639C4 obj_image_anim_frame 0x0008, 20 obj_image_anim_jump 0 -gUnknown_84639CC:: +gUnknown_84639CC:: @ 84639CC obj_image_anim_frame 0x000c, 20 obj_image_anim_jump 0 -gUnknown_84639D4:: +gUnknown_84639D4:: @ 84639D4 obj_image_anim_frame 0x0010, 20 obj_image_anim_jump 0 -gUnknown_84639DC:: +gUnknown_84639DC:: @ 84639DC obj_image_anim_frame 0x0014, 20 obj_image_anim_jump 0 -gUnknown_84639E4:: +gUnknown_84639E4:: @ 84639E4 obj_image_anim_frame 0x0018, 20 obj_image_anim_jump 0 -gUnknown_84639EC:: +gUnknown_84639EC:: @ 84639EC obj_image_anim_frame 0x001c, 20 obj_image_anim_jump 0 -gUnknown_84639F4:: @ 84639F4 dataptr +gUnknown_84639F4:: @ 84639F4 .4byte gUnknown_84639B4 .4byte gUnknown_84639BC .4byte gUnknown_84639C4 @@ -83,58 +81,58 @@ gUnknown_84639F4:: @ 84639F4 dataptr .4byte gUnknown_84639E4 .4byte gUnknown_84639EC -gUnknown_8463A14:: @ 8463A14 oamdata +gUnknown_8463A14:: @ 8463A14 .4byte 0x00000000, 0x00000000 -gUnknown_8463A1C:: +gUnknown_8463A1C:: @ 8463A1C obj_image_anim_frame 0x0000, 20 obj_image_anim_jump 0 -gUnknown_8463A24:: +gUnknown_8463A24:: @ 8463A24 obj_image_anim_frame 0x0001, 20 obj_image_anim_jump 0 -gUnknown_8463A2C:: +gUnknown_8463A2C:: @ 8463A2C obj_image_anim_frame 0x0002, 20 obj_image_anim_jump 0 -gUnknown_8463A34:: +gUnknown_8463A34:: @ 8463A34 obj_image_anim_frame 0x0003, 20 obj_image_anim_jump 0 -gUnknown_8463A3C:: +gUnknown_8463A3C:: @ 8463A3C obj_image_anim_frame 0x0004, 20 obj_image_anim_jump 0 -gUnknown_8463A44:: +gUnknown_8463A44:: @ 8463A44 obj_image_anim_frame 0x0005, 20 obj_image_anim_jump 0 -gUnknown_8463A4C:: +gUnknown_8463A4C:: @ 8463A4C obj_image_anim_frame 0x0006, 20 obj_image_anim_jump 0 -gUnknown_8463A54:: +gUnknown_8463A54:: @ 8463A54 obj_image_anim_frame 0x0007, 20 obj_image_anim_jump 0 -gUnknown_8463A5C:: +gUnknown_8463A5C:: @ 8463A5C obj_image_anim_frame 0x0008, 20 obj_image_anim_jump 0 -gUnknown_8463A64:: +gUnknown_8463A64:: @ 8463A64 obj_image_anim_frame 0x0009, 20 obj_image_anim_jump 0 -gUnknown_8463A6C:: +gUnknown_8463A6C:: @ 8463A6C obj_image_anim_frame 0x000a, 20 obj_image_anim_jump 0 -gUnknown_8463A74:: +gUnknown_8463A74:: @ 8463A74 obj_image_anim_frame 0x000b, 20 obj_image_anim_jump 0 -gUnknown_8463A7C:: @ 8463A7C dataptr +gUnknown_8463A7C:: @ 8463A7C .4byte gUnknown_8463A1C .4byte gUnknown_8463A24 .4byte gUnknown_8463A2C @@ -148,123 +146,123 @@ gUnknown_8463A7C:: @ 8463A7C dataptr .4byte gUnknown_8463A6C .4byte gUnknown_8463A74 -gUnknown_8463AAC:: @ 8463AAC gbapal +gUnknown_8463AAC:: @ 8463AAC .incbin "graphics/interface/pokesummary_unk_8463AAC.gbapal" -gUnknown_8463ACC:: @ 8463ACC gbapal +gUnknown_8463ACC:: @ 8463ACC .incbin "graphics/interface/pokesummary_unk_8463ACC.gbapal" -gUnknown_8463AEC:: @ 8463AEC oamdata +gUnknown_8463AEC:: @ 8463AEC .4byte 0x00000000, 0x00000000 -gUnknown_8463AF4:: +gUnknown_8463AF4:: @ 8463AF4 obj_image_anim_frame 0x0000, 20 obj_image_anim_jump 0 -gUnknown_8463AFC:: @ 8463AFC dataptr +gUnknown_8463AFC:: @ 8463AFC .4byte gUnknown_8463AF4 -gUnknown_8463B00:: @ 8463B00 gbapal +gUnknown_8463B00:: @ 8463B00 .incbin "graphics/interface/pokesummary_unk_8463B00.gbapal" -gUnknown_8463B20:: @ 8463B20 something.lz +gUnknown_8463B20:: @ 8463B20 .incbin "graphics/interface/pokesummary_unk_8463B20.4bpp.lz" -gUnknown_8463B30:: @ 8463B30 oamdata +gUnknown_8463B30:: @ 8463B30 .4byte 0x00000000, 0x00000000 -gUnknown_8463B38:: +gUnknown_8463B38:: @ 8463B38 obj_image_anim_frame 0x0001, 20 obj_image_anim_jump 0 -gUnknown_8463B40:: @ 8463B40 dataptr +gUnknown_8463B40:: @ 8463B40 .4byte gUnknown_8463B38 -gUnknown_8463B44:: @ 8463B44 gbapal +gUnknown_8463B44:: @ 8463B44 .incbin "graphics/interface/pokesummary_unk_8463B44.gbapal" -gUnknown_8463B64:: @ 8463B64 something.lz +gUnknown_8463B64:: @ 8463B64 .incbin "graphics/interface/pokesummary_unk_8463B64.4bpp.lz" -gUnknown_8463B88:: @ 8463B88 bin.lz +gUnknown_8463B88:: @ 8463B88 .incbin "graphics/interface/pokesummary_unk_8463B88.bin.lz" -gUnknown_8463C80:: @ 8463C80 bin.lz +gUnknown_8463C80:: @ 8463C80 .incbin "graphics/interface/pokesummary_unk_8463C80.bin.lz" -gUnknown_8463DBC:: +gUnknown_8463DBC:: @ 8463DBC .string "HARDY$" -gUnknown_8463DC2:: +gUnknown_8463DC2:: @ 8463DC2 .string "LONELY$" -gUnknown_8463DC9:: +gUnknown_8463DC9:: @ 8463DC9 .string "BRAVE$" -gUnknown_8463DCF:: +gUnknown_8463DCF:: @ 8463DCF .string "ADAMANT$" -gUnknown_8463DD7:: +gUnknown_8463DD7:: @ 8463DD7 .string "NAUGHTY$" -gUnknown_8463DDF:: +gUnknown_8463DDF:: @ 8463DDF .string "BOLD$" -gUnknown_8463DE4:: +gUnknown_8463DE4:: @ 8463DE4 .string "DOCILE$" -gUnknown_8463DEB:: +gUnknown_8463DEB:: @ 8463DEB .string "RELAXED$" -gUnknown_8463DF3:: +gUnknown_8463DF3:: @ 8463DF3 .string "IMPISH$" -gUnknown_8463DFA:: +gUnknown_8463DFA:: @ 8463DFA .string "LAX$" -gUnknown_8463DFE:: +gUnknown_8463DFE:: @ 8463DFE .string "TIMID$" -gUnknown_8463E04:: +gUnknown_8463E04:: @ 8463E04 .string "HASTY$" -gUnknown_8463E0A:: +gUnknown_8463E0A:: @ 8463E0A .string "SERIOUS$" -gUnknown_8463E12:: +gUnknown_8463E12:: @ 8463E12 .string "JOLLY$" -gUnknown_8463E18:: +gUnknown_8463E18:: @ 8463E18 .string "NAIVE$" -gUnknown_8463E1E:: +gUnknown_8463E1E:: @ 8463E1E .string "MODEST$" -gUnknown_8463E25:: +gUnknown_8463E25:: @ 8463E25 .string "MILD$" -gUnknown_8463E2A:: +gUnknown_8463E2A:: @ 8463E2A .string "QUIET$" -gUnknown_8463E30:: +gUnknown_8463E30:: @ 8463E30 .string "BASHFUL$" -gUnknown_8463E38:: +gUnknown_8463E38:: @ 8463E38 .string "RASH$" -gUnknown_8463E3D:: +gUnknown_8463E3D:: @ 8463E3D .string "CALM$" -gUnknown_8463E42:: +gUnknown_8463E42:: @ 8463E42 .string "GENTLE$" -gUnknown_8463E49:: +gUnknown_8463E49:: @ 8463E49 .string "SASSY$" -gUnknown_8463E4F:: +gUnknown_8463E4F:: @ 8463E4F .string "CAREFUL$" -gUnknown_8463E57:: +gUnknown_8463E57:: @ 8463E57 .string "QUIRKY$" .align 2 @@ -295,13 +293,13 @@ gNatureNames:: @ 8463E60 dataptr .4byte gUnknown_8463E4F .4byte gUnknown_8463E57 -gUnknown_8463EC4:: @ 8463EC4 dataptr +gUnknown_8463EC4:: @ 8463EC4 .4byte gUnknown_8419B44 .4byte gUnknown_8419B7B .4byte gUnknown_8419BAE .4byte gUnknown_8419BDB -gUnknown_8463ED4:: @ 8463ED4 dataptr +gUnknown_8463ED4:: @ 8463ED4 .4byte gUnknown_8419A3D .4byte gUnknown_8419B18 .4byte gUnknown_8419A6E @@ -310,10 +308,10 @@ gUnknown_8463ED4:: @ 8463ED4 dataptr .4byte gUnknown_8419ADE .4byte gUnknown_8419B18 -gUnknown_8463EF0:: @ 8463EF0 data8 +gUnknown_8463EF0:: @ 8463EF0 .byte 0x00, 0x07, 0x08, 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06 -gUnknown_8463EFC:: @ 8463EFC bg_template +gUnknown_8463EFC:: @ 8463EFC .4byte 0x000002e0 @ { @ .bg = 0, @@ -355,7 +353,7 @@ gUnknown_8463EFC:: @ 8463EFC bg_template @ .baseTile = 0x0000 @ } -gUnknown_8463F0C:: @ 8463F0C window_template +gUnknown_8463F0C:: @ 8463F0C .byte 1, 0, 0, 13, 2, 7 .2byte 0x0258 .byte 1, 19, 0, 11, 2, 7 @@ -363,7 +361,7 @@ gUnknown_8463F0C:: @ 8463F0C window_template .byte 1, 0, 2, 15, 2, 7 .2byte 0x0288 -gUnknown_8463F24:: @ 8463F24 window_template +gUnknown_8463F24:: @ 8463F24 .byte 2, 0, 0, 13, 2, 7 .2byte 0x0258 .byte 2, 19, 0, 11, 2, 7 @@ -371,7 +369,7 @@ gUnknown_8463F24:: @ 8463F24 window_template .byte 2, 0, 2, 15, 2, 7 .2byte 0x0288 -gUnknown_8463F3C:: @ 8463F3C window_template +gUnknown_8463F3C:: @ 8463F3C .byte 0, 15, 2, 15, 12, 6 .2byte 0x0001 .byte 0, 1, 14, 28, 6, 6 @@ -381,7 +379,7 @@ gUnknown_8463F3C:: @ 8463F3C window_template .byte 0, 0, 0, 0, 0, 0 .2byte 0x0000 -gUnknown_8463F5C:: @ 8463F5C window_template +gUnknown_8463F5C:: @ 8463F5C .byte 0, 20, 2, 10, 14, 6 .2byte 0x0001 .byte 0, 6, 12, 14, 4, 6 @@ -391,7 +389,7 @@ gUnknown_8463F5C:: @ 8463F5C window_template .byte 0, 0, 0, 0, 0, 0 .2byte 0x0000 -gUnknown_8463F7C:: @ 8463F7C window_template +gUnknown_8463F7C:: @ 8463F7C .byte 0, 20, 2, 10, 18, 8 .2byte 0x0001 .byte 0, 0, 7, 15, 13, 6 @@ -401,41 +399,41 @@ gUnknown_8463F7C:: @ 8463F7C window_template .byte 0, 6, 4, 9, 2, 6 .2byte 0x01d2 -gUnknown_8463F9C:: @ 8463F9C window_template +gUnknown_8463F9C:: @ 8463F9C .byte 255, 0, 0, 0, 0, 0 .2byte 0x0000 -gUnknown_8463FA4:: @ 8463FA4 data8 +gUnknown_8463FA4:: @ 8463FA4 .byte 0x00, 0x0e, 0x0a -gUnknown_8463FA7:: @ 8463FA7 data8 +gUnknown_8463FA7:: @ 8463FA7 .byte 0x00, 0x01, 0x02, 0x00, 0x09, 0x08, 0x00, 0x05, 0x04, 0x00, 0x02, 0x03, 0x00, 0x0b, 0x0a, 0x00, 0x00 -gUnknown_8463FB8:: @ 8463FB8 data8 +gUnknown_8463FB8:: @ 8463FB8 .byte 0x00, 0x02, 0x03, 0x01, 0x04, 0x05 -gUnknown_8463FBE:: @ 8463FBE data8 +gUnknown_8463FBE:: @ 8463FBE .byte 0xff, 0x00, 0x01 -gUnknown_8463FC1:: @ 8463FC1 data8 +gUnknown_8463FC1:: @ 8463FC1 .byte 0xfe, 0xff, 0x00, 0x01, 0x02 -gUnknown_8463FC6:: @ 8463FC6 data8 +gUnknown_8463FC6:: @ 8463FC6 .byte 0xfd, 0xfe, 0xff, 0x00, 0x01, 0x02, 0x03 -gUnknown_8463FCD:: @ 8463FCD data8 +gUnknown_8463FCD:: @ 8463FCD .byte 0xfb, 0xfd, 0xff, 0x00, 0x01, 0x03, 0x05 -gUnknown_8463FD4:: @ 8463FD4 data8 +gUnknown_8463FD4:: @ 8463FD4 .byte 0x01, 0x01, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x01, 0x01 -gUnknown_8463FDF:: @ 8463FDF data8 +gUnknown_8463FDF:: @ 8463FDF .byte 0x02, 0x01, 0x00, 0xff, 0xfe, 0x00, 0xfe, 0xff, 0x00, 0x01, 0x02 -gUnknown_8463FEA:: @ 8463FEA data8 +gUnknown_8463FEA:: @ 8463FEA .byte 0x02, 0x01, 0x01, 0x00, 0xff, 0xff, 0xfe, 0x00, 0xfe, 0xff, 0xff, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00 -gUnknown_8463FFC:: @ 8463FFC dataptr +gUnknown_8463FFC:: @ 8463FFC .4byte gUnknown_8E9B578 .4byte gUnknown_8463AAC .4byte gUnknown_8463ACC -- cgit v1.2.3 From 1196d0b53364e69e2faea5b891fe69390d071124 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 27 Nov 2019 16:22:20 -0500 Subject: Dump data/field_effects.s --- data/field_effect.s | 469 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 374 insertions(+), 95 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index 1a38abf94..c6affccd2 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,145 +6,424 @@ .section .rodata .align 2 - .incbin "baserom.gba", 0x3CA770, 0xE80 +gUnknown_83CA770:: @ 3CA770 4bpp + .incbin "graphics/field_effects/unk_83CA770.4bpp" -gUnknown_83CB5F0:: @ 83CB5F0 - .incbin "baserom.gba", 0x3CB5F0, 0x200 +gUnknown_83CAF70:: @ 83CAF70 gbapal + .incbin "graphics/field_effects/unk_83CAF70.gbapal" -gUnknown_83CB7F0:: @ 83CB7F0 - .incbin "baserom.gba", 0x3CB7F0, 0x20 +gUnknown_83CAF90:: @ 83CAF90 4bpp + .incbin "graphics/field_effects/unk_83CAF90.4bpp" -gUnknown_83CB810:: @ 83CB810 - .incbin "baserom.gba", 0x3CB810, 0x280 +gUnknown_83CAFB0:: @ 83CAFB0 gbapal + .incbin "graphics/field_effects/unk_83CAFB0.gbapal" -gUnknown_83CBA90:: @ 83CBA90 - .incbin "baserom.gba", 0x3CBA90, 0x80 +gUnknown_83CAFD0:: @ 83CAFD0 4bpp + .incbin "graphics/field_effects/unk_83CAFD0.4bpp" -gUnknown_83CBB10:: @ 83CBB10 - .incbin "baserom.gba", 0x3CBB10, 0x20 +gUnknown_83CB3D0:: @ 83CB3D0 gbapal + .incbin "graphics/field_effects/unk_83CB3D0.gbapal" -gUnknown_83CBB30:: @ 83CBB30 - .incbin "baserom.gba", 0x3CBB30, 0x300 +gUnknown_83CB3F0:: @ 83CB3F0 4bpp + .incbin "graphics/field_effects/unk_83CB3F0.4bpp" -gUnknown_83CBE30:: @ 83CBE30 - .incbin "baserom.gba", 0x3CBE30, 0x20 +gUnknown_83CB5F0:: @ 83CB5F0 4bpp + .incbin "graphics/field_effects/unk_83CB5F0.4bpp" -gUnknown_83CBE50:: @ 83CBE50 - .incbin "baserom.gba", 0x3CBE50, 0x20 +gUnknown_83CB7F0:: @ 83CB7F0 gbapal gUnknown_83CB5F0 + .incbin "graphics/field_effects/unk_83CB7F0.gbapal" -gUnknown_83CBE70:: @ 83CBE70 - .incbin "baserom.gba", 0x3CBE70, 0x14 +gUnknown_83CB810:: @ 83CB810 4bpp + .incbin "graphics/field_effects/unk_83CB810.bin" -gUnknown_83CBE84:: @ 83CBE84 - .incbin "baserom.gba", 0x3CBE84, 0x18 +gUnknown_83CBA90:: @ 83CBA90 4bpp + .incbin "graphics/field_effects/unk_83CBA90.4bpp" -gUnknown_83CBE9C:: - .incbin "baserom.gba", 0x3CBE9C, 0x8 +gUnknown_83CBB10:: @ 83CBB10 gbapal gUnknown_83CBA90 + .incbin "graphics/field_effects/unk_83CBB10.gbapal" -gUnknown_83CBEA4:: - .incbin "baserom.gba", 0x3CBEA4, 0xE4 +gUnknown_83CBB30:: @ 83CBB30 4bpp + .incbin "graphics/field_effects/unk_83CBB30.bin" -gUnknown_83CBF88:: @ 83CBF88 - .incbin "baserom.gba", 0x3CBF88, 0x18 + .align 2 +gUnknown_83CBE30:: @ 83CBE30 dataptr + .4byte FieldEffectCmd_loadtiles + .4byte FieldEffectCmd_loadfadedpal + .4byte FieldEffectCmd_loadpal + .4byte FieldEffectCmd_callnative + .4byte sub_80834DC + .4byte FieldEffectCmd_loadgfx_callnative + .4byte FieldEffectCmd_loadtiles_callnative + .4byte FieldEffectCmd_loadfadedpal_callnative + +gUnknown_83CBE50:: @ 83CBE50 oamdata + .4byte 0xc0000000, 0x00000000 + +gOamData_83CBE58:: @ 83CBE58 oamdata + .4byte 0x00000000, 0x00000000 + +gOamData_83CBE60:: @ 83CBE60 oamdata + .4byte 0x40000000, 0x00000000 -gUnknown_83CBFA0:: @ 83CBFA0 - .incbin "baserom.gba", 0x3CBFA0, 0x18 +gUnknown_83CBE68:: @ 83CBE68 sprite_frames + obj_frame_tiles gUnknown_83CA770, 0x0800 + +gUnknown_83CBE70:: @ 83CBE70 sprite_palette + obj_pal gUnknown_83CAF70, 4102 + +gUnknown_83CBE78:: @ 83CBE78 + obj_image_anim_frame 0x0000, 1 + obj_image_anim_end + + .align 2 +gUnknown_83CBE80:: @ 83CBE80 dataptr + .4byte gUnknown_83CBE78 + +gUnknown_83CBE84:: @ 83CBE84 spr_template + spr_template 65535, 4102, gUnknown_83CBE50, gUnknown_83CBE80, gUnknown_83CBE68, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_83CBE9C:: @ 83CBE9C sprite_palette + obj_pal gUnknown_83CAFB0, 4103 + +gUnknown_83CBEA4:: @ 83CBEA4 sprite_palette + obj_pal gUnknown_83CB3D0, 4112 + +gOamData_83CBEAC:: @ 83CBEAC oam_data + .4byte 0x80004000, 0x00000000 + +gUnknown_83CBEB4:: @ 83CBEB4 sprite_frames + obj_frame_tiles gUnknown_83CAF90, 0x0020 + +gUnknown_83CBEBC:: @ 83CBEBC sprite_frames + obj_frame_tiles gUnknown_83CAFD0 + 0x000, 0x0100 + obj_frame_tiles gUnknown_83CAFD0 + 0x100, 0x0100 + obj_frame_tiles gUnknown_83CAFD0 + 0x200, 0x0100 + obj_frame_tiles gUnknown_83CAFD0 + 0x300, 0x0100 + +gUnknown_83CBEDC:: @ 83CBEDC sprite_frames + obj_frame_tiles gUnknown_83CB3F0 + 0x000, 0x0080 + obj_frame_tiles gUnknown_83CB3F0 + 0x080, 0x0080 + obj_frame_tiles gUnknown_83CB3F0 + 0x100, 0x0080 + obj_frame_tiles gUnknown_83CB3F0 + 0x180, 0x0080 + +gUnknown_83CBEFC:: @ 83CBEFC unknown + .byte 0xf4, 0xf8, 0x01, 0x80 + .byte 0x04, 0xf8, 0x20, 0x80 + .byte 0xf4, 0x00, 0x31, 0x80 + .byte 0x04, 0x00, 0x50, 0x80 + .byte 0x04, 0x00, 0x00, 0x00 + +gUnknown_83CBF10:: @ 83CBF10 dataptr + .4byte gUnknown_83CBEFC + +gUnknown_83CBF14:: @ 83CBF14 unknown + .byte 0xe0, 0xf8, 0x05, 0x80 + .byte 0x00, 0xf8, 0x45, 0x80 + .byte 0xe0, 0x00, 0x85, 0x80 + .byte 0x00, 0x00, 0xc5, 0x80 + .byte 0x04, 0x00, 0x00, 0x00 + +gUnknown_83CBF28:: @ 83CBE28 dataptr + .4byte gUnknown_83CBF14 + +gUnknown_83CBF2C:: @ 83CBF2C animcmd + obj_image_anim_frame 0x0000, 1 + obj_image_anim_jump 0 + +gUnknown_83CBF34:: @ 83CBF34 animcmd + obj_image_anim_frame 0x0001, 5 + obj_image_anim_frame 0x0002, 5 + obj_image_anim_frame 0x0003, 7 + obj_image_anim_frame 0x0002, 5 + obj_image_anim_frame 0x0001, 5 + obj_image_anim_frame 0x0000, 5 + obj_image_anim_loop 3 + obj_image_anim_end -gUnknown_83CBFB8:: @ 83CBFB8 - .incbin "baserom.gba", 0x3CBFB8, 0x18 + .align 2 +gUnknown_83CBF54:: @ 83CBF54 dataptr + .4byte gUnknown_83CBF2C + .4byte gUnknown_83CBF34 + +gUnknown_83CBF5C:: @ 83CBF5C animcmd + obj_image_anim_frame 0x0003, 8 + obj_image_anim_frame 0x0002, 8 + obj_image_anim_frame 0x0001, 8 + obj_image_anim_frame 0x0000, 8 + obj_image_anim_frame 0x0001, 8 + obj_image_anim_frame 0x0002, 8 + obj_image_anim_loop 2 + obj_image_anim_frame 0x0001, 8 + obj_image_anim_frame 0x0000, 8 + obj_image_anim_end -gUnknown_83CBFD0:: @ 83CBFD0 - .incbin "baserom.gba", 0x3CBFD0, 0x10 + .align 2 +gUnknown_83CBF84:: @ 83CBF84 dataptr + .4byte gUnknown_83CBF5C -gUnknown_83CBFE0:: @ 83CBFE0 - .incbin "baserom.gba", 0x3CBFE0, 0x10 +gUnknown_83CBF88:: @ 83CBF88 spr_template + spr_template 65535, 4103, gOamData_83CBE58, gUnknown_83CBF54, gUnknown_83CBEB4, gDummySpriteAffineAnimTable, SpriteCB_PokeballGlow -gUnknown_83CBFF0:: @ 83CBFF0 - .incbin "baserom.gba", 0x3CBFF0, 0x20 +gUnknown_83CBFA0:: @ 83CBFA0 spr_template + spr_template 65535, 4103, gOamData_83CBEAC, gUnknown_83CBF54, gUnknown_83CBEBC, gDummySpriteAffineAnimTable, sub_808424C -gUnknown_83CC010:: @ 83CC010 - .incbin "baserom.gba", 0x3CC010, 0x18 +gUnknown_83CBFB8:: @ 83CBFB8 spr_template + spr_template 65535, 4112, gOamData_83CBE60, gUnknown_83CBF84, gUnknown_83CBEDC, gDummySpriteAffineAnimTable, sub_80842AC -gUnknown_83CC028:: @ 83CC028 - .incbin "baserom.gba", 0x3CC028, 0x4 + .align 2 +gUnknown_83CBFD0:: @ 83CBFD0 dataptr + .4byte PokecenterHealEffect_0 + .4byte PokecenterHealEffect_1 + .4byte sub_8083C78 + .4byte PokecenterHealEffect_3 -gUnknown_83CC02C:: @ 83CC02C - .incbin "baserom.gba", 0x3CC02C, 0x4 + .align 2 +gUnknown_83CBFE0:: @ 83CBFE0 dataptr + .4byte HallOfFameRecordEffect_0 + .4byte sub_8083D74 + .4byte sub_8083DAC + .4byte sub_8083DD4 -gUnknown_83CC030:: @ 83CC030 - .incbin "baserom.gba", 0x3CC030, 0x4 + .align 2 +gUnknown_83CBFF0:: @ 83CBFF0 dataptr + .4byte PokeballGlowEffect_0 + .4byte PokeballGlowEffect_1 + .4byte PokeballGlowEffect_2 + .4byte PokeballGlowEffect_3 + .4byte PokeballGlowEffect_4 + .4byte PokeballGlowEffect_5 + .4byte PokeballGlowEffect_6 + .4byte nullsub_50 -gUnknown_83CC034:: @ 83CC034 - .incbin "baserom.gba", 0x3CC034, 0x1C +gUnknown_83CC010:: @ 83CC010 data16 + .2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008 -gUnknown_83CC050:: @ 83CC050 - .incbin "baserom.gba", 0x3CC050, 0x18 +gUnknown_83CC028:: @ 83CC028 data8 + .byte 0x10, 0x0c, 0x08, 0x00 -gUnknown_83CC068:: @ 83CC068 - .incbin "baserom.gba", 0x3CC068, 0x1C +gUnknown_83CC02C:: @ 83CC02C data8 + .byte 0x10, 0x0c, 0x08, 0x00 -gUnknown_83CC084:: @ 83CC084 - .incbin "baserom.gba", 0x3CC084, 0x14 +gUnknown_83CC030:: @ 83CC030 data8 + .byte 0x00, 0x00, 0x00, 0x00 -gUnknown_83CC098:: @ 83CC098 - .incbin "baserom.gba", 0x3CC098, 0xC + .align 2 +gUnknown_83CC034:: @ 83CC034 dataptr + .4byte sub_80844BC + .4byte sub_8084564 + .4byte sub_8084580 + .4byte sub_80845F4 + .4byte sub_80846AC + .4byte sub_80846C8 + .4byte sub_8084708 -gUnknown_83CC0A4:: @ 83CC0A4 - .incbin "baserom.gba", 0x3CC0A4, 0x18 + .align 2 +gUnknown_83CC050:: @ 83CC050 dataptr + .4byte sub_80847F8 + .4byte sub_8084820 + .4byte sub_8084890 + .4byte sub_80848B4 + .4byte sub_80848C4 + .4byte sub_80848E8 -gUnknown_83CC0BC:: @ 83CC0BC - .incbin "baserom.gba", 0x3CC0BC, 0x10 + .align 2 +gUnknown_83CC068:: @ 83CC068 dataptr + .4byte sub_8084A5C + .4byte sub_8084AD8 + .4byte sub_8084B18 + .4byte sub_8084B78 + .4byte sub_8084BB8 + .4byte sub_8084C18 + .4byte sub_8084C3C -gUnknown_83CC0CC:: @ 83CC0CC - .incbin "baserom.gba", 0x3CC0CC, 0x14 + .align 2 +gUnknown_83CC084:: @ 83CC084 dataptr + .4byte sub_8084D24 + .4byte waterfall_1_do_anim_probably + .4byte waterfall_2_wait_anim_finish_probably + .4byte sub_8084DA4 + .4byte sub_8084DCC -gUnknown_83CC0E0:: @ 83CC0E0 - .incbin "baserom.gba", 0x3CC0E0, 0x8 + .align 2 +gUnknown_83CC098:: @ 83CC098 dataptr + .4byte dive_1_lock + .4byte dive_2_unknown + .4byte dive_3_unknown -gUnknown_83CC0E8:: @ 83CC0E8 - .incbin "baserom.gba", 0x3CC0E8, 0x8 + .align 2 +gUnknown_83CC0A4:: @ 83CC0A4 dataptr + .4byte sub_8084FA0 + .4byte sub_8084FD8 + .4byte sub_808500C + .4byte sub_8085058 + .4byte sub_808514C + .4byte sub_8085168 -gUnknown_83CC0F0:: @ 83CC0F0 - .incbin "baserom.gba", 0x3CC0F0, 0x8 + .align 2 +gUnknown_83CC0BC:: @ 83CC0BC dataptr + .4byte sub_8085244 + .4byte sub_8085274 + .4byte sub_80852C0 + .4byte sub_8085314 -gUnknown_83CC0F8:: @ 83CC0F8 - .incbin "baserom.gba", 0x3CC0F8, 0x10 + .align 2 +gUnknown_83CC0CC:: @ 83CC0CC dataptr + .4byte sub_8085440 + .4byte sub_8085470 + .4byte sub_80854EC + .4byte sub_8085524 + .4byte sub_808554C -gUnknown_83CC108:: @ 83CC108 - .incbin "baserom.gba", 0x3CC108, 0x8 + .align 2 +gUnknown_83CC0E0:: @ 83CC0E0 dataptr + .4byte sub_808566C + .4byte sub_8085690 -gUnknown_83CC110:: @ 83CC110 - .incbin "baserom.gba", 0x3CC110, 0xC +gUnknown_83CC0E8:: @ 83CC0E8 data8 + .byte 0x01, 0x03, 0x04, 0x02, 0x01 -gUnknown_83CC11C:: @ 83CC11C - .incbin "baserom.gba", 0x3CC11C, 0x1C + .align 2 +gUnknown_83CC0F0:: @ 83CC0F0 dataptr + .4byte sub_8085A54 + .4byte sub_8085A80 -gUnknown_83CC138:: @ 83CC138 - .incbin "baserom.gba", 0x3CC138, 0x1C + .align 2 +gUnknown_83CC0F8:: @ 83CC0F8 dataptr + .4byte sub_8085BA8 + .4byte sub_8085BD0 + .4byte sub_8085C60 + .4byte sub_8085D34 -gUnknown_83CC154:: @ 83CC154 - .incbin "baserom.gba", 0x3CC154, 0x14 +gUnknown_83CC108:: @ 83CC108 data8 + .byte 0x01, 0x03, 0x04, 0x02, 0x01 -gUnknown_83CC168:: @ 83CC168 - .incbin "baserom.gba", 0x3CC168, 0x10 + .align 2 +gUnknown_83CC110:: @ 83CC110 dataptr + .4byte sub_8085E0C + .4byte sub_8085E98 + .4byte sub_8085F9C -gUnknown_83CC178:: @ 83CC178 - .incbin "baserom.gba", 0x3CC178, 0x54 + .align 2 +gUnknown_83CC11C:: @ 83CC11C dataptr + .4byte sub_8086110 + .4byte sub_8086180 + .4byte sub_80861FC + .4byte sub_8086288 + .4byte sub_80862B8 + .4byte sub_808630C + .4byte sub_8086358 -gUnknown_83CC1CC:: @ 83CC1CC - .incbin "baserom.gba", 0x3CC1CC, 0x8 + .align 2 +gUnknown_83CC138:: @ 83CC138 dataptr + .4byte sub_8086498 + .4byte sub_80864D4 + .4byte sub_8086554 + .4byte sub_80865C0 + .4byte sub_80865F0 + .4byte sub_8086630 + .4byte sub_8086650 -gUnknown_83CC1D4:: @ 83CC1D4 - .incbin "baserom.gba", 0x3CC1D4, 0x1C + .align 2 +gUnknown_83CC154:: @ 83CC154 dataptr + .4byte sub_80869C0 + .4byte sub_8086A20 + .4byte sub_8086A6C + .4byte sub_8086AB4 + .4byte sub_8086B30 -gUnknown_83CC1F0:: @ 83CC1F0 - .incbin "baserom.gba", 0x3CC1F0, 0x4C + .align 2 +gUnknown_83CC168:: @ 83CC168 dataptr + .4byte sub_8086C00 + .4byte sub_8086C24 + .4byte sub_8086C70 + .4byte sub_8086CF4 + +gUnknown_83CC178:: @ 83CC178 dataptr (incomplete) + .4byte sub_8086E70 + .4byte sub_8086EC8 + .4byte sub_8086F0C + .4byte sub_8086F64 + .4byte sub_8086FA8 + .4byte sub_8086FFC + .4byte sub_808706C + .4byte sub_8087118 + .4byte sub_8087138 + +gUnknown_83CC19C:: @ 83CC19C affineanimcmd + obj_rot_scal_anim_frame 8, 8, 226, 0 + obj_rot_scal_anim_frame 28, 28, 0, 30 + obj_rot_scal_anim_end + +gUnknown_83CC1B4:: @ 83CC1B4 affineanimcmd + obj_rot_scal_anim_frame 256, 256, 64, 0 + obj_rot_scal_anim_frame -10, -10, 0, 22 + obj_rot_scal_anim_end -gUnknown_83CC23C:: @ 83CC23C - .incbin "baserom.gba", 0x3CC23C, 0x8 + .align 2 +gUnknown_83CC1CC:: @ 83CC1CC dataptr + .4byte gUnknown_83CC19C + .4byte gUnknown_83CC1B4 -gUnknown_83CC244:: @ 83CC244 - .incbin "baserom.gba", 0x3CC244, 0x5C + .align 2 +gUnknown_83CC1D4:: @ 83CC1D4 dataptr + .4byte sub_80874C8 + .4byte sub_80875C8 + .4byte sub_8087644 + .4byte sub_8087698 + .4byte sub_8087710 + .4byte sub_8087748 + .4byte fishE + +gUnknown_83CC1F0:: @ 83CC1F0 data16 + .2byte 0xfffe, 0xfffc, 0xfffb, 0xfffa, 0xfff9, 0xfff8, 0xfff8, 0xfff8, 0xfff9, 0xfff9, 0xfffa, 0xfffb, 0xfffd, 0xfffe, 0x0000, 0x0002 + .2byte 0x0004, 0x0008 + +gUnknown_83CC214:: @ 83CC214 affineanimcmd + obj_rot_scal_anim_frame 24, 24, 0, 1 + obj_rot_scal_anim_jump 0 + +gUnknown_83CC224:: @ 83CC224 affineanimcmd + obj_rot_scal_anim_frame 512, 512, 0, 1 + obj_rot_scal_anim_frame -16, -16, 0, 1 + obj_rot_scal_anim_jump 1 -gUnknown_83CC2A0:: @ 83CC2A0 - .incbin "baserom.gba", 0x3CC2A0, 0x18 + .align 2 +gUnknown_83CC23C:: @ 83CC23C dataptr + .4byte gUnknown_83CC214 + .4byte gUnknown_83CC224 + +gUnknown_83CC244:: @ 83CC244 dataptr + .4byte sub_8087C00 + .4byte sub_8087C2C + .4byte sub_8087CB4 + +gUnknown_83CC250:: @ 83CC250 sprite_frames + obj_frame_tiles 0x083cbdb0, 0x0020 + obj_frame_tiles 0x083cbdd0, 0x0020 + obj_frame_tiles 0x083cbdf0, 0x0020 + obj_frame_tiles 0x083cbe10, 0x0020 + +gUnknown_83CC270:: @ 83CC270 animcmd + obj_image_anim_frame 0x0000, 0 + obj_image_anim_end + +gUnknown_83CC278:: @ 83CC278 animcmd + obj_image_anim_frame 0x0001, 0 + obj_image_anim_end + +gUnknown_83CC280:: @ 83CC280 animcmd + obj_image_anim_frame 0x0002, 0 + obj_image_anim_end + +gUnknown_83CC288:: @ 83CC288 animcmd + obj_image_anim_frame 0x0003, 0 + obj_image_anim_end + +gUnknown_83CC290:: @ 83CC290 dataptr + .4byte gUnknown_83CC270 + .4byte gUnknown_83CC278 + .4byte gUnknown_83CC280 + .4byte gUnknown_83CC288 + +gUnknown_83CC2A0:: @ 83CC2A0 spr_template + spr_template 65535, 4371, gOamData_83CBE58, gUnknown_83CC290, gUnknown_83CC250, gDummySpriteAffineAnimTable, sub_8087D90 -- cgit v1.2.3 From 45ff887858828bf06dbab9e0a5e94610955f2358 Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 1 Dec 2019 11:49:27 -0500 Subject: anim particle gfx graphics names --- data/battle_anim.s | 78 ------- data/graphics.s | 626 ++++++++++++++++++++++++++--------------------------- 2 files changed, 313 insertions(+), 391 deletions(-) (limited to 'data') diff --git a/data/battle_anim.s b/data/battle_anim.s index 472ea2710..ddb6230c9 100644 --- a/data/battle_anim.s +++ b/data/battle_anim.s @@ -811,81 +811,3 @@ gUnknown_83ADD78:: @ 83ADD78 obj_pal gFile_graphics_battle_anims_sprites_287_palette, 10287 obj_pal gFile_graphics_battle_anims_sprites_288_palette, 10288 -gUnknown_83ADE18:: @ 83ADE18 - .4byte gFile_graphics_battle_anims_backgrounds_00_sheet, gFile_graphics_battle_anims_backgrounds_00_palette, gFile_graphics_battle_anims_backgrounds_00_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_00_sheet, gFile_graphics_battle_anims_backgrounds_00_palette, gFile_graphics_battle_anims_backgrounds_00_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_02_sheet, gFile_graphics_battle_anims_backgrounds_02_palette, gFile_graphics_battle_anims_backgrounds_02_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_03_sheet, gFile_graphics_battle_anims_backgrounds_03_palette, gFile_graphics_battle_anims_backgrounds_03_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_04_sheet, gFile_graphics_battle_anims_backgrounds_04_palette, gFile_graphics_battle_anims_backgrounds_04_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_04_sheet, gFile_graphics_battle_anims_backgrounds_04_palette, gFile_graphics_battle_anims_backgrounds_05_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_04_sheet, gFile_graphics_battle_anims_backgrounds_04_palette, gFile_graphics_battle_anims_backgrounds_06_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_07_sheet, gFile_graphics_battle_anims_backgrounds_07_palette, gFile_graphics_battle_anims_backgrounds_07_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_07_sheet, gFile_graphics_battle_anims_backgrounds_07_palette, gFile_graphics_battle_anims_backgrounds_08_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_09_sheet, gFile_graphics_battle_anims_backgrounds_09_palette, gFile_graphics_battle_anims_backgrounds_09_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_09_sheet, gFile_graphics_battle_anims_backgrounds_09_palette, gFile_graphics_battle_anims_backgrounds_10_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_11_sheet, gFile_graphics_battle_anims_backgrounds_11_palette, gFile_graphics_battle_anims_backgrounds_11_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_12_sheet, gFile_graphics_battle_anims_backgrounds_12_palette, gFile_graphics_battle_anims_backgrounds_12_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_12_sheet, gFile_graphics_battle_anims_backgrounds_12_palette, gFile_graphics_battle_anims_backgrounds_13_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_12_sheet, gFile_graphics_battle_anims_backgrounds_12_palette, gFile_graphics_battle_anims_backgrounds_14_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_15_sheet, gFile_graphics_battle_anims_backgrounds_15_palette, gFile_graphics_battle_anims_backgrounds_15_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_16_sheet, gFile_graphics_battle_anims_backgrounds_16_palette, gFile_graphics_battle_anims_backgrounds_16_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_17_sheet, gFile_graphics_battle_anims_backgrounds_17_palette, gFile_graphics_battle_anims_backgrounds_17_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_07_sheet, gFile_graphics_battle_anims_backgrounds_18_palette, gFile_graphics_battle_anims_backgrounds_07_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_07_sheet, gFile_graphics_battle_anims_backgrounds_18_palette, gFile_graphics_battle_anims_backgrounds_08_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_20_sheet, gFile_graphics_battle_anims_backgrounds_20_palette, gFile_graphics_battle_anims_backgrounds_20_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_21_sheet, gFile_graphics_battle_anims_backgrounds_21_palette, gFile_graphics_battle_anims_backgrounds_21_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_09_sheet, gFile_graphics_battle_anims_backgrounds_22_palette, gFile_graphics_battle_anims_backgrounds_09_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_09_sheet, gFile_graphics_battle_anims_backgrounds_22_palette, gFile_graphics_battle_anims_backgrounds_10_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_04_sheet, gFile_graphics_battle_anims_backgrounds_24_palette, gFile_graphics_battle_anims_backgrounds_04_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_04_sheet, gFile_graphics_battle_anims_backgrounds_24_palette, gFile_graphics_battle_anims_backgrounds_05_tilemap - .4byte gFile_graphics_battle_anims_backgrounds_04_sheet, gFile_graphics_battle_anims_backgrounds_24_palette, gFile_graphics_battle_anims_backgrounds_06_tilemap - -gUnknown_83ADF5C:: @ 83ADF5C - .4byte ScriptCmd_loadspritegfx - .4byte ScriptCmd_unloadspritegfx - .4byte ScriptCmd_createsprite - .4byte ScriptCmd_createvisualtask - .4byte ScriptCmd_delay - .4byte sub_8072ACC - .4byte nullsub_41 - .4byte nullsub_42 - .4byte sub_8072B08 - .4byte sub_8072C08 - .4byte sub_8072C30 - .4byte ScriptCmd_clearmonbg - .4byte ScriptCmd_setalpha - .4byte ScriptCmd_blendoff - .4byte ScriptCmd_call - .4byte sub_8073698 - .4byte ScriptCmd_setarg - .4byte ScriptCmd_choosetwoturnanim - .4byte ScriptCmd_jumpifmoveturn - .4byte ScriptCmd_jump - .4byte sub_80737A0 - .4byte ScriptCmd_restorebg - .4byte ScriptCmd_waitbgfadeout - .4byte sub_80739F0 - .4byte ScriptCmd_changebg - .4byte ScriptCmd_playsewithpan - .4byte ScriptCmd_setpan - .4byte ScriptCmd_panse_1B - .4byte ScriptCmd_loopsewithpan - .4byte ScriptCmd_waitplaysewithpan - .4byte ScriptCmd_setbldcnt - .4byte ScriptCmd_createsoundtask - .4byte ScriptCmd_waitsound - .4byte ScriptCmd_jumpargeq - .4byte sub_807339C - .4byte sub_8073484 - .4byte sub_80741B8 - .4byte sub_80737E4 - .4byte ScriptCmd_panse_26 - .4byte ScriptCmd_panse_27 - .4byte sub_80741C8 - .4byte sub_8074214 - .4byte sub_807423C - .4byte ScriptCmd_invisible - .4byte ScriptCmd_visible - .4byte sub_8074320 - .4byte sub_80743C8 - .4byte sub_8074458 diff --git a/data/graphics.s b/data/graphics.s index 818b01e3a..be83bce5d 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -150,27 +150,27 @@ gBlankGfxCompressed:: @ 8D02364 .incbin "graphics/interface/blank.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_146_sheet:: @ 8D02460 +gBattleAnimSpriteGfx_Bubble:: @ 8D02460 .incbin "graphics/battle_anims/sprites/146.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_000_sheet:: @ 8D02520 +gBattleAnimSpriteGfx_Bone:: @ 8D02520 .incbin "graphics/battle_anims/sprites/000.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_003_sheet:: @ 8D025D0 +gBattleAnimSpriteGfx_AirWave:: @ 8D025D0 .incbin "graphics/battle_anims/sprites/003.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_004_sheet:: @ 8D02644 +gBattleAnimSpriteGfx_Orb:: @ 8D02644 .incbin "graphics/battle_anims/sprites/004.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_005_sheet:: @ 8D026F4 +gBattleAnimSpriteGfx_Sword:: @ 8D026F4 .incbin "graphics/battle_anims/sprites/005.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_006_sheet:: @ 8D027C8 +gBattleAnimSpriteGfx_Seed:: @ 8D027C8 .incbin "graphics/battle_anims/sprites/006.4bpp.lz" .align 2 @@ -198,7 +198,7 @@ gFile_graphics_battle_anims_sprites_006_palette:: @ 8D0293C .incbin "graphics/battle_anims/sprites/006.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_161_sheet:: @ 8D02964 +gBattleAnimSpriteGfx_Needle:: @ 8D02964 .incbin "graphics/battle_anims/sprites/161.4bpp.lz" .align 2 @@ -206,7 +206,7 @@ gFile_graphics_battle_anims_sprites_161_palette:: @ 8D0298C .incbin "graphics/battle_anims/sprites/161.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_007_sheet:: @ 8D029B4 +gBattleAnimSpriteGfx_Explosion6:: @ 8D029B4 .incbin "graphics/battle_anims/sprites/007.4bpp.lz" .align 2 @@ -214,7 +214,7 @@ gFile_graphics_battle_anims_sprites_007_palette:: @ 8D02B30 .incbin "graphics/battle_anims/sprites/007.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_008_sheet:: @ 8D02B50 +gBattleAnimSpriteGfx_PinkOrb:: @ 8D02B50 .incbin "graphics/battle_anims/sprites/008.4bpp.lz" .align 2 @@ -226,11 +226,11 @@ gFile_graphics_battle_anims_sprites_010_palette:: @ 8D02B8C .incbin "graphics/battle_anims/sprites/010.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_010_sheet:: @ 8D02BAC +gBattleAnimSpriteGfx_IceCube:: @ 8D02BAC .incbin "graphics/battle_anims/sprites/010.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_009_sheet:: @ 8D02F8C +gBattleAnimSpriteGfx_Gust:: @ 8D02F8C .incbin "graphics/battle_anims/sprites/009.4bpp.lz" .align 2 @@ -238,7 +238,7 @@ gFile_graphics_battle_anims_sprites_009_palette:: @ 8D03274 .incbin "graphics/battle_anims/sprites/009.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_011_sheet:: @ 8D03294 +gBattleAnimSpriteGfx_Spark2:: @ 8D03294 .incbin "graphics/battle_anims/sprites/011.4bpp.lz" .align 2 @@ -246,7 +246,7 @@ gFile_graphics_battle_anims_sprites_011_palette:: @ 8D0330C .incbin "graphics/battle_anims/sprites/011.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_012_sheet:: @ 8D03334 +gBattleAnimSpriteGfx_Orange:: @ 8D03334 .incbin "graphics/battle_anims/sprites/012.4bpp.lz" .align 2 @@ -254,7 +254,7 @@ gFile_graphics_battle_anims_sprites_012_palette:: @ 8D0339C .incbin "graphics/battle_anims/sprites/012.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_152_sheet:: @ 8D033B4 +gBattleAnimSpriteGfx_Spikes:: @ 8D033B4 .incbin "graphics/battle_anims/sprites/152.4bpp.lz" .align 2 @@ -262,7 +262,7 @@ gFile_graphics_battle_anims_sprites_152_palette:: @ 8D033FC .incbin "graphics/battle_anims/sprites/152.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_013_sheet:: @ 8D03420 +gBattleAnimSpriteGfx_YellowBall:: @ 8D03420 .incbin "graphics/battle_anims/sprites/013.4bpp.lz" .align 2 @@ -270,7 +270,7 @@ gFile_graphics_battle_anims_sprites_013_palette:: @ 8D03454 .incbin "graphics/battle_anims/sprites/013.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_015_sheet:: @ 8D0346C +gBattleAnimSpriteGfx_TiedBag:: @ 8D0346C .incbin "graphics/battle_anims/sprites/015.4bpp.lz" .align 2 @@ -278,7 +278,7 @@ gFile_graphics_battle_anims_sprites_015_palette:: @ 8D034D8 .incbin "graphics/battle_anims/sprites/015.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_016_sheet:: @ 8D03500 +gBattleAnimSpriteGfx_BlackSmoke:: @ 8D03500 .incbin "graphics/battle_anims/sprites/016.4bpp.lz" .align 2 @@ -286,7 +286,7 @@ gFile_graphics_battle_anims_sprites_016_palette:: @ 8D03570 .incbin "graphics/battle_anims/sprites/016.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_017_sheet:: @ 8D03580 +gBattleAnimSpriteGfx_BlackBall:: @ 8D03580 .incbin "graphics/battle_anims/sprites/017.4bpp.lz" .align 2 @@ -298,11 +298,11 @@ gFile_graphics_battle_anims_sprites_019_palette:: @ 8D035C4 .incbin "graphics/battle_anims/sprites/019.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_019_sheet:: @ 8D035E0 +gBattleAnimSpriteGfx_Glass:: @ 8D035E0 .incbin "graphics/battle_anims/sprites/019.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_020_sheet:: @ 8D036A0 +gBattleAnimSpriteGfx_HornHit:: @ 8D036A0 .incbin "graphics/battle_anims/sprites/020.4bpp.lz" .align 2 @@ -314,7 +314,7 @@ gFile_graphics_battle_anims_sprites_023_palette:: @ 8D03794 .incbin "graphics/battle_anims/sprites/023.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_023_sheet:: @ 8D037BC +gBattleAnimSpriteGfx_BlueShards:: @ 8D037BC .incbin "graphics/battle_anims/sprites/023.4bpp.lz" .align 2 @@ -330,7 +330,7 @@ gFile_graphics_battle_anims_sprites_021_palette:: @ 8D039E8 .incbin "graphics/battle_anims/sprites/021.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_021_sheet:: @ 8D03A10 +gBattleAnimSpriteGfx_Hit:: @ 8D03A10 .incbin "graphics/battle_anims/sprites/021.4bpp.lz" .align 2 @@ -342,11 +342,11 @@ gFile_graphics_battle_anims_sprites_025_palette:: @ 8D03D70 .incbin "graphics/battle_anims/sprites/025.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_025_sheet:: @ 8D03D98 +gBattleAnimSpriteGfx_WavingHand:: @ 8D03D98 .incbin "graphics/battle_anims/sprites/025.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_024_sheet:: @ 8D03E88 +gBattleAnimSpriteGfx_ClosingEye:: @ 8D03E88 .incbin "graphics/battle_anims/sprites/024.4bpp.lz" .align 2 @@ -354,7 +354,7 @@ gFile_graphics_battle_anims_sprites_024_palette:: @ 8D03F54 .incbin "graphics/battle_anims/sprites/024.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_031_sheet:: @ 8D03F68 +gBattleAnimSpriteGfx_BlueStar:: @ 8D03F68 .incbin "graphics/battle_anims/sprites/031.4bpp.lz" .align 2 @@ -366,11 +366,11 @@ gFile_graphics_battle_anims_sprites_032_palette:: @ 8D04368 .incbin "graphics/battle_anims/sprites/032.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_032_sheet:: @ 8D04390 +gBattleAnimSpriteGfx_BubbleBurst:: @ 8D04390 .incbin "graphics/battle_anims/sprites/032.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_026_sheet:: @ 8D0447C +gBattleAnimSpriteGfx_HitDuplicate:: @ 8D0447C .incbin "graphics/battle_anims/sprites/026.4bpp.lz" .align 2 @@ -382,7 +382,7 @@ gFile_graphics_battle_anims_sprites_027_palette:: @ 8D047DC .incbin "graphics/battle_anims/sprites/027.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_027_sheet:: @ 8D04804 +gBattleAnimSpriteGfx_Leer:: @ 8D04804 .incbin "graphics/battle_anims/sprites/027.4bpp.lz" .align 2 @@ -390,11 +390,11 @@ gFile_graphics_battle_anims_sprites_028_palette:: @ 8D04B00 .incbin "graphics/battle_anims/sprites/028.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_028_sheet:: @ 8D04B28 +gBattleAnimSpriteGfx_BlueBurst:: @ 8D04B28 .incbin "graphics/battle_anims/sprites/028.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_029_sheet:: @ 8D04E78 +gBattleAnimSpriteGfx_SmallEmber:: @ 8D04E78 .incbin "graphics/battle_anims/sprites/029.4bpp.lz" .align 2 @@ -402,7 +402,7 @@ gFile_graphics_battle_anims_sprites_029_palette:: @ 8D05130 .incbin "graphics/battle_anims/sprites/029.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_030_sheet:: @ 8D05158 +gBattleAnimSpriteGfx_GraySmoke:: @ 8D05158 .incbin "graphics/battle_anims/sprites/030.4bpp.lz" .align 2 @@ -414,15 +414,15 @@ gFile_graphics_battle_anims_sprites_033_palette:: @ 8D0553C .incbin "graphics/battle_anims/sprites/033.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_033_sheet:: @ 8D05564 +gBattleAnimSpriteGfx_Fire:: @ 8D05564 .incbin "graphics/battle_anims/sprites/033.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_034_sheet:: @ 8D05ED4 +gBattleAnimSpriteGfx_SpinningFire:: @ 8D05ED4 .incbin "graphics/battle_anims/sprites/034.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_035_sheet:: @ 8D062A0 +gBattleAnimSpriteGfx_FirePlume:: @ 8D062A0 .incbin "graphics/battle_anims/sprites/035.4bpp.lz" .align 2 @@ -430,11 +430,11 @@ gFile_graphics_battle_anims_sprites_036_palette:: @ 8D06638 .incbin "graphics/battle_anims/sprites/036.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_036_sheet:: @ 8D06660 +gBattleAnimSpriteGfx_Lightning2:: @ 8D06660 .incbin "graphics/battle_anims/sprites/036.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_037_sheet:: @ 8D06A34 +gBattleAnimSpriteGfx_Lightning:: @ 8D06A34 .incbin "graphics/battle_anims/sprites/037.4bpp.lz" .align 2 @@ -482,19 +482,19 @@ gFile_graphics_battle_anims_sprites_039_palette:: @ 8D07924 .incbin "graphics/battle_anims/sprites/039.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_038_sheet:: @ 8D0794C +gBattleAnimSpriteGfx_ClawSlash2:: @ 8D0794C .incbin "graphics/battle_anims/sprites/038.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_039_sheet:: @ 8D07B70 +gBattleAnimSpriteGfx_ClawSlash:: @ 8D07B70 .incbin "graphics/battle_anims/sprites/039.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_040_sheet:: @ 8D07E6C +gBattleAnimSpriteGfx_Scratch3:: @ 8D07E6C .incbin "graphics/battle_anims/sprites/040.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_041_sheet:: @ 8D08078 +gBattleAnimSpriteGfx_Scratch2:: @ 8D08078 .incbin "graphics/battle_anims/sprites/041.4bpp.lz" .align 2 @@ -502,7 +502,7 @@ gFile_graphics_interface_party_menu_hpbar_sheet:: @ 8D08218 .incbin "graphics/interface/party_menu_hpbar.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_042_sheet:: @ 8D082AC +gBattleAnimSpriteGfx_BubbleBurst2:: @ 8D082AC .incbin "graphics/battle_anims/sprites/042.4bpp.lz" .align 2 @@ -510,7 +510,7 @@ gFile_graphics_battle_anims_sprites_042_palette:: @ 8D0857C .incbin "graphics/battle_anims/sprites/042.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_043_sheet:: @ 8D085A4 +gBattleAnimSpriteGfx_IceChunk:: @ 8D085A4 .incbin "graphics/battle_anims/sprites/043.4bpp.lz" .align 2 @@ -522,7 +522,7 @@ gFile_graphics_battle_anims_sprites_044_palette:: @ 8D089CC .incbin "graphics/battle_anims/sprites/044.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_044_sheet:: @ 8D089F4 +gBattleAnimSpriteGfx_Glass2:: @ 8D089F4 .incbin "graphics/battle_anims/sprites/044.4bpp.lz" .align 2 @@ -530,7 +530,7 @@ gFile_graphics_battle_anims_sprites_045_palette:: @ 8D08C60 .incbin "graphics/battle_anims/sprites/045.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_045_sheet:: @ 8D08C88 +gBattleAnimSpriteGfx_PinkHeart2:: @ 8D08C88 .incbin "graphics/battle_anims/sprites/045.4bpp.lz" .align 2 @@ -546,7 +546,7 @@ gFile_graphics_interface_hp_numbers:: @ 8D093D8 .incbin "graphics/interface/hp_numbers.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_046:: @ 8D095EC +gBattleAnimSpriteGfx_SapDrip:: @ 8D095EC .incbin "graphics/battle_anims/sprites/046.4bpp.lz" .align 2 @@ -566,7 +566,7 @@ gFile_graphics_battle_interface_unused_window2bar_sheet:: @ 8D09CAC .incbin "graphics/battle_interface/unused_window2bar.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_048_sheet:: @ 8D09CD8 +gBattleAnimSpriteGfx_Sparkle1:: @ 8D09CD8 .incbin "graphics/battle_anims/sprites/048.4bpp.lz" .align 2 @@ -582,15 +582,15 @@ gFile_graphics_battle_anims_sprites_050_palette:: @ 8D09FC0 .incbin "graphics/battle_anims/sprites/050.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_050_sheet:: @ 8D09FE4 +gBattleAnimSpriteGfx_HumanoidFoot:: @ 8D09FE4 .incbin "graphics/battle_anims/sprites/050.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_051_sheet:: @ 8D0A084 +gBattleAnimSpriteGfx_MonsterFoot:: @ 8D0A084 .incbin "graphics/battle_anims/sprites/051.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_052_sheet:: @ 8D0A130 +gBattleAnimSpriteGfx_HumanoidHand:: @ 8D0A130 .incbin "graphics/battle_anims/sprites/052.4bpp.lz" .align 2 @@ -602,7 +602,7 @@ gFile_graphics_unused_line_sketch_palette:: @ 8D0A380 .incbin "graphics/unused/line_sketch.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_054_sheet:: @ 8D0A390 +gBattleAnimSpriteGfx_YellowUnk:: @ 8D0A390 .incbin "graphics/battle_anims/sprites/054.4bpp.lz" .align 2 @@ -610,7 +610,7 @@ gFile_graphics_battle_anims_sprites_054_palette:: @ 8D0A3BC .incbin "graphics/battle_anims/sprites/054.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_056_sheet:: @ 8D0A3D4 +gBattleAnimSpriteGfx_SlamHit:: @ 8D0A3D4 .incbin "graphics/battle_anims/sprites/056.4bpp.lz" .align 2 @@ -618,11 +618,11 @@ gFile_graphics_battle_anims_sprites_056_palette:: @ 8D0A87C .incbin "graphics/battle_anims/sprites/056.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_055_sheet:: @ 8D0A8A4 +gBattleAnimSpriteGfx_RedFist:: @ 8D0A8A4 .incbin "graphics/battle_anims/sprites/055.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_057_sheet:: @ 8D0A968 +gBattleAnimSpriteGfx_Ring:: @ 8D0A968 .incbin "graphics/battle_anims/sprites/057.4bpp.lz" .align 2 @@ -630,7 +630,7 @@ gFile_graphics_battle_anims_sprites_057_palette:: @ 8D0A9F0 .incbin "graphics/battle_anims/sprites/057.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_058_sheet:: @ 8D0AA14 +gBattleAnimSpriteGfx_Rocks:: @ 8D0AA14 .incbin "graphics/battle_anims/sprites/058.4bpp.lz" .align 2 @@ -638,7 +638,7 @@ gFile_graphics_battle_anims_sprites_058_palette:: @ 8D0AE7C .incbin "graphics/battle_anims/sprites/058.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_059_sheet:: @ 8D0AEA4 +gBattleAnimSpriteGfx_Z:: @ 8D0AEA4 .incbin "graphics/battle_anims/sprites/059.4bpp.lz" .align 2 @@ -646,7 +646,7 @@ gFile_graphics_battle_anims_sprites_059_palette:: @ 8D0AF04 .incbin "graphics/battle_anims/sprites/059.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_060_sheet:: @ 8D0AF20 +gBattleAnimSpriteGfx_YellowUnk2:: @ 8D0AF20 .incbin "graphics/battle_anims/sprites/060.4bpp.lz" .align 2 @@ -654,7 +654,7 @@ gFile_graphics_battle_anims_sprites_060_palette:: @ 8D0AF48 .incbin "graphics/battle_anims/sprites/060.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_061_sheet:: @ 8D0AF64 +gBattleAnimSpriteGfx_AirSlash:: @ 8D0AF64 .incbin "graphics/battle_anims/sprites/061.4bpp.lz" .align 2 @@ -662,7 +662,7 @@ gFile_graphics_battle_anims_sprites_061_palette:: @ 8D0B014 .incbin "graphics/battle_anims/sprites/061.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_062_sheet:: @ 8D0B034 +gBattleAnimSpriteGfx_SpinningGreenOrbs:: @ 8D0B034 .incbin "graphics/battle_anims/sprites/062.4bpp.lz" .align 2 @@ -670,7 +670,7 @@ gFile_graphics_battle_anims_sprites_062_palette:: @ 8D0B404 .incbin "graphics/battle_anims/sprites/062.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_063_sheet:: @ 8D0B42C +gBattleAnimSpriteGfx_Leaf:: @ 8D0B42C .incbin "graphics/battle_anims/sprites/063.4bpp.lz" .align 2 @@ -686,7 +686,7 @@ gFile_graphics_battle_anims_sprites_091_palette:: @ 8D0B680 .incbin "graphics/battle_anims/sprites/091.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_065_sheet:: @ 8D0B6A4 +gBattleAnimSpriteGfx_PoisonPowder:: @ 8D0B6A4 .incbin "graphics/battle_anims/sprites/065.4bpp.lz" .align 2 @@ -694,7 +694,7 @@ gFile_graphics_battle_anims_sprites_065_palette:: @ 8D0B7B8 .incbin "graphics/battle_anims/sprites/065.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_066_sheet:: @ 8D0B7D8 +gBattleAnimSpriteGfx_BrownTriangle:: @ 8D0B7D8 .incbin "graphics/battle_anims/sprites/066.4bpp.lz" .align 2 @@ -702,7 +702,7 @@ gFile_graphics_battle_anims_sprites_066_palette:: @ 8D0B824 .incbin "graphics/battle_anims/sprites/066.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_070_sheet:: @ 8D0B84C +gBattleAnimSpriteGfx_Sparkle3:: @ 8D0B84C .incbin "graphics/battle_anims/sprites/070.4bpp.lz" .align 2 @@ -710,11 +710,11 @@ gFile_graphics_battle_anims_sprites_070_palette:: @ 8D0B8CC .incbin "graphics/battle_anims/sprites/070.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_071_sheet:: @ 8D0B8F4 +gBattleAnimSpriteGfx_Sparkle4:: @ 8D0B8F4 .incbin "graphics/battle_anims/sprites/071.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_072_sheet:: @ 8D0BB20 +gBattleAnimSpriteGfx_MusicNotes:: @ 8D0BB20 .incbin "graphics/battle_anims/sprites/072.4bpp.lz" .align 2 @@ -722,7 +722,7 @@ gFile_graphics_battle_anims_sprites_072_palette:: @ 8D0BBF0 .incbin "graphics/battle_anims/sprites/072.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_073_sheet:: @ 8D0BC08 +gBattleAnimSpriteGfx_Duck:: @ 8D0BC08 .incbin "graphics/battle_anims/sprites/073.4bpp.lz" .align 2 @@ -730,7 +730,7 @@ gFile_graphics_battle_anims_sprites_073_palette:: @ 8D0BD24 .incbin "graphics/battle_anims/sprites/073.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_075_sheet:: @ 8D0BD44 +gBattleAnimSpriteGfx_Alert:: @ 8D0BD44 .incbin "graphics/battle_anims/sprites/075.4bpp.lz" .align 2 @@ -738,7 +738,7 @@ gFile_graphics_battle_anims_sprites_075_palette:: @ 8D0BFC0 .incbin "graphics/battle_anims/sprites/075.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_078_sheet:: @ 8D0BFE4 +gBattleAnimSpriteGfx_Shock4:: @ 8D0BFE4 .incbin "graphics/battle_anims/sprites/078.4bpp.lz" .align 2 @@ -746,11 +746,11 @@ gFile_graphics_battle_anims_sprites_078_palette:: @ 8D0C17C .incbin "graphics/battle_anims/sprites/078.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_079_sheet:: @ 8D0C1A4 +gBattleAnimSpriteGfx_Shock:: @ 8D0C1A4 .incbin "graphics/battle_anims/sprites/079.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_080_sheet:: @ 8D0C5D4 +gBattleAnimSpriteGfx_Bell2:: @ 8D0C5D4 .incbin "graphics/battle_anims/sprites/080.4bpp.lz" .align 2 @@ -758,7 +758,7 @@ gFile_graphics_battle_anims_sprites_080_palette:: @ 8D0C938 .incbin "graphics/battle_anims/sprites/080.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_081_sheet:: @ 8D0C95C +gBattleAnimSpriteGfx_PinkGlove:: @ 8D0C95C .incbin "graphics/battle_anims/sprites/081.4bpp.lz" .align 2 @@ -790,7 +790,7 @@ gFile_graphics_unused_line_sketch_2_tilemap:: @ 8D0CAE8 .incbin "graphics/unused/line_sketch_2.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_082_sheet:: @ 8D0CB78 +gBattleAnimSpriteGfx_BlueLines:: @ 8D0CB78 .incbin "graphics/battle_anims/sprites/082.4bpp.lz" .align 2 @@ -866,83 +866,83 @@ gFile_graphics_battle_anims_sprites_103_palette:: @ 8D0CDDC .incbin "graphics/battle_anims/sprites/103.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_083_sheet:: @ 8D0CE00 +gBattleAnimSpriteGfx_Impact3:: @ 8D0CE00 .incbin "graphics/battle_anims/sprites/083.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_084_sheet:: @ 8D0D2A4 +gBattleAnimSpriteGfx_Impact2:: @ 8D0D2A4 .incbin "graphics/battle_anims/sprites/084.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_085_sheet:: @ 8D0D668 +gBattleAnimSpriteGfx_Reticle:: @ 8D0D668 .incbin "graphics/battle_anims/sprites/085.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_086_sheet:: @ 8D0D720 +gBattleAnimSpriteGfx_Breath:: @ 8D0D720 .incbin "graphics/battle_anims/sprites/086.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_088_sheet:: @ 8D0D890 +gBattleAnimSpriteGfx_Snowball:: @ 8D0D890 .incbin "graphics/battle_anims/sprites/088.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_089_sheet:: @ 8D0D8E0 +gBattleAnimSpriteGfx_Vine:: @ 8D0D8E0 .incbin "graphics/battle_anims/sprites/089.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_090_sheet:: @ 8D0DB54 +gBattleAnimSpriteGfx_Sword2:: @ 8D0DB54 .incbin "graphics/battle_anims/sprites/090.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_091_sheet:: @ 8D0DBE4 +gBattleAnimSpriteGfx_Clapping:: @ 8D0DBE4 .incbin "graphics/battle_anims/sprites/091.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_092_sheet:: @ 8D0DD18 +gBattleAnimSpriteGfx_RedTube:: @ 8D0DD18 .incbin "graphics/battle_anims/sprites/092.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_093_sheet:: @ 8D0DD94 +gBattleAnimSpriteGfx_Amnesia:: @ 8D0DD94 .incbin "graphics/battle_anims/sprites/093.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_094_sheet:: @ 8D0E464 +gBattleAnimSpriteGfx_String2:: @ 8D0E464 .incbin "graphics/battle_anims/sprites/094.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_095_sheet:: @ 8D0E608 +gBattleAnimSpriteGfx_Pencil2:: @ 8D0E608 .incbin "graphics/battle_anims/sprites/095.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_096_sheet:: @ 8D0E6B8 +gBattleAnimSpriteGfx_Petal:: @ 8D0E6B8 .incbin "graphics/battle_anims/sprites/096.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_097_sheet:: @ 8D0E828 +gBattleAnimSpriteGfx_BentSpoon:: @ 8D0E828 .incbin "graphics/battle_anims/sprites/097.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_098_sheet:: @ 8D0EA08 +gBattleAnimSpriteGfx_Web:: @ 8D0EA08 .incbin "graphics/battle_anims/sprites/098.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_100_sheet:: @ 8D0EB40 +gBattleAnimSpriteGfx_Coin:: @ 8D0EB40 .incbin "graphics/battle_anims/sprites/100.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_101_sheet:: @ 8D0EC40 +gBattleAnimSpriteGfx_CrackedEgg:: @ 8D0EC40 .incbin "graphics/battle_anims/sprites/101.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_102_sheet:: @ 8D0ED70 +gBattleAnimSpriteGfx_HatchedEgg:: @ 8D0ED70 .incbin "graphics/battle_anims/sprites/102.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_103_sheet:: @ 8D0EF08 +gBattleAnimSpriteGfx_FreshEgg:: @ 8D0EF08 .incbin "graphics/battle_anims/sprites/103.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_104_sheet:: @ 8D0EF74 +gBattleAnimSpriteGfx_Fangs:: @ 8D0EF74 .incbin "graphics/battle_anims/sprites/104.4bpp.lz" .align 2 @@ -950,7 +950,7 @@ gFile_graphics_battle_anims_sprites_104_palette:: @ 8D0F134 .incbin "graphics/battle_anims/sprites/104.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_105_sheet:: @ 8D0F15C +gBattleAnimSpriteGfx_Explosion2:: @ 8D0F15C .incbin "graphics/battle_anims/sprites/105.4bpp.lz" .align 2 @@ -958,11 +958,11 @@ gFile_graphics_battle_anims_sprites_105_palette:: @ 8D0F6E0 .incbin "graphics/battle_anims/sprites/105.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_106_sheet:: @ 8D0F708 +gBattleAnimSpriteGfx_Explosion3:: @ 8D0F708 .incbin "graphics/battle_anims/sprites/106.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_107_sheet:: @ 8D0F7F8 +gBattleAnimSpriteGfx_WaterDroplet:: @ 8D0F7F8 .incbin "graphics/battle_anims/sprites/107.4bpp.lz" .align 2 @@ -970,11 +970,11 @@ gFile_graphics_battle_anims_sprites_107_palette:: @ 8D0FBA4 .incbin "graphics/battle_anims/sprites/107.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_108_sheet:: @ 8D0FBCC +gBattleAnimSpriteGfx_WaterDroplet2:: @ 8D0FBCC .incbin "graphics/battle_anims/sprites/108.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_109_sheet:: @ 8D0FF50 +gBattleAnimSpriteGfx_Seed2:: @ 8D0FF50 .incbin "graphics/battle_anims/sprites/109.4bpp.lz" .align 2 @@ -982,11 +982,11 @@ gFile_graphics_battle_anims_sprites_109_palette:: @ 8D0FF78 .incbin "graphics/battle_anims/sprites/109.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_110_sheet:: @ 8D0FFA0 +gBattleAnimSpriteGfx_Sprout:: @ 8D0FFA0 .incbin "graphics/battle_anims/sprites/110.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_111_sheet:: @ 8D10384 +gBattleAnimSpriteGfx_RedWand:: @ 8D10384 .incbin "graphics/battle_anims/sprites/111.4bpp.lz" .align 2 @@ -994,7 +994,7 @@ gFile_graphics_battle_anims_sprites_111_palette:: @ 8D103C8 .incbin "graphics/battle_anims/sprites/111.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_112_sheet:: @ 8D103EC +gBattleAnimSpriteGfx_PurpleGreenUnk:: @ 8D103EC .incbin "graphics/battle_anims/sprites/112.4bpp.lz" .align 2 @@ -1002,7 +1002,7 @@ gFile_graphics_battle_anims_sprites_112_palette:: @ 8D10714 .incbin "graphics/battle_anims/sprites/112.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_113_sheet:: @ 8D1073C +gBattleAnimSpriteGfx_WaterColumn:: @ 8D1073C .incbin "graphics/battle_anims/sprites/113.4bpp.lz" .align 2 @@ -1010,7 +1010,7 @@ gFile_graphics_battle_anims_sprites_113_palette:: @ 8D109A8 .incbin "graphics/battle_anims/sprites/113.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_114_sheet:: @ 8D109D0 +gBattleAnimSpriteGfx_MudUnk:: @ 8D109D0 .incbin "graphics/battle_anims/sprites/114.4bpp.lz" .align 2 @@ -1034,7 +1034,7 @@ gFile_graphics_unused_color_frames_palette:: @ 8D115A4 .incbin "graphics/unused/color_frames.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_115_sheet:: @ 8D115CC +gBattleAnimSpriteGfx_RainDrops:: @ 8D115CC .incbin "graphics/battle_anims/sprites/115.4bpp.lz" .align 2 @@ -1084,7 +1084,7 @@ gFile_graphics_battle_interface_unused_window4_sheet:: @ 8D12C00 .incbin "graphics/battle_interface/unused_window4.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_116_sheet:: @ 8D12EB0 +gBattleAnimSpriteGfx_FurySwipes:: @ 8D12EB0 .incbin "graphics/battle_anims/sprites/116.4bpp.lz" .align 2 @@ -1092,7 +1092,7 @@ gFile_graphics_battle_anims_sprites_116_palette:: @ 8D1315C .incbin "graphics/battle_anims/sprites/116.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_117_sheet:: @ 8D13184 +gBattleAnimSpriteGfx_Vine2:: @ 8D13184 .incbin "graphics/battle_anims/sprites/117.4bpp.lz" .align 2 @@ -1100,7 +1100,7 @@ gFile_graphics_battle_anims_sprites_117_palette:: @ 8D133C0 .incbin "graphics/battle_anims/sprites/117.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_118_sheet:: @ 8D133DC +gBattleAnimSpriteGfx_Teeth:: @ 8D133DC .incbin "graphics/battle_anims/sprites/118.4bpp.lz" .align 2 @@ -1108,7 +1108,7 @@ gFile_graphics_battle_anims_sprites_118_palette:: @ 8D13574 .incbin "graphics/battle_anims/sprites/118.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_119_sheet:: @ 8D13590 +gBattleAnimSpriteGfx_Bone2:: @ 8D13590 .incbin "graphics/battle_anims/sprites/119.4bpp.lz" .align 2 @@ -1116,7 +1116,7 @@ gFile_graphics_battle_anims_sprites_119_palette:: @ 8D13820 .incbin "graphics/battle_anims/sprites/119.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_120_sheet:: @ 8D13848 +gBattleAnimSpriteGfx_WhiteBag:: @ 8D13848 .incbin "graphics/battle_anims/sprites/120.4bpp.lz" .align 2 @@ -1124,7 +1124,7 @@ gFile_graphics_battle_anims_sprites_120_palette:: @ 8D1393C .incbin "graphics/battle_anims/sprites/120.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_121_sheet:: @ 8D13964 +gBattleAnimSpriteGfx_Unknown:: @ 8D13964 .incbin "graphics/battle_anims/sprites/121.4bpp.lz" .align 2 @@ -1132,7 +1132,7 @@ gFile_graphics_battle_anims_sprites_121_palette:: @ 8D13990 .incbin "graphics/battle_anims/sprites/121.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_122_sheet:: @ 8D139B4 +gBattleAnimSpriteGfx_PurpleCoral:: @ 8D139B4 .incbin "graphics/battle_anims/sprites/122.4bpp.lz" .align 2 @@ -1140,11 +1140,11 @@ gFile_graphics_battle_anims_sprites_122_palette:: @ 8D13AB0 .incbin "graphics/battle_anims/sprites/122.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_123_sheet:: @ 8D13ACC +gBattleAnimSpriteGfx_PurpleDroplet:: @ 8D13ACC .incbin "graphics/battle_anims/sprites/123.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_124_sheet:: @ 8D13C08 +gBattleAnimSpriteGfx_Shock2:: @ 8D13C08 .incbin "graphics/battle_anims/sprites/124.4bpp.lz" .align 2 @@ -1152,7 +1152,7 @@ gFile_graphics_battle_anims_sprites_124_palette:: @ 8D13EA0 .incbin "graphics/battle_anims/sprites/124.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_125_sheet:: @ 8D13EC8 +gBattleAnimSpriteGfx_ClosingEye2:: @ 8D13EC8 .incbin "graphics/battle_anims/sprites/125.4bpp.lz" .align 2 @@ -1160,7 +1160,7 @@ gFile_graphics_battle_anims_sprites_125_palette:: @ 8D13FB4 .incbin "graphics/battle_anims/sprites/125.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_126_sheet:: @ 8D13FDC +gBattleAnimSpriteGfx_MetalBall:: @ 8D13FDC .incbin "graphics/battle_anims/sprites/126.4bpp.lz" .align 2 @@ -1168,7 +1168,7 @@ gFile_graphics_battle_anims_sprites_126_palette:: @ 8D14044 .incbin "graphics/battle_anims/sprites/126.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_127_sheet:: @ 8D14064 +gBattleAnimSpriteGfx_MonsterDoll:: @ 8D14064 .incbin "graphics/battle_anims/sprites/127.4bpp.lz" .align 2 @@ -1176,7 +1176,7 @@ gFile_graphics_battle_anims_sprites_127_palette:: @ 8D14204 .incbin "graphics/battle_anims/sprites/127.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_128_sheet:: @ 8D14228 +gBattleAnimSpriteGfx_Whirlwind:: @ 8D14228 .incbin "graphics/battle_anims/sprites/128.4bpp.lz" .align 2 @@ -1184,11 +1184,11 @@ gFile_graphics_battle_anims_sprites_128_palette:: @ 8D14494 .incbin "graphics/battle_anims/sprites/128.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_129_sheet:: @ 8D144B4 +gBattleAnimSpriteGfx_Whirlwind2:: @ 8D144B4 .incbin "graphics/battle_anims/sprites/129.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_130_sheet:: @ 8D14518 +gBattleAnimSpriteGfx_Explosion4:: @ 8D14518 .incbin "graphics/battle_anims/sprites/130.4bpp.lz" .align 2 @@ -1196,11 +1196,11 @@ gFile_graphics_battle_anims_sprites_130_palette:: @ 8D148E8 .incbin "graphics/battle_anims/sprites/130.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_131_sheet:: @ 8D14910 +gBattleAnimSpriteGfx_Explosion5:: @ 8D14910 .incbin "graphics/battle_anims/sprites/131.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_132_sheet:: @ 8D14A80 +gBattleAnimSpriteGfx_Tongue:: @ 8D14A80 .incbin "graphics/battle_anims/sprites/132.4bpp.lz" .align 2 @@ -1208,7 +1208,7 @@ gFile_graphics_battle_anims_sprites_132_palette:: @ 8D14B80 .incbin "graphics/battle_anims/sprites/132.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_133_sheet:: @ 8D14BA0 +gBattleAnimSpriteGfx_Smoke:: @ 8D14BA0 .incbin "graphics/battle_anims/sprites/133.4bpp.lz" .align 2 @@ -1216,11 +1216,11 @@ gFile_graphics_battle_anims_sprites_133_palette:: @ 8D14C1C .incbin "graphics/battle_anims/sprites/133.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_134_sheet:: @ 8D14C44 +gBattleAnimSpriteGfx_Smoke2:: @ 8D14C44 .incbin "graphics/battle_anims/sprites/134.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_076_sheet:: @ 8D14D14 +gBattleAnimSpriteGfx_BlueFlames:: @ 8D14D14 .incbin "graphics/battle_anims/sprites/076.4bpp.lz" .align 2 @@ -1228,7 +1228,7 @@ gFile_graphics_battle_anims_sprites_076_palette:: @ 8D14F50 .incbin "graphics/battle_anims/sprites/076.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_077_sheet:: @ 8D14F78 +gBattleAnimSpriteGfx_BlueFlames2:: @ 8D14F78 .incbin "graphics/battle_anims/sprites/077.4bpp.lz" .align 2 @@ -1336,7 +1336,7 @@ gFile_graphics_contest_misc_2_palette:: @ 8D1A42C .incbin "graphics/contest/misc_2.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_135_sheet:: @ 8D1A518 +gBattleAnimSpriteGfx_Impact:: @ 8D1A518 .incbin "graphics/battle_anims/sprites/135.4bpp.lz" .align 2 @@ -1348,7 +1348,7 @@ gFile_graphics_battle_anims_sprites_particles_sheet:: @ 8D1A608 .incbin "graphics/battle_anims/sprites/particles.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_136_sheet:: @ 8D1A6B8 +gBattleAnimSpriteGfx_CircleImpact:: @ 8D1A6B8 .incbin "graphics/battle_anims/sprites/136.4bpp.lz" .align 2 @@ -1356,11 +1356,11 @@ gFile_graphics_battle_anims_sprites_136_palette:: @ 8D1A6DC .incbin "graphics/battle_anims/sprites/136.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_137_sheet:: @ 8D1A704 +gBattleAnimSpriteGfx_Scratch:: @ 8D1A704 .incbin "graphics/battle_anims/sprites/137.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_139_sheet:: @ 8D1A908 +gBattleAnimSpriteGfx_SharpTeeth:: @ 8D1A908 .incbin "graphics/battle_anims/sprites/139.4bpp.lz" .align 2 @@ -1368,15 +1368,15 @@ gFile_graphics_battle_anims_sprites_139_palette:: @ 8D1AAF8 .incbin "graphics/battle_anims/sprites/139.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_145_sheet:: @ 8D1AB18 +gBattleAnimSpriteGfx_Clamp:: @ 8D1AB18 .incbin "graphics/battle_anims/sprites/145.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_138_sheet:: @ 8D1ACB8 +gBattleAnimSpriteGfx_Cut:: @ 8D1ACB8 .incbin "graphics/battle_anims/sprites/138.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_140_sheet:: @ 8D1AE04 +gBattleAnimSpriteGfx_RainbowRings:: @ 8D1AE04 .incbin "graphics/battle_anims/sprites/140.4bpp.lz" .align 2 @@ -1384,7 +1384,7 @@ gFile_graphics_battle_anims_sprites_140_palette:: @ 8D1AE84 .incbin "graphics/battle_anims/sprites/140.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_141_sheet:: @ 8D1AEA4 +gBattleAnimSpriteGfx_IceCrystals:: @ 8D1AEA4 .incbin "graphics/battle_anims/sprites/141.4bpp.lz" .align 2 @@ -1392,7 +1392,7 @@ gFile_graphics_battle_anims_sprites_141_palette:: @ 8D1AFAC .incbin "graphics/battle_anims/sprites/141.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_142_sheet:: @ 8D1AFCC +gBattleAnimSpriteGfx_IceSpikes:: @ 8D1AFCC .incbin "graphics/battle_anims/sprites/142.4bpp.lz" .align 2 @@ -1404,7 +1404,7 @@ gFile_graphics_unused_old_beatup_palette:: @ 8D1B0C8 .incbin "graphics/unused/old_beatup.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_147_sheet:: @ 8D1B0E4 +gBattleAnimSpriteGfx_Orbs:: @ 8D1B0E4 .incbin "graphics/battle_anims/sprites/147.4bpp.lz" .align 2 @@ -1412,11 +1412,11 @@ gFile_graphics_battle_anims_sprites_147_palette:: @ 8D1B1F8 .incbin "graphics/battle_anims/sprites/147.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_149_sheet:: @ 8D1B220 +gBattleAnimSpriteGfx_WaterOrb:: @ 8D1B220 .incbin "graphics/battle_anims/sprites/149.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_148_sheet:: @ 8D1B2F0 +gBattleAnimSpriteGfx_WaterImpact:: @ 8D1B2F0 .incbin "graphics/battle_anims/sprites/148.4bpp.lz" .align 2 @@ -1428,7 +1428,7 @@ gFile_graphics_battle_anims_sprites_259_palette:: @ 8D1B3F4 .incbin "graphics/battle_anims/sprites/259.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_074_sheet:: @ 8D1B414 +gBattleAnimSpriteGfx_MudSand:: @ 8D1B414 .incbin "graphics/battle_anims/sprites/074.4bpp.lz" .align 2 @@ -1436,7 +1436,7 @@ gFile_graphics_battle_anims_sprites_074_palette:: @ 8D1B47C .incbin "graphics/battle_anims/sprites/074.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_150_sheet:: @ 8D1B4A0 +gBattleAnimSpriteGfx_PoisonBubble:: @ 8D1B4A0 .incbin "graphics/battle_anims/sprites/150.4bpp.lz" .align 2 @@ -1444,11 +1444,11 @@ gFile_graphics_battle_anims_sprites_150_palette:: @ 8D1B574 .incbin "graphics/battle_anims/sprites/150.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_151_sheet:: @ 8D1B590 +gBattleAnimSpriteGfx_ToxicBubble:: @ 8D1B590 .incbin "graphics/battle_anims/sprites/151.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_153_sheet:: @ 8D1B688 +gBattleAnimSpriteGfx_HornHit2:: @ 8D1B688 .incbin "graphics/battle_anims/sprites/153.4bpp.lz" .align 2 @@ -1456,7 +1456,7 @@ gFile_graphics_battle_anims_sprites_153_palette:: @ 8D1B6F4 .incbin "graphics/battle_anims/sprites/153.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_154_sheet:: @ 8D1B70C +gBattleAnimSpriteGfx_AirWave2:: @ 8D1B70C .incbin "graphics/battle_anims/sprites/154.4bpp.lz" .align 2 @@ -1464,7 +1464,7 @@ gFile_graphics_battle_anims_sprites_154_palette:: @ 8D1B7B8 .incbin "graphics/battle_anims/sprites/154.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_155_sheet:: @ 8D1B7D8 +gBattleAnimSpriteGfx_SmallBubbles:: @ 8D1B7D8 .incbin "graphics/battle_anims/sprites/155.4bpp.lz" .align 2 @@ -1472,7 +1472,7 @@ gFile_graphics_battle_anims_sprites_155_palette:: @ 8D1B8A0 .incbin "graphics/battle_anims/sprites/155.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_156_sheet:: @ 8D1B8C0 +gBattleAnimSpriteGfx_RoundShadow:: @ 8D1B8C0 .incbin "graphics/battle_anims/sprites/156.4bpp.lz" .align 2 @@ -1480,7 +1480,7 @@ gFile_graphics_battle_anims_sprites_156_palette:: @ 8D1BAD8 .incbin "graphics/battle_anims/sprites/156.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_157_sheet:: @ 8D1BB00 +gBattleAnimSpriteGfx_Sunlight:: @ 8D1BB00 .incbin "graphics/battle_anims/sprites/157.4bpp.lz" .align 2 @@ -1488,7 +1488,7 @@ gFile_graphics_battle_anims_sprites_157_palette:: @ 8D1BB64 .incbin "graphics/battle_anims/sprites/157.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_158_sheet:: @ 8D1BB7C +gBattleAnimSpriteGfx_Spore:: @ 8D1BB7C .incbin "graphics/battle_anims/sprites/158.4bpp.lz" .align 2 @@ -1496,7 +1496,7 @@ gFile_graphics_battle_anims_sprites_158_palette:: @ 8D1BC44 .incbin "graphics/battle_anims/sprites/158.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_159_sheet:: @ 8D1BC68 +gBattleAnimSpriteGfx_Flower:: @ 8D1BC68 .incbin "graphics/battle_anims/sprites/159.4bpp.lz" .align 2 @@ -1504,7 +1504,7 @@ gFile_graphics_battle_anims_sprites_159_palette:: @ 8D1BCE4 .incbin "graphics/battle_anims/sprites/159.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_160_sheet:: @ 8D1BD0C +gBattleAnimSpriteGfx_RazorLeaf:: @ 8D1BD0C .incbin "graphics/battle_anims/sprites/160.4bpp.lz" .align 2 @@ -1512,7 +1512,7 @@ gFile_graphics_battle_anims_sprites_160_palette:: @ 8D1BDB4 .incbin "graphics/battle_anims/sprites/160.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_144_sheet:: @ 8D1BDDC +gBattleAnimSpriteGfx_MistCloud:: @ 8D1BDDC .incbin "graphics/battle_anims/sprites/144.4bpp.lz" .align 2 @@ -1532,7 +1532,7 @@ gFile_graphics_unknown_unknown_D1BE74_tilemap:: @ 8D1BEB4 .incbin "graphics/unknown/unknown_D1BE74.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_162_sheet:: @ 8D1BFB8 +gBattleAnimSpriteGfx_WhirlwindLines:: @ 8D1BFB8 .incbin "graphics/battle_anims/sprites/162.4bpp.lz" .align 2 @@ -1540,7 +1540,7 @@ gFile_graphics_battle_anims_sprites_162_palette:: @ 8D1C03C .incbin "graphics/battle_anims/sprites/162.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_163_sheet:: @ 8D1C05C +gBattleAnimSpriteGfx_GoldRing:: @ 8D1C05C .incbin "graphics/battle_anims/sprites/163.4bpp.lz" .align 2 @@ -1560,7 +1560,7 @@ gFile_graphics_battle_anims_sprites_165_palette:: @ 8D1C104 .incbin "graphics/battle_anims/sprites/165.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_166_sheet:: @ 8D1C11C +gBattleAnimSpriteGfx_GreenLightWall:: @ 8D1C11C .incbin "graphics/battle_anims/sprites/166.4bpp.lz" .align 2 @@ -1584,7 +1584,7 @@ gFile_graphics_battle_anims_sprites_170_palette:: @ 8D1C4A8 .incbin "graphics/battle_anims/sprites/170.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_171_sheet:: @ 8D1C4C8 +gBattleAnimSpriteGfx_BlackBall2:: @ 8D1C4C8 .incbin "graphics/battle_anims/sprites/171.4bpp.lz" .align 2 @@ -1604,7 +1604,7 @@ gFile_graphics_contest_judge_palette:: @ 8D1C830 .incbin "graphics/contest/judge.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_001_sheet:: @ 8D1C858 +gBattleAnimSpriteGfx_Spark:: @ 8D1C858 .incbin "graphics/battle_anims/sprites/001.4bpp.lz" .align 2 @@ -1612,19 +1612,19 @@ gFile_graphics_battle_anims_sprites_001_palette:: @ 8D1C90C .incbin "graphics/battle_anims/sprites/001.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_173_sheet:: @ 8D1C934 +gBattleAnimSpriteGfx_SparkH:: @ 8D1C934 .incbin "graphics/battle_anims/sprites/173.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_00_sheet:: @ 8D1C9BC +gBattleAnimBgImage_Dark:: @ 8D1C9BC .incbin "graphics/battle_anims/backgrounds/00.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_00_palette:: @ 8D1CFB4 +gBattleAnimBgPalette_Dark:: @ 8D1CFB4 .incbin "graphics/battle_anims/backgrounds/00.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_00_tilemap:: @ 8D1CFD4 +gBattleAnimBgTilemap_Dark:: @ 8D1CFD4 .incbin "graphics/battle_anims/backgrounds/00.bin.lz" .align 2 @@ -1652,7 +1652,7 @@ gFile_graphics_unused_goosuto_tilemap:: @ 8D1D624 .incbin "graphics/unused/goosuto.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_174_sheet:: @ 8D1D774 +gBattleAnimSpriteGfx_YellowStar:: @ 8D1D774 .incbin "graphics/battle_anims/sprites/174.4bpp.lz" .align 2 @@ -1660,7 +1660,7 @@ gFile_graphics_battle_anims_sprites_174_palette:: @ 8D1D814 .incbin "graphics/battle_anims/sprites/174.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_175_sheet:: @ 8D1D83C +gBattleAnimSpriteGfx_LargeFreshEgg:: @ 8D1D83C .incbin "graphics/battle_anims/sprites/175.4bpp.lz" .align 2 @@ -1668,7 +1668,7 @@ gFile_graphics_battle_anims_sprites_175_palette:: @ 8D1D8A0 .incbin "graphics/battle_anims/sprites/175.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_176_sheet:: @ 8D1D8C8 +gBattleAnimSpriteGfx_ShadowBall:: @ 8D1D8C8 .incbin "graphics/battle_anims/sprites/176.4bpp.lz" .align 2 @@ -1676,7 +1676,7 @@ gFile_graphics_battle_anims_sprites_176_palette:: @ 8D1DA20 .incbin "graphics/battle_anims/sprites/176.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_177_sheet:: @ 8D1DA48 +gBattleAnimSpriteGfx_Lick:: @ 8D1DA48 .incbin "graphics/battle_anims/sprites/177.4bpp.lz" .align 2 @@ -1684,7 +1684,7 @@ gFile_graphics_battle_anims_sprites_177_palette:: @ 8D1DB0C .incbin "graphics/battle_anims/sprites/177.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_178_sheet:: @ 8D1DB24 +gBattleAnimSpriteGfx_VoidLines:: @ 8D1DB24 .incbin "graphics/battle_anims/sprites/178.4bpp.lz" .align 2 @@ -1696,19 +1696,19 @@ gFile_graphics_battle_anims_sprites_179_palette:: @ 8D1DCB4 .incbin "graphics/battle_anims/sprites/179.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_179_sheet:: @ 8D1DCDC +gBattleAnimSpriteGfx_String:: @ 8D1DCDC .incbin "graphics/battle_anims/sprites/179.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_180_sheet:: @ 8D1DDB8 +gBattleAnimSpriteGfx_WebThread:: @ 8D1DDB8 .incbin "graphics/battle_anims/sprites/180.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_181_sheet:: @ 8D1DDD0 +gBattleAnimSpriteGfx_SpiderWeb:: @ 8D1DDD0 .incbin "graphics/battle_anims/sprites/181.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_182_sheet:: @ 8D1E160 +gBattleAnimSpriteGfx_Lightbulb:: @ 8D1E160 .incbin "graphics/battle_anims/sprites/182.4bpp.lz" .align 2 @@ -1716,7 +1716,7 @@ gFile_graphics_battle_anims_sprites_182_palette:: @ 8D1E204 .incbin "graphics/battle_anims/sprites/182.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_183_sheet:: @ 8D1E22C +gBattleAnimSpriteGfx_Slash:: @ 8D1E22C .incbin "graphics/battle_anims/sprites/183.4bpp.lz" .align 2 @@ -1724,7 +1724,7 @@ gFile_graphics_battle_anims_sprites_183_palette:: @ 8D1E4A4 .incbin "graphics/battle_anims/sprites/183.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_184_sheet:: @ 8D1E4CC +gBattleAnimSpriteGfx_FocusEnergy:: @ 8D1E4CC .incbin "graphics/battle_anims/sprites/184.4bpp.lz" .align 2 @@ -1732,7 +1732,7 @@ gFile_graphics_battle_anims_sprites_184_palette:: @ 8D1E620 .incbin "graphics/battle_anims/sprites/184.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_185_sheet:: @ 8D1E648 +gBattleAnimSpriteGfx_SphereToCube:: @ 8D1E648 .incbin "graphics/battle_anims/sprites/185.4bpp.lz" .align 2 @@ -1740,19 +1740,19 @@ gFile_graphics_battle_anims_sprites_185_palette:: @ 8D1EA5C .incbin "graphics/battle_anims/sprites/185.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_03_sheet:: @ 8D1EA84 +gBattleAnimBgImage_Psychic:: @ 8D1EA84 .incbin "graphics/battle_anims/backgrounds/03.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_03_palette:: @ 8D1EC54 +gBattleAnimBgPalette_Psychic:: @ 8D1EC54 .incbin "graphics/battle_anims/backgrounds/03.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_03_tilemap:: @ 8D1EC78 +gBattleAnimBgTilemap_Psychic:: @ 8D1EC78 .incbin "graphics/battle_anims/backgrounds/03.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_187_sheet:: @ 8D1ED40 +gBattleAnimSpriteGfx_Eye:: @ 8D1ED40 .incbin "graphics/battle_anims/sprites/187.4bpp.lz" .align 2 @@ -1760,7 +1760,7 @@ gFile_graphics_battle_anims_sprites_187_palette:: @ 8D1EF30 .incbin "graphics/battle_anims/sprites/187.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_186_sheet:: @ 8D1EF50 +gBattleAnimSpriteGfx_Tendrils:: @ 8D1EF50 .incbin "graphics/battle_anims/sprites/186.4bpp.lz" .align 2 @@ -1796,7 +1796,7 @@ gFile_graphics_unused_shadow_palette:: @ 8D1FD94 .incbin "graphics/unused/shadow.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_014_sheet:: @ 8D1FDA8 +gBattleAnimSpriteGfx_LockOn:: @ 8D1FDA8 .incbin "graphics/battle_anims/sprites/014.4bpp.lz" .align 2 @@ -1804,7 +1804,7 @@ gFile_graphics_battle_anims_sprites_014_palette:: @ 8D1FE3C .incbin "graphics/battle_anims/sprites/014.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_190_sheet:: @ 8D1FE58 +gBattleAnimSpriteGfx_OpeningEye:: @ 8D1FE58 .incbin "graphics/battle_anims/sprites/190.4bpp.lz" .align 2 @@ -1812,7 +1812,7 @@ gFile_graphics_battle_anims_sprites_190_palette:: @ 8D200B4 .incbin "graphics/battle_anims/sprites/190.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_191_sheet:: @ 8D200D8 +gBattleAnimSpriteGfx_RoundWhiteHalo:: @ 8D200D8 .incbin "graphics/battle_anims/sprites/191.4bpp.lz" .align 2 @@ -1820,7 +1820,7 @@ gFile_graphics_battle_anims_sprites_191_palette:: @ 8D20344 .incbin "graphics/battle_anims/sprites/191.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_189_sheet:: @ 8D2036C +gBattleAnimSpriteGfx_TealAlert:: @ 8D2036C .incbin "graphics/battle_anims/sprites/189.4bpp.lz" .align 2 @@ -1828,7 +1828,7 @@ gFile_graphics_battle_anims_sprites_189_palette:: @ 8D203F0 .incbin "graphics/battle_anims/sprites/189.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_192_sheet:: @ 8D20410 +gBattleAnimSpriteGfx_FangAttack:: @ 8D20410 .incbin "graphics/battle_anims/sprites/192.4bpp.lz" .align 2 @@ -1836,7 +1836,7 @@ gFile_graphics_battle_anims_sprites_192_palette:: @ 8D20690 .incbin "graphics/battle_anims/sprites/192.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_193_sheet:: @ 8D206B8 +gBattleAnimSpriteGfx_PurpleHandOutline:: @ 8D206B8 .incbin "graphics/battle_anims/sprites/193.4bpp.lz" .align 2 @@ -1852,7 +1852,7 @@ gFile_graphics_battle_anims_masks_curse_tilemap:: @ 8D20858 .incbin "graphics/battle_anims/masks/curse.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_002_sheet:: @ 8D20958 +gBattleAnimSpriteGfx_Pencil:: @ 8D20958 .incbin "graphics/battle_anims/sprites/002.4bpp.lz" .align 2 @@ -1860,7 +1860,7 @@ gFile_graphics_battle_anims_sprites_002_palette:: @ 8D20A3C .incbin "graphics/battle_anims/sprites/002.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_196_sheet:: @ 8D20A64 +gBattleAnimSpriteGfx_Spiral:: @ 8D20A64 .incbin "graphics/battle_anims/sprites/196.4bpp.lz" .align 2 @@ -1868,7 +1868,7 @@ gFile_graphics_battle_anims_sprites_196_palette:: @ 8D20E08 .incbin "graphics/battle_anims/sprites/196.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_194_sheet:: @ 8D20E20 +gBattleAnimSpriteGfx_Moon:: @ 8D20E20 .incbin "graphics/battle_anims/sprites/194.4bpp.lz" .align 2 @@ -1876,7 +1876,7 @@ gFile_graphics_battle_anims_sprites_194_palette:: @ 8D21158 .incbin "graphics/battle_anims/sprites/194.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_195_sheet:: @ 8D21180 +gBattleAnimSpriteGfx_GreenSparkle:: @ 8D21180 .incbin "graphics/battle_anims/sprites/195.4bpp.lz" .align 2 @@ -1884,7 +1884,7 @@ gFile_graphics_battle_anims_sprites_195_palette:: @ 8D21238 .incbin "graphics/battle_anims/sprites/195.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_197_sheet:: @ 8D21258 +gBattleAnimSpriteGfx_SnoreZ:: @ 8D21258 .incbin "graphics/battle_anims/sprites/197.4bpp.lz" .align 2 @@ -1892,7 +1892,7 @@ gFile_graphics_battle_anims_sprites_197_palette:: @ 8D213C8 .incbin "graphics/battle_anims/sprites/197.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_198_sheet:: @ 8D213F0 +gBattleAnimSpriteGfx_Explosion:: @ 8D213F0 .incbin "graphics/battle_anims/sprites/198.4bpp.lz" .align 2 @@ -1900,7 +1900,7 @@ gFile_graphics_battle_anims_sprites_198_palette:: @ 8D217E0 .incbin "graphics/battle_anims/sprites/198.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_199_sheet:: @ 8D21808 +gBattleAnimSpriteGfx_Nail:: @ 8D21808 .incbin "graphics/battle_anims/sprites/199.4bpp.lz" .align 2 @@ -1908,7 +1908,7 @@ gFile_graphics_battle_anims_sprites_199_palette:: @ 8D218D0 .incbin "graphics/battle_anims/sprites/199.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_200_sheet:: @ 8D218EC +gBattleAnimSpriteGfx_GhostlySpirit:: @ 8D218EC .incbin "graphics/battle_anims/sprites/200.4bpp.lz" .align 2 @@ -1916,7 +1916,7 @@ gFile_graphics_battle_anims_sprites_200_palette:: @ 8D21A2C .incbin "graphics/battle_anims/sprites/200.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_201_sheet:: @ 8D21A48 +gBattleAnimSpriteGfx_WarmRock:: @ 8D21A48 .incbin "graphics/battle_anims/sprites/201.4bpp.lz" .align 2 @@ -1924,7 +1924,7 @@ gFile_graphics_battle_anims_sprites_201_palette:: @ 8D220B8 .incbin "graphics/battle_anims/sprites/201.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_204_sheet:: @ 8D220E0 +gBattleAnimSpriteGfx_PunchImpact:: @ 8D220E0 .incbin "graphics/battle_anims/sprites/204.4bpp.lz" .align 2 @@ -1932,7 +1932,7 @@ gFile_graphics_battle_anims_sprites_204_palette:: @ 8D22254 .incbin "graphics/battle_anims/sprites/204.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_202_sheet:: @ 8D2227C +gBattleAnimSpriteGfx_BreakingEgg:: @ 8D2227C .incbin "graphics/battle_anims/sprites/202.4bpp.lz" .align 2 @@ -1940,7 +1940,7 @@ gFile_graphics_battle_anims_sprites_202_palette:: @ 8D223E4 .incbin "graphics/battle_anims/sprites/202.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_203_sheet:: @ 8D22408 +gBattleAnimSpriteGfx_ThinRing:: @ 8D22408 .incbin "graphics/battle_anims/sprites/203.4bpp.lz" .align 2 @@ -1948,7 +1948,7 @@ gFile_graphics_battle_anims_sprites_203_palette:: @ 8D225B4 .incbin "graphics/battle_anims/sprites/203.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_206_sheet:: @ 8D225D8 +gBattleAnimSpriteGfx_MusicNotes2:: @ 8D225D8 .incbin "graphics/battle_anims/sprites/206.4bpp.lz" .align 2 @@ -1956,7 +1956,7 @@ gFile_graphics_battle_anims_sprites_206_palette:: @ 8D227E4 .incbin "graphics/battle_anims/sprites/206.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_205_sheet:: @ 8D22878 +gBattleAnimSpriteGfx_Bell:: @ 8D22878 .incbin "graphics/battle_anims/sprites/205.4bpp.lz" .align 2 @@ -1964,7 +1964,7 @@ gFile_graphics_battle_anims_sprites_205_palette:: @ 8D22AAC .incbin "graphics/battle_anims/sprites/205.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_207_sheet:: @ 8D22AD0 +gBattleAnimSpriteGfx_SpeedDust:: @ 8D22AD0 .incbin "graphics/battle_anims/sprites/207.4bpp.lz" .align 2 @@ -1972,11 +1972,11 @@ gFile_graphics_battle_anims_sprites_207_palette:: @ 8D22B9C .incbin "graphics/battle_anims/sprites/207.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_208_sheet:: @ 8D22BC0 +gBattleAnimSpriteGfx_TornMetal:: @ 8D22BC0 .incbin "graphics/battle_anims/sprites/208.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_209_sheet:: @ 8D22FB0 +gBattleAnimSpriteGfx_ThoughtBubble:: @ 8D22FB0 .incbin "graphics/battle_anims/sprites/209.4bpp.lz" .align 2 @@ -1984,7 +1984,7 @@ gFile_graphics_battle_anims_sprites_209_palette:: @ 8D232B8 .incbin "graphics/battle_anims/sprites/209.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_064_sheet:: @ 8D232D8 +gBattleAnimSpriteGfx_Finger:: @ 8D232D8 .incbin "graphics/battle_anims/sprites/064.4bpp.lz" .align 2 @@ -1992,7 +1992,7 @@ gFile_graphics_battle_anims_sprites_064_palette:: @ 8D233C8 .incbin "graphics/battle_anims/sprites/064.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_210_sheet:: @ 8D233EC +gBattleAnimSpriteGfx_MagentaHeart:: @ 8D233EC .incbin "graphics/battle_anims/sprites/210.4bpp.lz" .align 2 @@ -2020,7 +2020,7 @@ gFile_graphics_battle_anims_backgrounds_attract_tilemap:: @ 8D23F4C .incbin "graphics/battle_anims/backgrounds/attract.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_217_sheet:: @ 8D241C8 +gBattleAnimSpriteGfx_RedOrb:: @ 8D241C8 .incbin "graphics/battle_anims/sprites/217.4bpp.lz" .align 2 @@ -2028,15 +2028,15 @@ gFile_graphics_battle_anims_sprites_217_palette:: @ 8D24230 .incbin "graphics/battle_anims/sprites/217.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_212_sheet:: @ 8D24250 +gBattleAnimSpriteGfx_CircleOfLight:: @ 8D24250 .incbin "graphics/battle_anims/sprites/212.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_211_sheet:: @ 8D24484 +gBattleAnimSpriteGfx_ElectricOrbs:: @ 8D24484 .incbin "graphics/battle_anims/sprites/211.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_213_sheet:: @ 8D244D4 +gBattleAnimSpriteGfx_Electricity:: @ 8D244D4 .incbin "graphics/battle_anims/sprites/213.4bpp.lz" .align 2 @@ -2044,11 +2044,11 @@ gFile_graphics_battle_anims_sprites_211_palette:: @ 8D24740 .incbin "graphics/battle_anims/sprites/211.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_214_sheet:: @ 8D24764 +gBattleAnimSpriteGfx_Finger2:: @ 8D24764 .incbin "graphics/battle_anims/sprites/214.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_215_sheet:: @ 8D249F4 +gBattleAnimSpriteGfx_MovementWaves:: @ 8D249F4 .incbin "graphics/battle_anims/sprites/215.4bpp.lz" .align 2 @@ -2068,11 +2068,11 @@ gFile_graphics_battle_anims_sprites_218_palette:: @ 8D24DFC .incbin "graphics/battle_anims/sprites/218.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_218_sheet:: @ 8D24E24 +gBattleAnimSpriteGfx_EyeSparkle:: @ 8D24E24 .incbin "graphics/battle_anims/sprites/218.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_087_sheet:: @ 8D24ED0 +gBattleAnimSpriteGfx_Anger:: @ 8D24ED0 .incbin "graphics/battle_anims/sprites/087.4bpp.lz" .align 2 @@ -2080,7 +2080,7 @@ gFile_graphics_battle_anims_sprites_087_palette:: @ 8D24F28 .incbin "graphics/battle_anims/sprites/087.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_018_sheet:: @ 8D24F50 +gBattleAnimSpriteGfx_Conversion:: @ 8D24F50 .incbin "graphics/battle_anims/sprites/018.4bpp.lz" .align 2 @@ -2092,7 +2092,7 @@ gFile_graphics_battle_anims_sprites_220_palette:: @ 8D24FA8 .incbin "graphics/battle_anims/sprites/220.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_220_sheet:: @ 8D24FD0 +gBattleAnimSpriteGfx_Angel:: @ 8D24FD0 .incbin "graphics/battle_anims/sprites/220.4bpp.lz" .align 2 @@ -2100,11 +2100,11 @@ gFile_graphics_battle_anims_sprites_221_palette:: @ 8D250FC .incbin "graphics/battle_anims/sprites/221.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_221_sheet:: @ 8D2511C +gBattleAnimSpriteGfx_Devil:: @ 8D2511C .incbin "graphics/battle_anims/sprites/221.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_222_sheet:: @ 8D25380 +gBattleAnimSpriteGfx_Swipe:: @ 8D25380 .incbin "graphics/battle_anims/sprites/222.4bpp.lz" .align 2 @@ -2116,7 +2116,7 @@ gFile_graphics_battle_anims_sprites_223_palette:: @ 8D25694 .incbin "graphics/battle_anims/sprites/223.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_223_sheet:: @ 8D256B4 +gBattleAnimSpriteGfx_Roots:: @ 8D256B4 .incbin "graphics/battle_anims/sprites/223.4bpp.lz" .align 2 @@ -2124,7 +2124,7 @@ gFile_graphics_battle_anims_sprites_224_palette:: @ 8D25948 .incbin "graphics/battle_anims/sprites/224.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_224_sheet:: @ 8D25968 +gBattleAnimSpriteGfx_ItemBag:: @ 8D25968 .incbin "graphics/battle_anims/sprites/224.4bpp.lz" .align 2 @@ -2132,7 +2132,7 @@ gFile_graphics_battle_anims_sprites_230_palette:: @ 8D25A64 .incbin "graphics/battle_anims/sprites/230.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_230_sheet:: @ 8D25A8C +gBattleAnimSpriteGfx_TriForceTriangle:: @ 8D25A8C .incbin "graphics/battle_anims/sprites/230.4bpp.lz" .align 2 @@ -2140,31 +2140,31 @@ gFile_graphics_battle_anims_sprites_228_palette:: @ 8D25CD0 .incbin "graphics/battle_anims/sprites/228.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_228_sheet:: @ 8D25CF0 +gBattleAnimSpriteGfx_LetterZ:: @ 8D25CF0 .incbin "graphics/battle_anims/sprites/228.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_04_palette:: @ 8D25D98 +gBattleAnimBgPalette_Impact:: @ 8D25D98 .incbin "graphics/battle_anims/backgrounds/04.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_04_sheet:: @ 8D25DC0 +gBattleAnimBgImage_Impact:: @ 8D25DC0 .incbin "graphics/battle_anims/backgrounds/04.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_04_tilemap:: @ 8D26B2C +gBattleAnimBgTilemap_ImpactOpponent:: @ 8D26B2C .incbin "graphics/battle_anims/backgrounds/04.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_05_tilemap:: @ 8D27028 +gBattleAnimBgTilemap_ImpactPlayer:: @ 8D27028 .incbin "graphics/battle_anims/backgrounds/05.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_06_tilemap:: @ 8D274F8 +gBattleAnimBgTilemap_ImpactContests:: @ 8D274F8 .incbin "graphics/battle_anims/backgrounds/06.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_225_sheet:: @ 8D27938 +gBattleAnimSpriteGfx_JaggedMusicNote:: @ 8D27938 .incbin "graphics/battle_anims/sprites/225.4bpp.lz" .align 2 @@ -2172,11 +2172,11 @@ gFile_graphics_battle_anims_sprites_225_palette:: @ 8D27ABC .incbin "graphics/battle_anims/sprites/225.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_227_sheet:: @ 8D27AE4 +gBattleAnimSpriteGfx_Spotlight:: @ 8D27AE4 .incbin "graphics/battle_anims/sprites/227.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_226_sheet:: @ 8D27C2C +gBattleAnimSpriteGfx_Pokeball:: @ 8D27C2C .incbin "graphics/battle_anims/sprites/226.4bpp.lz" .align 2 @@ -2184,7 +2184,7 @@ gFile_graphics_battle_anims_sprites_226_palette:: @ 8D27CB8 .incbin "graphics/battle_anims/sprites/226.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_229_sheet:: @ 8D27CDC +gBattleAnimSpriteGfx_RapidSpin:: @ 8D27CDC .incbin "graphics/battle_anims/sprites/229.4bpp.lz" .align 2 @@ -2192,7 +2192,7 @@ gFile_graphics_battle_anims_sprites_229_palette:: @ 8D27E98 .incbin "graphics/battle_anims/sprites/229.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_099_sheet:: @ 8D27EC0 +gBattleAnimSpriteGfx_MilkBottle:: @ 8D27EC0 .incbin "graphics/battle_anims/sprites/099.4bpp.lz" .align 2 @@ -2200,7 +2200,7 @@ gFile_graphics_battle_anims_sprites_099_palette:: @ 8D27FE0 .incbin "graphics/battle_anims/sprites/099.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_232_sheet:: @ 8D28008 +gBattleAnimSpriteGfx_WispFire:: @ 8D28008 .incbin "graphics/battle_anims/sprites/232.4bpp.lz" .align 2 @@ -2208,11 +2208,11 @@ gFile_graphics_battle_anims_sprites_231_palette:: @ 8D28540 .incbin "graphics/battle_anims/sprites/231.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_231_sheet:: @ 8D28568 +gBattleAnimSpriteGfx_WispOrb:: @ 8D28568 .incbin "graphics/battle_anims/sprites/231.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_233_sheet:: @ 8D28738 +gBattleAnimSpriteGfx_GoldStars:: @ 8D28738 .incbin "graphics/battle_anims/sprites/233.4bpp.lz" .align 2 @@ -2220,7 +2220,7 @@ gFile_graphics_battle_anims_sprites_233_palette:: @ 8D287BC .incbin "graphics/battle_anims/sprites/233.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_234_sheet:: @ 8D287E4 +gBattleAnimSpriteGfx_EclipsingOrb:: @ 8D287E4 .incbin "graphics/battle_anims/sprites/234.4bpp.lz" .align 2 @@ -2228,7 +2228,7 @@ gFile_graphics_battle_anims_sprites_234_palette:: @ 8D289A4 .incbin "graphics/battle_anims/sprites/234.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_238_sheet:: @ 8D289C8 +gBattleAnimSpriteGfx_PinkPetal:: @ 8D289C8 .incbin "graphics/battle_anims/sprites/238.4bpp.lz" .align 2 @@ -2236,7 +2236,7 @@ gFile_graphics_battle_anims_sprites_238_palette:: @ 8D28A30 .incbin "graphics/battle_anims/sprites/238.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_235_sheet:: @ 8D28A54 +gBattleAnimSpriteGfx_GrayOrb:: @ 8D28A54 .incbin "graphics/battle_anims/sprites/235.4bpp.lz" .align 2 @@ -2252,55 +2252,55 @@ gFile_graphics_battle_anims_sprites_237_palette:: @ 8D28ADC .incbin "graphics/battle_anims/sprites/237.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_07_sheet:: @ 8D28AF8 +gBattleAnimBgImage_Drill:: @ 8D28AF8 .incbin "graphics/battle_anims/backgrounds/07.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_07_palette:: @ 8D28CA0 +gBattleAnimBgPalette_Drill:: @ 8D28CA0 .incbin "graphics/battle_anims/backgrounds/07.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_18_palette:: @ 8D28CC8 +gBattleAnimBgPalette_Sky:: @ 8D28CC8 .incbin "graphics/battle_anims/backgrounds/18.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_07_tilemap:: @ 8D28CF0 +gBattleAnimBgTilemap_Drill:: @ 8D28CF0 .incbin "graphics/battle_anims/backgrounds/07.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_08_tilemap:: @ 8D28E80 +gBattleAnimBgTilemap_DrillContests:: @ 8D28E80 .incbin "graphics/battle_anims/backgrounds/08.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_20_sheet:: @ 8D2900C +gBattleAnimBgImage_Aurora:: @ 8D2900C .incbin "graphics/battle_anims/backgrounds/20.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_20_palette:: @ 8D29A34 +gBattleAnimBgPalette_Aurora:: @ 8D29A34 .incbin "graphics/battle_anims/backgrounds/20.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_20_tilemap:: @ 8D29A54 +gBattleAnimBgTilemap_Aurora:: @ 8D29A54 .incbin "graphics/battle_anims/backgrounds/20.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_09_tilemap:: @ 8D29C58 +gBattleAnimBgTilemap_HighspeedOpponent:: @ 8D29C58 .incbin "graphics/battle_anims/backgrounds/09.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_09_palette:: @ 8D29F50 +gBattleAnimBgPalette_Highspeed:: @ 8D29F50 .incbin "graphics/battle_anims/backgrounds/09.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_22_palette:: @ 8D29F70 +gBattleAnimBgPalette_Bug:: @ 8D29F70 .incbin "graphics/battle_anims/backgrounds/22.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_09_sheet:: @ 8D29F90 +gBattleAnimBgImage_Highspeed:: @ 8D29F90 .incbin "graphics/battle_anims/backgrounds/09.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_10_tilemap:: @ 8D2A510 +gBattleAnimBgTilemap_HighspeedPlayer:: @ 8D2A510 .incbin "graphics/battle_anims/backgrounds/10.bin.lz" .align 2 @@ -2316,39 +2316,39 @@ gFile_graphics_battle_anims_masks_morning_sun_tilemap:: @ 8D2A8C0 .incbin "graphics/battle_anims/masks/morning_sun.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_12_tilemap:: @ 8D2A9DC +gBattleAnimBgTilemap_GuillotineOpponent:: @ 8D2A9DC .incbin "graphics/battle_anims/backgrounds/12.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_13_tilemap:: @ 8D2ACA4 +gBattleAnimBgTilemap_GuillotinePlayer:: @ 8D2ACA4 .incbin "graphics/battle_anims/backgrounds/13.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_14_tilemap:: @ 8D2AFA0 +gBattleAnimBgTilemap_GuillotineContests:: @ 8D2AFA0 .incbin "graphics/battle_anims/backgrounds/14.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_12_sheet:: @ 8D2B230 +gBattleAnimBgImage_Guillotine:: @ 8D2B230 .incbin "graphics/battle_anims/backgrounds/12.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_12_palette:: @ 8D2BF98 +gBattleAnimBgPalette_Guillotine:: @ 8D2BF98 .incbin "graphics/battle_anims/backgrounds/12.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_11_sheet:: @ 8D2BFB8 +gBattleAnimBgImage_Thunder:: @ 8D2BFB8 .incbin "graphics/battle_anims/backgrounds/11.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_11_palette:: @ 8D2C954 +gBattleAnimBgPalette_Thunder:: @ 8D2C954 .incbin "graphics/battle_anims/backgrounds/11.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_11_tilemap:: @ 8D2C97C +gBattleAnimBgTilemap_Thunder:: @ 8D2C97C .incbin "graphics/battle_anims/backgrounds/11.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_239_sheet:: @ 8D2CC74 +gBattleAnimSpriteGfx_PainSplit:: @ 8D2CC74 .incbin "graphics/battle_anims/sprites/239.4bpp.lz" .align 2 @@ -2356,7 +2356,7 @@ gFile_graphics_battle_anims_sprites_239_palette:: @ 8D2CD58 .incbin "graphics/battle_anims/sprites/239.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_143_sheet:: @ 8D2CD80 +gBattleAnimSpriteGfx_HandsAndFeet:: @ 8D2CD80 .incbin "graphics/battle_anims/sprites/143.4bpp.lz" .align 2 @@ -2364,7 +2364,7 @@ gFile_graphics_battle_anims_sprites_143_palette:: @ 8D2CFB0 .incbin "graphics/battle_anims/sprites/143.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_240_sheet:: @ 8D2CFC8 +gBattleAnimSpriteGfx_Confetti:: @ 8D2CFC8 .incbin "graphics/battle_anims/sprites/240.4bpp.lz" .align 2 @@ -2384,7 +2384,7 @@ gSubstituteDollTilemap:: @ 8D2D2F4 .incbin "graphics/battle_anims/sprites/substitute.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_241_sheet:: @ 8D2D51C +gBattleAnimSpriteGfx_GreenStar:: @ 8D2D51C .incbin "graphics/battle_anims/sprites/241.4bpp.lz" .align 2 @@ -2400,7 +2400,7 @@ gFile_graphics_misc_confetti_palette:: @ 8D2D71C .incbin "graphics/misc/confetti.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_242_sheet:: @ 8D2D744 +gBattleAnimSpriteGfx_PinkCloud:: @ 8D2D744 .incbin "graphics/battle_anims/sprites/242.4bpp.lz" .align 2 @@ -2408,7 +2408,7 @@ gFile_graphics_battle_anims_sprites_242_palette:: @ 8D2D880 .incbin "graphics/battle_anims/sprites/242.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_243_sheet:: @ 8D2D8A4 +gBattleAnimSpriteGfx_SweatDrop:: @ 8D2D8A4 .incbin "graphics/battle_anims/sprites/243.4bpp.lz" .align 2 @@ -2476,15 +2476,15 @@ gFile_graphics_battle_anims_sprites_245_palette:: @ 8D2E0B4 .incbin "graphics/battle_anims/sprites/245.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_245_sheet:: @ 8D2E0DC +gBattleAnimSpriteGfx_PurpleScratch:: @ 8D2E0DC .incbin "graphics/battle_anims/sprites/245.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_246_sheet:: @ 8D2E280 +gBattleAnimSpriteGfx_PurpleSwipe:: @ 8D2E280 .incbin "graphics/battle_anims/sprites/246.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_244_sheet:: @ 8D2E728 +gBattleAnimSpriteGfx_GuardRing:: @ 8D2E728 .incbin "graphics/battle_anims/sprites/244.4bpp.lz" .align 2 @@ -2492,11 +2492,11 @@ gFile_graphics_battle_anims_sprites_244_palette:: @ 8D2E804 .incbin "graphics/battle_anims/sprites/244.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_247_sheet:: @ 8D2E820 +gBattleAnimSpriteGfx_TagHand:: @ 8D2E820 .incbin "graphics/battle_anims/sprites/247.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_053_sheet:: @ 8D2EA04 +gBattleAnimSpriteGfx_NoiseLine:: @ 8D2EA04 .incbin "graphics/battle_anims/sprites/053.4bpp.lz" .align 2 @@ -2508,7 +2508,7 @@ gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap:: @ 8D2EC70 .incbin "graphics/battle_anims/masks/unknown_D2EC24.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_248_sheet:: @ 8D2ED78 +gBattleAnimSpriteGfx_SmallRedEye:: @ 8D2ED78 .incbin "graphics/battle_anims/sprites/248.4bpp.lz" .align 2 @@ -2516,7 +2516,7 @@ gFile_graphics_battle_anims_sprites_248_palette:: @ 8D2ED90 .incbin "graphics/battle_anims/sprites/248.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_249_sheet:: @ 8D2EDA8 +gBattleAnimSpriteGfx_HollowOrb:: @ 8D2EDA8 .incbin "graphics/battle_anims/sprites/249.4bpp.lz" .align 2 @@ -2524,11 +2524,11 @@ gFile_graphics_battle_anims_sprites_249_palette:: @ 8D2EDF8 .incbin "graphics/battle_anims/sprites/249.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_250_sheet:: @ 8D2EE18 +gBattleAnimSpriteGfx_XSign:: @ 8D2EE18 .incbin "graphics/battle_anims/sprites/250.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_251_sheet:: @ 8D2F00C +gBattleAnimSpriteGfx_BluegreenOrb:: @ 8D2F00C .incbin "graphics/battle_anims/sprites/251.4bpp.lz" .align 2 @@ -2536,7 +2536,7 @@ gFile_graphics_battle_anims_sprites_251_palette:: @ 8D2F070 .incbin "graphics/battle_anims/sprites/251.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_252_sheet:: @ 8D2F088 +gBattleAnimSpriteGfx_PawPrint:: @ 8D2F088 .incbin "graphics/battle_anims/sprites/252.4bpp.lz" .align 2 @@ -2544,7 +2544,7 @@ gFile_graphics_battle_anims_sprites_252_palette:: @ 8D2F1A0 .incbin "graphics/battle_anims/sprites/252.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_253_sheet:: @ 8D2F1C4 +gBattleAnimSpriteGfx_PurpleFlame:: @ 8D2F1C4 .incbin "graphics/battle_anims/sprites/253.4bpp.lz" .align 2 @@ -2552,7 +2552,7 @@ gFile_graphics_battle_anims_sprites_253_palette:: @ 8D2F3A0 .incbin "graphics/battle_anims/sprites/253.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_254_sheet:: @ 8D2F3C8 +gBattleAnimSpriteGfx_RedBall:: @ 8D2F3C8 .incbin "graphics/battle_anims/sprites/254.4bpp.lz" .align 2 @@ -2560,7 +2560,7 @@ gFile_graphics_battle_anims_sprites_254_palette:: @ 8D2F500 .incbin "graphics/battle_anims/sprites/254.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_255_sheet:: @ 8D2F528 +gBattleAnimSpriteGfx_SmellingsaltEffect:: @ 8D2F528 .incbin "graphics/battle_anims/sprites/255.4bpp.lz" .align 2 @@ -2568,7 +2568,7 @@ gFile_graphics_battle_anims_sprites_255_palette:: @ 8D2F5A0 .incbin "graphics/battle_anims/sprites/255.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_258_sheet:: @ 8D2F5B4 +gBattleAnimSpriteGfx_MagnifyingGlass:: @ 8D2F5B4 .incbin "graphics/battle_anims/sprites/258.4bpp.lz" .align 2 @@ -2576,7 +2576,7 @@ gFile_graphics_battle_anims_sprites_258_palette:: @ 8D2F69C .incbin "graphics/battle_anims/sprites/258.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_256_sheet:: @ 8D2F6C4 +gBattleAnimSpriteGfx_Meteor:: @ 8D2F6C4 .incbin "graphics/battle_anims/sprites/256.4bpp.lz" .align 2 @@ -2584,7 +2584,7 @@ gFile_graphics_battle_anims_sprites_256_palette:: @ 8D2FA50 .incbin "graphics/battle_anims/sprites/256.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_257_sheet:: @ 8D2FA78 +gBattleAnimSpriteGfx_FlatRock:: @ 8D2FA78 .incbin "graphics/battle_anims/sprites/257.4bpp.lz" .align 2 @@ -13544,7 +13544,7 @@ gFile_graphics_battle_terrain_building_anim_map_tilemap:: @ 8E790C4 .incbin "graphics/battle_terrain/building/anim_map.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_261_sheet:: @ 8E791E8 +gBattleAnimSpriteGfx_FlyingDirt:: @ 8E791E8 .incbin "graphics/battle_anims/sprites/261.4bpp.lz" .align 2 @@ -13560,7 +13560,7 @@ gBattleAnimSpritePal_FlyingDirt:: @ 8E799FC .incbin "graphics/battle_anims/sprites/261.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_260_sheet:: @ 8E79A24 +gBattleAnimSpriteGfx_MetalSoundWaves:: @ 8E79A24 .incbin "graphics/battle_anims/sprites/260.4bpp.lz" .align 2 @@ -13568,19 +13568,19 @@ gFile_graphics_battle_anims_sprites_260_palette:: @ 8E79BE0 .incbin "graphics/battle_anims/sprites/260.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_15_sheet:: @ 8E79BF8 +gBattleAnimBgImage_Ice:: @ 8E79BF8 .incbin "graphics/battle_anims/backgrounds/15.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_15_palette:: @ 8E7A568 +gBattleAnimBgPalette_Ice:: @ 8E7A568 .incbin "graphics/battle_anims/backgrounds/15.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_15_tilemap:: @ 8E7A58C +gBattleAnimBgTilemap_Ice:: @ 8E7A58C .incbin "graphics/battle_anims/backgrounds/15.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_262_sheet:: @ 8E7A784 +gBattleAnimSpriteGfx_IcicleSpear:: @ 8E7A784 .incbin "graphics/battle_anims/sprites/262.4bpp.lz" .align 2 @@ -13600,7 +13600,7 @@ gFile_graphics_contest_nextturn_random:: @ 8E7A95C .incbin "graphics/contest/nextturn_random.4bpp" .align 2 -gFile_graphics_battle_anims_sprites_264_sheet:: @ 8E7A97C +gBattleAnimSpriteGfx_GlowyRedOrb:: @ 8E7A97C .incbin "graphics/battle_anims/sprites/264.4bpp.lz" .align 2 @@ -13632,7 +13632,7 @@ gFile_graphics_contest_nextturn:: @ 8E7ABB8 .incbin "graphics/contest/nextturn.gbapal" .align 2 -gFile_graphics_battle_anims_sprites_272_sheet:: @ 8E7ABD8 +gBattleAnimSpriteGfx_Splash:: @ 8E7ABD8 .incbin "graphics/battle_anims/sprites/272.4bpp.lz" .align 2 @@ -13640,11 +13640,11 @@ gFile_graphics_battle_anims_sprites_272_palette:: @ 8E7ADF4 .incbin "graphics/battle_anims/sprites/272.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_273_sheet:: @ 8E7AE18 +gBattleAnimSpriteGfx_SweatBead:: @ 8E7AE18 .incbin "graphics/battle_anims/sprites/273.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_269_sheet:: @ 8E7AE40 +gBattleAnimSpriteGfx_Pokeblock:: @ 8E7AE40 .incbin "graphics/battle_anims/sprites/269.4bpp.lz" .align 2 @@ -13652,15 +13652,15 @@ gFile_graphics_battle_anims_sprites_269_palette:: @ 8E7AE94 .incbin "graphics/battle_anims/sprites/269.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_274_sheet:: @ 8E7AEAC +gBattleAnimSpriteGfx_Gem1:: @ 8E7AEAC .incbin "graphics/battle_anims/sprites/274.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_275_sheet:: @ 8E7B02C +gBattleAnimSpriteGfx_Gem2:: @ 8E7B02C .incbin "graphics/battle_anims/sprites/275.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_276_sheet:: @ 8E7B198 +gBattleAnimSpriteGfx_Gem3:: @ 8E7B198 .incbin "graphics/battle_anims/sprites/276.4bpp.lz" .align 2 @@ -13668,19 +13668,19 @@ gFile_graphics_battle_anims_sprites_274_palette:: @ 8E7B300 .incbin "graphics/battle_anims/sprites/274.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_17_sheet:: @ 8E7B328 +gBattleAnimBgImage_InAir:: @ 8E7B328 .incbin "graphics/battle_anims/backgrounds/17.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_17_palette:: @ 8E7B484 +gBattleAnimBgPalette_InAir:: @ 8E7B484 .incbin "graphics/battle_anims/backgrounds/17.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_17_tilemap:: @ 8E7B4AC +gBattleAnimBgTilemap_InAir:: @ 8E7B4AC .incbin "graphics/battle_anims/backgrounds/17.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_280_sheet:: @ 8E7B694 +gBattleAnimSpriteGfx_Protect:: @ 8E7B694 .incbin "graphics/battle_anims/sprites/280.4bpp.lz" .align 2 @@ -13704,15 +13704,15 @@ gMonIcon_Egg:: @ 8E7BB88 .incbin "baserom.gba", 0xE7BB88, 0x400 @UNKNOWN .align 2 -gFile_graphics_battle_anims_backgrounds_02_sheet:: @ 8E7BF88 +gBattleAnimBgImage_Ghost:: @ 8E7BF88 .incbin "graphics/battle_anims/backgrounds/02.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_02_palette:: @ 8E7CC50 +gBattleAnimBgPalette_Ghost:: @ 8E7CC50 .incbin "graphics/battle_anims/backgrounds/02.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_02_tilemap:: @ 8E7CC6C +gBattleAnimBgTilemap_Ghost:: @ 8E7CC6C .incbin "graphics/battle_anims/backgrounds/02.bin.lz" .align 2 @@ -13720,7 +13720,7 @@ gFile_graphics_battle_anims_sprites_287_palette:: @ 8E7CF60 .incbin "graphics/battle_anims/sprites/287.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_24_palette:: @ 8E7CF88 +gBattleAnimBgPalette_Solarbeam:: @ 8E7CF88 .incbin "graphics/battle_anims/backgrounds/24.gbapal.lz" .align 2 @@ -13740,15 +13740,15 @@ gFile_graphics_berry_blender_outer_map_tilemap:: @ 8E7E700 .incbin "graphics/berry_blender/outer_map.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_16_palette:: @ 8E7EA14 +gBattleAnimBgPalette_Cosmic:: @ 8E7EA14 .incbin "graphics/battle_anims/backgrounds/16.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_16_sheet:: @ 8E7EA3C +gBattleAnimBgImage_Cosmic:: @ 8E7EA3C .incbin "graphics/battle_anims/backgrounds/16.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_16_tilemap:: @ 8E7EC9C +gBattleAnimBgTilemap_Cosmic:: @ 8E7EC9C .incbin "graphics/battle_anims/backgrounds/16.bin.lz" .align 2 @@ -13756,7 +13756,7 @@ gFile_graphics_battle_anims_sprites_277_palette:: @ 8E7EDD8 .incbin "graphics/battle_anims/sprites/277.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_277_sheet:: @ 8E7EE00 +gBattleAnimSpriteGfx_SlamHit2:: @ 8E7EE00 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" .align 2 @@ -13768,7 +13768,7 @@ gFile_graphics_battle_anims_sprites_283_palette:: @ 8E7F36C .incbin "graphics/battle_anims/sprites/283.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_283_sheet:: @ 8E7F388 +gBattleAnimSpriteGfx_WeatherBall:: @ 8E7F388 .incbin "graphics/battle_anims/sprites/283.4bpp.lz" .align 2 @@ -13784,7 +13784,7 @@ gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap:: @ 8E7F874 .incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_263_sheet:: @ 8E7FA58 +gBattleAnimSpriteGfx_Hail:: @ 8E7FA58 .incbin "graphics/battle_anims/sprites/263.4bpp.lz" .align 2 @@ -13792,7 +13792,7 @@ gFile_graphics_battle_anims_sprites_263_palette:: @ 8E7FA98 .incbin "graphics/battle_anims/sprites/263.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_266_sheet:: @ 8E7FAB0 +gBattleAnimSpriteGfx_GreenSpike:: @ 8E7FAB0 .incbin "graphics/battle_anims/sprites/266.4bpp.lz" .align 2 @@ -13808,7 +13808,7 @@ gFile_graphics_battle_anims_sprites_268_palette:: @ 8E7FB20 .incbin "graphics/battle_anims/sprites/268.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_278_sheet:: @ 8E7FB38 +gBattleAnimSpriteGfx_Recycle:: @ 8E7FB38 .incbin "graphics/battle_anims/sprites/278.4bpp.lz" .align 2 @@ -13816,7 +13816,7 @@ gFile_graphics_battle_anims_sprites_278_palette:: @ 8E7FD44 .incbin "graphics/battle_anims/sprites/278.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_279_sheet:: @ 8E7FD60 +gBattleAnimSpriteGfx_RedParticles:: @ 8E7FD60 .incbin "graphics/battle_anims/sprites/279.4bpp.lz" .align 2 @@ -13824,7 +13824,7 @@ gFile_graphics_battle_anims_sprites_279_palette:: @ 8E7FDAC .incbin "graphics/battle_anims/sprites/279.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_281_sheet:: @ 8E7FDC8 +gBattleAnimSpriteGfx_DirtMound:: @ 8E7FDC8 .incbin "graphics/battle_anims/sprites/281.4bpp.lz" .align 2 @@ -13832,19 +13832,19 @@ gFile_graphics_battle_anims_sprites_281_palette:: @ 8E7FF50 .incbin "graphics/battle_anims/sprites/281.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_21_sheet:: @ 8E7FF70 +gBattleAnimBgImage_Fissure:: @ 8E7FF70 .incbin "graphics/battle_anims/backgrounds/21.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_21_palette:: @ 8E80264 +gBattleAnimBgPalette_Fissure:: @ 8E80264 .incbin "graphics/battle_anims/backgrounds/21.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_21_tilemap:: @ 8E80280 +gBattleAnimBgTilemap_Fissure:: @ 8E80280 .incbin "graphics/battle_anims/backgrounds/21.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_284_sheet:: @ 8E8056C +gBattleAnimSpriteGfx_Bird:: @ 8E8056C .incbin "graphics/battle_anims/sprites/284.4bpp.lz" .align 2 @@ -13852,7 +13852,7 @@ gFile_graphics_battle_anims_sprites_284_palette:: @ 8E808E8 .incbin "graphics/battle_anims/sprites/284.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_285_sheet:: @ 8E80904 +gBattleAnimSpriteGfx_CrossImpact:: @ 8E80904 .incbin "graphics/battle_anims/sprites/285.4bpp.lz" .align 2 @@ -13884,7 +13884,7 @@ gFile_graphics_battle_anims_sprites_286_palette:: @ 8E825AC .incbin "graphics/battle_anims/sprites/286.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_188_sheet:: @ 8E825D4 +gBattleAnimSpriteGfx_WhiteShadow:: @ 8E825D4 .incbin "graphics/battle_anims/sprites/188.4bpp.lz" .align 2 @@ -15908,7 +15908,7 @@ gFile_graphics_battle_anims_sprites_282_palette:: @ 8E93748 .incbin "graphics/battle_anims/sprites/282.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_282_sheet:: @ 8E93770 +gBattleAnimSpriteGfx_Shock3:: @ 8E93770 .incbin "graphics/battle_anims/sprites/282.4bpp.lz" .align 2 @@ -15916,7 +15916,7 @@ gFile_graphics_battle_anims_sprites_270_palette:: @ 8E93958 .incbin "graphics/battle_anims/sprites/270.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_270_sheet:: @ 8E93974 +gBattleAnimSpriteGfx_WhiteFeather:: @ 8E93974 .incbin "graphics/battle_anims/sprites/270.4bpp.lz" .align 2 @@ -15924,7 +15924,7 @@ gFile_graphics_battle_anims_sprites_271_palette:: @ 8E93A9C .incbin "graphics/battle_anims/sprites/271.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_271_sheet:: @ 8E93AB4 +gBattleAnimSpriteGfx_Sparkle6:: @ 8E93AB4 .incbin "graphics/battle_anims/sprites/271.4bpp.lz" .align 2 -- cgit v1.2.3 From 9bc5170673883795cc4397aa010a1dd08cad9d85 Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 1 Dec 2019 13:00:24 -0500 Subject: resolve data/battle_anim.s --- data/battle_anim.s | 813 ----------------------------------------------------- data/graphics.s | 486 ++++++++++++++++---------------- 2 files changed, 243 insertions(+), 1056 deletions(-) delete mode 100644 data/battle_anim.s (limited to 'data') diff --git a/data/battle_anim.s b/data/battle_anim.s deleted file mode 100644 index ddb6230c9..000000000 --- a/data/battle_anim.s +++ /dev/null @@ -1,813 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 -gOamData_83AC9C8:: - .4byte 0x00000000, 0x00000800 - -gOamData_83AC9D0:: - .4byte 0x40000000, 0x00000800 - -gOamData_83AC9D8:: - .4byte 0x80000000, 0x00000800 - -gOamData_83AC9E0:: - .4byte 0xc0000000, 0x00000800 - -gOamData_83AC9E8:: - .4byte 0x00004000, 0x00000800 - -gOamData_83AC9F0:: - .4byte 0x40004000, 0x00000800 - -gOamData_83AC9F8:: - .4byte 0x80004000, 0x00000800 - -gOamData_83ACA00:: - .4byte 0xc0004000, 0x00000800 - -gOamData_83ACA08:: - .4byte 0x00008000, 0x00000800 - -gOamData_83ACA10:: - .4byte 0x40008000, 0x00000800 - -gOamData_83ACA18:: - .4byte 0x80008000, 0x00000800 - -gOamData_83ACA20:: - .4byte 0xc0008000, 0x00000800 - -gOamData_83ACA28:: - .4byte 0x00000100, 0x00000800 - -gOamData_83ACA30:: - .4byte 0x40000100, 0x00000800 - -gOamData_83ACA38:: - .4byte 0x80000100, 0x00000800 - -gOamData_83ACA40:: - .4byte 0xc0000100, 0x00000800 - -gOamData_83ACA48:: - .4byte 0x00004100, 0x00000800 - -gOamData_83ACA50:: - .4byte 0x40004100, 0x00000800 - -gOamData_83ACA58:: - .4byte 0x80004100, 0x00000800 - -gOamData_83ACA60:: - .4byte 0xc0004100, 0x00000800 - -gOamData_83ACA68:: - .4byte 0x00008100, 0x00000800 - -gOamData_83ACA70:: - .4byte 0x40008100, 0x00000800 - -gOamData_83ACA78:: - .4byte 0x80008100, 0x00000800 - -gOamData_83ACA80:: - .4byte 0xc0008100, 0x00000800 - -gOamData_83ACA88:: - .4byte 0x00000300, 0x00000800 - -gOamData_83ACA90:: - .4byte 0x40000300, 0x00000800 - -gOamData_83ACA98:: - .4byte 0x80000300, 0x00000800 - -gOamData_83ACAA0:: - .4byte 0xc0000300, 0x00000800 - -gOamData_83ACAA8:: - .4byte 0x00004300, 0x00000800 - -gOamData_83ACAB0:: - .4byte 0x40004300, 0x00000800 - -gOamData_83ACAB8:: - .4byte 0x80004300, 0x00000800 - -gOamData_83ACAC0:: - .4byte 0xc0004300, 0x00000800 - -gOamData_83ACAC8:: - .4byte 0x00008300, 0x00000800 - -gOamData_83ACAD0:: - .4byte 0x40008300, 0x00000800 - -gOamData_83ACAD8:: - .4byte 0x80008300, 0x00000800 - -gOamData_83ACAE0:: - .4byte 0xc0008300, 0x00000800 - -gOamData_83ACAE8:: - .4byte 0x00000400, 0x00000800 - -gOamData_83ACAF0:: - .4byte 0x40000400, 0x00000800 - -gOamData_83ACAF8:: - .4byte 0x80000400, 0x00000800 - -gOamData_83ACB00:: - .4byte 0xc0000400, 0x00000800 - -gOamData_83ACB08:: - .4byte 0x00004400, 0x00000800 - -gOamData_83ACB10:: - .4byte 0x40004400, 0x00000800 - -gOamData_83ACB18:: - .4byte 0x80004400, 0x00000800 - -gOamData_83ACB20:: - .4byte 0xc0004400, 0x00000800 - -gOamData_83ACB28:: - .4byte 0x00008400, 0x00000800 - -gOamData_83ACB30:: - .4byte 0x40008400, 0x00000800 - -gOamData_83ACB38:: - .4byte 0x80008400, 0x00000800 - -gOamData_83ACB40:: - .4byte 0xc0008400, 0x00000800 - -gOamData_83ACB48:: - .4byte 0x00000500, 0x00000800 - -gOamData_83ACB50:: - .4byte 0x40000500, 0x00000800 - -gOamData_83ACB58:: - .4byte 0x80000500, 0x00000800 - -gOamData_83ACB60:: - .4byte 0xc0000500, 0x00000800 - -gOamData_83ACB68:: - .4byte 0x00004500, 0x00000800 - -gOamData_83ACB70:: - .4byte 0x40004500, 0x00000800 - -gOamData_83ACB78:: - .4byte 0x80004500, 0x00000800 - -gOamData_83ACB80:: - .4byte 0xc0004500, 0x00000800 - -gOamData_83ACB88:: - .4byte 0x00008500, 0x00000800 - -gOamData_83ACB90:: - .4byte 0x40008500, 0x00000800 - -gOamData_83ACB98:: - .4byte 0x80008500, 0x00000800 - -gOamData_83ACBA0:: - .4byte 0xc0008500, 0x00000800 - -gOamData_83ACBA8:: - .4byte 0x00000700, 0x00000800 - -gOamData_83ACBB0:: - .4byte 0x40000700, 0x00000800 - -gOamData_83ACBB8:: - .4byte 0x80000700, 0x00000800 - -gOamData_83ACBC0:: - .4byte 0xc0000700, 0x00000800 - -gOamData_83ACBC8:: - .4byte 0x00004700, 0x00000800 - -gOamData_83ACBD0:: - .4byte 0x40004700, 0x00000800 - -gOamData_83ACBD8:: - .4byte 0x80004700, 0x00000800 - -gOamData_83ACBE0:: - .4byte 0xc0004700, 0x00000800 - -gOamData_83ACBE8:: - .4byte 0x00008700, 0x00000800 - -gOamData_83ACBF0:: - .4byte 0x40008700, 0x00000800 - -gOamData_83ACBF8:: - .4byte 0x80008700, 0x00000800 - -gOamData_83ACC00:: - .4byte 0xc0008700, 0x00000800 - -gUnknown_83ACC08:: @ 83ACC08 - obj_tiles gFile_graphics_battle_anims_sprites_000_sheet, 0x0200, 10000 - obj_tiles gFile_graphics_battle_anims_sprites_001_sheet, 0x0300, 10001 - obj_tiles gFile_graphics_battle_anims_sprites_002_sheet, 0x0200, 10002 - obj_tiles gFile_graphics_battle_anims_sprites_003_sheet, 0x0100, 10003 - obj_tiles gFile_graphics_battle_anims_sprites_004_sheet, 0x0200, 10004 - obj_tiles gFile_graphics_battle_anims_sprites_005_sheet, 0x0400, 10005 - obj_tiles gFile_graphics_battle_anims_sprites_006_sheet, 0x0180, 10006 - obj_tiles gFile_graphics_battle_anims_sprites_007_sheet, 0x0800, 10007 - obj_tiles gFile_graphics_battle_anims_sprites_008_sheet, 0x0020, 10008 - obj_tiles gFile_graphics_battle_anims_sprites_009_sheet, 0x0400, 10009 - obj_tiles gFile_graphics_battle_anims_sprites_010_sheet, 0x1200, 10010 - obj_tiles gFile_graphics_battle_anims_sprites_011_sheet, 0x0180, 10011 - obj_tiles gFile_graphics_battle_anims_sprites_012_sheet, 0x0080, 10012 - obj_tiles gFile_graphics_battle_anims_sprites_013_sheet, 0x0080, 10013 - obj_tiles gFile_graphics_battle_anims_sprites_014_sheet, 0x0280, 10014 - obj_tiles gFile_graphics_battle_anims_sprites_015_sheet, 0x0080, 10015 - obj_tiles gFile_graphics_battle_anims_sprites_016_sheet, 0x0100, 10016 - obj_tiles gFile_graphics_battle_anims_sprites_017_sheet, 0x0020, 10017 - obj_tiles gFile_graphics_battle_anims_sprites_018_sheet, 0x0080, 10018 - obj_tiles gFile_graphics_battle_anims_sprites_019_sheet, 0x0400, 10019 - obj_tiles gFile_graphics_battle_anims_sprites_020_sheet, 0x0200, 10020 - obj_tiles gFile_graphics_battle_anims_sprites_021_sheet, 0x0a00, 10021 - obj_tiles gFile_graphics_battle_anims_sprites_021_sheet, 0x0a00, 10022 - obj_tiles gFile_graphics_battle_anims_sprites_023_sheet, 0x0380, 10023 - obj_tiles gFile_graphics_battle_anims_sprites_024_sheet, 0x0300, 10024 - obj_tiles gFile_graphics_battle_anims_sprites_025_sheet, 0x0a00, 10025 - obj_tiles gFile_graphics_battle_anims_sprites_026_sheet, 0x0a00, 10026 - obj_tiles gFile_graphics_battle_anims_sprites_027_sheet, 0x0a00, 10027 - obj_tiles gFile_graphics_battle_anims_sprites_028_sheet, 0x0a00, 10028 - obj_tiles gFile_graphics_battle_anims_sprites_029_sheet, 0x0a00, 10029 - obj_tiles gFile_graphics_battle_anims_sprites_030_sheet, 0x0a00, 10030 - obj_tiles gFile_graphics_battle_anims_sprites_031_sheet, 0x0e00, 10031 - obj_tiles gFile_graphics_battle_anims_sprites_032_sheet, 0x0380, 10032 - obj_tiles gFile_graphics_battle_anims_sprites_033_sheet, 0x1000, 10033 - obj_tiles gFile_graphics_battle_anims_sprites_034_sheet, 0x0800, 10034 - obj_tiles gFile_graphics_battle_anims_sprites_035_sheet, 0x0a00, 10035 - obj_tiles gFile_graphics_battle_anims_sprites_036_sheet, 0x0800, 10036 - obj_tiles gFile_graphics_battle_anims_sprites_037_sheet, 0x0a00, 10037 - obj_tiles gFile_graphics_battle_anims_sprites_038_sheet, 0x0a00, 10038 - obj_tiles gFile_graphics_battle_anims_sprites_039_sheet, 0x0a00, 10039 - obj_tiles gFile_graphics_battle_anims_sprites_040_sheet, 0x0a00, 10040 - obj_tiles gFile_graphics_battle_anims_sprites_041_sheet, 0x0a00, 10041 - obj_tiles gFile_graphics_battle_anims_sprites_042_sheet, 0x0a00, 10042 - obj_tiles gFile_graphics_battle_anims_sprites_043_sheet, 0x0a00, 10043 - obj_tiles gFile_graphics_battle_anims_sprites_044_sheet, 0x0a00, 10044 - obj_tiles gFile_graphics_battle_anims_sprites_045_sheet, 0x0a00, 10045 - obj_tiles gFile_graphics_battle_anims_sprites_046, 0x1000, 10046 - obj_tiles gFile_graphics_battle_anims_sprites_046, 0x1000, 10047 - obj_tiles gFile_graphics_battle_anims_sprites_048_sheet, 0x1000, 10048 - obj_tiles gFile_graphics_battle_anims_sprites_048_sheet, 0x1000, 10049 - obj_tiles gFile_graphics_battle_anims_sprites_050_sheet, 0x0200, 10050 - obj_tiles gFile_graphics_battle_anims_sprites_051_sheet, 0x0200, 10051 - obj_tiles gFile_graphics_battle_anims_sprites_052_sheet, 0x0200, 10052 - obj_tiles gFile_graphics_battle_anims_sprites_053_sheet, 0x0800, 10053 - obj_tiles gFile_graphics_battle_anims_sprites_054_sheet, 0x0080, 10054 - obj_tiles gFile_graphics_battle_anims_sprites_055_sheet, 0x0200, 10055 - obj_tiles gFile_graphics_battle_anims_sprites_056_sheet, 0x1000, 10056 - obj_tiles gFile_graphics_battle_anims_sprites_057_sheet, 0x0180, 10057 - obj_tiles gFile_graphics_battle_anims_sprites_058_sheet, 0x0c00, 10058 - obj_tiles gFile_graphics_battle_anims_sprites_059_sheet, 0x0100, 10059 - obj_tiles gFile_graphics_battle_anims_sprites_060_sheet, 0x0040, 10060 - obj_tiles gFile_graphics_battle_anims_sprites_061_sheet, 0x0180, 10061 - obj_tiles gFile_graphics_battle_anims_sprites_062_sheet, 0x0800, 10062 - obj_tiles gFile_graphics_battle_anims_sprites_063_sheet, 0x0480, 10063 - obj_tiles gFile_graphics_battle_anims_sprites_064_sheet, 0x0200, 10064 - obj_tiles gFile_graphics_battle_anims_sprites_065_sheet, 0x0200, 10065 - obj_tiles gFile_graphics_battle_anims_sprites_066_sheet, 0x0100, 10066 - obj_tiles gFile_graphics_battle_anims_sprites_065_sheet, 0x0200, 10067 - obj_tiles gFile_graphics_battle_anims_sprites_065_sheet, 0x0200, 10068 - obj_tiles gFile_graphics_battle_anims_sprites_065_sheet, 0x0200, 10069 - obj_tiles gFile_graphics_battle_anims_sprites_070_sheet, 0x0200, 10070 - obj_tiles gFile_graphics_battle_anims_sprites_071_sheet, 0x0a00, 10071 - obj_tiles gFile_graphics_battle_anims_sprites_072_sheet, 0x0300, 10072 - obj_tiles gFile_graphics_battle_anims_sprites_073_sheet, 0x0180, 10073 - obj_tiles gFile_graphics_battle_anims_sprites_074_sheet, 0x00a0, 10074 - obj_tiles gFile_graphics_battle_anims_sprites_075_sheet, 0x0700, 10075 - obj_tiles gFile_graphics_battle_anims_sprites_076_sheet, 0x0400, 10076 - obj_tiles gFile_graphics_battle_anims_sprites_077_sheet, 0x0200, 10077 - obj_tiles gFile_graphics_battle_anims_sprites_078_sheet, 0x0300, 10078 - obj_tiles gFile_graphics_battle_anims_sprites_079_sheet, 0x0c00, 10079 - obj_tiles gFile_graphics_battle_anims_sprites_080_sheet, 0x0a00, 10080 - obj_tiles gFile_graphics_battle_anims_sprites_081_sheet, 0x0080, 10081 - obj_tiles gFile_graphics_battle_anims_sprites_082_sheet, 0x0040, 10082 - obj_tiles gFile_graphics_battle_anims_sprites_083_sheet, 0x0e00, 10083 - obj_tiles gFile_graphics_battle_anims_sprites_084_sheet, 0x0e00, 10084 - obj_tiles gFile_graphics_battle_anims_sprites_085_sheet, 0x0280, 10085 - obj_tiles gFile_graphics_battle_anims_sprites_086_sheet, 0x0200, 10086 - obj_tiles gFile_graphics_battle_anims_sprites_087_sheet, 0x0080, 10087 - obj_tiles gFile_graphics_battle_anims_sprites_088_sheet, 0x00c0, 10088 - obj_tiles gFile_graphics_battle_anims_sprites_089_sheet, 0x0a00, 10089 - obj_tiles gFile_graphics_battle_anims_sprites_090_sheet, 0x0200, 10090 - obj_tiles gFile_graphics_battle_anims_sprites_091_sheet, 0x0180, 10091 - obj_tiles gFile_graphics_battle_anims_sprites_092_sheet, 0x0080, 10092 - obj_tiles gFile_graphics_battle_anims_sprites_093_sheet, 0x1000, 10093 - obj_tiles gFile_graphics_battle_anims_sprites_094_sheet, 0x0a00, 10094 - obj_tiles gFile_graphics_battle_anims_sprites_095_sheet, 0x0180, 10095 - obj_tiles gFile_graphics_battle_anims_sprites_096_sheet, 0x0380, 10096 - obj_tiles gFile_graphics_battle_anims_sprites_097_sheet, 0x0c00, 10097 - obj_tiles gFile_graphics_battle_anims_sprites_098_sheet, 0x0200, 10098 - obj_tiles gFile_graphics_battle_anims_sprites_099_sheet, 0x0200, 10099 - obj_tiles gFile_graphics_battle_anims_sprites_100_sheet, 0x0200, 10100 - obj_tiles gFile_graphics_battle_anims_sprites_101_sheet, 0x0200, 10101 - obj_tiles gFile_graphics_battle_anims_sprites_102_sheet, 0x0400, 10102 - obj_tiles gFile_graphics_battle_anims_sprites_103_sheet, 0x0080, 10103 - obj_tiles gFile_graphics_battle_anims_sprites_104_sheet, 0x0400, 10104 - obj_tiles gFile_graphics_battle_anims_sprites_105_sheet, 0x0c00, 10105 - obj_tiles gFile_graphics_battle_anims_sprites_106_sheet, 0x0200, 10106 - obj_tiles gFile_graphics_battle_anims_sprites_107_sheet, 0x1000, 10107 - obj_tiles gFile_graphics_battle_anims_sprites_108_sheet, 0x0a00, 10108 - obj_tiles gFile_graphics_battle_anims_sprites_109_sheet, 0x0020, 10109 - obj_tiles gFile_graphics_battle_anims_sprites_110_sheet, 0x0e00, 10110 - obj_tiles gFile_graphics_battle_anims_sprites_111_sheet, 0x0080, 10111 - obj_tiles gFile_graphics_battle_anims_sprites_112_sheet, 0x0a00, 10112 - obj_tiles gFile_graphics_battle_anims_sprites_113_sheet, 0x0400, 10113 - obj_tiles gFile_graphics_battle_anims_sprites_114_sheet, 0x0200, 10114 - obj_tiles gFile_graphics_battle_anims_sprites_115_sheet, 0x0700, 10115 - obj_tiles gFile_graphics_battle_anims_sprites_116_sheet, 0x0800, 10116 - obj_tiles gFile_graphics_battle_anims_sprites_117_sheet, 0x0a00, 10117 - obj_tiles gFile_graphics_battle_anims_sprites_118_sheet, 0x0600, 10118 - obj_tiles gFile_graphics_battle_anims_sprites_119_sheet, 0x0800, 10119 - obj_tiles gFile_graphics_battle_anims_sprites_120_sheet, 0x0200, 10120 - obj_tiles gFile_graphics_battle_anims_sprites_121_sheet, 0x0040, 10121 - obj_tiles gFile_graphics_battle_anims_sprites_122_sheet, 0x0180, 10122 - obj_tiles gFile_graphics_battle_anims_sprites_123_sheet, 0x0600, 10123 - obj_tiles gFile_graphics_battle_anims_sprites_124_sheet, 0x0600, 10124 - obj_tiles gFile_graphics_battle_anims_sprites_125_sheet, 0x0200, 10125 - obj_tiles gFile_graphics_battle_anims_sprites_126_sheet, 0x0080, 10126 - obj_tiles gFile_graphics_battle_anims_sprites_127_sheet, 0x0200, 10127 - obj_tiles gFile_graphics_battle_anims_sprites_128_sheet, 0x0800, 10128 - obj_tiles gFile_graphics_battle_anims_sprites_129_sheet, 0x0080, 10129 - obj_tiles gFile_graphics_battle_anims_sprites_130_sheet, 0x0a00, 10130 - obj_tiles gFile_graphics_battle_anims_sprites_131_sheet, 0x0280, 10131 - obj_tiles gFile_graphics_battle_anims_sprites_132_sheet, 0x0280, 10132 - obj_tiles gFile_graphics_battle_anims_sprites_133_sheet, 0x0100, 10133 - obj_tiles gFile_graphics_battle_anims_sprites_134_sheet, 0x0200, 10134 - obj_tiles gFile_graphics_battle_anims_sprites_135_sheet, 0x0200, 10135 - -gUnknown_83AD048:: @ 83AD048 - obj_tiles gFile_graphics_battle_anims_sprites_136_sheet, 0x0020, 10136 - obj_tiles gFile_graphics_battle_anims_sprites_137_sheet, 0x0a00, 10137 - obj_tiles gFile_graphics_battle_anims_sprites_138_sheet, 0x0800, 10138 - obj_tiles gFile_graphics_battle_anims_sprites_139_sheet, 0x0800, 10139 - obj_tiles gFile_graphics_battle_anims_sprites_140_sheet, 0x00c0, 10140 - obj_tiles gFile_graphics_battle_anims_sprites_141_sheet, 0x01c0, 10141 - obj_tiles gFile_graphics_battle_anims_sprites_142_sheet, 0x0100, 10142 - obj_tiles gFile_graphics_battle_anims_sprites_143_sheet, 0x0800, 10143 - obj_tiles gFile_graphics_battle_anims_sprites_144_sheet, 0x0200, 10144 - obj_tiles gFile_graphics_battle_anims_sprites_145_sheet, 0x0800, 10145 - obj_tiles gFile_graphics_battle_anims_sprites_146_sheet, 0x0180, 10146 - obj_tiles gFile_graphics_battle_anims_sprites_147_sheet, 0x0180, 10147 - obj_tiles gFile_graphics_battle_anims_sprites_148_sheet, 0x0200, 10148 - obj_tiles gFile_graphics_battle_anims_sprites_149_sheet, 0x0200, 10149 - obj_tiles gFile_graphics_battle_anims_sprites_150_sheet, 0x0180, 10150 - obj_tiles gFile_graphics_battle_anims_sprites_151_sheet, 0x0400, 10151 - obj_tiles gFile_graphics_battle_anims_sprites_152_sheet, 0x0080, 10152 - obj_tiles gFile_graphics_battle_anims_sprites_153_sheet, 0x0100, 10153 - obj_tiles gFile_graphics_battle_anims_sprites_154_sheet, 0x0100, 10154 - obj_tiles gFile_graphics_battle_anims_sprites_155_sheet, 0x0140, 10155 - obj_tiles gFile_graphics_battle_anims_sprites_156_sheet, 0x0800, 10156 - obj_tiles gFile_graphics_battle_anims_sprites_157_sheet, 0x0200, 10157 - obj_tiles gFile_graphics_battle_anims_sprites_158_sheet, 0x0100, 10158 - obj_tiles gFile_graphics_battle_anims_sprites_159_sheet, 0x00a0, 10159 - obj_tiles gFile_graphics_battle_anims_sprites_160_sheet, 0x0100, 10160 - obj_tiles gFile_graphics_battle_anims_sprites_161_sheet, 0x0080, 10161 - obj_tiles gFile_graphics_battle_anims_sprites_162_sheet, 0x0300, 10162 - obj_tiles gFile_graphics_battle_anims_sprites_163_sheet, 0x0100, 10163 - obj_tiles gFile_graphics_battle_anims_sprites_163_sheet, 0x0100, 10164 - obj_tiles gFile_graphics_battle_anims_sprites_163_sheet, 0x0100, 10165 - obj_tiles gFile_graphics_battle_anims_sprites_166_sheet, 0x0800, 10166 - obj_tiles gFile_graphics_battle_anims_sprites_166_sheet, 0x0800, 10167 - obj_tiles gFile_graphics_battle_anims_sprites_166_sheet, 0x0800, 10168 - obj_tiles gFile_graphics_battle_anims_sprites_166_sheet, 0x0800, 10169 - obj_tiles gFile_graphics_battle_anims_sprites_166_sheet, 0x0800, 10170 - obj_tiles gFile_graphics_battle_anims_sprites_171_sheet, 0x0080, 10171 - obj_tiles gFile_graphics_battle_anims_sprites_144_sheet, 0x0200, 10172 - obj_tiles gFile_graphics_battle_anims_sprites_173_sheet, 0x0200, 10173 - obj_tiles gFile_graphics_battle_anims_sprites_174_sheet, 0x0200, 10174 - obj_tiles gFile_graphics_battle_anims_sprites_175_sheet, 0x0080, 10175 - obj_tiles gFile_graphics_battle_anims_sprites_176_sheet, 0x0200, 10176 - obj_tiles gFile_graphics_battle_anims_sprites_177_sheet, 0x0500, 10177 - obj_tiles gFile_graphics_battle_anims_sprites_178_sheet, 0x0800, 10178 - obj_tiles gFile_graphics_battle_anims_sprites_179_sheet, 0x0400, 10179 - obj_tiles gFile_graphics_battle_anims_sprites_180_sheet, 0x0020, 10180 - obj_tiles gFile_graphics_battle_anims_sprites_181_sheet, 0x0800, 10181 - obj_tiles gFile_graphics_battle_anims_sprites_182_sheet, 0x0100, 10182 - obj_tiles gFile_graphics_battle_anims_sprites_183_sheet, 0x0800, 10183 - obj_tiles gFile_graphics_battle_anims_sprites_184_sheet, 0x0400, 10184 - obj_tiles gFile_graphics_battle_anims_sprites_185_sheet, 0x0a00, 10185 - obj_tiles gFile_graphics_battle_anims_sprites_186_sheet, 0x1000, 10186 - obj_tiles gFile_graphics_battle_anims_sprites_187_sheet, 0x0800, 10187 - obj_tiles gFile_graphics_battle_anims_sprites_188_sheet, 0x0400, 10188 - obj_tiles gFile_graphics_battle_anims_sprites_189_sheet, 0x0200, 10189 - obj_tiles gFile_graphics_battle_anims_sprites_190_sheet, 0x0800, 10190 - obj_tiles gFile_graphics_battle_anims_sprites_191_sheet, 0x0800, 10191 - obj_tiles gFile_graphics_battle_anims_sprites_192_sheet, 0x0800, 10192 - obj_tiles gFile_graphics_battle_anims_sprites_193_sheet, 0x0200, 10193 - obj_tiles gFile_graphics_battle_anims_sprites_194_sheet, 0x0800, 10194 - obj_tiles gFile_graphics_battle_anims_sprites_195_sheet, 0x0200, 10195 - obj_tiles gFile_graphics_battle_anims_sprites_196_sheet, 0x0800, 10196 - obj_tiles gFile_graphics_battle_anims_sprites_197_sheet, 0x0200, 10197 - obj_tiles gFile_graphics_battle_anims_sprites_198_sheet, 0x0800, 10198 - obj_tiles gFile_graphics_battle_anims_sprites_199_sheet, 0x0400, 10199 - obj_tiles gFile_graphics_battle_anims_sprites_200_sheet, 0x0200, 10200 - obj_tiles gFile_graphics_battle_anims_sprites_201_sheet, 0x0a80, 10201 - obj_tiles gFile_graphics_battle_anims_sprites_202_sheet, 0x0600, 10202 - obj_tiles gFile_graphics_battle_anims_sprites_203_sheet, 0x0800, 10203 - obj_tiles gFile_graphics_battle_anims_sprites_204_sheet, 0x0200, 10204 - obj_tiles gFile_graphics_battle_anims_sprites_205_sheet, 0x0600, 10205 - obj_tiles gFile_graphics_battle_anims_sprites_206_sheet, 0x0800, 10206 - obj_tiles gFile_graphics_battle_anims_sprites_207_sheet, 0x0180, 10207 - obj_tiles gFile_graphics_battle_anims_sprites_208_sheet, 0x0800, 10208 - obj_tiles gFile_graphics_battle_anims_sprites_209_sheet, 0x0800, 10209 - obj_tiles gFile_graphics_battle_anims_sprites_210_sheet, 0x0080, 10210 - obj_tiles gFile_graphics_battle_anims_sprites_211_sheet, 0x0080, 10211 - obj_tiles gFile_graphics_battle_anims_sprites_212_sheet, 0x0800, 10212 - obj_tiles gFile_graphics_battle_anims_sprites_213_sheet, 0x0800, 10213 - obj_tiles gFile_graphics_battle_anims_sprites_214_sheet, 0x0600, 10214 - obj_tiles gFile_graphics_battle_anims_sprites_215_sheet, 0x0600, 10215 - obj_tiles gFile_graphics_battle_anims_sprites_210_sheet, 0x0080, 10216 - obj_tiles gFile_graphics_battle_anims_sprites_217_sheet, 0x0080, 10217 - obj_tiles gFile_graphics_battle_anims_sprites_218_sheet, 0x0180, 10218 - obj_tiles gFile_graphics_battle_anims_sprites_210_sheet, 0x0080, 10219 - obj_tiles gFile_graphics_battle_anims_sprites_220_sheet, 0x0200, 10220 - obj_tiles gFile_graphics_battle_anims_sprites_221_sheet, 0x0400, 10221 - obj_tiles gFile_graphics_battle_anims_sprites_222_sheet, 0x0a00, 10222 - obj_tiles gFile_graphics_battle_anims_sprites_223_sheet, 0x0800, 10223 - obj_tiles gFile_graphics_battle_anims_sprites_224_sheet, 0x0200, 10224 - obj_tiles gFile_graphics_battle_anims_sprites_225_sheet, 0x0400, 10225 - obj_tiles gFile_graphics_battle_anims_sprites_226_sheet, 0x0080, 10226 - obj_tiles gFile_graphics_battle_anims_sprites_227_sheet, 0x0800, 10227 - obj_tiles gFile_graphics_battle_anims_sprites_228_sheet, 0x0200, 10228 - obj_tiles gFile_graphics_battle_anims_sprites_229_sheet, 0x0300, 10229 - obj_tiles gFile_graphics_battle_anims_sprites_230_sheet, 0x0800, 10230 - obj_tiles gFile_graphics_battle_anims_sprites_231_sheet, 0x0380, 10231 - obj_tiles gFile_graphics_battle_anims_sprites_232_sheet, 0x0800, 10232 - -gUnknown_83AD350:: @ 83AD350 - obj_tiles gFile_graphics_battle_anims_sprites_233_sheet, 0x00c0, 10233 - obj_tiles gFile_graphics_battle_anims_sprites_234_sheet, 0x0800, 10234 - obj_tiles gFile_graphics_battle_anims_sprites_235_sheet, 0x0060, 10235 - obj_tiles gFile_graphics_battle_anims_sprites_235_sheet, 0x0060, 10236 - obj_tiles gFile_graphics_battle_anims_sprites_235_sheet, 0x0060, 10237 - obj_tiles gFile_graphics_battle_anims_sprites_238_sheet, 0x0080, 10238 - obj_tiles gFile_graphics_battle_anims_sprites_239_sheet, 0x0180, 10239 - obj_tiles gFile_graphics_battle_anims_sprites_240_sheet, 0x0180, 10240 - obj_tiles gFile_graphics_battle_anims_sprites_241_sheet, 0x0200, 10241 - obj_tiles gFile_graphics_battle_anims_sprites_242_sheet, 0x0200, 10242 - obj_tiles gFile_graphics_battle_anims_sprites_243_sheet, 0x0020, 10243 - obj_tiles gFile_graphics_battle_anims_sprites_244_sheet, 0x0400, 10244 - obj_tiles gFile_graphics_battle_anims_sprites_245_sheet, 0x0600, 10245 - obj_tiles gFile_graphics_battle_anims_sprites_246_sheet, 0x1000, 10246 - obj_tiles gFile_graphics_battle_anims_sprites_247_sheet, 0x0400, 10247 - obj_tiles gFile_graphics_battle_anims_sprites_248_sheet, 0x0020, 10248 - obj_tiles gFile_graphics_battle_anims_sprites_249_sheet, 0x0080, 10249 - obj_tiles gFile_graphics_battle_anims_sprites_250_sheet, 0x0800, 10250 - obj_tiles gFile_graphics_battle_anims_sprites_251_sheet, 0x0080, 10251 - obj_tiles gFile_graphics_battle_anims_sprites_252_sheet, 0x0200, 10252 - obj_tiles gFile_graphics_battle_anims_sprites_253_sheet, 0x0400, 10253 - obj_tiles gFile_graphics_battle_anims_sprites_254_sheet, 0x0200, 10254 - obj_tiles gFile_graphics_battle_anims_sprites_255_sheet, 0x0200, 10255 - obj_tiles gFile_graphics_battle_anims_sprites_256_sheet, 0x0800, 10256 - obj_tiles gFile_graphics_battle_anims_sprites_257_sheet, 0x0280, 10257 - obj_tiles gFile_graphics_battle_anims_sprites_258_sheet, 0x0200, 10258 - obj_tiles gFile_graphics_battle_anims_sprites_149_sheet, 0x0200, 10259 - obj_tiles gFile_graphics_battle_anims_sprites_260_sheet, 0x0400, 10260 - obj_tiles gFile_graphics_battle_anims_sprites_261_sheet, 0x0200, 10261 - obj_tiles gFile_graphics_battle_anims_sprites_262_sheet, 0x0200, 10262 - obj_tiles gFile_graphics_battle_anims_sprites_263_sheet, 0x0080, 10263 - obj_tiles gFile_graphics_battle_anims_sprites_264_sheet, 0x0020, 10264 - obj_tiles gFile_graphics_battle_anims_sprites_264_sheet, 0x0020, 10265 - obj_tiles gFile_graphics_battle_anims_sprites_266_sheet, 0x0080, 10266 - obj_tiles gFile_graphics_battle_anims_sprites_212_sheet, 0x0800, 10267 - obj_tiles gFile_graphics_battle_anims_sprites_264_sheet, 0x0020, 10268 - -gUnknown_83AD470:: @ 83AD470 - obj_tiles gFile_graphics_battle_anims_sprites_269_sheet, 0x0080, 10269 - obj_tiles gFile_graphics_battle_anims_sprites_270_sheet, 0x0400, 10270 - obj_tiles gFile_graphics_battle_anims_sprites_271_sheet, 0x0080, 10271 - obj_tiles gFile_graphics_battle_anims_sprites_272_sheet, 0x0800, 10272 - obj_tiles gFile_graphics_battle_anims_sprites_273_sheet, 0x0020, 10273 - obj_tiles gFile_graphics_battle_anims_sprites_274_sheet, 0x0800, 10274 - obj_tiles gFile_graphics_battle_anims_sprites_275_sheet, 0x0800, 10275 - obj_tiles gFile_graphics_battle_anims_sprites_276_sheet, 0x0800, 10276 - obj_tiles gFile_graphics_battle_anims_sprites_277_sheet, 0x1000, 10277 - obj_tiles gFile_graphics_battle_anims_sprites_278_sheet, 0x0800, 10278 - obj_tiles gFile_graphics_battle_anims_sprites_279_sheet, 0x00a0, 10279 - obj_tiles gFile_graphics_battle_anims_sprites_280_sheet, 0x0800, 10280 - obj_tiles gFile_graphics_battle_anims_sprites_281_sheet, 0x0200, 10281 - obj_tiles gFile_graphics_battle_anims_sprites_282_sheet, 0x0600, 10282 - obj_tiles gFile_graphics_battle_anims_sprites_283_sheet, 0x0200, 10283 - obj_tiles gFile_graphics_battle_anims_sprites_284_sheet, 0x0800, 10284 - obj_tiles gFile_graphics_battle_anims_sprites_285_sheet, 0x0200, 10285 - obj_tiles gFile_graphics_battle_anims_sprites_183_sheet, 0x0800, 10286 - obj_tiles gFile_graphics_battle_anims_sprites_056_sheet, 0x1000, 10287 - obj_tiles gFile_graphics_battle_anims_sprites_163_sheet, 0x0100, 10288 - - obj_pal gFile_graphics_battle_anims_sprites_000_palette, 10000 - obj_pal gFile_graphics_battle_anims_sprites_001_palette, 10001 - obj_pal gFile_graphics_battle_anims_sprites_002_palette, 10002 - obj_pal gFile_graphics_battle_anims_sprites_003_palette, 10003 - obj_pal gFile_graphics_battle_anims_sprites_004_palette, 10004 - obj_pal gFile_graphics_battle_anims_sprites_005_palette, 10005 - obj_pal gFile_graphics_battle_anims_sprites_006_palette, 10006 - obj_pal gFile_graphics_battle_anims_sprites_007_palette, 10007 - obj_pal gFile_graphics_battle_anims_sprites_008_palette, 10008 - obj_pal gFile_graphics_battle_anims_sprites_009_palette, 10009 - obj_pal gFile_graphics_battle_anims_sprites_010_palette, 10010 - obj_pal gFile_graphics_battle_anims_sprites_011_palette, 10011 - obj_pal gFile_graphics_battle_anims_sprites_012_palette, 10012 - obj_pal gFile_graphics_battle_anims_sprites_013_palette, 10013 - obj_pal gFile_graphics_battle_anims_sprites_014_palette, 10014 - obj_pal gFile_graphics_battle_anims_sprites_015_palette, 10015 - obj_pal gFile_graphics_battle_anims_sprites_016_palette, 10016 - obj_pal gFile_graphics_battle_anims_sprites_016_palette, 10017 - obj_pal gFile_graphics_battle_anims_sprites_018_palette, 10018 - obj_pal gFile_graphics_battle_anims_sprites_019_palette, 10019 - obj_pal gFile_graphics_battle_anims_sprites_020_palette, 10020 - obj_pal gFile_graphics_battle_anims_sprites_021_palette, 10021 - obj_pal gFile_graphics_battle_anims_sprites_022_palette, 10022 - obj_pal gFile_graphics_battle_anims_sprites_023_palette, 10023 - obj_pal gFile_graphics_battle_anims_sprites_024_palette, 10024 - obj_pal gFile_graphics_battle_anims_sprites_025_palette, 10025 - obj_pal gFile_graphics_battle_anims_sprites_026_palette, 10026 - obj_pal gFile_graphics_battle_anims_sprites_027_palette, 10027 - obj_pal gFile_graphics_battle_anims_sprites_028_palette, 10028 - obj_pal gFile_graphics_battle_anims_sprites_029_palette, 10029 - obj_pal gFile_graphics_battle_anims_sprites_030_palette, 10030 - obj_pal gFile_graphics_battle_anims_sprites_031_palette, 10031 - obj_pal gFile_graphics_battle_anims_sprites_032_palette, 10032 - obj_pal gFile_graphics_battle_anims_sprites_033_palette, 10033 - obj_pal gFile_graphics_battle_anims_sprites_033_palette, 10034 - obj_pal gFile_graphics_battle_anims_sprites_033_palette, 10035 - obj_pal gFile_graphics_battle_anims_sprites_036_palette, 10036 - obj_pal gFile_graphics_battle_anims_sprites_036_palette, 10037 - obj_pal gFile_graphics_battle_anims_sprites_038_palette, 10038 - obj_pal gFile_graphics_battle_anims_sprites_039_palette, 10039 - obj_pal gFile_graphics_battle_anims_sprites_038_palette, 10040 - obj_pal gFile_graphics_battle_anims_sprites_038_palette, 10041 - obj_pal gFile_graphics_battle_anims_sprites_042_palette, 10042 - obj_pal gFile_graphics_battle_anims_sprites_043_palette, 10043 - obj_pal gFile_graphics_battle_anims_sprites_044_palette, 10044 - obj_pal gFile_graphics_battle_anims_sprites_045_palette, 10045 - obj_pal gFile_graphics_battle_anims_sprites_046_palette, 10046 - obj_pal gFile_graphics_battle_anims_sprites_047_palette, 10046 - obj_pal gFile_graphics_battle_anims_sprites_048_palette, 10048 - obj_pal gFile_graphics_battle_anims_sprites_049_palette, 10049 - obj_pal gFile_graphics_battle_anims_sprites_050_palette, 10050 - obj_pal gFile_graphics_battle_anims_sprites_050_palette, 10051 - obj_pal gFile_graphics_battle_anims_sprites_050_palette, 10052 - obj_pal gFile_graphics_battle_anims_sprites_026_palette, 10053 - obj_pal gFile_graphics_battle_anims_sprites_054_palette, 10054 - obj_pal gFile_graphics_battle_anims_sprites_050_palette, 10055 - obj_pal gFile_graphics_battle_anims_sprites_056_palette, 10056 - obj_pal gFile_graphics_battle_anims_sprites_057_palette, 10057 - obj_pal gFile_graphics_battle_anims_sprites_058_palette, 10058 - obj_pal gFile_graphics_battle_anims_sprites_059_palette, 10059 - obj_pal gFile_graphics_battle_anims_sprites_060_palette, 10060 - obj_pal gFile_graphics_battle_anims_sprites_061_palette, 10061 - obj_pal gFile_graphics_battle_anims_sprites_062_palette, 10062 - obj_pal gFile_graphics_battle_anims_sprites_063_palette, 10063 - obj_pal gFile_graphics_battle_anims_sprites_064_palette, 10064 - obj_pal gFile_graphics_battle_anims_sprites_065_palette, 10065 - obj_pal gFile_graphics_battle_anims_sprites_066_palette, 10066 - obj_pal gFile_graphics_battle_anims_sprites_067_palette, 10067 - obj_pal gFile_graphics_battle_anims_sprites_068_palette, 10068 - obj_pal gFile_graphics_battle_anims_sprites_065_palette, 10069 - obj_pal gFile_graphics_battle_anims_sprites_070_palette, 10070 - obj_pal gFile_graphics_battle_anims_sprites_070_palette, 10071 - obj_pal gFile_graphics_battle_anims_sprites_072_palette, 10072 - obj_pal gFile_graphics_battle_anims_sprites_073_palette, 10073 - obj_pal gFile_graphics_battle_anims_sprites_074_palette, 10074 - obj_pal gFile_graphics_battle_anims_sprites_075_palette, 10075 - obj_pal gFile_graphics_battle_anims_sprites_076_palette, 10076 - obj_pal gFile_graphics_battle_anims_sprites_076_palette, 10077 - obj_pal gFile_graphics_battle_anims_sprites_078_palette, 10078 - obj_pal gFile_graphics_battle_anims_sprites_078_palette, 10079 - obj_pal gFile_graphics_battle_anims_sprites_080_palette, 10080 - obj_pal gFile_graphics_battle_anims_sprites_081_palette, 10081 - obj_pal gFile_graphics_battle_anims_sprites_082_palette, 10082 - obj_pal gFile_graphics_battle_anims_sprites_083_palette, 10083 - obj_pal gFile_graphics_battle_anims_sprites_084_palette, 10084 - obj_pal gFile_graphics_battle_anims_sprites_085_palette, 10085 - obj_pal gFile_graphics_battle_anims_sprites_086_palette, 10086 - obj_pal gFile_graphics_battle_anims_sprites_087_palette, 10087 - obj_pal gFile_graphics_battle_anims_sprites_088_palette, 10088 - obj_pal gFile_graphics_battle_anims_sprites_089_palette, 10089 - obj_pal gFile_graphics_battle_anims_sprites_090_palette, 10090 - obj_pal gFile_graphics_battle_anims_sprites_091_palette, 10091 - obj_pal gFile_graphics_battle_anims_sprites_092_palette, 10092 - obj_pal gFile_graphics_battle_anims_sprites_093_palette, 10093 - obj_pal gFile_graphics_battle_anims_sprites_094_palette, 10094 - obj_pal gFile_graphics_battle_anims_sprites_095_palette, 10095 - obj_pal gFile_graphics_battle_anims_sprites_096_palette, 10096 - obj_pal gFile_graphics_battle_anims_sprites_097_palette, 10097 - obj_pal gFile_graphics_battle_anims_sprites_094_palette, 10098 - obj_pal gFile_graphics_battle_anims_sprites_099_palette, 10099 - obj_pal gFile_graphics_battle_anims_sprites_100_palette, 10100 - obj_pal gFile_graphics_battle_anims_sprites_101_palette, 10101 - obj_pal gFile_graphics_battle_anims_sprites_101_palette, 10102 - obj_pal gFile_graphics_battle_anims_sprites_103_palette, 10103 - obj_pal gFile_graphics_battle_anims_sprites_104_palette, 10104 - obj_pal gFile_graphics_battle_anims_sprites_105_palette, 10105 - obj_pal gFile_graphics_battle_anims_sprites_105_palette, 10106 - obj_pal gFile_graphics_battle_anims_sprites_107_palette, 10107 - obj_pal gFile_graphics_battle_anims_sprites_107_palette, 10108 - obj_pal gFile_graphics_battle_anims_sprites_109_palette, 10109 - obj_pal gFile_graphics_battle_anims_sprites_109_palette, 10110 - obj_pal gFile_graphics_battle_anims_sprites_111_palette, 10111 - obj_pal gFile_graphics_battle_anims_sprites_112_palette, 10112 - obj_pal gFile_graphics_battle_anims_sprites_113_palette, 10113 - obj_pal gFile_graphics_battle_anims_sprites_114_palette, 10114 - obj_pal gFile_graphics_battle_anims_sprites_115_palette, 10115 - obj_pal gFile_graphics_battle_anims_sprites_116_palette, 10116 - obj_pal gFile_graphics_battle_anims_sprites_117_palette, 10117 - obj_pal gFile_graphics_battle_anims_sprites_118_palette, 10118 - obj_pal gFile_graphics_battle_anims_sprites_119_palette, 10119 - obj_pal gFile_graphics_battle_anims_sprites_120_palette, 10120 - obj_pal gFile_graphics_battle_anims_sprites_121_palette, 10121 - obj_pal gFile_graphics_battle_anims_sprites_122_palette, 10122 - obj_pal gFile_graphics_battle_anims_sprites_122_palette, 10123 - obj_pal gFile_graphics_battle_anims_sprites_124_palette, 10124 - obj_pal gFile_graphics_battle_anims_sprites_125_palette, 10125 - obj_pal gFile_graphics_battle_anims_sprites_126_palette, 10126 - obj_pal gFile_graphics_battle_anims_sprites_127_palette, 10127 - obj_pal gFile_graphics_battle_anims_sprites_128_palette, 10128 - obj_pal gFile_graphics_battle_anims_sprites_128_palette, 10129 - obj_pal gFile_graphics_battle_anims_sprites_130_palette, 10130 - obj_pal gFile_graphics_battle_anims_sprites_130_palette, 10131 - obj_pal gFile_graphics_battle_anims_sprites_132_palette, 10132 - obj_pal gFile_graphics_battle_anims_sprites_133_palette, 10133 - obj_pal gFile_graphics_battle_anims_sprites_133_palette, 10134 - obj_pal gFile_graphics_battle_anims_sprites_135_palette, 10135 - -gUnknown_83AD950:: @ 83AD950 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 10136 - obj_pal gFile_graphics_battle_anims_sprites_135_palette, 10137 - obj_pal gFile_graphics_battle_anims_sprites_135_palette, 10138 - obj_pal gFile_graphics_battle_anims_sprites_139_palette, 10139 - obj_pal gFile_graphics_battle_anims_sprites_140_palette, 10140 - obj_pal gFile_graphics_battle_anims_sprites_141_palette, 10141 - obj_pal gFile_graphics_battle_anims_sprites_141_palette, 10142 - obj_pal gFile_graphics_battle_anims_sprites_143_palette, 10143 - obj_pal gFile_graphics_battle_anims_sprites_144_palette, 10144 - obj_pal gFile_graphics_battle_anims_sprites_139_palette, 10145 - obj_pal gFile_graphics_battle_anims_sprites_115_palette, 10146 - obj_pal gFile_graphics_battle_anims_sprites_147_palette, 10147 - obj_pal gFile_graphics_battle_anims_sprites_148_palette, 10148 - obj_pal gFile_graphics_battle_anims_sprites_148_palette, 10149 - obj_pal gFile_graphics_battle_anims_sprites_150_palette, 10150 - obj_pal gFile_graphics_battle_anims_sprites_150_palette, 10151 - obj_pal gFile_graphics_battle_anims_sprites_152_palette, 10152 - obj_pal gFile_graphics_battle_anims_sprites_153_palette, 10153 - obj_pal gFile_graphics_battle_anims_sprites_154_palette, 10154 - obj_pal gFile_graphics_battle_anims_sprites_155_palette, 10155 - obj_pal gFile_graphics_battle_anims_sprites_156_palette, 10156 - obj_pal gFile_graphics_battle_anims_sprites_157_palette, 10157 - obj_pal gFile_graphics_battle_anims_sprites_158_palette, 10158 - obj_pal gFile_graphics_battle_anims_sprites_159_palette, 10159 - obj_pal gFile_graphics_battle_anims_sprites_160_palette, 10160 - obj_pal gFile_graphics_battle_anims_sprites_161_palette, 10161 - obj_pal gFile_graphics_battle_anims_sprites_162_palette, 10162 - obj_pal gFile_graphics_battle_anims_sprites_163_palette, 10163 - obj_pal gFile_graphics_battle_anims_sprites_164_palette, 10164 - obj_pal gFile_graphics_battle_anims_sprites_165_palette, 10165 - obj_pal gFile_graphics_battle_anims_sprites_166_palette, 10166 - obj_pal gFile_graphics_battle_anims_sprites_167_palette, 10167 - obj_pal gFile_graphics_battle_anims_sprites_168_palette, 10168 - obj_pal gFile_graphics_battle_anims_sprites_169_palette, 10169 - obj_pal gFile_graphics_battle_anims_sprites_170_palette, 10170 - obj_pal gFile_graphics_battle_anims_sprites_171_palette, 10171 - obj_pal gFile_graphics_battle_anims_sprites_172_palette, 10172 - obj_pal gFile_graphics_battle_anims_sprites_001_palette, 10173 - obj_pal gFile_graphics_battle_anims_sprites_174_palette, 10174 - obj_pal gFile_graphics_battle_anims_sprites_175_palette, 10175 - obj_pal gFile_graphics_battle_anims_sprites_176_palette, 10176 - obj_pal gFile_graphics_battle_anims_sprites_177_palette, 10177 - obj_pal gFile_graphics_battle_anims_sprites_178_palette, 10178 - obj_pal gFile_graphics_battle_anims_sprites_179_palette, 10179 - obj_pal gFile_graphics_battle_anims_sprites_179_palette, 10180 - obj_pal gFile_graphics_battle_anims_sprites_179_palette, 10181 - obj_pal gFile_graphics_battle_anims_sprites_182_palette, 10182 - obj_pal gFile_graphics_battle_anims_sprites_183_palette, 10183 - obj_pal gFile_graphics_battle_anims_sprites_184_palette, 10184 - obj_pal gFile_graphics_battle_anims_sprites_185_palette, 10185 - obj_pal gFile_graphics_battle_anims_sprites_186_palette, 10186 - obj_pal gFile_graphics_battle_anims_sprites_187_palette, 10187 - obj_pal gFile_graphics_battle_anims_sprites_188_palette, 10188 - obj_pal gFile_graphics_battle_anims_sprites_189_palette, 10189 - obj_pal gFile_graphics_battle_anims_sprites_190_palette, 10190 - obj_pal gFile_graphics_battle_anims_sprites_191_palette, 10191 - obj_pal gFile_graphics_battle_anims_sprites_192_palette, 10192 - obj_pal gFile_graphics_battle_anims_sprites_193_palette, 10193 - obj_pal gFile_graphics_battle_anims_sprites_194_palette, 10194 - obj_pal gFile_graphics_battle_anims_sprites_195_palette, 10195 - obj_pal gFile_graphics_battle_anims_sprites_196_palette, 10196 - obj_pal gFile_graphics_battle_anims_sprites_197_palette, 10197 - obj_pal gFile_graphics_battle_anims_sprites_198_palette, 10198 - obj_pal gFile_graphics_battle_anims_sprites_199_palette, 10199 - obj_pal gFile_graphics_battle_anims_sprites_200_palette, 10200 - obj_pal gFile_graphics_battle_anims_sprites_201_palette, 10201 - obj_pal gFile_graphics_battle_anims_sprites_202_palette, 10202 - obj_pal gFile_graphics_battle_anims_sprites_203_palette, 10203 - obj_pal gFile_graphics_battle_anims_sprites_204_palette, 10204 - obj_pal gFile_graphics_battle_anims_sprites_205_palette, 10205 - obj_pal gFile_graphics_battle_anims_sprites_206_palette, 10206 - obj_pal gFile_graphics_battle_anims_sprites_207_palette, 10207 - obj_pal gFile_graphics_battle_anims_sprites_167_palette, 10208 - obj_pal gFile_graphics_battle_anims_sprites_209_palette, 10209 - obj_pal gFile_graphics_battle_anims_sprites_210_palette, 10210 - obj_pal gFile_graphics_battle_anims_sprites_211_palette, 10211 - obj_pal gFile_graphics_battle_anims_sprites_211_palette, 10212 - obj_pal gFile_graphics_battle_anims_sprites_211_palette, 10213 - obj_pal gFile_graphics_battle_anims_sprites_064_palette, 10214 - obj_pal gFile_graphics_battle_anims_sprites_215_palette, 10215 - obj_pal gFile_graphics_battle_anims_sprites_216_palette, 10216 - obj_pal gFile_graphics_battle_anims_sprites_217_palette, 10217 - obj_pal gFile_graphics_battle_anims_sprites_218_palette, 10218 - obj_pal gFile_graphics_battle_anims_sprites_219_palette, 10219 - obj_pal gFile_graphics_battle_anims_sprites_220_palette, 10220 - obj_pal gFile_graphics_battle_anims_sprites_221_palette, 10221 - obj_pal gFile_graphics_battle_anims_sprites_222_palette, 10222 - obj_pal gFile_graphics_battle_anims_sprites_223_palette, 10223 - obj_pal gFile_graphics_battle_anims_sprites_224_palette, 10224 - obj_pal gFile_graphics_battle_anims_sprites_225_palette, 10225 - obj_pal gFile_graphics_battle_anims_sprites_226_palette, 10226 - obj_pal gFile_graphics_battle_anims_sprites_226_palette, 10227 - obj_pal gFile_graphics_battle_anims_sprites_228_palette, 10228 - obj_pal gFile_graphics_battle_anims_sprites_229_palette, 10229 - obj_pal gFile_graphics_battle_anims_sprites_230_palette, 10230 - obj_pal gFile_graphics_battle_anims_sprites_231_palette, 10231 - obj_pal gFile_graphics_battle_anims_sprites_231_palette, 10232 - -gUnknown_83ADC58:: @ 83ADC58 - obj_pal gFile_graphics_battle_anims_sprites_233_palette, 10233 - obj_pal gFile_graphics_battle_anims_sprites_234_palette, 10234 - obj_pal gFile_graphics_battle_anims_sprites_235_palette, 10235 - obj_pal gFile_graphics_battle_anims_sprites_236_palette, 10236 - obj_pal gFile_graphics_battle_anims_sprites_237_palette, 10237 - obj_pal gFile_graphics_battle_anims_sprites_238_palette, 10238 - obj_pal gFile_graphics_battle_anims_sprites_239_palette, 10239 - obj_pal gFile_graphics_battle_anims_sprites_240_palette, 10240 - obj_pal gFile_graphics_battle_anims_sprites_241_palette, 10241 - obj_pal gFile_graphics_battle_anims_sprites_242_palette, 10242 - obj_pal gFile_graphics_battle_anims_sprites_243_palette, 10243 - obj_pal gFile_graphics_battle_anims_sprites_244_palette, 10244 - obj_pal gFile_graphics_battle_anims_sprites_245_palette, 10245 - obj_pal gFile_graphics_battle_anims_sprites_245_palette, 10246 - obj_pal gFile_graphics_battle_anims_sprites_064_palette, 10247 - obj_pal gFile_graphics_battle_anims_sprites_248_palette, 10248 - obj_pal gFile_graphics_battle_anims_sprites_249_palette, 10249 - obj_pal gFile_graphics_battle_anims_sprites_249_palette, 10250 - obj_pal gFile_graphics_battle_anims_sprites_251_palette, 10251 - obj_pal gFile_graphics_battle_anims_sprites_252_palette, 10252 - obj_pal gFile_graphics_battle_anims_sprites_253_palette, 10253 - obj_pal gFile_graphics_battle_anims_sprites_254_palette, 10254 - obj_pal gFile_graphics_battle_anims_sprites_255_palette, 10255 - obj_pal gFile_graphics_battle_anims_sprites_256_palette, 10256 - obj_pal gFile_graphics_battle_anims_sprites_257_palette, 10257 - obj_pal gFile_graphics_battle_anims_sprites_258_palette, 10258 - obj_pal gFile_graphics_battle_anims_sprites_259_palette, 10259 - obj_pal gFile_graphics_battle_anims_sprites_260_palette, 10260 - obj_pal gBattleAnimSpritePal_FlyingDirt, 10261 - obj_pal gFile_graphics_battle_anims_sprites_262_palette, 10262 - obj_pal gFile_graphics_battle_anims_sprites_263_palette, 10263 - obj_pal gFile_graphics_battle_anims_sprites_264_palette, 10264 - obj_pal gFile_graphics_battle_anims_sprites_265_palette, 10265 - obj_pal gFile_graphics_battle_anims_sprites_266_palette, 10266 - obj_pal gFile_graphics_battle_anims_sprites_267_palette, 10267 - obj_pal gFile_graphics_battle_anims_sprites_268_palette, 10268 - -gUnknown_83ADD78:: @ 83ADD78 - obj_pal gFile_graphics_battle_anims_sprites_269_palette, 10269 - obj_pal gFile_graphics_battle_anims_sprites_270_palette, 10270 - obj_pal gFile_graphics_battle_anims_sprites_271_palette, 10271 - obj_pal gFile_graphics_battle_anims_sprites_272_palette, 10272 - obj_pal gFile_graphics_battle_anims_sprites_272_palette, 10273 - obj_pal gFile_graphics_battle_anims_sprites_274_palette, 10274 - obj_pal gFile_graphics_battle_anims_sprites_274_palette, 10275 - obj_pal gFile_graphics_battle_anims_sprites_274_palette, 10276 - obj_pal gFile_graphics_battle_anims_sprites_277_palette, 10277 - obj_pal gFile_graphics_battle_anims_sprites_278_palette, 10278 - obj_pal gFile_graphics_battle_anims_sprites_279_palette, 10279 - obj_pal gFile_graphics_battle_anims_sprites_280_palette, 10280 - obj_pal gFile_graphics_battle_anims_sprites_281_palette, 10281 - obj_pal gFile_graphics_battle_anims_sprites_282_palette, 10282 - obj_pal gFile_graphics_battle_anims_sprites_283_palette, 10283 - obj_pal gFile_graphics_battle_anims_sprites_284_palette, 10284 - obj_pal gFile_graphics_battle_anims_sprites_285_palette, 10285 - obj_pal gFile_graphics_battle_anims_sprites_286_palette, 10286 - obj_pal gFile_graphics_battle_anims_sprites_287_palette, 10287 - obj_pal gFile_graphics_battle_anims_sprites_288_palette, 10288 - diff --git a/data/graphics.s b/data/graphics.s index be83bce5d..83530b67e 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -174,27 +174,27 @@ gBattleAnimSpriteGfx_Seed:: @ 8D027C8 .incbin "graphics/battle_anims/sprites/006.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_115_palette:: @ 8D02894 +gBattleAnimSpritePal_RainDrops:: @ 8D02894 .incbin "graphics/battle_anims/sprites/115.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_000_palette:: @ 8D028B4 +gBattleAnimSpritePal_Bone:: @ 8D028B4 .incbin "graphics/battle_anims/sprites/000.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_003_palette:: @ 8D028D8 +gBattleAnimSpritePal_AirWave:: @ 8D028D8 .incbin "graphics/battle_anims/sprites/003.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_004_palette:: @ 8D02900 +gBattleAnimSpritePal_Orb:: @ 8D02900 .incbin "graphics/battle_anims/sprites/004.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_005_palette:: @ 8D02914 +gBattleAnimSpritePal_Sword:: @ 8D02914 .incbin "graphics/battle_anims/sprites/005.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_006_palette:: @ 8D0293C +gBattleAnimSpritePal_Seed:: @ 8D0293C .incbin "graphics/battle_anims/sprites/006.gbapal.lz" .align 2 @@ -202,7 +202,7 @@ gBattleAnimSpriteGfx_Needle:: @ 8D02964 .incbin "graphics/battle_anims/sprites/161.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_161_palette:: @ 8D0298C +gBattleAnimSpritePal_Needle:: @ 8D0298C .incbin "graphics/battle_anims/sprites/161.gbapal.lz" .align 2 @@ -210,7 +210,7 @@ gBattleAnimSpriteGfx_Explosion6:: @ 8D029B4 .incbin "graphics/battle_anims/sprites/007.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_007_palette:: @ 8D02B30 +gBattleAnimSpritePal_Explosion6:: @ 8D02B30 .incbin "graphics/battle_anims/sprites/007.gbapal.lz" .align 2 @@ -218,11 +218,11 @@ gBattleAnimSpriteGfx_PinkOrb:: @ 8D02B50 .incbin "graphics/battle_anims/sprites/008.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_008_palette:: @ 8D02B70 +gBattleAnimSpritePal_PinkOrb:: @ 8D02B70 .incbin "graphics/battle_anims/sprites/008.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_010_palette:: @ 8D02B8C +gBattleAnimSpritePal_IceCube:: @ 8D02B8C .incbin "graphics/battle_anims/sprites/010.gbapal.lz" .align 2 @@ -234,7 +234,7 @@ gBattleAnimSpriteGfx_Gust:: @ 8D02F8C .incbin "graphics/battle_anims/sprites/009.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_009_palette:: @ 8D03274 +gBattleAnimSpritePal_Gust:: @ 8D03274 .incbin "graphics/battle_anims/sprites/009.gbapal.lz" .align 2 @@ -242,7 +242,7 @@ gBattleAnimSpriteGfx_Spark2:: @ 8D03294 .incbin "graphics/battle_anims/sprites/011.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_011_palette:: @ 8D0330C +gBattleAnimSpritePal_Spark2:: @ 8D0330C .incbin "graphics/battle_anims/sprites/011.gbapal.lz" .align 2 @@ -250,7 +250,7 @@ gBattleAnimSpriteGfx_Orange:: @ 8D03334 .incbin "graphics/battle_anims/sprites/012.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_012_palette:: @ 8D0339C +gBattleAnimSpritePal_Orange:: @ 8D0339C .incbin "graphics/battle_anims/sprites/012.gbapal.lz" .align 2 @@ -258,7 +258,7 @@ gBattleAnimSpriteGfx_Spikes:: @ 8D033B4 .incbin "graphics/battle_anims/sprites/152.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_152_palette:: @ 8D033FC +gBattleAnimSpritePal_Spikes:: @ 8D033FC .incbin "graphics/battle_anims/sprites/152.gbapal.lz" .align 2 @@ -266,7 +266,7 @@ gBattleAnimSpriteGfx_YellowBall:: @ 8D03420 .incbin "graphics/battle_anims/sprites/013.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_013_palette:: @ 8D03454 +gBattleAnimSpritePal_YellowBall:: @ 8D03454 .incbin "graphics/battle_anims/sprites/013.gbapal.lz" .align 2 @@ -274,7 +274,7 @@ gBattleAnimSpriteGfx_TiedBag:: @ 8D0346C .incbin "graphics/battle_anims/sprites/015.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_015_palette:: @ 8D034D8 +gBattleAnimSpritePal_TiedBag:: @ 8D034D8 .incbin "graphics/battle_anims/sprites/015.gbapal.lz" .align 2 @@ -282,7 +282,7 @@ gBattleAnimSpriteGfx_BlackSmoke:: @ 8D03500 .incbin "graphics/battle_anims/sprites/016.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_016_palette:: @ 8D03570 +gBattleAnimSpritePal_BlackSmoke:: @ 8D03570 .incbin "graphics/battle_anims/sprites/016.gbapal.lz" .align 2 @@ -294,7 +294,7 @@ gFile_graphics_unknown_Unknown_8D035A0_sheet:: @ 8D035A0 .incbin "graphics/unknown/unknown_D035A0.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_019_palette:: @ 8D035C4 +gBattleAnimSpritePal_Glass:: @ 8D035C4 .incbin "graphics/battle_anims/sprites/019.gbapal.lz" .align 2 @@ -306,11 +306,11 @@ gBattleAnimSpriteGfx_HornHit:: @ 8D036A0 .incbin "graphics/battle_anims/sprites/020.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_020_palette:: @ 8D0376C +gBattleAnimSpritePal_HornHit:: @ 8D0376C .incbin "graphics/battle_anims/sprites/020.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_023_palette:: @ 8D03794 +gBattleAnimSpritePal_BlueShards:: @ 8D03794 .incbin "graphics/battle_anims/sprites/023.gbapal.lz" .align 2 @@ -326,7 +326,7 @@ gFile_graphics_unused_music_notes_sheet:: @ 8D038EC .incbin "graphics/unused/music_notes.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_021_palette:: @ 8D039E8 +gBattleAnimSpritePal_Hit:: @ 8D039E8 .incbin "graphics/battle_anims/sprites/021.gbapal.lz" .align 2 @@ -334,11 +334,11 @@ gBattleAnimSpriteGfx_Hit:: @ 8D03A10 .incbin "graphics/battle_anims/sprites/021.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_022_palette:: @ 8D03D48 +gBattleAnimSpritePal_Hit2:: @ 8D03D48 .incbin "graphics/battle_anims/sprites/022.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_025_palette:: @ 8D03D70 +gBattleAnimSpritePal_WavingHand:: @ 8D03D70 .incbin "graphics/battle_anims/sprites/025.gbapal.lz" .align 2 @@ -350,7 +350,7 @@ gBattleAnimSpriteGfx_ClosingEye:: @ 8D03E88 .incbin "graphics/battle_anims/sprites/024.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_024_palette:: @ 8D03F54 +gBattleAnimSpritePal_ClosingEye:: @ 8D03F54 .incbin "graphics/battle_anims/sprites/024.gbapal.lz" .align 2 @@ -358,11 +358,11 @@ gBattleAnimSpriteGfx_BlueStar:: @ 8D03F68 .incbin "graphics/battle_anims/sprites/031.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_031_palette:: @ 8D04348 +gBattleAnimSpritePal_BlueStar:: @ 8D04348 .incbin "graphics/battle_anims/sprites/031.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_032_palette:: @ 8D04368 +gBattleAnimSpritePal_BubbleBurst:: @ 8D04368 .incbin "graphics/battle_anims/sprites/032.gbapal.lz" .align 2 @@ -374,11 +374,11 @@ gBattleAnimSpriteGfx_HitDuplicate:: @ 8D0447C .incbin "graphics/battle_anims/sprites/026.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_026_palette:: @ 8D047B4 +gBattleAnimSpritePal_HitDuplicate:: @ 8D047B4 .incbin "graphics/battle_anims/sprites/026.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_027_palette:: @ 8D047DC +gBattleAnimSpritePal_Leer:: @ 8D047DC .incbin "graphics/battle_anims/sprites/027.gbapal.lz" .align 2 @@ -386,7 +386,7 @@ gBattleAnimSpriteGfx_Leer:: @ 8D04804 .incbin "graphics/battle_anims/sprites/027.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_028_palette:: @ 8D04B00 +gBattleAnimSpritePal_BlueBurst:: @ 8D04B00 .incbin "graphics/battle_anims/sprites/028.gbapal.lz" .align 2 @@ -398,7 +398,7 @@ gBattleAnimSpriteGfx_SmallEmber:: @ 8D04E78 .incbin "graphics/battle_anims/sprites/029.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_029_palette:: @ 8D05130 +gBattleAnimSpritePal_SmallEmber:: @ 8D05130 .incbin "graphics/battle_anims/sprites/029.gbapal.lz" .align 2 @@ -406,11 +406,11 @@ gBattleAnimSpriteGfx_GraySmoke:: @ 8D05158 .incbin "graphics/battle_anims/sprites/030.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_030_palette:: @ 8D05518 +gBattleAnimSpritePal_GraySmoke:: @ 8D05518 .incbin "graphics/battle_anims/sprites/030.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_033_palette:: @ 8D0553C +gBattleAnimSpritePal_Fire:: @ 8D0553C .incbin "graphics/battle_anims/sprites/033.gbapal.lz" .align 2 @@ -426,7 +426,7 @@ gBattleAnimSpriteGfx_FirePlume:: @ 8D062A0 .incbin "graphics/battle_anims/sprites/035.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_036_palette:: @ 8D06638 +gBattleAnimSpritePal_Lightning2:: @ 8D06638 .incbin "graphics/battle_anims/sprites/036.gbapal.lz" .align 2 @@ -474,11 +474,11 @@ gFile_graphics_unused_old_battle_interface_tilemap:: @ 8D077EC .incbin "graphics/unused/old_battle_interface_tilemap.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_038_palette:: @ 8D078FC +gBattleAnimSpritePal_ClawSlash2:: @ 8D078FC .incbin "graphics/battle_anims/sprites/038.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_039_palette:: @ 8D07924 +gBattleAnimSpritePal_ClawSlash:: @ 8D07924 .incbin "graphics/battle_anims/sprites/039.gbapal.lz" .align 2 @@ -506,7 +506,7 @@ gBattleAnimSpriteGfx_BubbleBurst2:: @ 8D082AC .incbin "graphics/battle_anims/sprites/042.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_042_palette:: @ 8D0857C +gBattleAnimSpritePal_BubbleBurst2:: @ 8D0857C .incbin "graphics/battle_anims/sprites/042.gbapal.lz" .align 2 @@ -514,11 +514,11 @@ gBattleAnimSpriteGfx_IceChunk:: @ 8D085A4 .incbin "graphics/battle_anims/sprites/043.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_043_palette:: @ 8D089A4 +gBattleAnimSpritePal_IceChunk:: @ 8D089A4 .incbin "graphics/battle_anims/sprites/043.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_044_palette:: @ 8D089CC +gBattleAnimSpritePal_Glass2:: @ 8D089CC .incbin "graphics/battle_anims/sprites/044.gbapal.lz" .align 2 @@ -526,7 +526,7 @@ gBattleAnimSpriteGfx_Glass2:: @ 8D089F4 .incbin "graphics/battle_anims/sprites/044.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_045_palette:: @ 8D08C60 +gBattleAnimSpritePal_PinkHeart2:: @ 8D08C60 .incbin "graphics/battle_anims/sprites/045.gbapal.lz" .align 2 @@ -550,11 +550,11 @@ gBattleAnimSpriteGfx_SapDrip:: @ 8D095EC .incbin "graphics/battle_anims/sprites/046.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_046_palette:: @ 8D099CC +gBattleAnimSpritePal_SapDrip:: @ 8D099CC .incbin "graphics/battle_anims/sprites/046.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_047_palette:: @ 8D099EC +gBattleAnimSpritePal_SapDrip2:: @ 8D099EC .incbin "graphics/battle_anims/sprites/047.gbapal.lz" .align 2 @@ -570,15 +570,15 @@ gBattleAnimSpriteGfx_Sparkle1:: @ 8D09CD8 .incbin "graphics/battle_anims/sprites/048.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_048_palette:: @ 8D09F70 +gBattleAnimSpritePal_Sparkle1:: @ 8D09F70 .incbin "graphics/battle_anims/sprites/048.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_049_palette:: @ 8D09F98 +gBattleAnimSpritePal_Sparkle2:: @ 8D09F98 .incbin "graphics/battle_anims/sprites/049.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_050_palette:: @ 8D09FC0 +gBattleAnimSpritePal_HumanoidFoot:: @ 8D09FC0 .incbin "graphics/battle_anims/sprites/050.gbapal.lz" .align 2 @@ -606,7 +606,7 @@ gBattleAnimSpriteGfx_YellowUnk:: @ 8D0A390 .incbin "graphics/battle_anims/sprites/054.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_054_palette:: @ 8D0A3BC +gBattleAnimSpritePal_YellowUnk:: @ 8D0A3BC .incbin "graphics/battle_anims/sprites/054.gbapal.lz" .align 2 @@ -614,7 +614,7 @@ gBattleAnimSpriteGfx_SlamHit:: @ 8D0A3D4 .incbin "graphics/battle_anims/sprites/056.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_056_palette:: @ 8D0A87C +gBattleAnimSpritePal_SlamHit:: @ 8D0A87C .incbin "graphics/battle_anims/sprites/056.gbapal.lz" .align 2 @@ -626,7 +626,7 @@ gBattleAnimSpriteGfx_Ring:: @ 8D0A968 .incbin "graphics/battle_anims/sprites/057.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_057_palette:: @ 8D0A9F0 +gBattleAnimSpritePal_Ring:: @ 8D0A9F0 .incbin "graphics/battle_anims/sprites/057.gbapal.lz" .align 2 @@ -634,7 +634,7 @@ gBattleAnimSpriteGfx_Rocks:: @ 8D0AA14 .incbin "graphics/battle_anims/sprites/058.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_058_palette:: @ 8D0AE7C +gBattleAnimSpritePal_Rocks:: @ 8D0AE7C .incbin "graphics/battle_anims/sprites/058.gbapal.lz" .align 2 @@ -642,7 +642,7 @@ gBattleAnimSpriteGfx_Z:: @ 8D0AEA4 .incbin "graphics/battle_anims/sprites/059.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_059_palette:: @ 8D0AF04 +gBattleAnimSpritePal_Z:: @ 8D0AF04 .incbin "graphics/battle_anims/sprites/059.gbapal.lz" .align 2 @@ -650,7 +650,7 @@ gBattleAnimSpriteGfx_YellowUnk2:: @ 8D0AF20 .incbin "graphics/battle_anims/sprites/060.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_060_palette:: @ 8D0AF48 +gBattleAnimSpritePal_YellowUnk2:: @ 8D0AF48 .incbin "graphics/battle_anims/sprites/060.gbapal.lz" .align 2 @@ -658,7 +658,7 @@ gBattleAnimSpriteGfx_AirSlash:: @ 8D0AF64 .incbin "graphics/battle_anims/sprites/061.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_061_palette:: @ 8D0B014 +gBattleAnimSpritePal_AirSlash:: @ 8D0B014 .incbin "graphics/battle_anims/sprites/061.gbapal.lz" .align 2 @@ -666,7 +666,7 @@ gBattleAnimSpriteGfx_SpinningGreenOrbs:: @ 8D0B034 .incbin "graphics/battle_anims/sprites/062.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_062_palette:: @ 8D0B404 +gBattleAnimSpritePal_SpinningGreenOrbs:: @ 8D0B404 .incbin "graphics/battle_anims/sprites/062.gbapal.lz" .align 2 @@ -674,7 +674,7 @@ gBattleAnimSpriteGfx_Leaf:: @ 8D0B42C .incbin "graphics/battle_anims/sprites/063.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_063_palette:: @ 8D0B5E8 +gBattleAnimSpritePal_Leaf:: @ 8D0B5E8 .incbin "graphics/battle_anims/sprites/063.gbapal.lz" .align 2 @@ -682,7 +682,7 @@ gFile_graphics_unused_metronome_hand_small_sheet:: @ 8D0B610 .incbin "graphics/unused/metronome_hand_small.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_091_palette:: @ 8D0B680 +gBattleAnimSpritePal_Clapping:: @ 8D0B680 .incbin "graphics/battle_anims/sprites/091.gbapal.lz" .align 2 @@ -690,7 +690,7 @@ gBattleAnimSpriteGfx_PoisonPowder:: @ 8D0B6A4 .incbin "graphics/battle_anims/sprites/065.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_065_palette:: @ 8D0B7B8 +gBattleAnimSpritePal_PoisonPowder:: @ 8D0B7B8 .incbin "graphics/battle_anims/sprites/065.gbapal.lz" .align 2 @@ -698,7 +698,7 @@ gBattleAnimSpriteGfx_BrownTriangle:: @ 8D0B7D8 .incbin "graphics/battle_anims/sprites/066.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_066_palette:: @ 8D0B824 +gBattleAnimSpritePal_BrownTriangle:: @ 8D0B824 .incbin "graphics/battle_anims/sprites/066.gbapal.lz" .align 2 @@ -706,7 +706,7 @@ gBattleAnimSpriteGfx_Sparkle3:: @ 8D0B84C .incbin "graphics/battle_anims/sprites/070.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_070_palette:: @ 8D0B8CC +gBattleAnimSpritePal_Sparkle3:: @ 8D0B8CC .incbin "graphics/battle_anims/sprites/070.gbapal.lz" .align 2 @@ -718,7 +718,7 @@ gBattleAnimSpriteGfx_MusicNotes:: @ 8D0BB20 .incbin "graphics/battle_anims/sprites/072.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_072_palette:: @ 8D0BBF0 +gBattleAnimSpritePal_MusicNotes:: @ 8D0BBF0 .incbin "graphics/battle_anims/sprites/072.gbapal.lz" .align 2 @@ -726,7 +726,7 @@ gBattleAnimSpriteGfx_Duck:: @ 8D0BC08 .incbin "graphics/battle_anims/sprites/073.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_073_palette:: @ 8D0BD24 +gBattleAnimSpritePal_Duck:: @ 8D0BD24 .incbin "graphics/battle_anims/sprites/073.gbapal.lz" .align 2 @@ -734,7 +734,7 @@ gBattleAnimSpriteGfx_Alert:: @ 8D0BD44 .incbin "graphics/battle_anims/sprites/075.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_075_palette:: @ 8D0BFC0 +gBattleAnimSpritePal_Alert:: @ 8D0BFC0 .incbin "graphics/battle_anims/sprites/075.gbapal.lz" .align 2 @@ -742,7 +742,7 @@ gBattleAnimSpriteGfx_Shock4:: @ 8D0BFE4 .incbin "graphics/battle_anims/sprites/078.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_078_palette:: @ 8D0C17C +gBattleAnimSpritePal_Shock4:: @ 8D0C17C .incbin "graphics/battle_anims/sprites/078.gbapal.lz" .align 2 @@ -754,7 +754,7 @@ gBattleAnimSpriteGfx_Bell2:: @ 8D0C5D4 .incbin "graphics/battle_anims/sprites/080.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_080_palette:: @ 8D0C938 +gBattleAnimSpritePal_Bell2:: @ 8D0C938 .incbin "graphics/battle_anims/sprites/080.gbapal.lz" .align 2 @@ -762,7 +762,7 @@ gBattleAnimSpriteGfx_PinkGlove:: @ 8D0C95C .incbin "graphics/battle_anims/sprites/081.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_081_palette:: @ 8D0C9E0 +gBattleAnimSpritePal_PinkGlove:: @ 8D0C9E0 .incbin "graphics/battle_anims/sprites/081.gbapal.lz" .align 2 @@ -794,47 +794,47 @@ gBattleAnimSpriteGfx_BlueLines:: @ 8D0CB78 .incbin "graphics/battle_anims/sprites/082.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_082_palette:: @ 8D0CB9C +gBattleAnimSpritePal_BlueLines:: @ 8D0CB9C .incbin "graphics/battle_anims/sprites/082.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_083_palette:: @ 8D0CBB0 +gBattleAnimSpritePal_Impact3:: @ 8D0CBB0 .incbin "graphics/battle_anims/sprites/083.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_084_palette:: @ 8D0CBD8 +gBattleAnimSpritePal_Impact2:: @ 8D0CBD8 .incbin "graphics/battle_anims/sprites/084.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_085_palette:: @ 8D0CC00 +gBattleAnimSpritePal_Reticle:: @ 8D0CC00 .incbin "graphics/battle_anims/sprites/085.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_086_palette:: @ 8D0CC18 +gBattleAnimSpritePal_Breath:: @ 8D0CC18 .incbin "graphics/battle_anims/sprites/086.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_088_palette:: @ 8D0CC40 +gBattleAnimSpritePal_Snowball:: @ 8D0CC40 .incbin "graphics/battle_anims/sprites/088.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_089_palette:: @ 8D0CC5C +gBattleAnimSpritePal_Vine:: @ 8D0CC5C .incbin "graphics/battle_anims/sprites/089.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_090_palette:: @ 8D0CC84 +gBattleAnimSpritePal_Sword2:: @ 8D0CC84 .incbin "graphics/battle_anims/sprites/090.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_092_palette:: @ 8D0CCA8 +gBattleAnimSpritePal_RedTube:: @ 8D0CCA8 .incbin "graphics/battle_anims/sprites/092.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_093_palette:: @ 8D0CCC4 +gBattleAnimSpritePal_Amnesia:: @ 8D0CCC4 .incbin "graphics/battle_anims/sprites/093.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_094_palette:: @ 8D0CCEC +gBattleAnimSpritePal_String2:: @ 8D0CCEC .incbin "graphics/battle_anims/sprites/094.gbapal.lz" .align 2 @@ -842,27 +842,27 @@ gFile_graphics_unknown_unknown_D0CD0C:: @ 8D0CD0C .incbin "graphics/unknown/unknown_D0CD0C.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_095_palette:: @ 8D0CD2C +gBattleAnimSpritePal_Pencil2:: @ 8D0CD2C .incbin "graphics/battle_anims/sprites/095.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_096_palette:: @ 8D0CD54 +gBattleAnimSpritePal_Petal:: @ 8D0CD54 .incbin "graphics/battle_anims/sprites/096.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_097_palette:: @ 8D0CD70 +gBattleAnimSpritePal_BentSpoon:: @ 8D0CD70 .incbin "graphics/battle_anims/sprites/097.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_100_palette:: @ 8D0CD98 +gBattleAnimSpritePal_Coin:: @ 8D0CD98 .incbin "graphics/battle_anims/sprites/100.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_101_palette:: @ 8D0CDB4 +gBattleAnimSpritePal_CrackedEgg:: @ 8D0CDB4 .incbin "graphics/battle_anims/sprites/101.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_103_palette:: @ 8D0CDDC +gBattleAnimSpritePal_FreshEgg:: @ 8D0CDDC .incbin "graphics/battle_anims/sprites/103.gbapal.lz" .align 2 @@ -946,7 +946,7 @@ gBattleAnimSpriteGfx_Fangs:: @ 8D0EF74 .incbin "graphics/battle_anims/sprites/104.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_104_palette:: @ 8D0F134 +gBattleAnimSpritePal_Fangs:: @ 8D0F134 .incbin "graphics/battle_anims/sprites/104.gbapal.lz" .align 2 @@ -954,7 +954,7 @@ gBattleAnimSpriteGfx_Explosion2:: @ 8D0F15C .incbin "graphics/battle_anims/sprites/105.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_105_palette:: @ 8D0F6E0 +gBattleAnimSpritePal_Explosion2:: @ 8D0F6E0 .incbin "graphics/battle_anims/sprites/105.gbapal.lz" .align 2 @@ -966,7 +966,7 @@ gBattleAnimSpriteGfx_WaterDroplet:: @ 8D0F7F8 .incbin "graphics/battle_anims/sprites/107.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_107_palette:: @ 8D0FBA4 +gBattleAnimSpritePal_WaterDroplet:: @ 8D0FBA4 .incbin "graphics/battle_anims/sprites/107.gbapal.lz" .align 2 @@ -978,7 +978,7 @@ gBattleAnimSpriteGfx_Seed2:: @ 8D0FF50 .incbin "graphics/battle_anims/sprites/109.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_109_palette:: @ 8D0FF78 +gBattleAnimSpritePal_Seed2:: @ 8D0FF78 .incbin "graphics/battle_anims/sprites/109.gbapal.lz" .align 2 @@ -990,7 +990,7 @@ gBattleAnimSpriteGfx_RedWand:: @ 8D10384 .incbin "graphics/battle_anims/sprites/111.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_111_palette:: @ 8D103C8 +gBattleAnimSpritePal_RedWand:: @ 8D103C8 .incbin "graphics/battle_anims/sprites/111.gbapal.lz" .align 2 @@ -998,7 +998,7 @@ gBattleAnimSpriteGfx_PurpleGreenUnk:: @ 8D103EC .incbin "graphics/battle_anims/sprites/112.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_112_palette:: @ 8D10714 +gBattleAnimSpritePal_PurpleGreenUnk:: @ 8D10714 .incbin "graphics/battle_anims/sprites/112.gbapal.lz" .align 2 @@ -1006,7 +1006,7 @@ gBattleAnimSpriteGfx_WaterColumn:: @ 8D1073C .incbin "graphics/battle_anims/sprites/113.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_113_palette:: @ 8D109A8 +gBattleAnimSpritePal_WaterColumn:: @ 8D109A8 .incbin "graphics/battle_anims/sprites/113.gbapal.lz" .align 2 @@ -1014,7 +1014,7 @@ gBattleAnimSpriteGfx_MudUnk:: @ 8D109D0 .incbin "graphics/battle_anims/sprites/114.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_114_palette:: @ 8D10AC4 +gBattleAnimSpritePal_MudUnk:: @ 8D10AC4 .incbin "graphics/battle_anims/sprites/114.gbapal.lz" .align 2 @@ -1088,7 +1088,7 @@ gBattleAnimSpriteGfx_FurySwipes:: @ 8D12EB0 .incbin "graphics/battle_anims/sprites/116.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_116_palette:: @ 8D1315C +gBattleAnimSpritePal_FurySwipes:: @ 8D1315C .incbin "graphics/battle_anims/sprites/116.gbapal.lz" .align 2 @@ -1096,7 +1096,7 @@ gBattleAnimSpriteGfx_Vine2:: @ 8D13184 .incbin "graphics/battle_anims/sprites/117.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_117_palette:: @ 8D133C0 +gBattleAnimSpritePal_Vine2:: @ 8D133C0 .incbin "graphics/battle_anims/sprites/117.gbapal.lz" .align 2 @@ -1104,7 +1104,7 @@ gBattleAnimSpriteGfx_Teeth:: @ 8D133DC .incbin "graphics/battle_anims/sprites/118.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_118_palette:: @ 8D13574 +gBattleAnimSpritePal_Teeth:: @ 8D13574 .incbin "graphics/battle_anims/sprites/118.gbapal.lz" .align 2 @@ -1112,7 +1112,7 @@ gBattleAnimSpriteGfx_Bone2:: @ 8D13590 .incbin "graphics/battle_anims/sprites/119.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_119_palette:: @ 8D13820 +gBattleAnimSpritePal_Bone2:: @ 8D13820 .incbin "graphics/battle_anims/sprites/119.gbapal.lz" .align 2 @@ -1120,7 +1120,7 @@ gBattleAnimSpriteGfx_WhiteBag:: @ 8D13848 .incbin "graphics/battle_anims/sprites/120.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_120_palette:: @ 8D1393C +gBattleAnimSpritePal_WhiteBag:: @ 8D1393C .incbin "graphics/battle_anims/sprites/120.gbapal.lz" .align 2 @@ -1128,7 +1128,7 @@ gBattleAnimSpriteGfx_Unknown:: @ 8D13964 .incbin "graphics/battle_anims/sprites/121.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_121_palette:: @ 8D13990 +gBattleAnimSpritePal_Unknown:: @ 8D13990 .incbin "graphics/battle_anims/sprites/121.gbapal.lz" .align 2 @@ -1136,7 +1136,7 @@ gBattleAnimSpriteGfx_PurpleCoral:: @ 8D139B4 .incbin "graphics/battle_anims/sprites/122.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_122_palette:: @ 8D13AB0 +gBattleAnimSpritePal_PurpleCoral:: @ 8D13AB0 .incbin "graphics/battle_anims/sprites/122.gbapal.lz" .align 2 @@ -1148,7 +1148,7 @@ gBattleAnimSpriteGfx_Shock2:: @ 8D13C08 .incbin "graphics/battle_anims/sprites/124.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_124_palette:: @ 8D13EA0 +gBattleAnimSpritePal_Shock2:: @ 8D13EA0 .incbin "graphics/battle_anims/sprites/124.gbapal.lz" .align 2 @@ -1156,7 +1156,7 @@ gBattleAnimSpriteGfx_ClosingEye2:: @ 8D13EC8 .incbin "graphics/battle_anims/sprites/125.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_125_palette:: @ 8D13FB4 +gBattleAnimSpritePal_ClosingEye2:: @ 8D13FB4 .incbin "graphics/battle_anims/sprites/125.gbapal.lz" .align 2 @@ -1164,7 +1164,7 @@ gBattleAnimSpriteGfx_MetalBall:: @ 8D13FDC .incbin "graphics/battle_anims/sprites/126.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_126_palette:: @ 8D14044 +gBattleAnimSpritePal_MetalBall:: @ 8D14044 .incbin "graphics/battle_anims/sprites/126.gbapal.lz" .align 2 @@ -1172,7 +1172,7 @@ gBattleAnimSpriteGfx_MonsterDoll:: @ 8D14064 .incbin "graphics/battle_anims/sprites/127.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_127_palette:: @ 8D14204 +gBattleAnimSpritePal_MonsterDoll:: @ 8D14204 .incbin "graphics/battle_anims/sprites/127.gbapal.lz" .align 2 @@ -1180,7 +1180,7 @@ gBattleAnimSpriteGfx_Whirlwind:: @ 8D14228 .incbin "graphics/battle_anims/sprites/128.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_128_palette:: @ 8D14494 +gBattleAnimSpritePal_Whirlwind:: @ 8D14494 .incbin "graphics/battle_anims/sprites/128.gbapal.lz" .align 2 @@ -1192,7 +1192,7 @@ gBattleAnimSpriteGfx_Explosion4:: @ 8D14518 .incbin "graphics/battle_anims/sprites/130.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_130_palette:: @ 8D148E8 +gBattleAnimSpritePal_Explosion4:: @ 8D148E8 .incbin "graphics/battle_anims/sprites/130.gbapal.lz" .align 2 @@ -1204,7 +1204,7 @@ gBattleAnimSpriteGfx_Tongue:: @ 8D14A80 .incbin "graphics/battle_anims/sprites/132.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_132_palette:: @ 8D14B80 +gBattleAnimSpritePal_Tongue:: @ 8D14B80 .incbin "graphics/battle_anims/sprites/132.gbapal.lz" .align 2 @@ -1212,7 +1212,7 @@ gBattleAnimSpriteGfx_Smoke:: @ 8D14BA0 .incbin "graphics/battle_anims/sprites/133.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_133_palette:: @ 8D14C1C +gBattleAnimSpritePal_Smoke:: @ 8D14C1C .incbin "graphics/battle_anims/sprites/133.gbapal.lz" .align 2 @@ -1224,7 +1224,7 @@ gBattleAnimSpriteGfx_BlueFlames:: @ 8D14D14 .incbin "graphics/battle_anims/sprites/076.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_076_palette:: @ 8D14F50 +gBattleAnimSpritePal_BlueFlames:: @ 8D14F50 .incbin "graphics/battle_anims/sprites/076.gbapal.lz" .align 2 @@ -1340,7 +1340,7 @@ gBattleAnimSpriteGfx_Impact:: @ 8D1A518 .incbin "graphics/battle_anims/sprites/135.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_135_palette:: @ 8D1A5F0 +gBattleAnimSpritePal_Impact:: @ 8D1A5F0 .incbin "graphics/battle_anims/sprites/135.gbapal.lz" .align 2 @@ -1352,7 +1352,7 @@ gBattleAnimSpriteGfx_CircleImpact:: @ 8D1A6B8 .incbin "graphics/battle_anims/sprites/136.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_136_palette:: @ 8D1A6DC +gBattleAnimSpritePal_CircleImpact:: @ 8D1A6DC .incbin "graphics/battle_anims/sprites/136.gbapal.lz" .align 2 @@ -1364,7 +1364,7 @@ gBattleAnimSpriteGfx_SharpTeeth:: @ 8D1A908 .incbin "graphics/battle_anims/sprites/139.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_139_palette:: @ 8D1AAF8 +gBattleAnimSpritePal_SharpTeeth:: @ 8D1AAF8 .incbin "graphics/battle_anims/sprites/139.gbapal.lz" .align 2 @@ -1380,7 +1380,7 @@ gBattleAnimSpriteGfx_RainbowRings:: @ 8D1AE04 .incbin "graphics/battle_anims/sprites/140.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_140_palette:: @ 8D1AE84 +gBattleAnimSpritePal_RainbowRings:: @ 8D1AE84 .incbin "graphics/battle_anims/sprites/140.gbapal.lz" .align 2 @@ -1388,7 +1388,7 @@ gBattleAnimSpriteGfx_IceCrystals:: @ 8D1AEA4 .incbin "graphics/battle_anims/sprites/141.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_141_palette:: @ 8D1AFAC +gBattleAnimSpritePal_IceCrystals:: @ 8D1AFAC .incbin "graphics/battle_anims/sprites/141.gbapal.lz" .align 2 @@ -1408,7 +1408,7 @@ gBattleAnimSpriteGfx_Orbs:: @ 8D1B0E4 .incbin "graphics/battle_anims/sprites/147.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_147_palette:: @ 8D1B1F8 +gBattleAnimSpritePal_Orbs:: @ 8D1B1F8 .incbin "graphics/battle_anims/sprites/147.gbapal.lz" .align 2 @@ -1420,11 +1420,11 @@ gBattleAnimSpriteGfx_WaterImpact:: @ 8D1B2F0 .incbin "graphics/battle_anims/sprites/148.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_148_palette:: @ 8D1B3D4 +gBattleAnimSpritePal_WaterImpact:: @ 8D1B3D4 .incbin "graphics/battle_anims/sprites/148.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_259_palette:: @ 8D1B3F4 +gBattleAnimSpritePal_BrownOrb:: @ 8D1B3F4 .incbin "graphics/battle_anims/sprites/259.gbapal.lz" .align 2 @@ -1432,7 +1432,7 @@ gBattleAnimSpriteGfx_MudSand:: @ 8D1B414 .incbin "graphics/battle_anims/sprites/074.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_074_palette:: @ 8D1B47C +gBattleAnimSpritePal_MudSand:: @ 8D1B47C .incbin "graphics/battle_anims/sprites/074.gbapal.lz" .align 2 @@ -1440,7 +1440,7 @@ gBattleAnimSpriteGfx_PoisonBubble:: @ 8D1B4A0 .incbin "graphics/battle_anims/sprites/150.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_150_palette:: @ 8D1B574 +gBattleAnimSpritePal_PoisonBubble:: @ 8D1B574 .incbin "graphics/battle_anims/sprites/150.gbapal.lz" .align 2 @@ -1452,7 +1452,7 @@ gBattleAnimSpriteGfx_HornHit2:: @ 8D1B688 .incbin "graphics/battle_anims/sprites/153.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_153_palette:: @ 8D1B6F4 +gBattleAnimSpritePal_HornHit2:: @ 8D1B6F4 .incbin "graphics/battle_anims/sprites/153.gbapal.lz" .align 2 @@ -1460,7 +1460,7 @@ gBattleAnimSpriteGfx_AirWave2:: @ 8D1B70C .incbin "graphics/battle_anims/sprites/154.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_154_palette:: @ 8D1B7B8 +gBattleAnimSpritePal_AirWave2:: @ 8D1B7B8 .incbin "graphics/battle_anims/sprites/154.gbapal.lz" .align 2 @@ -1468,7 +1468,7 @@ gBattleAnimSpriteGfx_SmallBubbles:: @ 8D1B7D8 .incbin "graphics/battle_anims/sprites/155.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_155_palette:: @ 8D1B8A0 +gBattleAnimSpritePal_SmallBubbles:: @ 8D1B8A0 .incbin "graphics/battle_anims/sprites/155.gbapal.lz" .align 2 @@ -1476,7 +1476,7 @@ gBattleAnimSpriteGfx_RoundShadow:: @ 8D1B8C0 .incbin "graphics/battle_anims/sprites/156.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_156_palette:: @ 8D1BAD8 +gBattleAnimSpritePal_RoundShadow:: @ 8D1BAD8 .incbin "graphics/battle_anims/sprites/156.gbapal.lz" .align 2 @@ -1484,7 +1484,7 @@ gBattleAnimSpriteGfx_Sunlight:: @ 8D1BB00 .incbin "graphics/battle_anims/sprites/157.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_157_palette:: @ 8D1BB64 +gBattleAnimSpritePal_Sunlight:: @ 8D1BB64 .incbin "graphics/battle_anims/sprites/157.gbapal.lz" .align 2 @@ -1492,7 +1492,7 @@ gBattleAnimSpriteGfx_Spore:: @ 8D1BB7C .incbin "graphics/battle_anims/sprites/158.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_158_palette:: @ 8D1BC44 +gBattleAnimSpritePal_Spore:: @ 8D1BC44 .incbin "graphics/battle_anims/sprites/158.gbapal.lz" .align 2 @@ -1500,7 +1500,7 @@ gBattleAnimSpriteGfx_Flower:: @ 8D1BC68 .incbin "graphics/battle_anims/sprites/159.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_159_palette:: @ 8D1BCE4 +gBattleAnimSpritePal_Flower:: @ 8D1BCE4 .incbin "graphics/battle_anims/sprites/159.gbapal.lz" .align 2 @@ -1508,7 +1508,7 @@ gBattleAnimSpriteGfx_RazorLeaf:: @ 8D1BD0C .incbin "graphics/battle_anims/sprites/160.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_160_palette:: @ 8D1BDB4 +gBattleAnimSpritePal_RazorLeaf:: @ 8D1BDB4 .incbin "graphics/battle_anims/sprites/160.gbapal.lz" .align 2 @@ -1516,7 +1516,7 @@ gBattleAnimSpriteGfx_MistCloud:: @ 8D1BDDC .incbin "graphics/battle_anims/sprites/144.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_144_palette:: @ 8D1BE54 +gBattleAnimSpritePal_MistCloud:: @ 8D1BE54 .incbin "graphics/battle_anims/sprites/144.gbapal.lz" .align 2 @@ -1536,7 +1536,7 @@ gBattleAnimSpriteGfx_WhirlwindLines:: @ 8D1BFB8 .incbin "graphics/battle_anims/sprites/162.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_162_palette:: @ 8D1C03C +gBattleAnimSpritePal_WhirlwindLines:: @ 8D1C03C .incbin "graphics/battle_anims/sprites/162.gbapal.lz" .align 2 @@ -1544,19 +1544,19 @@ gBattleAnimSpriteGfx_GoldRing:: @ 8D1C05C .incbin "graphics/battle_anims/sprites/163.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_163_palette:: @ 8D1C0BC +gBattleAnimSpritePal_GoldRing:: @ 8D1C0BC .incbin "graphics/battle_anims/sprites/163.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_288_palette:: @ 8D1C0D4 +gBattleAnimSpritePal_BlueRing2:: @ 8D1C0D4 .incbin "graphics/battle_anims/sprites/288.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_164_palette:: @ 8D1C0EC +gBattleAnimSpritePal_PurpleRing:: @ 8D1C0EC .incbin "graphics/battle_anims/sprites/164.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_165_palette:: @ 8D1C104 +gBattleAnimSpritePal_BlueRing:: @ 8D1C104 .incbin "graphics/battle_anims/sprites/165.gbapal.lz" .align 2 @@ -1564,23 +1564,23 @@ gBattleAnimSpriteGfx_GreenLightWall:: @ 8D1C11C .incbin "graphics/battle_anims/sprites/166.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_166_palette:: @ 8D1C428 +gBattleAnimSpritePal_GreenLightWall:: @ 8D1C428 .incbin "graphics/battle_anims/sprites/166.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_167_palette:: @ 8D1C448 +gBattleAnimSpritePal_BlueLightWall:: @ 8D1C448 .incbin "graphics/battle_anims/sprites/167.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_168_palette:: @ 8D1C468 +gBattleAnimSpritePal_RedLightWall:: @ 8D1C468 .incbin "graphics/battle_anims/sprites/168.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_169_palette:: @ 8D1C488 +gBattleAnimSpritePal_GrayLightWall:: @ 8D1C488 .incbin "graphics/battle_anims/sprites/169.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_170_palette:: @ 8D1C4A8 +gBattleAnimSpritePal_OrangeLightWall:: @ 8D1C4A8 .incbin "graphics/battle_anims/sprites/170.gbapal.lz" .align 2 @@ -1588,11 +1588,11 @@ gBattleAnimSpriteGfx_BlackBall2:: @ 8D1C4C8 .incbin "graphics/battle_anims/sprites/171.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_171_palette:: @ 8D1C514 +gBattleAnimSpritePal_BlackBall2:: @ 8D1C514 .incbin "graphics/battle_anims/sprites/171.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_172_palette:: @ 8D1C53C +gBattleAnimSpritePal_PurpleGasCloud:: @ 8D1C53C .incbin "graphics/battle_anims/sprites/172.gbapal.lz" .align 2 @@ -1608,7 +1608,7 @@ gBattleAnimSpriteGfx_Spark:: @ 8D1C858 .incbin "graphics/battle_anims/sprites/001.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_001_palette:: @ 8D1C90C +gBattleAnimSpritePal_Spark:: @ 8D1C90C .incbin "graphics/battle_anims/sprites/001.gbapal.lz" .align 2 @@ -1656,7 +1656,7 @@ gBattleAnimSpriteGfx_YellowStar:: @ 8D1D774 .incbin "graphics/battle_anims/sprites/174.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_174_palette:: @ 8D1D814 +gBattleAnimSpritePal_YellowStar:: @ 8D1D814 .incbin "graphics/battle_anims/sprites/174.gbapal.lz" .align 2 @@ -1664,7 +1664,7 @@ gBattleAnimSpriteGfx_LargeFreshEgg:: @ 8D1D83C .incbin "graphics/battle_anims/sprites/175.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_175_palette:: @ 8D1D8A0 +gBattleAnimSpritePal_LargeFreshEgg:: @ 8D1D8A0 .incbin "graphics/battle_anims/sprites/175.gbapal.lz" .align 2 @@ -1672,7 +1672,7 @@ gBattleAnimSpriteGfx_ShadowBall:: @ 8D1D8C8 .incbin "graphics/battle_anims/sprites/176.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_176_palette:: @ 8D1DA20 +gBattleAnimSpritePal_ShadowBall:: @ 8D1DA20 .incbin "graphics/battle_anims/sprites/176.gbapal.lz" .align 2 @@ -1680,7 +1680,7 @@ gBattleAnimSpriteGfx_Lick:: @ 8D1DA48 .incbin "graphics/battle_anims/sprites/177.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_177_palette:: @ 8D1DB0C +gBattleAnimSpritePal_Lick:: @ 8D1DB0C .incbin "graphics/battle_anims/sprites/177.gbapal.lz" .align 2 @@ -1688,11 +1688,11 @@ gBattleAnimSpriteGfx_VoidLines:: @ 8D1DB24 .incbin "graphics/battle_anims/sprites/178.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_178_palette:: @ 8D1DC8C +gBattleAnimSpritePal_VoidLines:: @ 8D1DC8C .incbin "graphics/battle_anims/sprites/178.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_179_palette:: @ 8D1DCB4 +gBattleAnimSpritePal_String:: @ 8D1DCB4 .incbin "graphics/battle_anims/sprites/179.gbapal.lz" .align 2 @@ -1712,7 +1712,7 @@ gBattleAnimSpriteGfx_Lightbulb:: @ 8D1E160 .incbin "graphics/battle_anims/sprites/182.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_182_palette:: @ 8D1E204 +gBattleAnimSpritePal_Lightbulb:: @ 8D1E204 .incbin "graphics/battle_anims/sprites/182.gbapal.lz" .align 2 @@ -1720,7 +1720,7 @@ gBattleAnimSpriteGfx_Slash:: @ 8D1E22C .incbin "graphics/battle_anims/sprites/183.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_183_palette:: @ 8D1E4A4 +gBattleAnimSpritePal_Slash:: @ 8D1E4A4 .incbin "graphics/battle_anims/sprites/183.gbapal.lz" .align 2 @@ -1728,7 +1728,7 @@ gBattleAnimSpriteGfx_FocusEnergy:: @ 8D1E4CC .incbin "graphics/battle_anims/sprites/184.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_184_palette:: @ 8D1E620 +gBattleAnimSpritePal_FocusEnergy:: @ 8D1E620 .incbin "graphics/battle_anims/sprites/184.gbapal.lz" .align 2 @@ -1736,7 +1736,7 @@ gBattleAnimSpriteGfx_SphereToCube:: @ 8D1E648 .incbin "graphics/battle_anims/sprites/185.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_185_palette:: @ 8D1EA5C +gBattleAnimSpritePal_SphereToCube:: @ 8D1EA5C .incbin "graphics/battle_anims/sprites/185.gbapal.lz" .align 2 @@ -1756,7 +1756,7 @@ gBattleAnimSpriteGfx_Eye:: @ 8D1ED40 .incbin "graphics/battle_anims/sprites/187.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_187_palette:: @ 8D1EF30 +gBattleAnimSpritePal_Eye:: @ 8D1EF30 .incbin "graphics/battle_anims/sprites/187.gbapal.lz" .align 2 @@ -1764,7 +1764,7 @@ gBattleAnimSpriteGfx_Tendrils:: @ 8D1EF50 .incbin "graphics/battle_anims/sprites/186.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_186_palette:: @ 8D1F31C +gBattleAnimSpritePal_Tendrils:: @ 8D1F31C .incbin "graphics/battle_anims/sprites/186.gbapal.lz" .align 2 @@ -1800,7 +1800,7 @@ gBattleAnimSpriteGfx_LockOn:: @ 8D1FDA8 .incbin "graphics/battle_anims/sprites/014.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_014_palette:: @ 8D1FE3C +gBattleAnimSpritePal_LockOn:: @ 8D1FE3C .incbin "graphics/battle_anims/sprites/014.gbapal.lz" .align 2 @@ -1808,7 +1808,7 @@ gBattleAnimSpriteGfx_OpeningEye:: @ 8D1FE58 .incbin "graphics/battle_anims/sprites/190.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_190_palette:: @ 8D200B4 +gBattleAnimSpritePal_OpeningEye:: @ 8D200B4 .incbin "graphics/battle_anims/sprites/190.gbapal.lz" .align 2 @@ -1816,7 +1816,7 @@ gBattleAnimSpriteGfx_RoundWhiteHalo:: @ 8D200D8 .incbin "graphics/battle_anims/sprites/191.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_191_palette:: @ 8D20344 +gBattleAnimSpritePal_RoundWhiteHalo:: @ 8D20344 .incbin "graphics/battle_anims/sprites/191.gbapal.lz" .align 2 @@ -1824,7 +1824,7 @@ gBattleAnimSpriteGfx_TealAlert:: @ 8D2036C .incbin "graphics/battle_anims/sprites/189.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_189_palette:: @ 8D203F0 +gBattleAnimSpritePal_TealAlert:: @ 8D203F0 .incbin "graphics/battle_anims/sprites/189.gbapal.lz" .align 2 @@ -1832,7 +1832,7 @@ gBattleAnimSpriteGfx_FangAttack:: @ 8D20410 .incbin "graphics/battle_anims/sprites/192.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_192_palette:: @ 8D20690 +gBattleAnimSpritePal_FangAttack:: @ 8D20690 .incbin "graphics/battle_anims/sprites/192.gbapal.lz" .align 2 @@ -1840,7 +1840,7 @@ gBattleAnimSpriteGfx_PurpleHandOutline:: @ 8D206B8 .incbin "graphics/battle_anims/sprites/193.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_193_palette:: @ 8D20814 +gBattleAnimSpritePal_PurpleHandOutline:: @ 8D20814 .incbin "graphics/battle_anims/sprites/193.gbapal.lz" .align 2 @@ -1856,7 +1856,7 @@ gBattleAnimSpriteGfx_Pencil:: @ 8D20958 .incbin "graphics/battle_anims/sprites/002.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_002_palette:: @ 8D20A3C +gBattleAnimSpritePal_Pencil:: @ 8D20A3C .incbin "graphics/battle_anims/sprites/002.gbapal.lz" .align 2 @@ -1864,7 +1864,7 @@ gBattleAnimSpriteGfx_Spiral:: @ 8D20A64 .incbin "graphics/battle_anims/sprites/196.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_196_palette:: @ 8D20E08 +gBattleAnimSpritePal_Spiral:: @ 8D20E08 .incbin "graphics/battle_anims/sprites/196.gbapal.lz" .align 2 @@ -1872,7 +1872,7 @@ gBattleAnimSpriteGfx_Moon:: @ 8D20E20 .incbin "graphics/battle_anims/sprites/194.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_194_palette:: @ 8D21158 +gBattleAnimSpritePal_Moon:: @ 8D21158 .incbin "graphics/battle_anims/sprites/194.gbapal.lz" .align 2 @@ -1880,7 +1880,7 @@ gBattleAnimSpriteGfx_GreenSparkle:: @ 8D21180 .incbin "graphics/battle_anims/sprites/195.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_195_palette:: @ 8D21238 +gBattleAnimSpritePal_GreenSparkle:: @ 8D21238 .incbin "graphics/battle_anims/sprites/195.gbapal.lz" .align 2 @@ -1888,7 +1888,7 @@ gBattleAnimSpriteGfx_SnoreZ:: @ 8D21258 .incbin "graphics/battle_anims/sprites/197.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_197_palette:: @ 8D213C8 +gBattleAnimSpritePal_SnoreZ:: @ 8D213C8 .incbin "graphics/battle_anims/sprites/197.gbapal.lz" .align 2 @@ -1896,7 +1896,7 @@ gBattleAnimSpriteGfx_Explosion:: @ 8D213F0 .incbin "graphics/battle_anims/sprites/198.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_198_palette:: @ 8D217E0 +gBattleAnimSpritePal_Explosion:: @ 8D217E0 .incbin "graphics/battle_anims/sprites/198.gbapal.lz" .align 2 @@ -1904,7 +1904,7 @@ gBattleAnimSpriteGfx_Nail:: @ 8D21808 .incbin "graphics/battle_anims/sprites/199.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_199_palette:: @ 8D218D0 +gBattleAnimSpritePal_Nail:: @ 8D218D0 .incbin "graphics/battle_anims/sprites/199.gbapal.lz" .align 2 @@ -1912,7 +1912,7 @@ gBattleAnimSpriteGfx_GhostlySpirit:: @ 8D218EC .incbin "graphics/battle_anims/sprites/200.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_200_palette:: @ 8D21A2C +gBattleAnimSpritePal_GhostlySpirit:: @ 8D21A2C .incbin "graphics/battle_anims/sprites/200.gbapal.lz" .align 2 @@ -1920,7 +1920,7 @@ gBattleAnimSpriteGfx_WarmRock:: @ 8D21A48 .incbin "graphics/battle_anims/sprites/201.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_201_palette:: @ 8D220B8 +gBattleAnimSpritePal_WarmRock:: @ 8D220B8 .incbin "graphics/battle_anims/sprites/201.gbapal.lz" .align 2 @@ -1928,7 +1928,7 @@ gBattleAnimSpriteGfx_PunchImpact:: @ 8D220E0 .incbin "graphics/battle_anims/sprites/204.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_204_palette:: @ 8D22254 +gBattleAnimSpritePal_PunchImpact:: @ 8D22254 .incbin "graphics/battle_anims/sprites/204.gbapal.lz" .align 2 @@ -1936,7 +1936,7 @@ gBattleAnimSpriteGfx_BreakingEgg:: @ 8D2227C .incbin "graphics/battle_anims/sprites/202.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_202_palette:: @ 8D223E4 +gBattleAnimSpritePal_BreakingEgg:: @ 8D223E4 .incbin "graphics/battle_anims/sprites/202.gbapal.lz" .align 2 @@ -1944,7 +1944,7 @@ gBattleAnimSpriteGfx_ThinRing:: @ 8D22408 .incbin "graphics/battle_anims/sprites/203.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_203_palette:: @ 8D225B4 +gBattleAnimSpritePal_ThinRing:: @ 8D225B4 .incbin "graphics/battle_anims/sprites/203.gbapal.lz" .align 2 @@ -1952,7 +1952,7 @@ gBattleAnimSpriteGfx_MusicNotes2:: @ 8D225D8 .incbin "graphics/battle_anims/sprites/206.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_206_palette:: @ 8D227E4 +gBattleAnimSpritePal_MusicNotes2:: @ 8D227E4 .incbin "graphics/battle_anims/sprites/206.gbapal.lz" .align 2 @@ -1960,7 +1960,7 @@ gBattleAnimSpriteGfx_Bell:: @ 8D22878 .incbin "graphics/battle_anims/sprites/205.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_205_palette:: @ 8D22AAC +gBattleAnimSpritePal_Bell:: @ 8D22AAC .incbin "graphics/battle_anims/sprites/205.gbapal.lz" .align 2 @@ -1968,7 +1968,7 @@ gBattleAnimSpriteGfx_SpeedDust:: @ 8D22AD0 .incbin "graphics/battle_anims/sprites/207.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_207_palette:: @ 8D22B9C +gBattleAnimSpritePal_SpeedDust:: @ 8D22B9C .incbin "graphics/battle_anims/sprites/207.gbapal.lz" .align 2 @@ -1980,7 +1980,7 @@ gBattleAnimSpriteGfx_ThoughtBubble:: @ 8D22FB0 .incbin "graphics/battle_anims/sprites/209.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_209_palette:: @ 8D232B8 +gBattleAnimSpritePal_ThoughtBubble:: @ 8D232B8 .incbin "graphics/battle_anims/sprites/209.gbapal.lz" .align 2 @@ -1988,7 +1988,7 @@ gBattleAnimSpriteGfx_Finger:: @ 8D232D8 .incbin "graphics/battle_anims/sprites/064.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_064_palette:: @ 8D233C8 +gBattleAnimSpritePal_Finger:: @ 8D233C8 .incbin "graphics/battle_anims/sprites/064.gbapal.lz" .align 2 @@ -1996,15 +1996,15 @@ gBattleAnimSpriteGfx_MagentaHeart:: @ 8D233EC .incbin "graphics/battle_anims/sprites/210.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_219_palette:: @ 8D23454 +gBattleAnimSpritePal_PinkHeart:: @ 8D23454 .incbin "graphics/battle_anims/sprites/219.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_210_palette:: @ 8D23474 +gBattleAnimSpritePal_MagentaHeart:: @ 8D23474 .incbin "graphics/battle_anims/sprites/210.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_216_palette:: @ 8D23494 +gBattleAnimSpritePal_RedHeart:: @ 8D23494 .incbin "graphics/battle_anims/sprites/216.gbapal.lz" .align 2 @@ -2024,7 +2024,7 @@ gBattleAnimSpriteGfx_RedOrb:: @ 8D241C8 .incbin "graphics/battle_anims/sprites/217.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_217_palette:: @ 8D24230 +gBattleAnimSpritePal_RedOrb:: @ 8D24230 .incbin "graphics/battle_anims/sprites/217.gbapal.lz" .align 2 @@ -2040,7 +2040,7 @@ gBattleAnimSpriteGfx_Electricity:: @ 8D244D4 .incbin "graphics/battle_anims/sprites/213.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_211_palette:: @ 8D24740 +gBattleAnimSpritePal_ElectricOrbs:: @ 8D24740 .incbin "graphics/battle_anims/sprites/211.gbapal.lz" .align 2 @@ -2052,7 +2052,7 @@ gBattleAnimSpriteGfx_MovementWaves:: @ 8D249F4 .incbin "graphics/battle_anims/sprites/215.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_215_palette:: @ 8D24B80 +gBattleAnimSpritePal_MovementWaves:: @ 8D24B80 .incbin "graphics/battle_anims/sprites/215.gbapal.lz" .align 2 @@ -2064,7 +2064,7 @@ gFile_graphics_battle_anims_backgrounds_scary_face_sheet:: @ 8D24BCC .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_218_palette:: @ 8D24DFC +gBattleAnimSpritePal_EyeSparkle:: @ 8D24DFC .incbin "graphics/battle_anims/sprites/218.gbapal.lz" .align 2 @@ -2076,7 +2076,7 @@ gBattleAnimSpriteGfx_Anger:: @ 8D24ED0 .incbin "graphics/battle_anims/sprites/087.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_087_palette:: @ 8D24F28 +gBattleAnimSpritePal_Anger:: @ 8D24F28 .incbin "graphics/battle_anims/sprites/087.gbapal.lz" .align 2 @@ -2084,11 +2084,11 @@ gBattleAnimSpriteGfx_Conversion:: @ 8D24F50 .incbin "graphics/battle_anims/sprites/018.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_018_palette:: @ 8D24F8C +gBattleAnimSpritePal_Conversion:: @ 8D24F8C .incbin "graphics/battle_anims/sprites/018.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_220_palette:: @ 8D24FA8 +gBattleAnimSpritePal_Angel:: @ 8D24FA8 .incbin "graphics/battle_anims/sprites/220.gbapal.lz" .align 2 @@ -2096,7 +2096,7 @@ gBattleAnimSpriteGfx_Angel:: @ 8D24FD0 .incbin "graphics/battle_anims/sprites/220.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_221_palette:: @ 8D250FC +gBattleAnimSpritePal_Devil:: @ 8D250FC .incbin "graphics/battle_anims/sprites/221.gbapal.lz" .align 2 @@ -2108,11 +2108,11 @@ gBattleAnimSpriteGfx_Swipe:: @ 8D25380 .incbin "graphics/battle_anims/sprites/222.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_222_palette:: @ 8D2566C +gBattleAnimSpritePal_Swipe:: @ 8D2566C .incbin "graphics/battle_anims/sprites/222.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_223_palette:: @ 8D25694 +gBattleAnimSpritePal_Roots:: @ 8D25694 .incbin "graphics/battle_anims/sprites/223.gbapal.lz" .align 2 @@ -2120,7 +2120,7 @@ gBattleAnimSpriteGfx_Roots:: @ 8D256B4 .incbin "graphics/battle_anims/sprites/223.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_224_palette:: @ 8D25948 +gBattleAnimSpritePal_ItemBag:: @ 8D25948 .incbin "graphics/battle_anims/sprites/224.gbapal.lz" .align 2 @@ -2128,7 +2128,7 @@ gBattleAnimSpriteGfx_ItemBag:: @ 8D25968 .incbin "graphics/battle_anims/sprites/224.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_230_palette:: @ 8D25A64 +gBattleAnimSpritePal_TriForceTriangle:: @ 8D25A64 .incbin "graphics/battle_anims/sprites/230.gbapal.lz" .align 2 @@ -2136,7 +2136,7 @@ gBattleAnimSpriteGfx_TriForceTriangle:: @ 8D25A8C .incbin "graphics/battle_anims/sprites/230.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_228_palette:: @ 8D25CD0 +gBattleAnimSpritePal_LetterZ:: @ 8D25CD0 .incbin "graphics/battle_anims/sprites/228.gbapal.lz" .align 2 @@ -2168,7 +2168,7 @@ gBattleAnimSpriteGfx_JaggedMusicNote:: @ 8D27938 .incbin "graphics/battle_anims/sprites/225.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_225_palette:: @ 8D27ABC +gBattleAnimSpritePal_JaggedMusicNote:: @ 8D27ABC .incbin "graphics/battle_anims/sprites/225.gbapal.lz" .align 2 @@ -2180,7 +2180,7 @@ gBattleAnimSpriteGfx_Pokeball:: @ 8D27C2C .incbin "graphics/battle_anims/sprites/226.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_226_palette:: @ 8D27CB8 +gBattleAnimSpritePal_Pokeball:: @ 8D27CB8 .incbin "graphics/battle_anims/sprites/226.gbapal.lz" .align 2 @@ -2188,7 +2188,7 @@ gBattleAnimSpriteGfx_RapidSpin:: @ 8D27CDC .incbin "graphics/battle_anims/sprites/229.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_229_palette:: @ 8D27E98 +gBattleAnimSpritePal_RapidSpin:: @ 8D27E98 .incbin "graphics/battle_anims/sprites/229.gbapal.lz" .align 2 @@ -2196,7 +2196,7 @@ gBattleAnimSpriteGfx_MilkBottle:: @ 8D27EC0 .incbin "graphics/battle_anims/sprites/099.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_099_palette:: @ 8D27FE0 +gBattleAnimSpritePal_MilkBottle:: @ 8D27FE0 .incbin "graphics/battle_anims/sprites/099.gbapal.lz" .align 2 @@ -2204,7 +2204,7 @@ gBattleAnimSpriteGfx_WispFire:: @ 8D28008 .incbin "graphics/battle_anims/sprites/232.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_231_palette:: @ 8D28540 +gBattleAnimSpritePal_WispOrb:: @ 8D28540 .incbin "graphics/battle_anims/sprites/231.gbapal.lz" .align 2 @@ -2216,7 +2216,7 @@ gBattleAnimSpriteGfx_GoldStars:: @ 8D28738 .incbin "graphics/battle_anims/sprites/233.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_233_palette:: @ 8D287BC +gBattleAnimSpritePal_GoldStars:: @ 8D287BC .incbin "graphics/battle_anims/sprites/233.gbapal.lz" .align 2 @@ -2224,7 +2224,7 @@ gBattleAnimSpriteGfx_EclipsingOrb:: @ 8D287E4 .incbin "graphics/battle_anims/sprites/234.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_234_palette:: @ 8D289A4 +gBattleAnimSpritePal_EclipsingOrb:: @ 8D289A4 .incbin "graphics/battle_anims/sprites/234.gbapal.lz" .align 2 @@ -2232,7 +2232,7 @@ gBattleAnimSpriteGfx_PinkPetal:: @ 8D289C8 .incbin "graphics/battle_anims/sprites/238.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_238_palette:: @ 8D28A30 +gBattleAnimSpritePal_PinkPetal:: @ 8D28A30 .incbin "graphics/battle_anims/sprites/238.gbapal.lz" .align 2 @@ -2240,15 +2240,15 @@ gBattleAnimSpriteGfx_GrayOrb:: @ 8D28A54 .incbin "graphics/battle_anims/sprites/235.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_235_palette:: @ 8D28AA4 +gBattleAnimSpritePal_GrayOrb:: @ 8D28AA4 .incbin "graphics/battle_anims/sprites/235.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_236_palette:: @ 8D28AC0 +gBattleAnimSpritePal_BlueOrb:: @ 8D28AC0 .incbin "graphics/battle_anims/sprites/236.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_237_palette:: @ 8D28ADC +gBattleAnimSpritePal_RedOrb2:: @ 8D28ADC .incbin "graphics/battle_anims/sprites/237.gbapal.lz" .align 2 @@ -2352,7 +2352,7 @@ gBattleAnimSpriteGfx_PainSplit:: @ 8D2CC74 .incbin "graphics/battle_anims/sprites/239.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_239_palette:: @ 8D2CD58 +gBattleAnimSpritePal_PainSplit:: @ 8D2CD58 .incbin "graphics/battle_anims/sprites/239.gbapal.lz" .align 2 @@ -2360,7 +2360,7 @@ gBattleAnimSpriteGfx_HandsAndFeet:: @ 8D2CD80 .incbin "graphics/battle_anims/sprites/143.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_143_palette:: @ 8D2CFB0 +gBattleAnimSpritePal_HandsAndFeet:: @ 8D2CFB0 .incbin "graphics/battle_anims/sprites/143.gbapal.lz" .align 2 @@ -2368,7 +2368,7 @@ gBattleAnimSpriteGfx_Confetti:: @ 8D2CFC8 .incbin "graphics/battle_anims/sprites/240.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_240_palette:: @ 8D2D068 +gBattleAnimSpritePal_Confetti:: @ 8D2D068 .incbin "graphics/battle_anims/sprites/240.gbapal.lz" .align 2 @@ -2388,7 +2388,7 @@ gBattleAnimSpriteGfx_GreenStar:: @ 8D2D51C .incbin "graphics/battle_anims/sprites/241.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_241_palette:: @ 8D2D5E0 +gBattleAnimSpritePal_GreenStar:: @ 8D2D5E0 .incbin "graphics/battle_anims/sprites/241.gbapal.lz" .align 2 @@ -2404,7 +2404,7 @@ gBattleAnimSpriteGfx_PinkCloud:: @ 8D2D744 .incbin "graphics/battle_anims/sprites/242.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_242_palette:: @ 8D2D880 +gBattleAnimSpritePal_PinkCloud:: @ 8D2D880 .incbin "graphics/battle_anims/sprites/242.gbapal.lz" .align 2 @@ -2412,7 +2412,7 @@ gBattleAnimSpriteGfx_SweatDrop:: @ 8D2D8A4 .incbin "graphics/battle_anims/sprites/243.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_243_palette:: @ 8D2D8CC +gBattleAnimSpritePal_SweatDrop:: @ 8D2D8CC .incbin "graphics/battle_anims/sprites/243.gbapal.lz" .align 2 @@ -2472,7 +2472,7 @@ gFile_graphics_battle_anims_masks_cure_bubbles_tilemap:: @ 8D2DF98 .incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_245_palette:: @ 8D2E0B4 +gBattleAnimSpritePal_PurpleScratch:: @ 8D2E0B4 .incbin "graphics/battle_anims/sprites/245.gbapal.lz" .align 2 @@ -2488,7 +2488,7 @@ gBattleAnimSpriteGfx_GuardRing:: @ 8D2E728 .incbin "graphics/battle_anims/sprites/244.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_244_palette:: @ 8D2E804 +gBattleAnimSpritePal_GuardRing:: @ 8D2E804 .incbin "graphics/battle_anims/sprites/244.gbapal.lz" .align 2 @@ -2512,7 +2512,7 @@ gBattleAnimSpriteGfx_SmallRedEye:: @ 8D2ED78 .incbin "graphics/battle_anims/sprites/248.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_248_palette:: @ 8D2ED90 +gBattleAnimSpritePal_SmallRedEye:: @ 8D2ED90 .incbin "graphics/battle_anims/sprites/248.gbapal.lz" .align 2 @@ -2520,7 +2520,7 @@ gBattleAnimSpriteGfx_HollowOrb:: @ 8D2EDA8 .incbin "graphics/battle_anims/sprites/249.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_249_palette:: @ 8D2EDF8 +gBattleAnimSpritePal_HollowOrb:: @ 8D2EDF8 .incbin "graphics/battle_anims/sprites/249.gbapal.lz" .align 2 @@ -2532,7 +2532,7 @@ gBattleAnimSpriteGfx_BluegreenOrb:: @ 8D2F00C .incbin "graphics/battle_anims/sprites/251.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_251_palette:: @ 8D2F070 +gBattleAnimSpritePal_BluegreenOrb:: @ 8D2F070 .incbin "graphics/battle_anims/sprites/251.gbapal.lz" .align 2 @@ -2540,7 +2540,7 @@ gBattleAnimSpriteGfx_PawPrint:: @ 8D2F088 .incbin "graphics/battle_anims/sprites/252.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_252_palette:: @ 8D2F1A0 +gBattleAnimSpritePal_PawPrint:: @ 8D2F1A0 .incbin "graphics/battle_anims/sprites/252.gbapal.lz" .align 2 @@ -2548,7 +2548,7 @@ gBattleAnimSpriteGfx_PurpleFlame:: @ 8D2F1C4 .incbin "graphics/battle_anims/sprites/253.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_253_palette:: @ 8D2F3A0 +gBattleAnimSpritePal_PurpleFlame:: @ 8D2F3A0 .incbin "graphics/battle_anims/sprites/253.gbapal.lz" .align 2 @@ -2556,7 +2556,7 @@ gBattleAnimSpriteGfx_RedBall:: @ 8D2F3C8 .incbin "graphics/battle_anims/sprites/254.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_254_palette:: @ 8D2F500 +gBattleAnimSpritePal_RedBall:: @ 8D2F500 .incbin "graphics/battle_anims/sprites/254.gbapal.lz" .align 2 @@ -2564,7 +2564,7 @@ gBattleAnimSpriteGfx_SmellingsaltEffect:: @ 8D2F528 .incbin "graphics/battle_anims/sprites/255.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_255_palette:: @ 8D2F5A0 +gBattleAnimSpritePal_SmellingsaltEffect:: @ 8D2F5A0 .incbin "graphics/battle_anims/sprites/255.gbapal.lz" .align 2 @@ -2572,7 +2572,7 @@ gBattleAnimSpriteGfx_MagnifyingGlass:: @ 8D2F5B4 .incbin "graphics/battle_anims/sprites/258.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_258_palette:: @ 8D2F69C +gBattleAnimSpritePal_MagnifyingGlass:: @ 8D2F69C .incbin "graphics/battle_anims/sprites/258.gbapal.lz" .align 2 @@ -2580,7 +2580,7 @@ gBattleAnimSpriteGfx_Meteor:: @ 8D2F6C4 .incbin "graphics/battle_anims/sprites/256.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_256_palette:: @ 8D2FA50 +gBattleAnimSpritePal_Meteor:: @ 8D2FA50 .incbin "graphics/battle_anims/sprites/256.gbapal.lz" .align 2 @@ -2588,7 +2588,7 @@ gBattleAnimSpriteGfx_FlatRock:: @ 8D2FA78 .incbin "graphics/battle_anims/sprites/257.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_257_palette:: @ 8D2FB94 +gBattleAnimSpritePal_FlatRock:: @ 8D2FB94 .incbin "graphics/battle_anims/sprites/257.gbapal.lz" .align 2 @@ -13564,7 +13564,7 @@ gBattleAnimSpriteGfx_MetalSoundWaves:: @ 8E79A24 .incbin "graphics/battle_anims/sprites/260.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_260_palette:: @ 8E79BE0 +gBattleAnimSpritePal_MetalSoundWaves:: @ 8E79BE0 .incbin "graphics/battle_anims/sprites/260.gbapal.lz" .align 2 @@ -13584,7 +13584,7 @@ gBattleAnimSpriteGfx_IcicleSpear:: @ 8E7A784 .incbin "graphics/battle_anims/sprites/262.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_262_palette:: @ 8E7A858 +gBattleAnimSpritePal_IcicleSpear:: @ 8E7A858 .incbin "graphics/battle_anims/sprites/262.gbapal.lz" .align 2 @@ -13604,19 +13604,19 @@ gBattleAnimSpriteGfx_GlowyRedOrb:: @ 8E7A97C .incbin "graphics/battle_anims/sprites/264.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_264_palette:: @ 8E7A99C +gBattleAnimSpritePal_GlowyRedOrb:: @ 8E7A99C .incbin "graphics/battle_anims/sprites/264.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_265_palette:: @ 8E7A9B4 +gBattleAnimSpritePal_GlowyGreenOrb:: @ 8E7A9B4 .incbin "graphics/battle_anims/sprites/265.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_067_palette:: @ 8E7A9CC +gBattleAnimSpritePal_SleepPowder:: @ 8E7A9CC .incbin "graphics/battle_anims/sprites/067.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_068_palette:: @ 8E7A9EC +gBattleAnimSpritePal_StunSpore:: @ 8E7A9EC .incbin "graphics/battle_anims/sprites/068.gbapal.lz" .align 2 @@ -13636,7 +13636,7 @@ gBattleAnimSpriteGfx_Splash:: @ 8E7ABD8 .incbin "graphics/battle_anims/sprites/272.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_272_palette:: @ 8E7ADF4 +gBattleAnimSpritePal_Splash:: @ 8E7ADF4 .incbin "graphics/battle_anims/sprites/272.gbapal.lz" .align 2 @@ -13648,7 +13648,7 @@ gBattleAnimSpriteGfx_Pokeblock:: @ 8E7AE40 .incbin "graphics/battle_anims/sprites/269.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_269_palette:: @ 8E7AE94 +gBattleAnimSpritePal_Pokeblock:: @ 8E7AE94 .incbin "graphics/battle_anims/sprites/269.gbapal.lz" .align 2 @@ -13664,7 +13664,7 @@ gBattleAnimSpriteGfx_Gem3:: @ 8E7B198 .incbin "graphics/battle_anims/sprites/276.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_274_palette:: @ 8E7B300 +gBattleAnimSpritePal_Gem1:: @ 8E7B300 .incbin "graphics/battle_anims/sprites/274.gbapal.lz" .align 2 @@ -13684,7 +13684,7 @@ gBattleAnimSpriteGfx_Protect:: @ 8E7B694 .incbin "graphics/battle_anims/sprites/280.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_280_palette:: @ 8E7BA90 +gBattleAnimSpritePal_Protect:: @ 8E7BA90 .incbin "graphics/battle_anims/sprites/280.gbapal.lz" .align 2 @@ -13716,7 +13716,7 @@ gBattleAnimBgTilemap_Ghost:: @ 8E7CC6C .incbin "graphics/battle_anims/backgrounds/02.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_287_palette:: @ 8E7CF60 +gBattleAnimSpritePal_WhipHit:: @ 8E7CF60 .incbin "graphics/battle_anims/sprites/287.gbapal.lz" .align 2 @@ -13752,7 +13752,7 @@ gBattleAnimBgTilemap_Cosmic:: @ 8E7EC9C .incbin "graphics/battle_anims/backgrounds/16.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_277_palette:: @ 8E7EDD8 +gBattleAnimSpritePal_SlamHit2:: @ 8E7EDD8 .incbin "graphics/battle_anims/sprites/277.gbapal.lz" .align 2 @@ -13764,7 +13764,7 @@ gBattleAnimFogTilemap:: @ 8E7F1F4 .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_283_palette:: @ 8E7F36C +gBattleAnimSpritePal_WeatherBall:: @ 8E7F36C .incbin "graphics/battle_anims/sprites/283.gbapal.lz" .align 2 @@ -13788,7 +13788,7 @@ gBattleAnimSpriteGfx_Hail:: @ 8E7FA58 .incbin "graphics/battle_anims/sprites/263.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_263_palette:: @ 8E7FA98 +gBattleAnimSpritePal_Hail:: @ 8E7FA98 .incbin "graphics/battle_anims/sprites/263.gbapal.lz" .align 2 @@ -13796,15 +13796,15 @@ gBattleAnimSpriteGfx_GreenSpike:: @ 8E7FAB0 .incbin "graphics/battle_anims/sprites/266.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_266_palette:: @ 8E7FAF0 +gBattleAnimSpritePal_GreenSpike:: @ 8E7FAF0 .incbin "graphics/battle_anims/sprites/266.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_267_palette:: @ 8E7FB08 +gBattleAnimSpritePal_WhiteCircleOfLight:: @ 8E7FB08 .incbin "graphics/battle_anims/sprites/267.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_268_palette:: @ 8E7FB20 +gBattleAnimSpritePal_GlowyBlueOrb:: @ 8E7FB20 .incbin "graphics/battle_anims/sprites/268.gbapal.lz" .align 2 @@ -13812,7 +13812,7 @@ gBattleAnimSpriteGfx_Recycle:: @ 8E7FB38 .incbin "graphics/battle_anims/sprites/278.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_278_palette:: @ 8E7FD44 +gBattleAnimSpritePal_Recycle:: @ 8E7FD44 .incbin "graphics/battle_anims/sprites/278.gbapal.lz" .align 2 @@ -13820,7 +13820,7 @@ gBattleAnimSpriteGfx_RedParticles:: @ 8E7FD60 .incbin "graphics/battle_anims/sprites/279.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_279_palette:: @ 8E7FDAC +gBattleAnimSpritePal_RedParticles:: @ 8E7FDAC .incbin "graphics/battle_anims/sprites/279.gbapal.lz" .align 2 @@ -13828,7 +13828,7 @@ gBattleAnimSpriteGfx_DirtMound:: @ 8E7FDC8 .incbin "graphics/battle_anims/sprites/281.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_281_palette:: @ 8E7FF50 +gBattleAnimSpritePal_DirtMound:: @ 8E7FF50 .incbin "graphics/battle_anims/sprites/281.gbapal.lz" .align 2 @@ -13848,7 +13848,7 @@ gBattleAnimSpriteGfx_Bird:: @ 8E8056C .incbin "graphics/battle_anims/sprites/284.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_284_palette:: @ 8E808E8 +gBattleAnimSpritePal_Bird:: @ 8E808E8 .incbin "graphics/battle_anims/sprites/284.gbapal.lz" .align 2 @@ -13856,7 +13856,7 @@ gBattleAnimSpriteGfx_CrossImpact:: @ 8E80904 .incbin "graphics/battle_anims/sprites/285.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_285_palette:: @ 8E809A4 +gBattleAnimSpritePal_CrossImpact:: @ 8E809A4 .incbin "graphics/battle_anims/sprites/285.gbapal.lz" .align 2 @@ -13880,7 +13880,7 @@ gFile_graphics_unknown_unknown_E822B8_tilemap:: @ 8E822B8 .incbin "graphics/unknown/unknown_E822B8.bin.lz" .align 2 -gFile_graphics_battle_anims_sprites_286_palette:: @ 8E825AC +gBattleAnimSpritePal_Slash2:: @ 8E825AC .incbin "graphics/battle_anims/sprites/286.gbapal.lz" .align 2 @@ -13888,7 +13888,7 @@ gBattleAnimSpriteGfx_WhiteShadow:: @ 8E825D4 .incbin "graphics/battle_anims/sprites/188.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_188_palette:: @ 8E826E8 +gBattleAnimSpritePal_WhiteShadow:: @ 8E826E8 .incbin "graphics/battle_anims/sprites/188.gbapal.lz" .align 2 @@ -15904,7 +15904,7 @@ gFile_graphics_items_icon_palettes_sapphire_palette:: @ 8E93720 .incbin "graphics/items/icon_palettes/sapphire.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_282_palette:: @ 8E93748 +gBattleAnimSpritePal_Shock3:: @ 8E93748 .incbin "graphics/battle_anims/sprites/282.gbapal.lz" .align 2 @@ -15912,7 +15912,7 @@ gBattleAnimSpriteGfx_Shock3:: @ 8E93770 .incbin "graphics/battle_anims/sprites/282.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_270_palette:: @ 8E93958 +gBattleAnimSpritePal_WhiteFeather:: @ 8E93958 .incbin "graphics/battle_anims/sprites/270.gbapal.lz" .align 2 @@ -15920,7 +15920,7 @@ gBattleAnimSpriteGfx_WhiteFeather:: @ 8E93974 .incbin "graphics/battle_anims/sprites/270.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_271_palette:: @ 8E93A9C +gBattleAnimSpritePal_Sparkle6:: @ 8E93A9C .incbin "graphics/battle_anims/sprites/271.gbapal.lz" .align 2 -- cgit v1.2.3 From 2f3ad837110bf47aeb1b3cf4f34531878d55e720 Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 1 Dec 2019 20:23:36 -0500 Subject: start anim objtemplates --- data/battle_anim_effects_misc.s | 332 +++++++++++++++++++------------------- data/battle_anim_scripts.s | 330 ++++++++++++++++++------------------- data/battle_anim_special.s | 28 ++-- data/battle_anim_status_effects.s | 20 +-- data/berry_crush.s | 10 +- data/field_weather.s | 2 +- data/pokemon_jump.s | 2 +- 7 files changed, 362 insertions(+), 362 deletions(-) (limited to 'data') diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s index ff14e90a4..eecd299ff 100644 --- a/data/battle_anim_effects_misc.s +++ b/data/battle_anim_effects_misc.s @@ -9,7 +9,7 @@ gUnknown_83E2964:: @ 83E2964 .byte 0x02, 0x04, 0x01, 0x03 -gUnknown_83E2968:: @ 83E2968 +gPowderParticlesAnimCmds:: @ 83E2968 obj_image_anim_frame 0x0000, 5 obj_image_anim_frame 0x0002, 5 obj_image_anim_frame 0x0004, 5 @@ -20,17 +20,17 @@ gUnknown_83E2968:: @ 83E2968 obj_image_anim_frame 0x000e, 5 obj_image_anim_jump 0x0000 -gUnknown_83E298C:: @ 83E298C - .4byte gUnknown_83E2968 +gPowderParticlesAnimTable:: @ 83E298C + .4byte gPowderParticlesAnimCmds -gUnknown_83E2990:: @ 83E2990 - spr_template 10067, 10067, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8 +gSleepPowderParticleSpriteTemplate:: @ 83E2990 + spr_template 10067, 10067, gOamData_AffineOff_ObjNormal_8x16, gPowderParticlesAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A22E8 -gUnknown_83E29A8:: @ 83E29A8 - spr_template 10068, 10068, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8 +gStunSporeParticleSpriteTemplate:: @ 83E29A8 + spr_template 10068, 10068, gOamData_AffineOff_ObjNormal_8x16, gPowderParticlesAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A22E8 -gUnknown_83E29C0:: @ 83E29C0 - spr_template 10065, 10065, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8 +gPoisonPowderParticleSpriteTemplate:: @ 83E29C0 + spr_template 10065, 10065, gOamData_AffineOff_ObjNormal_8x16, gPowderParticlesAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A22E8 gAnimCmd_83E29D8:: @ 83E29D8 obj_image_anim_frame 0, 1 @@ -90,54 +90,54 @@ gAffineAnimCmd_83E2A44:: @ 83E2A44 gSpriteAffineAnimTable_83E2A54:: @ 83E2A54 .4byte gAffineAnimCmd_83E2A44 -gUnknown_83E2A58:: @ 83E2A58 - spr_template 10147, 10147, gOamData_83ACB50, gSpriteAnimTable_83E2A40, NULL, gSpriteAffineAnimTable_83E2A54, sub_80A2388 +gPowerAbsorptionOrbSpriteTemplate:: @ 83E2A58 + spr_template 10147, 10147, gOamData_AffineNormal_ObjBlend_16x16, gSpriteAnimTable_83E2A40, NULL, gSpriteAffineAnimTable_83E2A54, sub_80A2388 -gUnknown_83E2A70:: @ 83E2A70 - spr_template 10147, 10147, gOamData_83AC9C8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A23D8 +gSolarbeamBigOrbSpriteTemplate:: @ 83E2A70 + spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A23D8 -gUnknown_83E2A88:: @ 83E2A88 - spr_template 10147, 10147, gOamData_83AC9C8, gSpriteAnimTable_83E2A3C, NULL, gDummySpriteAffineAnimTable, sub_80A2430 +gSolarbeamSmallOrbSpriteTemplate:: @ 83E2A88 + spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_83E2A3C, NULL, gDummySpriteAffineAnimTable, sub_80A2430 -gUnknown_83E2AA0:: @ 83E2AA0 +gStockpileAbsorptionOrbAffineCmds:: @ 83E2AA0 obj_rot_scal_anim_frame 320, 320, 0, 0 obj_rot_scal_anim_frame -14, -14, 0, 1 obj_rot_scal_anim_jump 1 -gUnknown_83E2AB8:: @ 83E2AB8 - .4byte gUnknown_83E2AA0 +gStockpileAbsorptionOrbAffineAnimTable:: @ 83E2AB8 + .4byte gStockpileAbsorptionOrbAffineCmds -gUnknown_83E2ABC:: @ 83E2ABC - spr_template 10235, 10235, gOamData_83ACA88, gDummySpriteAnimTable, NULL, gUnknown_83E2AB8, sub_80A2388 +gStockpileAbsorptionOrbSpriteTemplate:: @ 83E2ABC + spr_template 10235, 10235, gOamData_AffineDouble_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gStockpileAbsorptionOrbAffineAnimTable, sub_80A2388 -gUnknown_83E2AD4:: @ 83E2AD4 +gAbsorptionOrbAffineAnimCmds:: @ 83E2AD4 obj_rot_scal_anim_frame -5, -5, 0, 1 obj_rot_scal_anim_jump 0 -gUnknown_83E2AE4:: @ 83E2AE4 - .4byte gUnknown_83E2AD4 +gAbsorptionOrbAffineAnimTable:: @ 83E2AE4 + .4byte gAbsorptionOrbAffineAnimCmds -gUnknown_83E2AE8:: @ 83E2AE8 - spr_template 10147, 10147, gOamData_83ACB50, gSpriteAnimTable_83E2A40, NULL, gUnknown_83E2AE4, sub_80A2580 +gAbsorptionOrbSpriteTemplate:: @ 83E2AE8 + spr_template 10147, 10147, gOamData_AffineNormal_ObjBlend_16x16, gSpriteAnimTable_83E2A40, NULL, gAbsorptionOrbAffineAnimTable, sub_80A2580 -gUnknown_83E2B00:: @ 83E2B00 - spr_template 10147, 10147, gOamData_83AC9C8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A25EC +gHyperBeamOrbSpriteTemplate:: @ 83E2B00 + spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A25EC -gUnknown_83E2B18:: @ 83E2B18 +gLeechSeedAnimCmds1:: @ 83E2B18 obj_image_anim_frame 0, 1 obj_image_anim_end -gUnknown_83E2B20:: @ 83E2B20 +gLeechSeedAnimCmds2:: @ 83E2B20 obj_image_anim_frame 4, 7 obj_image_anim_frame 8, 7 obj_image_anim_jump 0 -gUnknown_83E2B2C:: @ 83E2B2C - .4byte gUnknown_83E2B18 - .4byte gUnknown_83E2B20 +gLeechSeedAnimTable:: @ 83E2B2C + .4byte gLeechSeedAnimCmds1 + .4byte gLeechSeedAnimCmds2 -gUnknown_83E2B34:: @ 83E2B34 - spr_template 10006, 10006, gOamData_83AC9D0, gUnknown_83E2B2C, NULL, gDummySpriteAffineAnimTable, sub_80A26F0 +gLeechSeedSpriteTemplate:: @ 83E2B34 + spr_template 10006, 10006, gOamData_AffineOff_ObjNormal_16x16, gLeechSeedAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A26F0 gUnknown_83E2B4C:: @ 83E2B4C obj_image_anim_frame 0, 1 @@ -152,7 +152,7 @@ gUnknown_83E2B5C:: @ 83E2B5C .4byte gUnknown_83E2B54 gUnknown_83E2B64:: @ 83E2B64 - spr_template 10158, 10158, gOamData_83AC9D0, gUnknown_83E2B5C, NULL, gDummySpriteAffineAnimTable, sub_80A27D0 + spr_template 10158, 10158, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2B5C, NULL, gDummySpriteAffineAnimTable, sub_80A27D0 gUnknown_83E2B7C:: @ 83E2B7C obj_image_anim_frame 0, 1 @@ -169,10 +169,10 @@ gUnknown_83E2B90:: @ 83E2B90 .4byte gUnknown_83E2B84 gUnknown_83E2B94:: @ 83E2B94 - spr_template 10159, 10159, gOamData_83AC9D0, gUnknown_83E2B8C, NULL, gDummySpriteAffineAnimTable, sub_80A2920 + spr_template 10159, 10159, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2B8C, NULL, gDummySpriteAffineAnimTable, sub_80A2920 gUnknown_83E2BAC:: @ 83E2BAC - spr_template 10159, 10159, gOamData_83AC9C8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A29EC + spr_template 10159, 10159, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A29EC gUnknown_83E2BC4:: @ 83E2BC4 obj_image_anim_frame 0, 5 @@ -198,10 +198,10 @@ gUnknown_83E2C00:: @ 83E2C00 .4byte gUnknown_83E2BF0 gUnknown_83E2C08:: @ 83E2C08 - spr_template 10063, 10063, gOamData_83AC9D0, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, sub_80A2AA4 + spr_template 10063, 10063, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, sub_80A2AA4 gUnknown_83E2C20:: @ 83E2C20 - spr_template 10063, 10063, gOamData_83AC9D0, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, AnimMoveTwisterParticle + spr_template 10063, 10063, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, AnimMoveTwisterParticle gUnknown_83E2C38:: @ 83E2C38 obj_image_anim_frame 0, 3 @@ -214,7 +214,7 @@ gUnknown_83E2C4C:: @ 83E2C4C .4byte gUnknown_83E2C38 gUnknown_83E2C50:: @ 83E2C50 - spr_template 10160, 10160, gOamData_83AC9F8, gUnknown_83E2C4C, NULL, gDummySpriteAffineAnimTable, sub_80A2B9C + spr_template 10160, 10160, gOamData_AffineOff_ObjNormal_32x16, gUnknown_83E2C4C, NULL, gDummySpriteAffineAnimTable, sub_80A2B9C gUnknown_83E2C68:: @ 83E2C68 obj_rot_scal_anim_frame 0, 0, 0, 1 @@ -224,7 +224,7 @@ gUnknown_83E2C78:: @ 83E2C78 .4byte gUnknown_83E2C68 gUnknown_83E2C7C:: @ 83E2C7C - spr_template 10174, 10174, gOamData_83ACA38, gDummySpriteAnimTable, NULL, gUnknown_83E2C78, sub_80A2B9C + spr_template 10174, 10174, gOamData_AffineNormal_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E2C78, sub_80A2B9C gUnknown_83E2C94:: @ 83E2C94 obj_image_anim_frame 0, 4 @@ -261,7 +261,7 @@ gUnknown_83E2D04:: @ 83E2D04 .4byte gUnknown_83E2CE4 gUnknown_83E2D0C:: @ 83E2D0C - spr_template 10186, 10186, gOamData_83ACA60, gUnknown_83E2CBC, NULL, gUnknown_83E2D04, sub_80A2E28 + spr_template 10186, 10186, gOamData_AffineNormal_ObjNormal_64x32, gUnknown_83E2CBC, NULL, gUnknown_83E2D04, sub_80A2E28 gUnknown_83E2D24:: @ 83E2D24 obj_rot_scal_anim_frame 0, 0, 0, 0 @@ -277,7 +277,7 @@ gUnknown_83E2D4C:: @ 83E2D4C .4byte gUnknown_83E2D3C gUnknown_83E2D54:: @ 83E2D54 - spr_template 10147, 10147, gOamData_83ACA90, gSpriteAnimTable_83E2A40, NULL, gUnknown_83E2D4C, sub_80A3098 + spr_template 10147, 10147, gOamData_AffineDouble_ObjNormal_16x16, gSpriteAnimTable_83E2A40, NULL, gUnknown_83E2D4C, sub_80A3098 gUnknown_83E2D6C:: @ 83E2D6C obj_image_anim_frame 0, 7 @@ -312,10 +312,10 @@ gUnknown_83E2DB4:: @ 83E2DB4 .4byte gUnknown_83E2DA4 gUnknown_83E2DC4:: @ 83E2DC4 - spr_template 10223, 10223, gOamData_83AC9D8, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A3168 + spr_template 10223, 10223, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A3168 gUnknown_83E2DDC:: @ 83E2DDC - spr_template 10223, 10223, gOamData_83AC9D8, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A31EC + spr_template 10223, 10223, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A31EC gUnknown_83E2DF4:: @ 83E2DF4 obj_image_anim_frame 3, 3 @@ -326,7 +326,7 @@ gUnknown_83E2E00:: @ 83E2E00 .4byte gUnknown_83E2DF4 gUnknown_83E2E04:: @ 83E2E04 - spr_template 10147, 10147, gOamData_83AC9C8, gUnknown_83E2E00, NULL, gDummySpriteAffineAnimTable, sub_80A3334 + spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E2E00, NULL, gDummySpriteAffineAnimTable, sub_80A3334 gUnknown_83E2E1C:: @ 83E2E1C obj_image_anim_frame 0, 30 @@ -355,10 +355,10 @@ gUnknown_83E2E80:: @ 83E2E80 .4byte gUnknown_83E2E48 gUnknown_83E2E88:: @ 83E2E88 - spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A3518 + spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A3518 gUnknown_83E2EA0:: @ 83E2EA0 - spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A35F4 + spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A35F4 gUnknown_83E2EB8:: @ 83E2EB8 obj_image_anim_frame 0, 4 @@ -371,10 +371,10 @@ gUnknown_83E2ECC:: @ 83E2ECC .4byte gUnknown_83E2EB8 gUnknown_83E2ED0:: @ 83E2ED0 - spr_template 10195, 10195, gOamData_83AC9D0, gUnknown_83E2ECC, NULL, gDummySpriteAffineAnimTable, sub_80A3670 + spr_template 10195, 10195, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2ECC, NULL, gDummySpriteAffineAnimTable, sub_80A3670 gUnknown_83E2EE8:: @ 83E2EE8 - spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A36B4 + spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A36B4 gUnknown_83E2F00:: @ 83E2F00 obj_rot_scal_anim_frame 0, 0, 0, 3 @@ -397,7 +397,7 @@ gUnknown_83E2F50:: @ 83E2F50 .4byte gUnknown_83E2E48 gUnknown_83E2F60:: @ 83E2F60 - spr_template 10224, 10224, gOamData_83ACA38, gUnknown_83E2E24, NULL, gUnknown_83E2F50, sub_80A37BC + spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2F50, sub_80A37BC gUnknown_83E2F78:: @ 83E2F78 .byte 0x05, 0x18, 0x01, 0x00, 0x04, 0x00, 0x08, 0x10, 0xff, 0x00, 0x02, 0x00, 0x08, 0x10, 0x01, 0x00, 0x02, 0x00, 0x08, 0x10, 0x01, 0x00, 0x02, 0x00, 0x08, 0x10, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00 @@ -441,7 +441,7 @@ gUnknown_83E2FD4:: @ 83E2FD4 .4byte gUnknown_83E2FCC gUnknown_83E2FF0:: @ 83E2FF0 - spr_template 10063, 10063, gOamData_83AC9D0, gUnknown_83E2FD4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 10063, 10063, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2FD4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_83E3008:: @ 83E3008 obj_rot_scal_anim_frame 256, 256, 0, 0 @@ -452,10 +452,10 @@ gUnknown_83E3020:: @ 83E3020 .4byte gUnknown_83E3008 gUnknown_83E3024:: @ 83E3024 - spr_template 10159, 10159, gOamData_83AC9C8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A4040 + spr_template 10159, 10159, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A4040 gUnknown_83E303C:: @ 83E303C - spr_template 10159, 10159, gOamData_83ACA30, gUnknown_83E2B8C, NULL, gUnknown_83E3020, sub_80A4040 + spr_template 10159, 10159, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E2B8C, NULL, gUnknown_83E3020, sub_80A4040 gUnknown_83E3054:: @ 83E3054 obj_rot_scal_anim_frame 256, 256, 0, 0 @@ -482,19 +482,19 @@ gUnknown_83E30A4:: @ 83E30A4 .4byte gUnknown_83E3084 gUnknown_83E30A8:: @ 83E30A8 - spr_template 10271, 10271, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E309C, sub_80A4040 + spr_template 10271, 10271, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E309C, sub_80A4040 gUnknown_83E30C0:: @ 83E30C0 - spr_template 10271, 10271, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E30A0, sub_80A4040 + spr_template 10271, 10271, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E30A0, sub_80A4040 gUnknown_83E30D8:: @ 83E30D8 - spr_template 10271, 10271, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E30A4, sub_80A4040 + spr_template 10271, 10271, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E30A4, sub_80A4040 gUnknown_83E30F0:: @ 83E30F0 .2byte 0x001f, 0x027f, 0x03ff, 0x03e0, 0x7dc5, 0x7d56, 0x7eb6, 0x0000 gUnknown_83E3100:: @ 83E3100 - spr_template 10266, 10266, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4298 + spr_template 10266, 10266, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4298 gUnknown_83E3118:: @ 83E3118 obj_image_anim_frame 64, 3 @@ -515,10 +515,10 @@ gUnknown_83E3140:: @ 83E3140 .4byte gUnknown_83E312C gUnknown_83E3148:: @ 83E3148 - spr_template 10056, 10056, gOamData_83AC9D8, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450 + spr_template 10056, 10056, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450 gUnknown_83E3160:: @ 83E3160 - spr_template 10287, 10287, gOamData_83AC9D8, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450 + spr_template 10287, 10287, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450 gUnknown_83E3178:: @ 83E3178 obj_image_anim_frame 0x0000, 4 @@ -532,10 +532,10 @@ gUnknown_83E3190:: @ 83E3190 .4byte gUnknown_83E3178 gUnknown_83E3194:: @ 83E3194 - spr_template 10021, 10021, gOamData_83AC9D8, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8 + spr_template 10021, 10021, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8 gUnknown_83E31AC:: @ 83E31AC - spr_template 10022, 10022, gOamData_83AC9D8, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8 + spr_template 10022, 10022, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8 gUnknown_83E31C4:: @ 83E31C4 obj_rot_scal_anim_frame 256, 256, 0, 0 @@ -580,7 +580,7 @@ gUnknown_83E3244:: .4byte gUnknown_83E3234 gUnknown_83E3264:: - spr_template 10143, 10143, gOamData_83ACA38, gDummySpriteAnimTable, NULL, gUnknown_83E3244, sub_80A4494 + spr_template 10143, 10143, gOamData_AffineNormal_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E3244, sub_80A4494 gUnknown_83E327C:: @ 83E327C obj_image_anim_frame 0, 5 @@ -593,10 +593,10 @@ gUnknown_83E3290:: @ 83E3290 .4byte gUnknown_83E327C gUnknown_83E3294:: @ 83E3294 - spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A44E0 + spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A44E0 gUnknown_83E32AC:: @ 83E32AC - spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A4588 + spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A4588 gUnknown_83E32C4:: @ 83E32C4 obj_image_anim_frame 0x0000, 1 @@ -651,10 +651,10 @@ gUnknown_83E3314:: .4byte gUnknown_83E330C gUnknown_83E333C:: - spr_template 10072, 10072, gOamData_83AC9D0, gUnknown_83E3314, NULL, gDummySpriteAffineAnimTable, sub_80A481C + spr_template 10072, 10072, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E3314, NULL, gDummySpriteAffineAnimTable, sub_80A481C gUnknown_83E3354:: @ 83E3354 - spr_template 10280, 10280, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A48F0 + spr_template 10280, 10280, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A48F0 gUnknown_83E336C:: @ 83E336C obj_rot_scal_anim_frame 256, 256, 0, 0 @@ -673,7 +673,7 @@ gUnknown_83E33AC:: @ 83E33AC .4byte gUnknown_83E337C gUnknown_83E33B4:: @ 83E33B4 - spr_template 10099, 10099, gOamData_83ACB58, gDummySpriteAnimTable, NULL, gUnknown_83E33AC, sub_80A4ACC + spr_template 10099, 10099, gOamData_AffineNormal_ObjBlend_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E33AC, sub_80A4ACC gUnknown_83E33CC:: @ 83E33CC obj_image_anim_frame 0, 7 @@ -690,10 +690,10 @@ gUnknown_83E33F0:: @ 83E33F0 .4byte gUnknown_83E33CC gUnknown_83E33F4:: @ 83E33F4 - spr_template 10049, 10049, gOamData_83AC9D8, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D0C + spr_template 10049, 10049, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D0C gUnknown_83E340C:: @ 83E340C - spr_template 10049, 10049, gOamData_83AC9D8, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D5C + spr_template 10049, 10049, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D5C gUnknown_83E3424:: @ 83E3424 obj_image_anim_frame 0x0000, 10 @@ -722,7 +722,7 @@ gUnknown_83E346C:: .4byte gUnknown_83E3448 gUnknown_83E3474:: - spr_template 10032, 10032, gOamData_83AC9D0, gUnknown_83E346C, NULL, gDummySpriteAffineAnimTable, sub_80A4E40 + spr_template 10032, 10032, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E346C, NULL, gDummySpriteAffineAnimTable, sub_80A4E40 gUnknown_83E348C:: @ 83E348C obj_image_anim_frame 0, 40 @@ -756,13 +756,13 @@ gUnknown_83E34F8:: @ 83E34F8 .4byte gUnknown_83E34C8 gUnknown_83E3500:: @ 83E3500 - spr_template 10228, 10228, gOamData_83ACA38, gUnknown_83E3494, NULL, gUnknown_83E34F8, sub_80A4EF4 + spr_template 10228, 10228, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E3494, NULL, gUnknown_83E34F8, sub_80A4EF4 gUnknown_83E3518:: @ 83E3518 - spr_template 10014, 10014, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4FAC + spr_template 10014, 10014, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4FAC gUnknown_83E3530:: @ 83E3530 - spr_template 10014, 10014, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5298 + spr_template 10014, 10014, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5298 gUnknown_83E3548:: @ 83E3548 .byte 0x40, 0x40, 0x00, 0xc0, 0xc0, 0x40, 0x20, 0xe0 @@ -787,13 +787,13 @@ gUnknown_83E359C:: @ 83E359C .4byte gUnknown_83E3594 gUnknown_83E35A4:: @ 83E35A4 - spr_template 10183, 10183, gOamData_83AC9D8, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A5940 + spr_template 10183, 10183, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A5940 gUnknown_83E35BC:: @ 83E35BC - spr_template 10286, 10286, gOamData_83AC9D8, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59A8 + spr_template 10286, 10286, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59A8 gUnknown_83E35D4:: @ 83E35D4 - spr_template 10286, 10286, gOamData_83AC9D8, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59F0 + spr_template 10286, 10286, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59F0 gUnknown_83E35EC:: @ 83E35EC obj_image_anim_frame 0, 4 @@ -806,7 +806,7 @@ gUnknown_83E3600:: @ 83E3600 .4byte gUnknown_83E35EC gUnknown_83E3604:: @ 83E3604 - spr_template 10184, 10184, gOamData_83ACA18, gUnknown_83E3600, NULL, gDummySpriteAffineAnimTable, sub_80A5AD8 + spr_template 10184, 10184, gOamData_AffineOff_ObjNormal_16x32, gUnknown_83E3600, NULL, gDummySpriteAffineAnimTable, sub_80A5AD8 gUnknown_83E361C:: @ 83E361C obj_image_anim_frame 0, 18 @@ -829,10 +829,10 @@ gUnknown_83E3658:: @ 83E3658 .4byte gUnknown_83E361C gUnknown_83E365C:: @ 83E365C - spr_template 10185, 10185, gOamData_83AC9D8, gUnknown_83E3658, NULL, gDummySpriteAffineAnimTable, sub_80A5B7C + spr_template 10185, 10185, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3658, NULL, gDummySpriteAffineAnimTable, sub_80A5B7C gUnknown_83E3674:: @ 83E3674 - spr_template 10017, 10017, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation + spr_template 10017, 10017, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation gUnknown_83E368C:: @ 83E368C obj_image_anim_frame 0, 3 @@ -846,7 +846,7 @@ gUnknown_83E36A4:: @ 83E36A4 .4byte gUnknown_83E368C gUnknown_83E36A8:: @ 83E36A8 - spr_template 10030, 10030, gOamData_83AC9D8, gUnknown_83E36A4, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos + spr_template 10030, 10030, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E36A4, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos gUnknown_83E36C0:: @ 83E36C0 obj_image_anim_frame 3, 5 @@ -866,7 +866,7 @@ gUnknown_83E36E8:: @ 83E36E8 .4byte gUnknown_83E36D8 gUnknown_83E36EC:: @ 83E36EC - spr_template 10018, 10018, gOamData_83ACBA8, gUnknown_83E36D4, NULL, gUnknown_83E36E8, sub_80A5C68 + spr_template 10018, 10018, gOamData_AffineDouble_ObjBlend_8x8, gUnknown_83E36D4, NULL, gUnknown_83E36E8, sub_80A5C68 gUnknown_83E3704:: @ 83E3704 obj_image_anim_frame 0, 5 @@ -879,10 +879,10 @@ gUnknown_83E3718:: @ 83E3718 .4byte gUnknown_83E3704 gUnknown_83E371C:: @ 83E371C - spr_template 10018, 10018, gOamData_83ACBA8, gUnknown_83E3718, NULL, gUnknown_83E36E8, sub_80A5D4C + spr_template 10018, 10018, gOamData_AffineDouble_ObjBlend_8x8, gUnknown_83E3718, NULL, gUnknown_83E36E8, sub_80A5D4C gUnknown_83E3734:: @ 83E3734 - spr_template 10194, 10194, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5EE0 + spr_template 10194, 10194, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5EE0 gUnknown_83E374C:: @ 83E374C obj_image_anim_frame 0, 8 @@ -895,7 +895,7 @@ gUnknown_83E3760:: @ 83E3760 .4byte gUnknown_83E374C gUnknown_83E3764:: @ 83E3764 - spr_template 10195, 10195, gOamData_83AC9D0, gUnknown_83E3760, NULL, gDummySpriteAffineAnimTable, sub_80A5F40 + spr_template 10195, 10195, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E3760, NULL, gDummySpriteAffineAnimTable, sub_80A5F40 gUnknown_83E377C:: @ 83E377C obj_image_anim_frame 0, 2 @@ -912,10 +912,10 @@ gUnknown_83E37A0:: @ 83E37A0 .4byte gUnknown_83E377C gUnknown_83E37A4:: @ 83E37A4 - spr_template 10031, 10031, gOamData_83AC9D8, gUnknown_83E37A0, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos + spr_template 10031, 10031, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E37A0, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos gUnknown_83E37BC:: @ 83E37BC - spr_template 10020, 10020, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6244 + spr_template 10020, 10020, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6244 gUnknown_83E37D4:: @ 83E37D4 obj_image_anim_frame 0, 2 @@ -928,7 +928,7 @@ gUnknown_83E37E8:: @ 83E37E8 .4byte gUnknown_83E37D4 gUnknown_83E37EC:: @ 83E37EC - spr_template 10192, 10192, gOamData_83AC9D8, gUnknown_83E37E8, NULL, gDummySpriteAffineAnimTable, sub_80A65CC + spr_template 10192, 10192, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E37E8, NULL, gDummySpriteAffineAnimTable, sub_80A65CC gUnknown_83E3804:: @ 83E3804 obj_image_anim_frame 0x0000, 10 @@ -974,17 +974,17 @@ gUnknown_83E387C:: @ 83E387C .4byte gUnknown_83E3864 gUnknown_83E3880:: @ 83E3880 - spr_template 10072, 10072, gOamData_83ACA90, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A66D4 + spr_template 10072, 10072, gOamData_AffineDouble_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A66D4 gUnknown_83E3898:: @ 83E3898 .2byte 0x2758, 0x7fff, 0x735f, 0x6adf, 0x623f, 0x59bf, 0x2771, 0x7fff, 0x6bf9, 0x57f4, 0x43ef, 0x33ea, 0x27c9, 0x7fff, 0x63ff, 0x47ff .2byte 0x2bff, 0x0fff, 0x27bf, 0x7fff, 0x7f9a, 0x7f55, 0x7f10, 0x7ecc gUnknown_83E38C8:: @ 83E38C8 - spr_template 10072, 10072, gOamData_83ACA90, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A68B0 + spr_template 10072, 10072, gOamData_AffineDouble_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A68B0 gUnknown_83E38E0:: @ 83E38E0 - spr_template 10193, 10193, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A69B8 + spr_template 10193, 10193, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A69B8 gUnknown_83E38F8:: @ 83E38F8 obj_rot_scal_anim_frame 160, 160, 0, 0 @@ -995,7 +995,7 @@ gUnknown_83E3910:: @ 83E3910 .4byte gUnknown_83E38F8 gUnknown_83E3914:: @ 83E3914 - spr_template 10072, 10072, gOamData_83ACA90, gUnknown_83E3844, NULL, gUnknown_83E3910, sub_80A6A28 + spr_template 10072, 10072, gOamData_AffineDouble_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E3910, sub_80A6A28 gUnknown_83E392C:: @ 83E392C obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP @@ -1032,7 +1032,7 @@ gUnknown_83E397C:: @ 83E397C .4byte gUnknown_83E3968 gUnknown_83E398C:: @ 83E398C - spr_template 10209, 10209, gOamData_83AC9D8, gUnknown_83E397C, NULL, gDummySpriteAffineAnimTable, sub_80A6B64 + spr_template 10209, 10209, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E397C, NULL, gDummySpriteAffineAnimTable, sub_80A6B64 gUnknown_83E39A4:: @ 83E39A4 obj_rot_scal_anim_frame 16, 16, 0, 0 @@ -1062,10 +1062,10 @@ gUnknown_83E3A2C:: @ 83E3A2C .4byte gUnknown_83E39BC gUnknown_83E3A34:: @ 83E3A34 - spr_template 10064, 10064, gOamData_83ACA98, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C08 + spr_template 10064, 10064, gOamData_AffineDouble_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C08 gUnknown_83E3A4C:: @ 83E3A4C - spr_template 10064, 10064, gOamData_83ACA38, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C84 + spr_template 10064, 10064, gOamData_AffineNormal_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C84 gUnknown_83E3A64:: @ 83E3A64 obj_image_anim_frame 0, 1 @@ -1102,10 +1102,10 @@ gUnknown_83E3AB4:: @ 83E3AB4 .4byte gUnknown_83E3A94 gUnknown_83E3AC4:: @ 83E3AC4 - spr_template 10214, 10214, gOamData_83AC9D8, gUnknown_83E3AB4, NULL, gDummySpriteAffineAnimTable, sub_80A6D90 + spr_template 10214, 10214, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3AB4, NULL, gDummySpriteAffineAnimTable, sub_80A6D90 gUnknown_83E3ADC:: - spr_template 10064, 10064, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E48 + spr_template 10064, 10064, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E48 gUnknown_83E3AF4:: @ 83E3AF4 obj_image_anim_frame 0x0004, 1 @@ -1115,13 +1115,13 @@ gUnknown_83E3AFC:: .4byte gUnknown_83E3AF4 gUnknown_83E3B00:: - spr_template 10072, 10072, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E98 + spr_template 10072, 10072, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E98 gUnknown_83E3B18:: spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6F8C gUnknown_83E3B30:: - spr_template 10145, 10145, gOamData_83ACB60, gDummySpriteAnimTable, NULL, gUnknown_83E7910, sub_80A7020 + spr_template 10145, 10145, gOamData_AffineNormal_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E7910, sub_80A7020 gUnknown_83E3B48:: obj_image_anim_frame 0x0000, 9 @@ -1142,7 +1142,7 @@ gUnknown_83E3B78:: .4byte gUnknown_83E3B60 gUnknown_83E3B7C:: - spr_template 10007, 10007, gOamData_83ACA38, gUnknown_83E3B5C, NULL, gUnknown_83E3B78, AnimSpriteOnMonPos + spr_template 10007, 10007, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E3B5C, NULL, gUnknown_83E3B78, AnimSpriteOnMonPos gUnknown_83E3B94:: @ 83E3B94 obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP @@ -1159,7 +1159,7 @@ gUnknown_83E3BB8:: @ 83E3BB8 .4byte gUnknown_83E3B94 gUnknown_83E3BBC:: @ 83E3BBC - spr_template 10075, 10075, gOamData_83AC9F8, gUnknown_83E3BB8, NULL, gDummySpriteAffineAnimTable, sub_80A71D8 + spr_template 10075, 10075, gOamData_AffineOff_ObjNormal_32x16, gUnknown_83E3BB8, NULL, gDummySpriteAffineAnimTable, sub_80A71D8 gUnknown_83E3BD4:: @ 83E3BD4 obj_rot_scal_anim_frame 16, 256, 0, 0 @@ -1171,13 +1171,13 @@ gUnknown_83E3BF4:: @ 83E3BF4 .4byte gUnknown_83E3BD4 gUnknown_83E3BF8:: @ 83E3BF8 - spr_template 10005, 10005, gOamData_83ACBA0, gDummySpriteAnimTable, NULL, gUnknown_83E3BF4, sub_80A727C + spr_template 10005, 10005, gOamData_AffineNormal_ObjBlend_32x64, gDummySpriteAnimTable, NULL, gUnknown_83E3BF4, sub_80A727C gUnknown_83E3C10:: @ 83E3C10 - spr_template 10003, 10003, gOamData_83ACBD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A72C8 + spr_template 10003, 10003, gOamData_AffineDouble_ObjBlend_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A72C8 gUnknown_83E3C28:: @ 83E3C28 - spr_template 10003, 10003, gOamData_83ACB18, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A74A4 + spr_template 10003, 10003, gOamData_AffineOff_ObjBlend_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A74A4 gUnknown_83E3C40:: @ 83E3C40 obj_rot_scal_anim_frame 32, 32, 0, 0 @@ -1201,22 +1201,22 @@ gUnknown_83E3C9C:: @ 83E3C9C .4byte gUnknown_83E3C58 gUnknown_83E3CA0:: @ 83E3CA0 - spr_template 10163, 10163, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation + spr_template 10163, 10163, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation gUnknown_83E3CB8:: @ 83E3CB8 - spr_template 10164, 10164, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation + spr_template 10164, 10164, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation gUnknown_83E3CD0:: @ 83E3CD0 - spr_template 10260, 10260, gOamData_83ACAE0, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation + spr_template 10260, 10260, gOamData_AffineDouble_ObjNormal_32x64, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation gUnknown_83E3CE8:: @ 83E3CE8 - spr_template 10288, 10288, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C9C, sub_80AC6D8 + spr_template 10288, 10288, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C9C, sub_80AC6D8 gUnknown_83E3D00:: @ 83E3D00 - spr_template 10175, 10175, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile + spr_template 10175, 10175, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile gUnknown_83E3D18:: @ 83E3D18 - spr_template 10178, 10178, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A79E8 + spr_template 10178, 10178, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A79E8 gUnknown_83E3D30:: @ 83E3D30 obj_image_anim_frame 8, 1 @@ -1233,10 +1233,10 @@ gUnknown_83E3D4C:: @ 83E3D4C .4byte gUnknown_83E3D3C gUnknown_83E3D50:: @ 83E3D50 - spr_template 10100, 10100, gOamData_83ACA30, gUnknown_83E3D38, NULL, gDummySpriteAffineAnimTable, sub_80A7A88 + spr_template 10100, 10100, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3D38, NULL, gDummySpriteAffineAnimTable, sub_80A7A88 gUnknown_83E3D68:: @ 83E3D68 - spr_template 10100, 10100, gOamData_83ACA30, gUnknown_83E3D38, NULL, gUnknown_83E3D4C, sub_80A7B3C + spr_template 10100, 10100, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3D38, NULL, gUnknown_83E3D4C, sub_80A7B3C gUnknown_83E3D80:: @ 83E3D80 obj_rot_scal_anim_frame 0, 0, 20, 1 @@ -1246,7 +1246,7 @@ gUnknown_83E3D90:: @ 83E3D90 .4byte gUnknown_83E3D80 gUnknown_83E3D94:: @ 83E3D94 - spr_template 10006, 10006, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E3D90, sub_80A7BC4 + spr_template 10006, 10006, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E3D90, sub_80A7BC4 gUnknown_83E3DAC:: @ 83E3DAC obj_rot_scal_anim_frame 16, 256, 0, 0 @@ -1257,7 +1257,7 @@ gUnknown_83E3DC4:: @ 83E3DC4 .4byte gUnknown_83E3DAC gUnknown_83E3DC8:: @ 83E3DC8 - spr_template 10009, 10009, gOamData_83ACA80, gDummySpriteAnimTable, NULL, gUnknown_83E3DC4, sub_80A7D04 + spr_template 10009, 10009, gOamData_AffineNormal_ObjNormal_32x64, gDummySpriteAnimTable, NULL, gUnknown_83E3DC4, sub_80A7D04 gUnknown_83E3DE0:: @ 83E3DE0 obj_image_anim_frame 0, 3 @@ -1276,7 +1276,7 @@ gUnknown_83E3E00:: @ 83E3E00 .4byte gUnknown_83E3DF0 gUnknown_83E3E08:: @ 83E3E08 - spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3E00, NULL, gDummySpriteAffineAnimTable, sub_80A7D64 + spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3E00, NULL, gDummySpriteAffineAnimTable, sub_80A7D64 gUnknown_83E3E20:: @ 83E3E20 obj_image_anim_frame 0, 2 @@ -1295,7 +1295,7 @@ gUnknown_83E3E40:: @ 83E3E40 .4byte gUnknown_83E3E30 gUnknown_83E3E48:: @ 83E3E48 - spr_template 10138, 10138, gOamData_83ACAF8, gUnknown_83E3E40, NULL, gDummySpriteAffineAnimTable, sub_80A7E14 + spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3E40, NULL, gDummySpriteAffineAnimTable, sub_80A7E14 gUnknown_83E3E60:: @ 83E3E60 obj_rot_scal_anim_frame -6, 4, 0, 8 @@ -1328,7 +1328,7 @@ gUnknown_83E3EC8:: @ 83E3EC8 .4byte gUnknown_83E3EB4 gUnknown_83E3ED0:: @ 83E3ED0 - spr_template 10086, 10086, gOamData_83AC9D0, gUnknown_83E3EC8, NULL, gDummySpriteAffineAnimTable, sub_80A851C + spr_template 10086, 10086, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E3EC8, NULL, gDummySpriteAffineAnimTable, sub_80A851C gUnknown_83E3EE8:: @ 83E3EE8 obj_rot_scal_anim_frame 11, 11, 0, 8 @@ -1339,7 +1339,7 @@ gUnknown_83E3F00:: @ 83E3F00 .4byte gUnknown_83E3EE8 gUnknown_83E3F04:: @ 83E3F04 - spr_template 10087, 10087, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E3F00, sub_80A85AC + spr_template 10087, 10087, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E3F00, sub_80A85AC gUnknown_83E3F1C:: @ 83E3F1C obj_rot_scal_anim_frame -10, 9, 0, 7 @@ -1350,10 +1350,10 @@ gUnknown_83E3F1C:: @ 83E3F1C obj_rot_scal_anim_end gUnknown_83E3F4C:: @ 83E3F4C - spr_template 10002, 10002, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8A1C + spr_template 10002, 10002, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8A1C gUnknown_83E3F64:: @ 83E3F64 - spr_template 10197, 10197, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimSnoreZ + spr_template 10197, 10197, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimSnoreZ gUnknown_83E3F7C:: @ 83E3F7C obj_image_anim_frame 0, 5 @@ -1366,7 +1366,7 @@ gUnknown_83E3F90:: @ 83E3F90 .4byte gUnknown_83E3F7C gUnknown_83E3F94:: @ 83E3F94 - spr_template 10198, 10198, gOamData_83AC9D8, gUnknown_83E3F90, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos + spr_template 10198, 10198, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3F90, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos gUnknown_83E3FAC:: @ 83E3FAC obj_rot_scal_anim_frame 0, 0, 248, 2 @@ -1394,7 +1394,7 @@ gUnknown_83E401C:: @ 83E401C .4byte gUnknown_83E3FDC gUnknown_83E4028:: @ 83E4028 - spr_template 10202, 10202, gOamData_83ACBB8, gDummySpriteAnimTable, NULL, gUnknown_83E401C, sub_80A8F38 + spr_template 10202, 10202, gOamData_AffineDouble_ObjBlend_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E401C, sub_80A8F38 gUnknown_83E4040:: @ 83E4040 obj_rot_scal_anim_frame 16, 16, 0, 0 @@ -1419,7 +1419,7 @@ gUnknown_83E4090:: @ 83E4090 .4byte gUnknown_83E4070 gUnknown_83E4094:: @ 83E4094 - spr_template 10203, 10203, gOamData_83ACAA0, gDummySpriteAnimTable, NULL, gUnknown_83E4088, AnimSpriteOnMonPos + spr_template 10203, 10203, gOamData_AffineDouble_ObjNormal_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4088, AnimSpriteOnMonPos gUnknown_83E40AC:: @ 83E40AC obj_rot_scal_anim_frame 512, 512, 0, 0 @@ -1430,16 +1430,16 @@ gUnknown_83E40C4:: @ 83E40C4 .4byte gUnknown_83E40AC gUnknown_83E40C8:: @ 83E40C8 - spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E40C4, AnimSpriteOnMonPos + spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E40C4, AnimSpriteOnMonPos gUnknown_83E40E0:: @ 83E40E0 - spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8BC4 + spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8BC4 gUnknown_83E40F8:: @ 83E40F8 - spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E4090, sub_80A8CA4 + spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4090, sub_80A8CA4 gUnknown_83E4110:: @ 83E4110 - spr_template 10203, 10203, gOamData_83ACBC0, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8EE8 + spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8EE8 gUnknown_83E4128:: @ 83E4128 obj_rot_scal_anim_frame 96, -13, 0, 8 @@ -1457,7 +1457,7 @@ gUnknown_83E4150:: @ 83E4150 .4byte gUnknown_83E4138 gUnknown_83E4154:: @ 83E4154 - spr_template 10207, 10207, gOamData_83AC9D0, gUnknown_83E4150, NULL, gDummySpriteAffineAnimTable, sub_80A9648 + spr_template 10207, 10207, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E4150, NULL, gDummySpriteAffineAnimTable, sub_80A9648 gUnknown_83E416C:: @ 83E416C .byte 0x1e, 0x1c, 0xec, 0x18, 0x10, 0x1a, 0xf6, 0x1c @@ -1482,17 +1482,17 @@ gUnknown_83E41AC:: @ 83E41AC .4byte gUnknown_83E4174 gUnknown_83E41B0:: @ 83E41B0 - spr_template 10205, 10205, gOamData_83AC9D8, gUnknown_83E41AC, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos + spr_template 10205, 10205, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E41AC, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos gUnknown_83E41C8:: @ 83E41C8 .2byte 10206, 9999, 9998 .align 2 gUnknown_83E41D0:: @ 83E41D0 - spr_template 10206, 10206, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A97E8 + spr_template 10206, 10206, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A97E8 gUnknown_83E41E8:: @ 83E41E8 - spr_template 10210, 10210, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9860 + spr_template 10210, 10210, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9860 gUnknown_83E4200:: @ 83E4200 obj_rot_scal_anim_frame 10, -13, 0, 10 @@ -1500,13 +1500,13 @@ gUnknown_83E4200:: @ 83E4200 obj_rot_scal_anim_end gUnknown_83E4218:: @ 83E4218 - spr_template 10216, 10216, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9B40 + spr_template 10216, 10216, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9B40 gUnknown_83E4230:: @ 83E4230 - spr_template 10216, 10216, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9BC4 + spr_template 10216, 10216, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9BC4 gUnknown_83E4248:: @ 83E4248 - spr_template 10216, 10216, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9C4C + spr_template 10216, 10216, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9C4C gUnknown_83E4260:: @ 83E4260 obj_rot_scal_anim_frame 128, 128, 0, 0 @@ -1517,10 +1517,10 @@ gUnknown_83E4278:: @ 83E4278 .4byte gUnknown_83E4260 gUnknown_83E427C:: @ 83E427C - spr_template 10217, 10217, gOamData_83ACA30, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA174 + spr_template 10217, 10217, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA174 gUnknown_83E4294:: @ 83E4294 - spr_template 10217, 10217, gOamData_83ACA90, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA2B0 + spr_template 10217, 10217, gOamData_AffineDouble_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA2B0 gUnknown_83E42AC:: @ 83E42AC obj_rot_scal_anim_frame 128, 128, 0, 0 @@ -1531,7 +1531,7 @@ gUnknown_83E42C4:: @ 83E42C4 .4byte gUnknown_83E42AC gUnknown_83E42C8:: @ 83E42C8 - spr_template 10237, 10237, gOamData_83ACA88, gDummySpriteAnimTable, NULL, gUnknown_83E42C4, sub_80AA37C + spr_template 10237, 10237, gOamData_AffineDouble_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gUnknown_83E42C4, sub_80AA37C gUnknown_83E42E0:: @ 83E42E0 obj_image_anim_frame 0, 4 @@ -1545,7 +1545,7 @@ gUnknown_83E42F8:: @ 83E42F8 .4byte gUnknown_83E42E0 gUnknown_83E42FC:: @ 83E42FC - spr_template 10218, 10218, gOamData_83AC9D0, gUnknown_83E42F8, NULL, gDummySpriteAffineAnimTable, sub_80AA3F0 + spr_template 10218, 10218, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E42F8, NULL, gDummySpriteAffineAnimTable, sub_80AA3F0 gUnknown_83E4314:: @ 83E4314 obj_image_anim_frame 0, 24 @@ -1555,10 +1555,10 @@ gUnknown_83E431C:: @ 83E431C .4byte gUnknown_83E4314 gUnknown_83E4320:: @ 83E4320 - spr_template 10220, 10220, gOamData_83AC9D8, gUnknown_83E431C, NULL, gDummySpriteAffineAnimTable, sub_80AA408 + spr_template 10220, 10220, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E431C, NULL, gDummySpriteAffineAnimTable, sub_80AA408 gUnknown_83E4338:: @ 83E4338 - spr_template 10219, 10219, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA508 + spr_template 10219, 10219, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA508 gUnknown_83E4350:: @ 83E4350 obj_image_anim_frame 0, 3 @@ -1573,7 +1573,7 @@ gUnknown_83E4360:: @ 83E4360 .4byte gUnknown_83E4358 gUnknown_83E4368:: @ 83E4368 - spr_template 10221, 10221, gOamData_83AC9D8, gUnknown_83E4360, NULL, gDummySpriteAffineAnimTable, sub_80AA58C + spr_template 10221, 10221, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E4360, NULL, gDummySpriteAffineAnimTable, sub_80AA58C gUnknown_83E4380:: @ 83E4380 obj_image_anim_frame 0, 4 @@ -1594,7 +1594,7 @@ gUnknown_83E43A8:: @ 83E43A8 .4byte gUnknown_83E4394 gUnknown_83E43B0:: @ 83E43B0 - spr_template 10222, 10222, gOamData_83AC9D8, gUnknown_83E43A8, NULL, gDummySpriteAffineAnimTable, sub_80AA6B8 + spr_template 10222, 10222, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E43A8, NULL, gDummySpriteAffineAnimTable, sub_80AA6B8 gUnknown_83E43C8:: @ 83E43C8 obj_image_anim_frame 0, 8 @@ -1615,7 +1615,7 @@ gUnknown_83E43F0:: @ 83E43F0 .4byte gUnknown_83E43DC gUnknown_83E43F8:: @ 83E43F8 - spr_template 10215, 10215, gOamData_83AC9D8, gUnknown_83E43F0, NULL, gDummySpriteAffineAnimTable, sub_80AA708 + spr_template 10215, 10215, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E43F0, NULL, gDummySpriteAffineAnimTable, sub_80AA708 gUnknown_83E4410:: @ 83E4410 obj_rot_scal_anim_frame -12, 8, 0, 4 @@ -1624,7 +1624,7 @@ gUnknown_83E4410:: @ 83E4410 obj_rot_scal_anim_end gUnknown_83E4430:: @ 83E4430 - spr_template 10225, 10225, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA838 + spr_template 10225, 10225, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA838 gUnknown_83E4448:: @ 83E4448 obj_rot_scal_anim_frame 0, 0, 0, 5 @@ -1644,10 +1644,10 @@ gUnknown_83E4478:: @ 83E4478 .4byte gUnknown_83E4468 gUnknown_83E4484:: @ 83E4484 - spr_template 10206, 10206, gOamData_83ACA30, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA998 + spr_template 10206, 10206, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA998 gUnknown_83E449C:: @ 83E449C - spr_template 10206, 10206, gOamData_83ACA30, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA938 + spr_template 10206, 10206, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA938 gUnknown_83E44B4:: @ 83E44B4 obj_rot_scal_anim_frame 256, 256, 0, 0 @@ -1662,7 +1662,7 @@ gUnknown_83E44D4:: @ 83E44D4 .4byte gUnknown_83E44C4 gUnknown_83E44DC:: @ 83E44DC - spr_template 10244, 10244, gOamData_83ACBE0, gDummySpriteAnimTable, NULL, gUnknown_83E44D4, sub_80AAAE4 + spr_template 10244, 10244, gOamData_AffineDouble_ObjBlend_64x32, gDummySpriteAnimTable, NULL, gUnknown_83E44D4, sub_80AAAE4 gUnknown_83E44F4:: @ 83E44F4 .incbin "graphics/battle_anims/unk_83E4874.4bpp" @@ -1684,7 +1684,7 @@ gUnknown_83E5894:: @ 83E5894 .4byte gUnknown_83E5874 gUnknown_83E5898:: @ 83E5898 - spr_template 10115, 10115, gOamData_83ACA18, gUnknown_83E5894, NULL, gDummySpriteAffineAnimTable, sub_80AAC54 + spr_template 10115, 10115, gOamData_AffineOff_ObjNormal_16x32, gUnknown_83E5894, NULL, gDummySpriteAffineAnimTable, sub_80AAC54 gUnknown_83E58B0:: @ 83E58B0 obj_rot_scal_anim_frame -5, -5, 0, 10 @@ -1704,7 +1704,7 @@ gUnknown_83E58DC:: @ 83E58DC .4byte gUnknown_83E58CC gUnknown_83E58E0:: @ 83E58E0 - spr_template 10146, 10146, gOamData_83ACB50, gUnknown_83E58DC, NULL, gUnknown_83E58C8, sub_80AAC98 + spr_template 10146, 10146, gOamData_AffineNormal_ObjBlend_16x16, gUnknown_83E58DC, NULL, gUnknown_83E58C8, sub_80AAC98 gUnknown_83E58F8:: @ 83E58F8 obj_image_anim_frame 0, 1 @@ -1727,7 +1727,7 @@ gUnknown_83E5928:: @ 83E5928 .4byte gUnknown_83E5910 gUnknown_83E592C:: @ 83E592C - spr_template 10140, 10140, gOamData_83ACAC8, gUnknown_83E5908, NULL, gUnknown_83E5928, sub_80AAE84 + spr_template 10140, 10140, gOamData_AffineDouble_ObjNormal_8x16, gUnknown_83E5908, NULL, gUnknown_83E5928, sub_80AAE84 gUnknown_83E5944:: @ 83E5944 obj_image_anim_frame 0, 1 @@ -1740,16 +1740,16 @@ gUnknown_83E5958:: @ 83E5958 .4byte gUnknown_83E5944 gUnknown_83E595C:: @ 83E595C - spr_template 10149, 10149, gOamData_83ACAF0, gUnknown_83E5958, NULL, gDummySpriteAffineAnimTable, sub_80AB024 + spr_template 10149, 10149, gOamData_AffineOff_ObjBlend_16x16, gUnknown_83E5958, NULL, gDummySpriteAffineAnimTable, sub_80AB024 gUnknown_83E5974:: @ 83E5974 - spr_template 10259, 10259, gOamData_83ACAF0, gUnknown_83E5958, NULL, gDummySpriteAffineAnimTable, sub_80AB024 + spr_template 10259, 10259, gOamData_AffineOff_ObjBlend_16x16, gUnknown_83E5958, NULL, gDummySpriteAffineAnimTable, sub_80AB024 gUnknown_83E598C:: @ 83E598C - spr_template 10264, 10264, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AB024 + spr_template 10264, 10264, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AB024 gUnknown_83E59A4:: @ 83E59A4 - spr_template 10265, 10265, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AB024 + spr_template 10265, 10265, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AB024 gUnknown_83E59BC:: @ 83E59BC obj_image_anim_frame 16, 2 @@ -1761,10 +1761,10 @@ gUnknown_83E59CC:: @ 83E59CC .4byte gUnknown_83E59BC gUnknown_83E59D0:: @ 83E59D0 - spr_template 10029, 10029, gOamData_83AC9D8, gUnknown_83E59CC, NULL, gDummySpriteAffineAnimTable, sub_80AB024 + spr_template 10029, 10029, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E59CC, NULL, gDummySpriteAffineAnimTable, sub_80AB024 gUnknown_83E59E8:: @ 83E59E8 - spr_template 10165, 10165, gOamData_83ACAD8, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, sub_80AB024 + spr_template 10165, 10165, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, sub_80AB024 gUnknown_83E5A00:: @ 83E5A00 obj_rot_scal_anim_frame 3, 3, 10, 50 @@ -1783,10 +1783,10 @@ gUnknown_83E5A34:: @ 83E5A34 .4byte gUnknown_83E5A20 gUnknown_83E5A38:: @ 83E5A38 - spr_template 10149, 10149, gOamData_83ACBB0, gUnknown_83E5958, NULL, gUnknown_83E5A30, sub_80AB168 + spr_template 10149, 10149, gOamData_AffineDouble_ObjBlend_16x16, gUnknown_83E5958, NULL, gUnknown_83E5A30, sub_80AB168 gUnknown_83E5A50:: @ 83E5A50 - spr_template 10149, 10149, gOamData_83ACBB0, gUnknown_83E5958, NULL, gUnknown_83E5A34, sub_80AB1F8 + spr_template 10149, 10149, gOamData_AffineDouble_ObjBlend_16x16, gUnknown_83E5958, NULL, gUnknown_83E5A34, sub_80AB1F8 gUnknown_83E5A68:: @ 83E5A68 obj_image_anim_frame 0, 1 @@ -1803,19 +1803,19 @@ gUnknown_83E5A7C:: @ 83E5A7C .4byte gUnknown_83E5A70 gUnknown_83E5A80:: @ 83E5A80 - spr_template 10155, 10155, gOamData_83ACAF0, gUnknown_83E5A78, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile + spr_template 10155, 10155, gOamData_AffineOff_ObjBlend_16x16, gUnknown_83E5A78, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile gUnknown_83E5A98:: @ 83E5A98 - spr_template 10155, 10155, gOamData_83ACBB0, gUnknown_83E5A7C, NULL, gUnknown_83E6A80, sub_80AB2CC + spr_template 10155, 10155, gOamData_AffineDouble_ObjBlend_16x16, gUnknown_83E5A7C, NULL, gUnknown_83E6A80, sub_80AB2CC gUnknown_83E5AB0:: @ 83E5AB0 - spr_template 10141, 10141, gOamData_83AC9C8, gUnknown_83E6330, NULL, gDummySpriteAffineAnimTable, sub_80AB308 + spr_template 10141, 10141, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E6330, NULL, gDummySpriteAffineAnimTable, sub_80AB308 gUnknown_83E5AC8:: @ 83E5AC8 - spr_template 10155, 10155, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ABA78 + spr_template 10155, 10155, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ABA78 gUnknown_83E5AE0:: @ 83E5AE0 - spr_template 10268, 10268, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ABF60 + spr_template 10268, 10268, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80ABF60 gUnknown_83E5AF8:: @ 83E5AF8 obj_image_anim_frame 8, 1 @@ -1859,10 +1859,10 @@ gUnknown_83E5B6C:: @ 83E5B6C .4byte gUnknown_83E5B4C gUnknown_83E5B70:: @ 83E5B70 - spr_template 10155, 10155, gOamData_83AC9C8, gUnknown_83E5B10, NULL, gDummySpriteAffineAnimTable, sub_80AC624 + spr_template 10155, 10155, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E5B10, NULL, gDummySpriteAffineAnimTable, sub_80AC624 gUnknown_83E5B88:: @ 83E5B88 - spr_template 10155, 10155, gOamData_83ACA28, gUnknown_83E5B10, NULL, gUnknown_83E5B64, sub_80AC698 + spr_template 10155, 10155, gOamData_AffineNormal_ObjNormal_8x8, gUnknown_83E5B10, NULL, gUnknown_83E5B64, sub_80AC698 gUnknown_83E5BA0:: @ 83E5BA0 - spr_template 10155, 10155, gOamData_83ACA30, gUnknown_83E5B18, NULL, gUnknown_83E5B6C, sub_8077350 + spr_template 10155, 10155, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E5B18, NULL, gUnknown_83E5B6C, sub_8077350 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index cf4cf25cb..66ff25ced 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -460,72 +460,72 @@ Move_POISON_POWDER:: @ 81C6FB8 loadspritegfx 10065 loadspritegfx 10150 loopsewithpan SE_W077, 63, 10, 6 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_83E29C0, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_STUN_SPORE:: @ 81C70E9 loadspritegfx 10068 loopsewithpan SE_W077, 63, 10, 6 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_83E29A8, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end Move_SLEEP_POWDER:: @ 81C7217 loadspritegfx 10067 loopsewithpan SE_W077, 63, 10, 6 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 delay 15 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 96, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 69, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 delay 30 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -15, -22, 117, 112, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 15, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 96, 7, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -5, -22, 117, 90, -8, 0 delay 20 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 - createsprite gUnknown_83E2990, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -10, -22, 117, 80, -5, 1 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0, -22, 117, 89, 5, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 20, -22, 117, 112, -8, 2 + createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 5, -22, 117, 80, 5, 1 waitforvisualfinish end @@ -909,13 +909,13 @@ gUnknown_81C7BCD:: @ 81C7BCD Move_LEECH_SEED:: @ 81C7C23 loadspritegfx 10006 playsewithpan SE_W077, 192 - createsprite gUnknown_83E2B34, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 + createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 playsewithpan SE_W077, 192 - createsprite gUnknown_83E2B34, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40 + createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 playsewithpan SE_W077, 192 - createsprite gUnknown_83E2B34, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37 + createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 loopsewithpan SE_W039, 63, 10, 8 waitforvisualfinish @@ -5540,33 +5540,33 @@ gUnknown_81CE521:: @ 81CE521 goto gUnknown_81CE51F gUnknown_81CE54B:: @ 81CE54B - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, 40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 40, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, -40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -40, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 0, 40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 40, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 0, -40, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -40, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, -20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -20, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, 20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 20, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, -20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, 20, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -20, 30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, 30, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 20, -30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, -30, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -20, -30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -20, -30, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 20, 30, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 20, 30, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, 0, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, 0, 16 delay 2 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, 0, 16 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 0, 16 delay 2 return @@ -5574,21 +5574,21 @@ gUnknown_81CE61E:: @ 81CE61E call gUnknown_81D5A07 panse_1B SE_W076, 192, 63, 2, 0 createvisualtask sub_80A2500, 5, - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 0 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 1 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 createvisualtask sub_80BA7F8, 10, 4, 1, 0, 10, 1017 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 2 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 65, 1 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 3 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 4 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 5 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 6 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 call gUnknown_81CE6F0 call gUnknown_81CE6F0 @@ -5598,19 +5598,19 @@ gUnknown_81CE61E:: @ 81CE61E goto gUnknown_81CE51F gUnknown_81CE6F0:: @ 81CE6F0 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 0 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 1 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 2 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 3 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 4 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 5 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gUnknown_83E2A70, ANIM_TARGET, 3, 15, 0, 20, 6 + createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 return @@ -5823,28 +5823,28 @@ Move_ABSORB:: @ 81CEBD5 gUnknown_81CEC44:: @ 81CEC44 playsewithpan SE_W152, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 playsewithpan SE_W152, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 playsewithpan SE_W152, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W152, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W152, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W152, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5876,36 +5876,36 @@ Move_MEGA_DRAIN:: @ 81CECED gUnknown_81CED5C:: @ 81CED5C playsewithpan SE_W145C, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 playsewithpan SE_W145C, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W145C, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W145C, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W145C, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 playsewithpan SE_W145C, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 playsewithpan SE_W145C, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W145C, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5937,44 +5937,44 @@ Move_GIGA_DRAIN:: @ 81CEE7D gUnknown_81CEEEC:: @ 81CEEEC playsewithpan SE_W202, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -40, 35 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W202, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 28, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 40, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 playsewithpan SE_W202, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -32, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 playsewithpan SE_W202, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W202, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W202, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -40, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 playsewithpan SE_W202, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 36, 33 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W202, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -7139,44 +7139,44 @@ Move_DREAM_EATER:: @ 81D0A1F gUnknown_81D0A89:: @ 81D0A89 playsewithpan SE_W207, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -40, 35 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W207, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 28, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 40, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 playsewithpan SE_W207, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -32, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 playsewithpan SE_W207, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 playsewithpan SE_W207, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, -15, -16, 36 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 playsewithpan SE_W207, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 16, 33 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -40, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 playsewithpan SE_W207, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -5, 15, 36, 33 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 10, -5, -8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, -10, 20, 20, 39 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 playsewithpan SE_W207, 63 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 0, 5, 8, 26 - createsprite gUnknown_83E2AE8, ANIM_ATTACKER, 3, 5, -18, -20, 35 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 + createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -7693,19 +7693,19 @@ Move_RECOVER:: @ 81D16CD end gUnknown_81D170D:: @ 81D170D - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 40, -10, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -10, 13 delay 3 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -35, -10, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -35, -10, 13 delay 3 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 15, -40, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 15, -40, 13 delay 3 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -10, -32, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -10, -32, 13 delay 3 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 25, -20, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 25, -20, 13 delay 3 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, -40, -20, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -20, 13 delay 3 - createsprite gUnknown_83E2A58, ANIM_ATTACKER, 2, 5, -40, 13 + createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 5, -40, 13 delay 3 return @@ -8296,21 +8296,21 @@ Move_STOCKPILE:: @ 81D256B end gUnknown_81D25A9:: @ 81D25A9 - createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 55, 55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 55, 13 delay 1 - createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, -55, -55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -55, 13 delay 1 - createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 0, 55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 55, 13 delay 1 - createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 0, -55, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -55, 13 delay 1 - createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 55, -34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, -34, 13 delay 1 - createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, 55, 34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 34, 13 delay 1 - createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, -55, -34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -34, 13 delay 1 - createsprite gUnknown_83E2ABC, ANIM_ATTACKER, 2, -55, 34, 13 + createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, 34, 13 delay 1 return @@ -8531,8 +8531,8 @@ Move_HYPER_BEAM:: @ 81D29A7 end gUnknown_81D2AD8:: @ 81D2AD8 - createsprite gUnknown_83E2B00, ANIM_TARGET, 2, - createsprite gUnknown_83E2B00, ANIM_TARGET, 2, + createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2, + createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2, delay 1 return diff --git a/data/battle_anim_special.s b/data/battle_anim_special.s index 967e27674..27d7636f6 100644 --- a/data/battle_anim_special.s +++ b/data/battle_anim_special.s @@ -96,22 +96,22 @@ gUnknown_840C074:: @ 840C074 .4byte sub_80F103C gUnknown_840C0A4:: @ 840C0A4 - spr_template 55020, 55020, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55020, 55020, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_840C0BC:: - spr_template 55021, 55021, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55022, 55022, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55023, 55023, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55021, 55021, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55022, 55022, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55023, 55023, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_840C104:: @ 840C104 - spr_template 55024, 55024, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55025, 55025, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55026, 55026, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55027, 55027, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55028, 55028, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55029, 55029, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55030, 55030, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55031, 55031, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55024, 55024, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55025, 55025, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55026, 55026, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55027, 55027, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55028, 55028, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55029, 55029, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55030, 55030, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 55031, 55031, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_840C1C4:: @ 840C1C4 .2byte RGB(31, 22, 30) @@ -134,7 +134,7 @@ gUnknown_840C1DC:: @ 840C1DC .align 2 gUnknown_840C1EC:: - spr_template 10269, 10269, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C + spr_template 10269, 10269, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C gUnknown_840C204:: obj_image_anim_frame 0x0040, 1 @@ -144,5 +144,5 @@ gSpriteAnimTable_840C20C:: .4byte gUnknown_840C204 gUnknown_840C210:: - spr_template 10058, 10058, gOamData_83AC9D8, gSpriteAnimTable_840C20C, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C + spr_template 10058, 10058, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_840C20C, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C diff --git a/data/battle_anim_status_effects.s b/data/battle_anim_status_effects.s index 6e8952131..f2fff9a3f 100644 --- a/data/battle_anim_status_effects.s +++ b/data/battle_anim_status_effects.s @@ -14,10 +14,10 @@ gSpriteAnimTable_83BF3F4:: @ 83BF3F4 .4byte gUnknown_83BF3E0 gSpriteTemplate_83BF3F8:: @ 83BF3F8 - spr_template 10004, 10004, gOamData_83AC9D0, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076F58 + spr_template 10004, 10004, gOamData_AffineOff_ObjNormal_16x16, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076F58 gSpriteTemplate_83BF410:: @ 83BF410 - spr_template 10004, 10004, gOamData_83AC9D0, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076ED8 + spr_template 10004, 10004, gOamData_AffineOff_ObjNormal_16x16, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076ED8 gUnknown_83BF428:: @ 83BF428 obj_image_anim_frame 0x0000, 3 @@ -27,10 +27,10 @@ gSpriteAnimTable_83BF430:: @ 83BF430 .4byte gUnknown_83BF428 gSpriteTemplate_83BF434:: @ 83BF434 - spr_template 10283, 10283, gOamData_83AC9D8, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_807729C + spr_template 10283, 10283, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_807729C gSpriteTemplate_83BF44C:: @ 83BF44C - spr_template 10283, 10283, gOamData_83AC9D8, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_8077350 + spr_template 10283, 10283, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_8077350 gUnknown_83BF464:: @ 83BF464 obj_image_anim_frame 0x0000, 3 @@ -44,10 +44,10 @@ gSpriteAnimTable_83BF47C:: @ 83BF47C .4byte gUnknown_83BF464 gSpriteTemplate_83BF480:: @ 83BF480 - spr_template 10071, 10071, gOamData_83AC9D8, gSpriteAnimTable_83BF47C, NULL, gDummySpriteAffineAnimTable, sub_8076FD0 + spr_template 10071, 10071, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_83BF47C, NULL, gDummySpriteAffineAnimTable, sub_8076FD0 gSpriteTemplate_83BF498:: @ 83BF498 - spr_template 10051, 10051, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8076F58 + spr_template 10051, 10051, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8076F58 gUnknown_83BF4B0:: @ 83BF4B0 obj_image_anim_frame 0x0000, 5 @@ -67,7 +67,7 @@ gSpriteAniimTable_83BF4C8:: @ 83BF4C8 .4byte gUnknown_83BF4C0 gSpriteTemplate_83BF4D4:: @ 83BF4D4 - spr_template 10135, 10135, gOamData_83AC9D8, gSpriteAniimTable_83BF4C8, NULL, gDummySpriteAffineAnimTable, sub_8076F58 + spr_template 10135, 10135, gOamData_AffineOff_ObjNormal_32x32, gSpriteAniimTable_83BF4C8, NULL, gDummySpriteAffineAnimTable, sub_8076F58 gUnknown_83BF4EC:: @ 83BF4EC obj_image_anim_frame 0x0000, 15 @@ -85,7 +85,7 @@ gSpriteAffineAnimTable_83BF510:: @ 83BF510 .4byte gUnknown_83BF4F8 gSpriteTemplate_83BF514:: @ 83BF514 - spr_template 10004, 10004, gOamData_83ACA90, gSpriteAnimTable_83BF4F4, NULL, gSpriteAffineAnimTable_83BF510, sub_8076ED8 + spr_template 10004, 10004, gOamData_AffineDouble_ObjNormal_16x16, gSpriteAnimTable_83BF4F4, NULL, gSpriteAffineAnimTable_83BF510, sub_8076ED8 gUnknown_83BF52C:: @ 83BF52C .string "TASK OVER\n" @@ -104,7 +104,7 @@ gUnknown_83BF554:: @ 83BF554 .4byte gSubsprites_83BF544 gUnknown_83BF55C:: @ 83BF55C - spr_template 10010, 10010, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 10010, 10010, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_83BF574:: @ 83BF574 - spr_template 10136, 10136, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807834C + spr_template 10136, 10136, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807834C diff --git a/data/berry_crush.s b/data/berry_crush.s index 8ca6e6a0c..cc7ae23fd 100644 --- a/data/berry_crush.s +++ b/data/berry_crush.s @@ -325,19 +325,19 @@ gUnknown_846F408:: .4byte gUnknown_846F3D4 gUnknown_846F410:: @ 846F410 - spr_template 1, 1, gOamData_83AC9E0, gUnknown_846F3EC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 1, 1, gOamData_AffineOff_ObjNormal_64x64, gUnknown_846F3EC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846F428:: @ 846F428 - spr_template 2, 2, gOamData_83AC9D8, gUnknown_846F3F0, NULL, gDummySpriteAffineAnimTable, sub_814EFD0 + spr_template 2, 2, gOamData_AffineOff_ObjNormal_32x32, gUnknown_846F3F0, NULL, gDummySpriteAffineAnimTable, sub_814EFD0 gUnknown_846F440:: @ 846F440 - spr_template 3, 2, gOamData_83AC9D0, gUnknown_846F3F8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 3, 2, gOamData_AffineOff_ObjNormal_16x16, gUnknown_846F3F8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846F458:: @ 846F458 - spr_template 4, 4, gOamData_83ACA08, gUnknown_846F400, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 4, 4, gOamData_AffineOff_ObjNormal_8x16, gUnknown_846F400, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846F470:: @ 846F470 - spr_template 5, 5, gOamData_83ACA98, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy + spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not .byte 9, 2, 8 diff --git a/data/field_weather.s b/data/field_weather.s index 356ec81a5..890f0fef6 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -389,7 +389,7 @@ gUnknown_83C68B8:: .4byte gUnknown_83C68AC gUnknown_83C68BC:: @ 83C68BC - spr_template 4613, 4608, gOamData_83AC9C8, gUnknown_83C68B8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4 + spr_template 4613, 4608, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83C68B8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4 gUnknown_83C68D4:: @ 83C68D4 .2byte 0x00c8, 0x0048, 0x0038, 0x0028, 0x0018, 0x0000 diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s index 3d01bf64f..8f37f94e0 100644 --- a/data/pokemon_jump.s +++ b/data/pokemon_jump.s @@ -51,7 +51,7 @@ gUnknown_846B47C:: .4byte gUnknown_846B474 gUnknown_846B494:: @ 846B494 - spr_template 0x2000, 0x2000, gOamData_83AC9D8, gUnknown_846B47C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0x2000, 0x2000, gOamData_AffineOff_ObjNormal_32x32, gUnknown_846B47C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_846B4AC:: @ 846B4AC @ This is a 2D array with one row. -- cgit v1.2.3 From aa8d5fb55768ab1b4e7cd423bd097756a65adb3e Mon Sep 17 00:00:00 2001 From: Evan Date: Mon, 2 Dec 2019 12:32:56 -0700 Subject: b_anim_eff_3 --- data/battle_anim_effects_misc.s | 1658 --------------------------------------- data/battle_anim_scripts.s | 1028 ++++++++++++------------ 2 files changed, 514 insertions(+), 2172 deletions(-) (limited to 'data') diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s index eecd299ff..77bf6d206 100644 --- a/data/battle_anim_effects_misc.s +++ b/data/battle_anim_effects_misc.s @@ -6,1664 +6,6 @@ .section .rodata .align 2 -gUnknown_83E2964:: @ 83E2964 - .byte 0x02, 0x04, 0x01, 0x03 - -gPowderParticlesAnimCmds:: @ 83E2968 - obj_image_anim_frame 0x0000, 5 - obj_image_anim_frame 0x0002, 5 - obj_image_anim_frame 0x0004, 5 - obj_image_anim_frame 0x0006, 5 - obj_image_anim_frame 0x0008, 5 - obj_image_anim_frame 0x000a, 5 - obj_image_anim_frame 0x000c, 5 - obj_image_anim_frame 0x000e, 5 - obj_image_anim_jump 0x0000 - -gPowderParticlesAnimTable:: @ 83E298C - .4byte gPowderParticlesAnimCmds - -gSleepPowderParticleSpriteTemplate:: @ 83E2990 - spr_template 10067, 10067, gOamData_AffineOff_ObjNormal_8x16, gPowderParticlesAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A22E8 - -gStunSporeParticleSpriteTemplate:: @ 83E29A8 - spr_template 10068, 10068, gOamData_AffineOff_ObjNormal_8x16, gPowderParticlesAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A22E8 - -gPoisonPowderParticleSpriteTemplate:: @ 83E29C0 - spr_template 10065, 10065, gOamData_AffineOff_ObjNormal_8x16, gPowderParticlesAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A22E8 - -gAnimCmd_83E29D8:: @ 83E29D8 - obj_image_anim_frame 0, 1 - obj_image_anim_end - -gAnimCmd_83E29E0:: @ 83E29E0 - obj_image_anim_frame 1, 1 - obj_image_anim_end - -gAnimCmd_83E29E8:: @ 83E29E8 - obj_image_anim_frame 2, 1 - obj_image_anim_end - -gAnimCmd_83E29F0:: @ 83E29F0 - obj_image_anim_frame 3, 1 - obj_image_anim_end - -gAnimCmd_83E29F8:: @ 83E29F8 - obj_image_anim_frame 4, 1 - obj_image_anim_end - -gAnimCmd_83E2A00:: @ 83E2A00 - obj_image_anim_frame 5, 1 - obj_image_anim_end - -gAnimCmd_83E2A08:: @ 83E2A08 - obj_image_anim_frame 6, 1 - obj_image_anim_end - -gAnimCmd_83E2A10:: @ 83E2A10 - obj_image_anim_frame 7, 1 - obj_image_anim_end - -gAnimCmd_83E2A18:: @ 83E2A18 - obj_image_anim_frame 8, 1 - obj_image_anim_end - -gSpriteAnimTable_83E2A20:: @ 83E2A20 - .4byte gAnimCmd_83E29D8 - .4byte gAnimCmd_83E29E0 - .4byte gAnimCmd_83E29E8 - .4byte gAnimCmd_83E29F0 - .4byte gAnimCmd_83E29F8 - .4byte gAnimCmd_83E2A00 - .4byte gAnimCmd_83E2A08 - -gSpriteAnimTable_83E2A3C:: @ 83E2A3C - .4byte gAnimCmd_83E2A10 - -gSpriteAnimTable_83E2A40:: @ 83E2A40 - .4byte gAnimCmd_83E2A18 - -gAffineAnimCmd_83E2A44:: @ 83E2A44 - obj_rot_scal_anim_frame -5, -5, 0, 1 - obj_rot_scal_anim_jump 0 - -gSpriteAffineAnimTable_83E2A54:: @ 83E2A54 - .4byte gAffineAnimCmd_83E2A44 - -gPowerAbsorptionOrbSpriteTemplate:: @ 83E2A58 - spr_template 10147, 10147, gOamData_AffineNormal_ObjBlend_16x16, gSpriteAnimTable_83E2A40, NULL, gSpriteAffineAnimTable_83E2A54, sub_80A2388 - -gSolarbeamBigOrbSpriteTemplate:: @ 83E2A70 - spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A23D8 - -gSolarbeamSmallOrbSpriteTemplate:: @ 83E2A88 - spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_83E2A3C, NULL, gDummySpriteAffineAnimTable, sub_80A2430 - -gStockpileAbsorptionOrbAffineCmds:: @ 83E2AA0 - obj_rot_scal_anim_frame 320, 320, 0, 0 - obj_rot_scal_anim_frame -14, -14, 0, 1 - obj_rot_scal_anim_jump 1 - -gStockpileAbsorptionOrbAffineAnimTable:: @ 83E2AB8 - .4byte gStockpileAbsorptionOrbAffineCmds - -gStockpileAbsorptionOrbSpriteTemplate:: @ 83E2ABC - spr_template 10235, 10235, gOamData_AffineDouble_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gStockpileAbsorptionOrbAffineAnimTable, sub_80A2388 - -gAbsorptionOrbAffineAnimCmds:: @ 83E2AD4 - obj_rot_scal_anim_frame -5, -5, 0, 1 - obj_rot_scal_anim_jump 0 - -gAbsorptionOrbAffineAnimTable:: @ 83E2AE4 - .4byte gAbsorptionOrbAffineAnimCmds - -gAbsorptionOrbSpriteTemplate:: @ 83E2AE8 - spr_template 10147, 10147, gOamData_AffineNormal_ObjBlend_16x16, gSpriteAnimTable_83E2A40, NULL, gAbsorptionOrbAffineAnimTable, sub_80A2580 - -gHyperBeamOrbSpriteTemplate:: @ 83E2B00 - spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_83E2A20, NULL, gDummySpriteAffineAnimTable, sub_80A25EC - -gLeechSeedAnimCmds1:: @ 83E2B18 - obj_image_anim_frame 0, 1 - obj_image_anim_end - -gLeechSeedAnimCmds2:: @ 83E2B20 - obj_image_anim_frame 4, 7 - obj_image_anim_frame 8, 7 - obj_image_anim_jump 0 - -gLeechSeedAnimTable:: @ 83E2B2C - .4byte gLeechSeedAnimCmds1 - .4byte gLeechSeedAnimCmds2 - -gLeechSeedSpriteTemplate:: @ 83E2B34 - spr_template 10006, 10006, gOamData_AffineOff_ObjNormal_16x16, gLeechSeedAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A26F0 - -gUnknown_83E2B4C:: @ 83E2B4C - obj_image_anim_frame 0, 1 - obj_image_anim_end - -gUnknown_83E2B54:: @ 83E2B54 - obj_image_anim_frame 4, 7 - obj_image_anim_end - -gUnknown_83E2B5C:: @ 83E2B5C - .4byte gUnknown_83E2B4C - .4byte gUnknown_83E2B54 - -gUnknown_83E2B64:: @ 83E2B64 - spr_template 10158, 10158, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2B5C, NULL, gDummySpriteAffineAnimTable, sub_80A27D0 - -gUnknown_83E2B7C:: @ 83E2B7C - obj_image_anim_frame 0, 1 - obj_image_anim_end - -gUnknown_83E2B84:: @ 83E2B84 - obj_image_anim_frame 4, 1 - obj_image_anim_end - -gUnknown_83E2B8C:: @ 83E2B8C - .4byte gUnknown_83E2B7C - -gUnknown_83E2B90:: @ 83E2B90 - .4byte gUnknown_83E2B84 - -gUnknown_83E2B94:: @ 83E2B94 - spr_template 10159, 10159, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2B8C, NULL, gDummySpriteAffineAnimTable, sub_80A2920 - -gUnknown_83E2BAC:: @ 83E2BAC - spr_template 10159, 10159, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A29EC - -gUnknown_83E2BC4:: @ 83E2BC4 - obj_image_anim_frame 0, 5 - obj_image_anim_frame 4, 5 - obj_image_anim_frame 8, 5 - obj_image_anim_frame 12, 5 - obj_image_anim_frame 16, 5 - obj_image_anim_frame 20, 5 - obj_image_anim_frame 16, 5 - obj_image_anim_frame 12, 5 - obj_image_anim_frame 8, 5 - obj_image_anim_frame 4, 5 - obj_image_anim_jump 0 - -gUnknown_83E2BF0:: @ 83E2BF0 - obj_image_anim_frame 24, 5 - obj_image_anim_frame 28, 5 - obj_image_anim_frame 32, 5 - obj_image_anim_end - -gUnknown_83E2C00:: @ 83E2C00 - .4byte gUnknown_83E2BC4 - .4byte gUnknown_83E2BF0 - -gUnknown_83E2C08:: @ 83E2C08 - spr_template 10063, 10063, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, sub_80A2AA4 - -gUnknown_83E2C20:: @ 83E2C20 - spr_template 10063, 10063, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2C00, NULL, gDummySpriteAffineAnimTable, AnimMoveTwisterParticle - -gUnknown_83E2C38:: @ 83E2C38 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_jump 0 - -gUnknown_83E2C4C:: @ 83E2C4C - .4byte gUnknown_83E2C38 - -gUnknown_83E2C50:: @ 83E2C50 - spr_template 10160, 10160, gOamData_AffineOff_ObjNormal_32x16, gUnknown_83E2C4C, NULL, gDummySpriteAffineAnimTable, sub_80A2B9C - -gUnknown_83E2C68:: @ 83E2C68 - obj_rot_scal_anim_frame 0, 0, 0, 1 - obj_rot_scal_anim_jump 0 - -gUnknown_83E2C78:: @ 83E2C78 - .4byte gUnknown_83E2C68 - -gUnknown_83E2C7C:: @ 83E2C7C - spr_template 10174, 10174, gOamData_AffineNormal_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E2C78, sub_80A2B9C - -gUnknown_83E2C94:: @ 83E2C94 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 96, 4 - obj_image_anim_end - -gUnknown_83E2CA8:: @ 83E2CA8 - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 64, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 96, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E2CBC:: @ 83E2CBC - .4byte gUnknown_83E2C94 - .4byte gUnknown_83E2CA8 - -gUnknown_83E2CC4:: @ 83E2CC4 - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_frame -11, 0, 0, 6 - obj_rot_scal_anim_frame 11, 0, 0, 6 - obj_rot_scal_anim_end - -gUnknown_83E2CE4:: @ 83E2CE4 - obj_rot_scal_anim_frame -256, 256, 0, 0 - obj_rot_scal_anim_frame 11, 0, 0, 6 - obj_rot_scal_anim_frame -11, 0, 0, 6 - obj_rot_scal_anim_end - -gUnknown_83E2D04:: @ 83E2D04 - .4byte gUnknown_83E2CC4 - .4byte gUnknown_83E2CE4 - -gUnknown_83E2D0C:: @ 83E2D0C - spr_template 10186, 10186, gOamData_AffineNormal_ObjNormal_64x32, gUnknown_83E2CBC, NULL, gUnknown_83E2D04, sub_80A2E28 - -gUnknown_83E2D24:: @ 83E2D24 - obj_rot_scal_anim_frame 0, 0, 0, 0 - obj_rot_scal_anim_frame 48, 48, 0, 14 - obj_rot_scal_anim_end - -gUnknown_83E2D3C:: @ 83E2D3C - obj_rot_scal_anim_frame -16, -16, 0, 1 - obj_rot_scal_anim_jump 0 - -gUnknown_83E2D4C:: @ 83E2D4C - .4byte gUnknown_83E2D24 - .4byte gUnknown_83E2D3C - -gUnknown_83E2D54:: @ 83E2D54 - spr_template 10147, 10147, gOamData_AffineDouble_ObjNormal_16x16, gSpriteAnimTable_83E2A40, NULL, gUnknown_83E2D4C, sub_80A3098 - -gUnknown_83E2D6C:: @ 83E2D6C - obj_image_anim_frame 0, 7 - obj_image_anim_frame 16, 7 - obj_image_anim_frame 32, 7 - obj_image_anim_frame 48, 7 - obj_image_anim_end - -gUnknown_83E2D80:: @ 83E2D80 - obj_image_anim_frame 0, 7, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 7, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 7, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 48, 7, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E2D94:: @ 83E2D94 - obj_image_anim_frame 0, 7 - obj_image_anim_frame 16, 7 - obj_image_anim_frame 32, 7 - obj_image_anim_end - -gUnknown_83E2DA4:: @ 83E2DA4 - obj_image_anim_frame 0, 7, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 7, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 7, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E2DB4:: @ 83E2DB4 - .4byte gUnknown_83E2D6C - .4byte gUnknown_83E2D80 - .4byte gUnknown_83E2D94 - .4byte gUnknown_83E2DA4 - -gUnknown_83E2DC4:: @ 83E2DC4 - spr_template 10223, 10223, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A3168 - -gUnknown_83E2DDC:: @ 83E2DDC - spr_template 10223, 10223, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E2DB4, NULL, gDummySpriteAffineAnimTable, sub_80A31EC - -gUnknown_83E2DF4:: @ 83E2DF4 - obj_image_anim_frame 3, 3 - obj_image_anim_frame 0, 5 - obj_image_anim_jump 0 - -gUnknown_83E2E00:: @ 83E2E00 - .4byte gUnknown_83E2DF4 - -gUnknown_83E2E04:: @ 83E2E04 - spr_template 10147, 10147, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E2E00, NULL, gDummySpriteAffineAnimTable, sub_80A3334 - -gUnknown_83E2E1C:: @ 83E2E1C - obj_image_anim_frame 0, 30 - obj_image_anim_end - -gUnknown_83E2E24:: @ 83E2E24 - .4byte gUnknown_83E2E1C - -gUnknown_83E2E28:: @ 83E2E28 - obj_rot_scal_anim_frame 0, 0, 252, 10 - obj_rot_scal_anim_frame 0, 0, 4, 20 - obj_rot_scal_anim_frame 0, 0, 252, 10 - obj_rot_scal_anim_end - -gUnknown_83E2E48:: @ 83E2E48 - obj_rot_scal_anim_frame 0, 0, 255, 2 - obj_rot_scal_anim_frame 0, 0, 1, 4 - obj_rot_scal_anim_frame 0, 0, 255, 4 - obj_rot_scal_anim_frame 0, 0, 1, 4 - obj_rot_scal_anim_frame 0, 0, 255, 4 - obj_rot_scal_anim_frame 0, 0, 1, 2 - obj_rot_scal_anim_end - -gUnknown_83E2E80:: @ 83E2E80 - .4byte gUnknown_83E2E28 - .4byte gUnknown_83E2E48 - -gUnknown_83E2E88:: @ 83E2E88 - spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A3518 - -gUnknown_83E2EA0:: @ 83E2EA0 - spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A35F4 - -gUnknown_83E2EB8:: @ 83E2EB8 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_frame 12, 4 - obj_image_anim_end - -gUnknown_83E2ECC:: @ 83E2ECC - .4byte gUnknown_83E2EB8 - -gUnknown_83E2ED0:: @ 83E2ED0 - spr_template 10195, 10195, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2ECC, NULL, gDummySpriteAffineAnimTable, sub_80A3670 - -gUnknown_83E2EE8:: @ 83E2EE8 - spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2E80, sub_80A36B4 - -gUnknown_83E2F00:: @ 83E2F00 - obj_rot_scal_anim_frame 0, 0, 0, 3 - obj_rot_scal_anim_end - -gUnknown_83E2F10:: @ 83E2F10 - obj_rot_scal_anim_frame 0, -10, 0, 3 - obj_rot_scal_anim_frame 0, -6, 0, 3 - obj_rot_scal_anim_frame 0, -2, 0, 3 - obj_rot_scal_anim_frame 0, 0, 0, 3 - obj_rot_scal_anim_frame 0, 2, 0, 3 - obj_rot_scal_anim_frame 0, 6, 0, 3 - obj_rot_scal_anim_frame 0, 10, 0, 3 - obj_rot_scal_anim_end - -gUnknown_83E2F50:: @ 83E2F50 - .4byte gUnknown_83E2F00 - .4byte gUnknown_83E2F10 - .4byte gUnknown_83E2E28 - .4byte gUnknown_83E2E48 - -gUnknown_83E2F60:: @ 83E2F60 - spr_template 10224, 10224, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E2E24, NULL, gUnknown_83E2F50, sub_80A37BC - -gUnknown_83E2F78:: @ 83E2F78 - .byte 0x05, 0x18, 0x01, 0x00, 0x04, 0x00, 0x08, 0x10, 0xff, 0x00, 0x02, 0x00, 0x08, 0x10, 0x01, 0x00, 0x02, 0x00, 0x08, 0x10, 0x01, 0x00, 0x02, 0x00, 0x08, 0x10, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00 - .byte 0x7f, 0x00, 0x00, 0x00 - -gUnknown_83E2F9C:: @ 83E2F9C - obj_image_anim_frame 28, 1 - obj_image_anim_end - -gUnknown_83E2FA4:: @ 83E2FA4 - obj_image_anim_frame 32, 1 - obj_image_anim_end - -gUnknown_83E2FAC:: @ 83E2FAC - obj_image_anim_frame 20, 1 - obj_image_anim_end - -gUnknown_83E2FB4:: @ 83E2FB4 - obj_image_anim_frame 28, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E2FBC:: @ 83E2FBC - obj_image_anim_frame 16, 1 - obj_image_anim_end - -gUnknown_83E2FC4:: @ 83E2FC4 - obj_image_anim_frame 16, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E2FCC:: @ 83E2FCC - obj_image_anim_frame 28, 1 - obj_image_anim_end - -gUnknown_83E2FD4:: @ 83E2FD4 - .4byte gUnknown_83E2F9C - .4byte gUnknown_83E2FA4 - .4byte gUnknown_83E2FAC - .4byte gUnknown_83E2FB4 - .4byte gUnknown_83E2FBC - .4byte gUnknown_83E2FC4 - .4byte gUnknown_83E2FCC - -gUnknown_83E2FF0:: @ 83E2FF0 - spr_template 10063, 10063, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E2FD4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83E3008:: @ 83E3008 - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_frame 0, 0, 4, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_83E3020:: @ 83E3020 - .4byte gUnknown_83E3008 - -gUnknown_83E3024:: @ 83E3024 - spr_template 10159, 10159, gOamData_AffineOff_ObjNormal_8x8, gUnknown_83E2B90, NULL, gDummySpriteAffineAnimTable, sub_80A4040 - -gUnknown_83E303C:: @ 83E303C - spr_template 10159, 10159, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E2B8C, NULL, gUnknown_83E3020, sub_80A4040 - -gUnknown_83E3054:: @ 83E3054 - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_frame 0, 0, 246, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_83E306C:: @ 83E306C - obj_rot_scal_anim_frame 192, 192, 0, 0 - obj_rot_scal_anim_frame 0, 0, 244, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_83E3084:: @ 83E3084 - obj_rot_scal_anim_frame 143, 143, 0, 0 - obj_rot_scal_anim_frame 0, 0, 241, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_83E309C:: @ 83E309C - .4byte gUnknown_83E3054 - -gUnknown_83E30A0:: @ 83E30A0 - .4byte gUnknown_83E306C - -gUnknown_83E30A4:: @ 83E30A4 - .4byte gUnknown_83E3084 - -gUnknown_83E30A8:: @ 83E30A8 - spr_template 10271, 10271, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E309C, sub_80A4040 - -gUnknown_83E30C0:: @ 83E30C0 - spr_template 10271, 10271, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E30A0, sub_80A4040 - -gUnknown_83E30D8:: @ 83E30D8 - spr_template 10271, 10271, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E30A4, sub_80A4040 - -gUnknown_83E30F0:: @ 83E30F0 - .2byte 0x001f, 0x027f, 0x03ff, 0x03e0, 0x7dc5, 0x7d56, 0x7eb6, 0x0000 - -gUnknown_83E3100:: @ 83E3100 - spr_template 10266, 10266, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4298 - -gUnknown_83E3118:: @ 83E3118 - obj_image_anim_frame 64, 3 - obj_image_anim_frame 80, 3 - obj_image_anim_frame 96, 3 - obj_image_anim_frame 112, 6 - obj_image_anim_end - -gUnknown_83E312C:: @ 83E312C - obj_image_anim_frame 64, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 80, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 96, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 112, 6, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E3140:: @ 83E3140 - .4byte gUnknown_83E3118 - .4byte gUnknown_83E312C - -gUnknown_83E3148:: @ 83E3148 - spr_template 10056, 10056, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450 - -gUnknown_83E3160:: @ 83E3160 - spr_template 10287, 10287, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3140, NULL, gDummySpriteAffineAnimTable, sub_80A4450 - -gUnknown_83E3178:: @ 83E3178 - obj_image_anim_frame 0x0000, 4 - obj_image_anim_frame 0x0010, 4 - obj_image_anim_frame 0x0020, 4 - obj_image_anim_frame 0x0030, 4 - obj_image_anim_frame 0x0040, 5 - obj_image_anim_end - -gUnknown_83E3190:: @ 83E3190 - .4byte gUnknown_83E3178 - -gUnknown_83E3194:: @ 83E3194 - spr_template 10021, 10021, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8 - -gUnknown_83E31AC:: @ 83E31AC - spr_template 10022, 10022, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3190, NULL, gDummySpriteAffineAnimTable, sub_80A43F8 - -gUnknown_83E31C4:: @ 83E31C4 - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_end - -gUnknown_83E31D4:: - obj_rot_scal_anim_frame 256, 256, 32, 0 - obj_rot_scal_anim_end - -gUnknown_83E31E4:: - obj_rot_scal_anim_frame 256, 256, 64, 0 - obj_rot_scal_anim_end - -gUnknown_83E31F4:: - obj_rot_scal_anim_frame 256, 256, 96, 0 - obj_rot_scal_anim_end - -gUnknown_83E3204:: - obj_rot_scal_anim_frame 256, 256, 128, 0 - obj_rot_scal_anim_end - -gUnknown_83E3214:: - obj_rot_scal_anim_frame 256, 256, 160, 0 - obj_rot_scal_anim_end - -gUnknown_83E3224:: - obj_rot_scal_anim_frame 256, 256, 192, 0 - obj_rot_scal_anim_end - -gUnknown_83E3234:: - obj_rot_scal_anim_frame 256, 256, 224, 0 - obj_rot_scal_anim_end - -gUnknown_83E3244:: - .4byte gUnknown_83E31C4 - .4byte gUnknown_83E31D4 - .4byte gUnknown_83E31E4 - .4byte gUnknown_83E31F4 - .4byte gUnknown_83E3204 - .4byte gUnknown_83E3214 - .4byte gUnknown_83E3224 - .4byte gUnknown_83E3234 - -gUnknown_83E3264:: - spr_template 10143, 10143, gOamData_AffineNormal_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E3244, sub_80A4494 - -gUnknown_83E327C:: @ 83E327C - obj_image_anim_frame 0, 5 - obj_image_anim_frame 16, 5 - obj_image_anim_frame 32, 5 - obj_image_anim_frame 48, 5 - obj_image_anim_end - -gUnknown_83E3290:: @ 83E3290 - .4byte gUnknown_83E327C - -gUnknown_83E3294:: @ 83E3294 - spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A44E0 - -gUnknown_83E32AC:: @ 83E32AC - spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3290, NULL, gDummySpriteAffineAnimTable, sub_80A4588 - -gUnknown_83E32C4:: @ 83E32C4 - obj_image_anim_frame 0x0000, 1 - obj_image_anim_end - -gUnknown_83E32CC:: - obj_image_anim_frame 0x0004, 1 - obj_image_anim_end - -gUnknown_83E32D4:: - obj_image_anim_frame 0x0008, 1 - obj_image_anim_end - -gUnknown_83E32DC:: - obj_image_anim_frame 0x000c, 1 - obj_image_anim_end - -gUnknown_83E32E4:: - obj_image_anim_frame 0x0010, 1 - obj_image_anim_end - -gUnknown_83E32EC:: - obj_image_anim_frame 0x0014, 1 - obj_image_anim_end - -gUnknown_83E32F4:: - obj_image_anim_frame 0x0000, 1, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - -gUnknown_83E32FC:: - obj_image_anim_frame 0x0004, 1, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - -gUnknown_83E3304:: - obj_image_anim_frame 0x0008, 1, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - -gUnknown_83E330C:: - obj_image_anim_frame 0x000c, 1, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - -gUnknown_83E3314:: - .4byte gUnknown_83E32C4 - .4byte gUnknown_83E32CC - .4byte gUnknown_83E32D4 - .4byte gUnknown_83E32DC - .4byte gUnknown_83E32E4 - .4byte gUnknown_83E32EC - .4byte gUnknown_83E32F4 - .4byte gUnknown_83E32FC - .4byte gUnknown_83E3304 - .4byte gUnknown_83E330C - -gUnknown_83E333C:: - spr_template 10072, 10072, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E3314, NULL, gDummySpriteAffineAnimTable, sub_80A481C - -gUnknown_83E3354:: @ 83E3354 - spr_template 10280, 10280, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A48F0 - -gUnknown_83E336C:: @ 83E336C - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_end - -gUnknown_83E337C:: @ 83E337C - obj_rot_scal_anim_frame 0, 0, 2, 12 - obj_rot_scal_anim_frame 0, 0, 0, 6 - obj_rot_scal_anim_frame 0, 0, 254, 24 - obj_rot_scal_anim_frame 0, 0, 0, 6 - obj_rot_scal_anim_frame 0, 0, 2, 12 - obj_rot_scal_anim_jump 0 - -gUnknown_83E33AC:: @ 83E33AC - .4byte gUnknown_83E336C - .4byte gUnknown_83E337C - -gUnknown_83E33B4:: @ 83E33B4 - spr_template 10099, 10099, gOamData_AffineNormal_ObjBlend_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E33AC, sub_80A4ACC - -gUnknown_83E33CC:: @ 83E33CC - obj_image_anim_frame 0, 7 - obj_image_anim_frame 16, 7 - obj_image_anim_frame 32, 7 - obj_image_anim_frame 48, 7 - obj_image_anim_frame 64, 7 - obj_image_anim_frame 80, 7 - obj_image_anim_frame 96, 7 - obj_image_anim_frame 112, 7 - obj_image_anim_jump 0 - -gUnknown_83E33F0:: @ 83E33F0 - .4byte gUnknown_83E33CC - -gUnknown_83E33F4:: @ 83E33F4 - spr_template 10049, 10049, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D0C - -gUnknown_83E340C:: @ 83E340C - spr_template 10049, 10049, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E33F0, NULL, gDummySpriteAffineAnimTable, sub_80A4D5C - -gUnknown_83E3424:: @ 83E3424 - obj_image_anim_frame 0x0000, 10 - obj_image_anim_frame 0x0004, 10 - obj_image_anim_frame 0x0008, 10 - obj_image_anim_frame 0x000c, 10 - obj_image_anim_frame 0x0010, 26 - obj_image_anim_frame 0x0010, 5 - obj_image_anim_frame 0x0014, 5 - obj_image_anim_frame 0x0018, 15 - obj_image_anim_end - -gUnknown_83E3448:: - obj_image_anim_frame 0x0000, 10, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0x0004, 10, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0x0008, 10, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0x000c, 10, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0x0010, 26, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0x0010, 5, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0x0014, 5, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0x0018, 15, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E346C:: - .4byte gUnknown_83E3424 - .4byte gUnknown_83E3448 - -gUnknown_83E3474:: - spr_template 10032, 10032, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E346C, NULL, gDummySpriteAffineAnimTable, sub_80A4E40 - -gUnknown_83E348C:: @ 83E348C - obj_image_anim_frame 0, 40 - obj_image_anim_end - -gUnknown_83E3494:: @ 83E3494 - .4byte gUnknown_83E348C - -gUnknown_83E3498:: @ 83E3498 - obj_rot_scal_anim_frame 20, 20, 226, 0 - obj_rot_scal_anim_frame 8, 8, 1, 24 - obj_rot_scal_anim_end - -gUnknown_83E34B0:: @ 83E34B0 - obj_rot_scal_anim_loop 0 - obj_rot_scal_anim_frame 0, 0, 1, 24 - obj_rot_scal_anim_loop 10 - -gUnknown_83E34C8:: @ 83E34C8 - obj_rot_scal_anim_frame 20, 20, 30, 0 - obj_rot_scal_anim_frame 8, 8, 255, 24 - obj_rot_scal_anim_end - -gUnknown_83E34E0:: @ 83E34E0 - obj_rot_scal_anim_loop 0 - obj_rot_scal_anim_frame 0, 0, 255, 24 - obj_rot_scal_anim_loop 10 - -gUnknown_83E34F8:: @ 83E34F8 - .4byte gUnknown_83E3498 - .4byte gUnknown_83E34C8 - -gUnknown_83E3500:: @ 83E3500 - spr_template 10228, 10228, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E3494, NULL, gUnknown_83E34F8, sub_80A4EF4 - -gUnknown_83E3518:: @ 83E3518 - spr_template 10014, 10014, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A4FAC - -gUnknown_83E3530:: @ 83E3530 - spr_template 10014, 10014, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5298 - -gUnknown_83E3548:: @ 83E3548 - .byte 0x40, 0x40, 0x00, 0xc0, 0xc0, 0x40, 0x20, 0xe0 - -gUnknown_83E3550:: @ 83E3550 - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5340 - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5590 - -gUnknown_83E3580:: @ 83E3580 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_frame 48, 4 - obj_image_anim_end - -gUnknown_83E3594:: @ 83E3594 - obj_image_anim_frame 48, 4 - obj_image_anim_end - -gUnknown_83E359C:: @ 83E359C - .4byte gUnknown_83E3580 - .4byte gUnknown_83E3594 - -gUnknown_83E35A4:: @ 83E35A4 - spr_template 10183, 10183, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A5940 - -gUnknown_83E35BC:: @ 83E35BC - spr_template 10286, 10286, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59A8 - -gUnknown_83E35D4:: @ 83E35D4 - spr_template 10286, 10286, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E359C, NULL, gDummySpriteAffineAnimTable, sub_80A59F0 - -gUnknown_83E35EC:: @ 83E35EC - obj_image_anim_frame 0, 4 - obj_image_anim_frame 8, 12 - obj_image_anim_frame 16, 4 - obj_image_anim_frame 24, 4 - obj_image_anim_end - -gUnknown_83E3600:: @ 83E3600 - .4byte gUnknown_83E35EC - -gUnknown_83E3604:: @ 83E3604 - spr_template 10184, 10184, gOamData_AffineOff_ObjNormal_16x32, gUnknown_83E3600, NULL, gDummySpriteAffineAnimTable, sub_80A5AD8 - -gUnknown_83E361C:: @ 83E361C - obj_image_anim_frame 0, 18 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 16, 18 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 16, 6 - obj_image_anim_frame 32, 18 - obj_image_anim_frame 16, 6 - obj_image_anim_frame 32, 6 - obj_image_anim_frame 48, 18 - obj_image_anim_frame 32, 6 - obj_image_anim_frame 48, 6 - obj_image_anim_frame 64, 18 - obj_image_anim_frame 48, 6 - obj_image_anim_frame 64, 54 - obj_image_anim_end - -gUnknown_83E3658:: @ 83E3658 - .4byte gUnknown_83E361C - -gUnknown_83E365C:: @ 83E365C - spr_template 10185, 10185, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3658, NULL, gDummySpriteAffineAnimTable, sub_80A5B7C - -gUnknown_83E3674:: @ 83E3674 - spr_template 10017, 10017, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation - -gUnknown_83E368C:: @ 83E368C - obj_image_anim_frame 0, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 32, 3 - obj_image_anim_frame 48, 3 - obj_image_anim_frame 64, 3 - obj_image_anim_end - -gUnknown_83E36A4:: @ 83E36A4 - .4byte gUnknown_83E368C - -gUnknown_83E36A8:: @ 83E36A8 - spr_template 10030, 10030, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E36A4, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos - -gUnknown_83E36C0:: @ 83E36C0 - obj_image_anim_frame 3, 5 - obj_image_anim_frame 2, 5 - obj_image_anim_frame 1, 5 - obj_image_anim_frame 0, 5 - obj_image_anim_end - -gUnknown_83E36D4:: @ 83E36D4 - .4byte gUnknown_83E36C0 - -gUnknown_83E36D8:: @ 83E36D8 - obj_rot_scal_anim_frame 512, 512, 0, 0 - obj_rot_scal_anim_end - -gUnknown_83E36E8:: @ 83E36E8 - .4byte gUnknown_83E36D8 - -gUnknown_83E36EC:: @ 83E36EC - spr_template 10018, 10018, gOamData_AffineDouble_ObjBlend_8x8, gUnknown_83E36D4, NULL, gUnknown_83E36E8, sub_80A5C68 - -gUnknown_83E3704:: @ 83E3704 - obj_image_anim_frame 0, 5 - obj_image_anim_frame 1, 5 - obj_image_anim_frame 2, 5 - obj_image_anim_frame 3, 5 - obj_image_anim_end - -gUnknown_83E3718:: @ 83E3718 - .4byte gUnknown_83E3704 - -gUnknown_83E371C:: @ 83E371C - spr_template 10018, 10018, gOamData_AffineDouble_ObjBlend_8x8, gUnknown_83E3718, NULL, gUnknown_83E36E8, sub_80A5D4C - -gUnknown_83E3734:: @ 83E3734 - spr_template 10194, 10194, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A5EE0 - -gUnknown_83E374C:: @ 83E374C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 8, 8 - obj_image_anim_frame 12, 8 - obj_image_anim_jump 0 - -gUnknown_83E3760:: @ 83E3760 - .4byte gUnknown_83E374C - -gUnknown_83E3764:: @ 83E3764 - spr_template 10195, 10195, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E3760, NULL, gDummySpriteAffineAnimTable, sub_80A5F40 - -gUnknown_83E377C:: @ 83E377C - obj_image_anim_frame 0, 2 - obj_image_anim_frame 16, 2 - obj_image_anim_frame 32, 2 - obj_image_anim_frame 48, 3 - obj_image_anim_frame 64, 5 - obj_image_anim_frame 80, 3 - obj_image_anim_frame 96, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_end - -gUnknown_83E37A0:: @ 83E37A0 - .4byte gUnknown_83E377C - -gUnknown_83E37A4:: @ 83E37A4 - spr_template 10031, 10031, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E37A0, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos - -gUnknown_83E37BC:: @ 83E37BC - spr_template 10020, 10020, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6244 - -gUnknown_83E37D4:: @ 83E37D4 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 16, 2 - obj_image_anim_frame 32, 2 - obj_image_anim_frame 48, 2 - obj_image_anim_end - -gUnknown_83E37E8:: @ 83E37E8 - .4byte gUnknown_83E37D4 - -gUnknown_83E37EC:: @ 83E37EC - spr_template 10192, 10192, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E37E8, NULL, gDummySpriteAffineAnimTable, sub_80A65CC - -gUnknown_83E3804:: @ 83E3804 - obj_image_anim_frame 0x0000, 10 - obj_image_anim_end - -gOamData_83E380C:: - obj_image_anim_frame 0x0004, 10 - obj_image_anim_end - -gUnknown_83E3814:: @ 83E3814 - obj_image_anim_frame 0x0008, 41 - obj_image_anim_end - -gUnknown_83E381C:: @ 83E381C - obj_image_anim_frame 0x000c, 10 - obj_image_anim_end - -gUnknown_83E3824:: @ 83E3824 - obj_image_anim_frame 0x0010, 10 - obj_image_anim_end - -gUnknown_83E382C:: @ 83E382C - obj_image_anim_frame 0x0014, 10 - obj_image_anim_end - obj_image_anim_frame 0x0000, 10, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - obj_image_anim_frame 0x0004, 10, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - -gUnknown_83E3844:: @ 83E3844 - spr_template 14340, 2110, gOamData_83E380C, gUnknown_83E3814, gUnknown_83E381C, gUnknown_83E3824, gUnknown_83E382C - -gUnknown_83E385C:: @ 83E385C - .4byte 0x83e3834 - .4byte 0x83e383c - -gUnknown_83E3864:: @ 83E3864 - obj_rot_scal_anim_frame 12, 12, 0, 16 - obj_rot_scal_anim_frame -12, -12, 0, 16 - obj_rot_scal_anim_jump 0 - -gUnknown_83E387C:: @ 83E387C - .4byte gUnknown_83E3864 - -gUnknown_83E3880:: @ 83E3880 - spr_template 10072, 10072, gOamData_AffineDouble_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A66D4 - -gUnknown_83E3898:: @ 83E3898 - .2byte 0x2758, 0x7fff, 0x735f, 0x6adf, 0x623f, 0x59bf, 0x2771, 0x7fff, 0x6bf9, 0x57f4, 0x43ef, 0x33ea, 0x27c9, 0x7fff, 0x63ff, 0x47ff - .2byte 0x2bff, 0x0fff, 0x27bf, 0x7fff, 0x7f9a, 0x7f55, 0x7f10, 0x7ecc - -gUnknown_83E38C8:: @ 83E38C8 - spr_template 10072, 10072, gOamData_AffineDouble_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E387C, sub_80A68B0 - -gUnknown_83E38E0:: @ 83E38E0 - spr_template 10193, 10193, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A69B8 - -gUnknown_83E38F8:: @ 83E38F8 - obj_rot_scal_anim_frame 160, 160, 0, 0 - obj_rot_scal_anim_frame 4, 4, 0, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_83E3910:: @ 83E3910 - .4byte gUnknown_83E38F8 - -gUnknown_83E3914:: @ 83E3914 - spr_template 10072, 10072, gOamData_AffineDouble_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E3910, sub_80A6A28 - -gUnknown_83E392C:: @ 83E392C - obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E3940:: @ 83E3940 - obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E3954:: @ 83E3954 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 16, 2 - obj_image_anim_frame 32, 2 - obj_image_anim_frame 48, 2 - obj_image_anim_end - -gUnknown_83E3968:: @ 83E3968 - obj_image_anim_frame 48, 2 - obj_image_anim_frame 32, 2 - obj_image_anim_frame 16, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_end - -gUnknown_83E397C:: @ 83E397C - .4byte gUnknown_83E392C - .4byte gUnknown_83E3954 - .4byte gUnknown_83E3940 - .4byte gUnknown_83E3968 - -gUnknown_83E398C:: @ 83E398C - spr_template 10209, 10209, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E397C, NULL, gDummySpriteAffineAnimTable, sub_80A6B64 - -gUnknown_83E39A4:: @ 83E39A4 - obj_rot_scal_anim_frame 16, 16, 0, 0 - obj_rot_scal_anim_frame 30, 30, 0, 8 - obj_rot_scal_anim_end - -gUnknown_83E39BC:: @ 83E39BC - obj_rot_scal_anim_frame 0, 0, 4, 11 - obj_rot_scal_anim_frame 0, 0, 252, 11 - obj_rot_scal_anim_loop 2 - obj_rot_scal_anim_frame -30, -30, 0, 8 - obj_rot_scal_anim_end - -gUnknown_83E39E4:: @ 83E39E4 - obj_rot_scal_anim_frame 16, 16, 0, 0 - obj_rot_scal_anim_frame 30, 30, 0, 8 - obj_rot_scal_anim_frame 0, 0, 0, 16 - obj_rot_scal_anim_loop 0 - obj_rot_scal_anim_frame 0, 0, 4, 11 - obj_rot_scal_anim_frame 0, 0, 252, 11 - obj_rot_scal_anim_loop 2 - obj_rot_scal_anim_frame -30, -30, 0, 8 - obj_rot_scal_anim_end - -gUnknown_83E3A2C:: @ 83E3A2C - .4byte gUnknown_83E39A4 - .4byte gUnknown_83E39BC - -gUnknown_83E3A34:: @ 83E3A34 - spr_template 10064, 10064, gOamData_AffineDouble_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C08 - -gUnknown_83E3A4C:: @ 83E3A4C - spr_template 10064, 10064, gOamData_AffineNormal_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E3A2C, sub_80A6C84 - -gUnknown_83E3A64:: @ 83E3A64 - obj_image_anim_frame 0, 1 - obj_image_anim_end - -gUnknown_83E3A6C:: @ 83E3A6C - obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E3A74:: @ 83E3A74 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_end - -gUnknown_83E3A94:: @ 83E3A94 - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E3AB4:: @ 83E3AB4 - .4byte gUnknown_83E3A64 - .4byte gUnknown_83E3A6C - .4byte gUnknown_83E3A74 - .4byte gUnknown_83E3A94 - -gUnknown_83E3AC4:: @ 83E3AC4 - spr_template 10214, 10214, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3AB4, NULL, gDummySpriteAffineAnimTable, sub_80A6D90 - -gUnknown_83E3ADC:: - spr_template 10064, 10064, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E48 - -gUnknown_83E3AF4:: @ 83E3AF4 - obj_image_anim_frame 0x0004, 1 - obj_image_anim_end - -gUnknown_83E3AFC:: - .4byte gUnknown_83E3AF4 - -gUnknown_83E3B00:: - spr_template 10072, 10072, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6E98 - -gUnknown_83E3B18:: - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A6F8C - -gUnknown_83E3B30:: - spr_template 10145, 10145, gOamData_AffineNormal_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E7910, sub_80A7020 - -gUnknown_83E3B48:: - obj_image_anim_frame 0x0000, 9 - obj_image_anim_frame 0x0010, 3 - obj_image_anim_frame 0x0020, 3 - obj_image_anim_frame 0x0030, 3 - obj_image_anim_end - -gUnknown_83E3B5C:: - .4byte gUnknown_83E3B48 - -gUnknown_83E3B60:: - obj_rot_scal_anim_frame 80, 80, 0, 0 - obj_rot_scal_anim_frame 9, 9, 0, 18 - obj_rot_scal_anim_end - -gUnknown_83E3B78:: - .4byte gUnknown_83E3B60 - -gUnknown_83E3B7C:: - spr_template 10007, 10007, gOamData_AffineNormal_ObjNormal_32x32, gUnknown_83E3B5C, NULL, gUnknown_83E3B78, AnimSpriteOnMonPos - -gUnknown_83E3B94:: @ 83E3B94 - obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 24, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 40, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_loop 1 - obj_image_anim_end - -gUnknown_83E3BB8:: @ 83E3BB8 - .4byte gUnknown_83E3B94 - -gUnknown_83E3BBC:: @ 83E3BBC - spr_template 10075, 10075, gOamData_AffineOff_ObjNormal_32x16, gUnknown_83E3BB8, NULL, gDummySpriteAffineAnimTable, sub_80A71D8 - -gUnknown_83E3BD4:: @ 83E3BD4 - obj_rot_scal_anim_frame 16, 256, 0, 0 - obj_rot_scal_anim_frame 20, 0, 0, 12 - obj_rot_scal_anim_frame 0, 0, 0, 32 - obj_rot_scal_anim_end - -gUnknown_83E3BF4:: @ 83E3BF4 - .4byte gUnknown_83E3BD4 - -gUnknown_83E3BF8:: @ 83E3BF8 - spr_template 10005, 10005, gOamData_AffineNormal_ObjBlend_32x64, gDummySpriteAnimTable, NULL, gUnknown_83E3BF4, sub_80A727C - -gUnknown_83E3C10:: @ 83E3C10 - spr_template 10003, 10003, gOamData_AffineDouble_ObjBlend_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A72C8 - -gUnknown_83E3C28:: @ 83E3C28 - spr_template 10003, 10003, gOamData_AffineOff_ObjBlend_32x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A74A4 - -gUnknown_83E3C40:: @ 83E3C40 - obj_rot_scal_anim_frame 32, 32, 0, 0 - obj_rot_scal_anim_frame 7, 7, 0, 200 - obj_rot_scal_anim_end - -gUnknown_83E3C58:: @ 83E3C58 - obj_rot_scal_anim_frame 5, 5, 0, 10 - obj_rot_scal_anim_frame -10, -10, 0, 10 - obj_rot_scal_anim_frame 10, 10, 0, 10 - obj_rot_scal_anim_frame -10, -10, 0, 10 - obj_rot_scal_anim_frame 10, 10, 0, 10 - obj_rot_scal_anim_frame -10, -10, 0, 10 - obj_rot_scal_anim_frame 10, 10, 0, 10 - obj_rot_scal_anim_end - -gUnknown_83E3C98:: @ 83E3C98 - .4byte gUnknown_83E3C40 - -gUnknown_83E3C9C:: @ 83E3C9C - .4byte gUnknown_83E3C58 - -gUnknown_83E3CA0:: @ 83E3CA0 - spr_template 10163, 10163, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation - -gUnknown_83E3CB8:: @ 83E3CB8 - spr_template 10164, 10164, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation - -gUnknown_83E3CD0:: @ 83E3CD0 - spr_template 10260, 10260, gOamData_AffineDouble_ObjNormal_32x64, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, TranslateAnimSpriteToTargetMonLocation - -gUnknown_83E3CE8:: @ 83E3CE8 - spr_template 10288, 10288, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C9C, sub_80AC6D8 - -gUnknown_83E3D00:: @ 83E3D00 - spr_template 10175, 10175, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimThrowProjectile - -gUnknown_83E3D18:: @ 83E3D18 - spr_template 10178, 10178, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A79E8 - -gUnknown_83E3D30:: @ 83E3D30 - obj_image_anim_frame 8, 1 - obj_image_anim_end - -gUnknown_83E3D38:: @ 83E3D38 - .4byte gUnknown_83E3D30 - -gUnknown_83E3D3C:: @ 83E3D3C - obj_rot_scal_anim_frame 0, 0, 10, 1 - obj_rot_scal_anim_jump 0 - -gUnknown_83E3D4C:: @ 83E3D4C - .4byte gUnknown_83E3D3C - -gUnknown_83E3D50:: @ 83E3D50 - spr_template 10100, 10100, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3D38, NULL, gDummySpriteAffineAnimTable, sub_80A7A88 - -gUnknown_83E3D68:: @ 83E3D68 - spr_template 10100, 10100, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3D38, NULL, gUnknown_83E3D4C, sub_80A7B3C - -gUnknown_83E3D80:: @ 83E3D80 - obj_rot_scal_anim_frame 0, 0, 20, 1 - obj_rot_scal_anim_jump 0 - -gUnknown_83E3D90:: @ 83E3D90 - .4byte gUnknown_83E3D80 - -gUnknown_83E3D94:: @ 83E3D94 - spr_template 10006, 10006, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E3D90, sub_80A7BC4 - -gUnknown_83E3DAC:: @ 83E3DAC - obj_rot_scal_anim_frame 16, 256, 0, 0 - obj_rot_scal_anim_frame 4, 0, 0, 40 - obj_rot_scal_anim_end - -gUnknown_83E3DC4:: @ 83E3DC4 - .4byte gUnknown_83E3DAC - -gUnknown_83E3DC8:: @ 83E3DC8 - spr_template 10009, 10009, gOamData_AffineNormal_ObjNormal_32x64, gDummySpriteAnimTable, NULL, gUnknown_83E3DC4, sub_80A7D04 - -gUnknown_83E3DE0:: @ 83E3DE0 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 32, 20 - obj_image_anim_end - -gUnknown_83E3DF0:: @ 83E3DF0 - obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 16, 3, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 32, 20, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - -gUnknown_83E3E00:: @ 83E3E00 - .4byte gUnknown_83E3DE0 - .4byte gUnknown_83E3DF0 - -gUnknown_83E3E08:: @ 83E3E08 - spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3E00, NULL, gDummySpriteAffineAnimTable, sub_80A7D64 - -gUnknown_83E3E20:: @ 83E3E20 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 16, 2 - obj_image_anim_frame 32, 1 - obj_image_anim_end - -gUnknown_83E3E30:: @ 83E3E30 - obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 16, 2, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 32, 1, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - -gUnknown_83E3E40:: @ 83E3E40 - .4byte gUnknown_83E3E20 - .4byte gUnknown_83E3E30 - -gUnknown_83E3E48:: @ 83E3E48 - spr_template 10138, 10138, gOamData_AffineOff_ObjBlend_32x32, gUnknown_83E3E40, NULL, gDummySpriteAffineAnimTable, sub_80A7E14 - -gUnknown_83E3E60:: @ 83E3E60 - obj_rot_scal_anim_frame -6, 4, 0, 8 - obj_rot_scal_anim_frame 10, -10, 0, 8 - obj_rot_scal_anim_frame -4, 6, 0, 8 - obj_rot_scal_anim_end - -gUnknown_83E3E80:: @ 83E3E80 - obj_rot_scal_anim_frame -4, -5, 0, 12 - obj_rot_scal_anim_frame 0, 0, 0, 24 - obj_rot_scal_anim_frame 4, 5, 0, 12 - obj_rot_scal_anim_end - -gUnknown_83E3EA0:: @ 83E3EA0 - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 4, 40, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 12, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E3EB4:: @ 83E3EB4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 4, 40 - obj_image_anim_frame 8, 4 - obj_image_anim_frame 12, 4 - obj_image_anim_end - -gUnknown_83E3EC8:: @ 83E3EC8 - .4byte gUnknown_83E3EA0 - .4byte gUnknown_83E3EB4 - -gUnknown_83E3ED0:: @ 83E3ED0 - spr_template 10086, 10086, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E3EC8, NULL, gDummySpriteAffineAnimTable, sub_80A851C - -gUnknown_83E3EE8:: @ 83E3EE8 - obj_rot_scal_anim_frame 11, 11, 0, 8 - obj_rot_scal_anim_frame -11, -11, 0, 8 - obj_rot_scal_anim_end - -gUnknown_83E3F00:: @ 83E3F00 - .4byte gUnknown_83E3EE8 - -gUnknown_83E3F04:: @ 83E3F04 - spr_template 10087, 10087, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E3F00, sub_80A85AC - -gUnknown_83E3F1C:: @ 83E3F1C - obj_rot_scal_anim_frame -10, 9, 0, 7 - obj_rot_scal_anim_frame 20, -20, 0, 7 - obj_rot_scal_anim_frame -20, 20, 0, 7 - obj_rot_scal_anim_frame 10, -9, 0, 7 - obj_rot_scal_anim_loop 2 - obj_rot_scal_anim_end - -gUnknown_83E3F4C:: @ 83E3F4C - spr_template 10002, 10002, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8A1C - -gUnknown_83E3F64:: @ 83E3F64 - spr_template 10197, 10197, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimSnoreZ - -gUnknown_83E3F7C:: @ 83E3F7C - obj_image_anim_frame 0, 5 - obj_image_anim_frame 16, 5 - obj_image_anim_frame 32, 5 - obj_image_anim_frame 48, 5 - obj_image_anim_end - -gUnknown_83E3F90:: @ 83E3F90 - .4byte gUnknown_83E3F7C - -gUnknown_83E3F94:: @ 83E3F94 - spr_template 10198, 10198, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E3F90, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos - -gUnknown_83E3FAC:: @ 83E3FAC - obj_rot_scal_anim_frame 0, 0, 248, 2 - obj_rot_scal_anim_frame 0, 0, 8, 4 - obj_rot_scal_anim_frame 0, 0, 248, 2 - obj_rot_scal_anim_jump 0 - -gUnknown_83E3FCC:: @ 83E3FCC - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_end - -gUnknown_83E3FDC:: @ 83E3FDC - obj_rot_scal_anim_frame -8, 4, 0, 8 - obj_rot_scal_anim_loop 0 - obj_rot_scal_anim_frame 16, -8, 0, 8 - obj_rot_scal_anim_frame -16, 8, 0, 8 - obj_rot_scal_anim_loop 1 - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_frame 0, 0, 0, 15 - obj_rot_scal_anim_end - -gUnknown_83E401C:: @ 83E401C - .4byte gUnknown_83E3FAC - .4byte gUnknown_83E3FCC - .4byte gUnknown_83E3FDC - -gUnknown_83E4028:: @ 83E4028 - spr_template 10202, 10202, gOamData_AffineDouble_ObjBlend_32x32, gDummySpriteAnimTable, NULL, gUnknown_83E401C, sub_80A8F38 - -gUnknown_83E4040:: @ 83E4040 - obj_rot_scal_anim_frame 16, 16, 0, 0 - obj_rot_scal_anim_frame 16, 16, 0, 30 - obj_rot_scal_anim_end 1 - -gUnknown_83E4058:: @ 83E4058 - obj_rot_scal_anim_frame 16, 16, 0, 0 - obj_rot_scal_anim_frame 32, 32, 0, 15 - obj_rot_scal_anim_end 1 - -gUnknown_83E4070:: @ 83E4070 - obj_rot_scal_anim_frame 16, 16, 0, 0 - obj_rot_scal_anim_frame 11, 11, 0, 45 - obj_rot_scal_anim_end 1 - -gUnknown_83E4088:: @ 83E4088 - .4byte gUnknown_83E4040 - .4byte gUnknown_83E4058 - -gUnknown_83E4090:: @ 83E4090 - .4byte gUnknown_83E4070 - -gUnknown_83E4094:: @ 83E4094 - spr_template 10203, 10203, gOamData_AffineDouble_ObjNormal_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4088, AnimSpriteOnMonPos - -gUnknown_83E40AC:: @ 83E40AC - obj_rot_scal_anim_frame 512, 512, 0, 0 - obj_rot_scal_anim_frame -16, -16, 0, 30 - obj_rot_scal_anim_end 1 - -gUnknown_83E40C4:: @ 83E40C4 - .4byte gUnknown_83E40AC - -gUnknown_83E40C8:: @ 83E40C8 - spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E40C4, AnimSpriteOnMonPos - -gUnknown_83E40E0:: @ 83E40E0 - spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8BC4 - -gUnknown_83E40F8:: @ 83E40F8 - spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4090, sub_80A8CA4 - -gUnknown_83E4110:: @ 83E4110 - spr_template 10203, 10203, gOamData_AffineDouble_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gUnknown_83E4088, sub_80A8EE8 - -gUnknown_83E4128:: @ 83E4128 - obj_rot_scal_anim_frame 96, -13, 0, 8 - obj_rot_scal_anim_end - -gUnknown_83E4138:: @ 83E4138 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 4, 3 - obj_image_anim_frame 8, 3 - obj_image_anim_frame 4, 3 - obj_image_anim_frame 0, 3 - obj_image_anim_end - -gUnknown_83E4150:: @ 83E4150 - .4byte gUnknown_83E4138 - -gUnknown_83E4154:: @ 83E4154 - spr_template 10207, 10207, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E4150, NULL, gDummySpriteAffineAnimTable, sub_80A9648 - -gUnknown_83E416C:: @ 83E416C - .byte 0x1e, 0x1c, 0xec, 0x18, 0x10, 0x1a, 0xf6, 0x1c - -gUnknown_83E4174:: @ 83E4174 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 16, 6 - obj_image_anim_frame 32, 15 - obj_image_anim_frame 16, 6 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 16, 6, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 15, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 6, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 6 - obj_image_anim_frame 16, 6 - obj_image_anim_frame 32, 15 - obj_image_anim_frame 16, 6 - obj_image_anim_frame 0, 6 - obj_image_anim_end - -gUnknown_83E41AC:: @ 83E41AC - .4byte gUnknown_83E4174 - -gUnknown_83E41B0:: @ 83E41B0 - spr_template 10205, 10205, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E41AC, NULL, gDummySpriteAffineAnimTable, AnimSpriteOnMonPos - -gUnknown_83E41C8:: @ 83E41C8 - .2byte 10206, 9999, 9998 - - .align 2 -gUnknown_83E41D0:: @ 83E41D0 - spr_template 10206, 10206, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A97E8 - -gUnknown_83E41E8:: @ 83E41E8 - spr_template 10210, 10210, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9860 - -gUnknown_83E4200:: @ 83E4200 - obj_rot_scal_anim_frame 10, -13, 0, 10 - obj_rot_scal_anim_frame -10, 13, 0, 10 - obj_rot_scal_anim_end - -gUnknown_83E4218:: @ 83E4218 - spr_template 10216, 10216, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9B40 - -gUnknown_83E4230:: @ 83E4230 - spr_template 10216, 10216, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9BC4 - -gUnknown_83E4248:: @ 83E4248 - spr_template 10216, 10216, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9C4C - -gUnknown_83E4260:: @ 83E4260 - obj_rot_scal_anim_frame 128, 128, 0, 0 - obj_rot_scal_anim_frame 8, 8, 0, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_83E4278:: @ 83E4278 - .4byte gUnknown_83E4260 - -gUnknown_83E427C:: @ 83E427C - spr_template 10217, 10217, gOamData_AffineNormal_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA174 - -gUnknown_83E4294:: @ 83E4294 - spr_template 10217, 10217, gOamData_AffineDouble_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gUnknown_83E4278, sub_80AA2B0 - -gUnknown_83E42AC:: @ 83E42AC - obj_rot_scal_anim_frame 128, 128, 0, 0 - obj_rot_scal_anim_frame 8, 8, 0, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_83E42C4:: @ 83E42C4 - .4byte gUnknown_83E42AC - -gUnknown_83E42C8:: @ 83E42C8 - spr_template 10237, 10237, gOamData_AffineDouble_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gUnknown_83E42C4, sub_80AA37C - -gUnknown_83E42E0:: @ 83E42E0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - -gUnknown_83E42F8:: @ 83E42F8 - .4byte gUnknown_83E42E0 - -gUnknown_83E42FC:: @ 83E42FC - spr_template 10218, 10218, gOamData_AffineOff_ObjNormal_16x16, gUnknown_83E42F8, NULL, gDummySpriteAffineAnimTable, sub_80AA3F0 - -gUnknown_83E4314:: @ 83E4314 - obj_image_anim_frame 0, 24 - obj_image_anim_end - -gUnknown_83E431C:: @ 83E431C - .4byte gUnknown_83E4314 - -gUnknown_83E4320:: @ 83E4320 - spr_template 10220, 10220, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E431C, NULL, gDummySpriteAffineAnimTable, sub_80AA408 - -gUnknown_83E4338:: @ 83E4338 - spr_template 10219, 10219, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA508 - -gUnknown_83E4350:: @ 83E4350 - obj_image_anim_frame 0, 3 - obj_image_anim_jump 0 - -gUnknown_83E4358:: @ 83E4358 - obj_image_anim_frame 16, 3 - obj_image_anim_jump 0 - -gUnknown_83E4360:: @ 83E4360 - .4byte gUnknown_83E4350 - .4byte gUnknown_83E4358 - -gUnknown_83E4368:: @ 83E4368 - spr_template 10221, 10221, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E4360, NULL, gDummySpriteAffineAnimTable, sub_80AA58C - -gUnknown_83E4380:: @ 83E4380 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_frame 48, 4 - obj_image_anim_end - -gUnknown_83E4394:: @ 83E4394 - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 48, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E43A8:: @ 83E43A8 - .4byte gUnknown_83E4380 - .4byte gUnknown_83E4394 - -gUnknown_83E43B0:: @ 83E43B0 - spr_template 10222, 10222, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E43A8, NULL, gDummySpriteAffineAnimTable, sub_80AA6B8 - -gUnknown_83E43C8:: @ 83E43C8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 16, 8 - obj_image_anim_frame 32, 8 - obj_image_anim_frame 16, 8 - obj_image_anim_end - -gUnknown_83E43DC:: @ 83E43DC - obj_image_anim_frame 16, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - -gUnknown_83E43F0:: @ 83E43F0 - .4byte gUnknown_83E43C8 - .4byte gUnknown_83E43DC - -gUnknown_83E43F8:: @ 83E43F8 - spr_template 10215, 10215, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E43F0, NULL, gDummySpriteAffineAnimTable, sub_80AA708 - -gUnknown_83E4410:: @ 83E4410 - obj_rot_scal_anim_frame -12, 8, 0, 4 - obj_rot_scal_anim_frame 20, -20, 0, 4 - obj_rot_scal_anim_frame -8, 12, 0, 4 - obj_rot_scal_anim_end - -gUnknown_83E4430:: @ 83E4430 - spr_template 10225, 10225, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA838 - -gUnknown_83E4448:: @ 83E4448 - obj_rot_scal_anim_frame 0, 0, 0, 5 - obj_rot_scal_anim_end - -gUnknown_83E4458:: @ 83E4458 - obj_rot_scal_anim_frame 0, 0, 248, 16 - obj_rot_scal_anim_end 1 - -gUnknown_83E4468:: @ 83E4468 - obj_rot_scal_anim_frame 0, 0, 8, 16 - obj_rot_scal_anim_end 1 - -gUnknown_83E4478:: @ 83E4478 - .4byte gUnknown_83E4448 - .4byte gUnknown_83E4458 - .4byte gUnknown_83E4468 - -gUnknown_83E4484:: @ 83E4484 - spr_template 10206, 10206, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA998 - -gUnknown_83E449C:: @ 83E449C - spr_template 10206, 10206, gOamData_AffineNormal_ObjNormal_16x16, gUnknown_83E3844, NULL, gUnknown_83E4478, sub_80AA938 - -gUnknown_83E44B4:: @ 83E44B4 - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_end - -gUnknown_83E44C4:: @ 83E44C4 - obj_rot_scal_anim_frame 512, 256, 0, 0 - obj_rot_scal_anim_end - -gUnknown_83E44D4:: @ 83E44D4 - .4byte gUnknown_83E44B4 - .4byte gUnknown_83E44C4 - -gUnknown_83E44DC:: @ 83E44DC - spr_template 10244, 10244, gOamData_AffineDouble_ObjBlend_64x32, gDummySpriteAnimTable, NULL, gUnknown_83E44D4, sub_80AAAE4 - gUnknown_83E44F4:: @ 83E44F4 .incbin "graphics/battle_anims/unk_83E4874.4bpp" diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 66ff25ced..925f6c012 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -535,21 +535,21 @@ Move_SWIFT:: @ 81C7345 monbg 3 setalpha 12, 8 playsewithpan SE_W129, 192 - createsprite gUnknown_83E2C7C, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 playsewithpan SE_W129, 192 - createsprite gUnknown_83E2C7C, ANIM_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 playsewithpan SE_W129, 192 - createsprite gUnknown_83E2C7C, ANIM_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 18, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 2, 0, 18, 1 delay 5 playsewithpan SE_W129, 192 - createsprite gUnknown_83E2C7C, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 playsewithpan SE_W129, 192 - createsprite gUnknown_83E2C7C, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 + createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish clearmonbg 3 @@ -641,7 +641,7 @@ Move_SUPERSONIC:: @ 81C755D gUnknown_81C759B:: @ 81C759B playsewithpan SE_W048, 192 - createsprite gUnknown_83E3CA0, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 + createsprite gSupersonicWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -657,7 +657,7 @@ Move_SCREECH:: @ 81C75B5 gUnknown_81C75E8:: @ 81C75E8 playsewithpan SE_W103, 192 - createsprite gUnknown_83E3CB8, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 + createsprite gScreechWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -1057,7 +1057,7 @@ Move_SONIC_BOOM:: @ 81C7EDB gUnknown_81C7F12:: @ 81C7F12 playsewithpan SE_W013B, 192 - createsprite gUnknown_83E3C10, ANIM_TARGET, 2, 16, 0, 0, 0, 15 + createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return @@ -1221,7 +1221,7 @@ Move_CUT:: @ 81C832A monbg 1 setalpha 12, 8 playsewithpan SE_W015, 63 - createsprite gUnknown_83E3294, ANIM_ATTACKER, 2, 40, -32, 0 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 delay 5 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 10, 1 waitforvisualfinish @@ -1240,24 +1240,24 @@ Move_HIDDEN_POWER:: @ 81C835C delay 4 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 playsewithpan SE_W179, 192 - createsprite gUnknown_83E427C, ANIM_ATTACKER, 2, 26, 0 - createsprite gUnknown_83E427C, ANIM_ATTACKER, 2, 26, 42 - createsprite gUnknown_83E427C, ANIM_ATTACKER, 2, 26, 84 - createsprite gUnknown_83E427C, ANIM_ATTACKER, 2, 26, 126 - createsprite gUnknown_83E427C, ANIM_ATTACKER, 2, 26, 168 - createsprite gUnknown_83E427C, ANIM_ATTACKER, 2, 26, 210 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 126 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 168 + createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210 delay 52 setarg 7, 65535 playsewithpan SE_W115, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 - createsprite gUnknown_83E4294, ANIM_TARGET, 2, 0 - createsprite gUnknown_83E4294, ANIM_TARGET, 2, 32 - createsprite gUnknown_83E4294, ANIM_TARGET, 2, 64 - createsprite gUnknown_83E4294, ANIM_TARGET, 2, 96 - createsprite gUnknown_83E4294, ANIM_TARGET, 2, 128 - createsprite gUnknown_83E4294, ANIM_TARGET, 2, 160 - createsprite gUnknown_83E4294, ANIM_TARGET, 2, 192 - createsprite gUnknown_83E4294, ANIM_TARGET, 2, 224 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 0 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 32 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 64 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 96 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 128 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 160 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 192 + createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 224 end Move_REVERSAL:: @ 81C8445 @@ -1348,7 +1348,7 @@ Move_SWORDS_DANCE:: @ 81C8644 setalpha 12, 8 playsewithpan SE_W014, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 16, 6, 1, 4 - createsprite gUnknown_83E3BF8, ANIM_ATTACKER, 2, 0, 0 + createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 22 createvisualtask sub_80B9F6C, 2, 10005, 2, 2, 32754, 16, 0, 0 waitforvisualfinish @@ -1465,11 +1465,11 @@ gUnknown_81C892E:: @ 81C892E end gUnknown_81C8947:: @ 81C8947 - createsprite gUnknown_83E3294, ANIM_ATTACKER, 2, 40, -32, 0 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 goto gUnknown_81C890A gUnknown_81C8959:: @ 81C8959 - createsprite gUnknown_83E3294, ANIM_ATTACKER, 2, 40, -32, 1 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1 goto gUnknown_81C890A gUnknown_81C896B:: @ 81C896B @@ -1500,19 +1500,19 @@ Move_SELF_DESTRUCT:: @ 81C89B9 gUnknown_81C8A3F:: @ 81C8A3F playsewithpan SE_W120, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 0, 0, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 playsewithpan SE_W120, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 24, -24, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 playsewithpan SE_W120, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -16, 16, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 playsewithpan SE_W120, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -24, -12, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 playsewithpan SE_W120, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 16, 16, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1524,7 +1524,7 @@ Move_SLAM:: @ 81C8AA9 playsewithpan SE_W004, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 - createsprite gUnknown_83E3148, ANIM_ATTACKER, 2, 0, 0 + createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 3 playsewithpan SE_W025B, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 @@ -1546,7 +1546,7 @@ Move_VINE_WHIP:: @ 81C8B31 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 6 playsewithpan SE_W010, 63 - createsprite gUnknown_83E3160, ANIM_TARGET, 2, 0, 0 + createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0 delay 6 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 6, 1 end @@ -1554,17 +1554,17 @@ Move_VINE_WHIP:: @ 81C8B31 Move_DRILL_PECK:: @ 81C8B68 loadspritegfx 10135 loadspritegfx 10162 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 0 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish delay 2 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 1 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 2 loopsewithpan SE_W030, 63, 4, 8 createvisualtask sub_80B2868, 5, createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1 waitforvisualfinish - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 2 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6 waitforvisualfinish @@ -1669,19 +1669,19 @@ Move_EXPLOSION:: @ 81C8E15 gUnknown_81C8EB2:: @ 81C8EB2 playsewithpan SE_W153, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 0, 0, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 playsewithpan SE_W153, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 24, -24, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 playsewithpan SE_W153, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -16, 16, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 playsewithpan SE_W153, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -24, -12, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 playsewithpan SE_W153, 192 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 16, 16, 0, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1702,7 +1702,7 @@ Move_PROTECT:: @ 81C8F55 monbg 2 monbgprio_28 0 waitplaysewithpan SE_W115, 192, 16 - createsprite gUnknown_83E3354, ANIM_ATTACKER, 2, 24, 0, 90 + createsprite gProtectWallSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90 waitforvisualfinish clearmonbg 2 end @@ -1746,10 +1746,10 @@ gUnknown_81C9004:: @ 81C9004 waitforvisualfinish delay 20 playsewithpan SE_W207B, 192 - createsprite gUnknown_83E3F04, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish playsewithpan SE_W207B, 192 - createsprite gUnknown_83E3F04, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 createvisualtask AnimTask_SwayMon, 5, 0, 16, 6144, 8, 0 @@ -1783,7 +1783,7 @@ gUnknown_81C910A:: @ 81C910A waitforvisualfinish delay 20 playsewithpan SE_W207B, 192 - createsprite gUnknown_83E3F04, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask sub_80E0488, 5, @@ -1805,7 +1805,7 @@ gUnknown_81C910A:: @ 81C910A gUnknown_81C91D7:: @ 81C91D7 playsewithpan SE_W207B, 192 - createsprite gUnknown_83E3F04, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 @@ -1837,11 +1837,11 @@ Move_SAFEGUARD:: @ 81C9297 monbg 2 setalpha 8, 8 playsewithpan SE_W208, 192 - createsprite gUnknown_83E44DC, ANIM_ATTACKER, 2, + createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, delay 4 - createsprite gUnknown_83E44DC, ANIM_ATTACKER, 2, + createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, delay 4 - createsprite gUnknown_83E44DC, ANIM_ATTACKER, 2, + createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish playsewithpan SE_REAPOKE, 192 createvisualtask sub_80B9BDC, 2, 10, 0, 2, 0, 10, 32767 @@ -1880,8 +1880,8 @@ Move_VICE_GRIP:: @ 81C9381 monbg 3 setalpha 12, 8 playsewithpan SE_W011, 63 - createsprite gUnknown_83E3E08, ANIM_ATTACKER, 2, 0 - createsprite gUnknown_83E3E08, ANIM_ATTACKER, 2, 1 + createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 0 + createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 9 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 5, 1 @@ -1898,8 +1898,8 @@ Move_GUILLOTINE:: @ 81C93C9 fadetobgfromset 12, 13, 14 waitbgfadein playsewithpan SE_W011, 63 - createsprite gUnknown_83E3E48, ANIM_ATTACKER, 2, 0 - createsprite gUnknown_83E3E48, ANIM_ATTACKER, 2, 1 + createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0 + createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 1 createvisualtask sub_80BA7F8, 10, 4, 2, 0, 16, 0 delay 9 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 23, 1 @@ -1922,11 +1922,11 @@ Move_PAY_DAY:: @ 81C9455 monbgprio_28 1 setalpha 12, 8 playsewithpan SE_W013B, 192 - createsprite gUnknown_83E3D50, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 + createsprite gCoinThrowSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish playsewithpan SE_W006, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 - createsprite gUnknown_83E3D68, ANIM_ATTACKER, 2, + createsprite gFallingCoinSpriteTemplate, ANIM_ATTACKER, 2, createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 6, 1 waitforvisualfinish clearmonbg 1 @@ -2030,26 +2030,26 @@ Move_ATTRACT:: @ 81C985A loopsewithpan SE_W204, 192, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 - createsprite gUnknown_83E4218, ANIM_TARGET, 3, 20, -8 + createsprite gRedHeartProjectileSpriteTemplate, ANIM_TARGET, 3, 20, -8 waitforvisualfinish playsewithpan SE_W213, 63 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, 160, -32 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, -256, -40 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, 128, -16 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, 416, -38 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, -128, -22 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, -384, -31 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 waitforvisualfinish waitplaysewithpan SE_W213B, 0, 15 createvisualtask sub_80A9CE8, 5, - createsprite gUnknown_83E4248, ANIM_ATTACKER, 40, 16, 256, 0 - createsprite gUnknown_83E4248, ANIM_ATTACKER, 40, 224, 240, 15 - createsprite gUnknown_83E4248, ANIM_ATTACKER, 40, 126, 272, 30 - createsprite gUnknown_83E4248, ANIM_ATTACKER, 40, 80, 224, 45 - createsprite gUnknown_83E4248, ANIM_ATTACKER, 40, 170, 272, 60 - createsprite gUnknown_83E4248, ANIM_ATTACKER, 40, 40, 256, 75 - createsprite gUnknown_83E4248, ANIM_ATTACKER, 40, 112, 256, 90 - createsprite gUnknown_83E4248, ANIM_ATTACKER, 40, 200, 272, 90 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 126, 272, 30 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 80, 224, 45 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 170, 272, 60 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 40, 256, 75 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 112, 256, 90 + createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 200, 272, 90 delay 75 createvisualtask sub_80B9BDC, 2, 4, 4, 4, 0, 10, 28479 end @@ -2108,11 +2108,11 @@ Move_CONFUSE_RAY:: @ 81C9A31 Move_LOCK_ON:: @ 81C9A84 loadspritegfx 10014 - createsprite gUnknown_83E3518, ANIM_ATTACKER, 40, - createsprite gUnknown_83E3530, ANIM_ATTACKER, 40, 1 - createsprite gUnknown_83E3530, ANIM_ATTACKER, 40, 2 - createsprite gUnknown_83E3530, ANIM_ATTACKER, 40, 3 - createsprite gUnknown_83E3530, ANIM_ATTACKER, 40, 4 + createsprite gLockOnTargetSpriteTemplate, ANIM_ATTACKER, 40, + createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 1 + createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 2 + createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 3 + createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 4 delay 120 setarg 7, 65535 waitforvisualfinish @@ -2332,40 +2332,40 @@ Move_CONVERSION:: @ 81C9FA9 setalpha 16, 0 delay 0 playsewithpan SE_W129, 192 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, -24, -24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -24 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, -8, -24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -24 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, 8, -24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 8, -24 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, 24, -24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -24 delay 3 playsewithpan SE_W129, 192 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, -24, -8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -8 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, -8, -8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -8 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, 8, -8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 8, -8 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, 24, -8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -8 delay 3 playsewithpan SE_W129, 192 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, -24, 8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 8 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, -8, 8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 8 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, 8, 8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 8, 8 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, 24, 8 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 8 delay 3 playsewithpan SE_W129, 192 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, -24, 24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 24 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, -8, 24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 24 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, 8, 24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 8, 24 delay 3 - createsprite gUnknown_83E36EC, ANIM_ATTACKER, 2, 24, 24 + createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 24 delay 20 playsewithpan SE_W112, 192 createvisualtask sub_80B9F6C, 2, 10018, 1, 1, 14335, 12, 0, 0 @@ -2384,22 +2384,22 @@ Move_CONVERSION_2:: @ 81CA0BE setalpha 0, 16 delay 0 playsewithpan SE_W112, 63 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, -24, -24, 60 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, -8, -24, 65 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, 8, -24, 70 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, 24, -24, 75 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, -24, -8, 80 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, -8, -8, 85 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, 8, -8, 90 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, 24, -8, 95 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, -24, 8, 100 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, -8, 8, 105 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, 8, 8, 110 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, 24, 8, 115 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, -24, 24, 120 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, -8, 24, 125 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, 8, 24, 130 - createsprite gUnknown_83E371C, ANIM_ATTACKER, 2, 24, 24, 135 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 60 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, -24, 65 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, -24, 70 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, -24, 75 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, -8, 80 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, -8, 85 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, -8, 90 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 95 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, 8, 100 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 8, 105 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 8, 110 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 115 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, 24, 120 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 24, 125 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 24, 130 + createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135 createvisualtask sub_80A5DE0, 5, delay 60 playsewithpan SE_W129, 63 @@ -2446,15 +2446,15 @@ Move_ROLLING_KICK:: @ 81CA1DA Move_HEADBUTT:: @ 81CA25D loadspritegfx 10135 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 0 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish delay 2 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 1 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 4, 1 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 2 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gUnknown_83E7C98, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W233B, 63 waitforvisualfinish @@ -2463,16 +2463,16 @@ Move_HEADBUTT:: @ 81CA25D Move_HORN_ATTACK:: @ 81CA2BA loadspritegfx 10135 loadspritegfx 10020 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 0 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish delay 2 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 1 - createsprite gUnknown_83E37BC, ANIM_TARGET, 4, 0, 0, 10 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 + createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 4, 1 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 2 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gUnknown_83E7C98, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, 63 waitforvisualfinish @@ -2490,14 +2490,14 @@ gUnknown_81CA345:: @ 81CA345 end gUnknown_81CA358:: @ 81CA358 - createsprite gUnknown_83E37BC, ANIM_TARGET, 4, 8, 8, 10 + createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 8, 8, 10 waitforvisualfinish createsprite gUnknown_83E7C98, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, 63 goto gUnknown_81CA345 gUnknown_81CA37E:: @ 81CA37E - createsprite gUnknown_83E37BC, ANIM_TARGET, 4, -8, -8, 10 + createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, -8, -8, 10 waitforvisualfinish createsprite gUnknown_83E7C98, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_W030, 63 @@ -2514,12 +2514,12 @@ Move_HORN_DRILL:: @ 81CA3A4 gUnknown_81CA3C1:: @ 81CA3C1 waitbgfadein setalpha 12, 8 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 0 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish delay 2 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 1 - createsprite gUnknown_83E37BC, ANIM_TARGET, 4, 0, 0, 12 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 + createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 0, 0, 12 waitforvisualfinish playse SE_BAN createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 40, 1 @@ -2557,7 +2557,7 @@ gUnknown_81CA3C1:: @ 81CA3C1 createsprite gUnknown_83E7C98, ANIM_TARGET, 3, 32, 0, 1, 2 playsewithpan SE_W030, 63 delay 4 - createsprite gUnknown_83E3550, ANIM_ATTACKER, 2, 2 + createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 waitforvisualfinish restorebg waitbgfadeout @@ -2595,29 +2595,29 @@ Move_SING:: @ 81CA5A0 createvisualtask sub_80A65E8, 2, waitforvisualfinish panse_1B SE_W047, 192, 63, 2, 0 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 7, 0, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 0, 12 delay 5 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 6, 1, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 12 delay 5 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 1, 2, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 1, 2, 12 delay 5 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 2, 3, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 3, 12 delay 5 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 3, 0, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 3, 0, 12 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 2, 1, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 12 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 5, 2, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 2, 12 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 6, 3, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 3, 12 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 2, 0, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 0, 12 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 2, 1, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 12 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 1, 2, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 1, 2, 12 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 5, 3, 12 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 3, 12 delay 4 waitforvisualfinish clearmonbg 3 @@ -2797,10 +2797,10 @@ Move_RAGE:: @ 81CAA1C monbg 1 setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, 0, 31, 10, 0, 2 - createsprite gUnknown_83E3F04, ANIM_ATTACKER, 2, 0, -20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, -28 playsewithpan SE_W207B, 192 delay 20 - createsprite gUnknown_83E3F04, ANIM_ATTACKER, 2, 0, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 playsewithpan SE_W207B, 192 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -2859,10 +2859,10 @@ Move_MINIMIZE:: @ 81CAAF2 Move_METRONOME:: @ 81CAB05 loadspritegfx 10064 loadspritegfx 10209 - createsprite gUnknown_83E398C, ANIM_ATTACKER, 11, 0, 100 + createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 playsewithpan SE_W118, 192 delay 6 - createsprite gUnknown_83E3A34, ANIM_ATTACKER, 12, 0 + createsprite gMetronomeFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 24 loopsewithpan SE_W039, 192, 22, 3 waitforvisualfinish @@ -2923,8 +2923,8 @@ Move_KINESIS:: @ 81CAC19 playsewithpan SE_W060, 192 call gUnknown_81D59BB createsprite gUnknown_83E6F8C, ANIM_ATTACKER, 20, - createsprite gUnknown_83E3BBC, ANIM_ATTACKER, 19, 32, -8, 0 - createsprite gUnknown_83E3BBC, ANIM_ATTACKER, 19, 32, 16, 1 + createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, -8, 0 + createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, 16, 1 loopsewithpan SE_W109, 192, 21, 2 delay 60 playsewithpan SE_W146, 192 @@ -2944,8 +2944,8 @@ Move_GLARE:: @ 81CAC6A waitforvisualfinish createvisualtask sub_80BA7F8, 5, 1, 0, 0, 16, 0 waitforvisualfinish - createsprite gUnknown_83E42FC, ANIM_ATTACKER, 0, -16, -8 - createsprite gUnknown_83E42FC, ANIM_ATTACKER, 0, 16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 createvisualtask sub_80A9F10, 5, playsewithpan SE_W043, 192 delay 2 @@ -3062,7 +3062,7 @@ Move_ACID_ARMOR:: @ 81CAED5 Move_SHARPEN:: @ 81CAEEE loadspritegfx 10185 - createsprite gUnknown_83E365C, ANIM_ATTACKER, 2, + createsprite gSharpenSphereSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish end @@ -3077,7 +3077,7 @@ Move_SUPER_FANG:: @ 81CAEFA delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - createsprite gUnknown_83E37EC, ANIM_TARGET, 2, + createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2, playsewithpan SE_W044, 63 delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 2143, 14, 32767, 14 @@ -3088,10 +3088,10 @@ Move_SUPER_FANG:: @ 81CAEFA Move_SLASH:: @ 81CAF7B loadspritegfx 10183 - createsprite gUnknown_83E35A4, ANIM_TARGET, 2, 1, -8, 0 + createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 playsewithpan SE_W013, 63 delay 4 - createsprite gUnknown_83E35A4, ANIM_TARGET, 2, 1, 8, 0 + createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1 playsewithpan SE_W013, 63 waitforvisualfinish @@ -3103,8 +3103,8 @@ Move_STRUGGLE:: @ 81CAFB5 monbg 1 setalpha 12, 8 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 3, 0, 12, 4 - createsprite gUnknown_83E43F8, ANIM_ATTACKER, 2, 0, 0, 2 - createsprite gUnknown_83E43F8, ANIM_ATTACKER, 2, 0, 1, 2 + createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 + createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2 loopsewithpan SE_W029, 192, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 @@ -3119,7 +3119,7 @@ Move_SKETCH:: @ 81CB01B loadspritegfx 10002 monbg 1 createvisualtask sub_80A8874, 2, - createsprite gUnknown_83E3F4C, ANIM_TARGET, 2, + createsprite gPencilSpriteTemplate, ANIM_TARGET, 2, waitforvisualfinish clearmonbg 1 createvisualtask sub_80A8338, 2, 0, 2 @@ -3265,27 +3265,27 @@ Move_ENDURE:: @ 81CB227 end gUnknown_81CB267:: @ 81CB267 - createsprite gUnknown_83E3604, ANIM_ATTACKER, 2, 0, -24, 26, 2 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 26, 2 delay 4 - createsprite gUnknown_83E3604, ANIM_ATTACKER, 2, 0, 14, 28, 1 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, 14, 28, 1 delay 4 - createsprite gUnknown_83E3604, ANIM_ATTACKER, 2, 0, -5, 10, 2 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2 delay 4 - createsprite gUnknown_83E3604, ANIM_ATTACKER, 2, 0, 28, 26, 3 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 26, 3 delay 4 - createsprite gUnknown_83E3604, ANIM_ATTACKER, 2, 0, -12, 0, 1 + createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -12, 0, 1 return Move_CHARM:: @ 81CB2BB loadspritegfx 10210 createvisualtask sub_80E0558, 5, 0, 2, 0 - createsprite gUnknown_83E41E8, ANIM_ATTACKER, 3, 0, 20 + createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, 192 delay 15 - createsprite gUnknown_83E41E8, ANIM_ATTACKER, 3, -20, 20 + createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 playsewithpan SE_W204, 192 delay 15 - createsprite gUnknown_83E41E8, ANIM_ATTACKER, 3, 20, 20 + createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 playsewithpan SE_W204, 192 waitforvisualfinish end @@ -3310,23 +3310,23 @@ Move_ROLLOUT:: @ 81CB2FE Move_FALSE_SWIPE:: @ 81CB33F loadspritegfx 10286 loadspritegfx 10135 - createsprite gUnknown_83E35BC, ANIM_TARGET, 2, + createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2, playsewithpan SE_W233, 63 delay 16 - createsprite gUnknown_83E35D4, ANIM_TARGET, 2, 0 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 0 playsewithpan SE_W104, 63 delay 2 - createsprite gUnknown_83E35D4, ANIM_TARGET, 2, 16 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 16 delay 2 - createsprite gUnknown_83E35D4, ANIM_TARGET, 2, 32 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 32 playsewithpan SE_W104, 63 delay 2 - createsprite gUnknown_83E35D4, ANIM_TARGET, 2, 48 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 48 delay 2 - createsprite gUnknown_83E35D4, ANIM_TARGET, 2, 64 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 64 playsewithpan SE_W104, 63 delay 2 - createsprite gUnknown_83E35D4, ANIM_TARGET, 2, 80 + createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 @@ -3340,14 +3340,14 @@ Move_SWAGGER:: @ 81CB3C6 createvisualtask sub_80A84B4, 2, playsewithpan SE_W207, 192 waitforvisualfinish - createsprite gUnknown_83E3ED0, ANIM_ATTACKER, 2, + createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, loopsewithpan SE_W207, 192, 4, 2 waitforvisualfinish delay 24 - createsprite gUnknown_83E3F04, ANIM_TARGET, 2, 1, -20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, 63 delay 12 - createsprite gUnknown_83E3F04, ANIM_TARGET, 2, 1, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, 63 waitforvisualfinish end @@ -3357,7 +3357,7 @@ Move_MILK_DRINK:: @ 81CB40E loadspritegfx 10203 loadspritegfx 10031 monbg 1 - createsprite gUnknown_83E33B4, ANIM_ATTACKER, 2, + createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2, delay 40 playsewithpan SE_W152, 192 delay 12 @@ -3365,7 +3365,7 @@ Move_MILK_DRINK:: @ 81CB40E delay 20 playsewithpan SE_W152, 192 waitforvisualfinish - createsprite gUnknown_83E4094, ANIM_ATTACKER, 3, 0, 0, 1, 0 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 playsewithpan SE_W208, 192 waitforvisualfinish clearmonbg 1 @@ -3424,19 +3424,19 @@ Move_MOONLIGHT:: @ 81CB54E setalpha 0, 16 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, 0 waitforvisualfinish - createsprite gUnknown_83E3734, ANIM_ATTACKER, 2, 120, 56 + createsprite gMoonSpriteTemplate, ANIM_ATTACKER, 2, 120, 56 createvisualtask sub_8076048, 3, 0, 16, 16, 0, 1 playsewithpan SE_W236, 0 delay 30 - createsprite gUnknown_83E3764, ANIM_ATTACKER, 40, -12, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, -12, 0 delay 30 - createsprite gUnknown_83E3764, ANIM_ATTACKER, 40, -24, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, -24, 0 delay 30 - createsprite gUnknown_83E3764, ANIM_ATTACKER, 40, 21, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 21, 0 delay 30 - createsprite gUnknown_83E3764, ANIM_ATTACKER, 40, 0, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 0, 0 delay 30 - createsprite gUnknown_83E3764, ANIM_ATTACKER, 40, 10, 0 + createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 10, 0 delay 20 createvisualtask sub_80A5FC0, 2, waitforvisualfinish @@ -3499,22 +3499,22 @@ Move_UPROAR:: @ 81CB69C loadspritegfx 10203 monbg 3 createvisualtask sub_80AA7C8, 2, 0 - createsprite gUnknown_83E4110, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, 192 - createsprite gUnknown_83E4430, ANIM_ATTACKER, 2, 0, 29, -12, 0 - createsprite gUnknown_83E4430, ANIM_ATTACKER, 2, 0, -12, -29, 1 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1 delay 16 createvisualtask sub_80AA7C8, 2, 0 - createsprite gUnknown_83E4110, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, 192 - createsprite gUnknown_83E4430, ANIM_ATTACKER, 2, 0, 12, -29, 1 - createsprite gUnknown_83E4430, ANIM_ATTACKER, 2, 0, -29, -12, 0 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0 delay 16 createvisualtask sub_80AA7C8, 2, 0 - createsprite gUnknown_83E4110, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 + createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, 192 - createsprite gUnknown_83E4430, ANIM_ATTACKER, 2, 0, 24, -24, 1 - createsprite gUnknown_83E4430, ANIM_ATTACKER, 2, 0, -24, -24, 0 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1 + createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish clearmonbg 3 end @@ -3560,10 +3560,10 @@ Move_TORMENT:: @ 81CB84E createvisualtask sub_80DF1DC, 2, waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, 1, 31, 10, 1, 1 - createsprite gUnknown_83E3F04, ANIM_TARGET, 2, 1, -20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, 63 delay 20 - createsprite gUnknown_83E3F04, ANIM_TARGET, 2, 1, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, 63 end @@ -3615,7 +3615,7 @@ Move_SMELLING_SALT:: @ 81CB8F6 Move_FOLLOW_ME:: @ 81CB951 loadspritegfx 10064 - createsprite gUnknown_83E3A4C, ANIM_ATTACKER, 2, 0 + createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W039, 192 delay 18 playsewithpan SE_W213, 192 @@ -3662,19 +3662,19 @@ Move_TAUNT:: @ 81CBA0B loadspritegfx 10214 loadspritegfx 10209 loadspritegfx 10087 - createsprite gUnknown_83E398C, ANIM_ATTACKER, 11, 0, 45 + createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 45 playsewithpan SE_W118, 192 delay 6 - createsprite gUnknown_83E3AC4, ANIM_ATTACKER, 12, 0 + createsprite gTauntFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 4 loopsewithpan SE_W039, 192, 16, 2 waitforvisualfinish delay 8 - createsprite gUnknown_83E3F04, ANIM_TARGET, 2, 1, -20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 playsewithpan SE_W207B, 63 waitforvisualfinish delay 12 - createsprite gUnknown_83E3F04, ANIM_TARGET, 2, 1, 20, -28 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 playsewithpan SE_W207B, 63 end @@ -4060,19 +4060,19 @@ Move_TEETER_DANCE:: @ 81CC371 loadspritegfx 10072 loadspritegfx 10073 createvisualtask sub_80E4160, 5, - createsprite gUnknown_83E38C8, ANIM_ATTACKER, 2, 0, 16, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 playsewithpan SE_W298, 192 delay 24 - createsprite gUnknown_83E38C8, ANIM_ATTACKER, 2, 0, 0, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -2 playsewithpan SE_W298, 192 delay 24 - createsprite gUnknown_83E38C8, ANIM_ATTACKER, 2, 0, -16, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -2 playsewithpan SE_W298, 192 delay 24 - createsprite gUnknown_83E38C8, ANIM_ATTACKER, 2, 1, -8, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, -8, -2 playsewithpan SE_W298, 192 delay 24 - createsprite gUnknown_83E38C8, ANIM_ATTACKER, 2, 2, 8, -2 + createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 2, 8, -2 playsewithpan SE_W298, 192 end @@ -4128,42 +4128,42 @@ Move_NEEDLE_ARM:: @ 81CC513 loadspritegfx 10135 loadspritegfx 10143 loopsewithpan SE_W030, 63, 2, 16 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, 0, -32, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, 22, -22, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 22, -22, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, 30, 0, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 30, 0, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, 20, 20, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 20, 20, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, 0, 28, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, 28, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, -19, 19, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, -19, 19, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, -27, 0, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, -27, 0, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, -18, -18, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, -18, -18, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, 0, -25, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -25, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, 17, -17, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 17, -17, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, 23, 0, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 23, 0, 16 delay 2 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 0, 16, 16, 16 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, 16, 16 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 playsewithpan SE_W233B, 63 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, 0, -24, 10 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, 17, -17, 10 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, 24, 0, 10 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, 17, 17, 10 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, 0, 24, 10 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, -17, 17, 10 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, -24, 0, 10 - createsprite gUnknown_83E3100, ANIM_TARGET, 2, 1, 1, -17, -17, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0, -24, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 17, -17, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 24, 0, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 17, 17, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0, 24, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, -17, 17, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, -24, 0, 10 + createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, -17, -17, 10 end Move_SLACK_OFF:: @ 81CC6C3 @@ -4206,17 +4206,17 @@ Move_AROMATHERAPY:: @ 81CC74B delay 1 monbg 0 delay 1 - createsprite gUnknown_83E3024, ANIM_ATTACKER, 0, 24, 16, 0, 2, 2, 0, 0 - createsprite gUnknown_83E3024, ANIM_ATTACKER, 66, 64, 24, 0, 3, 1, 1, 0 - createsprite gUnknown_83E303C, ANIM_ATTACKER, 0, 16, 24, 0, 2, 1, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 24, 16, 0, 2, 2, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 66, 64, 24, 0, 3, 1, 1, 0 + createsprite gAromatherapyBigFlowerSpriteTemplate, ANIM_ATTACKER, 0, 16, 24, 0, 2, 1, 0, 0 delay 20 - createsprite gUnknown_83E3024, ANIM_ATTACKER, 66, 48, 12, 0, 4, 3, 1, 0 - createsprite gUnknown_83E3024, ANIM_ATTACKER, 0, 100, 16, 0, 3, 2, 0, 0 - createsprite gUnknown_83E3024, ANIM_ATTACKER, 0, 74, 24, 180, 3, 2, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 66, 48, 12, 0, 4, 3, 1, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 100, 16, 0, 3, 2, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 74, 24, 180, 3, 2, 0, 0 delay 10 - createsprite gUnknown_83E3024, ANIM_ATTACKER, 66, 80, 30, 0, 4, 1, 1, 0 - createsprite gUnknown_83E3024, ANIM_ATTACKER, 0, 128, 12, 0, 3, 3, 0, 0 - createsprite gUnknown_83E303C, ANIM_ATTACKER, 0, 90, 16, 0, 2, 1, 0, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 66, 80, 30, 0, 4, 1, 1, 0 + createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 128, 12, 0, 3, 3, 0, 0 + createsprite gAromatherapyBigFlowerSpriteTemplate, ANIM_ATTACKER, 0, 90, 16, 0, 2, 1, 0, 0 waitforvisualfinish clearmonbg 0 delay 1 @@ -4226,13 +4226,13 @@ Move_AROMATHERAPY:: @ 81CC74B createvisualtask sub_80E2084, 2, 1 waitforvisualfinish playsewithpan SE_W234, 192 - createsprite gUnknown_83E340C, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 + createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite gUnknown_83E340C, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish playsewithpan SE_REAPOKE, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 43, 3, 10, 0, 13293 - createsprite gUnknown_83E40E0, ANIM_ATTACKER, 16, 0, 0, 0, 1 + createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish end @@ -4270,7 +4270,7 @@ Move_AIR_CUTTER:: @ 81CC93D createvisualtask sub_80A76F0, 2, 32, -24, 1536, 2, 128 waitforvisualfinish playsewithpan SE_W015, 63 - createsprite gUnknown_83E32AC, ANIM_ATTACKER, 2, 40, -32, 0, 2 + createsprite gAirCutterSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 2, 0, 8, 1 @@ -4303,29 +4303,29 @@ Move_GRASS_WHISTLE:: @ 81CC9E9 createvisualtask sub_80A65E8, 2, waitforvisualfinish panse_1B SE_W320, 192, 63, 2, 0 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 7, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 1, 0 delay 5 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 6, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 0 delay 5 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 1, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0 delay 5 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 2, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 0 delay 5 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 3, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 3, 1, 0 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 2, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 5, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 1, 0 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 6, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 0 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 2, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 2, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 2, 1, 0 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 1, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0 delay 4 - createsprite gUnknown_83E3880, ANIM_TARGET, 2, 5, 1, 0 + createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 1, 0 delay 4 waitforvisualfinish createvisualtask sub_80A66A0, 2, @@ -4337,8 +4337,8 @@ Move_TICKLE:: @ 81CCADC loadspritegfx 10218 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 0, 16, 0 waitforvisualfinish - createsprite gUnknown_83E42FC, ANIM_ATTACKER, 0, -16, -8 - createsprite gUnknown_83E42FC, ANIM_ATTACKER, 0, 16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 playsewithpan SE_W197, 192 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, 0 @@ -4416,7 +4416,7 @@ Move_AERIAL_ACE:: @ 81CCC39 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 1, 5 createvisualtask sub_80BAB98, 2, 0, 4, 7, 3 - createsprite gUnknown_83E3294, ANIM_ATTACKER, 2, 40, -32, 0 + createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 playsewithpan SE_W013B, 192 delay 5 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 10, 1 @@ -4455,7 +4455,7 @@ Move_BULK_UP:: @ 81CCCFE createvisualtask sub_80A84B4, 2, playsewithpan SE_W207, 192 waitforvisualfinish - createsprite gUnknown_83E3ED0, ANIM_ATTACKER, 2, + createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, loopsewithpan SE_W207, 192, 4, 2 waitforvisualfinish end @@ -4464,13 +4464,13 @@ Move_COVET:: @ 81CCD1C loadspritegfx 10210 loadspritegfx 10224 createvisualtask sub_80E0558, 5, 0, 2, 0 - createsprite gUnknown_83E41E8, ANIM_ATTACKER, 3, 0, 20 + createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, 192 delay 15 - createsprite gUnknown_83E41E8, ANIM_ATTACKER, 3, -20, 20 + createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 playsewithpan SE_W204, 192 delay 15 - createsprite gUnknown_83E41E8, ANIM_ATTACKER, 3, 20, 20 + createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 playsewithpan SE_W204, 192 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -4544,13 +4544,13 @@ Move_CALM_MIND:: @ 81CCE97 waitforvisualfinish createvisualtask sub_80BB9B0, 5, 1 waitforvisualfinish - createsprite gUnknown_83E40C8, ANIM_ATTACKER, 40, 0, 0, 0, 0 + createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, 192 delay 14 - createsprite gUnknown_83E40C8, ANIM_ATTACKER, 40, 0, 0, 0, 0 + createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, 192 delay 14 - createsprite gUnknown_83E40C8, ANIM_ATTACKER, 40, 0, 0, 0, 0 + createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, 192 waitforvisualfinish createvisualtask sub_80BB9B0, 5, 0 @@ -4652,27 +4652,27 @@ Move_BELLY_DRUM:: @ 81CD0C0 createvisualtask sub_80A65E8, 2, waitforvisualfinish call gUnknown_81CD18D - createsprite gUnknown_83E3914, ANIM_ATTACKER, 2, 0, 0, 0, 0 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 playsewithpan SE_W187, 192 delay 15 call gUnknown_81CD172 - createsprite gUnknown_83E3914, ANIM_ATTACKER, 2, 1, 1, 1, 0 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 1, 0 playsewithpan SE_W187, 192 delay 15 call gUnknown_81CD18D - createsprite gUnknown_83E3914, ANIM_ATTACKER, 2, 0, 3, 3, 128 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 3, 3, 128 playsewithpan SE_W187, 192 delay 7 call gUnknown_81CD172 - createsprite gUnknown_83E3914, ANIM_ATTACKER, 2, 1, 2, 0, 128 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 128 playsewithpan SE_W187, 192 delay 7 call gUnknown_81CD18D - createsprite gUnknown_83E3914, ANIM_ATTACKER, 2, 0, 1, 1, 0 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 1, 0 playsewithpan SE_W187, 192 delay 7 call gUnknown_81CD172 - createsprite gUnknown_83E3914, ANIM_ATTACKER, 2, 1, 0, 3, 0 + createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0 playsewithpan SE_W187, 192 waitforvisualfinish createvisualtask sub_80A66A0, 2, @@ -4680,12 +4680,12 @@ Move_BELLY_DRUM:: @ 81CD0C0 end gUnknown_81CD172:: @ 81CD172 - createsprite gUnknown_83E38E0, ANIM_ATTACKER, 3, 0 + createsprite gBellyDrumHandSpriteTemplate, ANIM_ATTACKER, 3, 0 createvisualtask AnimTask_ShakeMon, 2, 0, 0, 8, 2, 1 return gUnknown_81CD18D:: @ 81CD18D - createsprite gUnknown_83E38E0, ANIM_ATTACKER, 3, 1 + createsprite gBellyDrumHandSpriteTemplate, ANIM_ATTACKER, 3, 1 createvisualtask AnimTask_ShakeMon, 2, 0, 0, 8, 2, 1 return @@ -4769,11 +4769,11 @@ Move_ICE_PUNCH:: @ 81CD2E0 Move_REST:: @ 81CD3CB playsewithpan SE_W173, 192 loadspritegfx 10228 - createsprite gUnknown_83E3500, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite gUnknown_83E3500, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 - createsprite gUnknown_83E3500, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 waitforvisualfinish end @@ -5099,9 +5099,9 @@ gUnknown_81CDBB1:: @ 81CDBB1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 7, 1 createsprite gUnknown_83E7B88, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0 - createsprite gUnknown_83E3F64, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0 - createsprite gUnknown_83E3F64, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0 - createsprite gUnknown_83E3F64, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 + createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -42, -38, 24, 0, 0 + createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, -42, 24, 0, 0 + createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 return Move_LIGHT_SCREEN:: @ 81CDC28 @@ -6694,19 +6694,19 @@ Move_DYNAMIC_PUNCH:: @ 81CFF92 waitsound playsewithpan SE_W120, 63 createvisualtask AnimTask_ShakeMon2, 5, 1, 5, 0, 28, 1 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 24, -24, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -24, -12, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg 3 blendoff @@ -6863,11 +6863,11 @@ Move_COTTON_SPORE:: @ 81D0395 end gUnknown_81D03B5:: @ 81D03B5 - createsprite gUnknown_83E2B64, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0 + createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0 delay 12 - createsprite gUnknown_83E2B64, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0 + createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0 delay 12 - createsprite gUnknown_83E2B64, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0 + createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 80, 0 delay 12 return @@ -6887,11 +6887,11 @@ Move_SPORE:: @ 81D03EF end gUnknown_81D041A:: @ 81D041A - createsprite gUnknown_83E2B64, ANIM_TARGET, 2, 0, -20, 85, 80, 1 + createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -20, 85, 80, 1 delay 12 - createsprite gUnknown_83E2B64, ANIM_TARGET, 2, 0, -10, 170, 80, 1 + createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -10, 170, 80, 1 delay 12 - createsprite gUnknown_83E2B64, ANIM_TARGET, 2, 0, -15, 0, 80, 1 + createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 80, 1 delay 12 return @@ -6902,23 +6902,23 @@ Move_PETAL_DANCE:: @ 81D0454 setalpha 12, 8 playsewithpan SE_W080, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 6, 6, 3 - createsprite gUnknown_83E2B94, ANIM_ATTACKER, 2, 0, -24, 8, 140 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, 16, -24, 8, 100 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, -16, -24, 8, 100 + createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 8, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -16, -24, 8, 100 delay 15 - createsprite gUnknown_83E2B94, ANIM_ATTACKER, 2, 0, -24, 8, 140 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, 32, -24, 8, 100 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, -32, -24, 8, 100 + createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 32, -24, 8, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -32, -24, 8, 100 delay 15 - createsprite gUnknown_83E2B94, ANIM_ATTACKER, 2, 0, -24, 8, 140 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, 24, -24, 8, 100 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, -24, -24, 8, 100 + createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 24, -24, 8, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 8, 100 delay 30 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, 16, -24, 0, 100 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, -16, -24, 0, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 0, 100 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -16, -24, 0, 100 delay 30 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, 20, -16, 14, 80 - createsprite gUnknown_83E2BAC, ANIM_ATTACKER, 2, -20, -14, 16, 80 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 20, -16, 14, 80 + createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, -20, -14, 16, 80 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 @@ -6941,29 +6941,29 @@ Move_RAZOR_LEAF:: @ 81D058C setalpha 12, 8 delay 1 loopsewithpan SE_W077, 192, 10, 5 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -3, -2, 10 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -1, -1, 15 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -4, -4, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, 3, -3, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -1, -6, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, 2, -1, 12 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -3, -4, 13 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, 4, -5, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, 2, -6, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -3, -5, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 playsewithpan SE_W013B, 192 - createsprite gUnknown_83E2C50, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 - createsprite gUnknown_83E2C50, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 playsewithpan SE_W013, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -7010,16 +7010,16 @@ Move_OCTAZOOKA:: @ 81D07BB loadspritegfx 10030 loadspritegfx 10017 playsewithpan SE_W025B, 192 - createsprite gUnknown_83E3674, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 + createsprite gOctazookaBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish playsewithpan SE_W120, 63 - createsprite gUnknown_83E36A8, ANIM_TARGET, 2, 8, 8, 1, 0 + createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, 8, 1, 0 delay 2 - createsprite gUnknown_83E36A8, ANIM_TARGET, 2, -8, -8, 1, 0 + createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, -8, -8, 1, 0 delay 2 - createsprite gUnknown_83E36A8, ANIM_TARGET, 2, 8, -8, 1, 0 + createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, -8, 1, 0 delay 2 - createsprite gUnknown_83E36A8, ANIM_TARGET, 2, -8, 8, 1, 0 + createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, -8, 8, 1, 0 waitforvisualfinish end @@ -7438,22 +7438,22 @@ Move_EGG_BOMB:: @ 81D1203 loadspritegfx 10198 loadspritegfx 10175 playsewithpan SE_W039, 192 - createsprite gUnknown_83E3D00, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 + createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 16, 1 - createsprite gUnknown_83E3F94, ANIM_TARGET, 4, 6, 5, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 1, 0 playsewithpan SE_W120, 63 delay 3 - createsprite gUnknown_83E3F94, ANIM_TARGET, 4, -16, -15, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 1, 0 playsewithpan SE_W120, 63 delay 3 - createsprite gUnknown_83E3F94, ANIM_TARGET, 4, 16, -5, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 1, 0 playsewithpan SE_W120, 63 delay 3 - createsprite gUnknown_83E3F94, ANIM_TARGET, 4, -12, 18, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 1, 0 playsewithpan SE_W120, 63 delay 3 - createsprite gUnknown_83E3F94, ANIM_TARGET, 4, 0, 5, 1, 0 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0 playsewithpan SE_W120, 63 delay 3 waitforvisualfinish @@ -7629,9 +7629,9 @@ gUnknown_81D15C2:: @ 81D15C2 gUnknown_81D15C4:: @ 81D15C4 loadspritegfx 10009 playsewithpan SE_W016, 192 - createsprite gUnknown_83E3DC8, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 - createsprite gUnknown_83E3DC8, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 - createsprite gUnknown_83E3DC8, ANIM_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 + createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 + createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 + createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish playsewithpan SE_W016B, 192 goto gUnknown_81D15C2 @@ -7716,7 +7716,7 @@ Move_MIMIC:: @ 81D1777 panse_1B SE_W107, 63, 192, 253, 0 createvisualtask sub_80A2F0C, 5, 128, 24 delay 15 - createsprite gUnknown_83E2D54, ANIM_TARGET, 2, -12, 24 + createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24 delay 10 setarg 7, 65535 waitforvisualfinish @@ -7730,12 +7730,12 @@ Move_MIMIC:: @ 81D1777 Move_CONSTRICT:: @ 81D17C1 loadspritegfx 10186 loopsewithpan SE_W010, 63, 6, 4 - createsprite gUnknown_83E2D0C, ANIM_TARGET, 4, 0, 16, 0, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 - createsprite gUnknown_83E2D0C, ANIM_TARGET, 3, 0, 0, 0, 2 - createsprite gUnknown_83E2D0C, ANIM_TARGET, 2, 0, 8, 1, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 2 delay 7 - createsprite gUnknown_83E2D0C, ANIM_TARGET, 3, 0, -8, 1, 2 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, -8, 1, 2 delay 8 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 delay 20 @@ -7800,15 +7800,15 @@ Move_SOFT_BOILED:: @ 81D18E9 monbg 2 playsewithpan SE_W039, 192 createvisualtask AnimTask_ShakeMon, 2, 0, 0, 2, 6, 1 - createsprite gUnknown_83E4028, ANIM_ATTACKER, 4, 0, 16, 0 - createsprite gUnknown_83E4028, ANIM_ATTACKER, 4, 0, 16, 1 + createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 0 + createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 playsewithpan SE_W030, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, 31500 - createsprite gUnknown_83E4094, ANIM_ATTACKER, 3, 31, 16, 0, 1 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 8 - createsprite gUnknown_83E4094, ANIM_ATTACKER, 3, 31, 16, 0, 1 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 60 setarg 7, 65535 waitforvisualfinish @@ -7823,24 +7823,24 @@ Move_HEAL_BELL:: @ 81D196B createvisualtask sub_80BA7F8, 10, 10, 0, 0, 10, 32767 waitforvisualfinish createvisualtask sub_80A96B4, 5, - createsprite gUnknown_83E41B0, ANIM_ATTACKER, 2, 0, -24, 0, 1 + createsprite gBellSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 1 delay 12 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 48, -18, 35, 0, 0 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -48, 20, 30, 1, 1 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -38, -29, 30, 2, 2 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 36, 18, 30, 3, 3 call gUnknown_81D1B2F delay 33 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 19, 26, 35, 4, 4 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -34, -12, 30, 5, 5 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 41, -20, 34, 6, 2 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -15, 26, 32, 7, 0 call gUnknown_81D1B2F delay 33 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3 - createsprite gUnknown_83E41D0, ANIM_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -48, 18, 31, 0, 2 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 48, -20, 30, 2, 5 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 38, 29, 33, 4, 3 + createsprite gHealBellMusicNoteSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, -36, -18, 30, 6, 1 call gUnknown_81D1B2F waitforvisualfinish createvisualtask sub_80A9760, 5, @@ -7850,22 +7850,22 @@ Move_HEAL_BELL:: @ 81D196B unloadspritegfx 10203 loadspritegfx 10049 playsewithpan SE_W234, 192 - createsprite gUnknown_83E340C, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 + createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 - createsprite gUnknown_83E340C, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 + createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx 10049 loadspritegfx 10203 playsewithpan SE_REAPOKE, 192 createvisualtask sub_80BA83C, 10, 4, 3, 10, 0, 31500 createvisualtask sub_80BA7F8, 10, 10, 3, 10, 0, 32767 - createsprite gUnknown_83E40E0, ANIM_ATTACKER, 16, 0, 0, 0, 1 + createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 end gUnknown_81D1B2F:: @ 81D1B2F createvisualtask sub_80BA83C, 10, 4, 3, 8, 0, 31500 createvisualtask sub_80BA7F8, 10, 10, 3, 2, 10, 32767 - createsprite gUnknown_83E4094, ANIM_ATTACKER, 40, 0, -24, 0, 1 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 playsewithpan SE_W215, 192 return @@ -7889,8 +7889,8 @@ Move_SCARY_FACE:: @ 81D1BA0 playsewithpan SE_W043, 192 createvisualtask sub_80A9F10, 5, delay 13 - createsprite gUnknown_83E42FC, ANIM_ATTACKER, 0, -16, -8 - createsprite gUnknown_83E42FC, ANIM_ATTACKER, 0, 16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 + createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask sub_80ADAD8, 3, 20, 1, 0 playsewithpan SE_W081B, 63 @@ -7901,33 +7901,33 @@ Move_SCARY_FACE:: @ 81D1BA0 Move_SWEET_KISS:: @ 81D1C03 loadspritegfx 10216 loadspritegfx 10220 - createsprite gUnknown_83E4320, ANIM_TARGET, 2, 16, -48 + createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 playsewithpan SE_W215, 63 delay 23 playsewithpan SE_W215, 63 delay 23 playsewithpan SE_W215, 63 waitforvisualfinish - createsprite gUnknown_83E4230, ANIM_TARGET, 3, 160, -30 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -30 playsewithpan SE_W213, 63 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, -256, -42 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, 128, -14 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, 416, -38 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, -128, -22 - createsprite gUnknown_83E4230, ANIM_TARGET, 3, -384, -31 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -42 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -14 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22 + createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 end Move_LOVELY_KISS:: @ 81D1C6C loadspritegfx 10219 loadspritegfx 10221 - createsprite gUnknown_83E4368, ANIM_TARGET, 2, 0, -24 + createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 playsewithpan SE_W060B, 63 waitforvisualfinish playsewithpan SE_W213, 63 - createsprite gUnknown_83E4338, ANIM_TARGET, 3, -256, -42 - createsprite gUnknown_83E4338, ANIM_TARGET, 3, 128, -14 - createsprite gUnknown_83E4338, ANIM_TARGET, 3, 416, -38 - createsprite gUnknown_83E4338, ANIM_TARGET, 3, -128, -22 + createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -256, -42 + createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 128, -14 + createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 416, -38 + createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -128, -22 end Move_FURY_SWIPES:: @ 81D1CB3 @@ -7935,41 +7935,41 @@ Move_FURY_SWIPES:: @ 81D1CB3 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 playsewithpan SE_W010, 63 - createsprite gUnknown_83E43B0, ANIM_TARGET, 2, 16, 0, 1 + createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 5, 1 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5 delay 4 playsewithpan SE_W010, 63 - createsprite gUnknown_83E43B0, ANIM_TARGET, 2, -16, 0, 0 + createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 7, 1 end Move_INGRAIN:: @ 81D1D17 loadspritegfx 10223 loadspritegfx 10147 - createsprite gUnknown_83E2DC4, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, 192 delay 10 - createsprite gUnknown_83E2DC4, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 playsewithpan SE_W010, 192 delay 10 - createsprite gUnknown_83E2DC4, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 playsewithpan SE_W010, 192 delay 10 - createsprite gUnknown_83E2DC4, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 + createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 playsewithpan SE_W010, 192 delay 40 - createsprite gUnknown_83E2E04, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 + createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 playsewithpan SE_W145C, 192 delay 5 - createsprite gUnknown_83E2E04, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 + createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 playsewithpan SE_W145C, 192 delay 5 playsewithpan SE_W145C, 192 delay 5 - createsprite gUnknown_83E2E04, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 + createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 playsewithpan SE_W145C, 192 delay 10 waitforvisualfinish @@ -7978,7 +7978,7 @@ Move_INGRAIN:: @ 81D1D17 Move_PRESENT:: @ 81D1DC8 loadspritegfx 10224 createvisualtask sub_80DEAF0, 2, - createsprite gUnknown_83E2E88, ANIM_TARGET, 2, 0, -5, 10, 2, -1 + createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 playsewithpan SE_W039, 192 delay 14 playsewithpan SE_W145B, 192 @@ -7994,42 +7994,42 @@ Move_PRESENT:: @ 81D1DC8 gUnknown_81D1E0B:: @ 81D1E0B loadspritegfx 10198 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_TARGET, 3, 0, 0, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_TARGET, 3, 24, -24, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_TARGET, 3, -16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_TARGET, 3, -24, -12, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_TARGET, 3, 16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1 end gUnknown_81D1E76:: @ 81D1E76 loadspritegfx 10195 loadspritegfx 10031 playsewithpan SE_W234, 63 - createsprite gUnknown_83E2ED0, ANIM_TARGET, 4, -16, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 - createsprite gUnknown_83E2ED0, ANIM_TARGET, 4, 16, 32, -3, -1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1 delay 3 - createsprite gUnknown_83E2ED0, ANIM_TARGET, 4, 32, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 32, 32, -3, 1 delay 3 - createsprite gUnknown_83E2ED0, ANIM_TARGET, 4, -32, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -32, 32, -3, 1 delay 3 - createsprite gUnknown_83E2ED0, ANIM_TARGET, 4, 0, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 0, 32, -3, 1 delay 3 - createsprite gUnknown_83E2ED0, ANIM_TARGET, 4, -8, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_83E2ED0, ANIM_TARGET, 4, -8, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1 delay 3 - createsprite gUnknown_83E2ED0, ANIM_TARGET, 4, 24, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 24, 32, -3, 1 delay 3 - createsprite gUnknown_83E2ED0, ANIM_TARGET, 4, -24, 32, -3, 1 + createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -24, 32, -3, 1 waitforvisualfinish waitsound call gUnknown_81D5712 @@ -8044,23 +8044,23 @@ Move_BATON_PASS:: @ 81D1F1F Move_PERISH_SONG:: @ 81D1F41 loadspritegfx 10206 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 0, 0, 0 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 1, 1, 16 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 2, 1, 32 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 3, 2, 48 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 4, 2, 64 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 5, 0, 80 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 6, 0, 96 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 7, 1, 112 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 8, 2, 128 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 9, 0, 144 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 10, 2, 160 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 11, 0, 176 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 12, 1, 192 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 13, 3, 208 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 14, 3, 224 - createsprite gUnknown_83E4484, ANIM_ATTACKER, 4, 15, 0, 240 - createsprite gUnknown_83E449C, ANIM_ATTACKER, 4, 15, 0, 0 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 0 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 1, 1, 16 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 2, 1, 32 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 3, 2, 48 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 4, 2, 64 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 5, 0, 80 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 6, 0, 96 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 7, 1, 112 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 8, 2, 128 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 9, 0, 144 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 10, 2, 160 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 11, 0, 176 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 12, 1, 192 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 13, 3, 208 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 14, 3, 224 + createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 240 + createsprite gPerishSongMusicNote2SpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 0 delay 20 panse_1B SE_W195, 192, 63, 2, 0 delay 80 @@ -8243,8 +8243,8 @@ Move_ENCORE:: @ 81D23FE Move_TRICK:: @ 81D24A5 loadspritegfx 10224 loadspritegfx 10207 - createsprite gUnknown_83E2F60, ANIM_ATTACKER, 2, -40, 80 - createsprite gUnknown_83E2F60, ANIM_ATTACKER, 2, -40, 208 + createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 + createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208 delay 16 playsewithpan SE_W166, 0 createvisualtask sub_80A9A20, 3, @@ -8323,14 +8323,14 @@ Move_SPIT_UP:: @ 81D2622 delay 45 playsewithpan SE_W255, 192 delay 3 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 0, 12 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 32, 12 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 64, 12 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 96, 12 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 128, 12 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 160, 12 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 192, 12 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 224, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 32, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 64, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 96, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 128, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 160, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 192, 12 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 224, 12 delay 5 jumpifmoveturn 2, gUnknown_81D26EF jumpifmoveturn 3, gUnknown_81D2718 @@ -8347,21 +8347,21 @@ gUnknown_81D26B2:: @ 81D26B2 end gUnknown_81D26EF:: @ 81D26EF - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 16 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 80 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 144 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 208 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 16 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 80 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 144 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 208 goto gUnknown_81D26B2 gUnknown_81D2718:: @ 81D2718 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 16 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 48 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 80 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 112 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 144 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 176 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 208 - createsprite gUnknown_83E42C8, ANIM_ATTACKER, 2, 240 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 16 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 48 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 80 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 112 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 144 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 176 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 208 + createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 240 goto gUnknown_81D26B2 Move_SWALLOW:: @ 81D2765 @@ -8608,7 +8608,7 @@ Move_REFRESH:: @ 81D2C42 waitforvisualfinish playsewithpan SE_REAPOKE, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, 31500 - createsprite gUnknown_83E4094, ANIM_ATTACKER, 3, 0, 0, 0, 0 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 end Move_BLAZE_KICK:: @ 81D2C85 @@ -8645,7 +8645,7 @@ gUnknown_81D2D1F:: @ 81D2D1F createvisualtask sub_80DD334, 5, createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 8, 0, 1023 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, 0, 0 - createsprite gUnknown_83E40F8, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 + createsprite gHyperVoiceRingSpriteTemplate, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 6, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 1, 0, 6, 1 createvisualtask sub_80BA47C, 2, 1, 0, 6, 1 @@ -8736,26 +8736,26 @@ Move_MUDDY_WATER:: @ 81D2F28 Move_BULLET_SEED:: @ 81D2F3A loadspritegfx 10006 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 30, 1 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 - createsprite gUnknown_83E3D94, ANIM_TARGET, 2, 20, 0 + createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 waitforvisualfinish end @@ -8933,31 +8933,31 @@ Move_FRENZY_PLANT:: @ 81D343F setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, 0 waitforvisualfinish - createsprite gUnknown_83E2DDC, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 playsewithpan SE_W010, 192 delay 5 - createsprite gUnknown_83E2DDC, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 playsewithpan SE_W010, 213 delay 5 - createsprite gUnknown_83E2DDC, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 playsewithpan SE_W010, 234 delay 5 - createsprite gUnknown_83E2DDC, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 playsewithpan SE_W010, 0 delay 5 - createsprite gUnknown_83E2DDC, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 playsewithpan SE_W010, 21 delay 5 - createsprite gUnknown_83E2DDC, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 playsewithpan SE_W010, 42 delay 5 - createsprite gUnknown_83E2DDC, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 playsewithpan SE_W010, 63 delay 5 - createsprite gUnknown_83E2DDC, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 playsewithpan SE_W010, 63 delay 5 - createsprite gUnknown_83E2DDC, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 + createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 playsewithpan SE_W010, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, 1, 3 @@ -9002,7 +9002,7 @@ Move_METAL_SOUND:: @ 81D35E3 gUnknown_81D3616:: @ 81D3616 panse_1B SE_W103, 192, 63, 2, 0 - createsprite gUnknown_83E3CD0, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 + createsprite gMetalSoundSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -9215,9 +9215,9 @@ Move_COSMIC_POWER:: @ 81D3B89 waitbgfadein delay 70 createvisualtask sub_80DD3DC, 5, 221, -64 - createsprite gUnknown_83E33F4, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 + createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite gUnknown_83E33F4, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 + createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 40 createvisualtask sub_80BB7DC, 2, 0, 15, 0, 0 waitforvisualfinish @@ -9324,29 +9324,29 @@ gUnknown_81D3F7E:: @ 81D3F7E delay 0 createvisualtask sub_80BA7F8, 10, 1, 0, 4, 4, 0 waitbgfadein - createsprite gUnknown_83E30A8, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_83E30A8, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_83E30A8, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_83E30A8, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_83E30C0, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_83E30C0, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_83E30C0, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_83E30C0, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 0 - createsprite gUnknown_83E30D8, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 - createsprite gUnknown_83E30D8, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 - createsprite gUnknown_83E30D8, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 - createsprite gUnknown_83E30D8, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_ATTACKER, 120, -24, 18, 90, 5, 1, 2, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_ATTACKER, 120, -40, 14, 128, 4, 1, 2, 1 delay 6 - createsprite gUnknown_83E30A8, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_83E30A8, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_83E30C0, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_83E30C0, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gSilverWindMediumSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 delay 0 - createsprite gUnknown_83E30D8, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 - createsprite gUnknown_83E30D8, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 + createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish playsewithpan SE_W016B, 63 clearmonbg 3 @@ -9672,13 +9672,13 @@ Move_WATER_PULSE:: @ 81D48A6 playsewithpan SE_W145C, 63 waitforvisualfinish playsewithpan SE_W202, 192 - createsprite gUnknown_83E3CE8, ANIM_TARGET, 2, 0, 0, 40, 15 + createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 playsewithpan SE_W202, 192 - createsprite gUnknown_83E3CE8, ANIM_TARGET, 2, 0, 0, 40, 15 + createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 playsewithpan SE_W202, 192 - createsprite gUnknown_83E3CE8, ANIM_TARGET, 2, 0, 0, 40, 15 + createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 8, 18, 1 waitforvisualfinish @@ -9767,19 +9767,19 @@ Move_DOOM_DESIRE:: @ 81D4A9F delay 23 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 20, 1 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 24, -24, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -24, -12, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, 32767 waitforvisualfinish @@ -9849,26 +9849,26 @@ Move_TWISTER:: @ 81D4D0E monbg 3 monbgprio_28 1 playsewithpan SE_W239, 63 - createsprite gUnknown_83E2C20, ANIM_TARGET, 2, 120, 70, 5, 70, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30 delay 1 - createsprite gUnknown_83E2C20, ANIM_TARGET, 2, 115, 55, 6, 60, 25 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 6, 60, 25 delay 1 - createsprite gUnknown_83E2C20, ANIM_TARGET, 2, 115, 60, 7, 60, 30 - createsprite gUnknown_83E2C20, ANIM_TARGET, 2, 115, 55, 10, 60, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 60, 7, 60, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 10, 60, 30 delay 3 createsprite gUnknown_83E7578, ANIM_TARGET, 2, 100, 50, 4, 50, 26 delay 1 - createsprite gUnknown_83E2C20, ANIM_TARGET, 2, 105, 25, 8, 60, 20 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 105, 25, 8, 60, 20 delay 1 - createsprite gUnknown_83E2C20, ANIM_TARGET, 2, 115, 40, 10, 48, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 40, 10, 48, 30 delay 3 createsprite gUnknown_83E7578, ANIM_TARGET, 2, 120, 30, 6, 45, 25 - createsprite gUnknown_83E2C20, ANIM_TARGET, 2, 115, 35, 10, 60, 30 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 35, 10, 60, 30 delay 3 createsprite gUnknown_83E7578, ANIM_TARGET, 2, 105, 20, 8, 40, 0 delay 3 - createsprite gUnknown_83E2C20, ANIM_TARGET, 2, 20, 255, 15, 32, 0 - createsprite gUnknown_83E2C20, ANIM_TARGET, 2, 110, 10, 8, 32, 20 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 20, 255, 15, 32, 0 + createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, 1, 3 playsewithpan SE_W004, 63 @@ -9897,29 +9897,29 @@ Move_MAGICAL_LEAF:: @ 81D4E6D delay 1 loopsewithpan SE_W077, 192, 10, 5 createvisualtask sub_80A41C4, 5, - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -3, -2, 10 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -1, -1, 15 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -4, -4, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -4, -4, 7 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, 3, -3, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 3, -3, 11 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -1, -6, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -6, 8 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, 2, -1, 12 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 12 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -3, -4, 13 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -4, 13 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, 4, -5, 7 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 4, -5, 7 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, 2, -6, 11 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, 2, -6, 11 delay 2 - createsprite gUnknown_83E2C08, ANIM_ATTACKER, 2, -3, -5, 8 + createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 playsewithpan SE_W013B, 192 - createsprite gUnknown_83E2C50, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 - createsprite gUnknown_83E2C50, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 + createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 playsewithpan SE_W013, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, 1, 2 @@ -10241,33 +10241,33 @@ gUnknown_81D55E2:: @ 81D55E2 return gUnknown_81D569E:: @ 81D569E - createsprite gUnknown_83E33F4, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 + createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 - createsprite gUnknown_83E33F4, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 + createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 8 return gUnknown_81D56C9:: @ 81D56C9 playsewithpan SE_W071B, 192 - createsprite gUnknown_83E37A4, ANIM_ATTACKER, 2, 0, -5, 0, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 0, 0 delay 7 - createsprite gUnknown_83E37A4, ANIM_ATTACKER, 2, -15, 10, 0, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, -15, 10, 0, 0 delay 7 - createsprite gUnknown_83E37A4, ANIM_ATTACKER, 2, -15, -15, 0, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, -15, -15, 0, 0 delay 7 - createsprite gUnknown_83E37A4, ANIM_ATTACKER, 2, 10, -5, 0, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 10, -5, 0, 0 delay 7 return gUnknown_81D5712:: @ 81D5712 playsewithpan SE_W071B, 63 - createsprite gUnknown_83E37A4, ANIM_TARGET, 2, 0, -5, 1, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0 delay 7 - createsprite gUnknown_83E37A4, ANIM_TARGET, 2, -15, 10, 1, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, 10, 1, 0 delay 7 - createsprite gUnknown_83E37A4, ANIM_TARGET, 2, -15, -15, 1, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, -15, 1, 0 delay 7 - createsprite gUnknown_83E37A4, ANIM_TARGET, 2, 10, -5, 1, 0 + createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 10, -5, 1, 0 delay 7 return @@ -10458,21 +10458,21 @@ gUnknown_81D5A90:: @ 81D5A90 Status_Infatuation:: @ 81D5AA8 loadspritegfx 10210 playsewithpan SE_W204, 192 - createsprite gUnknown_83E41E8, ANIM_ATTACKER, 3, 0, 20 + createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 delay 15 playsewithpan SE_W204, 192 - createsprite gUnknown_83E41E8, ANIM_ATTACKER, 3, -20, 20 + createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 delay 15 playsewithpan SE_W204, 192 - createsprite gUnknown_83E41E8, ANIM_ATTACKER, 3, 20, 20 + createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 end Status_Sleep:: @ 81D5ADD loadspritegfx 10228 playsewithpan SE_W173, 192 - createsprite gUnknown_83E3500, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 - createsprite gUnknown_83E3500, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 + createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 end Status_Paralysis:: @ 81D5B09 @@ -10567,7 +10567,7 @@ General_PokeblockThrow:: @ 81D5C0C General_ItemKnockoff:: @ 81D5C54 loadspritegfx 10224 - createsprite gUnknown_83E2EA0, ANIM_TARGET, 2, + createsprite gKnockOffItemSpriteTemplate, ANIM_TARGET, 2, end General_TurnTrap:: @ 81D5C5F @@ -10581,9 +10581,9 @@ General_TurnTrap:: @ 81D5C5F gUnknown_81D5C8B:: @ 81D5C8B loadspritegfx 10186 loopsewithpan SE_W010, 63, 6, 2 - createsprite gUnknown_83E2D0C, ANIM_TARGET, 4, 0, 16, 0, 1 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 - createsprite gUnknown_83E2D0C, ANIM_TARGET, 2, 0, 8, 1, 1 + createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1 delay 3 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 delay 20 @@ -10668,7 +10668,7 @@ General_ItemEffect:: @ 81D5DF2 waitforvisualfinish playsewithpan SE_REAPOKE, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 3, 7, 0, 26609 - createsprite gUnknown_83E4094, ANIM_ATTACKER, 3, 0, 0, 0, 0 + createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish end @@ -10765,7 +10765,7 @@ General_ItemSteal:: @ 81D6026 createvisualtask sub_80BC0FC, 2, createvisualtask sub_80F1700, 2, delay 1 - createsprite gUnknown_83E2EE8, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 + createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end General_SnatchMove:: @ 81D604B @@ -10830,19 +10830,19 @@ General_DoomDesireHit:: @ 81D6108 delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 20, 1 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 0, 0, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 24, -24, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, -24, -12, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 playsewithpan SE_W120, 63 - createsprite gUnknown_83E3F94, ANIM_ATTACKER, 3, 16, 16, 1, 1 + createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, 32767 waitforvisualfinish @@ -10983,11 +10983,11 @@ gUnknown_81D63FD:: @ 81D63FD gUnknown_81D6425:: @ 81D6425 loadspritegfx 10087 - createsprite gUnknown_83E3F04, ANIM_TARGET, 2, 1, 20, -20 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -20 playsewithpan SE_W207B, 63 waitforvisualfinish delay 12 - createsprite gUnknown_83E3F04, ANIM_TARGET, 2, 1, -20, -20 + createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -20 playsewithpan SE_W207B, 63 end -- cgit v1.2.3 From 0cc5446a2a28b6050c8c496416de4b8acdc87929 Mon Sep 17 00:00:00 2001 From: Evan Date: Mon, 2 Dec 2019 15:49:22 -0700 Subject: init battle_anim_special --- data/battle_anim_effects_3.s | 181 ----------------------------- data/battle_anim_scripts.s | 266 +++++++++++++++++++++---------------------- data/battle_anim_special.s | 148 ------------------------ 3 files changed, 133 insertions(+), 462 deletions(-) delete mode 100644 data/battle_anim_effects_3.s delete mode 100644 data/battle_anim_special.s (limited to 'data') diff --git a/data/battle_anim_effects_3.s b/data/battle_anim_effects_3.s deleted file mode 100644 index ebd42dfb5..000000000 --- a/data/battle_anim_effects_3.s +++ /dev/null @@ -1,181 +0,0 @@ -#include "constants/region_map.h" -#include "constants/flags.h" -#include "constants/moves.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_83FEDE4:: @ 83FEDE4 - .incbin "baserom.gba", 0x3FEDE4, 0x1C - -gUnknown_83FEE00:: - .incbin "baserom.gba", 0x3FEE00, 0x18 - -gUnknown_83FEE18:: - .incbin "baserom.gba", 0x3FEE18, 0x18 - -gUnknown_83FEE30:: - .incbin "baserom.gba", 0x3FEE30, 0x2C - -gUnknown_83FEE5C:: - .incbin "baserom.gba", 0x3FEE5C, 0x18 - -gUnknown_83FEE74:: - .incbin "baserom.gba", 0x3FEE74, 0x18 - -gUnknown_83FEE8C:: - .incbin "baserom.gba", 0x3FEE8C, 0x58 - -gUnknown_83FEEE4:: - .incbin "baserom.gba", 0x3FEEE4, 0x18 - -gUnknown_83FEEFC:: - .incbin "baserom.gba", 0x3FEEFC, 0x34 - -gUnknown_83FEF30:: - .incbin "baserom.gba", 0x3FEF30, 0x40 - -gUnknown_83FEF70:: - .incbin "baserom.gba", 0x3FEF70, 0x4C - -gUnknown_83FEFBC:: - .incbin "baserom.gba", 0x3FEFBC, 0x50 - -gUnknown_83FF00C:: - .incbin "baserom.gba", 0x3FF00C, 0x18 - -gUnknown_83FF024:: - .incbin "baserom.gba", 0x3FF024, 0x18 - -gUnknown_83FF03C:: - .incbin "baserom.gba", 0x3FF03C, 0x2C - -gUnknown_83FF068:: - .incbin "baserom.gba", 0x3FF068, 0x18 - -gUnknown_83FF080:: @ 83FF080 - .incbin "baserom.gba", 0x3FF080, 0x58 - -gUnknown_83FF0D8:: - .incbin "baserom.gba", 0x3FF0D8, 0x40 - -gUnknown_83FF118:: - .incbin "baserom.gba", 0x3FF118, 0x18 - -gUnknown_83FF130:: @ 83FF130 - .incbin "baserom.gba", 0x3FF130, 0x20 - -gUnknown_83FF150:: - .incbin "baserom.gba", 0x3FF150, 0x18 - -gUnknown_83FF168:: @ 83FF168 - .incbin "baserom.gba", 0x3FF168, 0x18 - -gUnknown_83FF180:: @ 83FF180 - .incbin "baserom.gba", 0x3FF180, 0x18 - -gUnknown_83FF198:: @ 83FF198 - .incbin "baserom.gba", 0x3FF198, 0x28 - -gUnknown_83FF1C0:: @ 83FF1C0 - .incbin "baserom.gba", 0x3FF1C0, 0x38 - -gUnknown_83FF1F8:: - .incbin "baserom.gba", 0x3FF1F8, 0x18 - -gUnknown_83FF210:: @ 83FF210 - .incbin "baserom.gba", 0x3FF210, 0x30 - -gUnknown_83FF240:: @ 83FF240 - .incbin "baserom.gba", 0x3FF240, 0x2C - -gUnknown_83FF26C:: @ 83FF26C - .incbin "baserom.gba", 0x3FF26C, 0x18 - -gUnknown_83FF284:: @ 83FF284 - .incbin "baserom.gba", 0x3FF284, 0x4 - -gUnknown_83FF288:: @ 83FF288 - .incbin "baserom.gba", 0x3FF288, 0x8 - -gUnknown_83FF290:: @ 83FF290 - .incbin "baserom.gba", 0x3FF290, 0x20 - -gUnknown_83FF2B0:: - .incbin "baserom.gba", 0x3FF2B0, 0x74 - -gUnknown_83FF324:: - .incbin "baserom.gba", 0x3FF324, 0x4C - -gUnknown_83FF370:: - .incbin "baserom.gba", 0x3FF370, 0x18 - -gUnknown_83FF388:: - .incbin "baserom.gba", 0x3FF388, 0x18 - -gUnknown_83FF3A0:: - .incbin "baserom.gba", 0x3FF3A0, 0x18 - -gUnknown_83FF3B8:: - .incbin "baserom.gba", 0x3FF3B8, 0x18 - -gUnknown_83FF3D0:: @ 83FF3D0 - .incbin "baserom.gba", 0x3FF3D0, 0x9C - -gUnknown_83FF46C:: - .incbin "baserom.gba", 0x3FF46C, 0xA8 - -gUnknown_83FF514:: - .incbin "baserom.gba", 0x3FF514, 0x18 - -gUnknown_83FF52C:: @ 83FF52C - .incbin "baserom.gba", 0x3FF52C, 0x20 - -gUnknown_83FF54C:: @ 83FF54C - .incbin "baserom.gba", 0x3FF54C, 0x18 - -gUnknown_83FF564:: @ 83FF564 - .incbin "baserom.gba", 0x3FF564, 0x50 - -gUnknown_83FF5B4:: - .incbin "baserom.gba", 0x3FF5B4, 0x18 - -gUnknown_83FF5CC:: @ 83FF5CC - .incbin "baserom.gba", 0x3FF5CC, 0x18 - -gUnknown_83FF5E4:: - .incbin "baserom.gba", 0x3FF5E4, 0x48 - -gUnknown_83FF62C:: @ 83FF62C - .incbin "baserom.gba", 0x3FF62C, 0x18 - -gUnknown_83FF644:: - .incbin "baserom.gba", 0x3FF644, 0x18 - -gUnknown_83FF65C:: @ 83FF65C - .incbin "baserom.gba", 0x3FF65C, 0x18 - -gUnknown_83FF674:: - .incbin "baserom.gba", 0x3FF674, 0x18 - -gUnknown_83FF68C:: - .incbin "baserom.gba", 0x3FF68C, 0x18 - -gUnknown_83FF6A4:: - .incbin "baserom.gba", 0x3FF6A4, 0x18 - -gUnknown_83FF6BC:: - .incbin "baserom.gba", 0x3FF6BC, 0x30 - -gUnknown_83FF6EC:: - .incbin "baserom.gba", 0x3FF6EC, 0x78 - -gUnknown_83FF764:: - .incbin "baserom.gba", 0x3FF764, 0x2C - -gUnknown_83FF790:: - .incbin "baserom.gba", 0x3FF790, 0x18 - -gUnknown_83FF7A8:: @ 83FF7A8 - .incbin "baserom.gba", 0x3FF7A8, 0x30 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 925f6c012..c3c6399dc 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1271,12 +1271,12 @@ Move_REVERSAL:: @ 81C8445 createvisualtask sub_80B9BDC, 2, 31, 3, 2, 0, 10, 32767 delay 10 playsewithpan SE_W179, 192 - createsprite gUnknown_83FF3B8, ANIM_ATTACKER, 2, 26, 0 - createsprite gUnknown_83FF3B8, ANIM_ATTACKER, 2, 26, 42 - createsprite gUnknown_83FF3B8, ANIM_ATTACKER, 2, 26, 84 - createsprite gUnknown_83FF3B8, ANIM_ATTACKER, 2, 26, 126 - createsprite gUnknown_83FF3B8, ANIM_ATTACKER, 2, 26, 168 - createsprite gUnknown_83FF3B8, ANIM_ATTACKER, 2, 26, 210 + createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 + createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 + createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 + createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 126 + createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 168 + createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210 waitforvisualfinish delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 @@ -1691,7 +1691,7 @@ Move_DEFENSE_CURL:: @ 81C8F1C createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 0 createvisualtask sub_80DF524, 5, waitforvisualfinish - createsprite gUnknown_83FF118, ANIM_ATTACKER, 2, 0, 6, 0, 1 + createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1 waitforvisualfinish createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 1 waitforvisualfinish @@ -1822,7 +1822,7 @@ gUnknown_81C91D7:: @ 81C91D7 goto gUnknown_81C8FFF gUnknown_81C9253:: @ 81C9253 - createsprite gUnknown_83FF2B0, ANIM_ATTACKER, 2, 20, -28 + createsprite gWeakFrustrationAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 20, -28 waitforvisualfinish delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2 @@ -1852,22 +1852,22 @@ Move_SAFEGUARD:: @ 81C9297 Move_PAIN_SPLIT:: @ 81C92D9 loadspritegfx 10239 - createsprite gUnknown_83FF370, ANIM_ATTACKER, 2, -8, -42, 0 - createsprite gUnknown_83FF370, ANIM_TARGET, 2, -8, -42, 1 + createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, 0 + createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_80E0B00, 2, 0, 0 createvisualtask sub_80E0B00, 2, 1, 0 waitforvisualfinish - createsprite gUnknown_83FF370, ANIM_ATTACKER, 2, -24, -42, 0 - createsprite gUnknown_83FF370, ANIM_TARGET, 2, -24, -42, 1 + createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, 0 + createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_80E0B00, 2, 0, 1 createvisualtask sub_80E0B00, 2, 1, 1 waitforvisualfinish - createsprite gUnknown_83FF370, ANIM_ATTACKER, 2, 8, -42, 0 - createsprite gUnknown_83FF370, ANIM_TARGET, 2, 8, -42, 1 + createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, 0 + createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, 1 delay 10 playsewithpan SE_W207B, 0 createvisualtask sub_80E0B00, 2, 0, 2 @@ -2125,7 +2125,7 @@ Move_MEAN_LOOK:: @ 81C9ABA createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, 0 loopsewithpan SE_W109, 63, 15, 4 waitplaysewithpan SE_W043, 63, 85 - createsprite gUnknown_83FEEE4, ANIM_ATTACKER, 2, + createsprite gMeanLookEyeSpriteTemplate, ANIM_ATTACKER, 2, delay 120 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, 0 delay 30 @@ -2305,23 +2305,23 @@ Move_SMOKESCREEN:: @ 81C9EB0 loadspritegfx 10016 loadspritegfx 10017 playsewithpan SE_W104, 192 - createsprite gUnknown_83FEE30, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 + createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask sub_80DE34C, 2, delay 2 playsewithpan SE_W028, 63 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, -12, 104, 0, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, -12, 72, 1, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, -6, 56, 1, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, -6, 88, 0, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, 0, 56, 0, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, 0, 88, 1, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, 6, 72, 0, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, 6, 104, 1, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, 12, 72, 0, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, 12, 56, 1, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, 18, 80, 0, 75 - createsprite gUnknown_83FEE18, ANIM_TARGET, 4, 0, 18, 72, 1, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 104, 0, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 72, 1, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -6, 56, 1, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -6, 88, 0, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 0, 56, 0, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 0, 88, 1, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 6, 72, 0, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 6, 104, 1, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 12, 72, 0, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 12, 56, 1, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 18, 80, 0, 75 + createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 18, 72, 1, 75 waitforvisualfinish end @@ -3217,7 +3217,7 @@ Move_FORESIGHT:: @ 81CB18D monbg 3 monbgprio_28 1 setalpha 16, 0 - createsprite gUnknown_83FF6A4, ANIM_TARGET, 2, 1 + createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, 1 delay 17 loopsewithpan SE_W166, 63, 16, 4 delay 48 @@ -3402,7 +3402,7 @@ Move_RAPID_SPIN:: @ 81CB4E1 loadspritegfx 10135 loadspritegfx 10229 monbg 0 - createsprite gUnknown_83FF068, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 + createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_80DEF9C, 2, 0, 2, 0 loopsewithpan SE_W013B, 192, 8, 4 waitforvisualfinish @@ -3601,15 +3601,15 @@ Move_FACADE:: @ 81CB8D6 Move_SMELLING_SALT:: @ 81CB8F6 loadspritegfx 10247 loadspritegfx 10255 - createsprite gUnknown_83FF644, ANIM_TARGET, 2, 1, 0, 2 - createsprite gUnknown_83FF644, ANIM_TARGET, 2, 1, 1, 2 + createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 0, 2 + createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 1, 2 delay 32 createvisualtask sub_80E28DC, 3, 1, 2 loopsewithpan SE_W003, 63, 12, 2 waitforvisualfinish delay 4 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 6, 2 - createsprite gUnknown_83FF674, ANIM_TARGET, 2, 1, 8, 3 + createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, 1, 8, 3 loopsewithpan SE_W207B, 63, 16, 3 end @@ -3681,8 +3681,8 @@ Move_TAUNT:: @ 81CBA0B Move_HELPING_HAND:: @ 81CBA5F loadspritegfx 10247 createvisualtask sub_80E2CE4, 5, - createsprite gUnknown_83FF68C, ANIM_ATTACKER, 40, 0 - createsprite gUnknown_83FF68C, ANIM_ATTACKER, 40, 1 + createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 + createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1 delay 19 playsewithpan SE_W227, 0 createvisualtask AnimTask_ShakeMon2, 2, 2, 2, 0, 5, 1 @@ -3697,18 +3697,18 @@ Move_HELPING_HAND:: @ 81CBA5F Move_ASSIST:: @ 81CBAD2 loadspritegfx 10252 - createsprite gUnknown_83FF5E4, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 + createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 - createsprite gUnknown_83FF5E4, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 + createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 playsewithpan SE_W010, 0 delay 2 - createsprite gUnknown_83FF5E4, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36 + createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36 playsewithpan SE_W010, 0 delay 2 - createsprite gUnknown_83FF5E4, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36 + createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36 playsewithpan SE_W010, 0 delay 2 - createsprite gUnknown_83FF5E4, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36 + createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36 playsewithpan SE_W010, 0 end @@ -3751,7 +3751,7 @@ Move_RECYCLE:: @ 81CBBFE monbg 0 setalpha 0, 16 delay 1 - createsprite gUnknown_83FF790, ANIM_ATTACKER, 2, + createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2, loopsewithpan SE_W036, 192, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 32767, 12, 2, 1 @@ -3837,12 +3837,12 @@ Move_YAWN:: @ 81CBE37 createvisualtask sub_80E1704, 2, 0 playsewithpan SE_W281, 192 waitforvisualfinish - createsprite gUnknown_83FF46C, ANIM_TARGET, 5, 2 + createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2 playsewithpan SE_W255, 192 delay 4 - createsprite gUnknown_83FF46C, ANIM_TARGET, 5, 1 + createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1 delay 4 - createsprite gUnknown_83FF46C, ANIM_TARGET, 5, 0 + createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0 waitforvisualfinish createvisualtask sub_80E1704, 2, 1 playsewithpan SE_W281, 63 @@ -4436,7 +4436,7 @@ Move_IRON_DEFENSE:: @ 81CCCA3 Move_BLOCK:: @ 81CCCCD loadspritegfx 10250 - createsprite gUnknown_83FF6EC, ANIM_TARGET, 66, + createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66, playsewithpan SE_W207, 63 end @@ -4695,8 +4695,8 @@ Move_MIND_READER:: @ 81CD1A8 loadspritegfx 10191 monbg 4 playsewithpan SE_W109, 63 - createsprite gUnknown_83FEE5C, ANIM_ATTACKER, 5, 0, 0, 1, 0 - createsprite gUnknown_83FEE74, ANIM_ATTACKER, 5, + createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0 + createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5, delay 40 playsewithpan SE_W043, 63 createvisualtask sub_80B9BDC, 2, 1, 1, 2, 0, 10, 0 @@ -4706,26 +4706,26 @@ Move_MIND_READER:: @ 81CD1A8 end gUnknown_81CD1EF:: @ 81CD1EF - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 70, 0, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 40, 40, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 10, -60, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, -50, -40, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, -40, 40, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 50, -50, 6 - delay 2 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 50, -30, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 60, 10, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 0, 60, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 0, -40, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, -60, 20, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, -60, -30, 6 - delay 2 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, -50, 50, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, -60, 20, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, -40, -40, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 20, -60, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 50, -50, 6 - createsprite gUnknown_83FEE8C, ANIM_ATTACKER, 4, 35, 40, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 70, 0, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 40, 40, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 10, -60, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -50, -40, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -40, 40, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 50, -50, 6 + delay 2 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 50, -30, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 60, 10, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0, 60, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0, -40, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -60, 20, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -60, -30, 6 + delay 2 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -50, 50, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -60, 20, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -40, -40, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 20, -60, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 50, -50, 6 + createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 35, 40, 6 delay 2 return @@ -5000,7 +5000,7 @@ Move_SCRATCH:: @ 81CD97A monbg 1 setalpha 12, 8 playsewithpan SE_W010, 63 - createsprite gUnknown_83FEE00, ANIM_ATTACKER, 2, 0, 0, 1, 0 + createsprite gScratchSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish clearmonbg 1 @@ -5061,13 +5061,13 @@ Move_ROAR:: @ 81CDAC0 end gUnknown_81CDB06:: @ 81CDB06 - createsprite gUnknown_83FF5B4, ANIM_ATTACKER, 2, 24, -8, 0 - createsprite gUnknown_83FF5B4, ANIM_ATTACKER, 2, 24, 0, 2 - createsprite gUnknown_83FF5B4, ANIM_ATTACKER, 2, 24, 8, 1 + createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0 + createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2 + createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1 delay 15 - createsprite gUnknown_83FF5B4, ANIM_ATTACKER, 2, 24, -8, 0 - createsprite gUnknown_83FF5B4, ANIM_ATTACKER, 2, 24, 0, 2 - createsprite gUnknown_83FF5B4, ANIM_ATTACKER, 2, 24, 8, 1 + createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0 + createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2 + createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1 return Move_GROWL:: @ 81CDB57 @@ -6192,14 +6192,14 @@ Move_SPIKES:: @ 81CF503 monbg 3 playsewithpan SE_W026, 192 waitplaysewithpan SE_W030, 63, 28 - createsprite gUnknown_83FEEFC, ANIM_TARGET, 2, 20, 0, 0, 24, 30 + createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 30 delay 10 playsewithpan SE_W026, 192 waitplaysewithpan SE_W030, 63, 28 - createsprite gUnknown_83FEEFC, ANIM_TARGET, 2, 20, 0, -24, 24, 30 + createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, -24, 24, 30 delay 10 waitplaysewithpan SE_W030, 63, 28 - createsprite gUnknown_83FEEFC, ANIM_TARGET, 2, 20, 0, 24, 24, 30 + createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg 3 end @@ -7099,7 +7099,7 @@ Move_LEER:: @ 81D09C8 monbgprio_28 0 setalpha 8, 8 playsewithpan SE_W043, 192 - createsprite gUnknown_83FEF30, ANIM_ATTACKER, 2, 24, -12 + createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 24, -12 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1 waitforvisualfinish delay 10 @@ -8039,7 +8039,7 @@ Move_BATON_PASS:: @ 81D1F1F loadspritegfx 10226 playsewithpan SE_W226, 192 createvisualtask sub_80B9BDC, 2, 31, 1, 2, 0, 11, 31455 - createsprite gUnknown_83FF150, ANIM_ATTACKER, 2, + createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2, end Move_PERISH_SONG:: @ 81D1F41 @@ -8082,26 +8082,26 @@ Move_SLEEP_TALK:: @ 81D20AA loadspritegfx 10228 createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 - createsprite gUnknown_83FEF70, ANIM_TARGET, 2, 0, 20, 5, -1 + createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 playsewithpan SE_W173, 192 delay 6 - createsprite gUnknown_83FEF70, ANIM_TARGET, 2, 0, 20, 5, -1 + createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 delay 6 - createsprite gUnknown_83FEF70, ANIM_TARGET, 2, 0, 20, 5, -1 + createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 delay 20 - createsprite gUnknown_83FEF70, ANIM_TARGET, 2, 0, 20, 5, -5 + createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 playsewithpan SE_W173, 192 delay 6 - createsprite gUnknown_83FEF70, ANIM_TARGET, 2, 0, 20, 5, -5 + createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 delay 6 - createsprite gUnknown_83FEF70, ANIM_TARGET, 2, 0, 20, 5, -5 + createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 delay 20 - createsprite gUnknown_83FEF70, ANIM_TARGET, 2, 0, 20, 5, -3 + createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 playsewithpan SE_W173, 192 delay 6 - createsprite gUnknown_83FEF70, ANIM_TARGET, 2, 0, 20, 5, -3 + createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 delay 6 - createsprite gUnknown_83FEF70, ANIM_TARGET, 2, 0, 20, 5, -3 + createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 waitforvisualfinish end @@ -8118,7 +8118,7 @@ Move_HYPER_FANG:: @ 81D2165 gUnknown_81D2193:: @ 81D2193 waitbgfadeout - createsprite gUnknown_83FEFBC, ANIM_TARGET, 2, + createsprite gFangSpriteTemplate, ANIM_TARGET, 2, waitbgfadein createvisualtask AnimTask_ShakeMon, 3, 1, 0, 10, 10, 1 playsewithpan SE_W043, 63 @@ -8142,7 +8142,7 @@ gUnknown_81D21C5:: @ 81D21C5 Move_TRI_ATTACK:: @ 81D21CC loadspritegfx 10230 - createsprite gUnknown_83FF0D8, ANIM_TARGET, 2, 16, 0 + createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0 playsewithpan SE_W161, 192 delay 20 playsewithpan SE_W161, 192 @@ -8226,11 +8226,11 @@ Move_ENCORE:: @ 81D23FE createvisualtask sub_80DEDD8, 2, createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite gUnknown_83FF00C, ANIM_TARGET, 2, 0, -8 - createsprite gUnknown_83FF024, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 - createsprite gUnknown_83FF024, ANIM_ATTACKER, 2, 2, 0, 1, 0, 9 - createsprite gUnknown_83FF03C, ANIM_ATTACKER, 3, -2, 0, 0, 0, 9 - createsprite gUnknown_83FF03C, ANIM_ATTACKER, 3, 2, 0, 1, 0, 9 + createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8 + createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 + createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 1, 0, 9 + createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, -2, 0, 0, 0, 9 + createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, 2, 0, 1, 0, 9 delay 16 createvisualtask sub_80DD410, 5, 216, 63 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, 1 @@ -8274,7 +8274,7 @@ Move_WISH:: @ 81D2523 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish panse_27 SE_W115, 63, 192, 253, 0 - createsprite gUnknown_83FF168, ANIM_ATTACKER, 40, + createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40, waitforvisualfinish delay 60 loopsewithpan SE_W215, 192, 16, 3 @@ -8383,15 +8383,15 @@ gUnknown_81D27AF:: @ 81D27AF end gUnknown_81D27B6:: @ 81D27B6 - createsprite gUnknown_83FF1F8, ANIM_ATTACKER, 2, 0, -8 + createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -8 delay 1 - createsprite gUnknown_83FF1F8, ANIM_ATTACKER, 2, -24, -8 + createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, -24, -8 delay 1 - createsprite gUnknown_83FF1F8, ANIM_ATTACKER, 2, 16, -8 + createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 16, -8 delay 1 - createsprite gUnknown_83FF1F8, ANIM_ATTACKER, 2, -16, -8 + createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, -16, -8 delay 1 - createsprite gUnknown_83FF1F8, ANIM_ATTACKER, 2, 24, -8 + createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 24, -8 delay 1 return @@ -8442,18 +8442,18 @@ Move_MORNING_SUN:: @ 81D2829 end gUnknown_81D28AF:: @ 81D28AF - createsprite gUnknown_83FF26C, ANIM_ATTACKER, 2, 30, 640 + createsprite gGreenStarSpriteTemplate, ANIM_ATTACKER, 2, 30, 640 delay 5 return Move_SWEET_SCENT:: @ 81D28BD loadspritegfx 10238 playsewithpan SE_W230, 192 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 100, 0, 100 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 call gUnknown_81D2901 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 55, 0 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 55, 0 setpan 63 createvisualtask sub_80B9BDC, 2, 20, 1, 5, 5, 13, 22207 call gUnknown_81D2901 @@ -8461,27 +8461,27 @@ Move_SWEET_SCENT:: @ 81D28BD end gUnknown_81D2901:: @ 81D2901 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 70, 1, 64 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 70, 1, 64 delay 2 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 60, 0, 64 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 60, 0, 64 delay 5 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 80, 1, 64 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 80, 1, 64 delay 2 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 58, 0, 120 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 58, 0, 120 delay 2 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 100, 0, 120 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120 delay 2 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 90, 0, 64 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 90, 0, 64 delay 2 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 48, 0, 64 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 48, 0, 64 delay 2 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 95, 1, 80 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 95, 1, 80 delay 2 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 100, 0, 120 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120 delay 2 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 75, 1, 64 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 75, 1, 64 delay 2 - createsprite gUnknown_83FF324, ANIM_ATTACKER, 2, 85, 0, 120 + createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 85, 0, 120 delay 2 return @@ -8543,7 +8543,7 @@ Move_FLATTER:: @ 81D2AE9 createvisualtask sub_80DEDD8, 2, createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 waitforvisualfinish - createsprite gUnknown_83FF3A0, ANIM_TARGET, 2, 0, -8, 80 + createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 delay 0 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, 1 delay 10 @@ -8578,8 +8578,8 @@ Move_FLATTER:: @ 81D2AE9 end gUnknown_81D2BD2:: @ 81D2BD2 - createsprite gUnknown_83FF388, ANIM_ATTACKER, 40, 0 - createsprite gUnknown_83FF388, ANIM_ATTACKER, 40, 1 + createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, 0 + createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, 1 return Move_ROLE_PLAY:: @ 81D2BE5 @@ -8861,12 +8861,12 @@ Move_METEOR_MASH:: @ 81D32D6 fadetobg 16 waitbgfadein waitforvisualfinish - createsprite gUnknown_83FF6BC, ANIM_TARGET, 3, -48, -64, 72, 32, 30 + createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -48, -64, 72, 32, 30 delay 10 - createsprite gUnknown_83FF6BC, ANIM_TARGET, 3, -112, -64, 8, 32, 30 + createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -112, -64, 8, 32, 30 delay 40 createsprite gUnknown_83E678C, ANIM_TARGET, 3, 0, 0, 0, 30 - createsprite gUnknown_83FF6BC, ANIM_TARGET, 3, -80, -64, 40, 32, 30 + createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30 delay 20 playsewithpan SE_W233B, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 @@ -8911,7 +8911,7 @@ Move_POISON_FANG:: @ 81D33F4 loadspritegfx 10192 loadspritegfx 10150 playsewithpan SE_W044, 63 - createsprite gUnknown_83FEFBC, ANIM_TARGET, 2, + createsprite gFangSpriteTemplate, ANIM_TARGET, 2, delay 10 createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1 waitforvisualfinish @@ -9720,7 +9720,7 @@ Move_KNOCK_OFF:: @ 81D4A0F createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 playsewithpan SE_W233, 63 - createsprite gUnknown_83FF764, ANIM_TARGET, 2, -16, -16 + createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 @@ -10678,31 +10678,31 @@ General_SmokeballEscape:: @ 81D5E66 setalpha 12, 4 delay 0 playsewithpan SE_BOWA2, 63 - createsprite gUnknown_83FF514, ANIM_TARGET, 0, 0, 32, 28, 30 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30 delay 4 playsewithpan SE_BOWA2, 63 - createsprite gUnknown_83FF514, ANIM_ATTACKER, 127, 2, 12, 20, 30 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30 delay 12 playsewithpan SE_BOWA2, 63 - createsprite gUnknown_83FF514, ANIM_ATTACKER, 126, 2, -28, 4, 30 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30 delay 12 playsewithpan SE_BOWA2, 63 - createsprite gUnknown_83FF514, ANIM_ATTACKER, 124, 2, 14, -20, 30 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30 delay 4 playsewithpan SE_BOWA2, 63 createvisualtask sub_80B78E0, 2, 2 - createsprite gUnknown_83FF514, ANIM_ATTACKER, 123, 3, 4, 4, 30 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30 delay 14 playsewithpan SE_BOWA2, 63 - createsprite gUnknown_83FF514, ANIM_ATTACKER, 122, 3, -14, 18, 46 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46 delay 0 - createsprite gUnknown_83FF514, ANIM_ATTACKER, 121, 3, 14, -14, 46 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46 delay 0 - createsprite gUnknown_83FF514, ANIM_ATTACKER, 120, 3, -12, -10, 46 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, -10, 46 delay 0 - createsprite gUnknown_83FF514, ANIM_ATTACKER, 119, 3, 14, 14, 46 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 14, 46 delay 0 - createsprite gUnknown_83FF514, ANIM_ATTACKER, 118, 3, 0, 0, 46 + createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 46 waitforvisualfinish clearmonbg 0 invisible 0 diff --git a/data/battle_anim_special.s b/data/battle_anim_special.s deleted file mode 100644 index 27d7636f6..000000000 --- a/data/battle_anim_special.s +++ /dev/null @@ -1,148 +0,0 @@ -#include "constants/region_map.h" -#include "constants/flags.h" -#include "constants/moves.h" -#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_840BF3C:: @ 840BF3C - .byte 10, 2, -3, 0 - .byte 15, 0, -4, 0 - .byte -10, 2, -4, 0 - -gUnknown_840BF48:: @ 840BF48 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55020 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55021 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55022 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55023 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55024 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55025 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55026 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55027 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55028 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55029 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55030 - obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55031 - -gUnknown_840BFA8:: @ 840BFA8 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55020 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55021 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55022 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55023 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55024 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55025 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55026 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55027 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55028 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55029 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55030 - obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55031 - -gAnimCmd_840C008:: @ 840C008 - obj_image_anim_frame 0x0000, 1 - obj_image_anim_frame 0x0001, 1 - obj_image_anim_frame 0x0002, 1 - obj_image_anim_frame 0x0000, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0x0002, 1 - obj_image_anim_frame 0x0001, 1 - obj_image_anim_jump 0x0000 - -gAnimCmd_840C024:: @ 840C024 - obj_image_anim_frame 0x0003, 1 - obj_image_anim_end - -gAnimCmd_840C02C:: @ 840C02C - obj_image_anim_frame 0x0004, 1 - obj_image_anim_end - -gAnimCmd_840C034:: @ 840C034 - obj_image_anim_frame 0x0005, 1 - obj_image_anim_end - -gAnimCmd_840C03C:: @ 840C03C - obj_image_anim_frame 0x0006, 4 - obj_image_anim_frame 0x0007, 4 - obj_image_anim_jump 0x0000 - -gAnimCmd_840C048:: @ 840C048 - obj_image_anim_frame 0x0007, 4 - obj_image_anim_end - -gSpriteAnimTable_840C050:: - .4byte gAnimCmd_840C008 - .4byte gAnimCmd_840C024 - .4byte gAnimCmd_840C02C - .4byte gAnimCmd_840C034 - .4byte gAnimCmd_840C03C - .4byte gAnimCmd_840C048 - -gUnknown_840C068:: @ 840C068 - .byte 0x00, 0x00, 0x00, 0x05, 0x01, 0x02, 0x02, 0x03, 0x05, 0x05, 0x04, 0x04 - -gUnknown_840C074:: @ 840C074 - .4byte sub_80F06A4 - .4byte sub_80F0C28 - .4byte sub_80F0A20 - .4byte sub_80F0B20 - .4byte sub_80F0F10 - .4byte sub_80F0A20 - .4byte sub_80F091C - .4byte sub_80F0B20 - .4byte sub_80F0DB4 - .4byte sub_80F0818 - .4byte sub_80F0C28 - .4byte sub_80F103C - -gUnknown_840C0A4:: @ 840C0A4 - spr_template 55020, 55020, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_840C0BC:: - spr_template 55021, 55021, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55022, 55022, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55023, 55023, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_840C104:: @ 840C104 - spr_template 55024, 55024, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55025, 55025, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55026, 55026, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55027, 55027, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55028, 55028, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55029, 55029, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55030, 55030, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - spr_template 55031, 55031, gOamData_AffineOff_ObjNormal_8x8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_840C1C4:: @ 840C1C4 - .2byte RGB(31, 22, 30) - .2byte RGB(16, 23, 30) - .2byte RGB(23, 30, 20) - .2byte RGB(31, 31, 15) - .2byte RGB(23, 20, 28) - .2byte RGB(21, 31, 25) - .2byte RGB(12, 25, 30) - .2byte RGB(30, 27, 10) - .2byte RGB(31, 24, 16) - .2byte RGB(29, 30, 30) - .2byte RGB(31, 17, 10) - .2byte RGB(31, 9, 10) - -gUnknown_840C1DC:: @ 840C1DC - .byte 0x00, 0x00, 0x01, 0x02, 0x03 - .byte 0x04, 0x01, 0x01, 0x00, 0x01 - .byte 0x03, 0x05, 0x06, 0x05, 0x04 - - .align 2 -gUnknown_840C1EC:: - spr_template 10269, 10269, gOamData_AffineOff_ObjNormal_16x16, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C - -gUnknown_840C204:: - obj_image_anim_frame 0x0040, 1 - obj_image_anim_end - -gSpriteAnimTable_840C20C:: - .4byte gUnknown_840C204 - -gUnknown_840C210:: - spr_template 10058, 10058, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_840C20C, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C - -- cgit v1.2.3 From 5c40e5ea212c947b1853a8c8dc23dcb8d882bf90 Mon Sep 17 00:00:00 2001 From: Evan Date: Mon, 2 Dec 2019 17:58:49 -0700 Subject: battle_anim_status_effects --- data/battle_anim_scripts.s | 86 ++++++++++++++--------------- data/battle_anim_status_effects.s | 110 -------------------------------------- 2 files changed, 43 insertions(+), 153 deletions(-) delete mode 100644 data/battle_anim_status_effects.s (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index c3c6399dc..5a95235c9 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1786,7 +1786,7 @@ gUnknown_81C910A:: @ 81C910A createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 - createvisualtask sub_80E0488, 5, + createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5, delay 7 playsewithpan SE_W004, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1 @@ -1856,22 +1856,22 @@ Move_PAIN_SPLIT:: @ 81C92D9 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, 1 delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_80E0B00, 2, 0, 0 - createvisualtask sub_80E0B00, 2, 1, 0 + createvisualtask AnimTask_PainSplitMovement, 2, 0, 0 + createvisualtask AnimTask_PainSplitMovement, 2, 1, 0 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, 1 delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_80E0B00, 2, 0, 1 - createvisualtask sub_80E0B00, 2, 1, 1 + createvisualtask AnimTask_PainSplitMovement, 2, 0, 1 + createvisualtask AnimTask_PainSplitMovement, 2, 1, 1 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, 1 delay 10 playsewithpan SE_W207B, 0 - createvisualtask sub_80E0B00, 2, 0, 2 - createvisualtask sub_80E0B00, 2, 1, 2 + createvisualtask AnimTask_PainSplitMovement, 2, 0, 2 + createvisualtask AnimTask_PainSplitMovement, 2, 1, 2 end Move_VICE_GRIP:: @ 81C9381 @@ -2307,7 +2307,7 @@ Move_SMOKESCREEN:: @ 81C9EB0 playsewithpan SE_W104, 192 createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish - createvisualtask sub_80DE34C, 2, + createvisualtask AnimTask_SmokescreenImpact, 2, delay 2 playsewithpan SE_W028, 63 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 104, 0, 75 @@ -2592,7 +2592,7 @@ Move_THRASH:: @ 81CA521 Move_SING:: @ 81CA5A0 loadspritegfx 10072 monbg 3 - createvisualtask sub_80A65E8, 2, + createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish panse_1B SE_W047, 192, 63, 2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 0, 12 @@ -2939,14 +2939,14 @@ Move_KINESIS:: @ 81CAC19 Move_GLARE:: @ 81CAC6A loadspritegfx 10248 loadspritegfx 10218 - createvisualtask sub_80E21CC, 5, 0 + createvisualtask AnimTask_GlareEyeDots, 5, 0 playsewithpan SE_W060B, 192 waitforvisualfinish createvisualtask sub_80BA7F8, 5, 1, 0, 0, 16, 0 waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 - createvisualtask sub_80A9F10, 5, + createvisualtask AnimTask_ScaryFace, 5, playsewithpan SE_W043, 192 delay 2 createvisualtask sub_80ADAD8, 3, 20, 1, 0 @@ -2956,7 +2956,7 @@ Move_GLARE:: @ 81CAC6A Move_BARRAGE:: @ 81CACD3 loadspritegfx 10254 - createvisualtask sub_80E2518, 3, + createvisualtask AnimTask_BarrageBall, 3, playsewithpan SE_W207, 192 delay 24 createsprite gUnknown_83E7B88, ANIM_ATTACKER, 2, 8, 1, 40, 1 @@ -3052,7 +3052,7 @@ Move_SPLASH:: @ 81CAEC0 Move_ACID_ARMOR:: @ 81CAED5 monbg 0 setalpha 15, 0 - createvisualtask sub_80E12F8, 2, 0 + createvisualtask AnimTask_AcidArmor, 2, 0 playsewithpan SE_W151, 192 waitforvisualfinish blendoff @@ -3153,7 +3153,7 @@ Move_FLAIL:: @ 81CB099 loadspritegfx 10135 monbg 1 setalpha 12, 8 - createvisualtask sub_80E0850, 2, 0 + createvisualtask AnimTask_FlailMovement, 2, 0 loopsewithpan SE_W029, 192, 8, 2 waitforvisualfinish createsprite gUnknown_83E7C50, ANIM_TARGET, 3, 1, 3 @@ -3278,7 +3278,7 @@ gUnknown_81CB267:: @ 81CB267 Move_CHARM:: @ 81CB2BB loadspritegfx 10210 - createvisualtask sub_80E0558, 5, 0, 2, 0 + createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, 192 delay 15 @@ -3593,8 +3593,8 @@ Move_MEMENTO:: @ 81CB892 Move_FACADE:: @ 81CB8D6 loadspritegfx 10243 - createvisualtask sub_80E1D5C, 2, 0, 3 - createvisualtask sub_80E1FC4, 2, 0, 72 + createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 3 + createvisualtask AnimTask_FacadeColorBlend, 2, 0, 72 loopsewithpan SE_W207, 192, 24, 3 end @@ -3604,7 +3604,7 @@ Move_SMELLING_SALT:: @ 81CB8F6 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 0, 2 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 1, 2 delay 32 - createvisualtask sub_80E28DC, 3, 1, 2 + createvisualtask AnimTask_SmellingSaltsSquish, 3, 1, 2 loopsewithpan SE_W003, 63, 12, 2 waitforvisualfinish delay 4 @@ -3680,7 +3680,7 @@ Move_TAUNT:: @ 81CBA0B Move_HELPING_HAND:: @ 81CBA5F loadspritegfx 10247 - createvisualtask sub_80E2CE4, 5, + createvisualtask AnimTask_HelpingHandAttackerMovement, 5, createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1 delay 19 @@ -3834,7 +3834,7 @@ gUnknown_81CBD16:: @ 81CBD16 Move_YAWN:: @ 81CBE37 loadspritegfx 10242 - createvisualtask sub_80E1704, 2, 0 + createvisualtask AnimTask_DeepInhale, 2, 0 playsewithpan SE_W281, 192 waitforvisualfinish createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2 @@ -3844,14 +3844,14 @@ Move_YAWN:: @ 81CBE37 delay 4 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0 waitforvisualfinish - createvisualtask sub_80E1704, 2, 1 + createvisualtask AnimTask_DeepInhale, 2, 1 playsewithpan SE_W281, 63 end Move_ENDEAVOR:: @ 81CBE7A loadspritegfx 10243 loadspritegfx 10135 - createvisualtask sub_80E1D5C, 2, 0, 2 + createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 2 loopsewithpan SE_W039, 192, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 703, 12, 1, 2 delay 6 @@ -4059,7 +4059,7 @@ Move_FEATHER_DANCE:: @ 81CC2A1 Move_TEETER_DANCE:: @ 81CC371 loadspritegfx 10072 loadspritegfx 10073 - createvisualtask sub_80E4160, 5, + createvisualtask AnimTask_TeeterDanceMovement, 5, createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 playsewithpan SE_W298, 192 delay 24 @@ -4168,7 +4168,7 @@ Move_NEEDLE_ARM:: @ 81CC513 Move_SLACK_OFF:: @ 81CC6C3 loadspritegfx 10031 - createvisualtask sub_80E4540, 2, 0 + createvisualtask AnimTask_SlackOffSquish, 2, 0 playsewithpan SE_W281, 192 waitforvisualfinish call gUnknown_81D56C9 @@ -4242,7 +4242,7 @@ Move_FAKE_TEARS:: @ 81CC8AD loadspritegfx 10072 createvisualtask AnimTask_BlendParticle, 5, 10155, 0, 4, 4, 32108 waitforvisualfinish - createvisualtask sub_80E0558, 5, 0, 2, 1 + createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 1 loopsewithpan SE_W039, 192, 12, 4 delay 8 createsprite gUnknown_83E7998, ANIM_ATTACKER, 2, 0, 0 @@ -4267,7 +4267,7 @@ Move_AIR_CUTTER:: @ 81CC93D monbg 3 setalpha 12, 8 delay 0 - createvisualtask sub_80A76F0, 2, 32, -24, 1536, 2, 128 + createvisualtask AnimTask_AirCutterProjectile, 2, 32, -24, 1536, 2, 128 waitforvisualfinish playsewithpan SE_W015, 63 createsprite gAirCutterSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0, 2 @@ -4282,7 +4282,7 @@ Move_AIR_CUTTER:: @ 81CC93D Move_ODOR_SLEUTH:: @ 81CC99F monbg 1 - createvisualtask sub_80E3664, 5, + createvisualtask AnimTask_OdorSleuthMovement, 5, delay 24 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 playsewithpan SE_W207, 192 @@ -4300,7 +4300,7 @@ Move_GRASS_WHISTLE:: @ 81CC9E9 loadspritegfx 10072 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 13298 waitforvisualfinish - createvisualtask sub_80A65E8, 2, + createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish panse_1B SE_W320, 192, 63, 2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 1, 0 @@ -4346,7 +4346,7 @@ Move_TICKLE:: @ 81CCADC delay 20 createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, 0 delay 12 - createvisualtask sub_80E0558, 3, 1, 6, 2 + createvisualtask AnimTask_RockMonBackAndForth, 3, 1, 6, 2 loopsewithpan SE_W039, 63, 8, 8 waitforvisualfinish end @@ -4442,7 +4442,7 @@ Move_BLOCK:: @ 81CCCCD Move_HOWL:: @ 81CCCDC loadspritegfx 10053 - createvisualtask sub_80E1704, 2, 0 + createvisualtask AnimTask_DeepInhale, 2, 0 delay 12 call gUnknown_81CDB06 createvisualtask sub_80DD06C, 2, 0, 3 @@ -4463,7 +4463,7 @@ Move_BULK_UP:: @ 81CCCFE Move_COVET:: @ 81CCD1C loadspritegfx 10210 loadspritegfx 10224 - createvisualtask sub_80E0558, 5, 0, 2, 0 + createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, 192 delay 15 @@ -4564,7 +4564,7 @@ Move_CALM_MIND:: @ 81CCE97 Move_LEAF_BLADE:: @ 81CCF17 loadspritegfx 10063 loadspritegfx 10285 - createvisualtask sub_80A39C0, 5, + createvisualtask AnimTask_LeafBlade, 5, delay 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 playsewithpan SE_W015, 63 @@ -4649,7 +4649,7 @@ Move_HARDEN:: @ 81CD0AB Move_BELLY_DRUM:: @ 81CD0C0 loadspritegfx 10072 loadspritegfx 10193 - createvisualtask sub_80A65E8, 2, + createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish call gUnknown_81CD18D createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 @@ -7887,7 +7887,7 @@ Move_SCARY_FACE:: @ 81D1BA0 waitforvisualfinish delay 10 playsewithpan SE_W043, 192 - createvisualtask sub_80A9F10, 5, + createvisualtask AnimTask_ScaryFace, 5, delay 13 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 @@ -8589,7 +8589,7 @@ Move_ROLE_PLAY:: @ 81D2BE5 waitforvisualfinish playsewithpan SE_W161, 192 waitplaysewithpan SE_W197, 192, 30 - createvisualtask sub_80E0FB8, 2, + createvisualtask AnimTask_RolePlaySilhouette, 2, waitforvisualfinish clearmonbg 2 createvisualtask sub_80BA7F8, 10, 4, 2, 16, 0, 32767 @@ -8922,7 +8922,7 @@ Move_POISON_FANG:: @ 81D33F4 Move_SUBSTITUTE:: @ 81D3433 playsewithpan SE_W213, 192 - createvisualtask sub_80E3294, 2, + createvisualtask AnimTask_MonToSubstitute, 2, end Move_FRENZY_PLANT:: @ 81D343F @@ -9064,7 +9064,7 @@ Move_RETURN:: @ 81D36FA loadspritegfx 10135 monbg 3 setalpha 12, 8 - createvisualtask sub_80E38D8, 2, + createvisualtask AnimTask_GetReturnPowerLevel, 2, delay 2 jumpargeq 7, 0, gUnknown_81D3730 jumpargeq 7, 1, gUnknown_81D3782 @@ -9757,7 +9757,7 @@ Move_DOOM_DESIRE:: @ 81D4A9F createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, 32767 waitforvisualfinish delay 10 - createvisualtask sub_80E017C, 5, + createvisualtask AnimTask_DoomDesireLightBeam, 5, delay 5 playsewithpan SE_W109, 192 delay 10 @@ -10044,7 +10044,7 @@ Move_WEATHER_BALL:: @ 81D515D playsewithpan SE_W197, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 waitforvisualfinish - createvisualtask sub_80E44EC, 2, + createvisualtask AnimTask_GetWeather, 2, delay 1 jumpargeq 7, 0, gUnknown_81D51C8 jumpargeq 7, 1, gUnknown_81D5205 @@ -10549,7 +10549,7 @@ General_SubstituteFade:: @ 81D5BC7 end General_SubstituteAppear:: @ 81D5C04 - createvisualtask sub_80E3294, 2, + createvisualtask AnimTask_MonToSubstitute, 2, end General_PokeblockThrow:: @ 81D5C0C @@ -10786,12 +10786,12 @@ gUnknown_81D6082:: @ 81D6082 gUnknown_81D6089:: @ 81D6089 playsewithpan SE_W104, 192 - createvisualtask sub_80E392C, 2, + createvisualtask AnimTask_SnatchOpposingMonMove, 2, goto gUnknown_81D6082 gUnknown_81D6099:: @ 81D6099 playsewithpan SE_W104, 192 - createvisualtask sub_80E3FC0, 2, + createvisualtask AnimTask_SnatchPartnerMove, 2, goto gUnknown_81D6082 General_FutureSightHit:: @ 81D60A9 @@ -10820,7 +10820,7 @@ General_DoomDesireHit:: @ 81D6108 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, 32767 waitforvisualfinish delay 10 - createvisualtask sub_80E017C, 5, + createvisualtask AnimTask_DoomDesireLightBeam, 5, delay 9 playsewithpan SE_W109, 192 delay 9 diff --git a/data/battle_anim_status_effects.s b/data/battle_anim_status_effects.s deleted file mode 100644 index f2fff9a3f..000000000 --- a/data/battle_anim_status_effects.s +++ /dev/null @@ -1,110 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_83BF3E0:: @ 83BF3DC - obj_image_anim_frame 0, 3 - obj_image_anim_frame 4, 3 - obj_image_anim_frame 8, 3 - obj_image_anim_frame 12, 3 - obj_image_anim_jump 0 - -gSpriteAnimTable_83BF3F4:: @ 83BF3F4 - .4byte gUnknown_83BF3E0 - -gSpriteTemplate_83BF3F8:: @ 83BF3F8 - spr_template 10004, 10004, gOamData_AffineOff_ObjNormal_16x16, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076F58 - -gSpriteTemplate_83BF410:: @ 83BF410 - spr_template 10004, 10004, gOamData_AffineOff_ObjNormal_16x16, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076ED8 - -gUnknown_83BF428:: @ 83BF428 - obj_image_anim_frame 0x0000, 3 - obj_image_anim_jump 0x0000 - -gSpriteAnimTable_83BF430:: @ 83BF430 - .4byte gUnknown_83BF428 - -gSpriteTemplate_83BF434:: @ 83BF434 - spr_template 10283, 10283, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_807729C - -gSpriteTemplate_83BF44C:: @ 83BF44C - spr_template 10283, 10283, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_8077350 - -gUnknown_83BF464:: @ 83BF464 - obj_image_anim_frame 0x0000, 3 - obj_image_anim_frame 0x0010, 3 - obj_image_anim_frame 0x0020, 3 - obj_image_anim_frame 0x0030, 3 - obj_image_anim_frame 0x0040, 3 - obj_image_anim_end - -gSpriteAnimTable_83BF47C:: @ 83BF47C - .4byte gUnknown_83BF464 - -gSpriteTemplate_83BF480:: @ 83BF480 - spr_template 10071, 10071, gOamData_AffineOff_ObjNormal_32x32, gSpriteAnimTable_83BF47C, NULL, gDummySpriteAffineAnimTable, sub_8076FD0 - -gSpriteTemplate_83BF498:: @ 83BF498 - spr_template 10051, 10051, gOamData_AffineOff_ObjNormal_32x32, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8076F58 - -gUnknown_83BF4B0:: @ 83BF4B0 - obj_image_anim_frame 0x0000, 5 - obj_image_anim_jump 0x0000 - -gUnknown_83BF4B8:: @ 83BF4B8 - obj_image_anim_frame 0x0000, 5 - obj_image_anim_jump 0x0000 - -gUnknown_83BF4C0:: @ 83BF4C0 - obj_image_anim_frame 0x0000, 5 - obj_image_anim_jump 0x0000 - -gSpriteAniimTable_83BF4C8:: @ 83BF4C8 - .4byte gUnknown_83BF4B0 - .4byte gUnknown_83BF4B8 - .4byte gUnknown_83BF4C0 - -gSpriteTemplate_83BF4D4:: @ 83BF4D4 - spr_template 10135, 10135, gOamData_AffineOff_ObjNormal_32x32, gSpriteAniimTable_83BF4C8, NULL, gDummySpriteAffineAnimTable, sub_8076F58 - -gUnknown_83BF4EC:: @ 83BF4EC - obj_image_anim_frame 0x0000, 15 - obj_image_anim_jump 0x0000 - -gSpriteAnimTable_83BF4F4:: @ 83BF4F4 - .4byte gUnknown_83BF4EC - -gUnknown_83BF4F8:: @ 83BF4F8 - obj_rot_scal_anim_frame 0x0060, 0x0060, 0x00, 0 - obj_rot_scal_anim_frame 0x0002, 0x0002, 0x00, 1 - obj_rot_scal_anim_jump 0x0001 - -gSpriteAffineAnimTable_83BF510:: @ 83BF510 - .4byte gUnknown_83BF4F8 - -gSpriteTemplate_83BF514:: @ 83BF514 - spr_template 10004, 10004, gOamData_AffineDouble_ObjNormal_16x16, gSpriteAnimTable_83BF4F4, NULL, gSpriteAffineAnimTable_83BF510, sub_8076ED8 - -gUnknown_83BF52C:: @ 83BF52C - .string "TASK OVER\n" - .string "タスクがオーバーしました$" - - .align 2 -gSubsprites_83BF544:: @ 83BF544 - subsprite 240, 240, 2, 0x00, 64x64 - subsprite 240, 48, 2, 0x40, 64x32 - subsprite 48, 240, 2, 0x60, 32x64 - subsprite 48, 48, 2, 0x80, 32x32 - -gUnknown_83BF554:: @ 83BF554 - .byte 4 - .align 2 - .4byte gSubsprites_83BF544 - -gUnknown_83BF55C:: @ 83BF55C - spr_template 10010, 10010, gOamData_AffineOff_ObjBlend_64x64, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_83BF574:: @ 83BF574 - spr_template 10136, 10136, gOamData_AffineOff_ObjNormal_8x8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807834C -- cgit v1.2.3 From f1bd7a41cc1e2bcd730a0c2c6c5c4c618044f631 Mon Sep 17 00:00:00 2001 From: Evan Date: Mon, 2 Dec 2019 20:58:12 -0700 Subject: resolve compiler errors --- data/graphics.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index 83530b67e..cd41ee295 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2464,7 +2464,7 @@ gFile_graphics_battle_anims_masks_cure_bubbles_sheet:: @ 8D2DE3C .incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz" .align 2 -gFile_graphics_battle_anims_masks_cure_bubbles_palette:: @ 8D2DF78 +gCureBubblesPal:: @ 8D2DF78 .incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz" .align 2 -- cgit v1.2.3 From 2453b88b9db93cf195c79f001c9c8ba22013fd6a Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 3 Dec 2019 10:54:47 -0700 Subject: resolve compiler errors --- data/battle_anim_scripts.s | 44 ++++++++++++++++++++++---------------------- data/graphics.s | 30 +++++++++++++++--------------- 2 files changed, 37 insertions(+), 37 deletions(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 5a95235c9..1f2932fd2 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -970,7 +970,7 @@ gUnknown_81C7D89:: @ 81C7D89 delay 2 createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, gUnknown_81C7DC0 - createvisualtask sub_80DEAB4, 2, + createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, gUnknown_81C7DB2 jumpargeq 7, 1, gUnknown_81C7DB9 @@ -1444,12 +1444,12 @@ Move_FURY_CUTTER:: @ 81C88EA monbg 1 setalpha 12, 8 playsewithpan SE_W013, 63 - createvisualtask sub_80AAB7C, 2, + createvisualtask AnimTask_IsFuryCutterHitRight, 2, jumpargeq 7, 0, gUnknown_81C8947 goto gUnknown_81C8959 gUnknown_81C890A:: @ 81C890A - createvisualtask update_fury_cutter_counter_copy, 2, + createvisualtask AnimTask_GetFuryCutterHitCount, 2, jumpargeq 7, 1, gUnknown_81C892E jumpargeq 7, 2, gUnknown_81C896B jumpargeq 7, 3, gUnknown_81C8985 @@ -1689,7 +1689,7 @@ Move_DEFENSE_CURL:: @ 81C8F1C loadspritegfx 10234 loopsewithpan SE_W161, 192, 18, 3 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 0 - createvisualtask sub_80DF524, 5, + createvisualtask AnimTask_DefenseCurlDeformMon, 5, waitforvisualfinish createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1 waitforvisualfinish @@ -2041,7 +2041,7 @@ Move_ATTRACT:: @ 81C985A createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 waitforvisualfinish waitplaysewithpan SE_W213B, 0, 15 - createvisualtask sub_80A9CE8, 5, + createvisualtask AnimTask_HeartsBackground, 5, createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 126, 272, 30 @@ -2370,7 +2370,7 @@ Move_CONVERSION:: @ 81C9FA9 playsewithpan SE_W112, 192 createvisualtask sub_80B9F6C, 2, 10018, 1, 1, 14335, 12, 0, 0 delay 6 - createvisualtask sub_80A5CD4, 5, + createvisualtask AnimTask_ConversionAlphaBlend, 5, waitforvisualfinish delay 1 clearmonbg 2 @@ -2400,7 +2400,7 @@ Move_CONVERSION_2:: @ 81CA0BE createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 24, 125 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 24, 130 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135 - createvisualtask sub_80A5DE0, 5, + createvisualtask AnimTask_Conversion2AlphaBlend, 5, delay 60 playsewithpan SE_W129, 63 delay 10 @@ -2574,8 +2574,8 @@ gUnknown_81CA50A:: @ 81CA50A Move_THRASH:: @ 81CA521 loadspritegfx 10135 loadspritegfx 10143 - createvisualtask sub_80A8638, 2, - createvisualtask sub_80A86A4, 2, + createvisualtask AnimTask_ThrashMoveMonHorizontal, 2, + createvisualtask AnimTask_ThrashMoveMonVertical, 2, createsprite gUnknown_83E6728, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 4, 0, 7, 1 playsewithpan SE_W004, 63 @@ -2621,7 +2621,7 @@ Move_SING:: @ 81CA5A0 delay 4 waitforvisualfinish clearmonbg 3 - createvisualtask sub_80A66A0, 2, + createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, waitforvisualfinish end @@ -2824,7 +2824,7 @@ Move_TELEPORT:: @ 81CAA92 Move_DOUBLE_TEAM:: @ 81CAAAB monbg 2 setalpha 12, 8 - createvisualtask sub_80A63B4, 2, + createvisualtask AnimTask_DoubleTeam, 2, playsewithpan SE_W104, 192 delay 32 playsewithpan SE_W104, 192 @@ -2850,7 +2850,7 @@ Move_DOUBLE_TEAM:: @ 81CAAAB Move_MINIMIZE:: @ 81CAAF2 setalpha 10, 8 - createvisualtask sub_80A8074, 2, + createvisualtask AnimTask_Minimize, 2, loopsewithpan SE_W107, 192, 34, 3 waitforvisualfinish blendoff @@ -2892,7 +2892,7 @@ gUnknown_81CAB49:: @ 81CAB49 gUnknown_81CAB86:: @ 81CAB86 loadspritegfx 10135 - createvisualtask sub_80A5694, 2, 0 + createvisualtask AnimTask_SkullBashPosition, 2, 0 playsewithpan SE_W036, 192 waitforvisualfinish playse SE_BAN @@ -2902,7 +2902,7 @@ gUnknown_81CAB86:: @ 81CAB86 createsprite gUnknown_83E7C98, ANIM_TARGET, 4, 0, 0, 1, 0 loopsewithpan SE_W025B, 63, 8, 3 waitforvisualfinish - createvisualtask sub_80A5694, 2, 1 + createvisualtask AnimTask_SkullBashPosition, 2, 1 goto gUnknown_81CAB38 Move_AMNESIA:: @ 81CABF5 @@ -3043,7 +3043,7 @@ Move_FLASH:: @ 81CAEB3 end Move_SPLASH:: @ 81CAEC0 - createvisualtask sub_80A8338, 2, 0, 3 + createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 loopsewithpan SE_W039, 192, 38, 3 waitforvisualfinish @@ -3122,7 +3122,7 @@ Move_SKETCH:: @ 81CB01B createsprite gPencilSpriteTemplate, ANIM_TARGET, 2, waitforvisualfinish clearmonbg 1 - createvisualtask sub_80A8338, 2, 0, 2 + createvisualtask AnimTask_Splash, 2, 0, 2 loopsewithpan SE_W039, 192, 38, 2 end @@ -4078,7 +4078,7 @@ Move_TEETER_DANCE:: @ 81CC371 Move_MUD_SPORT:: @ 81CC3DC loadspritegfx 10074 - createvisualtask sub_80A8338, 2, 0, 6 + createvisualtask AnimTask_Splash, 2, 0, 6 delay 24 createsprite gUnknown_83E7A94, ANIM_TARGET, 2, 0, -4, -16 createsprite gUnknown_83E7A94, ANIM_TARGET, 2, 0, 4, -12 @@ -4328,7 +4328,7 @@ Move_GRASS_WHISTLE:: @ 81CC9E9 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 1, 0 delay 4 waitforvisualfinish - createvisualtask sub_80A66A0, 2, + createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, 13298 waitforvisualfinish end @@ -4675,7 +4675,7 @@ Move_BELLY_DRUM:: @ 81CD0C0 createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0 playsewithpan SE_W187, 192 waitforvisualfinish - createvisualtask sub_80A66A0, 2, + createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, waitforvisualfinish end @@ -8112,7 +8112,7 @@ Move_HYPER_FANG:: @ 81D2165 delay 2 createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, gUnknown_81D21C5 - createvisualtask sub_80DEAB4, 2, + createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, gUnknown_81D21B7 goto gUnknown_81D21BE @@ -9019,7 +9019,7 @@ gUnknown_81D363A:: @ 81D363A delay 1 createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, gUnknown_81D36F3 - createvisualtask sub_80DEAB4, 2, + createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, gUnknown_81D36E5 jumpargeq 7, 1, gUnknown_81D36EC @@ -10405,7 +10405,7 @@ gUnknown_81D59FF:: @ 81D59FF gUnknown_81D5A07:: @ 81D5A07 createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, gUnknown_81D5A2C - createvisualtask sub_80DEAB4, 2, + createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, gUnknown_81D5A3A goto gUnknown_81D5A33 diff --git a/data/graphics.s b/data/graphics.s index cd41ee295..42be9f27d 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2008,15 +2008,15 @@ gBattleAnimSpritePal_RedHeart:: @ 8D23494 .incbin "graphics/battle_anims/sprites/216.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_attract_sheet:: @ 8D234B4 +gBattleAnimBg_AttractGfx:: @ 8D234B4 .incbin "graphics/battle_anims/backgrounds/attract.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_attract_palette:: @ 8D23F24 +gBattleAnimBg_AttractPal:: @ 8D23F24 .incbin "graphics/battle_anims/backgrounds/attract.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_attract_tilemap:: @ 8D23F4C +gBattleAnimBg_AttractTilemap:: @ 8D23F4C .incbin "graphics/battle_anims/backgrounds/attract.bin.lz" .align 2 @@ -2056,11 +2056,11 @@ gBattleAnimSpritePal_MovementWaves:: @ 8D24B80 .incbin "graphics/battle_anims/sprites/215.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_scary_face_palette:: @ 8D24BA4 +gBattleAnim_ScaryFacePal:: @ 8D24BA4 .incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_scary_face_sheet:: @ 8D24BCC +gBattleAnim_ScaryFaceGfx:: @ 8D24BCC .incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz" .align 2 @@ -2304,15 +2304,15 @@ gBattleAnimBgTilemap_HighspeedPlayer:: @ 8D2A510 .incbin "graphics/battle_anims/backgrounds/10.bin.lz" .align 2 -gFile_graphics_battle_anims_masks_morning_sun_sheet:: @ 8D2A808 +gBattleAnim_MorningSunGfx:: @ 8D2A808 .incbin "graphics/battle_anims/masks/morning_sun.4bpp.lz" .align 2 -gFile_graphics_battle_anims_masks_morning_sun_palette:: @ 8D2A8A8 +gBattleAnim_MorningSunPal:: @ 8D2A8A8 .incbin "graphics/battle_anims/masks/morning_sun.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_morning_sun_tilemap:: @ 8D2A8C0 +gBattleAnim_MorningSunTilemap:: @ 8D2A8C0 .incbin "graphics/battle_anims/masks/morning_sun.bin.lz" .align 2 @@ -2460,7 +2460,7 @@ gBattleStatMask8_Pal:: @ 8D2DE1C .incbin "graphics/battle_anims/masks/stat8.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_cure_bubbles_sheet:: @ 8D2DE3C +gCureBubblesGfx:: @ 8D2DE3C .incbin "graphics/battle_anims/masks/cure_bubbles.4bpp.lz" .align 2 @@ -2468,7 +2468,7 @@ gCureBubblesPal:: @ 8D2DF78 .incbin "graphics/battle_anims/masks/cure_bubbles.gbapal.lz" .align 2 -gFile_graphics_battle_anims_masks_cure_bubbles_tilemap:: @ 8D2DF98 +gCureBubblesTilemap:: @ 8D2DF98 .incbin "graphics/battle_anims/masks/cure_bubbles.bin.lz" .align 2 @@ -2500,11 +2500,11 @@ gBattleAnimSpriteGfx_NoiseLine:: @ 8D2EA04 .incbin "graphics/battle_anims/sprites/053.4bpp.lz" .align 2 -gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet:: @ 8D2EC24 +gUnknown_D2EC24_Gfx:: @ 8D2EC24 .incbin "graphics/battle_anims/masks/unknown_D2EC24.4bpp.lz" .align 2 -gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap:: @ 8D2EC70 +gUnknown_D2EC24_Tilemap:: @ 8D2EC70 .incbin "graphics/battle_anims/masks/unknown_D2EC24.bin.lz" .align 2 @@ -13772,15 +13772,15 @@ gBattleAnimSpriteGfx_WeatherBall:: @ 8E7F388 .incbin "graphics/battle_anims/sprites/283.4bpp.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap:: @ 8E7F4AC +gBattleAnimBgTilemap_ScaryFacePlayer:: @ 8E7F4AC .incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap:: @ 8E7F690 +gBattleAnimBgTilemap_ScaryFaceOpponent:: @ 8E7F690 .incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz" .align 2 -gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap:: @ 8E7F874 +gBattleAnimBgTilemap_ScaryFaceContest:: @ 8E7F874 .incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz" .align 2 -- cgit v1.2.3 From a9548849d7d9fab7ef78d1e693573caf11c9b5b7 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 3 Dec 2019 19:50:42 -0700 Subject: resolve references --- data/battle_anim_effects_misc.s | 2 +- data/battle_anim_scripts.s | 90 ++++++++++++++++++++--------------------- data/graphics.s | 2 +- data/pokeball.s | 2 +- 4 files changed, 48 insertions(+), 48 deletions(-) (limited to 'data') diff --git a/data/battle_anim_effects_misc.s b/data/battle_anim_effects_misc.s index 77bf6d206..c6cb89e24 100644 --- a/data/battle_anim_effects_misc.s +++ b/data/battle_anim_effects_misc.s @@ -106,7 +106,7 @@ gUnknown_83E59D0:: @ 83E59D0 spr_template 10029, 10029, gOamData_AffineOff_ObjNormal_32x32, gUnknown_83E59CC, NULL, gDummySpriteAffineAnimTable, sub_80AB024 gUnknown_83E59E8:: @ 83E59E8 - spr_template 10165, 10165, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gUnknown_83E3C98, sub_80AB024 + spr_template 10165, 10165, gOamData_AffineDouble_ObjNormal_16x32, gDummySpriteAnimTable, NULL, gGrowingRingAffineAnimTable, sub_80AB024 gUnknown_83E5A00:: @ 83E5A00 obj_rot_scal_anim_frame 3, 3, 10, 50 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 1f2932fd2..dd2cbea55 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -3337,7 +3337,7 @@ Move_FALSE_SWIPE:: @ 81CB33F Move_SWAGGER:: @ 81CB3C6 loadspritegfx 10086 loadspritegfx 10087 - createvisualtask sub_80A84B4, 2, + createvisualtask AnimTask_GrowAndShrink, 2, playsewithpan SE_W207, 192 waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, @@ -3403,7 +3403,7 @@ Move_RAPID_SPIN:: @ 81CB4E1 loadspritegfx 10229 monbg 0 createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 - createvisualtask sub_80DEF9C, 2, 0, 2, 0 + createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0 loopsewithpan SE_W013B, 192, 8, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 @@ -3411,7 +3411,7 @@ Move_RAPID_SPIN:: @ 81CB4E1 playsewithpan SE_W003, 63 waitforvisualfinish delay 8 - createvisualtask sub_80DEF9C, 2, 0, 2, 1 + createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 1 loopsewithpan SE_W013B, 192, 8, 4 waitforvisualfinish clearmonbg 0 @@ -3438,7 +3438,7 @@ Move_MOONLIGHT:: @ 81CB54E delay 30 createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 10, 0 delay 20 - createvisualtask sub_80A5FC0, 2, + createvisualtask AnimTask_FadeScreenBlue, 2, waitforvisualfinish call gUnknown_81D56C9 waitforvisualfinish @@ -3455,7 +3455,7 @@ gUnknown_81CB5F5:: @ 81CB5F5 waitbgfadeout createvisualtask sub_80BB82C, 5, -2304, 0, 1, -1 waitbgfadein - createvisualtask sub_80A917C, 2, + createvisualtask AnimTask_StretchAttacker, 2, loopsewithpan SE_W013B, 192, 8, 3 waitforvisualfinish delay 1 @@ -3463,7 +3463,7 @@ gUnknown_81CB5F5:: @ 81CB5F5 monbg 1 setalpha 12, 8 delay 18 - createvisualtask sub_80A9210, 2, + createvisualtask AnimTask_ExtremeSpeedImpact, 2, delay 2 playsewithpan SE_W004, 63 createsprite gUnknown_83E7C68, ANIM_TARGET, 2, 1, 0, -12, 3 @@ -3474,9 +3474,9 @@ gUnknown_81CB5F5:: @ 81CB5F5 playsewithpan SE_W233B, 63 createsprite gUnknown_83E7C68, ANIM_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish - createvisualtask sub_80A94AC, 2, + createvisualtask AnimTask_SpeedDust, 2, delay 10 - createvisualtask sub_80A939C, 2, + createvisualtask AnimTask_ExtremeSpeedMonReappear, 2, loopsewithpan SE_W104, 192, 8, 4 waitforvisualfinish restorebg @@ -3498,19 +3498,19 @@ Move_UPROAR:: @ 81CB69C loadspritegfx 10225 loadspritegfx 10203 monbg 3 - createvisualtask sub_80AA7C8, 2, 0 + createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, 192 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1 delay 16 - createvisualtask sub_80AA7C8, 2, 0 + createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, 192 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0 delay 16 - createvisualtask sub_80AA7C8, 2, 0 + createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 playsewithpan SE_W253, 192 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1 @@ -3557,7 +3557,7 @@ Move_HAIL:: @ 81CB816 Move_TORMENT:: @ 81CB84E loadspritegfx 10087 loadspritegfx 10209 - createvisualtask sub_80DF1DC, 2, + createvisualtask AnimTask_TormentAttacker, 2, waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, 1, 31, 10, 1, 1 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 @@ -3976,7 +3976,7 @@ Move_LUSTER_PURGE:: @ 81CC0FB loadspritegfx 10135 fadetobg 3 waitbgfadeout - createvisualtask sub_80DE7B4, 5, + createvisualtask AnimTask_FadeScreenToWhite, 5, waitbgfadein monbg 0 setalpha 12, 8 @@ -4452,7 +4452,7 @@ Move_HOWL:: @ 81CCCDC Move_BULK_UP:: @ 81CCCFE loadspritegfx 10086 - createvisualtask sub_80A84B4, 2, + createvisualtask AnimTask_GrowAndShrink, 2, playsewithpan SE_W207, 192 waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, @@ -5479,7 +5479,7 @@ gUnknown_81CE3FC:: @ 81CE3FC Move_WITHDRAW:: @ 81CE432 playsewithpan SE_W029, 192 - createvisualtask sub_80A70A0, 5, + createvisualtask AnimTask_Withdraw, 5, waitforvisualfinish end @@ -5573,7 +5573,7 @@ gUnknown_81CE54B:: @ 81CE54B gUnknown_81CE61E:: @ 81CE61E call gUnknown_81D5A07 panse_1B SE_W076, 192, 63, 2, 0 - createvisualtask sub_80A2500, 5, + createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5, createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 @@ -6875,7 +6875,7 @@ Move_SPORE:: @ 81D03EF loadspritegfx 10158 monbg 3 setalpha 12, 8 - createvisualtask sub_80A28C4, 2, + createvisualtask AnimTask_SporeDoubleBattle, 2, loopsewithpan SE_W077, 63, 16, 11 call gUnknown_81D041A call gUnknown_81D041A @@ -7666,7 +7666,7 @@ Move_DISABLE:: @ 81D169F playsewithpan SE_W197, 192 createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 24, -16 waitforvisualfinish - createvisualtask sub_80A7FB0, 5, + createvisualtask AnimTask_GrowAndGreyscale, 5, loopsewithpan SE_W020, 63, 15, 4 waitforvisualfinish delay 1 @@ -7871,7 +7871,7 @@ gUnknown_81D1B2F:: @ 81D1B2F Move_FAKE_OUT:: @ 81D1B65 playsewithpan SE_W260, 0 - createvisualtask sub_80A98B0, 5, + createvisualtask AnimTask_FakeOut, 5, waitforvisualfinish playsewithpan SE_W166, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 @@ -7977,7 +7977,7 @@ Move_INGRAIN:: @ 81D1D17 Move_PRESENT:: @ 81D1DC8 loadspritegfx 10224 - createvisualtask sub_80DEAF0, 2, + createvisualtask AnimTask_IsHealingMove, 2, createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 playsewithpan SE_W039, 192 delay 14 @@ -8223,7 +8223,7 @@ Move_WILL_O_WISP:: @ 81D2340 Move_ENCORE:: @ 81D23FE loadspritegfx 10227 loadspritegfx 10247 - createvisualtask sub_80DEDD8, 2, + createvisualtask AnimTask_CreateSpotlight, 2, createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 waitforvisualfinish createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8 @@ -8237,7 +8237,7 @@ Move_ENCORE:: @ 81D23FE waitforvisualfinish createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1 waitforvisualfinish - createvisualtask sub_80DEE78, 2, + createvisualtask AnimTask_RemoveSpotlight, 2, end Move_TRICK:: @ 81D24A5 @@ -8288,7 +8288,7 @@ Move_STOCKPILE:: @ 81D256B loadspritegfx 10235 playsewithpan SE_W025, 192 createvisualtask sub_80B9BDC, 2, 2, 8, 1, 0, 12, 32767 - createvisualtask sub_80DF848, 5, + createvisualtask AnimTask_StockpileDeformMon, 5, call gUnknown_81D25A9 call gUnknown_81D25A9 waitforvisualfinish @@ -8318,7 +8318,7 @@ Move_SPIT_UP:: @ 81D2622 loadspritegfx 10237 loadspritegfx 10135 playsewithpan SE_W036, 192 - createvisualtask sub_80DF8A0, 5, + createvisualtask AnimTask_SpitUpDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 delay 45 playsewithpan SE_W255, 192 @@ -8368,7 +8368,7 @@ Move_SWALLOW:: @ 81D2765 loadspritegfx 10236 loadspritegfx 10031 playsewithpan SE_W036, 192 - createvisualtask sub_80DF964, 5, + createvisualtask AnimTask_SwallowDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 delay 38 playsewithpan SE_W255, 192 @@ -8408,7 +8408,7 @@ Move_TRANSFORM:: @ 81D2811 monbg 0 playsewithpan SE_W100, 192 waitplaysewithpan SE_W107, 192, 48 - createvisualtask sub_80DF9BC, 2, 0 + createvisualtask AnimTask_TransformMon, 2, 0 waitforvisualfinish clearmonbg 0 end @@ -8416,7 +8416,7 @@ Move_TRANSFORM:: @ 81D2811 Move_MORNING_SUN:: @ 81D2829 loadspritegfx 10241 loadspritegfx 10031 - createvisualtask sub_80DFC50, 5, + createvisualtask AnimTask_MorningSunLightBeam, 5, delay 8 createvisualtask sub_80BA7F8, 10, 1921, 8, 0, 12, 32767 delay 14 @@ -8540,7 +8540,7 @@ Move_FLATTER:: @ 81D2AE9 loadspritegfx 10227 loadspritegfx 10240 createvisualtask sub_80DD410, 5, 216, 63 - createvisualtask sub_80DEDD8, 2, + createvisualtask AnimTask_CreateSpotlight, 2, createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 waitforvisualfinish createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 @@ -8574,7 +8574,7 @@ Move_FLATTER:: @ 81D2AE9 waitforvisualfinish createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1 waitforvisualfinish - createvisualtask sub_80DEE78, 2, + createvisualtask AnimTask_RemoveSpotlight, 2, end gUnknown_81D2BD2:: @ 81D2BD2 @@ -9692,7 +9692,7 @@ Move_PSYCHO_BOOST:: @ 81D499B monbg 2 fadetobg 3 waitbgfadeout - createvisualtask sub_80DE7B4, 5, + createvisualtask AnimTask_FadeScreenToWhite, 5, waitbgfadein delay 6 createvisualtask sub_80B9BDC, 2, 1, 2, 8, 0, 10, 0 @@ -10368,7 +10368,7 @@ gUnknown_81D595F:: @ 81D595F gUnknown_81D59BB:: @ 81D59BB fadetobg 3 waitbgfadeout - createvisualtask sub_80DE6F0, 5, + createvisualtask AnimTask_SetPsychicBackground, 5, waitbgfadein return @@ -10513,7 +10513,7 @@ Status_Nightmare:: @ 81D5B63 end General_CastformChange:: @ 81D5B88 - createvisualtask c3_80DFBE4, 2, + createvisualtask AnimTask_IsMonInvisible, 2, jumpargeq 7, 1, gUnknown_81D5BB4 goto gUnknown_81D5B9C @@ -10521,17 +10521,17 @@ gUnknown_81D5B9C:: @ 81D5B9C monbg 0 playsewithpan SE_W100, 192 waitplaysewithpan SE_W107, 192, 48 - createvisualtask sub_80DF9BC, 2, 1 + createvisualtask AnimTask_TransformMon, 2, 1 waitforvisualfinish clearmonbg 0 end gUnknown_81D5BB4:: @ 81D5BB4 - createvisualtask sub_80DFC24, 2, 1 + createvisualtask AnimTask_CastformGfxChange, 2, 1 end General_StatsChange:: @ 81D5BBE - createvisualtask sub_8078694, 5, + createvisualtask AnimTask_StatsChange, 5, waitforvisualfinish end @@ -10554,15 +10554,15 @@ General_SubstituteAppear:: @ 81D5C04 General_PokeblockThrow:: @ 81D5C0C createvisualtask sub_80F1C8C, 2, 0 - createvisualtask sub_80F1AE0, 2, + createvisualtask AnimTask_LoadPokeblockGfx, 2, delay 0 waitplaysewithpan SE_W026, 192, 22 - createsprite gUnknown_840C1EC, ANIM_TARGET, 3, -18, 12, 0, 32 + createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 loopsewithpan SE_W039, 63, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 waitforvisualfinish - createvisualtask sub_80F1B14, 2, + createvisualtask AnimTask_FreePokeblockGfx, 2, end General_ItemKnockoff:: @ 81D5C54 @@ -10571,7 +10571,7 @@ General_ItemKnockoff:: @ 81D5C54 end General_TurnTrap:: @ 81D5C5F - createvisualtask sub_80F1D14, 5, + createvisualtask AnimTask_GetTrappedMoveAnimId, 5, jumpargeq 0, 1, gUnknown_81D5CD3 jumpargeq 0, 2, gUnknown_81D5CF8 jumpargeq 0, 3, gUnknown_81D5D4C @@ -10744,7 +10744,7 @@ General_Hail:: @ 81D5FE2 goto Move_HAIL General_LeechSeedDrain:: @ 81D5FE7 - createvisualtask sub_80F1D7C, 5, + createvisualtask AnimTask_GetBattlersFromArg, 5, delay 0 goto Move_ABSORB @@ -10763,7 +10763,7 @@ General_MonHit:: @ 81D5FF5 General_ItemSteal:: @ 81D6026 loadspritegfx 10224 createvisualtask sub_80BC0FC, 2, - createvisualtask sub_80F1700, 2, + createvisualtask AnimTask_TargetToEffectBattler, 2, delay 1 createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end @@ -10939,7 +10939,7 @@ gUnknown_81D637B:: @ 81D637B monbg 0 playsewithpan SE_W100, 192 waitplaysewithpan SE_W107, 192, 48 - createvisualtask sub_80DF9BC, 2, 255 + createvisualtask AnimTask_TransformMon, 2, 255 waitsound waitforvisualfinish clearmonbg 0 @@ -11000,7 +11000,7 @@ gUnknown_81D644E:: @ 81D644E end gUnknown_81D6476:: @ 81D6476 - createvisualtask sub_80F16CC, 2, + createvisualtask AnimTask_IsAttackerBehindSubstitute, 2, jumpargeq 7, 1, gUnknown_81D6487 gUnknown_81D6485:: @ 81D6485 @@ -11013,7 +11013,7 @@ gUnknown_81D6487:: @ 81D6487 goto gUnknown_81D6485 gUnknown_81D6496:: @ 81D6496 - createvisualtask sub_80F16CC, 2, + createvisualtask AnimTask_IsAttackerBehindSubstitute, 2, jumpargeq 7, 1, gUnknown_81D64A7 gUnknown_81D64A5:: @ 81D64A5 @@ -11051,7 +11051,7 @@ Special_BallThrow:: @ 81D64F9 delay 0 playsewithpan SE_NAGERU, 0 createvisualtask sub_80EF5AC, 2, - createvisualtask sub_80EF4E0, 2, + createvisualtask AnimTask_IsBallBlockedByTrainer, 2, jumpargeq 7, 65535, gUnknown_81D652D jumpargeq 7, 65534, gUnknown_81D6555 diff --git a/data/graphics.s b/data/graphics.s index 42be9f27d..b47938c49 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1344,7 +1344,7 @@ gBattleAnimSpritePal_Impact:: @ 8D1A5F0 .incbin "graphics/battle_anims/sprites/135.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_particles_sheet:: @ 8D1A608 +gBattleAnimSpriteGfx_Particles:: @ 8D1A608 .incbin "graphics/battle_anims/sprites/particles.4bpp.lz" .align 2 diff --git a/data/pokeball.s b/data/pokeball.s index db8dbfef5..e1351d463 100644 --- a/data/pokeball.s +++ b/data/pokeball.s @@ -101,7 +101,7 @@ gSpriteAffineAnimTable_82606E0:: .4byte gSpriteAffineAnims_82606C0 .4byte gSpriteAffineAnims_82606D0 -gUnknown_82606F4:: @ 82606F4 +gBallSpriteTemplates:: @ 82606F4 spr_template 55000, 55000, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow spr_template 55001, 55001, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow spr_template 55002, 55002, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow -- cgit v1.2.3 From 661a581176ecb6ad28e9d795fe02c3178c50b660 Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 4 Dec 2019 14:49:35 -0700 Subject: matching up battle_anim_special --- data/battle_anim_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index dd2cbea55..4cc93f85e 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -11051,7 +11051,7 @@ Special_BallThrow:: @ 81D64F9 delay 0 playsewithpan SE_NAGERU, 0 createvisualtask sub_80EF5AC, 2, - createvisualtask AnimTask_IsBallBlockedByTrainer, 2, + createvisualtask AnimTask_IsBallBlockedByTrainerOrDodged, 2, jumpargeq 7, 65535, gUnknown_81D652D jumpargeq 7, 65534, gUnknown_81D6555 -- cgit v1.2.3