diff options
| -rw-r--r-- | data/battle_4.s | 10 | ||||
| -rw-r--r-- | data/link.s | 36 |
2 files changed, 11 insertions, 35 deletions
diff --git a/data/battle_4.s b/data/battle_4.s index 0f799eac8..3300b25ee 100644 --- a/data/battle_4.s +++ b/data/battle_4.s @@ -81,11 +81,11 @@ sProtectSuccessRates:: @ 831C3D8 .align 2 gUnknown_0831C3E0:: @ 831C3E0 - .2byte 0x0076, 0x00a5, 0x00a6, 0x0066 - .2byte 0xfffe, 0x0044, 0x00f3, 0x00b6 - .2byte 0x00c5, 0x00cb, 0x00c2, 0x00d6 - .2byte 0x00a8, 0x010a, 0x0121, 0x010e - .2byte 0x0157, 0x010f, 0x0108, 0xffff + .2byte MOVE_METRONOME, MOVE_STRUGGLE, MOVE_SKETCH, MOVE_MIMIC + .2byte 0xfffe, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_PROTECT + .2byte MOVE_DETECT, MOVE_ENDURE, MOVE_DESTINY_BOND, MOVE_SLEEP_TALK + .2byte MOVE_THIEF, MOVE_FOLLOW_ME, MOVE_SNATCH, MOVE_HELPING_HAND + .2byte MOVE_COVET, MOVE_TRICK, MOVE_FOCUS_PUNCH, 0xffff .align 2 gUnknown_0831C408:: @ 831C408 diff --git a/data/link.s b/data/link.s index a7424cc1a..3aa87ef67 100644 --- a/data/link.s +++ b/data/link.s @@ -54,38 +54,14 @@ gUnknown_082ED1FC:: @ 82ED1FC BgTemplate .4byte 0x000001F8 .4byte 0x00001081 -gUnknown_082ED204:: @ 82ED204 WindowTemplate - .byte 0x00 - .byte 0x00 - .byte 0x00 - .byte 0x1E - .byte 0x05 - .byte 0x0F - .2byte 0x0002 +gUnknown_082ED204:: @ 82ED204 + window_template 0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002 - .byte 0x00 - .byte 0x00 - .byte 0x06 - .byte 0x1E - .byte 0x07 - .byte 0x0F - .2byte 0x0098 + window_template 0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098 - .byte 0x00 - .byte 0x00 - .byte 0x0D - .byte 0x1E - .byte 0x07 - .byte 0x0F - .2byte 0x016A + window_template 0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A - .byte 0xFF - .byte 0x00 - .byte 0x00 - .byte 0x00 - .byte 0x00 - .byte 0x00 - .2byte 0x0000 + window_template 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 gUnknown_082ED224:: @ 82ED224 .byte 0x00, 0x01, 0x02, 0x00, 0xff, 0xfe, 0xff, 0x00 @@ -3041,7 +3017,7 @@ gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate .4byte 0x000000F8 .align 2 -gUnknown_082F32CC:: @ 82F32CC struct WindowTemplate? not sure +gUnknown_082F32CC:: @ 82F32CC struct BgTemplate? not sure .byte 0xd1, 0x14, 0x00, 0x00, 0xc2, 0x20, 0x00, 0x00 .byte 0xb3, 0x30, 0x00, 0x00 |