diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/field_effect_scripts.s | 6 | ||||
| -rw-r--r-- | data/fldeff_cut.s | 32 | ||||
| -rw-r--r-- | data/party_menu.s | 2 |
3 files changed, 4 insertions, 36 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 581b72e43..c0c74496f 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -78,11 +78,11 @@ gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 field_eff_end gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6 - field_eff_callnative sub_80D3A6C + field_eff_callnative FldEff_UseCutOnGrass field_eff_end gFieldEffectScript_UseCutOnTree:: @ 82DBAEC - field_eff_callnative sub_80D3ABC + field_eff_callnative FldEff_UseCutOnTree field_eff_end gFieldEffectScript_Shadow:: @ 82DBAF2 @@ -308,7 +308,7 @@ gFieldEffectScript_Unknown57:: @ 82DBCB8 field_eff_end gFieldEffectScript_Unknown58:: @ 82DBCC2 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass field_eff_end gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s deleted file mode 100644 index ee5a09c37..000000000 --- a/data/fldeff_cut.s +++ /dev/null @@ -1,32 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0857C608:: @ 857C608 - .byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00 - .byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00 - -gUnknown_0857C648:: @ 857C648 - .2byte 0 - .2byte 0 - .2byte 0x1401 - .2byte 0 - -gUnknown_0857C650:: @ 857C650 - obj_image_anim_frame 0, 0x1E - obj_image_anim_jump 0 - -gUnknown_0857C658:: @ 857C658 - .4byte gUnknown_0857C650 - -gUnknown_0857C65C:: @ 857C65C - obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32 - - .align 2 -gFieldEffectObjectPaletteInfo6:: @ 857C664 - obj_pal gFieldEffectObjectPalette6, 0x1000 - -gUnknown_0857C66C:: @ 857C66C - spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8 diff --git a/data/party_menu.s b/data/party_menu.s index ebd596870..eedcd4377 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -431,7 +431,7 @@ gUnknown_08615D7E:: @ 8615D7E .align 2 gUnknown_08615D9C:: @ 8615D9C - .4byte sub_80D3718, 0x00000007 + .4byte SetUpFieldMove_Cut, 0x00000007 .4byte SetUpFieldMove_Flash, 0x0000000d .4byte SetUpFieldMove_RockSmash, 0x0000000d .4byte SetUpFieldMove_Strength, 0x0000000d |