diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:49 -0700 |
| commit | bcf0bd960b03720a02669ed2b6d3a22df60cf0b2 (patch) | |
| tree | 2ffb3b9c8eca5fc4e2be2fc8aaf4965f64a13296 /engine/hidden_object_functions7.asm | |
| parent | 54143d33fc1211fb0c949ba62633d1c8d94f2717 (diff) | |
| parent | 2685abc3c58d4d542687f80ea83da75de46cf36a (diff) | |
Merge pull request #16 from YamaArashi/master
sync engine code with pokered
Diffstat (limited to 'engine/hidden_object_functions7.asm')
| -rwxr-xr-x | engine/hidden_object_functions7.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 691d05f2..a8676fed 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -85,7 +85,7 @@ SafariZoneGameOver: ld a, $5 ld [wSafariZoneEntranceCurScript], a SetEvent EVENT_SAFARI_GAME_OVER - ld a, $1 + ld a, 1 ld [wSafariZoneGameOver], a ret @@ -138,7 +138,7 @@ CinnabarGymQuiz: ld [$ffdc], a ld a, [hGymGateIndex] ld hl, CinnabarGymQuizIntroText - cp $1 + cp 1 jr z, .onFirstQuestion ld hl, CinnabarGymQuizShortIntroText .onFirstQuestion @@ -154,7 +154,7 @@ CinnabarGymQuiz: ld h, [hl] ld l, a call PrintText - ld a, $1 + ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a call CinnabarGymQuiz_1ea92 jp TextScriptEnd @@ -435,16 +435,16 @@ BillsHousePokemonList: ld hl, BillsHousePokemonListText1 call PrintText xor a - ld [wMenuItemOffset], a + ld [wMenuItemOffset], a ; not used ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a - ld a, $4 + ld a, 4 ld [wMaxMenuItem], a - ld a, $2 + ld a, 2 ld [wTopMenuItemY], a - ld a, $1 + ld a, 1 ld [wTopMenuItemX], a .billsPokemonLoop ld hl, wd730 |