diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-10-20 18:56:21 -0600 |
| commit | 5459477ecd3c60342f31881343bc921b41b94eb0 (patch) | |
| tree | aed48bfac6aee9ccad16d3de004c1014550bacd5 /scripts/rockethideout4.asm | |
| parent | 519dd7fd56c4688ead80e444d945fc188cea5b66 (diff) | |
| parent | 0991bd3abed50f4d249da1ef38d77cd5cd39a77e (diff) | |
Merge branch 'master' of https://github.com/dannye/pokered
Diffstat (limited to 'scripts/rockethideout4.asm')
| -rwxr-xr-x | scripts/rockethideout4.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 097512c3..f1b46653 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -59,10 +59,10 @@ RocketHideout4Script3: ; 454b6 (11:54b6) ld [H_SPRITEHEIGHT], a call DisplayTextID call GBFadeOutToBlack - ld a, $83 + ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI ld [wcc4d], a predef HideObject - ld a, $87 + ld a, HS_ROCKET_HIDEOUT_4_ITEM_4 ld [wcc4d], a predef ShowObject call UpdateSprites @@ -217,7 +217,7 @@ RocketHideout4AfterBattleText4: ; 455cf (11:55cf) bit 6, [hl] set 6, [hl] jr nz, .asm_455e9 ; 0x455dd $a - ld a, $88 + ld a, HS_ROCKET_HIDEOUT_4_ITEM_5 ld [wcc4d], a predef ShowObject .asm_455e9 |