diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/CherrygroveCity.asm | 6 | ||||
| -rw-r--r-- | maps/LakeofRage.asm | 2 | ||||
| -rw-r--r-- | maps/Route29.asm | 6 | ||||
| -rw-r--r-- | maps/TeamRocketBaseB1F.asm | 6 | ||||
| -rw-r--r-- | maps/TinTower1F.asm | 2 | ||||
| -rw-r--r-- | maps/TinTowerRoof.asm | 2 | ||||
| -rw-r--r-- | maps/VermilionCity.asm | 2 | ||||
| -rw-r--r-- | maps/WhirlIslandLugiaChamber.asm | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index f2573913b..cdcacbd1b 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -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 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 46cdf948f..fcd052968 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -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 diff --git a/maps/Route29.asm b/maps/Route29.asm index 2dbe28d1c..f3b95ae7c 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -52,7 +52,7 @@ UnknownScript_0x1a0f6d: ; 0x1a0f6d applymovement $2, MovementData_0x1a109a stopfollow loadpokedata RATTATA, 5 - catchtutorial $3 + catchtutorial BATTLETYPE_TUTORIAL spriteface $2, $1 loadfont 2writetext UnknownText_0x1a114d @@ -78,7 +78,7 @@ UnknownScript_0x1a0fa3: ; 0x1a0fa3 applymovement $2, MovementData_0x1a10a1 stopfollow loadpokedata RATTATA, 5 - catchtutorial $3 + catchtutorial BATTLETYPE_TUTORIAL spriteface $2, $1 loadfont 2writetext UnknownText_0x1a114d @@ -121,7 +121,7 @@ CooltrainerMScript_0x1a0ff1: ; 0x1a0ff1 iffalse UnknownScript_0x1a1022 loadmovesprites loadpokedata RATTATA, 5 - catchtutorial $3 + catchtutorial BATTLETYPE_TUTORIAL loadfont 2writetext UnknownText_0x1a114d closetext diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 7c8b2f50b..d0aa17c29 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -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 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 4e4d93d04..d9a1fe044 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -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 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 27ed801c5..5e3aa8bea 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -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 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index a1e1123db..d69a9546f 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -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 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 05adf2ced..ff95c239d 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -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 |