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/mansion4.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/PokemonMansionB1F.asm (renamed from scripts/mansion4.asm) | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/scripts/mansion4.asm b/scripts/PokemonMansionB1F.asm index 57687fec..0a668c09 100755 --- a/scripts/mansion4.asm +++ b/scripts/PokemonMansionB1F.asm @@ -1,11 +1,11 @@ -Mansion4Script: +PokemonMansionB1F_Script: call Mansion4Script_523cf call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeader0 - ld de, Mansion4ScriptPointers - ld a, [wMansion4CurScript] + ld de, PokemonMansionB1F_ScriptPointers + ld a, [wPokemonMansionB1FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion4CurScript], a + ld [wPokemonMansionB1FCurScript], a ret Mansion4Script_523cf: @@ -53,12 +53,12 @@ Mansion4Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion4ScriptPointers: +PokemonMansionB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion4TextPointers: +PokemonMansionB1F_TextPointers: dw Mansion4Text1 dw Mansion4Text2 dw PickUpItemText @@ -69,7 +69,6 @@ Mansion4TextPointers: dw PickUpItemText dw Mansion3Text6 -Mansion4TrainerHeaders: Mansion4TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0 db ($0 << 4) ; trainer's view range @@ -79,10 +78,10 @@ Mansion4TrainerHeader0: dw Mansion4EndBattleText1 ; TextEndBattle dw Mansion4EndBattleText1 ; TextEndBattle -Mansion4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_2 +Mansion4TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_1 dw Mansion4BattleText2 ; TextBeforeBattle dw Mansion4AfterBattleText2 ; TextAfterBattle dw Mansion4EndBattleText2 ; TextEndBattle @@ -98,7 +97,7 @@ Mansion4Text1: Mansion4Text2: TX_ASM - ld hl, Mansion4TrainerHeader2 + ld hl, Mansion4TrainerHeader1 call TalkToTrainer jp TextScriptEnd |