thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/pret/pokered

Browse source
This commit is contained in:
dannye 2022-12-28 17:38:38 -06:00
commit 3f691fcb21
970 changed files with 15106 additions and 11361 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engine/events/cinnabar_lab.asm
View file

@ -27,7 +27,7 @@ GiveFossilToCinnabarLab::
ld hl, wd730
res 6, [hl]
call HandleMenuInput
bit 1, a ; pressed B?
bit BIT_B_BUTTON, a
jr nz, .cancelledGivingFossil
ld hl, wFilteredBagItems
ld a, [wCurrentMenuItem]
@ -116,7 +116,7 @@ LoadFossilItemAndMonName::
ld a, [wFossilMon]
ld [wd11e], a
call GetMonName
call CopyStringToCF4B
call CopyToStringBuffer
ld a, [wFossilItem]
ld [wd11e], a
call GetItemName

11
engine/events/diploma.asm
View file

@ -1,4 +1,4 @@
CIRCLE_TILE_ID EQU $70
DEF CIRCLE_TILE_ID EQU $70
DisplayDiploma::
call SaveScreenTilesToBuffer2
@ -17,9 +17,10 @@ DisplayDiploma::
hlcoord 0, 0
lb bc, 16, 18
predef Diploma_TextBoxBorder
ld hl, DiplomaTextPointersAndCoords
ld c, $5
.asm_56715
.placeTextLoop
push bc
ld a, [hli]
ld e, a
@ -34,7 +35,7 @@ DisplayDiploma::
inc hl
pop bc
dec c
jr nz, .asm_56715
jr nz, .placeTextLoop
hlcoord 10, 4
ld de, wPlayerName
call PlaceString
@ -42,7 +43,7 @@ DisplayDiploma::
; Move the player 33 pixels right and set the priority bit so he appears
; behind the background layer.
ld hl, wOAMBuffer + $01
ld hl, wShadowOAMSprite00XCoord
lb bc, $80, $28
.adjustPlayerGfxLoop
ld a, [hl] ; X
@ -83,7 +84,7 @@ UnusedPlayerNameLengthFunc:
dec c
jr .loop
diploma_text: MACRO
MACRO diploma_text
dw \3
dwcoord \1, \2
ENDM

4
engine/events/give_pokemon.asm
View file

@ -7,7 +7,7 @@ _GivePokemon::
ld a, [wPartyCount]
cp PARTY_LENGTH
jr c, .addToParty
ld a, [wNumInBox]
ld a, [wBoxCount]
cp MONS_PER_BOX
jr nc, .boxFull
; add to box
@ -18,7 +18,7 @@ _GivePokemon::
callfar LoadEnemyMonData
call SetPokedexOwnedFlag
callfar SendNewMonToBox
ld hl, wcf4b
ld hl, wStringBuffer
ld a, [wCurrentBoxNum]
and $7f
cp 9

4
engine/events/hidden_objects/bench_guys.asm
View file

@ -79,9 +79,9 @@ SaffronCityPokecenterBenchGuyText::
text_asm
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ld hl, SaffronCityPokecenterBenchGuyText2
jr nz, .asm_624f2
jr nz, .printText
ld hl, SaffronCityPokecenterBenchGuyText1
.asm_624f2
.printText
call PrintText
jp TextScriptEnd

2
engine/events/hidden_objects/bills_house_pc.asm
View file

@ -95,7 +95,7 @@ BillsHousePokemonList::
call PrintText
call SaveScreenTilesToBuffer2
call HandleMenuInput
bit 1, a ; pressed b
bit BIT_B_BUTTON, a
jr nz, .cancel
ld a, [wCurrentMenuItem]
add EEVEE

10
engine/events/hidden_objects/cinnabar_gym_quiz.asm
View file

@ -32,7 +32,7 @@ CinnabarGymQuiz::
call PrintText
ld a, 1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
call CinnabarGymQuiz_1ea92
call CinnabarGymQuiz_AskQuestion
jp TextScriptEnd
CinnabarGymQuizIntroText:
@ -75,7 +75,7 @@ CinnabarGymGateFlagAction:
EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
predef_jump FlagActionPredef
CinnabarGymQuiz_1ea92:
CinnabarGymQuiz_AskQuestion:
call YesNoChoice
ldh a, [hGymGateAnswer]
ld c, a
@ -183,12 +183,12 @@ UpdateCinnabarGymGateTileBlocks_::
jr nz, .loop
ret
gym_gate_coord: MACRO
MACRO gym_gate_coord
db \1, \2, \3, 0
ENDM
HORIZONTAL_GATE_BLOCK EQU $54
VERTICAL_GATE_BLOCK EQU $5f
DEF HORIZONTAL_GATE_BLOCK EQU $54
DEF VERTICAL_GATE_BLOCK EQU $5f
CinnabarGymGateCoords:
; x coord, y coord, block id

2
engine/events/hidden_objects/safari_game.asm
View file

@ -39,7 +39,7 @@ SafariZoneGameOver:
call WaitForSoundToFinish
;.waitForMusicToPlay
; ld a, [wChannelSoundIDs + Ch5]
; ld a, [wChannelSoundIDs + CHAN5]
; cp SFX_SAFARI_ZONE_PA
; jr nz, .waitForMusicToPlay

8
engine/events/hidden_objects/school_blackboard.asm
View file

@ -36,7 +36,7 @@ LinkCableHelp::
ld hl, LinkCableHelpText2
call PrintText
call HandleMenuInput
bit 1, a ; pressed b
bit BIT_B_BUTTON, a
jr nz, .exit
ld a, [wCurrentMenuItem]
cp 3 ; pressed a on "STOP READING"
@ -122,9 +122,9 @@ ViridianSchoolBlackboard::
ld hl, ViridianSchoolBlackboardText2
call PrintText
call HandleMenuInput ; pressing up and down is handled in here
bit 1, a ; pressed b
bit BIT_B_BUTTON, a ; pressed b
jr nz, .exitBlackboard
bit 4, a ; pressed right
bit BIT_D_RIGHT, a
jr z, .didNotPressRight
; move cursor to right column
ld a, 2
@ -137,7 +137,7 @@ ViridianSchoolBlackboard::
ld [wMenuItemOffset], a
jr .blackboardLoop
.didNotPressRight
bit 5, a ; pressed left
bit BIT_D_LEFT, a
jr z, .didNotPressLeftOrRight
; move cursor to left column
ld a, 2

4
engine/events/pewter_guys.asm
View file

@ -8,7 +8,7 @@ PewterGuys:
add hl, de
ld d, h
ld e, l
ld hl, PointerTable_37ce6
ld hl, PewterGuysCoordsTable
ld a, [wWhichPewterGuy]
add a
ld b, 0
@ -48,7 +48,7 @@ PewterGuys:
inc hl
jr .findMatchingCoordsLoop
PointerTable_37ce6:
PewterGuysCoordsTable:
dw PewterMuseumGuyCoords
dw PewterGymGuyCoords

102
engine/events/pokedex_rating.asm
View file

@ -26,7 +26,7 @@ DisplayDexRating:
CheckAndResetEventA EVENT_HALL_OF_FAME_DEX_RATING
jr nz, .hallOfFame
push hl
ld hl, PokedexRatingText_441cc
ld hl, DexCompletionText
call PrintText
pop hl
call PrintText
@ -51,88 +51,88 @@ DisplayDexRating:
ld [de], a
ret
PokedexRatingText_441cc:
text_far _OaksLabText_441cc
DexCompletionText:
text_far _DexCompletionText
text_end
DexRatingsTable:
dbw 10, PokedexRatingText_44201
dbw 20, PokedexRatingText_44206
dbw 30, PokedexRatingText_4420b
dbw 40, PokedexRatingText_44210
dbw 50, PokedexRatingText_44215
dbw 60, PokedexRatingText_4421a
dbw 70, PokedexRatingText_4421f
dbw 80, PokedexRatingText_44224
dbw 90, PokedexRatingText_44229
dbw 100, PokedexRatingText_4422e
dbw 110, PokedexRatingText_44233
dbw 120, PokedexRatingText_44238
dbw 130, PokedexRatingText_4423d
dbw 140, PokedexRatingText_44242
dbw 150, PokedexRatingText_44247
dbw NUM_POKEMON + 1, PokedexRatingText_4424c
dbw 10, DexRatingText_Own0To9
dbw 20, DexRatingText_Own10To19
dbw 30, DexRatingText_Own20To29
dbw 40, DexRatingText_Own30To39
dbw 50, DexRatingText_Own40To49
dbw 60, DexRatingText_Own50To59
dbw 70, DexRatingText_Own60To69
dbw 80, DexRatingText_Own70To79
dbw 90, DexRatingText_Own80To89
dbw 100, DexRatingText_Own90To99
dbw 110, DexRatingText_Own100To109
dbw 120, DexRatingText_Own110To119
dbw 130, DexRatingText_Own120To129
dbw 140, DexRatingText_Own130To139
dbw 150, DexRatingText_Own140To149
dbw NUM_POKEMON + 1, DexRatingText_Own150To151
PokedexRatingText_44201:
text_far _OaksLabText_44201
DexRatingText_Own0To9:
text_far _DexRatingText_Own0To9
text_end
PokedexRatingText_44206:
text_far _OaksLabText_44206
DexRatingText_Own10To19:
text_far _DexRatingText_Own10To19
text_end
PokedexRatingText_4420b:
text_far _OaksLabText_4420b
DexRatingText_Own20To29:
text_far _DexRatingText_Own20To29
text_end
PokedexRatingText_44210:
text_far _OaksLabText_44210
DexRatingText_Own30To39:
text_far _DexRatingText_Own30To39
text_end
PokedexRatingText_44215:
text_far _OaksLabText_44215
DexRatingText_Own40To49:
text_far _DexRatingText_Own40To49
text_end
PokedexRatingText_4421a:
text_far _OaksLabText_4421a
DexRatingText_Own50To59:
text_far _DexRatingText_Own50To59
text_end
PokedexRatingText_4421f:
text_far _OaksLabText_4421f
DexRatingText_Own60To69:
text_far _DexRatingText_Own60To69
text_end
PokedexRatingText_44224:
text_far _OaksLabText_44224
DexRatingText_Own70To79:
text_far _DexRatingText_Own70To79
text_end
PokedexRatingText_44229:
text_far _OaksLabText_44229
DexRatingText_Own80To89:
text_far _DexRatingText_Own80To89
text_end
PokedexRatingText_4422e:
text_far _OaksLabText_4422e
DexRatingText_Own90To99:
text_far _DexRatingText_Own90To99
text_end
PokedexRatingText_44233:
text_far _OaksLabText_44233
DexRatingText_Own100To109:
text_far _DexRatingText_Own100To109
text_end
PokedexRatingText_44238:
text_far _OaksLabText_44238
DexRatingText_Own110To119:
text_far _DexRatingText_Own110To119
text_end
PokedexRatingText_4423d:
text_far _OaksLabText_4423d
DexRatingText_Own120To129:
text_far _DexRatingText_Own120To129
text_end
PokedexRatingText_44242:
text_far _OaksLabText_44242
DexRatingText_Own130To139:
text_far _DexRatingText_Own130To139
text_end
PokedexRatingText_44247:
text_far _OaksLabText_44247
DexRatingText_Own140To149:
text_far _DexRatingText_Own140To149
text_end
PokedexRatingText_4424c:
text_far _OaksLabText_4424c
DexRatingText_Own150To151:
text_far _DexRatingText_Own150To151
text_end

2
engine/events/pokemart.asm
View file

@ -159,7 +159,7 @@ DisplayPokemartDialogue_::
ld a, [wcf91] ; item ID
ld [wd11e], a ; store item ID for GetItemName
call GetItemName
call CopyStringToCF4B ; copy name to wcf4b
call CopyToStringBuffer
ld hl, PokemartTellBuyPriceText
call PrintText
hlcoord 14, 7

2
engine/events/prize_menu.asm
View file

@ -31,7 +31,7 @@ CeladonPrizeMenu::
ld hl, WhichPrizeTextPtr
call PrintText
call HandleMenuInput ; menu choice handler
bit 1, a ; keypress = B (Cancel)
bit BIT_B_BUTTON, a
jr nz, .noChoice
ld a, [wCurrentMenuItem]
cp 3 ; "NO,THANKS" choice

2
engine/events/vending_machine.asm
View file

@ -31,7 +31,7 @@ VendingMachineMenu::
ld hl, wd730
res 6, [hl]
call HandleMenuInput
bit 1, a ; pressed B?
bit BIT_B_BUTTON, a
jr nz, .notThirsty
ld a, [wCurrentMenuItem]
cp 3 ; chose Cancel?