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/PokemonMansion1F.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/PokemonMansion1F.asm')
| -rw-r--r-- | scripts/PokemonMansion1F.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm index c1fef205..b294a247 100644 --- a/scripts/PokemonMansion1F.asm +++ b/scripts/PokemonMansion1F.asm @@ -1,5 +1,5 @@ PokemonMansion1F_Script: - call Mansion1Subscript1 + call Mansion1CheckReplaceSwitchDoorBlocks call EnableAutoTextBoxDrawing ld hl, Mansion1TrainerHeaders ld de, PokemonMansion1F_ScriptPointers @@ -8,37 +8,37 @@ PokemonMansion1F_Script: ld [wPokemonMansion1FCurScript], a ret -Mansion1Subscript1: +Mansion1CheckReplaceSwitchDoorBlocks: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_442ec + jr nz, .switchTurnedOn lb bc, 6, 12 - call Mansion1Script_4430b + call Mansion1LoadEmptyFloorTileBlock lb bc, 3, 8 - call Mansion1Script_44304 + call Mansion1LoadHorizontalGateBlock lb bc, 8, 10 - call Mansion1Script_44304 + call Mansion1LoadHorizontalGateBlock lb bc, 13, 13 - jp Mansion1Script_44304 -.asm_442ec + jp Mansion1LoadHorizontalGateBlock +.switchTurnedOn lb bc, 6, 12 - call Mansion1Script_44304 + call Mansion1LoadHorizontalGateBlock lb bc, 3, 8 - call Mansion1Script_4430b + call Mansion1LoadEmptyFloorTileBlock lb bc, 8, 10 - call Mansion1Script_4430b + call Mansion1LoadEmptyFloorTileBlock lb bc, 13, 13 - jp Mansion1Script_4430b + jp Mansion1LoadEmptyFloorTileBlock -Mansion1Script_44304: +Mansion1LoadHorizontalGateBlock: ld a, $2d ld [wNewTileBlockID], a jr Mansion1ReplaceBlock -Mansion1Script_4430b: +Mansion1LoadEmptyFloorTileBlock: ld a, $e ld [wNewTileBlockID], a Mansion1ReplaceBlock: |