diff options
Diffstat (limited to 'scripts/mansion4.asm')
| -rwxr-xr-x | scripts/mansion4.asm | 88 |
1 files changed, 43 insertions, 45 deletions
diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index b89af5f2..de8a5d58 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -1,20 +1,19 @@ -Mansion4Script: ; 523b9 (14:63b9) +Mansion4Script: call Mansion4Script_523cf call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeader0 ld de, Mansion4ScriptPointers - ld a, [W_MANSION4CURSCRIPT] + ld a, [wMansion4CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION4CURSCRIPT], a + ld [wMansion4CurScript], a ret -Mansion4Script_523cf: ; 523cf (14:63cf) - ld hl, wd126 +Mansion4Script_523cf: + 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_523ff ld a, $e ld bc, $80d @@ -44,89 +43,88 @@ Mansion4Script_523cf: ; 523cf (14:63cf) call Mansion2Script_5202f ret -Mansion4Script_Switches: ; 52420 (14:6420) +Mansion4Script_Switches: ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz xor a ld [hJoyHeld], a ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a ; $ff8c + ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion4ScriptPointers: ; 52430 (14:6430) +Mansion4ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion4TextPointers: ; 52436 (14:6436) +Mansion4TextPointers: dw Mansion4Text1 dw Mansion4Text2 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw Mansion4Text7 - dw Predef5CText + dw PickUpItemText dw Mansion3Text6 -Mansion4TrainerHeaders: ; 52448 (14:6448) -Mansion4TrainerHeader0: ; 52448 (14:6448) - db $1 ; flag's bit +Mansion4TrainerHeader0: + dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0 db ($0 << 4) ; trainer's view range - dw wd84b ; flag's byte - dw Mansion4BattleText1 ; 0x6475 TextBeforeBattle - dw Mansion4AfterBattleText1 ; 0x647f TextAfterBattle - dw Mansion4EndBattleText1 ; 0x647a TextEndBattle - dw Mansion4EndBattleText1 ; 0x647a TextEndBattle - -Mansion4TrainerHeader2: ; 52454 (14:6454) - db $2 ; flag's bit + dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_0 + dw Mansion4BattleText1 ; TextBeforeBattle + dw Mansion4AfterBattleText1 ; TextAfterBattle + dw Mansion4EndBattleText1 ; TextEndBattle + dw Mansion4EndBattleText1 ; TextEndBattle + +Mansion4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_1 db ($3 << 4) ; trainer's view range - dw wd84b ; flag's byte - dw Mansion4BattleText2 ; 0x6484 TextBeforeBattle - dw Mansion4AfterBattleText2 ; 0x648e TextAfterBattle - dw Mansion4EndBattleText2 ; 0x6489 TextEndBattle - dw Mansion4EndBattleText2 ; 0x6489 TextEndBattle + dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_1 + dw Mansion4BattleText2 ; TextBeforeBattle + dw Mansion4AfterBattleText2 ; TextAfterBattle + dw Mansion4EndBattleText2 ; TextEndBattle + dw Mansion4EndBattleText2 ; TextEndBattle db $ff -Mansion4Text1: ; 52461 (14:6461) - db $08 ; asm +Mansion4Text1: + TX_ASM ld hl, Mansion4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion4Text2: ; 5246b (14:646b) - db $08 ; asm - ld hl, Mansion4TrainerHeader2 +Mansion4Text2: + TX_ASM + ld hl, Mansion4TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Mansion4BattleText1: ; 52475 (14:6475) +Mansion4BattleText1: TX_FAR _Mansion4BattleText1 db "@" -Mansion4EndBattleText1: ; 5247a (14:647a) +Mansion4EndBattleText1: TX_FAR _Mansion4EndBattleText1 db "@" -Mansion4AfterBattleText1: ; 5247f (14:647f) +Mansion4AfterBattleText1: TX_FAR _Mansion4AfterBattleText1 db "@" -Mansion4BattleText2: ; 52484 (14:6484) +Mansion4BattleText2: TX_FAR _Mansion4BattleText2 db "@" -Mansion4EndBattleText2: ; 52489 (14:6489) +Mansion4EndBattleText2: TX_FAR _Mansion4EndBattleText2 db "@" -Mansion4AfterBattleText2: ; 5248e (14:648e) +Mansion4AfterBattleText2: TX_FAR _Mansion4AfterBattleText2 db "@" -Mansion4Text7: ; 52493 (14:6493) +Mansion4Text7: TX_FAR _Mansion4Text7 db "@" |