Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More consistent data tables

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-11 22:59:30 -05:00
parent f1f84743f7
commit 213dcc70d7
32 changed files with 653 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

272
main.asm
View File

@@ -1,5 +1,6 @@
INCLUDE "includes.asm"
SECTION "bank1", ROMX
PlaceWaitingText:: ; 4000
@@ -246,6 +247,7 @@ Predef1: ; 747a
; not used
ret
SECTION "bank2", ROMX
INCLUDE "engine/player_object.asm"
@@ -253,6 +255,7 @@ INCLUDE "engine/sine.asm"
INCLUDE "engine/predef.asm"
INCLUDE "engine/color.asm"
SECTION "bank3", ROMX
CheckTime:: ; c000
@@ -380,6 +383,7 @@ KnowsMove: ; f9ea
text_jump UnknownText_0x1c5ea8
db "@"
SECTION "bank4", ROMX
INCLUDE "engine/pack.asm"
@@ -603,6 +607,7 @@ root set 1
root set root+1
endr
SECTION "bank5", ROMX
INCLUDE "engine/rtc.asm"
@@ -628,6 +633,7 @@ SECTION "bank8", ROMX
INCLUDE "engine/clock_reset.asm"
SECTION "bank9", ROMX
StringBufferPointers:: ; 24000
@@ -1147,6 +1153,7 @@ Kurt_SelectQuantity_InterpretJoypad: ; 27a28
ld b, a
ret
SECTION "bankA", ROMX
INCLUDE "engine/link.asm"
@@ -1171,6 +1178,7 @@ INCBIN "gfx/player/chris_back.2bpp.lz"
DudeBackpic: ; 2bbaa
INCBIN "gfx/battle/dude.2bpp.lz"
SECTION "bankB", ROMX
INCLUDE "battle/trainer_huds.asm"
@@ -1606,10 +1614,12 @@ PlaceGraphic: ; 2ef6e
jr nz, .x2
ret
SECTION "Effect Commands", ROMX
INCLUDE "battle/effect_commands.asm"
SECTION "Enemy Trainers", ROMX
INCLUDE "battle/ai/items.asm"
@@ -1690,12 +1700,14 @@ INCLUDE "trainers/trainer_pointers.asm"
INCLUDE "trainers/trainers.asm"
SECTION "Battle Core", ROMX
INCLUDE "battle/core.asm"
INCLUDE "battle/effect_command_pointers.asm"
SECTION "bank10", ROMX
INCLUDE "engine/pokedex.asm"
@@ -1704,232 +1716,20 @@ INCLUDE "battle/moves/moves.asm"
INCLUDE "engine/evolve.asm"
SECTION "bank11", ROMX
INCLUDE "engine/fruit_trees.asm"
INCLUDE "battle/ai/move.asm"
AnimateDexSearchSlowpoke: ; 441cf
ld hl, .FrameIDs
ld b, 25
.loop
ld a, [hli]
; Wrap around
cp $fe
jr nz, .ok
ld hl, .FrameIDs
ld a, [hli]
.ok
ld [wDexSearchSlowpokeFrame], a
ld a, [hli]
ld c, a
push bc
push hl
call DoDexSearchSlowpokeFrame
pop hl
pop bc
call DelayFrames
dec b
jr nz, .loop
xor a
ld [wDexSearchSlowpokeFrame], a
call DoDexSearchSlowpokeFrame
ld c, 32
call DelayFrames
ret
.FrameIDs: ; 441fc
; frame ID, duration
db 0, 7
db 1, 7
db 2, 7
db 3, 7
db 4, 7
db -2
DoDexSearchSlowpokeFrame: ; 44207
ld a, [wDexSearchSlowpokeFrame]
ld hl, .SpriteData
ld de, Sprites
.loop
ld a, [hli]
cp -1
ret z
ld [de], a
inc de
ld a, [hli]
ld [de], a
inc de
ld a, [wDexSearchSlowpokeFrame]
ld b, a
add a
add b
add [hl]
inc hl
ld [de], a
inc de
ld a, [hli]
ld [de], a
inc de
jr .loop
.SpriteData: ; 44228
dsprite 11, 0, 9, 0, $00, $00
dsprite 11, 0, 10, 0, $01, $00
dsprite 11, 0, 11, 0, $02, $00
dsprite 12, 0, 9, 0, $10, $00
dsprite 12, 0, 10, 0, $11, $00
dsprite 12, 0, 11, 0, $12, $00
dsprite 13, 0, 9, 0, $20, $00
dsprite 13, 0, 10, 0, $21, $00
dsprite 13, 0, 11, 0, $22, $00
db -1
DisplayDexEntry: ; 4424d
call GetPokemonName
hlcoord 9, 3
call PlaceString ; mon species
ld a, [wd265]
ld b, a
call GetDexEntryPointer
ld a, b
push af
hlcoord 9, 5
call FarString ; dex species
ld h, b
ld l, c
push de
; Print dex number
hlcoord 2, 8
ld a, $5c ; No
ld [hli], a
ld a, $5d ; .
ld [hli], a
ld de, wd265
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
call PrintNum
; Check to see if we caught it. Get out of here if we haven't.
ld a, [wd265]
dec a
call CheckCaughtMon
pop hl
pop bc
ret z
; Get the height of the Pokemon.
ld a, [CurPartySpecies]
ld [CurSpecies], a
inc hl
ld a, b
push af
push hl
call GetFarHalfword
ld d, l
ld e, h
pop hl
inc hl
inc hl
ld a, d
or e
jr z, .skip_height
push hl
push de
ld hl, sp+$0
ld d, h
ld e, l
hlcoord 12, 7
lb bc, 2, PRINTNUM_MONEY | 4
call PrintNum
hlcoord 14, 7
ld [hl], $5e ; ft symbol
pop af
pop hl
.skip_height
pop af
push af
inc hl
push hl
dec hl
call GetFarHalfword
ld d, l
ld e, h
ld a, e
or d
jr z, .skip_weight
push de
ld hl, sp+$0
ld d, h
ld e, l
hlcoord 11, 9
lb bc, 2, PRINTNUM_RIGHTALIGN | 5
call PrintNum
pop de
.skip_weight
; Page 1
lb bc, 5, SCREEN_WIDTH - 2
hlcoord 2, 11
call ClearBox
hlcoord 1, 10
ld bc, SCREEN_WIDTH - 1
ld a, $61 ; horizontal divider
call ByteFill
; page number
hlcoord 1, 9
ld [hl], $55
inc hl
ld [hl], $55
hlcoord 1, 10
ld [hl], $56 ; P.
inc hl
ld [hl], $57 ; 1
pop de
inc de
pop af
hlcoord 2, 11
push af
call FarString
pop bc
ld a, [wPokedexStatus]
or a
ret z
; Page 2
push bc
push de
lb bc, 5, SCREEN_WIDTH - 2
hlcoord 2, 11
call ClearBox
hlcoord 1, 10
ld bc, SCREEN_WIDTH - 1
ld a, $61
call ByteFill
; page number
hlcoord 1, 9
ld [hl], $55
inc hl
ld [hl], $55
hlcoord 1, 10
ld [hl], $56 ; P.
inc hl
ld [hl], $58 ; 2
pop de
inc de
pop af
hlcoord 2, 11
call FarString
ret
String_44331: ; 44331
db "#@"
INCLUDE "engine/pokedex_2.asm"
INCLUDE "data/pokedex/entry_pointers.asm"
INCLUDE "engine/mail.asm"
SECTION "Crystal Unique", ROMX
INCLUDE "engine/init_gender.asm"
@@ -2137,6 +1937,7 @@ Buena_ExitMenu: ; 4ae5e
ld [hOAMUpdate], a
ret
SECTION "bank13", ROMX
SwapTextboxPalettes:: ; 4c000
@@ -3486,6 +3287,7 @@ INCLUDE "misc/gbc_only.asm"
INCLUDE "event/poke_seer.asm"
SECTION "bank14", ROMX
INCLUDE "engine/party_menu.asm"
@@ -4613,10 +4415,12 @@ UnknownEggPic:: ; 53d9c
; Another egg pic. This is shifted up a few pixels.
INCBIN "gfx/unknown/unknown_egg.2bpp.lz"
SECTION "bank19", ROMX
INCLUDE "text/phone/extra.asm"
SECTION "bank20", ROMX
INCLUDE "engine/player_movement.asm"
@@ -4629,6 +4433,7 @@ INCLUDE "text/battle.asm"
INCLUDE "engine/debug.asm"
SECTION "bank21", ROMX
INCLUDE "engine/printer.asm"
@@ -4637,6 +4442,7 @@ INCLUDE "battle/anim_gfx.asm"
INCLUDE "event/halloffame.asm"
SECTION "bank22", ROMX
INCLUDE "event/kurt.asm"
@@ -4915,6 +4721,7 @@ INCLUDE "event/dratini.asm"
INCLUDE "event/battle_tower.asm"
INCLUDE "misc/mobile_22_2.asm"
SECTION "bank23", ROMX
Predef35: ; 8c000
@@ -4944,6 +4751,7 @@ INCLUDE "engine/sprites.asm"
INCLUDE "engine/mon_icons.asm"
SECTION "bank24", ROMX
INCLUDE "engine/phone.asm"
@@ -4953,11 +4761,13 @@ INCLUDE "engine/pokegear.asm"
INCLUDE "engine/fish.asm"
INCLUDE "engine/slot_machine.asm"
SECTION "Phone Engine", ROMX
INCLUDE "engine/more_phone_scripts.asm"
INCLUDE "engine/buena_phone_scripts.asm"
SECTION "Phone Text", ROMX
INCLUDE "text/phone/anthony_overworld.asm"
@@ -4978,6 +4788,7 @@ INCLUDE "text/phone/kenji_overworld.asm"
INCLUDE "text/phone/parry_overworld.asm"
INCLUDE "text/phone/erin_overworld.asm"
SECTION "bank2E", ROMX
INCLUDE "engine/events_3.asm"
@@ -4986,6 +4797,7 @@ INCLUDE "engine/radio.asm"
INCLUDE "gfx/mail.asm"
SECTION "bank2F", ROMX
INCLUDE "engine/std_scripts.asm"
@@ -5086,6 +4898,7 @@ LoadPoisonBGPals: ; cbcdd
TheEndGFX:: ; cbd2e
INCBIN "gfx/credits/theend.2bpp"
SECTION "bank33", ROMX
DisplayCaughtContestMonStats: ; cc000
@@ -5201,6 +5014,7 @@ INCLUDE "battle/anim_commands.asm"
INCLUDE "battle/anim_objects.asm"
SECTION "Pic Animations 1", ROMX
INCLUDE "gfx/pics/animation.asm"
@@ -5241,21 +5055,25 @@ INCLUDE "gfx/pics/bitmasks.asm"
INCLUDE "gfx/pics/unown_bitmask_pointers.asm"
INCLUDE "gfx/pics/unown_bitmasks.asm"
SECTION "Pic Animations 2", ROMX
INCLUDE "gfx/pics/frame_pointers.asm"
INCLUDE "gfx/pics/kanto_frames.asm"
SECTION "bank36", ROMX
FontInversed: INCBIN "gfx/font/font_inversed.1bpp"
SECTION "Pic Animations 3", ROMX
INCLUDE "gfx/pics/johto_frames.asm"
INCLUDE "gfx/pics/unown_frame_pointers.asm"
INCLUDE "gfx/pics/unown_frames.asm"
SECTION "bank38", ROMX
RotateUnownFrontpic: ; e0000
@@ -5383,6 +5201,7 @@ INCLUDE "engine/unown_puzzle.asm"
INCLUDE "engine/dummy_game.asm"
INCLUDE "engine/billspc.asm"
SECTION "bank39", ROMX
CopyrightGFX:: ; e4000
@@ -5391,6 +5210,7 @@ INCBIN "gfx/splash/copyright.2bpp"
INCLUDE "engine/options_menu.asm"
INCLUDE "engine/crystal_intro.asm"
SECTION "bank3E", ROMX
INCLUDE "gfx/font.asm"
@@ -5402,6 +5222,7 @@ INCLUDE "battle/hidden_power.asm"
INCLUDE "battle/misc.asm"
SECTION "bank3F", ROMX
INCLUDE "tilesets/animations.asm"
@@ -5410,10 +5231,12 @@ INCLUDE "engine/npctrade.asm"
INCLUDE "event/mom_phone.asm"
SECTION "bank40", ROMX
INCLUDE "misc/mobile_40.asm"
SECTION "bank41", ROMX
INCLUDE "misc/gfx_41.asm"
@@ -5443,15 +5266,18 @@ INCBIN "gfx/font/overworld.2bpp"
.space
INCBIN "gfx/font/space.2bpp"
SECTION "bank42", ROMX
INCLUDE "misc/mobile_42.asm"
SECTION "Intro Logo", ROMX
IntroLogoGFX: ; 109407
INCBIN "gfx/intro/logo.2bpp.lz"
SECTION "bank43", ROMX
INCLUDE "misc/unused_title.asm"
@@ -5461,23 +5287,28 @@ INCLUDE "engine/title.asm"
INCLUDE "misc/mobile_45.asm"
INCLUDE "misc/mobile_46.asm"
SECTION "bank47", ROMX
INCLUDE "misc/battle_tower_47.asm"
SECTION "bank5B", ROMX
INCLUDE "misc/mobile_5b.asm"
INCLUDE "engine/link_trade.asm"
SECTION "bank5C", ROMX
INCLUDE "misc/mobile_5c.asm"
SECTION "bank5D", ROMX
INCLUDE "text/phone/extra3.asm"
SECTION "bank5E", ROMX
_UpdateBattleHUDs:
@@ -5492,6 +5323,7 @@ _UpdateBattleHUDs:
INCLUDE "misc/mobile_5f.asm"
SECTION "Common Text 1", ROMX
INCLUDE "text/stdtext.asm"
@@ -5507,6 +5339,7 @@ INCLUDE "text/phone/wade_overworld.asm"
INCLUDE "text/phone/ralph_overworld.asm"
INCLUDE "text/phone/liz_overworld.asm"
SECTION "bank6D", ROMX
INCLUDE "text/phone/mom.asm"
@@ -5514,6 +5347,7 @@ INCLUDE "text/phone/bill.asm"
INCLUDE "text/phone/elm.asm"
INCLUDE "text/phone/trainers1.asm"
SECTION "bank72", ROMX
INCLUDE "items/item_names.asm"
@@ -5524,6 +5358,7 @@ INCLUDE "battle/move_names.asm"
INCLUDE "engine/landmarks.asm"
SECTION "bank77", ROMX
UnownFont: ; 1dc000
@@ -5537,6 +5372,7 @@ INCBIN "gfx/mobile/hp.1bpp"
MobileLvIcon: ; 1dc599
INCBIN "gfx/mobile/lv.1bpp"
SECTION "bank77_2", ROMX
Function1dd6a9: ; 1dd6a9
@@ -5968,14 +5804,17 @@ LeggiPostaInglese:
jr nz, .loop
ret
SECTION "bank7B", ROMX
INCLUDE "text/battle_tower.asm"
SECTION "bank7C", ROMX
INCLUDE "data/battle_tower_2.asm"
SECTION "bank7D", ROMX
db $cc, $6b, $1e ; XXX
@@ -6021,13 +5860,16 @@ Function1f5d9f: ; 1f5d9f
.unknown_data
INCBIN "unknown/1f5db4.bin"
SECTION "bank7E", ROMX
INCLUDE "engine/battle_tower.asm"
INCLUDE "engine/odd_eggs.asm"
SECTION "bank7F", ROMX
SECTION "stadium2", ROMX
IF DEF(CRYSTAL11)