diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/animations.asm | 3 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 12 | ||||
| -rwxr-xr-x | engine/items/items.asm | 4 | ||||
| -rw-r--r-- | engine/menu/bills_pc.asm | 3 | ||||
| -rwxr-xr-x | engine/menu/pokedex.asm | 3 | ||||
| -rwxr-xr-x | engine/oak_speech2.asm | 28 | ||||
| -rwxr-xr-x | engine/slot_machine.asm | 3 |
7 files changed, 6 insertions, 50 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 31b490f3..be8d2b18 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -373,9 +373,6 @@ ENDC IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine2.2bpp" ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine2.2bpp" -ENDC MoveAnimation: ; 78d5e (1e:4d5e) push hl diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c5c3774f..fce78717 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1727,7 +1727,7 @@ LoadBattleMonFromParty: ; 3cba6 (f:4ba6) ld bc, NUM_MOVES call CopyData ld de, wBattleMonLevel - ld bc, $b + ld bc, wBattleMonPP - wBattleMonLevel call CopyData ld a, [wBattleMonSpecies2] ld [wd0b5], a @@ -1771,7 +1771,7 @@ LoadEnemyMonFromParty: ; 3cc13 (f:4c13) ld bc, NUM_MOVES call CopyData ld de, wEnemyMonLevel - ld bc, $b + ld bc, wEnemyMonPP - wEnemyMonLevel call CopyData ld a, [wEnemyMonSpecies] ld [wd0b5], a @@ -1913,11 +1913,11 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) call PlaceString ld hl, wBattleMonSpecies ld de, wLoadedMon - ld bc, $c + ld bc, wBattleMonDVs - wBattleMonSpecies call CopyData ld hl, wBattleMonLevel ld de, wLoadedMonLevel - ld bc, $b + ld bc, wBattleMonPP - wBattleMonLevel call CopyData coord hl, 14, 8 push hl @@ -2982,11 +2982,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6) jp Delay3 DisabledText: ; 3d555 (f:5555) -IF DEF(_YELLOW) - db "Disabled!@" -ELSE db "disabled!@" -ENDC TypeText: ; 3d55f (f:555f) db "TYPE@" diff --git a/engine/items/items.asm b/engine/items/items.asm index 55dcb53e..1dd0a6f7 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -863,7 +863,7 @@ ItemUseMedicine: ; dabb (3:5abb) jr nc,.healHP ; if it's a Full Restore or one of the potions ; fall through if it's one of the status-specifc healing items .cureStatusAilment - ld bc,4 + ld bc,wPartyMon1Status - wPartyMon1 add hl,bc ; hl now points to status ld a,[wcf91] lb bc, ANTIDOTE_MSG, 1 << PSN @@ -2039,7 +2039,7 @@ ItemUsePPRestore: ; e31e (3:631e) cp a,ETHER jr nc,.useEther ; if Ether or Max Ether .usePPUp - ld bc,21 + ld bc,wPartyMon1PP - wPartyMon1Moves add hl,bc ld a,[hl] ; move PP cp a,3 << 6 ; have 3 PP Ups already been used? diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index d367bdb5..0be2e6b0 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -343,9 +343,6 @@ BillsPCMenuText: ; 216e1 (8:56e1) next "DEPOSIT ", $4a next "RELEASE ", $4a next "CHANGE BOX" -IF DEF(_YELLOW) - next "PRINT BOX" -ENDC next "SEE YA!" db "@" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index a58523e8..3898ef43 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -367,9 +367,6 @@ PokedexMenuItemsText: ; 402af (10:42af) db "DATA" next "CRY" next "AREA" -IF DEF(_YELLOW) - next "PRNT" -ENDC next "QUIT@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index fe0d6fa3..d58aef83 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -219,22 +219,6 @@ DefaultNamesRival: ; 6abe (1:6abe) db "@" ENDC -IF DEF(_YELLOW) -DefaultNamesPlayer: - db "NEW NAME" - next "YELLOW" - next "ASH" - next "JACK" - db "@" - -DefaultNamesRival: - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" -ENDC - GetDefaultName: ; 6ad6 (1:6ad6) ; a = name index ; hl = name list @@ -283,18 +267,6 @@ DefaultNamesRivalList: ; 6b08 (1:6b08) db "ASH@" db "JACK@" ENDC -IF DEF(_YELLOW) -DefaultNamesPlayerList: - db "NEW NAME@" - db "YELLOW@" - db "ASH@" - db "JACK@" -DefaultNamesRivalList: - db "NEW NAME@" - db "BLUE@" - db "GARY@" - db "JOHN@" -ENDC TextTerminator_6b20: ; 6b20 (1:6b20) db "@" diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index b2917459..eb1cf3c3 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -888,6 +888,3 @@ ENDC IF DEF(_BLUE) INCBIN "gfx/blue/slotmachine1.2bpp" ENDC -IF DEF(_YELLOW) - INCBIN "gfx/yellow/slotmachine1.2bpp" -ENDC |