diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-02-17 04:03:59 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-02-17 04:03:59 -0600 |
| commit | ebd88b36060e8958fbf5f3b2028629575c79a243 (patch) | |
| tree | 101cf777ea827ff7e68069c5ad45822a629ea75c /data/event_scripts.s | |
| parent | 1605f6253564e4e5f67dd295a1ac70145e5c1c9d (diff) | |
| parent | e2932a38ded59a6b794d10024498db718c0b0bb9 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into intro
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index b2b895903..6668f0d1f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -8,7 +8,6 @@ .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" - .section script_data, "aw", %progbits @@ -1287,12 +1286,12 @@ EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851 setvar VAR_0x40D3, 1 return -EverGrandeCity_HallOfFame_EventScript_271857:: @ 8271857 +EventScript_WhiteOut:: @ 8271857 call EverGrandeCity_HallOfFame_EventScript_2718CC - goto EverGrandeCity_HallOfFame_EventScript_271862 + goto EventScript_271862 end -EverGrandeCity_HallOfFame_EventScript_271862:: @ 8271862 +EventScript_271862:: @ 8271862 compare VAR_0x4096, 1 goto_eq EverGrandeCity_HallOfFame_EventScript_271884 compare VAR_0x4096, 2 |