diff options
| -rw-r--r-- | data/data2.s | 61 | ||||
| -rw-r--r-- | data/text/battle_strings.s | 6 |
2 files changed, 66 insertions, 1 deletions
diff --git a/data/data2.s b/data/data2.s index 15f735584..a6c665f1b 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1560,8 +1560,67 @@ gUnknown_081FAF4C:: @ 81FAF4C .4byte 0x0200c000 .4byte 0x0200e000 + .align 2 gUnknown_081FAF5C:: @ 81FAF5C - .incbin "baserom.gba", 0x001faf5c, 0xec + .4byte dp01t_00_7_getattr + .4byte dp01t_01_2_read_pokmon_data_slice + .4byte dp01t_02_7_setattr + .4byte sub_8034744 + .4byte sub_80347B8 + .4byte sub_8034910 + .4byte sub_8034AE0 + .4byte c2_8123744 + .4byte sub_8034DC0 + .4byte sub_8034F84 + .4byte sub_8035030 + .4byte sub_80350D4 + .4byte sub_80350E0 + .4byte sub_80350EC + .4byte sub_80350F8 + .4byte sub_8035104 + .4byte sub_803539C + .4byte sub_8035400 + .4byte sub_803540C + .4byte sub_803541C + .4byte sub_8035428 + .4byte sub_8035590 + .4byte sub_80355C0 + .4byte sub_80356C0 + .4byte sub_80356CC + .4byte sub_80357BC + .4byte sub_80357C8 + .4byte sub_803583C + .4byte sub_80358A4 + .4byte sub_80358B0 + .4byte sub_80358BC + .4byte sub_80358C8 + .4byte sub_80358D4 + .4byte sub_80358E0 + .4byte sub_80358EC + .4byte sub_80358F8 + .4byte sub_8035904 + .4byte sub_8035910 + .4byte sub_803592C + .4byte sub_8035964 + .4byte sub_803597C + .4byte dp01t_29_7_blink + .4byte sub_8035A14 + .4byte sub_8035A20 + .4byte sub_8035A64 + .4byte sub_8035A94 + .4byte dp01t_2E_7_battle_intro + .4byte sub_8035B04 + .4byte dp01t_30_7_0803D67C + .4byte sub_8035E6C + .4byte sub_8035EB8 + .4byte sub_8035EC4 + .4byte dp01t_34_7_move_anim_start_t3 + .4byte sub_8035F8C + .4byte sub_8035F98 + .4byte sub_8035FA4 + .4byte nullsub_46 + + .incbin "baserom.gba", 0x001fb040, 0x8 .align 2 gUnknown_081FB048:: @ 81FB048 diff --git a/data/text/battle_strings.s b/data/text/battle_strings.s index 50768d80e..950e2b489 100644 --- a/data/text/battle_strings.s +++ b/data/text/battle_strings.s @@ -1,3 +1,4 @@ + .align 2 gUnknown_083FE4F4:: @ 83FE4F4 .4byte dp01t_00_3_getattr .4byte sub_811EC04 @@ -1230,6 +1231,7 @@ gUnknown_08400F58:: @ 8400F58 .4byte BattleStatText_Accuracy .4byte BattleStatText_Evasion + .align 2 gUnknown_08400F78:: @ 8400F78 .4byte ContestStatText_TooSpicy .4byte ContestStatText_TooDry @@ -1237,6 +1239,7 @@ gUnknown_08400F78:: @ 8400F78 .4byte ContestStatText_TooBitter .4byte ContestStatText_TooSour + .align 2 gUnknown_08400F8C:: @ 8400F8C .4byte BattleText_UnknownString .4byte BattleText_GainExpPoints @@ -1590,6 +1593,7 @@ gUnknown_08400F8C:: @ 8400F8C .4byte BattleText_NoEffect .4byte BattleText_NoEffectOn + .align 1 gUnknown_08401508:: @ 8401508 @ Each entry refers to a text pointer in gUnknown_08400F8C, but the values are offset @ by 0xc. For example, 0x0017 refers to BattleText_AttackMissed because it is the @@ -1760,6 +1764,7 @@ gUnknown_08401508:: @ 8401508 gUnknown_0840164C:: @ 840164C .incbin "baserom.gba", 0x0040164c, 0x10 + .align 2 gUnknown_0840165C:: @ 840165C .4byte BattleText_HP .4byte BattleText_SpAtk @@ -1768,6 +1773,7 @@ gUnknown_0840165C:: @ 840165C .4byte BattleText_Defense .4byte BattleStatText_Speed + .align 2 gUnknown_08401674:: @ 8401674 .4byte BattleText_Normal .4byte BattleText_Fighting |