pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous labels

Browse Source
This commit is contained in:
PikalaxALT
2015-12-13 20:33:56 -05:00
parent 259c155187
commit 8a439dbd05
14 changed files with 236 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/billspc.asm
View File

@@ -205,7 +205,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
ld [CurPartyMon], a ld [CurPartyMon], a
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba Functione039 callba RemoveMonFromPartyOrBox
call Functione3180 call Functione3180
ld a, $0 ld a, $0
ld [wJumptableIndex], a ld [wJumptableIndex], a
@@ -468,7 +468,7 @@ endr
ld [CurPartyMon], a ld [CurPartyMon], a
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba Functione039 callba RemoveMonFromPartyOrBox
call Functione3180 call Functione3180
ld a, $0 ld a, $0
ld [wJumptableIndex], a ld [wJumptableIndex], a
@@ -1880,7 +1880,7 @@ Functione307c: ; e307c (38:707c)
jr c, .asm_boxisfull jr c, .asm_boxisfull
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba Functione039 callba RemoveMonFromPartyOrBox
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayCry
hlcoord 0, 0 hlcoord 0, 0
@@ -1935,7 +1935,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
jr c, .PartyFull jr c, .PartyFull
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba Functione039 callba RemoveMonFromPartyOrBox
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayCry
hlcoord 0, 0 hlcoord 0, 0
@@ -2173,7 +2173,7 @@ Functione32b0: ; e32b0
callba Function5088b callba Function5088b
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba Functione039 callba RemoveMonFromPartyOrBox
ret ret
; e32fa ; e32fa
@@ -2206,7 +2206,7 @@ Functione3316: ; e3316
call CopyMonToTemp call CopyMonToTemp
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba Functione039 callba RemoveMonFromPartyOrBox
ret ret
; e3346 ; e3346

2
engine/buy_sell_toss.asm
View File

@@ -114,7 +114,7 @@ BuySellToss_InterpretJoypad: ; 2500e
.right .right
ld a, [wItemQuantityChangeBuffer] ld a, [wItemQuantityChangeBuffer]
add $a add 10
ld b, a ld b, a
ld a, [wItemQuantityBuffer] ld a, [wItemQuantityBuffer]
cp b cp b

2
engine/link.asm
View File

@@ -1886,7 +1886,7 @@ Function28b87: ; 28b87
ld [wd002], a ld [wd002], a
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callab Functione039 callab RemoveMonFromPartyOrBox
ld a, [PartyCount] ld a, [PartyCount]
dec a dec a
ld [CurPartyMon], a ld [CurPartyMon], a

2
engine/mail.asm
View File

@@ -177,7 +177,7 @@ CheckPokeItem:: ; 44654
jr c, .close_sram_return jr c, .close_sram_return
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba Functione039 callba RemoveMonFromPartyOrBox
ld a, $1 ld a, $1
.close_sram_return .close_sram_return

26
engine/npctrade.asm
View File

@@ -40,7 +40,7 @@ NPCTrade:: ; fcba8
; Select givemon from party ; Select givemon from party
ld b, 6 ld b, 6
callba Function5001d callba SelectTradeOrDaycareMon
ld a, TRADE_CANCEL ld a, TRADE_CANCEL
jr c, .done jr c, .done
@@ -100,23 +100,23 @@ CheckTradeGender: ; fcc23
call GetTradeAttribute call GetTradeAttribute
ld a, [hl] ld a, [hl]
and a and a
jr z, .asm_fcc46 jr z, .matching
cp 1 cp 1
jr z, .asm_fcc3e jr z, .check_male
callba GetGender callba GetGender
jr nz, .asm_fcc48 jr nz, .not_matching
jr .asm_fcc46 jr .matching
.asm_fcc3e .check_male
callba GetGender callba GetGender
jr z, .asm_fcc48 jr z, .not_matching
.asm_fcc46 .matching
and a and a
ret ret
.asm_fcc48 .not_matching
scf scf
ret ret
; fcc4a ; fcc4a
@@ -211,7 +211,7 @@ DoNPCTrade: ; fcc63
xor a xor a
ld [MonType], a ld [MonType], a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callab Functione039 callab RemoveMonFromPartyOrBox
predef TryAddMonToParty predef TryAddMonToParty
ld e, TRADE_DIALOG ld e, TRADE_DIALOG
@@ -219,9 +219,9 @@ DoNPCTrade: ; fcc63
ld a, [hl] ld a, [hl]
cp TRADE_COMPLETE cp TRADE_COMPLETE
ld b, RESET_FLAG ld b, RESET_FLAG
jr c, .asm_fcd1c jr c, .incomplete
ld b, SET_FLAG ld b, SET_FLAG
.asm_fcd1c .incomplete
callba SetGiftPartyMonCaughtData callba SetGiftPartyMonCaughtData
ld e, TRADE_NICK ld e, TRADE_NICK
@@ -291,7 +291,7 @@ DoNPCTrade: ; fcc63
ld a, [PartyCount] ld a, [PartyCount]
dec a dec a
ld [CurPartyMon], a ld [CurPartyMon], a
callba Functione134 callba ComputeNPCTrademonStats
pop af pop af
ld [CurPartyMon], a ld [CurPartyMon], a
pop hl pop hl

2
engine/party_menu.asm
View File

@@ -13,7 +13,7 @@ SelectMonFromParty: ; 50000
; 5001d ; 5001d
Function5001d: ; 5001d SelectTradeOrDaycareMon: ; 5001d
ld a, b ld a, b
ld [PartyMenuActionText], a ld [PartyMenuActionText], a
call DisableSpriteUpdates call DisableSpriteUpdates

24
engine/warp_connection.asm
View File

@@ -62,9 +62,9 @@ EnterWestConnection: ; 1045ed
.skip_to_load .skip_to_load
ld a, l ld a, l
ld [wd194], a ld [wOverworldMapAnchor], a
ld a, h ld a, h
ld [wd194 + 1], a ld [wOverworldMapAnchor + 1], a
jp EnteredConnection jp EnteredConnection
; 104629 ; 104629
@@ -99,9 +99,9 @@ EnterEastConnection: ; 104629
.skip_to_load .skip_to_load
ld a, l ld a, l
ld [wd194], a ld [wOverworldMapAnchor], a
ld a, h ld a, h
ld [wd194 + 1], a ld [wOverworldMapAnchor + 1], a
jp EnteredConnection jp EnteredConnection
; 104665 ; 104665
@@ -126,9 +126,9 @@ EnterNorthConnection: ; 104665
srl c srl c
add hl, bc add hl, bc
ld a, l ld a, l
ld [wd194], a ld [wOverworldMapAnchor], a
ld a, h ld a, h
ld [wd194 + 1], a ld [wOverworldMapAnchor + 1], a
jp EnteredConnection jp EnteredConnection
; 104696 ; 104696
@@ -153,9 +153,9 @@ EnterSouthConnection: ; 104696
srl c srl c
add hl, bc add hl, bc
ld a, l ld a, l
ld [wd194], a ld [wOverworldMapAnchor], a
ld a, h ld a, h
ld [wd194 + 1], a ld [wOverworldMapAnchor + 1], a
; fallthrough ; fallthrough
; 1046c4 ; 1046c4
@@ -427,14 +427,14 @@ GetCoordOfUpperLeftCorner:: ; 10486d
.resume2 .resume2
call AddNTimes call AddNTimes
ld a, l ld a, l
ld [wd194], a ld [wOverworldMapAnchor], a
ld a, h ld a, h
ld [wd194 + 1], a ld [wOverworldMapAnchor + 1], a
ld a, [YCoord] ld a, [YCoord]
and $1 and $1
ld [wd196], a ld [wMetatileStandingY], a
ld a, [XCoord] ld a, [XCoord]
and $1 and $1
ld [wd197], a ld [wMetatileStandingX], a
ret ret
; 1048ba ; 1048ba

2
event/daycare.asm
View File

@@ -103,7 +103,7 @@ Function16798: ; 16798
ld a, 4 ld a, 4
call Function1689b call Function1689b
ld b, 6 ld b, 6
callba Function5001d callba SelectTradeOrDaycareMon
jr c, .asm_167dd jr c, .asm_167dd
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
cp EGG cp EGG

4
event/magnet_train.asm
View File

@@ -322,7 +322,7 @@ Function8ce14: ; 8ce14
Function8ce19: ; 8ce19 Function8ce19: ; 8ce19
ld d, $55 ld d, $55
ld a, [wd194 + 1] ld a, [wOverworldMapAnchor + 1]
ld e, a ld e, a
ld b, SPRITE_ANIM_INDEX_15 ld b, SPRITE_ANIM_INDEX_15
ld a, [rSVBK] ld a, [rSVBK]
@@ -386,7 +386,7 @@ Function8ce6d: ; 8ce6d
; 8ce7a ; 8ce7a
Function8ce7a: ; 8ce7a Function8ce7a: ; 8ce7a
ld hl, wd194 ld hl, wOverworldMapAnchor
ld a, [wcf65] ld a, [wcf65]
cp [hl] cp [hl]
jr z, .asm_8ce9e jr z, .asm_8ce9e

16
home/map.asm
View File

@@ -124,10 +124,10 @@ LoadMapPart:: ; 217a
; 2198 ; 2198
LoadMetatiles:: ; 2198 LoadMetatiles:: ; 2198
; de <- wd194 ; de <- wOverworldMapAnchor
ld a, [wd194] ld a, [wOverworldMapAnchor]
ld e, a ld e, a
ld a, [wd194 + 1] ld a, [wOverworldMapAnchor + 1]
ld d, a ld d, a
ld hl, wMisc ld hl, wMisc
ld b, 5 ; SCREEN_WIDTH / 4 ld b, 5 ; SCREEN_WIDTH / 4
@@ -1272,7 +1272,7 @@ ScrollMapUp:: ; 2748
ret ret
; 2771 ; 2771
ScrollMapLeft:: ; 2771 ScrollMapRight:: ; 2771
hlcoord 0, 0 hlcoord 0, 0
ld de, BGMapBuffer ld de, BGMapBuffer
call BackupBGMapColumn call BackupBGMapColumn
@@ -1288,7 +1288,7 @@ ScrollMapLeft:: ; 2771
ret ret
; 278f ; 278f
ScrollMapRight:: ; 278f ScrollMapLeft:: ; 278f
hlcoord SCREEN_WIDTH - 2, 0 hlcoord SCREEN_WIDTH - 2, 0
ld de, BGMapBuffer ld de, BGMapBuffer
call BackupBGMapColumn call BackupBGMapColumn
@@ -1468,7 +1468,7 @@ LoadTileset:: ; 2821
; 2879 ; 2879
BufferScreen:: ; 2879 BufferScreen:: ; 2879
ld hl, wd194 ld hl, wOverworldMapAnchor
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@@ -1497,7 +1497,7 @@ BufferScreen:: ; 2879
; 289d ; 289d
SaveScreen:: ; 289d SaveScreen:: ; 289d
ld hl, wd194 ld hl, wOverworldMapAnchor
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@@ -1547,7 +1547,7 @@ SaveScreen:: ; 289d
LoadNeighboringBlockData:: ; 28e3 LoadNeighboringBlockData:: ; 28e3
ld hl, wd194 ld hl, wOverworldMapAnchor
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a

364
main.asm
View File

File diff suppressed because it is too large Load Diff

2
misc/mobile_40.asm
View File

@@ -5406,7 +5406,7 @@ Function1023c6: ; 1023c6
ld [CurPartyMon], a ld [CurPartyMon], a
xor a xor a
ld [wd10b], a ld [wd10b], a
callba Functione039 callba RemoveMonFromPartyOrBox
ld hl, PartyCount ld hl, PartyCount
inc [hl] inc [hl]
ld a, [hli] ld a, [hli]

2
misc/mobile_46.asm
View File

@@ -7459,7 +7459,7 @@ Function11b5c0: ; 11b5c0
ld [CurPartyMon], a ld [CurPartyMon], a
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
callba Functione039 callba RemoveMonFromPartyOrBox
callba Function170807 callba Function170807
callba Function14a58 callba Function14a58
jp Function11ad8a jp Function11ad8a

8
wram.asm
View File

@@ -1984,11 +1984,9 @@ wd182:: ds 1
wd191:: ds 1 wd191:: ds 1
wd192:: ds 1 wd192:: ds 1
wd193:: ds 1 wd193:: ds 1
wd194:: dw wOverworldMapAnchor:: dw
wMetatileStandingY:: wMetatileStandingY:: ds 1
wd196:: ds 1 wMetatileStandingX:: ds 1
wMetatileStandingX::
wd197:: ds 1
wSecondMapHeaderBank:: ds 1 wSecondMapHeaderBank:: ds 1
wTileset:: ds 1 wTileset:: ds 1
wPermission:: ds 1 wPermission:: ds 1