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/mansion1.asm | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| parent | No more ldh (diff) | |
| download | pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/mansion1.asm')
| -rwxr-xr-x | scripts/mansion1.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index 3e067a98..e5c7eb0a 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -15,7 +15,7 @@ Mansion1Subscript1: ; 442c5 (11:42c5) ret z ld a, [wd796] bit 0, a - jr nz, .asm_442ec ; 0x442d2 $18 + jr nz, .asm_442ec ld bc, $060c call Mansion1Script_4430b ld bc, $0308 @@ -37,12 +37,12 @@ Mansion1Subscript1: ; 442c5 (11:42c5) Mansion1Script_44304: ; 44304 (11:4304) ld a, $2d ld [wd09f], a - jr asm_44310 + jr Mansion1ReplaceBlock Mansion1Script_4430b: ; 4430b (11:430b) ld a, $e ld [wd09f], a -asm_44310: ; 44310 (11:4310) +Mansion1ReplaceBlock: ; 44310 (11:4310) predef ReplaceTileBlock ret @@ -72,15 +72,15 @@ Mansion1TrainerHeader0: ; 44334 (11:4334) db $1 ; flag's bit db ($3 << 4) ; trainer's view range dw wd798 ; flag's byte - dw Mansion1BattleText2 ; 0x434b TextBeforeBattle - dw Mansion1AfterBattleText2 ; 0x4355 TextAfterBattle - dw Mansion1EndBattleText2 ; 0x4350 TextEndBattle - dw Mansion1EndBattleText2 ; 0x4350 TextEndBattle + dw Mansion1BattleText2 ; TextBeforeBattle + dw Mansion1AfterBattleText2 ; TextAfterBattle + dw Mansion1EndBattleText2 ; TextEndBattle + dw Mansion1EndBattleText2 ; TextEndBattle db $ff Mansion1Text1: ; 44341 (11:4341) - db $08 ; asm + TX_ASM ld hl, Mansion1TrainerHeader0 call TalkToTrainer jp TextScriptEnd @@ -98,13 +98,13 @@ Mansion1AfterBattleText2: ; 44355 (11:4355) db "@" Mansion1Text4: ; 4435a (11:435a) - db $8 + TX_ASM ld hl, MansionSwitchText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_4438c ; 0x44368 $22 + jr nz, .asm_4438c ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, wd126 @@ -116,9 +116,9 @@ Mansion1Text4: ; 4435a (11:435a) ld hl, wd796 bit 0, [hl] set 0, [hl] - jr z, .asm_44392 ; 0x44386 $a + jr z, .asm_44392 res 0, [hl] - jr .asm_44392 ; 0x4438a $6 + jr .asm_44392 .asm_4438c ld hl, MansionSwitchNotPressedText call PrintText |