Leahnaya/pokegold-spaceworld
1
0
Fork 0
mirror of https://github.com/pret/pokegold-spaceworld.git synced 2026-03-21 17:45:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #46 from Tauwasser/misc1_v2

Browse Source 
Miscellaneous Changes v2
This commit is contained in:
vulcandth 2023-06-02 10:16:11 -05:00 committed by GitHub
commit 1d16231300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 118 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
constants/wram_constants.asm
View File

@ -15,6 +15,31 @@ DEF NUM_DIRECTIONS EQU const_value
const TEMPMON ; 3
const WILDMON ; 4
; wJohtoBadges:: ; d163
const_def
const BADGE_0
const BADGE_1
const BADGE_2
const BADGE_3
const BADGE_4
const BADGE_5
const BADGE_6
const BADGE_7
DEF NUM_JOHTO_BADGES EQU const_value
; wKantoBadges:: ; d164
const_def
const BOULDERBADGE
const CASCADEBADGE
const THUNDERBADGE
const RAINBOWBADGE
const SOULBADGE
const MARSHBADGE
const VOLCANOBADGE
const EARTHBADGE
DEF NUM_KANTO_BADGES EQU const_value
DEF NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
; wPlayerState::
DEF PLAYER_NORMAL EQU 0
DEF PLAYER_BIKE EQU 1

135
engine/dumps/bank02.asm
View File

@ -640,7 +640,7 @@ Function83e8:
ld a, [hl]
ld l, a
ld h, $00
ld de, Table83fb
ld de, .Table83fb
add hl, hl
add hl, de
ld e, [hl]
@ -650,133 +650,128 @@ Function83e8:
push de
ret
Table83fb:
dw Function8432
dw Function844a
dw Function8459
dw Function8433
dw Function8438
dw Function843d
dw Function8468
dw Function8477
dw Function8485
dw Function848b
dw Function8494
dw Function849b
dw Function84a9
dw Function84af
dw Function84b8
.Table83fb:
dw .LoadDone
dw .LoadJumpShadow
dw .LoadUnknownBouncingOrb
dw .LoadShockEmote
dw .LoadQuestionEmote
dw .LoadHappyEmote
dw .LoadBoulderDust
dw .LoadGrampsSpriteStandPt0
dw .LoadGrampsSpriteStandPt1
dw .LoadGrampsSpriteWalkPt0
dw .LoadGrampsSpriteWalkPt1
dw .LoadClefairySpriteStandPt0
dw .LoadClefairySpriteStandPt1
dw .LoadClefairySpriteWalkPt0
dw .LoadClefairySpriteWalkPt1
Function8419:
.FarCopy:
ld a, c
ld [wVBCopyFarSrcBank], a
ld a, l
ld [wVBCopyFarSrc], a
ld a, h
ld [wVBCopyFarSrc+1], a
Function8425:
.ContinueFarCopyNewDst:
ld a, e
ld [wVBCopyFarDst], a
ld a, d
ld [wVBCopyFarDst+1], a
Function842d:
.ContinueFarCopy:
ld a, b
ld [wVBCopyFarSize], a
ret
Function8432:
.LoadDone:
ret
Function8433:
.LoadShockEmote:
ld hl, ShockEmoteGFX
jr Function8440
Function8438:
jr .load_emote
.LoadQuestionEmote:
ld hl, QuestionEmoteGFX
jr Function8440
Function843d:
jr .load_emote
.LoadHappyEmote:
ld hl, HappyEmoteGFX
Function8440:
.load_emote:
ld de, vChars1 + $780
ld b, $04
ld c, BANK(HappyEmoteGFX)
jp Function8419
ld b, (HappyEmoteGFX.end - HappyEmoteGFX) / LEN_2BPP_TILE
ld c, BANK(EmoteGFX)
jp .FarCopy
Function844a:
.LoadJumpShadow:
ld [hl], $00
ld hl, JumpShadowGFX
ld de, vChars1 + $7c0
ld b, $01
ld b, (JumpShadowGFX.end - JumpShadowGFX) / LEN_2BPP_TILE
ld c, BANK(JumpShadowGFX)
jp Function8419
jp .FarCopy
Function8459:
.LoadUnknownBouncingOrb:
ld [hl], $00
ld hl, UnknownBouncingOrbGFX
ld de, vChars1 + $7c0
ld b, $04
ld b, (UnknownBouncingOrbGFX.end - UnknownBouncingOrbGFX) / LEN_2BPP_TILE
ld c, BANK(UnknownBouncingOrbGFX)
jp Function8419
jp .FarCopy
Function8468:
.LoadBoulderDust:
ld [hl], $00
ld hl, UnknownBallGFX
ld hl, BoulderDustGFX
ld de, vChars1 + $7c0
ld b, $01
ld c, BANK(UnknownBallGFX)
jp Function8419
ld b, (BoulderDustGFX.end - BoulderDustGFX) / LEN_2BPP_TILE
ld c, BANK(BoulderDustGFX)
jp .FarCopy
Function8477:
.LoadGrampsSpriteStandPt0:
inc [hl]
ld hl, GrampsSpriteGFX
ld de, vChars0
ld b, $06
ld b, (GrampsSpriteGFX.end - GrampsSpriteGFX) / LEN_2BPP_TILE / 4
ld c, BANK(GrampsSpriteGFX)
jp Function8419
jp .FarCopy
Function8485:
.LoadGrampsSpriteStandPt1:
inc [hl]
ld b, $06
jp Function842d
ld b, (GrampsSpriteGFX.end - GrampsSpriteGFX) / LEN_2BPP_TILE / 4
jp .ContinueFarCopy
Function848b:
.LoadGrampsSpriteWalkPt0:
inc [hl]
ld de, vChars1
ld b, $06
jp Function8425
ld b, (GrampsSpriteGFX.end - GrampsSpriteGFX) / LEN_2BPP_TILE / 4
jp .ContinueFarCopyNewDst
Function8494:
.LoadGrampsSpriteWalkPt1:
ld [hl], $00
ld b, $06
jp Function842d
ld b, (GrampsSpriteGFX.end - GrampsSpriteGFX) / LEN_2BPP_TILE / 4
jp .ContinueFarCopy
Function849b:
.LoadClefairySpriteStandPt0:
inc [hl]
ld hl, ClefairySpriteGFX
ld de, vChars0
ld b, $06
ld b, (ClefairySpriteGFX.end - ClefairySpriteGFX) / LEN_2BPP_TILE / 4
ld c, BANK(ClefairySpriteGFX)
jp Function8419
jp .FarCopy
Function84a9:
.LoadClefairySpriteStandPt1:
inc [hl]
ld b, $06
jp Function842d
ld b, (ClefairySpriteGFX.end - ClefairySpriteGFX) / LEN_2BPP_TILE / 4
jp .ContinueFarCopy
Function84af:
.LoadClefairySpriteWalkPt0:
inc [hl]
ld de, vChars1
ld b, $06
jp Function8425
ld b, (ClefairySpriteGFX.end - ClefairySpriteGFX) / LEN_2BPP_TILE / 4
jp .ContinueFarCopyNewDst
Function84b8:
.LoadClefairySpriteWalkPt1:
ld [hl], $00
ld b, $06
jp Function842d
ld b, (ClefairySpriteGFX.end - ClefairySpriteGFX) / LEN_2BPP_TILE / 4
jp .ContinueFarCopy
SECTION "engine/dumps/bank02.asm@QueueFollowerFirstStep", ROMX

8
engine/menu/main_menu.asm
View File

@ -63,8 +63,8 @@ InitializeNewGameWRAM:
xor a
ld [wMonType], a
ld [wd163], a
ld [wd164], a
ld [wJohtoBadges], a
ld [wKantoBadges], a
ld [wCoins], a
ld [wd15c], a
ld [wd15d], a
@ -252,8 +252,8 @@ DisplayContinueGameInfo::
PrintNumBadges::
push hl
ld hl, wd163 ; badges?
ld b, $01
ld hl, wJohtoBadges
ld b, $01 ; only Johto Badges
call CountSetBits
pop hl
ld de, wCountSetBitsResult

2
engine/menu/start_menu.asm
View File

@ -943,7 +943,7 @@ SelectedPokemonSubmenu:
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [wd163]
ld a, [wJohtoBadges]
jp hl
PartyJumpTable:

6
engine/movie/oak_speech.asm
View File

@ -167,9 +167,9 @@ DebugSetUpPlayer::
ld [wd15e], a
ld a, $3F
ld [wd15f], a
ld a, $FF
ld [wd163], a
ld [wd164], a
ld a, $FF ; give all badges
ld [wJohtoBadges], a
ld [wKantoBadges], a
call GiveRandomJohto
ld a, $03
call AddRandomPokemonToBox

27
gfx/gfx.asm
View File

@ -5,18 +5,19 @@ PokedexNestIconGFX::
INCBIN "gfx/trainer_gear/dexmap_nest_icon.1bpp"
SECTION "gfx.asm@Bank 2 Misc GFX", ROMX
UnknownBouncingOrbGFX::
INCBIN "gfx/overworld/gfx_84bf.2bpp"
JumpShadowGFX::
INCBIN "gfx/overworld/shadow.2bpp"
ShockEmoteGFX::
INCBIN "gfx/overworld/shock.2bpp"
QuestionEmoteGFX::
INCBIN "gfx/overworld/question.2bpp"
HappyEmoteGFX::
INCBIN "gfx/overworld/happy.2bpp"
UnknownBallGFX::
INCBIN "gfx/overworld/gfx_85cf.2bpp"
UnknownBouncingOrbGFX:: INCBIN "gfx/overworld/gfx_84bf.2bpp"
.end:
JumpShadowGFX:: INCBIN "gfx/overworld/shadow.2bpp"
.end:
EmoteGFX::
ShockEmoteGFX:: INCBIN "gfx/overworld/shock.2bpp"
.end:
QuestionEmoteGFX:: INCBIN "gfx/overworld/question.2bpp"
.end:
HappyEmoteGFX:: INCBIN "gfx/overworld/happy.2bpp"
.end:
BoulderDustGFX:: INCBIN "gfx/overworld/boulder_dust.2bpp"
.end:
SECTION "gfx.asm@Trainer Gear GFX", ROMX
TrainerGearGFX::
@ -455,6 +456,7 @@ RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp"
PokefanMSpriteGFX:: INCBIN "gfx/sprites/pokefan_m.2bpp"
PokefanFSpriteGFX:: INCBIN "gfx/sprites/pokefan_f.2bpp"
GrampsSpriteGFX:: INCBIN "gfx/sprites/gramps.2bpp"
.end:
GrannySpriteGFX:: INCBIN "gfx/sprites/granny.2bpp"
SwimmerMSpriteGFX:: INCBIN "gfx/sprites/swimmer_m.2bpp"
SwimmerFSpriteGFX:: INCBIN "gfx/sprites/swimmer_f.2bpp"
@ -483,6 +485,7 @@ HelmetSpriteGFX:: INCBIN "gfx/sprites/helmet.2bpp"
BurglarSpriteGFX:: INCBIN "gfx/sprites/burglar.2bpp"
RhydonSpriteGFX:: INCBIN "gfx/sprites/rhydon.2bpp"
ClefairySpriteGFX:: INCBIN "gfx/sprites/clefairy.2bpp"
.end:
PidgeySpriteGFX:: INCBIN "gfx/sprites/pidgey.2bpp"
CharizardSpriteGFX:: INCBIN "gfx/sprites/charizard.2bpp"
SnorlaxSpriteGFX:: INCBIN "gfx/sprites/snorlax.2bpp"

BIN
gfx/overworld/boulder_dust.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
gfx/overworld/gfx_85cf.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 268 B

8
ram/wram.asm
View File

@ -1196,9 +1196,11 @@ wd15f:: db
SECTION "D163", WRAM0[$D163]
wd163:: db
wd164:: db
wBadges::
wJohtoBadges::
flag_array NUM_JOHTO_BADGES
wKantoBadges::
flag_array NUM_KANTO_BADGES
wTMsHMs:: db