diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:38:12 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-07-03 14:38:12 -0500 |
| commit | f4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce (patch) | |
| tree | c5eb931244f739bd3a88d488586923b2a0762b74 /scripts/copycatshouse2f.asm | |
| parent | cd649184f556db777d592671a7274bfa4a8423d7 (diff) | |
Rename/organize part 2 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 'scripts/copycatshouse2f.asm')
| -rwxr-xr-x | scripts/copycatshouse2f.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm index b7a1255c..5bdb98b2 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/copycatshouse2f.asm @@ -14,14 +14,14 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82) db $08 ; asm ld a, [wd7af] bit 0, a - jr nz, .asm_7ccf3 ; 0x5cc88 + jr nz, .asm_7ccf3 ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, CopycatsHouse2FText_5ccd4 call PrintText ld b, POKE_DOLL call IsItemInBag - jr z, .asm_62ecd ; 0x5cc9a + jr z, .asm_62ecd ld hl, TM31PreReceiveText call PrintText ld bc, (TM_31 << 8) | 1 @@ -34,15 +34,15 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82) callba RemoveItemByID ld hl, wd7af set 0, [hl] - jr .asm_62ecd ; 0x5ccc1 + jr .asm_62ecd .BagFull ld hl, TM31NoRoomText call PrintText - jr .asm_62ecd ; 0x5ccc9 -.asm_7ccf3 ; 0x5cccb + jr .asm_62ecd +.asm_7ccf3 ld hl, TM31ExplanationText2 call PrintText -.asm_62ecd ; 0x5ccd1 +.asm_62ecd jp TextScriptEnd CopycatsHouse2FText_5ccd4: ; 5ccd4 (17:4cd4) @@ -87,9 +87,9 @@ CopycatsHouse2FText7: ; 5cd03 (17:4d03) ld a, [wSpriteStateData1 + 9] cp $4 ld hl, CopycatsHouse2FText_5cd1c - jr nz, .asm_399a4 ; 0x5cd0c + jr nz, .asm_399a4 ld hl, CopycatsHouse2FText_5cd17 -.asm_399a4 ; 0x5cd11 +.asm_399a4 call PrintText jp TextScriptEnd |