Battle type constants in the wild.

Also add constants for trap and Celebi event battles.
This commit is contained in:
yenatch
2014-06-13 22:53:20 -07:00
parent eb9fc6676c
commit e23f341258
16 changed files with 60 additions and 54 deletions

View File

@@ -130,7 +130,7 @@ UnknownScript_0x19c0ae: ; 0x19c0ae
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
setlasttalked $3
loadtrainer RIVAL1, RIVAL1_3
writecode $3, $1
writecode $3, BATTLETYPE_CANLOSE
startbattle
reloadmapmusic
reloadmap
@@ -142,7 +142,7 @@ UnknownScript_0x19c0ee: ; 0x19c0ee
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
setlasttalked $3
loadtrainer RIVAL1, RIVAL1_1
writecode $3, $1
writecode $3, BATTLETYPE_CANLOSE
startbattle
reloadmapmusic
reloadmap
@@ -154,7 +154,7 @@ UnknownScript_0x19c104: ; 0x19c104
winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
setlasttalked $3
loadtrainer RIVAL1, RIVAL1_2
writecode $3, $1
writecode $3, BATTLETYPE_CANLOSE
startbattle
reloadmapmusic
reloadmap

View File

@@ -88,7 +88,7 @@ GyaradosScript_0x70063: ; 0x70063
cry GYARADOS
loadmovesprites
loadpokedata GYARADOS, 30
writecode $3, $7
writecode $3, BATTLETYPE_SHINY
startbattle
if_equal $1, UnknownScript_0x7007a
disappear $a

View File

@@ -464,7 +464,7 @@ VoltorbExplodingTrap: ; 0x6ca34
cry VOLTORB
special $0031
setlasttalked $ff
writecode $3, $9
writecode $3, BATTLETYPE_TRAP
loadpokedata VOLTORB, 23
startbattle
end
@@ -474,7 +474,7 @@ GeodudeExplodingTrap: ; 0x6ca47
cry GEODUDE
special $0031
setlasttalked $ff
writecode $3, $9
writecode $3, BATTLETYPE_TRAP
loadpokedata GEODUDE, 21
startbattle
end
@@ -484,7 +484,7 @@ KoffingExplodingTrap: ; 0x6ca5a
cry KOFFING
special $0031
setlasttalked $ff
writecode $3, $9
writecode $3, BATTLETYPE_TRAP
loadpokedata KOFFING, 21
startbattle
end

View File

@@ -122,7 +122,7 @@ UnknownScript_0x1850d7: ; 0x1850d7
cry SUICUNE
pause 20
loadpokedata SUICUNE, 40
writecode $3, $c
writecode $3, BATTLETYPE_SUICUNE
startbattle
reloadmapmusic
disappear $2

View File

@@ -36,7 +36,7 @@ HoOhScript_0x77244: ; 0x77244
pause 15
loadmovesprites
setevent EVENT_FOUGHT_HO_OH
writecode $3, $a
writecode $3, BATTLETYPE_FORCEITEM
loadpokedata HO_OH, 60
startbattle
disappear $2

View File

@@ -56,7 +56,7 @@ UnknownScript_0x1aa9ab: ; 0x1aa9ab
pause 15
cry SNORLAX
loadmovesprites
writecode $3, $a
writecode $3, BATTLETYPE_FORCEITEM
loadpokedata SNORLAX, 50
startbattle
disappear $6

View File

@@ -36,7 +36,7 @@ LugiaScript_0x18c518: ; 0x18c518
pause 15
loadmovesprites
setevent EVENT_FOUGHT_LUGIA
writecode $3, $a
writecode $3, BATTLETYPE_FORCEITEM
loadpokedata LUGIA, 60
startbattle
disappear $2