diff options
| author | entrpntr <12521136+entrpntr@users.noreply.github.com> | 2020-06-02 18:33:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 18:33:40 -0400 |
| commit | 2547aeb6cc3b2ce051ac88c119d3e7b57dd857a4 (patch) | |
| tree | 8a3f5bcbc0961ccf96695b3a794297e82a023a2c /main.asm | |
| parent | 4dd92dd52efeaf851c732094b45a8e194ea612f0 (diff) | |
| parent | 0297de0841b135923520f025f837c39baff2eac0 (diff) | |
Merge pull request #42 from libjet/bank32-test
Disassemble bank $32
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -378,14 +378,10 @@ INCLUDE "engine/pokemon/caught_data.asm" SECTION "bank32", ROMX -ExecuteBGEffects:: - dr $c8000, $c80d6 -DummyPredef2F:: - dr $c80d6, $c900a +INCLUDE "engine/battle_anims/bg_effects.asm" INCLUDE "data/moves/animations.asm" +INCLUDE "engine/events/poisonstep_pals.asm" -LoadPoisonBGPals:: - dr $cbc76, $cbcbd TheEndGFX:: INCBIN "gfx/credits/theend.2bpp" @@ -408,10 +404,14 @@ BattleAnimCmd_RaiseSub:: BattleAnimCmd_MinimizeOpp:: dr $cc67c, $cc836 ClearBattleAnims:: - dr $cc836, $ce6aa + dr $cc836, $cc8f0 +QueueBattleAnimation:: + dr $cc8f0, $ce6aa BattleAnim_Sine_e:: - dr $ce6aa, $cfce3 + dr $ce6aa, $ce6b0 +BattleAnim_Cosine_e:: + dr $ce6b0, $cfce3 SECTION "Font Inversed", ROMX |