diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 20:12:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 20:12:31 -0500 |
| commit | f404af8a4326e4cc632a3810ff77a013c1d3e24f (patch) | |
| tree | c28045b675937d380eb3d51c48bb990ceed33c0a /maps/TeamRocketBaseB3F.asm | |
| parent | 4046b41c3aaaf0d930f0268e52112aa7ea01e0a4 (diff) | |
| parent | c959f7a2ea7dbe044489eb2ba6dc963a40717535 (diff) | |
Merge pull request #486 from surskitty/master
Another batch of label names
Diffstat (limited to 'maps/TeamRocketBaseB3F.asm')
| -rw-r--r-- | maps/TeamRocketBaseB3F.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 3f7fe5d39..8373be03f 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -98,18 +98,18 @@ UnknownScript_0x6e056: playmusic MUSIC_ROCKET_ENCOUNTER spriteface TEAMROCKETBASEB3F_ROCKET1, DOWN opentext - writetext UnknownText_0x6e400 + writetext ExecutiveM4BeforeText waitbutton closetext applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142 - winlosstext UnknownText_0x6e511, 0 + winlosstext ExecutiveM4BeatenText, 0 setlasttalked TEAMROCKETBASEB3F_ROCKET1 loadtrainer EXECUTIVEM, EXECUTIVEM_4 startbattle reloadmapafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4 opentext - writetext UnknownText_0x6e548 + writetext ExecutiveM4AfterText waitbutton closetext applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144 @@ -385,7 +385,7 @@ RocketBaseRivalText: cont "the likes of you!" done -UnknownText_0x6e400: +ExecutiveM4BeforeText: text "What? Who are you?" line "This is the office" @@ -412,7 +412,7 @@ UnknownText_0x6e400: cont "place!" done -UnknownText_0x6e511: +ExecutiveM4BeatenText: text "I… I couldn't do a" line "thing…" @@ -420,7 +420,7 @@ UnknownText_0x6e511: line "forgive me…" done -UnknownText_0x6e548: +ExecutiveM4AfterText: text "No, I can't let" line "this affect me." |