Merge pull request #228 from yenatch/nuke-globals

Nuke globals.asm
This commit is contained in:
Bryan Bishop 2014-02-04 07:25:51 -08:00
commit 1202e68d2f
81 changed files with 2473 additions and 2474 deletions

1
.gitignore vendored
View File

@ -1,5 +1,4 @@
# generated # generated
globals.asm
*.tx *.tx
*.o *.o

View File

@ -27,13 +27,9 @@ OBJS := $(CRYSTAL_OBJS)
ROMS := pokecrystal.gbc ROMS := pokecrystal.gbc
ALL_DEPENDENCIES :=
# generate a list of dependencies for each object file # generate a list of dependencies for each object file
$(shell $(foreach obj, $(OBJS), \ $(shell $(foreach obj, $(OBJS), \
$(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) $(POKEMONTOOLS)/scan_includes.py $(obj:.o=.asm) | sed s/globals.asm//g)) \ $(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) $(POKEMONTOOLS)/scan_includes.py $(obj:.o=.asm))) \
))
$(shell $(foreach obj, $(OBJS), \
$(eval ALL_DEPENDENCIES += $($(obj:.o=)_DEPENDENCIES)) \
)) ))
@ -44,7 +40,6 @@ crystal: pokecrystal.gbc
clean: clean:
rm -f $(ROMS) rm -f $(ROMS)
rm -f $(OBJS) rm -f $(OBJS)
rm -f globals.asm
find -iname '*.tx' -exec rm {} + find -iname '*.tx' -exec rm {} +
baserom.gbc: ; baserom.gbc: ;
@ -53,20 +48,16 @@ baserom.gbc: ;
%.asm: ; %.asm: ;
.asm.tx: .asm.tx:
$(eval TEXTQUEUE := $(TEXTQUEUE) $<) $(eval TEXTQUEUE += $<)
@rm -f $@ @rm -f $@
globals.asm: $(ALL_DEPENDENCIES:.asm=.tx) $(OBJS:.o=.tx)
@touch $@
@$(PYTHON) prequeue.py $(TEXTQUEUE)
globals.tx: globals.asm
@cp $< $@
$(OBJS): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_DEPENDENCIES)) $(OBJS): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_DEPENDENCIES))
@$(PYTHON) prequeue.py $(TEXTQUEUE)
$(eval TEXTQUEUE :=)
rgbasm -o $@ $*.tx rgbasm -o $@ $*.tx
pokecrystal.gbc: globals.tx $(CRYSTAL_OBJS) pokecrystal.gbc: $(CRYSTAL_OBJS)
rgblink -n $*.sym -m $*.map -o $@ $(CRYSTAL_OBJS) rgblink -n $*.sym -m $*.map -o $@ $^
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
cmp baserom.gbc $@ cmp baserom.gbc $@

View File

@ -166,7 +166,7 @@ INCBIN "baserom.gbc",$17982d, $1799ef - $17982d
SECTION "Cries", ROMX, BANK[CRIES] SECTION "Cries", ROMX, BANK[CRIES]
CryHeaders: INCLUDE "audio/cry_headers.asm" CryHeaders:: INCLUDE "audio/cry_headers.asm"
INCBIN "baserom.gbc",$f2d69, $f3fb6 - $f2d69 INCBIN "baserom.gbc",$f2d69, $f3fb6 - $f2d69

View File

@ -7,7 +7,7 @@
; PlayStereoSFX ; PlayStereoSFX
; PlayCry ; PlayCry
_SoundRestart: ; e8000 _SoundRestart:: ; e8000
; restart sound operation ; restart sound operation
; clear all relevant hardware registers & wram ; clear all relevant hardware registers & wram
push hl push hl
@ -84,7 +84,7 @@ MusicOff: ; e8057
ret ret
; e805c ; e805c
_UpdateSound: ; e805c _UpdateSound:: ; e805c
; called once per frame ; called once per frame
; no use updating audio if it's not playing ; no use updating audio if it's not playing
ld a, [MusicPlaying] ld a, [MusicPlaying]
@ -2322,7 +2322,7 @@ SetLRTracks: ; e8b1b
ret ret
; e8b30 ; e8b30
_PlayMusic: ; e8b30 _PlayMusic:: ; e8b30
; load music ; load music
call MusicOff call MusicOff
ld hl, MusicID ld hl, MusicID
@ -2365,7 +2365,7 @@ _PlayMusic: ; e8b30
ret ret
; e8b79 ; e8b79
PlayCry: ; e8b79 PlayCry:: ; e8b79
; Play cry de using parameters: ; Play cry de using parameters:
; CryPitch ; CryPitch
; CryEcho ; CryEcho
@ -2479,7 +2479,7 @@ PlayCry: ; e8b79
ret ret
; e8c04 ; e8c04
_PlaySFX: ; e8c04 _PlaySFX:: ; e8c04
; clear channels if they aren't already ; clear channels if they aren't already
call MusicOff call MusicOff
ld hl, $c1cc ; Channel5Flags ld hl, $c1cc ; Channel5Flags
@ -2580,7 +2580,7 @@ _PlaySFX: ; e8c04
; e8ca6 ; e8ca6
PlayStereoSFX: ; e8ca6 PlayStereoSFX:: ; e8ca6
; play sfx de ; play sfx de
call MusicOff call MusicOff
@ -2759,7 +2759,7 @@ ChannelInit: ; e8d5b
ret ret
; e8d76 ; e8d76
LoadMusicByte: ; e8d76 LoadMusicByte:: ; e8d76
; input: ; input:
; de = current music address ; de = current music address
; output: ; output:
@ -3156,7 +3156,7 @@ ChannelPointers: ; e8fd9
dw Channel8 dw Channel8
; e8fe9 ; e8fe9
ClearChannels: ; e8fe9 ClearChannels:: ; e8fe9
; runs ClearChannel for all 4 channels ; runs ClearChannel for all 4 channels
; doesn't seem to be used, but functionally identical to SoundRestart ; doesn't seem to be used, but functionally identical to SoundRestart
ld hl, rNR50 ld hl, rNR50

View File

@ -1,6 +1,6 @@
; Currently, must be in the same bank as the sound engine. ; Currently, must be in the same bank as the sound engine.
PlayTrainerEncounterMusic: ; e900a PlayTrainerEncounterMusic:: ; e900a
; input: e = trainer type ; input: e = trainer type
; turn fade off ; turn fade off
xor a xor a

View File

@ -335,7 +335,7 @@ Functioncc293: ; cc293
; no known jump sources ; no known jump sources
BattleAnimCommands: ; cc2a4 (33:42a4) BattleAnimCommands:: ; cc2a4 (33:42a4)
dw BattleAnimCmd_D0 dw BattleAnimCmd_D0
dw BattleAnimCmd_D1 dw BattleAnimCmd_D1
dw BattleAnimCmd_D2 dw BattleAnimCmd_D2

View File

@ -1,4 +1,4 @@
BattleAnimations: ; c906f BattleAnimations:: ; c906f
dw BattleAnim_0 dw BattleAnim_0
dw BattleAnim_Pound dw BattleAnim_Pound
dw BattleAnim_KarateChop dw BattleAnim_KarateChop

View File

@ -4761,7 +4761,7 @@ Function3df2c: ; 3df2c
Function3df48: ; 3df48 Function3df48:: ; 3df48
push hl push hl
push de push de
push bc push bc
@ -4907,7 +4907,7 @@ PrintPlayerHUD: ; 3dfbf
jp PrintLevel jp PrintLevel
; 3e036 ; 3e036
Function3e036: ; 3e036 Function3e036:: ; 3e036
push hl push hl
push de push de
push bc push bc
@ -7191,7 +7191,7 @@ EmptyBattleTextBox: ; 3edd1
; 3edd8 ; 3edd8
_BattleRandom: ; 3edd8 _BattleRandom:: ; 3edd8
; If the normal RNG is used in a link battle it'll desync. ; If the normal RNG is used in a link battle it'll desync.
; To circumvent this a shared PRNG is used instead. ; To circumvent this a shared PRNG is used instead.

View File

@ -1,9 +1,4 @@
; macros require rst vectors to be defined
FarCall EQU $08
Bankswitch EQU $10
JumpTable EQU $28
INCLUDE "macros.asm" INCLUDE "macros.asm"
INCLUDE "gbhw.asm" INCLUDE "gbhw.asm"
@ -26,169 +21,6 @@ INCLUDE "constants/music_constants.asm"
INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/sfx_constants.asm"
INCLUDE "constants/animation_constants.asm" INCLUDE "constants/animation_constants.asm"
INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/gfx_constants.asm"
INCLUDE "constants/pokemon_data_constants.asm"
INCLUDE "constants/misc_constants.asm"
NONE EQU 0
; egg group constants
MONSTER EQU $01
AMPHIBIAN EQU $02
INSECT EQU $03
AVIAN EQU $04
FIELD EQU $05
FAIRY EQU $06
PLANT EQU $07
HUMANSHAPE EQU $08
INVERTEBRATE EQU $09
INANIMATE EQU $0A
AMORPHOUS EQU $0B
FISH EQU $0C
LADIES_MAN EQU $0D
REPTILE EQU $0E
NO_EGGS EQU $0F
; menu sprites
ICON_POLIWAG EQU $01
ICON_JIGGLYPUFF EQU $02
ICON_DIGLETT EQU $03
ICON_PIKACHU EQU $04
ICON_STARYU EQU $05
ICON_FISH EQU $06
ICON_BIRD EQU $07
ICON_MONSTER EQU $08
ICON_CLEFAIRY EQU $09
ICON_ODDISH EQU $0a
ICON_BUG EQU $0b
ICON_GHOST EQU $0c
ICON_LAPRAS EQU $0d
ICON_HUMANSHAPE EQU $0e
ICON_FOX EQU $0f
ICON_EQUINE EQU $10
ICON_SHELL EQU $11
ICON_BLOB EQU $12
ICON_SERPENT EQU $13
ICON_VOLTORB EQU $14
ICON_SQUIRTLE EQU $15
ICON_BULBASAUR EQU $16
ICON_CHARMANDER EQU $17
ICON_CATERPILLAR EQU $18
ICON_UNOWN EQU $19
ICON_GEODUDE EQU $1a
ICON_FIGHTER EQU $1b
ICON_EGG EQU $1c
ICON_JELLYFISH EQU $1d
ICON_MOTH EQU $1e
ICON_BAT EQU $1f
ICON_SNORLAX EQU $20
ICON_HO_OH EQU $21
ICON_LUGIA EQU $22
ICON_GYARADOS EQU $23
ICON_SLOWPOKE EQU $24
ICON_SUDOWOODO EQU $25
ICON_BIGMON EQU $26
; evolution types
EVOLVE_LEVEL EQU 1
EVOLVE_ITEM EQU 2
EVOLVE_TRADE EQU 3
EVOLVE_HAPPINESS EQU 4
EVOLVE_STAT EQU 5
BASE_HAPPINESS EQU 70
; happiness evolution triggers
HAPPINESS_TO_EVOLVE EQU 220
TR_ANYTIME EQU 1
TR_MORNDAY EQU 2
TR_NITE EQU 3
; stat evolution triggers
ATK_GT_DEF EQU 1
ATK_LT_DEF EQU 2
ATK_EQ_DEF EQU 3
; name length
PLAYER_NAME_LENGTH EQU 8
PKMN_NAME_LENGTH EQU 11
; predefs
PREDEF_FLAG EQU $03
PREDEF_FILLPP EQU $05
PREDEF_ADDPARTYMON EQU $06
PREDEF_FILLSTATS EQU $0C
PREDEF_PRINT_MOVE_DESCRIPTION EQU $11
PREDEF_UPDATE_PLAYER_HUD EQU $12
PREDEF_FILL_BOX EQU $13
PREDEF_UPDATE_ENEMY_HUD EQU $15
PREDEF_START_BATTLE EQU $16
PREDEF_FILL_IN_EXP_BAR EQU $17
PREDEF_FILLMOVES EQU $1B
PREDEF_GET_GENDER EQU $24
PREDEF_STATS_SCREEN EQU $25
PREDEF_DRAW_PLAYER_HP EQU $26
PREDEF_DRAW_ENEMY_HP EQU $27
PREDEF_GET_TYPE_NAME EQU $29
PREDEF_PRINT_MOVE_TYPE EQU $2A
PREDEF_PRINT_TYPE EQU $2B
PREDEF_GET_UNOWN_LETTER EQU $2D
PREDEF_LOAD_SGB_LAYOUT EQU $31
PREDEF_CHECK_CONTEST_MON EQU $33
PREDEF_BATTLE_TRANSITION EQU $34
PREDEF_PARTYMON_ITEM_NAME EQU $3B
PREDEF_DECOMPRESS EQU $40
; flag manipulation
RESET_FLAG EQU 0
SET_FLAG EQU 1
CHECK_FLAG EQU 2
; joypad
BUTTONS EQU %00010000
D_PAD EQU %00100000
NO_INPUT EQU %00000000
A_BUTTON EQU %00000001
B_BUTTON EQU %00000010
SELECT EQU %00000100
START EQU %00001000
D_RIGHT EQU %00010000
D_LEFT EQU %00100000
D_UP EQU %01000000
D_DOWN EQU %10000000
; screen
HP_BAR_LENGTH EQU 6
HP_BAR_LENGTH_PX EQU 48
EXP_BAR_LENGTH EQU 8
EXP_BAR_LENGTH_PX EQU 64
SCREEN_WIDTH EQU 20
SCREEN_HEIGHT EQU 18
SCREEN_WIDTH_PX EQU 160
SCREEN_HEIGHT_PX EQU 144
BG_MAP_WIDTH EQU 32
BG_MAP_HEIGHT EQU 32
TILE_WIDTH EQU 8
; movement
STEP_SLOW EQU 0
STEP_WALK EQU 1
STEP_BIKE EQU 2
STEP_LEDGE EQU 3
STEP_ICE EQU 4
STEP_TURN EQU 5
STEP_BACK_LEDGE EQU 6
STEP_WALK_IN_PLACE EQU 7

View File

@ -0,0 +1,81 @@
; name length
PLAYER_NAME_LENGTH EQU 8
PKMN_NAME_LENGTH EQU 11
; predefs
PREDEF_FLAG EQU $03
PREDEF_FILLPP EQU $05
PREDEF_ADDPARTYMON EQU $06
PREDEF_FILLSTATS EQU $0C
PREDEF_PRINT_MOVE_DESCRIPTION EQU $11
PREDEF_UPDATE_PLAYER_HUD EQU $12
PREDEF_FILL_BOX EQU $13
PREDEF_UPDATE_ENEMY_HUD EQU $15
PREDEF_START_BATTLE EQU $16
PREDEF_FILL_IN_EXP_BAR EQU $17
PREDEF_FILLMOVES EQU $1B
PREDEF_GET_GENDER EQU $24
PREDEF_STATS_SCREEN EQU $25
PREDEF_DRAW_PLAYER_HP EQU $26
PREDEF_DRAW_ENEMY_HP EQU $27
PREDEF_GET_TYPE_NAME EQU $29
PREDEF_PRINT_MOVE_TYPE EQU $2A
PREDEF_PRINT_TYPE EQU $2B
PREDEF_GET_UNOWN_LETTER EQU $2D
PREDEF_LOAD_SGB_LAYOUT EQU $31
PREDEF_CHECK_CONTEST_MON EQU $33
PREDEF_BATTLE_TRANSITION EQU $34
PREDEF_PARTYMON_ITEM_NAME EQU $3B
PREDEF_DECOMPRESS EQU $40
; flag manipulation
RESET_FLAG EQU 0
SET_FLAG EQU 1
CHECK_FLAG EQU 2
; joypad
BUTTONS EQU %00010000
D_PAD EQU %00100000
NO_INPUT EQU %00000000
A_BUTTON EQU %00000001
B_BUTTON EQU %00000010
SELECT EQU %00000100
START EQU %00001000
D_RIGHT EQU %00010000
D_LEFT EQU %00100000
D_UP EQU %01000000
D_DOWN EQU %10000000
; screen
HP_BAR_LENGTH EQU 6
HP_BAR_LENGTH_PX EQU 48
EXP_BAR_LENGTH EQU 8
EXP_BAR_LENGTH_PX EQU 64
SCREEN_WIDTH EQU 20
SCREEN_HEIGHT EQU 18
SCREEN_WIDTH_PX EQU 160
SCREEN_HEIGHT_PX EQU 144
BG_MAP_WIDTH EQU 32
BG_MAP_HEIGHT EQU 32
TILE_WIDTH EQU 8
; movement
STEP_SLOW EQU 0
STEP_WALK EQU 1
STEP_BIKE EQU 2
STEP_LEDGE EQU 3
STEP_ICE EQU 4
STEP_TURN EQU 5
STEP_BACK_LEDGE EQU 6
STEP_WALK_IN_PLACE EQU 7

View File

@ -0,0 +1,83 @@
; egg group constants
MONSTER EQU $01
AMPHIBIAN EQU $02
INSECT EQU $03
AVIAN EQU $04
FIELD EQU $05
FAIRY EQU $06
PLANT EQU $07
HUMANSHAPE EQU $08
INVERTEBRATE EQU $09
INANIMATE EQU $0A
AMORPHOUS EQU $0B
FISH EQU $0C
LADIES_MAN EQU $0D
REPTILE EQU $0E
NO_EGGS EQU $0F
; menu sprites
ICON_POLIWAG EQU $01
ICON_JIGGLYPUFF EQU $02
ICON_DIGLETT EQU $03
ICON_PIKACHU EQU $04
ICON_STARYU EQU $05
ICON_FISH EQU $06
ICON_BIRD EQU $07
ICON_MONSTER EQU $08
ICON_CLEFAIRY EQU $09
ICON_ODDISH EQU $0a
ICON_BUG EQU $0b
ICON_GHOST EQU $0c
ICON_LAPRAS EQU $0d
ICON_HUMANSHAPE EQU $0e
ICON_FOX EQU $0f
ICON_EQUINE EQU $10
ICON_SHELL EQU $11
ICON_BLOB EQU $12
ICON_SERPENT EQU $13
ICON_VOLTORB EQU $14
ICON_SQUIRTLE EQU $15
ICON_BULBASAUR EQU $16
ICON_CHARMANDER EQU $17
ICON_CATERPILLAR EQU $18
ICON_UNOWN EQU $19
ICON_GEODUDE EQU $1a
ICON_FIGHTER EQU $1b
ICON_EGG EQU $1c
ICON_JELLYFISH EQU $1d
ICON_MOTH EQU $1e
ICON_BAT EQU $1f
ICON_SNORLAX EQU $20
ICON_HO_OH EQU $21
ICON_LUGIA EQU $22
ICON_GYARADOS EQU $23
ICON_SLOWPOKE EQU $24
ICON_SUDOWOODO EQU $25
ICON_BIGMON EQU $26
; evolution types
EVOLVE_LEVEL EQU 1
EVOLVE_ITEM EQU 2
EVOLVE_TRADE EQU 3
EVOLVE_HAPPINESS EQU 4
EVOLVE_STAT EQU 5
BASE_HAPPINESS EQU 70
; happiness evolution triggers
HAPPINESS_TO_EVOLVE EQU 220
TR_ANYTIME EQU 1
TR_MORNDAY EQU 2
TR_NITE EQU 3
; stat evolution triggers
ATK_GT_DEF EQU 1
ATK_LT_DEF EQU 2
ATK_EQ_DEF EQU 3

View File

@ -865,7 +865,7 @@ Function9853: ; 9853
; 9890 ; 9890
Function9890: ; 9890 Function9890:: ; 9890
call CheckCGB call CheckCGB
ret z ret z
ld a, $1 ld a, $1

View File

@ -114,7 +114,7 @@ const_value SET -7
const CREDITS_END const CREDITS_END
Function109847: ; 109847 Function109847:: ; 109847
bit 6, b bit 6, b
ld a, $0 ld a, $0
jr z, .asm_10984f jr z, .asm_10984f

View File

@ -3,7 +3,7 @@ INCLUDE "includes.asm"
SECTION "Events", ROMX, BANK[EVENTS] SECTION "Events", ROMX, BANK[EVENTS]
OverworldLoop: ; 966b0 OverworldLoop:: ; 966b0
xor a xor a
ld [MapStatus], a ld [MapStatus], a
.loop .loop
@ -30,7 +30,7 @@ Function966cb: ; 966cb
ret ret
; 966d0 ; 966d0
Function966d0: ; 966d0 Function966d0:: ; 966d0
ld a, $ff ld a, $ff
ld [ScriptFlags3], a ld [ScriptFlags3], a
ret ret
@ -419,7 +419,7 @@ CheckTileEvent: ; 96874
; 968c7 ; 968c7
Function968c7: ; 968c7 Function968c7:: ; 968c7
ld hl, $d452 ld hl, $d452
ld a, [hl] ld a, [hl]
and a and a

View File

@ -5,14 +5,14 @@ INCLUDE "includes.asm"
SECTION "Events 2", ROMX, BANK[EVENTS] SECTION "Events 2", ROMX, BANK[EVENTS]
Function97c28: ; 97c28 Function97c28:: ; 97c28
ld hl, StatusFlags2 ld hl, StatusFlags2
res 1, [hl] res 1, [hl]
res 2, [hl] res 2, [hl]
ret ret
; 97c30 ; 97c30
Function97c30: ; 97c30 Function97c30:: ; 97c30
ld a, [$d45c] ld a, [$d45c]
and a and a
ret z ret z
@ -32,7 +32,7 @@ Function97c30: ; 97c30
ret ret
; 97c4f ; 97c4f
Function97c4f: ; 97c4f Function97c4f:: ; 97c4f
ld hl, $d45c ld hl, $d45c
ld a, [hl] ld a, [hl]
and a and a
@ -48,7 +48,7 @@ Function97c4f: ; 97c4f
ret ret
; 97c5f ; 97c5f
Function97c5f: ; 97c5f Function97c5f:: ; 97c5f
call GetFacingTileCoord call GetFacingTileCoord
ld [EngineBuffer1], a ld [EngineBuffer1], a
ld c, a ld c, a
@ -99,7 +99,7 @@ Function97c5f: ; 97c5f
; 97cc0 ; 97cc0
Function97cc0: ; 97cc0 Function97cc0:: ; 97cc0
; Rock Smash encounter ; Rock Smash encounter
call Function968c7 call Function968c7
@ -146,7 +146,7 @@ RockSmashBattleScript: ; 97cf9
end end
; 97cfd ; 97cfd
Function97cfd: ; 97cfd Function97cfd:: ; 97cfd
ld hl, StatusFlags ld hl, StatusFlags
bit 5, [hl] bit 5, [hl]
jr nz, .asm_97d21 jr nz, .asm_97d21
@ -178,7 +178,7 @@ Function97d23: ; 97d23
ret ret
; 97d31 ; 97d31
Function97d31: ; 97d31 Function97d31:: ; 97d31
; Pick a random mon out of ContestMons. ; Pick a random mon out of ContestMons.
.asm_97d31 .asm_97d31
@ -266,7 +266,7 @@ ContestMons: ; 97d87
db -1, VENOMOTH, 30, 40 db -1, VENOMOTH, 30, 40
; 97db3 ; 97db3
Function97db3: ; 97db3 Function97db3:: ; 97db3
nop nop
nop nop
; fallthrough ; fallthrough
@ -319,7 +319,7 @@ Function97db5: ; 97db5
ret ret
; 97df9 ; 97df9
Function97df9: ; 97df9 Function97df9:: ; 97df9
ld hl, $d6de ld hl, $d6de
ld de, $0006 ld de, $0006
ld c, $4 ld c, $4
@ -332,7 +332,7 @@ Function97df9: ; 97df9
ret ret
; 97e08 ; 97e08
Function97e08: ; 97e08 Function97e08:: ; 97e08
ld hl, $d6de ld hl, $d6de
xor a xor a
.asm_97e0c .asm_97e0c
@ -365,7 +365,7 @@ Function97e25: ; 97e25
ret ret
; 97e31 ; 97e31
Function97e31: ; 97e31 Function97e31:: ; 97e31
push bc push bc
push de push de
call Function97e45 call Function97e45
@ -403,7 +403,7 @@ Function97e45: ; 97e45
ret ret
; 97e5c ; 97e5c
Function97e5c: ; 97e5c Function97e5c:: ; 97e5c
ld hl, $d6de ld hl, $d6de
ld de, $0006 ld de, $0006
ld c, $4 ld c, $4

View File

@ -1,4 +1,4 @@
FruitTreeScript: ; 44000 FruitTreeScript:: ; 44000
3callasm GetCurTreeFruit 3callasm GetCurTreeFruit
loadfont loadfont
copybytetovar CurFruit copybytetovar CurFruit

View File

@ -15,7 +15,7 @@ GetLandmarkCoords: ; 0x1ca896
; 0x1ca8a5 ; 0x1ca8a5
GetLandmarkName: ; 0x1ca8a5 GetLandmarkName:: ; 0x1ca8a5
; Copy the name of landmark e to StringBuffer1. ; Copy the name of landmark e to StringBuffer1.
push hl push hl
push de push de

View File

@ -1,7 +1,7 @@
; Event scripting commands. ; Event scripting commands.
Function96c56: ; 96c56 Function96c56:: ; 96c56
push af push af
ld a, 1 ld a, 1
ld [ScriptMode], a ld [ScriptMode], a
@ -10,7 +10,7 @@ Function96c56: ; 96c56
; 96c5e ; 96c5e
ScriptEvents: ; 96c5e ScriptEvents:: ; 96c5e
call StartScript call StartScript
.loop .loop
ld a, [ScriptMode] ld a, [ScriptMode]
@ -1658,7 +1658,7 @@ ScriptCall: ; 0x974cb
ret ret
; 0x974f3 ; 0x974f3
Unknown_0x974f3: ; 0x974f3 Unknown_0x974f3:: ; 0x974f3
ld a, [ScriptBank] ld a, [ScriptBank]
or $80 or $80
ld [ScriptBank], a ld [ScriptBank], a
@ -2952,7 +2952,7 @@ Script_changeblock: ; 0x97acc
ret ret
; 0x97ae3 ; 0x97ae3
Script_reloadmappart: ; 0x97ae3 Script_reloadmappart:: ; 0x97ae3
; script command 0x7c ; script command 0x7c
xor a xor a

View File

@ -1,4 +1,4 @@
StdScripts: ; bc000 StdScripts:: ; bc000
dbw BANK(PokeCenterNurseScript), PokeCenterNurseScript dbw BANK(PokeCenterNurseScript), PokeCenterNurseScript
dbw BANK(UnknownScript_0xbc162), UnknownScript_0xbc162 dbw BANK(UnknownScript_0xbc162), UnknownScript_0xbc162
dbw BANK(UnknownScript_0xbc166), UnknownScript_0xbc166 dbw BANK(UnknownScript_0xbc166), UnknownScript_0xbc166

346
home.asm

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
; Functions to copy data from ROM. ; Functions to copy data from ROM.
Functiondc9: ; dc9 Functiondc9:: ; dc9
ld a, [rLCDC] ld a, [rLCDC]
bit 7, a bit 7, a
jp z, Copy2bpp jp z, Copy2bpp
@ -17,7 +17,7 @@ Functiondc9: ; dc9
ret ret
; ddc ; ddc
Functionddc: ; ddc Functionddc:: ; ddc
ld a, [rLCDC] ld a, [rLCDC]
bit 7, a bit 7, a
jp z, Copy1bpp jp z, Copy1bpp
@ -33,7 +33,7 @@ Functionddc: ; ddc
ret ret
; def ; def
Functiondef: ; def Functiondef:: ; def
ld [hBuffer], a ld [hBuffer], a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -45,7 +45,7 @@ Functiondef: ; def
ret ret
; dfd ; dfd
Functiondfd: ; dfd Functiondfd:: ; dfd
dec c dec c
ld a, [hBGMapMode] ld a, [hBGMapMode]
push af push af
@ -105,37 +105,37 @@ Functiondfd: ; dfd
Functione4a: ; e4a Functione4a:: ; e4a
callba Function14135 callba Function14135
ret ret
; e51 ; e51
Functione51: ; e51 Functione51:: ; e51
callba Functionfb449 callba Functionfb449
ret ret
; e58 ; e58
Functione58: ; e58 Functione58:: ; e58
callba Functionfb4be callba Functionfb4be
ret ret
; e5f ; e5f
Functione5f: ; e5f Functione5f:: ; e5f
callba Functionfb48a callba Functionfb48a
callba Functionfb4b0 callba Functionfb4b0
ret ret
; e6c ; e6c
Functione6c: ; e6c Functione6c:: ; e6c
callba Functionfb4b0 callba Functionfb4b0
ret ret
; e73 ; e73
Functione73: ; e73 Functione73:: ; e73
push de push de
ld a, $0 ld a, $0
call GetSRAMBank call GetSRAMBank
@ -153,7 +153,7 @@ Functione73: ; e73
FarCopyBytes: ; e8d FarCopyBytes:: ; e8d
; copy bc bytes from a:hl to de ; copy bc bytes from a:hl to de
ld [hBuffer], a ld [hBuffer], a
@ -170,7 +170,7 @@ FarCopyBytes: ; e8d
; 0xe9b ; 0xe9b
FarCopyBytesDouble: ; e9b FarCopyBytesDouble:: ; e9b
; Copy bc bytes from a:hl to bc*2 bytes at de, ; Copy bc bytes from a:hl to bc*2 bytes at de,
; doubling each byte in the process. ; doubling each byte in the process.
@ -209,7 +209,7 @@ FarCopyBytesDouble: ; e9b
; 0xeba ; 0xeba
Request2bpp: ; eba Request2bpp:: ; eba
ld a, [hBGMapMode] ld a, [hBGMapMode]
push af push af
xor a xor a
@ -283,7 +283,7 @@ Request2bpp: ; eba
; f1e ; f1e
Request1bpp: ; f1e Request1bpp:: ; f1e
ld a, [hBGMapMode] ld a, [hBGMapMode]
push af push af
xor a xor a
@ -356,12 +356,12 @@ Request1bpp: ; f1e
; f82 ; f82
Get2bpp: ; f82 Get2bpp:: ; f82
ld a, [rLCDC] ld a, [rLCDC]
bit 7, a bit 7, a
jp nz, Request2bpp jp nz, Request2bpp
Copy2bpp: ; f89 Copy2bpp:: ; f89
; copy c 2bpp tiles from b:de to hl ; copy c 2bpp tiles from b:de to hl
push hl push hl
@ -387,12 +387,12 @@ Copy2bpp: ; f89
; f9d ; f9d
Get1bpp: ; f9d Get1bpp:: ; f9d
ld a, [rLCDC] ld a, [rLCDC]
bit 7, a bit 7, a
jp nz, Request1bpp jp nz, Request1bpp
Copy1bpp: ; fa4 Copy1bpp:: ; fa4
; copy c 1bpp tiles from b:de to hl ; copy c 1bpp tiles from b:de to hl
push de push de

View File

@ -1,4 +1,4 @@
CopyBytes: ; 0x3026 CopyBytes:: ; 0x3026
; copy bc bytes from hl to de ; copy bc bytes from hl to de
inc b ; we bail the moment b hits 0, so include the last run inc b ; we bail the moment b hits 0, so include the last run
inc c ; same thing; include last byte inc c ; same thing; include last byte
@ -14,7 +14,7 @@ CopyBytes: ; 0x3026
jr nz, .CopyByte jr nz, .CopyByte
ret ret
SwapBytes: ; 0x3034 SwapBytes:: ; 0x3034
; swap bc bytes between hl and de ; swap bc bytes between hl and de
.Loop .Loop
; stash [hl] away on the stack ; stash [hl] away on the stack
@ -37,7 +37,7 @@ SwapBytes: ; 0x3034
jr nz, .Loop jr nz, .Loop
ret ret
ByteFill: ; 0x3041 ByteFill:: ; 0x3041
; fill bc bytes with the value of a, starting at hl ; fill bc bytes with the value of a, starting at hl
inc b ; we bail the moment b hits 0, so include the last run inc b ; we bail the moment b hits 0, so include the last run
inc c ; same thing; include last byte inc c ; same thing; include last byte
@ -51,7 +51,7 @@ ByteFill: ; 0x3041
jr nz, .PutByte jr nz, .PutByte
ret ret
GetFarByte: ; 0x304d GetFarByte:: ; 0x304d
; retrieve a single byte from a:hl, and return it in a. ; retrieve a single byte from a:hl, and return it in a.
; bankswitch to new bank ; bankswitch to new bank
ld [hBuffer], a ld [hBuffer], a
@ -72,7 +72,7 @@ GetFarByte: ; 0x304d
ld a, [hBuffer] ld a, [hBuffer]
ret ret
GetFarHalfword: ; 0x305d GetFarHalfword:: ; 0x305d
; retrieve a halfword from a:hl, and return it in hl. ; retrieve a halfword from a:hl, and return it in hl.
; bankswitch to new bank ; bankswitch to new bank
ld [hBuffer], a ld [hBuffer], a
@ -92,7 +92,7 @@ GetFarHalfword: ; 0x305d
ret ret
; 0x306b ; 0x306b
FarCopyWRAM: ; 306b FarCopyWRAM:: ; 306b
ld [hBuffer], a ld [hBuffer], a
ld a, [rSVBK] ld a, [rSVBK]
push af push af
@ -104,7 +104,7 @@ FarCopyWRAM: ; 306b
ret ret
; 307b ; 307b
GetFarWRAMByte: ; 307b GetFarWRAMByte:: ; 307b
ld [hBuffer], a ld [hBuffer], a
ld a, [rSVBK] ld a, [rSVBK]
push af push af
@ -118,7 +118,7 @@ GetFarWRAMByte: ; 307b
ret ret
; 308d ; 308d
GetFarWRAMWord: ; 308d GetFarWRAMWord:: ; 308d
ld [hBuffer], a ld [hBuffer], a
ld a, [rSVBK] ld a, [rSVBK]
push af push af

View File

@ -1,4 +1,4 @@
FarDecompress: ; b40 FarDecompress:: ; b40
; Decompress graphics data at a:hl to de ; Decompress graphics data at a:hl to de
; put a away for a sec ; put a away for a sec
@ -20,7 +20,7 @@ FarDecompress: ; b40
; b50 ; b50
Decompress: ; b50 Decompress:: ; b50
; Pokemon Crystal uses an lz variant for compression. ; Pokemon Crystal uses an lz variant for compression.
; This is mainly used for graphics, but the intro's ; This is mainly used for graphics, but the intro's

View File

@ -1,4 +1,4 @@
DelayFrame: ; 45a DelayFrame:: ; 45a
; Wait for one frame ; Wait for one frame
ld a, 1 ld a, 1
ld [VBlankOccurred], a ld [VBlankOccurred], a
@ -13,7 +13,7 @@ DelayFrame: ; 45a
; 468 ; 468
DelayFrames: ; 468 DelayFrames:: ; 468
; Wait c frames ; Wait c frames
call DelayFrame call DelayFrame
dec c dec c

View File

@ -5,20 +5,20 @@
; and double speed at any time, but LCD output ; and double speed at any time, but LCD output
; collapses during the switch. ; collapses during the switch.
DoubleSpeed: ; 2fef DoubleSpeed:: ; 2fef
ld hl, rKEY1 ld hl, rKEY1
bit 7, [hl] bit 7, [hl]
jr z, SwitchSpeed jr z, SwitchSpeed
ret ret
; 2ff7 ; 2ff7
NormalSpeed: ; 2ff7 NormalSpeed:: ; 2ff7
ld hl, rKEY1 ld hl, rKEY1
bit 7, [hl] bit 7, [hl]
ret z ret z
; 2ffd ; 2ffd
SwitchSpeed: ; 2ffd SwitchSpeed:: ; 2ffd
set 0, [hl] set 0, [hl]
xor a xor a
ld [rIF], a ld [rIF], a

View File

@ -1,7 +1,7 @@
; Functions to fade the screen in and out. ; Functions to fade the screen in and out.
Function48c: ; 48c Function48c:: ; 48c
ld a, [TimeOfDayPal] ld a, [TimeOfDayPal]
ld b, a ld b, a
ld hl, IncGradGBPalTable_11 ld hl, IncGradGBPalTable_11
@ -22,7 +22,7 @@ Function48c: ; 48c
; 4a3 ; 4a3
Function4a3: ; 4a3 Function4a3:: ; 4a3
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, .asm_4af jr z, .asm_4af
@ -36,7 +36,7 @@ Function4a3: ; 4a3
jr FadeOut jr FadeOut
; 4b6 ; 4b6
Function4b6: ; 4b6 Function4b6:: ; 4b6
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, .asm_4c2 jr z, .asm_4c2
@ -49,7 +49,7 @@ Function4b6: ; 4b6
ld b, 3 ld b, 3
; 4c7 ; 4c7
FadeOut: ; 4c7 FadeOut:: ; 4c7
push de push de
ld a, [hli] ld a, [hli]
call DmgToCgbBGPals call DmgToCgbBGPals
@ -66,7 +66,7 @@ FadeOut: ; 4c7
ret ret
; 4dd ; 4dd
Function4dd: ; 4dd Function4dd:: ; 4dd
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, .asm_4e9 jr z, .asm_4e9
@ -80,7 +80,7 @@ Function4dd: ; 4dd
jr FadeIn jr FadeIn
; 4f0 ; 4f0
Function4f0: ; 4f0 Function4f0:: ; 4f0
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, .asm_4fc jr z, .asm_4fc
@ -94,7 +94,7 @@ Function4f0: ; 4f0
; fallthrough ; fallthrough
; 501 ; 501
FadeIn: ; 501 FadeIn:: ; 501
push de push de
ld a, [hld] ld a, [hld]
ld d, a ld d, a
@ -113,22 +113,22 @@ FadeIn: ; 501
; 517 ; 517
IncGradGBPalTable_00: db %11111111, %11111111, %11111111 IncGradGBPalTable_00:: db %11111111, %11111111, %11111111
IncGradGBPalTable_01: db %11111110, %11111110, %11111110 IncGradGBPalTable_01:: db %11111110, %11111110, %11111110
IncGradGBPalTable_02: db %11111001, %11111001, %11111001 IncGradGBPalTable_02:: db %11111001, %11111001, %11111001
IncGradGBPalTable_03: db %11100100, %11100100, %11100100 IncGradGBPalTable_03:: db %11100100, %11100100, %11100100
IncGradGBPalTable_04: db %11100100, %11100100, %11100100 IncGradGBPalTable_04:: db %11100100, %11100100, %11100100
IncGradGBPalTable_05: db %10010000, %10010000, %10010000 IncGradGBPalTable_05:: db %10010000, %10010000, %10010000
IncGradGBPalTable_06: db %01000000, %01000000, %01000000 IncGradGBPalTable_06:: db %01000000, %01000000, %01000000
IncGradGBPalTable_07: db %00000000, %00000000, %00000000 IncGradGBPalTable_07:: db %00000000, %00000000, %00000000
; bgp obp1 obp2 ; bgp obp1 obp2
IncGradGBPalTable_08: db %11111111, %11111111, %11111111 IncGradGBPalTable_08:: db %11111111, %11111111, %11111111
IncGradGBPalTable_09: db %11111110, %11111110, %11111000 IncGradGBPalTable_09:: db %11111110, %11111110, %11111000
IncGradGBPalTable_10: db %11111001, %11100100, %11100100 IncGradGBPalTable_10:: db %11111001, %11100100, %11100100
IncGradGBPalTable_11: db %11100100, %11010000, %11100000 IncGradGBPalTable_11:: db %11100100, %11010000, %11100000
IncGradGBPalTable_12: db %11100100, %11010000, %11100000 IncGradGBPalTable_12:: db %11100100, %11010000, %11100000
IncGradGBPalTable_13: db %10010000, %10000000, %10010000 IncGradGBPalTable_13:: db %10010000, %10000000, %10010000
IncGradGBPalTable_14: db %01000000, %01000000, %01000000 IncGradGBPalTable_14:: db %01000000, %01000000, %01000000
IncGradGBPalTable_15: db %00000000, %00000000, %00000000 IncGradGBPalTable_15:: db %00000000, %00000000, %00000000
; 547 ; 547

View File

@ -1,4 +1,4 @@
FarCall_de: ; 2d54 FarCall_de:: ; 2d54
; Call a:de. ; Call a:de.
; Preserves other registers. ; Preserves other registers.
@ -16,7 +16,7 @@ FarCall_de: ; 2d54
; 2d63 ; 2d63
FarCall_hl: ; 2d63 FarCall_hl:: ; 2d63
; Call a:hl. ; Call a:hl.
; Preserves other registers. ; Preserves other registers.
@ -28,7 +28,7 @@ FarCall_hl: ; 2d63
call Function2d82 call Function2d82
; 2d6e ; 2d6e
ReturnFarCall: ; 2d6e ReturnFarCall:: ; 2d6e
; We want to retain the contents of f. ; We want to retain the contents of f.
; To do this, we can pop to bc instead of af. ; To do this, we can pop to bc instead of af.
@ -49,7 +49,7 @@ ReturnFarCall: ; 2d6e
ret ret
; 2d82 ; 2d82
Function2d82: ; 2d82 Function2d82:: ; 2d82
jp [hl] jp [hl]
; 2d83 ; 2d83

View File

@ -1,11 +1,11 @@
Function2e50: ; 2e50 Function2e50:: ; 2e50
xor a xor a
ld hl, EventFlags ld hl, EventFlags
ld [hli], a ld [hli], a
ret ret
; 2e56 ; 2e56
Function2e56: ; 2e56 Function2e56:: ; 2e56
xor a xor a
ld hl, BikeFlags ld hl, BikeFlags
ld [hli], a ld [hli], a
@ -13,7 +13,7 @@ Function2e56: ; 2e56
ret ret
; 2e5d ; 2e5d
Function2e5d: ; 2e5d Function2e5d:: ; 2e5d
ld a, [$d19a] ld a, [$d19a]
cp $2 cp $2
jr z, .asm_2e69 jr z, .asm_2e69
@ -28,12 +28,12 @@ Function2e5d: ; 2e5d
; 2e6f ; 2e6f
EventFlagAction: ; 0x2e6f EventFlagAction:: ; 0x2e6f
ld hl, EventFlags ld hl, EventFlags
call FlagAction call FlagAction
ret ret
FlagAction: ; 0x2e76 FlagAction:: ; 0x2e76
; Perform action b on bit de in flag array hl. ; Perform action b on bit de in flag array hl.
; inputs: ; inputs:
@ -102,7 +102,7 @@ FlagAction: ; 0x2e76
; 0x2ead ; 0x2ead
Function2ead: ; 2ead Function2ead:: ; 2ead
ld de, ENGINE_POKEDEX ld de, ENGINE_POKEDEX
ld b, CHECK_FLAG ld b, CHECK_FLAG
callba EngineFlagAction callba EngineFlagAction

View File

@ -1,4 +1,4 @@
ResetGameTime: ; 208a ResetGameTime:: ; 208a
xor a xor a
ld [GameTimeCap], a ld [GameTimeCap], a
ld [GameTimeHours], a ld [GameTimeHours], a
@ -10,7 +10,7 @@ ResetGameTime: ; 208a
; 209e ; 209e
GameTimer: ; 209e GameTimer:: ; 209e
nop nop
@ -27,7 +27,7 @@ GameTimer: ; 209e
; 20ad ; 20ad
UpdateGameTimer: ; 20ad UpdateGameTimer:: ; 20ad
; Increment the game timer by one frame. ; Increment the game timer by one frame.
; The game timer is capped at 999:59:59.00. ; The game timer is capped at 999:59:59.00.

View File

@ -1,4 +1,4 @@
AskSerial: ; 2063 AskSerial:: ; 2063
; send out a handshake while serial int is off ; send out a handshake while serial int is off
ld a, [$c2d4] ld a, [$c2d4]
bit 0, a bit 0, a

View File

@ -1,4 +1,4 @@
Reset: ; 150 Reset:: ; 150
di di
call SoundRestart call SoundRestart
xor a xor a
@ -20,7 +20,7 @@ Reset: ; 150
; 16e ; 16e
_Start: ; 16e _Start:: ; 16e
cp $11 cp $11
jr z, .asm_175 jr z, .asm_175
xor a xor a
@ -36,7 +36,7 @@ _Start: ; 16e
; 17d ; 17d
Init: ; 17d Init:: ; 17d
di di
@ -177,7 +177,7 @@ Init: ; 17d
; 245 ; 245
ClearVRAM: ; 245 ClearVRAM:: ; 245
; Wipe VRAM banks 0 and 1 ; Wipe VRAM banks 0 and 1
ld a, 1 ld a, 1
@ -194,7 +194,7 @@ ClearVRAM: ; 245
ret ret
; 25a ; 25a
ClearWRAM: ; 25a ClearWRAM:: ; 25a
; Wipe swappable WRAM banks (1-7) ; Wipe swappable WRAM banks (1-7)
ld a, 1 ld a, 1
@ -212,7 +212,7 @@ ClearWRAM: ; 25a
ret ret
; 270 ; 270
Function270: ; 270 Function270:: ; 270
ld a, $0 ld a, $0
call GetSRAMBank call GetSRAMBank
ld hl, $a000 ld hl, $a000

View File

@ -1,9 +1,9 @@
DoItemEffect: ; 2f3f DoItemEffect:: ; 2f3f
callba _DoItemEffect callba _DoItemEffect
ret ret
; 2f46 ; 2f46
CheckTossableItem: ; 2f46 CheckTossableItem:: ; 2f46
push hl push hl
push de push de
push bc push bc
@ -14,7 +14,7 @@ CheckTossableItem: ; 2f46
ret ret
; 2f53 ; 2f53
TossItem: ; 2f53 TossItem:: ; 2f53
push hl push hl
push de push de
push bc push bc
@ -34,7 +34,7 @@ TossItem: ; 2f53
ret ret
; 2f66 ; 2f66
ReceiveItem: ; 2f66 ReceiveItem:: ; 2f66
push bc push bc
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -54,7 +54,7 @@ ReceiveItem: ; 2f66
ret ret
; 2f79 ; 2f79
CheckItem: ; 2f79 CheckItem:: ; 2f79
push hl push hl
push de push de
push bc push bc

View File

@ -1,4 +1,4 @@
JoypadInt: ; 92e JoypadInt:: ; 92e
; Replaced by Joypad, called from VBlank instead of the useless ; Replaced by Joypad, called from VBlank instead of the useless
; joypad interrupt. ; joypad interrupt.
@ -6,7 +6,7 @@ JoypadInt: ; 92e
reti reti
; 92f ; 92f
ClearJoypad: ; 92f ClearJoypad:: ; 92f
xor a xor a
; Pressed this frame (delta) ; Pressed this frame (delta)
ld [hJoyPressed], a ld [hJoyPressed], a
@ -15,7 +15,7 @@ ClearJoypad: ; 92f
ret ret
; 935 ; 935
Joypad: ; 935 Joypad:: ; 935
; Read the joypad register and translate it to something more ; Read the joypad register and translate it to something more
; workable for use in-game. There are 8 buttons, so we can use ; workable for use in-game. There are 8 buttons, so we can use
; one byte to contain all player input. ; one byte to contain all player input.
@ -109,7 +109,7 @@ Joypad: ; 935
; 984 ; 984
GetJoypad: ; 984 GetJoypad:: ; 984
; Update mirror joypad input from hJoypadDown (real input) ; Update mirror joypad input from hJoypadDown (real input)
; hJoyReleased: released this frame (delta) ; hJoyReleased: released this frame (delta)
@ -238,7 +238,7 @@ GetJoypad: ; 984
; 9ee ; 9ee
StartAutoInput: ; 9ee StartAutoInput:: ; 9ee
; Start reading automated input stream at a:hl. ; Start reading automated input stream at a:hl.
ld [AutoInputBank], a ld [AutoInputBank], a
@ -261,7 +261,7 @@ StartAutoInput: ; 9ee
; a0a ; a0a
StopAutoInput: ; a0a StopAutoInput:: ; a0a
; Clear variables related to automated input. ; Clear variables related to automated input.
xor a xor a
ld [AutoInputBank], a ld [AutoInputBank], a
@ -274,7 +274,7 @@ StopAutoInput: ; a0a
; a1b ; a1b
Functiona1b: ; a1b Functiona1b:: ; a1b
call DelayFrame call DelayFrame
@ -302,7 +302,7 @@ Functiona1b: ; a1b
; a36 ; a36
Functiona36: ; a36 Functiona36:: ; a36
call DelayFrame call DelayFrame
call GetJoypad call GetJoypad
ld a, [hJoyPressed] ld a, [hJoyPressed]
@ -312,7 +312,7 @@ Functiona36: ; a36
jr Functiona36 jr Functiona36
; a46 ; a46
Functiona46: ; a46 Functiona46:: ; a46
ld a, [hOAMUpdate] ld a, [hOAMUpdate]
push af push af
ld a, 1 ld a, 1
@ -324,7 +324,7 @@ Functiona46: ; a46
ret ret
; a57 ; a57
Functiona57: ; a57 Functiona57:: ; a57
call GetJoypad call GetJoypad
ld a, [$ffaa] ld a, [$ffaa]
and a and a
@ -354,7 +354,7 @@ Functiona57: ; a57
ret ret
; a80 ; a80
Functiona80: ; a80 Functiona80:: ; a80
ld a, [$ffaf] ld a, [$ffaf]
push af push af
ld a, [$ffb0] ld a, [$ffb0]
@ -379,7 +379,7 @@ Functiona80: ; a80
ret ret
; aa5 ; aa5
Functionaa5: ; aa5 Functionaa5:: ; aa5
call Functiona57 call Functiona57
ld a, [$ffa9] ld a, [$ffa9]
and A_BUTTON | B_BUTTON and A_BUTTON | B_BUTTON
@ -387,7 +387,7 @@ Functionaa5: ; aa5
ret ret
; aaf ; aaf
Functionaaf: ; aaf Functionaaf:: ; aaf
ld a, [InLinkBattle] ld a, [InLinkBattle]
and a and a
jr nz, .asm_ac1 jr nz, .asm_ac1
@ -403,7 +403,7 @@ Functionaaf: ; aaf
jp DelayFrames jp DelayFrames
; ac6 ; ac6
Functionac6: ; ac6 Functionac6:: ; ac6
ld a, [hOAMUpdate] ld a, [hOAMUpdate]
push af push af
ld a, $1 ld a, $1
@ -430,7 +430,7 @@ Functionac6: ; ac6
ret ret
; af5 ; af5
Functionaf5: ; af5 Functionaf5:: ; af5
ld a, [$ff9b] ld a, [$ff9b]
and $10 and $10
jr z, .asm_aff jr z, .asm_aff
@ -445,7 +445,7 @@ Functionaf5: ; af5
ret ret
; b06 ; b06
Functionb06: ; b06 Functionb06:: ; b06
push bc push bc
ld a, [hl] ld a, [hl]
ld b, a ld b, a

View File

@ -1,7 +1,7 @@
; LCD handling ; LCD handling
Function547: ; 547 Function547:: ; 547
ld a, [hLCDStatCustom] ld a, [hLCDStatCustom]
cp rSCX & $ff cp rSCX & $ff
ret nz ret nz
@ -12,7 +12,7 @@ Function547: ; 547
; 552 ; 552
LCD: ; 552 LCD:: ; 552
push af push af
ld a, [hLCDStatCustom] ld a, [hLCDStatCustom]
and a and a
@ -37,7 +37,7 @@ LCD: ; 552
; 568 ; 568
DisableLCD: ; 568 DisableLCD:: ; 568
; Turn the LCD off ; Turn the LCD off
; Don't need to do anything if the LCD is already off ; Don't need to do anything if the LCD is already off
@ -72,7 +72,7 @@ DisableLCD: ; 568
; 58a ; 58a
EnableLCD: ; 58a EnableLCD:: ; 58a
ld a, [rLCDC] ld a, [rLCDC]
set 7, a ; lcd enable set 7, a ; lcd enable
ld [rLCDC], a ld [rLCDC], a

View File

@ -1,6 +1,6 @@
; Functions dealing with rendering and interacting with maps. ; Functions dealing with rendering and interacting with maps.
Function210f: ; 210f Function210f:: ; 210f
ld hl, $c7e8 ld hl, $c7e8
ld bc, $0018 ld bc, $0018
ld a, $0 ld a, $0
@ -8,7 +8,7 @@ Function210f: ; 210f
ret ret
; 211b ; 211b
Function211b: ; 211b Function211b:: ; 211b
push hl push hl
ld hl, $dbf7 ld hl, $dbf7
ld a, [hli] ld a, [hli]
@ -24,7 +24,7 @@ Function211b: ; 211b
ret ret
; 212a ; 212a
Function212a: ; 212a Function212a:: ; 212a
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]
@ -42,7 +42,7 @@ Function212a: ; 212a
ret ret
; 2147 ; 2147
Function2147: ; 2147 Function2147:: ; 2147
push bc push bc
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -87,13 +87,13 @@ Function2147: ; 2147
ret ret
; 2173 ; 2173
Function2173: ; 2173 Function2173:: ; 2173
call Function217a call Function217a
call Functiondb1 call Functiondb1
ret ret
; 217a ; 217a
Function217a: ; 217a Function217a:: ; 217a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -115,7 +115,7 @@ Function217a: ; 217a
ret ret
; 2198 ; 2198
Function2198: ; 2198 Function2198:: ; 2198
ld a, [$d194] ld a, [$d194]
ld e, a ld e, a
ld a, [$d195] ld a, [$d195]
@ -211,7 +211,7 @@ endr
ret ret
; 222a ; 222a
Function222a: ; 222a Function222a:: ; 222a
ld a, $fa ld a, $fa
ld [$ff9f], a ld [$ff9f], a
callba RunMapSetupScript callba RunMapSetupScript
@ -220,7 +220,7 @@ Function222a: ; 222a
ret ret
; 2238 ; 2238
Function2238: ; 2238 Function2238:: ; 2238
call Function2252 call Function2252
ret nc ret nc
push bc push bc
@ -234,14 +234,14 @@ Function2238: ; 2238
Function224a: ; 224a Function224a:: ; 224a
call Function2252 call Function2252
ret nc ret nc
call Function22a7 call Function22a7
ret ret
; 2252 ; 2252
Function2252: ; 2252 Function2252:: ; 2252
callba Function1499a callba Function1499a
ret nc ret nc
@ -257,7 +257,7 @@ Function2252: ; 2252
ret ret
; 2266 ; 2266
Function2266: ; 2266 Function2266:: ; 2266
ld a, [MapY] ld a, [MapY]
sub $4 sub $4
ld e, a ld e, a
@ -308,14 +308,14 @@ Function2266: ; 2266
ret ret
; 22a3 ; 22a3
Function22a3: ; 22a3 Function22a3:: ; 22a3
inc hl inc hl
inc hl inc hl
scf scf
ret ret
; 22a7 ; 22a7
Function22a7: ; 22a7 Function22a7:: ; 22a7
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -328,7 +328,7 @@ Function22a7: ; 22a7
ret ret
; 22b4 ; 22b4
Function22b4: ; 22b4 Function22b4:: ; 22b4
push bc push bc
ld hl, $dbfc ld hl, $dbfc
ld a, [hli] ld a, [hli]
@ -365,14 +365,14 @@ Function22b4: ; 22b4
CheckOutdoorMap: ; 22ee CheckOutdoorMap:: ; 22ee
cp ROUTE cp ROUTE
ret z ret z
cp TOWN cp TOWN
ret ret
; 22f4 ; 22f4
CheckIndoorMap: ; 22f4 CheckIndoorMap:: ; 22f4
cp INDOOR cp INDOOR
ret z ret z
cp CAVE cp CAVE
@ -383,7 +383,7 @@ CheckIndoorMap: ; 22f4
ret ret
; 2300 ; 2300
Function2300: ; 2300 Function2300:: ; 2300
cp INDOOR cp INDOOR
ret z ret z
cp GATE cp GATE
@ -393,7 +393,7 @@ Function2300: ; 2300
; 2309 ; 2309
Function2309: ; 2309 Function2309:: ; 2309
call Function2326 call Function2326
call Function2c52 call Function2c52
call Function234f call Function234f
@ -402,7 +402,7 @@ Function2309: ; 2309
ret ret
; 2317 ; 2317
Function2317: ; 2317 Function2317:: ; 2317
call Function2326 call Function2326
call Function2c52 call Function2c52
call Function234f call Function234f
@ -411,7 +411,7 @@ Function2317: ; 2317
ret ret
; 2326 ; 2326
Function2326: ; 2326 Function2326:: ; 2326
call Function2c3d call Function2c3d
call SwitchToMapBank call SwitchToMapBank
call GetSecondaryMapHeaderPointer call GetSecondaryMapHeaderPointer
@ -420,7 +420,7 @@ Function2326: ; 2326
ret ret
; 2336 ; 2336
Function2336: ; 2336 Function2336:: ; 2336
push af push af
ld hl, MapEventHeaderPointer ld hl, MapEventHeaderPointer
ld a, [hli] ld a, [hli]
@ -438,7 +438,7 @@ Function2336: ; 2336
ret ret
; 234f ; 234f
Function234f: ; 234f Function234f:: ; 234f
ld hl, MapScriptHeaderPointer ld hl, MapScriptHeaderPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -448,7 +448,7 @@ Function234f: ; 234f
ret ret
; 235c ; 235c
Function235c: ; 235c Function235c:: ; 235c
ld de, $d19d ld de, $d19d
ld c, $c ld c, $c
.asm_2361 .asm_2361
@ -460,7 +460,7 @@ Function235c: ; 235c
ret ret
; 2368 ; 2368
Function2368: ; 2368 Function2368:: ; 2368
ld a, $ff ld a, $ff
ld [NorthConnectedMapGroup], a ld [NorthConnectedMapGroup], a
ld [SouthConnectedMapGroup], a ld [SouthConnectedMapGroup], a
@ -498,7 +498,7 @@ Function2368: ; 2368
; 23a3 ; 23a3
GetMapConnection: ; 23a3 GetMapConnection:: ; 23a3
; Load map connection struct at hl into de. ; Load map connection struct at hl into de.
ld c, SouthMapConnection - NorthMapConnection ld c, SouthMapConnection - NorthMapConnection
.loop .loop
@ -511,7 +511,7 @@ GetMapConnection: ; 23a3
; 23ac ; 23ac
Function23ac: ; 23ac Function23ac:: ; 23ac
ld a, [hli] ld a, [hli]
ld c, a ld c, a
ld [$dc07], a ld [$dc07], a
@ -527,7 +527,7 @@ Function23ac: ; 23ac
ret ret
; 23c3 ; 23c3
Function23c3: ; 23c3 Function23c3:: ; 23c3
ld a, [hli] ld a, [hli]
ld c, a ld c, a
ld [$dc0a], a ld [$dc0a], a
@ -543,7 +543,7 @@ Function23c3: ; 23c3
ret ret
; 23da ; 23da
Function23da: ; 23da Function23da:: ; 23da
ld a, [hli] ld a, [hli]
ld c, a ld c, a
ld [$dbfb], a ld [$dbfb], a
@ -559,7 +559,7 @@ Function23da: ; 23da
ret ret
; 23f1 ; 23f1
Function23f1: ; 23f1 Function23f1:: ; 23f1
ld a, [hli] ld a, [hli]
ld c, a ld c, a
ld [$dbfe], a ld [$dbfe], a
@ -575,7 +575,7 @@ Function23f1: ; 23f1
ret ret
; 2408 ; 2408
Function2408: ; 2408 Function2408:: ; 2408
ld a, [hli] ld a, [hli]
ld c, a ld c, a
ld [$dc01], a ld [$dc01], a
@ -591,7 +591,7 @@ Function2408: ; 2408
ret ret
; 241f ; 241f
Function241f: ; 241f Function241f:: ; 241f
push hl push hl
call Function2471 call Function2471
pop de pop de
@ -628,7 +628,7 @@ Function241f: ; 241f
ret ret
; 2457 ; 2457
Function2457: ; 2457 Function2457:: ; 2457
and a and a
ret z ret z
ld c, a ld c, a
@ -653,7 +653,7 @@ Function2457: ; 2457
ret ret
; 2471 ; 2471
Function2471: ; 2471 Function2471:: ; 2471
ld hl, $d4fe ld hl, $d4fe
ld bc, $01e0 ld bc, $01e0
xor a xor a
@ -670,7 +670,7 @@ Function2471: ; 2471
ret ret
; 248a ; 248a
Function248a: ; 248a Function248a:: ; 248a
call GetMapScriptHeaderBank call GetMapScriptHeaderBank
rst Bankswitch rst Bankswitch
@ -701,7 +701,7 @@ Function248a: ; 248a
ret ret
; 24ba ; 24ba
Function24ba: ; 24ba Function24ba:: ; 24ba
ld a, [$d149] ld a, [$d149]
ld [$dcac], a ld [$dcac], a
ld a, [$d14a] ld a, [$d14a]
@ -711,7 +711,7 @@ Function24ba: ; 24ba
ret ret
; 24cd ; 24cd
Function24cd: ; 24cd Function24cd:: ; 24cd
ld hl, OverworldMap ld hl, OverworldMap
ld bc, OverworldMapEnd - OverworldMap ld bc, OverworldMapEnd - OverworldMap
ld a, 0 ld a, 0
@ -725,7 +725,7 @@ Function24cd: ; 24cd
Function24e4: ; 24e4 Function24e4:: ; 24e4
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -777,7 +777,7 @@ Function24e4: ; 24e4
FillMapConnections: ; 2524 FillMapConnections:: ; 2524
; North ; North
ld a, [NorthConnectedMapGroup] ld a, [NorthConnectedMapGroup]
@ -876,8 +876,8 @@ FillMapConnections: ; 2524
; 25d3 ; 25d3
FillNorthConnectionStrip: FillNorthConnectionStrip::
FillSouthConnectionStrip: ; 25d3 FillSouthConnectionStrip:: ; 25d3
ld c, 3 ld c, 3
.y .y
@ -913,8 +913,8 @@ FillSouthConnectionStrip: ; 25d3
; 25f6 ; 25f6
FillWestConnectionStrip: FillWestConnectionStrip::
FillEastConnectionStrip: ; 25f6 FillEastConnectionStrip:: ; 25f6
.asm_25f6 .asm_25f6
ld a, [MapWidth] ld a, [MapWidth]
@ -952,13 +952,13 @@ FillEastConnectionStrip: ; 25f6
ret ret
; 261b ; 261b
Function261b: ; 261b Function261b:: ; 261b
ld [$d432], a ld [$d432], a
ret ret
; 261f ; 261f
CallScript: ; 261f CallScript:: ; 261f
; Call a script at a:hl. ; Call a script at a:hl.
ld [ScriptBank], a ld [ScriptBank], a
@ -974,7 +974,7 @@ CallScript: ; 261f
ret ret
; 2631 ; 2631
Function2631: ; 2631 Function2631:: ; 2631
ld a, [ScriptRunning] ld a, [ScriptRunning]
and a and a
ret nz ret nz
@ -982,7 +982,7 @@ Function2631: ; 2631
jr CallScript jr CallScript
; 263b ; 263b
Function263b: ; 263b Function263b:: ; 263b
ld b, a ld b, a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -1002,7 +1002,7 @@ Function263b: ; 263b
ret ret
; 2653 ; 2653
Function2653: ; 2653 Function2653:: ; 2653
ld a, [$dc0a] ld a, [$dc0a]
ld c, a ld c, a
and a and a
@ -1033,7 +1033,7 @@ Function2653: ; 2653
ret ret
; 2674 ; 2674
Function2674: ; 2674 Function2674:: ; 2674
callba Unknown_0x974f3 callba Unknown_0x974f3
ld a, [ScriptMode] ld a, [ScriptMode]
push af push af
@ -1050,7 +1050,7 @@ Function2674: ; 2674
ret ret
; 269a ; 269a
Function269a: ; 269a Function269a:: ; 269a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -1073,7 +1073,7 @@ Function269a: ; 269a
ret ret
; 26b7 ; 26b7
Function26b7: ; 26b7 Function26b7:: ; 26b7
; Call a:de. ; Call a:de.
ld [hBuffer], a ld [hBuffer], a
@ -1093,7 +1093,7 @@ Function26b7: ; 26b7
ret ret
; 26c7 ; 26c7
Function26c7: ; 26c7 Function26c7:: ; 26c7
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, b ld a, b
@ -1109,7 +1109,7 @@ Function26c7: ; 26c7
; 26d4 ; 26d4
GetScriptByte: ; 0x26d4 GetScriptByte:: ; 0x26d4
; Return byte at ScriptBank:ScriptPos in a. ; Return byte at ScriptBank:ScriptPos in a.
push hl push hl
@ -1141,37 +1141,37 @@ GetScriptByte: ; 0x26d4
; 0x26ef ; 0x26ef
ObjectEvent: ; 0x26ef ObjectEvent:: ; 0x26ef
jumptextfaceplayer ObjectEventText jumptextfaceplayer ObjectEventText
; 0x26f2 ; 0x26f2
ObjectEventText: ObjectEventText::
TX_FAR _ObjectEventText TX_FAR _ObjectEventText
db "@" db "@"
; 0x26f7 ; 0x26f7
BGEvent: ; 26f7 BGEvent:: ; 26f7
jumptext BGEventText jumptext BGEventText
; 26fa ; 26fa
BGEventText: ; 26fa BGEventText:: ; 26fa
text_jump UnknownText_0x1c46fc text_jump UnknownText_0x1c46fc
db "@" db "@"
; 26ff ; 26ff
CoordinatesEvent: ; 26ff CoordinatesEvent:: ; 26ff
jumptext CoordinatesEventText jumptext CoordinatesEventText
; 2702 ; 2702
CoordinatesEventText: ; 2702 CoordinatesEventText:: ; 2702
text_jump UnknownText_0x1c4706 text_jump UnknownText_0x1c4706
db "@" db "@"
; 2707 ; 2707
Function2707: ; 2707 Function2707:: ; 2707
ld a, [hConnectionStripLength] ld a, [hConnectionStripLength]
ld e, a ld e, a
ld d, $0 ld d, $0
@ -1181,7 +1181,7 @@ Function2707: ; 2707
ret ret
; 2712 ; 2712
Function2712: ; 2712 Function2712:: ; 2712
ld a, [hConnectionStripLength] ld a, [hConnectionStripLength]
ld e, a ld e, a
ld d, $0 ld d, $0
@ -1191,7 +1191,7 @@ Function2712: ; 2712
ret ret
; 271e ; 271e
Function271e: ; 271e Function271e:: ; 271e
ld a, [hConnectionStripLength] ld a, [hConnectionStripLength]
ld e, a ld e, a
ld d, $0 ld d, $0
@ -1202,7 +1202,7 @@ Function271e: ; 271e
; 272a ; 272a
Function272a: ; 272a Function272a:: ; 272a
ld hl, TileMap ld hl, TileMap
ld de, BGMapBuffer ld de, BGMapBuffer
call Function27b7 call Function27b7
@ -1218,7 +1218,7 @@ Function272a: ; 272a
ret ret
; 2748 ; 2748
Function2748: ; 2748 Function2748:: ; 2748
ld hl, $c5e0 ld hl, $c5e0
ld de, BGMapBuffer ld de, BGMapBuffer
call Function27b7 call Function27b7
@ -1241,7 +1241,7 @@ Function2748: ; 2748
ret ret
; 2771 ; 2771
Function2771: ; 2771 Function2771:: ; 2771
ld hl, TileMap ld hl, TileMap
ld de, BGMapBuffer ld de, BGMapBuffer
call Function27c0 call Function27c0
@ -1257,7 +1257,7 @@ Function2771: ; 2771
ret ret
; 278f ; 278f
Function278f: ; 278f Function278f:: ; 278f
ld hl, $c4b2 ld hl, $c4b2
ld de, BGMapBuffer ld de, BGMapBuffer
call Function27c0 call Function27c0
@ -1280,7 +1280,7 @@ Function278f: ; 278f
ret ret
; 27b7 ; 27b7
Function27b7: ; 27b7 Function27b7:: ; 27b7
ld c, $28 ld c, $28
.asm_27b9 .asm_27b9
ld a, [hli] ld a, [hli]
@ -1291,7 +1291,7 @@ Function27b7: ; 27b7
ret ret
; 27c0 ; 27c0
Function27c0: ; 27c0 Function27c0:: ; 27c0
ld c, $12 ld c, $12
.asm_27c2 .asm_27c2
ld a, [hli] ld a, [hli]
@ -1312,7 +1312,7 @@ Function27c0: ; 27c0
ret ret
; 27d3 ; 27d3
Function27d3: ; 27d3 Function27d3:: ; 27d3
ld hl, BGMapBufferPtrs ld hl, BGMapBufferPtrs
push de push de
call .asm_27df call .asm_27df
@ -1344,7 +1344,7 @@ Function27d3: ; 27d3
ret ret
; 27f8 ; 27f8
Function27f8: ; 27f8 Function27f8:: ; 27f8
ld hl, BGMapBufferPtrs ld hl, BGMapBufferPtrs
ld c, $12 ld c, $12
.asm_27fd .asm_27fd
@ -1370,7 +1370,7 @@ Function27f8: ; 27f8
ret ret
; 2816 ; 2816
Function2816: ; 2816 Function2816:: ; 2816
ld hl, BGMapBuffer ld hl, BGMapBuffer
ld bc, $0078 ld bc, $0078
xor a xor a
@ -1378,7 +1378,7 @@ Function2816: ; 2816
ret ret
; 2821 ; 2821
Function2821: ; 2821 Function2821:: ; 2821
ld hl, TilesetAddress ld hl, TilesetAddress
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -1426,7 +1426,7 @@ Function2821: ; 2821
ret ret
; 2879 ; 2879
Function2879: ; 2879 Function2879:: ; 2879
ld hl, $d194 ld hl, $d194
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -1455,7 +1455,7 @@ Function2879: ; 2879
ret ret
; 289d ; 289d
Function289d: ; 289d Function289d:: ; 289d
ld hl, $d194 ld hl, $d194
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -1505,7 +1505,7 @@ Function289d: ; 289d
jr Function28f7 jr Function28f7
Function28e3: ; 28e3 Function28e3:: ; 28e3
ld hl, $d194 ld hl, $d194
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -1517,7 +1517,7 @@ Function28e3: ; 28e3
ld b, $6 ld b, $6
ld c, $5 ld c, $5
Function28f7: ; 28f7 Function28f7:: ; 28f7
.asm_28f7 .asm_28f7
push bc push bc
push hl push hl
@ -1547,7 +1547,7 @@ Function28f7: ; 28f7
ret ret
; 2914 ; 2914
Function2914: ; 2914 Function2914:: ; 2914
xor a xor a
ld [TilePermissions], a ld [TilePermissions], a
call Function296c call Function296c
@ -1579,7 +1579,7 @@ Function2914: ; 2914
db 1, 2, 4, 8, 9, 10, 5, 6 db 1, 2, 4, 8, 9, 10, 5, 6
; 294d ; 294d
Function294d: ; 294d Function294d:: ; 294d
ld a, [MapX] ld a, [MapX]
ld d, a ld d, a
ld a, [MapY] ld a, [MapY]
@ -1597,7 +1597,7 @@ Function294d: ; 294d
ret ret
; 296c ; 296c
Function296c: ; 296c Function296c:: ; 296c
ld a, [MapX] ld a, [MapX]
ld d, a ld d, a
ld a, [MapY] ld a, [MapY]
@ -1615,7 +1615,7 @@ Function296c: ; 296c
ret ret
; 298b ; 298b
Function298b: ; 298b Function298b:: ; 298b
call Function29ff call Function29ff
ret nz ret nz
ld a, [TileDown] ld a, [TileDown]
@ -1634,7 +1634,7 @@ Function298b: ; 298b
ret ret
; 29a8 ; 29a8
Function29a8: ; 29a8 Function29a8:: ; 29a8
call Function29ff call Function29ff
ret nz ret nz
ld a, [TileUp] ld a, [TileUp]
@ -1653,7 +1653,7 @@ Function29a8: ; 29a8
ret ret
; 29c5 ; 29c5
Function29c5: ; 29c5 Function29c5:: ; 29c5
call Function29ff call Function29ff
ret nz ret nz
ld a, [TileRight] ld a, [TileRight]
@ -1672,7 +1672,7 @@ Function29c5: ; 29c5
ret ret
; 29e2 ; 29e2
Function29e2: ; 29e2 Function29e2:: ; 29e2
call Function29ff call Function29ff
ret nz ret nz
ld a, [TileLeft] ld a, [TileLeft]
@ -1691,7 +1691,7 @@ Function29e2: ; 29e2
ret ret
; 29ff ; 29ff
Function29ff: ; 29ff Function29ff:: ; 29ff
and $f0 and $f0
cp $b0 cp $b0
ret z ret z
@ -1700,7 +1700,7 @@ Function29ff: ; 29ff
; 2a07 ; 2a07
GetFacingTileCoord: ; 2a07 GetFacingTileCoord:: ; 2a07
; Return map coordinates in (d, e) and tile id in a ; Return map coordinates in (d, e) and tile id in a
; of the tile the player is facing. ; of the tile the player is facing.
@ -1746,7 +1746,7 @@ GetFacingTileCoord: ; 2a07
; 2a3c ; 2a3c
Function2a3c: ; 2a3c Function2a3c:: ; 2a3c
call Function2a66 call Function2a66
ld a, [hl] ld a, [hl]
and a and a
@ -1780,7 +1780,7 @@ Function2a3c: ; 2a3c
ret ret
; 2a66 ; 2a66
Function2a66: ; 2a66 Function2a66:: ; 2a66
ld a, [MapWidth] ld a, [MapWidth]
add $6 add $6
ld c, a ld c, a
@ -1811,7 +1811,7 @@ Function2a66: ; 2a66
; 2a8b ; 2a8b
CheckFacingSign: ; 2a8b CheckFacingSign:: ; 2a8b
call GetFacingTileCoord call GetFacingTileCoord
ld b, a ld b, a
ld a, d ld a, d
@ -1834,7 +1834,7 @@ CheckFacingSign: ; 2a8b
ret ret
; 2aaa ; 2aaa
Function2aaa: ; 2aaa Function2aaa:: ; 2aaa
ld hl, $dc02 ld hl, $dc02
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -1872,7 +1872,7 @@ Function2aaa: ; 2aaa
ret ret
; 2ad4 ; 2ad4
Function2ad4: ; 2ad4 Function2ad4:: ; 2ad4
ld a, [$dbfe] ld a, [$dbfe]
and a and a
ret z ret z
@ -1887,7 +1887,7 @@ Function2ad4: ; 2ad4
ret ret
; 2ae7 ; 2ae7
Function2ae7: ; 2ae7 Function2ae7:: ; 2ae7
ld hl, $dbff ld hl, $dbff
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -1941,7 +1941,7 @@ Function2ae7: ; 2ae7
; 2b29 ; 2b29
FadeToMenu: ; 2b29 FadeToMenu:: ; 2b29
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function1d6e call Function1d6e
@ -1952,7 +1952,7 @@ FadeToMenu: ; 2b29
; 2b3c ; 2b3c
Function2b3c: ; 2b3c Function2b3c:: ; 2b3c
call WhiteBGMap call WhiteBGMap
call Function2bae call Function2bae
call Function1ad2 call Function1ad2
@ -1961,7 +1961,7 @@ Function2b3c: ; 2b3c
jr Function2b5c jr Function2b5c
; 2b4d ; 2b4d
Function2b4d: ; 2b4d Function2b4d:: ; 2b4d
call WhiteBGMap call WhiteBGMap
call Function1d7d call Function1d7d
call Function2bae call Function2bae
@ -1969,7 +1969,7 @@ Function2b4d: ; 2b4d
call Functiond90 call Functiond90
; 2b5c ; 2b5c
Function2b5c: ; 2b5c Function2b5c:: ; 2b5c
ld b, $9 ld b, $9
call GetSGBLayout call GetSGBLayout
callba Function49409 callba Function49409
@ -1980,7 +1980,7 @@ Function2b5c: ; 2b5c
; 2b74 ; 2b74
Function2b74: ; 0x2b74 Function2b74:: ; 0x2b74
push af push af
ld a, $1 ld a, $1
ld [$c2ce], a ld [$c2ce], a
@ -2005,7 +2005,7 @@ Function2b74: ; 0x2b74
ret ret
; 0x2bae ; 0x2bae
Function2bae: ; 2bae Function2bae:: ; 2bae
call DisableLCD call DisableLCD
call ClearSprites call ClearSprites
callba Function14168 callba Function14168
@ -2031,14 +2031,14 @@ Function2bae: ; 2bae
; 2be5 ; 2be5
GetMapHeaderPointer: ; 2be5 GetMapHeaderPointer:: ; 2be5
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
; 2bed ; 2bed
GetAnyMapHeaderPointer: ; 0x2bed GetAnyMapHeaderPointer:: ; 0x2bed
; Prior to calling this function, you must have switched banks so that ; Prior to calling this function, you must have switched banks so that
; MapGroupPointers is visible. ; MapGroupPointers is visible.
@ -2071,7 +2071,7 @@ GetAnyMapHeaderPointer: ; 0x2bed
ret ret
; 0x2c04 ; 0x2c04
GetMapHeaderMember: ; 0x2c04 GetMapHeaderMember:: ; 0x2c04
; Extract data from the current map's header. ; Extract data from the current map's header.
; inputs: ; inputs:
@ -2087,7 +2087,7 @@ GetMapHeaderMember: ; 0x2c04
ld c, a ld c, a
; fallthrough ; fallthrough
GetAnyMapHeaderMember: ; 0x2c0c GetAnyMapHeaderMember:: ; 0x2c0c
; bankswitch ; bankswitch
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -2107,28 +2107,28 @@ GetAnyMapHeaderMember: ; 0x2c0c
; 0x2c1c ; 0x2c1c
SwitchToMapBank: ; 2c1c SwitchToMapBank:: ; 2c1c
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
; 2c24 ; 2c24
SwitchToAnyMapBank: ; 2c24 SwitchToAnyMapBank:: ; 2c24
call GetAnyMapBank call GetAnyMapBank
rst Bankswitch rst Bankswitch
ret ret
; 2c29 ; 2c29
GetMapBank: ; 2c29 GetMapBank:: ; 2c29
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
; 2c31 ; 2c31
GetAnyMapBank: ; 2c31 GetAnyMapBank:: ; 2c31
push hl push hl
push de push de
ld de, $0000 ld de, $0000
@ -2139,7 +2139,7 @@ GetAnyMapBank: ; 2c31
ret ret
; 2c3d ; 2c3d
Function2c3d: ; 2c3d Function2c3d:: ; 2c3d
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, $25 ld a, $25
@ -2153,19 +2153,19 @@ Function2c3d: ; 2c3d
ret ret
; 2c52 ; 2c52
Function2c52: ; 2c52 Function2c52:: ; 2c52
ld a, [MapScriptHeaderBank] ld a, [MapScriptHeaderBank]
rst Bankswitch rst Bankswitch
ret ret
; 2c57 ; 2c57
GetMapScriptHeaderBank: ; 2c57 GetMapScriptHeaderBank:: ; 2c57
ld a, [MapScriptHeaderBank] ld a, [MapScriptHeaderBank]
ret ret
; 2c5b ; 2c5b
GetAnyMapBlockdataBank: ; 2c5b GetAnyMapBlockdataBank:: ; 2c5b
; Return the blockdata bank for group b map c. ; Return the blockdata bank for group b map c.
push hl push hl
push de push de
@ -2195,7 +2195,7 @@ GetAnyMapBlockdataBank: ; 2c5b
ret ret
; 2c7d ; 2c7d
GetSecondaryMapHeaderPointer: ; 0x2c7d GetSecondaryMapHeaderPointer:: ; 0x2c7d
; returns the current map's secondary map header pointer in hl. ; returns the current map's secondary map header pointer in hl.
push bc push bc
push de push de
@ -2208,7 +2208,7 @@ GetSecondaryMapHeaderPointer: ; 0x2c7d
ret ret
; 2c8a ; 2c8a
GetMapPermission: ; 2c8a GetMapPermission:: ; 2c8a
push hl push hl
push de push de
push bc push bc
@ -2221,11 +2221,11 @@ GetMapPermission: ; 2c8a
ret ret
; 2c98 ; 2c98
Function2c98: ; 2c98 Function2c98:: ; 2c98
ret ret
; 2c99 ; 2c99
GetAnyMapPermission: ; 2c99 GetAnyMapPermission:: ; 2c99
push hl push hl
push de push de
push bc push bc
@ -2238,14 +2238,14 @@ GetAnyMapPermission: ; 2c99
ret ret
; 2ca7 ; 2ca7
GetAnyMapTileset: ; 2ca7 GetAnyMapTileset:: ; 2ca7
ld de, $0001 ld de, $0001
call GetAnyMapHeaderMember call GetAnyMapHeaderMember
ld a, c ld a, c
ret ret
; 2caf ; 2caf
GetWorldMapLocation: ; 0x2caf GetWorldMapLocation:: ; 0x2caf
; given a map group/id in bc, return its location on the Pokégear map. ; given a map group/id in bc, return its location on the Pokégear map.
push hl push hl
push de push de
@ -2259,7 +2259,7 @@ GetWorldMapLocation: ; 0x2caf
ret ret
; 0x2cbd ; 0x2cbd
Function2cbd: ; 2cbd Function2cbd:: ; 2cbd
push hl push hl
push bc push bc
ld de, $0006 ld de, $0006
@ -2303,20 +2303,20 @@ Function2cbd: ; 2cbd
jr .asm_2cd7 jr .asm_2cd7
; 2cff ; 2cff
Function2cff: ; 2cff Function2cff:: ; 2cff
call Function2d0d call Function2d0d
and $f and $f
ret ret
; 2d05 ; 2d05
Function2d05: ; 2d05 Function2d05:: ; 2d05
call Function2d0d call Function2d0d
and $f0 and $f0
swap a swap a
ret ret
; 2d0d ; 2d0d
Function2d0d: ; 2d0d Function2d0d:: ; 2d0d
push hl push hl
push bc push bc
ld de, $0007 ld de, $0007
@ -2327,7 +2327,7 @@ Function2d0d: ; 2d0d
ret ret
; 2d19 ; 2d19
Function2d19: ; 2d19 Function2d19:: ; 2d19
push de push de
push hl push hl
push bc push bc
@ -2340,7 +2340,7 @@ Function2d19: ; 2d19
ret ret
; 2d27 ; 2d27
LoadTilesetHeader: ; 2d27 LoadTilesetHeader:: ; 2d27
push hl push hl
push bc push bc

View File

@ -1,7 +1,7 @@
; Functions handling map objects. ; Functions handling map objects.
GetSpritePalette: ; 17ff GetSpritePalette:: ; 17ff
push hl push hl
push de push de
push bc push bc
@ -15,7 +15,7 @@ GetSpritePalette: ; 17ff
; 180e ; 180e
Function180e: ; 180e Function180e:: ; 180e
push hl push hl
push bc push bc
ld hl, $d156 ld hl, $d156
@ -51,7 +51,7 @@ Function180e: ; 180e
ret ret
; 1836 ; 1836
Function1836: ; 1836 Function1836:: ; 1836
push de push de
push hl push hl
@ -76,14 +76,14 @@ Function1836: ; 1836
Function184a: ; 184a Function184a:: ; 184a
ld a, [StandingTile] ld a, [StandingTile]
call GetTileCollision call GetTileCollision
ld b, a ld b, a
ret ret
; 1852 ; 1852
Function1852: ; 1852 Function1852:: ; 1852
ld a, [StandingTile] ld a, [StandingTile]
call GetTileCollision call GetTileCollision
sub 1 sub 1
@ -93,7 +93,7 @@ Function1852: ; 1852
; 185d ; 185d
GetTileCollision: ; 185d GetTileCollision:: ; 185d
; Get the collision type of tile a. ; Get the collision type of tile a.
push de push de
@ -121,7 +121,7 @@ GetTileCollision: ; 185d
; 1875 ; 1875
Function1875: ; 1875 Function1875:: ; 1875
ld d, a ld d, a
and $f0 and $f0
cp $10 cp $10
@ -146,42 +146,42 @@ Function1875: ; 1875
ret ret
; 188e ; 188e
Function188e: ; 188e Function188e:: ; 188e
cp $14 cp $14
ret z ret z
cp $1c cp $1c
ret ret
; 1894 ; 1894
CheckCutTreeTile: ; 1894 CheckCutTreeTile:: ; 1894
cp $12 cp $12
ret z ret z
cp $1a cp $1a
ret ret
; 189a ; 189a
CheckHeadbuttTreeTile: ; 189a CheckHeadbuttTreeTile:: ; 189a
cp $15 cp $15
ret z ret z
cp $1d cp $1d
ret ret
; 18a0 ; 18a0
CheckCounterTile: ; 18a0 CheckCounterTile:: ; 18a0
cp $90 cp $90
ret z ret z
cp $98 cp $98
ret ret
; 18a6 ; 18a6
CheckPitTile: ; 18a6 CheckPitTile:: ; 18a6
cp $60 cp $60
ret z ret z
cp $68 cp $68
ret ret
; 18ac ; 18ac
CheckIceTile: ; 18ac CheckIceTile:: ; 18ac
cp $23 cp $23
ret z ret z
cp $2b cp $2b
@ -190,7 +190,7 @@ CheckIceTile: ; 18ac
ret ret
; 18b4 ; 18b4
CheckWhirlpoolTile: ; 18b4 CheckWhirlpoolTile:: ; 18b4
nop nop
cp $24 cp $24
ret z ret z
@ -200,14 +200,14 @@ CheckWhirlpoolTile: ; 18b4
ret ret
; 18bd ; 18bd
CheckWaterfallTile: ; 18bd CheckWaterfallTile:: ; 18bd
cp $33 cp $33
ret z ret z
cp $3b cp $3b
ret ret
; 18c3 ; 18c3
CheckStandingOnEntrance: ; 18c3 CheckStandingOnEntrance:: ; 18c3
ld a, [StandingTile] ld a, [StandingTile]
cp $71 ; door cp $71 ; door
ret z ret z
@ -220,7 +220,7 @@ CheckStandingOnEntrance: ; 18c3
; 18d2 ; 18d2
GetMapObject: ; 18d2 GetMapObject:: ; 18d2
; Return the location of map object a in bc. ; Return the location of map object a in bc.
ld hl, MapObjects ld hl, MapObjects
ld bc, $10 ld bc, $10
@ -231,7 +231,7 @@ GetMapObject: ; 18d2
; 18de ; 18de
Function18de: ; 18de Function18de:: ; 18de
ld [hConnectionStripLength], a ld [hConnectionStripLength], a
call GetMapObject call GetMapObject
ld hl, $0000 ld hl, $0000
@ -249,7 +249,7 @@ Function18de: ; 18de
ret ret
; 18f5 ; 18f5
Function18f5: ; 18f5 Function18f5:: ; 18f5
ld hl, $0006 ld hl, $0006
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -323,7 +323,7 @@ Function18f5: ; 18f5
ret ret
; 194d ; 194d
Function194d: ; 194d Function194d:: ; 194d
ld [hConnectionStripLength], a ld [hConnectionStripLength], a
call GetMapObject call GetMapObject
call Function80e7 call Function80e7
@ -332,7 +332,7 @@ Function194d: ; 194d
Function1956: ; 1956 Function1956:: ; 1956
ld [hConnectionStripLength], a ld [hConnectionStripLength], a
call Function271e call Function271e
ld a, [hConnectionStripLength] ld a, [hConnectionStripLength]
@ -341,7 +341,7 @@ Function1956: ; 1956
ret ret
; 1967 ; 1967
Function1967: ; 1967 Function1967:: ; 1967
ld [hConnectionStripLength], a ld [hConnectionStripLength], a
call GetMapObject call GetMapObject
ld hl, $0000 ld hl, $0000
@ -358,7 +358,7 @@ Function1967: ; 1967
ret ret
; 1985 ; 1985
Function1985: ; 1985 Function1985:: ; 1985
ld hl, $d4cd ld hl, $d4cd
cp [hl] cp [hl]
jr z, .asm_1990 jr z, .asm_1990
@ -374,13 +374,13 @@ Function1985: ; 1985
ret ret
; 199f ; 199f
Function199f: ; 199f Function199f:: ; 199f
call Function1967 call Function1967
call Function2712 call Function2712
ret ret
; 19a6 ; 19a6
Function19a6: ; 19a6 Function19a6:: ; 19a6
push hl push hl
call GetMapObject call GetMapObject
ld d, b ld d, b
@ -394,7 +394,7 @@ Function19a6: ; 19a6
ret ret
; 19b8 ; 19b8
Function19b8: ; 19b8 Function19b8:: ; 19b8
call GetMapObject call GetMapObject
ld hl, $0000 ld hl, $0000
add hl, bc add hl, bc
@ -426,7 +426,7 @@ Function19b8: ; 19b8
Function19e9: ; 19e9 Function19e9:: ; 19e9
ld [$c2e2], a ld [$c2e2], a
ld a, [hROMBank] ld a, [hROMBank]
ld [$c2e3], a ld [$c2e3], a
@ -451,7 +451,7 @@ Function19e9: ; 19e9
Function1a13: ; 1a13 Function1a13:: ; 1a13
push bc push bc
push de push de
ld hl, $d4d6 ld hl, $d4d6
@ -480,7 +480,7 @@ Function1a13: ; 1a13
Function1a2f: ; 1a2f Function1a2f:: ; 1a2f
ld hl, $0003 ld hl, $0003
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -502,7 +502,7 @@ Function1a2f: ; 1a2f
ret ret
; 1a47 ; 1a47
Function1a47: ; 1a47 Function1a47:: ; 1a47
push bc push bc
push de push de
ld e, a ld e, a
@ -525,7 +525,7 @@ Function1a47: ; 1a47
; 1a61 ; 1a61
Function1a61: ; 1a61 Function1a61:: ; 1a61
ld l, a ld l, a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -543,7 +543,7 @@ Function1a61: ; 1a61
ret ret
; 1a71 ; 1a71
Function1a71: ; 1a71 Function1a71:: ; 1a71
ld hl, $0003 ld hl, $0003
add hl, de add hl, de
ld [hl], a ld [hl], a
@ -591,7 +591,7 @@ Function1a71: ; 1a71
ret ret
; 1aae ; 1aae
Function1aae: ; 1aae Function1aae:: ; 1aae
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, [hli] ld a, [hli]
@ -616,20 +616,20 @@ Function1aae: ; 1aae
ret ret
; 1ac6 ; 1ac6
Function1ac6: ; 1ac6 Function1ac6:: ; 1ac6
ld hl, VramState ld hl, VramState
set 0, [hl] set 0, [hl]
ret ret
; 1acc ; 1acc
Function1acc: ; 1acc Function1acc:: ; 1acc
ld hl, VramState ld hl, VramState
res 0, [hl] res 0, [hl]
ret ret
; 1ad2 ; 1ad2
Function1ad2: ; 1ad2 Function1ad2:: ; 1ad2
ld a, [VramState] ld a, [VramState]
bit 0, a bit 0, a
ret z ret z
@ -639,7 +639,7 @@ Function1ad2: ; 1ad2
; 1ae5 ; 1ae5
Function1ae5: ; 1ae5 Function1ae5:: ; 1ae5
ld bc, $0028 ld bc, $0028
ld hl, $d4d6 ld hl, $d4d6
call AddNTimes call AddNTimes
@ -648,7 +648,7 @@ Function1ae5: ; 1ae5
ret ret
; 1af1 ; 1af1
Function1af1: ; 1af1 Function1af1:: ; 1af1
ld hl, $0000 ld hl, $0000
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -656,7 +656,7 @@ Function1af1: ; 1af1
ret ret
; 1af8 ; 1af8
Function1af8: ; 1af8 Function1af8:: ; 1af8
push af push af
ld hl, $0008 ld hl, $0008
add hl, bc add hl, bc
@ -671,7 +671,7 @@ Function1af8: ; 1af8
; 1b07 ; 1b07
GetSpriteDirection: ; 1b07 GetSpriteDirection:: ; 1b07
ld hl, $0008 ld hl, $0008
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]

View File

@ -1,4 +1,4 @@
SimpleMultiply: ; 3105 SimpleMultiply:: ; 3105
; Return a * c. ; Return a * c.
and a and a
ret z ret z
@ -15,7 +15,7 @@ SimpleMultiply: ; 3105
; 3110 ; 3110
SimpleDivide: ; 3110 SimpleDivide:: ; 3110
; Divide a by c. Return quotient b and remainder a. ; Divide a by c. Return quotient b and remainder a.
ld b, 0 ld b, 0
.loop .loop
@ -28,7 +28,7 @@ SimpleDivide: ; 3110
; 3119 ; 3119
Multiply: ; 3119 Multiply:: ; 3119
; Multiply hMultiplicand (3 bytes) by hMultiplier. Result in hProduct. ; Multiply hMultiplicand (3 bytes) by hMultiplier. Result in hProduct.
; All values are big endian. ; All values are big endian.
push hl push hl
@ -42,7 +42,7 @@ Multiply: ; 3119
; 3124 ; 3124
Divide: ; 3124 Divide:: ; 3124
; Divide hDividend length b (max 4 bytes) by hDivisor. Result in hQuotient. ; Divide hDividend length b (max 4 bytes) by hDivisor. Result in hQuotient.
; All values are big endian. ; All values are big endian.
push hl push hl
@ -64,7 +64,7 @@ Divide: ; 3124
; 3136 ; 3136
SubtractSigned: ; 3136 SubtractSigned:: ; 3136
; Return a - b, sign in carry. ; Return a - b, sign in carry.
sub b sub b
ret nc ret nc

View File

@ -1,12 +1,12 @@
; Functions used in displaying and handling menus. ; Functions used in displaying and handling menus.
LoadMenuDataHeader: ; 0x1d35 LoadMenuDataHeader:: ; 0x1d35
call Function1d3c call Function1d3c
call Function1c00 call Function1c00
ret ret
Function1d3c: ; 0x1d3c Function1d3c:: ; 0x1d3c
ld de, $cf81 ld de, $cf81
ld bc, $0010 ld bc, $0010
call CopyBytes call CopyBytes
@ -15,30 +15,30 @@ Function1d3c: ; 0x1d3c
ret ret
; 0x1d4b ; 0x1d4b
Function1d4b: ; 1d4b Function1d4b:: ; 1d4b
ld [$cf88], a ld [$cf88], a
ret ret
; 1d4f ; 1d4f
Function1d4f: ; 1d4f Function1d4f:: ; 1d4f
push hl push hl
call Function1d58 call Function1d58
pop hl pop hl
jp PrintText jp PrintText
; 1d57 ; 1d57
Function1d57: ; 1d57 Function1d57:: ; 1d57
ret ret
; 1d58 ; 1d58
Function1d58: ; 1d58 Function1d58:: ; 1d58
ld hl, MenuDataHeader_0x1d5f ld hl, MenuDataHeader_0x1d5f
call LoadMenuDataHeader call LoadMenuDataHeader
ret ret
; 1d5f ; 1d5f
MenuDataHeader_0x1d5f: ; 1d5f MenuDataHeader_0x1d5f:: ; 1d5f
db $40 ; tile backup db $40 ; tile backup
db 12, 0 ; start coords db 12, 0 ; start coords
db 17, 19 ; end coords db 17, 19 ; end coords
@ -46,19 +46,19 @@ MenuDataHeader_0x1d5f: ; 1d5f
db 0 ; default option db 0 ; default option
; 1d67 ; 1d67
Function1d67: ; 1d67 Function1d67:: ; 1d67
call Function1d4f call Function1d4f
call Function1c17 call Function1c17
ret ret
; 1d6e ; 1d6e
Function1d6e: ; 1d6e Function1d6e:: ; 1d6e
ld hl, MenuDataHeader_0x1d75 ld hl, MenuDataHeader_0x1d75
call LoadMenuDataHeader call LoadMenuDataHeader
ret ret
; 1d75 ; 1d75
MenuDataHeader_0x1d75: ; 1d75 MenuDataHeader_0x1d75:: ; 1d75
db $40 ; tile backup db $40 ; tile backup
db 0, 0 ; start coords db 0, 0 ; start coords
db 17, 19 ; end coords db 17, 19 ; end coords
@ -66,12 +66,12 @@ MenuDataHeader_0x1d75: ; 1d75
db 1 ; default option db 1 ; default option
; 1d7d ; 1d7d
Function1d7d: ; 1d7d Function1d7d:: ; 1d7d
call Function1c07 call Function1c07
ret ret
; 1d81 ; 1d81
Function1d81: ; 0x1d81 Function1d81:: ; 0x1d81
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function1cbb call Function1cbb
@ -95,7 +95,7 @@ Function1d81: ; 0x1d81
ret ret
; 0x1dab ; 0x1dab
Function1dab: ; 1dab Function1dab:: ; 1dab
call LoadMenuDataHeader call LoadMenuDataHeader
call Function1d81 call Function1d81
call Function1c17 call Function1c17
@ -103,7 +103,7 @@ Function1dab: ; 1dab
ret ret
; 1db8 ; 1db8
Function1db8: ; 0x1db8 Function1db8:: ; 0x1db8
push hl push hl
push bc push bc
push af push af
@ -124,17 +124,17 @@ Function1db8: ; 0x1db8
; 0x1dcf ; 0x1dcf
YesNoBox: ; 1dcf YesNoBox:: ; 1dcf
lb bc, 14, 7 lb bc, 14, 7
PlaceYesNoBox: ; 1dd2 PlaceYesNoBox:: ; 1dd2
jr _YesNoBox jr _YesNoBox
Function1dd4: ; 1dd4 Function1dd4:: ; 1dd4
call LoadMenuDataHeader call LoadMenuDataHeader
jr Function1dfe jr Function1dfe
_YesNoBox: ; 1dd9 _YesNoBox:: ; 1dd9
; Return nc (yes) or c (no). ; Return nc (yes) or c (no).
push bc push bc
ld hl, YesNoMenuDataHeader ld hl, YesNoMenuDataHeader
@ -157,7 +157,7 @@ _YesNoBox: ; 1dd9
ld [$cf84], a ld [$cf84], a
call Function1c00 call Function1c00
Function1dfe: ; 1dfe Function1dfe:: ; 1dfe
call Function1d81 call Function1d81
push af push af
ld c, $f ld c, $f
@ -178,7 +178,7 @@ Function1dfe: ; 1dfe
ret ret
; 1e1d ; 1e1d
YesNoMenuDataHeader: ; 1e1d YesNoMenuDataHeader:: ; 1e1d
db $40 ; tile backup db $40 ; tile backup
db 5, 10 ; start coords db 5, 10 ; start coords
db 9, 15 ; end coords db 9, 15 ; end coords
@ -186,20 +186,20 @@ YesNoMenuDataHeader: ; 1e1d
db 1 ; default option db 1 ; default option
; 1e25 ; 1e25
YesNoMenuData2: ; 1e25 YesNoMenuData2:: ; 1e25
db $c0 ; flags db $c0 ; flags
db 2 db 2
db "YES@" db "YES@"
db "NO@" db "NO@"
; 1e2e ; 1e2e
Function1e2e: ; 1e2e Function1e2e:: ; 1e2e
call Function1e35 call Function1e35
call Function1c00 call Function1c00
ret ret
; 1e35 ; 1e35
Function1e35: ; 1e35 Function1e35:: ; 1e35
push de push de
call Function1d3c call Function1d3c
pop de pop de
@ -224,7 +224,7 @@ Function1e35: ; 1e35
ret ret
; 1e5d ; 1e5d
Function1e5d: ; 1e5d Function1e5d:: ; 1e5d
call MenuFunc_1e7f call MenuFunc_1e7f
call MenuWriteText call MenuWriteText
call Function1eff call Function1eff
@ -234,7 +234,7 @@ Function1e5d: ; 1e5d
ret ret
; 1e70 ; 1e70
SetUpMenu: ; 1e70 SetUpMenu:: ; 1e70
call MenuFunc_1e7f ; ??? call MenuFunc_1e7f ; ???
call MenuWriteText call MenuWriteText
call Function1eff ; set up selection pointer call Function1eff ; set up selection pointer
@ -242,14 +242,14 @@ SetUpMenu: ; 1e70
set 7, [hl] set 7, [hl]
ret ret
MenuFunc_1e7f: ; 0x1e7f MenuFunc_1e7f:: ; 0x1e7f
call Function1c66 call Function1c66
call Function1ebd call Function1ebd
call Function1ea6 call Function1ea6
call Function1cbb call Function1cbb
ret ret
MenuWriteText: ; 0x1e8c MenuWriteText:: ; 0x1e8c
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function1ebd ; sort out the text call Function1ebd ; sort out the text
@ -265,7 +265,7 @@ MenuWriteText: ; 0x1e8c
ret ret
; 0x1ea6 ; 0x1ea6
Function1ea6: ; 1ea6 Function1ea6:: ; 1ea6
ld a, [$cf83] ld a, [$cf83]
ld c, a ld c, a
ld a, [$cf85] ld a, [$cf85]
@ -281,7 +281,7 @@ Function1ea6: ; 1ea6
ret ret
; 1ebd ; 1ebd
Function1ebd: ; 1ebd Function1ebd:: ; 1ebd
ld hl, $cf93 ld hl, $cf93
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -306,7 +306,7 @@ Function1ebd: ; 1ebd
ret ret
; 1eda ; 1eda
Function1eda: ; 1eda Function1eda:: ; 1eda
call Function1cfd call Function1cfd
ld bc, $002a ld bc, $002a
add hl, bc add hl, bc
@ -329,14 +329,14 @@ Function1eda: ; 1eda
jr .asm_1ee1 jr .asm_1ee1
; 1efb ; 1efb
Function1efb: ; 1efb Function1efb:: ; 1efb
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
jp [hl] jp [hl]
; 1eff ; 1eff
Function1eff: ; 1eff Function1eff:: ; 1eff
call Function1c10 call Function1c10
ld hl, $cfa8 ld hl, $cfa8
ld a, [$cf91] ld a, [$cf91]
@ -356,20 +356,20 @@ Function1eff: ; 1eff
; 1f1a ; 1f1a
Function1f1a: ; 1f1a Function1f1a:: ; 1f1a
call Function1bd3 call Function1bd3
ld hl, $cfa8 ld hl, $cfa8
and [hl] and [hl]
jr Function1f2a jr Function1f2a
; 1f23 ; 1f23
Function1f23: ; 1f23 Function1f23:: ; 1f23
xor a xor a
ld [$cf73], a ld [$cf73], a
call Function1bc9 call Function1bc9
; 1f2a ; 1f2a
Function1f2a: ; 1f2a Function1f2a:: ; 1f2a
bit 0, a bit 0, a
jr nz, .asm_1f52 jr nz, .asm_1f52
bit 1, a bit 1, a
@ -420,7 +420,7 @@ Function1f2a: ; 1f2a
ret ret
; 1f79 ; 1f79
Function1f79: ; 1f79 Function1f79:: ; 1f79
push de push de
ld hl, $cf97 ld hl, $cf97
ld a, [hli] ld a, [hli]
@ -435,7 +435,7 @@ Function1f79: ; 1f79
ret ret
; 1f8d ; 1f8d
Function1f8d: ; 1f8d Function1f8d:: ; 1f8d
push de push de
ld a, [MenuSelection] ld a, [MenuSelection]
call Function1fb1 call Function1fb1
@ -449,7 +449,7 @@ Function1f8d: ; 1f8d
ret ret
; 1f9e ; 1f9e
Function1f9e: ; 1f9e Function1f9e:: ; 1f9e
call Function1fb1 call Function1fb1
inc hl inc hl
inc hl inc hl
@ -459,7 +459,7 @@ Function1f9e: ; 1f9e
ret ret
; 1fa7 ; 1fa7
Function1fa7: ; 1fa7 Function1fa7:: ; 1fa7
ld a, [MenuSelection] ld a, [MenuSelection]
call Function1fb1 call Function1fb1
ld a, [hli] ld a, [hli]
@ -468,7 +468,7 @@ Function1fa7: ; 1fa7
jp [hl] jp [hl]
; 1fb1 ; 1fb1
Function1fb1: ; 1fb1 Function1fb1:: ; 1fb1
ld e, a ld e, a
ld d, $0 ld d, $0
ld hl, $cf97 ld hl, $cf97
@ -482,7 +482,7 @@ Function1fb1: ; 1fb1
ret ret
; 1fbf ; 1fbf
Function1fbf: ; 1fbf Function1fbf:: ; 1fbf
ld hl, $cf71 ld hl, $cf71
call Function1ff0 call Function1ff0
ld hl, $cf81 ld hl, $cf81
@ -508,14 +508,14 @@ Function1fbf: ; 1fbf
ret ret
; 1ff0 ; 1ff0
Function1ff0: ; 1ff0 Function1ff0:: ; 1ff0
ld bc, $0010 ld bc, $0010
xor a xor a
call ByteFill call ByteFill
ret ret
; 1ff8 ; 1ff8
Function1ff8: ; 1ff8 Function1ff8:: ; 1ff8
push af push af
and $3 and $3
jr z, .asm_2007 jr z, .asm_2007
@ -530,7 +530,7 @@ Function1ff8: ; 1ff8
; 2009 ; 2009
PlayClickSFX: ; 2009 PlayClickSFX:: ; 2009
push de push de
ld de, SFX_READ_TEXT_2 ld de, SFX_READ_TEXT_2
call PlaySFX call PlaySFX
@ -538,14 +538,14 @@ PlayClickSFX: ; 2009
ret ret
; 0x2012 ; 0x2012
Function2012: ; 2012 Function2012:: ; 2012
call Function1d4f call Function1d4f
call Functiona46 call Functiona46
call Function1c07 call Function1c07
ret ret
; 201c ; 201c
Function201c: ; 201c Function201c:: ; 201c
ld [hBuffer], a ld [hBuffer], a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -559,7 +559,7 @@ Function201c: ; 201c
ret ret
; 202a ; 202a
Function202a: ; 202a Function202a:: ; 202a
ld a, [hROMBank] ld a, [hROMBank]
ld [$cf94], a ld [$cf94], a
callba Function2400e callba Function2400e
@ -567,7 +567,7 @@ Function202a: ; 202a
ret ret
; 2039 ; 2039
Function2039: ; 2039 Function2039:: ; 2039
ld a, [hROMBank] ld a, [hROMBank]
ld [$cf94], a ld [$cf94], a
callba Function24022 callba Function24022
@ -575,7 +575,7 @@ Function2039: ; 2039
ret ret
; 2048 ; 2048
Function2048: ; 2048 Function2048:: ; 2048
ld a, [hROMBank] ld a, [hROMBank]
ld [$cf94], a ld [$cf94], a
callba Function2403c callba Function2403c
@ -583,7 +583,7 @@ Function2048: ; 2048
ret ret
; 2057 ; 2057
Function2057: ; 2057 Function2057:: ; 2057
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, $21 ld a, $21

View File

@ -1,4 +1,4 @@
Function1b1e: ; 1b1e Function1b1e:: ; 1b1e
ld [$d003], a ld [$d003], a
xor a xor a
ld [DefaultFlypoint], a ld [DefaultFlypoint], a
@ -11,7 +11,7 @@ Function1b1e: ; 1b1e
ret ret
; 1b35 ; 1b35
Function1b35: ; 1b35 Function1b35:: ; 1b35
ld a, [DefaultFlypoint] ld a, [DefaultFlypoint]
and a and a
ret z ret z
@ -20,7 +20,7 @@ Function1b35: ; 1b35
ret ret
; 1b3f ; 1b3f
Function1b3f: ; 1b3f Function1b3f:: ; 1b3f
push hl push hl
push de push de
ld hl, DefaultFlypoint ld hl, DefaultFlypoint
@ -35,7 +35,7 @@ Function1b3f: ; 1b3f
ret ret
; 1b50 ; 1b50
Function1b50: ; 1b50 Function1b50:: ; 1b50
push af push af
ld a, c ld a, c
and a and a
@ -52,7 +52,7 @@ Function1b50: ; 1b50
ret ret
; 1b5f ; 1b5f
Function1b5f: ; 1b5f Function1b5f:: ; 1b5f
push af push af
ld a, b ld a, b
sub d sub d
@ -97,7 +97,7 @@ Function1b5f: ; 1b5f
ret ret
; 1b92 ; 1b92
Function1b92: ; 1b92 Function1b92:: ; 1b92
push de push de
push hl push hl
ld l, b ld l, b
@ -119,7 +119,7 @@ Function1b92: ; 1b92
db 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 db 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19
; 1bb1 ; 1bb1
Function1bb1: ; 1bb1 Function1bb1:: ; 1bb1
push hl push hl
push bc push bc
ld hl, $cfa1 ld hl, $cfa1
@ -142,19 +142,19 @@ Function1bb1: ; 1bb1
ret ret
; 1bc9 ; 1bc9
Function1bc9: ; 1bc9 Function1bc9:: ; 1bc9
callab Function241a8 callab Function241a8
call Function1bdd call Function1bdd
ret ret
; 1bd3 ; 1bd3
Function1bd3: ; 1bd3 Function1bd3:: ; 1bd3
callab Function241ab callab Function241ab
call Function1bdd call Function1bdd
ret ret
; 1bdd ; 1bdd
Function1bdd: ; 1bdd Function1bdd:: ; 1bdd
push bc push bc
push af push af
ld a, [$ffa9] ld a, [$ffa9]
@ -170,7 +170,7 @@ Function1bdd: ; 1bdd
ret ret
; 1bee ; 1bee
Function1bee: ; 1bee Function1bee:: ; 1bee
ld hl, $cfac ld hl, $cfac
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -179,7 +179,7 @@ Function1bee: ; 1bee
ret ret
; 1bf7 ; 1bf7
Function1bf7: ; 1bf7 Function1bf7:: ; 1bf7
ld hl, $cfac ld hl, $cfac
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -188,22 +188,22 @@ Function1bf7: ; 1bf7
ret ret
; 1c00 ; 1c00
Function1c00: ; 1c00 Function1c00:: ; 1c00
callab Function24374 callab Function24374
ret ret
; 1c07 ; 1c07
Function1c07: ; 0x1c07 Function1c07:: ; 0x1c07
push af push af
callab Function243e8 callab Function243e8
pop af pop af
ret ret
Function1c10: ; 0x1c10 Function1c10:: ; 0x1c10
callab Function2446d callab Function2446d
ret ret
Function1c17: ; 0x1c17 Function1c17:: ; 0x1c17
push af push af
call Function1c07 call Function1c07
call Function321c call Function321c
@ -211,7 +211,7 @@ Function1c17: ; 0x1c17
pop af pop af
ret ret
Function1c23: ; 0x1c23 Function1c23:: ; 0x1c23
call Function1cfd call Function1cfd
call Function1c30 call Function1c30
call Function1d19 call Function1d19

View File

@ -1,7 +1,7 @@
; Functions dealing with palettes. ; Functions dealing with palettes.
UpdatePalsIfCGB: ; c2f UpdatePalsIfCGB:: ; c2f
; update bgp data from BGPals ; update bgp data from BGPals
; update obp data from OBPals ; update obp data from OBPals
; return carry if successful ; return carry if successful
@ -12,7 +12,7 @@ UpdatePalsIfCGB: ; c2f
ret z ret z
UpdateCGBPals: ; c33 UpdateCGBPals:: ; c33
; return carry if successful ; return carry if successful
; any pals to update? ; any pals to update?
ld a, [hCGBPalUpdate] ld a, [hCGBPalUpdate]
@ -20,7 +20,7 @@ UpdateCGBPals: ; c33
ret z ret z
ForceUpdateCGBPals: ; c37 ForceUpdateCGBPals:: ; c37
ld a, [rSVBK] ld a, [rSVBK]
push af push af
@ -71,7 +71,7 @@ ForceUpdateCGBPals: ; c37
; c9f ; c9f
DmgToCgbBGPals: ; c9f DmgToCgbBGPals:: ; c9f
; exists to forego reinserting cgb-converted image data ; exists to forego reinserting cgb-converted image data
; input: a -> bgp ; input: a -> bgp
@ -116,7 +116,7 @@ DmgToCgbBGPals: ; c9f
; ccb ; ccb
DmgToCgbObjPals: ; ccb DmgToCgbObjPals:: ; ccb
; exists to forego reinserting cgb-converted image data ; exists to forego reinserting cgb-converted image data
; input: d -> obp1 ; input: d -> obp1
@ -162,7 +162,7 @@ DmgToCgbObjPals: ; ccb
; cf8 ; cf8
Functioncf8: ; cf8 Functioncf8:: ; cf8
ld [rOBP0], a ld [rOBP0], a
push af push af
ld a, [hCGB] ld a, [hCGB]
@ -194,7 +194,7 @@ Functioncf8: ; cf8
ret ret
; d24 ; d24
Functiond24: ; d24 Functiond24:: ; d24
ld [rOBP1], a ld [rOBP1], a
push af push af
ld a, [hCGB] ld a, [hCGB]
@ -228,7 +228,7 @@ Functiond24: ; d24
CopyPals: ; d50 CopyPals:: ; d50
; copy c palettes in order b from de to hl ; copy c palettes in order b from de to hl
push bc push bc
@ -281,7 +281,7 @@ CopyPals: ; d50
; d79 ; d79
Functiond79: ; d79 Functiond79:: ; d79
ld a, [hCGB] ld a, [hCGB]
and a and a
ret z ret z
@ -297,12 +297,12 @@ Functiond79: ; d79
; d90 ; d90
Functiond90: ; d90 Functiond90:: ; d90
ret ret
; d91 ; d91
Functiond91: ; d91 Functiond91:: ; d91
ld a, [hCGB] ld a, [hCGB]
and a and a
ret z ret z
@ -323,7 +323,7 @@ Functiond91: ; d91
; db1 ; db1
Functiondb1: ; db1 Functiondb1:: ; db1
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, BANK(Function4c000) ld a, BANK(Function4c000)
@ -334,7 +334,7 @@ Functiondb1: ; db1
ret ret
; dbd ; dbd
Functiondbd: ; dbd Functiondbd:: ; dbd
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, BANK(Function4c03f) ld a, BANK(Function4c03f)

View File

@ -1,4 +1,4 @@
SetSeenAndCaughtMon: ; 3380 SetSeenAndCaughtMon:: ; 3380
push af push af
ld c, a ld c, a
ld hl, PokedexCaught ld hl, PokedexCaught
@ -8,28 +8,28 @@ SetSeenAndCaughtMon: ; 3380
; fallthrough ; fallthrough
; 338b ; 338b
SetSeenMon: ; 338b SetSeenMon:: ; 338b
ld c, a ld c, a
ld hl, PokedexSeen ld hl, PokedexSeen
ld b, SET_FLAG ld b, SET_FLAG
jr PokedexFlagAction jr PokedexFlagAction
; 3393 ; 3393
CheckCaughtMon: ; 3393 CheckCaughtMon:: ; 3393
ld c, a ld c, a
ld hl, PokedexCaught ld hl, PokedexCaught
ld b, CHECK_FLAG ld b, CHECK_FLAG
jr PokedexFlagAction jr PokedexFlagAction
; 339b ; 339b
CheckSeenMon: ; 339b CheckSeenMon:: ; 339b
ld c, a ld c, a
ld hl, PokedexSeen ld hl, PokedexSeen
ld b, CHECK_FLAG ld b, CHECK_FLAG
; fallthrough ; fallthrough
; 33a1 ; 33a1
PokedexFlagAction: ; 33a1 PokedexFlagAction:: ; 33a1
ld d, 0 ld d, 0
ld a, PREDEF_FLAG ld a, PREDEF_FLAG
call Predef call Predef

View File

@ -1,4 +1,4 @@
Predef: ; 2d83 Predef:: ; 2d83
; Call predefined function a. ; Call predefined function a.
; Preserves bc, de, hl and f. ; Preserves bc, de, hl and f.

View File

@ -1,4 +1,4 @@
Random: ; 2f8c Random:: ; 2f8c
; A simple hardware-based random number generator (RNG). ; A simple hardware-based random number generator (RNG).
; Two random numbers are generated by adding and subtracting ; Two random numbers are generated by adding and subtracting
@ -29,7 +29,7 @@ Random: ; 2f8c
ret ret
; 2f9f ; 2f9f
BattleRandom: ; 2f9f BattleRandom:: ; 2f9f
; _BattleRandom lives in another bank. ; _BattleRandom lives in another bank.
; It handles all RNG calls in the battle engine, allowing ; It handles all RNG calls in the battle engine, allowing
@ -50,7 +50,7 @@ BattleRandom: ; 2f9f
; 2fb1 ; 2fb1
Function2fb1: ; 2fb1 Function2fb1:: ; 2fb1
push bc push bc
ld c, a ld c, a
xor a xor a

View File

@ -1,4 +1,4 @@
RTC: ; 46f RTC:: ; 46f
; update time and time-sensitive palettes ; update time and time-sensitive palettes
; rtc enabled? ; rtc enabled?
@ -13,12 +13,12 @@ RTC: ; 46f
bit 0, a ; obj update bit 0, a ; obj update
ret z ret z
TimeOfDayPals: ; 47e TimeOfDayPals:: ; 47e
callab _TimeOfDayPals callab _TimeOfDayPals
ret ret
; 485 ; 485
UpdateTimePals: ; 485 UpdateTimePals:: ; 485
callab _UpdateTimePals callab _UpdateTimePals
ret ret
; 48c ; 48c

View File

@ -1,4 +1,4 @@
Serial: ; 6ef Serial:: ; 6ef
; The serial interrupt. ; The serial interrupt.
push af push af
@ -89,7 +89,7 @@ Serial: ; 6ef
reti reti
; 75f ; 75f
Function75f: ; 75f Function75f:: ; 75f
ld a, $1 ld a, $1
ld [$ffcc], a ld [$ffcc], a
.asm_763 .asm_763
@ -125,7 +125,7 @@ Function75f: ; 75f
ret ret
; 78a ; 78a
Function78a: ; 78a Function78a:: ; 78a
xor a xor a
ld [$ffca], a ld [$ffca], a
ld a, [$ffcb] ld a, [$ffcb]
@ -230,7 +230,7 @@ Function78a: ; 78a
ret ret
; 82b ; 82b
Function82b: ; 82b Function82b:: ; 82b
push hl push hl
ld hl, $cf5b ld hl, $cf5b
ld a, [hli] ld a, [hli]
@ -239,14 +239,14 @@ Function82b: ; 82b
ret ret
; 833 ; 833
Function833: ; 833 Function833:: ; 833
dec a dec a
ld [$cf5b], a ld [$cf5b], a
ld [$cf5c], a ld [$cf5c], a
ret ret
; 83b ; 83b
Function83b: ; 83b Function83b:: ; 83b
ld hl, $cf56 ld hl, $cf56
ld de, $cf51 ld de, $cf51
ld c, $2 ld c, $2
@ -272,7 +272,7 @@ Function83b: ; 83b
ret ret
; 862 ; 862
Function862: ; 862 Function862:: ; 862
call Function309d call Function309d
callab Function4000 callab Function4000
call Function87d call Function87d
@ -280,7 +280,7 @@ Function862: ; 862
; 871 ; 871
Function871: ; 871 Function871:: ; 871
call Function309d call Function309d
callab Function4000 callab Function4000
jp Function87d jp Function87d
@ -288,7 +288,7 @@ Function871: ; 871
Function87d: ; 87d Function87d:: ; 87d
ld a, $ff ld a, $ff
ld [$cf52], a ld [$cf52], a
.asm_882 .asm_882
@ -331,7 +331,7 @@ Function87d: ; 87d
ret ret
; 8c1 ; 8c1
Function8c1: ; 8c1 Function8c1:: ; 8c1
push bc push bc
ld b, $60 ld b, $60
ld a, [InLinkBattle] ld a, [InLinkBattle]
@ -363,7 +363,7 @@ Function8c1: ; 8c1
ret ret
; 8f3 ; 8f3
Function8f3: ; 8f3 Function8f3:: ; 8f3
ld a, [hSerialReceive] ld a, [hSerialReceive]
ld [$cf51], a ld [$cf51], a
and $f0 and $f0
@ -377,7 +377,7 @@ Function8f3: ; 8f3
ret ret
; 908 ; 908
Function908: ; 908 Function908:: ; 908
xor a xor a
ld [hSerialSend], a ld [hSerialSend], a
ld a, [$ffcb] ld a, [$ffcb]
@ -390,7 +390,7 @@ Function908: ; 908
ret ret
; 919 ; 919
Function919: ; 919 Function919:: ; 919
ld a, [InLinkBattle] ld a, [InLinkBattle]
and a and a
ret nz ret nz

View File

@ -1,8 +1,8 @@
Cosine: ; 1b0f Cosine:: ; 1b0f
; Return d * cos(a) in hl ; Return d * cos(a) in hl
add $10 ; 90 degrees add $10 ; 90 degrees
Sine: ; 1b11 Sine:: ; 1b11
; Return d * sin(a) in hl ; Return d * sin(a) in hl
; a is a signed 6-bit value. ; a is a signed 6-bit value.

View File

@ -1,4 +1,4 @@
GetSRAMBank: ; 2fcb GetSRAMBank:: ; 2fcb
; load sram bank a ; load sram bank a
; if invalid bank, sram is disabled ; if invalid bank, sram is disabled
cp NUM_SRAM_BANKS cp NUM_SRAM_BANKS
@ -6,7 +6,7 @@ GetSRAMBank: ; 2fcb
jr CloseSRAM jr CloseSRAM
; 2fd1 ; 2fd1
OpenSRAM: ; 2fd1 OpenSRAM:: ; 2fd1
; switch to sram bank a ; switch to sram bank a
push af push af
; latch clock data ; latch clock data
@ -21,7 +21,7 @@ OpenSRAM: ; 2fd1
ret ret
; 2fe1 ; 2fe1
CloseSRAM: ; 2fe1 CloseSRAM:: ; 2fe1
push af push af
ld a, SRAM_DISABLE ld a, SRAM_DISABLE
; reset clock latch for next time ; reset clock latch for next time

View File

@ -1,16 +1,16 @@
InitString: ; 2ef6 InitString:: ; 2ef6
; Init a string of length c. ; Init a string of length c.
push hl push hl
jr _InitString jr _InitString
; 2ef9 ; 2ef9
InitName: ; 2ef9 InitName:: ; 2ef9
; Intended for names, so this function is limited to ten characters. ; Intended for names, so this function is limited to ten characters.
push hl push hl
ld c, 10 ld c, 10
; 2efc ; 2efc
_InitString: ; 2efc _InitString:: ; 2efc
; if the string pointed to by hl is empty (defined as "zero or more spaces ; if the string pointed to by hl is empty (defined as "zero or more spaces
; followed by a null"), then initialize it to the string pointed to by de. ; followed by a null"), then initialize it to the string pointed to by de.
push bc push bc

View File

@ -1,8 +1,8 @@
ClearBox: ; fb6 ClearBox:: ; fb6
; Fill a c*b box at hl with blank tiles. ; Fill a c*b box at hl with blank tiles.
ld a, " " ld a, " "
Functionfb8: Functionfb8::
push bc push bc
push hl push hl
.x .x
@ -19,7 +19,7 @@ Functionfb8:
; fc8 ; fc8
ClearTileMap: ; fc8 ClearTileMap:: ; fc8
; Fill TileMap with blank tiles. ; Fill TileMap with blank tiles.
ld hl, TileMap ld hl, TileMap
@ -35,7 +35,7 @@ ClearTileMap: ; fc8
; fdb ; fdb
Functionfdb: ; fdb Functionfdb:: ; fdb
ld a, $7 ld a, $7
ld hl, AttrMap ld hl, AttrMap
ld bc, $0168 ld bc, $0168
@ -45,7 +45,7 @@ Functionfdb: ; fdb
TextBox: ; fe8 TextBox:: ; fe8
; Draw a text box width c height b at hl ; Draw a text box width c height b at hl
; Dimensions do not include the border. ; Dimensions do not include the border.
push bc push bc
@ -57,7 +57,7 @@ TextBox: ; fe8
; ff1 ; ff1
TextBoxBorder: ; ff1 TextBoxBorder:: ; ff1
; Top ; Top
push hl push hl
@ -96,7 +96,7 @@ TextBoxBorder: ; ff1
; 101e ; 101e
NPlaceChar: ; 101e NPlaceChar:: ; 101e
; Place char a c times ; Place char a c times
ld d,c ld d,c
.loop .loop
@ -107,7 +107,7 @@ NPlaceChar: ; 101e
; 1024 ; 1024
TextBoxPalette: ; 1024 TextBoxPalette:: ; 1024
; Fill text box width c height b at hl with pal 7 ; Fill text box width c height b at hl with pal 7
ld de, AttrMap - TileMap ld de, AttrMap - TileMap
add hl, de add hl, de
@ -133,7 +133,7 @@ TextBoxPalette: ; 1024
; 103e ; 103e
SpeechTextBox: ; 103e SpeechTextBox:: ; 103e
; Standard textbox. ; Standard textbox.
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ; height ld b, 4 ; height
@ -141,11 +141,11 @@ SpeechTextBox: ; 103e
jp TextBox jp TextBox
; 1048 ; 1048
UnknownText_0x1048: ; 1048 UnknownText_0x1048:: ; 1048
db $0, "ゲームフりーク!", $57 db $0, "ゲームフりーク!", $57
; 1052 ; 1052
Function1052: ; 1052 Function1052:: ; 1052
ld hl, .text_1056 ld hl, .text_1056
ret ret
.text_1056 .text_1056
@ -153,23 +153,23 @@ Function1052: ; 1052
; 1057 ; 1057
PrintText: ; 1057 PrintText:: ; 1057
call Function106c call Function106c
Function105a: ; 105a Function105a:: ; 105a
push hl push hl
hlcoord 1, 14 hlcoord 1, 14
ld bc, 18 + 3<<8 ld bc, 18 + 3<<8
call ClearBox call ClearBox
pop hl pop hl
PrintTextBoxText: ; 1065 PrintTextBoxText:: ; 1065
bccoord 1, 14 bccoord 1, 14
call Function13e5 call Function13e5
ret ret
; 106c ; 106c
Function106c: ; 106c Function106c:: ; 106c
push hl push hl
call SpeechTextBox call SpeechTextBox
call Function1ad2 call Function1ad2
@ -180,10 +180,10 @@ Function106c: ; 106c
PlaceString: ; 1078 PlaceString:: ; 1078
push hl push hl
PlaceNextChar: ; 1079 PlaceNextChar:: ; 1079
ld a, [de] ld a, [de]
cp "@" cp "@"
jr nz, CheckDict jr nz, CheckDict
@ -193,11 +193,11 @@ PlaceNextChar: ; 1079
ret ret
pop de pop de
NextChar: ; 1083 NextChar:: ; 1083
inc de inc de
jp PlaceNextChar jp PlaceNextChar
CheckDict: ; 1087 CheckDict:: ; 1087
cp $15 cp $15
jp z, Function117b jp z, Function117b
cp $4f cp $4f
@ -312,127 +312,127 @@ CheckDict: ; 1087
; 0x117b ; 0x117b
Function117b: ; 117b Function117b:: ; 117b
ld c, l ld c, l
ld b, h ld b, h
callba Function17f036 callba Function17f036
jp PlaceNextChar jp PlaceNextChar
; 1186 ; 1186
Function1186: ; 1186 Function1186:: ; 1186
push de push de
ld de, MomsName ld de, MomsName
jp $126a jp $126a
; 118d ; 118d
Function118d: ; 118d Function118d:: ; 118d
push de push de
ld de, PlayerName ld de, PlayerName
jp $126a jp $126a
; 1194 ; 1194
Function1194: ; 1194 Function1194:: ; 1194
push de push de
ld de, RivalName ld de, RivalName
jp $126a jp $126a
; 119b ; 119b
Function119b: ; 119b Function119b:: ; 119b
push de push de
ld de, RedsName ld de, RedsName
jp $126a jp $126a
; 11a2 ; 11a2
Function11a2: ; 11a2 Function11a2:: ; 11a2
push de push de
ld de, GreensName ld de, GreensName
jp $126a jp $126a
; 11a9 ; 11a9
Function11a9: ; 11a9 Function11a9:: ; 11a9
push de push de
ld de, Char5DText ld de, Char5DText
jp $126a jp $126a
; 11b0 ; 11b0
Function11b0: ; 11b0 Function11b0:: ; 11b0
push de push de
ld de, Char5CText ld de, Char5CText
jp $126a jp $126a
; 11b7 ; 11b7
Function11b7: ; 11b7 Function11b7:: ; 11b7
push de push de
ld de, Char5BText ld de, Char5BText
jp $126a jp $126a
; 11be ; 11be
Function11be: ; 11be Function11be:: ; 11be
push de push de
ld de, Char5EText ld de, Char5EText
jp $126a jp $126a
; 11c5 ; 11c5
Function11c5: ; 11c5 Function11c5:: ; 11c5
push de push de
ld de, Char54Text ld de, Char54Text
jp $126a jp $126a
; 11cc ; 11cc
Function11cc: ; 11cc Function11cc:: ; 11cc
push de push de
ld de, Char23Text ld de, Char23Text
jp $126a jp $126a
; 11d3 ; 11d3
Function11d3: ; 11d3 Function11d3:: ; 11d3
push de push de
ld de, $1292 ld de, $1292
jp $126a jp $126a
; 11da ; 11da
Function11da: ; 11da Function11da:: ; 11da
push de push de
ld de, Char4AText ld de, Char4AText
jp $126a jp $126a
; 11e1 ; 11e1
Function11e1: ; 11e1 Function11e1:: ; 11e1
push de push de
ld de, Char24Text ld de, Char24Text
jp $126a jp $126a
; 11e8 ; 11e8
Function11e8: ; 11e8 Function11e8:: ; 11e8
push de push de
ld de, Char37Text ld de, Char37Text
jp $126a jp $126a
; 11ef ; 11ef
Function11ef: ; 11ef Function11ef:: ; 11ef
push de push de
ld de, Char37Text ld de, Char37Text
jp $126a jp $126a
; 11f6 ; 11f6
Function11f6: ; 11f6 Function11f6:: ; 11f6
push de push de
ld de, Char37Text ld de, Char37Text
jp $126a jp $126a
; 11fd ; 11fd
Function11fd: ; 11fd Function11fd:: ; 11fd
ld a, [hBattleTurn] ld a, [hBattleTurn]
xor $1 xor $1
jr Function1205 jr Function1205
; 1203 ; 1203
Char5D: ; 1203 Char5D:: ; 1203
ld a, [hBattleTurn] ld a, [hBattleTurn]
; 1205 ; 1205
Function1205: ; 1205 Function1205:: ; 1205
push de push de
and a and a
jr nz, .asm_120e ; 0x1207 $5 jr nz, .asm_120e ; 0x1207 $5
@ -490,39 +490,39 @@ Function1205: ; 1205
jp NextChar jp NextChar
; 0x1273 ; 0x1273
Char5CText: ; 1273 Char5CText:: ; 1273
db "TM@" db "TM@"
Char5DText: ; 1276 Char5DText:: ; 1276
db "TRAINER@" db "TRAINER@"
Char5BText: ; 127e Char5BText:: ; 127e
db "PC@" db "PC@"
Char5EText: ; 1281 Char5EText:: ; 1281
db "ROCKET@" db "ROCKET@"
Char54Text: ; 1288 Char54Text:: ; 1288
db "POKé@" db "POKé@"
Char23Text: ; 128d Char23Text:: ; 128d
db "こうげき@" db "こうげき@"
Char56Text:; 1292 Char56Text::; 1292
db "……@" db "……@"
Char5AText: ; 1295 Char5AText:: ; 1295
db "Enemy @" db "Enemy @"
Char4AText: ; 129c Char4AText:: ; 129c
db $e1, $e2, "@" ; PK MN db $e1, $e2, "@" ; PK MN
Char24Text: ; 129f Char24Text:: ; 129f
db $70, $71, "@" ; PO KE db $70, $71, "@" ; PO KE
String12a2: ; 12a2 String12a2:: ; 12a2
db " @" db " @"
Char35Text: Char35Text::
Char36Text: Char36Text::
Char37Text: ; 12a4 Char37Text:: ; 12a4
db "@" db "@"
String12a5: ; 12a5 String12a5:: ; 12a5
db "@" db "@"
String12a6: ; 12a6 String12a6:: ; 12a6
db "@" db "@"
; 12a7 ; 12a7
Function12a7: ; 12a7 Function12a7:: ; 12a7
pop hl pop hl
ld bc, $0028 ld bc, $0028
add hl, bc add hl, bc
@ -530,7 +530,7 @@ Function12a7: ; 12a7
jp NextChar jp NextChar
; 12b0 ; 12b0
Function12b0: ; 12b0 Function12b0:: ; 12b0
pop hl pop hl
ld bc, $0014 ld bc, $0014
add hl, bc add hl, bc
@ -538,7 +538,7 @@ Function12b0: ; 12b0
jp NextChar jp NextChar
; 12b9 ; 12b9
Function12b9: ; 12b9 Function12b9:: ; 12b9
pop hl pop hl
push de push de
ld bc, $3b60 ld bc, $3b60
@ -581,14 +581,14 @@ Function12b9: ; 12b9
; 12ea ; 12ea
Char4F: ; 12ea Char4F:: ; 12ea
pop hl pop hl
hlcoord 1, 16 hlcoord 1, 16
push hl push hl
jp NextChar jp NextChar
; 0x12f2 ; 0x12f2
Function12f2: ; 12f2 Function12f2:: ; 12f2
push de push de
ld a, [InLinkBattle] ld a, [InLinkBattle]
cp $3 cp $3
@ -612,7 +612,7 @@ Function12f2: ; 12f2
; 131f ; 131f
Char4B: ; 131f Char4B:: ; 131f
ld a, [InLinkBattle] ld a, [InLinkBattle]
or a or a
jr nz, .asm_1328 jr nz, .asm_1328
@ -638,7 +638,7 @@ Char4B: ; 131f
; 1345 ; 1345
Char55: ; 1345 Char55:: ; 1345
push de push de
ld de, Text_1354 ld de, Text_1354
ld b, h ld b, h
@ -650,19 +650,19 @@ Char55: ; 1345
jp NextChar jp NextChar
; 1354 ; 1354
Text_1354: ; 1354 Text_1354:: ; 1354
db $4b, "@" db $4b, "@"
; 1356 ; 1356
Char5F: ; 1356 Char5F:: ; 1356
; ends a Pokédex entry ; ends a Pokédex entry
ld [hl], "." ld [hl], "."
pop hl pop hl
ret ret
; 135a ; 135a
Function135a: ; 135a Function135a:: ; 135a
ld a, [InLinkBattle] ld a, [InLinkBattle]
cp $3 cp $3
jr z, .asm_1368 jr z, .asm_1368
@ -690,14 +690,14 @@ Function135a: ; 135a
db "@" db "@"
; 1383 ; 1383
Function1383: ; 1383 Function1383:: ; 1383
ld a, $e6 ld a, $e6
ld [hli], a ld [hli], a
call PrintLetterDelay call PrintLetterDelay
jp NextChar jp NextChar
; 138c ; 138c
Function138c: ; 138c Function138c:: ; 138c
ld hl, $c5b9 ld hl, $c5b9
ld de, $c5a5 ld de, $c5a5
ld a, $3 ld a, $3
@ -726,7 +726,7 @@ Function138c: ; 138c
ret ret
; 13b6 ; 13b6
Function13b6: ; 13b6 Function13b6:: ; 13b6
push bc push bc
ld a, [hOAMUpdate] ld a, [hOAMUpdate]
push af push af
@ -739,23 +739,23 @@ Function13b6: ; 13b6
ret ret
; 13c6 ; 13c6
Function13c6: ; 13c6 Function13c6:: ; 13c6
ret ret
; 13c7 ; 13c7
Function13c7: ; 13c7 Function13c7:: ; 13c7
ld a, $ee ld a, $ee
ld [$c606], a ld [$c606], a
ret ret
; 13cd ; 13cd
Function13cd: ; 13cd Function13cd:: ; 13cd
ld a, [$c605] ld a, [$c605]
ld [$c606], a ld [$c606], a
ret ret
; 13d4 ; 13d4
Function13d4: ; 13d4 Function13d4:: ; 13d4
ld b, a ld b, a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -769,7 +769,7 @@ Function13d4: ; 13d4
ret ret
; 13e0 ; 13e0
Function13e0: ; 13e0 Function13e0:: ; 13e0
ld hl, $13e4 ld hl, $13e4
ret ret
@ -778,7 +778,7 @@ Function13e0: ; 13e0
; 13e5 ; 13e5
Function13e5: ; 13e5 Function13e5:: ; 13e5
ld a, [$cfcf] ld a, [$cfcf]
push af push af
set 1, a set 1, a
@ -789,7 +789,7 @@ Function13e5: ; 13e5
ret ret
; 13f6 ; 13f6
Function13f6: ; 13f6 Function13f6:: ; 13f6
.asm_13f6 .asm_13f6
ld a, [hli] ld a, [hli]
cp "@" cp "@"
@ -798,7 +798,7 @@ Function13f6: ; 13f6
jr .asm_13f6 jr .asm_13f6
; 13ff ; 13ff
Function13ff: ; 13ff Function13ff:: ; 13ff
push hl push hl
push bc push bc
ld c, a ld c, a
@ -817,7 +817,7 @@ Function13ff: ; 13ff
ret ret
; 1410 ; 1410
TextCommands: ; 1410 TextCommands:: ; 1410
dw Text_00 dw Text_00
dw Text_01 dw Text_01
dw Text_02 dw Text_02
@ -843,7 +843,7 @@ TextCommands: ; 1410
dw Text_16 dw Text_16
; 143e ; 143e
Text_00: ; 143e Text_00:: ; 143e
; TX ; TX
; write text until "@" ; write text until "@"
; [$00]["...@"] ; [$00]["...@"]
@ -859,7 +859,7 @@ Text_00: ; 143e
ret ret
; 1449 ; 1449
Text_01: ; 1449 Text_01:: ; 1449
; TX_RAM ; TX_RAM
; write text from a ram address ; write text from a ram address
; little endian ; little endian
@ -877,7 +877,7 @@ Text_01: ; 1449
ret ret
; 1455 ; 1455
Text_16: ; 1455 Text_16:: ; 1455
; TX_FAR ; TX_FAR
; write text from a different bank ; write text from a different bank
; little endian ; little endian
@ -907,7 +907,7 @@ Text_16: ; 1455
ret ret
; 1470 ; 1470
Text_02: ; 1470 Text_02:: ; 1470
; TX_NUM ; TX_NUM
; write bcdnumber from address, typically ram ; write bcdnumber from address, typically ram
; little endian ; little endian
@ -930,7 +930,7 @@ Text_02: ; 1470
ret ret
; 1480 ; 1480
Text_03: ; 1480 Text_03:: ; 1480
; TX_MOVE ; TX_MOVE
; move to a new tile ; move to a new tile
; little endian ; little endian
@ -945,7 +945,7 @@ Text_03: ; 1480
ret ret
; 148b ; 148b
Text_04: ; 148b Text_04:: ; 148b
; TX_BOX ; TX_BOX
; draw a box ; draw a box
; little endian ; little endian
@ -967,7 +967,7 @@ Text_04: ; 148b
ret ret
; 149b ; 149b
Text_05: ; 149b Text_05:: ; 149b
; TX_LOW ; TX_LOW
; write text at (1,16) ; write text at (1,16)
; [$05] ; [$05]
@ -997,7 +997,7 @@ Text_06:: ; 149f
ret ret
; 14ba ; 14ba
Text_07: ; 14ba Text_07:: ; 14ba
push hl push hl
call Function13cd call Function13cd
call Function138c call Function138c
@ -1007,7 +1007,7 @@ Text_07: ; 14ba
ret ret
; 14c9 ; 14c9
Text_08: ; 14c9 Text_08:: ; 14c9
; TX_ASM ; TX_ASM
; rom only? ; rom only?
@ -1021,7 +1021,7 @@ Text_08: ; 14c9
ret ret
; 14d2 ; 14d2
Text_09: ; 14d2 Text_09:: ; 14d2
ld a, [hli] ld a, [hli]
ld e, a ld e, a
ld a, [hli] ld a, [hli]
@ -1045,7 +1045,7 @@ Text_09: ; 14d2
ret ret
; 14ed ; 14ed
Text_0A: ; 14ed Text_0A:: ; 14ed
push hl push hl
push bc push bc
call GetJoypad call GetJoypad
@ -1097,7 +1097,7 @@ Text_PlaySound:: ; 1500
ret ret
; 1522 ; 1522
Function1522: ; 1522 Function1522:: ; 1522
push de push de
ld e, [hl] ld e, [hl]
inc hl inc hl
@ -1109,7 +1109,7 @@ Function1522: ; 1522
ret ret
; 152d ; 152d
TextSFX: ; 152d TextSFX:: ; 152d
dbw $0b, SFX_DEX_FANFARE_50_79 dbw $0b, SFX_DEX_FANFARE_50_79
dbw $12, SFX_FANFARE dbw $12, SFX_FANFARE
dbw $0e, SFX_DEX_FANFARE_20_49 dbw $0e, SFX_DEX_FANFARE_20_49
@ -1120,7 +1120,7 @@ TextSFX: ; 152d
db $ff ; end db $ff ; end
; 1543 ; 1543
Text_0C: ; 1543 Text_0C:: ; 1543
ld a, [hli] ld a, [hli]
ld d, a ld d, a
push hl push hl
@ -1146,7 +1146,7 @@ Text_0C: ; 1543
ret ret
; 1562 ; 1562
Text_0D: ; 1562 Text_0D:: ; 1562
; wait for key down ; wait for key down
; display arrow ; display arrow
push hl push hl
@ -1157,7 +1157,7 @@ Text_0D: ; 1562
ret ret
; 156a ; 156a
Text_14: ; 156a Text_14:: ; 156a
; TX_PREDEF ; TX_PREDEF
; [$14][id] ; [$14][id]
@ -1179,7 +1179,7 @@ Text_14: ; 156a
ret ret
; 1582 ; 1582
Text_15: ; 1582 Text_15:: ; 1582
; TX_DAY ; TX_DAY
call GetWeekday call GetWeekday

View File

@ -1,4 +1,4 @@
Function1c30: ; 0x1c30 Function1c30:: ; 0x1c30
call Function1c53 call Function1c53
inc b inc b
inc c inc c
@ -19,7 +19,7 @@ Function1c30: ; 0x1c30
jr nz, .asm_1c35 ; 0x1c44 $ef jr nz, .asm_1c35 ; 0x1c44 $ef
ret ret
Function1c47: ; 0x1c47 Function1c47:: ; 0x1c47
ld b, $10 ld b, $10
ld de, $cf81 ld de, $cf81
.asm_1c4c .asm_1c4c
@ -30,7 +30,7 @@ Function1c47: ; 0x1c47
jr nz, .asm_1c4c ; 0x1c50 $fa jr nz, .asm_1c4c ; 0x1c50 $fa
ret ret
Function1c53: ; 0x1c53 Function1c53:: ; 0x1c53
ld a, [$cf82] ld a, [$cf82]
ld b, a ld b, a
ld a, [$cf84] ld a, [$cf84]
@ -44,7 +44,7 @@ Function1c53: ; 0x1c53
ret ret
; 0x1c66 ; 0x1c66
Function1c66: ; 1c66 Function1c66:: ; 1c66
push hl push hl
push de push de
push bc push bc
@ -63,7 +63,7 @@ Function1c66: ; 1c66
ret ret
; 1c7e ; 1c7e
Function1c7e: ; 1c7e Function1c7e:: ; 1c7e
ld hl, $cf71 ld hl, $cf71
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
@ -75,7 +75,7 @@ Function1c7e: ; 1c7e
ret ret
; 1c89 ; 1c89
Function1c89: ; 1c89 Function1c89:: ; 1c89
call Function1c66 call Function1c66
ld hl, $cf86 ld hl, $cf86
ld e, [hl] ld e, [hl]
@ -108,7 +108,7 @@ Function1c89: ; 1c89
jp PlaceString jp PlaceString
; 1cbb ; 1cbb
Function1cbb: ; 1cbb Function1cbb:: ; 1cbb
call Function1cfd call Function1cfd
call Function1c53 call Function1c53
dec b dec b
@ -116,7 +116,7 @@ Function1cbb: ; 1cbb
jp TextBox jp TextBox
; 1cc6 ; 1cc6
Function1cc6: ; 1cc6 Function1cc6:: ; 1cc6
ld a, [$cf82] ld a, [$cf82]
ld b, a ld b, a
inc b inc b
@ -138,7 +138,7 @@ Function1cc6: ; 1cc6
ret ret
; 1ce1 ; 1ce1
Function1ce1: ; 1ce1 Function1ce1:: ; 1ce1
call Function1cfd call Function1cfd
ld bc, $0015 ld bc, $0015
add hl, bc add hl, bc
@ -149,7 +149,7 @@ Function1ce1: ; 1ce1
ret ret
; 1cf1 ; 1cf1
Function1cf1: ; 1cf1 Function1cf1:: ; 1cf1
call Function1cfd call Function1cfd
call Function1c53 call Function1c53
inc c inc c
@ -159,7 +159,7 @@ Function1cf1: ; 1cf1
; 1cfd ; 1cfd
Function1cfd: ; 1cfd Function1cfd:: ; 1cfd
ld a, [$cf83] ld a, [$cf83]
ld c, a ld c, a
ld a, [$cf82] ld a, [$cf82]
@ -167,7 +167,7 @@ Function1cfd: ; 1cfd
; 1d05 ; 1d05
GetTileCoord: ; 1d05 GetTileCoord:: ; 1d05
; Return the address of TileMap(c, b) in hl. ; Return the address of TileMap(c, b) in hl.
xor a xor a
ld h, a ld h, a
@ -189,13 +189,13 @@ GetTileCoord: ; 1d05
ret ret
; 1d19 ; 1d19
Function1d19: ; 1d19 Function1d19:: ; 1d19
ld a, [$cf83] ld a, [$cf83]
ld c, a ld c, a
ld a, [$cf82] ld a, [$cf82]
ld b, a ld b, a
GetAttrCoord: ; 1d21 GetAttrCoord:: ; 1d21
; Return the address of AttrMap(c, b) in hl. ; Return the address of AttrMap(c, b) in hl.
xor a xor a
ld h, a ld h, a

View File

@ -1,7 +1,7 @@
; Functions relating to the timer interrupt and the real-time-clock. ; Functions relating to the timer interrupt and the real-time-clock.
AskTimer: ; 591 AskTimer:: ; 591
push af push af
ld a, [$ffe9] ld a, [$ffe9]
and a and a
@ -14,7 +14,7 @@ AskTimer: ; 591
; 59c ; 59c
LatchClock: ; 59c LatchClock:: ; 59c
; latch clock counter data ; latch clock counter data
ld a, 0 ld a, 0
ld [MBC3LatchClock], a ld [MBC3LatchClock], a
@ -24,7 +24,7 @@ LatchClock: ; 59c
; 5a7 ; 5a7
UpdateTime: ; 5a7 UpdateTime:: ; 5a7
call GetClock call GetClock
call FixDays call FixDays
call FixTime call FixTime
@ -33,7 +33,7 @@ UpdateTime: ; 5a7
; 5b7 ; 5b7
GetClock: ; 5b7 GetClock:: ; 5b7
; store clock data in hRTCDayHi-hRTCSeconds ; store clock data in hRTCDayHi-hRTCSeconds
; enable clock r/w ; enable clock r/w
@ -75,7 +75,7 @@ GetClock: ; 5b7
; 5e8 ; 5e8
FixDays: ; 5e8 FixDays:: ; 5e8
; fix day count ; fix day count
; mod by 140 ; mod by 140
@ -137,7 +137,7 @@ FixDays: ; 5e8
; 61d ; 61d
FixTime: ; 61d FixTime:: ; 61d
; add ingame time (set at newgame) to current time ; add ingame time (set at newgame) to current time
; day hr min sec ; day hr min sec
; store time in CurDay, hHours, hMinutes, hSeconds ; store time in CurDay, hHours, hMinutes, hSeconds
@ -187,14 +187,14 @@ FixTime: ; 61d
ret ret
; 658 ; 658
Function658: ; 658 Function658:: ; 658
xor a xor a
ld [StringBuffer2], a ld [StringBuffer2], a
ld a, $0 ld a, $0
ld [$d089], a ld [$d089], a
jr Function677 jr Function677
Function663: ; 663 Function663:: ; 663
call UpdateTime call UpdateTime
ld a, [hHours] ld a, [hHours]
ld [$d087], a ld [$d087], a
@ -204,20 +204,20 @@ Function663: ; 663
ld [$d089], a ld [$d089], a
jr Function677 jr Function677
Function677: ; 677 Function677:: ; 677
callba Function140ed callba Function140ed
ret ret
; 67e ; 67e
Function67e: ; 67e Function67e:: ; 67e
call Function685 call Function685
call SetClock call SetClock
ret ret
; 685 ; 685
Function685: ; 685 Function685:: ; 685
xor a xor a
ld [hRTCSeconds], a ld [hRTCSeconds], a
ld [hRTCMinutes], a ld [hRTCMinutes], a
@ -228,7 +228,7 @@ Function685: ; 685
; 691 ; 691
SetClock: ; 691 SetClock:: ; 691
; set clock data from hram ; set clock data from hram
; enable clock r/w ; enable clock r/w
@ -277,7 +277,7 @@ SetClock: ; 691
; 6c4 ; 6c4
Function6c4: ; 6c4 Function6c4:: ; 6c4
xor a xor a
push af push af
ld a, $0 ld a, $0
@ -288,7 +288,7 @@ Function6c4: ; 6c4
ret ret
; 6d3 ; 6d3
Function6d3: ; 6d3 Function6d3:: ; 6d3
ld hl, $ac60 ld hl, $ac60
push af push af
ld a, $0 ld a, $0
@ -300,7 +300,7 @@ Function6d3: ; 6d3
ret ret
; 6e3 ; 6e3
Function6e3: ; 6e3 Function6e3:: ; 6e3
ld a, $0 ld a, $0
call GetSRAMBank call GetSRAMBank
ld a, [$ac60] ld a, [$ac60]

View File

@ -7,7 +7,7 @@
; This prevents the display and audio output from lagging. ; This prevents the display and audio output from lagging.
VBlank: ; 283 VBlank:: ; 283
push af push af
push bc push bc
push de push de
@ -52,7 +52,7 @@ VBlank: ; 283
; 2b1 ; 2b1
VBlank0: ; 2b1 VBlank0:: ; 2b1
; normal operation ; normal operation
; rng ; rng
@ -181,7 +181,7 @@ VBlank0: ; 2b1
; 325 ; 325
VBlank2: ; 325 VBlank2:: ; 325
; sound only ; sound only
; save bank ; save bank
@ -204,7 +204,7 @@ VBlank2: ; 325
; 337 ; 337
VBlank1: ; 337 VBlank1:: ; 337
; scx, scy ; scx, scy
; palettes ; palettes
; bg map ; bg map
@ -289,7 +289,7 @@ VBlank1: ; 337
; 37f ; 37f
UpdatePals: ; 37f UpdatePals:: ; 37f
; update pals for either dmg or cgb ; update pals for either dmg or cgb
; check cgb ; check cgb
@ -312,7 +312,7 @@ UpdatePals: ; 37f
; 396 ; 396
VBlank3: ; 396 VBlank3:: ; 396
; scx, scy ; scx, scy
; palettes ; palettes
; bg map ; bg map
@ -397,7 +397,7 @@ VBlank3: ; 396
; 3df ; 3df
VBlank4: ; 3df VBlank4:: ; 3df
; bg map ; bg map
; tiles ; tiles
; oam ; oam
@ -444,7 +444,7 @@ VBlank4: ; 3df
; 400 ; 400
VBlank5: ; 400 VBlank5:: ; 400
; scx ; scx
; palettes ; palettes
; bg map ; bg map
@ -504,7 +504,7 @@ VBlank5: ; 400
; 436 ; 436
VBlank6: ; 436 VBlank6:: ; 436
; palettes ; palettes
; tiles ; tiles
; dma transfer ; dma transfer

View File

@ -1,6 +1,6 @@
; Functions dealing with VRAM. ; Functions dealing with VRAM.
DMATransfer: ; 15d8 DMATransfer:: ; 15d8
; Return carry if the transfer is completed. ; Return carry if the transfer is completed.
ld a, [hDMATransfer] ld a, [hDMATransfer]
@ -19,7 +19,7 @@ DMATransfer: ; 15d8
; 15e3 ; 15e3
UpdateBGMapBuffer: ; 15e3 UpdateBGMapBuffer:: ; 15e3
; Copy [$ffdc] 16x8 tiles from BGMapBuffer ; Copy [$ffdc] 16x8 tiles from BGMapBuffer
; to bg map addresses in BGMapBufferPtrs. ; to bg map addresses in BGMapBufferPtrs.
@ -100,7 +100,7 @@ endr
; 163a ; 163a
WaitTop: ; 163a WaitTop:: ; 163a
; Wait until the top third of the BG Map is being updated. ; Wait until the top third of the BG Map is being updated.
ld a, [hBGMapMode] ld a, [hBGMapMode]
@ -121,7 +121,7 @@ WaitTop: ; 163a
; 164c ; 164c
UpdateBGMap: ; 164c UpdateBGMap:: ; 164c
; Update the BG Map, in thirds, from TileMap and AttrMap. ; Update the BG Map, in thirds, from TileMap and AttrMap.
ld a, [hBGMapMode] ld a, [hBGMapMode]
@ -282,7 +282,7 @@ endr
; 170a ; 170a
Serve1bppRequest: ; 170a Serve1bppRequest:: ; 170a
; Only call during the first fifth of VBlank ; Only call during the first fifth of VBlank
ld a, [Requested1bpp] ld a, [Requested1bpp]
@ -363,7 +363,7 @@ endr
; 1769 ; 1769
Serve2bppRequest: ; 1769 Serve2bppRequest:: ; 1769
; Only call during the first fifth of VBlank ; Only call during the first fifth of VBlank
ld a, [Requested2bpp] ld a, [Requested2bpp]
@ -379,13 +379,13 @@ Serve2bppRequest: ; 1769
jr _Serve2bppRequest jr _Serve2bppRequest
Serve2bppRequest@VBlank: ; 1778 Serve2bppRequest@VBlank:: ; 1778
ld a, [Requested2bpp] ld a, [Requested2bpp]
and a and a
ret z ret z
_Serve2bppRequest: ; 177d _Serve2bppRequest:: ; 177d
; Copy [Requested2bpp] 2bpp tiles from [Requested2bppSource] to [Requested2bppDest] ; Copy [Requested2bpp] 2bpp tiles from [Requested2bppSource] to [Requested2bppDest]
ld [hSPBuffer], sp ld [hSPBuffer], sp
@ -445,7 +445,7 @@ endr
; 17d3 ; 17d3
AnimateTileset: ; 17d3 AnimateTileset:: ; 17d3
; Only call during the first fifth of VBlank ; Only call during the first fifth of VBlank
ld a, [$ffde] ld a, [$ffde]

View File

@ -1,4 +1,4 @@
ResetWindow: ; 2dba ResetWindow:: ; 2dba
call Function1fbf call Function1fbf
ld a, [hROMBank] ld a, [hROMBank]
@ -16,7 +16,7 @@ ResetWindow: ; 2dba
; 2dcf ; 2dcf
Function2dcf: ; 2dcf Function2dcf:: ; 2dcf
ld a, [hOAMUpdate] ld a, [hOAMUpdate]
push af push af
ld a, $1 ld a, $1
@ -29,7 +29,7 @@ Function2dcf: ; 2dcf
ret ret
; 2de2 ; 2de2
Function2de2: ; 2de2 Function2de2:: ; 2de2
call Function1fbf call Function1fbf
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
@ -46,7 +46,7 @@ Function2de2: ; 2de2
ret ret
; 2e08 ; 2e08
Function2e08: ; 2e08 Function2e08:: ; 2e08
call Function1fbf call Function1fbf
ld a, [hROMBank] ld a, [hROMBank]
push af push af
@ -63,7 +63,7 @@ Function2e08: ; 2e08
ret ret
; 2e20 ; 2e20
Function2e20: ; 2e20 Function2e20:: ; 2e20
ld a, [hOAMUpdate] ld a, [hOAMUpdate]
push af push af
ld a, $1 ld a, $1
@ -74,7 +74,7 @@ Function2e20: ; 2e20
ret ret
; 2e31 ; 2e31
Function2e31: ; 2e31 Function2e31:: ; 2e31
ld a, [hOAMUpdate] ld a, [hOAMUpdate]
push af push af
ld a, [hBGMapMode] ld a, [hBGMapMode]

View File

@ -1,3 +1,2 @@
INCLUDE "globals.asm"
INCLUDE "contents.asm" INCLUDE "contents.asm"
INCLUDE "constants.asm" INCLUDE "constants.asm"

View File

@ -1,4 +1,4 @@
_DoItemEffect: ; e722 _DoItemEffect:: ; e722
ld a, [CurItem] ld a, [CurItem]
ld [$d265], a ld [$d265], a
call GetItemName call GetItemName

View File

@ -21,7 +21,7 @@ Function110029: ; 110029 (44:4029)
ret ret
; known jump sources: 3e5d (0:3e5d) ; known jump sources: 3e5d (0:3e5d)
Function110030: ; 110030 (44:4030) Function110030:: ; 110030 (44:4030)
push de push de
ld a, [$c988] ld a, [$c988]
cp $c cp $c
@ -183,7 +183,7 @@ Function111686: ; 111686 (44:5686)
INCBIN "baserom.gbc",$1116a0,$1116c5 - $1116a0 INCBIN "baserom.gbc",$1116a0,$1116c5 - $1116a0
; known jump sources: 3e89 (0:3e89) ; known jump sources: 3e89 (0:3e89)
Function1116c5: ; 1116c5 (44:56c5) Function1116c5:: ; 1116c5 (44:56c5)
ld a, [OverworldMap] ; $c800 ld a, [OverworldMap] ; $c800
rrca rrca
jp nc, Function1118bc jp nc, Function1118bc
@ -522,7 +522,7 @@ Function1118c2: ; 1118c2 (44:58c2)
ret ret
; known jump sources: 3ec1 (0:3ec1) ; known jump sources: 3ec1 (0:3ec1)
Function1118de: ; 1118de (44:58de) Function1118de:: ; 1118de (44:58de)
ld a, [$c80b] ld a, [$c80b]
cp $4 cp $4
call z, Function111b3c call z, Function111b3c

View File

@ -1,5 +1,15 @@
; rgbds macros ; rgbds macros
; macros require rst vectors to be defined
FarCall EQU $08
Bankswitch EQU $10
JumpTable EQU $28
NONE EQU 0
dwb: MACRO dwb: MACRO
dw \1 dw \1
db \2 db \2

347
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -202,7 +202,7 @@ ScientistMarcScript: ; 0x5e5eb
end end
; 0x5e5f3 ; 0x5e5f3
MapRadioTower3FSignpost2Script: ; 0x5e5f3 MapRadioTower3FSignpost2Script:: ; 0x5e5f3
loadfont loadfont
2writetext UnknownText_0x5eaa4 2writetext UnknownText_0x5eaa4
closetext closetext

View File

@ -67,7 +67,7 @@ UnknownScript_0x19404a: ; 0x19404a
; fallthrough ; fallthrough
; 0x194053 ; 0x194053
WateredWeirdTreeScript: ; 0x194053 WateredWeirdTreeScript:: ; 0x194053
loadfont loadfont
2writetext UnknownText_0x194290 2writetext UnknownText_0x194290
closetext closetext

View File

@ -468,7 +468,7 @@ UnknownScript_0x7c2cd: ; 0x7c2cd
end end
; 0x7c2d6 ; 0x7c2d6
MapWarehouseEntranceSignpost0Script: ; 0x7c2d6 MapWarehouseEntranceSignpost0Script:: ; 0x7c2d6
loadfont loadfont
checkevent EVENT_USED_BASEMENT_KEY checkevent EVENT_USED_BASEMENT_KEY
iftrue UnknownScript_0x7c2fa iftrue UnknownScript_0x7c2fa

View File

@ -1,4 +1,4 @@
MapGroupPointers: ; 0x94000 MapGroupPointers:: ; 0x94000
; pointers to the first map header of each map group ; pointers to the first map header of each map group
dw MapGroup1 dw MapGroup1
dw MapGroup2 dw MapGroup2
@ -30,7 +30,7 @@ MapGroupPointers: ; 0x94000
MapGroup1: MapGroup1:
OlivinePokeCenter1F_MapHeader: ; 0x94034 OlivinePokeCenter1F_MapHeader:: ; 0x94034
; bank, tileset, permission ; bank, tileset, permission
db BANK(OlivinePokeCenter1F_SecondMapHeader), $7, 3 db BANK(OlivinePokeCenter1F_SecondMapHeader), $7, 3
@ -43,7 +43,7 @@ OlivinePokeCenter1F_MapHeader: ; 0x94034
; had to convert 0x->$ (duh..) ; had to convert 0x->$ (duh..)
; 0x9403d ; 0x9403d
OlivineGym_MapHeader: ; 0x9403d OlivineGym_MapHeader:: ; 0x9403d
; bank, tileset, permission ; bank, tileset, permission
db BANK(OlivineGym_SecondMapHeader), $12, 3 db BANK(OlivineGym_SecondMapHeader), $12, 3

View File

@ -2974,7 +2974,7 @@ RuinsofAlphHoOhChamber_SecondMapHeader: ; 0x958c4
db 0 db 0
; 0x958d0 ; 0x958d0
RuinsofAlphKabutoChamber_SecondMapHeader: ; 0x958d0 RuinsofAlphKabutoChamber_SecondMapHeader:: ; 0x958d0
; border block ; border block
db $0 db $0
@ -3014,7 +3014,7 @@ RuinsofAlphOmanyteChamber_SecondMapHeader: ; 0x958dc
db 0 db 0
; 0x958e8 ; 0x958e8
RuinsofAlphAerodactylChamber_SecondMapHeader: ; 0x958e8 RuinsofAlphAerodactylChamber_SecondMapHeader:: ; 0x958e8
; border block ; border block
db $0 db $0

View File

@ -8,7 +8,7 @@ INCBIN "gfx/misc/mobile_adapter.2bpp"
; no known jump sources ; no known jump sources
Function17a68f: ; 17a68f (5e:668f) Function17a68f:: ; 17a68f (5e:668f)
call Function17a6a8 call Function17a6a8
call Function17a751 call Function17a751
ld hl, $d088 ld hl, $d088

View File

@ -66,7 +66,6 @@ def setup_processor():
def main(): def main():
processor = setup_processor() processor = setup_processor()
processor.preprocess() processor.preprocess()
processor.update_globals
# only run against stdin when not included as a module # only run against stdin when not included as a module
if __name__ == "__main__": if __name__ == "__main__":

View File

@ -23,8 +23,6 @@ def preprocess_queue(filenames=sys.argv[1:]):
sys.stdout = open(dest, 'w') sys.stdout = open(dest, 'w')
processor.preprocess() processor.preprocess()
processor.update_globals()
sys.stdin = stdin sys.stdin = stdin
sys.stdout = stdout sys.stdout = stdout

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
EvosAttacks: EvosAttacks::
BulbasaurEvosAttacks: BulbasaurEvosAttacks:
db EVOLVE_LEVEL,16,IVYSAUR db EVOLVE_LEVEL,16,IVYSAUR

View File

@ -2,7 +2,7 @@
; These are grouped together since they're both checked at level-up. ; These are grouped together since they're both checked at level-up.
EvosAttacksPointers: ; 0x425b1 EvosAttacksPointers:: ; 0x425b1
dw BulbasaurEvosAttacks dw BulbasaurEvosAttacks
dw IvysaurEvosAttacks dw IvysaurEvosAttacks
dw VenusaurEvosAttacks dw VenusaurEvosAttacks

View File

@ -1,24 +1,24 @@
SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1] SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1]
PokedexEntries1: PokedexEntries1::
INCLUDE "stats/pokedex/entries_1.asm" INCLUDE "stats/pokedex/entries_1.asm"
SECTION "Pokedex Entries 065-128", ROMX, BANK[POKEDEX_ENTRIES_2] SECTION "Pokedex Entries 065-128", ROMX, BANK[POKEDEX_ENTRIES_2]
PokedexEntries2: PokedexEntries2::
INCLUDE "stats/pokedex/entries_2.asm" INCLUDE "stats/pokedex/entries_2.asm"
SECTION "Pokedex Entries 129-192", ROMX, BANK[POKEDEX_ENTRIES_3] SECTION "Pokedex Entries 129-192", ROMX, BANK[POKEDEX_ENTRIES_3]
PokedexEntries3: PokedexEntries3::
INCLUDE "stats/pokedex/entries_3.asm" INCLUDE "stats/pokedex/entries_3.asm"
SECTION "Pokedex Entries 193-251", ROMX, BANK[POKEDEX_ENTRIES_4] SECTION "Pokedex Entries 193-251", ROMX, BANK[POKEDEX_ENTRIES_4]
PokedexEntries4: PokedexEntries4::
INCLUDE "stats/pokedex/entries_4.asm" INCLUDE "stats/pokedex/entries_4.asm"

View File

@ -1,64 +1,64 @@
BulbasaurPokedexEntry: INCLUDE "stats/pokedex/entries/001.asm" BulbasaurPokedexEntry:: INCLUDE "stats/pokedex/entries/001.asm"
IvysaurPokedexEntry: INCLUDE "stats/pokedex/entries/002.asm" IvysaurPokedexEntry:: INCLUDE "stats/pokedex/entries/002.asm"
VenusaurPokedexEntry: INCLUDE "stats/pokedex/entries/003.asm" VenusaurPokedexEntry:: INCLUDE "stats/pokedex/entries/003.asm"
CharmanderPokedexEntry: INCLUDE "stats/pokedex/entries/004.asm" CharmanderPokedexEntry:: INCLUDE "stats/pokedex/entries/004.asm"
CharmeleonPokedexEntry: INCLUDE "stats/pokedex/entries/005.asm" CharmeleonPokedexEntry:: INCLUDE "stats/pokedex/entries/005.asm"
CharizardPokedexEntry: INCLUDE "stats/pokedex/entries/006.asm" CharizardPokedexEntry:: INCLUDE "stats/pokedex/entries/006.asm"
SquirtlePokedexEntry: INCLUDE "stats/pokedex/entries/007.asm" SquirtlePokedexEntry:: INCLUDE "stats/pokedex/entries/007.asm"
WartortlePokedexEntry: INCLUDE "stats/pokedex/entries/008.asm" WartortlePokedexEntry:: INCLUDE "stats/pokedex/entries/008.asm"
BlastoisePokedexEntry: INCLUDE "stats/pokedex/entries/009.asm" BlastoisePokedexEntry:: INCLUDE "stats/pokedex/entries/009.asm"
CaterpiePokedexEntry: INCLUDE "stats/pokedex/entries/010.asm" CaterpiePokedexEntry:: INCLUDE "stats/pokedex/entries/010.asm"
MetapodPokedexEntry: INCLUDE "stats/pokedex/entries/011.asm" MetapodPokedexEntry:: INCLUDE "stats/pokedex/entries/011.asm"
ButterfreePokedexEntry: INCLUDE "stats/pokedex/entries/012.asm" ButterfreePokedexEntry:: INCLUDE "stats/pokedex/entries/012.asm"
WeedlePokedexEntry: INCLUDE "stats/pokedex/entries/013.asm" WeedlePokedexEntry:: INCLUDE "stats/pokedex/entries/013.asm"
KakunaPokedexEntry: INCLUDE "stats/pokedex/entries/014.asm" KakunaPokedexEntry:: INCLUDE "stats/pokedex/entries/014.asm"
BeedrillPokedexEntry: INCLUDE "stats/pokedex/entries/015.asm" BeedrillPokedexEntry:: INCLUDE "stats/pokedex/entries/015.asm"
PidgeyPokedexEntry: INCLUDE "stats/pokedex/entries/016.asm" PidgeyPokedexEntry:: INCLUDE "stats/pokedex/entries/016.asm"
PidgeottoPokedexEntry: INCLUDE "stats/pokedex/entries/017.asm" PidgeottoPokedexEntry:: INCLUDE "stats/pokedex/entries/017.asm"
PidgeotPokedexEntry: INCLUDE "stats/pokedex/entries/018.asm" PidgeotPokedexEntry:: INCLUDE "stats/pokedex/entries/018.asm"
RattataPokedexEntry: INCLUDE "stats/pokedex/entries/019.asm" RattataPokedexEntry:: INCLUDE "stats/pokedex/entries/019.asm"
RaticatePokedexEntry: INCLUDE "stats/pokedex/entries/020.asm" RaticatePokedexEntry:: INCLUDE "stats/pokedex/entries/020.asm"
SpearowPokedexEntry: INCLUDE "stats/pokedex/entries/021.asm" SpearowPokedexEntry:: INCLUDE "stats/pokedex/entries/021.asm"
FearowPokedexEntry: INCLUDE "stats/pokedex/entries/022.asm" FearowPokedexEntry:: INCLUDE "stats/pokedex/entries/022.asm"
EkansPokedexEntry: INCLUDE "stats/pokedex/entries/023.asm" EkansPokedexEntry:: INCLUDE "stats/pokedex/entries/023.asm"
ArbokPokedexEntry: INCLUDE "stats/pokedex/entries/024.asm" ArbokPokedexEntry:: INCLUDE "stats/pokedex/entries/024.asm"
PikachuPokedexEntry: INCLUDE "stats/pokedex/entries/025.asm" PikachuPokedexEntry:: INCLUDE "stats/pokedex/entries/025.asm"
RaichuPokedexEntry: INCLUDE "stats/pokedex/entries/026.asm" RaichuPokedexEntry:: INCLUDE "stats/pokedex/entries/026.asm"
SandshrewPokedexEntry: INCLUDE "stats/pokedex/entries/027.asm" SandshrewPokedexEntry:: INCLUDE "stats/pokedex/entries/027.asm"
SandslashPokedexEntry: INCLUDE "stats/pokedex/entries/028.asm" SandslashPokedexEntry:: INCLUDE "stats/pokedex/entries/028.asm"
NidoranFPokedexEntry: INCLUDE "stats/pokedex/entries/029.asm" NidoranFPokedexEntry:: INCLUDE "stats/pokedex/entries/029.asm"
NidorinaPokedexEntry: INCLUDE "stats/pokedex/entries/030.asm" NidorinaPokedexEntry:: INCLUDE "stats/pokedex/entries/030.asm"
NidoqueenPokedexEntry: INCLUDE "stats/pokedex/entries/031.asm" NidoqueenPokedexEntry:: INCLUDE "stats/pokedex/entries/031.asm"
NidoranMPokedexEntry: INCLUDE "stats/pokedex/entries/032.asm" NidoranMPokedexEntry:: INCLUDE "stats/pokedex/entries/032.asm"
NidorinoPokedexEntry: INCLUDE "stats/pokedex/entries/033.asm" NidorinoPokedexEntry:: INCLUDE "stats/pokedex/entries/033.asm"
NidokingPokedexEntry: INCLUDE "stats/pokedex/entries/034.asm" NidokingPokedexEntry:: INCLUDE "stats/pokedex/entries/034.asm"
ClefairyPokedexEntry: INCLUDE "stats/pokedex/entries/035.asm" ClefairyPokedexEntry:: INCLUDE "stats/pokedex/entries/035.asm"
ClefablePokedexEntry: INCLUDE "stats/pokedex/entries/036.asm" ClefablePokedexEntry:: INCLUDE "stats/pokedex/entries/036.asm"
VulpixPokedexEntry: INCLUDE "stats/pokedex/entries/037.asm" VulpixPokedexEntry:: INCLUDE "stats/pokedex/entries/037.asm"
NinetalesPokedexEntry: INCLUDE "stats/pokedex/entries/038.asm" NinetalesPokedexEntry:: INCLUDE "stats/pokedex/entries/038.asm"
JigglypuffPokedexEntry: INCLUDE "stats/pokedex/entries/039.asm" JigglypuffPokedexEntry:: INCLUDE "stats/pokedex/entries/039.asm"
WigglytuffPokedexEntry: INCLUDE "stats/pokedex/entries/040.asm" WigglytuffPokedexEntry:: INCLUDE "stats/pokedex/entries/040.asm"
ZubatPokedexEntry: INCLUDE "stats/pokedex/entries/041.asm" ZubatPokedexEntry:: INCLUDE "stats/pokedex/entries/041.asm"
GolbatPokedexEntry: INCLUDE "stats/pokedex/entries/042.asm" GolbatPokedexEntry:: INCLUDE "stats/pokedex/entries/042.asm"
OddishPokedexEntry: INCLUDE "stats/pokedex/entries/043.asm" OddishPokedexEntry:: INCLUDE "stats/pokedex/entries/043.asm"
GloomPokedexEntry: INCLUDE "stats/pokedex/entries/044.asm" GloomPokedexEntry:: INCLUDE "stats/pokedex/entries/044.asm"
VileplumePokedexEntry: INCLUDE "stats/pokedex/entries/045.asm" VileplumePokedexEntry:: INCLUDE "stats/pokedex/entries/045.asm"
ParasPokedexEntry: INCLUDE "stats/pokedex/entries/046.asm" ParasPokedexEntry:: INCLUDE "stats/pokedex/entries/046.asm"
ParasectPokedexEntry: INCLUDE "stats/pokedex/entries/047.asm" ParasectPokedexEntry:: INCLUDE "stats/pokedex/entries/047.asm"
VenonatPokedexEntry: INCLUDE "stats/pokedex/entries/048.asm" VenonatPokedexEntry:: INCLUDE "stats/pokedex/entries/048.asm"
VenomothPokedexEntry: INCLUDE "stats/pokedex/entries/049.asm" VenomothPokedexEntry:: INCLUDE "stats/pokedex/entries/049.asm"
DiglettPokedexEntry: INCLUDE "stats/pokedex/entries/050.asm" DiglettPokedexEntry:: INCLUDE "stats/pokedex/entries/050.asm"
DugtrioPokedexEntry: INCLUDE "stats/pokedex/entries/051.asm" DugtrioPokedexEntry:: INCLUDE "stats/pokedex/entries/051.asm"
MeowthPokedexEntry: INCLUDE "stats/pokedex/entries/052.asm" MeowthPokedexEntry:: INCLUDE "stats/pokedex/entries/052.asm"
PersianPokedexEntry: INCLUDE "stats/pokedex/entries/053.asm" PersianPokedexEntry:: INCLUDE "stats/pokedex/entries/053.asm"
PsyduckPokedexEntry: INCLUDE "stats/pokedex/entries/054.asm" PsyduckPokedexEntry:: INCLUDE "stats/pokedex/entries/054.asm"
GolduckPokedexEntry: INCLUDE "stats/pokedex/entries/055.asm" GolduckPokedexEntry:: INCLUDE "stats/pokedex/entries/055.asm"
MankeyPokedexEntry: INCLUDE "stats/pokedex/entries/056.asm" MankeyPokedexEntry:: INCLUDE "stats/pokedex/entries/056.asm"
PrimeapePokedexEntry: INCLUDE "stats/pokedex/entries/057.asm" PrimeapePokedexEntry:: INCLUDE "stats/pokedex/entries/057.asm"
GrowlithePokedexEntry: INCLUDE "stats/pokedex/entries/058.asm" GrowlithePokedexEntry:: INCLUDE "stats/pokedex/entries/058.asm"
ArcaninePokedexEntry: INCLUDE "stats/pokedex/entries/059.asm" ArcaninePokedexEntry:: INCLUDE "stats/pokedex/entries/059.asm"
PoliwagPokedexEntry: INCLUDE "stats/pokedex/entries/060.asm" PoliwagPokedexEntry:: INCLUDE "stats/pokedex/entries/060.asm"
PoliwhirlPokedexEntry: INCLUDE "stats/pokedex/entries/061.asm" PoliwhirlPokedexEntry:: INCLUDE "stats/pokedex/entries/061.asm"
PoliwrathPokedexEntry: INCLUDE "stats/pokedex/entries/062.asm" PoliwrathPokedexEntry:: INCLUDE "stats/pokedex/entries/062.asm"
AbraPokedexEntry: INCLUDE "stats/pokedex/entries/063.asm" AbraPokedexEntry:: INCLUDE "stats/pokedex/entries/063.asm"
KadabraPokedexEntry: INCLUDE "stats/pokedex/entries/064.asm" KadabraPokedexEntry:: INCLUDE "stats/pokedex/entries/064.asm"

View File

@ -1,64 +1,64 @@
AlakazamPokedexEntry: INCLUDE "stats/pokedex/entries/065.asm" AlakazamPokedexEntry:: INCLUDE "stats/pokedex/entries/065.asm"
MachopPokedexEntry: INCLUDE "stats/pokedex/entries/066.asm" MachopPokedexEntry:: INCLUDE "stats/pokedex/entries/066.asm"
MachokePokedexEntry: INCLUDE "stats/pokedex/entries/067.asm" MachokePokedexEntry:: INCLUDE "stats/pokedex/entries/067.asm"
MachampPokedexEntry: INCLUDE "stats/pokedex/entries/068.asm" MachampPokedexEntry:: INCLUDE "stats/pokedex/entries/068.asm"
BellsproutPokedexEntry: INCLUDE "stats/pokedex/entries/069.asm" BellsproutPokedexEntry:: INCLUDE "stats/pokedex/entries/069.asm"
WeepinbellPokedexEntry: INCLUDE "stats/pokedex/entries/070.asm" WeepinbellPokedexEntry:: INCLUDE "stats/pokedex/entries/070.asm"
VictreebelPokedexEntry: INCLUDE "stats/pokedex/entries/071.asm" VictreebelPokedexEntry:: INCLUDE "stats/pokedex/entries/071.asm"
TentacoolPokedexEntry: INCLUDE "stats/pokedex/entries/072.asm" TentacoolPokedexEntry:: INCLUDE "stats/pokedex/entries/072.asm"
TentacruelPokedexEntry: INCLUDE "stats/pokedex/entries/073.asm" TentacruelPokedexEntry:: INCLUDE "stats/pokedex/entries/073.asm"
GeodudePokedexEntry: INCLUDE "stats/pokedex/entries/074.asm" GeodudePokedexEntry:: INCLUDE "stats/pokedex/entries/074.asm"
GravelerPokedexEntry: INCLUDE "stats/pokedex/entries/075.asm" GravelerPokedexEntry:: INCLUDE "stats/pokedex/entries/075.asm"
GolemPokedexEntry: INCLUDE "stats/pokedex/entries/076.asm" GolemPokedexEntry:: INCLUDE "stats/pokedex/entries/076.asm"
PonytaPokedexEntry: INCLUDE "stats/pokedex/entries/077.asm" PonytaPokedexEntry:: INCLUDE "stats/pokedex/entries/077.asm"
RapidashPokedexEntry: INCLUDE "stats/pokedex/entries/078.asm" RapidashPokedexEntry:: INCLUDE "stats/pokedex/entries/078.asm"
SlowpokePokedexEntry: INCLUDE "stats/pokedex/entries/079.asm" SlowpokePokedexEntry:: INCLUDE "stats/pokedex/entries/079.asm"
SlowbroPokedexEntry: INCLUDE "stats/pokedex/entries/080.asm" SlowbroPokedexEntry:: INCLUDE "stats/pokedex/entries/080.asm"
MagnemitePokedexEntry: INCLUDE "stats/pokedex/entries/081.asm" MagnemitePokedexEntry:: INCLUDE "stats/pokedex/entries/081.asm"
MagnetonPokedexEntry: INCLUDE "stats/pokedex/entries/082.asm" MagnetonPokedexEntry:: INCLUDE "stats/pokedex/entries/082.asm"
FarfetchDPokedexEntry: INCLUDE "stats/pokedex/entries/083.asm" FarfetchDPokedexEntry:: INCLUDE "stats/pokedex/entries/083.asm"
DoduoPokedexEntry: INCLUDE "stats/pokedex/entries/084.asm" DoduoPokedexEntry:: INCLUDE "stats/pokedex/entries/084.asm"
DodrioPokedexEntry: INCLUDE "stats/pokedex/entries/085.asm" DodrioPokedexEntry:: INCLUDE "stats/pokedex/entries/085.asm"
SeelPokedexEntry: INCLUDE "stats/pokedex/entries/086.asm" SeelPokedexEntry:: INCLUDE "stats/pokedex/entries/086.asm"
DewgongPokedexEntry: INCLUDE "stats/pokedex/entries/087.asm" DewgongPokedexEntry:: INCLUDE "stats/pokedex/entries/087.asm"
GrimerPokedexEntry: INCLUDE "stats/pokedex/entries/088.asm" GrimerPokedexEntry:: INCLUDE "stats/pokedex/entries/088.asm"
MukPokedexEntry: INCLUDE "stats/pokedex/entries/089.asm" MukPokedexEntry:: INCLUDE "stats/pokedex/entries/089.asm"
ShellderPokedexEntry: INCLUDE "stats/pokedex/entries/090.asm" ShellderPokedexEntry:: INCLUDE "stats/pokedex/entries/090.asm"
CloysterPokedexEntry: INCLUDE "stats/pokedex/entries/091.asm" CloysterPokedexEntry:: INCLUDE "stats/pokedex/entries/091.asm"
GastlyPokedexEntry: INCLUDE "stats/pokedex/entries/092.asm" GastlyPokedexEntry:: INCLUDE "stats/pokedex/entries/092.asm"
HaunterPokedexEntry: INCLUDE "stats/pokedex/entries/093.asm" HaunterPokedexEntry:: INCLUDE "stats/pokedex/entries/093.asm"
GengarPokedexEntry: INCLUDE "stats/pokedex/entries/094.asm" GengarPokedexEntry:: INCLUDE "stats/pokedex/entries/094.asm"
OnixPokedexEntry: INCLUDE "stats/pokedex/entries/095.asm" OnixPokedexEntry:: INCLUDE "stats/pokedex/entries/095.asm"
DrowzeePokedexEntry: INCLUDE "stats/pokedex/entries/096.asm" DrowzeePokedexEntry:: INCLUDE "stats/pokedex/entries/096.asm"
HypnoPokedexEntry: INCLUDE "stats/pokedex/entries/097.asm" HypnoPokedexEntry:: INCLUDE "stats/pokedex/entries/097.asm"
KrabbyPokedexEntry: INCLUDE "stats/pokedex/entries/098.asm" KrabbyPokedexEntry:: INCLUDE "stats/pokedex/entries/098.asm"
KinglerPokedexEntry: INCLUDE "stats/pokedex/entries/099.asm" KinglerPokedexEntry:: INCLUDE "stats/pokedex/entries/099.asm"
VoltorbPokedexEntry: INCLUDE "stats/pokedex/entries/100.asm" VoltorbPokedexEntry:: INCLUDE "stats/pokedex/entries/100.asm"
ElectrodePokedexEntry: INCLUDE "stats/pokedex/entries/101.asm" ElectrodePokedexEntry:: INCLUDE "stats/pokedex/entries/101.asm"
ExeggcutePokedexEntry: INCLUDE "stats/pokedex/entries/102.asm" ExeggcutePokedexEntry:: INCLUDE "stats/pokedex/entries/102.asm"
ExeggutorPokedexEntry: INCLUDE "stats/pokedex/entries/103.asm" ExeggutorPokedexEntry:: INCLUDE "stats/pokedex/entries/103.asm"
CubonePokedexEntry: INCLUDE "stats/pokedex/entries/104.asm" CubonePokedexEntry:: INCLUDE "stats/pokedex/entries/104.asm"
MarowakPokedexEntry: INCLUDE "stats/pokedex/entries/105.asm" MarowakPokedexEntry:: INCLUDE "stats/pokedex/entries/105.asm"
HitmonleePokedexEntry: INCLUDE "stats/pokedex/entries/106.asm" HitmonleePokedexEntry:: INCLUDE "stats/pokedex/entries/106.asm"
HitmonchanPokedexEntry: INCLUDE "stats/pokedex/entries/107.asm" HitmonchanPokedexEntry:: INCLUDE "stats/pokedex/entries/107.asm"
LickitungPokedexEntry: INCLUDE "stats/pokedex/entries/108.asm" LickitungPokedexEntry:: INCLUDE "stats/pokedex/entries/108.asm"
KoffingPokedexEntry: INCLUDE "stats/pokedex/entries/109.asm" KoffingPokedexEntry:: INCLUDE "stats/pokedex/entries/109.asm"
WeezingPokedexEntry: INCLUDE "stats/pokedex/entries/110.asm" WeezingPokedexEntry:: INCLUDE "stats/pokedex/entries/110.asm"
RhyhornPokedexEntry: INCLUDE "stats/pokedex/entries/111.asm" RhyhornPokedexEntry:: INCLUDE "stats/pokedex/entries/111.asm"
RhydonPokedexEntry: INCLUDE "stats/pokedex/entries/112.asm" RhydonPokedexEntry:: INCLUDE "stats/pokedex/entries/112.asm"
ChanseyPokedexEntry: INCLUDE "stats/pokedex/entries/113.asm" ChanseyPokedexEntry:: INCLUDE "stats/pokedex/entries/113.asm"
TangelaPokedexEntry: INCLUDE "stats/pokedex/entries/114.asm" TangelaPokedexEntry:: INCLUDE "stats/pokedex/entries/114.asm"
KangaskhanPokedexEntry: INCLUDE "stats/pokedex/entries/115.asm" KangaskhanPokedexEntry:: INCLUDE "stats/pokedex/entries/115.asm"
HorseaPokedexEntry: INCLUDE "stats/pokedex/entries/116.asm" HorseaPokedexEntry:: INCLUDE "stats/pokedex/entries/116.asm"
SeadraPokedexEntry: INCLUDE "stats/pokedex/entries/117.asm" SeadraPokedexEntry:: INCLUDE "stats/pokedex/entries/117.asm"
GoldeenPokedexEntry: INCLUDE "stats/pokedex/entries/118.asm" GoldeenPokedexEntry:: INCLUDE "stats/pokedex/entries/118.asm"
SeakingPokedexEntry: INCLUDE "stats/pokedex/entries/119.asm" SeakingPokedexEntry:: INCLUDE "stats/pokedex/entries/119.asm"
StaryuPokedexEntry: INCLUDE "stats/pokedex/entries/120.asm" StaryuPokedexEntry:: INCLUDE "stats/pokedex/entries/120.asm"
StarmiePokedexEntry: INCLUDE "stats/pokedex/entries/121.asm" StarmiePokedexEntry:: INCLUDE "stats/pokedex/entries/121.asm"
MrMimePokedexEntry: INCLUDE "stats/pokedex/entries/122.asm" MrMimePokedexEntry:: INCLUDE "stats/pokedex/entries/122.asm"
ScytherPokedexEntry: INCLUDE "stats/pokedex/entries/123.asm" ScytherPokedexEntry:: INCLUDE "stats/pokedex/entries/123.asm"
JynxPokedexEntry: INCLUDE "stats/pokedex/entries/124.asm" JynxPokedexEntry:: INCLUDE "stats/pokedex/entries/124.asm"
ElectabuzzPokedexEntry: INCLUDE "stats/pokedex/entries/125.asm" ElectabuzzPokedexEntry:: INCLUDE "stats/pokedex/entries/125.asm"
MagmarPokedexEntry: INCLUDE "stats/pokedex/entries/126.asm" MagmarPokedexEntry:: INCLUDE "stats/pokedex/entries/126.asm"
PinsirPokedexEntry: INCLUDE "stats/pokedex/entries/127.asm" PinsirPokedexEntry:: INCLUDE "stats/pokedex/entries/127.asm"
TaurosPokedexEntry: INCLUDE "stats/pokedex/entries/128.asm" TaurosPokedexEntry:: INCLUDE "stats/pokedex/entries/128.asm"

View File

@ -1,64 +1,64 @@
MagikarpPokedexEntry: INCLUDE "stats/pokedex/entries/129.asm" MagikarpPokedexEntry:: INCLUDE "stats/pokedex/entries/129.asm"
GyaradosPokedexEntry: INCLUDE "stats/pokedex/entries/130.asm" GyaradosPokedexEntry:: INCLUDE "stats/pokedex/entries/130.asm"
LaprasPokedexEntry: INCLUDE "stats/pokedex/entries/131.asm" LaprasPokedexEntry:: INCLUDE "stats/pokedex/entries/131.asm"
DittoPokedexEntry: INCLUDE "stats/pokedex/entries/132.asm" DittoPokedexEntry:: INCLUDE "stats/pokedex/entries/132.asm"
EeveePokedexEntry: INCLUDE "stats/pokedex/entries/133.asm" EeveePokedexEntry:: INCLUDE "stats/pokedex/entries/133.asm"
VaporeonPokedexEntry: INCLUDE "stats/pokedex/entries/134.asm" VaporeonPokedexEntry:: INCLUDE "stats/pokedex/entries/134.asm"
JolteonPokedexEntry: INCLUDE "stats/pokedex/entries/135.asm" JolteonPokedexEntry:: INCLUDE "stats/pokedex/entries/135.asm"
FlareonPokedexEntry: INCLUDE "stats/pokedex/entries/136.asm" FlareonPokedexEntry:: INCLUDE "stats/pokedex/entries/136.asm"
PorygonPokedexEntry: INCLUDE "stats/pokedex/entries/137.asm" PorygonPokedexEntry:: INCLUDE "stats/pokedex/entries/137.asm"
OmanytePokedexEntry: INCLUDE "stats/pokedex/entries/138.asm" OmanytePokedexEntry:: INCLUDE "stats/pokedex/entries/138.asm"
OmastarPokedexEntry: INCLUDE "stats/pokedex/entries/139.asm" OmastarPokedexEntry:: INCLUDE "stats/pokedex/entries/139.asm"
KabutoPokedexEntry: INCLUDE "stats/pokedex/entries/140.asm" KabutoPokedexEntry:: INCLUDE "stats/pokedex/entries/140.asm"
KabutopsPokedexEntry: INCLUDE "stats/pokedex/entries/141.asm" KabutopsPokedexEntry:: INCLUDE "stats/pokedex/entries/141.asm"
AerodactylPokedexEntry: INCLUDE "stats/pokedex/entries/142.asm" AerodactylPokedexEntry:: INCLUDE "stats/pokedex/entries/142.asm"
SnorlaxPokedexEntry: INCLUDE "stats/pokedex/entries/143.asm" SnorlaxPokedexEntry:: INCLUDE "stats/pokedex/entries/143.asm"
ArticunoPokedexEntry: INCLUDE "stats/pokedex/entries/144.asm" ArticunoPokedexEntry:: INCLUDE "stats/pokedex/entries/144.asm"
ZapdosPokedexEntry: INCLUDE "stats/pokedex/entries/145.asm" ZapdosPokedexEntry:: INCLUDE "stats/pokedex/entries/145.asm"
MoltresPokedexEntry: INCLUDE "stats/pokedex/entries/146.asm" MoltresPokedexEntry:: INCLUDE "stats/pokedex/entries/146.asm"
DratiniPokedexEntry: INCLUDE "stats/pokedex/entries/147.asm" DratiniPokedexEntry:: INCLUDE "stats/pokedex/entries/147.asm"
DragonairPokedexEntry: INCLUDE "stats/pokedex/entries/148.asm" DragonairPokedexEntry:: INCLUDE "stats/pokedex/entries/148.asm"
DragonitePokedexEntry: INCLUDE "stats/pokedex/entries/149.asm" DragonitePokedexEntry:: INCLUDE "stats/pokedex/entries/149.asm"
MewtwoPokedexEntry: INCLUDE "stats/pokedex/entries/150.asm" MewtwoPokedexEntry:: INCLUDE "stats/pokedex/entries/150.asm"
MewPokedexEntry: INCLUDE "stats/pokedex/entries/151.asm" MewPokedexEntry:: INCLUDE "stats/pokedex/entries/151.asm"
ChikoritaPokedexEntry: INCLUDE "stats/pokedex/entries/152.asm" ChikoritaPokedexEntry:: INCLUDE "stats/pokedex/entries/152.asm"
BayleefPokedexEntry: INCLUDE "stats/pokedex/entries/153.asm" BayleefPokedexEntry:: INCLUDE "stats/pokedex/entries/153.asm"
MeganiumPokedexEntry: INCLUDE "stats/pokedex/entries/154.asm" MeganiumPokedexEntry:: INCLUDE "stats/pokedex/entries/154.asm"
CyndaquilPokedexEntry: INCLUDE "stats/pokedex/entries/155.asm" CyndaquilPokedexEntry:: INCLUDE "stats/pokedex/entries/155.asm"
QuilavaPokedexEntry: INCLUDE "stats/pokedex/entries/156.asm" QuilavaPokedexEntry:: INCLUDE "stats/pokedex/entries/156.asm"
TyphlosionPokedexEntry: INCLUDE "stats/pokedex/entries/157.asm" TyphlosionPokedexEntry:: INCLUDE "stats/pokedex/entries/157.asm"
TotodilePokedexEntry: INCLUDE "stats/pokedex/entries/158.asm" TotodilePokedexEntry:: INCLUDE "stats/pokedex/entries/158.asm"
CroconawPokedexEntry: INCLUDE "stats/pokedex/entries/159.asm" CroconawPokedexEntry:: INCLUDE "stats/pokedex/entries/159.asm"
FeraligatrPokedexEntry: INCLUDE "stats/pokedex/entries/160.asm" FeraligatrPokedexEntry:: INCLUDE "stats/pokedex/entries/160.asm"
SentretPokedexEntry: INCLUDE "stats/pokedex/entries/161.asm" SentretPokedexEntry:: INCLUDE "stats/pokedex/entries/161.asm"
FurretPokedexEntry: INCLUDE "stats/pokedex/entries/162.asm" FurretPokedexEntry:: INCLUDE "stats/pokedex/entries/162.asm"
HoothootPokedexEntry: INCLUDE "stats/pokedex/entries/163.asm" HoothootPokedexEntry:: INCLUDE "stats/pokedex/entries/163.asm"
NoctowlPokedexEntry: INCLUDE "stats/pokedex/entries/164.asm" NoctowlPokedexEntry:: INCLUDE "stats/pokedex/entries/164.asm"
LedybaPokedexEntry: INCLUDE "stats/pokedex/entries/165.asm" LedybaPokedexEntry:: INCLUDE "stats/pokedex/entries/165.asm"
LedianPokedexEntry: INCLUDE "stats/pokedex/entries/166.asm" LedianPokedexEntry:: INCLUDE "stats/pokedex/entries/166.asm"
SpinarakPokedexEntry: INCLUDE "stats/pokedex/entries/167.asm" SpinarakPokedexEntry:: INCLUDE "stats/pokedex/entries/167.asm"
AriadosPokedexEntry: INCLUDE "stats/pokedex/entries/168.asm" AriadosPokedexEntry:: INCLUDE "stats/pokedex/entries/168.asm"
CrobatPokedexEntry: INCLUDE "stats/pokedex/entries/169.asm" CrobatPokedexEntry:: INCLUDE "stats/pokedex/entries/169.asm"
ChinchouPokedexEntry: INCLUDE "stats/pokedex/entries/170.asm" ChinchouPokedexEntry:: INCLUDE "stats/pokedex/entries/170.asm"
LanturnPokedexEntry: INCLUDE "stats/pokedex/entries/171.asm" LanturnPokedexEntry:: INCLUDE "stats/pokedex/entries/171.asm"
PichuPokedexEntry: INCLUDE "stats/pokedex/entries/172.asm" PichuPokedexEntry:: INCLUDE "stats/pokedex/entries/172.asm"
CleffaPokedexEntry: INCLUDE "stats/pokedex/entries/173.asm" CleffaPokedexEntry:: INCLUDE "stats/pokedex/entries/173.asm"
IgglybuffPokedexEntry: INCLUDE "stats/pokedex/entries/174.asm" IgglybuffPokedexEntry:: INCLUDE "stats/pokedex/entries/174.asm"
TogepiPokedexEntry: INCLUDE "stats/pokedex/entries/175.asm" TogepiPokedexEntry:: INCLUDE "stats/pokedex/entries/175.asm"
TogeticPokedexEntry: INCLUDE "stats/pokedex/entries/176.asm" TogeticPokedexEntry:: INCLUDE "stats/pokedex/entries/176.asm"
NatuPokedexEntry: INCLUDE "stats/pokedex/entries/177.asm" NatuPokedexEntry:: INCLUDE "stats/pokedex/entries/177.asm"
XatuPokedexEntry: INCLUDE "stats/pokedex/entries/178.asm" XatuPokedexEntry:: INCLUDE "stats/pokedex/entries/178.asm"
MareepPokedexEntry: INCLUDE "stats/pokedex/entries/179.asm" MareepPokedexEntry:: INCLUDE "stats/pokedex/entries/179.asm"
FlaaffyPokedexEntry: INCLUDE "stats/pokedex/entries/180.asm" FlaaffyPokedexEntry:: INCLUDE "stats/pokedex/entries/180.asm"
AmpharosPokedexEntry: INCLUDE "stats/pokedex/entries/181.asm" AmpharosPokedexEntry:: INCLUDE "stats/pokedex/entries/181.asm"
BellossomPokedexEntry: INCLUDE "stats/pokedex/entries/182.asm" BellossomPokedexEntry:: INCLUDE "stats/pokedex/entries/182.asm"
MarillPokedexEntry: INCLUDE "stats/pokedex/entries/183.asm" MarillPokedexEntry:: INCLUDE "stats/pokedex/entries/183.asm"
AzumarillPokedexEntry: INCLUDE "stats/pokedex/entries/184.asm" AzumarillPokedexEntry:: INCLUDE "stats/pokedex/entries/184.asm"
SudowoodoPokedexEntry: INCLUDE "stats/pokedex/entries/185.asm" SudowoodoPokedexEntry:: INCLUDE "stats/pokedex/entries/185.asm"
PolitoedPokedexEntry: INCLUDE "stats/pokedex/entries/186.asm" PolitoedPokedexEntry:: INCLUDE "stats/pokedex/entries/186.asm"
HoppipPokedexEntry: INCLUDE "stats/pokedex/entries/187.asm" HoppipPokedexEntry:: INCLUDE "stats/pokedex/entries/187.asm"
SkiploomPokedexEntry: INCLUDE "stats/pokedex/entries/188.asm" SkiploomPokedexEntry:: INCLUDE "stats/pokedex/entries/188.asm"
JumpluffPokedexEntry: INCLUDE "stats/pokedex/entries/189.asm" JumpluffPokedexEntry:: INCLUDE "stats/pokedex/entries/189.asm"
AipomPokedexEntry: INCLUDE "stats/pokedex/entries/190.asm" AipomPokedexEntry:: INCLUDE "stats/pokedex/entries/190.asm"
SunkernPokedexEntry: INCLUDE "stats/pokedex/entries/191.asm" SunkernPokedexEntry:: INCLUDE "stats/pokedex/entries/191.asm"
SunfloraPokedexEntry: INCLUDE "stats/pokedex/entries/192.asm" SunfloraPokedexEntry:: INCLUDE "stats/pokedex/entries/192.asm"

View File

@ -1,59 +1,59 @@
YanmaPokedexEntry: INCLUDE "stats/pokedex/entries/193.asm" YanmaPokedexEntry:: INCLUDE "stats/pokedex/entries/193.asm"
WooperPokedexEntry: INCLUDE "stats/pokedex/entries/194.asm" WooperPokedexEntry:: INCLUDE "stats/pokedex/entries/194.asm"
QuagsirePokedexEntry: INCLUDE "stats/pokedex/entries/195.asm" QuagsirePokedexEntry:: INCLUDE "stats/pokedex/entries/195.asm"
EspeonPokedexEntry: INCLUDE "stats/pokedex/entries/196.asm" EspeonPokedexEntry:: INCLUDE "stats/pokedex/entries/196.asm"
UmbreonPokedexEntry: INCLUDE "stats/pokedex/entries/197.asm" UmbreonPokedexEntry:: INCLUDE "stats/pokedex/entries/197.asm"
MurkrowPokedexEntry: INCLUDE "stats/pokedex/entries/198.asm" MurkrowPokedexEntry:: INCLUDE "stats/pokedex/entries/198.asm"
SlowkingPokedexEntry: INCLUDE "stats/pokedex/entries/199.asm" SlowkingPokedexEntry:: INCLUDE "stats/pokedex/entries/199.asm"
MisdreavusPokedexEntry: INCLUDE "stats/pokedex/entries/200.asm" MisdreavusPokedexEntry:: INCLUDE "stats/pokedex/entries/200.asm"
UnownPokedexEntry: INCLUDE "stats/pokedex/entries/201.asm" UnownPokedexEntry:: INCLUDE "stats/pokedex/entries/201.asm"
WobbuffetPokedexEntry: INCLUDE "stats/pokedex/entries/202.asm" WobbuffetPokedexEntry:: INCLUDE "stats/pokedex/entries/202.asm"
GirafarigPokedexEntry: INCLUDE "stats/pokedex/entries/203.asm" GirafarigPokedexEntry:: INCLUDE "stats/pokedex/entries/203.asm"
PinecoPokedexEntry: INCLUDE "stats/pokedex/entries/204.asm" PinecoPokedexEntry:: INCLUDE "stats/pokedex/entries/204.asm"
ForretressPokedexEntry: INCLUDE "stats/pokedex/entries/205.asm" ForretressPokedexEntry:: INCLUDE "stats/pokedex/entries/205.asm"
DunsparcePokedexEntry: INCLUDE "stats/pokedex/entries/206.asm" DunsparcePokedexEntry:: INCLUDE "stats/pokedex/entries/206.asm"
GligarPokedexEntry: INCLUDE "stats/pokedex/entries/207.asm" GligarPokedexEntry:: INCLUDE "stats/pokedex/entries/207.asm"
SteelixPokedexEntry: INCLUDE "stats/pokedex/entries/208.asm" SteelixPokedexEntry:: INCLUDE "stats/pokedex/entries/208.asm"
SnubbullPokedexEntry: INCLUDE "stats/pokedex/entries/209.asm" SnubbullPokedexEntry:: INCLUDE "stats/pokedex/entries/209.asm"
GranbullPokedexEntry: INCLUDE "stats/pokedex/entries/210.asm" GranbullPokedexEntry:: INCLUDE "stats/pokedex/entries/210.asm"
QwilfishPokedexEntry: INCLUDE "stats/pokedex/entries/211.asm" QwilfishPokedexEntry:: INCLUDE "stats/pokedex/entries/211.asm"
ScizorPokedexEntry: INCLUDE "stats/pokedex/entries/212.asm" ScizorPokedexEntry:: INCLUDE "stats/pokedex/entries/212.asm"
ShucklePokedexEntry: INCLUDE "stats/pokedex/entries/213.asm" ShucklePokedexEntry:: INCLUDE "stats/pokedex/entries/213.asm"
HeracrossPokedexEntry: INCLUDE "stats/pokedex/entries/214.asm" HeracrossPokedexEntry:: INCLUDE "stats/pokedex/entries/214.asm"
SneaselPokedexEntry: INCLUDE "stats/pokedex/entries/215.asm" SneaselPokedexEntry:: INCLUDE "stats/pokedex/entries/215.asm"
TeddiursaPokedexEntry: INCLUDE "stats/pokedex/entries/216.asm" TeddiursaPokedexEntry:: INCLUDE "stats/pokedex/entries/216.asm"
UrsaringPokedexEntry: INCLUDE "stats/pokedex/entries/217.asm" UrsaringPokedexEntry:: INCLUDE "stats/pokedex/entries/217.asm"
SlugmaPokedexEntry: INCLUDE "stats/pokedex/entries/218.asm" SlugmaPokedexEntry:: INCLUDE "stats/pokedex/entries/218.asm"
MagcargoPokedexEntry: INCLUDE "stats/pokedex/entries/219.asm" MagcargoPokedexEntry:: INCLUDE "stats/pokedex/entries/219.asm"
SwinubPokedexEntry: INCLUDE "stats/pokedex/entries/220.asm" SwinubPokedexEntry:: INCLUDE "stats/pokedex/entries/220.asm"
PiloswinePokedexEntry: INCLUDE "stats/pokedex/entries/221.asm" PiloswinePokedexEntry:: INCLUDE "stats/pokedex/entries/221.asm"
CorsolaPokedexEntry: INCLUDE "stats/pokedex/entries/222.asm" CorsolaPokedexEntry:: INCLUDE "stats/pokedex/entries/222.asm"
RemoraidPokedexEntry: INCLUDE "stats/pokedex/entries/223.asm" RemoraidPokedexEntry:: INCLUDE "stats/pokedex/entries/223.asm"
OctilleryPokedexEntry: INCLUDE "stats/pokedex/entries/224.asm" OctilleryPokedexEntry:: INCLUDE "stats/pokedex/entries/224.asm"
DelibirdPokedexEntry: INCLUDE "stats/pokedex/entries/225.asm" DelibirdPokedexEntry:: INCLUDE "stats/pokedex/entries/225.asm"
MantinePokedexEntry: INCLUDE "stats/pokedex/entries/226.asm" MantinePokedexEntry:: INCLUDE "stats/pokedex/entries/226.asm"
SkarmoryPokedexEntry: INCLUDE "stats/pokedex/entries/227.asm" SkarmoryPokedexEntry:: INCLUDE "stats/pokedex/entries/227.asm"
HoundourPokedexEntry: INCLUDE "stats/pokedex/entries/228.asm" HoundourPokedexEntry:: INCLUDE "stats/pokedex/entries/228.asm"
HoundoomPokedexEntry: INCLUDE "stats/pokedex/entries/229.asm" HoundoomPokedexEntry:: INCLUDE "stats/pokedex/entries/229.asm"
KingdraPokedexEntry: INCLUDE "stats/pokedex/entries/230.asm" KingdraPokedexEntry:: INCLUDE "stats/pokedex/entries/230.asm"
PhanpyPokedexEntry: INCLUDE "stats/pokedex/entries/231.asm" PhanpyPokedexEntry:: INCLUDE "stats/pokedex/entries/231.asm"
DonphanPokedexEntry: INCLUDE "stats/pokedex/entries/232.asm" DonphanPokedexEntry:: INCLUDE "stats/pokedex/entries/232.asm"
Porygon2PokedexEntry: INCLUDE "stats/pokedex/entries/233.asm" Porygon2PokedexEntry:: INCLUDE "stats/pokedex/entries/233.asm"
StantlerPokedexEntry: INCLUDE "stats/pokedex/entries/234.asm" StantlerPokedexEntry:: INCLUDE "stats/pokedex/entries/234.asm"
SmearglePokedexEntry: INCLUDE "stats/pokedex/entries/235.asm" SmearglePokedexEntry:: INCLUDE "stats/pokedex/entries/235.asm"
TyroguePokedexEntry: INCLUDE "stats/pokedex/entries/236.asm" TyroguePokedexEntry:: INCLUDE "stats/pokedex/entries/236.asm"
HitmontopPokedexEntry: INCLUDE "stats/pokedex/entries/237.asm" HitmontopPokedexEntry:: INCLUDE "stats/pokedex/entries/237.asm"
SmoochumPokedexEntry: INCLUDE "stats/pokedex/entries/238.asm" SmoochumPokedexEntry:: INCLUDE "stats/pokedex/entries/238.asm"
ElekidPokedexEntry: INCLUDE "stats/pokedex/entries/239.asm" ElekidPokedexEntry:: INCLUDE "stats/pokedex/entries/239.asm"
MagbyPokedexEntry: INCLUDE "stats/pokedex/entries/240.asm" MagbyPokedexEntry:: INCLUDE "stats/pokedex/entries/240.asm"
MiltankPokedexEntry: INCLUDE "stats/pokedex/entries/241.asm" MiltankPokedexEntry:: INCLUDE "stats/pokedex/entries/241.asm"
BlisseyPokedexEntry: INCLUDE "stats/pokedex/entries/242.asm" BlisseyPokedexEntry:: INCLUDE "stats/pokedex/entries/242.asm"
RaikouPokedexEntry: INCLUDE "stats/pokedex/entries/243.asm" RaikouPokedexEntry:: INCLUDE "stats/pokedex/entries/243.asm"
EnteiPokedexEntry: INCLUDE "stats/pokedex/entries/244.asm" EnteiPokedexEntry:: INCLUDE "stats/pokedex/entries/244.asm"
SuicunePokedexEntry: INCLUDE "stats/pokedex/entries/245.asm" SuicunePokedexEntry:: INCLUDE "stats/pokedex/entries/245.asm"
LarvitarPokedexEntry: INCLUDE "stats/pokedex/entries/246.asm" LarvitarPokedexEntry:: INCLUDE "stats/pokedex/entries/246.asm"
PupitarPokedexEntry: INCLUDE "stats/pokedex/entries/247.asm" PupitarPokedexEntry:: INCLUDE "stats/pokedex/entries/247.asm"
TyranitarPokedexEntry: INCLUDE "stats/pokedex/entries/248.asm" TyranitarPokedexEntry:: INCLUDE "stats/pokedex/entries/248.asm"
LugiaPokedexEntry: INCLUDE "stats/pokedex/entries/249.asm" LugiaPokedexEntry:: INCLUDE "stats/pokedex/entries/249.asm"
HoOhPokedexEntry: INCLUDE "stats/pokedex/entries/250.asm" HoOhPokedexEntry:: INCLUDE "stats/pokedex/entries/250.asm"
CelebiPokedexEntry: INCLUDE "stats/pokedex/entries/251.asm" CelebiPokedexEntry:: INCLUDE "stats/pokedex/entries/251.asm"

View File

@ -33,7 +33,7 @@ WildPokemonAppearedText2: ; 0x80793
db "appeared!", $58 db "appeared!", $58
; 0x807a9 ; 0x807a9
WantsToBattleText: ; 0x807a9 WantsToBattleText:: ; 0x807a9
db $0, $3f, $4f db $0, $3f, $4f
db "wants to battle!", $58 db "wants to battle!", $58
; 0x807bd ; 0x807bd
@ -745,7 +745,7 @@ WontDropAnymoreText: ; 0x8128f
db "drop anymore!", $58 db "drop anymore!", $58
; 0x812ac ; 0x812ac
FledFromBattleText: ; 0x812ac FledFromBattleText:: ; 0x812ac
db $0, $5a, $4f db $0, $5a, $4f
db "fled from battle!", $58 db "fled from battle!", $58
; 0x812c1 ; 0x812c1

View File

@ -222,26 +222,26 @@ UnknownText_0x1c46dc: ; 0x1c46dc
db $0, "Corrupted event!", $58 db $0, "Corrupted event!", $58
; 0x1c46ee ; 0x1c46ee
_ObjectEventText: ; 0x1c46ee _ObjectEventText:: ; 0x1c46ee
db $0, "Object event", $57 db $0, "Object event", $57
; 0x1c46fc ; 0x1c46fc
UnknownText_0x1c46fc: ; 0x1c46fc UnknownText_0x1c46fc:: ; 0x1c46fc
db $0, "BG event", $57 db $0, "BG event", $57
; 0x1c4706 ; 0x1c4706
UnknownText_0x1c4706: ; 0x1c4706 UnknownText_0x1c4706:: ; 0x1c4706
db $0, "Coordinates event", $57 db $0, "Coordinates event", $57
; 0x1c4719 ; 0x1c4719
UnknownText_0x1c4719: ; 0x1c4719 UnknownText_0x1c4719:: ; 0x1c4719
db $0, $52, " received", $4f db $0, $52, " received", $4f
db "@" db "@"
text_from_ram $d0ac text_from_ram $d0ac
db $0, ".", $57 db $0, ".", $57
; 0x1c472c ; 0x1c472c
UnknownText_0x1c472c: ; 0x1c472c UnknownText_0x1c472c:: ; 0x1c472c
db $0, $52, " put the", $4f db $0, $52, " put the", $4f
db "@" db "@"
text_from_ram $d073 text_from_ram $d073
@ -251,7 +251,7 @@ UnknownText_0x1c472c: ; 0x1c472c
db $0, ".", $58 db $0, ".", $58
; 0x1c474b ; 0x1c474b
UnknownText_0x1c474b: ; 0x1c474b UnknownText_0x1c474b:: ; 0x1c474b
db $0, "The @" db $0, "The @"
text_from_ram $d099 text_from_ram $d099
db $0, $4f db $0, $4f

View File

@ -1,5 +1,5 @@
_AnimateTileset: ; fc000 _AnimateTileset:: ; fc000
; Iterate over a given pointer array of ; Iterate over a given pointer array of
; animation functions (one per frame). ; animation functions (one per frame).

View File

@ -1,5 +1,5 @@
LoadMapGroupRoof: ; 1c000 LoadMapGroupRoof:: ; 1c000
ld a, [MapGroup] ld a, [MapGroup]
ld e, a ld e, a
ld d, 0 ld d, 0

View File

@ -1,4 +1,4 @@
Tileset00: ; 0x4d596 Tileset00:: ; 0x4d596
dbw BANK(Tileset00GFX), Tileset00GFX dbw BANK(Tileset00GFX), Tileset00GFX
dbw BANK(Tileset00Meta), Tileset00Meta dbw BANK(Tileset00Meta), Tileset00Meta
dbw BANK(Tileset00Coll), Tileset00Coll dbw BANK(Tileset00Coll), Tileset00Coll
@ -6,7 +6,7 @@ Tileset00: ; 0x4d596
dw $0000 dw $0000
dw Tileset00PalMap dw Tileset00PalMap
Tileset01: ; 0x4d5a5 Tileset01:: ; 0x4d5a5
dbw BANK(Tileset01GFX), Tileset01GFX dbw BANK(Tileset01GFX), Tileset01GFX
dbw BANK(Tileset01Meta), Tileset01Meta dbw BANK(Tileset01Meta), Tileset01Meta
dbw BANK(Tileset01Coll), Tileset01Coll dbw BANK(Tileset01Coll), Tileset01Coll

1678
wram.asm

File diff suppressed because it is too large Load Diff