diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/ai/items.asm | 8 | ||||
| -rw-r--r-- | engine/events/halloffame.asm | 2 | ||||
| -rw-r--r-- | engine/events/lucky_number.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/map_setup.asm | 19 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc_top.asm | 10 | ||||
| -rw-r--r-- | engine/pokemon/search.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/search2.asm | 2 |
7 files changed, 26 insertions, 21 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 6ee026d28..a7443d165 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -725,10 +725,14 @@ AI_HealStatus: xor a ld [hl], a ld [wEnemyMonStatus], a - ; Bug: this should reset SUBSTATUS_NIGHTMARE too - ; Uncomment the lines below to fix + ; Bug: this should reset SUBSTATUS_NIGHTMARE + ; Uncomment the 2 lines below to fix ; ld hl, wEnemySubStatus1 ; res SUBSTATUS_NIGHTMARE, [hl] + ; Bug: this should reset SUBSTATUS_CONFUSED + ; Uncomment the 2 lines below to fix + ; ld hl, wEnemySubStatus3 + ; res SUBSTATUS_CONFUSED, [hl] ld hl, wEnemySubStatus5 res SUBSTATUS_TOXIC, [hl] ret diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index a4350c2f7..06b6b9390 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -449,7 +449,7 @@ DisplayHOFMon: ld bc, MON_NAME_LENGTH - 1 call CopyBytes ld a, "@" - ld [wStringBuffer2 + 10], a + ld [wStringBuffer2 + MON_NAME_LENGTH - 1], a hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 36dbf3d0e..6b1d4d8a9 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -148,7 +148,7 @@ CheckForLuckyNumberWinners: .done pop hl push hl - ld de, -6 + ld de, MON_SPECIES - MON_ID add hl, de ld a, [hl] pop hl diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm index a38736eb3..a1b28e544 100644 --- a/engine/overworld/map_setup.asm +++ b/engine/overworld/map_setup.asm @@ -178,13 +178,13 @@ CheckReplaceKrisSprite: jr z, .surfing call GetMapEnvironment cp INDOOR - jr z, .checkbiking + jr z, .no_biking cp ENVIRONMENT_5 - jr z, .checkbiking + jr z, .no_biking cp DUNGEON - jr z, .checkbiking + jr z, .no_biking jr .nope -.checkbiking +.no_biking ld a, [wPlayerState] cp PLAYER_BIKE jr nz, .nope @@ -200,18 +200,19 @@ CheckReplaceKrisSprite: .CheckSurfing: call CheckOnWater - jr nz, .ret_nc + jr nz, .nope2 ld a, [wPlayerState] cp PLAYER_SURF - jr z, ._surfing + jr z, .is_surfing cp PLAYER_SURF_PIKA - jr z, ._surfing + jr z, .is_surfing ld a, PLAYER_SURF ld [wPlayerState], a -._surfing +.is_surfing scf ret -.ret_nc + +.nope2 and a ret diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index b449c765a..3883d89c3 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -261,7 +261,7 @@ CopyBoxmonToTempMon: call CloseSRAM ret -Unreferenced_Functione5d9: +Unreferenced_LoadBoxMonListing: ld a, [wCurBox] cp b jr z, .same_box @@ -284,11 +284,11 @@ Unreferenced_Functione5d9: .okay call GetSRAMBank ld a, [hl] - ld bc, 1 + MONS_PER_BOX + 1 + ld bc, sBoxMons - sBox add hl, bc ld b, a ld c, $0 - ld de, wc608 + ld de, wBoxPartialData ld a, b and a jr z, .empty_box @@ -296,7 +296,7 @@ Unreferenced_Functione5d9: push hl push bc ld a, c - ld bc, 0 + ld bc, sBoxMon1Species - sBoxMons add hl, bc ld bc, BOXMON_STRUCT_LENGTH call AddNTimes @@ -311,7 +311,7 @@ Unreferenced_Functione5d9: push hl push bc ld a, c - ld bc, MONS_PER_BOX * (BOXMON_STRUCT_LENGTH + NAME_LENGTH) + ld bc, sBoxMonNicknames - sBoxMons add hl, bc call SkipNames call CopyBytes diff --git a/engine/pokemon/search.asm b/engine/pokemon/search.asm index c8d4439df..2ea1beacf 100644 --- a/engine/pokemon/search.asm +++ b/engine/pokemon/search.asm @@ -113,7 +113,7 @@ CheckOwnMonAnywhere: jr z, .loopbox ; Load the box. - ld hl, BoxAddressTable1 + ld hl, BoxAddressTable ld b, 0 add hl, bc add hl, bc @@ -244,7 +244,7 @@ endr scf ret -BoxAddressTable1: +BoxAddressTable: dba sBox1 dba sBox2 dba sBox3 diff --git a/engine/pokemon/search2.asm b/engine/pokemon/search2.asm index 7af93282e..c33d84edf 100644 --- a/engine/pokemon/search2.asm +++ b/engine/pokemon/search2.asm @@ -117,7 +117,7 @@ FindThatSpecies: ret RetroactivelyIgnoreEggs: - ld e, -2 + ld e, %11111110 ld hl, wPartySpecies .loop ld a, [hli] |