diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /scripts/PokemonMansion2F.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | scripts/PokemonMansion2F.asm (renamed from scripts/mansion2.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/mansion2.asm b/scripts/PokemonMansion2F.asm index ddc1ff7a..a7b90bcd 100755 --- a/scripts/mansion2.asm +++ b/scripts/PokemonMansion2F.asm @@ -1,11 +1,11 @@ -Mansion2Script: +PokemonMansion2F_Script: call Mansion2Script_51fee call EnableAutoTextBoxDrawing ld hl, Mansion2TrainerHeader0 - ld de, Mansion2ScriptPointers - ld a, [wMansion2CurScript] + ld de, PokemonMansion2F_ScriptPointers + ld a, [wPokemonMansion2FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion2CurScript], a + ld [wPokemonMansion2FCurScript], a ret Mansion2Script_51fee: @@ -51,12 +51,12 @@ 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 |