diff options
| author | Vortyne <104168801+Vortyne@users.noreply.github.com> | 2023-11-19 16:09:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-19 15:09:33 -0600 |
| commit | 5739aea99068b83604bf64f7c2d27682b3df51de (patch) | |
| tree | 57b953bd34ccc439a343ec60e6b7312eecef493a /scripts/PokemonMansion2F.asm | |
| parent | Fix HallOfFake typo (diff) | |
| download | pokeyellow-5739aea99068b83604bf64f7c2d27682b3df51de.tar.gz pokeyellow-5739aea99068b83604bf64f7c2d27682b3df51de.tar.xz pokeyellow-5739aea99068b83604bf64f7c2d27682b3df51de.zip | |
Name unnamed labels in seafoam islands and pokemon mansion script files (#435)
* Update PokemonMansion1F.asm
* Name unnamed seafoam/mansion labels
Diffstat (limited to 'scripts/PokemonMansion2F.asm')
| -rw-r--r-- | scripts/PokemonMansion2F.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm index a4322da7..bc3d78e9 100644 --- a/scripts/PokemonMansion2F.asm +++ b/scripts/PokemonMansion2F.asm @@ -1,5 +1,5 @@ PokemonMansion2F_Script: - call Mansion2Script_51fee + call Mansion2CheckReplaceSwitchDoorBlocks call EnableAutoTextBoxDrawing ld hl, Mansion2TrainerHeaders ld de, PokemonMansion2F_ScriptPointers @@ -8,36 +8,36 @@ PokemonMansion2F_Script: ld [wPokemonMansion2FCurScript], a ret -Mansion2Script_51fee: +Mansion2CheckReplaceSwitchDoorBlocks: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_52016 + jr nz, .switchTurnedOn ld a, $e lb bc, 2, 4 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $54 lb bc, 4, 9 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $5f lb bc, 11, 3 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret -.asm_52016 +.switchTurnedOn ld a, $5f lb bc, 2, 4 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e lb bc, 4, 9 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e lb bc, 11, 3 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret -Mansion2Script_5202f: +Mansion2ReplaceBlock: ld [wNewTileBlockID], a predef_jump ReplaceTileBlock |