Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding bank14, good chunk of text transcribed and labelled in bank0d, renaming farcall to callab, and much more #112

Merged
merged 13 commits into from
Jan 16, 2025
Merged

Adding bank14, good chunk of text transcribed and labelled in bank0d, renaming farcall to callab, and much more #112

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6684276
Sporadic constantifying and function naming
DrippingYellow Dec 15, 2024
fbb1ad2
Merge pull request #1 from DrippingYellow/main
DrippingYellow Dec 15, 2024
38545c0
Added bank 14
DrippingYellow Jan 11, 2025
15d2c3d
Merge branch 'pret:master' into master
DrippingYellow Jan 11, 2025
3f74de4
Delete .DS_Store files
vulcandth Jan 11, 2025
d75c729
Delete EOL whitespace
vulcandth Jan 11, 2025
eaf9c94
Use Tab indents instead of four spaces
vulcandth Jan 11, 2025
5bd2610
Identify some routines
vulcandth Jan 11, 2025
db4086f
Merge branch 'master' into pr/112
vulcandth Jan 11, 2025
939affd
Identify more stuff
vulcandth Jan 12, 2025
630163f
Identified party and box structs
DrippingYellow Jan 13, 2025
a2ce32b
Identified wBattleMon and wEnemyMon structs
DrippingYellow Jan 15, 2025
ba9d382
Macro'd landmarks, cleaned up comments
DrippingYellow Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into pr/112
  • Loading branch information
@vulcandth
vulcandth committed Jan 11, 2025
commit db4086faf11a5628b1df32cc4e520b412cb5728f
18 changes: 9 additions & 9 deletions engine/dumps/bank03.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2384,7 +2384,7 @@ BoxSelectFunc:
ld c, $00
.sub_e3f2
push hl
ld de, DummyBox
ld de, DummyBoxText
call CopyString
ld a, "０"
add c
Expand All @@ -2400,8 +2400,8 @@ BoxSelectFunc:
jr c, .sub_e3f2
ret

DummyBox:
db "ダミーボックス@"
DummyBoxText:
db "ダミーボックス@" ; "Dummy Box"

Datae414:
db $40, $00, $00, $0c, $13, $1c, $64, $01
Expand Down Expand Up @@ -3329,16 +3329,16 @@ Textec0e:
line "てんそうされた！"
prompt

Textec27:
BallSentToSomeonesPCText_2:
text_from_ram wBoxMonNicknames
text "は　だれかの　<PC>に"
line "てんそうされた！"
text "は　だれかの　<PC>に" ; "was transferred to"
line "てんそうされた！" ; "Someone's PC!"
prompt

Textec3e:
NewDexDataText_2:
text_from_ram wEnemyMonNickname
text "の　データが　あたらしく"
line "#ずかんに　セーブされます！@"
text "の　データが　あたらしく" ; "New Dex data will"
line "#ずかんに　セーブされます！@" ; "be added for (MON)!"

Textec5e:
sound_slot_machine_start
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.