diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2017-10-02 22:09:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 22:09:29 -0400 |
| commit | 2701191a769784640d6a4fb819ae48272d01eb75 (patch) | |
| tree | 6e6ebcf4bc02c2528e58ddcbe699b1d0601a50e1 /data/battle_scripts_2.s | |
| parent | 4cf115000289d10de3408e752b37128446dd261c (diff) | |
| parent | 0fe97e838eab14723a4a38a773e2bc4d1494241e (diff) | |
Merge branch 'master' into unk_text_util_2
Diffstat (limited to 'data/battle_scripts_2.s')
| -rw-r--r-- | data/battle_scripts_2.s | 77 |
1 files changed, 68 insertions, 9 deletions
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index e76bb397b..adabccb88 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -5,25 +5,84 @@ .align 2 gUnknown_082DBD08:: @ 82DBD08 - .incbin "baserom.gba", 0x2dbd08, 0x34 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD7E + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .4byte gUnknown_082DBD68 + .align 2 gUnknown_082DBD3C:: @ 82DBD3C - .incbin "baserom.gba", 0x2dbd3c, 0x18 + .4byte gUnknown_082DBE12 + .4byte gUnknown_082DBE1C + .4byte gUnknown_082DBE1C + .4byte gUnknown_082DBE4B + .4byte gUnknown_082DBE6F + .4byte gUnknown_082DBE91 + .align 2 gUnknown_082DBD54:: @ 82DBD54 - .incbin "baserom.gba", 0x2dbd54, 0x4 + .4byte gUnknown_082DBEB3 + .align 2 gUnknown_082DBD58:: @ 82DBD58 - .incbin "baserom.gba", 0x2dbd58, 0x2c + .4byte gUnknown_082DBEBD + .4byte gUnknown_082DBEC4 + .4byte gUnknown_082DBECD + .4byte gUnknown_082DBEE3 + +gUnknown_082DBD68:: @ 82DBD68 + .incbin "baserom.gba", 0x2dbd68, 0x16 -gUnknown_082DBD84:: @ 82DBD84 +gUnknown_082DBD7E:: @ 82DBD7E + .incbin "baserom.gba", 0x2dbd7e, 0x6 + +BattleScript_SuccessBallThrow:: @ 82DBD84 .incbin "baserom.gba", 0x2dbd84, 0x46 -gUnknown_082DBDCA:: @ 82DBDCA +BattleScript_WallyBallThrow:: @ 82DBDCA .incbin "baserom.gba", 0x2dbdca, 0xa -gUnknown_082DBDD4:: @ 82DBDD4 +BattleScript_ShakeBallThrow:: @ 82DBDD4 .incbin "baserom.gba", 0x2dbdd4, 0x2e -gUnknown_082DBE02:: @ 82DBE02 - .incbin "baserom.gba", 0x2dbe02, 0xf6 +BattleScript_TrainerBallBlock:: @ 82DBE02 + .incbin "baserom.gba", 0x2dbe02, 0x10 + +gUnknown_082DBE12:: @ 82DBE12 + .incbin "baserom.gba", 0x2dbe12, 0xa + +gUnknown_082DBE1C:: @ 82DBE1C + .incbin "baserom.gba", 0x2dbe1c, 0x2f + +gUnknown_082DBE4B:: @ 82DBE4B + .incbin "baserom.gba", 0x2dbe4b, 0x24 + +gUnknown_082DBE6F:: @ 82DBE6F + .incbin "baserom.gba", 0x2dbe6f, 0x22 + +gUnknown_082DBE91:: @ 82DBE91 + .incbin "baserom.gba", 0x2dbe91, 0x22 + +gUnknown_082DBEB3:: @ 82DBEB3 + .incbin "baserom.gba", 0x2dbeb3, 0xA + +gUnknown_082DBEBD:: @ 82DBEBD + .incbin "baserom.gba", 0x2dbebd, 0x7 + +gUnknown_082DBEC4:: @ 82DBEC4 + .incbin "baserom.gba", 0x2dbec4, 0x9 + +gUnknown_082DBECD:: @ 82DBECD + .incbin "baserom.gba", 0x2dbecd, 0x16 + +gUnknown_082DBEE3:: @ 82DBEE3 + .incbin "baserom.gba", 0x2dbee3, 0x15 |