diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:37:53 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:37:53 -0500 |
| commit | cd649184f556db777d592671a7274bfa4a8423d7 (patch) | |
| tree | dca56b6c0accb03b4256268faaee2705d373b933 /engine/hidden_object_functions17.asm | |
| parent | ae420a4d8f24d4c4290b7b2e7ccc02f363272548 (diff) | |
Rename/organize part 1 of 4
rename functions, clean up address/wram comments, other misc
only broken up so that all changes are viewable on github
Diffstat (limited to 'engine/hidden_object_functions17.asm')
| -rwxr-xr-x | engine/hidden_object_functions17.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 69f3c7f4..822f59a5 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -61,7 +61,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ; Displays a pokemon's front sprite in a pop-up window. ; [wcf91] = pokemon interal id number ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; $ffba + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a ld [hWY], a @@ -78,7 +78,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ld a, $80 ld [$ffe1], a hlCoord 10, 11 - predef Func_3f073 + predef AnimateSendingOutMon call WaitForTextScrollButtonPress call LoadScreenTilesFromBuffer1 call Delay3 @@ -125,10 +125,10 @@ LinkCableHelp: ; 5dc29 (17:5c29) call PrintText call HandleMenuInput bit 1, a - jr nz, .asm_5dc93 ; 0x5dc74 $1d + jr nz, .asm_5dc93 ld a, [wCurrentMenuItem] cp $3 - jr z, .asm_5dc93 ; 0x5dc7b $16 + jr z, .asm_5dc93 ld hl, wd730 res 6, [hl] ld hl, LinkCableInfoTexts @@ -316,7 +316,7 @@ VermilionGymTrashText: ; 5ddf7 (17:5df7) GymTrashScript: ; 5ddfc (17:5dfc) call EnableAutoTextBoxDrawing - ld a, [wWhichTrade] ; wWhichTrade + ld a, [wWhichTrade] ld [wcd5b], a ; Don't do the trash can puzzle if it's already been done. @@ -345,7 +345,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) ld hl, wd773 set 1, [hl] - ld hl, GymTrashCans ; $5e7d + ld hl, GymTrashCans ld a, [wcd5b] ; * 5 ld b, a |