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/mansion2.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/PokemonMansion2F.asm (renamed from scripts/mansion2.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/mansion2.asm b/scripts/PokemonMansion2F.asm index 7edfd097..8d05cdc9 100755 --- a/scripts/mansion2.asm +++ b/scripts/PokemonMansion2F.asm @@ -1,11 +1,11 @@ -Mansion2Script: +PokemonMansion2F_Script: call Mansion2Script_51fee call EnableAutoTextBoxDrawing - ld hl, Mansion2TrainerHeaders - ld de, Mansion2ScriptPointers - ld a, [wMansion2CurScript] + ld hl, Mansion2TrainerHeader0 + ld de, PokemonMansion2F_ScriptPointers + ld a, [wPokemonMansion2FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion2CurScript], a + ld [wPokemonMansion2FCurScript], a ret Mansion2Script_51fee: @@ -51,19 +51,18 @@ Mansion2Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion2ScriptPointers: +PokemonMansion2F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion2TextPointers: +PokemonMansion2F_TextPointers: dw Mansion2Text1 dw PickUpItemText dw Mansion2Text3 dw Mansion2Text4 dw Mansion2Text5 -Mansion2TrainerHeaders: Mansion2TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0 db ($0 << 4) ; trainer's view range |