diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-29 19:54:15 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-29 19:54:15 +0100 |
| commit | e8ecb01ab2f7d7e67a525621e6ea7ada08c52952 (patch) | |
| tree | 9764a85781bb0d70d0259d870e18085fb1189bf2 /data/battle_setup.s | |
| parent | 10470ef536132c317f0c478e42ad37657a0f00aa (diff) | |
more work on battle setup
Diffstat (limited to 'data/battle_setup.s')
| -rw-r--r-- | data/battle_setup.s | 92 |
1 files changed, 42 insertions, 50 deletions
diff --git a/data/battle_setup.s b/data/battle_setup.s index cd7c5d57b..dacc3faa4 100644 --- a/data/battle_setup.s +++ b/data/battle_setup.s @@ -4,96 +4,88 @@ .section .rodata .align 2, 0 -gUnknown_0854FE98:: @ 854FE98 - .byte 0x1d, 0x1e, 0x1f, 0x20, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29 - -gUnknown_0854FEA4:: @ 854FEA4 - .byte 0x1f, 0x20, 0x21 - -gUnknown_0854FEA7:: @ 854FEA7 - .byte 0x1d, 0x1f, 0x20, 0x21, 0x00 .align 2 gUnknown_0854FEAC:: @ 854FEAC - .4byte gUnknown_02038BC8, 0x00000000 + .4byte sTrainerBattleMode, 0x00000000 .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000002 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 + .4byte sTrainerMapObjectLocalId, 0x00000001 + .4byte sTrainerAIntroSpeech, 0x00000002 + .4byte sTrainerADefeatSpeech, 0x00000002 + .4byte sTrainerVictorySpeech, 0x00000005 + .4byte sTrainerCannotBattleSpeech, 0x00000005 .4byte gUnknown_02038BF0, 0x00000005 .4byte gUnknown_02038BEC, 0x00000006 .align 2 gUnknown_0854FEF4:: @ 854FEF4 - .4byte gUnknown_02038BC8, 0x00000000 + .4byte sTrainerBattleMode, 0x00000000 .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000002 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 + .4byte sTrainerMapObjectLocalId, 0x00000001 + .4byte sTrainerAIntroSpeech, 0x00000002 + .4byte sTrainerADefeatSpeech, 0x00000002 + .4byte sTrainerVictorySpeech, 0x00000005 + .4byte sTrainerCannotBattleSpeech, 0x00000005 .4byte gUnknown_02038BF0, 0x00000002 .4byte gUnknown_02038BEC, 0x00000006 .align 2 gUnknown_0854FF3C:: @ 854FF3C - .4byte gUnknown_02038BC8, 0x00000000 + .4byte sTrainerBattleMode, 0x00000000 .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000002 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000002 + .4byte sTrainerMapObjectLocalId, 0x00000001 + .4byte sTrainerAIntroSpeech, 0x00000002 + .4byte sTrainerADefeatSpeech, 0x00000002 + .4byte sTrainerVictorySpeech, 0x00000005 + .4byte sTrainerCannotBattleSpeech, 0x00000002 .4byte gUnknown_02038BF0, 0x00000005 .4byte gUnknown_02038BEC, 0x00000006 .align 2 gUnknown_0854FF84:: @ 854FF84 - .4byte gUnknown_02038BC8, 0x00000000 + .4byte sTrainerBattleMode, 0x00000000 .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000005 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 + .4byte sTrainerMapObjectLocalId, 0x00000001 + .4byte sTrainerAIntroSpeech, 0x00000005 + .4byte sTrainerADefeatSpeech, 0x00000002 + .4byte sTrainerVictorySpeech, 0x00000005 + .4byte sTrainerCannotBattleSpeech, 0x00000005 .4byte gUnknown_02038BF0, 0x00000005 .4byte gUnknown_02038BEC, 0x00000006 .align 2 gUnknown_0854FFCC:: @ 854FFCC - .4byte gUnknown_02038BC8, 0x00000000 + .4byte sTrainerBattleMode, 0x00000000 .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000002 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000002 + .4byte sTrainerMapObjectLocalId, 0x00000001 + .4byte sTrainerAIntroSpeech, 0x00000002 + .4byte sTrainerADefeatSpeech, 0x00000002 + .4byte sTrainerVictorySpeech, 0x00000005 + .4byte sTrainerCannotBattleSpeech, 0x00000002 .4byte gUnknown_02038BF0, 0x00000002 .4byte gUnknown_02038BEC, 0x00000006 .align 2 gUnknown_08550014:: @ 8550014 - .4byte gUnknown_02038BC8, 0x00000000 + .4byte sTrainerBattleMode, 0x00000000 .4byte gTrainerBattleOpponent_B, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD8, 0x00000002 - .4byte gUnknown_02038BE0, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 + .4byte sTrainerMapObjectLocalId, 0x00000001 + .4byte sTrainerBIntroSpeech, 0x00000002 + .4byte sTrainerBDefeatSpeech, 0x00000002 + .4byte sTrainerVictorySpeech, 0x00000005 + .4byte sTrainerCannotBattleSpeech, 0x00000005 .4byte gUnknown_02038BF4, 0x00000005 .4byte gUnknown_02038BEC, 0x00000006 .align 2 gUnknown_0855005C:: @ 855005C - .4byte gUnknown_02038BC8, 0x00000000 + .4byte sTrainerBattleMode, 0x00000000 .4byte gTrainerBattleOpponent_B, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD8, 0x00000002 - .4byte gUnknown_02038BE0, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 + .4byte sTrainerMapObjectLocalId, 0x00000001 + .4byte sTrainerBIntroSpeech, 0x00000002 + .4byte sTrainerBDefeatSpeech, 0x00000002 + .4byte sTrainerVictorySpeech, 0x00000005 + .4byte sTrainerCannotBattleSpeech, 0x00000005 .4byte gUnknown_02038BF4, 0x00000002 .4byte gUnknown_02038BEC, 0x00000006 |