diff options
Diffstat (limited to 'misc/fixed_words.asm')
| -rwxr-xr-x | misc/fixed_words.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 708116689..4f56936a8 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -288,7 +288,7 @@ Function11c1ca: ; 11c1ca ld [wcd2b], a ld a, $ff ld [wcd24], a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] dec a call Function11c254 call ClearBGPalettes @@ -306,9 +306,9 @@ Function11c1ca: ; 11c1ca call Decompress call EnableLCD callba ReloadMapPart - callba Function8cf53 + callba ClearSpriteAnims callba LoadPokemonData - callba Function40c30 + callba Pokedex_ABCMode ld a, [rSVBK] push af ld a, $5 @@ -362,12 +362,12 @@ Function11c283: ; 11c283 bit 7, a jr nz, .exit call .DoJumptableFunction - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr .loop .exit - callba Function8cf53 + callba ClearSpriteAnims call ClearSprites ret ; 11c2ac @@ -1733,7 +1733,7 @@ String_11cb31: ; 11cb31 Function11cb52: ; 11cb52 (47:4b52) ld hl, Unknown_11cc01 - ld a, [MenuSelection2] + ld a, [wMenuCursorY] .asm_11cb58 dec a jr z, .asm_11cb5f @@ -1771,7 +1771,7 @@ Function11cb66: ; 11cb66 (47:4b66) ld a, $4 call GetSRAMBank ld hl, $a007 - ld a, [MenuSelection2] + ld a, [wMenuCursorY] dec a sla a sla a @@ -1794,7 +1794,7 @@ Function11cb66: ; 11cb66 (47:4b66) ld de, Unknown_11cfc6 call Function11cfce ld hl, Unknown_11cc7e - ld a, [MenuSelection2] + ld a, [wMenuCursorY] .asm_11cbba dec a jr z, .asm_11cbc1 @@ -2478,7 +2478,7 @@ Function11d0f5: ; 11d0f5 (47:50f5) ld d, $0 add hl, de ld a, [hl] - call Function3b3c + call ReinitSpriteAnimFrame ld a, [CreditsTimer] sla a ld hl, Unknown_11d23e @@ -2487,7 +2487,7 @@ Function11d0f5: ; 11d0f5 (47:50f5) Function11d10f: ; 11d10f (47:510f) ld a, $27 - call Function3b3c + call ReinitSpriteAnimFrame ld a, [wcd25] sla a ld hl, Unknown_11d29e @@ -2514,7 +2514,7 @@ asm_11d11e: ; 11d11e (47:511e) Function11d134: ; 11d134 (47:5134) ld a, $27 - call Function3b3c + call ReinitSpriteAnimFrame ld a, [wcd2a] sla a ld hl, Unknown_11d2b6 @@ -2523,7 +2523,7 @@ Function11d134: ; 11d134 (47:5134) Function11d145: ; 11d145 (47:5145) ld a, $27 - call Function3b3c + call ReinitSpriteAnimFrame ld a, [wcd2c] sla a ld hl, Unknown_11d2ba @@ -2532,7 +2532,7 @@ Function11d145: ; 11d145 (47:5145) Function11d156: ; 11d156 (47:5156) ld a, $2a - call Function3b3c + call ReinitSpriteAnimFrame ld a, [wcd4a] sla a sla a @@ -2557,7 +2557,7 @@ Function11d175: ; 11d175 (47:5175) .asm_11d180 ld a, $26 .asm_11d182 - call Function3b3c + call ReinitSpriteAnimFrame ld a, [wcd4d] cp $4 jr z, .asm_11d1b1 @@ -2611,7 +2611,7 @@ Function11d1d7: ; 11d1d7 (47:51d7) asm_11d1db: ; 11d1db (47:51db) push de - call Function3b3c + call ReinitSpriteAnimFrame ld a, [wcd4a] sla a sla a @@ -2632,7 +2632,7 @@ asm_11d1db: ; 11d1db (47:51db) Function11d1fc: ; 11d1fc (47:51fc) ld a, $26 - call Function3b3c + call ReinitSpriteAnimFrame ld a, $8 ld e, a call Function11d2ee |