diff options
| -rw-r--r-- | engine/bank3c/main.asm | 6 | ||||
| -rwxr-xr-x | engine/menu/start_menu.asm | 2 | ||||
| -rw-r--r-- | home.asm | 163 | ||||
| -rw-r--r-- | home/init.asm | 4 | ||||
| -rw-r--r-- | home/overworld.asm | 12 | ||||
| -rw-r--r-- | home/text.asm | 16 | ||||
| -rwxr-xr-x | yellow/main.asm | 192 |
7 files changed, 217 insertions, 178 deletions
diff --git a/engine/bank3c/main.asm b/engine/bank3c/main.asm index 4e898e9f..489de063 100644 --- a/engine/bank3c/main.asm +++ b/engine/bank3c/main.asm @@ -1,6 +1,6 @@ ;INCLUDE "engine/bank3c/overworld.asm" -INCBIN "baserom.gbc",$f0000,$f0274 - $f0000 +dr $f0000,$f0274 ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) ; Reset player status on blackout. @@ -116,4 +116,6 @@ Pointer_f0a76:: ; f0a76 (3c:4a76) db $27,$07,$7b,$4a,$ff db $01,$ec,$02,$ed,$03,$ee,$ff -INCBIN "baserom.gbc",$f0a82,$f4000 - $f0a82 +dr $f0a82,$f25f8 +CheckForHiddenObject:: ; f25f8 (3c:65f8) +dr $f25f8,$f4000
\ No newline at end of file diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 7e2052d9..3c3b837c 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -2,7 +2,7 @@ DisplayStartMenu:: ; 29d1 (0:29d1) switchbank StartMenu_Pokedex ; also bank for other functions ld a,[wWalkBikeSurfState] ; walking/biking/surfing ld [wWalkBikeSurfStateCopy],a - ld a, (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound + ld a, $8f ; (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound call PlaySound RedisplayStartMenu:: ; 29e1 (0:29e1) @@ -1513,7 +1513,7 @@ AddAmountSoldToMoney:: ; 2aa0 (0:2aa0) ld a,MONEY_BOX ld [wTextBoxID],a call DisplayTextBoxID ; redraw money text box - ld a, (SFX_02_5a - SFX_Headers_02) / 3 + ld a, $b2 ;(SFX_02_5a - SFX_Headers_02) / 3 call PlaySoundWaitForCurrent ; play sound jp WaitForSoundToFinish ; wait until sound is done playing @@ -2875,7 +2875,7 @@ PlayTrainerMusic:: ; 3379 (0:3379) xor a ld [wMusicHeaderPointer], a call StopAllMusic ; stop music - ld a, BANK(Music_MeetEvilTrainer) + ld a, $1f ; BANK(Music_MeetEvilTrainer) ld [wc0ef], a ld [wc0f0], a ld a, [wEngagedTrainerClass] @@ -2887,7 +2887,7 @@ PlayTrainerMusic:: ; 3379 (0:3379) jr z, .noEvilTrainer cp b jr nz, .evilTrainerListLoop - ld a, MUSIC_MEET_EVIL_TRAINER + ld a, $f5 ; MUSIC_MEET_EVIL_TRAINER jr .PlaySound .noEvilTrainer ld hl, FemaleTrainerList @@ -2897,10 +2897,10 @@ PlayTrainerMusic:: ; 3379 (0:3379) jr z, .maleTrainer cp b jr nz, .femaleTrainerListLoop - ld a, MUSIC_MEET_FEMALE_TRAINER + ld a, $f8 ; MUSIC_MEET_FEMALE_TRAINER jr .PlaySound .maleTrainer - ld a, MUSIC_MEET_MALE_TRAINER + ld a, $fb ; MUSIC_MEET_MALE_TRAINER .PlaySound ld [wc0ee], a jp PlaySound @@ -3237,7 +3237,7 @@ GetTrainerInformation:: ; 3563 (0:3563) ld a, [wLinkState] and a jr nz, .linkBattle - ld a, Bank(TrainerPicAndMoneyPointers) + ld a, BANK(TrainerPicAndMoneyPointers) call BankswitchHome ld a, [W_TRAINERCLASS] ; wd031 dec a @@ -3454,7 +3454,7 @@ LoadTextBoxTilePatterns:: ; 36a3 (0:36a3) ld de, vChars2 + $600 ld bc, $200 ld a, BANK(TextBoxGraphics) - jp FarCopyData2 ; if LCD is off, transfer all at once + jp FarCopyData ; if LCD is off, transfer all at once .on ld de, TextBoxGraphics ld hl, vChars2 + $600 @@ -3470,7 +3470,7 @@ LoadHpBarAndStatusTilePatterns:: ; 36c3 (0:36c3) ld de, vChars2 + $620 ld bc, $1e0 ld a, BANK(HpBarAndStatusGraphics) - jp FarCopyData2 ; if LCD is off, transfer all at once + jp FarCopyData ; if LCD is off, transfer all at once .on ld de, HpBarAndStatusGraphics ld hl, vChars2 + $620 @@ -3654,7 +3654,7 @@ GetItemPrice:: ; 37d2 (0:37d2) push af ld a, [wListMenuID] cp MOVESLISTMENU - ld a, BANK(ItemPrices) + ld a, $1 ; BANK(ItemPrices) jr nz, .asm_37e0 ld a, $f ; hardcoded Bank .asm_37e0 @@ -3792,7 +3792,7 @@ ManualTextScroll:: ; 388e (0:388e) jr z, .inLinkBattle call WaitForTextScrollButtonPress call WaitForSoundToFinish - ld a, (SFX_02_40 - SFX_Headers_02) / 3 + ld a, $90 ; (SFX_02_40 - SFX_Headers_02) / 3 jp PlaySound .inLinkBattle ld c, $41 @@ -4117,7 +4117,7 @@ AddEnemyMonToPlayerParty:: ; 3a48 (0:3a48) ret Func_3a59:: ; 3a59 (0:3a59) - homecall_sf Func_f51e + homecall_sf Func_f3a4 ret ; skips a text entries, each of size $b (like trainer name, OT name, rival name, ...) @@ -4214,7 +4214,7 @@ HandleMenuInputPokemonSelection:: ; 3aaf (0:3aaf) ld a,[wd09b] and a ; is it a pokemon selection menu? jr z,.getJoypadState - callba AnimatePartyMon ; shake mini sprite of selected pokemon + callba AnimatePartyMon ; shake mini sprite of selected pokemon (1c:578c) .getJoypadState pop hl call JoypadLowSensitivity @@ -4294,7 +4294,7 @@ HandleMenuInputPokemonSelection:: ; 3aaf (0:3aaf) bit 5,[hl] pop hl jr nz,.skipPlayingSound - ld a,(SFX_02_40 - SFX_Headers_02) / 3 + ld a, $90 ; (SFX_02_40 - SFX_Headers_02) / 3 call PlaySound ; play sound .skipPlayingSound pop af @@ -4945,14 +4945,14 @@ PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9) INCLUDE "home/predef.asm" -Func_3ead:: ; 3ead (0:3ead) +Func_3ef0:: ; 3ef0 (0:3ef0) ld b, BANK(CinnabarGymQuiz_1eb0a) ld hl, CinnabarGymQuiz_1eb0a call Bankswitch ret ; again? ;jp Bankswitch -CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ; 3eb5 (0:3eb5) +CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ; 3ef9 (0:3ef9) ld a, [H_LOADEDROMBANK] push af ld a, [hJoyHeld] @@ -5012,69 +5012,70 @@ SetMapTextPointer:: ; 3f54 (0:3f54) ret TextPredefs:: ; 3f67 (0:3f67) - add_tx_pre CardKeySuccessText ; 01 - add_tx_pre CardKeyFailText ; 02 - add_tx_pre RedBedroomPC ; 03 - add_tx_pre RedBedroomSNESText ; 04 - add_tx_pre PushStartText ; 05 - add_tx_pre SaveOptionText ; 06 - add_tx_pre StrengthsAndWeaknessesText ; 07 - add_tx_pre OakLabEmailText ; 08 - add_tx_pre AerodactylFossilText ; 09 - add_tx_pre Route15UpstairsBinocularsText ; 0A - add_tx_pre KabutopsFossilText ; 0B - add_tx_pre GymStatueText1 ; 0C - add_tx_pre GymStatueText2 ; 0D - add_tx_pre BookcaseText ; 0E - add_tx_pre ViridianCityPokecenterBenchGuyText ; 0F - add_tx_pre PewterCityPokecenterBenchGuyText ; 10 - add_tx_pre CeruleanCityPokecenterBenchGuyText ; 11 - add_tx_pre LavenderCityPokecenterBenchGuyText ; 12 - add_tx_pre VermilionCityPokecenterBenchGuyText ; 13 - add_tx_pre CeladonCityPokecenterBenchGuyText ; 14 - add_tx_pre CeladonCityHotelText ; 15 - add_tx_pre FuchsiaCityPokecenterBenchGuyText ; 16 - add_tx_pre CinnabarIslandPokecenterBenchGuyText ; 17 - add_tx_pre SaffronCityPokecenterBenchGuyText ; 18 - add_tx_pre MtMoonPokecenterBenchGuyText ; 19 - add_tx_pre RockTunnelPokecenterBenchGuyText ; 1A - add_tx_pre UnusedBenchGuyText1 ; 1B - add_tx_pre UnusedBenchGuyText2 ; 1C - add_tx_pre UnusedBenchGuyText3 ; 1D - add_tx_pre TerminatorText_62508 ; 1E - add_tx_pre PredefText1f ; 1F - add_tx_pre ViridianSchoolNotebook ; 20 - add_tx_pre ViridianSchoolBlackboard ; 21 - add_tx_pre JustAMomentText ; 22 - add_tx_pre PredefText23 ; 23 - add_tx_pre FoundHiddenItemText ; 24 - add_tx_pre HiddenItemBagFullText ; 25 - add_tx_pre VermilionGymTrashText ; 26 - add_tx_pre IndigoPlateauHQText ; 27 - add_tx_pre GameCornerOutOfOrderText ; 28 - add_tx_pre GameCornerOutToLunchText ; 29 - add_tx_pre GameCornerSomeonesKeysText ; 2A - add_tx_pre FoundHiddenCoinsText ; 2B - add_tx_pre DroppedHiddenCoinsText ; 2C - add_tx_pre BillsHouseMonitorText ; 2D - add_tx_pre BillsHouseInitiatedText ; 2E - add_tx_pre BillsHousePokemonList ; 2F - add_tx_pre MagazinesText ; 30 - add_tx_pre CinnabarGymQuiz ; 31 - add_tx_pre GameCornerNoCoinsText ; 32 - add_tx_pre GameCornerCoinCaseText ; 33 - add_tx_pre LinkCableHelp ; 34 - add_tx_pre TMNotebook ; 35 - add_tx_pre FightingDojoText ; 36 - add_tx_pre FightingDojoText_52a10 ; 37 - add_tx_pre FightingDojoText_52a1d ; 38 - add_tx_pre NewBicycleText ; 39 - add_tx_pre IndigoPlateauStatues ; 3A - add_tx_pre VermilionGymTrashSuccesText1 ; 3B - add_tx_pre VermilionGymTrashSuccesText2 ; 3C - add_tx_pre VermilionGymTrashSuccesText3 ; 3D - add_tx_pre VermilionGymTrashFailText ; 3E - add_tx_pre TownMapText ; 3F - add_tx_pre BookOrSculptureText ; 40 - add_tx_pre ElevatorText ; 41 - add_tx_pre PokemonStuffText ; 42 +INCBIN "baserom.gbc",$3f67,$4000 - $3f67 +; add_tx_pre CardKeySuccessText ; 01 +; add_tx_pre CardKeyFailText ; 02 +; add_tx_pre RedBedroomPC ; 03 +; add_tx_pre RedBedroomSNESText ; 04 +; add_tx_pre PushStartText ; 05 +; add_tx_pre SaveOptionText ; 06 +; add_tx_pre StrengthsAndWeaknessesText ; 07 +; add_tx_pre OakLabEmailText ; 08 +; add_tx_pre AerodactylFossilText ; 09 +; add_tx_pre Route15UpstairsBinocularsText ; 0A +; add_tx_pre KabutopsFossilText ; 0B +; add_tx_pre GymStatueText1 ; 0C +; add_tx_pre GymStatueText2 ; 0D +; add_tx_pre BookcaseText ; 0E +; add_tx_pre ViridianCityPokecenterBenchGuyText ; 0F +; add_tx_pre PewterCityPokecenterBenchGuyText ; 10 +; add_tx_pre CeruleanCityPokecenterBenchGuyText ; 11 +; add_tx_pre LavenderCityPokecenterBenchGuyText ; 12 +; add_tx_pre VermilionCityPokecenterBenchGuyText ; 13 +; add_tx_pre CeladonCityPokecenterBenchGuyText ; 14 +; add_tx_pre CeladonCityHotelText ; 15 +; add_tx_pre FuchsiaCityPokecenterBenchGuyText ; 16 +; add_tx_pre CinnabarIslandPokecenterBenchGuyText ; 17 +; add_tx_pre SaffronCityPokecenterBenchGuyText ; 18 +; add_tx_pre MtMoonPokecenterBenchGuyText ; 19 +; add_tx_pre RockTunnelPokecenterBenchGuyText ; 1A +; add_tx_pre UnusedBenchGuyText1 ; 1B +; add_tx_pre UnusedBenchGuyText2 ; 1C +; add_tx_pre UnusedBenchGuyText3 ; 1D +; add_tx_pre TerminatorText_62508 ; 1E +; add_tx_pre PredefText1f ; 1F +; add_tx_pre ViridianSchoolNotebook ; 20 +; add_tx_pre ViridianSchoolBlackboard ; 21 +; add_tx_pre JustAMomentText ; 22 +; add_tx_pre PredefText23 ; 23 +; add_tx_pre FoundHiddenItemText ; 24 +; add_tx_pre HiddenItemBagFullText ; 25 +; add_tx_pre VermilionGymTrashText ; 26 +; add_tx_pre IndigoPlateauHQText ; 27 +; add_tx_pre GameCornerOutOfOrderText ; 28 +; add_tx_pre GameCornerOutToLunchText ; 29 +; add_tx_pre GameCornerSomeonesKeysText ; 2A +; add_tx_pre FoundHiddenCoinsText ; 2B +; add_tx_pre DroppedHiddenCoinsText ; 2C +; add_tx_pre BillsHouseMonitorText ; 2D +; add_tx_pre BillsHouseInitiatedText ; 2E +; add_tx_pre BillsHousePokemonList ; 2F +; add_tx_pre MagazinesText ; 30 +; add_tx_pre CinnabarGymQuiz ; 31 +; add_tx_pre GameCornerNoCoinsText ; 32 +; add_tx_pre GameCornerCoinCaseText ; 33 +; add_tx_pre LinkCableHelp ; 34 +; add_tx_pre TMNotebook ; 35 +; add_tx_pre FightingDojoText ; 36 +; add_tx_pre FightingDojoText_52a10 ; 37 +; add_tx_pre FightingDojoText_52a1d ; 38 +; add_tx_pre NewBicycleText ; 39 +; add_tx_pre IndigoPlateauStatues ; 3A +; add_tx_pre VermilionGymTrashSuccesText1 ; 3B +; add_tx_pre VermilionGymTrashSuccesText2 ; 3C +; add_tx_pre VermilionGymTrashSuccesText3 ; 3D +; add_tx_pre VermilionGymTrashFailText ; 3E +; add_tx_pre TownMapText ; 3F +; add_tx_pre BookOrSculptureText ; 40 +; add_tx_pre ElevatorText ; 41 +; add_tx_pre PokemonStuffText ; 42 diff --git a/home/init.asm b/home/init.asm index 671809a7..168524b8 100644 --- a/home/init.asm +++ b/home/init.asm @@ -5,7 +5,7 @@ SoftReset:: ; 1d08 (0:1d08) call DelayFrames ; fallthrough -Init:: ; 1d10 +Init:: ; 1d10 (0:1d10) ; Program init. rLCDC_DEFAULT EQU %11100011 @@ -99,7 +99,7 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB - ld a, BANK(SFX_1f_67) + ld a, $1f ; BANK(SFX_1f_67) ld [wc0ef], a ld [wc0f0], a ld a, $9c diff --git a/home/overworld.asm b/home/overworld.asm index f0e7f990..42da2240 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -667,10 +667,10 @@ PlayMapChangeSound:: ; 06ef (0:06ef) aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on cp a,$0b ; door tile in tileset 0 jr nz,.didNotGoThroughDoor - ld a,(SFX_02_57 - SFX_Headers_02) / 3 + ld a, $ad ; (SFX_02_57 - SFX_Headers_02) / 3 jr .playSound .didNotGoThroughDoor - ld a,(SFX_02_5c - SFX_Headers_02) / 3 + ld a, $b5 ; (SFX_02_5c - SFX_Headers_02) / 3 .playSound call PlaySound ld a,[wMapPalOffset] @@ -1247,9 +1247,9 @@ CollisionCheckOnLand:: ; 0a1c (0:0a1c) jr nc,.noCollision .collision ld a,[wc02a] - cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing + cp $b4 ; (SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing jr z,.setCarry - ld a,(SFX_02_5b - SFX_Headers_02) / 3 + ld a, $b4 ; (SFX_02_5b - SFX_Headers_02) / 3 call PlaySound ; play collision sound (if it's not already playing) .setCarry scf @@ -1707,9 +1707,9 @@ CollisionCheckOnWater:: ; 0cca (0:0cca) jr nc,.stopSurfing .collision ld a,[wc02a] - cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing + cp $b4 ; (SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing jr z,.setCarry - ld a,(SFX_02_5b - SFX_Headers_02) / 3 + ld a, $b4 ; (SFX_02_5b - SFX_Headers_02) / 3 call PlaySound ; play collision sound (if it's not already playing) .setCarry scf diff --git a/home/text.asm b/home/text.asm index ce2f3aa7..b12f5adb 100644 --- a/home/text.asm +++ b/home/text.asm @@ -631,14 +631,14 @@ TextCommand0B:: ; 1a0a (0:1a0a) jp NextTextCommand ; format: text command ID, sound ID or cry ID -TextCommandSounds:: ; 1c64 (0:1c64) - db $0B,(SFX_02_3a - SFX_Headers_02) / 3 - db $12,(SFX_08_46 - SFX_Headers_08) / 3 - db $0E,(SFX_02_41 - SFX_Headers_02) / 3 - db $0F,(SFX_02_3a - SFX_Headers_02) / 3 - db $10,(SFX_02_3b - SFX_Headers_02) / 3 - db $11,(SFX_02_42 - SFX_Headers_02) / 3 - db $13,(SFX_08_45 - SFX_Headers_08) / 3 +TextCommandSounds:: ; 1a3d (0:1a3d) + db $0B,$86 ; (SFX_02_3a - SFX_Headers_02) / 3 + db $12,$9A ; (SFX_08_46 - SFX_Headers_08) / 3 + db $0E,$91 ; (SFX_02_41 - SFX_Headers_02) / 3 + db $0F,$86 ; (SFX_02_3a - SFX_Headers_02) / 3 + db $10,$89 ; (SFX_02_3b - SFX_Headers_02) / 3 + db $11,$94 ; (SFX_02_42 - SFX_Headers_02) / 3 + db $13,$98 ; (SFX_08_45 - SFX_Headers_08) / 3 db $14,NIDORINA ; used in OakSpeech db $15,PIDGEOT ; used in SaffronCityText12 db $16,DEWGONG ; unused? diff --git a/yellow/main.asm b/yellow/main.asm index 025fe8be..d0515b66 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -16,19 +16,26 @@ PICS_5 EQU $D SECTION "home",ROM0 INCLUDE "home.asm" -;INCBIN "baserom.gbc",$0000,$4000 - $0000 SECTION "bank01",ROMX,BANK[$01] INCLUDE "data/facing.asm" INCLUDE "engine/battle/safari_zone.asm" -INCBIN "baserom.gbc",$414b,$8000 - $414b - +dr $414b,$45b7 +ItemNames:: ; 45b7 (1:45b7) +dr $45b7,$491e +UnusedNames:: ; 491e (1:491e) +dr $491e,$778e +PlayerPC:: ; 778e (1:778e) +dr $778e,$7a0f +_RemovePokemon:: ; 7a0f (1:7a0f) +dr $7a0f,$7c18 +Func_7c18:: ; 7c18 (1:7c18) +dr $7c18,$8000 SECTION "bank02",ROMX,BANK[$02] -INCBIN "baserom.gbc",$8000,$c000 - $8000 - +dr $8000,$c000 SECTION "bank03",ROMX,BANK[$03] @@ -290,17 +297,26 @@ IsPlayerStandingOnDoorTileOrWarpTile: ; c1e6 (3:41e6) INCLUDE "data/warp_tile_ids.asm" -INCBIN "baserom.gbc",$c27b,$cb62 - $c27b +dr $c27b,$cb62 LoadWildData:: ; cb62 (3:4b62) -INCBIN "baserom.gbc",$cb62,$e808 - $cb62 +dr $cb62,$e808 IsNextTileShoreOrWater:: ; e808 (3:6808) -INCBIN "baserom.gbc",$e808,$e91b - $e808 +dr $e808,$e91b GymLeaderFaceAndBadgeTileGraphics: ; e91b (3:691b) INCBIN "gfx/badges.2bpp" -INCBIN "baserom.gbc",$ed1b,$10000 - $ed1b - +dr $ed1b,$f161 +_AddPartyMon:: ; f161 (3:7161) +dr $f161,$f323 +_AddEnemyMonToPlayerParty:: ; f323 (3:7323) +dr $f323,$f3a4 +Func_f3a4:: ; f3a4 (3:73a4) +dr $f3a4,$f9de +PrintBookshelfText:: ; f9de (3:79de) +dr $f9de,$fad3 +PokemonStuffText:: ; fad3 (3:7ad3) +dr $fad3,$10000 SECTION "Graphics", ROMX, BANK[GFX] @@ -319,13 +335,13 @@ PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp" WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" -INCBIN "baserom.gbc",$11468,$11a97 - $11468 +dr $11468,$11a97 RedPicFront:: INCBIN "pic/ytrainer/red.pic" ShrinkPic1:: INCBIN "pic/trainer/shrink1.pic" ShrinkPic2:: INCBIN "pic/trainer/shrink2.pic" -INCBIN "baserom.gbc",$11c22,$12365 - $11c22 +dr $11c22,$12365 SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] @@ -359,12 +375,14 @@ OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" QuestionMarkSprite: INCBIN "gfx/sprites/question_mark.2bpp" -INCBIN "baserom.gbc",$13765,$14000 - $13765 +dr $13765,$14000 SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] -INCBIN "baserom.gbc",$14000,$143f1 - $14000 +dr $14000,$1401b +_InitMapSprites:: ; 1401b (5:401b) +dr $1401b,$143f1 RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" RedSprite: INCBIN "gfx/sprites/red.2bpp" @@ -407,29 +425,33 @@ BrunoSprite: INCBIN "gfx/sprites/bruno.2bpp" LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite: INCBIN "gfx/sprites/seel.2bpp" -INCBIN "baserom.gbc",$17c31,$18000 - $17c31 - +dr $17c31,$17cb0 +ActivatePC:: ; 17cb0 (5:7cb0) +dr $17cb0,$18000 SECTION "bank06",ROMX,BANK[$06] -INCBIN "baserom.gbc",$18000,$1a785 - $18000 +dr $18000,$1a785 IsPlayerStandingOnDoorTile:: ; 1a785 (6:6785) -INCBIN "baserom.gbc",$1a785,$1a7f4 - $1a785 +dr $1a785,$1a7f4 HandleLedges:: ; 1a7f4 (6:67f4) -INCBIN "baserom.gbc",$1a7f4,$1c000 - $1a7f4 +dr $1a7f4,$1c000 SECTION "bank07",ROMX,BANK[$07] -INCBIN "baserom.gbc",$1c000,$1e321 - $1c000 +dr $1c000,$1e321 SafariZoneCheck:: ; 1e321 (7:6e21) -INCBIN "baserom.gbc",$1e321,$1e330 - $1e321 +dr $1e321,$1e330 SafariZoneCheckSteps:: ; 1e330 (7:6330) -INCBIN "baserom.gbc",$1e330,$20000 - $1e330 +dr $1e330,$1e4bf +CinnabarGymQuiz_1eb0a:: ; 1e4bf (7:64bf) +dr $1e4bf,$20000 SECTION "bank08",ROMX,BANK[$08] -INCBIN "baserom.gbc",$20000,$24000 - $20000 - +dr $20000,$2146f +BillsPC_:: ; 2146f (8:546f) +dr $2146f,$24000 SECTION "Pics 1", ROMX, BANK[PICS_1] @@ -494,8 +516,9 @@ PinsirPicBack:: INCBIN "pic/monback/pinsirb.pic" TangelaPicFront:: INCBIN "pic/ymon/tangela.pic" TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" -INCBIN "baserom.gbc",$27d20,$28000 - $27d20 - +dr $27d20,$27dff +SaveTrainerName:: ; 27dff (9:7dff) +dr $27dff,$28000 SECTION "Pics 2", ROMX, BANK[PICS_2] @@ -564,7 +587,7 @@ JynxPicBack:: INCBIN "pic/monback/jynxb.pic" MoltresPicFront:: INCBIN "pic/ymon/moltres.pic" MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" -INCBIN "baserom.gbc",$2bd4c,$2c000 - $2bd4c +dr $2bd4c,$2c000 SECTION "Pics 3", ROMX, BANK[PICS_3] @@ -640,7 +663,7 @@ BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" -INCBIN "baserom.gbc",$2fd25,$30000 - $2fd25 +dr $2fd25,$30000 SECTION "Pics 4", ROMX, BANK[PICS_4] @@ -762,12 +785,15 @@ WeepinbellPicBack:: INCBIN "pic/monback/weepinbellb.pic" VictreebelPicFront:: INCBIN "pic/ymon/victreebel.pic" VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" -INCBIN "baserom.gbc",$3749e,$38000 - $3749e - +dr $3749e,$38000 SECTION "bank0E",ROMX,BANK[$0E] -INCBIN "baserom.gbc",$38000,$3aa68 - $38000 +dr $38000,$39893 +TrainerPicAndMoneyPointers:: ; 39893 (e:5893) +dr $39893,$3997e +TrainerNames:: ; 3997e (e:597e) +dr $3997e,$3aa68 TradingAnimationGraphics: INCBIN "gfx/game_boy.norepeat.2bpp" @@ -777,28 +803,28 @@ TradingAnimationGraphics2: ; Pokeball traveling through the link cable. INCBIN "gfx/trade2.2bpp" -INCBIN "baserom.gbc",$3adb8,$3c000 - $3adb8 +dr $3adb8,$3c000 SECTION "bank0F",ROMX,BANK[$0F] -INCBIN "baserom.gbc",$3c000,$3cae8 - $3c000 +dr $3c000,$3cae8 AnyPartyAlive:: ; 3cae8 (f:4ae8) -INCBIN "baserom.gbc",$3cae8,$40000 - $3cae8 +dr $3cae8,$40000 SECTION "bank10",ROMX,BANK[$10] -INCBIN "baserom.gbc",$40000,$44000 - $40000 +dr $40000,$44000 SECTION "bank11",ROMX,BANK[$11] -INCBIN "baserom.gbc",$44000,$48000 - $44000 +dr $44000,$48000 SECTION "bank12",ROMX,BANK[$12] -INCBIN "baserom.gbc",$48000,$4c000 - $48000 +dr $48000,$4c000 SECTION "bank13",ROMX,BANK[$13] @@ -852,47 +878,53 @@ AgathaPic:: INCBIN "pic/trainer/agatha.pic" LancePic:: INCBIN "pic/trainer/lance.pic" JessieJamesPic:: INCBIN "pic/ytrainer/jessiejames.pic" -INCBIN "baserom.gbc",$4fe79,$50000 - $4fe79 +dr $4fe79,$50000 SECTION "bank14",ROMX,BANK[$14] -INCBIN "baserom.gbc",$50000,$54000 - $50000 - +dr $50000,$5267d +CeladonPrizeMenu:: ; 5267d (14:667d) +dr $5267d,$54000 SECTION "bank15",ROMX,BANK[$15] -INCBIN "baserom.gbc",$54000,$58000 - $54000 +dr $54000,$57745 +_GetSpritePosition1:: ; 57745 (15:7745) +dr $57745,$57765 +_GetSpritePosition2:: ; 57765 (15:7765) +dr $57765,$57789 +_SetSpritePosition1:: ; 57789 (15:7789) SECTION "bank16",ROMX,BANK[$16] -INCBIN "baserom.gbc",$58000,$5c000 - $58000 +dr $58000,$5c000 SECTION "bank17",ROMX,BANK[$17] -INCBIN "baserom.gbc",$5c000,$60000 - $5c000 +dr $5c000,$60000 SECTION "bank18",ROMX,BANK[$18] -INCBIN "baserom.gbc",$60000,$64000 - $60000 +dr $60000,$64000 SECTION "bank19",ROMX,BANK[$19] -INCBIN "baserom.gbc",$64000,$68000 - $64000 +dr $64000,$68000 SECTION "bank1A",ROMX,BANK[$1A] -INCBIN "baserom.gbc",$68000,$6c000 - $68000 +dr $68000,$6c000 SECTION "bank1B",ROMX,BANK[$1B] -INCBIN "baserom.gbc",$6c000,$70000 - $6c000 +dr $6c000,$70000 SECTION "bank1C",ROMX,BANK[$1C] @@ -904,138 +936,142 @@ INCLUDE "engine/overworld/player_animations.asm" INCLUDE "engine/battle/ghost_marowak_anim.asm" INCLUDE "engine/battle/battle_transitions.asm" INCLUDE "engine/town_map.asm" - -INCBIN "baserom.gbc",$71784,$71eb3 - $71784 +AnimatePartyMon_ForceSpeed1:: ; 71784 (1c:5784) +dr $71784,$7178c +AnimatePartyMon:: ; 7178c (1c:578c) +dr $7178c,$71eb3 INCLUDE "engine/palettes.asm" PokemonYellowGraphics: INCBIN "gfx/pokemon_yellow.t6.2bpp" -INCBIN "baserom.gbc",$73959,$74000 - $73959 +dr $73959,$74000 SECTION "bank1D",ROMX,BANK[$1D] -INCBIN "baserom.gbc",$74000,$78000 - $74000 +dr $74000,$78000 SECTION "bank1E",ROMX,BANK[$1E] -INCBIN "baserom.gbc",$78000,$7a19a - $78000 +dr $78000,$7a19a RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp" RedFishingTilesBack: INCBIN "gfx/red_fishing_tile_back.2bpp" RedFishingTilesSide: INCBIN "gfx/red_fishing_tile_side.2bpp" RedFishingRodTiles: INCBIN "gfx/red_fishingrod_tiles.2bpp" -INCBIN "baserom.gbc",$7a22a,$7c000 - $7a22a +dr $7a22a,$7c000 SECTION "bank1F",ROMX,BANK[$1F] -INCBIN "baserom.gbc",$7c000,$80000 - $7c000 +dr $7c000,$80000 SECTION "bank20",ROMX,BANK[$20] -INCBIN "baserom.gbc",$80000,$80f14 - $80000 +dr $80000,$80f14 SurfingPikachu1Graphics: INCBIN "gfx/surfing_pikachu_1.t4.2bpp" -INCBIN "baserom.gbc",$82bd4,$84000 - $82bd4 +dr $82bd4,$84000 SECTION "bank21",ROMX,BANK[$21] -INCBIN "baserom.gbc",$84000,$88000 - $84000 +dr $84000,$88000 SECTION "bank22",ROMX,BANK[$22] -INCBIN "baserom.gbc",$88000,$8c000 - $88000 +dr $88000,$8c000 SECTION "bank23",ROMX,BANK[$23] -INCBIN "baserom.gbc",$8c000,$90000 - $8c000 +dr $8c000,$90000 SECTION "bank24",ROMX,BANK[$24] -INCBIN "baserom.gbc",$90000,$94000 - $90000 +dr $90000,$94000 SECTION "bank25",ROMX,BANK[$25] -INCBIN "baserom.gbc",$94000,$98000 - $94000 +dr $94000,$98000 SECTION "bank2f",ROMX[$5000],BANK[$2F] -INCBIN "baserom.gbc",$bd000,$c0000 - $bd000 +dr $bd000,$c0000 SECTION "bank30",ROMX,BANK[$30] -INCBIN "baserom.gbc",$c0000,$c4000 - $c0000 +dr $c0000,$c4000 SECTION "bank31",ROMX,BANK[$31] -INCBIN "baserom.gbc",$c4000,$c8000 - $c4000 +dr $c4000,$c8000 SECTION "bank32",ROMX,BANK[$32] -INCBIN "baserom.gbc",$c8000,$cc000 - $c8000 +dr $c8000,$cc000 SECTION "bank33",ROMX,BANK[$33] -INCBIN "baserom.gbc",$cc000,$d0000 - $cc000 +dr $cc000,$d0000 SECTION "bank34",ROMX,BANK[$34] -INCBIN "baserom.gbc",$d0000,$d4000 - $d0000 +dr $d0000,$d4000 SECTION "bank35",ROMX,BANK[$35] -INCBIN "baserom.gbc",$d4000,$d8000 - $d4000 +dr $d4000,$d8000 SECTION "bank36",ROMX,BANK[$36] -INCBIN "baserom.gbc",$d8000,$dc000 - $d8000 +dr $d8000,$dc000 SECTION "bank37",ROMX,BANK[$37] -INCBIN "baserom.gbc",$dc000,$e0000 - $dc000 +dr $dc000,$e0000 SECTION "bank38",ROMX,BANK[$38] -INCBIN "baserom.gbc",$e0000,$e4000 - $e0000 +dr $e0000,$e4000 SECTION "bank39",ROMX,BANK[$39] -INCBIN "baserom.gbc",$e4000,$e8000 - $e4000 +dr $e4000,$e8000 SECTION "bank3A",ROMX,BANK[$3A] - -INCBIN "baserom.gbc",$e8000,$e928a - $e8000 +MonsterNames:: ; e8000 (3a:4000) +dr $e8000,$e928a SurfingPikachu2Graphics: INCBIN "gfx/surfing_pikachu_2.2bpp" -INCBIN "baserom.gbc",$e988a,$e9bfa - $e988a +dr $e988a,$e9bfa SurfingPikachu3Graphics: INCBIN "gfx/surfing_pikachu_3.t1.2bpp" -INCBIN "baserom.gbc",$ea3ea,$ec000 - $ea3ea +dr $ea3ea,$eaa02 +FreezeEnemyTrainerSprite:: ; eaa02 (3a:6a02) +dr $eaa02,$ec000 SECTION "bank3C",ROMX,BANK[$3C] @@ -1047,11 +1083,11 @@ INCLUDE "engine/bank3d/main.asm" SECTION "bank3E",ROMX,BANK[$3E] -INCBIN "baserom.gbc",$f8000,$fa35a - $f8000 +dr $f8000,$fa35a YellowIntroGraphics: INCBIN "gfx/yellow_intro.2bpp" -INCBIN "baserom.gbc",$fbb5a,$fc000 - $fbb5a +dr $fbb5a,$fc000 SECTION "bank3F",ROMX,BANK[$3F] |