diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2013-12-15 13:50:05 -0500 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2013-12-15 13:50:05 -0500 |
| commit | 323a1a638fb2b35a93506f1c3ca13f87e9357467 (patch) | |
| tree | 136ead68ef35cf9d40991f48c08e83d4e7820e29 | |
| parent | 75a6575b8670f1b9844482b1d29f2a9cdba0ba8e (diff) | |
incbin killing part 2
| -rwxr-xr-x | main.asm | 1549 | ||||
| -rwxr-xr-x | maps/unusedblocks58d7d.blk | 2 | ||||
| -rwxr-xr-x | maps/unusedblocks601f8.blk | 1 | ||||
| -rwxr-xr-x | maps/unusedblocks60cef.blk | 1 | ||||
| -rw-r--r-- | wram.asm | 2 |
5 files changed, 1130 insertions, 425 deletions
@@ -1214,12 +1214,12 @@ HandleBlackOut: ; 0931 (0:0931) jp Func_5d5f StopMusic: ; 0951 (0:0951) - ld [wMusicChannelPointer],a + ld [wMusicHeaderPointer],a ld a,$ff ld [$c0ee],a call PlaySound .waitLoop - ld a,[wMusicChannelPointer] + ld a,[wMusicHeaderPointer] and a jr nz,.waitLoop jp StopAllSounds @@ -5271,7 +5271,7 @@ StopAllSounds: ; 200e (0:200e) ld [$c0ef], a ld [$c0f0], a xor a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld [$c0ee], a ld [$cfca], a dec a @@ -5825,7 +5825,7 @@ asm_2324: ; 2324 (0:2324) ret z .asm_2351 ld a, c - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld a, b ld [$cfca], a ld [$c0ee], a @@ -5883,7 +5883,7 @@ PlayMusic: ; 23a1 (0:23a1) ld b, a ld [$c0ee], a xor a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld a, c ld [$c0ef], a ld [$c0f0], a @@ -5904,7 +5904,7 @@ PlaySound: ; 23b1 (0:23b1) ld [$c02c], a ld [$c02d], a .asm_23c8 - ld a, [wMusicChannelPointer] + ld a, [wMusicHeaderPointer] and a jr z, .asm_23e3 ld a, [$c0ee] @@ -5916,7 +5916,7 @@ PlaySound: ; 23b1 (0:23b1) cp $ff jr nz, .asm_2414 xor a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a .asm_23e3 xor a ld [$c0ee], a @@ -5949,11 +5949,11 @@ PlaySound: ; 23b1 (0:23b1) .asm_2414 ld a, b ld [$cfca], a - ld a, [wMusicChannelPointer] + ld a, [wMusicHeaderPointer] ld [$cfc8], a ld [$cfc9], a ld a, b - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a .asm_2425 pop bc pop de @@ -6698,7 +6698,7 @@ ResetPlayerSpriteData_ClearSpriteData: ; 28c4 (0:28c4) jp FillMemory Func_28cb: ; 28cb (0:28cb) - ld a, [wMusicChannelPointer] + ld a, [wMusicHeaderPointer] and a jr nz, .asm_28dc ld a, [$d72c] @@ -6733,10 +6733,10 @@ Func_28cb: ; 28cb (0:28cb) ld [$FF00+$24], a ret .asm_2903 - ld a, [wMusicChannelPointer] + ld a, [wMusicHeaderPointer] ld b, a xor a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld a, $ff ld [$c0ee], a call PlaySound @@ -8427,7 +8427,7 @@ PlayTrainerMusic: ; 33e8 (0:33e8) and a ret nz xor a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld a, $ff call PlaySound ; stop music ld a, BANK(Music_MeetEvilTrainer) @@ -10531,7 +10531,7 @@ Func_3eb5: ; 3eb5 (0:3eb5) Func_3ef5: ; 3ef5 (0:3ef5) ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c - ld hl, $3f22 + ld hl, PointerTable_3f22 call Func_3f0f ld hl, $cf11 set 0, [hl] @@ -10555,7 +10555,8 @@ Func_3f0f: ; 3f0f (0:3f0f) ld a, h ld [$d36d], a ret -; 3f22 (0:3f22) + +PointerTable_3f22: ; 3f22 (0:3f22) dw $66ee dw $66f8 dw $5b8e @@ -13728,7 +13729,7 @@ Func_5849: ld a, [hl] ld [$cd3e], a ld a, $a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld a, $2 ld [$c0f0], a ld a, $e5 @@ -13825,7 +13826,7 @@ Func_5a5f: ; 5a5f (1:5a5f) ld [W_ISLINKBATTLE], a ; $d12b ld [$FF00+$b5], a ld a, $a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld a, BANK(Music_Celadon) ld [$c0f0], a ld a, (Music_Celadon - $4000) / 3 @@ -14742,7 +14743,7 @@ Func_61bc: ; 61bc (1:61bc) ld [$C0EF],a ld [$C0F0],a ld a,$A - ld [wMusicChannelPointer],a + ld [wMusicHeaderPointer],a ld a,$FF ld [$C0EE],a call PlaySound ; stop music @@ -16576,7 +16577,7 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) ld hl, Func_70433 call Bankswitch ; do the healing machine animation xor a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld a, [$c0f0] ld [$c0ef], a ld a, [$d35b] @@ -18363,7 +18364,7 @@ INCLUDE "music/sfx/sfx_02_36.asm" PlayBattleMusic: ; 0x90c6 xor a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld [$d083], a dec a ld [$c0ee], a @@ -20116,7 +20117,7 @@ Music_Cities1AlternateTempo: ; 0x9b81 ld [$cfc8], a ld [$cfc9], a ld a, $ff - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld c, $64 call DelayFrames ld c, BANK(Music_Cities1) @@ -21142,13 +21143,13 @@ Func_c44e: ; c44e (3:444e) push bc call Func_c589 ld a, [W_CURMAP] ; $d35e - cp $63 - jr z, .asm_c490 + cp SS_ANNE_5 + jr z, .ssAnne5 ld a, [$c109] srl a ld c, a ld b, $0 - ld hl, .unknown_c477 ; $4477 + ld hl, .pointerTable_c477 ; $4477 add hl, bc ld a, [hli] ld h, [hl] @@ -21162,10 +21163,25 @@ Func_c44e: ; c44e (3:444e) pop hl ret -.unknown_c477: ; c477 (3:4477) -INCBIN "baserom.gbc",$c477,$c490 - $c477 +.pointerTable_c477: ; c477 (3:4477) + dw .arrayData_c47f + dw .arrayData_c487 + dw .arrayData_c48a + dw .arrayData_c48d + +.arrayData_c47f + db $01,$12,$17,$3D,$04,$18,$33,$FF + +.arrayData_c487 + db $01,$5C,$FF -.asm_c490 +.arrayData_c48a + db $1A,$4B,$FF + +.arrayData_c48d + db $0F,$4E,$FF + +.ssAnne5 ld a, [$cfc6] cp $15 jr nz, .asm_c49a @@ -21187,7 +21203,7 @@ Func_c49d: ; c49d (3:449d) add a ld c, a ld b, $0 - ld hl, Unknown_c4cc ; $44cc + ld hl, WarpTileIDPointers ; $44cc add hl, bc ld a, [hli] ld h, [hl] @@ -21205,14 +21221,97 @@ Func_c49d: ; c49d (3:449d) pop hl ret -Unknown_c4cc: ; c4cc (3:44cc) -INCBIN "baserom.gbc",$c4cc,$c52f - $c4cc +WarpTileIDPointers: ; c4cc (3:44cc) + dw Tileset00WarpTileIDs + dw Tileset01WarpTileIDs + dw Tileset02WarpTileIDs + dw Tileset03WarpTileIDs + dw Tileset04WarpTileIDs + dw Tileset05WarpTileIDs + dw Tileset06WarpTileIDs + dw Tileset07WarpTileIDs + dw Tileset08WarpTileIDs + dw Tileset09WarpTileIDs + dw Tileset0AWarpTileIDs + dw Tileset0BWarpTileIDs + dw Tileset0CWarpTileIDs + dw Tileset0DWarpTileIDs + dw Tileset0EWarpTileIDs + dw Tileset0FWarpTileIDs + dw Tileset10WarpTileIDs + dw Tileset11WarpTileIDs + dw Tileset12WarpTileIDs + dw Tileset13WarpTileIDs + dw Tileset14WarpTileIDs + dw Tileset15WarpTileIDs + dw Tileset16WarpTileIDs + dw Tileset17WarpTileIDs + +Tileset00WarpTileIDs: ; c4fc (3:44fc) + db $1B,$58,$FF + +Tileset09WarpTileIDs: ; c4ff (3:44ff) +Tileset0AWarpTileIDs: ; c4ff (3:44ff) +Tileset0CWarpTileIDs: ; c4ff (3:44ff) + db $3B + +Tileset01WarpTileIDs: ; c500 (3:4500) +Tileset04WarpTileIDs: ; c500 (3:4500) + db $1A,$1C,$FF + +Tileset02WarpTileIDs: ; c503 (3:4503) +Tileset06WarpTileIDs: ; c503 (3:4503) + db $5E,$FF + +Tileset03WarpTileIDs: ; c505 (3:4505) + db $5A,$5C,$3A,$FF + +Tileset05WarpTileIDs: ; c509 (3:4509) +Tileset07WarpTileIDs: ; c509 (3:4509) + db $4A,$FF + +Tileset08WarpTileIDs: ; c50b (3:450b) + db $54,$5C,$32,$FF + +Tileset0DWarpTileIDs: ; c50f (3:450f) + db $37,$39,$1E,$4A,$FF + +Tileset10WarpTileIDs: ; c514 (3:4514) + db $15,$55,$04,$FF + +Tileset11WarpTileIDs: ; c518 (3:4518) + db $18,$1A,$22,$FF + +Tileset12WarpTileIDs: ; c51c (3:451c) + db $1A,$1C,$38,$FF + +Tileset13WarpTileIDs: ; c520 (3:4520) + db $1A,$1C,$53,$FF + +Tileset14WarpTileIDs: ; c524 (3:4524) + db $34,$FF + +Tileset16WarpTileIDs: ; c526 (3:4526) + db $43,$58,$20 + +Tileset0FWarpTileIDs: ; c529 (3:4529) + db $1B + +Tileset0BWarpTileIDs: ; c52a (3:452a) + db $13,$FF + +Tileset17WarpTileIDs: ; c52c (3:452c) + db $1B,$3B + +Tileset0EWarpTileIDs: ; c52e (3:452e) +Tileset15WarpTileIDs: ; c52e (3:452e) + db $FF Func_c52f: ; c52f (3:452f) ld a, [W_CURMAP] ; $d35e - cp $d9 + cp SAFARI_ZONE_EAST ret c - cp $e2 + cp UNKNOWN_DUNGEON_2 ret nc ld hl, wTileMap ld b, $3 @@ -21583,7 +21682,7 @@ Func_c754: ; c754 (3:4754) ld a, [W_CURMAPTILESET] ; $d367 push hl push de - ld hl, Unknown_c7b2 ; $47b2 + ld hl, DungeonTilesetIDs ; $47b2 ld de, $1 call IsInArray pop de @@ -21608,8 +21707,8 @@ Func_c754: ; c754 (3:4754) .asm_c7b1 ret -Unknown_c7b2: ; c7b2 (3:47b2) -INCBIN "baserom.gbc",$c7b2,$c7be - $c7b2 +DungeonTilesetIDs: ; c7b2 (3:47b2) + db $03,$0A,$0D,$11,$12,$13,$0C,$14,$16,$0F,$07,$FF TilesetsHeadPtr: ; c7be (3:47be) TSETHEAD Tset00_Block,Tset00_GFX,Tset00_Coll,$FF,$FF,$FF,$52,2 @@ -28164,8 +28263,8 @@ ItemUseItemfinder: ; e2e1 (3:62e1) and a jp nz,ItemUseNotTime call ItemUseReloadOverworldData - ld b,BANK(Unknown_7481f) - ld hl,Unknown_7481f + ld b,BANK(Func_7481f) + ld hl,Func_7481f call Bankswitch ; check for hidden items ld hl,ItemfinderFoundNothingText jr nc,.printText ; if no hidden items @@ -31214,7 +31313,7 @@ Func_f9a0: ; f9a0 (3:79a0) Func_f9bf: ; f9bf (3:79bf) push hl ld b, a - ld hl, Unknown_f9d2 + ld hl, DataTable_f9d2 .asm_f9c4 ld a, [hli] cp $ff @@ -31229,9 +31328,11 @@ Func_f9bf: ; f9bf (3:79bf) pop hl ret -Unknown_f9d2: ; f9d2 (3:79d2) - ;db $40, $40, $00, $80, $80, $20, $c0, $10, $ff, $c9 -INCBIN "baserom.gbc",$f9d2,$f9dc - $f9d2 +DataTable_f9d2: ; f9d2 (3:79d2) + db $40, $40, $00, $80, $80, $20, $c0, $10, $ff + +Func_f9db: ; f9db (3:79db) + ret Func_f9dc: ; f9dc (3:79dc) call Load16BitRegisters @@ -31501,6 +31602,7 @@ UpdateHPBar_CalcOldNewHPBarPixels: ; fb30 (3:7b30) pop hl ret +; prints text for bookshelves in buildings without sign events Func_fb50: ; fb50 (3:7b50) ld a, [$c109] cp $4 @@ -31510,7 +31612,7 @@ Func_fb50: ; fb50 (3:7b50) FuncCoord 8, 7 ; $c434 ld a, [Coord] ld c, a - ld hl, Unknown_fb8b ; $7b8b + ld hl, BookshelfTileIDs ; $7b8b .asm_fb62 ld a, [hli] cp $ff @@ -31540,8 +31642,39 @@ Func_fb50: ; fb50 (3:7b50) ld hl, Func_52673 jp Bankswitch ; indirect jump to Func_52673 (52673 (14:6673)) -Unknown_fb8b: ; fb8b (3:7b8b) -INCBIN "baserom.gbc",$fb8b,$fbd9 - $fb8b +; format: db tileset id, bookshelf tile id, unknown +BookshelfTileIDs: ; fb8b (3:7b8b) + db $17,$30,$3A + db $08,$3D,$3F + db $08,$1E,$40 + db $13,$32,$40 + db $01,$32,$40 + db $14,$28,$40 + db $12,$16,$41 + db $07,$1D,$40 + db $05,$1D,$40 + db $0C,$22,$40 + db $02,$54,$42 + db $02,$55,$42 + db $06,$54,$42 + db $06,$55,$42 + db $12,$50,$42 + db $12,$52,$42 + db $0D,$36,$40 + db $FF + +UnnamedText_fbbf: ; fbbf (3:7bbf) + db $08 ; asm + ld hl, UnnamedText_fbd9 + call PrintText + ld a, [W_XCOORD] + bit 0, a + ld hl, UnnamedText_fbde + jr nz, .asm_fbd3 + ld hl, UnnamedText_fbe3 +.asm_fbd3 + call PrintText + jp TextScriptEnd UnnamedText_fbd9: ; fbd9 (3:7bd9) TX_FAR _UnnamedText_fbd9 @@ -31559,13 +31692,12 @@ UnnamedText_fbe8: ; fbe8 (3:7be8) db $08 ; asm ld hl, UnnamedText_fc03 ld a, [W_CURMAPTILESET] - cp $13 + cp $13 ; Celadon Mansion tileset jr nz, .asm_fbfd ld a, [$c420] cp $38 jr nz, .asm_fbfd ld hl, UnnamedText_fc08 - .asm_fbfd call PrintText jp TextScriptEnd @@ -33711,10 +33843,10 @@ Func_13870: ; 13870 (4:7870) ld a, [W_WATERRATE] ; $d8a4 jr z, .asm_138c4 ld a, [W_CURMAP] ; $d35e - cp $25 + cp REDS_HOUSE_1F jr c, .asm_13912 ld a, [W_CURMAPTILESET] ; $d367 - cp $3 + cp $3 ; Viridian Forest/Safari Zone jr z, .asm_13912 ld a, [W_GRASSRATE] ; $d887 .asm_138c4 @@ -39214,7 +39346,7 @@ RivalIDs: ; 1a605 (6:6605) Func_1a609: ; 1a609 (6:6609) push de - ld hl, TilesetArray_1a62c ; $662c + ld hl, DoorTileIDPointers ; $662c ld a, [W_CURMAPTILESET] ; $d367 ld de, $3 call IsInArray @@ -39239,63 +39371,63 @@ Func_1a609: ; 1a609 (6:6609) and a ret -TilesetArray_1a62c: ; 1a62c (6:662c) +DoorTileIDPointers: ; 1a62c (6:662c) db $00 - dw UnknownTilesetData1a654 + dw Tileset00DoorTileIDs db $03 - dw UnknownTilesetData1a657 + dw Tileset03DoorTileIDs db $02 - dw UnknownTilesetData1a659 + dw Tileset02DoorTileIDs db $08 - dw UnknownTilesetData1a65b + dw Tileset08DoorTileIDs db $09 - dw UnknownTilesetData1a65d + dw TilesetMuseumDoorTileIDs db $0a - dw UnknownTilesetData1a65d + dw TilesetMuseumDoorTileIDs db $0c - dw UnknownTilesetData1a65d + dw TilesetMuseumDoorTileIDs db $0d - dw UnknownTilesetData1a65f + dw Tileset0DDoorTileIDs db $12 - dw UnknownTilesetData1a661 + dw Tileset12DoorTileIDs db $13 - dw UnknownTilesetData1a665 + dw Tileset13DoorTileIDs db $14 - dw UnknownTilesetData1a669 + dw Tileset14DoorTileIDs db $16 - dw UnknownTilesetData1a66b + dw Tileset16DoorTileIDs db $17 dw UnknownTilesetData1a66f db $ff -UnknownTilesetData1a654: ; 1a654 (6:6654) +Tileset00DoorTileIDs: ; 1a654 (6:6654) db $1B,$58,$00 -UnknownTilesetData1a657: ; 1a657 (6:6657) +Tileset03DoorTileIDs: ; 1a657 (6:6657) db $3a,$00 -UnknownTilesetData1a659: ; 1a659 (6:6659) +Tileset02DoorTileIDs: ; 1a659 (6:6659) db $5e,$00 -UnknownTilesetData1a65b: ; 1a65b (6:665b) +Tileset08DoorTileIDs: ; 1a65b (6:665b) db $54,$00 -UnknownTilesetData1a65d: ; 1a65d (6:665d) +TilesetMuseumDoorTileIDs: ; 1a65d (6:665d) db $3b,$00 -UnknownTilesetData1a65f: ; 1a65f (6:665f) +Tileset0DDoorTileIDs: ; 1a65f (6:665f) db $1e,$00 -UnknownTilesetData1a661: ; 1a661 (6:6661) +Tileset12DoorTileIDs: ; 1a661 (6:6661) db $1c,$38,$1a,$00 -UnknownTilesetData1a665: ; 1a665 (6:6665) +Tileset13DoorTileIDs: ; 1a665 (6:6665) db $1a,$1c,$53,$00 -UnknownTilesetData1a669: ; 1a669 (6:6669) +Tileset14DoorTileIDs: ; 1a669 (6:6669) db $34,$00 -UnknownTilesetData1a66b: ; 1a66b (6:666b) +Tileset16DoorTileIDs: ; 1a66b (6:666b) db $43,$58,$1b,$00 UnknownTilesetData1a66f: ; 1a66f (6:666f) @@ -44060,7 +44192,7 @@ asm_1e9ab: ; 1e9ab (7:69ab) asm_1e9b0: ; 1e9b0 (7:69b0) call EnableAutoTextBoxDrawing xor a - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a dec a call PlaySound ld c, BANK(SFX_02_5f) @@ -44448,7 +44580,7 @@ UnnamedText_1ecaa: ; 1ecaa (7:6caa) TX_FAR _UnnamedText_1ecaa db "@" -Unknown_1ecaf +Func_1ecaf: ; 1ecaf (7:6caf) ld a, [$c109] cp $4 ret nz @@ -57767,7 +57899,7 @@ Func_3a902: ; 3a902 (e:6902) FuncCoord 18, 10 ; $c47a ld hl, Coord ld de, rIE ; $ffff - jr asm_3a930 + jr Func_3a930 Unknown_3a916: ; 3a916 (e:6916) INCBIN "baserom.gbc",$3a916,$3a919 - $3a916 @@ -57780,11 +57912,12 @@ Func_3a919: ; 3a919 (e:6919) FuncCoord 1, 2 ; $c3c9 ld hl, Coord ld de, $1 - jr asm_3a930 + jr Func_3a930 Unknown_3a92d: ; 3a92d (e:692d) INCBIN "baserom.gbc",$3a92d,$3a930 - $3a92d -asm_3a930: ; 3a930 (e:6930) + +Func_3a930: ; 3a930 (e:6930) ld [hl], $73 ld bc, $14 add hl, bc @@ -64463,11 +64596,12 @@ Func_3daad: ; 3daad (f:5aad) jp ApplyDamageToPlayerPokemon Func_3daf5: ; 3daf5 (f:5af5) - ld hl, Unknown_3dafb ; $5afb + ld hl, UnnamedText_3dafb ; $5afb jp PrintText -Unknown_3dafb: ; 3dafb (f:5afb) -INCBIN "baserom.gbc",$3dafb,$3db00 - $3dafb +UnnamedText_3dafb: ; 3dafb (f:5afb) + TX_FAR _UnnamedText_3dafb + db $08 ; asm ld a, [H_WHOSETURN] ; $FF00+$f3 and a ld a, [W_PLAYERMOVENUM] ; $cfd2 @@ -64481,38 +64615,42 @@ INCBIN "baserom.gbc",$3dafb,$3db00 - $3dafb call Func_3db85 ld a, [$cced] and a - ld hl, Unknown_3db34 ; $5b34 + ld hl, UnnamedText_3db34 ; $5b34 ret nz ld a, [$d11e] cp $3 - ld hl, Unknown_3db34 ; $5b34 + ld hl, UnnamedText_3db34 ; $5b34 ret c - ld hl, Unknown_3db2d ; $5b2d + ld hl, UnnamedText_3db2d ; $5b2d ret -Unknown_3db2d: ; 3db2d (f:5b2d) -INCBIN "baserom.gbc",$3db2d,$3db32 - $3db2d - jr asm_3db39 +UnnamedText_3db2d: ; 3db2d (f:5b2d) + TX_FAR _UnnamedText_3db2d + db $08 ; asm + jr Func_3db39 -Unknown_3db34: ; 3db34 (f:5b34) -INCBIN "baserom.gbc",$3db34,$3db39 - $3db34 +UnnamedText_3db34: ; 3db34 (f:5b34) + TX_FAR _UnnamedText_3db34 + db $08 ; asm -asm_3db39 +Func_3db39: ; 3db39 (f:5b39) ld a, [$cced] and a - jr z, .asm_3db48 - ld hl, .unknown_3db43 ; $5b43 + jr z, Func_3db48 + ld hl, UnnamedText_3db43 ; $5b43 ret -.unknown_3db43: ; 3db43 (f:5b43) -INCBIN "baserom.gbc",$3db43,$3db48 - $3db43 +UnnamedText_3db43: ; 3db43 (f:5b43) + TX_FAR _UnnamedText_3db43 + db $08 ; asm -.asm_3db48 - ld hl, Unknown_3db4c ; $5b4c +Func_3db48: ; 3db48 (f:5b48) + ld hl, UnnamedText_3db4c ; $5b4c ret -Unknown_3db4c: ; 3db4c (f:5b4c) -INCBIN "baserom.gbc",$3db4c,$3db51 - $3db4c +UnnamedText_3db4c: ; 3db4c (f:5b4c) + TX_FAR _UnnamedText_3db4c + db $08 ; asm ld hl, TextPointerTable_3db62 ld a, [$d11e] add a @@ -67375,11 +67513,11 @@ Func_3ee5b: ; 3ee5b (f:6e5b) jp CopyVideoDataDouble Func_3ee94: ; 3ee94 (f:6e94) - ld hl, Unknown_3ee9a ; $6e9a + ld hl, TerminatorText_3ee9a ; $6e9a jp PrintText -Unknown_3ee9a: ; 3ee9a (f:6e9a) -INCBIN "baserom.gbc",$3ee9a,$3ee9b - $3ee9a +TerminatorText_3ee9a: ; 3ee9a (f:6e9a) + db "@" ; generates a random number unless in link battle ; stores random number in A @@ -67633,7 +67771,11 @@ Func_3f04b: ; 3f04b (f:704b) ld c, a jp LoadUncompressedSpriteData -INCBIN "baserom.gbc",$3f069,$3f073 - $3f069 +Func_3f069: ; 3f069 (f:7069) + xor a + ld [$c0f1], a + ld [$c0f2], a + jp PlaySound Func_3f073: ; 3f073 (f:7073) ld a, [$cc4f] @@ -68328,7 +68470,7 @@ asm_3f4ca: ; 3f4ca (f:74ca) ld a, [H_WHOSETURN] ; $FF00+$f3 and a call z, Func_3ee19 - ld hl, Unknown_3f528 ; $7528 + ld hl, UnnamedText_3f528 ; $7528 call PrintText call Func_3ed27 jp Func_3ed64 @@ -68341,8 +68483,9 @@ Func_3f522: ; 3f522 (f:7522) ld hl, UnnamedText_3fb3e ; $7b3e jp PrintText -Unknown_3f528: ; 3f528 (f:7528) -INCBIN "baserom.gbc",$3f528,$3f52d - $3f528 +UnnamedText_3f528: ; 3f528 (f:7528) + TX_FAR _UnnamedText_3f528 + db $08 ; asm ld hl, UnnamedText_3f542 ; $7542 ld a, [H_WHOSETURN] ; $FF00+$f3 and a @@ -68356,7 +68499,8 @@ INCBIN "baserom.gbc",$3f528,$3f52d - $3f528 ret UnnamedText_3f542: ; 3f542 (f:7542) -INCBIN "baserom.gbc",$3f542,$3f547 - $3f542 + db $0a + TX_FAR _UnnamedText_3f542 UnnamedText_3f547: ; 3f547 (f:7547) TX_FAR _UnnamedText_3f547 @@ -68535,7 +68679,8 @@ Func_3f65a: ; 3f65a (f:765a) jp Func_3fb4e UnnamedText_3f661: ; 3f661 (f:7661) -INCBIN "baserom.gbc",$3f661,$3f666 - $3f661 + TX_FAR _UnnamedText_3f661 + db $08 ; asm ld hl, UnnamedText_3f683 ; $7683 ld a, [H_WHOSETURN] ; $FF00+$f3 and a @@ -68547,11 +68692,12 @@ INCBIN "baserom.gbc",$3f661,$3f666 - $3f661 ret c cp $44 ret nc - ld hl, Unknown_3f67e ; $767e + ld hl, UnnamedText_3f67e ; $767e ret -Unknown_3f67e: ; 3f67e (f:767e) -INCBIN "baserom.gbc",$3f67e,$3f683 - $3f67e +UnnamedText_3f67e: ; 3f67e (f:767e) + db $0a + TX_FAR _UnnamedText_3f67e UnnamedText_3f683: ; 3f683 (f:7683) TX_FAR _UnnamedText_3f683 @@ -68849,11 +68995,12 @@ Func_3f88c: ; 3f88c (f:788c) call Func_3fbb9 ld a, [de] ld [wWhichTrade], a ; $cd3d - ld hl, Unknown_3f8c8 ; $78c8 + ld hl, UnnamedText_3f8c8 ; $78c8 jp PrintText -Unknown_3f8c8: ; 3f8c8 (f:78c8) -INCBIN "baserom.gbc",$3f8c8,$3f8cd - $3f8c8 +UnnamedText_3f8c8: ; 3f8c8 (f:78c8) + TX_FAR _UnnamedText_3f8c8 + db $08 ; asm ld a, [wWhichTrade] ; $cd3d cp $d ld hl, UnnamedText_3f8f9 ; $78f9 @@ -71470,7 +71617,7 @@ Func_410e2: ; 410e2 (10:50e2) ld [$cd5e], a ld a, [wTrainerEngageDistance] ld [$cd5f], a - ld de, Unknown_41138 ; $5138 + ld de, PointerIDs_41138 ; $5138 jr Func_41102 Func_410f3: ; 410f3 (10:50f3) @@ -71478,7 +71625,7 @@ Func_410f3: ; 410f3 (10:50f3) ld [$cd5e], a ld a, [wTrainerSpriteOffset] ld [$cd5f], a - ld de, Unknown_41149 + ld de, PointerIDs_41149 Func_41102: ; 41102 (10:5102) ld a, [W_OPTIONS] ; $d355 @@ -71519,11 +71666,12 @@ Func_41102: ; 41102 (10:5102) ld [W_OPTIONS], a ; $d355 ret -Unknown_41138: ; 41138 (10:5138) -INCBIN "baserom.gbc",$41138,$41149 - $41138 +; these bytes refer to the $00th through $10th pointer of PointerTable_4115f +PointerIDs_41138: ; 41138 (10:5138) + db $00,$01,$02,$03,$05,$07,$08,$09,$0A,$0B,$06,$08,$02,$04,$07,$0E,$FF -Unknown_41149: ; 41149 (10:5149) -INCBIN "baserom.gbc",$41149,$4115f - $41149 +PointerIDs_41149: ; 41149 (10:5149) + db $00,$08,$0D,$0B,$10,$05,$10,$08,$02,$04,$0F,$01,$02,$03,$10,$06,$10,$07,$08,$09,$0E,$FF PointerTable_4115f: ; 4115f (10:515f) dw Func_411a1 @@ -73571,7 +73719,9 @@ SeafoamIslands1Object: ; 0x4484f (size=72) EVENT_DISP $f, $3, $19 ; SEAFOAM_ISLANDS_2 EVENT_DISP $f, $f, $17 ; SEAFOAM_ISLANDS_2 -INCBIN "baserom.gbc",$44897,$4489f - $44897 + ; holes + EVENT_DISP $f, $6, $11 + EVENT_DISP $f, $6, $18 SeafoamIslands1Blocks: ; 4489f (11:489f) INCBIN "maps/seafoamislands1.blk" @@ -74431,9 +74581,9 @@ Func_44fd7: ; 44fd7 (11:4fd7) ld [$c102], a ld a, [W_CURMAPTILESET] ; $d367 cp $16 - ld hl, Unknown_45023 ; $5023 + ld hl, SpinnerArrowTilePointers1 ; $5023 jr z, .asm_44ff6 - ld hl, Unknown_45053 ; $5053 + ld hl, SpinnerArrowTilePointers2 ; $5053 .asm_44ff6 ld a, [$cd38] bit 0, a @@ -74470,12 +74620,11 @@ Func_44fd7: ; 44fd7 (11:4fd7) jr nz, .asm_45006 ret -Unknown_45023: ; 45023 (11:5023) -; 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 +SpinnerArrowTilePointers1: ; 45023 (11:5023) dw SpinnerArrowAnimTiles ;address from within tileset graphics - db 1 ;number of tiles to copy? + db 1 ;number of tiles to copy? db BANK(SpinnerArrowAnimTiles) ;bank of tileset graphics - dw $9200 ;where to load in VRAM + dw $9200 ;where to load in VRAM dw SpinnerArrowAnimTiles + $10 db 1 @@ -74494,25 +74643,25 @@ Unknown_45023: ; 45023 (11:5023) dw Tset16_GFX + $200 db 1 - db $1A + db BANK(Tset16_GFX) dw $9200 dw Tset16_GFX + $210 db 1 - db $1A + db BANK(Tset16_GFX) dw $9210 dw Tset16_GFX + $300 db 1 - db $1A + db BANK(Tset16_GFX) dw $9300 dw Tset16_GFX + $310 db 1 - db $1A + db BANK(Tset16_GFX) dw $9310 -Unknown_45053: ; 45053 (11:5053) +SpinnerArrowTilePointers2: ; 45053 (11:5053) dw SpinnerArrowAnimTiles + $10 db 1 db BANK(SpinnerArrowAnimTiles) @@ -74535,22 +74684,22 @@ Unknown_45053: ; 45053 (11:5053) dw Tset05_GFX + $3C0 db 1 - db $1A + db BANK(Tset16_GFX) dw $93C0 dw Tset05_GFX + $3D0 db 1 - db $1A + db BANK(Tset16_GFX) dw $93D0 dw Tset05_GFX + $4C0 db 1 - db $1A + db BANK(Tset16_GFX) dw $94C0 dw Tset05_GFX + $4D0 db 1 - db $1A + db BANK(Tset16_GFX) dw $94D0 Unknown_45083: ; 45083 (11:5083) @@ -75172,23 +75321,23 @@ RocketHideoutElevatorScript: ; 45710 (11:5710) ret RocketHideoutElevatorScript_4572c: ; 4572c (11:572c) - ld hl, $d3af - ld a, [$d73b] - ld b, a - ld a, [$d73c] - ld c, a - call RocketHideoutElevatorScript_4573a + ld hl, $d3af + ld a, [$d73b] + ld b, a + ld a, [$d73c] + ld c, a + call RocketHideoutElevatorScript_4573a RocketHideoutElevatorScript_4573a: ; 4573a (11:573a) - inc hl - inc hl - ld a, b - ld [hli], a - ld a, c - ld [hli], a - ret - -Func_45741: ; 45741 (11:5741) + inc hl + inc hl + ld a, b + ld [hli], a + ld a, c + ld [hli], a + ret + +RocketHideoutElevatorScript_45741: ; 45741 (11:5741) ld hl, Unknown_45754 ; $5754 call LoadItemList ld hl, Unknown_45759 ; $5759 @@ -75218,7 +75367,7 @@ RocketHideoutElevatorText1: ; 4576d (11:576d) ld b, LIFT_KEY call IsItemInBag jr z, .asm_8d8f0 ; 0x45773 - call Func_45741 + call RocketHideoutElevatorScript_45741 ld hl, Unknown_45759 ; $5759 ld a, $61 call Predef @@ -75282,9 +75431,9 @@ SilphCoElevatorScript_457dc: ; 457dc (11:57dc) ld b, a ld a, [$d73c] ld c, a - call Func_457ea + call SilphCoElevatorScript_457ea -Func_457ea: ; 457ea (11:57ea) +SilphCoElevatorScript_457ea: ; 457ea (11:57ea) inc hl inc hl ld a, b @@ -75293,7 +75442,7 @@ Func_457ea: ; 457ea (11:57ea) ld [hli], a ret -Func_457f1: ; 457f1 (11:57f1) +SilphCoElevatorScript_457f1: ; 457f1 (11:57f1) ld hl, Unknown_45804 ; $5804 call LoadItemList ld hl, Unknown_45811 ; $5811 @@ -75320,7 +75469,7 @@ SilphCoElevatorTextPointers: ; 45833 (11:5833) SilphCoElevatorText1: ; 45835 (11:5835) db $08 ; asm - call Func_457f1 + call SilphCoElevatorScript_457f1 ld hl, Unknown_45811 ; $5811 ld a, $61 call Predef @@ -78082,11 +78231,11 @@ CeladonMartRoof_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126) CeladonMartRoofScript: ; 483d5 (12:43d5) jp EnableAutoTextBoxDrawing -Func_483d8: ; 483d8 (12:43d8) +CeladonMartRoofScript_483d8: ; 483d8 (12:43d8) xor a ld [$cd37], a ld de, $cc5b - ld hl, Unknown_48408 ; $4408 + ld hl, CeladonMartRoofDrinkList ; $4408 .asm_483e2 ld a, [hli] and a @@ -78115,10 +78264,13 @@ Func_483d8: ; 483d8 (12:43d8) ld [de], a ret -Unknown_48408: ; 48408 (12:4408) -INCBIN "baserom.gbc",$48408,$4840c - $48408 +CeladonMartRoofDrinkList: ; 48408 (12:4408) + db FRESH_WATER + db SODA_POP + db LEMONADE + db $00 -Func_4840c: ; 4840c (12:440c) +CeladonMartRoofScript_4840c: ; 4840c (12:440c) ld hl, $d730 set 6, [hl] ld hl, UnnamedText_484ee ; $44ee @@ -78145,7 +78297,7 @@ Func_4840c: ; 4840c (12:440c) ld hl, wTileMap call TextBoxBorder call UpdateSprites - call Func_48532 + call CeladonMartRoofScript_48532 ld hl, $d730 res 6, [hl] call HandleMenuInput @@ -78165,13 +78317,13 @@ Func_4840c: ; 4840c (12:440c) ld a, [$d778] bit 6, a jr nz, .asm_484e0 - ld hl, Unknown_48515 ; $4515 + ld hl, UnnamedText_48515 ; $4515 call PrintText call RemoveItemByIDBank12 ld bc, (TM_49 << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, Unknown_4851b ; $451b + ld hl, ReceivedTM49Text ; $451b call PrintText ld hl, $d778 set 6, [hl] @@ -78180,13 +78332,13 @@ Func_4840c: ; 4840c (12:440c) ld a, [$d778] bit 5, a jr nz, .asm_484e0 - ld hl, Unknown_48504 ; $4504 + ld hl, UnnamedText_48504 ; $4504 call PrintText call RemoveItemByIDBank12 ld bc, (TM_48 << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, Unknown_4850a ; $450a + ld hl, UnnamedText_4850a ; $450a call PrintText ld hl, $d778 set 5, [hl] @@ -78195,22 +78347,22 @@ Func_4840c: ; 4840c (12:440c) ld a, [$d778] bit 4, a jr nz, .asm_484e0 - ld hl, Unknown_484f3 ; $44f3 + ld hl, UnnamedText_484f3 ; $44f3 call PrintText call RemoveItemByIDBank12 ld bc, (TM_13 << 8) | 1 call GiveItem jr nc, .BagFull - ld hl, Unknown_484f9 ; $44f9 + ld hl, UnnamedText_484f9 ; $44f9 call PrintText ld hl, $d778 set 4, [hl] ret .BagFull - ld hl, Unknown_48526 ; $4526 + ld hl, UnnamedText_48526 ; $4526 jp PrintText .asm_484e0 - ld hl, Unknown_4852c ; $452c + ld hl, UnnamedText_4852c ; $452c jp PrintText RemoveItemByIDBank12: ; 484e6 (12:44e6) @@ -78222,31 +78374,53 @@ UnnamedText_484ee: ; 484ee (12:44ee) TX_FAR _UnnamedText_484ee db "@" -Unknown_484f3: ; 484f3 (12:44f3) -INCBIN "baserom.gbc",$484f3,$484f9 - $484f3 +UnnamedText_484f3: ; 484f3 (12:44f3) + TX_FAR _UnnamedText_484f3 + db $0d + db "@" -Unknown_484f9: ; 484f9 (12:44f9) -INCBIN "baserom.gbc",$484f9,$48504 - $484f9 +UnnamedText_484f9: ; 484f9 (12:44f9) + TX_FAR _UnnamedText_484f9 + db $0b + TX_FAR _UnnamedText_484fe + db $0d + db "@" -Unknown_48504: ; 48504 (12:4504) -INCBIN "baserom.gbc",$48504,$4850a - $48504 +UnnamedText_48504: ; 48504 (12:4504) + TX_FAR _UnnamedText_48504 + db $0d + db "@" -Unknown_4850a: ; 4850a (12:450a) -INCBIN "baserom.gbc",$4850a,$48515 - $4850a +UnnamedText_4850a: ; 4850a (12:450a) + TX_FAR _UnnamedText_4850a + db $0b + TX_FAR _UnnamedText_4850f + db $0d + db "@" -Unknown_48515: ; 48515 (12:4515) -INCBIN "baserom.gbc",$48515,$4851b - $48515 +UnnamedText_48515: ; 48515 (12:4515) + TX_FAR _UnnamedText_48515 + db $0d + db "@" -Unknown_4851b: ; 4851b (12:451b) -INCBIN "baserom.gbc",$4851b,$48526 - $4851b +ReceivedTM49Text: ; 4851b (12:451b) + TX_FAR _ReceivedTM49Text + db $0b + TX_FAR _UnnamedText_48520 + db $0d + db "@" -Unknown_48526: ; 48526 (12:4526) -INCBIN "baserom.gbc",$48526,$4852c - $48526 +UnnamedText_48526: ; 48526 (12:4526) + TX_FAR _UnnamedText_48526 + db $0d + db "@" -Unknown_4852c: ; 4852c (12:452c) -INCBIN "baserom.gbc",$4852c,$48532 - $4852c +UnnamedText_4852c: ; 4852c (12:452c) + TX_FAR _UnnamedText_4852c + db $0d + db "@" -Func_48532: ; 48532 (12:4532) +CeladonMartRoofScript_48532: ; 48532 (12:4532) ld hl, $cc5b xor a ld [$FF00+$db], a @@ -78283,7 +78457,7 @@ CeladonMartRoofText1: ; 48567 (12:4567) CeladonMartRoofText2: ; 4856c (12:456c) db $08 ; asm - call Func_483d8 + call CeladonMartRoofScript_483d8 ld a, [$cd37] and a jr z, .asm_914b9 ; 0x48574 @@ -78295,7 +78469,7 @@ CeladonMartRoofText2: ; 4856c (12:456c) ld a, [$cc26] and a jr nz, .asm_05aa4 ; 0x48588 - call Func_4840c + call CeladonMartRoofScript_4840c jr .asm_05aa4 ; 0x4858d .asm_914b9 ; 0x4858f ld hl, CeladonMartRoofText3 @@ -78308,8 +78482,7 @@ CeladonMartRoofText3: ; 48598 (12:4598) db "@" CeladonMartRoofText4: ; 4859d (12:459d) -UnnamedText_4859d: ; 4859d (12:459d) - TX_FAR _UnnamedText_4859d + TX_FAR _CeladonMartRoofText4 db "@" CeladonMartRoofText5: ; 485a2 (12:45a2) @@ -78382,7 +78555,7 @@ CeladonMartElevatorScript_4862a: ; 4862a (12:462a) ld [hli], a ret -Func_48631: ; 48631 (12:4631) +CeladonMartElevatorScript_48631: ; 48631 (12:4631) ld hl, Unknown_48643 ; $4643 call LoadItemList ld hl, Unknown_4864a ; $464a @@ -78406,7 +78579,7 @@ CeladonMartElevatorTextPointers: ; 4865c (12:465c) CeladonMartElevatorText1: ; 4865e (12:465e) db $08 ; asm - call Func_48631 + call CeladonMartElevatorScript_48631 ld hl, Unknown_4864a ; $464a ld a, $61 call Predef @@ -82160,11 +82333,13 @@ Func_4fe11: ; 4fe11 (13:7e11) pop af ld [$d11e], a call GetMonName - ld hl, Unknown_4fe39 ; $7e39 + ld hl, UnnamedText_4fe39 ; $7e39 jp PrintText -Unknown_4fe39: ; 4fe39 (13:7e39) -INCBIN "baserom.gbc",$4fe39,$4fe3f - $4fe39 +UnnamedText_4fe39: ; 4fe39 (13:7e39) + TX_FAR _UnnamedText_4fe39 + db $0b + db "@" UnnamedText_4fe3f: ; 4fe3f (13:7e3f) TX_FAR _UnnamedText_4fe3f @@ -84912,7 +85087,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) bit 5, [hl] res 5, [hl] ret z - ld hl, Unknown_51bc1 ; $5bc1 + ld hl, DataTable_51bc1 ; $5bc1 call Func_51bc8 call Func_51bf4 ld a, [$d830] @@ -84944,8 +85119,8 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) -Unknown_51bc1: ; 51bc1 (14:5bc1) -INCBIN "baserom.gbc",$51bc1,$51bc8 - $51bc1 +DataTable_51bc1: ; 51bc1 (14:5bc1) + db $03,$05,$02,$0A,$06,$0A,$FF Func_51bc8: ; 51bc8 (14:5bc8) push hl @@ -86602,13 +86777,55 @@ IF _BLUE db PORYGON,18 ENDC -INCBIN "baserom.gbc",$52996,$529e9 - $52996 +Func_52996: ; 52996 (14:6996) + call EnableAutoTextBoxDrawing + ld a, $1 + ld [$cc3c], a + ld a, [wTrainerSpriteOffset] + jp Func_3ef5 + +UnnamedText_529a4: ; 529a4 (14:69a4) + TX_FAR UnnamedText_88bfd + db $0d + db "@" + +UnnamedText_529aa: ; 529aa (14:69aa) + db $08 ; asm + ld hl, UnnamedText_529f4 + call PrintText + call Func_529db + jr nz, .asm_529d8 + ld hl, UnnamedText_529f9 + call PrintText + call Func_529db + jr nz, .asm_529d8 + ld hl, UnnamedText_529fe + call PrintText + call Func_529db + jr nz, .asm_529d8 + ld hl, UnnamedText_52a03 + call PrintText + ld hl, UnnamedText_529ee + call PrintText +.asm_529d8 + jp TextScriptEnd + +Func_529db: ; 529db (14:69db) + ld hl, UnnamedText_529e9 + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + ret UnnamedText_529e9: ; 529e9 (14:69e9) TX_FAR _UnnamedText_529e9 db "@" -INCBIN "baserom.gbc",$529ee,$529f4 - $529ee +UnnamedText_529ee: ; 529ee (14:69ee) + TX_FAR _UnnamedText_529ee + db $0d + db "@" UnnamedText_529f4: ; 529f4 (14:69f4) TX_FAR _UnnamedText_529f4 @@ -86626,25 +86843,40 @@ UnnamedText_52a03: ; 52a03 (14:6a03) TX_FAR _UnnamedText_52a03 db "@" -INCBIN "baserom.gbc",$52a08,$52a10 - $52a08 +Func_52a08: ; 52a08 (14:6a08) + call EnableAutoTextBoxDrawing + ld a, $37 + jp Func_3ef5 UnnamedText_52a10: ; 52a10 (14:6a10) TX_FAR _UnnamedText_52a10 db "@" -INCBIN "baserom.gbc",$52a15,$52a1d - $52a15 +Func_52a15: ; 52a15 (14:6a15) + call EnableAutoTextBoxDrawing + ld a, $38 + jp Func_3ef5 UnnamedText_52a1d: ; 52a1d (14:6a1d) TX_FAR _UnnamedText_52a1d db "@" -INCBIN "baserom.gbc",$52a22,$52a2a - $52a22 +Func_52a22: ; 52a22 (14:6a22) + call EnableAutoTextBoxDrawing + ld a, $36 + jp Func_3ef5 UnnamedText_52a2a: ; 52a2a (14:6a2a) TX_FAR _UnnamedText_52a2a db "@" -INCBIN "baserom.gbc",$52a2f,$52a3d - $52a2f +Func_52a2f: ; 52a2f (14:6a2f) + ld a, [$c109] + cp $4 + ret nz + call EnableAutoTextBoxDrawing + ld a, $27 + jp Func_3ef5 UnnamedText_52a3d: ; 52a3d (14:6a3d) TX_FAR _UnnamedText_52a3d @@ -86708,7 +86940,12 @@ Route2Object: ; 0x54022 (size=72) EVENT_DISP $a, $27, $f ; ROUTE_2_GATE EVENT_DISP $a, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE -INCBIN "baserom.gbc",$5406a,$5407e - $5406a + ; unused + EVENT_DISP $4, $7, $2 + db $12, $c7, $9, $7 + EVENT_DISP $4, $7, $2 + EVENT_DISP $4, $7, $2 + EVENT_DISP $4, $7, $2 Route2Blocks: ; 5407e (15:407e) INCBIN "maps/route2.blk" @@ -87318,7 +87555,7 @@ Func_5525f: ; 5525f (15:525f) ld a, [wWhichPokemon] ; $cf92 ld hl, W_PARTYMON1NAME ; $d2b5 call GetPartyMonName - ld hl, Unknown_554b2 ; $54b2 + ld hl, UnnamedText_554b2 ; $54b2 call PrintText xor a ld [$cc49], a @@ -87419,7 +87656,7 @@ Func_5525f: ; 5525f (15:525f) call Bankswitch ; indirect jump to Func_3ee94 (3ee94 (f:6e94)) call SaveScreenTilesToBuffer1 .asm_553f7 - ld hl, Unknown_554dd ; $54dd + ld hl, UnnamedText_554dd ; $54dd call PrintText xor a ld [$cc49], a @@ -87522,31 +87759,37 @@ Func_5549f: ; 5549f (15:549f) ld [$FF00+$97], a ret -Unknown_554b2: ; 554b2 (15:54b2) -INCBIN "baserom.gbc",$554b2,$554b7 - $554b2 +UnnamedText_554b2: ; 554b2 (15:54b2) + TX_FAR _UnnamedText_554b2 + db $08 ; asm ld a, [$cc5b] - ld hl, Unknown_554cb ; $54cb + ld hl, UnnamedText_554cb and a ret nz - ld hl, UnnamedText_554d8 ; $54d8 + ld hl, UnnamedText_554d8 ld a, [$cf4d] and a ret z - ld hl, Unknown_554d4 ; $54d4 + ld hl, UnnamedText_554d4 ret -Unknown_554cb: ; 554cb (15:54cb) -INCBIN "baserom.gbc",$554cb,$554d4 - $554cb +UnnamedText_554cb: ; 554cb (15:54cb) + TX_FAR _UnnamedText_554cb + db $08 ; asm + ld hl, UnnamedText_554d8 + ret -Unknown_554d4: ; 554d4 (15:54d4) -INCBIN "baserom.gbc",$554d4,$554d8 - $554d4 +UnnamedText_554d4: ; 554d4 (15:54d4) + TX_FAR _UnnamedText_554d4 UnnamedText_554d8: ; 554d8 (15:54d8) - TX_FAR _UnnamedText_554d8 ; 0x89bee + TX_FAR _UnnamedText_554d8 db "@" -Unknown_554dd: ; 554dd (15:54dd) -INCBIN "baserom.gbc",$554dd,$554e3 - $554dd +UnnamedText_554dd: ; 554dd (15:54dd) + TX_FAR UnnamedText_89c01 + db $0b + db "@" Route2Script: ; 554e3 (15:54e3) jp EnableAutoTextBoxDrawing @@ -90295,7 +90538,7 @@ SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213) dw SilphCo8Object ; objects SilphCo8Script: ; 56504 (15:6504) - call SilphCo8_Unknown5651a + call SilphCo8Script_5651a call EnableAutoTextBoxDrawing ld hl, SilphCo8TrainerHeader0 ld de, SilphCo8ScriptPointers @@ -90304,12 +90547,12 @@ SilphCo8Script: ; 56504 (15:6504) ld [W_SILPHCO8CURSCRIPT], a ret -SilphCo8_Unknown5651a: ; 5651a (15:651a) +SilphCo8Script_5651a: ; 5651a (15:651a) ld hl, $d126 bit 5, [hl] res 5, [hl] ret z - ld hl, Unknown_5653e ; $653e + ld hl, DataTable_5653e ; $653e call Func_56541 call Func_5656d ld a, [$d832] @@ -90321,8 +90564,8 @@ SilphCo8_Unknown5651a: ; 5651a (15:651a) ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) -Unknown_5653e: ; 5653e (15:653e) -INCBIN "baserom.gbc",$5653e,$56541 - $5653e +DataTable_5653e: ; 5653e (15:653e) + db $04,$03,$FF Func_56541: ; 56541 (15:6541) push hl @@ -91455,7 +91698,7 @@ Route18Object: ; 0x58c5a (size=66) Route18Blocks: ; 58c9c (16:4c9c) INCBIN "maps/route18.blk" -INCBIN "baserom.gbc",$58d7d,$58d99 - $58d7d + INCBIN "maps/unusedblocks58d7d.blk" Func_58d99: ; 58d99 (16:4d99) ld a, [W_ISINBATTLE] ; $d057 @@ -91565,7 +91808,7 @@ Func_58e59: ; 58e59 (16:4e59) ld hl, W_ENEMYMONCURHP ; $cfe6 ld a, [hli] or [hl] - ld hl, .unknown_58eae ; $4eae + ld hl, UnnamedText_58eae ; $4eae jr z, .asm_58eab xor a ld [H_NUMTOPRINT], a ; $FF00+$96 (aliases: H_MULTIPLICAND) @@ -91591,36 +91834,39 @@ Func_58e59: ; 58e59 (16:4e59) ld [H_REMAINDER], a ; $FF00+$99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) call Divide ld a, [$FF00+$98] - ld hl, .unknown_58eae ; $4eae + ld hl, UnnamedText_58eae ; $4eae cp $46 jr nc, .asm_58eab - ld hl, .unknown_58eb5 ; $4eb5 + ld hl, UnnamedText_58eb5 ; $4eb5 cp $28 jr nc, .asm_58eab - ld hl, .unknown_58ebc ; $4ebc + ld hl, UnnamedText_58ebc ; $4ebc cp $a jr nc, .asm_58eab - ld hl, .unknown_58ec3 ; $4ec3 + ld hl, UnnamedText_58ec3 ; $4ec3 .asm_58eab jp PrintText -.unknown_58eae: ; 58eae (16:4eae) -INCBIN "baserom.gbc",$58eae,$58eb3 - $58eae - - jr .asm_58ec8 - -.unknown_58eb5: ; 58eb5 (16:4eb5) -INCBIN "baserom.gbc",$58eb5,$58eba - $58eb5 +UnnamedText_58eae: ; 58eae (16:4eae) + TX_FAR _UnnamedText_58eae + db $08 ; asm + jr Func_58ec8 - jr .asm_58ec8 +UnnamedText_58eb5: ; 58eb5 (16:4eb5) + TX_FAR _UnnamedText_58eb5 + db $08 ; asm + jr Func_58ec8 -.unknown_58ebc: ; 58ebc (16:4ebc) -INCBIN "baserom.gbc",$58ebc,$58ec3 - $58ebc +UnnamedText_58ebc: ; 58ebc (16:4ebc) + TX_FAR _UnnamedText_58ebc + db $08 ; asm + jr Func_58ec8 -.unknown_58ec3: ; 58ec3 (16:4ec3) -INCBIN "baserom.gbc",$58ec3,$58ec8 - $58ec3 +UnnamedText_58ec3: ; 58ec3 (16:4ec3) + TX_FAR _UnnamedText_58ec3 + db $08 ; asm -.asm_58ec8 +Func_58ec8 ld hl, UnnamedText_58ecc ; $4ecc ret @@ -91629,11 +91875,73 @@ UnnamedText_58ecc: ; 58ecc (16:4ecc) db "@" Func_58ed1: ; 58ed1 (16:4ed1) - ld hl, Unknown_58ed7 ; $4ed7 + ld hl, UnnamedText_58ed7 ; $4ed7 jp PrintText -Unknown_58ed7: ; 58ed7 (16:4ed7) -INCBIN "baserom.gbc",$58ed7,$58f3e - $58ed7 +UnnamedText_58ed7: ; 58ed7 (16:4ed7) + TX_FAR _UnnamedText_58ed7 + db $08 ; asm + push de + push bc + ld hl, $cfe7 + ld de, $cce4 + ld b, [hl] + dec hl + ld a, [de] + sub b + ld [$ff98], a + dec de + ld b, [hl] + ld a, [de] + sbc b + ld [$ff97], a + ld a, $19 + ld [H_POWEROFTEN], a + call Multiply + ld hl, W_ENEMYMONMAXHP + ld a, [hli] + ld b, [hl] + srl a + rr b + srl a + rr b + ld a, b + ld b, $4 + ld [H_POWEROFTEN], a + call Divide + pop bc + pop de + ld a, [$ff98] + ld hl, UnnamedText_58f25 + and a + ret z + ld hl, UnnamedText_58f3e + cp $1e + ret c + ld hl, UnnamedText_58f2c + cp $46 + ret c + ld hl, UnnamedText_58f33 + ret + +UnnamedText_58f25: ; 58f25 (16:4f25) + TX_FAR _UnnamedText_58f25 + db $08 ; asm + jr Func_58f3a + +UnnamedText_58f2c: ; 58f2c (16:4f2c) + TX_FAR _UnnamedText_58f2c + db $08 ; asm + jr Func_58f3a + +UnnamedText_58f33: ; 58f33 (16:4f33) + TX_FAR _UnnamedText_58f33 + db $08 ; asm + jr Func_58f3a + +Func_58f3a: ; 58f3a (16:4f3a) + ld hl, UnnamedText_58f3e + ret UnnamedText_58f3e: ; 58f3e (16:4f3e) TX_FAR _UnnamedText_58f3e @@ -91819,7 +92127,7 @@ Func_59035 ; 0x59035 ld c, 1 call GiveItem jr nc, .BagFull - ld hl, Unknown_590a5 ; $50a5 + ld hl, UnnamedText_590a5 ; $50a5 call PrintText ld a, $1 jr .asm_5908e ; 0x59071 $1b @@ -91857,8 +92165,10 @@ UnnamedText_590a0: ; 590a0 (16:50a0) TX_FAR _UnnamedText_590a0 db "@" -Unknown_590a5: ; 590a5 (16:50a5) -INCBIN "baserom.gbc",$590a5,$590ab - $590a5 +UnnamedText_590a5: ; 590a5 (16:50a5) + TX_FAR _UnnamedText_590a5 + db $0b + db "@" UnnamedText_590ab: ; 590ab (16:50ab) TX_FAR _UnnamedText_590ab @@ -94031,7 +94341,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) bit 5, [hl] res 5, [hl] ret z - ld hl, Unknown_59d3e + ld hl, DataTable_59d3e call Func_59d43 call Func_59d6f ld a, [$d826] @@ -94053,8 +94363,8 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) ld a, $17 jp Predef -Unknown_59d3e: ; 59d3e (16:5d3e) -INCBIN "baserom.gbc",$59d3e,$59d43 - $59d3e +DataTable_59d3e: ; 59d3e (16:5d3e) + db $02,$02,$05,$02,$FF Func_59d43: ; 59d43 (16:5d43) push hl @@ -94321,7 +94631,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) bit 5, [hl] res 5, [hl] ret z - ld hl, Unknown_59fa8 ; $5fa8 + ld hl, DataTable_59fa8 ; $5fa8 call Func_59d43 call Func_59fad ld a, [$d828] @@ -94343,8 +94653,8 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) -Unknown_59fa8: ; 59fa8 (16:5fa8) -INCBIN "baserom.gbc",$59fa8,$59fad - $59fa8 +DataTable_59fa8: ; 59fa8 (16:5fa8) + db $04,$04,$04,$08,$FF Func_59fad: ; 59fad (16:5fad) ld hl, $d828 @@ -94507,7 +94817,7 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f) bit 5, [hl] res 5, [hl] ret z - ld hl, Unknown_5a173 ; $6173 + ld hl, DataTable_5a173 ; $6173 call Func_59d43 call Func_5a176 ld a, [$d836] @@ -94519,8 +94829,8 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f) ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) -Unknown_5a173: ; 5a173 (16:6173) -INCBIN "baserom.gbc",$5a173,$5a176 - $5a173 +DataTable_5a173: ; 5a173 (16:6173) + db $04,$05,$FF Func_5a176: ; 5a176 (16:6176) ld a, [$FF00+$e0] @@ -94861,7 +95171,11 @@ HallofFameRoomScript: ; 5a49e (16:649e) ld a, [W_HALLOFFAMEROOMCURSCRIPT] jp CallFunctionInTable -INCBIN "baserom.gbc",$5a4aa,$5a4b2 - $5a4aa +Func_5a4aa: ; 5a4aa (16:64aa) + xor a + ld [wJoypadForbiddenButtonsMask], a + ld [W_HALLOFFAMEROOMCURSCRIPT], a + ret HallofFameRoomScriptPointers: ; 5a4b2 (16:64b2) dw HallofFameRoomScript0 @@ -94870,7 +95184,7 @@ HallofFameRoomScriptPointers: ; 5a4b2 (16:64b2) dw HallofFameRoomScript3 HallofFameRoomScript3: ; 5a4ba (16:64ba) - db $c9 + ret HallofFameRoomScript2: ; 5a4bb (16:64bb) call Delay3 @@ -98144,7 +98458,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) bit 5, [hl] res 5, [hl] ret z - ld hl, Unknown_5d82e ; $582e + ld hl, DataTable_5d82e ; $582e call Func_5d837 call Func_5d863 ld a, [$d834] @@ -98186,8 +98500,8 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) -Unknown_5d82e: ; 5d82e (17:582e) -INCBIN "baserom.gbc",$5d82e,$5d837 - $5d82e +DataTable_5d82e: ; 5d82e (17:582e) + db $04,$01,$02,$09,$05,$09,$06,$05,$FF Func_5d837: ; 5d837 (17:5837) push hl @@ -98739,7 +99053,87 @@ UnnamedText_5dce8: ; 5dce8 (17:5ce8) TX_FAR _UnnamedText_5dce8 db "@" -INCBIN "baserom.gbc",$5dced,$5dda2 - $5dced +UnnamedText_5dced: ; 5dced (17:5ced) + db $08 ; asm + call SaveScreenTilesToBuffer1 + ld hl, UnnamedText_5dda2 + call PrintText + xor a + ld [W_ANIMATIONID], a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld a, $33 + ld [wMenuWatchedKeys], a + ld a, $2 + ld [wMaxMenuItem], a + ld a, $2 + ld [wTopMenuItemY], a + ld a, $1 + ld [wTopMenuItemX], a +.asm_5dd15 + ld hl, $d730 + set 6, [hl] + ld hl, wTileMap + ld bc, $060a + call TextBoxBorder + ld hl, $c3c9 + ld de, StatusAilmentText1 + call PlaceString + ld hl, $c3ce + ld de, StatusAilmentText2 + call PlaceString + ld hl, UnnamedText_5dda7 + call PrintText + call HandleMenuInput + bit 1, a + jr nz, .asm_5dd97 + bit 4, a + jr z, .asm_5dd5c + ld a, $2 + ld [wMaxMenuItem], a + ld a, $2 + ld [wTopMenuItemY], a + ld a, $6 + ld [wTopMenuItemX], a + ld a, $3 + ld [W_ANIMATIONID], a + jr .asm_5dd15 +.asm_5dd5c + bit 5, a + jr z, .asm_5dd75 + ld a, $2 + ld [wMaxMenuItem], a + ld a, $2 + ld [wTopMenuItemY], a + ld a, $1 + ld [wTopMenuItemX], a + xor a + ld [W_ANIMATIONID], a + jr .asm_5dd15 +.asm_5dd75 + ld a, [wCurrentMenuItem] + ld b, a + ld a, [W_ANIMATIONID] + add b + cp $5 + jr z, .asm_5dd97 + ld hl, $d730 + res 6, [hl] + ld hl, PointerTable_5ddcc + add a + ld d, $0 + ld e, a + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + call PrintText + jp .asm_5dd15 +.asm_5dd97 + ld hl, $d730 + res 6, [hl] + call LoadScreenTilesFromBuffer1 + jp TextScriptEnd UnnamedText_5dda2: ; 5dda2 (17:5da2) TX_FAR _UnnamedText_5dda2 @@ -98749,10 +99143,12 @@ UnnamedText_5dda7: ; 5dda7 (17:5da7) TX_FAR _UnnamedText_5dda7 db "@" -StatusAilmentText: +StatusAilmentText1: ; 5ddac (17:5dac) db " SLP",$4e db " PSN",$4e db " PAR@" + +StatusAilmentText2: ; 5ddbb (17:5dbb) db " BRN",$4e db " FRZ",$4e db " QUIT@@" @@ -98784,7 +99180,7 @@ UnnamedText_5ddea: ; 5ddea (17:5dea) TX_FAR _UnnamedText_5ddea db "@" -Unknown_5ddef: ; 5ddef (17:5def) +Func_5ddef: ; 5ddef (17:5def) call EnableAutoTextBoxDrawing ld a, $26 jp Func_3ef5 @@ -98864,7 +99260,11 @@ UnnamedText_5ddf7: ; 5ddf7 (17:5df7) jp Func_3ef5 Unknown_5de7d: ; 5de7d (17:5e7d) -INCBIN "baserom.gbc",$5de7d,$5decd - $5de7d +INCBIN "baserom.gbc",$5de7d,$5dec8 - $5de7d + +UnnamedText_5dec8: ; 5dec8 (17:5ec8) + TX_FAR _UnnamedText_5dec8 + db $08 ; asm call WaitForSoundToFinish ld a, $9d call PlaySound @@ -98875,14 +99275,26 @@ UnnamedText_5dedb: ; 5dedb (17:5edb) TX_FAR _UnnamedText_5dedb db "@" -INCBIN "baserom.gbc",$5dee0,$5def4 - $5dee0 +UnnamedText_5dee0: ; 5dee0 (17:5ee0) + db $08 ; asm + call WaitForSoundToFinish + ld a, $9d + call PlaySound + call WaitForSoundToFinish + jp TextScriptEnd + +UnnamedText_5deef: ; 5deef (17:5eef) + TX_FAR _UnnamedText_5deef + db $08 ; asm call WaitForSoundToFinish ld a, $ad call PlaySound call WaitForSoundToFinish jp TextScriptEnd -INCBIN "baserom.gbc",$5df02,$5df07 - $5df02 +UnnamedText_5df02: ; 5df02 (17:5f02) + TX_FAR _UnnamedText_5df02 + db $08 ; asm call WaitForSoundToFinish ld a, $a5 call PlaySound @@ -98897,7 +99309,7 @@ ViridianForestBlocks: ; 60000 (18:4000) UndergroundPathNSBlocks: ; 60198 (18:4198) INCBIN "maps/undergroundpathns.blk" -INCBIN "baserom.gbc",$601f8,$603c0 - $601f8 + INCBIN "maps/unusedblocks601f8.blk" SSAnne10Blocks: ; 603c0 (18:43c0) SSAnne9Blocks: ; 603c0 (18:43c0) @@ -99907,7 +100319,7 @@ PokemonTower6Object: ; 0x60c5b (size=58) PokemonTower6Blocks: ; 60c95 (18:4c95) INCBIN "maps/pokemontower6.blk" -INCBIN "baserom.gbc",$60cef,$60cf9 - $60cef + INCBIN "maps/unusedblocks60cef.blk" PokemonTower7_h: ; 0x60cf9 to 0x60d05 (12 bytes) (id=148) db $0f ; tileset @@ -102158,7 +102570,7 @@ SilphCo11Script_62110: ; 62110 (18:6110) bit 5, [hl] res 5, [hl] ret z - ld hl, Unknown_62134 ; $6134 + ld hl, DataTable_62134 ; $6134 call Func_62137 call Func_62163 ld a, [$d838] @@ -102170,8 +102582,8 @@ SilphCo11Script_62110: ; 62110 (18:6110) ld a, $17 jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e)) -Unknown_62134: ; 62134 (18:6134) -INCBIN "baserom.gbc",$62134,$62137 - $62134 +DataTable_62134: ; 62134 (18:6134) + db $06,$03,$FF Func_62137: ; 62137 (18:6137) push hl @@ -102218,7 +102630,7 @@ Func_62163: ; 62163 (18:6163) ret Func_6216d: ; 6216d (18:616d) - ld hl, Unknown_6219b ; $619b + ld hl, MissableObjectIDs_6219b ; $619b .asm_62170 ld a, [hli] cp $ff @@ -102230,7 +102642,7 @@ Func_6216d: ; 6216d (18:616d) pop hl jr .asm_62170 .asm_62181 - ld hl, Unknown_62194 ; $6194 + ld hl, MissableObjectIDs_62194 ; $6194 .asm_62184 ld a, [hli] cp $ff @@ -102242,17 +102654,22 @@ Func_6216d: ; 6216d (18:616d) pop hl jr .asm_62184 -Unknown_62194: ; 62194 (18:6194) -INCBIN "baserom.gbc",$62194,$6219b - $62194 +MissableObjectIDs_62194: ; 62194 (18:6194) + db $11,$12,$13,$14,$15,$16,$FF -Unknown_6219b: ; 6219b (18:619b) -INCBIN "baserom.gbc",$6219b,$621c4 - $6219b +MissableObjectIDs_6219b: ; 6219b (18:619b) + db $0A,$0B,$0C,$0D,$0E,$0F,$10,$17 + db $18,$8A,$8B,$8C,$8D,$8E,$8F,$91 + db $92,$93,$97,$98,$99,$9A,$9E,$9F + db $A0,$A3,$A4,$A5,$A6,$AB,$AC,$AD + db $AE,$AF,$B0,$B1,$B2,$B7,$B8,$B9 + db $FF -Func_621c4: ; 621c4 (18:61c4) +SilphCo11Script_621c4: ; 621c4 (18:61c4) xor a ld [wJoypadForbiddenButtonsMask], a -Func_621c8: ; 621c8 (18:61c8) +SilphCo11Script_621c8: ; 621c8 (18:61c8) ld [W_SILPHCO11CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret @@ -102287,7 +102704,7 @@ SilphCo11Script0: ; 621db (18:61db) ld de, MovementData_62216 call MoveSprite ld a, $3 - jp Func_621c8 + jp SilphCo11Script_621c8 CoordsData_62211: ; 62211 (18:6211) db $0D,$06 @@ -102297,7 +102714,7 @@ CoordsData_62211: ; 62211 (18:6211) MovementData_62216: ; 62216 (18:6216) db $00,$00,$00,$FF -Func_6221a: ; 6221a (18:621a) +SilphCo11Script_6221a: ; 6221a (18:621a) ld [$d528], a ld a, $3 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c @@ -102308,7 +102725,7 @@ Func_6221a: ; 6221a (18:621a) SilphCo11Script5: ; 62227 (18:6227) ld a, [W_ISINBATTLE] ; $d057 cp $ff - jp z, Func_621c4 + jp z, SilphCo11Script_621c4 ld a, [$cf0d] cp $1 jr z, .asm_6223c @@ -102319,7 +102736,7 @@ SilphCo11Script5: ; 62227 (18:6227) ld a, $8 ld b, $0 .asm_62240 - call Func_6221a + call SilphCo11Script_6221a ld a, $f0 ld [wJoypadForbiddenButtonsMask], a ld a, $6 @@ -102334,7 +102751,7 @@ SilphCo11Script5: ; 62227 (18:6227) set 7, [hl] xor a ld [wJoypadForbiddenButtonsMask], a - jp Func_621c8 + jp SilphCo11Script_621c8 SilphCo11Script3: ; 6226a (18:626a) ld a, [$d730] @@ -102353,10 +102770,10 @@ SilphCo11Script3: ; 6226a (18:626a) ld a, $8 ld b, $0 .asm_62288 - call Func_6221a + call SilphCo11Script_6221a call Delay3 ld a, $4 - jp Func_621c8 + jp SilphCo11Script_621c8 SilphCo11Script4: ; 62293 (18:6293) ld hl, $d72d @@ -102372,7 +102789,7 @@ SilphCo11Script4: ; 62293 (18:6293) xor a ld [wJoypadForbiddenButtonsMask], a ld a, $5 - jp Func_621c8 + jp SilphCo11Script_621c8 SilphCo11TextPointers: ; 622b7 (18:62b7) dw SilphCo11Text1 @@ -102496,7 +102913,7 @@ SilphCo11AfterBattleText2: ; 62367 (18:6367) TX_FAR _SilphCo11AfterBattleText2 db "@" -UnknownText_6236c: ; 6236c (18:636c) +UnnamedText_6236c: ; 6236c (18:636c) db $8 ld hl, UnnamedText_6237b call PrintText @@ -102584,7 +103001,44 @@ UnnamedText_62458: ; 62458 (18:6458) TX_FAR _UnnamedText_62458 db "@" -INCBIN "baserom.gbc",$6245d,$624a3 - $6245d +Func_6245d: ; 6245d (18:645d) + call EnableAutoTextBoxDrawing + ld hl, PokeCenterMapIDList + ld a, [W_CURMAP] + ld b, a +.asm_62467 + ld a, [hli] + cp $ff + ret z + cp b + jr z, .asm_62472 + inc hl + inc hl + jr .asm_62467 +.asm_62472 + ld a, [hli] + ld b, a + ld a, [$c109] + cp b + jr nz, .asm_62467 + ld a, [hl] + jp Func_3ef5 + +; format: db map id, 08, text id of PointerTable_3f22 +PokeCenterMapIDList: ; 6247e (18:647e) + db VIRIDIAN_POKECENTER,$08,$0F + db PEWTER_POKECENTER,$08,$10 + db CERULEAN_POKECENTER,$08,$11 + db LAVENDER_POKECENTER,$08,$12 + db VERMILION_POKECENTER,$08,$13 + db CELADON_POKECENTER,$08,$14 + db CELADON_HOTEL,$08,$15 + db FUCHSIA_POKECENTER,$08,$16 + db CINNABAR_POKECENTER,$08,$17 + db SAFFRON_POKECENTER,$08,$18 + db MT_MOON_POKECENTER,$08,$19 + db ROCK_TUNNEL_POKECENTER,$08,$1A + db $FF UnnamedText_624a3: ; 624a3 (18:64a3) TX_FAR _UnnamedText_624a3 @@ -102839,7 +103293,7 @@ Func_70000: ; 70000 (1c:4000) ld bc, (BANK(FallingStar) << 8) + $01 call CopyVideoData ld hl, GameFreakLogoOAMData ; $4140 - ld de, $c360 + ld de, wOAMBuffer + $60 ld bc, $40 call CopyData ld hl, GameFreakShootingStarOAMData ; $4180 @@ -102901,7 +103355,7 @@ Func_70044: ; 70044 (1c:4044) ld a, $18 .asm_70098 push af - ld hl, Unknown_700ee ; $40ee + ld hl, OAMData_700ee ; $40ee ld bc, $4 call CopyData pop af @@ -102909,7 +103363,7 @@ Func_70044: ; 70044 (1c:4044) jr nz, .asm_70098 xor a ld [wWhichTrade], a ; $cd3d - ld hl, Unknown_700f2 ; $40f2 + ld hl, PointerTable_700f2 ; $40f2 ld c, $6 .asm_700af ld a, [hli] @@ -102918,7 +103372,7 @@ Func_70044: ; 70044 (1c:4044) ld d, a push bc push hl - ld hl, $c350 + ld hl, wOAMBuffer + $50 ld c, $4 .asm_700ba ld a, [de] @@ -102954,11 +103408,44 @@ Func_70044: ; 70044 (1c:4044) and a ret -Unknown_700ee: ; 700ee (1c:40ee) -INCBIN "baserom.gbc",$700ee,$700f2 - $700ee - -Unknown_700f2: ; 700f2 (1c:40f2) -INCBIN "baserom.gbc",$700f2,$7011f - $700f2 +OAMData_700ee: ; 700ee (1c:40ee) + db $00,$00,$A2,$90 + +PointerTable_700f2: ; 700f2 (1c:40f2) + dw OAMData_700fe + dw OAMData_70106 + dw OAMData_7010e + dw OAMData_70116 + dw OAMData_7011e + dw OAMData_7011e + +; each entry is only half of an OAM tile +OAMData_700fe: ; 700fe (1c:40fe) + db $68,$30 + db $68,$40 + db $68,$58 + db $68,$78 + +OAMData_70106: ; 70106 (1c:4106) + db $68,$38 + db $68,$48 + db $68,$60 + db $68,$70 + +OAMData_7010e: ; 7010e (1c:410e) + db $68,$34 + db $68,$4C + db $68,$54 + db $68,$64 + +OAMData_70116: ; 70116 (1c:4116) + db $68,$3C + db $68,$5C + db $68,$6C + db $68,$74 + +OAMData_7011e: ; 7011e (1c:411e) + db $FF Func_7011f: ; 7011f (1c:411f) ld b, $8 @@ -103311,13 +103798,13 @@ Func_70423: ; 70423 (1c:4423) ld [$cfc8], a ld [$cfc9], a ld a, $ff - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a jp GBFadeOut2 Func_70433: ; 70433 (1c:4433) - ld de, PokeCenterHealBall ; $44b7 + ld de, PokeCenterFlashingMonitorAndHealBall ; $44b7 ld hl, $87c0 - ld bc, (BANK(PokeCenterHealBall) << 8) + $03 + ld bc, (BANK(PokeCenterFlashingMonitorAndHealBall) << 8) + $03 call CopyVideoData ld hl, $cfcb ld a, [hl] @@ -103329,15 +103816,15 @@ Func_70433: ; 70433 (1c:4433) ld a, $e0 ld [rOBP1], a ; $FF00+$49 ld hl, $c384 - ld de, Unknown_704d7 ; $44d7 + ld de, PokeCenterOAMData ; $44d7 call Func_70503 ld a, $4 - ld [wMusicChannelPointer], a + ld [wMusicHeaderPointer], a ld a, $ff ld [$c0ee], a call PlaySound .asm_70464 - ld a, [wMusicChannelPointer] + ld a, [wMusicHeaderPointer] and a jr nz, .asm_70464 ld a, [W_NUMINPARTY] ; $d163 @@ -103378,11 +103865,17 @@ Func_70433: ; 70433 (1c:4433) ld [hl], a jp UpdateSprites -PokeCenterHealBall: ; 704b7 (1c:44b7) +PokeCenterFlashingMonitorAndHealBall: ; 704b7 (1c:44b7) INCBIN "gfx/pokecenter_ball.2bpp" -Unknown_704d7: ; 704d7 (1c:44d7) -INCBIN "baserom.gbc",$704d7,$704f3 - $704d7 +PokeCenterOAMData: ; 704d7 (1c:44d7) + db $24,$34,$7C,$10 ; heal machine monitor + db $2B,$30,$7D,$10 ; pokeballs 1-6 + db $2B,$38,$7D,$30 + db $30,$30,$7D,$10 + db $30,$38,$7D,$30 + db $35,$30,$7D,$10 + db $35,$38,$7D,$30 Func_704f3: ; 704f3 (1c:44f3) ld b, $8 @@ -103709,7 +104202,7 @@ Func_7077f: ; 7077f (1c:477f) Func_70787: ; 70787 (1c:4787) ld b, $0 - ld hl, Unknown_707a9 ; $47a9 + ld hl, DataTable_707a9 ; $47a9 ld a, [W_CURMAPTILESET] ; $d367 ld c, a .asm_70790 @@ -103734,8 +104227,13 @@ Func_70787: ; 70787 (1c:4787) ld [$cd5b], a ret -Unknown_707a9: ; 707a9 (1c:47a9) -INCBIN "baserom.gbc",$707a9,$707b6 - $707a9 +; format: db tileset id, tile id, value to be put in $cd5b +DataTable_707a9: ; 707a9 (1c:47a9) + db $16,$20,$01 + db $16,$11,$02 + db $11,$22,$02 + db $10,$55,$01 + db $FF Func_707b6: ; 707b6 (1c:47b6) ld c, $a @@ -104058,7 +104556,7 @@ Func_709ef: ; 709ef (1c:49ef) Func_70a19: ; 70a19 (1c:4a19) ld a, [W_CURMAP] ; $d35e ld e, a - ld hl, Unknown_70a3f ; $4a3f + ld hl, MapIDList_70a3f ; $4a3f .asm_70a20 ld a, [hli] cp $ff @@ -104069,7 +104567,7 @@ Func_70a19: ; 70a19 (1c:4a19) set 2, c ret .asm_70a2b - ld hl, Unknown_70a44 ; $4a44 + ld hl, MapIDList_70a44 ; $4a44 .asm_70a2e ld a, [hli] cp $ff @@ -104085,11 +104583,33 @@ Func_70a19: ; 70a19 (1c:4a19) res 2, c ret -Unknown_70a3f: ; 70a3f (1c:4a3f) -INCBIN "baserom.gbc",$70a3f,$70a44 - $70a3f +; Func_70a19 checks if W_CURMAP is equal to one of these maps +MapIDList_70a3f: ; 70a3f (1c:4a3f) + db VIRIDIAN_FOREST + db ROCK_TUNNEL_1 + db SEAFOAM_ISLANDS_1 + db ROCK_TUNNEL_2 + db $FF -Unknown_70a44: ; 70a44 (1c:4a44) -INCBIN "baserom.gbc",$70a44,$70a4d - $70a44 +; Func_70a19 checks if W_CURMAP is in between or equal to each pair of maps +MapIDList_70a44: ; 70a44 (1c:4a44) + ; all MT_MOON maps + db MT_MOON_1 + db MT_MOON_3 + + ; all SS_ANNE maps, VICTORY_ROAD_1, LANCES_ROOM, and HALL_OF_FAME + db SS_ANNE_1 + db HALL_OF_FAME + + ; all POKEMONTOWER maps and Lavender Town buildings + db LAVENDER_POKECENTER + db LAVENDER_HOUSE_2 + + ; all SILPH_CO, MANSION, SAFARI_ZONE, and UNKNOWN_DUNGEON maps, + ; except for SILPH_CO_1F + db SILPH_CO_2F + db UNKNOWN_DUNGEON_1 + db $FF Func_70a4d: ; 70a4d (1c:4a4d) ld hl, $8ff0 @@ -104258,7 +104778,7 @@ Func_70af9: ; 70af9 (1c:4af9) jr .asm_70b1c Func_70b5d: ; 70b5d (1c:4b5d) - ld hl, Unknown_70b72 ; $4b72 + ld hl, DataTable_70b72 ; $4b72 .asm_70b60 ld a, [hli] cp $1 @@ -104272,8 +104792,9 @@ Func_70b5d: ; 70b5d (1c:4b5d) jr nz, Func_70b5d ret -Unknown_70b72: ; 70b72 (1c:4b72) -INCBIN "baserom.gbc",$70b72,$70b7f - $70b72 +DataTable_70b72: ; 70b72 (1c:4b72) + db $F9,$FE,$FF,$FE,$F9,$E4,$90,$40,$00,$40,$90,$E4 + db $01 ; terminator Func_70b7f: ; 70b7f (1c:4b7f) ld c, $9 @@ -104587,15 +105108,111 @@ Func_70d50: ; 70d50 (1c:4d50) ld a, [hli] ld h, [hl] ld l, a - jp asm_70dc5 + jp Func_70dc5 Unknown_70d61: ; 70d61 (1c:4d61) -INCBIN "baserom.gbc",$70d61,$70d93 - $70d61 + db $01 + dw Unknown_70dfe + FuncCoord 18, 6 + dw Coord + + db $01 + dw Unknown_70e04 + FuncCoord 19, 3 + dw Coord + + db $01 + dw Unknown_70e0e + FuncCoord 18, 0 + dw Coord + + db $01 + dw Unknown_70e20 + FuncCoord 14, 0 + dw Coord + + db $01 + dw Unknown_70e2e + FuncCoord 10, 0 + dw Coord + + db $00 + dw Unknown_70e2e + FuncCoord 9, 0 + dw Coord + + db $00 + dw Unknown_70e20 + FuncCoord 5, 0 + dw Coord + + db $00 + dw Unknown_70e0e + FuncCoord 1, 0 + dw Coord + + db $00 + dw Unknown_70e04 + FuncCoord 0, 3 + dw Coord + + db $00 + dw Unknown_70dfe + FuncCoord 1, 6 + dw Coord Unknown_70d93: ; 70d93 (1c:4d93) -INCBIN "baserom.gbc",$70d93,$70dc5 - $70d93 + db $00 + dw Unknown_70dfe + FuncCoord 1, 11 + dw Coord + + db $00 + dw Unknown_70e04 + FuncCoord 0, 14 + dw Coord + + db $00 + dw Unknown_70e0e + FuncCoord 1, 17 + dw Coord + + db $00 + dw Unknown_70e20 + FuncCoord 5, 17 + dw Coord + + db $00 + dw Unknown_70e2e + FuncCoord 9, 17 + dw Coord + + db $01 + dw Unknown_70e2e + FuncCoord 10, 17 + dw Coord + + db $01 + dw Unknown_70e20 + FuncCoord 14, 17 + dw Coord + + db $01 + dw Unknown_70e0e + FuncCoord 18, 17 + dw Coord + + db $01 + dw Unknown_70e04 + FuncCoord 19, 14 + dw Coord -asm_70dc5 + db $01 + dw Unknown_70dfe + FuncCoord 18, 11 + dw Coord + +Func_70dc5: ; 70dc5 (1c:4dc5) push hl ld a, [de] ld c, a @@ -104625,7 +105242,7 @@ asm_70dc5 cp $ff ret z and a - jr z, asm_70dc5 + jr z, Func_70dc5 ld c, a .asm_70def ld a, [$cd3e] @@ -104638,9 +105255,22 @@ asm_70dc5 .asm_70df9 dec c jr nz, .asm_70def - jr asm_70dc5 + jr Func_70dc5 + +Unknown_70dfe: ; 70dfe (1c:4dfe) + db $02,$03,$05,$04,$09,$FF + +Unknown_70e04: ; 70e04 (1c:4e04) + db $01,$01,$02,$02,$04,$02,$04,$02,$03,$FF + +Unknown_70e0e: ; 70e0e (1c:4e0e) + db $02,$01,$03,$01,$04,$01,$04,$01,$04,$01,$03,$01,$02,$01,$01,$01,$01,$FF + +Unknown_70e20: ; 70e20 (1c:4e20) + db $04,$01,$04,$00,$03,$01,$03,$00,$02,$01,$02,$00,$01,$FF -INCBIN "baserom.gbc",$70dfe,$70e3e - $70dfe +Unknown_70e2e: ; 70e2e (1c:4e2e) + db $04,$00,$03,$00,$03,$00,$02,$00,$02,$00,$01,$00,$01,$00,$01,$FF Func_70e3e: ; 70e3e (1c:4e3e) call Func_7109b @@ -104670,7 +105300,7 @@ Func_70e3e: ; 70e3e (1c:4e3e) xor a ld [wWhichTrade], a ; $cd3d pop af - jr asm_70e92 + jr Func_70e92 Func_70e7e: ; 70e7e (1c:4e7e) ld hl, wTileMap @@ -104682,7 +105312,8 @@ Func_70e7e: ; 70e7e (1c:4e7e) ld b, $0 add hl, bc ld a, [hl] -asm_70e92: ; 70e92 (1c:4e92) + +Func_70e92: ; 70e92 (1c:4e92) ld de, $cee9 call Func_712f1 ld a, [de] @@ -105240,7 +105871,7 @@ Func_712d9: ; 712d9 (1c:52d9) jr .asm_712e4 Func_712f1: ; 712f1 (1c:52f1) - cp $25 + cp REDS_HOUSE_1F jr c, .asm_71304 ld bc, $4 ld hl, InternalMapEntries ; $5382 @@ -105523,7 +106154,7 @@ Func_716ff: ; 716ff (1c:56ff) ld a, [hl] asm_7170a: ; 7170a (1c:570a) ld c, a - ld hl, Unknown_71769 ; $5769 + ld hl, DataTable_71769 ; $5769 add hl, bc ld a, [$cf1b] xor $1 @@ -105583,8 +106214,8 @@ asm_7170a: ; 7170a (1c:570a) ld a, c jr .asm_71721 -Unknown_71769: ; 71769 (1c:5769) -INCBIN "baserom.gbc",$71769,$7176c - $71769 +DataTable_71769: ; 71769 (1c:5769) + db $05,$10,$20 Func_7176c: ; 7176c (1c:576c) ld hl, MonOverworldSpritePointers ; $57c0 @@ -106004,7 +106635,7 @@ Predef54: ; 71ad9 (1c:5ad9) pop af ld l,a ld h,$0 - ld de,Unknown_71d64 ; $5d64 + ld de,InGameTradeTextPointers ; $5d64 add hl,hl add hl,de ld a,[hli] @@ -106230,8 +106861,31 @@ Func_71d4f: ; 71d4f (1c:5d4f) Unknown_71d59: ; 71d59 (1c:5d59) INCBIN "baserom.gbc",$71d59,$71d64 - $71d59 -Unknown_71d64: ; 71d64 (1c:5d64) -INCBIN "baserom.gbc",$71d64,$71d88 - $71d64 +InGameTradeTextPointers: ; 71d64 (1c:5d64) + dw TradeTextPointers1 + dw TradeTextPointers2 + dw TradeTextPointers3 + +TradeTextPointers1: ; 71d6a (1c:5d6a) + dw UnnamedText_71d94 + dw UnnamedText_71d99 + dw UnnamedText_71d9e + dw UnnamedText_71da3 + dw UnnamedText_71da8 + +TradeTextPointers2: ; 71d74 (1c:5d74) + dw UnnamedText_71dad + dw UnnamedText_71db2 + dw UnnamedText_71db7 + dw UnnamedText_71dbc + dw UnnamedText_71dc1 + +TradeTextPointers3: ; 71d7e (1c:5d7e) + dw UnnamedText_71dc6 + dw UnnamedText_71dcb + dw UnnamedText_71dd0 + dw UnnamedText_71dd5 + dw UnnamedText_71dda UnnamedText_71d88: ; 71d88 (1c:5d88) TX_FAR _UnnamedText_71d88 @@ -106502,7 +107156,7 @@ LoadTrainerCardBadgePalettes: ; 71f3b (1c:5f3b) ld de, $cc5b ld bc, $40 call CopyData - ld de, Unknown_71f8f + ld de, LoopCounts_71f8f ld hl, $cc5d ld a, [W_OBTAINEDBADGES] ld c, $8 @@ -106551,8 +107205,9 @@ PointerTable_71f73: ; 71f73 (1c:5f73) dw Func_71ebb dw LoadTrainerCardBadgePalettes -Unknown_71f8f: ; 71f8f (1c:5f8f) -INCBIN "baserom.gbc",$71f8f,$71f97 - $71f8f +; each byte is the number of loops to make in .asm_71f5b for each badge +LoopCounts_71f8f: ; 71f8f (1c:5f8f) + db $06,$06,$06,$12,$06,$06,$06,$06 DeterminePaletteID: ; 71f97 (1c:5f97) bit 3, a ; bit 3 of battle status 3, set if current Pokemon is transformed @@ -107352,10 +108007,11 @@ IF _BLUE INCBIN "gfx/blue/sgbborder.map" ENDC -INCBIN "baserom.gbc",$72e88,$72ede - $72e88 + ds $56 Unknown_72ede: ; 72ede (1c:6ede) -INCBIN "baserom.gbc",$72ede,$72f88 - $72ede + ds $AA + IF _RED RGB 30,29,29 ; PAL_SGB1 RGB 25,22,25 @@ -107369,7 +108025,7 @@ IF _BLUE RGB 16,20,27 ENDC -INCBIN "baserom.gbc",$72f90,$72fa8 - $72f90 + ds $18 IF _RED RGB 30,29,29 ; PAL_SGB2 @@ -107384,7 +108040,7 @@ IF _BLUE RGB 28,25,15 ENDC -INCBIN "baserom.gbc",$72fb0,$72fc8 - $72fb0 + ds $18 IF _RED RGB 30,29,29 ; PAL_SGB3 @@ -107399,7 +108055,7 @@ IF _BLUE RGB 14,22,17 ENDC -INCBIN "baserom.gbc",$72fd0,$72fe8 - $72fd0 + ds $18 SGBBorderGraphics: ; 72fe8 (1c:6fe8) IF _RED @@ -107585,7 +108241,7 @@ SaveSAV: ;$770a NowSavingString: db "Now saving...@" -SaveSAVConfirm: ; $7768 +SaveSAVConfirm: ; 73768 (1c:7768) call PrintText FuncCoord 0, 7 ld hl,Coord @@ -107724,7 +108380,7 @@ Func_73863: ; 73863 (1c:7863) ret Func_7387b: ; 7387b (1c:787b) - ld hl, Unknown_73895 ; $7895 + ld hl, PointerTable_73895 ; $7895 ld a, [$d5a0] and $7f cp $6 @@ -107742,8 +108398,13 @@ Func_7387b: ; 7387b (1c:787b) ld l, a ret -Unknown_73895: ; 73895 (1c:7895) -INCBIN "baserom.gbc",$73895,$738a1 - $73895 +PointerTable_73895: ; 73895 (1c:7895) + dw $A000 + dw $A462 + dw $A8C4 + dw $AD26 + dw $B188 + dw $B5EA Func_738a1: ; 738a1 (1c:78a1) ld hl, UnnamedText_73909 ; $7909 @@ -108163,7 +108824,7 @@ Func_7405c: ; 7405c (1d:405c) jp Func_7418e Func_740ba: ; 740ba (1d:40ba) - ld hl, Unknown_74160 ; $4160 + ld hl, DataTable_74160 ; $4160 ld b, $4 .asm_740bf ld a, [hli] @@ -108268,8 +108929,8 @@ Func_74152: ; 74152 (1d:4152) jr z, .asm_7415a ret -Unknown_74160: ; 74160 (1d:4160) -INCBIN "baserom.gbc",$74160,$74164 - $74160 +DataTable_74160: ; 74160 (1d:4160) + db $C0,$D0,$E0,$F0 Func_74164: ; 74164 (1d:4164) ld a, l @@ -108388,7 +109049,7 @@ Func_7418e: ; 7418e (1d:418e) call CopyVideoData FuncCoord 4, 8 ; $c444 ld hl, Coord - ld de, UnknownText_74229 ; $4229 + ld de, UnnamedText_74229 ; $4229 call PlaceString FuncCoord 4, 9 ; $c458 ld hl, Coord @@ -108396,7 +109057,7 @@ Func_7418e: ; 7418e (1d:418e) call PlaceString jp Func_740ba -UnknownText_74229: ; 74229 (1d:4229) +UnnamedText_74229: ; 74229 (1d:4229) db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@" db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@" @@ -108404,7 +109065,6 @@ Unknown_74243: ; 74243 (1d:4243) INCBIN "baserom.gbc",$74243,$742c3 - $74243 CreditsTextPointers: ; 742c3 (1d:42c3) - dw CredVersion dw CredTajiri dw CredTaOota @@ -108654,7 +109314,7 @@ PrintStatusAilment: ; 747de (1d:47de) ld [hl], "R" ret -Unknown_7481f: ; 7481f (1d:481f) +Func_7481f: ; 7481f (1d:481f) ld hl, HiddenItemCoords ld b, $0 .asm_74824 @@ -111408,7 +112068,7 @@ Func_75d38: ; 75d38 (1d:5d38) xor a ld [$cd37], a ld de, $cc5b - ld hl, Unknown_75d68 + ld hl, FossilsList .asm_75d42 ld a, [hli] and a @@ -111437,8 +112097,11 @@ Func_75d38: ; 75d38 (1d:5d38) ld [de], a ret -Unknown_75d68: ; 75d68 (1d:5d68) -INCBIN "baserom.gbc",$75d68,$75d6c - $75d68 +FossilsList: ; 75d68 (1d:5d68) + db DOME_FOSSIL + db HELIX_FOSSIL + db OLD_AMBER + db $00 Lab4Text1: ; 75d6c (1d:5d6c) db $8 @@ -114326,6 +114989,8 @@ Func_79329: ; 79329 (1e:5329) xor a ld [hli], a ret + +Func_79337: ; 79337 (1e:5337) ld l, e ld h, d @@ -114347,6 +115012,8 @@ Func_79339: ; 79339 (1e:5339) dec c jr nz, .asm_7933c ret + +Func_79350: ; 79350 (1e:5350) ld l, e ld h, d @@ -114574,7 +115241,7 @@ Func_794d4: ; 794d4 (1e:54d4) ld a, [$d09f] cp $0 jr nz, .asm_794e7 - call asm_7985b + call Func_7985b dec hl jr .asm_794eb .asm_794e7 @@ -115039,7 +115706,7 @@ Func_79820: ; 79820 (1e:5820) ret Func_79842: ; 79842 (1e:5842) - ld hl, Unknown_79aea ; $5aea + ld hl, PointerTable_79aea ; $5aea ld e, a ld d, $0 add hl, de @@ -115058,12 +115725,13 @@ Func_79842: ; 79842 (1e:5842) and $f ld b, a ret -asm_7985b: ; 7985b (1e:585b) + +Func_7985b: ; 7985b (1e:585b) ld a, [hld] ld [hli], a inc hl dec c - jr nz, asm_7985b + jr nz, Func_7985b ret Func_79862: ; 79862 (1e:5862) @@ -115348,8 +116016,23 @@ Func_79ace: ; 79ace (1e:5ace) pop hl ret -Unknown_79aea: ; 79aea (1e:5aea) -INCBIN "baserom.gbc",$79aea,$79b02 - $79aea +PointerTable_79aea: ; 79aea (1e:5aea) + dw $5b24 + db $77 + dw $5b55 + db $57 + dw $5b78 + db $37 + dw $5b8D + db $77 + dw $5bBE + db $77 + dw $5bEF + db $77 + dw $5c20 + db $86 + dw $5c50 + db $3C Unknown_79b02: ; 79b02 (1e:5b02) INCBIN "baserom.gbc",$79b02,$79b1b - $79b02 @@ -115599,7 +116282,7 @@ Func_79f54: ; 79f54 (1e:5f54) Func_79f92: ; 79f92 (1e:5f92) ld a, [$c109] - ld hl, Unknown_79fb0 ; $5fb0 + ld hl, PointerTable_79fb0 ; $5fb0 ld c, a ld b, $0 add hl, bc @@ -115619,8 +116302,18 @@ Func_79f92: ; 79f92 (1e:5f92) pop hl ret -Unknown_79fb0: ; 79fb0 (1e:5fb0) -INCBIN "baserom.gbc",$79fb0,$79fc0 - $79fb0 +PointerTable_79fb0: ; 79fb0 (1e:5fb0) + db $FF,$00 + dw Func_79350 + + db $01,$00 + dw Func_79350 + + db $01,$01 + dw Func_79337 + + db $FF,$01 + dw Func_79337 Func_79fc0: ; 79fc0 (1e:5fc0) ld hl, $8fc0 @@ -118045,7 +118738,7 @@ UnnamedText_802a5: ; 802a5 (20:42a5) db "Congratulations!", $51 db "Here you go!", $58 -UnnamedText_802d9: ; 802d9 (20:42d9) +_UnnamedText_590a5: ; 802d9 (20:42d9) db $0, $52, " got the", $4f db "@" TX_RAM $cc5b @@ -120928,7 +121621,7 @@ UnnamedText_88bfd: ; 88bfd (22:4bfd) _UnnamedText_529e9: ; 88c6f (22:4c6f) db $0, "Turn the page?", $57 -UnnamedText_88c7f: ; 88c7f (22:4c7f) +_UnnamedText_529ee: ; 88c7f (22:4c7f) db $0, "GIRL: Hey! Don't", $4f db "look at my notes!@@" @@ -121106,7 +121799,7 @@ _UnnamedText_5ddf7: ; 893a7 (22:53a7) db $0, "Nope, there's", $4f db "only trash here.", $57 -UnnamedText_893c6: ; 893c6 (22:53c6) +_UnnamedText_5dec8: ; 893c6 (22:53c6) db $0, "Hey! There's a", $4f db "switch under the", $55 db "trash!", $55 @@ -121120,13 +121813,13 @@ _UnnamedText_5dedb: ; 89418 (22:5418) db "under the trash!", $55 db "Turn it on!", $58 -UnnamedText_89451: ; 89451 (22:5451) +_UnnamedText_5deef: ; 89451 (22:5451) db $0, "The 2nd electric", $4f db "lock opened!", $51 db "The motorized door", $4f db "opened!@@" -UnnamedText_8948c: ; 8948c (22:548c) +_UnnamedText_5df02: ; 8948c (22:548c) db $0, "Nope! There's", $4f db "only trash here.", $55 db "Hey! The electric", $55 @@ -121403,22 +122096,22 @@ UnnamedText_89a2e: ; 89a2e (22:5a2e) db $0, " is", $55 db "disabled!", $58 -UnnamedText_89a40: ; 89a40 (22:5a40) +_UnnamedText_3dafb: ; 89a40 (22:5a40) db $0, $5a, "@@" -UnnamedText_89a44: ; 89a44 (22:5a44) +_UnnamedText_3db2d: ; 89a44 (22:5a44) db $0, $4f db "used @@" -UnnamedText_89a4d: ; 89a4d (22:5a4d) +_UnnamedText_3db34: ; 89a4d (22:5a4d) db $0, $4f db "used @@" -UnnamedText_89a56: ; 89a56 (22:5a56) +_UnnamedText_3db43: ; 89a56 (22:5a56) db $0, "instead,", $55 db "@@" -UnnamedText_89a62: ; 89a62 (22:5a62) +_UnnamedText_3db4c: ; 89a62 (22:5a62) TX_RAM $cf4b db $0, "@" @@ -121508,16 +122201,16 @@ UnnamedText_89bb5: ; 89bb5 (22:5bb5) TX_NUM $cd05, 1, 1 db $0, " times!", $58 -UnnamedText_89bc2: ; 89bc2 (22:5bc2) +_UnnamedText_554b2: ; 89bc2 (22:5bc2) TX_RAM $cd6d db $0, " gained", $4f db "@@" -UnnamedText_89bd0: ; 89bd0 (22:5bd0) +_UnnamedText_554cb: ; 89bd0 (22:5bd0) db $0, "with EXP.ALL,", $55 db "@@" -UnnamedText_89be1: ; 89be1 (22:5be1) +_UnnamedText_554d4: ; 89be1 (22:5be1) db $0, "a boosted", $55 db "@@" _UnnamedText_554d8: ; 89bee (22:5bee) @@ -121563,26 +122256,34 @@ _UnnamedText_58e54: ; 89c9e (22:5c9e) db $0, "Darn! The GHOST", $4f db "can't be ID'd!", $58 -UnknownText_89cbc: ; 89cbc (22:5cbc) +_UnnamedText_58eae: ; 89cbc (22:5cbc) db $0, "Go! @@" + +_UnnamedText_58eb5: ; 89cc3 (22:5cc3) db $0, "Do it! @@" + +_UnnamedText_58ebc: ; 89ccd (22:5ccd) db $0, "Get'm! @@" -UnknownText_89cd6: ; 89cd6 (22:5cd6) +_UnnamedText_58ec3: ; 89cd6 (22:5cd6) db $0, "The enemy's weak!", $4f db "Get'm! @@" _UnnamedText_58ecc: ; 89cf0 (22:5cf0) TX_RAM W_PLAYERMONNAME db $0, "!", $57 + +_UnnamedText_58ed7: ; 89cf6 (22:5cf6) TX_RAM W_PLAYERMONNAME db $0, " @@" + +_UnnamedText_58f25: ; 89cfd (22:5cfd) db $0, "enough!@@" -_UnnamedText_89d07: ; 89d07 (22:5d07) +_UnnamedText_58f2c: ; 89d07 (22:5d07) db $0, "OK!@@" -UnknownText_89d0d: ; 89d0d (22:5d0d) +_UnnamedText_58f33: ; 89d0d (22:5d0d) db $0, "good!@@" _UnnamedText_58f3e: ; 89d15 (22:5d15) @@ -121807,7 +122508,7 @@ _MonIsTakenOutText: ; 0x8a1b9 db $0, " is", $4f db "taken out.", $55 db "Got @" -UnknownText_8a1d1: ; 8a1d1 (22:61d1) +UnnamedText_8a1d1: ; 8a1d1 (22:61d1) TX_RAM $cf4b db $0, ".", $58 @@ -121910,7 +122611,7 @@ _DoYouWantToNicknameText: ; 0x8a605 db "give a nickname", $55 db "to @" -UnknownText_8a629: ; 8a629 (22:6629) +UnnamedText_8a629: ; 8a629 (22:6629) TX_RAM $cd6d db $0, "?", $57 @@ -121928,7 +122629,7 @@ _SSAnne8AfterBattleText2: ; 8a677 (22:6677) db $0, " and", $4f db "@" -UnknownText_8a681: ; 8a681 (22:6681) +UnnamedText_8a681: ; 8a681 (22:6681) TX_RAM $cd6d db $0, " will", $55 db "be traded.", $57 @@ -122079,7 +122780,7 @@ _UnnamedText_56419: ; 8abf0 (22:6bf0) db $0, "Fine, I'll look", $4f db "after @" -UnknownText_8ac07: ; 8ac07 (22:6c07) +UnnamedText_8ac07: ; 8ac07 (22:6c07) TX_RAM $cd6d db $0, $55 db "for a while.", $58 @@ -122091,14 +122792,14 @@ _UnnamedText_5641e: ; 8ac19 (22:6c19) _UnnamedText_56423: ; 8ac32 (22:6c32) db $0, "Your @" -UnknownText_8ac39: ; 8ac39 (22:6c39) +UnnamedText_8ac39: ; 8ac39 (22:6c39) TX_RAM $cd6d db $0, $4f db "has grown a lot!", $51 db "By level, it's", $4f db "grown by @" -UnknownText_8ac67: ; 8ac67 (22:6c67) +UnnamedText_8ac67: ; 8ac67 (22:6c67) TX_NUM $cd3e,$1,$3 db $0, "!", $51 db "Aren't I great?", $58 @@ -122109,7 +122810,7 @@ _UnnamedText_56428: ; 8ac7d (22:6c7d) ;XXX db $2, $3f, $cd, $c2 -UnknownText_8ac8f: ; 8ac8f (22:6c8f) +UnnamedText_8ac8f: ; 8ac8f (22:6c8f) db $0, $4f db "for the return", $55 db "of this #MON.", $57 @@ -122118,7 +122819,7 @@ _UnnamedText_5642d: ; 8acae (22:6cae) db $0, $52, " got", $4f db "@" -UnknownText_8acb6: ; 8acb6 (22:6cb6) +UnnamedText_8acb6: ; 8acb6 (22:6cb6) TX_RAM $da49 db $0, " back!", $57 @@ -122126,7 +122827,7 @@ _UnnamedText_56432: ; 8acc1 (22:6cc1) db $0, "Back already?", $4f db "Your @" -UnknownText_8acd6: ; 8acd6 (22:6cd6) +UnnamedText_8acd6: ; 8acd6 (22:6cd6) TX_RAM $cd6d db $0, $55 db "needs some more", $55 @@ -122423,7 +123124,7 @@ _UnnamedText_564c5: ; 8ca00 (23:4a00) db $52, " received", $4f db "a @" -UnknownText_8ca48: ; 8ca48 (23:4a48) +UnnamedText_8ca48: ; 8ca48 (23:4a48) TX_RAM $cf4b db $0, "!@@" @@ -122751,7 +123452,7 @@ _UnnamedText_1cae8: ; 8d643 (23:5643) db $0, $52, " got", $4f db "@" -UnknownText_8d64b: ; 8d64b (23:564b) +UnnamedText_8d64b: ; 8d64b (23:564b) TX_RAM $cf4b db $0, "!@@" @@ -124793,13 +125494,13 @@ _VictoryRoadGuardText1: ; 9261e (24:661e) db "only if you have", $55 db "the @" -UnknownText_92647: ; 92647 (24:6647) +UnnamedText_92647: ; 92647 (24:6647) TX_RAM $cd6d db $0, "!", $51 db "You don't have the", $4f db "@" -UnknownText_92660: ; 92660 (24:6660) +UnnamedText_92660: ; 92660 (24:6660) TX_RAM $cd6d db $0, " yet!", $51 db "You have to have", $4f @@ -124811,13 +125512,13 @@ _VictoryRoadGuardText2: ; 92696 (24:6696) db "only if you have", $55 db "the @" -UnknownText_926bf: ; 926bf (24:66bf) +UnnamedText_926bf: ; 926bf (24:66bf) TX_RAM $cd6d db $0, "!", $51 db "Oh! That is the", $4f db "@" -UnknownText_926d6: ; 926d6 (24:66d6) +UnnamedText_926d6: ; 926d6 (24:66d6) TX_RAM $cd6d db $0, "!@@" @@ -124844,7 +125545,7 @@ _UnnamedText_5151a: ; 92779 (24:6779) db $0, $52, " received", $4f db "a @" -UnknownText_92788: ; 92788 (24:6788) +UnnamedText_92788: ; 92788 (24:6788) TX_RAM $cf4b db $0, "!@@" @@ -125123,14 +125824,14 @@ _UnnamedText_3af43: ; 946cf (25:46cf) db $0, $4f db "into @" -UnknownText_946d7: ; 946d7 (25:46d7) +UnnamedText_946d7: ; 946d7 (25:46d7) TX_RAM $cd6d db $0, "!", $57 _UnnamedText_3af48: ; 946dd (25:46dd) db $0, "Huh? @" -UnknownText_946e4: ; 946e4 (25:46e4) +UnnamedText_946e4: ; 946e4 (25:46e4) TX_RAM $cf4b db $0, $4f db "stopped evolving!", $58 @@ -125138,7 +125839,7 @@ UnknownText_946e4: ; 946e4 (25:46e4) _UnnamedText_3af4d: ; 946fb (25:46fb) db $0, "What? @" -UnknownText_94703: ; 94703 (25:4703) +UnnamedText_94703: ; 94703 (25:4703) TX_RAM $cf4b db $0, $4f db "is evolving!", $57 @@ -125171,29 +125872,29 @@ _UnnamedText_3f423: ; 94782 (25:4782) db $0, "Fire defrosted", $4f db $59, "!", $58 -UnknownText_94795: ; 94795 (25:4795) +_UnnamedText_3f528: ; 94795 (25:4795) db $0, $5a, "'s", $4f db "@" -UnknownText_9479a: ; 9479a (25:479a) +UnnamedText_9479a: ; 9479a (25:479a) TX_RAM $cf4b db $0, "@@" -UnknownText_947a0: ; 947a0 (25:47a0) +_UnnamedText_3f542: ; 947a0 (25:47a0) db $0, $4c, "greatly@@" _UnnamedText_3f547: ; 947ab (25:47ab) db $0, " rose!", $58 -UnknownText_947b3: ; 947b3 (25:47b3) +_UnnamedText_3f661: ; 947b3 (25:47b3) db $0, $59, "'s", $4f db "@" -UnknownText_947b8: ; 947b8 (25:47b8) +UnnamedText_947b8: ; 947b8 (25:47b8) TX_RAM $cf4b db $0, "@@" -UnknownText_947be: ; 947be (25:47be) +_UnnamedText_3f67e: ; 947be (25:47be) db $0, $4c, "greatly@@" _UnnamedText_3f683: ; 947c9 (25:47c9) @@ -125211,7 +125912,7 @@ _UnnamedText_3f80c: ; 947f9 (25:47f9) db $0, $59, $4f db "was blown away!", $58 -UnnamedText_9480c: ; 9480c (25:480c) +_UnnamedText_3f8c8: ; 9480c (25:480c) db $0, $5a, "@@" _UnnamedText_3f8f9: ; 94810 (25:4810) @@ -127642,20 +128343,20 @@ _UnnamedText_484ee: ; 9cbb5 (27:4bb5) db $0, "Give her which", $4f db "drink?", $57 -UnnamedText_9cbcc: ; 9cbcc (27:4bcc) +_UnnamedText_484f3: ; 9cbcc (27:4bcc) db $0, "Yay!", $51 db "FRESH WATER!", $51 db "Thank you!", $51 db "You can have this", $4f db "from me!@@" -UnnamedText_9cc06: ; 9cc06 (27:4c06) +_UnnamedText_484f9: ; 9cc06 (27:4c06) db $0, $52, " received", $4f db "@" TX_RAM $cf4b db $0, "!@@" -UnnamedText_9cc1a: ; 9cc1a (27:4c1a) +_UnnamedText_484fe: ; 9cc1a (27:4c1a) db $0, $51 db "@" TX_RAM $cf4b @@ -127664,20 +128365,20 @@ UnnamedText_9cc1a: ; 9cc1a (27:4c1a) db "It can freeze the", $4f db "target sometimes!@@" -UnnamedText_9cc5a: ; 9cc5a (27:4c5a) +_UnnamedText_48504: ; 9cc5a (27:4c5a) db $0, "Yay!", $51 db "SODA POP!", $51 db "Thank you!", $51 db "You can have this", $4f db "from me!@@" -UnnamedText_9cc91: ; 9cc91 (27:4c91) +_UnnamedText_4850a: ; 9cc91 (27:4c91) db $0, $52, " received", $4f db "@" TX_RAM $cf4b db $0, "!@@" -UnnamedText_9cca5: ; 9cca5 (27:4ca5) +_UnnamedText_4850f: ; 9cca5 (27:4ca5) db $0, $51 db "@" TX_RAM $cf4b @@ -127686,27 +128387,27 @@ UnnamedText_9cca5: ; 9cca5 (27:4ca5) db "It can spook the", $4f db "target sometimes!@@" -UnnamedText_9cce6: ; 9cce6 (27:4ce6) +_UnnamedText_48515: ; 9cce6 (27:4ce6) db $0, "Yay!", $51 db "LEMONADE!", $51 db "Thank you!", $51 db "You can have this", $4f db "from me!@@" -ReceivedTM49Text: ; 9cd1d (27:4d1d) +_ReceivedTM49Text: ; 9cd1d (27:4d1d) db $0, $52, " received", $4f db "TM49!@@" -UnnamedText_9cd30: ; 9cd30 (27:4d30) +_UnnamedText_48520: ; 9cd30 (27:4d30) db $0, $51 db "TM49 contains", $4f db "TRI ATTACK!@@" -UnnamedText_9cd4d: ; 9cd4d (27:4d4d) +_UnnamedText_48526: ; 9cd4d (27:4d4d) db $0, "You don't have", $4f db "space for this!@@" -UnnamedText_9cd6d: ; 9cd6d (27:4d6d) +_UnnamedText_4852c: ; 9cd6d (27:4d6d) db $0, "No thank you!", $4f db "I'm not thirsty", $55 db "after all!@@" @@ -127724,7 +128425,7 @@ _UnnamedText_48598: ; 9cdee (27:4dee) db "I want something", $55 db "to drink!", $57 -_UnnamedText_4859d: ; 9ce16 (27:4e16) +_CeladonMartRoofText4: ; 9ce16 (27:4e16) db $0, "I'm thirsty!", $4f db "I want something", $55 db "to drink!", $51 @@ -129828,7 +130529,7 @@ _CannotGetOffHereText: ; a4168 (29:4168) db $0, "You can't get off", $4f db "here.", $58 -UnnamedText_a4180: ; a4180 (29:4180) +_UnnamedText_4fe39: ; a4180 (29:4180) db $0, $52, " got", $4f db "@" TX_RAM $cd6d diff --git a/maps/unusedblocks58d7d.blk b/maps/unusedblocks58d7d.blk new file mode 100755 index 00000000..9641efe4 --- /dev/null +++ b/maps/unusedblocks58d7d.blk @@ -0,0 +1,2 @@ +
!"# +
\ No newline at end of file diff --git a/maps/unusedblocks601f8.blk b/maps/unusedblocks601f8.blk new file mode 100755 index 00000000..eb9bb094 --- /dev/null +++ b/maps/unusedblocks601f8.blk @@ -0,0 +1 @@ +
, +> + + + +>
\ No newline at end of file diff --git a/maps/unusedblocks60cef.blk b/maps/unusedblocks60cef.blk new file mode 100755 index 00000000..21808bb7 --- /dev/null +++ b/maps/unusedblocks60cef.blk @@ -0,0 +1 @@ +
\ No newline at end of file @@ -321,7 +321,7 @@ wWalkCounter: ; cfc5 ds 1 -wMusicChannelPointer: ; cfc7 +wMusicHeaderPointer: ; cfc7 ; (the current music channel address - $4000) / 3 ds 1 |