diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 03:41:52 -0400 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-23 03:51:15 -0400 |
commit | 185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21 (patch) | |
tree | 0a7b16d82178d2d99f41bbb0be80ba7e9ab84f23 /engine/scripting.asm | |
parent | 4c480a23dc2f81323b48670612cb23516a544e86 (diff) |
Wild Pokemon functions and data
Replaced encounter rates with percent values
Added new constants denoting the number of wild Pokemon in the grass and water wild constructs
Annotated and relabeled the encounter generating functions
Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species
Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly
Diffstat (limited to 'engine/scripting.asm')
-rw-r--r-- | engine/scripting.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index b01ac0c52..32d036d48 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1470,7 +1470,7 @@ Script_loadpikachudata: ; 0x973f0 ; script command 0x5a ld a, PIKACHU - ld [wd22e], a + ld [TempWildMonSpecies], a ld a, 5 ld [CurPartyLevel], a ret @@ -1505,7 +1505,7 @@ Script_loadpokedata: ; 0x97412 ld a, $80 ld [wd459], a call GetScriptByte - ld [wd22e], a + ld [TempWildMonSpecies], a call GetScriptByte ld [CurPartyLevel], a ret |