Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-09-30 19:06:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start cleaning up.

Browse Source
This commit is contained in:
entrpntr
2020-06-02 06:07:53 -04:00
parent ea845793bb
commit 20f612793e
7 changed files with 279 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/sprite_anims/framesets.asm
View File

@@ -1,4 +1,5 @@
SpriteAnimFrameData:
; entries correspond to SPRITE_ANIM_FRAMESET_* constants
dw .Frameset_00
dw .Frameset_PartyMon
dw .Frameset_PartyMonWithMail
@@ -49,7 +50,7 @@ SpriteAnimFrameData:
dw .Frameset_Leaf
dw .Frameset_CutTree
dw .Frameset_EggCrack
dw .Frameset_EggHatch
dw .Frameset_EggHatch1
dw .Frameset_EggHatch2
dw .Frameset_EggHatch3
dw .Frameset_EggHatch4
@@ -354,7 +355,7 @@ ENDC
frame SPRITE_ANIM_OAMSET_EGG_CRACK, 32
endanim
.Frameset_EggHatch:
.Frameset_EggHatch1:
frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32
endanim

112
data/sprite_anims/oam.asm
View File

@@ -87,54 +87,54 @@ SpriteAnimOAMData:
dbw $00, .OAMData_CutTree4 ; SPRITE_ANIM_OAMSET_CUT_TREE_4
dbw $00, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_CRACK
dbw $01, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_HATCH
IF DEF(_GOLD)
IF DEF(_GOLD)
dbw $00, .OAMData_GSIntroHoOh1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1
dbw $00, .OAMData_GSIntroHoOh2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2
dbw $00, .OAMData_GSIntroHoOh3 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3
dbw $00, .OAMData_GSIntroHoOh4 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4
dbw $00, .OAMData_GSIntroHoOh5 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5
ELIF DEF(_SILVER)
dbw $00, .OAMData_GSIntroLugia1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1
dbw $20, .OAMData_GSIntroLugia1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2
dbw $40, .OAMData_GSIntroLugia2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3
dbw $60, .OAMData_GSIntroLugia2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4
dbw $00, .OAMData_GSIntroLugia1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5
ENDC
ELIF DEF(_SILVER)
dbw $00, .OAMData_GSIntroLugia1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1
dbw $20, .OAMData_GSIntroLugia1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2
dbw $40, .OAMData_GSIntroLugia2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3
dbw $60, .OAMData_GSIntroLugia2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4
dbw $00, .OAMData_GSIntroLugia1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5
ENDC
dbw $04, .OAMData_Tree ; SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2
.OAMData_1x1_Palette0
.OAMData_1x1_Palette0:
db 1
dbsprite -1, -1, 4, 4, $00, 0
.OAMData_GSIntroShellder
.OAMData_GSIntroShellder:
db 4
dbsprite -1, -1, 0, 0, $00, 0
dbsprite 0, -1, 0, 0, $01, 0
dbsprite -1, 0, 0, 0, $10, 0
dbsprite 0, 0, 0, 0, $11, 0
.OAMData_GSIntroStar
.OAMData_GSIntroStar:
db 4
dbsprite -1, -1, 0, 0, $00, 0
dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP
dbsprite -1, 0, 0, 0, $01, 0
dbsprite 0, 0, 0, 0, $01, 0 | X_FLIP
.OAMData_TradePokeBall1
.OAMData_TradePokeBall1:
db 4
dbsprite -1, -1, 0, 0, $00, 0 | PRIORITY
dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP | PRIORITY
dbsprite -1, 0, 0, 0, $01, 0 | PRIORITY
dbsprite 0, 0, 0, 0, $01, 0 | X_FLIP | PRIORITY
.OAMData_8df09
.OAMData_8df09:
db 4
dbsprite -1, -1, 0, 0, $00, 0
dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP
dbsprite -1, 0, 0, 0, $00, 0 | Y_FLIP
dbsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP
.OAMData_TradeTubeBulge
.OAMData_TradeTubeBulge:
db 4
dbsprite -1, -1, 0, 0, $00, 7
dbsprite 0, -1, 0, 0, $00, 7 | X_FLIP
@@ -148,7 +148,7 @@ SpriteAnimOAMData:
dbsprite -1, 0, 0, 0, $00, 0 | Y_FLIP | PRIORITY
dbsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY
.OAMData_TradePoofBubble
.OAMData_TradePoofBubble:
db 16
dbsprite -2, -2, 0, 0, $00, 0
dbsprite -1, -2, 0, 0, $01, 0
@@ -167,7 +167,7 @@ SpriteAnimOAMData:
dbsprite 0, 1, 0, 0, $01, 0 | X_FLIP | Y_FLIP
dbsprite 1, 1, 0, 0, $00, 0 | X_FLIP | Y_FLIP
.OAMData_GSIntroBigFireball
.OAMData_GSIntroBigFireball:
db 36
dbsprite -3, -3, 0, 0, $00, 0
dbsprite -2, -3, 0, 0, $01, 0
@@ -206,7 +206,7 @@ SpriteAnimOAMData:
dbsprite 1, 2, 0, 0, $01, 0 | X_FLIP | Y_FLIP
dbsprite 2, 2, 0, 0, $00, 0 | X_FLIP | Y_FLIP
.OAMData_Unused43_4A
.OAMData_Unused43_4A:
db 9
dbsprite -2, -2, 4, 4, $00, 0
dbsprite -1, -2, 4, 4, $01, 0
@@ -218,7 +218,7 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 4, $21, 0
dbsprite 0, 0, 4, 4, $22, 0
.OAMData_GSIntroJigglypuffPikachu
.OAMData_GSIntroJigglypuffPikachu:
db 16
dbsprite -2, -2, 0, 0, $00, 0
dbsprite -1, -2, 0, 0, $01, 0
@@ -237,7 +237,7 @@ SpriteAnimOAMData:
dbsprite 0, 1, 0, 0, $32, 0
dbsprite 1, 1, 0, 0, $33, 0
.OAMData_GSIntroStarter
.OAMData_GSIntroStarter:
db 25
dbsprite -3, -3, 4, 4, $00, 0
dbsprite -3, -2, 4, 4, $01, 0
@@ -304,49 +304,49 @@ SpriteAnimOAMData:
dbsprite 1, 2, 0, 0, $22, 0
dbsprite 2, 2, 0, 0, $23, 0
.OAMData_RedWalk
.OAMData_RedWalk:
db 4
dbsprite -1, -1, 0, 0, $00, PAL_OW_RED
dbsprite 0, -1, 0, 0, $01, PAL_OW_RED
dbsprite -1, 0, 0, 0, $02, PAL_OW_RED
dbsprite 0, 0, 0, 0, $03, PAL_OW_RED
.OAMData_MagnetTrainRed
.OAMData_MagnetTrainRed:
db 4
dbsprite -1, -1, 0, 0, $00, PAL_OW_RED | PRIORITY
dbsprite 0, -1, 0, 0, $01, PAL_OW_RED | PRIORITY
dbsprite -1, 0, 0, 0, $02, PAL_OW_RED | PRIORITY
dbsprite 0, 0, 0, 0, $03, PAL_OW_RED | PRIORITY
.OAMData_PartyMonWithMail1
.OAMData_PartyMonWithMail1:
db 4
dbsprite -1, -1, 0, 0, $00, PAL_OW_RED
dbsprite 0, -1, 0, 0, $01, PAL_OW_RED
dbsprite -1, 0, 0, 0, $08, PAL_OW_RED
dbsprite 0, 0, 0, 0, $03, PAL_OW_RED
.OAMData_PartyMonWithMail2
.OAMData_PartyMonWithMail2:
db 4
dbsprite -1, -1, 0, 0, $04, PAL_OW_RED
dbsprite 0, -1, 0, 0, $05, PAL_OW_RED
dbsprite -1, 0, 0, 0, $08, PAL_OW_RED
dbsprite 0, 0, 0, 0, $07, PAL_OW_RED
.OAMData_PartyMonWithItem1
.OAMData_PartyMonWithItem1:
db 4
dbsprite -1, -1, 0, 0, $00, PAL_OW_RED
dbsprite 0, -1, 0, 0, $01, PAL_OW_RED
dbsprite -1, 0, 0, 0, $09, PAL_OW_RED
dbsprite 0, 0, 0, 0, $03, PAL_OW_RED
.OAMData_PartyMonWithItem2
.OAMData_PartyMonWithItem2:
db 4
dbsprite -1, -1, 0, 0, $04, PAL_OW_RED
dbsprite 0, -1, 0, 0, $05, PAL_OW_RED
dbsprite -1, 0, 0, 0, $09, PAL_OW_RED
dbsprite 0, 0, 0, 0, $07, PAL_OW_RED
.OAMData_GSIntroMagikarp
.OAMData_GSIntroMagikarp:
db 6
dbsprite -2, -1, 4, 0, $00, 1
dbsprite -1, -1, 4, 0, $01, 1
@@ -355,7 +355,7 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 0, $11, 1
dbsprite 0, 0, 4, 0, $12, 1
.OAMData_8e1e9
.OAMData_8e1e9:
db 10
db $f4, $f0, $00, $00
db $f4, $f8, $01, $00
@@ -368,7 +368,7 @@ SpriteAnimOAMData:
db $04, $f8, $09, $00
db $04, $00, $0a, $00
.OAMData_8e212
.OAMData_8e212:
db 27
db $e8, $e8, $00, $00
db $e8, $f0, $01, $00
@@ -398,7 +398,7 @@ SpriteAnimOAMData:
db $10, $08, $54, $80
db $10, $10, $55, $80
.OAMData_8e27f
.OAMData_8e27f:
db 27
db $e8, $e8, $0d, $00
db $e8, $f0, $0e, $00
@@ -428,7 +428,7 @@ SpriteAnimOAMData:
db $10, $08, $54, $80
db $10, $10, $55, $80
.OAMData_GSIntroLapras
.OAMData_GSIntroLapras:
db 29
dbsprite -3, -3, 0, 0, $00, 0
dbsprite -2, -3, 0, 0, $01, 0
@@ -460,12 +460,12 @@ SpriteAnimOAMData:
dbsprite 1, 2, 0, 0, $54, 0 | PRIORITY
dbsprite 2, 2, 0, 0, $55, 0 | PRIORITY
.OAMData_GSIntroNote
.OAMData_GSIntroNote:
db 2
dbsprite -1, -1, 4, 0, $00, 0
dbsprite -1, 0, 4, 0, $10, 0
.OAMData_GSIntroPikachuTail
.OAMData_GSIntroPikachuTail:
db 5
dbsprite 3, -2, 0, 0, $00, 0
dbsprite 4, -2, 0, 0, $01, 0
@@ -473,25 +473,25 @@ SpriteAnimOAMData:
dbsprite 3, -1, 0, 0, $03, 0
dbsprite 2, 0, 0, 0, $04, 0
.OAMData_Leaf
.OAMData_Leaf:
db 1
dbsprite -1, -1, 4, 4, $00, PAL_OW_TREE
.OAMData_Tree
.OAMData_Tree:
db 4
dbsprite -1, -1, 0, 0, $00, PAL_OW_TREE
dbsprite 0, -1, 0, 0, $01, PAL_OW_TREE
dbsprite -1, 0, 0, 0, $02, PAL_OW_TREE
dbsprite 0, 0, 0, 0, $03, PAL_OW_TREE
.OAMData_TextEntryCursor
.OAMData_TextEntryCursor:
db 4
dbsprite -1, -1, 7, 7, $00, 0
dbsprite 0, -1, 0, 7, $00, 0 | X_FLIP
dbsprite -1, 0, 7, 0, $00, 0 | Y_FLIP
dbsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP
.OAMData_TextEntryCursorBig
.OAMData_TextEntryCursorBig:
db 10
dbsprite 0, -1, 0, 7, $00, 0
dbsprite 1, -1, 0, 7, $01, 0
@@ -504,7 +504,7 @@ SpriteAnimOAMData:
dbsprite 3, 0, 0, 0, $01, 0 | Y_FLIP
dbsprite 4, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP
.OAMData_GSIntroGameFreakLogo
.OAMData_GSIntroGameFreakLogo:
db 15
dbsprite -2, -3, 4, 4, $00, 1 | OBP_NUM
dbsprite -1, -3, 4, 4, $01, 1 | OBP_NUM
@@ -522,7 +522,7 @@ SpriteAnimOAMData:
dbsprite -1, 1, 4, 4, $0d, 1 | OBP_NUM
dbsprite 0, 1, 4, 4, $0e, 1 | OBP_NUM
.OAMData_SlotsGolem
.OAMData_SlotsGolem:
db 6
dbsprite -2, -2, 4, 4, $00, 5 | OBP_NUM
dbsprite -1, -2, 4, 4, $02, 5 | OBP_NUM
@@ -531,7 +531,7 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 4, $06, 5 | OBP_NUM
dbsprite 0, 0, 4, 4, $04, 5 | OBP_NUM | X_FLIP
.OAMData_SlotsChansey1
.OAMData_SlotsChansey1:
db 6
dbsprite -2, -2, 4, 4, $00, 6 | OBP_NUM
dbsprite -1, -2, 4, 4, $02, 6 | OBP_NUM
@@ -540,7 +540,7 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 4, $08, 6 | OBP_NUM
dbsprite 0, 0, 4, 4, $0a, 6 | OBP_NUM
.OAMData_SlotsChansey2
.OAMData_SlotsChansey2:
db 6
dbsprite -2, -2, 4, 4, $00, 6 | OBP_NUM
dbsprite -1, -2, 4, 4, $02, 6 | OBP_NUM
@@ -549,7 +549,7 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 4, $0e, 6 | OBP_NUM
dbsprite 0, 0, 4, 4, $10, 6 | OBP_NUM
.OAMData_SlotsChansey3
.OAMData_SlotsChansey3:
db 6
dbsprite -2, -2, 4, 4, $00, 6 | OBP_NUM
dbsprite -1, -2, 4, 4, $02, 6 | OBP_NUM
@@ -558,7 +558,7 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 4, $14, 6 | OBP_NUM
dbsprite 0, 0, 4, 4, $16, 6 | OBP_NUM
.OAMData_SlotsChansey4
.OAMData_SlotsChansey4:
db 6
dbsprite -2, -2, 4, 4, $00, 6 | OBP_NUM
dbsprite -1, -2, 4, 4, $02, 6 | OBP_NUM
@@ -567,7 +567,7 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 4, $1a, 6 | OBP_NUM
dbsprite 0, 0, 4, 4, $1c, 6 | OBP_NUM
.OAMData_SlotsChansey5
.OAMData_SlotsChansey5:
db 6
dbsprite -2, -2, 4, 4, $1e, 6 | OBP_NUM
dbsprite -1, -2, 4, 4, $20, 6 | OBP_NUM
@@ -576,13 +576,13 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 4, $26, 6 | OBP_NUM
dbsprite 0, 0, 4, 4, $28, 6 | OBP_NUM
.OAMData_RadioTuningKnob
.OAMData_RadioTuningKnob:
db 3
dbsprite -1, -2, 4, 4, $00, 0 | OBP_NUM
dbsprite -1, -1, 4, 4, $00, 0 | OBP_NUM
dbsprite -1, 0, 4, 4, $00, 0 | OBP_NUM
.OAMData_Unused4B
.OAMData_Unused4B:
db 6
dbsprite 0, 0, 0, 0, $00, 0
dbsprite 1, 0, 0, 0, $01, 0
@@ -591,28 +591,28 @@ SpriteAnimOAMData:
dbsprite 4, 0, 0, 0, $02, 0
dbsprite 5, 0, 0, 0, $03, 0
.OAMData_Unused4C
.OAMData_Unused4C:
db 4
dbsprite 0, 0, 0, 0, $00, 0
dbsprite 1, 0, 0, 0, $01, 0
dbsprite 2, 0, 0, 0, $02, 0
dbsprite 3, 0, 0, 0, $03, 0
.OAMData_CutTree2
.OAMData_CutTree2:
db 4
dbsprite -2, -1, 6, 0, $00, PAL_OW_TREE
dbsprite 0, -1, 2, 0, $01, PAL_OW_TREE
dbsprite -2, 0, 6, 0, $02, PAL_OW_TREE
dbsprite 0, 0, 2, 0, $03, PAL_OW_TREE
.OAMData_CutTree3
.OAMData_CutTree3:
db 4
dbsprite -2, -1, 4, 0, $00, PAL_OW_TREE
dbsprite 0, -1, 4, 0, $01, PAL_OW_TREE
dbsprite -2, 0, 4, 0, $02, PAL_OW_TREE
dbsprite 0, 0, 4, 0, $03, PAL_OW_TREE
.OAMData_CutTree4
.OAMData_CutTree4:
db 4
dbsprite -2, -1, 0, 0, $00, PAL_OW_TREE
dbsprite 1, -1, 0, 0, $01, PAL_OW_TREE
@@ -620,7 +620,7 @@ SpriteAnimOAMData:
dbsprite 1, 0, 0, 0, $03, PAL_OW_TREE
IF DEF(_GOLD)
.OAMData_GSIntroHoOh1
.OAMData_GSIntroHoOh1:
db 19
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -642,7 +642,7 @@ IF DEF(_GOLD)
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
.OAMData_GSIntroHoOh2
.OAMData_GSIntroHoOh2:
db 16
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -661,7 +661,7 @@ IF DEF(_GOLD)
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
.OAMData_GSIntroHoOh3
.OAMData_GSIntroHoOh3:
db 15
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -679,7 +679,7 @@ IF DEF(_GOLD)
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
.OAMData_GSIntroHoOh4
.OAMData_GSIntroHoOh4:
db 17
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -699,7 +699,7 @@ IF DEF(_GOLD)
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
.OAMData_GSIntroHoOh5
.OAMData_GSIntroHoOh5:
db 17
dbsprite -4, -1, 0, 0, $00, 0
dbsprite -3, -2, 0, 0, $02, 0
@@ -719,7 +719,7 @@ IF DEF(_GOLD)
dbsprite 3, -2, 0, 0, $22, 0
dbsprite 3, 0, 0, 0, $24, 0
.OAMData_GSTitleTrail
.OAMData_GSTitleTrail:
db 1
dbsprite -1, -1, 4, 4, $00, 1 | OBP_NUM
@@ -822,7 +822,7 @@ ELIF DEF(_SILVER)
db $f8, $18, $74, $00
db $f8, $20, $76, $00
.OAMData_GSTitleTrail
.OAMData_GSTitleTrail:
db 2
db $f8, $f8, $00, $00
db $f8, $00, $02, $00

21
engine/battle/battle_transition.asm
View File

@@ -25,9 +25,8 @@ DoBattleTransition:
.loop
ld a, [wJumptableIndex]
bit 7, a
bit 7, a ; BATTLETRANSITION_END?
jr nz, .done
call BattleTransitionJumptable
call DelayFrame
jr .loop
@@ -74,7 +73,7 @@ DoBattleTransition:
ret
ConvertTrainerBattlePokeballTilesTo2bpp:
ld hl, wc700
ld hl, wDecompressScratch
ld bc, $28 tiles
.loop
ld [hl], -1
@@ -84,7 +83,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp:
or b
jr nz, .loop
ld de, wc700
ld de, wDecompressScratch
ld hl, vBGMap2
ld b, BANK(@)
ld c, $28
@@ -101,16 +100,7 @@ TrainerBattlePokeballTiles:
INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
BattleTransitionJumptable:
ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, .Jumptable
add hl, de
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
jp hl
jumptable .Jumptable, wJumptableIndex
.Jumptable
dw StartTrainerBattle_DetermineWhichAnimation ; 00
@@ -604,12 +594,10 @@ StartTrainerBattle_LoadPokeBallGraphics:
ld de, wBGPals2 palette PAL_BG_TEXT
ld bc, 1 palettes
call CopyBytes
hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
ld a, %00000111
call ByteFill
ld a, 1
ldh [hCGBPalUpdate], a
call DelayFrame
@@ -689,6 +677,7 @@ StartTrainerBattle_DrawSineWave:
StartTrainerBattle_ZoomToBlack:
farcall Function55a1
ld de, .boxes
.loop
ld a, [de]
cp -1

378
engine/gfx/sprite_anims.asm
View File

File diff suppressed because it is too large Load Diff

4
engine/gfx/sprites.asm
View File

@@ -415,9 +415,9 @@ GetSpriteAnimFrame:
inc [hl]
call .GetPointer ; load pointer from SpriteAnimFrameData
ld a, [hli]
cp $fe
cp dorestart_command
jr z, .restart
cp $ff
cp endanim_command
jr z, .repeat_last
push af

10
main.asm
View File

@@ -332,7 +332,9 @@ INCBIN "gfx/font/font_inversed.1bpp"
SECTION "bank38", ROMX
ret_e0000:
ret
; unused
ret
_Diploma::
dr $e0002, $e0009
@@ -341,7 +343,9 @@ PlaceDiplomaOnScreen::
PrintDiplomaPage2::
dr $e00ae, $e081b
RotateUnownFrontpic::
dr $e081b, $e0909
dr $e081b, $e0908
ret_e0908::
ret
_CardFlip::
dr $e0909, $e199d
@@ -349,7 +353,9 @@ _UnownPuzzle::
dr $e199d, $e2668
_DummyGame::
dr $e2668, $e2b9e
dr $e2668, $e29ae
DummyGame_InterpretJoypad_AnimateCursor::
dr $e29ae, $e2b9e
_DepositPKMN::
dr $e2b9e, $e2d71
_WithdrawPKMN::

4
wram.asm
View File

@@ -418,6 +418,10 @@ UNION ; c700
wOverworldMapBlocks:: ds 1300 ; c700
wOverworldMapBlocksEnd::
NEXTU ; c700
; decompress buffer in wram
wDecompressScratch:: ds 40 tiles
NEXTU ; c700
; GB Printer screen RAM
wGameboyPrinterRAM::