diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-23 15:57:48 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-23 15:57:48 -0400 |
| commit | 9da88a19beed6b713317bb446d21cbd493ab8009 (patch) | |
| tree | d8d6cc4df3c3dcb00541b5bda9cae842584a7009 /engine/overworld/saffron_guards.asm | |
| parent | Name some wram address refs (diff) | |
| parent | Bank7 misc functions (diff) | |
| download | pokeyellow-9da88a19beed6b713317bb446d21cbd493ab8009.tar.gz pokeyellow-9da88a19beed6b713317bb446d21cbd493ab8009.tar.xz pokeyellow-9da88a19beed6b713317bb446d21cbd493ab8009.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/overworld/saffron_guards.asm')
| -rwxr-xr-x | engine/overworld/saffron_guards.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/saffron_guards.asm b/engine/overworld/saffron_guards.asm index c0d6a985..83d73d02 100755 --- a/engine/overworld/saffron_guards.asm +++ b/engine/overworld/saffron_guards.asm @@ -1,4 +1,4 @@ -RemoveGuardDrink: ; 5a59f (16:659f) +RemoveGuardDrink: ; 5a53a (16:653a) ld hl, GuardDrinksList .drinkLoop ld a, [hli] @@ -12,5 +12,5 @@ RemoveGuardDrink: ; 5a59f (16:659f) jr z, .drinkLoop jpba RemoveItemByID -GuardDrinksList: ; 5a5b7 (16:65b7) +GuardDrinksList: ; 5a552 (16:6552) db FRESH_WATER, SODA_POP, LEMONADE, $00 |