diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/billspc.asm | 12 | ||||
| -rwxr-xr-x | engine/buy_sell_toss.asm | 2 | ||||
| -rwxr-xr-x | engine/link.asm | 2 | ||||
| -rwxr-xr-x | engine/mail.asm | 2 | ||||
| -rwxr-xr-x | engine/npctrade.asm | 26 | ||||
| -rw-r--r-- | engine/party_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/warp_connection.asm | 24 |
7 files changed, 35 insertions, 35 deletions
diff --git a/engine/billspc.asm b/engine/billspc.asm index ace4eb873..33792477a 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -205,7 +205,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0) ld [CurPartyMon], a xor a ld [wPokemonWithdrawDepositParameter], a - callba Functione039 + callba RemoveMonFromPartyOrBox call Functione3180 ld a, $0 ld [wJumptableIndex], a @@ -468,7 +468,7 @@ endr ld [CurPartyMon], a ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - callba Functione039 + callba RemoveMonFromPartyOrBox call Functione3180 ld a, $0 ld [wJumptableIndex], a @@ -1880,7 +1880,7 @@ Functione307c: ; e307c (38:707c) jr c, .asm_boxisfull xor a ld [wPokemonWithdrawDepositParameter], a - callba Functione039 + callba RemoveMonFromPartyOrBox ld a, [CurPartySpecies] call PlayCry hlcoord 0, 0 @@ -1935,7 +1935,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa) jr c, .PartyFull ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - callba Functione039 + callba RemoveMonFromPartyOrBox ld a, [CurPartySpecies] call PlayCry hlcoord 0, 0 @@ -2173,7 +2173,7 @@ Functione32b0: ; e32b0 callba Function5088b ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - callba Functione039 + callba RemoveMonFromPartyOrBox ret ; e32fa @@ -2206,7 +2206,7 @@ Functione3316: ; e3316 call CopyMonToTemp xor a ld [wPokemonWithdrawDepositParameter], a - callba Functione039 + callba RemoveMonFromPartyOrBox ret ; e3346 diff --git a/engine/buy_sell_toss.asm b/engine/buy_sell_toss.asm index db1acddbc..7f2ad2727 100755 --- a/engine/buy_sell_toss.asm +++ b/engine/buy_sell_toss.asm @@ -114,7 +114,7 @@ BuySellToss_InterpretJoypad: ; 2500e .right ld a, [wItemQuantityChangeBuffer] - add $a + add 10 ld b, a ld a, [wItemQuantityBuffer] cp b diff --git a/engine/link.asm b/engine/link.asm index 0e6fe4b7c..222d1eedb 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1886,7 +1886,7 @@ Function28b87: ; 28b87 ld [wd002], a xor a ld [wPokemonWithdrawDepositParameter], a - callab Functione039 + callab RemoveMonFromPartyOrBox ld a, [PartyCount] dec a ld [CurPartyMon], a diff --git a/engine/mail.asm b/engine/mail.asm index dec445d94..6eef16a8c 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -177,7 +177,7 @@ CheckPokeItem:: ; 44654 jr c, .close_sram_return xor a ld [wPokemonWithdrawDepositParameter], a - callba Functione039 + callba RemoveMonFromPartyOrBox ld a, $1 .close_sram_return diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 71ab03ee3..79a25495d 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -40,7 +40,7 @@ NPCTrade:: ; fcba8 ; Select givemon from party ld b, 6 - callba Function5001d + callba SelectTradeOrDaycareMon ld a, TRADE_CANCEL jr c, .done @@ -100,23 +100,23 @@ CheckTradeGender: ; fcc23 call GetTradeAttribute ld a, [hl] and a - jr z, .asm_fcc46 + jr z, .matching cp 1 - jr z, .asm_fcc3e + jr z, .check_male callba GetGender - jr nz, .asm_fcc48 - jr .asm_fcc46 + jr nz, .not_matching + jr .matching -.asm_fcc3e +.check_male callba GetGender - jr z, .asm_fcc48 + jr z, .not_matching -.asm_fcc46 +.matching and a ret -.asm_fcc48 +.not_matching scf ret ; fcc4a @@ -211,7 +211,7 @@ DoNPCTrade: ; fcc63 xor a ld [MonType], a ld [wPokemonWithdrawDepositParameter], a - callab Functione039 + callab RemoveMonFromPartyOrBox predef TryAddMonToParty ld e, TRADE_DIALOG @@ -219,9 +219,9 @@ DoNPCTrade: ; fcc63 ld a, [hl] cp TRADE_COMPLETE ld b, RESET_FLAG - jr c, .asm_fcd1c + jr c, .incomplete ld b, SET_FLAG -.asm_fcd1c +.incomplete callba SetGiftPartyMonCaughtData ld e, TRADE_NICK @@ -291,7 +291,7 @@ DoNPCTrade: ; fcc63 ld a, [PartyCount] dec a ld [CurPartyMon], a - callba Functione134 + callba ComputeNPCTrademonStats pop af ld [CurPartyMon], a pop hl diff --git a/engine/party_menu.asm b/engine/party_menu.asm index e5d8cbd1e..0da558272 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -13,7 +13,7 @@ SelectMonFromParty: ; 50000 ; 5001d -Function5001d: ; 5001d +SelectTradeOrDaycareMon: ; 5001d ld a, b ld [PartyMenuActionText], a call DisableSpriteUpdates diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index e9a38257d..1a857ab43 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -62,9 +62,9 @@ EnterWestConnection: ; 1045ed .skip_to_load ld a, l - ld [wd194], a + ld [wOverworldMapAnchor], a ld a, h - ld [wd194 + 1], a + ld [wOverworldMapAnchor + 1], a jp EnteredConnection ; 104629 @@ -99,9 +99,9 @@ EnterEastConnection: ; 104629 .skip_to_load ld a, l - ld [wd194], a + ld [wOverworldMapAnchor], a ld a, h - ld [wd194 + 1], a + ld [wOverworldMapAnchor + 1], a jp EnteredConnection ; 104665 @@ -126,9 +126,9 @@ EnterNorthConnection: ; 104665 srl c add hl, bc ld a, l - ld [wd194], a + ld [wOverworldMapAnchor], a ld a, h - ld [wd194 + 1], a + ld [wOverworldMapAnchor + 1], a jp EnteredConnection ; 104696 @@ -153,9 +153,9 @@ EnterSouthConnection: ; 104696 srl c add hl, bc ld a, l - ld [wd194], a + ld [wOverworldMapAnchor], a ld a, h - ld [wd194 + 1], a + ld [wOverworldMapAnchor + 1], a ; fallthrough ; 1046c4 @@ -427,14 +427,14 @@ GetCoordOfUpperLeftCorner:: ; 10486d .resume2 call AddNTimes ld a, l - ld [wd194], a + ld [wOverworldMapAnchor], a ld a, h - ld [wd194 + 1], a + ld [wOverworldMapAnchor + 1], a ld a, [YCoord] and $1 - ld [wd196], a + ld [wMetatileStandingY], a ld a, [XCoord] and $1 - ld [wd197], a + ld [wMetatileStandingX], a ret ; 1048ba |