diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-12 09:02:49 -0400 |
| commit | fb11ff7e55be56cef9234c8443614f04f2157a1e (patch) | |
| tree | a6aa8d0745bd07d0b80090491b5e4b6652de4420 /data/wildPokemon/mansion3.asm | |
| parent | Pull a lot of engine out of main.asm (diff) | |
| parent | Update INSTALL.md (diff) | |
| download | pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.gz pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.tar.xz pokeyellow-fb11ff7e55be56cef9234c8443614f04f2157a1e.zip | |
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'data/wildPokemon/mansion3.asm')
| -rwxr-xr-x | data/wildPokemon/mansion3.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm index c0df4020..a1b126ac 100755 --- a/data/wildPokemon/mansion3.asm +++ b/data/wildPokemon/mansion3.asm @@ -1,4 +1,4 @@ -MansionMons3: +MansionMons3: db $0A IF _RED db 31,KOFFING @@ -12,7 +12,7 @@ MansionMons3: db 36,PONYTA db 42,MUK ENDC - + IF _GREEN || !_JAPAN && _BLUE db 31,GRIMER db 33,VULPIX @@ -25,7 +25,7 @@ MansionMons3: db 36,PONYTA db 42,WEEZING ENDC - + IF _JAPAN && _BLUE db 31,GRIMER db 33,GROWLITHE @@ -38,7 +38,7 @@ MansionMons3: db 36,PONYTA db 42,WEEZING ENDC - + IF _YELLOW db 40,RATTATA db 40,RATICATE @@ -51,6 +51,6 @@ MansionMons3: db 38,MUK db 41,MUK ENDC - + db $00 |