diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-09-04 14:50:37 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-09-04 14:50:37 -0400 |
| commit | d271cc7b08567ef2270def3ee4c3d814321668e3 (patch) | |
| tree | 45e4c00c1f64a2ab0eda6ce47ca0dc461129dddd | |
| parent | bf35bf265bba4f650a9fcebdcb1a7ccb64fde4f7 (diff) | |
engine/in_game_trades.asm
| -rwxr-xr-x | data/trades.asm | 2 | ||||
| -rwxr-xr-x | engine/in_game_trades.asm | 122 | ||||
| -rwxr-xr-x | wram.asm | 2 | ||||
| -rwxr-xr-x | yellow/main.asm | 905 |
4 files changed, 527 insertions, 504 deletions
diff --git a/data/trades.asm b/data/trades.asm index 80d01161..b1430089 100755 --- a/data/trades.asm +++ b/data/trades.asm @@ -1,4 +1,4 @@ -TradeMons: ; 71b7b (1c:5b7b) +TradeMons: ; 71c1d (1c:5c1d) ; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total db LICKITUNG, DUGTRIO, 0,"GURIO@@@@@@" db CLEFAIRY, MR_MIME, 0,"MILES@@@@@@" diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index 4229afd8..553f550d 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -1,15 +1,10 @@ -DoInGameTradeDialogue: ; 71ad9 (1c:5ad9) +DoInGameTradeDialogue: ; 71b86 (1c:5b86) ; trigger the trade offer/action specified by wWhichTrade call SaveScreenTilesToBuffer2 ld hl,TradeMons ld a,[wWhichTrade] - ld b,a - swap a - sub b - sub b - ld c,a - ld b,0 - add hl,bc + ld bc,$e + call AddNTimes ld a,[hli] ld [wInGameTradeGiveMonSpecies],a ld a,[hli] @@ -21,7 +16,7 @@ DoInGameTradeDialogue: ; 71ad9 (1c:5ad9) call CopyData pop af ld l,a - ld h,$0 + ld h,0 ld de,InGameTradeTextPointers add hl,hl add hl,de @@ -35,18 +30,15 @@ DoInGameTradeDialogue: ; 71ad9 (1c:5ad9) ld a,[wInGameTradeReceiveMonSpecies] ld de,wInGameTradeReceiveMonName call InGameTrade_GetMonName - ld hl,wCompletedInGameTradeFlags - ld a,[wWhichTrade] - ld c,a + ld a,$4 + ld [wInGameTradeTextPointerTableIndex],a ld b,FLAG_TEST - predef FlagActionPredef + call InGameTrade_FlagActionPredef ld a,c and a - ld a,$4 - ld [wInGameTradeTextPointerTableIndex],a jr nz,.printText ; if the trade hasn't been done yet - xor a + ld a,$0 ld [wInGameTradeTextPointerTableIndex],a call .printText ld a,$1 @@ -75,7 +67,7 @@ DoInGameTradeDialogue: ; 71ad9 (1c:5ad9) jp PrintText ; copies name of species a to hl -InGameTrade_GetMonName: ; 71b6a (1c:5b6a) +InGameTrade_GetMonName: ; 71c0c (1c:5c0c) push de ld [wd11e],a call GetMonName @@ -86,7 +78,7 @@ InGameTrade_GetMonName: ; 71b6a (1c:5b6a) INCLUDE "data/trades.asm" -InGameTrade_DoTrade: ; 71c07 (1c:5c07) +InGameTrade_DoTrade: ; 71ca9 (1c:5ca9) xor a ; NORMAL_PARTY_MENU ld [wPartyMenuTypeOrMessageID],a dec a @@ -109,11 +101,8 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) call AddNTimes ld a,[hl] ld [W_CURENEMYLVL],a - ld hl,wCompletedInGameTradeFlags - ld a,[wWhichTrade] - ld c,a ld b,FLAG_SET - predef FlagActionPredef + call InGameTrade_FlagActionPredef ld hl, ConnectCableText call PrintText ld a,[wWhichPokemon] @@ -137,20 +126,20 @@ InGameTrade_DoTrade: ; 71c07 (1c:5c07) ld [wMonDataLocation],a call AddPartyMon call InGameTrade_CopyDataToReceivedMon - callab EvolveTradeMon + call InGameTrade_CheckForTradeEvo call ClearScreen call InGameTrade_RestoreScreen callba RedrawMapView and a ld a,$3 jr .tradeSucceeded -.tradeFailed +.tradeFailed ; never jumped to scf .tradeSucceeded ld [wInGameTradeTextPointerTableIndex],a ret -InGameTrade_RestoreScreen: ; 71ca2 (1c:5ca2) +InGameTrade_RestoreScreen: ; 71d36 (1c:5d36) call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns call ReloadTilesetTilePatterns @@ -161,7 +150,7 @@ InGameTrade_RestoreScreen: ; 71ca2 (1c:5ca2) call DelayFrames jpba LoadWildData -InGameTrade_PrepareTradeData: ; 71cc1 (1c:5cc1) +InGameTrade_PrepareTradeData: ; 71d55 (1c:5d55) ld hl, wTradedPlayerMonSpecies ld a, [wInGameTradeGiveMonSpecies] ld [hli], a ; wTradedPlayerMonSpecies @@ -191,7 +180,7 @@ InGameTrade_PrepareTradeData: ; 71cc1 (1c:5cc1) ld de, wTradedEnemyMonOTID jp CopyData -InGameTrade_CopyData: ; 71d11 (1c:5d11) +InGameTrade_CopyData: ; 71da5 (1c:5da5) push hl push bc call CopyData @@ -199,7 +188,7 @@ InGameTrade_CopyData: ; 71d11 (1c:5d11) pop hl ret -InGameTrade_CopyDataToReceivedMon: ; 71d19 (1c:5d19) +InGameTrade_CopyDataToReceivedMon: ; 71dad (1c:5dad) ld hl, wPartyMonNicks ld bc, NAME_LENGTH call InGameTrade_GetReceivedMonPointer @@ -221,7 +210,7 @@ InGameTrade_CopyDataToReceivedMon: ; 71d19 (1c:5d19) ; the received mon's index is (partyCount - 1), ; so this adds bc to hl (partyCount - 1) times and moves the result to de -InGameTrade_GetReceivedMonPointer: ; 71d4f (1c:5d4f) +InGameTrade_GetReceivedMonPointer: ; 71de3 (1c:5de3) ld a, [wPartyCount] dec a call AddNTimes @@ -229,100 +218,131 @@ InGameTrade_GetReceivedMonPointer: ; 71d4f (1c:5d4f) ld d, h ret -InGameTrade_TrainerString: ; 71d59 (1c:5d59) +InGameTrade_FlagActionPredef: ; 71ded (1c:5ded) + ld hl,wCompletedInGameTradeFlags + ld a,[wWhichTrade] + ld c,a + predef_jump FlagActionPredef + +InGameTrade_CheckForTradeEvo: ; 71df9 (1c:5df9) + ld a,[wInGameTradeReceiveMonSpecies] + cp KADABRA + jr z,.tradeEvo + cp GRAVELER + jr z,.tradeEvo + cp MACHOKE + jr z,.tradeEvo + cp HAUNTER + jr z,.tradeEvo + ret + +.tradeEvo + ld a,[wPartyCount] + dec a + ld [wWhichPokemon],a + ld a,$1 + ld [wForceEvolution],a + ld a,LINK_STATE_TRADING + ld [wLinkState],a + callab EvolveTradeMon + xor a ; LINK_STATE_NONE + ld [wLinkState],a + jp PlayDefaultMusic + +InGameTrade_TrainerString: ; 71e2d (1c:5e2d) ; "TRAINER@@@@@@@@@@" db $5d, "@@@@@@@@@@" -InGameTradeTextPointers: ; 71d64 (1c:5d64) +InGameTradeTextPointers: ; 71e38 (1c:5e38) dw TradeTextPointers1 dw TradeTextPointers2 dw TradeTextPointers3 -TradeTextPointers1: ; 71d6a (1c:5d6a) +TradeTextPointers1: ; 71e3e (1c:5e3e) dw WannaTrade1Text dw NoTrade1Text dw WrongMon1Text dw Thanks1Text dw AfterTrade1Text -TradeTextPointers2: ; 71d74 (1c:5d74) +TradeTextPointers2: ; 71e48 (1c:5e48) dw WannaTrade2Text dw NoTrade2Text dw WrongMon2Text dw Thanks2Text dw AfterTrade2Text -TradeTextPointers3: ; 71d7e (1c:5d7e) +TradeTextPointers3: ; 71e52 (1c:5e52) dw WannaTrade3Text dw NoTrade3Text dw WrongMon3Text dw Thanks3Text dw AfterTrade3Text -ConnectCableText: ; 71d88 (1c:5d88) +ConnectCableText: ; 71e5c (1c:5e5c) TX_FAR _ConnectCableText db "@" -TradedForText: ; 71d8d (1c:5d8d) +TradedForText: ; 71e61 (1c:5e61) TX_FAR _TradedForText db $11, $a, "@" -WannaTrade1Text: ; 71d94 (1c:5d94) +WannaTrade1Text: ; 71e66 (1c:5e66) TX_FAR _WannaTrade1Text db "@" -NoTrade1Text: ; 71d99 (1c:5d99) +NoTrade1Text: ; 71e6b (1c:5e6b) TX_FAR _NoTrade1Text db "@" -WrongMon1Text: ; 71d9e (1c:5d9e) +WrongMon1Text: ; 71e70 (1c:5e70) TX_FAR _WrongMon1Text db "@" -Thanks1Text: ; 71da3 (1c:5da3) +Thanks1Text: ; 71e75 (1c:5e75) TX_FAR _Thanks1Text db "@" -AfterTrade1Text: ; 71da8 (1c:5da8) +AfterTrade1Text: ; 71e7a (1c:5e7a) TX_FAR _AfterTrade1Text db "@" -WannaTrade2Text: ; 71dad (1c:5dad) +WannaTrade2Text: ; 71e7f (1c:5e7f) TX_FAR _WannaTrade2Text db "@" -NoTrade2Text: ; 71db2 (1c:5db2) +NoTrade2Text: ; 71e84 (1c:5e84) TX_FAR _NoTrade2Text db "@" -WrongMon2Text: ; 71db7 (1c:5db7) +WrongMon2Text: ; 71e89 (1c:5e89) TX_FAR _WrongMon2Text db "@" -Thanks2Text: ; 71dbc (1c:5dbc) +Thanks2Text: ; 71e8e (1c:5e8e) TX_FAR _Thanks2Text db "@" -AfterTrade2Text: ; 71dc1 (1c:5dc1) +AfterTrade2Text: ; 71e93 (1c:5e93) TX_FAR _AfterTrade2Text db "@" -WannaTrade3Text: ; 71dc6 (1c:5dc6) +WannaTrade3Text: ; 71e98 (1c:5e98) TX_FAR _WannaTrade3Text db "@" -NoTrade3Text: ; 71dcb (1c:5dcb) +NoTrade3Text: ; 71e9d (1c:5d9d) TX_FAR _NoTrade3Text db "@" -WrongMon3Text: ; 71dd0 (1c:5dd0) +WrongMon3Text: ; 71ea2 (1c:5ea2) TX_FAR _WrongMon3Text db "@" -Thanks3Text: ; 71dd5 (1c:5dd5) +Thanks3Text: ; 71ea7 (1c:5ea7) TX_FAR _Thanks3Text db "@" -AfterTrade3Text: ; 71dda (1c:5dda) +AfterTrade3Text: ; 71eac (1c:5eac) TX_FAR _AfterTrade3Text db "@" @@ -753,7 +753,7 @@ wEnemyMonAccuracyMod:: ; cd32 wEnemyMonEvasionMod:: ; cd33 ds 1 -wInGameTradeReceiveMonSpecies:: +wInGameTradeReceiveMonSpecies:: ; cd34 ds 1 ds 2 diff --git a/yellow/main.asm b/yellow/main.asm index 5795df45..72d984a9 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -21,53 +21,53 @@ SECTION "bank01",ROMX,BANK[$01] ;INCLUDE "data/facing.asm" dr $4000,$4111 INCLUDE "engine/battle/safari_zone.asm" -SetDefaultNamesBeforeTitlescreen:: ; 414b (1:414b) +SetDefaultNamesBeforeTitlescreen: ; 414b (1:414b) dr $414b,$442b -LoadMonData_:: ; 442b (1:442b) +LoadMonData_: ; 442b (1:442b) dr $442b,$4494 -ItemPrices:: ; 4494 (1:4494) +ItemPrices: ; 4494 (1:4494) dr $4494,$45b7 -ItemNames:: ; 45b7 (1:45b7) +ItemNames: ; 45b7 (1:45b7) dr $45b7,$491e -UnusedNames:: ; 491e (1:491e) +UnusedNames: ; 491e (1:491e) dr $491e,$499b -PrepareOAMData:: ; 499b (1:499b) +PrepareOAMData: ; 499b (1:499b) dr $499b,$4a92 -WriteDMACodeToHRAM:: ; 4a92 (1:4a92) +WriteDMACodeToHRAM: ; 4a92 (1:4a92) dr $4a92,$4aaa -_IsTilePassable:: ; 4aaa (1:4aaa) +_IsTilePassable: ; 4aaa (1:4aaa) dr $4aaa,$4b89 -PrintWaitingText:: ; 4b89 (1:4b89) +PrintWaitingText: ; 4b89 (1:4b89) dr $4b89,$4bb7 -_UpdateSprites:: ; 4bb7 (1:4bb7) +_UpdateSprites: ; 4bb7 (1:4bb7) dr $4bb7,$5ce4 -Func_5ce4:: ; 5ce4 (1:5ce4) +Func_5ce4: ; 5ce4 (1:5ce4) dr $5ce4,$6042 -SpecialWarpIn:: ; 6042 (1:6042) +SpecialWarpIn: ; 6042 (1:6042) dr $6042,$68a6 -SubtractAmountPaidFromMoney_:: ; 68a6 (1:68a6) +SubtractAmountPaidFromMoney_: ; 68a6 (1:68a6) dr $68a6,$68c9 -HandleItemListSwapping:: ; 68c9 (1:68c9) +HandleItemListSwapping: ; 68c9 (1:68c9) dr $68c9,$69a5 -DisplayPokemartDialogue_:: ; 69a5 (1:69a5) +DisplayPokemartDialogue_: ; 69a5 (1:69a5) dr $69a5,$6d97 -DisplayPokemonCenterDialogue_:: ; 6d97 (1:6d97) +DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) dr $6d97,$6f0e -DisplayTextIDInit:: ; 6f0e (1:6f0e) +DisplayTextIDInit: ; 6f0e (1:6f0e) dr $6f0e,$6f80 -DrawStartMenu:: ; 6f80 (1:6f80) +DrawStartMenu: ; 6f80 (1:6f80) dr $6f80,$7035 -CableClubNPC:: ; 7035 (1:7035) +CableClubNPC: ; 7035 (1:7035) dr $7035,$71ac CloseLinkConnection: ; 71ac (1:71ac) dr $71ac,$71bf -DisplayTextBoxID_:: ; 71bf (1:71bf) +DisplayTextBoxID_: ; 71bf (1:71bf) dr $71bf,$778e -PlayerPC:: ; 778e (1:778e) +PlayerPC: ; 778e (1:778e) dr $778e,$7a0f -_RemovePokemon:: ; 7a0f (1:7a0f) +_RemovePokemon: ; 7a0f (1:7a0f) dr $7a0f,$7abf -_DisplayPokedex:: ; 7c18 (1:7abf) +_DisplayPokedex: ; 7c18 (1:7abf) dr $7abf,$8000 SECTION "bank02",ROMX,BANK[$02] @@ -75,9 +75,9 @@ SECTION "bank02",ROMX,BANK[$02] dr $8000,$9064 PlayBattleMusic: ; 9064 (2:5064) dr $9064,$909d -Music2_UpdateMusic:: ; 909d (2:509d) +Music2_UpdateMusic: ; 909d (2:509d) dr $909d,$984e -Func_984e:: ; 984e (2:584e) +Func_984e: ; 984e (2:584e) dr $984e,$c000 SECTION "bank03",ROMX,BANK[$03] @@ -341,44 +341,46 @@ IsPlayerStandingOnDoorTileOrWarpTile: ; c1e6 (3:41e6) ret INCLUDE "data/warp_tile_ids.asm" -PrintSafariZoneSteps:: ; c27b (3:427b) +PrintSafariZoneSteps: ; c27b (3:427b) dr $c27b,$c2d4 -_GetTileAndCoordsInFrontOfPlayer:: ; c2d4 (3:42d4) +_GetTileAndCoordsInFrontOfPlayer: ; c2d4 (3:42d4) dr $c2d4,$cb62 -LoadWildData:: ; cb62 (3:4b62) +LoadWildData: ; cb62 (3:4b62) dr $cb62,$d2ed -UseItem_:: ; d2ed (3:52ed) +UseItem_: ; d2ed (3:52ed) dr $d2ed,$e635 -TossItem_:: ; e635 (3:6635) +TossItem_: ; e635 (3:6635) dr $e635,$e6a8 -IsKeyItem_:: ; e6a8 (3:66a8) +IsKeyItem_: ; e6a8 (3:66a8) dr $e6a8,$e6e8 SendNewMonToBox: ; e6e8 (3:66e8) dr $e6e8,$e808 -IsNextTileShoreOrWater:: ; e808 (3:6808) +IsNextTileShoreOrWater: ; e808 (3:6808) dr $e808,$e848 -FindWildLocationsOfMon:: ; e848 (3:6848) +FindWildLocationsOfMon: ; e848 (3:6848) dr $e848,$e91b GymLeaderFaceAndBadgeTileGraphics: ; e91b (3:691b) INCBIN "gfx/badges.2bpp" - dr $ed1b,$ef93 -MarkTownVisitedAndLoadMissableObjects:: ; ef93 (3:6f93) + dr $ed1b,$ed59 +RedrawMapView: ; ed59 (3:6d59) + dr $ed59,$ef93 +MarkTownVisitedAndLoadMissableObjects: ; ef93 (3:6f93) dr $ef93,$f0a1 -TryPushingBoulder:: ; f0a1 (3:70a1) +TryPushingBoulder: ; f0a1 (3:70a1) dr $f0a1,$f131 -DoBoulderDustAnimation:: ; f131 (3:7131) +DoBoulderDustAnimation: ; f131 (3:7131) dr $f131,$f161 -_AddPartyMon:: ; f161 (3:7161) +_AddPartyMon: ; f161 (3:7161) dr $f161,$f323 -_AddEnemyMonToPlayerParty:: ; f323 (3:7323) +_AddEnemyMonToPlayerParty: ; f323 (3:7323) dr $f323,$f3a4 -Func_f3a4:: ; f3a4 (3:73a4) +Func_f3a4: ; f3a4 (3:73a4) dr $f3a4,$f9de -PrintBookshelfText:: ; f9de (3:79de) +PrintBookshelfText: ; f9de (3:79de) dr $f9de,$fad3 -PokemonStuffText:: ; fad3 (3:7ad3) +PokemonStuffText: ; fad3 (3:7ad3) dr $fad3,$10000 SECTION "Graphics", ROMX, BANK[GFX] @@ -403,31 +405,31 @@ WorldMapTileGraphicsEnd: PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" dr $11468,$11875 -DrawPartyMenu_:: ; 11875 (4:5875) +DrawPartyMenu_: ; 11875 (4:5875) dr $11875,$11886 -RedrawPartyMenu_:: ; 11886 (4:5886) +RedrawPartyMenu_: ; 11886 (4:5886) dr $11886,$11a97 -RedPicFront:: INCBIN "pic/ytrainer/red.pic" -ShrinkPic1:: INCBIN "pic/trainer/shrink1.pic" -ShrinkPic2:: INCBIN "pic/trainer/shrink2.pic" +RedPicFront: INCBIN "pic/ytrainer/red.pic" +ShrinkPic1: INCBIN "pic/trainer/shrink1.pic" +ShrinkPic2: INCBIN "pic/trainer/shrink2.pic" -StartMenu_Pokedex:: ; 11c22 (4:5c22) +StartMenu_Pokedex: ; 11c22 (4:5c22) dr $11c22,$11c36 -StartMenu_Pokemon:: ; 11c36 (4:5c36) +StartMenu_Pokemon: ; 11c36 (4:5c36) dr $11c36,$11ce4 -SpecialEnterMap:: ; 11ce4 (4:5ce4) +SpecialEnterMap: ; 11ce4 (4:5ce4) dr $11ce4,$11e98 -ErasePartyMenuCursors:: ; 11e98 (4:5e98) +ErasePartyMenuCursors: ; 11e98 (4:5e98) dr $11e98,$11ead -StartMenu_Item:: ; 11ead (4:5ead) +StartMenu_Item: ; 11ead (4:5ead) dr $11ead,$1200a -StartMenu_TrainerInfo:: ; 1200a (4:600a) +StartMenu_TrainerInfo: ; 1200a (4:600a) dr $1200a,$12195 -StartMenu_SaveReset:: ; 12195 (4:6195) +StartMenu_SaveReset: ; 12195 (4:6195) dr $12195,$121a8 -StartMenu_Option:: ; 121a8 (4:61a8) +StartMenu_Option: ; 121a8 (4:61a8) dr $121a8,$121c5 -SwitchPartyMon:: ; 121c5 (4:61c5) +SwitchPartyMon: ; 121c5 (4:61c5) dr $121c5,$12365 @@ -471,7 +473,7 @@ TryDoWildEncounter: ; 1383a (4:783a) SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] dr $14000,$1401b -_InitMapSprites:: ; 1401b (5:401b) +_InitMapSprites: ; 1401b (5:401b) dr $1401b,$143f1 RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" @@ -516,398 +518,398 @@ LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite: INCBIN "gfx/sprites/seel.2bpp" dr $17c31,$17cb0 -ActivatePC:: ; 17cb0 (5:7cb0) +ActivatePC: ; 17cb0 (5:7cb0) dr $17cb0,$18000 SECTION "bank06",ROMX,BANK[$06] dr $18000,$1a4ea -PlayerStepOutFromDoor:: ; 1a4ea (6:64ea) +PlayerStepOutFromDoor: ; 1a4ea (6:64ea) dr $1a4ea,$1a527 -_EndNPCMovementScript:: ; 1a527 (6:6527) +_EndNPCMovementScript: ; 1a527 (6:6527) dr $1a527,$1a54c -ProfOakMovementScriptPointerTable:: ; 1a54c (6:654c) +ProfOakMovementScriptPointerTable: ; 1a54c (6:654c) dr $1a54c,$1a622 -PewterMuseumGuyMovementScriptPointerTable:: ; 1a622 (6:6622) +PewterMuseumGuyMovementScriptPointerTable: ; 1a622 (6:6622) dr $1a622,$1a685 -PewterGymGuyMovementScriptPointerTable:: ; 1a685 (6:6685) +PewterGymGuyMovementScriptPointerTable: ; 1a685 (6:6685) dr $1a685,$1a785 -IsPlayerStandingOnDoorTile:: ; 1a785 (6:6785) +IsPlayerStandingOnDoorTile: ; 1a785 (6:6785) dr $1a785,$1a7f4 -HandleLedges:: ; 1a7f4 (6:67f4) +HandleLedges: ; 1a7f4 (6:67f4) dr $1a7f4,$1c000 SECTION "bank07",ROMX,BANK[$07] dr $1c000,$1e321 -SafariZoneCheck:: ; 1e321 (7:6e21) +SafariZoneCheck: ; 1e321 (7:6e21) dr $1e321,$1e330 -SafariZoneCheckSteps:: ; 1e330 (7:6330) +SafariZoneCheckSteps: ; 1e330 (7:6330) dr $1e330,$1e385 -PrintSafariGameOverText:: ; 1e385 (7:6385) +PrintSafariGameOverText: ; 1e385 (7:6385) dr $1e385,$1e4bf -CinnabarGymQuiz_1eb0a:: ; 1e4bf (7:64bf) +CinnabarGymQuiz_1eb0a: ; 1e4bf (7:64bf) dr $1e4bf,$20000 SECTION "bank08",ROMX,BANK[$08] dr $20000,$2131e -Music_DoLowHealthAlarm:: ; 2131e (8:531e) +Music_DoLowHealthAlarm: ; 2131e (8:531e) dr $2131e,$2146f -BillsPC_:: ; 2146f (8:546f) +BillsPC_: ; 2146f (8:546f) dr $2146f,$218bb -Func_218bb:: ; 218bb (8:58bb) +Func_218bb: ; 218bb (8:58bb) dr $218bb,$219f8 -Func_219f8:: ; 219f8 (8:59f8) +Func_219f8: ; 219f8 (8:59f8) dr $219f8,$21ab7 -Func_21ab7:: ; 21ab7 (8:5ab7) +Func_21ab7: ; 21ab7 (8:5ab7) dr $21ab7,$21b3f -Func_21b3f:: ; 21b3f (8:5b3f) +Func_21b3f: ; 21b3f (8:5b3f) dr $21b3f,$24000 SECTION "Pics 1", ROMX, BANK[PICS_1] -RhydonPicFront:: INCBIN "pic/ymon/rhydon.pic" -RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" -KangaskhanPicFront:: INCBIN "pic/ymon/kangaskhan.pic" -KangaskhanPicBack:: INCBIN "pic/monback/kangaskhanb.pic" -NidoranMPicFront:: INCBIN "pic/ymon/nidoranm.pic" -NidoranMPicBack:: INCBIN "pic/monback/nidoranmb.pic" -ClefairyPicFront:: INCBIN "pic/ymon/clefairy.pic" -ClefairyPicBack:: INCBIN "pic/monback/clefairyb.pic" -SpearowPicFront:: INCBIN "pic/ymon/spearow.pic" -SpearowPicBack:: INCBIN "pic/monback/spearowb.pic" -VoltorbPicFront:: INCBIN "pic/ymon/voltorb.pic" -VoltorbPicBack:: INCBIN "pic/monback/voltorbb.pic" -NidokingPicFront:: INCBIN "pic/ymon/nidoking.pic" -NidokingPicBack:: INCBIN "pic/monback/nidokingb.pic" -SlowbroPicFront:: INCBIN "pic/ymon/slowbro.pic" -SlowbroPicBack:: INCBIN "pic/monback/slowbrob.pic" -IvysaurPicFront:: INCBIN "pic/ymon/ivysaur.pic" -IvysaurPicBack:: INCBIN "pic/monback/ivysaurb.pic" -ExeggutorPicFront:: INCBIN "pic/ymon/exeggutor.pic" -ExeggutorPicBack:: INCBIN "pic/monback/exeggutorb.pic" -LickitungPicFront:: INCBIN "pic/ymon/lickitung.pic" -LickitungPicBack:: INCBIN "pic/monback/lickitungb.pic" -ExeggcutePicFront:: INCBIN "pic/ymon/exeggcute.pic" -ExeggcutePicBack:: INCBIN "pic/monback/exeggcuteb.pic" -GrimerPicFront:: INCBIN "pic/ymon/grimer.pic" -GrimerPicBack:: INCBIN "pic/monback/grimerb.pic" -GengarPicFront:: INCBIN "pic/ymon/gengar.pic" -GengarPicBack:: INCBIN "pic/monback/gengarb.pic" -NidoranFPicFront:: INCBIN "pic/ymon/nidoranf.pic" -NidoranFPicBack:: INCBIN "pic/monback/nidoranfb.pic" -NidoqueenPicFront:: INCBIN "pic/ymon/nidoqueen.pic" -NidoqueenPicBack:: INCBIN "pic/monback/nidoqueenb.pic" -CubonePicFront:: INCBIN "pic/ymon/cubone.pic" -CubonePicBack:: INCBIN "pic/monback/cuboneb.pic" -RhyhornPicFront:: INCBIN "pic/ymon/rhyhorn.pic" -RhyhornPicBack:: INCBIN "pic/monback/rhyhornb.pic" -LaprasPicFront:: INCBIN "pic/ymon/lapras.pic" -LaprasPicBack:: INCBIN "pic/monback/laprasb.pic" -ArcaninePicFront:: INCBIN "pic/ymon/arcanine.pic" -ArcaninePicBack:: INCBIN "pic/monback/arcanineb.pic" -MewPicFront:: INCBIN "pic/ymon/mew.pic" -MewPicBack:: INCBIN "pic/monback/mewb.pic" -GyaradosPicFront:: INCBIN "pic/ymon/gyarados.pic" -GyaradosPicBack:: INCBIN "pic/monback/gyaradosb.pic" -ShellderPicFront:: INCBIN "pic/ymon/shellder.pic" -ShellderPicBack:: INCBIN "pic/monback/shellderb.pic" -TentacoolPicFront:: INCBIN "pic/ymon/tentacool.pic" -TentacoolPicBack:: INCBIN "pic/monback/tentacoolb.pic" -GastlyPicFront:: INCBIN "pic/ymon/gastly.pic" -GastlyPicBack:: INCBIN "pic/monback/gastlyb.pic" -ScytherPicFront:: INCBIN "pic/ymon/scyther.pic" -ScytherPicBack:: INCBIN "pic/monback/scytherb.pic" -StaryuPicFront:: INCBIN "pic/ymon/staryu.pic" -StaryuPicBack:: INCBIN "pic/monback/staryub.pic" -BlastoisePicFront:: INCBIN "pic/ymon/blastoise.pic" -BlastoisePicBack:: INCBIN "pic/monback/blastoiseb.pic" -PinsirPicFront:: INCBIN "pic/ymon/pinsir.pic" -PinsirPicBack:: INCBIN "pic/monback/pinsirb.pic" -TangelaPicFront:: INCBIN "pic/ymon/tangela.pic" -TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" +RhydonPicFront: INCBIN "pic/ymon/rhydon.pic" +RhydonPicBack: INCBIN "pic/monback/rhydonb.pic" +KangaskhanPicFront: INCBIN "pic/ymon/kangaskhan.pic" +KangaskhanPicBack: INCBIN "pic/monback/kangaskhanb.pic" +NidoranMPicFront: INCBIN "pic/ymon/nidoranm.pic" +NidoranMPicBack: INCBIN "pic/monback/nidoranmb.pic" +ClefairyPicFront: INCBIN "pic/ymon/clefairy.pic" +ClefairyPicBack: INCBIN "pic/monback/clefairyb.pic" +SpearowPicFront: INCBIN "pic/ymon/spearow.pic" +SpearowPicBack: INCBIN "pic/monback/spearowb.pic" +VoltorbPicFront: INCBIN "pic/ymon/voltorb.pic" +VoltorbPicBack: INCBIN "pic/monback/voltorbb.pic" +NidokingPicFront: INCBIN "pic/ymon/nidoking.pic" +NidokingPicBack: INCBIN "pic/monback/nidokingb.pic" +SlowbroPicFront: INCBIN "pic/ymon/slowbro.pic" +SlowbroPicBack: INCBIN "pic/monback/slowbrob.pic" +IvysaurPicFront: INCBIN "pic/ymon/ivysaur.pic" +IvysaurPicBack: INCBIN "pic/monback/ivysaurb.pic" +ExeggutorPicFront: INCBIN "pic/ymon/exeggutor.pic" +ExeggutorPicBack: INCBIN "pic/monback/exeggutorb.pic" +LickitungPicFront: INCBIN "pic/ymon/lickitung.pic" +LickitungPicBack: INCBIN "pic/monback/lickitungb.pic" +ExeggcutePicFront: INCBIN "pic/ymon/exeggcute.pic" +ExeggcutePicBack: INCBIN "pic/monback/exeggcuteb.pic" +GrimerPicFront: INCBIN "pic/ymon/grimer.pic" +GrimerPicBack: INCBIN "pic/monback/grimerb.pic" +GengarPicFront: INCBIN "pic/ymon/gengar.pic" +GengarPicBack: INCBIN "pic/monback/gengarb.pic" +NidoranFPicFront: INCBIN "pic/ymon/nidoranf.pic" +NidoranFPicBack: INCBIN "pic/monback/nidoranfb.pic" +NidoqueenPicFront: INCBIN "pic/ymon/nidoqueen.pic" +NidoqueenPicBack: INCBIN "pic/monback/nidoqueenb.pic" +CubonePicFront: INCBIN "pic/ymon/cubone.pic" +CubonePicBack: INCBIN "pic/monback/cuboneb.pic" +RhyhornPicFront: INCBIN "pic/ymon/rhyhorn.pic" +RhyhornPicBack: INCBIN "pic/monback/rhyhornb.pic" +LaprasPicFront: INCBIN "pic/ymon/lapras.pic" +LaprasPicBack: INCBIN "pic/monback/laprasb.pic" +ArcaninePicFront: INCBIN "pic/ymon/arcanine.pic" +ArcaninePicBack: INCBIN "pic/monback/arcanineb.pic" +MewPicFront: INCBIN "pic/ymon/mew.pic" +MewPicBack: INCBIN "pic/monback/mewb.pic" +GyaradosPicFront: INCBIN "pic/ymon/gyarados.pic" +GyaradosPicBack: INCBIN "pic/monback/gyaradosb.pic" +ShellderPicFront: INCBIN "pic/ymon/shellder.pic" +ShellderPicBack: INCBIN "pic/monback/shellderb.pic" +TentacoolPicFront: INCBIN "pic/ymon/tentacool.pic" +TentacoolPicBack: INCBIN "pic/monback/tentacoolb.pic" +GastlyPicFront: INCBIN "pic/ymon/gastly.pic" +GastlyPicBack: INCBIN "pic/monback/gastlyb.pic" +ScytherPicFront: INCBIN "pic/ymon/scyther.pic" +ScytherPicBack: INCBIN "pic/monback/scytherb.pic" +StaryuPicFront: INCBIN "pic/ymon/staryu.pic" +StaryuPicBack: INCBIN "pic/monback/staryub.pic" +BlastoisePicFront: INCBIN "pic/ymon/blastoise.pic" +BlastoisePicBack: INCBIN "pic/monback/blastoiseb.pic" +PinsirPicFront: INCBIN "pic/ymon/pinsir.pic" +PinsirPicBack: INCBIN "pic/monback/pinsirb.pic" +TangelaPicFront: INCBIN "pic/ymon/tangela.pic" +TangelaPicBack: INCBIN "pic/monback/tangelab.pic" dr $27d20,$27dff -SaveTrainerName:: ; 27dff (9:7dff) +SaveTrainerName: ; 27dff (9:7dff) dr $27dff,$28000 SECTION "Pics 2", ROMX, BANK[PICS_2] -GrowlithePicFront:: INCBIN "pic/ymon/growlithe.pic" -GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" -OnixPicFront:: INCBIN "pic/ymon/onix.pic" -OnixPicBack:: INCBIN "pic/monback/onixb.pic" -FearowPicFront:: INCBIN "pic/ymon/fearow.pic" -FearowPicBack:: INCBIN "pic/monback/fearowb.pic" -PidgeyPicFront:: INCBIN "pic/ymon/pidgey.pic" -PidgeyPicBack:: INCBIN "pic/monback/pidgeyb.pic" -SlowpokePicFront:: INCBIN "pic/ymon/slowpoke.pic" -SlowpokePicBack:: INCBIN "pic/monback/slowpokeb.pic" -KadabraPicFront:: INCBIN "pic/ymon/kadabra.pic" -KadabraPicBack:: INCBIN "pic/monback/kadabrab.pic" -GravelerPicFront:: INCBIN "pic/ymon/graveler.pic" -GravelerPicBack:: INCBIN "pic/monback/gravelerb.pic" -ChanseyPicFront:: INCBIN "pic/ymon/chansey.pic" -ChanseyPicBack:: INCBIN "pic/monback/chanseyb.pic" -MachokePicFront:: INCBIN "pic/ymon/machoke.pic" -MachokePicBack:: INCBIN "pic/monback/machokeb.pic" -MrMimePicFront:: INCBIN "pic/ymon/mr.mime.pic" -MrMimePicBack:: INCBIN "pic/monback/mr.mimeb.pic" -HitmonleePicFront:: INCBIN "pic/ymon/hitmonlee.pic" -HitmonleePicBack:: INCBIN "pic/monback/hitmonleeb.pic" -HitmonchanPicFront:: INCBIN "pic/ymon/hitmonchan.pic" -HitmonchanPicBack:: INCBIN "pic/monback/hitmonchanb.pic" -ArbokPicFront:: INCBIN "pic/ymon/arbok.pic" -ArbokPicBack:: INCBIN "pic/monback/arbokb.pic" -ParasectPicFront:: INCBIN "pic/ymon/parasect.pic" -ParasectPicBack:: INCBIN "pic/monback/parasectb.pic" -PsyduckPicFront:: INCBIN "pic/ymon/psyduck.pic" -PsyduckPicBack:: INCBIN "pic/monback/psyduckb.pic" -DrowzeePicFront:: INCBIN "pic/ymon/drowzee.pic" -DrowzeePicBack:: INCBIN "pic/monback/drowzeeb.pic" -GolemPicFront:: INCBIN "pic/ymon/golem.pic" -GolemPicBack:: INCBIN "pic/monback/golemb.pic" -MagmarPicFront:: INCBIN "pic/ymon/magmar.pic" -MagmarPicBack:: INCBIN "pic/monback/magmarb.pic" -ElectabuzzPicFront:: INCBIN "pic/ymon/electabuzz.pic" -ElectabuzzPicBack:: INCBIN "pic/monback/electabuzzb.pic" -MagnetonPicFront:: INCBIN "pic/ymon/magneton.pic" -MagnetonPicBack:: INCBIN "pic/monback/magnetonb.pic" -KoffingPicFront:: INCBIN "pic/ymon/koffing.pic" -KoffingPicBack:: INCBIN "pic/monback/koffingb.pic" -MankeyPicFront:: INCBIN "pic/ymon/mankey.pic" -MankeyPicBack:: INCBIN "pic/monback/mankeyb.pic" -SeelPicFront:: INCBIN "pic/ymon/seel.pic" -SeelPicBack:: INCBIN "pic/monback/seelb.pic" -DiglettPicFront:: INCBIN "pic/ymon/diglett.pic" -DiglettPicBack:: INCBIN "pic/monback/diglettb.pic" -TaurosPicFront:: INCBIN "pic/ymon/tauros.pic" -TaurosPicBack:: INCBIN "pic/monback/taurosb.pic" -FarfetchdPicFront:: INCBIN "pic/ymon/farfetchd.pic" -FarfetchdPicBack:: INCBIN "pic/monback/farfetchdb.pic" -VenonatPicFront:: INCBIN "pic/ymon/venonat.pic" -VenonatPicBack:: INCBIN "pic/monback/venonatb.pic" -DragonitePicFront:: INCBIN "pic/ymon/dragonite.pic" -DragonitePicBack:: INCBIN "pic/monback/dragoniteb.pic" -DoduoPicFront:: INCBIN "pic/ymon/doduo.pic" -DoduoPicBack:: INCBIN "pic/monback/doduob.pic" -PoliwagPicFront:: INCBIN "pic/ymon/poliwag.pic" -PoliwagPicBack:: INCBIN "pic/monback/poliwagb.pic" -JynxPicFront:: INCBIN "pic/ymon/jynx.pic" -JynxPicBack:: INCBIN "pic/monback/jynxb.pic" -MoltresPicFront:: INCBIN "pic/ymon/moltres.pic" -MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" +GrowlithePicFront: INCBIN "pic/ymon/growlithe.pic" +GrowlithePicBack: INCBIN "pic/monback/growlitheb.pic" +OnixPicFront: INCBIN "pic/ymon/onix.pic" +OnixPicBack: INCBIN "pic/monback/onixb.pic" +FearowPicFront: INCBIN "pic/ymon/fearow.pic" +FearowPicBack: INCBIN "pic/monback/fearowb.pic" +PidgeyPicFront: INCBIN "pic/ymon/pidgey.pic" +PidgeyPicBack: INCBIN "pic/monback/pidgeyb.pic" +SlowpokePicFront: INCBIN "pic/ymon/slowpoke.pic" +SlowpokePicBack: INCBIN "pic/monback/slowpokeb.pic" +KadabraPicFront: INCBIN "pic/ymon/kadabra.pic" +KadabraPicBack: INCBIN "pic/monback/kadabrab.pic" +GravelerPicFront: INCBIN "pic/ymon/graveler.pic" +GravelerPicBack: INCBIN "pic/monback/gravelerb.pic" +ChanseyPicFront: INCBIN "pic/ymon/chansey.pic" +ChanseyPicBack: INCBIN "pic/monback/chanseyb.pic" +MachokePicFront: INCBIN "pic/ymon/machoke.pic" +MachokePicBack: INCBIN "pic/monback/machokeb.pic" +MrMimePicFront: INCBIN "pic/ymon/mr.mime.pic" +MrMimePicBack: INCBIN "pic/monback/mr.mimeb.pic" +HitmonleePicFront: INCBIN "pic/ymon/hitmonlee.pic" +HitmonleePicBack: INCBIN "pic/monback/hitmonleeb.pic" +HitmonchanPicFront: INCBIN "pic/ymon/hitmonchan.pic" +HitmonchanPicBack: INCBIN "pic/monback/hitmonchanb.pic" +ArbokPicFront: INCBIN "pic/ymon/arbok.pic" +ArbokPicBack: INCBIN "pic/monback/arbokb.pic" +ParasectPicFront: INCBIN "pic/ymon/parasect.pic" +ParasectPicBack: INCBIN "pic/monback/parasectb.pic" +PsyduckPicFront: INCBIN "pic/ymon/psyduck.pic" +PsyduckPicBack: INCBIN "pic/monback/psyduckb.pic" +DrowzeePicFront: INCBIN "pic/ymon/drowzee.pic" +DrowzeePicBack: INCBIN "pic/monback/drowzeeb.pic" +GolemPicFront: INCBIN "pic/ymon/golem.pic" +GolemPicBack: INCBIN "pic/monback/golemb.pic" +MagmarPicFront: INCBIN "pic/ymon/magmar.pic" +MagmarPicBack: INCBIN "pic/monback/magmarb.pic" +ElectabuzzPicFront: INCBIN "pic/ymon/electabuzz.pic" +ElectabuzzPicBack: INCBIN "pic/monback/electabuzzb.pic" +MagnetonPicFront: INCBIN "pic/ymon/magneton.pic" +MagnetonPicBack: INCBIN "pic/monback/magnetonb.pic" +KoffingPicFront: INCBIN "pic/ymon/koffing.pic" +KoffingPicBack: INCBIN "pic/monback/koffingb.pic" +MankeyPicFront: INCBIN "pic/ymon/mankey.pic" +MankeyPicBack: INCBIN "pic/monback/mankeyb.pic" +SeelPicFront: INCBIN "pic/ymon/seel.pic" +SeelPicBack: INCBIN "pic/monback/seelb.pic" +DiglettPicFront: INCBIN "pic/ymon/diglett.pic" +DiglettPicBack: INCBIN "pic/monback/diglettb.pic" +TaurosPicFront: INCBIN "pic/ymon/tauros.pic" +TaurosPicBack: INCBIN "pic/monback/taurosb.pic" +FarfetchdPicFront: INCBIN "pic/ymon/farfetchd.pic" +FarfetchdPicBack: INCBIN "pic/monback/farfetchdb.pic" +VenonatPicFront: INCBIN "pic/ymon/venonat.pic" +VenonatPicBack: INCBIN "pic/monback/venonatb.pic" +DragonitePicFront: INCBIN "pic/ymon/dragonite.pic" +DragonitePicBack: INCBIN "pic/monback/dragoniteb.pic" +DoduoPicFront: INCBIN "pic/ymon/doduo.pic" +DoduoPicBack: INCBIN "pic/monback/doduob.pic" +PoliwagPicFront: INCBIN "pic/ymon/poliwag.pic" +PoliwagPicBack: INCBIN "pic/monback/poliwagb.pic" +JynxPicFront: INCBIN "pic/ymon/jynx.pic" +JynxPicBack: INCBIN "pic/monback/jynxb.pic" +MoltresPicFront: INCBIN "pic/ymon/moltres.pic" +MoltresPicBack: INCBIN "pic/monback/moltresb.pic" dr $2bd4c,$2c000 SECTION "Pics 3", ROMX, BANK[PICS_3] -ArticunoPicFront:: INCBIN "pic/ymon/articuno.pic" -ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" -ZapdosPicFront:: INCBIN "pic/ymon/zapdos.pic" -ZapdosPicBack:: INCBIN "pic/monback/zapdosb.pic" -DittoPicFront:: INCBIN "pic/ymon/ditto.pic" -DittoPicBack:: INCBIN "pic/monback/dittob.pic" -MeowthPicFront:: INCBIN "pic/ymon/meowth.pic" -MeowthPicBack:: INCBIN "pic/monback/meowthb.pic" -KrabbyPicFront:: INCBIN "pic/ymon/krabby.pic" -KrabbyPicBack:: INCBIN "pic/monback/krabbyb.pic" -VulpixPicFront:: INCBIN "pic/ymon/vulpix.pic" -VulpixPicBack:: INCBIN "pic/monback/vulpixb.pic" -NinetalesPicFront:: INCBIN "pic/ymon/ninetales.pic" -NinetalesPicBack:: INCBIN "pic/monback/ninetalesb.pic" -PikachuPicFront:: INCBIN "pic/ymon/pikachu.pic" -PikachuPicBack:: INCBIN "pic/monback/pikachub.pic" -RaichuPicFront:: INCBIN "pic/ymon/raichu.pic" -RaichuPicBack:: INCBIN "pic/monback/raichub.pic" -DratiniPicFront:: INCBIN "pic/ymon/dratini.pic" -DratiniPicBack:: INCBIN "pic/monback/dratinib.pic" -DragonairPicFront:: INCBIN "pic/ymon/dragonair.pic" -DragonairPicBack:: INCBIN "pic/monback/dragonairb.pic" -KabutoPicFront:: INCBIN "pic/ymon/kabuto.pic" -KabutoPicBack:: INCBIN "pic/monback/kabutob.pic" -KabutopsPicFront:: INCBIN "pic/ymon/kabutops.pic" -KabutopsPicBack:: INCBIN "pic/monback/kabutopsb.pic" -HorseaPicFront:: INCBIN "pic/ymon/horsea.pic" -HorseaPicBack:: INCBIN "pic/monback/horseab.pic" -SeadraPicFront:: INCBIN "pic/ymon/seadra.pic" -SeadraPicBack:: INCBIN "pic/monback/seadrab.pic" -SandshrewPicFront:: INCBIN "pic/ymon/sandshrew.pic" -SandshrewPicBack:: INCBIN "pic/monback/sandshrewb.pic" -SandslashPicFront:: INCBIN "pic/ymon/sandslash.pic" -SandslashPicBack:: INCBIN "pic/monback/sandslashb.pic" -OmanytePicFront:: INCBIN "pic/ymon/omanyte.pic" -OmanytePicBack:: INCBIN "pic/monback/omanyteb.pic" -OmastarPicFront:: INCBIN "pic/ymon/omastar.pic" -OmastarPicBack:: INCBIN "pic/monback/omastarb.pic" -JigglypuffPicFront:: INCBIN "pic/ymon/jigglypuff.pic" -JigglypuffPicBack:: INCBIN "pic/monback/jigglypuffb.pic" -WigglytuffPicFront:: INCBIN "pic/ymon/wigglytuff.pic" -WigglytuffPicBack:: INCBIN "pic/monback/wigglytuffb.pic" -EeveePicFront:: INCBIN "pic/ymon/eevee.pic" -EeveePicBack:: INCBIN "pic/monback/eeveeb.pic" -FlareonPicFront:: INCBIN "pic/ymon/flareon.pic" -FlareonPicBack:: INCBIN "pic/monback/flareonb.pic" -JolteonPicFront:: INCBIN "pic/ymon/jolteon.pic" -JolteonPicBack:: INCBIN "pic/monback/jolteonb.pic" -VaporeonPicFront:: INCBIN "pic/ymon/vaporeon.pic" -VaporeonPicBack:: INCBIN "pic/monback/vaporeonb.pic" -MachopPicFront:: INCBIN "pic/ymon/machop.pic" -MachopPicBack:: INCBIN "pic/monback/machopb.pic" -ZubatPicFront:: INCBIN "pic/ymon/zubat.pic" -ZubatPicBack:: INCBIN "pic/monback/zubatb.pic" -EkansPicFront:: INCBIN "pic/ymon/ekans.pic" -EkansPicBack:: INCBIN "pic/monback/ekansb.pic" -ParasPicFront:: INCBIN "pic/ymon/paras.pic" -ParasPicBack:: INCBIN "pic/monback/parasb.pic" -PoliwhirlPicFront:: INCBIN "pic/ymon/poliwhirl.pic" -PoliwhirlPicBack:: INCBIN "pic/monback/poliwhirlb.pic" -PoliwrathPicFront:: INCBIN "pic/ymon/poliwrath.pic" -PoliwrathPicBack:: INCBIN "pic/monback/poliwrathb.pic" -WeedlePicFront:: INCBIN "pic/ymon/weedle.pic" -WeedlePicBack:: INCBIN "pic/monback/weedleb.pic" -KakunaPicFront:: INCBIN "pic/ymon/kakuna.pic" -KakunaPicBack:: INCBIN "pic/monback/kakunab.pic" -BeedrillPicFront:: INCBIN "pic/ymon/beedrill.pic" -BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" - -FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" +ArticunoPicFront: INCBIN "pic/ymon/articuno.pic" +ArticunoPicBack: INCBIN "pic/monback/articunob.pic" +ZapdosPicFront: INCBIN "pic/ymon/zapdos.pic" +ZapdosPicBack: INCBIN "pic/monback/zapdosb.pic" +DittoPicFront: INCBIN "pic/ymon/ditto.pic" +DittoPicBack: INCBIN "pic/monback/dittob.pic" +MeowthPicFront: INCBIN "pic/ymon/meowth.pic" +MeowthPicBack: INCBIN "pic/monback/meowthb.pic" +KrabbyPicFront: INCBIN "pic/ymon/krabby.pic" +KrabbyPicBack: INCBIN "pic/monback/krabbyb.pic" +VulpixPicFront: INCBIN "pic/ymon/vulpix.pic" +VulpixPicBack: INCBIN "pic/monback/vulpixb.pic" +NinetalesPicFront: INCBIN "pic/ymon/ninetales.pic" +NinetalesPicBack: INCBIN "pic/monback/ninetalesb.pic" +PikachuPicFront: INCBIN "pic/ymon/pikachu.pic" +PikachuPicBack: INCBIN "pic/monback/pikachub.pic" +RaichuPicFront: INCBIN "pic/ymon/raichu.pic" +RaichuPicBack: INCBIN "pic/monback/raichub.pic" +DratiniPicFront: INCBIN "pic/ymon/dratini.pic" +DratiniPicBack: INCBIN "pic/monback/dratinib.pic" +DragonairPicFront: INCBIN "pic/ymon/dragonair.pic" +DragonairPicBack: INCBIN "pic/monback/dragonairb.pic" +KabutoPicFront: INCBIN "pic/ymon/kabuto.pic" +KabutoPicBack: INCBIN "pic/monback/kabutob.pic" +KabutopsPicFront: INCBIN "pic/ymon/kabutops.pic" +KabutopsPicBack: INCBIN "pic/monback/kabutopsb.pic" +HorseaPicFront: INCBIN "pic/ymon/horsea.pic" +HorseaPicBack: INCBIN "pic/monback/horseab.pic" +SeadraPicFront: INCBIN "pic/ymon/seadra.pic" +SeadraPicBack: INCBIN "pic/monback/seadrab.pic" +SandshrewPicFront: INCBIN "pic/ymon/sandshrew.pic" +SandshrewPicBack: INCBIN "pic/monback/sandshrewb.pic" +SandslashPicFront: INCBIN "pic/ymon/sandslash.pic" +SandslashPicBack: INCBIN "pic/monback/sandslashb.pic" +OmanytePicFront: INCBIN "pic/ymon/omanyte.pic" +OmanytePicBack: INCBIN "pic/monback/omanyteb.pic" +OmastarPicFront: INCBIN "pic/ymon/omastar.pic" +OmastarPicBack: INCBIN "pic/monback/omastarb.pic" +JigglypuffPicFront: INCBIN "pic/ymon/jigglypuff.pic" +JigglypuffPicBack: INCBIN "pic/monback/jigglypuffb.pic" +WigglytuffPicFront: INCBIN "pic/ymon/wigglytuff.pic" +WigglytuffPicBack: INCBIN "pic/monback/wigglytuffb.pic" +EeveePicFront: INCBIN "pic/ymon/eevee.pic" +EeveePicBack: INCBIN "pic/monback/eeveeb.pic" +FlareonPicFront: INCBIN "pic/ymon/flareon.pic" +FlareonPicBack: INCBIN "pic/monback/flareonb.pic" +JolteonPicFront: INCBIN "pic/ymon/jolteon.pic" +JolteonPicBack: INCBIN "pic/monback/jolteonb.pic" +VaporeonPicFront: INCBIN "pic/ymon/vaporeon.pic" +VaporeonPicBack: INCBIN "pic/monback/vaporeonb.pic" +MachopPicFront: INCBIN "pic/ymon/machop.pic" +MachopPicBack: INCBIN "pic/monback/machopb.pic" +ZubatPicFront: INCBIN "pic/ymon/zubat.pic" +ZubatPicBack: INCBIN "pic/monback/zubatb.pic" +EkansPicFront: INCBIN "pic/ymon/ekans.pic" +EkansPicBack: INCBIN "pic/monback/ekansb.pic" +ParasPicFront: INCBIN "pic/ymon/paras.pic" +ParasPicBack: INCBIN "pic/monback/parasb.pic" +PoliwhirlPicFront: INCBIN "pic/ymon/poliwhirl.pic" +PoliwhirlPicBack: INCBIN "pic/monback/poliwhirlb.pic" +PoliwrathPicFront: INCBIN "pic/ymon/poliwrath.pic" +PoliwrathPicBack: INCBIN "pic/monback/poliwrathb.pic" +WeedlePicFront: INCBIN "pic/ymon/weedle.pic" +WeedlePicBack: INCBIN "pic/monback/weedleb.pic" +KakunaPicFront: INCBIN "pic/ymon/kakuna.pic" +KakunaPicBack: INCBIN "pic/monback/kakunab.pic" +BeedrillPicFront: INCBIN "pic/ymon/beedrill.pic" +BeedrillPicBack: INCBIN "pic/monback/beedrillb.pic" + +FossilKabutopsPic: INCBIN "pic/bmon/fossilkabutops.pic" dr $2fd25,$30000 SECTION "Pics 4", ROMX, BANK[PICS_4] -DodrioPicFront:: INCBIN "pic/ymon/dodrio.pic" -DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" -PrimeapePicFront:: INCBIN "pic/ymon/primeape.pic" -PrimeapePicBack:: INCBIN "pic/monback/primeapeb.pic" -DugtrioPicFront:: INCBIN "pic/ymon/dugtrio.pic" -DugtrioPicBack:: INCBIN "pic/monback/dugtriob.pic" -VenomothPicFront:: INCBIN "pic/ymon/venomoth.pic" -VenomothPicBack:: INCBIN "pic/monback/venomothb.pic" -DewgongPicFront:: INCBIN "pic/ymon/dewgong.pic" -DewgongPicBack:: INCBIN "pic/monback/dewgongb.pic" -CaterpiePicFront:: INCBIN "pic/ymon/caterpie.pic" -CaterpiePicBack:: INCBIN "pic/monback/caterpieb.pic" -MetapodPicFront:: INCBIN "pic/ymon/metapod.pic" -MetapodPicBack:: INCBIN "pic/monback/metapodb.pic" -ButterfreePicFront:: INCBIN "pic/ymon/butterfree.pic" -ButterfreePicBack:: INCBIN "pic/monback/butterfreeb.pic" -MachampPicFront:: INCBIN "pic/ymon/machamp.pic" -MachampPicBack:: INCBIN "pic/monback/machampb.pic" -GolduckPicFront:: INCBIN "pic/ymon/golduck.pic" -GolduckPicBack:: INCBIN "pic/monback/golduckb.pic" -HypnoPicFront:: INCBIN "pic/ymon/hypno.pic" -HypnoPicBack:: INCBIN "pic/monback/hypnob.pic" -GolbatPicFront:: INCBIN "pic/ymon/golbat.pic" -GolbatPicBack:: INCBIN "pic/monback/golbatb.pic" -MewtwoPicFront:: INCBIN "pic/ymon/mewtwo.pic" -MewtwoPicBack:: INCBIN "pic/monback/mewtwob.pic" -SnorlaxPicFront:: INCBIN "pic/ymon/snorlax.pic" -SnorlaxPicBack:: INCBIN "pic/monback/snorlaxb.pic" -MagikarpPicFront:: INCBIN "pic/ymon/magikarp.pic" -MagikarpPicBack:: INCBIN "pic/monback/magikarpb.pic" -MukPicFront:: INCBIN "pic/ymon/muk.pic" -MukPicBack:: INCBIN "pic/monback/mukb.pic" -KinglerPicFront:: INCBIN "pic/ymon/kingler.pic" -KinglerPicBack:: INCBIN "pic/monback/kinglerb.pic" -CloysterPicFront:: INCBIN "pic/ymon/cloyster.pic" -CloysterPicBack:: INCBIN "pic/monback/cloysterb.pic" -ElectrodePicFront:: INCBIN "pic/ymon/electrode.pic" -ElectrodePicBack:: INCBIN "pic/monback/electrodeb.pic" -ClefablePicFront:: INCBIN "pic/ymon/clefable.pic" -ClefablePicBack:: INCBIN "pic/monback/clefableb.pic" -WeezingPicFront:: INCBIN "pic/ymon/weezing.pic" -WeezingPicBack:: INCBIN "pic/monback/weezingb.pic" -PersianPicFront:: INCBIN "pic/ymon/persian.pic" -PersianPicBack:: INCBIN "pic/monback/persianb.pic" -MarowakPicFront:: INCBIN "pic/ymon/marowak.pic" -MarowakPicBack:: INCBIN "pic/monback/marowakb.pic" -HaunterPicFront:: INCBIN "pic/ymon/haunter.pic" -HaunterPicBack:: INCBIN "pic/monback/haunterb.pic" -AbraPicFront:: INCBIN "pic/ymon/abra.pic" -AbraPicBack:: INCBIN "pic/monback/abrab.pic" -AlakazamPicFront:: INCBIN "pic/ymon/alakazam.pic" -AlakazamPicBack:: INCBIN "pic/monback/alakazamb.pic" -PidgeottoPicFront:: INCBIN "pic/ymon/pidgeotto.pic" -PidgeottoPicBack:: INCBIN "pic/monback/pidgeottob.pic" -PidgeotPicFront:: INCBIN "pic/ymon/pidgeot.pic" -PidgeotPicBack:: INCBIN "pic/monback/pidgeotb.pic" -StarmiePicFront:: INCBIN "pic/ymon/starmie.pic" -StarmiePicBack:: INCBIN "pic/monback/starmieb.pic" +DodrioPicFront: INCBIN "pic/ymon/dodrio.pic" +DodrioPicBack: INCBIN "pic/monback/dodriob.pic" +PrimeapePicFront: INCBIN "pic/ymon/primeape.pic" +PrimeapePicBack: INCBIN "pic/monback/primeapeb.pic" +DugtrioPicFront: INCBIN "pic/ymon/dugtrio.pic" +DugtrioPicBack: INCBIN "pic/monback/dugtriob.pic" +VenomothPicFront: INCBIN "pic/ymon/venomoth.pic" +VenomothPicBack: INCBIN "pic/monback/venomothb.pic" +DewgongPicFront: INCBIN "pic/ymon/dewgong.pic" +DewgongPicBack: INCBIN "pic/monback/dewgongb.pic" +CaterpiePicFront: INCBIN "pic/ymon/caterpie.pic" +CaterpiePicBack: INCBIN "pic/monback/caterpieb.pic" +MetapodPicFront: INCBIN "pic/ymon/metapod.pic" +MetapodPicBack: INCBIN "pic/monback/metapodb.pic" +ButterfreePicFront: INCBIN "pic/ymon/butterfree.pic" +ButterfreePicBack: INCBIN "pic/monback/butterfreeb.pic" +MachampPicFront: INCBIN "pic/ymon/machamp.pic" +MachampPicBack: INCBIN "pic/monback/machampb.pic" +GolduckPicFront: INCBIN "pic/ymon/golduck.pic" +GolduckPicBack: INCBIN "pic/monback/golduckb.pic" +HypnoPicFront: INCBIN "pic/ymon/hypno.pic" +HypnoPicBack: INCBIN "pic/monback/hypnob.pic" +GolbatPicFront: INCBIN "pic/ymon/golbat.pic" +GolbatPicBack: INCBIN "pic/monback/golbatb.pic" +MewtwoPicFront: INCBIN "pic/ymon/mewtwo.pic" +MewtwoPicBack: INCBIN "pic/monback/mewtwob.pic" +SnorlaxPicFront: INCBIN "pic/ymon/snorlax.pic" +SnorlaxPicBack: INCBIN "pic/monback/snorlaxb.pic" +MagikarpPicFront: INCBIN "pic/ymon/magikarp.pic" +MagikarpPicBack: INCBIN "pic/monback/magikarpb.pic" +MukPicFront: INCBIN "pic/ymon/muk.pic" +MukPicBack: INCBIN "pic/monback/mukb.pic" +KinglerPicFront: INCBIN "pic/ymon/kingler.pic" +KinglerPicBack: INCBIN "pic/monback/kinglerb.pic" +CloysterPicFront: INCBIN "pic/ymon/cloyster.pic" +CloysterPicBack: INCBIN "pic/monback/cloysterb.pic" +ElectrodePicFront: INCBIN "pic/ymon/electrode.pic" +ElectrodePicBack: INCBIN "pic/monback/electrodeb.pic" +ClefablePicFront: INCBIN "pic/ymon/clefable.pic" +ClefablePicBack: INCBIN "pic/monback/clefableb.pic" +WeezingPicFront: INCBIN "pic/ymon/weezing.pic" +WeezingPicBack: INCBIN "pic/monback/weezingb.pic" +PersianPicFront: INCBIN "pic/ymon/persian.pic" +PersianPicBack: INCBIN "pic/monback/persianb.pic" +MarowakPicFront: INCBIN "pic/ymon/marowak.pic" +MarowakPicBack: INCBIN "pic/monback/marowakb.pic" +HaunterPicFront: INCBIN "pic/ymon/haunter.pic" +HaunterPicBack: INCBIN "pic/monback/haunterb.pic" +AbraPicFront: INCBIN "pic/ymon/abra.pic" +AbraPicBack: INCBIN "pic/monback/abrab.pic" +AlakazamPicFront: INCBIN "pic/ymon/alakazam.pic" +AlakazamPicBack: INCBIN "pic/monback/alakazamb.pic" +PidgeottoPicFront: INCBIN "pic/ymon/pidgeotto.pic" +PidgeottoPicBack: INCBIN "pic/monback/pidgeottob.pic" +PidgeotPicFront: INCBIN "pic/ymon/pidgeot.pic" +PidgeotPicBack: INCBIN "pic/monback/pidgeotb.pic" +StarmiePicFront: INCBIN "pic/ymon/starmie.pic" +StarmiePicBack: INCBIN "pic/monback/starmieb.pic" SECTION "Pics 5", ROMX, BANK[PICS_5] -BulbasaurPicFront:: INCBIN "pic/ymon/bulbasaur.pic" -BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" -VenusaurPicFront:: INCBIN "pic/ymon/venusaur.pic" -VenusaurPicBack:: INCBIN "pic/monback/venusaurb.pic" -TentacruelPicFront:: INCBIN "pic/ymon/tentacruel.pic" -TentacruelPicBack:: INCBIN "pic/monback/tentacruelb.pic" -GoldeenPicFront:: INCBIN "pic/ymon/goldeen.pic" -GoldeenPicBack:: INCBIN "pic/monback/goldeenb.pic" -SeakingPicFront:: INCBIN "pic/ymon/seaking.pic" -SeakingPicBack:: INCBIN "pic/monback/seakingb.pic" -PonytaPicFront:: INCBIN "pic/ymon/ponyta.pic" -RapidashPicFront:: INCBIN "pic/ymon/rapidash.pic" -PonytaPicBack:: INCBIN "pic/monback/ponytab.pic" -RapidashPicBack:: INCBIN "pic/monback/rapidashb.pic" -RattataPicFront:: INCBIN "pic/ymon/rattata.pic" -RattataPicBack:: INCBIN "pic/monback/rattatab.pic" -RaticatePicFront:: INCBIN "pic/ymon/raticate.pic" -RaticatePicBack:: INCBIN "pic/monback/raticateb.pic" -NidorinoPicFront:: INCBIN "pic/ymon/nidorino.pic" -NidorinoPicBack:: INCBIN "pic/monback/nidorinob.pic" -NidorinaPicFront:: INCBIN "pic/ymon/nidorina.pic" -NidorinaPicBack:: INCBIN "pic/monback/nidorinab.pic" -GeodudePicFront:: INCBIN "pic/ymon/geodude.pic" -GeodudePicBack:: INCBIN "pic/monback/geodudeb.pic" -PorygonPicFront:: INCBIN "pic/ymon/porygon.pic" -PorygonPicBack:: INCBIN "pic/monback/porygonb.pic" -AerodactylPicFront:: INCBIN "pic/ymon/aerodactyl.pic" -AerodactylPicBack:: INCBIN "pic/monback/aerodactylb.pic" -MagnemitePicFront:: INCBIN "pic/ymon/magnemite.pic" -MagnemitePicBack:: INCBIN "pic/monback/magnemiteb.pic" -CharmanderPicFront:: INCBIN "pic/ymon/charmander.pic" -CharmanderPicBack:: INCBIN "pic/monback/charmanderb.pic" -SquirtlePicFront:: INCBIN "pic/ymon/squirtle.pic" -SquirtlePicBack:: INCBIN "pic/monback/squirtleb.pic" -CharmeleonPicFront:: INCBIN "pic/ymon/charmeleon.pic" -CharmeleonPicBack:: INCBIN "pic/monback/charmeleonb.pic" -WartortlePicFront:: INCBIN "pic/ymon/wartortle.pic" -WartortlePicBack:: INCBIN "pic/monback/wartortleb.pic" -CharizardPicFront:: INCBIN "pic/ymon/charizard.pic" -CharizardPicBack:: INCBIN "pic/monback/charizardb.pic" -FossilAerodactylPic:: INCBIN "pic/bmon/fossilaerodactyl.pic" -GhostPic:: INCBIN "pic/other/ghost.pic" -OddishPicFront:: INCBIN "pic/ymon/oddish.pic" -OddishPicBack:: INCBIN "pic/monback/oddishb.pic" -GloomPicFront:: INCBIN "pic/ymon/gloom.pic" -GloomPicBack:: INCBIN "pic/monback/gloomb.pic" -VileplumePicFront:: INCBIN "pic/ymon/vileplume.pic" -VileplumePicBack:: INCBIN "pic/monback/vileplumeb.pic" -BellsproutPicFront:: INCBIN "pic/ymon/bellsprout.pic" -BellsproutPicBack:: INCBIN "pic/monback/bellsproutb.pic" -WeepinbellPicFront:: INCBIN "pic/ymon/weepinbell.pic" -WeepinbellPicBack:: INCBIN "pic/monback/weepinbellb.pic" -VictreebelPicFront:: INCBIN "pic/ymon/victreebel.pic" -VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" +BulbasaurPicFront: INCBIN "pic/ymon/bulbasaur.pic" +BulbasaurPicBack: INCBIN "pic/monback/bulbasaurb.pic" +VenusaurPicFront: INCBIN "pic/ymon/venusaur.pic" +VenusaurPicBack: INCBIN "pic/monback/venusaurb.pic" +TentacruelPicFront: INCBIN "pic/ymon/tentacruel.pic" +TentacruelPicBack: INCBIN "pic/monback/tentacruelb.pic" +GoldeenPicFront: INCBIN "pic/ymon/goldeen.pic" +GoldeenPicBack: INCBIN "pic/monback/goldeenb.pic" +SeakingPicFront: INCBIN "pic/ymon/seaking.pic" +SeakingPicBack: INCBIN "pic/monback/seakingb.pic" +PonytaPicFront: INCBIN "pic/ymon/ponyta.pic" +RapidashPicFront: INCBIN "pic/ymon/rapidash.pic" +PonytaPicBack: INCBIN "pic/monback/ponytab.pic" +RapidashPicBack: INCBIN "pic/monback/rapidashb.pic" +RattataPicFront: INCBIN "pic/ymon/rattata.pic" +RattataPicBack: INCBIN "pic/monback/rattatab.pic" +RaticatePicFront: INCBIN "pic/ymon/raticate.pic" +RaticatePicBack: INCBIN "pic/monback/raticateb.pic" +NidorinoPicFront: INCBIN "pic/ymon/nidorino.pic" +NidorinoPicBack: INCBIN "pic/monback/nidorinob.pic" +NidorinaPicFront: INCBIN "pic/ymon/nidorina.pic" +NidorinaPicBack: INCBIN "pic/monback/nidorinab.pic" +GeodudePicFront: INCBIN "pic/ymon/geodude.pic" +GeodudePicBack: INCBIN "pic/monback/geodudeb.pic" +PorygonPicFront: INCBIN "pic/ymon/porygon.pic" +PorygonPicBack: INCBIN "pic/monback/porygonb.pic" +AerodactylPicFront: INCBIN "pic/ymon/aerodactyl.pic" +AerodactylPicBack: INCBIN "pic/monback/aerodactylb.pic" +MagnemitePicFront: INCBIN "pic/ymon/magnemite.pic" +MagnemitePicBack: INCBIN "pic/monback/magnemiteb.pic" +CharmanderPicFront: INCBIN "pic/ymon/charmander.pic" +CharmanderPicBack: INCBIN "pic/monback/charmanderb.pic" +SquirtlePicFront: INCBIN "pic/ymon/squirtle.pic" +SquirtlePicBack: INCBIN "pic/monback/squirtleb.pic" +CharmeleonPicFront: INCBIN "pic/ymon/charmeleon.pic" +CharmeleonPicBack: INCBIN "pic/monback/charmeleonb.pic" +WartortlePicFront: INCBIN "pic/ymon/wartortle.pic" +WartortlePicBack: INCBIN "pic/monback/wartortleb.pic" +CharizardPicFront: INCBIN "pic/ymon/charizard.pic" +CharizardPicBack: INCBIN "pic/monback/charizardb.pic" +FossilAerodactylPic: INCBIN "pic/bmon/fossilaerodactyl.pic" +GhostPic: INCBIN "pic/other/ghost.pic" +OddishPicFront: INCBIN "pic/ymon/oddish.pic" +OddishPicBack: INCBIN "pic/monback/oddishb.pic" +GloomPicFront: INCBIN "pic/ymon/gloom.pic" +GloomPicBack: INCBIN "pic/monback/gloomb.pic" +VileplumePicFront: INCBIN "pic/ymon/vileplume.pic" +VileplumePicBack: INCBIN "pic/monback/vileplumeb.pic" +BellsproutPicFront: INCBIN "pic/ymon/bellsprout.pic" +BellsproutPicBack: INCBIN "pic/monback/bellsproutb.pic" +WeepinbellPicFront: INCBIN "pic/ymon/weepinbell.pic" +WeepinbellPicBack: INCBIN "pic/monback/weepinbellb.pic" +VictreebelPicFront: INCBIN "pic/ymon/victreebel.pic" +VictreebelPicBack: INCBIN "pic/monback/victreebelb.pic" dr $3749e,$38000 SECTION "bank0E",ROMX,BANK[$0E] dr $38000,$383de -BaseStats:: ; 383de (e:43de) +BaseStats: ; 383de (e:43de) dr $383de,$39462 -CryData:: ; 39462 (e:5462) +CryData: ; 39462 (e:5462) dr $39462,$39893 -TrainerPicAndMoneyPointers:: ; 39893 (e:5893) +TrainerPicAndMoneyPointers: ; 39893 (e:5893) dr $39893,$3997e -TrainerNames:: ; 3997e (e:597e) +TrainerNames: ; 3997e (e:597e) dr $3997e,$39bb6 ReadTrainer: ; 39bb6 (e:5bb6) dr $39bb6,$3a8df @@ -924,6 +926,7 @@ TradingAnimationGraphics2: ; Pokeball traveling through the link cable. INCBIN "gfx/trade2.2bpp" +EvolveTradeMon: ; 3adb8 (e:6db8) dr $3adb8,$3b10f Func_3b10f: ; 3b01f (e:710f) dr $3b10f,$3c000 @@ -936,7 +939,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) dr $3c04c,$3c127 StartBattle: ; 3c127 (f:4127) dr $3c127,$3cae8 -AnyPartyAlive:: ; 3cae8 (f:4ae8) +AnyPartyAlive: ; 3cae8 (f:4ae8) dr $3cae8,$3ce1f DrawHUDsAndHPBars: ; 3ce1f (f:4e1f) dr $3ce1f,$3ceb1 @@ -973,7 +976,7 @@ Pointer_4050b: ; 4050b (10:450b) SECTION "bank11",ROMX,BANK[$11] dr $44000,$45077 -LoadSpinnerArrowTiles:: ; 45077 (11:5077) +LoadSpinnerArrowTiles: ; 45077 (11:5077) dr $45077,$48000 @@ -984,54 +987,54 @@ SECTION "bank12",ROMX,BANK[$12] SECTION "bank13",ROMX,BANK[$13] -TrainerPics:: -YoungsterPic:: INCBIN "pic/trainer/youngster.pic" -BugCatcherPic:: INCBIN "pic/trainer/bugcatcher.pic" -LassPic:: INCBIN "pic/trainer/lass.pic" -SailorPic:: INCBIN "pic/trainer/sailor.pic" -JrTrainerMPic:: INCBIN "pic/trainer/jr.trainerm.pic" -JrTrainerFPic:: INCBIN "pic/trainer/jr.trainerf.pic" -PokemaniacPic:: INCBIN "pic/trainer/pokemaniac.pic" -SuperNerdPic:: INCBIN "pic/trainer/supernerd.pic" -HikerPic:: INCBIN "pic/trainer/hiker.pic" -BikerPic:: INCBIN "pic/trainer/biker.pic" -BurglarPic:: INCBIN "pic/trainer/burglar.pic" -EngineerPic:: INCBIN "pic/trainer/engineer.pic" -FisherPic:: INCBIN "pic/trainer/fisher.pic" -SwimmerPic:: INCBIN "pic/trainer/swimmer.pic" -CueBallPic:: INCBIN "pic/trainer/cueball.pic" -GamblerPic:: INCBIN "pic/trainer/gambler.pic" -BeautyPic:: INCBIN "pic/trainer/beauty.pic" -PsychicPic:: INCBIN "pic/trainer/psychic.pic" -RockerPic:: INCBIN "pic/trainer/rocker.pic" -JugglerPic:: INCBIN "pic/trainer/juggler.pic" -TamerPic:: INCBIN "pic/trainer/tamer.pic" -BirdKeeperPic:: INCBIN "pic/trainer/birdkeeper.pic" -BlackbeltPic:: INCBIN "pic/trainer/blackbelt.pic" -Rival1Pic:: INCBIN "pic/ytrainer/rival1.pic" -ProfOakPic:: INCBIN "pic/trainer/prof.oak.pic" -ChiefPic:: -ScientistPic:: INCBIN "pic/trainer/scientist.pic" -GiovanniPic:: INCBIN "pic/trainer/giovanni.pic" -RocketPic:: INCBIN "pic/trainer/rocket.pic" -CooltrainerMPic:: INCBIN "pic/trainer/cooltrainerm.pic" -CooltrainerFPic:: INCBIN "pic/trainer/cooltrainerf.pic" -BrunoPic:: INCBIN "pic/trainer/bruno.pic" -BrockPic:: INCBIN "pic/ytrainer/brock.pic" -MistyPic:: INCBIN "pic/ytrainer/misty.pic" -LtSurgePic:: INCBIN "pic/trainer/lt.surge.pic" -ErikaPic:: INCBIN "pic/ytrainer/erika.pic" -KogaPic:: INCBIN "pic/trainer/koga.pic" -BlainePic:: INCBIN "pic/trainer/blaine.pic" -SabrinaPic:: INCBIN "pic/trainer/sabrina.pic" -GentlemanPic:: INCBIN "pic/trainer/gentleman.pic" -Rival2Pic:: INCBIN "pic/ytrainer/rival2.pic" -Rival3Pic:: INCBIN "pic/ytrainer/rival3.pic" -LoreleiPic:: INCBIN "pic/trainer/lorelei.pic" -ChannelerPic:: INCBIN "pic/trainer/channeler.pic" -AgathaPic:: INCBIN "pic/trainer/agatha.pic" -LancePic:: INCBIN "pic/trainer/lance.pic" -JessieJamesPic:: INCBIN "pic/ytrainer/jessiejames.pic" +TrainerPics: +YoungsterPic: INCBIN "pic/trainer/youngster.pic" +BugCatcherPic: INCBIN "pic/trainer/bugcatcher.pic" +LassPic: INCBIN "pic/trainer/lass.pic" +SailorPic: INCBIN "pic/trainer/sailor.pic" +JrTrainerMPic: INCBIN "pic/trainer/jr.trainerm.pic" +JrTrainerFPic: INCBIN "pic/trainer/jr.trainerf.pic" +PokemaniacPic: INCBIN "pic/trainer/pokemaniac.pic" +SuperNerdPic: INCBIN "pic/trainer/supernerd.pic" +HikerPic: INCBIN "pic/trainer/hiker.pic" +BikerPic: INCBIN "pic/trainer/biker.pic" +BurglarPic: INCBIN "pic/trainer/burglar.pic" +EngineerPic: INCBIN "pic/trainer/engineer.pic" +FisherPic: INCBIN "pic/trainer/fisher.pic" +SwimmerPic: INCBIN "pic/trainer/swimmer.pic" +CueBallPic: INCBIN "pic/trainer/cueball.pic" +GamblerPic: INCBIN "pic/trainer/gambler.pic" +BeautyPic: INCBIN "pic/trainer/beauty.pic" +PsychicPic: INCBIN "pic/trainer/psychic.pic" +RockerPic: INCBIN "pic/trainer/rocker.pic" +JugglerPic: INCBIN "pic/trainer/juggler.pic" +TamerPic: INCBIN "pic/trainer/tamer.pic" +BirdKeeperPic: INCBIN "pic/trainer/birdkeeper.pic" +BlackbeltPic: INCBIN "pic/trainer/blackbelt.pic" +Rival1Pic: INCBIN "pic/ytrainer/rival1.pic" +ProfOakPic: INCBIN "pic/trainer/prof.oak.pic" +ChiefPic: +ScientistPic: INCBIN "pic/trainer/scientist.pic" +GiovanniPic: INCBIN "pic/trainer/giovanni.pic" +RocketPic: INCBIN "pic/trainer/rocket.pic" +CooltrainerMPic: INCBIN "pic/trainer/cooltrainerm.pic" +CooltrainerFPic: INCBIN "pic/trainer/cooltrainerf.pic" +BrunoPic: INCBIN "pic/trainer/bruno.pic" +BrockPic: INCBIN "pic/ytrainer/brock.pic" +MistyPic: INCBIN "pic/ytrainer/misty.pic" +LtSurgePic: INCBIN "pic/trainer/lt.surge.pic" +ErikaPic: INCBIN "pic/ytrainer/erika.pic" +KogaPic: INCBIN "pic/trainer/koga.pic" +BlainePic: INCBIN "pic/trainer/blaine.pic" +SabrinaPic: INCBIN "pic/trainer/sabrina.pic" +GentlemanPic: INCBIN "pic/trainer/gentleman.pic" +Rival2Pic: INCBIN "pic/ytrainer/rival2.pic" +Rival3Pic: INCBIN "pic/ytrainer/rival3.pic" +LoreleiPic: INCBIN "pic/trainer/lorelei.pic" +ChannelerPic: INCBIN "pic/trainer/channeler.pic" +AgathaPic: INCBIN "pic/trainer/agatha.pic" +LancePic: INCBIN "pic/trainer/lance.pic" +JessieJamesPic: INCBIN "pic/ytrainer/jessiejames.pic" dr $4fe79,$50000 @@ -1039,26 +1042,26 @@ JessieJamesPic:: INCBIN "pic/ytrainer/jessiejames.pic" SECTION "bank14",ROMX,BANK[$14] dr $50000,$5267d -CeladonPrizeMenu:: ; 5267d (14:667d) +CeladonPrizeMenu: ; 5267d (14:667d) dr $5267d,$54000 SECTION "bank15",ROMX,BANK[$15] dr $54000,$56745 -_GetSpritePosition1:: ; 56745 (15:6745) +_GetSpritePosition1: ; 56745 (15:6745) dr $56745,$56765 -_GetSpritePosition2:: ; 56765 (15:6765) +_GetSpritePosition2: ; 56765 (15:6765) dr $56765,$56789 -_SetSpritePosition1:: ; 56789 (15:6789) +_SetSpritePosition1: ; 56789 (15:6789) dr $56789,$567a9 -_SetSpritePosition2:: ; 567a9 (15:67a9) +_SetSpritePosition2: ; 567a9 (15:67a9) dr $567a9,$567cd -TrainerWalkUpToPlayer:: ; 567cd (15:67cd) +TrainerWalkUpToPlayer: ; 567cd (15:67cd) dr $567cd,$58000 SECTION "bank16",ROMX,BANK[$16] dr $58000,$58e8b -PrintStatusAilment:: ; 58e8b (16:4e8b) +PrintStatusAilment: ; 58e8b (16:4e8b) dr $58e8b,$5c000 @@ -1097,7 +1100,7 @@ INCLUDE "engine/battle/ghost_marowak_anim.asm" INCLUDE "engine/battle/battle_transitions.asm" INCLUDE "engine/town_map.asm" INCLUDE "engine/mon_party_sprites.asm" - dr $71b86,$71eb3 +INCLUDE "engine/in_game_trades.asm" INCLUDE "engine/palettes.asm" ;PokemonYellowGraphics: INCBIN "gfx/pokemon_yellow.t6.2bpp" @@ -1110,7 +1113,7 @@ SaveHallOfFameTeams: ; 73e2e (1c:7e2e) SECTION "bank1D",ROMX,BANK[$1D] dr $74000,$74726 -VendingMachineMenu:: ; 74726 (1d:4726) +VendingMachineMenu: ; 74726 (1d:4726) dr $74726,$78000 SECTION "bank1E",ROMX,BANK[$1E] @@ -1138,7 +1141,7 @@ RedFishingRodTiles: INCBIN "gfx/red_fishingrod_tiles.2bpp" SECTION "bank1F",ROMX,BANK[$1F] dr $7c000,$7d10d -Func_7d10d:: ; 7d10d (1f:510d) +Func_7d10d: ; 7d10d (1f:510d) dr $7d10d,$80000 SECTION "bank20",ROMX,BANK[$20] @@ -1146,7 +1149,7 @@ SECTION "bank20",ROMX,BANK[$20] dr $80000,$80f14 SurfingPikachu1Graphics: INCBIN "gfx/surfing_pikachu_1.t4.2bpp" -Func_82bd4:: ; 82bd4 (20:6bd4) +Func_82bd4: ; 82bd4 (20:6bd4) dr $82bd4,$84000 @@ -1178,7 +1181,7 @@ SECTION "bank25",ROMX,BANK[$25] SECTION "bank2f",ROMX[$5000],BANK[$2F] dr $bd000,$bf450 -Func_bf450:: ; bf450 (2f:7450) +Func_bf450: ; bf450 (2f:7450) dr $bf450,$c0000 SECTION "bank30",ROMX,BANK[$30] @@ -1232,9 +1235,9 @@ SECTION "bank39",ROMX,BANK[$39] SECTION "bank3A",ROMX,BANK[$3A] -MonsterNames:: ; e8000 (3a:4000) +MonsterNames: ; e8000 (3a:4000) dr $e8000,$e8a5e -Func_e8a5e:: ; e8a5e (3a:4a5e) +Func_e8a5e: ; e8a5e (3a:4a5e) dr $e8a5e,$e928a SurfingPikachu2Graphics: INCBIN "gfx/surfing_pikachu_2.2bpp" dr $e988a,$e9bfa @@ -1242,7 +1245,7 @@ SurfingPikachu2Graphics: INCBIN "gfx/surfing_pikachu_2.2bpp" SurfingPikachu3Graphics: INCBIN "gfx/surfing_pikachu_3.t1.2bpp" dr $ea3ea,$eaa02 -FreezeEnemyTrainerSprite:: ; eaa02 (3a:6a02) +FreezeEnemyTrainerSprite: ; eaa02 (3a:6a02) dr $eaa02,$ec000 SECTION "bank3C",ROMX,BANK[$3C] |