summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm415
1 files changed, 266 insertions, 149 deletions
diff --git a/main.asm b/main.asm
index 43834a825..76b6f7c00 100644
--- a/main.asm
+++ b/main.asm
@@ -8314,7 +8314,7 @@ Functiond906: ; d906
FillPP: ; da6d
push bc
- ld b, $4
+ ld b, NUM_MOVES
.asm_da70
ld a, [hli]
and a
@@ -8332,7 +8332,7 @@ FillPP: ; da6d
pop bc
pop de
pop hl
- ld a, [StringBuffer1 + 5]
+ ld a, [StringBuffer1 + MOVE_PP]
.asm_da8f
ld [de], a
@@ -13218,7 +13218,7 @@ StartMenu:: ; 125cd
call .AppendMenuList
.no_pack
- ld hl, wd957
+ ld hl, wPokegearFlags
bit 7, [hl]
jr z, .no_pokegear
ld a, 7 ; pokegear
@@ -15456,7 +15456,7 @@ Function1365b:: ; 1365b
call IsInArray
jr nc, .asm_1367f
- ld a, $c ; jumpstd
+ ld a, jumpstd_command
ld [wd03f], a
inc hl
ld a, [hli]
@@ -16111,13 +16111,14 @@ Function13a47: ; 13a47
ld a, [hl]
and a
ret z
- cp 6 + 1
+
+ cp PARTY_LENGTH + 1
jr c, .asm_13a54
- ld a, 6
+ ld a, PARTY_LENGTH
ld [hl], a
-
.asm_13a54
inc hl
+
ld b, a
ld c, 0
.asm_13a58
@@ -16146,6 +16147,7 @@ Function13a47: ; 13a47
dec b
jr nz, .asm_13a58
ld [hl], $ff
+
ld hl, PartyMon1
ld a, [PartyCount]
ld d, a
@@ -16158,7 +16160,7 @@ Function13a47: ; 13a47
ld a, [hl]
and a
jr z, .asm_13a8f
- cp $fc
+ cp NUM_POKEMON + 1
jr c, .asm_13a9c
.asm_13a8f
@@ -16177,8 +16179,8 @@ Function13a47: ; 13a47
ld hl, PartyMon1Level - PartyMon1
add hl, bc
ld a, [hl]
- cp 2
- ld a, 2
+ cp MIN_LEVEL
+ ld a, MIN_LEVEL
jr c, .asm_13ab4
ld a, [hl]
cp MAX_LEVEL
@@ -16193,7 +16195,7 @@ Function13a47: ; 13a47
add hl, bc
ld d, h
ld e, l
- ld hl, $000a
+ ld hl, PartyMon1Exp + 2 - PartyMon1
add hl, bc
ld b, $1
predef Functione167
@@ -16204,6 +16206,7 @@ Function13a47: ; 13a47
inc e
dec d
jr nz, .asm_13a83
+
ld de, PartyMonNicknames
ld a, [PartyCount]
ld b, a
@@ -16216,6 +16219,7 @@ Function13a47: ; 13a47
pop hl
pop bc
jr nc, .asm_13b0e
+
push bc
push hl
ld hl, PartySpecies
@@ -16230,10 +16234,9 @@ Function13a47: ; 13a47
ld [wd265], a
call GetPokemonName
ld hl, StringBuffer1
-
.asm_13b06
pop de
- ld bc, $000b
+ ld bc, PKMN_NAME_LENGTH
call CopyBytes
pop bc
@@ -16241,6 +16244,7 @@ Function13a47: ; 13a47
inc c
dec b
jr nz, .asm_13adc
+
ld de, PartyMonOT
ld a, [PartyCount]
ld b, a
@@ -16257,7 +16261,6 @@ Function13a47: ; 13a47
ld hl, PlayerName
ld bc, $000b
call CopyBytes
-
.asm_13b34
pop bc
inc c
@@ -16273,9 +16276,8 @@ Function13a47: ; 13a47
ld a, [hl]
and a
jr z, .asm_13b4b
- cp $fc
+ cp NUM_ATTACKS + 1
jr c, .asm_13b4d
-
.asm_13b4b
ld [hl], POUND
@@ -22405,7 +22407,7 @@ Function16949: ; 16949
call YesNoBox
jr c, .asm_1697c
ld a, [PartyCount]
- cp $6
+ cp PARTY_LENGTH
jr nc, .asm_16987
call Function169ac
ld hl, wDaycareMan
@@ -22472,7 +22474,7 @@ Function169ac: ; 169ac
ld [CurPartyLevel], a
ld hl, PartyCount
ld a, [hl]
- cp $6
+ cp PARTY_LENGTH
jr nc, .asm_16a2f
inc a
ld [hl], a
@@ -22487,7 +22489,7 @@ Function169ac: ; 169ac
ld a, $ff
ld [hl], a
ld hl, PartyMonNicknames
- ld bc, $000b
+ ld bc, PKMN_NAME_LENGTH
call Function16a31
ld hl, wEggNick
call CopyBytes
@@ -22510,10 +22512,10 @@ Function169ac: ; 169ac
call AddNTimes
ld b, h
ld c, l
- ld hl, $0007
+ ld hl, PartyMon1ID + 1 - PartyMon1
add hl, bc
push hl
- ld hl, $0024
+ ld hl, PartyMon1MaxHP - PartyMon1
add hl, bc
ld d, h
ld e, l
@@ -22522,7 +22524,7 @@ Function169ac: ; 169ac
ld b, $0
predef Functione167
pop bc
- ld hl, $0022
+ ld hl, PartyMon1HP - PartyMon1
add hl, bc
xor a
ld [hli], a
@@ -22610,21 +22612,22 @@ Function16a66: ; 16a66
ld [CurPartySpecies], a
callab GetPreEvolution
callab GetPreEvolution
- ld a, $5
+ ld a, EGG_LEVEL
ld [CurPartyLevel], a
+
ld a, [CurPartySpecies]
- cp $1d
+ cp NIDORAN_F
jr nz, .asm_16ae8
call Random
cp $80
- ld a, $1d
+ ld a, NIDORAN_F
jr c, .asm_16ae8
- ld a, $20
-
+ ld a, NIDORAN_M
.asm_16ae8
ld [CurPartySpecies], a
ld [CurSpecies], a
ld [wEggMonSpecies], a
+
call GetBaseData
ld hl, wEggNick
ld de, String_16be0
@@ -23107,7 +23110,6 @@ Function16e1d: ; 16e1d
ld c, $fe
jr z, .asm_16e9f
ld c, $80
-
.asm_16e9f
ld a, [wBreedMon1ID]
ld b, a
@@ -23261,25 +23263,30 @@ Function16f7a: ; 16f7a (5:6f7a)
and a
jp nz, Function1707d
ld [hl], $78
+
push de
+
callba Function4dbb8
callba Function10608d
ld a, [CurPartyMon]
ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
- ld bc, $30
+ ld bc, PartyMon2 - PartyMon1
call AddNTimes
ld a, [hl]
ld [CurPartySpecies], a
dec a
call SetSeenAndCaughtMon
+
ld a, [CurPartySpecies]
- cp $af
+ cp TOGEPI
jr nz, .asm_16fbf
ld de, $54
ld b, $1
call EventFlagAction
.asm_16fbf
+
pop de
+
ld a, [CurPartySpecies]
dec de
ld [de], a
@@ -23291,45 +23298,45 @@ Function16f7a: ; 16f7a (5:6f7a)
call GetBaseData
ld a, [CurPartyMon]
ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
- ld bc, $30
+ ld bc, PartyMon2 - PartyMon1
call AddNTimes
push hl
- ld bc, $24
+ ld bc, PartyMon1MaxHP - PartyMon1
add hl, bc
ld d, h
ld e, l
pop hl
push hl
- ld bc, $1f
+ ld bc, PartyMon1Level - PartyMon1
add hl, bc
ld a, [hl]
ld [CurPartyLevel], a
pop hl
push hl
- ld bc, $20
+ ld bc, PartyMon1Status - PartyMon1
add hl, bc
xor a
ld [hli], a
ld [hl], a
pop hl
push hl
- ld bc, $a
+ ld bc, PartyMon1Exp + 2 - PartyMon1
add hl, bc
ld b, $0
predef Functione167
pop bc
- ld hl, $24
+ ld hl, PartyMon1MaxHP - PartyMon1
add hl, bc
ld d, h
ld e, l
- ld hl, $22
+ ld hl, PartyMon1HP - PartyMon1
add hl, bc
ld a, [de]
inc de
ld [hli], a
ld a, [de]
ld [hl], a
- ld hl, $6
+ ld hl, PartyMon1ID - PartyMon1
add hl, bc
ld a, [PlayerID]
ld [hli], a
@@ -23347,7 +23354,7 @@ Function16f7a: ; 16f7a (5:6f7a)
call PrintText
ld a, [CurPartyMon]
ld hl, PartyMonNicknames
- ld bc, $b
+ ld bc, PKMN_NAME_LENGTH
call AddNTimes
ld d, h
ld e, l
@@ -23377,7 +23384,7 @@ Function1707d: ; 1707d (5:707d)
ld hl, CurPartyMon
inc [hl]
pop hl
- ld de, $30
+ ld de, PartyMon2 - PartyMon1
add hl, de
pop de
jp Function16f7a
@@ -23434,13 +23441,13 @@ Function170bf: ; 170bf
call Function17197
ld d, h
ld e, l
- ld b, $4
+ ld b, NUM_MOVES
.asm_170c6
ld a, [de]
and a
jr z, .asm_170e3
ld hl, wEggMonMoves
- ld c, $4
+ ld c, NUM_MOVES
.asm_170cf
ld a, [de]
cp [hl]
@@ -30545,7 +30552,7 @@ Function28771: ; 28771
and a
ret z
push hl
- ld hl, Unknown_28785
+ ld hl, .TimeCapsuleAlt
.asm_28778
ld a, [hli]
and a
@@ -30561,10 +30568,11 @@ Function28771: ; 28771
.asm_28783
pop hl
ret
-; 28785
-Unknown_28785: ; 28785
-; Alternate mappings for unused items.
+.TimeCapsuleAlt ; 28785
+; Pokémon traded from RBY do not have held items, so GSC usually interprets the
+; catch rate as an item. However, if the catch rate appears in this table, the
+; item associated with the table entry is used instead.
db ITEM_19, LEFTOVERS
db ITEM_2D, BITTER_BERRY
db ITEM_32, GOLD_BERRY
@@ -33017,7 +33025,7 @@ TradePoofGFX: INCBIN "gfx/trade/poof.2bpp"
Function29bfb: ; 29bfb
ld hl, PartySpecies
- ld b, $6
+ ld b, PARTY_LENGTH
.asm_29c00
ld a, [hli]
cp $ff
@@ -37352,7 +37360,7 @@ Function421f5: ; 421f5
call AddNTimes
ld e, l
ld d, h
- ld bc, $0024
+ ld bc, PartyMon1MaxHP - PartyMon1
add hl, bc
ld a, [hli]
ld b, a
@@ -37451,7 +37459,7 @@ Function42414: ; 42414
cp "@"
jr nz, .asm_4242b
ld a, [CurPartyMon]
- ld bc, $000b
+ ld bc, PKMN_NAME_LENGTH
ld hl, PartyMonNicknames
call AddNTimes
push hl
@@ -37460,7 +37468,7 @@ Function42414: ; 42414
call GetPokemonName
ld hl, StringBuffer1
pop de
- ld bc, $000b
+ ld bc, PKMN_NAME_LENGTH
jp CopyBytes
; 42454
@@ -38138,7 +38146,7 @@ Function4424d: ; 4424d
ld d, h
ld e, l
hlcoord 11, 9
- ld bc, ClearVRAM
+ ld bc, $0245
call PrintNum
pop de
@@ -38381,7 +38389,7 @@ Function44607: ; 44607
ld d, [hl]
ld a, [CurPartyMon]
ld hl, PartyMon1Item
- ld bc, $30
+ ld bc, PartyMon2 - PartyMon1
call AddNTimes
ld [hl], d
call CloseSRAM
@@ -38421,6 +38429,7 @@ Function44654:: ; 44654
ld e, l
pop hl
pop bc
+
ld a, $20
ld [wd265], a
.asm_44691
@@ -41739,7 +41748,14 @@ Function49856: ; 49856
; 4985a
Unknown_4985a: ; unreferenced
-INCBIN "baserom.gbc",$4985a,$4989a - $4985a
+ db $ab, $03, $57, $24, $ac, $0e, $13, $32
+ db $be, $30, $5b, $4c, $47, $60, $ed, $f2
+ db $ab, $03, $55, $26, $aa, $0a, $13, $3a
+ db $be, $28, $33, $24, $6e, $71, $df, $b0
+ db $a8, $00, $e5, $e0, $9a, $fc, $f4, $2c
+ db $fe, $4c, $a3, $5e, $c6, $3a, $ab, $4d
+ db $a8, $00, $b5, $b0, $de, $e8, $fc, $1c
+ db $ba, $66, $f7, $0e, $ba, $5e, $43, $bd
Function4989a: ; 4989a
call DelayFrame
@@ -51469,7 +51485,20 @@ INCLUDE "data/base_stats.asm"
PokemonNames::
INCLUDE "data/pokemon_names.asm"
-INCBIN "baserom.gbc",$53d84,$53d9c - $53d84
+Unknown_53d84: ; unreferenced
+ db $1a, $15
+ db $33, $16
+ db $4b, $17
+ db $62, $18
+ db $79, $19
+ db $90, $1a
+ db $a8, $1b
+ db $c4, $1c
+ db $e0, $1d
+ db $f6, $1e
+ db $ff, $1f
+ db $ff, $20
+; 53d9c
UnknownEggPic:: ; 53d9c
; Another egg pic. This is shifted up a few pixels.
@@ -56364,7 +56393,7 @@ MenuDataHeader_0x8810d: ; 0x8810d
db 09, 06 ; start coords
db 12, 19 ; end coords
-INCBIN "baserom.gbc",$88112,$88116 - $88112
+ db 0, 0, -1, 0 ; XXX
Function88116: ; 88116
call Function1cfd
@@ -70927,7 +70956,7 @@ Function90eb0: ; 90eb0 (24:4eb0)
ld bc, $8
ld a, $4f
call ByteFill
- ld de, wd957
+ ld de, wPokegearFlags
ld a, [de]
bit 0, a
call nz, Function90ee4
@@ -71017,7 +71046,7 @@ Function90f3e: ; 90f3e (24:4f3e)
and D_RIGHT
ret z
- ld a, [wd957]
+ ld a, [wPokegearFlags]
bit 0, a
jr z, .asm_90f5a
ld c, $2
@@ -71025,7 +71054,7 @@ Function90f3e: ; 90f3e (24:4f3e)
jr .asm_90f71
.asm_90f5a
- ld a, [wd957]
+ ld a, [wPokegearFlags]
bit 2, a
jr z, .asm_90f67
ld c, $7
@@ -71033,7 +71062,7 @@ Function90f3e: ; 90f3e (24:4f3e)
jr .asm_90f71
.asm_90f67
- ld a, [wd957]
+ ld a, [wPokegearFlags]
bit 1, a
ret z
@@ -71136,7 +71165,7 @@ Function90ff2: ; 90ff2 (24:4ff2)
ret
.right
- ld a, [wd957]
+ ld a, [wPokegearFlags]
bit 2, a
jr z, .asm_91015
ld c, $7
@@ -71144,7 +71173,7 @@ Function90ff2: ; 90ff2 (24:4ff2)
jr .done
.asm_91015
- ld a, [wd957]
+ ld a, [wPokegearFlags]
bit 1, a
ret z
ld c, $b
@@ -71329,7 +71358,7 @@ Function91112: ; 91112 (24:5112)
ret
.left
- ld a, [wd957]
+ ld a, [wPokegearFlags]
bit 2, a
jr z, .asm_9113b
ld c, $7
@@ -71337,7 +71366,7 @@ Function91112: ; 91112 (24:5112)
jr .asm_9114c
.asm_9113b
- ld a, [wd957]
+ ld a, [wPokegearFlags]
bit 0, a
jr z, .asm_91148
ld c, $2
@@ -71388,7 +71417,7 @@ Function91171: ; 91171 (24:5171)
ret
.left
- ld a, [wd957]
+ ld a, [wPokegearFlags]
bit 0, a
jr z, .asm_9119c
ld c, $2
@@ -71400,7 +71429,7 @@ Function91171: ; 91171 (24:5171)
jr .asm_911ac
.right
- ld a, [wd957]
+ ld a, [wPokegearFlags]
bit 1, a
ret z
ld c, $b
@@ -72003,7 +72032,7 @@ Function9164e: ; 9164e (24:564e)
UpdateRadioStation: ; 9166f (24:566f)
ld hl, wd958
ld d, [hl]
- ld hl, Unknown_916ad
+ ld hl, RadioChannels
.asm_91676
ld a, [hli]
cp $ff
@@ -72047,79 +72076,82 @@ Function916a1: ; 916a1
ret
; 916ad
-Unknown_916ad: ; 916ad
- dbw 16, Function916c9
- dbw 28, Function916d8
- dbw 32, Function916e0
- dbw 40, Function916e8
- dbw 52, Function916f0
- dbw 64, Function916fa
- dbw 72, Function91709
- dbw 78, Function91718
- dbw 80, Function91727
+
+RadioChannels:
+; frequencies and the shows that play on them.
+; frequency value given here = 4 × ingame_frequency − 2
+ dbw 16, .PkmnTalkAndPokedexShow
+ dbw 28, .PokemonMusic
+ dbw 32, .LuckyChannel
+ dbw 40, .BuenasPassword
+ dbw 52, .RuinsOfAlphRadio
+ dbw 64, .PlacesAndPeople
+ dbw 72, .LetsAllSing
+ dbw 78, .PokeFluteRadio
+ dbw 80, .EvolutionRadio
db $ff
-; 916c9
-Function916c9: ; 916c9
- call Function91744
- jr nc, Function91740
+.PkmnTalkAndPokedexShow
+; Pokédex Show in the morning
+; Oak's Pokémon Talk in the afternoon and evening
+ call .InJohto
+ jr nc, .NoSignal
ld a, [TimeOfDay]
and a
jp z, Function91766
jp Function91753
-Function916d8: ; 916d8
- call Function91744
- jr nc, Function91740
+.PokemonMusic
+ call .InJohto
+ jr nc, .NoSignal
jp Function9177b
-Function916e0: ; 916e0
- call Function91744
- jr nc, Function91740
+.LuckyChannel
+ call .InJohto
+ jr nc, .NoSignal
jp Function91790
-Function916e8: ; 916e8
- call Function91744
- jr nc, Function91740
+.BuenasPassword
+ call .InJohto
+ jr nc, .NoSignal
jp Function917a5
-Function916f0: ; 916f0
+.RuinsOfAlphRadio
ld a, [wc6d8]
cp RUINS_OF_ALPH
- jr nz, Function91740
+ jr nz, .NoSignal
jp Function917d5
-Function916fa: ; 916fa
- call Function91744
- jr c, Function91740
- ld a, [wd957]
+.PlacesAndPeople
+ call .InJohto
+ jr c, .NoSignal
+ ld a, [wPokegearFlags]
bit 3, a
- jr z, Function91740
+ jr z, .NoSignal
jp Function917ea
-Function91709: ; 91709
- call Function91744
- jr c, Function91740
- ld a, [wd957]
+.LetsAllSing
+ call .InJohto
+ jr c, .NoSignal
+ ld a, [wPokegearFlags]
bit 3, a
- jr z, Function91740
+ jr z, .NoSignal
jp Function917ff
-Function91718: ; 91718
- call Function91744
- jr c, Function91740
- ld a, [wd957]
+.PokeFluteRadio
+ call .InJohto
+ jr c, .NoSignal
+ ld a, [wPokegearFlags]
bit 3, a
- jr z, Function91740
+ jr z, .NoSignal
jp Function91829
-Function91727: ; 91727
-; This station airs in the Lake of Rage
-; area when Rocket are still in Mahogany.
+.EvolutionRadio
+; This station airs in the Lake of Rage area when Rocket are still in Mahogany.
ld a, [StatusFlags]
bit 4, a
- jr z, Function91740
+ jr z, .NoSignal
ld a, [wc6d8]
cp MAHOGANY_TOWN
@@ -72127,15 +72159,17 @@ Function91727: ; 91727
cp ROUTE_43
jr z, .ok
cp LAKE_OF_RAGE
- jr nz, Function91740
+ jr nz, .NoSignal
.ok
jp Function9183e
-Function91740: ; 91740
+.NoSignal
call NoRadioStation
ret
-Function91744: ; 91744 (24:5744)
+.InJohto
+; if in Johto or on the S.S. Aqua, set carry
+; otherwise clear carry
ld a, [wc6d8]
cp FAST_SHIP
jr z, .johto
@@ -77615,12 +77649,12 @@ Functionb8b8f: ; b8b8f (2e:4b8f)
Functionb8b90: ; b8b90 (2e:4b90)
call Function1052
call PrintText
- ld de, $51
+ ld de, MUSIC_POKEMON_MARCH
call GetWeekday
and 1
- jr z, .asm_b8ba3
- ld de, $50
-.asm_b8ba3
+ jr z, .done
+ ld de, MUSIC_POKEMON_LULLABY
+.done
callab Function91854
ret
; b8baa (2e:4baa)
@@ -78722,7 +78756,7 @@ Functionb91eb: ; b91eb (2e:51eb)
ret nz
call Function1052
call PrintText
- ld hl, Unknown_b920b
+ ld hl, RadioChannelSongs
ld a, [wd002]
ld c, a
ld b, 0
@@ -78735,7 +78769,7 @@ Functionb91eb: ; b91eb (2e:51eb)
ret
; b920b (2e:520b)
-Unknown_b920b: ; b920b
+RadioChannelSongs: ; b920b
dw MUSIC_POKEMON_TALK
dw MUSIC_POKEMON_CENTER
dw MUSIC_TITLE
@@ -82026,7 +82060,11 @@ Functione124e: ; e124e
; e126d
Unknown_e126d: ; e126d
-INCBIN "baserom.gbc",$e126d,$e127d - $e126d
+ db $00, $01, $02, $03
+ db $04, $05, $06, $0b
+ db $0c, $11, $12, $17
+ db $18, $1d, $1e, $23
+; e127d
Functione127d: ; e127d
call Functione128d
@@ -82392,7 +82430,12 @@ Functione1481: ; e1481
; e148f
Unknown_e148f: ; e148f
-INCBIN "baserom.gbc", $e148f, $e14a0 - $e148f
+ db $e0
+ db $00, $03, $06, $09
+ db $24, $27, $2a, $2d
+ db $48, $4b, $4e, $51
+ db $6c, $6f, $72, $75
+; e14a0
Functione14a0: ; e14a0
ld hl, Unknown_e14b5
@@ -82415,7 +82458,13 @@ Functione14a0: ; e14a0
; e14b5
Unknown_e14b5: ; e14b5
-INCBIN "baserom.gbc", $e14b5, $e14d9 - $e14b5
+ db $00, $00, $00, $00, $00, $00
+ db $00, $01, $02, $03, $04, $00
+ db $00, $05, $06, $07, $08, $00
+ db $00, $09, $0a, $0b, $0c, $00
+ db $00, $0d, $0e, $0f, $10, $00
+ db $00, $00, $00, $00, $00, $00
+; e14d9
Functione14d9: ; e14d9
call Functione1481
@@ -82459,13 +82508,73 @@ Functione14d9: ; e14d9
; e150f
Unknown_e150f: ; e150f
-INCBIN "baserom.gbc",$e150f,$e1534 - $e150f
+ db $f4, $f4, $00, $00
+ db $f4, $fc, $01, $00
+ db $f4, $04, $02, $00
+ db $fc, $f4, $0c, $00
+ db $fc, $fc, $0d, $00
+ db $fc, $04, $0e, $00
+ db $04, $f4, $18, $00
+ db $04, $fc, $19, $00
+ db $04, $04, $1a, $00
+ db $ff
Unknown_e1534: ; e1534
-INCBIN "baserom.gbc",$e1534,$e1559 - $e1534
+ db $f4, $f4, $00, $00
+ db $f4, $fc, $01, $00
+ db $f4, $04, $00, $20
+ db $fc, $f4, $02, $00
+ db $fc, $fc, $03, $00
+ db $fc, $04, $02, $20
+ db $04, $f4, $00, $40
+ db $04, $fc, $01, $40
+ db $04, $04, $00, $60
+ db $ff
Unknown_e1559: ; e1559
-INCBIN "baserom.gbc",$e1559,$e1631 - $e1559
+
+macro_e1559: macro
+ db \1, \2
+ dwcoord \3, \4
+ db \5, \6
+endm
+
+ macro_e1559 $1c, $1c, 1, 0, $ee, $00
+ macro_e1559 $34, $1c, 4, 0, $ee, $00
+ macro_e1559 $4c, $1c, 7, 0, $ee, $00
+ macro_e1559 $64, $1c, 10, 0, $ee, $00
+ macro_e1559 $7c, $1c, 13, 0, $ee, $00
+ macro_e1559 $94, $1c, 16, 0, $ee, $00
+ macro_e1559 $1c, $34, 1, 3, $ee, $00
+ macro_e1559 $34, $34, 4, 3, $ef, $00
+ macro_e1559 $4c, $34, 7, 3, $ef, $00
+ macro_e1559 $64, $34, 10, 3, $ef, $00
+ macro_e1559 $7c, $34, 13, 3, $ef, $00
+ macro_e1559 $94, $34, 16, 3, $ee, $00
+ macro_e1559 $1c, $4c, 1, 6, $ee, $00
+ macro_e1559 $34, $4c, 4, 6, $ef, $00
+ macro_e1559 $4c, $4c, 7, 6, $ef, $00
+ macro_e1559 $64, $4c, 10, 6, $ef, $00
+ macro_e1559 $7c, $4c, 13, 6, $ef, $00
+ macro_e1559 $94, $4c, 16, 6, $ee, $00
+ macro_e1559 $1c, $64, 1, 9, $ee, $00
+ macro_e1559 $34, $64, 4, 9, $ef, $00
+ macro_e1559 $4c, $64, 7, 9, $ef, $00
+ macro_e1559 $64, $64, 10, 9, $ef, $00
+ macro_e1559 $7c, $64, 13, 9, $ef, $00
+ macro_e1559 $94, $64, 16, 9, $ee, $00
+ macro_e1559 $1c, $7c, 1, 12, $ee, $00
+ macro_e1559 $34, $7c, 4, 12, $ef, $00
+ macro_e1559 $4c, $7c, 7, 12, $ef, $00
+ macro_e1559 $64, $7c, 10, 12, $ef, $00
+ macro_e1559 $7c, $7c, 13, 12, $ef, $00
+ macro_e1559 $94, $7c, 16, 12, $ee, $00
+ macro_e1559 $1c, $94, 1, 15, $ee, $00
+ macro_e1559 $34, $94, 4, 15, $ee, $00
+ macro_e1559 $4c, $94, 7, 15, $ee, $00
+ macro_e1559 $64, $94, 10, 15, $ee, $00
+ macro_e1559 $7c, $94, 13, 15, $ee, $00
+ macro_e1559 $94, $94, 16, 15, $ee, $00
Functione1631: ; e1631
ld hl, VTiles2
@@ -85880,7 +85989,7 @@ Functione36f9: ; e36f9 (38:76f9)
ret
; e3778 (38:7778)
-INCBIN "baserom.gbc",$e3778,$e377b - $e3778
+ hlcoord 11, 7 ; XXX
MenuDataHeader_0xe377b: ; 0xe377b
db $40 ; flags
@@ -91294,7 +91403,7 @@ Unknown_fd15e: ; fd15e
db $01, $86, $a0, $00, $59, $10, $02, $1a ; SNORLAX_DOLL
; fd1ae
-INCBIN "baserom.gbc", $fd1ae, $fd1b1 - $fd1ae
+ db 0, 0, 0 ; XXX
UnknownText_0xfd1b1: ; 0xfd1b1
; Hi, ! How are you?
@@ -91332,13 +91441,13 @@ UnknownText_0xfd1ca: ; 0xfd1ca
db "@"
; 0xfd1cf
-INCBIN "baserom.gbc", $fd1cf, $fd1d0 - $fd1cf
+ db 0 ; XXX
Functionfd1d0: ; fd1d0
ret
; fd1d1
-INCBIN "baserom.gbc", $fd1d1, $fd1d2 - $fd1d1
+ ret ; XXX
INCLUDE "misc/mobile_40.asm"
@@ -93010,8 +93119,7 @@ Function104da9: ; 104da9 (41:4da9)
ret z
xor a
ld [rIF], a ; $ff00+$f
- db $76 ;halt (prevents rgbasm from putting in an extra nop)
- nop
+ halt
ld a, [$ff00+c]
bit 1, a
jr z, Function104da9
@@ -93023,8 +93131,7 @@ Function104db7: ; 104db7 (41:4db7)
ret z
xor a
ld [rIF], a ; $ff00+$f
- db $76 ;halt (prevents rgbasm from putting in an extra nop)
- nop
+ halt
ld a, [$ff00+c]
bit 1, a
jr nz, Function104db7
@@ -93039,8 +93146,7 @@ Function104dc5: ; 104dc5 (41:4dc5)
ret z
xor a
ld [rIF], a ; $ff00+$f
- db $76 ;halt (prevents rgbasm from putting in an extra nop)
- nop
+ halt
jr .asm_104dc8
Function104dd1: ; 104dd1 (41:4dd1)
@@ -93051,8 +93157,7 @@ Function104dd1: ; 104dd1 (41:4dd1)
ret z
xor a
ld [rIF], a ; $ff00+$f
- db $76 ;halt (prevents rgbasm from putting in an extra nop)
- nop
+ halt
jr .asm_104dd4
Function104ddd: ; 104ddd (41:4ddd)
@@ -93219,8 +93324,7 @@ Function104ed6: ; 104ed6 (41:4ed6)
.asm_104f02
xor a
ld [rIF], a ; $ff00+$f
- db $76 ;halt (prevents rgbasm from putting in an extra nop)
- nop
+ halt
ld a, $c1
ld [rRP], a ; $ff00+$56
ld d, $1
@@ -93239,8 +93343,7 @@ Function104ed6: ; 104ed6 (41:4ed6)
jr z, .asm_104f25
xor a
ld [rIF], a ; $ff00+$f
- db $76 ;halt (prevents rgbasm from putting in an extra nop)
- nop
+ halt
.asm_104f25
ld a, [$ffb6]
dec a
@@ -93252,8 +93355,7 @@ Function104ed6: ; 104ed6 (41:4ed6)
ld [rTMA], a ; $ff00+$6
xor a
ld [rIF], a ; $ff00+$f
- db $76 ;halt (prevents rgbasm from putting in an extra nop)
- nop
+ halt
ld d, $5
call Function104dc5
ld d, $11
@@ -94046,7 +94148,22 @@ Function1058e9: ; 1058e9 (41:58e9)
; 1058f0 (41:58f0)
OAM_1058f0: ; 1058f0
-INCBIN "baserom.gbc",$1058f0,$105930 - $1058f0
+ db $11, $34, $00, $00
+ db $11, $3c, $01, $00
+ db $11, $44, $02, $00
+ db $11, $4c, $03, $00
+ db $19, $34, $04, $00
+ db $19, $3c, $05, $00
+ db $19, $44, $06, $00
+ db $19, $4c, $07, $00
+ db $01, $5c, $00, $00
+ db $01, $64, $01, $00
+ db $01, $6c, $02, $00
+ db $01, $74, $03, $00
+ db $09, $5c, $04, $00
+ db $09, $64, $05, $00
+ db $09, $6c, $06, $00
+ db $09, $74, $07, $00
; japanese mystery gift gfx
MysteryGiftJP_GFX: ; 105930
@@ -96413,12 +96530,12 @@ INCLUDE "text/battle_tower.asm"
SECTION "bank7C", ROMX, BANK[$7C]
-INCBIN "baserom.gbc",$1f0000,$1f09d8 - $1f0000
+INCBIN "unknown/1f0000.bin"
SECTION "bank7D", ROMX, BANK[$7D]
-INCBIN "baserom.gbc",$1f4000,$1f4003 - $1f4000
+ db $cc, $6b, $1e ; XXX
Function1f4003: ; 1f4003
ld a, $6
@@ -96432,7 +96549,7 @@ Function1f4003: ; 1f4003
; 1f4018
Unknown_1f4018:
-INCBIN "baserom.gbc", $1f4018, $1f4dbe - $1f4018
+INCBIN "unknown/1f4018.bin"
Function1f4dbe: ; 1f4dbe
ld a, $6
@@ -96446,7 +96563,7 @@ Function1f4dbe: ; 1f4dbe
; 1f4dd3
Unknown_1f4dd3:
-INCBIN "baserom.gbc", $1f4dd3, $1f5d9f - $1f4dd3
+INCBIN "unknown/1f4dd3.bin"
Function1f5d9f: ; 1f5d9f
ld a, $6
@@ -96460,7 +96577,7 @@ Function1f5d9f: ; 1f5d9f
; 1f5db4
Unknown_1f5db4:
-INCBIN "baserom.gbc", $1f5db4, $1f636a - $1f5db4
+INCBIN "unknown/1f5db4.bin"
SECTION "bank7E", ROMX, BANK[$7E]
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-20 09:14:00 +0000