diff options
| author | Treeki <treeki@gmail.com> | 2012-09-22 03:56:25 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-09-22 03:56:25 +0200 |
| commit | 18db1947457951b5ce7c83e10c6ee50c2f76b411 (patch) | |
| tree | 426436fe2db9c7c4233fdcdfc96e00d7f5b6c803 | |
| parent | 224cecc27eedc20e4397eb5b196a6555990fd594 (diff) | |
| parent | d47a9ed57a826d60c37bfa8a4ae00ccaba0ed806 (diff) | |
| download | kamek-18db1947457951b5ce7c83e10c6ee50c2f76b411.tar.gz kamek-18db1947457951b5ce7c83e10c6ee50c2f76b411.zip | |
Merge branch 'level-select' of tsn:Kamek into level-select
| -rw-r--r-- | pumpkinGoomba.yaml | 4 | ||||
| -rw-r--r-- | src/pumpkinGoomba.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pumpkinGoomba.yaml b/pumpkinGoomba.yaml index ae28f56..55c95bd 100644 --- a/pumpkinGoomba.yaml +++ b/pumpkinGoomba.yaml @@ -15,10 +15,10 @@ hooks: addr_pal: 0x8030A6B0 # -ID- ---- -X Offs- -Y Offs- -RectX1- -RectY1- -RectX2- -RectY2- -1C- -1E- -20- -22- Flag ---- # Orig 01FC 0000 00000008 00000000 00000000 FFFFFFC0 00000010 00000040 0030 0030 0000 0000 0008 0000 - data: '027D 0000 00000008 00000000 00000008 00000000 00000200 00000200 0030 0030 0000 0000 0008 0000' + data: '027D 0000 00000008 00000010 00000000 FFFFFFF8 00000008 00000008 0000 0000 0000 0000 0000 0000' - name: GoombaPieSpriteFileInfo type: add_func_pointer src_addr_pal: 0x8031ABA4 target_func: 'GParcNameList' - # 0x8031AB4C + sprite num * 0x4 == offset + # 0x8031AB4C + sprite num * 0x4 == offset
\ No newline at end of file diff --git a/src/pumpkinGoomba.cpp b/src/pumpkinGoomba.cpp index 1cc7a96..426d323 100644 --- a/src/pumpkinGoomba.cpp +++ b/src/pumpkinGoomba.cpp @@ -165,7 +165,7 @@ int dGoombaPie::onCreate() { // Other shit isBursting = false; - this->scale = (Vec){0.375, 0.375, 0.375}; + this->scale = (Vec){0.39, 0.39, 0.39}; ActivePhysics::Info HitMeBaby; |