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/PokemonMansion3F.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/PokemonMansion3F.asm (renamed from scripts/mansion3.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/mansion3.asm b/scripts/PokemonMansion3F.asm index abe76df8..3edc7bfd 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: @@ -31,7 +31,7 @@ Mansion3Script_52204: call Mansion2Script_5202f ret -Mansion3ScriptPointers: +PokemonMansion3F_ScriptPointers: dw Mansion3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -82,7 +82,7 @@ Mansion3Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion3TextPointers: +PokemonMansion3F_TextPointers: dw Mansion3Text1 dw Mansion3Text2 dw PickUpItemText |