diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /scripts/mansion2.asm | |
| parent | c43c338a5f7d90494b7e6e67c6533288bd28117d (diff) | |
| parent | 5d9d26bd5c64a5b11021bdd46e2e0786ddef888d (diff) | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/mansion2.asm')
| -rwxr-xr-x | scripts/mansion2.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index c643d229..334753df 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -69,15 +69,15 @@ Mansion2TrainerHeader0: ; 52057 (14:6057) db $1 ; flag's bit db ($0 << 4) ; trainer's view range dw wd847 ; flag's byte - dw Mansion2BattleText1 ; 0x606e TextBeforeBattle - dw Mansion2AfterBattleText1 ; 0x6078 TextAfterBattle - dw Mansion2EndBattleText1 ; 0x6073 TextEndBattle - dw Mansion2EndBattleText1 ; 0x6073 TextEndBattle + dw Mansion2BattleText1 ; TextBeforeBattle + dw Mansion2AfterBattleText1 ; TextAfterBattle + dw Mansion2EndBattleText1 ; TextEndBattle + dw Mansion2EndBattleText1 ; TextEndBattle db $ff Mansion2Text1: ; 52064 (14:6064) - db $08 ; asm + TX_ASM ld hl, Mansion2TrainerHeader0 call TalkToTrainer jp TextScriptEnd @@ -104,13 +104,13 @@ Mansion2Text4: ; 52082 (14:6082) Mansion3Text6: ; 52087 (14:6087) Mansion2Text5: ; 52087 (14:6087) - db $8 + TX_ASM ld hl, Mansion2Text_520c2 call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_520b9 ; 0x52095 $22 + jr nz, .asm_520b9 ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, wd126 @@ -122,9 +122,9 @@ Mansion2Text5: ; 52087 (14:6087) ld hl, wd796 bit 0, [hl] set 0, [hl] - jr z, .asm_520bf ; 0x520b3 $a + jr z, .asm_520bf res 0, [hl] - jr .asm_520bf ; 0x520b7 $6 + jr .asm_520bf .asm_520b9 ld hl, Mansion2Text_520cc call PrintText |