diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros.s | 16 | ||||
| -rw-r--r-- | asm/rom.s | 134 |
2 files changed, 79 insertions, 71 deletions
diff --git a/asm/macros.s b/asm/macros.s index 8faccc42a..d8f8fa173 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -13,7 +13,7 @@ .4byte gMapName_\name .endm - .macro obj_tiles address, uncompressed_size, tag = 0 + .macro obj_tiles address, uncompressed_size, tag .4byte \address .2byte \uncompressed_size .2byte \tag @@ -25,6 +25,13 @@ .2byte 0; padding .endm +; For object animation frames. + .macro obj_frame_tiles address, uncompressed_size + .4byte \address + .2byte \uncompressed_size + .2byte 0 ; padding + .endm + .macro zero_fill count .fill \count .endm @@ -36,10 +43,11 @@ .byte 3, 4, \slot, \slot, \slot .endm - .macro sprite_oam x, y, priority, tile_num_offset, size - .byte \x - .byte \y + .macro subsprite x, y, priority, tile_num_offset, size + .2byte \x + .2byte \y .2byte ((\priority) << 14) | ((\tile_num_offset) << 4) | SPRITE_SIZE_\size + .2byte 0 ; padding .endm .macro obj_image_anim_frame pic_id, duration, flags = 0 @@ -1259,7 +1259,7 @@ _08000BC8: .4byte 0x03002410 _08000BCC: .4byte 0x02020004 _08000BD0: .4byte 0x03001770 _08000BD4: .4byte 0x030024d4 -_08000BD8: .4byte gUnknown_081E28F8 +_08000BD8: .4byte gDummyBaseOam thumb_func_end sub_8000B44 thumb_func_start AddObjectToFront @@ -1742,7 +1742,7 @@ _08000F60: bx r0 .align 2 _08000F68: .4byte 0x030017ac -_08000F6C: .4byte gUnknown_081E28F8 +_08000F6C: .4byte gDummyBaseOam thumb_func_end ResetSpriteRange thumb_func_start LoadOamFromSprites @@ -183713,7 +183713,7 @@ sub_805AAB0: ; 805AAB0 pop {r0} bx r0 .align 2 -_0805AB4C: .4byte gUnknown_0836DFC0 +_0805AB4C: .4byte gFieldEffectObjectTemplatePointers _0805AB50: .4byte 0x02020004 thumb_func_end sub_805AAB0 @@ -185945,9 +185945,9 @@ _0805BBFC: pop {r0} bx r0 .align 2 -_0805BC04: .4byte gUnknown_0837446C -_0805BC08: .4byte gUnknown_08374314 -_0805BC0C: .4byte gUnknown_083743C0 +_0805BC04: .4byte gBerryTreeGraphicsIdTablePointers +_0805BC08: .4byte gBerryTreePicTablePointers +_0805BC0C: .4byte gBerryTreePaletteSlotTablePointers thumb_func_end get_berry_tree_graphics thumb_func_start sub_805BC10 @@ -185975,7 +185975,7 @@ _0805BC2E: pop {r1} bx r1 .align 2 -_0805BC3C: .4byte gUnknown_0836DC58 +_0805BC3C: .4byte gMapObjectGraphicsInfoPointers thumb_func_end sub_805BC10 thumb_func_start FieldObjectHandleDynamicGraphicsId @@ -241643,8 +241643,8 @@ ma00_load_graphics: ; 8075A10 bx r0 .align 2 _08075A5C: .4byte 0x0202f7a4 -_08075A60: .4byte gUnknown_0836A8E4 -_08075A64: .4byte gUnknown_0836B1EC +_08075A60: .4byte gBattleAnimPicTable - (10000 * 8) +_08075A64: .4byte gBattleAnimPaletteTable - (10000 * 8) _08075A68: .4byte 0xffffd8f0 _08075A6C: .4byte 0x0202f7b0 _08075A70: .4byte 0x0202f7ac @@ -241684,7 +241684,7 @@ ma01_080728D0: ; 8075A78 bx r0 .align 2 _08075AB8: .4byte 0x0202f7a4 -_08075ABC: .4byte gUnknown_0837E164 +_08075ABC: .4byte gBattleAnimPicTable _08075AC0: .4byte 0xffffd8f0 thumb_func_end ma01_080728D0 @@ -242067,7 +242067,7 @@ _08075D98: .4byte 0x030073c0 _08075D9C: .4byte 0x03007400 _08075DA0: .4byte 0x03004af0 _08075DA4: .4byte 0x0000ffff -_08075DA8: .4byte gUnknown_0837E164 +_08075DA8: .4byte gBattleAnimPicTable _08075DAC: .4byte 0x03004b10 _08075DB0: .4byte 0x03007380 _08075DB4: .4byte 0x0202f7b1 @@ -253807,8 +253807,8 @@ _0807B734: .align 2 _0807B740: .4byte 0x02024be0 _0807B744: .4byte sub_807B7E0 -_0807B748: .4byte gUnknown_0837E5A4 -_0807B74C: .4byte gUnknown_0837EEAC +_0807B748: .4byte gBattleAnimPicTable + (136 * 8) +_0807B74C: .4byte gBattleAnimPaletteTable + (136 * 8) _0807B750: .4byte 0x03004b20 _0807B754: .4byte 0x02020004 _0807B758: .4byte gUnknown_083931F8 @@ -274585,7 +274585,7 @@ _08085686: pop {r1} bx r1 .align 2 -_080856A8: .4byte gUnknown_081D9B34 +_080856A8: .4byte gFieldEffectScriptPointers _080856AC: .4byte gUnknown_0839F0D4 thumb_func_end FieldEffectStart @@ -275104,8 +275104,8 @@ sub_80859BC: ; 80859BC _08085A44: .4byte gTrainerFrontPicPaletteTable _08085A48: .4byte gTrainerFrontPicTable _08085A4C: .4byte gUnknown_0839F0F4 -_08085A50: .4byte gUnknown_081E2904 -_08085A54: .4byte gUnknown_081E2910 +_08085A50: .4byte gDummyObjectImageAnimTable +_08085A54: .4byte gDummyObjectRotScalAnimTable _08085A58: .4byte nullsub_2 thumb_func_end sub_80859BC @@ -278741,7 +278741,7 @@ sub_80875D4: ; 80875D4 bx r1 .align 2 _0808762C: .4byte 0x0202ff84 -_08087630: .4byte gUnknown_0836DFC0 +_08087630: .4byte gFieldEffectObjectTemplatePointers _08087634: .4byte 0x02020004 thumb_func_end sub_80875D4 @@ -279045,7 +279045,7 @@ sub_8087828: ; 8087828 bx r1 .align 2 _08087880: .4byte 0x0202ff84 -_08087884: .4byte gUnknown_0836DFC0 +_08087884: .4byte gFieldEffectObjectTemplatePointers _08087888: .4byte 0x02020004 thumb_func_end sub_8087828 @@ -281494,7 +281494,7 @@ sub_8088B68: ; 8088B68 pop {r1} bx r1 .align 2 -_08088BB4: .4byte gUnknown_0836DFC0 +_08088BB4: .4byte gFieldEffectObjectTemplatePointers _08088BB8: .4byte 0x02020004 _08088BBC: .4byte sub_8088BC4 _08088BC0: .4byte 0x0202ff84 @@ -281999,7 +281999,7 @@ sub_8088F60: ; 8088F60 pop {r1} bx r1 .align 2 -_08088F98: .4byte gUnknown_0836DFC0 +_08088F98: .4byte gFieldEffectObjectTemplatePointers _08088F9C: .4byte 0x02020004 _08088FA0: .4byte sub_8089018 thumb_func_end sub_8088F60 @@ -308870,8 +308870,8 @@ _0809654C: bx r0 .align 2 _08096564: .4byte 0xffff0fff -_08096568: .4byte gUnknown_081E2904 -_0809656C: .4byte gUnknown_081E2910 +_08096568: .4byte gDummyObjectImageAnimTable +_0809656C: .4byte gDummyObjectRotScalAnimTable _08096570: .4byte nullsub_2 _08096574: .4byte 0x02038478 _08096578: .4byte 0x00000242 @@ -408104,7 +408104,7 @@ _080C6D1E: .align 2 _080C6D28: .4byte 0x030048a0 _080C6D2C: .4byte 0x0202e858 -_080C6D30: .4byte gUnknown_0836DFC0 +_080C6D30: .4byte gFieldEffectObjectTemplatePointers _080C6D34: .4byte 0x02020004 _080C6D38: .4byte sub_80C6C64 thumb_func_end sub_80C6C90 @@ -508357,7 +508357,7 @@ _080F7824: .4byte gUnknown_08E8A7C4 _080F7828: .4byte gUnknown_08E966B8 _080F782C: .4byte gUnknown_083E5214 _080F7830: .4byte gUnknown_083E52AC -_080F7834: .4byte gUnknown_081E2910 +_080F7834: .4byte gDummyObjectRotScalAnimTable _080F7838: .4byte nullsub_65 _080F783C: .4byte 0x02020004 _080F7840: .4byte gUnknown_083E5274 @@ -508582,7 +508582,7 @@ _080F79DC: .4byte gUnknown_083E4A14 _080F79E0: .4byte 0xffff0000 _080F79E4: .4byte gUnknown_083E52B4 _080F79E8: .4byte gUnknown_083E533C -_080F79EC: .4byte gUnknown_081E2910 +_080F79EC: .4byte gDummyObjectRotScalAnimTable _080F79F0: .4byte nullsub_65 _080F79F4: lsls r0, r1, 4 @@ -517499,7 +517499,7 @@ _080FBD9C: .4byte gUnknown_083E5C20 _080FBDA0: .4byte 0xffff0000 _080FBDA4: .4byte gUnknown_083E7708 _080FBDA8: .4byte gUnknown_083E7718 -_080FBDAC: .4byte gUnknown_081E2910 +_080FBDAC: .4byte gDummyObjectRotScalAnimTable _080FBDB0: .4byte nullsub_2 _080FBDB4: .4byte 0x02024ea4 _080FBDB8: .4byte gUnknown_083E5CE0 @@ -563354,7 +563354,7 @@ _08111C54: .4byte gMonFrontPicTable _08111C58: .4byte gUnknown_081E7C74 _08111C5C: .4byte gUnknown_081FAF4C _08111C60: .4byte 0x02024e8c -_08111C64: .4byte gUnknown_081E2910 +_08111C64: .4byte gDummyObjectRotScalAnimTable _08111C68: .4byte 0x02014800 _08111C6C: .4byte 0x02020004 _08111C70: .4byte nullsub_37 @@ -563563,7 +563563,7 @@ _08111E58: .4byte gMonFrontPicTable _08111E5C: .4byte gUnknown_081E7C74 _08111E60: .4byte gUnknown_081FAF4C _08111E64: .4byte 0x02024e8c -_08111E68: .4byte gUnknown_081E2910 +_08111E68: .4byte gDummyObjectRotScalAnimTable _08111E6C: .4byte 0x02020004 _08111E70: .4byte nullsub_37 _08111E74: .4byte nullsub_73 @@ -563800,7 +563800,7 @@ _0811208E: b _081120D6 .align 2 _08112098: .4byte 0x02024e8c -_0811209C: .4byte gUnknown_081E2910 +_0811209C: .4byte gDummyObjectRotScalAnimTable _081120A0: .4byte 0x02014800 _081120A4: .4byte 0x02020004 _081120A8: .4byte nullsub_37 @@ -563996,7 +563996,7 @@ _08112248: .4byte gMonFrontPicTable _0811224C: .4byte gUnknown_081E7C74 _08112250: .4byte gUnknown_081FAF4C _08112254: .4byte 0x02024e8c -_08112258: .4byte gUnknown_081E2910 +_08112258: .4byte gDummyObjectRotScalAnimTable _0811225C: .4byte 0x02020004 _08112260: .4byte nullsub_37 _08112264: .4byte sub_8112FE8 @@ -581860,7 +581860,7 @@ _0811B1C4: .4byte 0x03005560 _0811B1C8: .4byte sub_811B520 _0811B1CC: .4byte 0x01000400 _0811B1D0: .4byte gUnknown_083FBB88 -_0811B1D4: .4byte gUnknown_083FD9F8 +_0811B1D4: .4byte gFieldEffectObjectPalette10 thumb_func_end sub_811B128 thumb_func_start sub_811B1D8 @@ -582393,7 +582393,7 @@ sub_811B5B0: ; 811B5B0 .align 2 _0811B5F0: .4byte gUnknown_083FC108 _0811B5F4: .4byte 0x05000200 -_0811B5F8: .4byte gUnknown_083FD9F8 +_0811B5F8: .4byte gFieldEffectObjectPalette10 thumb_func_end sub_811B5B0 thumb_func_start sub_811B5FC @@ -585925,7 +585925,7 @@ sub_811D0F0: ; 811D0F0 .align 2 _0811D138: .4byte gUnknown_083FD528 _0811D13C: .4byte 0x01000400 -_0811D140: .4byte gUnknown_083FD9F8 +_0811D140: .4byte gFieldEffectObjectPalette10 thumb_func_end sub_811D0F0 thumb_func_start sub_811D144 @@ -605053,8 +605053,8 @@ _081268B2: _081268BC: .4byte 0x02020004 _081268C0: .4byte sub_81269E0 _081268C4: .4byte gUnknown_0830FD14 -_081268C8: .4byte gUnknown_081E2904 -_081268CC: .4byte gUnknown_081E2910 +_081268C8: .4byte gDummyObjectImageAnimTable +_081268CC: .4byte gDummyObjectRotScalAnimTable thumb_func_end SetUpReflection thumb_func_start sub_81268D0 @@ -605423,7 +605423,7 @@ _08126B92: pop {r1} bx r1 .align 2 -_08126B9C: .4byte gUnknown_0836DFC0 +_08126B9C: .4byte gFieldEffectObjectTemplatePointers _08126BA0: .4byte 0x02020004 thumb_func_end sub_8126B54 @@ -605606,7 +605606,7 @@ _08126CF0: .align 2 _08126CF8: .4byte 0x0202ff84 _08126CFC: .4byte 0x030048a0 -_08126D00: .4byte gUnknown_0836DFC0 +_08126D00: .4byte gFieldEffectObjectTemplatePointers _08126D04: .4byte gUnknown_08401E32 _08126D08: .4byte 0x02020004 _08126D0C: .4byte gUnknown_08401E36 @@ -605786,7 +605786,7 @@ _08126E64: bx r1 .align 2 _08126E70: .4byte 0x0202ff84 -_08126E74: .4byte gUnknown_0836DFC0 +_08126E74: .4byte gFieldEffectObjectTemplatePointers _08126E78: .4byte 0x02020004 thumb_func_end oei_grass_normal @@ -605977,7 +605977,7 @@ _08126FDC: bx r1 .align 2 _08126FE4: .4byte 0x0202ff84 -_08126FE8: .4byte gUnknown_0836DFC0 +_08126FE8: .4byte gFieldEffectObjectTemplatePointers _08126FEC: .4byte 0x02020004 thumb_func_end sub_8126F80 @@ -606135,7 +606135,7 @@ _08127110: bx r1 .align 2 _0812711C: .4byte 0x0202ff84 -_08127120: .4byte gUnknown_0836DFC0 +_08127120: .4byte gFieldEffectObjectTemplatePointers _08127124: .4byte 0x02020004 thumb_func_end sub_8127080 @@ -606318,7 +606318,7 @@ _0812727C: bx r1 .align 2 _08127284: .4byte 0x0202ff84 -_08127288: .4byte gUnknown_0836DFC0 +_08127288: .4byte gFieldEffectObjectTemplatePointers _0812728C: .4byte 0x02020004 thumb_func_end sub_8127220 @@ -606400,7 +606400,7 @@ _0812731C: .align 2 _08127324: .4byte 0x0202ff84 _08127328: .4byte 0x030048a0 -_0812732C: .4byte gUnknown_0836DFC0 +_0812732C: .4byte gFieldEffectObjectTemplatePointers _08127330: .4byte 0x02020004 thumb_func_end sub_8127290 @@ -606582,7 +606582,7 @@ _08127486: bx r1 .align 2 _08127490: .4byte 0x0202ff84 -_08127494: .4byte gUnknown_0836DFC0 +_08127494: .4byte gFieldEffectObjectTemplatePointers _08127498: .4byte 0x02020004 thumb_func_end sub_8127428 @@ -606640,7 +606640,7 @@ _081274FC: bx r1 .align 2 _08127504: .4byte 0x0202ff84 -_08127508: .4byte gUnknown_0836DFC0 +_08127508: .4byte gFieldEffectObjectTemplatePointers _0812750C: .4byte 0x02020004 thumb_func_end sub_812749C @@ -606698,7 +606698,7 @@ _08127570: bx r1 .align 2 _08127578: .4byte 0x0202ff84 -_0812757C: .4byte gUnknown_0836DFC0 +_0812757C: .4byte gFieldEffectObjectTemplatePointers _08127580: .4byte 0x02020004 thumb_func_end sub_8127510 @@ -606854,7 +606854,7 @@ _0812769A: .align 2 _081276A4: .4byte 0x0202ff84 _081276A8: .4byte 0x030048a0 -_081276AC: .4byte gUnknown_0836DFC0 +_081276AC: .4byte gFieldEffectObjectTemplatePointers _081276B0: .4byte 0x02020004 thumb_func_end sub_8127610 @@ -606983,7 +606983,7 @@ _0812779C: bx r1 .align 2 _081277A4: .4byte 0x0202ff84 -_081277A8: .4byte gUnknown_0836DFC0 +_081277A8: .4byte gFieldEffectObjectTemplatePointers _081277AC: .4byte 0x02020004 thumb_func_end sub_8127740 @@ -607040,7 +607040,7 @@ _0812780C: bx r1 .align 2 _08127814: .4byte 0x0202ff84 -_08127818: .4byte gUnknown_0836DFC0 +_08127818: .4byte gFieldEffectObjectTemplatePointers _0812781C: .4byte 0x02020004 thumb_func_end oei_water_drop_tall @@ -607125,7 +607125,7 @@ _081278B6: .align 2 _081278C0: .4byte 0x0202ff84 _081278C4: .4byte 0x030048a0 -_081278C8: .4byte gUnknown_0836DFC0 +_081278C8: .4byte gFieldEffectObjectTemplatePointers _081278CC: .4byte 0x02020004 _081278D0: .4byte sub_81278D8 _081278D4: .4byte 0x0000ffff @@ -607258,7 +607258,7 @@ _081279C4: pop {r1} bx r1 .align 2 -_081279CC: .4byte gUnknown_0836DFC0 +_081279CC: .4byte gFieldEffectObjectTemplatePointers _081279D0: .4byte 0x0202ff84 _081279D4: .4byte 0x02020004 thumb_func_end oei_ripples @@ -607341,7 +607341,7 @@ _08127A64: .align 2 _08127A6C: .4byte 0x0202ff84 _08127A70: .4byte 0x030048a0 -_08127A74: .4byte gUnknown_0836DFC0 +_08127A74: .4byte gFieldEffectObjectTemplatePointers _08127A78: .4byte 0x02020004 thumb_func_end sub_81279D8 @@ -607475,7 +607475,7 @@ _08127B6C: bx r1 .align 2 _08127B74: .4byte 0x0202ff84 -_08127B78: .4byte gUnknown_0836DFC0 +_08127B78: .4byte gFieldEffectObjectTemplatePointers _08127B7C: .4byte 0x02020004 thumb_func_end sub_8127B14 @@ -607530,7 +607530,7 @@ _08127BD8: bx r1 .align 2 _08127BE0: .4byte 0x0202ff84 -_08127BE4: .4byte gUnknown_0836DFC0 +_08127BE4: .4byte gFieldEffectObjectTemplatePointers _08127BE8: .4byte 0x02020004 thumb_func_end sub_8127B80 @@ -607585,7 +607585,7 @@ _08127C44: bx r1 .align 2 _08127C4C: .4byte 0x0202ff84 -_08127C50: .4byte gUnknown_0836DFC0 +_08127C50: .4byte gFieldEffectObjectTemplatePointers _08127C54: .4byte 0x02020004 thumb_func_end sub_8127BEC @@ -607640,7 +607640,7 @@ _08127CB0: bx r1 .align 2 _08127CB8: .4byte 0x0202ff84 -_08127CBC: .4byte gUnknown_0836DFC0 +_08127CBC: .4byte gFieldEffectObjectTemplatePointers _08127CC0: .4byte 0x02020004 thumb_func_end sub_8127C58 @@ -607740,7 +607740,7 @@ _08127D6E: bx r1 .align 2 _08127D78: .4byte 0x0202ff84 -_08127D7C: .4byte gUnknown_0836DFC0 +_08127D7C: .4byte gFieldEffectObjectTemplatePointers _08127D80: .4byte 0x02020004 thumb_func_end oei_ash @@ -607913,7 +607913,7 @@ _08127EB2: bx r1 .align 2 _08127EC0: .4byte 0x0202ff84 -_08127EC4: .4byte gUnknown_0836DFC0 +_08127EC4: .4byte gFieldEffectObjectTemplatePointers _08127EC8: .4byte 0x02020004 _08127ECC: .4byte 0x0000ffff thumb_func_end sub_8127E58 @@ -608380,7 +608380,7 @@ _08128210: bx r1 .align 2 _08128218: .4byte 0x0202ff84 -_0812821C: .4byte gUnknown_0836DFC0 +_0812821C: .4byte gFieldEffectObjectTemplatePointers _08128220: .4byte 0x02020004 thumb_func_end sub_81281B4 @@ -608472,7 +608472,7 @@ _081282C8: .align 2 _081282D0: .4byte 0x0202ff84 _081282D4: .4byte 0x030048a0 -_081282D8: .4byte gUnknown_0836DFC0 +_081282D8: .4byte gFieldEffectObjectTemplatePointers _081282DC: .4byte 0x02020004 thumb_func_end sub_8128224 @@ -608628,7 +608628,7 @@ _081283FC: bx r1 .align 2 _08128404: .4byte 0x0202ff84 -_08128408: .4byte gUnknown_0836DFC0 +_08128408: .4byte gFieldEffectObjectTemplatePointers _0812840C: .4byte 0x02020004 thumb_func_end sub_81283AC @@ -608721,7 +608721,7 @@ _081284B0: bx r1 .align 2 _081284B8: .4byte 0x0202ff84 -_081284BC: .4byte gUnknown_0836DFC0 +_081284BC: .4byte gFieldEffectObjectTemplatePointers _081284C0: .4byte 0x02020004 thumb_func_end sub_8128450 @@ -608849,7 +608849,7 @@ _08128598: pop {r1} bx r1 .align 2 -_081285A4: .4byte gUnknown_0836DFC0 +_081285A4: .4byte gFieldEffectObjectTemplatePointers _081285A8: .4byte 0x02020004 thumb_func_end ShowDisguiseFieldEffect @@ -609091,7 +609091,7 @@ _08128760: bx r1 .align 2 _08128768: .4byte 0x0202ff84 -_0812876C: .4byte gUnknown_0836DFC0 +_0812876C: .4byte gFieldEffectObjectTemplatePointers _08128770: .4byte 0x02020004 thumb_func_end sub_8128700 @@ -660575,8 +660575,8 @@ _081418A2: _081418E0: .4byte 0x02017810 _081418E4: .4byte 0x0000ffff _081418E8: .4byte 0x000027f9 -_081418EC: .4byte gUnknown_0837E8AC -_081418F0: .4byte gUnknown_0837F1B4 +_081418EC: .4byte gBattleAnimPicTable + (233 * 8) +_081418F0: .4byte gBattleAnimPaletteTable + (233 * 8) _081418F4: .4byte sub_814191C _081418F8: .4byte 0x03004b20 _081418FC: @@ -660968,8 +660968,8 @@ sub_8141BD4: ; 8141BD4 pop {r0} bx r0 .align 2 -_08141BFC: .4byte gUnknown_0837E9CC -_08141C00: .4byte gUnknown_0837F2D4 +_08141BFC: .4byte gBattleAnimPicTable + (269 * 8) +_08141C00: .4byte gBattleAnimPaletteTable + (269 * 8) _08141C04: .4byte 0x0000281d thumb_func_end sub_8141BD4 |