diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/mansion3.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/PokemonMansion3F.asm (renamed from scripts/mansion3.asm) | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/scripts/mansion3.asm b/scripts/PokemonMansion3F.asm index 990ad434..e19fec72 100755 --- a/scripts/mansion3.asm +++ b/scripts/PokemonMansion3F.asm @@ -1,11 +1,11 @@ -Mansion3Script: +PokemonMansion3F_Script: call Mansion3Script_52204 call EnableAutoTextBoxDrawing ld hl, Mansion3TrainerHeader0 - ld de, Mansion3ScriptPointers - ld a, [wMansion3CurScript] + ld de, PokemonMansion3F_ScriptPointers + ld a, [wPokemonMansion3FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion3CurScript], a + ld [wPokemonMansion3FCurScript], a ret Mansion3Script_52204: @@ -16,22 +16,22 @@ Mansion3Script_52204: CheckEvent EVENT_MANSION_SWITCH_ON jr nz, .asm_52224 ld a, $e - ld bc, $207 + lb bc, 2, 7 call Mansion2Script_5202f ld a, $5f - ld bc, $507 + lb bc, 5, 7 call Mansion2Script_5202f ret .asm_52224 ld a, $5f - ld bc, $207 + lb bc, 2, 7 call Mansion2Script_5202f ld a, $e - ld bc, $507 + lb bc, 5, 7 call Mansion2Script_5202f ret -Mansion3ScriptPointers: +PokemonMansion3F_ScriptPointers: dw Mansion3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -43,9 +43,9 @@ Mansion3Script0: and a jp z, CheckFightingMapTrainers cp $3 - ld a, $a5 + ld a, POKEMON_MANSION_1F jr nz, .asm_52250 - ld a, $d6 + ld a, POKEMON_MANSION_2F .asm_52250 ld [wDungeonWarpDestinationMap], a ret @@ -82,7 +82,7 @@ Mansion3Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion3TextPointers: +PokemonMansion3F_TextPointers: dw Mansion3Text1 dw Mansion3Text2 dw PickUpItemText @@ -90,7 +90,6 @@ Mansion3TextPointers: dw Mansion3Text5 dw Mansion3Text6 -Mansion3TrainerHeaders: Mansion3TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0 db ($0 << 4) ; trainer's view range @@ -100,10 +99,10 @@ Mansion3TrainerHeader0: dw Mansion3EndBattleText1 ; TextEndBattle dw Mansion3EndBattleText1 ; TextEndBattle -Mansion3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_2 +Mansion3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_1 dw Mansion3BattleText2 ; TextBeforeBattle dw Mansion3AfterBattleText2 ; TextAfterBattle dw Mansion3EndBattleText2 ; TextEndBattle @@ -119,7 +118,7 @@ Mansion3Text1: Mansion3Text2: TX_ASM - ld hl, Mansion3TrainerHeader2 + ld hl, Mansion3TrainerHeader1 call TalkToTrainer jp TextScriptEnd |