summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-09-15 21:24:59 +0200
committerTreeki <treeki@gmail.com>2012-09-15 21:24:59 +0200
commitd03b7871950f89623f1f90facde2f5df89e9e136 (patch)
tree40bacbe48d2634ca451b770c9e89a439fd285d61
parenta16adae746a5d4814a781f583d18dd79d3e7d43b (diff)
downloadkamek-d03b7871950f89623f1f90facde2f5df89e9e136.tar.gz
kamek-d03b7871950f89623f1f90facde2f5df89e9e136.zip
fixed a profile assignment conflict and added a doc for assigned profiles
-rw-r--r--bossBalboaWrench.yaml2
-rw-r--r--bossFuzzyBear.yaml2
-rw-r--r--electricLine.yaml2
-rw-r--r--koopatlas.yaml18
-rw-r--r--spritespawner.yaml4
-rw-r--r--src/koopatlas/core.h2
-rw-r--r--tools/UsedProfileAndSpriteList.txt159
7 files changed, 174 insertions, 15 deletions
diff --git a/bossBalboaWrench.yaml b/bossBalboaWrench.yaml
index f649aa0..178713d 100644
--- a/bossBalboaWrench.yaml
+++ b/bossBalboaWrench.yaml
@@ -1,5 +1,5 @@
---
-# Replaces EN_Iwao
+# Replaces AC_LIFT_ICE_SPRING
source_files: [../src/bossBalboaWrench.cpp]
hooks:
diff --git a/bossFuzzyBear.yaml b/bossFuzzyBear.yaml
index 3b608d3..33b9e1f 100644
--- a/bossFuzzyBear.yaml
+++ b/bossFuzzyBear.yaml
@@ -1,5 +1,5 @@
---
-# Replaces EN_WALLINSECT
+# Replaces WALLINSECT_MGR
source_files: [../src/bossFuzzyBear.cpp]
hooks:
diff --git a/electricLine.yaml b/electricLine.yaml
index 3b9e856..ab968c4 100644
--- a/electricLine.yaml
+++ b/electricLine.yaml
@@ -1,5 +1,5 @@
---
-# Replaces Ship_Window
+# Replaces Kawanagare
source_files: [../src/electricLine.cpp]
hooks:
diff --git a/koopatlas.yaml b/koopatlas.yaml
index 0457fe0..4c79acf 100644
--- a/koopatlas.yaml
+++ b/koopatlas.yaml
@@ -16,42 +16,42 @@ source_files:
- ../src/koopatlas/starcoin.cpp
hooks:
- - name: BuildWorldMap
+ - name: BuildWorldMap # WORLD_MAP
type: add_func_pointer
src_addr_pal: 0x8098DCF0
target_func: 'dScKoopatlas_c::build(void)'
- - name: BuildWMPlayer
+ - name: BuildWMPlayer # WM_PLAYER
type: add_func_pointer
src_addr_pal: 0x80988DDC
target_func: 'daWMPlayer_c::build(void)'
- - name: BuildWMHud
+ - name: BuildWMHud # WM_DANCE_PAKKUN
type: add_func_pointer
src_addr_pal: 0x80982844
target_func: 'dWMHud_c::build(void)'
- - name: BuildWorldCamera
+ - name: BuildWorldCamera # WORLD_CAMERA
type: add_func_pointer
src_addr_pal: 0x8098EEC8
target_func: 'dWorldCamera_c::build(void)'
- - name: BuildWMMap
+ - name: BuildWMMap # WM_MAP
type: add_func_pointer
src_addr_pal: 0x80984710
target_func: 'dWMMap_c::build(void)'
- - name: BuildWMShop
+ - name: BuildWMShop # WM_TOGEZO
type: add_func_pointer
src_addr_pal: 0x80986074
target_func: 'dWMShop_c::build(void)'
- - name: BuildWMdShopItem
+ - name: BuildWMdShopItem # WM_BOARD
type: add_func_pointer
- src_addr_pal: 0x809894B4
+ src_addr_pal: 0x80981CA0
target_func: 'dShopItem::build(void)'
- - name: BuildWMdStarCoin
+ - name: BuildWMdStarCoin # WM_GHOST
type: add_func_pointer
src_addr_pal: 0x80982D1C
target_func: 'dWMStarCoin::build(void)'
diff --git a/spritespawner.yaml b/spritespawner.yaml
index 8c2e7ca..8c630eb 100644
--- a/spritespawner.yaml
+++ b/spritespawner.yaml
@@ -1,5 +1,5 @@
---
-# Replaces Ac_Lift_ObjBg_HMove_Big
+# Replaces EN_BOYON
source_files: [../src/spritespawner.cpp]
hooks:
@@ -12,4 +12,4 @@ hooks:
type: add_func_pointer
src_addr_pal: 0x80ADEA30
target_func: 'SpriteSpawner_Execute(SpriteSpawner *)'
- \ No newline at end of file
+
diff --git a/src/koopatlas/core.h b/src/koopatlas/core.h
index d2d9454..2674977 100644
--- a/src/koopatlas/core.h
+++ b/src/koopatlas/core.h
@@ -36,7 +36,7 @@ void NewerMapDrawFunc();
#define WM_HUD WM_DANCE_PAKKUN
#define WM_SHOP WM_TOGEZO
-#define WM_SHOPITEM WM_PUKU
+#define WM_SHOPITEM WM_BOARD
#define WM_STARCOIN WM_GHOST
class daWMPlayer_c;
diff --git a/tools/UsedProfileAndSpriteList.txt b/tools/UsedProfileAndSpriteList.txt
new file mode 100644
index 0000000..7f2a7ec
--- /dev/null
+++ b/tools/UsedProfileAndSpriteList.txt
@@ -0,0 +1,159 @@
+[Commented] 210 : TARZAN_ROPE : Pengi
+--- : MOVIE : Cut Scene
+--- : WM_BOARD : Shop Item
+--- : WM_DANCE_PAKKUN : HUD
+--- : WM_GHOST : Star Coin Screen
+--- : WM_MAP : Map
+--- : WM_PAKKUN : Captain Bowser: Clown Shot
+--- : WM_PLAYER : Player
+--- : WM_SINKSHIP : Song Prize
+--- : WM_SMALLCLOUD : Bridge Bowser: Dropped Bomb
+--- : WM_TOGEZO : Shop
+--- : WORLD_CAMERA : World Camera
+--- : WORLD_MAP : Koopatlas
+ 10 : WM_ANCHOR : Captain Bowser: Koopa Throw
+ 11 : WM_KOOPA_CASTLE : Make Your Own
+ 12 : WM_KURIBO : Challenge Star
+ 13 : JR_CLOWN_FOR_PLAYER : Captain Bowser: Clown Car
+ 14 : WM_ANTLION : Captain Bowser: Koopa Flamethrower
+ 15 : WM_KILLERBULLET : Sing Along
+ 16 : WM_CLOUD : Bridge Bowser: Bomb Drop
+ 17 : WM_KILLER : Song Block
+ 18 : WM_BOSS_IGGY : Bone Piece
+ 19 : WM_PUKU : Samurshai
+ 22 : WM_KINOKO_STAR : Pumpkin Goomba
+ 49 : AC_LIFT_SEESAW : Fake Star Coin
+ 79 : EN_HELPOS : Event Looper
+ 88 : EN_BOYON : Sprite Spawner
+ 89 : EN_REMOCON_TORIMOCHI : Sprite Swapper Timed
+107 : EN_LIFT_ROTATION_HALF : Message Box Manager
+152 : EN_BLUR : Message Block
+169 : EN_SLIP_PENGUIN : Magic Platform
+183 : EN_TARZANROPE : Meteor
+210 : TARZAN_ROPE : Topman
+213 : BRANCH : Captain Bowser
+239 : MIST_INTERMITTENT : Event Block
+244 : RIVER_MGR : Line God
+246 : TAG_THUNDER : Level Special
+250 : KAWANAGARE : Electric Line
+251 : SLOW_QUICK_TAG : Topman Boss
+282 : EN_WALLINSECT : Mr Sun
+283 : WALLINSECT_MGR : Fuzzy Bear
+290 : EN_IWAO : Ramboo
+302 : EN_GAKE_NOKO : Wrench
+322 : EN_GHOST_JUGEM : Thwomp Boss
+324 : SHIP_WINDOW : Podouble
+332 : LIFT_TORIDE_ROLL : Effect Video
+350 : DUMMY_DOOR_PARENT : Fire Laser
+351 : DUMMY_DOOR_CHILD : Shy Guy
+410 : AC_BLOCK_GROUP : Mega Goomba
+XXX : AC_LIFT_ICE_SPRING : Balboa Wrench
+
+
+
+-- All Replaced Profiles --
+AC_BLOCK_GROUP
+AC_LIFT_ICE_SPRING
+AC_LIFT_SEESAW
+BRANCH
+DUMMY_DOOR_CHILD
+DUMMY_DOOR_PARENT
+EN_BLUR
+EN_BOYON
+EN_GAKE_NOKO
+EN_GHOST_JUGEM
+EN_HELPOS
+EN_IWAO
+EN_LIFT_ROTATION_HALF
+EN_REMOCON_TORIMOCHI
+EN_SLIP_PENGUIN
+EN_TARZANROPE
+EN_WALLINSECT
+JR_CLOWN_FOR_PLAYER
+KAWANAGARE
+LIFT_TORIDE_ROLL
+MIST_INTERMITTENT
+MOVIE
+RIVER_MGR
+SHIP_WINDOW
+SLOW_QUICK_TAG
+TAG_THUNDER
+TARZAN_ROPE
+WALLINSECT_MGR
+WM_ANCHOR
+WM_ANTLION
+WM_BOARD
+WM_BOSS_IGGY
+WM_CLOUD
+WM_DANCE_PAKKUN
+WM_GHOST
+WM_KILLER
+WM_KILLERBULLET
+WM_KINOKO_STAR
+WM_KOOPA_CASTLE
+WM_KURIBO
+WM_MAP
+WM_PAKKUN
+WM_PLAYER
+WM_PUKU
+WM_PUKU
+WM_SINKSHIP
+WM_SMALLCLOUD
+WM_TOGEZO
+WORLD_CAMERA
+WORLD_MAP
+
+
+
+-- World Map Processes Free for Use: --
+WM_ANTLION_MNG
+WM_BOSS_BASE
+WM_BOSS_KAMECK
+WM_BOSS_LARRY
+WM_BOSS_LEMMY
+WM_BOSS_LUDWIG
+WM_BOSS_MORTON
+WM_BOSS_ROY
+WM_BOSS_WENDY
+WM_BROS
+WM_BUBBLE
+WM_CANNON
+WM_CASTLE
+WM_COURSE
+WM_CS_SEQ_MNG
+WM_CS_W3_PALM
+WM_DIRECTOR
+WM_DOKAN
+WM_DOKANROUTE
+WM_GRID
+WM_HANACHAN
+WM_IBARA
+WM_ISLAND
+WM_JUGEM
+WM_KINOBALLOON
+WM_KINOKO_1UP
+WM_KINOKO_BASE
+WM_KINOKO_RED
+WM_KINOPIO
+WM_KOOPAJR
+WM_KOOPASHIP
+WM_MANTA
+WM_NOTE
+WM_PAKKUNHEAD
+WM_PEACH
+WM_PEACH_CASTLE
+WM_SANDPILLAR
+WM_START
+WM_STOP
+WM_SUBPLAYER
+WM_SURRENDER
+WM_SWITCH
+WM_TERESA
+WM_TEST
+WM_TEST2
+WM_TORIDE
+WM_TOWER
+WM_TREASURESHIP
+WM_YOGANPILLAR
+WORLD_SELECT
+WORLD_SELECT_GUIDE