diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
| commit | a1951cefc09035e11077a433b28ec8c66b3b03db (patch) | |
| tree | 4de98db5a6edb6d74192028d50893da2b764421f /engine/events/magikarp.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
Diffstat (limited to 'engine/events/magikarp.asm')
| -rw-r--r-- | engine/events/magikarp.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 6588295b8..8d835960f 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -7,13 +7,13 @@ Special_CheckMagikarpLength: ; fbb32 ; Let's start by selecting a Magikarp. farcall SelectMonFromParty jr c, .declined - ld a, [CurPartySpecies] + ld a, [wCurPartySpecies] cp MAGIKARP jr nz, .not_magikarp ; Now let's compute its length based on its DVs and ID. - ld a, [CurPartyMon] - ld hl, PartyMon1Species + ld a, [wCurPartyMon] + ld hl, wPartyMon1Species ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes push hl @@ -48,27 +48,27 @@ Special_CheckMagikarpLength: ; fbb32 ld a, [hl] ld [de], a inc de - ld a, [CurPartyMon] - ld hl, PartyMonOT + ld a, [wCurPartyMon] + ld hl, wPartyMonOT call SkipNames call CopyBytes ld a, MAGIKARPLENGTH_BEAT_RECORD - ld [ScriptVar], a + ld [wScriptVar], a ret .not_long_enough ld a, MAGIKARPLENGTH_TOO_SHORT - ld [ScriptVar], a + ld [wScriptVar], a ret .declined ld a, MAGIKARPLENGTH_REFUSED - ld [ScriptVar], a + ld [wScriptVar], a ret .not_magikarp xor a ; MAGIKARPLENGTH_NOT_MAGIKARP - ld [ScriptVar], a + ld [wScriptVar], a ret ; fbba9 @@ -92,7 +92,7 @@ INCBIN "gfx/font/feet_inches.2bpp" PrintMagikarpLength: ; fbbdb call Magikarp_LoadFeetInchesChars - ld hl, StringBuffer1 + ld hl, wStringBuffer1 ld de, wMagikarpLength lb bc, PRINTNUM_RIGHTALIGN | 1, 2 call PrintNum @@ -111,8 +111,8 @@ CalcMagikarpLength: ; fbbfc ; Return Magikarp's length (in feet and inches) at wMagikarpLength (big endian). ; ; input: -; de: EnemyMonDVs -; bc: PlayerID +; de: wEnemyMonDVs +; bc: wPlayerID ; This function is poorly commented. |