diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/billspctop.asm | 2 | ||||
| -rwxr-xr-x | engine/color.asm | 2 | ||||
| -rwxr-xr-x | engine/main_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/move_mon.asm | 13 | ||||
| -rwxr-xr-x | engine/specials.asm | 8 |
5 files changed, 14 insertions, 13 deletions
diff --git a/engine/billspctop.asm b/engine/billspctop.asm index bbdf7e62..4cb456ed 100644 --- a/engine/billspctop.asm +++ b/engine/billspctop.asm @@ -297,7 +297,7 @@ Function65b4: ld a, [hl] ld [de], a inc de - ld [wce60], a + ld [wCurSpecies], a call GetBaseData pop bc pop hl diff --git a/engine/color.asm b/engine/color.asm index bdcfca66..16e4c29d 100755 --- a/engine/color.asm +++ b/engine/color.asm @@ -647,7 +647,7 @@ Function9bba: ; 9bba (2:5bba) callba Function3d907 ld c, l ld b, h - ld a, [wd0ed] + ld a, [wTempEnemyMonSpecies] call Function9bd3 pop de ret diff --git a/engine/main_menu.asm b/engine/main_menu.asm index f02db06a..dc386990 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -752,7 +752,7 @@ OakSpeech: ; 5fa5 (1:5fa5) call ClearTileMap ld a, MARILL - ld [wce60], a + ld [wCurSpecies], a ld [wCurPartySpecies], a call GetBaseData hlcoord 6, 4 diff --git a/engine/move_mon.asm b/engine/move_mon.asm index f4d65683..f6e63d88 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -62,11 +62,12 @@ TryAddMonToParty:: ; d892 (3:5892) dec a ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes +GeneratePartyMonStats: ld e, l ld d, h push hl ld a, [wCurPartySpecies] - ld [wce60], a + ld [wCurSpecies], a call GetBaseData ld a, [wd120] ld [de], a @@ -723,7 +724,7 @@ Functiondd6a: ; dd6a (3:5d6a) ld de, wdc7a .asm_dd8c ld [hli], a - ld [wce60], a + ld [wCurSpecies], a ld a, $ff ld [hl], a ld hl, wPartyMon1Nickname @@ -843,7 +844,7 @@ SentPkmnIntoBox: ; de74 (3:5e74) inc a ld [de], a ld a, [wd004] - ld [wce60], a + ld [wCurSpecies], a ld c, a .asm_de8b inc de @@ -1221,7 +1222,7 @@ ComputeNPCTrademonStats: ld a, MON_SPECIES call GetPartyParamLocation ld a, [hl] - ld [wce60], a + ld [wCurSpecies], a call GetBaseData ld a, MON_MAXHP call GetPartyParamLocation @@ -1506,7 +1507,7 @@ GivePoke: ; Give a Pokemon from script .asm_e2c9 ld a, [wCurPartySpecies] - ld [wd0ed], a + ld [wTempEnemyMonSpecies], a callab LoadEnemyMon call SentPkmnIntoBox jp nc, Functione3af @@ -1529,7 +1530,7 @@ GivePoke: ; Give a Pokemon from script .asm_e2fa ld a, [wd004] ld [wd151], a - ld [wd0ed], a + ld [wTempEnemyMonSpecies], a call GetPokemonName ld hl, wStringBuffer1 ld de, wMonOrItemNameBuffer diff --git a/engine/specials.asm b/engine/specials.asm index 98f19abb..a3279a57 100755 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -153,28 +153,28 @@ SpecialSeenMon: ; c3ac Special_FindGreaterThanThatLevel: ; c3b4 ld a, [wScriptVar] ld b, a - callba Functione6a9 ; same bank + callba PartySearch_MaximumLevel ; same bank jr z, asm_c3f2 jr asm_c3ec Special_FindAtLeastThatHappy: ; c3c2 ld a, [wScriptVar] ld b, a - callba Functione6b0 ; same bank + callba PartySearch_MinimumHappiness ; same bank jr z, asm_c3f2 jr asm_c3ec Special_FindThatSpecies: ; c3d0 ld a, [wScriptVar] ld b, a - callba Functione6b7 ; same bank + callba PartySearch_SameSpecies ; same bank jr z, asm_c3f2 jr asm_c3ec Special_FindThatSpeciesYourTrainerID: ; c3de ld a, [wScriptVar] ld b, a - callba Functione6bd ; same bank + callba PartySearch_SameSpeciesAndYourID ; same bank jr z, asm_c3f2 jr asm_c3ec |