diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /maps/SaffronGym.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'maps/SaffronGym.asm')
| -rw-r--r-- | maps/SaffronGym.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 008356172..a2ba7497d 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -6,7 +6,7 @@ const_value set 2 const SAFFRONGYM_YOUNGSTER2 const SAFFRONGYM_GYM_GUY -SaffronGym_MapScriptHeader: +SaffronGym_MapScripts: .SceneScripts: db 0 @@ -22,7 +22,7 @@ SabrinaScript_0x189c2e: waitbutton closetext winlosstext UnknownText_0x189df4, 0 - loadtrainer SABRINA, 1 + loadtrainer SABRINA, SABRINA1 startbattle reloadmapafterbattle setevent EVENT_BEAT_SABRINA @@ -111,7 +111,7 @@ SaffronGymStatue: iftrue .Beaten jumpstd gymstatue1 .Beaten: - trainertotext SABRINA, 1, $1 + trainertotext SABRINA, SABRINA1, MEM_BUFFER_1 jumpstd gymstatue2 UnknownText_0x189cdf: @@ -290,7 +290,7 @@ SaffronGymGuyWinText: line "fantastic battle!" done -SaffronGym_MapEventHeader: +SaffronGym_MapEvents: ; filler db 0, 0 |