diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
| commit | d2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch) | |
| tree | f581489b522fc647477d7b36dee072d553c44fd1 /yellow/main.asm | |
| parent | 3394d8320f35f524231aa13bd9cae34e22246a6d (diff) | |
| parent | 1a987d1e1ab96ca9553d4253c72858057332a03a (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'yellow/main.asm')
| -rwxr-xr-x | yellow/main.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index 82c3f2f8..94ba27bd 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -1118,13 +1118,13 @@ SECTION "bank1E",ROMX,BANK[$1E] dr $78000,$78757 AnimationTileset2: ; 78757 (1e:4857) dr $78757,$79816 -Func_79816: ; 79816 (1e:5816) +HideSubstituteShowMonAnim: ; 79816 (1e:5816) dr $79816,$798b2 -Func_798b2: ; 798b2 (1e:58b2) +ReshowSubstituteAnim: ; 798b2 (1e:58b2) dr $798b2,$798c8 AnimationTransformMon: ; 798c8 (1e:58c8) dr $798c8,$798d4 -Func_798d4: ; 798d4 (1e:58d4) +ChangeMonPic: ; 798d4 (1e:58d4) dr $798d4,$7a19a RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp" |