Skip to content

Commit

Permalink
move new pics sections to pics.o (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
etdv-thevoid authored May 17, 2024
1 parent 3db947a commit 3ab31fa
Show file tree
Hide file tree
Showing 3 changed files with 572 additions and 581 deletions.
Loading

4 comments on commit 3ab31fa

@MisterTobias
Copy link

@MisterTobias MisterTobias commented on 3ab31fa Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change prevented me from adding mew to the "data/pokemon/base_stats.asm" file.

In detail modification of what I am describing:

INCLUDE "data/pokemon/base_stats/mewtwo.asm"
+ INCLUDE "data/pokemon/base_stats/mew.asm
- assert_table_length NUM_POKEMON - 1 ; discount Mew
+ assert_table_length NUM_POKEMON

"main.asm"
INCLUDE "data/sprites/facings.asm"
INCLUDE "engine/events/black_out.asm"
- INCLUDE "data/pokemon/mew.asm"
INCLUDE "engine/battle/safari_zone.asm"

But then, when trying to assemble the project I would get an error related with the layout.link file:
(I don't remember exactly, work by word, how the error message was written. But was something like this):
ERROR IN LINE 43 org $425b
ERROR IN LINE 44 "Mew Base Stats"

Removing those line or just omit them using ";" . Wouldn't still work the, org value was always "wrong".

ROMX $1
"bank1"
;org $425b
;"Mew Base Stats"```
And this was important for my project, because without changing mew.asm file location, the sprites of my added Pokémon wouldn't properly decompress. Didn't matter if they were in pic.asm file or main.asm file

So I had to get the "pic.asm", "main.asm" and "layout.link" files, before this commit, "3ab31fa"
changes. Adding the location for the sprite in the main.asm file and using ";" to remove

Edit: My mistake, it was probably the "home/pokemon.asm" file that had the wrong modifications when I tried "removing mew from there" .

@dannye
Copy link
Owner

@dannye dannye commented on 3ab31fa Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MisterTobias Sorry, but this doesn't really add up. This commit has nothing to do with base stats and doesn't prevent you from making any changes to base stats. This commit also doesn't prevent you from putting the pics in any bank you wish.

I can't help without knowing the *exact* error messages you were seeing. But I can tell you that reverting this commit was not necessary.

You are correct that commenting out:

;	org $425b
;	"Mew Base Stats"

after moving mew's base stats is good and correct. If you still got errors after commenting out those lines, then I suspect that you started getting a different error message. I would need to know what that error message is to help you.

@MisterTobias
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dannye
I just tried to recreate the error, with this commit changes but this time it WORKED CORRECTLY!

I am not sure what I did different from the other times/attempts, but I suspect it might have been involved with the "/home/pokemon.asm" file.

I may have deleted/omitted the wrong lines of code when "removing mew from there" and when I replaced the "pics.asm", "main.asm" and "layout.link" files to their previous version , I have probably also downloaded a clean "pokemon.asm" file.

Showing me the error message about "/home/pokemon.asm", when assembling, making me redo "the mew lines omitting/deleting" and consequently fixing the real problem, without me realizing it.

Which made me assume that those files (pic, layout and main) were the problem.

Sorry for bothering you with all this misunderstanding, my bad

@dannye
Copy link
Owner

@dannye dannye commented on 3ab31fa Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem, not a bother at all, glad you got it sorted.

Please sign in to comment.