diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-02-16 09:29:11 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-02-16 09:29:11 +0530 |
| commit | ffeca135bcaa449267bc7540f25eeb02cf4c92fa (patch) | |
| tree | 4d9ca1668dc8b49a739c3bb8f83b453f20e2e41d /data/event_scripts.s | |
| parent | a200d9406b15f722b34775050f6fe73894d23629 (diff) | |
| parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
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 |