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/PokemonMansionB1F.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/PokemonMansionB1F.asm')
| -rw-r--r-- | scripts/PokemonMansionB1F.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm index 187a765f..74f1648e 100644 --- a/scripts/PokemonMansionB1F.asm +++ b/scripts/PokemonMansionB1F.asm @@ -1,5 +1,5 @@ PokemonMansionB1F_Script: - call Mansion4Script_523cf + call MansionB1FCheckReplaceSwitchDoorBlocks call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeaders ld de, PokemonMansionB1F_ScriptPointers @@ -8,39 +8,39 @@ PokemonMansionB1F_Script: ld [wPokemonMansionB1FCurScript], a ret -Mansion4Script_523cf: +MansionB1FCheckReplaceSwitchDoorBlocks: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_MANSION_SWITCH_ON - jr nz, .asm_523ff + jr nz, .switchTurnedOn ld a, $e ld bc, $80d - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e ld bc, $b06 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $5f ld bc, $304 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $54 ld bc, $808 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret -.asm_523ff +.switchTurnedOn ld a, $2d ld bc, $80d - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $5f ld bc, $b06 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e ld bc, $304 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ld a, $e ld bc, $808 - call Mansion2Script_5202f + call Mansion2ReplaceBlock ret Mansion4Script_Switches:: |