dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

more work on battle setup

Browse Source
This commit is contained in:
DizzyEggg
2017-11-29 19:54:15 +01:00
parent 10470ef536
commit e8ecb01ab2
15 changed files with 332 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
data/battle_setup.s
View File

@@ -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

2
data/scripts/maps/Route101.inc
View File

@@ -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

2
data/specials.inc
View File

@@ -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