diff options
Diffstat (limited to 'scripts/mansion2.asm')
| -rwxr-xr-x | scripts/mansion2.asm | 100 |
1 files changed, 48 insertions, 52 deletions
diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index c643d229..ddc1ff7a 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -1,144 +1,140 @@ -Mansion2Script: ; 51fd8 (14:5fd8) +Mansion2Script: call Mansion2Script_51fee call EnableAutoTextBoxDrawing - ld hl, Mansion2TrainerHeaders + ld hl, Mansion2TrainerHeader0 ld de, Mansion2ScriptPointers - ld a, [W_MANSION2CURSCRIPT] + ld a, [wMansion2CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION2CURSCRIPT], a + ld [wMansion2CurScript], a ret -Mansion2Script_51fee: ; 51fee (14:5fee) - ld hl, wd126 +Mansion2Script_51fee: + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z - ld a, [wd796] - bit 0, a + CheckEvent EVENT_MANSION_SWITCH_ON jr nz, .asm_52016 ld a, $e - ld bc, $204 + lb bc, 2, 4 call Mansion2Script_5202f ld a, $54 - ld bc, $409 + lb bc, 4, 9 call Mansion2Script_5202f ld a, $5f - ld bc, $b03 + lb bc, 11, 3 call Mansion2Script_5202f ret .asm_52016 ld a, $5f - ld bc, $204 + lb bc, 2, 4 call Mansion2Script_5202f ld a, $e - ld bc, $409 + lb bc, 4, 9 call Mansion2Script_5202f ld a, $e - ld bc, $b03 + lb bc, 11, 3 call Mansion2Script_5202f ret -Mansion2Script_5202f: ; 5202f (14:602f) - ld [wd09f], a +Mansion2Script_5202f: + ld [wNewTileBlockID], a predef_jump ReplaceTileBlock -Mansion2Script_Switches: ; 52037 (14:6037) +Mansion2Script_Switches: ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz xor a ld [hJoyHeld], a ld a, $5 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion2ScriptPointers: ; 52047 (14:6047) +Mansion2ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion2TextPointers: ; 5204d (14:604d) +Mansion2TextPointers: dw Mansion2Text1 - dw Predef5CText + dw PickUpItemText dw Mansion2Text3 dw Mansion2Text4 dw Mansion2Text5 -Mansion2TrainerHeaders: ; 52057 (14:6057) -Mansion2TrainerHeader0: ; 52057 (14:6057) - db $1 ; flag's bit +Mansion2TrainerHeader0: + dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0 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 + dwEventFlagAddress EVENT_BEAT_MANSION_2_TRAINER_0 + dw Mansion2BattleText1 ; TextBeforeBattle + dw Mansion2AfterBattleText1 ; TextAfterBattle + dw Mansion2EndBattleText1 ; TextEndBattle + dw Mansion2EndBattleText1 ; TextEndBattle db $ff -Mansion2Text1: ; 52064 (14:6064) - db $08 ; asm +Mansion2Text1: + TX_ASM ld hl, Mansion2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion2BattleText1: ; 5206e (14:606e) +Mansion2BattleText1: TX_FAR _Mansion2BattleText1 db "@" -Mansion2EndBattleText1: ; 52073 (14:6073) +Mansion2EndBattleText1: TX_FAR _Mansion2EndBattleText1 db "@" -Mansion2AfterBattleText1: ; 52078 (14:6078) +Mansion2AfterBattleText1: TX_FAR _Mansion2AfterBattleText1 db "@" -Mansion2Text3: ; 5207d (14:607d) +Mansion2Text3: TX_FAR _Mansion2Text3 db "@" -Mansion2Text4: ; 52082 (14:6082) +Mansion2Text4: TX_FAR _Mansion2Text4 db "@" -Mansion3Text6: ; 52087 (14:6087) -Mansion2Text5: ; 52087 (14:6087) - db $8 +Mansion3Text6: +Mansion2Text5: + 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 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld hl, Mansion2Text_520c7 call PrintText - ld a, (SFX_02_57 - SFX_Headers_02) / 3 + ld a, SFX_GO_INSIDE call PlaySound - ld hl, wd796 - bit 0, [hl] - set 0, [hl] - jr z, .asm_520bf ; 0x520b3 $a - res 0, [hl] - jr .asm_520bf ; 0x520b7 $6 + CheckAndSetEvent EVENT_MANSION_SWITCH_ON + jr z, .asm_520bf + ResetEventReuseHL EVENT_MANSION_SWITCH_ON + jr .asm_520bf .asm_520b9 ld hl, Mansion2Text_520cc call PrintText .asm_520bf jp TextScriptEnd -Mansion2Text_520c2: ; 520c2 (14:60c2) +Mansion2Text_520c2: TX_FAR _Mansion2Text_520c2 db "@" -Mansion2Text_520c7: ; 520c7 (14:60c7) +Mansion2Text_520c7: TX_FAR _Mansion2Text_520c7 db "@" -Mansion2Text_520cc: ; 520cc (14:60cc) +Mansion2Text_520cc: TX_FAR _Mansion2Text_520cc db "@" |