diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_setup.s | 92 | ||||
| -rw-r--r-- | data/scripts/maps/Route101.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 44 insertions, 52 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 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 27c83f3d0..6536952c4 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -225,7 +225,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setobjectxy 255, 6, 13 applymovement 255, Route101_Movement_2725A4 waitmovement 0 - special sub_80B1138 + special ChooseStarter waitstate applymovement 2, Route101_Movement_1EBE8D waitmovement 0 diff --git a/data/specials.inc b/data/specials.inc index e1a355870..4f8473e17 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -166,7 +166,7 @@ gSpecials:: @ 81DBA64 def_special sub_8085784 def_special Special_StartWallClock def_special Special_ViewWallClock - def_special sub_80B1138 + def_special ChooseStarter def_special StartWallyTutorialBattle def_special ChangePokemonNickname def_special sub_81B94B0 |