diff options
| -rwxr-xr-x | gfx/AB.2bpp | bin | 0 -> 32 bytes | |||
| -rwxr-xr-x | gfx/attack_anim_1.2bpp | bin | 0 -> 1264 bytes | |||
| -rwxr-xr-x | gfx/attack_anim_2.2bpp | bin | 0 -> 1264 bytes | |||
| -rwxr-xr-x | gfx/badge_numbers.2bpp | bin | 0 -> 128 bytes | |||
| -rwxr-xr-x | gfx/badges.2bpp | bin | 0 -> 1024 bytes | |||
| -rwxr-xr-x | gfx/battle_hud1.1bpp | bin | 0 -> 24 bytes | |||
| -rwxr-xr-x | gfx/battle_hud2.1bpp | bin | 0 -> 24 bytes | |||
| -rwxr-xr-x | gfx/battle_hud3.1bpp | bin | 0 -> 24 bytes | |||
| -rwxr-xr-x | gfx/battle_transition.2bpp | 1 | ||||
| -rwxr-xr-x | gfx/blank_leader_names.2bpp | bin | 0 -> 368 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | gfx/blue/introfight.2bpp | bin | 1680 -> 1744 bytes | |||
| -rwxr-xr-x | gfx/copyright.2bpp | bin | 0 -> 304 bytes | |||
| -rwxr-xr-x | gfx/diagonal_lines.2bpp | bin | 0 -> 32 bytes | |||
| -rwxr-xr-x | gfx/emotion_bubbles.2bpp | bin | 0 -> 200 bytes | |||
| -rwxr-xr-x | gfx/falling_star.2bpp | bin | 0 -> 16 bytes | |||
| -rwxr-xr-x | gfx/gamefreak.2bpp | bin | 0 -> 144 bytes | |||
| -rwxr-xr-x | gfx/gamefreak_intro.2bpp | bin | 0 -> 320 bytes | |||
| -rwxr-xr-x | gfx/intro_fight.2bpp | bin | 0 -> 1536 bytes | |||
| -rwxr-xr-x | gfx/ledge_hopping_shadow.1bpp | bin | 0 -> 8 bytes | |||
| -rwxr-xr-x | gfx/mon_ow_sprites.2bpp | bin | 0 -> 384 bytes | |||
| -rwxr-xr-x | gfx/player_title.2bpp | bin | 0 -> 560 bytes | |||
| -rwxr-xr-x | gfx/pokeball.2bpp | bin | 0 -> 64 bytes | |||
| -rwxr-xr-x | gfx/pokecenter_ball.2bpp | bin | 0 -> 32 bytes | |||
| -rwxr-xr-x | gfx/pokedex.2bpp | bin | 0 -> 288 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | gfx/red/introfight.2bpp | bin | 1680 -> 1744 bytes | |||
| -rwxr-xr-x | gfx/red_fishing.2bpp | bin | 0 -> 160 bytes | |||
| -rwxr-xr-x | gfx/spinner_arrow.2bpp | bin | 0 -> 64 bytes | |||
| -rwxr-xr-x | gfx/sprites/cycling.2bpp | bin | 0 -> 384 bytes | |||
| -rwxr-xr-x | gfx/town_map.2bpp | bin | 0 -> 256 bytes | |||
| -rwxr-xr-x | gfx/town_map.rle | bin | 0 -> 171 bytes | |||
| -rwxr-xr-x | gfx/town_map_cursor.1bpp | bin | 0 -> 32 bytes | |||
| -rwxr-xr-x | gfx/trade.2bpp | bin | 0 -> 784 bytes | |||
| -rwxr-xr-x | gfx/trade2.2bpp | bin | 0 -> 64 bytes | |||
| -rwxr-xr-x | gfx/trainer_info.2bpp | bin | 0 -> 144 bytes | |||
| -rwxr-xr-x | gfx/up_arrow.1bpp | bin | 0 -> 8 bytes | |||
| -rw-r--r-- | main.asm | 1001 | ||||
| -rw-r--r-- | pic/monback/vulpikb.pic | bin | 101 -> 0 bytes | |||
| -rw-r--r-- | pokeblue.asm | 1 | ||||
| -rw-r--r-- | pokered.asm | 1 | ||||
| -rw-r--r-- | wram.asm | 4 |
40 files changed, 544 insertions, 464 deletions
diff --git a/gfx/AB.2bpp b/gfx/AB.2bpp Binary files differnew file mode 100755 index 00000000..5116536b --- /dev/null +++ b/gfx/AB.2bpp diff --git a/gfx/attack_anim_1.2bpp b/gfx/attack_anim_1.2bpp Binary files differnew file mode 100755 index 00000000..55dcfef5 --- /dev/null +++ b/gfx/attack_anim_1.2bpp diff --git a/gfx/attack_anim_2.2bpp b/gfx/attack_anim_2.2bpp Binary files differnew file mode 100755 index 00000000..51d87b27 --- /dev/null +++ b/gfx/attack_anim_2.2bpp diff --git a/gfx/badge_numbers.2bpp b/gfx/badge_numbers.2bpp Binary files differnew file mode 100755 index 00000000..664758aa --- /dev/null +++ b/gfx/badge_numbers.2bpp diff --git a/gfx/badges.2bpp b/gfx/badges.2bpp Binary files differnew file mode 100755 index 00000000..8a717ff7 --- /dev/null +++ b/gfx/badges.2bpp diff --git a/gfx/battle_hud1.1bpp b/gfx/battle_hud1.1bpp Binary files differnew file mode 100755 index 00000000..3d489cab --- /dev/null +++ b/gfx/battle_hud1.1bpp diff --git a/gfx/battle_hud2.1bpp b/gfx/battle_hud2.1bpp Binary files differnew file mode 100755 index 00000000..6ac1cb0b --- /dev/null +++ b/gfx/battle_hud2.1bpp diff --git a/gfx/battle_hud3.1bpp b/gfx/battle_hud3.1bpp Binary files differnew file mode 100755 index 00000000..0a43bdda --- /dev/null +++ b/gfx/battle_hud3.1bpp diff --git a/gfx/battle_transition.2bpp b/gfx/battle_transition.2bpp new file mode 100755 index 00000000..13ff23b1 --- /dev/null +++ b/gfx/battle_transition.2bpp @@ -0,0 +1 @@ +ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ No newline at end of file diff --git a/gfx/blank_leader_names.2bpp b/gfx/blank_leader_names.2bpp Binary files differnew file mode 100755 index 00000000..1eac2fae --- /dev/null +++ b/gfx/blank_leader_names.2bpp diff --git a/gfx/blue/introfight.2bpp b/gfx/blue/introfight.2bpp Binary files differindex 76d7070a..4666bbf9 100644..100755 --- a/gfx/blue/introfight.2bpp +++ b/gfx/blue/introfight.2bpp diff --git a/gfx/copyright.2bpp b/gfx/copyright.2bpp Binary files differnew file mode 100755 index 00000000..1e7b762b --- /dev/null +++ b/gfx/copyright.2bpp diff --git a/gfx/diagonal_lines.2bpp b/gfx/diagonal_lines.2bpp Binary files differnew file mode 100755 index 00000000..ed8d1e78 --- /dev/null +++ b/gfx/diagonal_lines.2bpp diff --git a/gfx/emotion_bubbles.2bpp b/gfx/emotion_bubbles.2bpp Binary files differnew file mode 100755 index 00000000..c8a13e2f --- /dev/null +++ b/gfx/emotion_bubbles.2bpp diff --git a/gfx/falling_star.2bpp b/gfx/falling_star.2bpp Binary files differnew file mode 100755 index 00000000..4cab94c8 --- /dev/null +++ b/gfx/falling_star.2bpp diff --git a/gfx/gamefreak.2bpp b/gfx/gamefreak.2bpp Binary files differnew file mode 100755 index 00000000..6524eb2e --- /dev/null +++ b/gfx/gamefreak.2bpp diff --git a/gfx/gamefreak_intro.2bpp b/gfx/gamefreak_intro.2bpp Binary files differnew file mode 100755 index 00000000..fed4d67f --- /dev/null +++ b/gfx/gamefreak_intro.2bpp diff --git a/gfx/intro_fight.2bpp b/gfx/intro_fight.2bpp Binary files differnew file mode 100755 index 00000000..5672e387 --- /dev/null +++ b/gfx/intro_fight.2bpp diff --git a/gfx/ledge_hopping_shadow.1bpp b/gfx/ledge_hopping_shadow.1bpp Binary files differnew file mode 100755 index 00000000..61d484f2 --- /dev/null +++ b/gfx/ledge_hopping_shadow.1bpp diff --git a/gfx/mon_ow_sprites.2bpp b/gfx/mon_ow_sprites.2bpp Binary files differnew file mode 100755 index 00000000..b318eba5 --- /dev/null +++ b/gfx/mon_ow_sprites.2bpp diff --git a/gfx/player_title.2bpp b/gfx/player_title.2bpp Binary files differnew file mode 100755 index 00000000..756cfcd5 --- /dev/null +++ b/gfx/player_title.2bpp diff --git a/gfx/pokeball.2bpp b/gfx/pokeball.2bpp Binary files differnew file mode 100755 index 00000000..626c4e3e --- /dev/null +++ b/gfx/pokeball.2bpp diff --git a/gfx/pokecenter_ball.2bpp b/gfx/pokecenter_ball.2bpp Binary files differnew file mode 100755 index 00000000..292f6954 --- /dev/null +++ b/gfx/pokecenter_ball.2bpp diff --git a/gfx/pokedex.2bpp b/gfx/pokedex.2bpp Binary files differnew file mode 100755 index 00000000..04a47d39 --- /dev/null +++ b/gfx/pokedex.2bpp diff --git a/gfx/red/introfight.2bpp b/gfx/red/introfight.2bpp Binary files differindex 62c20894..bbed4572 100644..100755 --- a/gfx/red/introfight.2bpp +++ b/gfx/red/introfight.2bpp diff --git a/gfx/red_fishing.2bpp b/gfx/red_fishing.2bpp Binary files differnew file mode 100755 index 00000000..11da1073 --- /dev/null +++ b/gfx/red_fishing.2bpp diff --git a/gfx/spinner_arrow.2bpp b/gfx/spinner_arrow.2bpp Binary files differnew file mode 100755 index 00000000..5c0d27c6 --- /dev/null +++ b/gfx/spinner_arrow.2bpp diff --git a/gfx/sprites/cycling.2bpp b/gfx/sprites/cycling.2bpp Binary files differnew file mode 100755 index 00000000..7a92c2ba --- /dev/null +++ b/gfx/sprites/cycling.2bpp diff --git a/gfx/town_map.2bpp b/gfx/town_map.2bpp Binary files differnew file mode 100755 index 00000000..54e45869 --- /dev/null +++ b/gfx/town_map.2bpp diff --git a/gfx/town_map.rle b/gfx/town_map.rle Binary files differnew file mode 100755 index 00000000..f9ede0ec --- /dev/null +++ b/gfx/town_map.rle diff --git a/gfx/town_map_cursor.1bpp b/gfx/town_map_cursor.1bpp Binary files differnew file mode 100755 index 00000000..46328979 --- /dev/null +++ b/gfx/town_map_cursor.1bpp diff --git a/gfx/trade.2bpp b/gfx/trade.2bpp Binary files differnew file mode 100755 index 00000000..e7c18503 --- /dev/null +++ b/gfx/trade.2bpp diff --git a/gfx/trade2.2bpp b/gfx/trade2.2bpp Binary files differnew file mode 100755 index 00000000..975f4da0 --- /dev/null +++ b/gfx/trade2.2bpp diff --git a/gfx/trainer_info.2bpp b/gfx/trainer_info.2bpp Binary files differnew file mode 100755 index 00000000..4baf4888 --- /dev/null +++ b/gfx/trainer_info.2bpp diff --git a/gfx/up_arrow.1bpp b/gfx/up_arrow.1bpp Binary files differnew file mode 100755 index 00000000..a3c69389 --- /dev/null +++ b/gfx/up_arrow.1bpp @@ -1,36 +1,36 @@ INCLUDE "constants.asm" ; the rst vectors are unused -SECTION "rst00",HOME[0] +SECTION "rst00",ROM0[0] db $FF -SECTION "rst08",HOME[8] +SECTION "rst08",ROM0[8] db $FF -SECTION "rst10",HOME[$10] +SECTION "rst10",ROM0[$10] db $FF -SECTION "rst18",HOME[$18] +SECTION "rst18",ROM0[$18] db $FF -SECTION "rst20",HOME[$20] +SECTION "rst20",ROM0[$20] db $FF -SECTION "rst28",HOME[$28] +SECTION "rst28",ROM0[$28] db $FF -SECTION "rst30",HOME[$30] +SECTION "rst30",ROM0[$30] db $FF -SECTION "rst38",HOME[$38] +SECTION "rst38",ROM0[$38] db $FF ; interrupts -SECTION "vblank",HOME[$40] +SECTION "vblank",ROM0[$40] jp VBlankHandler -SECTION "lcdc",HOME[$48] +SECTION "lcdc",ROM0[$48] db $FF -SECTION "timer",HOME[$50] +SECTION "timer",ROM0[$50] jp TimerHandler -SECTION "serial",HOME[$58] +SECTION "serial",ROM0[$58] jp SerialInterruptHandler -SECTION "joypad",HOME[$60] +SECTION "joypad",ROM0[$60] reti -SECTION "bank0",HOME[$61] +SECTION "bank0",ROM0[$61] DisableLCD: ; 0061 (0:0061) xor a @@ -102,11 +102,11 @@ CopyData: ; 00b5 (0:00b5) jr nz,CopyData ret -SECTION "romheader",HOME[$100] +SECTION "romheader",ROM0[$100] nop jp Start -Section "start",HOME[$150] +Section "start",ROM0[$150] Start: ; 0150 (0:0150) cp $11 ; value that indicates Gameboy Color jr z,.gbcDetected @@ -7338,7 +7338,7 @@ DisplayListMenuIDLoop: ; 2c53 (0:2c53) and a ; is it a PC pokemon list? jr z,.pokemonList push hl - call Func_37df + call GetItemPrice pop hl ld a,[W_LISTMENUID] cp a,ITEMLISTMENU @@ -7634,7 +7634,7 @@ PrintListMenuEntries: ; 2e5a (0:2e5a) ld a,[de] ld de,ItemPrices ld [$cf91],a - call Func_37df ; get price + call GetItemPrice ; get price pop hl ld bc,20 + 5 ; 1 row down and 5 columns right add hl,bc @@ -8610,7 +8610,7 @@ IsItemInBag: ; 3493 (0:3493) and a ret -Func_349b: ; 349b (0:349b) +DisplayPokedex: ; 349b (0:349b) ld [$d11e], a ld b, BANK(Func_7c18) ld hl, Func_7c18 @@ -9246,7 +9246,7 @@ GetName: ; 376b (0:376b) ret ; known jump sources: 2cdc (0:2cdc), 2ee0 (0:2ee0) -Func_37df: ; 37df (0:37df) +GetItemPrice: ; 37df (0:37df) ld a, [H_LOADEDROMBANK] push af ld a, [W_LISTMENUID] ; $cf94 @@ -9262,7 +9262,7 @@ Func_37df: ; 37df (0:37df) ld h, [hl] ld l, a ld a, [$cf91] - cp $c4 + cp HM_01 jr nc, .asm_3812 ld bc, $3 .asm_3802 @@ -9281,7 +9281,7 @@ Func_37df: ; 37df (0:37df) ld a, $1e ld [H_LOADEDROMBANK], a ld [$2000], a - call Func_7bf86 + call GetMachinePrice .asm_381c ld de, H_DOWNARROWBLINKCNT1 ; $ff8b pop af @@ -10494,6 +10494,8 @@ Func_3e08: ; 3e08 (0:3e08) ; 3e2e (0:3e2e) GiveItem: ; 3e2e (0:3e2e) +; Give player quantity c of item b, and copy item name to $cf4b. +; Set carry on success. If no room in bag, reset carry. ld a, b ld [$d11e], a ld [$cf91], a @@ -10723,7 +10725,7 @@ Func_3f0f: ; 3f0f (0:3f0f) dw $7c0d dw $7c45 -SECTION "bank1",DATA,BANK[$1] +SECTION "bank1",ROMX,BANK[$1] SpriteFacingAndAnimationTable: ; 4000 (1:4000) dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 0 @@ -11015,7 +11017,7 @@ ENDC ld [hl], a FuncCoord 2, 17 ; $c4f6 ld hl, Coord - ld de, .unknown_437f ; $437f + ld de, .titlescreenTilemap ; $437f ld b, $10 .asm_4377 ld a, [de] @@ -11025,8 +11027,8 @@ ENDC jr nz, .asm_4377 jr .asm_438f -.unknown_437f ; 437f (1:437f) -INCBIN "baserom.gbc",$437f,$438f - $437f +.titlescreenTilemap ; 437f (1:437f) +db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'95.'96.'98 GAME FREAK inc. .asm_438f call SaveScreenTilesToBuffer2 @@ -11281,11 +11283,13 @@ Func_4541: ; 4541 (1:4541) call CopyVideoData FuncCoord 2, 7 ; $c42e ld hl, Coord - ld de, Unknown_4556 ; $4556 + ld de, CopyrightTextString ; $4556 jp PlaceString -Unknown_4556: ; 4556 (1:4556) -INCBIN "baserom.gbc",$4556,$4588 - $4556 +CopyrightTextString: ; 4556 (1:4556) + db $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A,$4E ; ©'95.'96.'98 Nintendo + db $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72,$4E ; ©'95.'96.'98 Creatures inc. + db $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B,"@" ; ©'95.'96.'98 GAME FREAK inc. TitleMons: ; 4588 (1:4588) ; mons on the title screen are randomly chosen from here @@ -11833,13 +11837,13 @@ Func_4c05: ; 4c05 (1:4c05) .asm_4c1a FuncCoord 4, 11 ; $c480 ld hl, Coord - ld de, Unknown_4c28 ; $4c28 + ld de, WaitingText ; $4c28 call PlaceString ld c, $32 jp DelayFrames -Unknown_4c28: ; 4c28 (1:4c28) -INCBIN "baserom.gbc",$4c28,$4c34 - $4c28 +WaitingText: ; 4c28 (1:4c28) + db "Waiting...!@" ; known jump sources: 2438 (0:2438) _UpdateSprites: ; 4c34 (1:4c34) @@ -12057,7 +12061,7 @@ Func_4ca5: ; 4ca5 (1:4ca5) inc l inc l ld a, [$FF00+$8f] - ld de, Unknown_4d85 ; $4d85 + ld de, DiagonalLines ; $4d85 add a add e ld e, a @@ -12094,8 +12098,10 @@ Func_4d72: ; 4d72 (1:4d72) .asm_4d84 ret -Unknown_4d85: ; 4d85 (1:4d85) -INCBIN "baserom.gbc",$4d85,$4de1 - $4d85 +DiagonalLines: ; 4d85 (1:4d85) +INCBIN "gfx/diagonal_lines.2bpp" + +INCBIN "baserom.gbc",$4da5,$4de1 - $4da5 ; known jump sources: 24f7 (0:24f7) PickupItem: ; 4de1 (1:4de1) @@ -12123,9 +12129,9 @@ PickupItem: ; 4de1 (1:4de1) add hl, de ; seek to item data of found item ld a, [hl] ; read Item type ld b, a - ld c, $1 ; quantity is 1 + ld c, 1 ; quantity is 1 call GiveItem - jr nc, .noMoreSpace + jr nc, .BagFull ld a, [$FF00+$db] ld [$cc4d], a ld a, $11 @@ -12134,7 +12140,7 @@ PickupItem: ; 4de1 (1:4de1) ld [$cc3c], a ld hl, FoundItemText jr .printText -.noMoreSpace +.BagFull ld hl, NoMoreRoomForItemText .printText call PrintText @@ -13035,7 +13041,7 @@ Func_5317: ; 5317 (1:5317) call Func_5ab3 FuncCoord 4, 10 ; $c46c ld hl, Coord - ld de, .unknown_550f ; $550f + ld de, .pleaseWait ; $550f call PlaceString ld hl, W_NUMHITS ; $d074 xor a @@ -13304,8 +13310,8 @@ Func_5317: ; 5317 (1:5317) call PlayMusic jr .asm_551c -.unknown_550f: ; 550f (1:550f) -INCBIN "baserom.gbc",$550f,$551c - $550f +.pleaseWait: ; 550f (1:550f) + db "PLEASE WAIT!@" .asm_551c ld hl, Unknown_5a5b ; $5a5b @@ -13352,7 +13358,8 @@ SSAnne8AfterBattleText2: ; 5a24 (1:5a24) db $50 ; 0x5a24 + 5 bytes -INCBIN "baserom.gbc",$5a29,$5a5b - $5a29 + db "Trade completed!@" + db "Too bad! The trade",$4E,"was canceled!@" Unknown_5a5b: ; 5a5b (1:5a5b) INCBIN "baserom.gbc",$5a5b,$5a5f - $5a5b @@ -17785,7 +17792,7 @@ Func_7c18: ; 7c18 (1:7c18) ret ; 0x7c49 -SECTION "bank2",DATA,BANK[$2] +SECTION "bank2",ROMX,BANK[$2] INCBIN "baserom.gbc",$8000,$822e - $8000 @@ -17990,7 +17997,7 @@ IndigoPlateau_mh: ; 0x82F1 - 0x82FC INCLUDE "music.asm" -SECTION "bank3",DATA,BANK[$3] +SECTION "bank3",ROMX,BANK[$3] ; known jump sources: 1a4 (0:1a4) _GetJoypadState: ; c000 (3:4000) @@ -26678,102 +26685,131 @@ Func_e9f0: ; e9f0 (3:69f0) dec hl ret -; known jump sources: 13474 (4:7474) -Func_ea03: ; ea03 (3:6a03) + +DrawBadges: ; ea03 (3:6a03) +; Draw 4x2 gym leader faces, with the faces replaced by +; badges if they are owned. Used in the player status screen. + +; In Japanese versions, names are displayed above faces. +; Instead of removing relevant code, the name graphics were erased. + +; Tile ids for face/badge graphics. ld de, $cd3f - ld hl, Unknown_ea96 ; $6a96 - ld bc, $8 + ld hl, .FaceBadgeTiles + ld bc, 8 call CopyData + +; Booleans for each badge. ld hl, $cd49 - ld bc, $8 + ld bc, 8 xor a call FillMemory + +; Alter these based on owned badges. ld de, $cd49 ld hl, $cd3f - ld a, [W_OBTAINEDBADGES] ; $d356 + ld a, [W_OBTAINEDBADGES] ld b, a - ld c, $8 -.asm_ea25 + ld c, 8 +.CheckBadge srl b - jr nc, .asm_ea30 + jr nc, .NextBadge ld a, [hl] - add $4 + add 4 ; Badge graphics are after each face ld [hl], a - ld a, $1 + ld a, 1 ld [de], a -.asm_ea30 +.NextBadge inc hl inc de dec c - jr nz, .asm_ea25 - ld hl, W_WHICHTRADE ; $cd3d - ld a, $d8 + jr nz, .CheckBadge + +; Draw two rows of badges. + ld hl, $cd3d + ld a, $d8 ; [1] ld [hli], a - ld [hl], $60 - FuncCoord 2, 11 ; $c47e + ld [hl], $60 ; First name + + FuncCoord 2, 11 ld hl, Coord ld de, $cd49 - call Func_ea4c - FuncCoord 2, 14 ; $c4ba + call .DrawBadgeRow + + FuncCoord 2, 14 ld hl, Coord - ld de, $cd4d + ld de, $cd49 + 4 +; call .DrawBadgeRow +; ret +; ea4c -; known jump sources: ea43 (3:6a43) -Func_ea4c: ; ea4c (3:6a4c) - ld c, $4 -.asm_ea4e +.DrawBadgeRow ; ea4c (3:6a4c) +; Draw 4 badges. + + ld c, 4 +.DrawBadge push de push hl - ld a, [W_WHICHTRADE] ; $cd3d + +; Badge no. + ld a, [$cd3d] ld [hli], a inc a - ld [W_WHICHTRADE], a ; $cd3d + ld [$cd3d], a + +; Names aren't printed if the badge is owned. ld a, [de] and a ld a, [$cd3e] - jr nz, .asm_ea64 - call Func_ea91 - jr .asm_ea67 -.asm_ea64 + jr nz, .SkipName + call .PlaceTiles + jr .PlaceBadge + +.SkipName inc a inc a inc hl -.asm_ea67 + +.PlaceBadge ld [$cd3e], a - ld de, $13 + ld de, 20 - 1 add hl, de ld a, [$cd3f] - call Func_ea91 + call .PlaceTiles add hl, de - call Func_ea91 + call .PlaceTiles + +; Shift badge array back one byte. push bc - ld hl, $cd40 + ld hl, $cd3f + 1 ld de, $cd3f - ld bc, $8 + ld bc, 8 call CopyData pop bc + pop hl - ld de, $4 + ld de, 4 add hl, de + pop de inc de dec c - jr nz, .asm_ea4e + jr nz, .DrawBadge ret -; known jump sources: ea5f (3:6a5f), ea71 (3:6a71), ea75 (3:6a75) -Func_ea91: ; ea91 (3:6a91) +.PlaceTiles ld [hli], a inc a ld [hl], a inc a ret -Unknown_ea96: ; ea96 (3:6a96) -INCBIN "baserom.gbc",$ea96,$ea9e - $ea96 +.FaceBadgeTiles + db $20, $28, $30, $38, $40, $48, $50, $58 +; ea9e GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e) -INCBIN "baserom.gbc",$ea9e,$ee9e - $ea9e +INCBIN "gfx/badges.2bpp" ; known jump sources: 19f70 (6:5f70), 19f83 (6:5f83), 19f94 (6:5f94), 1a1e0 (6:61e0), 1eb3e (7:6b3e), 44312 (11:4312), 449ae (11:49ae), 517e7 (14:57e7), 51b9a (14:5b9a), 51bad (14:5bad), 51bbe (14:5bbe), 52034 (14:6034), 526cf (14:66cf), 5653b (15:653b), 59f94 (16:5f94), 59fa5 (16:5fa5), 5a170 (16:6170), 5a2f2 (16:62f2), 5ca87 (17:4a87), 5d7f4 (17:57f4), 5d807 (17:5807), 5d81a (17:581a), 5d82b (17:582b), 5da37 (17:5a37), 62131 (18:6131), 761b3 (1d:61b3), 7630a (1d:630a), 76461 (1d:6461) Func_ee9e: ; ee9e (3:6e9e) @@ -28916,7 +28952,7 @@ UnnamedText_fc45: ; fc45 (3:7c45) db $50 ; 0xfc45 + 5 bytes -SECTION "bank4",DATA,BANK[$4] +SECTION "bank4",ROMX,BANK[$4] OakAideSprite: ; 10000 (4:4000) INCBIN "gfx/sprites/oak_aide.2bpp" ; was $10000 @@ -28978,37 +29014,38 @@ PokemonLogoGraphics: ; 11380 (4:5380) FontGraphics: ; 11a80 (4:5a80) INCBIN "gfx/font.1bpp" -INCBIN "baserom.gbc",$11e80,$11ea0 - $11e80 +ABTiles: ; 11e80 (4:5e80) + INCBIN "gfx/AB.2bpp" HpBarAndStatusGraphics: ; 11ea0 (4:5ea0) INCBIN "gfx/hp_bar_and_status.2bpp" -Unknown_12080: ; 12080 (4:6080) -INCBIN "baserom.gbc",$12080,$12098 - $12080 +BattleHudTiles1: ; 12080 (4:6080) +INCBIN "gfx/battle_hud1.1bpp" -Unknown_12098: ; 12098 (4:6098) -INCBIN "baserom.gbc",$12098,$120b0 - $12098 +BattleHudTiles2: ; 12098 (4:6098) +INCBIN "gfx/battle_hud2.1bpp" -Unknown_120b0: ; 120b0 (4:60b0) -INCBIN "baserom.gbc",$120b0,$120c8 - $120b0 +BattleHudTiles3: ; 120b0 (4:60b0) +INCBIN "gfx/battle_hud3.1bpp" NintendoCopyrightLogoGraphics: ; 120c8 (4:60c8) -INCBIN "baserom.gbc",$120c8,$121f8 - $120c8 +INCBIN "gfx/copyright.2bpp" GamefreakLogoGraphics: ; 121f8 (4:61f8) -INCBIN "baserom.gbc",$121f8,$12288 - $121f8 +INCBIN "gfx/gamefreak.2bpp" TextBoxGraphics: ; 12288 (4:6288) INCBIN "gfx/text_box.2bpp" PokedexTileGraphics: ; 12488 (4:6488) -INCBIN "baserom.gbc",$12488,$125a8 - $12488 +INCBIN "gfx/pokedex.2bpp" WorldMapTileGraphics: ; 125a8 (4:65a8) -INCBIN "baserom.gbc",$125a8,$126a8 - $125a8 +INCBIN "gfx/town_map.2bpp" PlayerCharacterTitleGraphics: ; 126a8 (4:66a8) -INCBIN "baserom.gbc",$126a8,$128d8 - $126a8 +INCBIN "gfx/player_title.2bpp" ; known jump sources: 1388d (4:788d) Func_128d8: ; 128d8 (4:68d8) @@ -29116,17 +29153,17 @@ StatusScreen: ; 12953 (4:6953) call ClearScreen call UpdateSprites ; move sprites (?) call LoadHpBarAndStatusTilePatterns - ld de, Unknown_12080 ; $6080 ; source + ld de, BattleHudTiles1 ; $6080 ; source ld hl, $96d0 ; dest - ld bc, (BANK(Unknown_12080) << 8) + $03 ; bank bytes/8 + ld bc, (BANK(BattleHudTiles1) << 8) + $03 ; bank bytes/8 call CopyVideoDataDouble ; ·│ :L and halfarrow line end - ld de, Unknown_12098 ; $6098 + ld de, BattleHudTiles2 ; $6098 ld hl, $9780 - ld bc, (BANK(Unknown_12098) << 8) + $01 + ld bc, (BANK(BattleHudTiles2) << 8) + $01 call CopyVideoDataDouble ; │ - ld de, Unknown_120b0 ; $60b0 + ld de, BattleHudTiles3 ; $60b0 ld hl, $9760 - ld bc, (BANK(Unknown_120b0) << 8) + $02 + ld bc, (BANK(BattleHudTiles3) << 8) + $02 call CopyVideoDataDouble ; ─┘ ld de, PTile ld hl, $9720 @@ -30473,7 +30510,7 @@ DrawTrainerInfo: ; 1349a (4:749a) ld bc,$0080 push bc call TrainerInfo_FarCopyData - ld hl,UnknownGFX_2fc28 ; $7c28 + ld hl,BlankLeaderNames ; $7c28 ld de,$9600 ld bc,$0170 call TrainerInfo_FarCopyData @@ -31220,11 +31257,10 @@ GenRandom_: ; 13a8f (4:7a8f) ld [H_RAND2],a ret -SECTION "bank5",DATA,BANK[$5] +SECTION "bank5",ROMX,BANK[$5] RedCyclingSprite: ; 14000 (5:4000) -INCBIN "baserom.gbc",$14000,$14180 - $14000 - + INCBIN "gfx/sprites/cycling.2bpp" ; was $14000 RedSprite: ; 14180 (5:4180) INCBIN "gfx/sprites/red.2bpp" ; was $14180 BlueSprite: ; 14300 (5:4300) @@ -32356,7 +32392,7 @@ Func_17c47: ; 17c47 (5:7c47) ld a, [hl] add $8 ld c, a - ld de, Unknown_17cb5 ; $7cb5 + ld de, EmotionBubbles ; $7cb5 xor a call WriteOAMBlock ld c, $3c @@ -32369,8 +32405,8 @@ Func_17c47: ; 17c47 (5:7c47) Unknown_17caf: ; 17caf (5:7caf) INCBIN "baserom.gbc",$17caf,$17cb5 - $17caf -Unknown_17cb5: ; 17cb5 (5:7cb5) -INCBIN "baserom.gbc",$17cb5,$17d7d - $17cb5 +EmotionBubbles: ; 17cb5 (5:7cb5) +INCBIN "gfx/emotion_bubbles.2bpp" ; known jump sources: 71c87 (1c:5c87) Func_17d7d: ; 17d7d (5:7d7d) @@ -32636,7 +32672,7 @@ RemoveItemByID: ; 17f37 (5:7f37) ld hl, W_NUMBAGITEMS ; $d31d jp RemoveItemFromInventory ; 17f5f (5:7f5f) -SECTION "bank6",DATA,BANK[$6] +SECTION "bank6",ROMX,BANK[$6] CeladonCity_h: ; 18000 (6:4000) db $00 ; tileset @@ -33687,13 +33723,13 @@ ViridianCityText6: ; 19196 (6:5196) call PrintText ld bc, (TM_42 << 8) | 1 call GiveItem - jr nc, .asm_b655e ; 0x191aa + jr nc, .BagFull ld hl, ReceivedTM42Text call PrintText ld hl, $d74c set 1, [hl] jr .asm_3c73c ; 0x191b7 -.asm_b655e ; 0x191b9 +.BagFull ld hl, TM42NoRoomText call PrintText jr .asm_3c73c ; 0x191bf @@ -34399,11 +34435,11 @@ CeruleanCityText2: ; 1967c (6:567c) call PrintText ld bc, $e401 call GiveItem - jr c, .asm_8bbbd ; 0x196b9 $8 + jr c, .Success ld hl, TM28NoRoomText call PrintText - jr .asm_e4e6f ; 0x196c1 $13 -.asm_8bbbd ; 0x196c3 + jr .Done +.Success ld a, $1 ld [$cc3c], a ld hl, ReceivedTM28Text @@ -34411,7 +34447,7 @@ CeruleanCityText2: ; 1967c (6:567c) ld b, BANK(Unnamed_ASM_74872) ld hl, Unnamed_ASM_74872 call Bankswitch -.asm_e4e6f ; 0x196d6 +.Done jp TextScriptEnd ; 0x196d9 @@ -34863,20 +34899,20 @@ CeladonCityText5: ; 1999e (6:599e) call PrintText ld bc, (TM_41 << 8) | 1 call GiveItem - jr c, .asm_890ec ; 0x199b2 + jr c, .Success ld hl, TM41NoRoomText call PrintText - jr .asm_c765a ; 0x199ba -.asm_890ec ; 0x199bc + jr .Done +.Success ld hl, ReceivedTM41Text call PrintText ld hl, $d777 set 0, [hl] - jr .asm_c765a ; 0x199c7 + jr .Done .asm_7053f ; 0x199c9 ld hl, TM41ExplanationText call PrintText -.asm_c765a ; 0x199cf +.Done jp TextScriptEnd TM41PreText: ; 199d2 (6:59d2) @@ -35007,8 +35043,8 @@ FuchsiaCityText19: ; 19a90 (6:5a90) db $08 ; asm ld hl, FuchsiaCityChanseyText call PrintText - ld a, $28 - call Func_349b + ld a, CHANSEY + call DisplayPokedex jp TextScriptEnd FuchsiaCityChanseyText: ; 19a9f (6:5a9f) @@ -35020,8 +35056,8 @@ FuchsiaCityText20: ; 19aa4 (6:5aa4) db $08 ; asm ld hl, FuchsiaCityVoltorbText call PrintText - ld a, $6 - call Func_349b + ld a, VOLTORB + call DisplayPokedex jp TextScriptEnd FuchsiaCityVoltorbText: ; 19ab3 (6:5ab3) @@ -35033,8 +35069,8 @@ FuchsiaCityText21: ; 19ab8 (6:5ab8) db $08 ; asm ld hl, FuchsiaCityKangaskhanText call PrintText - ld a, $2 - call Func_349b + ld a, KANGASKHAN + call DisplayPokedex jp TextScriptEnd FuchsiaCityKangaskhanText: ; 19ac7 (6:5ac7) @@ -35046,8 +35082,8 @@ FuchsiaCityText22: ; 19acc (6:5acc) db $08 ; asm ld hl, FuchsiaCitySlowpokeText call PrintText - ld a, $25 - call Func_349b + ld a, SLOWPOKE + call DisplayPokedex jp TextScriptEnd FuchsiaCitySlowpokeText: ; 19adb (6:5adb) @@ -35059,8 +35095,8 @@ FuchsiaCityText23: ; 19ae0 (6:5ae0) db $08 ; asm ld hl, FuchsiaCityLaprasText call PrintText - ld a, $13 - call Func_349b + ld a, LAPRAS + call DisplayPokedex jp TextScriptEnd FuchsiaCityLaprasText: ; 19aef (6:5aef) @@ -35086,9 +35122,9 @@ FuchsiaCityText24: ; 19af4 (6:5af4) .asm_667d5 ; 0x19b12 ld hl, FuchsiaCityKabutoText call PrintText - ld a, $5a + ld a, KABUTO .asm_81556 ; 0x19b1a - call Func_349b + call DisplayPokedex .asm_4343f ; 0x19b1d jp TextScriptEnd @@ -35154,7 +35190,7 @@ BluesHouseText1: ; 19b5d (6:5b5d) call PrintText ld bc,(TOWN_MAP << 8) | 1 call GiveItem - jr nc,.BagFull + jr nc, .BagFull ld a,$29 ld [$CC4D],a ld a,$11 @@ -36548,8 +36584,8 @@ INCBIN "baserom.gbc",$1a6cf,$1a6f0 - $1a6cf ; known jump sources: 1a6c6 (6:66c6) Func_1a6f0: ; 1a6f0 (6:66f0) ld hl, $8ff0 - ld de, Unknown_1a708 ; $6708 - ld bc, (BANK(Unknown_1a708) << 8) + $01 + ld de, LedgeHoppingShadow ; $6708 + ld bc, (BANK(LedgeHoppingShadow) << 8) + $01 call CopyVideoDataDouble ld a, $9 ld bc, $5448 @@ -36557,13 +36593,13 @@ Func_1a6f0: ; 1a6f0 (6:66f0) call WriteOAMBlock ret -Unknown_1a708: ; 1a708 (6:6708) -INCBIN "baserom.gbc",$1a708,$1a710 - $1a708 +LedgeHoppingShadow: ; 1a708 (6:6708) +INCBIN "gfx/ledge_hopping_shadow.1bpp" Unknown_1a710: ; 1a710 (6:6710) INCBIN "baserom.gbc",$1a710,$1bcc8 - $1a710 -SECTION "bank7",DATA,BANK[$7] +SECTION "bank7",ROMX,BANK[$7] CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8) db $00 ; tileset @@ -37070,10 +37106,10 @@ Route1Text1: ; 1cab8 (7:4ab8) call PrintText ld bc, (POTION << 8) | 1 call GiveItem - jr nc, .asm_a630e ; 0x1cace + jr nc, .BagFull ld hl, Unknown_1cae8 ; $4ae8 jr .asm_46d43 ; 0x1cad3 -.asm_a630e ; 0x1cad5 +.BagFull ld hl, UnnamedText_1caf3 ; $4af3 jr .asm_46d43 ; 0x1cad8 .asm_02840 ; 0x1cada @@ -38468,7 +38504,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) ld a, $5 ld [$ff00+$8c], a call DisplayTextID - ld bc, (OAKS_PARCEL << 8) + 1 ; 1x OAKS_PARCEL + ld bc, (OAKS_PARCEL << 8) + 1 call GiveItem ld hl, $d74e set 1, [hl] @@ -38859,7 +38895,7 @@ BikeShopText1: ; 1d745 (7:5745) jr z, .asm_260d4 ; 0x1d74b ld hl, UnnamedText_1d82f call PrintText - jp .asm_99ef2 + jp .Done .asm_260d4 ; 0x1d756 ld b, BIKE_VOUCHER call IsItemInBag @@ -38868,7 +38904,7 @@ BikeShopText1: ; 1d745 (7:5745) call PrintText ld bc, (BICYCLE << 8) | 1 call GiveItem - jr nc, .asm_d0d90 ; 0x1d769 + jr nc, .BagFull ld a, BIKE_VOUCHER ldh [$db], a ld b, BANK(RemoveItemByID) @@ -38878,11 +38914,11 @@ BikeShopText1: ; 1d745 (7:5745) set 0, [hl] ld hl, UnnamedText_1d824 call PrintText - jr .asm_99ef2 ; 0x1d782 -.asm_d0d90 ; 0x1d784 + jr .Done +.BagFull ld hl, UnnamedText_1d834 call PrintText - jr .asm_99ef2 ; 0x1d78a + jr .Done .asm_41190 ; 0x1d78c ld hl, UnnamedText_1d810 call PrintText @@ -38927,7 +38963,7 @@ BikeShopText1: ; 1d745 (7:5745) .asm_b7579 ; 0x1d7ef ld hl, UnnamedText_1d82a call PrintText -.asm_99ef2 ; 0x1d7f5 +.Done jp TextScriptEnd BikeShopMenuText: ; 1d7f8 (7:57f8) @@ -39117,13 +39153,13 @@ LavenderHouse1Text5: ; 1d918 (7:5918) call PrintText ld bc, (POKE_FLUTE << 8) | 1 call GiveItem - jr nc, .asm_5ce36 ; 0x1d92c + jr nc, .BagFull ld hl, ReceivedFluteText call PrintText ld hl, $d76c set 0, [hl] jr .asm_da749 ; 0x1d939 -.asm_5ce36 ; 0x1d93b +.BagFull ld hl, FluteNoRoomText call PrintText jr .asm_da749 ; 0x1d941 @@ -39847,13 +39883,13 @@ SaffronHouse2Text1: ; 1de41 (7:5e41) call PrintText ld bc,(TM_29 << 8) | 1 call GiveItem - jr nc, .asm_4b1da ; 0x1de55 + jr nc, .BagFull ld hl, ReceivedTM29Text call PrintText ld hl, $d7bd set 0, [hl] jr .asm_fe4e1 ; 0x1de62 -.asm_4b1da ; 0x1de64 +.BagFull ld hl, TM29NoRoomText call PrintText jr .asm_fe4e1 ; 0x1de6a @@ -40776,12 +40812,12 @@ Route16HouseText1: ; 1e5ff (7:65ff) call PrintText ld bc, (HM_02 << 8) | 1 call GiveItem - jr nc, .asm_d3ee3 ; 0x1e616 + jr nc, .BagFull ld hl, $d7e0 set 6, [hl] ld hl, ReceivedHM02Text jr .asm_13616 ; 0x1e620 -.asm_d3ee3 ; 0x1e622 +.BagFull ld hl, HM02NoRoomText .asm_13616 ; 0x1e625 call PrintText @@ -41136,7 +41172,7 @@ BillsHouseText2: ; 1e874 (7:6874) call PrintText ld bc, (S_S__TICKET << 8) | 1 call GiveItem - jr nc, .asm_18a67 ; 0x1e888 + jr nc, .BagFull ld hl, SSTicketReceivedText call PrintText ld hl, $d7f2 @@ -41153,7 +41189,7 @@ BillsHouseText2: ; 1e874 (7:6874) ld hl, UnnamedText_1e8cb call PrintText jr .asm_bd408 ; 0x1e8af -.asm_18a67 ; 0x1e8b1 +.BagFull ld hl, SSTicketNoRoomText call PrintText .asm_bd408 ; 0x1e8b7 @@ -41634,7 +41670,7 @@ UnnamedText_1ecbd: ; 1ecbd (7:6cbd) db $50 ; 0x1ecbd + 5 bytes -SECTION "bank8",DATA,BANK[$8] +SECTION "bank8",ROMX,BANK[$8] Unknown_20000: ; 20000 (8:4000) INCBIN "baserom.gbc",$20000,$20361 - $20000 @@ -43996,7 +44032,7 @@ INCBIN "baserom.gbc",$22322,$22325 - $22322 Unknown_22325: ; 22325 (8:6325) INCBIN "baserom.gbc",$22325,$23f52 - $22325 -SECTION "bank9",DATA,BANK[$9] +SECTION "bank9",ROMX,BANK[$9] RhydonPicFront: ; 24000 (9:4000) INCBIN "pic/bmon/rhydon.pic" @@ -44367,7 +44403,7 @@ UnnamedText_27fb3: ; 27fb3 (9:7fb3) db $50 ; 0x27fb3 + 5 bytes -SECTION "bankA",DATA,BANK[$A] +SECTION "bankA",ROMX,BANK[$A] GrowlithePicFront: ; 28000 (a:4000) INCBIN "pic/bmon/growlithe.pic" GrowlithePicBack: ; 28101 (a:4101) @@ -44544,7 +44580,7 @@ UnnamedText_2bef7: ; 2bef7 (a:7ef7) db $50 ; 0x2bef7 + 5 bytes -SECTION "bankB",DATA,BANK[$B] +SECTION "bankB",ROMX,BANK[$B] ArticunoPicFront: ; 2c000 (b:4000) INCBIN "pic/bmon/articuno.pic" ArticunoPicBack: ; 2c238 (b:4238) @@ -44706,14 +44742,14 @@ UnnamedText_2fb93: ; 2fb93 (b:7b93) ; 0x2fb93 + 5 bytes TrainerInfoTextBoxTileGraphics: ; 2fb98 (b:7b98) -INCBIN "baserom.gbc",$2fb98,$2fc28 - $2fb98 +INCBIN "gfx/trainer_info.2bpp" ; mostly empty, last tile contains circle -UnknownGFX_2fc28: ; 2fc28 (b:7c28) -INCBIN "baserom.gbc",$2fc28,$2fd98 - $2fc28 +BlankLeaderNames: ; 2fc28 (b:7c28) +INCBIN "gfx/blank_leader_names.2bpp" BadgeNumbersTileGraphics: ; 2fd98 (b:7d98) -INCBIN "baserom.gbc",$2fd98,$2fe18 - $2fd98 +INCBIN "gfx/badge_numbers.2bpp" ; known jump sources: e530 (3:6530) Func_2fe18: ; 2fe18 (b:7e18) @@ -44893,7 +44929,7 @@ UnnamedText_2ff37: ; 2ff37 (b:7f37) db $50 ; 0x2ff37 + 5 bytes -SECTION "bankC",DATA,BANK[$C] +SECTION "bankC",ROMX,BANK[$C] DodrioPicFront: ; 30000 (c:4000) INCBIN "pic/bmon/dodrio.pic" DodrioPicBack: ; 301a2 (c:41a2) @@ -45060,7 +45096,7 @@ Func_33f57: ; 33f57 (c:7f57) ld [W_MOVEMISSED], a ; $d05f ret ; 33f90 (c:7f90) -SECTION "bankD",DATA,BANK[$D] +SECTION "bankD",ROMX,BANK[$D] BulbasaurPicFront: ; 34000 (d:4000) INCBIN "pic/bmon/bulbasaur.pic" BulbasaurPicBack: ; 340e5 (d:40e5) @@ -45526,7 +45562,7 @@ UnnamedText_37e83: ; 37e83 (d:7e83) db $50 ; 0x37e83 + 5 bytes -SECTION "bankE",DATA,BANK[$E] +SECTION "bankE",ROMX,BANK[$E] Moves: ; 38000 (e:4000) ; characteristics of each move @@ -53858,15 +53894,15 @@ Func_3a948: ; 3a948 (e:6948) ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon) PokeballTileGraphics: ; 3a97e (e:697e) -INCBIN "baserom.gbc",$3a97e,$3a9be - $3a97e +INCBIN "gfx/pokeball.2bpp" ; tiles for gameboy and link cable graphics used for trading sequence animation TradingAnimationGraphics: ; 3a9be (e:69be) -INCBIN "baserom.gbc",$3a9be,$3acce - $3a9be +INCBIN "gfx/trade.2bpp" ; 4 tiles for actual wire transfer animation (pokeball wandering inside wire) TradingAnimationGraphics2: ; 3acce (e:6cce) -INCBIN "baserom.gbc",$3acce,$3ad0e - $3acce +INCBIN "gfx/trade2.2bpp" ; known jump sources: df11 (3:5f11), 17da3 (5:7da3) Func_3ad0e: ; 3ad0e (e:6d0e) @@ -56872,7 +56908,7 @@ BankswitchEtoF: ; 3bbe1 (e:7be1) jp Bankswitch ; 0x3bbe6 -SECTION "bankF",DATA,BANK[$F] +SECTION "bankF",ROMX,BANK[$F] ; These are move effects (second value from the Moves table in bank $E). EffectsArray1: ; 3c000 (f:4000) @@ -63571,24 +63607,24 @@ Func_3ee5b: ; 3ee5b (f:6e5b) ld a, [rLCDC] ; $FF00+$40 add a jr c, .asm_3ee7c - ld hl, Unknown_12080 ; $6080 + ld hl, BattleHudTiles1 ; $6080 ld de, $96d0 ld bc, $18 - ld a, BANK(Unknown_12080) + ld a, BANK(BattleHudTiles1) call FarCopyDataDouble - ld hl, Unknown_12098 ; $6098 + ld hl, BattleHudTiles2 ; $6098 ld de, $9730 ld bc, $30 - ld a, BANK(Unknown_12098) + ld a, BANK(BattleHudTiles2) jp FarCopyDataDouble .asm_3ee7c - ld de, Unknown_12080 ; $6080 + ld de, BattleHudTiles1 ; $6080 ld hl, $96d0 - ld bc, (BANK(Unknown_12080) << 8) + $03 + ld bc, (BANK(BattleHudTiles1) << 8) + $03 call CopyVideoDataDouble - ld de, Unknown_12098 ; $6098 + ld de, BattleHudTiles2 ; $6098 ld hl, $9730 - ld bc, (BANK(Unknown_12098) << 8) + $06 + ld bc, (BANK(BattleHudTiles2) << 8) + $06 jp CopyVideoDataDouble ; known jump sources: 3c5f7 (f:45f7), 3c79b (f:479b), 3c952 (f:4952), 3ccf4 (f:4cf4), 3cebf (f:4ebf), 553f1 (15:53f1) @@ -65349,7 +65385,7 @@ Func_3fbbc: ; 3fbbc (f:7bbc) pop hl ret ; 3fbc8 (f:7bc8) -SECTION "bank10",DATA,BANK[$10] +SECTION "bank10",ROMX,BANK[$10] DisplayPokedexMenu_: ; 40000 (10:4000) call GBPalWhiteOut @@ -68196,66 +68232,73 @@ Func_41676: ; 41676 (10:5676) jp Predef ; indirect jump to MoveAnimation (78d5e (1e:4d5e)) ; known jump sources: 1fee (0:1fee) -Func_41682: ; 41682 (10:5682) +PlayIntro: ; 41682 (10:5682) xor a ld [H_CURRENTPRESSEDBUTTONS], a inc a - ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba + ld [H_AUTOBGTRANSFERENABLED], a call Func_4188a - call Func_4169d + call PlayIntroScene call GBFadeOut2 xor a ld [$FF00+$ae], a - ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba + ld [H_AUTOBGTRANSFERENABLED], a call CleanLCD_OAM call DelayFrame ret -; known jump sources: 4168b (10:568b) -Func_4169d: ; 4169d (10:569d) +PlayIntroScene: ; 4169d (10:569d) ld b, $7 call GoPAL_SET - ld a, $e4 - ld [rBGP], a ; $FF00+$47 - ld [rOBP0], a ; $FF00+$48 - ld [rOBP1], a ; $FF00+$49 + ld a, %11100100 + ld [rBGP], a + ld [rOBP0], a + ld [rOBP1], a xor a ld [$FF00+$ae], a ld b, $3 call Func_4183f - ld a, $0 - ld [W_BASECOORDX], a ; $d081 - ld a, $50 - ld [W_BASECOORDY], a ; $d082 + ld a, 0 + ld [W_BASECOORDX], a + ld a, 80 + ld [W_BASECOORDY], a ld bc, $606 call Func_417c7 ld de, $28ff call Func_4180e ret c + +; hip ld a, $b9 call PlaySound xor a ld [$d09f], a - ld de, Unknown_41910 ; $5910 - call Func_41793 + ld de, Unknown_41910 + call AnimateIntroNidorino +; hop ld a, $ba call PlaySound - ld de, Unknown_4191b ; $591b - call Func_41793 + ld de, Unknown_4191b + call AnimateIntroNidorino ld c, $a call CheckForUserInterruption ret c + +; hip ld a, $b9 call PlaySound - ld de, Unknown_41910 ; $5910 - call Func_41793 + ld de, Unknown_41910 + call AnimateIntroNidorino +; hop ld a, $ba call PlaySound - ld de, Unknown_4191b ; $591b - call Func_41793 + ld de, Unknown_4191b + call AnimateIntroNidorino ld c, $1e call CheckForUserInterruption ret c + +; raise ld b, $4 call Func_4183f ld a, $bb @@ -68265,21 +68308,25 @@ Func_4169d: ; 4169d (10:569d) ld c, $1e call CheckForUserInterruption ret c + +; slash ld b, $5 call Func_4183f ld a, $bc call PlaySound ld de, $800 call Func_4180e +; hip ld a, $b9 call PlaySound ld a, $24 ld [$d09f], a - ld de, Unknown_41926 ; $5926 - call Func_41793 + ld de, Unknown_41926 + call AnimateIntroNidorino ld c, $1e call CheckForUserInterruption ret c + ld de, $401 call Func_4180e ld b, $3 @@ -68287,35 +68334,40 @@ Func_4169d: ; 4169d (10:569d) ld c, $3c call CheckForUserInterruption ret c + +; hip ld a, $b9 call PlaySound xor a ld [$d09f], a ld de, Unknown_41931 ; $5931 - call Func_41793 + call AnimateIntroNidorino +; hop ld a, $ba call PlaySound ld de, Unknown_4193c ; $593c - call Func_41793 + call AnimateIntroNidorino ld c, $14 call CheckForUserInterruption ret c + ld a, $24 ld [$d09f], a ld de, Unknown_41947 ; $5947 - call Func_41793 + call AnimateIntroNidorino ld c, $1e call CheckForUserInterruption ret c + +; lunge ld a, $b8 call PlaySound ld a, $48 ld [$d09f], a ld de, Unknown_41950 ; $5950 - jp Func_41793 + jp AnimateIntroNidorino -; known jump sources: 416d5 (10:56d5), 416e0 (10:56e0), 416f1 (10:56f1), 416fc (10:56fc), 41738 (10:5738), 4175e (10:575e), 41769 (10:5769), 4177a (10:577a), 41790 (10:5790), 417ac (10:57ac) -Func_41793: ; 41793 (10:5793) +AnimateIntroNidorino: ; 41793 (10:5793) ld a, [de] cp $50 ret z @@ -68326,11 +68378,11 @@ Func_41793: ; 41793 (10:5793) push de ld c, $24 call Func_417ae - ld c, $5 + ld c, 5 call DelayFrames pop de inc de - jr Func_41793 + jr AnimateIntroNidorino ; known jump sources: 417a2 (10:57a2), 41829 (10:5829) Func_417ae: ; 417ae (10:57ae) @@ -68461,25 +68513,25 @@ INCBIN "baserom.gbc",$41849,$41852 - $41849 ; known jump sources: 418ad (10:58ad) Func_41852: ; 41852 (10:5852) - ld hl, Unknown_41a99 ; $5a99 + ld hl, FightIntroBackMon ; $5a99 ld de, $9000 ld bc, $600 - ld a, BANK(Unknown_41a99) + ld a, BANK(FightIntroBackMon) call FarCopyData2 - ld hl, Unknown_41959 ; $5959 + ld hl, GameFreakIntro ; $5959 ld de, $9600 ld bc, $140 - ld a, BANK(Unknown_41959) + ld a, BANK(GameFreakIntro) call FarCopyData2 - ld hl, Unknown_41959 ; $5959 + ld hl, GameFreakIntro ; $5959 ld de, $8800 ld bc, $140 - ld a, BANK(Unknown_41959) + ld a, BANK(GameFreakIntro) call FarCopyData2 - ld hl, Unknown_42099 ; $6099 + ld hl, FightIntroFrontMon ; $6099 ld de, $8000 ld bc, $6c0 - ld a, BANK(Unknown_42099) + ld a, BANK(FightIntroFrontMon) jp FarCopyData2 ; known jump sources: 41688 (10:5688) @@ -68564,14 +68616,13 @@ INCBIN "baserom.gbc",$41947,$41950 - $41947 Unknown_41950: ; 41950 (10:5950) INCBIN "baserom.gbc",$41950,$41959 - $41950 -Unknown_41959: ; 41959 (10:5959) -INCBIN "baserom.gbc",$41959,$41a99 - $41959 +GameFreakIntro: ; 41959 (10:5959) +INCBIN "gfx/gamefreak_intro.2bpp" -Unknown_41a99: ; 41a99 (10:5a99) -INCBIN "baserom.gbc",$41a99,$42099 - $41a99 +FightIntroBackMon: ; 41a99 (10:5a99) +INCBIN "gfx/intro_fight.2bpp" -Unknown_42099: ; 42099 (10:6099) -INCBIN "baserom.gbc",$42099,$420d9 - $42099 +FightIntroFrontMon: ; 42099 (10:6099) IF _RED INCBIN "gfx/red/introfight.2bpp" @@ -68643,7 +68694,7 @@ OTString67E5: ; 427e5 (10:67e5) db "OT/",$4E db $73,"№",$F2,"@" -SECTION "bank11",DATA,BANK[$11] +SECTION "bank11",ROMX,BANK[$11] LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4) db $00 ; tileset @@ -70093,24 +70144,24 @@ Func_44fd7: ; 44fd7 (11:4fd7) Unknown_45023: ; 45023 (11:5023) ; 0x45023 XXX: it looks to me this is probably data for copying tiles into memory, maybe to mix and match a few tilesets, but I don't really know for sure - dw UnknownGFX_45087 ;address from within tileset graphics + dw SpinnerArrowAnimTiles ;address from within tileset graphics db 1 ;number of tiles to copy? - db BANK(UnknownGFX_45087) ;bank of tileset graphics + db BANK(SpinnerArrowAnimTiles) ;bank of tileset graphics dw $9200 ;where to load in VRAM - dw UnknownGFX_45087 + $10 + dw SpinnerArrowAnimTiles + $10 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $9210 - dw UnknownGFX_45087 + $20 + dw SpinnerArrowAnimTiles + $20 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $9300 - dw UnknownGFX_45087 + $30 + dw SpinnerArrowAnimTiles + $30 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $9310 dw Tset16_GFX + $200 @@ -70134,24 +70185,24 @@ Unknown_45023: ; 45023 (11:5023) dw $9310 Unknown_45053: ; 45053 (11:5053) - dw UnknownGFX_45087 + $10 + dw SpinnerArrowAnimTiles + $10 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $93C0 - dw UnknownGFX_45087 + $30 + dw SpinnerArrowAnimTiles + $30 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $93D0 - dw UnknownGFX_45087 + dw SpinnerArrowAnimTiles db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $94C0 - dw UnknownGFX_45087 + $20 + dw SpinnerArrowAnimTiles + $20 db 1 - db BANK(UnknownGFX_45087) + db BANK(SpinnerArrowAnimTiles) dw $94D0 dw Tset05_GFX + $3C0 @@ -70177,9 +70228,9 @@ Unknown_45053: ; 45053 (11:5053) Unknown_45083: ; 45083 (11:5083) INCBIN "baserom.gbc",$45083,$45087 - $45083 -; four tiles apparently forming a 2x2 diamond shaped pattern -UnknownGFX_45087: ; 45087 (11:5087) -INCBIN "baserom.gbc",$45087,$450c7 - $45087 +; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ +SpinnerArrowAnimTiles: ; 45087 (11:5087) +INCBIN "gfx/spinner_arrow.2bpp" RocketHideout2Texts: ; 450c7 (11:50c7) dw RocketHideout2Text1, Predef5CText, Predef5CText, Predef5CText, Predef5CText @@ -72933,9 +72984,7 @@ Route4HiddenObjects: ; 470a4 (11:70a4) dbw BANK(HiddenItems),HiddenItems db $FF -INCBIN "baserom.gbc",$470ab,$48000 - $470ab - -SECTION "bank12",DATA,BANK[$12] +SECTION "bank12",ROMX,BANK[$12] Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18) db $00 ; tileset @@ -73214,12 +73263,12 @@ CeladonMart3Text1: ; 4824a (12:424a) call PrintText ld bc, (TM_18 << 8) | 1 call GiveItem - jr nc, .asm_95f37 ; 0x4825e + jr nc, .BagFull ld hl, $d778 set 7, [hl] ld hl, ReceivedTM18Text jr .asm_81359 ; 0x48268 -.asm_95f37 ; 0x4826a +.BagFull ld hl, TM18NoRoomText jr .asm_81359 ; 0x4826d .asm_a5463 ; 0x4826f @@ -73485,9 +73534,9 @@ Func_4840c: ; 4840c (12:440c) ld hl, Unknown_48515 ; $4515 call PrintText call RemoveItemByIDBank12 - ld bc, $f901 ; 1x TM_49 + ld bc, (TM_49 << 8) | 1 call GiveItem - jr nc, .asm_484da + jr nc, .BagFull ld hl, Unknown_4851b ; $451b call PrintText ld hl, $d778 @@ -73500,9 +73549,9 @@ Func_4840c: ; 4840c (12:440c) ld hl, Unknown_48504 ; $4504 call PrintText call RemoveItemByIDBank12 - ld bc, $f801 ; 1x TM_48 + ld bc, (TM_48 << 8) | 1 call GiveItem - jr nc, .asm_484da + jr nc, .BagFull ld hl, Unknown_4850a ; $450a call PrintText ld hl, $d778 @@ -73515,15 +73564,15 @@ Func_4840c: ; 4840c (12:440c) ld hl, Unknown_484f3 ; $44f3 call PrintText call RemoveItemByIDBank12 - ld bc, $d501 ; 1x TM_13 + ld bc, (TM_13 << 8) | 1 call GiveItem - jr nc, .asm_484da + jr nc, .BagFull ld hl, Unknown_484f9 ; $44f9 call PrintText ld hl, $d778 set 4, [hl] ret -.asm_484da +.BagFull ld hl, Unknown_48526 ; $4526 jp PrintText .asm_484e0 @@ -73872,66 +73921,75 @@ CeladonMansion3Script: ; 48790 (12:4790) ; 0x48793 CeladonMansion3Texts: ; 48793 (12:4793) - dw CeladonMansion3Text1, CeladonMansion3Text2, CeladonMansion3Text3, CeladonMansion3Text4, CeladonMansion3Text5, CeladonMansion3Text6, CeladonMansion3Text7, CeladonMansion3Text8 + dw ProgrammerText + dw GraphicArtistText + dw WriterText + dw DirectorText + dw GameFreakPCText1 + dw GameFreakPCText2 + dw GameFreakPCText3 + dw GameFreakSignText -CeladonMansion3Text1: ; 487a3 (12:47a3) - TX_FAR _CeladonMansion3Text1 +ProgrammerText: ; 487a3 (12:47a3) + TX_FAR _ProgrammerText db $50 -CeladonMansion3Text2: ; 487a8 (12:47a8) - TX_FAR _CeladonMansion3Text2 +GraphicArtistText: ; 487a8 (12:47a8) + TX_FAR _GraphicArtistText db $50 -CeladonMansion3Text3: ; 487ad (12:47ad) - TX_FAR _CeladonMansion3Text3 +WriterText: ; 487ad (12:47ad) + TX_FAR _WriterText db $50 -CeladonMansion3Text4: ; 487b2 (12:47b2) +DirectorText: ; 487b2 (12:47b2) db $08 ; asm - ld hl, $d2f7 - ld b, $13 + + ; check pokédex + ld hl, WPokedexOwned + ld b, WPokedexOwnedEnd-WPokedexOwned call CountSetBits ld a, [$d11e] - cp $96 - jr nc, .asm_f03d0 ; 0x487c0 - ld hl, UnnamedText_487d0 - jr .asm_c13f0 ; 0x487c5 -.asm_f03d0 ; 0x487c7 - ld hl, UnnamedText_487d5 -.asm_c13f0 ; 0x487ca + cp 150 + jr nc, .CompletedDex + ld hl, .GameDesigner + jr .done +.CompletedDex + ld hl, .CompletedDexText +.done call PrintText jp TextScriptEnd -UnnamedText_487d0: ; 487d0 (12:47d0) - TX_FAR _UnnamedText_487d0 - db $50 +.GameDesigner ; 487d0 (12:47d0) + TX_FAR _GameDesignerText + db "@" ; 0x487d5 -UnnamedText_487d5: ; 487d5 (12:47d5) - TX_FAR _UnnamedText_487d5 ; 0x9d0ad +.CompletedDexText + TX_FAR _CompletedDexText ; 0x9d0ad db $6 - db $8 - ld hl, Func_566e2 - ld b, BANK(Func_566e2) + db $8 ; asm + ld hl, DisplayDiploma + ld b, BANK(DisplayDiploma) call Bankswitch ld a, $1 ld [$cc3c], a jp TextScriptEnd ; 0x487eb -CeladonMansion3Text5: ; 487eb (12:47eb) +GameFreakPCText1: ; 487eb (12:47eb) TX_FAR _CeladonMansion3Text5 db $50 -CeladonMansion3Text6: ; 487f0 (12:47f0) +GameFreakPCText2: ; 487f0 (12:47f0) TX_FAR _CeladonMansion3Text6 db $50 -CeladonMansion3Text7: ; 487f5 (12:47f5) +GameFreakPCText3: ; 487f5 (12:47f5) TX_FAR _CeladonMansion3Text7 db $50 -CeladonMansion3Text8: ; 487fa (12:47fa) +GameFreakSignText: ; 487fa (12:47fa) TX_FAR _CeladonMansion3Text8 db $50 @@ -74110,16 +74168,16 @@ Func_48963: ; 48963 (12:4963) call DisplayTextID ld hl, $d77c set 1, [hl] - ld bc, $dd01 + ld bc, (TM_21 << 8) | 1 call GiveItem - jr nc, .asm_48985 + jr nc, .BagFull ld a, $a ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID ld hl, $d77c set 0, [hl] jr .asm_4898c -.asm_48985 +.BagFull ld a, $b ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -75122,13 +75180,13 @@ CeladonDinerText5: ; 49173 (12:5173) call PrintText ld bc, (COIN_CASE << 8) | 1 call GiveItem - jr nc, .asm_78e93 ; 0x49187 + jr nc, .BagFull ld hl, $d783 set 0, [hl] ld hl, ReceivedCoinCaseText call PrintText jr .asm_68b61 ; 0x49194 -.asm_78e93 ; 0x49196 +.BagFull ld hl, CoinCaseNoRoomText call PrintText jr .asm_68b61 ; 0x4919c @@ -75674,13 +75732,13 @@ Route12GateUpstairsText1: ; 49569 (12:5569) call PrintText ld bc, (TM_39 << 8) | 1 call GiveItem - jr nc, .asm_4c2be ; 0x4957c + jr nc, .BagFull ld hl, ReceivedTM39Text call PrintText ld hl, $d7d7 set 0, [hl] jr .asm_4ba56 ; 0x49589 -.asm_4c2be ; 0x4958b +.BagFull ld hl, TM39NoRoomText call PrintText jr .asm_4ba56 ; 0x49591 @@ -77072,13 +77130,13 @@ SafariZoneSecretHouseText1: ; 4a31c (12:631c) call PrintText ld bc, (HM_03 << 8) | 1 call GiveItem - jr nc, .asm_a21d2 ; 0x4a330 + jr nc, .BagFull ld hl, ReceivedHM03Text call PrintText ld hl, $d857 set 0, [hl] jr .asm_8f1fc ; 0x4a33d -.asm_a21d2 ; 0x4a33f +.BagFull ld hl, HM03NoRoomText call PrintText jr .asm_8f1fc ; 0x4a345 @@ -77127,7 +77185,7 @@ SafariZoneSecretHouseObject: ; 0x4a365 (size=26) SafariZoneSecretHouseBlocks: ; 4a37f (12:637f) INCBIN "maps/safarizonesecrethouse.blk" -SECTION "bank13",DATA,BANK[$13] +SECTION "bank13",ROMX,BANK[$13] YoungsterPic: ; 4c000 (13:4000) INCBIN "pic/trainer/youngster.pic" @@ -77513,7 +77571,7 @@ MoveAnimationPredef: ; 4fe91 (13:7e91) dbw $1C,$778C dbw $0F,$6F18 dbw $01,$5A5F - dbw $03,$6A03 + dbw BANK(DrawBadges), DrawBadges dbw $10,$50F3 dbw $1C,$496D dbw $1E,$5DDA @@ -77573,7 +77631,7 @@ DrawHPBarPredef: ; 4ff96 (13:7f96) dbw $07,$49C6 dbw $16,$5035 -SECTION "bank14",DATA,BANK[$14] +SECTION "bank14",ROMX,BANK[$14] Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33) db $00 ; tileset @@ -79244,9 +79302,9 @@ Route24Text1: ; 514a4 (14:54a4) jr nz, .asm_a03f5 ; 0x514af $48 ld hl, UnnamedText_51510 call PrintText - ld bc, $3101 + ld bc, (NUGGET << 8) | 1 call GiveItem - jr nc, .asm_3a23d ; 0x514bd $43 + jr nc, .BagFull ld hl, $d7ef set 0, [hl] ld hl, UnnamedText_5151a @@ -79273,7 +79331,7 @@ Route24Text1: ; 514a4 (14:54a4) ld hl, UnnamedText_51530 call PrintText jp TextScriptEnd -.asm_3a23d ; 0x51502 +.BagFull ld hl, UnnamedText_51521 call PrintText ld hl, $d7f0 @@ -81735,10 +81793,10 @@ HandlePrizeChoice: ; 528c6 (14:68c6) jr nz,.GiveMon ld a,[$D11E] ld b,a - ld a,$01 + ld a,1 ld c,a call GiveItem ; GiveItem - jr nc,.BagIsFull + jr nc,.BagFull jr .SubtractCoins .GiveMon ; 14:6912 ld a,[$D11E] @@ -81763,7 +81821,7 @@ HandlePrizeChoice: ; 528c6 (14:68c6) ld a,$0C call Predef ; subtract coins (BCD daa operations) jp PrintPrizePrice -.BagIsFull ; 14:693F +.BagFull ld hl,PrizeRoomBagIsFullTextPtr jp PrintText .NotEnoughCoins ; 14:6945 @@ -81893,7 +81951,7 @@ UnnamedText_52a3d: ; 52a3d (14:6a3d) db $50 ; 0x52a3d + 5 bytes -SECTION "bank15",DATA,BANK[$15] +SECTION "bank15",ROMX,BANK[$15] Route2_h: ; 54000 (15:4000) db 00 ; Tileset @@ -85142,12 +85200,12 @@ VermilionHouse2Text1: ; 56075 (15:6075) jr nz, asm_eb1b7 ; 0x5608a ld bc, (OLD_ROD << 8) | 1 call GiveItem - jr nc, asm_fd67b ; 0x56092 + jr nc, .BagFull ld hl, $d728 set 3, [hl] ld hl, UnnamedText_560b6 jr asm_5dd95 ; 0x5609c -asm_fd67b ; 0x5609e +.BagFull ld hl, UnnamedText_560ca jr asm_5dd95 ; 0x560a1 asm_eb1b7 ; 0x560a3 @@ -85282,12 +85340,12 @@ FuchsiaHouse3Text1: ; 56181 (15:6181) jr nz, asm_3ace4 ; 0x56196 ld bc, (GOOD_ROD << 8) | 1 call GiveItem - jr nc, asm_628ee ; 0x5619e + jr nc, .BagFull ld hl, $d728 set 4, [hl] ld hl, UnnamedText_561c2 jr asm_1b09c ; 0x561a8 -asm_628ee ; 0x561aa +.BagFull ld hl, UnnamedText_5621c jr asm_1b09c ; 0x561ad asm_3ace4 ; 0x561af @@ -85540,12 +85598,12 @@ Route12HouseText1: ; 56484 (15:6484) jr nz, asm_a2d76 ; 0x56499 ld bc, (SUPER_ROD << 8) | 1 call GiveItem - jr nc, asm_e3b89 ; 0x564a1 + jr nc, .BagFull ld hl, $d728 set 5, [hl] ld hl, UnnamedText_564c5 jr asm_df984 ; 0x564ab -asm_e3b89 ; 0x564ad +.BagFull ld hl, UnnamedText_564d9 jr asm_df984 ; 0x564b0 asm_a2d76 ; 0x564b2 @@ -85840,7 +85898,7 @@ SilphCo8Object: ; 0x56613 (size=90) SilphCo8Blocks: ; 5666d (15:666d) INCBIN "maps/silphco8.blk" -Func_566e2: ; 566e2 (15:66e2) +DisplayDiploma: ; 566e2 (15:66e2) call SaveScreenTilesToBuffer2 call GBPalWhiteOutWithDelay3 call ClearScreen @@ -85849,10 +85907,10 @@ Func_566e2: ; 566e2 (15:66e2) ld hl, $d730 set 6, [hl] call DisableLCD - ld hl, UnknownGFX_2fc28 + $160 ; $7d88 ; circle tile + ld hl, BlankLeaderNames + $160 ; $7d88 ; circle tile ld de, $9700 ld bc, $0010 - ld a, BANK(UnknownGFX_2fc28) + ld a, BANK(BlankLeaderNames) call FarCopyData2 ld hl, W_SCREENTILESBUFFER ld bc, $1012 @@ -86281,7 +86339,7 @@ CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3) ret ; 56a4b (15:6a4b) -SECTION "bank16",DATA,BANK[$16] +SECTION "bank16",ROMX,BANK[$16] Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17) db $00 ; tileset @@ -87142,14 +87200,14 @@ Func_59035 ; 0x59035 call PrintText ld a, [$ff00+$dc] ld b, a - ld c, $1 + ld c, 1 call GiveItem - jr nc, .asm_59073 ; 0x59067 $a + jr nc, .BagFull ld hl, Unknown_590a5 ; $50a5 call PrintText ld a, $1 jr .asm_5908e ; 0x59071 $1b -.asm_59073 +.BagFull ld hl, UnnamedText_590ab ; $50ab call PrintText xor a @@ -89405,13 +89463,13 @@ FanClubText5: ; 59c1c (16:5c1c) call PrintText ld bc, (BIKE_VOUCHER << 8) | 1 call GiveItem - jr nc, asm_867d4 ; 0x59c3d + jr nc, .BagFull ld hl, ReceivedBikeVoucherText call PrintText ld hl, $d771 set 1, [hl] jr asm_d3c26 ; 0x59c4a -asm_867d4 ; 0x59c4c +.BagFull ld hl, UnnamedText_59c83 call PrintText jr asm_d3c26 ; 0x59c52 @@ -90478,7 +90536,7 @@ RemoveGuardDrink: ; 5a59f (16:659f) GuardDrinksList: ; 5a5b7 (16:65b7) db FRESH_WATER, SODA_POP, LEMONADE, $00 -SECTION "bank17",DATA,BANK[$17] +SECTION "bank17",ROMX,BANK[$17] SaffronMartBlocks: ; 5c000 (17:4000) LavenderMartBlocks: ; 5c000 (17:4000) @@ -90783,7 +90841,7 @@ MuseumF1Text3: ; 5c256 (17:4256) call PrintText ld bc, (OLD_AMBER << 8) | 1 call GiveItem - jr nc, .asm_91ebf ; 0x5c26a + jr nc, .BagFull ld hl, $d754 set 1, [hl] ld a, $34 @@ -90792,7 +90850,7 @@ MuseumF1Text3: ; 5c256 (17:4256) call Predef ld hl, ReceivedOldAmberText jr .asm_52e0f ; 0x5c27e -.asm_91ebf ; 0x5c280 +.BagFull ld hl, UnnamedText_5c29e jr .asm_52e0f ; 0x5c283 .asm_16599 ; 0x5c285 @@ -90988,16 +91046,16 @@ Func_5c3df: ; 5c3df (17:43df) call DisplayTextID ld hl, $d755 set 7, [hl] - ld bc, $ea01 + ld bc, (TM_34 << 8) | 1 call GiveItem - jr nc, .asm_5c401 + jr nc, .BagFull ld a, $5 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID ld hl, $d755 set 6, [hl] jr .asm_5c408 -.asm_5c401 +.BagFull ld a, $6 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -91412,16 +91470,16 @@ Func_5c70d: ; 5c70d (17:470d) call DisplayTextID ld hl, $d75e set 7, [hl] - ld bc, $d301 + ld bc, (TM_11 << 8) | 1 call GiveItem - jr nc, .asm_5c72f + jr nc, .BagFull ld a, $6 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID ld hl, $d75e set 6, [hl] jr .asm_5c736 -.asm_5c72f +.BagFull ld a, $7 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -91935,16 +91993,16 @@ Func_5caaa: ; 5caaa (17:4aaa) call DisplayTextID ld hl, $d773 set 7, [hl] - ld bc, $e001 + ld bc, (TM_24 << 8) | 1 call GiveItem - jr nc, .asm_5cacc + jr nc, .BagFull ld a, $7 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID ld hl, $d773 set 6, [hl] jr .asm_5cad3 -.asm_5cacc +.BagFull ld a, $8 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -92202,7 +92260,7 @@ CopycatsHouseF2Text1: ; 5cc82 (17:4c82) call PrintText ld bc, (TM_31 << 8) | 1 call GiveItem - jr nc, .asm_16690 ; 0x5cca8 + jr nc, .BagFull ld hl, ReceivedTM31Text call PrintText ld a, $33 @@ -92213,7 +92271,7 @@ CopycatsHouseF2Text1: ; 5cc82 (17:4c82) ld hl, $d7af set 0, [hl] jr .asm_62ecd ; 0x5ccc1 -.asm_16690 ; 0x5ccc3 +.BagFull ld hl, TM31NoRoomText call PrintText jr .asm_62ecd ; 0x5ccc9 @@ -92513,27 +92571,30 @@ FightingDojoAfterBattleText4: ; 5cf01 (17:4f01) ; 0x5cf01 + 5 bytes FightingDojoText6: ; 5cf06 (17:4f06) +; Hitmonlee Poké Ball db $08 ; asm ld a, [$d7b1] - and $c0 - jr z, .asm_f8e28 ; 0x5cf0c - ld hl, UnnamedText_5cf96 + and %11000000 + jr z, .GetMon + ld hl, OtherHitmonText call PrintText - jr .asm_3a2c8 ; 0x5cf14 -.asm_f8e28 ; 0x5cf16 - ld a, $2b - call Func_349b - ld hl, UnnamedText_5cf49 + jr .done +.GetMon + ld a, HITMONLEE + call DisplayPokedex + ld hl, WantHitmonleeText call PrintText call YesNoChoice ld a, [$cc26] and a - jr nz, .asm_3a2c8 ; 0x5cf28 + jr nz, .done ld a, [$cf91] ld b, a ld c, 30 call GivePokemon - jr nc, .asm_3a2c8 ; 0x5cf33 + jr nc, .done + + ; once Poké Ball is taken, hide sprite ld a, $4a ld [$cc4d], a ld a, $11 @@ -92541,53 +92602,56 @@ FightingDojoText6: ; 5cf06 (17:4f06) ld hl, $d7b1 set 6, [hl] set 0, [hl] -.asm_3a2c8 ; 0x5cf46 +.done jp TextScriptEnd -UnnamedText_5cf49: ; 5cf49 (17:4f49) - TX_FAR _UnnamedText_5cf49 +WantHitmonleeText: ; 5cf49 (17:4f49) + TX_FAR _WantHitmonleeText db $50 ; 0x5cf49 + 5 bytes FightingDojoText7: ; 5cf4e (17:4f4e) +; Hitmonchan Poké Ball db $08 ; asm ld a, [$d7b1] - and $c0 - jr z, .asm_170a9 ; 0x5cf54 - ld hl, UnnamedText_5cf96 + and %11000000 + jr z, .GetMon + ld hl, OtherHitmonText call PrintText - jr .asm_f1f47 ; 0x5cf5c -.asm_170a9 ; 0x5cf5e - ld a, $2c - call Func_349b - ld hl, UnnamedText_5cf91 + jr .done +.GetMon + ld a, HITMONCHAN + call DisplayPokedex + ld hl, WantHitmonchanText call PrintText call YesNoChoice ld a, [$cc26] and a - jr nz, .asm_f1f47 ; 0x5cf70 + jr nz, .done ld a, [$cf91] ld b, a ld c,30 call GivePokemon - jr nc, .asm_f1f47 ; 0x5cf7b + jr nc, .done ld hl, $d7b1 set 7, [hl] set 0, [hl] + + ; once Poké Ball is taken, hide sprite ld a, $4b ld [$cc4d], a ld a, $11 call Predef -.asm_f1f47 ; 0x5cf8e +.done jp TextScriptEnd -UnnamedText_5cf91: ; 5cf91 (17:4f91) - TX_FAR _UnnamedText_5cf91 +WantHitmonchanText: ; 5cf91 (17:4f91) + TX_FAR _WantHitmonchanText db $50 ; 0x5cf91 + 5 bytes -UnnamedText_5cf96: ; 5cf96 (17:4f96) - TX_FAR _UnnamedText_5cf96 +OtherHitmonText: ; 5cf96 (17:4f96) + TX_FAR _OtherHitmonText db $50 ; 0x5cf96 + 5 bytes @@ -92671,16 +92735,16 @@ Func_5d068: ; 5d068 (17:5068) call DisplayTextID ld hl, $d7b3 set 1, [hl] - ld bc, $f601 + ld bc, (TM_46 << 8) | 1 call GiveItem - jr nc, .asm_5d08a + jr nc, .BagFull ld a, $b ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID ld hl, $d7b3 set 0, [hl] jr .asm_5d091 -.asm_5d08a +.BagFull ld a, $c ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -94255,7 +94319,7 @@ INCBIN "baserom.gbc",$5df02,$5df07 - $5df02 call WaitForSoundToFinish jp TextScriptEnd ; 5df15 (17:5f15) -SECTION "bank18",DATA,BANK[$18] +SECTION "bank18",ROMX,BANK[$18] ViridianForestBlocks: ; 60000 (18:4000) INCBIN "maps/viridianforest.blk" @@ -96579,13 +96643,13 @@ SSAnne7Text1: ; 618ad (18:58ad) call PrintText ld bc, (HM_01 << 8) | 1 call GiveItem - jr nc, .asm_ccdcd ; 0x618c7 + jr nc, .BagFull ld hl, ReceivedHM01Text call PrintText ld hl, $d803 set 0, [hl] jr .asm_0faf5 ; 0x618d4 -.asm_ccdcd ; 0x618d6 +.BagFull ld hl, HM01NoRoomText call PrintText ld hl, $d72d @@ -96988,8 +97052,8 @@ SSAnne9Text5: ; 61bdd (18:5bdd) ld hl, UnnamedText_61bf2 call PrintText call LoadScreenTilesFromBuffer1 - ld a, $84 - call Func_349b + ld a, SNORLAX + call DisplayPokedex jp TextScriptEnd UnnamedText_61bf2: ; 61bf2 (18:5bf2) @@ -97796,13 +97860,13 @@ SilphCo11Text1: ; 622dc (18:62dc) call PrintText ld bc, (MASTER_BALL << 8) | 1 call GiveItem - jr nc, .asm_36088 ; 0x622f1 + jr nc, .BagFull ld hl, ReceivedSilphCoMasterBallText call PrintText ld hl, $d838 set 5, [hl] jr .asm_fd405 ; 0x622fe -.asm_36088 ; 0x62300 +.BagFull ld hl, SilphCoMasterBallNoRoomText call PrintText jr .asm_fd405 ; 0x62306 @@ -97896,8 +97960,8 @@ UnknownText_6236c: ; 6236c (18:636c) db $8 ld hl, UnnamedText_6237b call PrintText - ld a, $aa - call Func_349b + ld a, PORYGON + call DisplayPokedex jp TextScriptEnd ; 0x6237b @@ -98096,7 +98160,7 @@ UnnamedText_62511: ; 62511 (18:6511) INCBIN "baserom.gbc",$62529,$6252a - $62529 -SECTION "bank19",DATA,BANK[$19] +SECTION "bank19",ROMX,BANK[$19] Tset00_GFX: ; 64000 (19:4000) INCBIN "gfx/tilesets/00.2bpp" @@ -98127,7 +98191,7 @@ Tset17_GFX: ; 676f0 (19:76f0) Tset17_Block: ; 67b50 (19:7b50) INCBIN "gfx/blocksets/17.bst" -SECTION "bank1A",DATA,BANK[$1A] +SECTION "bank1A",ROMX,BANK[$1A] DecrementPP: ; 68000 (1a:4000) ; after using a move, decrement pp in battle and (if not transformed?) in party @@ -98202,7 +98266,7 @@ Tset16_GFX: ; 6b1ff (1a:71ff) Tset16_Block: ; 6b7ff (1a:77ff) INCBIN "gfx/blocksets/16.bst" -SECTION "bank1B",DATA,BANK[$1B] +SECTION "bank1B",ROMX,BANK[$1B] Tset0F_GFX: ; 6c000 (1b:4000) INCBIN "gfx/tilesets/0f.2bpp" @@ -98233,7 +98297,7 @@ Tset0B_GFX: ; 6fd60 (1b:7d60) Tset0B_Block: ; 6fef0 (1b:7ef0) INCBIN "gfx/blocksets/0b.bst" -SECTION "bank1C",DATA,BANK[$1C] +SECTION "bank1C",ROMX,BANK[$1C] ; known jump sources: 70044 (1c:4044) Func_70000: ; 70000 (1c:4000) @@ -98249,9 +98313,9 @@ Func_70000: ; 70000 (1c:4000) ld hl, $8a10 ld bc, (BANK(AnimationTileset2) << 8) + $01 call CopyVideoData - ld de, Unknown_70190 ; $4190 + ld de, FallingStar ; $4190 ld hl, $8a20 - ld bc, (BANK(Unknown_70190) << 8) + $01 + ld bc, (BANK(FallingStar) << 8) + $01 call CopyVideoData ld hl, Unknown_70140 ; $4140 ld de, $c360 @@ -98405,8 +98469,8 @@ INCBIN "baserom.gbc",$70140,$70180 - $70140 Unknown_70180: ; 70180 (1c:4180) INCBIN "baserom.gbc",$70180,$70190 - $70180 -Unknown_70190: ; 70190 (1c:4190) -INCBIN "baserom.gbc",$70190,$701a0 - $70190 +FallingStar: ; 70190 (1c:4190) +INCBIN "gfx/falling_star.2bpp" ; known jump sources: 74061 (1d:4061) Func_701a0: ; 701a0 (1c:41a0) @@ -98727,9 +98791,9 @@ Func_70423: ; 70423 (1c:4423) ; known jump sources: 7027 (1:7027) Func_70433: ; 70433 (1c:4433) - ld de, Unknown_704b7 ; $44b7 + ld de, PokeCenterHealBall ; $44b7 ld hl, $87c0 - ld bc, (BANK(Unknown_704b7) << 8) + $03 + ld bc, (BANK(PokeCenterHealBall) << 8) + $03 call CopyVideoData ld hl, $cfcb ld a, [hl] @@ -98790,8 +98854,8 @@ Func_70433: ; 70433 (1c:4433) ld [hl], a jp UpdateSprites -Unknown_704b7: ; 704b7 (1c:44b7) -INCBIN "baserom.gbc",$704b7,$704d7 - $704b7 +PokeCenterHealBall: ; 704b7 (1c:44b7) +INCBIN "gfx/pokecenter_ball.2bpp" Unknown_704d7: ; 704d7 (1c:44d7) INCBIN "baserom.gbc",$704d7,$704f3 - $704d7 @@ -99526,12 +99590,12 @@ INCBIN "baserom.gbc",$70a44,$70a4d - $70a44 ; known jump sources: 709b3 (1c:49b3) Func_70a4d: ; 70a4d (1c:4a4d) ld hl, $8ff0 - ld de, Unknown_70a59 ; $4a59 - ld bc, (BANK(Unknown_70a59) << 8) + $01 + ld de, BattleTransitionTile ; $4a59 + ld bc, (BANK(BattleTransitionTile) << 8) + $01 jp CopyVideoData -Unknown_70a59: ; 70a59 (1c:4a59) -INCBIN "baserom.gbc",$70a59,$70a69 - $70a59 +BattleTransitionTile: ; 70a59 (1c:4a59) +INCBIN "gfx/battle_transition.2bpp" ; known jump sources: 70a9f (1c:4a9f), 70bc2 (1c:4bc2), 70c0a (1c:4c0a), 70ca7 (1c:4ca7), 70cd5 (1c:4cd5), 70d4d (1c:4d4d) Func_70a69: ; 70a69 (1c:4a69) @@ -100077,8 +100141,8 @@ Func_70e3e: ; 70e3e (1c:4e3e) ld bc, $10 call CopyData ld hl, $8040 - ld de, Unknown_70f40 ; $4f40 - ld bc, (BANK(Unknown_70f40) << 8) + $04 + ld de, TownMapCursor ; $4f40 + ld bc, (BANK(TownMapCursor) << 8) + $04 call CopyVideoDataDouble xor a ld [W_WHICHTRADE], a ; $cd3d @@ -100166,8 +100230,8 @@ asm_70e92: ; 70e92 (1c:4e92) Unknown_70f11: ; 70f11 (1c:4f11) INCBIN "baserom.gbc",$70f11,$70f40 - $70f11 -Unknown_70f40: ; 70f40 (1c:4f40) -INCBIN "baserom.gbc",$70f40,$70f60 - $70f40 +TownMapCursor: ; 70f40 (1c:4f40) +INCBIN "gfx/town_map_cursor.1bpp" ; known jump sources: 4010a (10:410a) Func_70f60: ; 70f60 (1c:4f60) @@ -100206,9 +100270,9 @@ Func_70f90: ; 70f90 (1c:4f90) ld hl, $8040 ld bc, (BANK(BirdSprite) << 8) + $0c call CopyVideoData - ld de, Unknown_71093 ; $5093 + ld de, TownMapUpArrow ; $5093 ld hl, $8ed0 - ld bc, (BANK(Unknown_71093) << 8) + $01 + ld bc, (BANK(TownMapUpArrow) << 8) + $01 call CopyVideoDataDouble call Func_71070 ld hl, $cfcb @@ -100343,8 +100407,8 @@ Func_71070: ; 71070 (1c:5070) ld [hl], $ff ret -Unknown_71093: ; 71093 (1c:5093) -INCBIN "baserom.gbc",$71093,$7109b - $71093 +TownMapUpArrow: ; 71093 (1c:5093) +INCBIN "gfx/up_arrow.1bpp" ; known jump sources: 70e3e (1c:4e3e), 70f60 (1c:4f60), 70f93 (1c:4f93) Func_7109b: ; 7109b (1c:509b) @@ -100399,7 +100463,7 @@ Func_7109b: ; 7109b (1c:509b) ; 71100 (1c:5100) CompressedMap: ; 71100 (1c:5100) ; you can decompress this file with the redrle program in the extras/ dir - INCBIN "baserom.gbc",$71100,$711AB-$71100 + INCBIN "gfx/town_map.rle" ; known jump sources: 70eeb (1c:4eeb), 70f82 (1c:4f82) Func_711ab: ; 711ab (1c:51ab) @@ -101198,7 +101262,8 @@ MonOverworldData: ; 7190d (1c:590d) dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo dn SPRITE_MON, 0 ;Mew/Padding -INCBIN "baserom.gbc",$71959,$71ad9 - $71959 +MonOverworldSprites: + INCBIN "gfx/mon_ow_sprites.2bpp" Predef54: ; 71ad9 (1c:5ad9) ; trigger the trade offer/action specified by W_WHICHTRADE @@ -103294,7 +103359,7 @@ PadSRAM_FF: ; 73b8f (1c:7b8f) jp FillMemory -SECTION "bank1D",DATA,BANK[$1D] +SECTION "bank1D",ROMX,BANK[$1D] CopycatsHouseF1Blocks: ; 74000 (1d:4000) INCBIN "maps/copycatshousef1.blk" @@ -104092,16 +104157,16 @@ Unknown_74995: ; 74995 (1d:4995) call DisplayTextID ld hl, $d751 set 1, [hl] - ld bc, $e301 + ld bc, (TM_27 << 8) | 1 call GiveItem - jr nc, .asm_749b7 + jr nc, .BagFull ld a, $d ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID ld hl, $d751 set 0, [hl] jr .asm_749be -.asm_749b7 +.BagFull ld a, $e ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -104820,9 +104885,9 @@ Unknown_74ee0: ; 74ee0 (1d:4ee0) call Unknown_74fe7 ld a, [$FF00+$db] ld b, a - ld c, $1 + ld c, 1 call GiveItem - jr nc, .asm_74f8d + jr nc, .BagFull ld b, $3c .asm_74f63 ld c, $2 @@ -104843,7 +104908,7 @@ Unknown_74ee0: ; 74ee0 (1d:4ee0) ld a, $13 ld [$d125], a jp DisplayTextBoxID -.asm_74f8d +.BagFull ld hl, UnnamedText_74fdd jp PrintText .asm_74f93 @@ -104886,7 +104951,7 @@ UnnamedText_74fe2: ; 74fe2 (1d:4fe2) ; 0x74fe2 + 5 bytes Unknown_74fe7: ; 74fe7 (1d:4fe7) - ld hl, Unknown_75000 + ld hl, VendingPrices ld a, [$cc26] add a add a @@ -104902,10 +104967,11 @@ Unknown_74fe7: ; 74fe7 (1d:4fe7) ld a, [hl] ld [$ff00+$de], a ret -; 0x75000 -Unknown_75000: ; 75000 (1d:5000) -INCBIN "baserom.gbc",$75000,$7500c - $75000 +VendingPrices: ; 75000 (1d:5000) + db FRESH_WATER,$00,$02,$00 + db SODA_POP, $00,$03,$00 + db LEMONADE, $00,$03,$50 FuchsiaHouse1_h: ; 0x7500c to 0x75018 (12 bytes) (id=153) db $08 ; tileset @@ -105054,7 +105120,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2) call PrintText ld bc,(HM_04 << 8) | 1 call GiveItem - jr nc, .asm_53b90 ; 0x75115 + jr nc, .BagFull ld hl, ReceivedHM04Text call PrintText ld hl, $d78e @@ -105064,7 +105130,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2) ld hl, HM04ExplanationText call PrintText jr .asm_52039 ; 0x7512a -.asm_53b90 ; 0x7512c +.BagFull ld hl, HM04NoRoomText call PrintText .asm_52039 ; 0x75132 @@ -105561,16 +105627,16 @@ Unknown_75497: ; 75497 (1d:5497) call DisplayTextID ld hl, $d792 set 1, [hl] - ld bc, $ce01 + ld bc, (TM_06 << 8) | 1 call GiveItem - jr nc, .asm_754b9 + jr nc, .BagFull ld a, $a ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID ld hl, $d792 set 0, [hl] jr .asm_754c0 -.asm_754b9 +.BagFull ld a, $b ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call DisplayTextID @@ -106094,16 +106160,16 @@ Unknown_75857: ; 75857 (1d:5857) call DisplayTextID ld hl, $d79a set 1, [hl] - ld bc, $ee01 + ld bc, (TM_38 << 8) | 1 call GiveItem - jr nc, .asm_75879 ; 0x75869 $e + jr nc, .BagFull ld a, $b ld [$ff00+$8c], a call DisplayTextID ld hl, $d79a set 0, [hl] jr .asm_75880 ; 0x75877 $7 -.asm_75879 +.BagFull ld a, $c ld [$ff00+$8c], a call DisplayTextID @@ -106624,13 +106690,13 @@ Lab3Text1: ; 75c94 (1d:5c94) call PrintText ld bc, (TM_35 << 8) | 1 call GiveItem - jr nc, .asm_6c187 ; 0x75ca8 + jr nc, .BagFull ld hl, ReceivedTM35Text call PrintText ld hl, $d7a1 set 7, [hl] jr .asm_eb896 ; 0x75cb5 -.asm_6c187 ; 0x75cb7 +.BagFull ld hl, TM35NoRoomText call PrintText jr .asm_eb896 ; 0x75cbd @@ -108103,9 +108169,9 @@ FoundHiddenItemText: ; 7675b (1d:675b) db $8 ld a, [$cd3d] ; item ID ld b, a - ld c, 1 ; quantity + ld c, 1 call GiveItem - jr nc, .bagfull ; 0x76769 $19 + jr nc, .BagFull ld hl, $d6f0 ld a, [$cd41] ld c, a @@ -108116,7 +108182,7 @@ FoundHiddenItemText: ; 7675b (1d:675b) call PlaySoundWaitForCurrent ; play sound call WaitForSoundToFinish ; wait for sound to finish playing jp TextScriptEnd -.bagfull +.BagFull call WaitForTextScrollButtonPress ; wait for button press xor a ld [$cc3c], a @@ -108255,7 +108321,7 @@ Label76857: ; 76857 (1d:6857) inc hl jr .loop -SECTION "bank1E",DATA,BANK[$1E] +SECTION "bank1E",ROMX,BANK[$1E] ; Draws a "frame block". Frame blocks are blocks of tiles that are put ; together to form frames in battle animations. @@ -108620,10 +108686,10 @@ dw AnimationTileset1 db $FF AnimationTileset1: ; 781fe (1e:41fe) -INCBIN "baserom.gbc",$781fe,$786ee - $781fe +INCBIN "gfx/attack_anim_1.2bpp" AnimationTileset2: ; 786ee (1e:46ee) -INCBIN "baserom.gbc",$786ee,$78bde - $786ee +INCBIN "gfx/attack_anim_2.2bpp" IF _RED INCBIN "gfx/red/slotmachine2.2bpp" @@ -110738,12 +110804,12 @@ Func_79fc0: ; 79fc0 (1e:5fc0) ; known jump sources: 79fc7 (1e:5fc7) Func_79fd4: ; 79fd4 (1e:5fd4) - ld de, Unknown_79fdd ; $5fdd - ld bc, (BANK(Unknown_79fdd) << 8) + $01 + ld de, RedFishingTiles ; $5fdd + ld bc, (BANK(RedFishingTiles) << 8) + $01 jp CopyVideoData -Unknown_79fdd: ; 79fdd (1e:5fdd) -INCBIN "baserom.gbc",$79fdd,$7a07d - $79fdd +RedFishingTiles: ; 79fdd (1e:5fdd) +INCBIN "gfx/red_fishing.2bpp" Unknown_7a07d: ; 7a07d (1e:607d) INCBIN "baserom.gbc",$7a07d,$7a76d - $7a07d @@ -111119,15 +111185,15 @@ Func_7bf64: ; 7bf64 (1e:7f64) jp Delay3 ; known jump sources: 3819 (0:3819) -Func_7bf86: ; 7bf86 (1e:7f86) +GetMachinePrice: ; 7bf86 (1e:7f86) ld a, [$cf91] - sub $c9 + sub TM_01 ret c ld d, a - ld hl, Unknown_7bfa7 ; $7fa7 + ld hl, TechnicalMachinePrices ; $7fa7 srl a ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [hl] srl d @@ -111141,10 +111207,17 @@ Func_7bf86: ; 7bf86 (1e:7f86) ld [$FF00+$8d], a ret -Unknown_7bfa7: ; 7bfa7 (1e:7fa7) -INCBIN "baserom.gbc",$7bfa7,$7c000 - $7bfa7 +TechnicalMachinePrices: ; 7bfa7 (1e:7fa7) +; In thousands (nybbles). + db $32, $21, $34, $24, $34 + db $21, $45, $55, $32, $32 + db $55, $52, $54, $52, $41 + db $21, $12, $42, $25, $24 + db $22, $52, $24, $34, $42 +; 7bfc0 + -SECTION "bank1F",DATA,BANK[$1F] +SECTION "bank1F",ROMX,BANK[$1F] Unknown_7c000: ; 7c000 (1f:4000) INCBIN "baserom.gbc",$7c000,$7c361 - $7c000 @@ -112987,7 +113060,7 @@ INCBIN "baserom.gbc",$7db9b,$7dba3 - $7db9b Unknown_7dba3: ; 7dba3 (1f:5ba3) INCBIN "baserom.gbc",$7dba3,$80000 - $7dba3 -SECTION "bank20",DATA,BANK[$20] +SECTION "bank20",ROMX,BANK[$20] UnnamedText_80000: ; 80000 (20:4000) db $0, "Bingo!@@" @@ -114571,7 +114644,7 @@ _SilphCo5BattleText4: ; 82a81 (20:6a81) db "children here?", $57 ; 0x82a81 + 46 bytes -SECTION "bank21",DATA,BANK[$21] +SECTION "bank21",ROMX,BANK[$21] _SilphCo5EndBattleText4: ; 84000 (21:4000) db $0, "Oh", $4f @@ -115953,7 +116026,7 @@ _RockTunnel2EndBattleText8: ; 86c94 (21:6c94) db "away!", $58 ; 0x86c94 + 13 bytes -SECTION "bank22",DATA,BANK[$22] +SECTION "bank22",ROMX,BANK[$22] _RockTunnel2AfterBattleText8: ; 88000 (22:4000) db $0, "I'll raise my", $4f @@ -117872,7 +117945,7 @@ UnknownText_8acd6: ; 8acd6 (22:6cd6) db "time with me.", $58 ; 0x8acd6 + 35 bytes -SECTION "bank23",DATA,BANK[$23] +SECTION "bank23",ROMX,BANK[$23] _UnnamedText_56437: ; 8c000 (23:4000) db $0, "All right then,", $4f @@ -119460,7 +119533,7 @@ _Route11BattleText9: ; 8ebee (23:6bee) db "live wires!", $57 ; 0x8ebee + 27 bytes -SECTION "bank24",DATA,BANK[$24] +SECTION "bank24",ROMX,BANK[$24] _Route11EndBattleText9: ; 90000 (24:4000) db $0, "Whoa!", $4f @@ -121156,7 +121229,7 @@ _Route24BattleText1: ; 928e2 (24:68e2) db "from the grass!", $57 ; 0x928e2 + 33 bytes -SECTION "bank25",DATA,BANK[$25] +SECTION "bank25",ROMX,BANK[$25] _Route24EndBattleText1: ; 94000 (25:4000) db $0, "I", $4f @@ -122670,7 +122743,7 @@ _UnnamedText_5c49e: ; 9697a (25:697a) db "me your best!", $57 ; 0x9697a + 190 bytes -SECTION "bank26",DATA,BANK[$26] +SECTION "bank26",ROMX,BANK[$26] _UnnamedText_5c4a3: ; 98000 (26:4000) db $0, "There are all", $4f @@ -123965,7 +124038,7 @@ _UnnamedText_5cb6d: ; 9aaa5 (26:6aa5) db "do to you!", $57 ; 0x9aaa5 + 214 bytes -SECTION "bank27",DATA,BANK[$27] +SECTION "bank27",ROMX,BANK[$27] _UnnamedText_5cb72: ; 9c000 (27:4000) db $0, "A little word of", $4f @@ -124473,16 +124546,16 @@ _CeladonMansion2Text1: ; 9cf8b (27:4f8b) db $0, "GAME FREAK", $4f db "Meeting Room", $57 -_CeladonMansion3Text1: ; 9cfa4 (27:4fa4) +_ProgrammerText: ; 9cfa4 (27:4fa4) db $0, "Me? I'm the", $4f db "programmer!", $57 -_CeladonMansion3Text2: ; 9cfbc (27:4fbc) +_GraphicArtistText: ; 9cfbc (27:4fbc) db $0, "I'm the graphic", $4f db "artist!", $55 db "I drew you!", $57 -_CeladonMansion3Text3: ; 9cfe0 (27:4fe0) +_WriterText: ; 9cfe0 (27:4fe0) db $0, "I wrote the story!", $4f db "Isn't ERIKA cute?", $51 db "I like MISTY a", $4f @@ -124490,7 +124563,7 @@ _CeladonMansion3Text3: ; 9cfe0 (27:4fe0) db "Oh, and SABRINA,", $4f db "I like her!", $57 -_UnnamedText_487d0: ; 9d03a (27:503a) +_GameDesignerText: ; 9d03a (27:503a) db $0, "Is that right?", $51 db "I'm the game", $4f db "designer!", $51 @@ -124501,7 +124574,7 @@ _UnnamedText_487d0: ; 9d03a (27:503a) db "come tell me!", $57 ; 0x9d03a + 115 bytes -_UnnamedText_487d5: ; 9d0ad (27:50ad) +_CompletedDexText: ; 9d0ad (27:50ad) db $0, "Wow! Excellent!", $4f db "You completed", $55 db "your #DEX!", $55 @@ -125294,7 +125367,7 @@ _UnnamedText_75586: ; 9ea66 (27:6a66) db "SOULBADGE!", $58 ; 0x9ea66 + 62 bytes -SECTION "bank28",DATA,BANK[$28] +SECTION "bank28",ROMX,BANK[$28] _UnnamedText_7558b: ; a0000 (28:4000) db $0, "When afflicted by", $4f @@ -126178,19 +126251,19 @@ _FightingDojoAfterBattleText4: ; a1b1a (28:5b1a) db "train here.", $57 ; 0xa1b1a + 48 bytes -_UnnamedText_5cf49: ; a1b4a (28:5b4a) +_WantHitmonleeText: ; a1b4a (28:5b4a) db $0, "You want the", $4f db "hard kicking", $55 db "HITMONLEE?", $57 ; 0xa1b4a + 38 bytes -_UnnamedText_5cf91: ; a1b70 (28:5b70) +_WantHitmonchanText: ; a1b70 (28:5b70) db $0, "You want the", $4f db "piston punching", $55 db "HITMONCHAN?", $57 ; 0xa1b70 + 42 bytes -_UnnamedText_5cf96: ; a1b9a (28:5b9a) +_OtherHitmonText: ; a1b9a (28:5b9a) db $0, "Better not get", $4f db "greedy...", $57 ; 0xa1b9a + 26 bytes @@ -126724,7 +126797,7 @@ _UnnamedText_72c8: ; a29db (28:69db) db "come again!", $57 ; 0xa29db + 92 bytes -SECTION "bank29",DATA,BANK[$29] +SECTION "bank29",ROMX,BANK[$29] _UnnamedText_72cd: ; a4000 (29:4000) db $0, "Please come again!", $57 @@ -128033,7 +128106,7 @@ _BoxFullCannotThrowBallText: ; a6b69 (29:6b69) db "is full! Can't", $55 db "use that item!", $58 -SECTION "bank2A",DATA,BANK[$2A] +SECTION "bank2A",ROMX,BANK[$2A] _ItemUseText001: ; a8000 (2a:4000) db 0,$52," used@@" @@ -128215,11 +128288,11 @@ _UnnamedText_71dda: ; a82c9 (2a:42c9) db $0, " hacked", $4f db "away with CUT!", $58 -SECTION "bank2B",DATA,BANK[$2B] +SECTION "bank2B",ROMX,BANK[$2B] INCLUDE "text/pokedex.tx" -SECTION "bank2C",DATA,BANK[$2C] +SECTION "bank2C",ROMX,BANK[$2C] MoveNames: ; b0000 (2c:4000) db "POUND@" diff --git a/pic/monback/vulpikb.pic b/pic/monback/vulpikb.pic Binary files differdeleted file mode 100644 index 8cfa93dd..00000000 --- a/pic/monback/vulpikb.pic +++ /dev/null diff --git a/pokeblue.asm b/pokeblue.asm index 78f8cd48..f392bb0a 100644 --- a/pokeblue.asm +++ b/pokeblue.asm @@ -1,3 +1,4 @@ _RED EQU 0 _BLUE EQU 1 +INCLUDE "wram.asm" INCLUDE "main.tx" diff --git a/pokered.asm b/pokered.asm index a6e1f6c8..44e762cc 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1,3 +1,4 @@ _RED EQU 1 _BLUE EQU 0 +INCLUDE "wram.asm" INCLUDE "main.tx" diff --git a/wram.asm b/wram.asm new file mode 100644 index 00000000..ead23b85 --- /dev/null +++ b/wram.asm @@ -0,0 +1,4 @@ +SECTION "pokedex",WRAMX[$d2f7],BANK[1] +WPokedexOwned: + ds (150 / 8) + 1 +WPokedexOwnedEnd: |