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/mansion1.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/PokemonMansion1F.asm (renamed from scripts/mansion1.asm) | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/mansion1.asm b/scripts/PokemonMansion1F.asm index d659d993..639a4acf 100755 --- a/scripts/mansion1.asm +++ b/scripts/PokemonMansion1F.asm @@ -1,11 +1,11 @@ -Mansion1Script: +PokemonMansion1F_Script: call Mansion1Subscript1 call EnableAutoTextBoxDrawing - ld hl, Mansion1TrainerHeaders - ld de, Mansion1ScriptPointers - ld a, [wMansion1CurScript] + ld hl, Mansion1TrainerHeader0 + ld de, PokemonMansion1F_ScriptPointers + ld a, [wPokemonMansion1FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion1CurScript], a + ld [wPokemonMansion1FCurScript], a ret Mansion1Subscript1: @@ -55,18 +55,17 @@ Mansion1Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion1ScriptPointers: +PokemonMansion1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion1TextPointers: +PokemonMansion1F_TextPointers: dw Mansion1Text1 dw PickUpItemText dw PickUpItemText dw Mansion1Text4 -Mansion1TrainerHeaders: Mansion1TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0 db ($3 << 4) ; trainer's view range |