diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-07-17 17:30:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 17:30:53 -0500 |
| commit | 36597a7917144bbf5d9ae63a0f9d537f6f58eb74 (patch) | |
| tree | e478588912070f759c95b8c276c03dc7a296c9d2 /scripts/PokemonMansion3F.asm | |
| parent | Merge pull request #201 from SatoMew/master (diff) | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-36597a7917144bbf5d9ae63a0f9d537f6f58eb74.tar.gz pokeyellow-36597a7917144bbf5d9ae63a0f9d537f6f58eb74.tar.xz pokeyellow-36597a7917144bbf5d9ae63a0f9d537f6f58eb74.zip | |
Merge pull request #220 from Rangi42/master
Replace some hard-coded values with constants
Diffstat (limited to 'scripts/PokemonMansion3F.asm')
| -rwxr-xr-x | scripts/PokemonMansion3F.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm index 3edc7bfd..ff172413 100755 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -16,18 +16,18 @@ Mansion3Script_52204: CheckEvent EVENT_MANSION_SWITCH_ON jr nz, .asm_52224 ld a, $e - ld bc, $207 + lb bc, 2, 7 call Mansion2Script_5202f ld a, $5f - ld bc, $507 + lb bc, 5, 7 call Mansion2Script_5202f ret .asm_52224 ld a, $5f - ld bc, $207 + lb bc, 2, 7 call Mansion2Script_5202f ld a, $e - ld bc, $507 + lb bc, 5, 7 call Mansion2Script_5202f ret @@ -43,9 +43,9 @@ Mansion3Script0: and a jp z, CheckFightingMapTrainers cp $3 - ld a, $a5 + ld a, POKEMON_MANSION_1F jr nz, .asm_52250 - ld a, $d6 + ld a, POKEMON_MANSION_2F .asm_52250 ld [wDungeonWarpDestinationMap], a ret |