diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/4_2.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/b_2.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/vending_machine.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/hidden_items.asm | 2 | ||||
| -rwxr-xr-x | engine/predefs.asm | 13 | ||||
| -rwxr-xr-x | engine/slot_machine.asm | 4 |
7 files changed, 17 insertions, 16 deletions
diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm index 264a74d7..891363f5 100755 --- a/engine/battle/4_2.asm +++ b/engine/battle/4_2.asm @@ -36,8 +36,8 @@ Func_137aa: ; 137aa (4:77aa) jr z, .asm_1380a ld de, wPlayerMoney + 2 ; $d349 ld c, $3 - ld a, $b - call Predef ; indirect jump to Func_f81d (f81d (3:781d)) + ld a, $b ; AddBCDPredef + call Predef ld hl, PickUpPayDayMoneyText call PrintText .asm_1380a diff --git a/engine/battle/b_2.asm b/engine/battle/b_2.asm index b71ca40d..00510ec7 100755 --- a/engine/battle/b_2.asm +++ b/engine/battle/b_2.asm @@ -120,7 +120,7 @@ PayDayEffect_ ; 2feb8 (b:7eb8) ld [hl], a ld de, $cce7 ld c, $3 - ld a, $b + ld a, $b ; AddBCDPredef call Predef ld hl, CoinsScatteredText ; $7f04 jp PrintText diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 48d075c0..d47e8d30 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -996,8 +996,8 @@ TrainerBattleVictory: ; 3c696 (f:4696) ld de, wPlayerMoney + 2 ; $d349 ld hl, $d07b ld c, $3 - ld a, $b - jp Predef ; indirect jump to Func_f81d (f81d (3:781d)) + ld a, $b ; AddBCDPredef + jp Predef MoneyForWinningText: ; 3c6e4 (f:46e4) TX_FAR _MoneyForWinningText diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 1f0ed084..7a8b6985 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -71,8 +71,8 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld hl, $ffde ld de, wPlayerMoney + 2 ; $d349 ld c, $3 - ld a, $c - call Predef ; indirect jump to Func_f836 (f836 (3:7836)) + ld a, $c ; SubtractBCDPredef + call Predef ld a, $13 ld [$d125], a jp DisplayTextBoxID diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index db6bf1cd..ea032cbe 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -104,7 +104,7 @@ HiddenCoins: ; 76799 (1d:6799) ld de, $d5a5 ld hl, $ffa1 ld c, $2 - ld a, $b + ld a, $b ; AddBCDPredef call Predef ld hl, $d6fe ld a, [$cd41] diff --git a/engine/predefs.asm b/engine/predefs.asm index 4a40ede6..a3591421 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -70,12 +70,13 @@ HealPartyPredef: ; 4fe8e (13:7e8e) dbw BANK(HealParty),HealParty MoveAnimationPredef: ; 4fe91 (13:7e91) dbw BANK(MoveAnimation),MoveAnimation; 08 play move animation - dbw BANK(Func_f71e),Func_f71e - dbw BANK(Func_f71e),Func_f71e - dbw BANK(Func_f81d),Func_f81d - dbw BANK(Func_f836),Func_f836 - dbw BANK(Func_f71e),Func_f71e - dbw BANK(Func_f71e),Func_f71e + dbw BANK(DivideBCDPredef),DivideBCDPredef + dbw BANK(DivideBCDPredef),DivideBCDPredef + dbw BANK(AddBCDPredef),AddBCDPredef + db BANK(SubtractBCDPredef) + dw SubtractBCDPredef + dbw BANK(DivideBCDPredef),DivideBCDPredef + dbw BANK(DivideBCDPredef),DivideBCDPredef db BANK(InitializePlayerData) dw InitializePlayerData dbw BANK(FlagActionPredef),FlagActionPredef diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 1d320207..99ee942b 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -618,7 +618,7 @@ SlotMachine_37741: ; 37741 (d:7741) ld [hli], a ld de, $d5a5 ld c, $2 - ld a, $c + ld a, $c ; SubtractBCDPredef call Predef SlotMachine_37754: ; 37754 (d:7754) @@ -660,7 +660,7 @@ SlotMachine_3776b: ; 3776b (d:776b) ld hl, $cd47 ld de, $d5a5 ld c, $2 - ld a, $b + ld a, $b ; AddBCDPredef call Predef call SlotMachine_37754 call SlotMachine_3775f |